feat: lg naming migration

Composer/packages/extensions/visual-designer/__tests__/transformers/jsonTracker.test.ts

@@ -155,8 +155,8 @@ describe('delete node flow', () => {
       expect(result).toEqual({ foo: {} });
       expect(removedDataFn).toBeCalledWith(dialog.foo.bar);
     });
-    it("removeLgTemplate function should be called when targetNode's $kind is 'Microsoft.SendActivity' && activity includes '[bfdactivity-'", () => {
-      dialog.foo.activityNode = { $kind: 'Microsoft.SendActivity', activity: '[bfdactivity-a]' };
+    it("removeLgTemplate function should be called when targetNode's $kind is 'Microsoft.SendActivity' && activity includes '[SendActivity_'", () => {
+      dialog.foo.activityNode = { $kind: 'Microsoft.SendActivity', activity: '[SendActivity_a]' };
       path = 'foo.activityNode';
       const result = deleteNode(dialog, path, removedDataFn);
 

Composer/packages/extensions/visual-designer/__tests__/transformers/todoBot.main.json

@@ -66,7 +66,7 @@
               "updatedAt": "2019-08-02T22:36:20.947Z",
               "id": "157674"
             },
-            "activity": "[bfdactivity-157674]"
+            "activity": "[SendActivity_157674]"
           }
         ]
       },
@@ -135,7 +135,7 @@
               "updatedAt": "2019-08-01T23:44:57.629Z",
               "id": "696707"
             },
-            "activity": "[bfdactivity-696707]"
+            "activity": "[SendActivity_696707]"
           }
         ],
         "intent": "HelpIntent"

Composer/packages/extensions/visual-designer/demo/src/samples/todo/AddToDo.json

@@ -78,7 +78,7 @@
               "updatedAt": "2019-07-16T20:01:26.980Z",
               "id": "116673"
             },
-            "activity": "[bfdactivity-116673]"
+            "activity": "[SendActivity_116673]"
           }
         ]
       }

Composer/packages/extensions/visual-designer/demo/src/samples/todo/ClearToDos.json

@@ -43,7 +43,7 @@
                 "updatedAt": "2019-07-16T20:01:43.249Z",
                 "id": "832307"
               },
-              "activity": "[bfdactivity-832307]"
+              "activity": "[SendActivity_832307]"
             }
           ],
           "elseActions": [
@@ -54,7 +54,7 @@
                 "updatedAt": "2019-07-16T20:01:47.803Z",
                 "id": "983761"
               },
-              "activity": "[bfdactivity-983761]"
+              "activity": "[SendActivity_983761]"
             }
           ]
         }

Composer/packages/extensions/visual-designer/demo/src/samples/todo/DeleteToDo.json

@@ -68,7 +68,7 @@
                 "updatedAt": "2019-07-16T20:02:14.365Z",
                 "id": "725469"
               },
-              "activity": "[bfdactivity-725469]"
+              "activity": "[SendActivity_725469]"
             }
           ],
           "elseActions": [
@@ -79,7 +79,7 @@
                 "updatedAt": "2019-07-16T20:02:19.199Z",
                 "id": "549615"
               },
-              "activity": "[bfdactivity-549615]"
+              "activity": "[SendActivity_549615]"
             }
           ]
         }

Composer/packages/extensions/visual-designer/demo/src/samples/todo/ShowToDos.json

@@ -33,7 +33,7 @@
                   "id": "339580",
                   "name": "Send an Activity"
                 },
-                "activity": "[bfdactivity-339580]"
+                "activity": "[SendActivity_339580]"
               }
             ],
             "elseActions": [
@@ -45,7 +45,7 @@
                   "id": "662084",
                   "name": "Send an Activity"
                 },
-                "activity": "[bfdactivity-662084]"
+                "activity": "[SendActivity_662084]"
               }
             ]
           }

Composer/packages/extensions/visual-designer/demo/src/samples/todo/ToDoBot.main.json

@@ -66,7 +66,7 @@
               "updatedAt": "2019-08-02T22:36:20.947Z",
               "id": "157674"
             },
