Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

fix: import lg/lu not find all up view #6238

Merged
boydc2014 merged 7 commits into from
Mar 8, 2021
Merged

fix: import lg/lu not find all up view #6238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
657a3d5
resolve correct file
zhixzhan Mar 5, 2021
fbf9e4f
indent on import item
zhixzhan Mar 5, 2021
1011fe2
lint
zhixzhan Mar 5, 2021
3253f0a
Merge branch 'main' into zhixzhan/file-import-resolve
zhixzhan Mar 5, 2021
35664f8
change icon, no indent
zhixzhan Mar 8, 2021
c00a2c7
Merge branch 'main' into zhixzhan/file-import-resolve
zhixzhan Mar 8, 2021
2c0762f
Merge branch 'main' into zhixzhan/file-import-resolve
boydc2014 Mar 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ export const ProjectTree: React.FC<Props> = ({
key={`lg_${item.id}`}
dialogName={dialog.displayName}
extraSpace={INDENT_PER_LEVEL}
icon={icons.LG}
icon={icons.DIALOG}
isActive={doesLinkMatch(link, selectedLink)}
isMenuOpen={isMenuOpen}
link={link}
Expand Down Expand Up @@ -571,7 +571,7 @@ export const ProjectTree: React.FC<Props> = ({
key={`lu_${item.id}`}
dialogName={dialog.displayName}
extraSpace={INDENT_PER_LEVEL}
icon={icons.LU}
icon={icons.DIALOG}
isActive={doesLinkMatch(link, selectedLink)}
isMenuOpen={isMenuOpen}
link={link}
Expand Down
2 changes: 1 addition & 1 deletion Composer/packages/client/src/pages/language-generation/code-editor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const CodeEditor: React.FC<CodeEditorProps> = (props) => {

const file: LgFile | undefined = lgFileId
? lgFiles.find(({ id }) => id === lgFileId)
: lgFiles.find(({ id }) => id === `${dialogId}.${locale}`);
: lgFiles.find(({ id }) => id === dialogId || id === `${dialogId}.${locale}`);

const defaultLangFile = lgFileId
? lgFiles.find(({ id }) => id === lgFileId)
Expand Down
2 changes: 1 addition & 1 deletion Composer/packages/client/src/pages/language-generation/table-view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const TableView: React.FC<TableViewProps> = (props) => {

const file = lgFileId
? lgFiles.find(({ id }) => id === lgFileId)
: lgFiles.find(({ id }) => id === `${dialogId}.${locale}`);
: lgFiles.find(({ id }) => id === dialogId || id === `${dialogId}.${locale}`);

const defaultLangFile = lgFileId
? lgFiles.find(({ id }) => id === lgFileId)
Expand Down
2 changes: 1 addition & 1 deletion Composer/packages/client/src/pages/language-understanding/code-editor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const CodeEditor: React.FC<CodeEditorProps> = (props) => {

const file = luFileId
? luFiles.find(({ id }) => id === luFileId)
: luFiles.find(({ id }) => id === `${dialogId}.${locale}`);
: luFiles.find(({ id }) => id === dialogId || id === `${dialogId}.${locale}`);

const defaultLangFile = luFileId
? luFiles.find(({ id }) => id === luFileId)
Expand Down
2 changes: 1 addition & 1 deletion Composer/packages/client/src/pages/language-understanding/table-view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ const TableView: React.FC<TableViewProps> = (props) => {

const file = luFileId
? luFiles.find(({ id }) => id === luFileId)
: luFiles.find(({ id }) => id === `${dialogId}.${locale}`);
: luFiles.find(({ id }) => id === dialogId || id === `${dialogId}.${locale}`);

const defaultLangFile = luFileId
? luFiles.find(({ id }) => id === luFileId)
Expand Down
5 changes: 3 additions & 2 deletions Composer/packages/client/src/recoilModel/selectors/dialogImports.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,11 @@ export const getLanguageFileImports = <T extends LgFile | LuFile | QnAFile>(
continue;
}
const currentImports = file.imports.map((item) => {
const importedFile = getFile(getBaseName(item.id));
return {
displayName: item.description,
importPath: item.path,
id: getBaseName(item.id),
id: importedFile ? importedFile.id : '',
};
});

Expand All @@ -62,7 +63,7 @@ export const lgImportsSelectorFamily = selectorFamily<LanguageFileImport[], { pr
get(lgFilesSelectorFamily(projectId)).find((f) => f.id === fileId || f.id === `${fileId}.${locale}`) as LgFile;

// Have to exclude common as a special case
return getLanguageFileImports(dialogId, getFile).filter((i) => i.id !== 'common');
return getLanguageFileImports(dialogId, getFile).filter((i) => getBaseName(i.id) !== 'common');
},
});

Expand Down