From a75a3958fa85bc923f235b630c301be5eb189ec0 Mon Sep 17 00:00:00 2001
From: Weitian Li <weitli@microsoft.com>
Date: Wed, 18 Sep 2019 20:27:11 +0800
Subject: [PATCH 1/9] update dialog trigger json parse

---
 .../packages/server/src/models/bot/indexers/dialogIndexers.ts    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Composer/packages/server/src/models/bot/indexers/dialogIndexers.ts b/Composer/packages/server/src/models/bot/indexers/dialogIndexers.ts
index 9ab7f564bb..0198e31c02 100644
--- a/Composer/packages/server/src/models/bot/indexers/dialogIndexers.ts
+++ b/Composer/packages/server/src/models/bot/indexers/dialogIndexers.ts
@@ -122,6 +122,7 @@ export class DialogIndexer {
             trigers.push(trigger);
           }
         });
+        return true;
       }
       return false;
     };

From 11e1eda037732a9243ea88a5e05ca6c8d17a015d Mon Sep 17 00:00:00 2001
From: Weitian Li <weitli@microsoft.com>
Date: Thu, 19 Sep 2019 14:38:57 +0800
Subject: [PATCH 2/9] fetch event types from schemas

---
 Composer/cypress/support/commands.js          |  4 ++
 .../ProjectTree/TriggerCreationModal.tsx      | 49 +++++++++++++++----
 .../src/components/ProjectTree/styles.ts      |  2 +-
 Composer/packages/client/src/store/types.ts   |  2 +
 .../packages/client/src/utils/dialogUtil.ts   | 22 +++++----
 5 files changed, 59 insertions(+), 20 deletions(-)

diff --git a/Composer/cypress/support/commands.js b/Composer/cypress/support/commands.js
index e351efa57c..a881813908 100644
--- a/Composer/cypress/support/commands.js
+++ b/Composer/cypress/support/commands.js
@@ -70,6 +70,10 @@ Cypress.Commands.add('addEventHandler', handler => {
   cy.getByTestId('AddNewTrigger').click();
   cy.get(`[data-testid="triggerTypeDropDown"]`).click();
   cy.getByText(handler).click();
+  if (handler === 'Handle a Dialog Event') {
+    cy.get(`[data-testid="eventTypeDropDown"]`).click();
+    cy.getByText('consultDialog').click();
+  }
   cy.get('input[data-testid="triggerName"]').type(`__TestTrigger`);
   cy.get(`[data-testid="triggerFormSubmit"]`).click();
 });
diff --git a/Composer/packages/client/src/components/ProjectTree/TriggerCreationModal.tsx b/Composer/packages/client/src/components/ProjectTree/TriggerCreationModal.tsx
index f3053461a6..330a8a88b8 100644
--- a/Composer/packages/client/src/components/ProjectTree/TriggerCreationModal.tsx
+++ b/Composer/packages/client/src/components/ProjectTree/TriggerCreationModal.tsx
@@ -3,23 +3,31 @@ import { Dialog, DialogType } from 'office-ui-fabric-react';
 import formatMessage from 'format-message';
 import { DialogFooter, PrimaryButton, DefaultButton, Stack, TextField, IDropdownOption } from 'office-ui-fabric-react';
 import { Dropdown } from 'office-ui-fabric-react/lib/Dropdown';
+import { get } from 'lodash';
 
 import { addNewTrigger, getTriggerTypes, TriggerFormData, TriggerFormDataErrors } from '../../utils/dialogUtil';
 import { StoreContext } from '../../store';
 import { DialogInfo } from '../../store/types';
 
