fix duplicate key bug in breadcrumbs

microsoft · Nov 2, 2020 · 5f9d19a · 5f9d19a
1 parent be78ab3
commit 5f9d19a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 308 deletions.
diff --git a/Composer/packages/client/src/pages/design/DesignPage.tsx b/Composer/packages/client/src/pages/design/DesignPage.tsx
@@ -63,6 +63,7 @@ import { VisualEditor } from './VisualEditor';
 import { PropertyEditor } from './PropertyEditor';
 
 type BreadcrumbItem = {
+  key: string;
   label: string;
   link: Partial<TreeLink>;
   onClick?: () => void;
@@ -257,13 +258,15 @@ const DesignPage: React.FC<RouteComponentProps<{ dialogId: string; projectId: st
     const breadcrumbArray: Array<BreadcrumbItem> = [];
     if (dialogId != null) {
       breadcrumbArray.push({
+        key: 'dialog-' + parentLink?.dialogId,
         label: parentLink?.displayName ?? link.displayName,
         link: { skillId: skillId ?? projectId, dialogId },
         onClick: () => navTo(skillId ?? projectId, dialogId),
       });
     }
     if (trigger != null) {
       breadcrumbArray.push({
+        key: 'trigger-' + parentLink?.trigger,
         label: link.displayName,
         link: { skillId: skillId ?? projectId, dialogId, trigger },
         onClick: () => selectTo(skillId ?? null, dialogId ?? null, `triggers[${trigger}]`),
@@ -468,14 +471,13 @@ const DesignPage: React.FC<RouteComponentProps<{ dialogId: string; projectId: st
 
   const createBreadcrumbItem: (breadcrumb: BreadcrumbItem) => IBreadcrumbItem = (breadcrumb: BreadcrumbItem) => {
     return {
-      key: breadcrumb.label,
+      key: breadcrumb.key,
       text: breadcrumb.label,
       onClick: () => breadcrumb.onClick?.(),
     };
   };
 
   const items = breadcrumbs.map(createBreadcrumbItem);
-  console.log(items);
 
   const breadcrumbItems = (
     <div style={{ display: 'flex', justifyContent: 'space-between', height: '65px' }}>