-            "activity": "[bfdactivity-157674]"
+            "activity": "[SendActivity_157674]"
           }
         ]
       },
@@ -135,7 +135,7 @@
               "updatedAt": "2019-08-01T23:44:57.629Z",
               "id": "696707"
             },
-            "activity": "[bfdactivity-696707]"
+            "activity": "[SendActivity_696707]"
           }
         ],
         "intent": "HelpIntent"

Composer/packages/lib/code-editor/demo/src/lgEditor.tsx

@@ -45,31 +45,31 @@ const content = `# Hello
 -I can help you yes I can
 -Help, we don't need no stinkin' help!
 
-# bfdactivity-116673
+# SendActivity_116673
 -Successfully added a todo named @{dialog.todo}
 
-# bfdactivity-832307
+# SendActivity_832307
 -Successfully cleared items in the Todo List.
 
-# bfdactivity-983761
+# SendActivity_983761
 -You don't have any items in the Todo List.
 
-# bfdactivity-725469
+# SendActivity_725469
 -Successfully removed a todo named @{dialog.todo}
 
-# bfdactivity-549615
+# SendActivity_549615
 -@{dialog.todo} is not in the Todo List
 
-# bfdactivity-339580
+# SendActivity_339580
 -You have no todos.
 
-# bfdactivity-662084
+# SendActivity_662084
 -@{ShowTodo}
 
-# bfdactivity-696707
+# SendActivity_696707
 -@{help}
 
-# bfdactivity-157674
+# SendActivity_157674
 - Hi! I'm a ToDo bot. Say "add a todo named first" to get started.
 `;
 

Composer/packages/lib/code-editor/demo/src/lgJsonEditor.tsx

@@ -69,31 +69,31 @@ const lgContent = `# Hello
 -I can help you yes I can
 -Help, we don't need no stinkin' help!
 
-# bfdactivity-116673
+# SendActivity_116673
 -Successfully added a todo named {dialog.todo}
 
-# bfdactivity-832307
+# SendActivity_832307
 -Successfully cleared items in the Todo List.
 
-# bfdactivity-983761
+# SendActivity_983761
 -You don't have any items in the Todo List.
 
-# bfdactivity-725469
+# SendActivity_725469
 -Successfully removed a todo named {dialog.todo}
 
-# bfdactivity-549615
+# SendActivity_549615
 -{dialog.todo} is not in the Todo List
 
-# bfdactivity-339580
+# SendActivity_339580
 -You have no todos.
 
-# bfdactivity-662084
+# SendActivity_662084
 -[ShowTodo]
 
-# bfdactivity-696707
+# SendActivity_696707
 -[help]
 
-# bfdactivity-157674
+# SendActivity_157674
 - Hi! I'm a ToDo bot. Say "add a todo named first" to get started.
 `;
 

Composer/packages/lib/shared/__tests__/copyUtils/copyIfCondition.test.ts

@@ -18,7 +18,7 @@ describe('#copyIfCondition', () => {
       elseActions: [
         {
           $kind: 'Microsoft.SendActivity',
-          activity: '[bfdactivity-1234]',
+          activity: '[SendActivity_1234]',
         },
       ],
     };
@@ -44,7 +44,7 @@ describe('#copyIfCondition', () => {
           $designer: {
             id: '5678',
           },
-          activity: '[bfdactivity-1234]',
+          activity: '[SendActivity_1234]',
         },
       ],
     });

Composer/packages/lib/shared/__tests__/copyUtils/copyInputDialog.test.ts

