[Form editor] Update shared schema

Composer/packages/client/src/ShellApi.ts

@@ -311,9 +311,16 @@ export const ShellApi: React.FC = () => {
   function focusSteps({ subPaths = [], fragment }, event) {
     cleanData();
     let dataPath: string = subPaths[0];
-    if (event.source.name === FORM_EDITOR && focused && dataPath !== focused) {
-      dataPath = `${focused}.${dataPath}`;
+
+    if (event.source.name === FORM_EDITOR) {
+      // nothing focused yet, prepend the selected path
+      if (!focused && selected) {
+        dataPath = `${selected}.${dataPath}`;
+      } else if (focused !== dataPath) {
+        dataPath = `${focused}.${dataPath}`;
+      }
     }
+
     actions.focusTo(dataPath, fragment);
   }
 

Composer/packages/client/src/components/ProjectTree/TriggerCreationModal.tsx

@@ -4,6 +4,7 @@ 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 { appschema } from 'shared';
 
 import {
   addNewTrigger,
@@ -56,7 +57,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, schemas, luFiles } = state;
+  const { dialogs, luFiles } = state;
   const luFile = luFiles.find(lu => lu.id === dialogId);
   const onClickSubmitButton = e => {
     e.preventDefault();
@@ -93,17 +94,16 @@ export const TriggerCreationModal: React.FC<TriggerCreationModalProps> = props =
       [field]: newValue,
     });
   };
-  const eventTypes = get(schemas, `sdk.content.definitions.['${eventTypeKey}'].properties.events.items.enum`, []).map(
-    t => {
-      return { key: t, text: t };
-    }
-  );
+  const eventTypes = get(appschema, `definitions.['${eventTypeKey}'].properties.event.enum`, []).map(t => {
+    return { key: t, text: t };
+  });
 
   const intents = get(luFile, 'parsedContent.LUISJsonStructure.intents', []);
 
   const intentOptions = intents.map(t => {
     return { key: t.name, text: t.name };
   });
