From 657a3d515e87dcc592a030432334cde8a8fdcd1e Mon Sep 17 00:00:00 2001 From: zhixzhan Date: Fri, 5 Mar 2021 15:59:45 +0800 Subject: [PATCH 1/4] resolve correct file --- .../client/src/pages/language-generation/code-editor.tsx | 2 +- .../client/src/pages/language-generation/table-view.tsx | 2 +- .../client/src/pages/language-understanding/code-editor.tsx | 2 +- .../client/src/pages/language-understanding/table-view.tsx | 2 +- .../client/src/recoilModel/selectors/dialogImports.ts | 5 +++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Composer/packages/client/src/pages/language-generation/code-editor.tsx b/Composer/packages/client/src/pages/language-generation/code-editor.tsx index aae80bf07f..dbfd6709ed 100644 --- a/Composer/packages/client/src/pages/language-generation/code-editor.tsx +++ b/Composer/packages/client/src/pages/language-generation/code-editor.tsx @@ -51,7 +51,7 @@ const CodeEditor: React.FC = (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) diff --git a/Composer/packages/client/src/pages/language-generation/table-view.tsx b/Composer/packages/client/src/pages/language-generation/table-view.tsx index 18274b064c..9ed2b4e732 100644 --- a/Composer/packages/client/src/pages/language-generation/table-view.tsx +++ b/Composer/packages/client/src/pages/language-generation/table-view.tsx @@ -51,7 +51,7 @@ const TableView: React.FC = (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) diff --git a/Composer/packages/client/src/pages/language-understanding/code-editor.tsx b/Composer/packages/client/src/pages/language-understanding/code-editor.tsx index 2c28246b14..a056e8c01e 100644 --- a/Composer/packages/client/src/pages/language-understanding/code-editor.tsx +++ b/Composer/packages/client/src/pages/language-understanding/code-editor.tsx @@ -45,7 +45,7 @@ const CodeEditor: React.FC = (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) diff --git a/Composer/packages/client/src/pages/language-understanding/table-view.tsx b/Composer/packages/client/src/pages/language-understanding/table-view.tsx index a974ba276d..1317f1e7f4 100644 --- a/Composer/packages/client/src/pages/language-understanding/table-view.tsx +++ b/Composer/packages/client/src/pages/language-understanding/table-view.tsx @@ -62,7 +62,7 @@ const TableView: React.FC = (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) diff --git a/Composer/packages/client/src/recoilModel/selectors/dialogImports.ts b/Composer/packages/client/src/recoilModel/selectors/dialogImports.ts index fc49a8a07a..d47366fd55 100644 --- a/Composer/packages/client/src/recoilModel/selectors/dialogImports.ts +++ b/Composer/packages/client/src/recoilModel/selectors/dialogImports.ts @@ -36,10 +36,11 @@ export const getLanguageFileImports = ( 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 : '', }; }); @@ -62,7 +63,7 @@ export const lgImportsSelectorFamily = selectorFamily 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'); }, }); From fbf9e4fb05795cc0eccae9094d1a0470fa9ee88c Mon Sep 17 00:00:00 2001 From: zhixzhan Date: Fri, 5 Mar 2021 16:06:42 +0800 Subject: [PATCH 2/4] indent on import item --- .../packages/client/src/components/ProjectTree/ProjectTree.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx b/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx index c8bd9a29f3..23fd14866f 100644 --- a/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx +++ b/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx @@ -527,6 +527,7 @@ export const ProjectTree: React.FC = ({ key={`lg_${item.id}`} dialogName={dialog.displayName} extraSpace={INDENT_PER_LEVEL} + marginLeft={INDENT_PER_LEVEL} icon={icons.LG} isActive={doesLinkMatch(link, selectedLink)} isMenuOpen={isMenuOpen} @@ -571,6 +572,7 @@ export const ProjectTree: React.FC = ({ key={`lu_${item.id}`} dialogName={dialog.displayName} extraSpace={INDENT_PER_LEVEL} + marginLeft={INDENT_PER_LEVEL} icon={icons.LU} isActive={doesLinkMatch(link, selectedLink)} isMenuOpen={isMenuOpen} From 1011fe2e08cb5164ed7c68a798123f0eb80228c9 Mon Sep 17 00:00:00 2001 From: zhixzhan Date: Fri, 5 Mar 2021 16:23:52 +0800 Subject: [PATCH 3/4] lint --- .../client/src/components/ProjectTree/ProjectTree.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx b/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx index 23fd14866f..149020f7d5 100644 --- a/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx +++ b/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx @@ -527,11 +527,11 @@ export const ProjectTree: React.FC = ({ key={`lg_${item.id}`} dialogName={dialog.displayName} extraSpace={INDENT_PER_LEVEL} - marginLeft={INDENT_PER_LEVEL} icon={icons.LG} isActive={doesLinkMatch(link, selectedLink)} isMenuOpen={isMenuOpen} link={link} + marginLeft={INDENT_PER_LEVEL} menu={[]} menuOpenCallback={setMenuOpen} showErrors={options.showErrors} @@ -572,11 +572,11 @@ export const ProjectTree: React.FC = ({ key={`lu_${item.id}`} dialogName={dialog.displayName} extraSpace={INDENT_PER_LEVEL} - marginLeft={INDENT_PER_LEVEL} icon={icons.LU} isActive={doesLinkMatch(link, selectedLink)} isMenuOpen={isMenuOpen} link={link} + marginLeft={INDENT_PER_LEVEL} menu={[]} menuOpenCallback={setMenuOpen} showErrors={options.showErrors} From 35664f84046c678362a6950f2376f337c0b5cdf2 Mon Sep 17 00:00:00 2001 From: zhixzhan Date: Mon, 8 Mar 2021 10:36:37 +0800 Subject: [PATCH 4/4] change icon, no indent --- .../client/src/components/ProjectTree/ProjectTree.tsx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx b/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx index 149020f7d5..58b3c9d5b9 100644 --- a/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx +++ b/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx @@ -527,11 +527,10 @@ export const ProjectTree: React.FC = ({ 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} - marginLeft={INDENT_PER_LEVEL} menu={[]} menuOpenCallback={setMenuOpen} showErrors={options.showErrors} @@ -572,11 +571,10 @@ export const ProjectTree: React.FC = ({ 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} - marginLeft={INDENT_PER_LEVEL} menu={[]} menuOpenCallback={setMenuOpen} showErrors={options.showErrors}