@@ -22,10 +22,10 @@ describe('shallowCopyAdaptiveAction', () => {
       alwaysPrompt: false,
       allowInterruptions: 'true',
       outputFormat: 'none',
-      prompt: '[bfdprompt-1234]',
-      invalidPrompt: '[bfdinvalidPrompt-1234]',
-      unrecognizedPrompt: '[bfdunrecognizedPrompt-1234]',
-      defaultValueResponse: '[bfddefaultValueResponse-1234]',
+      prompt: '[TextInput_Prompt_1234]',
+      invalidPrompt: '[TextInput_InvalidPrompt_1234]',
+      unrecognizedPrompt: '[TextInput_UnrecognizedPrompt_1234]',
+      defaultValueResponse: '[TextInput_DefaultValueResponse_1234]',
     };
 
     expect(await copyInputDialog(promptText as any, externalApiWithLgCopy)).toEqual({
@@ -37,10 +37,10 @@ describe('shallowCopyAdaptiveAction', () => {
       alwaysPrompt: false,
       allowInterruptions: 'true',
       outputFormat: 'none',
-      prompt: '[bfdprompt-1234](copy)',
-      invalidPrompt: '[bfdinvalidPrompt-1234](copy)',
-      unrecognizedPrompt: '[bfdunrecognizedPrompt-1234](copy)',
-      defaultValueResponse: '[bfddefaultValueResponse-1234](copy)',
+      prompt: '[TextInput_Prompt_1234](copy)',
+      invalidPrompt: '[TextInput_InvalidPrompt_1234](copy)',
+      unrecognizedPrompt: '[TextInput_UnrecognizedPrompt_1234](copy)',
+      defaultValueResponse: '[TextInput_DefaultValueResponse_1234](copy)',
     });
   });
 });

Composer/packages/lib/shared/__tests__/copyUtils/copySendActivity.test.ts

@@ -14,13 +14,13 @@ describe('copySendActivity', () => {
   it('can copy SendActivity', async () => {
     const sendActivity = {
       $kind: 'Microsoft.SendActivity',
-      activity: '[bfdactivity-1234]',
+      activity: '[SendActivity_1234]',
     };
 
     expect(await copySendActivity(sendActivity, externalApiWithLgCopy)).toEqual({
       $kind: 'Microsoft.SendActivity',
       $designer: { id: '5678' },
-      activity: '[bfdactivity-1234](copy)',
+      activity: '[SendActivity_1234](copy)',
     });
   });
 });

Composer/packages/lib/shared/__tests__/copyUtils/copySwitchCondition.test.ts

@@ -19,7 +19,7 @@ describe('#copySwitchCondition', () => {
           actions: [
             {
               $kind: 'Microsoft.SendActivity',
-              activity: '[bfdactivity-1234]',
+              activity: '[SendActivity_1234]',
             },
           ],
         },
@@ -73,7 +73,7 @@ describe('#copySwitchCondition', () => {
               $designer: {
                 id: '5678',
               },
-              activity: '[bfdactivity-1234]',
+              activity: '[SendActivity_1234]',
             },
           ],
         },

Composer/packages/lib/shared/__tests__/lgUtils/models/LgMetaData.test.ts

@@ -5,20 +5,20 @@ import { LgMetaData } from '../../../src';
 
 describe('LgMetaData', () => {
   it('can construct an instance via constructor', () => {
-    const instance = new LgMetaData('activity', '123456');
+    const instance = new LgMetaData('SendActivity', '1Xkg4a');
 
-    expect(instance.type).toEqual('activity');
-    expect(instance.designerId).toEqual('123456');
+    expect(instance.type).toEqual('SendActivity');
+    expect(instance.designerId).toEqual('1Xkg4a');
     expect(instance.toString).toBeDefined();
   });
 
   it('can generate correct output strings', () => {
-    const instance = new LgMetaData('activity', '123456');
+    const instance = new LgMetaData('SendActivity', '1Xkg4a');
 
-    expect(instance.toString()).toEqual('bfdactivity-123456');
+    expect(instance.toString()).toEqual('SendActivity_1Xkg4a');
   });
 
   it('can construct instance via `parse()` method', () => {
-    expect(LgMetaData.parse('bfdactivity-123456')).toBeInstanceOf(LgMetaData);
+    expect(LgMetaData.parse('SendActivity_1Xkg4a')).toBeInstanceOf(LgMetaData);
   });
 });

Composer/packages/lib/shared/__tests__/lgUtils/models/LgTemplateRef.test.ts