+
   const showEventDropDown = formData.$type === eventTypeKey;
   const showIntentDropDown = formData.$type === intentTypeKey;
   return (

Composer/packages/client/src/utils/dialogUtil.ts

@@ -53,9 +53,10 @@ export function getFriendlyName(data) {
 
 export function insert(content, path: string, position: number | undefined, data: TriggerFormData) {
   const current = get(content, path, []);
-  const optionalAttributes: { intent?: string; events?: string[] } = {};
+  const optionalAttributes: { intent?: string; event?: string } = {};
+
   if (data.eventType) {
-    optionalAttributes.events = [data.eventType];
+    optionalAttributes.event = data.eventType;
   }
 
   if (data.intent) {

Composer/packages/extensions/obiformeditor/demo/src/index.tsx

@@ -57,7 +57,7 @@ function createDialogInfo(id: string, content: Partial<MicrosoftAdaptiveDialog>
     isRoot: id === 'Main',
     content: {
       $type: 'Microsoft.AdaptiveDialog',
-      events: [],
+      triggers: [],
       ...content,
     },
     lgFile: '',
@@ -367,7 +367,7 @@ const Demo: React.FC = () => {
           memory={memoryFormData}
           onChange={debouncedOnChange}
           schemas={{ editor: editorSchemaFormData }}
-          shellApi={mockShellApi as ShellApi}
+          shellApi={mockShellApi}
           luFiles={luFiles}
           lgFiles={lgFiles}
           currentDialog={dialogFiles[0]}

Composer/packages/extensions/obiformeditor/src/Form/fields/PromptField/UserAnswers.tsx

@@ -54,17 +54,6 @@ export const UserAnswers: React.FC<UserAnswersProps> = props => {
           />
         </div>
       )}
-      <div css={field}>
-        <TextWidget
-          onChange={onChange('value')}
-          schema={getSchema('value')}
-          id={idSchema.value.__id}
-          value={formData.value}
-          label={formatMessage('Value')}
-          formContext={props.formContext}
-          rawErrors={errorSchema.value && errorSchema.value.__errors}
-        />
-      </div>
       {getSchema('defaultLocale') && (
         <div css={field}>
           <TextWidget

Composer/packages/extensions/obiformeditor/src/Form/fields/RulesField.tsx

@@ -9,7 +9,7 @@ import { setOverridesOnField } from '../utils';
 
 import { TableField } from './TableField';
 
-const renderTitle = (item: MicrosoftIRule) => {
+const renderTitle = (item: ITriggerCondition) => {
   const friendlyName = get(item, '$designer.name');
 
   if (friendlyName) {
@@ -28,12 +28,12 @@ export function RulesField(props: FieldProps) {
   const overrides = setOverridesOnField(props.formContext, 'RulesField');
 
   return (
-    <TableField<MicrosoftIRule>
+    <TableField<ITriggerCondition>
       {...props}
       {...overrides}
       dialogOptionsOpts={{ include: [DialogGroup.EVENTS], subMenu: false }}
       label={formatMessage('Add New Rule')}
-      navPrefix="events"
+      navPrefix="triggers"
       renderTitle={renderTitle}
     >
       {({ createNewItemAtIndex }) => (

Composer/packages/extensions/obiformeditor/src/Form/fields/StepsField.tsx

@@ -23,7 +23,7 @@ export const StepsField: React.FC<BFDFieldProps> = props => {
       dialogOptionsOpts={{
         exclude: [DialogGroup.EVENTS, DialogGroup.ADVANCED_EVENTS, DialogGroup.SELECTOR, DialogGroup.OTHER],
       }}
-      navPrefix={`${formContext.focusedEvent}.${props.name}`}
+      navPrefix={props.name}
     >
       {({ createNewItemAtIndex }) => (
         <DefaultButton

Composer/packages/extensions/obiformeditor/src/ObiFormEditor.tsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import ErrorBoundary, { FallbackProps } from 'react-error-boundary';
 import { MessageBar, MessageBarType } from 'office-ui-fabric-react';
 import debounce from 'lodash.debounce';
@@ -32,7 +32,8 @@ const ObiFormEditor: React.FC<FormEditorProps> = props => {
     props.onChange(data, props.focusedSteps[0]);
   };
 
-  const debouncedOnChange = debounce(onChange, 750);
+  // only need to debounce the change handler when focusedSteps change
+  const debouncedOnChange = useMemo(() => debounce(onChange, 750), [props.focusedSteps[0]]);
   const key = get(props.data, '$designer.id', props.focusPath);
 
   return (

Composer/packages/extensions/obiformeditor/src/schema/types.d.ts

@@ -85,8 +85,6 @@ interface InputDialog extends BaseSchema {
   maxTurnCount: number;
   /** Expressions to validate an input. */
   validations: MicrosoftIExpression[];
-  /** The expression that you evaluated for input. */
-  value: MicrosoftIExpression;
   /** Property that this input dialog is bound to */
   property: MicrosoftIExpression;
   /** Value to return if the value expression can't be evaluated. */
@@ -193,13 +191,7 @@ interface RuleBase extends BaseSchema {
   /** Optional constraint to which must be met for this rule to fire */
   constraint?: string;
   /** Sequence of steps or dialogs to execute */
-  steps: MicrosoftIDialog[];
-}
-
-/** Defines a rule for an event which is triggered by some source */
-interface OnEvent extends RuleBase {
-  /** Events to trigger this rule for */
-  events: DialogEvent[];
+  actions: MicrosoftIDialog[];
 }
 
 /** This defines the steps to take when an Intent is recognized (and optionally entities) */
@@ -210,13 +202,10 @@ interface OnIntent extends RuleBase {
   entities: string[];
 }
 
-/** Defines a rule for an event which is triggered by some source */
-interface Rule extends RuleBase {}
-
 /** Defines a sequence of steps to take if there is no other trigger or plan operating */
 interface OnUnknownIntent extends RuleBase {}
 
-type MicrosoftIRule = OnEvent | OnIntent | Rule | OnUnknownIntent;
+type ITriggerCondition = OnIntent | OnUnknownIntent;
 
 /**
  * Conversational Flow and Dialog Management
@@ -239,23 +228,25 @@ interface SwitchCondition extends BaseSchema {
   default?: MicrosoftIDialog[];
 }
 
-/** This configures a data driven dialog via a collection of steps/dialogs. */
+/** Flexible, data driven dialog that can adapt to the conversation. */
 interface MicrosoftAdaptiveDialog extends BaseSchema {
+  /** Optional dialog ID. */
+  id?: string;
   /** If this is true the dialog will automatically end when there are no more steps to run.  If this is false it is the responsbility of the author to call EndDialog at an appropriate time. */
   autoEndDialog?: boolean;
+  /** Value that will be passed back to the parent dialog. */
+  defaultResultProperty?: string;
   /** Configured recognizer to generate intent and entites from user utterance. */
   recognizer?: MicrosoftIRecognizer;
-  /** Language generator to use for this dialog. (aka: LG file) */
-  generator?: string;
   /** This is the array of rules to use to evaluate conversation */
-  events: MicrosoftIRule[];
+  triggers: ITriggerCondition[];
 }
 
 /* Union of components which implement the IDialog interface */
 type MicrosoftIDialog =
   | ChoiceInput
   | ConfirmInput
   | MicrosoftIRecognizer
-  | MicrosoftIRule
+  | ITriggerCondition
   | SwitchCondition
   | TextInput;