feat: Remove input LU when deconstructing prompts (#2180)

* feat: Remove input LU when deconstructing prompts * Fixed lint issue Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>
microsoft · Mar 6, 2020 · ae6111e · ae6111e
1 parent c17b59e
commit ae6111e
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 10 deletions.
diff --git a/Composer/packages/extensions/visual-designer/src/editors/ObiEditor.tsx b/Composer/packages/extensions/visual-designer/src/editors/ObiEditor.tsx
@@ -44,7 +44,7 @@ export const ObiEditor: FC<ObiEditorProps> = ({
 }): JSX.Element | null => {
   let divRef;
 
-  const { focusedId, focusedEvent, clipboardActions, copyLgTemplate, removeLgTemplates } = useContext(
+  const { focusedId, focusedEvent, clipboardActions, copyLgTemplate, removeLgTemplates, removeLuIntent } = useContext(
     NodeRendererContext
   );
 
@@ -59,6 +59,10 @@ export const ObiEditor: FC<ObiEditorProps> = ({
     return removeLgTemplates(lgFileId, normalizedLgTemplates);
   };
 
+  const deleteLuIntents = (luIntents: string[]) => {
+    return Promise.all(luIntents.map(intent => removeLuIntent(path, intent)));
+  };
+
   const dispatchEvent = (eventName: NodeEventTypes, eventData: any): any => {
     let handler;
     switch (eventName) {
@@ -80,7 +84,7 @@ export const ObiEditor: FC<ObiEditorProps> = ({
         break;
       case NodeEventTypes.Delete:
         handler = e => {
-          onChange(deleteNode(data, e.id, node => deleteAction(node, deleteLgTemplates)));
+          onChange(deleteNode(data, e.id, node => deleteAction(node, deleteLgTemplates, deleteLuIntents)));
           onFocusSteps([]);
         };
         break;
@@ -138,7 +142,9 @@ export const ObiEditor: FC<ObiEditorProps> = ({
         break;
       case NodeEventTypes.DeleteSelection:
         handler = e => {
-          const dialog = deleteNodes(data, e.actionIds, nodes => deleteActions(nodes, deleteLgTemplates));
+          const dialog = deleteNodes(data, e.actionIds, nodes =>
+            deleteActions(nodes, deleteLgTemplates, deleteLuIntents)
+          );
           onChange(dialog);
           onFocusSteps([]);
         };

diff --git a/Composer/packages/extensions/visual-designer/src/index.tsx b/Composer/packages/extensions/visual-designer/src/index.tsx
@@ -62,6 +62,7 @@ const VisualDesigner: React.FC<VisualDesignerProps> = ({
     copyLgTemplate,
     removeLgTemplate,
     removeLgTemplates,
+    removeLuIntent,
     undo,
     redo,
   } = shellApi;
@@ -78,6 +79,7 @@ const VisualDesigner: React.FC<VisualDesignerProps> = ({
     copyLgTemplate,
     removeLgTemplate,
     removeLgTemplates,
+    removeLuIntent,
   };
 
   return (

diff --git a/Composer/packages/extensions/visual-designer/src/store/NodeRendererContext.ts b/Composer/packages/extensions/visual-designer/src/store/NodeRendererContext.ts
@@ -9,7 +9,8 @@ type ShellApiFuncs =
   | 'copyLgTemplate'
   | 'removeLgTemplate'
   | 'removeLgTemplates'
-  | 'updateLgTemplate';
+  | 'updateLgTemplate'
+  | 'removeLuIntent';
 
 interface NodeRendererContextValue extends Pick<ShellApi, ShellApiFuncs> {
   focusedId?: string;
@@ -28,4 +29,5 @@ export const NodeRendererContext = React.createContext<NodeRendererContextValue>
   removeLgTemplate: () => Promise.resolve(),
   removeLgTemplates: () => Promise.resolve(),
   updateLgTemplate: () => Promise.resolve(),
+  removeLuIntent: () => Promise.resolve(),
 });
diff --git a/Composer/packages/lib/shared/src/deleteUtils/index.ts b/Composer/packages/lib/shared/src/deleteUtils/index.ts
@@ -25,19 +25,51 @@ const collectLgTemplates = (action: any, outputTemplates: string[]) => {
   }
 };
 
-export const deleteAdaptiveAction = (data: MicrosoftIDialog, deleteLgTemplates: (lgTemplates: string[]) => any) => {
+const collectLuIntents = (action: any, outputTemplates: string[]) => {
+  if (typeof action === 'string') return;
+  if (!action || !action.$type) return;
+
+  switch (action.$type) {
+    case SDKTypes.AttachmentInput:
+    case SDKTypes.ChoiceInput:
+    case SDKTypes.ConfirmInput:
+    case SDKTypes.DateTimeInput:
+    case SDKTypes.NumberInput:
+    case SDKTypes.TextInput: {
+      const [, promptType] = action.$type.split('.');
+      const intentName = `${promptType}.response-${action?.$designer?.id}`;
+      promptType && intentName && outputTemplates.push(intentName);
+      break;
+    }
+  }
+};
+
+export const deleteAdaptiveAction = (
+  data: MicrosoftIDialog,
+  deleteLgTemplates: (lgTemplates: string[]) => any,
+  deleteLuIntents: (luIntents: string[]) => any
+) => {
   const lgTemplates: string[] = [];
+  const luIntents: string[] = [];
+
   walkAdaptiveAction(data, action => collectLgTemplates(action, lgTemplates));
+  walkAdaptiveAction(data, action => collectLuIntents(action, luIntents));
 
   deleteLgTemplates(lgTemplates.filter(activity => !!activity));
+  deleteLuIntents(luIntents);
 };
 
 export const deleteAdaptiveActionList = (
   data: MicrosoftIDialog[],
-  deleteLgTemplates: (lgTemplates: string[]) => any
+  deleteLgTemplates: (lgTemplates: string[]) => any,
+  deleteLuIntents: (luIntents: string[]) => any
 ) => {
   const lgTemplates: string[] = [];
+  const luIntents: string[] = [];
+
   walkAdaptiveActionList(data, action => collectLgTemplates(action, lgTemplates));
+  walkAdaptiveAction(data, action => collectLuIntents(action, luIntents));
 
   deleteLgTemplates(lgTemplates.filter(activity => !!activity));
+  deleteLuIntents(luIntents);
 };
diff --git a/Composer/packages/lib/shared/src/dialogFactory.ts b/Composer/packages/lib/shared/src/dialogFactory.ts
@@ -118,12 +118,20 @@ export const deepCopyAction = async (
   });
 };
 
-export const deleteAction = (data: MicrosoftIDialog, deleteLgTemplates: (templates: string[]) => any) => {
-  return deleteAdaptiveAction(data, deleteLgTemplates);
+export const deleteAction = (
+  data: MicrosoftIDialog,
+  deleteLgTemplates: (templates: string[]) => any,
+  deleteLuIntents: (luIntents: string[]) => any
+) => {
+  return deleteAdaptiveAction(data, deleteLgTemplates, deleteLuIntents);
 };
 
-export const deleteActions = (inputs: MicrosoftIDialog[], deleteLgTemplates: (templates: string[]) => any) => {
-  return deleteAdaptiveActionList(inputs, deleteLgTemplates);
+export const deleteActions = (
+  inputs: MicrosoftIDialog[],
+  deleteLgTemplates: (templates: string[]) => any,
+  deleteLuIntents: (luIntents: string[]) => any
+) => {
+  return deleteAdaptiveActionList(inputs, deleteLgTemplates, deleteLuIntents);
 };
 
 export const seedNewDialog = (