From 3e8b7bdc769990b8a26637b1c37565789c39f4d4 Mon Sep 17 00:00:00 2001
From: Weitian Li <weitli@microsoft.com>
Date: Thu, 17 Oct 2019 17:24:27 +0800
Subject: [PATCH 1/3] trigger align with the new schema

---
 .../ProjectTree/TriggerCreationModal.tsx      | 48 ++++++++++++++-----
 .../src/components/ProjectTree/styles.ts      |  3 +-
 .../packages/client/src/utils/dialogUtil.ts   | 35 ++++++++++++++
 Composer/packages/lib/shared/src/viewUtils.ts | 12 +++--
 4 files changed, 83 insertions(+), 15 deletions(-)

diff --git a/Composer/packages/client/src/components/ProjectTree/TriggerCreationModal.tsx b/Composer/packages/client/src/components/ProjectTree/TriggerCreationModal.tsx
index 9ed6a81a59..098d2d1046 100644
--- a/Composer/packages/client/src/components/ProjectTree/TriggerCreationModal.tsx
+++ b/Composer/packages/client/src/components/ProjectTree/TriggerCreationModal.tsx
@@ -1,10 +1,9 @@
 import React, { useState, useContext } from 'react';
 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 { DialogFooter, PrimaryButton, DefaultButton, Stack, IDropdownOption } from 'office-ui-fabric-react';
 import { Dropdown } from 'office-ui-fabric-react/lib/Dropdown';
 import { get } from 'lodash';
