From 2627c0f955fe3615ae7ddebd3135152aa82636ce Mon Sep 17 00:00:00 2001 From: Long Alan Date: Wed, 17 Mar 2021 17:38:44 +0800 Subject: [PATCH 1/3] hidden showCode button when dialog is all & show code for form dialog --- .../src/components/ProjectTree/ProjectTree.tsx | 12 ++++++------ .../src/pages/language-understanding/table-view.tsx | 10 +++++++--- Composer/packages/client/src/router.tsx | 3 --- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx b/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx index c74485b4d3..6c12700264 100644 --- a/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx +++ b/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx @@ -499,12 +499,12 @@ export const ProjectTree: React.FC = ({ : renderTriggerList(dialog.triggers, dialog, projectId, dialogLink, 1); }; - const renderLgImport = (item: LanguageFileImport, projectId: string): React.ReactNode => { + const renderLgImport = (item: LanguageFileImport, projectId: string, dialogId: string): React.ReactNode => { const link: TreeLink = { projectId: rootProjectId, skillId: projectId === rootProjectId ? undefined : projectId, lgFileId: item.id, - dialogId: 'all', + dialogId, displayName: item.displayName ?? item.id, diagnostics: [], isRoot: false, @@ -532,17 +532,17 @@ export const ProjectTree: React.FC = ({ return lgImportsByProjectByDialog[projectId][dialog.id] .filter((lgImport) => filterMatch(dialog.displayName) || filterMatch(lgImport.displayName)) .map((lgImport) => { - return renderLgImport(lgImport, projectId); + return renderLgImport(lgImport, projectId, dialog.id); }); }; - const renderLuImport = (item: LanguageFileImport, projectId: string): React.ReactNode => { + const renderLuImport = (item: LanguageFileImport, projectId: string, dialogId: string): React.ReactNode => { const link: TreeLink = { projectId: rootProjectId, skillId: projectId === rootProjectId ? undefined : projectId, luFileId: item.id, displayName: item.displayName ?? item.id, - dialogId: 'all', + dialogId, diagnostics: [], isRoot: false, isRemote: false, @@ -569,7 +569,7 @@ export const ProjectTree: React.FC = ({ return luImportsByProjectByDialog[projectId][dialog.id] .filter((luImport) => filterMatch(dialog.displayName) || filterMatch(luImport.displayName)) .map((luImport) => { - return renderLuImport(luImport, projectId); + return renderLuImport(luImport, projectId, dialog.id); }); }; 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 13569b24c3..95a222d373 100644 --- a/Composer/packages/client/src/pages/language-understanding/table-view.tsx +++ b/Composer/packages/client/src/pages/language-understanding/table-view.tsx @@ -157,14 +157,18 @@ const TableView: React.FC = (props) => { [defaultLangFile, actualProjectId] ); - const getTemplatesMoreButtons = (item, index): IContextualMenuItem[] => { + const getTemplatesMoreButtons = (item, index, luFileId): IContextualMenuItem[] => { const buttons = [ { key: 'edit', name: formatMessage('Edit'), onClick: () => { const { name, dialogId } = intents[index]; - navigateTo(`${baseURL}language-understanding/${dialogId}/edit?t=${encodeURIComponent(name)}`); + navigateTo( + `${baseURL}language-understanding/${dialogId}${ + luFileId ? `/item/${luFileId}/` : '/' + }edit?t=${encodeURIComponent(name)}` + ); }, }, ]; @@ -373,7 +377,7 @@ const TableView: React.FC = (props) => { menuIconProps={{ iconName: 'MoreVertical' }} menuProps={{ shouldFocusOnMount: true, - items: getTemplatesMoreButtons(item, index), + items: getTemplatesMoreButtons(item, index, luFileId), }} styles={{ menuIcon: { color: NeutralColors.black, fontSize: FontSizes.size16 } }} /> diff --git a/Composer/packages/client/src/router.tsx b/Composer/packages/client/src/router.tsx index 96bf0c8cc8..84e10dbaad 100644 --- a/Composer/packages/client/src/router.tsx +++ b/Composer/packages/client/src/router.tsx @@ -66,13 +66,11 @@ const Routes = (props) => { - - @@ -81,7 +79,6 @@ const Routes = (props) => { - From 1c498502b57dc66996cde1684ab5cc9c056c9055 Mon Sep 17 00:00:00 2001 From: Long Alan Date: Wed, 17 Mar 2021 18:11:04 +0800 Subject: [PATCH 2/3] ci fix --- .../client/src/components/ProjectTree/ProjectTree.tsx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx b/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx index 6c12700264..745cbd8eb5 100644 --- a/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx +++ b/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx @@ -34,6 +34,7 @@ import { ProjectTreeHeader, ProjectTreeHeaderMenuItem } from './ProjectTreeHeade import { isChildTriggerLinkSelected, doesLinkMatch } from './helpers'; import { ProjectHeader } from './ProjectHeader'; import { ProjectTreeOptions, TreeLink, TreeMenuItem } from './types'; +import { dialog } from '../ErrorPopup/styles'; // -------------------- Styles -------------------- // @@ -586,8 +587,12 @@ export const ProjectTree: React.FC = ({ ); const commonLink = options.showCommonLinks ? [renderCommonDialogHeader(projectId, 1)] : []; - const importedLgLinks = options.showLgImports ? lgImportsList.map((file) => renderLgImport(file, projectId)) : []; - const importedLuLinks = options.showLuImports ? luImportsList.map((file) => renderLuImport(file, projectId)) : []; + const importedLgLinks = options.showLgImports + ? lgImportsList.map((file) => renderLgImport(file, projectId, dialog.id)) + : []; + const importedLuLinks = options.showLuImports + ? luImportsList.map((file) => renderLuImport(file, projectId, dialog.id)) + : []; return [ ...commonLink, From 05ce6e21d2a0c3388f0376f2f9bcb11cef62936a Mon Sep 17 00:00:00 2001 From: Long Alan Date: Wed, 17 Mar 2021 18:58:06 +0800 Subject: [PATCH 3/3] lint --- .../packages/client/src/components/ProjectTree/ProjectTree.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx b/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx index 745cbd8eb5..c3f8ae3754 100644 --- a/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx +++ b/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx @@ -26,6 +26,7 @@ import { triggerNotSupported } from '../../utils/dialogValidator'; import { useFeatureFlag } from '../../utils/hooks'; import { LoadingSpinner } from '../LoadingSpinner'; import TelemetryClient from '../../telemetry/TelemetryClient'; +import { dialog } from '../ErrorPopup/styles'; import { TreeItem } from './treeItem'; import { ExpandableNode } from './ExpandableNode'; @@ -34,7 +35,6 @@ import { ProjectTreeHeader, ProjectTreeHeaderMenuItem } from './ProjectTreeHeade import { isChildTriggerLinkSelected, doesLinkMatch } from './helpers'; import { ProjectHeader } from './ProjectHeader'; import { ProjectTreeOptions, TreeLink, TreeMenuItem } from './types'; -import { dialog } from '../ErrorPopup/styles'; // -------------------- Styles -------------------- //