@@ -37,11 +37,11 @@ describe('LgTemplateRef#', () => {
     });
 
     it('should return LgTemplateRef when inputs are valid', () => {
-      const a = LgTemplateRef.parse('${bfdactivity-123456()}');
-      expect(a).toEqual(new LgTemplateRef('bfdactivity-123456'));
+      const a = LgTemplateRef.parse('${SendActivity_1Xkg4a()}');
+      expect(a).toEqual(new LgTemplateRef('SendActivity_1Xkg4a'));
 
-      const a2 = LgTemplateRef.parse('${bfdactivity-123456()}');
-      expect(a2).toEqual(new LgTemplateRef('bfdactivity-123456'));
+      const a2 = LgTemplateRef.parse('${SendActivity_1Xkg4a()}');
+      expect(a2).toEqual(new LgTemplateRef('SendActivity_1Xkg4a'));
 
       const b = LgTemplateRef.parse('${greeting(1,2)}');
       expect(b).toEqual(new LgTemplateRef('greeting', ['1', '2']));

Composer/packages/lib/shared/__tests__/lgUtils/parsers/parseLgTemplateName.test.ts

@@ -11,9 +11,9 @@ describe('parseLgTemplateName', () => {
   });
 
   it('should return LgMetaData when inputs are valid', () => {
-    const result = parseLgTemplateName('bfdactivity-123456');
+    const result = parseLgTemplateName('SendActivity_1Xkg4a');
     expect(result).toBeInstanceOf(LgMetaData);
-    expect((result as LgMetaData).designerId).toEqual('123456');
-    expect((result as LgMetaData).type).toEqual('activity');
+    expect((result as LgMetaData).designerId).toEqual('1Xkg4a');
+    expect((result as LgMetaData).type).toEqual('SendActivity');
   });
 });

Composer/packages/lib/shared/__tests__/lgUtils/parsers/parseLgTemplateRef.test.ts

@@ -13,8 +13,8 @@ describe('parseLgTemplateRef', () => {
   });
 
   it('should return LgTemplateRef when inputs are valid', () => {
-    const a = parseLgTemplateRef('${bfdactivity-123456()}');
-    expect(a).toEqual(new LgTemplateRef('bfdactivity-123456'));
+    const a = parseLgTemplateRef('${SendActivity_1Xkg4a()}');
+    expect(a).toEqual(new LgTemplateRef('SendActivity_1Xkg4a'));
 
     const b = parseLgTemplateRef('${greeting(1,2)}');
     expect(b).toEqual(new LgTemplateRef('greeting', ['1', '2']));
@@ -24,7 +24,7 @@ describe('parseLgTemplateRef', () => {
 describe('extractLgTemplateRefs', () => {
   it('can extract lg refs from input string', () => {
     expect(extractLgTemplateRefs('Hi')).toEqual([]);
-    expect(extractLgTemplateRefs('${bfdactivity-123456()}')).toEqual([new LgTemplateRef('bfdactivity-123456')]);
+    expect(extractLgTemplateRefs('${SendActivity_1Xkg4a()}')).toEqual([new LgTemplateRef('SendActivity_1Xkg4a')]);
     expect(extractLgTemplateRefs(`-\${Greeting()}, I'm a fancy bot, \${Bye()}`)).toEqual([
       new LgTemplateRef('Greeting'),
       new LgTemplateRef('Bye'),

Composer/packages/lib/shared/src/deleteUtils/index.ts

@@ -40,7 +40,7 @@ const collectLuIntents = (action: any, outputTemplates: string[]) => {
     case SDKKinds.NumberInput:
     case SDKKinds.TextInput: {
       const [, promptType] = action.$kind.split('.');
-      const intentName = `${promptType}.response-${action?.$designer?.id}`;
+      const intentName = `${promptType}_Response_${action?.$designer?.id}`;
       promptType && intentName && outputTemplates.push(intentName);
       break;
     }

Composer/packages/lib/shared/src/lgUtils/models/LgMetaData.ts

@@ -7,7 +7,7 @@ import buildLgTemplateName from '../stringBuilders/buildLgTemplateName';
 import { LgTemplateName } from './stringTypes';
 
 /**
- * LgMetaData can be converted from & to Lg name. Such as 'bfdactivity-1234'.
+ * LgMetaData can be converted from & to Lg name. Such as 'SendActivity_1234'.
  * It's created by Composer, contains designerId and filed type.
  */
 export default class LgMetaData {