-import { appschema } from 'shared';
 
 import {
   addNewTrigger,
@@ -13,11 +12,14 @@ import {
   TriggerFormDataErrors,
   eventTypeKey,
   intentTypeKey,
+  activityTypeKey,
+  getEventTypes,
+  getActivityTypes,
 } from '../../utils/dialogUtil';
 import { StoreContext } from '../../store';
 import { DialogInfo } from '../../store/types';
 
-import { styles, dropdownStyles, intent, dialogWindow } from './styles';
+import { styles, dropdownStyles, dialogWindow } from './styles';
 
 const isValidName = name => {
   const nameRegex = /^[a-zA-Z0-9-_.]+$/;
@@ -25,12 +27,16 @@ const isValidName = name => {
 };
 const validateForm = (data: TriggerFormData): TriggerFormDataErrors => {
   const errors: TriggerFormDataErrors = {};
-  const { $type, eventType } = data;
+  const { $type, eventType, activityType } = data;
 
   if ($type === eventTypeKey && !eventType) {
     errors.eventType = formatMessage('please select a event type');
   }
 
+  if ($type === activityTypeKey && !activityType) {
+    errors.activityType = formatMessage('please select an activity type');
+  }
+
   if (!$type) {
     errors.$type = formatMessage('please select a trigger type');
   }
@@ -49,6 +55,7 @@ const initialFormData: TriggerFormData = {
   $type: intentTypeKey,
   intent: '',
   eventType: '',
+  activityType: '',
 };
 
 const triggerTypeOptions: IDropdownOption[] = getTriggerTypes();
@@ -59,7 +66,10 @@ export const TriggerCreationModal: React.FC<TriggerCreationModalProps> = props =
   const { state } = useContext(StoreContext);
   const { dialogs, luFiles } = state;
   const luFile = luFiles.find(lu => lu.id === dialogId);
+<<<<<<< HEAD
   const dialogFile = dialogs.find(dialog => dialog.id === dialogId);
+=======
+>>>>>>> trigger align with the new schema
 
   const onClickSubmitButton = e => {
     e.preventDefault();
@@ -78,8 +88,9 @@ export const TriggerCreationModal: React.FC<TriggerCreationModalProps> = props =
   };
 
   const onSelectTriggerType = (e, option) => {
-    delete formData.eventType;
-    setFormData({ ...formData, $type: option.key });
+    // delete formData.eventType;
+    // delete formData.activityType;
+    setFormData({ ...initialFormData, $type: option.key });
   };
 
   const onSelectEventType = (e, option) => {
@@ -90,16 +101,18 @@ export const TriggerCreationModal: React.FC<TriggerCreationModalProps> = props =
     setFormData({ ...formData, intent: option.key });
   };
 
-  const updateForm = field => (e, newValue) => {
-    setFormData({
-      ...formData,
-      [field]: newValue,
-    });
+  const onSelectActivityType = (e, option) => {
+    setFormData({ ...formData, activityType: option.key });
   };
 
+<<<<<<< HEAD
   const eventTypes = get(appschema, `definitions.['${eventTypeKey}'].properties.event.enum`, []).map(t => {
     return { key: t, text: t };
   });
+=======
+  const eventTypes: IDropdownOption[] = getEventTypes();
+  const activityTypes: IDropdownOption[] = getActivityTypes();
+>>>>>>> trigger align with the new schema
 
   const regexIntents = get(dialogFile, 'content.recognizer.intents', []);
   const luisIntents = get(luFile, 'parsedContent.LUISJsonStructure.intents', []);
@@ -111,6 +124,8 @@ export const TriggerCreationModal: React.FC<TriggerCreationModalProps> = props =
 
   const showEventDropDown = formData.$type === eventTypeKey;
   const showIntentDropDown = formData.$type === intentTypeKey;
+  const showActivityDropDown = formData.$type === activityTypeKey;
+
   return (
     <Dialog
       hidden={!isOpen}
@@ -148,6 +163,17 @@ export const TriggerCreationModal: React.FC<TriggerCreationModalProps> = props =
               data-testid={'eventTypeDropDown'}
             />
           )}
+          {showActivityDropDown && (
+            <Dropdown
+              placeholder="select an activity type"
+              label="Which activity?"
+              options={activityTypes}
+              styles={dropdownStyles}
+              onChange={onSelectActivityType}
+              errorMessage={formData.errors.activityType}
+              data-testid={'activityTypeDropDown'}
+            />
+          )}
           {showIntentDropDown && (
             <Dropdown
               label={formatMessage('Which intent do you want to handle?')}
diff --git a/Composer/packages/client/src/components/ProjectTree/styles.ts b/Composer/packages/client/src/components/ProjectTree/styles.ts
index f4c800d88a..e7efa4dcdd 100644
--- a/Composer/packages/client/src/components/ProjectTree/styles.ts
+++ b/Composer/packages/client/src/components/ProjectTree/styles.ts
@@ -138,8 +138,9 @@ export const dropdownStyles = {
 
 export const dialogWindow = css`
   display: flex;
-  width: 400px;
   flex-direction: column;
+  width: 400px;
+  height: 250px;
 `;
 
 export const textFieldlabel = {
diff --git a/Composer/packages/client/src/utils/dialogUtil.ts b/Composer/packages/client/src/utils/dialogUtil.ts
index 17cb9f6ecc..70555cd27d 100644
--- a/Composer/packages/client/src/utils/dialogUtil.ts
+++ b/Composer/packages/client/src/utils/dialogUtil.ts
@@ -19,12 +19,14 @@ export interface TriggerFormData {
   $type: string;
   eventType: string;
   intent: string;
+  activityType: string;
 }
 
 export interface TriggerFormDataErrors {
   $type?: string;
   eventType?: string;
   intent?: string;
+  activityType?: string;
 }
 
 export function getDialog(dialogs: DialogInfo[], dialogId: string) {
@@ -34,6 +36,7 @@ export function getDialog(dialogs: DialogInfo[], dialogId: string) {
 
 export const eventTypeKey: string = SDKTypes.OnDialogEvent;
 export const intentTypeKey: string = SDKTypes.OnIntent;
+export const activityTypeKey: string = SDKTypes.OnActivity;
 
 export function getFriendlyName(data) {
   if (get(data, '$designer.name')) {
@@ -116,6 +119,38 @@ export function getTriggerTypes(): IDropdownOption[] {
   return triggerTypes;
 }
 
+export function getEventTypes(): IDropdownOption[] {
+  const eventTypes: IDropdownOption[] = [
+    ...dialogGroups[DialogGroup.DIALOG_EVENT_TYPES].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 eventTypes;
+}
+
+export function getActivityTypes(): IDropdownOption[] {
+  const activityTypes: IDropdownOption[] = [
+    ...dialogGroups[DialogGroup.ADVANCED_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 activityTypes;
+}
+
 export function getDialogsMap(dialogs: DialogInfo[]): DialogsMap {
   return dialogs.reduce((result, dialog) => {
     result[dialog.id] = dialog.content;
diff --git a/Composer/packages/lib/shared/src/viewUtils.ts b/Composer/packages/lib/shared/src/viewUtils.ts
index f42ec1a136..e60babcec4 100644
--- a/Composer/packages/lib/shared/src/viewUtils.ts
+++ b/Composer/packages/lib/shared/src/viewUtils.ts
@@ -23,6 +23,7 @@ export enum DialogGroup {
   LOG = 'LOG',
   EVENTS = 'EVENTS',
   ADVANCED_EVENTS = 'ADVANCED_EVENTS',
+  DIALOG_EVENT_TYPES = 'DIALOG_EVENT_TYPES',
   RECOGNIZER = 'RECOGNIZER',
   SELECTOR = 'SELECTOR',
   OTHER = 'OTHER',
@@ -89,15 +90,20 @@ export const dialogGroups: DialogGroupsMap = {
     types: [
       SDKTypes.OnIntent,
       SDKTypes.OnUnknownIntent,
-      SDKTypes.OnConversationUpdateActivity,
-      SDKTypes.OnBeginDialog,
       SDKTypes.OnDialogEvent,
+      SDKTypes.OnActivity,
+      SDKTypes.OnCustomEvent,
     ],
   },
+  [DialogGroup.DIALOG_EVENT_TYPES]: {
+    label: 'OnDialogEvents Types',
+    types: [SDKTypes.OnBeginDialog, SDKTypes.OnCancelDialog, SDKTypes.OnError, SDKTypes.OnRepromptDialog],
+  },
   [DialogGroup.ADVANCED_EVENTS]: {
     label: 'Advanced Events',
     types: [
-      SDKTypes.OnActivity,
+      SDKTypes.OnConversationUpdateActivity,
+      SDKTypes.OnEndOfConversationActivity,
       SDKTypes.OnEventActivity,
       SDKTypes.OnHandoffActivity,
       SDKTypes.OnInvokeActivity,

From 550738d34df5102c7b002da3d5b2e3694452bafb Mon Sep 17 00:00:00 2001
From: Weitian Li <weitli@microsoft.com>
Date: Fri, 18 Oct 2019 12:50:51 +0800
Subject: [PATCH 2/3] align with new schema

---
 .../ProjectTree/TriggerCreationModal.tsx      | 35 ++++++++-----------
 .../packages/client/src/utils/dialogUtil.ts   | 12 +++----
 .../packages/lib/shared/src/dialogFactory.ts  |  2 +-
 3 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/Composer/packages/client/src/components/ProjectTree/TriggerCreationModal.tsx b/Composer/packages/client/src/components/ProjectTree/TriggerCreationModal.tsx
index 098d2d1046..c2836a4039 100644
--- a/Composer/packages/client/src/components/ProjectTree/TriggerCreationModal.tsx
+++ b/Composer/packages/client/src/components/ProjectTree/TriggerCreationModal.tsx
@@ -27,14 +27,14 @@ const isValidName = name => {
 };
 const validateForm = (data: TriggerFormData): TriggerFormDataErrors => {
   const errors: TriggerFormDataErrors = {};
-  const { $type, eventType, activityType } = data;
+  const { $type, specifiedType } = data;
 
-  if ($type === eventTypeKey && !eventType) {
-    errors.eventType = formatMessage('please select a event type');
+  if ($type === eventTypeKey && !specifiedType) {
+    errors.specifiedType = formatMessage('please select a event type');
   }
 
-  if ($type === activityTypeKey && !activityType) {
-    errors.activityType = formatMessage('please select an activity type');
+  if ($type === activityTypeKey && !specifiedType) {
+    errors.specifiedType = formatMessage('please select an activity type');
   }
 
   if (!$type) {
@@ -54,8 +54,7 @@ const initialFormData: TriggerFormData = {
   errors: {},
   $type: intentTypeKey,
   intent: '',
-  eventType: '',
-  activityType: '',
+  specifiedType: '',
 };
 
 const triggerTypeOptions: IDropdownOption[] = getTriggerTypes();
@@ -88,21 +87,15 @@ export const TriggerCreationModal: React.FC<TriggerCreationModalProps> = props =
   };
 
   const onSelectTriggerType = (e, option) => {
-    // delete formData.eventType;
-    // delete formData.activityType;
     setFormData({ ...initialFormData, $type: option.key });
   };
 
-  const onSelectEventType = (e, option) => {
-    setFormData({ ...formData, eventType: option.key });
-  };
-
   const onSelectIntent = (e, option) => {
     setFormData({ ...formData, intent: option.key });
   };
 
-  const onSelectActivityType = (e, option) => {
-    setFormData({ ...formData, activityType: option.key });
+  const onSelectSpecifiedTypeType = (e, option) => {
+    setFormData({ ...formData, specifiedType: option.key });
   };
 
 <<<<<<< HEAD
@@ -122,8 +115,8 @@ export const TriggerCreationModal: React.FC<TriggerCreationModalProps> = props =
     return { key: t.name || t.intent, text: t.name || t.intent };
   });
 
-  const showEventDropDown = formData.$type === eventTypeKey;
   const showIntentDropDown = formData.$type === intentTypeKey;
+  const showEventDropDown = formData.$type === eventTypeKey;
   const showActivityDropDown = formData.$type === activityTypeKey;
 
   return (
@@ -158,19 +151,19 @@ export const TriggerCreationModal: React.FC<TriggerCreationModalProps> = props =
               label="What is the event?"
               options={eventTypes}
               styles={dropdownStyles}
-              onChange={onSelectEventType}
-              errorMessage={formData.errors.eventType}
+              onChange={onSelectSpecifiedTypeType}
+              errorMessage={formData.errors.specifiedType}
               data-testid={'eventTypeDropDown'}
             />
           )}
           {showActivityDropDown && (
             <Dropdown
               placeholder="select an activity type"
-              label="Which activity?"
+              label="What is the activity?"
               options={activityTypes}
               styles={dropdownStyles}
-              onChange={onSelectActivityType}
-              errorMessage={formData.errors.activityType}
+              onChange={onSelectSpecifiedTypeType}
+              errorMessage={formData.errors.specifiedType}
               data-testid={'activityTypeDropDown'}
             />
           )}
diff --git a/Composer/packages/client/src/utils/dialogUtil.ts b/Composer/packages/client/src/utils/dialogUtil.ts
index 70555cd27d..9b3c909588 100644
--- a/Composer/packages/client/src/utils/dialogUtil.ts
+++ b/Composer/packages/client/src/utils/dialogUtil.ts
@@ -17,16 +17,14 @@ interface DialogsMap {
 export interface TriggerFormData {
   errors: TriggerFormDataErrors;
   $type: string;
-  eventType: string;
   intent: string;
-  activityType: string;
+  specifiedType: string;
 }
 
 export interface TriggerFormDataErrors {
   $type?: string;
-  eventType?: string;
   intent?: string;
-  activityType?: string;
+  specifiedType?: string;
 }
 
 export function getDialog(dialogs: DialogInfo[], dialogId: string) {
@@ -57,11 +55,9 @@ export function getFriendlyName(data) {
 export function insert(content, path: string, position: number | undefined, data: TriggerFormData) {
   const current = get(content, path, []);
   const optionalAttributes: { intent?: string; event?: string } = {};
-
-  if (data.eventType) {
-    optionalAttributes.event = data.eventType;
+  if (data.specifiedType) {
+    data.$type = data.specifiedType;
   }
-
   if (data.intent) {
     optionalAttributes.intent = data.intent;
   }
diff --git a/Composer/packages/lib/shared/src/dialogFactory.ts b/Composer/packages/lib/shared/src/dialogFactory.ts
index 10d18bf867..64b9c473e1 100644
--- a/Composer/packages/lib/shared/src/dialogFactory.ts
+++ b/Composer/packages/lib/shared/src/dialogFactory.ts
@@ -27,7 +27,7 @@ const initialDialogShape = {
   },
   'Microsoft.OnConversationUpdateActivity': {
     $type: 'Microsoft.OnConversationUpdateActivity',
-    constraint: "toLower(turn.Activity.membersAdded[0].name) != 'bot'",
+    condition: "toLower(turn.Activity.membersAdded[0].name) != 'bot'",
   },
 };
 

From 1d2cf4cacd124256ee39f405de8ec17abc0a7c74 Mon Sep 17 00:00:00 2001
From: Weitian Li <weitli@microsoft.com>
Date: Fri, 18 Oct 2019 13:51:32 +0800
Subject: [PATCH 3/3] rebase master

---
 .../components/ProjectTree/TriggerCreationModal.tsx    | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/Composer/packages/client/src/components/ProjectTree/TriggerCreationModal.tsx b/Composer/packages/client/src/components/ProjectTree/TriggerCreationModal.tsx
index c2836a4039..36d1aa7a8d 100644
--- a/Composer/packages/client/src/components/ProjectTree/TriggerCreationModal.tsx
+++ b/Composer/packages/client/src/components/ProjectTree/TriggerCreationModal.tsx
@@ -65,11 +65,7 @@ export const TriggerCreationModal: React.FC<TriggerCreationModalProps> = props =
   const { state } = useContext(StoreContext);
   const { dialogs, luFiles } = state;
   const luFile = luFiles.find(lu => lu.id === dialogId);
-<<<<<<< HEAD
   const dialogFile = dialogs.find(dialog => dialog.id === dialogId);
-=======
->>>>>>> trigger align with the new schema
-
   const onClickSubmitButton = e => {
     e.preventDefault();
     const errors = validateForm(formData);
@@ -98,14 +94,8 @@ export const TriggerCreationModal: React.FC<TriggerCreationModalProps> = props =
     setFormData({ ...formData, specifiedType: option.key });
   };
 
-<<<<<<< HEAD
-  const eventTypes = get(appschema, `definitions.['${eventTypeKey}'].properties.event.enum`, []).map(t => {
-    return { key: t, text: t };
-  });
-=======
   const eventTypes: IDropdownOption[] = getEventTypes();
   const activityTypes: IDropdownOption[] = getActivityTypes();
->>>>>>> trigger align with the new schema
 
   const regexIntents = get(dialogFile, 'content.recognizer.intents', []);
   const luisIntents = get(luFile, 'parsedContent.LUISJsonStructure.intents', []);