-import { styles, dropdownStyles, name, dialogWindow, description } from './styles';
+import { styles, dropdownStyles, name, dialogWindow, constraint } from './styles';
+
+const eventTypeKey = 'Microsoft.OnDialogEvent';
+
 const isValidName = name => {
   const nameRegex = /^[a-zA-Z0-9-_.]+$/;
   return nameRegex.test(name);
 };
 const validateForm = (data: TriggerFormData): TriggerFormDataErrors => {
   const errors: TriggerFormDataErrors = {};
-  const { name, $type } = data;
+  const { name, $type, eventType } = data;
   if (!name || !isValidName(name)) {
     errors.name = formatMessage('Spaces and special characters are not allowed. Use letters, numbers, -, or _.');
   }
 
+  if ($type === eventTypeKey && !eventType) {
+    errors.eventType = formatMessage('please select a event type');
+  }
+
   if (!$type) {
     errors.$type = formatMessage('please select a trigger type');
   }
@@ -37,7 +45,8 @@ const initialFormData: TriggerFormData = {
   errors: {},
   $type: '',
   name: '',
-  description: '',
+  constraint: '',
+  eventType: '',
 };
 
 const triggerTypeOptions: IDropdownOption[] = getTriggerTypes();
@@ -46,7 +55,7 @@ export const TriggerCreationModal: React.FC<TriggerCreationModalProps> = props =
   const { isOpen, onDismiss, onSubmit, dialogId } = props;
   const [formData, setFormData] = useState(initialFormData);
   const { state } = useContext(StoreContext);
-  const { dialogs } = state;
+  const { dialogs, schemas } = state;
 
   const onClickSubmitButton = e => {
     e.preventDefault();
@@ -65,16 +74,26 @@ export const TriggerCreationModal: React.FC<TriggerCreationModalProps> = props =
   };
 
   const onSelectTriggerType = (e, option) => {
+    delete formData.eventType;
     setFormData({ ...formData, $type: option.key });
   };
 
+  const onSelectEventType = (e, option) => {
+    setFormData({ ...formData, eventType: option.key });
+  };
+
   const updateForm = field => (e, newValue) => {
     setFormData({
       ...formData,
       [field]: newValue,
     });
   };
-
+  const eventTypes = get(schemas, `sdk.content.definitions.['${eventTypeKey}'].properties.events.items.enum`, []).map(
+    t => {
+      return { key: t, text: t };
+    }
+  );
+  const showEventDropDown = formData.$type === eventTypeKey;
   return (
     <Dialog
       hidden={!isOpen}
@@ -99,6 +118,18 @@ export const TriggerCreationModal: React.FC<TriggerCreationModalProps> = props =
             errorMessage={formData.errors.$type}
             data-testid={'triggerTypeDropDown'}
           />
+
+          {showEventDropDown && (
+            <Dropdown
+              placeholder="select a event type"
+              label="What is the event?"
+              options={eventTypes}
+              styles={dropdownStyles}
+              onChange={onSelectEventType}
+              errorMessage={formData.errors.eventType}
+              data-testid={'eventTypeDropDown'}
+            />
+          )}
           <TextField
             label={formatMessage('What is the name of this trigger?')}
             styles={name}
@@ -107,12 +138,12 @@ export const TriggerCreationModal: React.FC<TriggerCreationModalProps> = props =
             data-testid={'triggerName'}
           />
           <TextField
-            styles={description}
-            label={formatMessage('Description')}
+            styles={constraint}
+            label={formatMessage('Constraint')}
             multiline
             resizable={false}
-            onChange={updateForm('description')}
-            data-testid={'triggerDescription'}
+            onChange={updateForm('constraint')}
+            data-testid={'triggerConstraint'}
           />
         </Stack>
       </div>
diff --git a/Composer/packages/client/src/components/ProjectTree/styles.ts b/Composer/packages/client/src/components/ProjectTree/styles.ts
index 8eb31593ab..0da80fb66e 100644
--- a/Composer/packages/client/src/components/ProjectTree/styles.ts
+++ b/Composer/packages/client/src/components/ProjectTree/styles.ts
@@ -152,6 +152,6 @@ export const name = {
   subComponentStyles: textFieldlabel,
 };
 
-export const description = {
+export const constraint = {
   subComponentStyles: textFieldlabel,
 };
diff --git a/Composer/packages/client/src/store/types.ts b/Composer/packages/client/src/store/types.ts
index b8e4b4318c..2ebc9278fa 100644
--- a/Composer/packages/client/src/store/types.ts
+++ b/Composer/packages/client/src/store/types.ts
@@ -30,6 +30,8 @@ export interface BreadcrumbItem {
 
 export interface BotSchemas {
   editor?: any;
+  sdk?: any;
+  diagnostics?: any[];
 }
 
 export interface State {
diff --git a/Composer/packages/client/src/utils/dialogUtil.ts b/Composer/packages/client/src/utils/dialogUtil.ts
index dcc5894f2e..ef7fb9ebbd 100644
--- a/Composer/packages/client/src/utils/dialogUtil.ts
+++ b/Composer/packages/client/src/utils/dialogUtil.ts
@@ -17,13 +17,15 @@ interface DialogsMap {
 export interface TriggerFormData {
   errors: TriggerFormDataErrors;
   $type: string;
+  eventType: string;
   name: string;
-  description: string;
+  constraint: string;
 }
 
 export interface TriggerFormDataErrors {
   $type?: string;
   name?: string;
+  eventType?: string;
 }
 
 export function getDialog(dialogs: DialogInfo[], dialogId: string) {
@@ -56,9 +58,16 @@ export function getNewDesigner(name: string, description: string) {
 
 export function insert(content, path: string, position: number | undefined, data: TriggerFormData) {
   const current = get(content, path, []);
+  const optionalAttributes: { constraint?: string; events?: string[] } = {};
+  if (data.constraint) {
+    optionalAttributes.constraint = data.constraint;
+  }
+  if (data.eventType) {
+    optionalAttributes.events = [data.eventType];
+  }
   const newStep = {
     $type: data.$type,
-    ...seedNewDialog(data.$type, { name: data.name, description: data.description }),
+    ...seedNewDialog(data.$type, { name: data.name }, optionalAttributes),
   };
 
   const insertAt = typeof position === 'undefined' ? current.length : position;
@@ -100,14 +109,7 @@ export function getTriggerTypes(): IDropdownOption[] {
       text: '',
     },
     ...dialogGroups[DialogGroup.EVENTS].types.map(t => {
-      let name = t as string;
-      const labelOverrides = ConceptLabels[t];
-
-      if (labelOverrides && labelOverrides.title) {
-        name = labelOverrides.title;
-      }
-
-      return { key: t, text: name || t };
+      return { key: t, text: ConceptLabels[t].title };
     }),
   ];
   return triggerTypes;

From aea3258b00dc3eacc7e74e5b7096ccfb341b60df Mon Sep 17 00:00:00 2001
From: Weitian Li <weitli@microsoft.com>
Date: Thu, 19 Sep 2019 15:53:05 +0800
Subject: [PATCH 3/9] get constant from appschema

---
 .../components/ProjectTree/TriggerCreationModal.tsx    | 10 +++++++---
 Composer/packages/client/src/utils/dialogUtil.ts       |  4 +++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Composer/packages/client/src/components/ProjectTree/TriggerCreationModal.tsx b/Composer/packages/client/src/components/ProjectTree/TriggerCreationModal.tsx
index 330a8a88b8..4a89404dee 100644
--- a/Composer/packages/client/src/components/ProjectTree/TriggerCreationModal.tsx
+++ b/Composer/packages/client/src/components/ProjectTree/TriggerCreationModal.tsx
@@ -5,14 +5,18 @@ import { DialogFooter, PrimaryButton, DefaultButton, Stack, TextField, IDropdown
 import { Dropdown } from 'office-ui-fabric-react/lib/Dropdown';
 import { get } from 'lodash';
 
-import { addNewTrigger, getTriggerTypes, TriggerFormData, TriggerFormDataErrors } from '../../utils/dialogUtil';
+import {
+  addNewTrigger,
+  getTriggerTypes,
+  TriggerFormData,
+  TriggerFormDataErrors,
+  eventTypeKey,
+} from '../../utils/dialogUtil';
 import { StoreContext } from '../../store';
 import { DialogInfo } from '../../store/types';
 
 import { styles, dropdownStyles, name, dialogWindow, constraint } from './styles';
 
-const eventTypeKey = 'Microsoft.OnDialogEvent';
-
 const isValidName = name => {
   const nameRegex = /^[a-zA-Z0-9-_.]+$/;
   return nameRegex.test(name);
diff --git a/Composer/packages/client/src/utils/dialogUtil.ts b/Composer/packages/client/src/utils/dialogUtil.ts
index ef7fb9ebbd..13b6d46a66 100644
--- a/Composer/packages/client/src/utils/dialogUtil.ts
+++ b/Composer/packages/client/src/utils/dialogUtil.ts
@@ -1,5 +1,5 @@
 import { get, set, cloneDeep } from 'lodash';
-import { ConceptLabels, seedNewDialog, dialogGroups, DialogGroup } from 'shared-menus';
+import { ConceptLabels, seedNewDialog, dialogGroups, DialogGroup, SDKTypes } from 'shared-menus';
 import { ExpressionEngine } from 'botbuilder-expression-parser';
 import nanoid from 'nanoid/generate';
 import { IDropdownOption } from 'office-ui-fabric-react';
@@ -33,6 +33,8 @@ export function getDialog(dialogs: DialogInfo[], dialogId: string) {
   return cloneDeep(dialog);
 }
 
+export const eventTypeKey = SDKTypes.OnDialogEvent;
+
 export function getFriendlyName(data) {
   if (get(data, '$designer.name')) {
     return get(data, '$designer.name');

From ba009a2b074dcd00198554c64601720650d7e7c9 Mon Sep 17 00:00:00 2001
From: Weitian Li <weitli@microsoft.com>
Date: Thu, 19 Sep 2019 16:03:13 +0800
Subject: [PATCH 4/9] fix conflict

---
 .../packages/lib/shared-menus/src/dialogFactory.ts  | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/Composer/packages/lib/shared-menus/src/dialogFactory.ts b/Composer/packages/lib/shared-menus/src/dialogFactory.ts
index 9768f86e90..709eade63b 100644
--- a/Composer/packages/lib/shared-menus/src/dialogFactory.ts
+++ b/Composer/packages/lib/shared-menus/src/dialogFactory.ts
@@ -2,7 +2,11 @@ import nanoid from 'nanoid/generate';
 
 interface DesignerAttributes {
   name?: string;
-  description?: string;
+}
+
+interface OptionalAttributes {
+  constraint?: string;
+  events?: string[];
 }
 
 const initialDialogShape = {
@@ -12,12 +16,17 @@ const initialDialogShape = {
   },
 };
 
-export const seedNewDialog = ($type: string, designerAttributes: DesignerAttributes): object => {
+export const seedNewDialog = (
+  $type: string,
+  designerAttributes: DesignerAttributes,
+  optionalAttributes?: OptionalAttributes
+): object => {
   return {
     $designer: {
       id: nanoid('1234567890', 6),
       ...designerAttributes,
     },
+    ...optionalAttributes,
     ...(initialDialogShape[$type] || {}),
   };
 };

From 8371b2f7d8275356363696b8f15da80d3bce86d9 Mon Sep 17 00:00:00 2001
From: Weitian Li <weitli@microsoft.com>
Date: Thu, 19 Sep 2019 16:33:12 +0800
Subject: [PATCH 5/9] fix conflict

---
 Composer/cypress/integration/VisualDesigner.spec.js | 8 ++++----
 Composer/packages/client/src/utils/dialogUtil.ts    | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Composer/cypress/integration/VisualDesigner.spec.js b/Composer/cypress/integration/VisualDesigner.spec.js
index d77fafec8e..96d7acd1c9 100644
--- a/Composer/cypress/integration/VisualDesigner.spec.js
+++ b/Composer/cypress/integration/VisualDesigner.spec.js
@@ -12,28 +12,28 @@ context('Visual Designer', () => {
     cy.wait(100);
 
     cy.withinEditor('VisualEditor', () => {
-      cy.contains('Handle a Dialog Event').should('exist');
+      cy.contains('Microsoft.OnDialogEvent').should('exist');
     });
 
     cy.addEventHandler('Handle an Intent');
     cy.wait(100);
 
     cy.withinEditor('VisualEditor', () => {
-      cy.contains('Handle an Intent').should('exist');
+      cy.contains('Microsoft.OnIntent').should('exist');
     });
 
     cy.addEventHandler('Handle Unknown Intent');
     cy.wait(100);
 
     cy.withinEditor('VisualEditor', () => {
-      cy.contains('Handle Unknown Intent').should('exist');
+      cy.contains('Microsoft.OnUnknownIntent').should('exist');
     });
 
     cy.addEventHandler('Handle ConversationUpdate');
     cy.wait(100);
 
     cy.withinEditor('VisualEditor', () => {
-      cy.contains('Handle ConversationUpdate').should('exist');
+      cy.contains('Microsoft.OnConversationUpdateActivity').should('exist');
     });
   });
 });
diff --git a/Composer/packages/client/src/utils/dialogUtil.ts b/Composer/packages/client/src/utils/dialogUtil.ts
index 13b6d46a66..334737ffd8 100644
--- a/Composer/packages/client/src/utils/dialogUtil.ts
+++ b/Composer/packages/client/src/utils/dialogUtil.ts
@@ -33,7 +33,7 @@ export function getDialog(dialogs: DialogInfo[], dialogId: string) {
   return cloneDeep(dialog);
 }
 
-export const eventTypeKey = SDKTypes.OnDialogEvent;
+export const eventTypeKey: string = SDKTypes.OnDialogEvent;
 
 export function getFriendlyName(data) {
   if (get(data, '$designer.name')) {
@@ -111,7 +111,7 @@ export function getTriggerTypes(): IDropdownOption[] {
       text: '',
     },
     ...dialogGroups[DialogGroup.EVENTS].types.map(t => {
-      return { key: t, text: ConceptLabels[t].title };
+      return { key: String(t), text: ConceptLabels[String(t)].title };
     }),
   ];
   return triggerTypes;

From 27989b8e5ca1d232f28a6fa74b8152e56eda5293 Mon Sep 17 00:00:00 2001
From: Weitian Li <weitli@microsoft.com>
Date: Thu, 19 Sep 2019 17:28:17 +0800
Subject: [PATCH 6/9] fix test case

---
 Composer/cypress/integration/VisualDesigner.spec.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Composer/cypress/integration/VisualDesigner.spec.js b/Composer/cypress/integration/VisualDesigner.spec.js
index 96d7acd1c9..e5248dd32b 100644
--- a/Composer/cypress/integration/VisualDesigner.spec.js
+++ b/Composer/cypress/integration/VisualDesigner.spec.js
@@ -12,7 +12,7 @@ context('Visual Designer', () => {
     cy.wait(100);
 
     cy.withinEditor('VisualEditor', () => {
-      cy.contains('Microsoft.OnDialogEvent').should('exist');
+      cy.contains('Handle an Intent').should('exist');
     });
 
     cy.addEventHandler('Handle an Intent');
@@ -26,14 +26,14 @@ context('Visual Designer', () => {
     cy.wait(100);
 
     cy.withinEditor('VisualEditor', () => {
-      cy.contains('Microsoft.OnUnknownIntent').should('exist');
+      cy.contains('Handle Unknown Intent').should('exist');
     });
 
     cy.addEventHandler('Handle ConversationUpdate');
     cy.wait(100);
 
     cy.withinEditor('VisualEditor', () => {
-      cy.contains('Microsoft.OnConversationUpdateActivity').should('exist');
+      cy.contains('Handle ConversationUpdate').should('exist');
     });
   });
 });

From 27fb84472d94d97f1acf5c392586b395cf49b755 Mon Sep 17 00:00:00 2001
From: Weitian Li <weitli@microsoft.com>
Date: Thu, 19 Sep 2019 17:29:27 +0800
Subject: [PATCH 7/9] fix test case

---
 Composer/cypress/integration/VisualDesigner.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Composer/cypress/integration/VisualDesigner.spec.js b/Composer/cypress/integration/VisualDesigner.spec.js
index e5248dd32b..d77fafec8e 100644
--- a/Composer/cypress/integration/VisualDesigner.spec.js
+++ b/Composer/cypress/integration/VisualDesigner.spec.js
@@ -12,14 +12,14 @@ context('Visual Designer', () => {
     cy.wait(100);
 
     cy.withinEditor('VisualEditor', () => {
-      cy.contains('Handle an Intent').should('exist');
+      cy.contains('Handle a Dialog Event').should('exist');
     });
 
     cy.addEventHandler('Handle an Intent');
     cy.wait(100);
 
     cy.withinEditor('VisualEditor', () => {
-      cy.contains('Microsoft.OnIntent').should('exist');
+      cy.contains('Handle an Intent').should('exist');
     });
 
     cy.addEventHandler('Handle Unknown Intent');

From 6cb2914c7ff6f0cef67f19c15a67e6c421d574be Mon Sep 17 00:00:00 2001
From: Weitian Li <weitli@microsoft.com>
Date: Thu, 19 Sep 2019 18:25:24 +0800
Subject: [PATCH 8/9] fix test case

---
 Composer/packages/client/src/utils/dialogUtil.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Composer/packages/client/src/utils/dialogUtil.ts b/Composer/packages/client/src/utils/dialogUtil.ts
index 334737ffd8..20a7efb5bb 100644
--- a/Composer/packages/client/src/utils/dialogUtil.ts
+++ b/Composer/packages/client/src/utils/dialogUtil.ts
@@ -111,7 +111,14 @@ export function getTriggerTypes(): IDropdownOption[] {
       text: '',
     },
     ...dialogGroups[DialogGroup.EVENTS].types.map(t => {
-      return { key: String(t), text: ConceptLabels[String(t)].title };
+      let name = t as string;
+      const labelOverrides = ConceptLabels[t];
+
+      if (labelOverrides && labelOverrides.title) {
+        name = labelOverrides.title;
+      }
+
+      return { key: t, text: name || t };
     }),
   ];
   return triggerTypes;

From fe9a767d4c0fee49cd0732eef614dbf866bbdafe Mon Sep 17 00:00:00 2001
From: Weitian Li <weitli@microsoft.com>
Date: Fri, 20 Sep 2019 21:08:00 +0800
Subject: [PATCH 9/9] handle comments

---
 Composer/packages/lib/shared-menus/src/appschema.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Composer/packages/lib/shared-menus/src/appschema.ts b/Composer/packages/lib/shared-menus/src/appschema.ts
index 7cf26d6a1b..8830ae18ee 100644
--- a/Composer/packages/lib/shared-menus/src/appschema.ts
+++ b/Composer/packages/lib/shared-menus/src/appschema.ts
@@ -167,11 +167,11 @@ export const dialogGroups: DialogGroupsMap = {
   [DialogGroup.EVENTS]: {
     label: 'Events',
     types: [
-      SDKTypes.OnDialogEvent,
       SDKTypes.OnIntent,
       SDKTypes.OnUnknownIntent,
       SDKTypes.OnConversationUpdateActivity,
       SDKTypes.OnBeginDialog,
+      SDKTypes.OnDialogEvent,
     ],
   },
   [DialogGroup.ADVANCED_EVENTS]: {