fix: deprecate editor.schema in favor of pure ui schema

Composer/packages/client/src/store/index.tsx

@@ -38,7 +38,7 @@ const initialState: State = {
   templateId: 'EmptyBot',
   storageFileLoadingStatus: 'success',
   lgFiles: [],
-  schemas: { editor: {} },
+  schemas: {},
   luFiles: [],
   actionsSeed: [],
   designPageLocation: {

Composer/packages/extensions/adaptive-form/src/components/AdaptiveForm/FormTitle.tsx

@@ -28,7 +28,7 @@ interface FormTitleProps {
 const FormTitle: React.FC<FormTitleProps> = props => {
   const { name, description, schema, formData, uiOptions = {} } = props;
 
-  const handleTitleChange = (e: any, newTitle?: string): void => {
+  const handleTitleChange = (_e: React.FormEvent, newTitle?: string): void => {
     if (props.onChange) {
       props.onChange({
         ...formData.$designer,

Composer/packages/extensions/adaptive-form/src/defaultUiSchema.ts

@@ -13,7 +13,8 @@ const triggerUiSchema = {
 
 const DefaultUISchema: UISchema = {
   [SDKTypes.AdaptiveDialog]: {
-    description: 'This configures a data driven dialog via a collection of events and actions.',
+    label: 'Adaptive dialog',
+    description: () => formatMessage('This configures a data driven dialog via a collection of events and actions.'),
     helpLink: 'https://aka.ms/botframework',
     order: ['recognizer', '*'],
     hidden: ['triggers', 'autoEndDialog', 'generator', 'selector', 'schema'],
@@ -28,23 +29,33 @@ const DefaultUISchema: UISchema = {
     },
   },
   [SDKTypes.AttachmentInput]: {
+    label: 'Prompt for Attachment',
     helpLink: 'https://aka.ms/bfc-ask-for-user-input',
   },
   [SDKTypes.BeginDialog]: {
+    label: 'Begin a Dialog',
     helpLink: 'https://aka.ms/bfc-understanding-dialogs',
     order: ['dialog', 'options', 'resultProperty', 'includeActivity', '*'],
   },
+  [SDKTypes.OnCancelDialog]: {
+    label: () => formatMessage('Dialog cancelled'),
+    subtitle: () => formatMessage('Cancel dialog event'),
+  },
   [SDKTypes.CancelAllDialogs]: {
+    label: () => formatMessage('Cancel All Dialogs'),
     helpLink: 'https://aka.ms/bfc-understanding-dialogs',
     order: ['dialog', 'property', '*'],
   },
   [SDKTypes.ChoiceInput]: {
+    label: () => formatMessage('Prompt with multi-choice'),
     helpLink: 'https://aka.ms/bfc-ask-for-user-input',
   },
   [SDKTypes.ConfirmInput]: {
+    label: () => formatMessage('Prompt for confirmation'),
     helpLink: 'https://aka.ms/bfc-ask-for-user-input',
   },
   [SDKTypes.DateTimeInput]: {
+    label: () => formatMessage('Prompt for a date'),
     helpLink: 'https://aka.ms/bfc-ask-for-user-input',
   },
   [SDKTypes.DebugBreak]: { label: () => formatMessage('Debug Break') },
@@ -57,6 +68,7 @@ const DefaultUISchema: UISchema = {
     helpLink: 'https://aka.ms/bfc-using-memory',
   },
   [SDKTypes.DeleteProperties]: {
+    label: () => formatMessage('Delete Properties'),
     helpLink: 'https://aka.ms/bfc-using-memory',
   },
   [SDKTypes.EditActions]: { label: () => formatMessage('Modify active dialog') },
@@ -69,63 +81,105 @@ const DefaultUISchema: UISchema = {
     helpLink: 'https://aka.ms/bfc-custom-events',
   },
   [SDKTypes.EndDialog]: {
+    label: () => formatMessage('End Dialog'),
     helpLink: 'https://aka.ms/bfc-understanding-dialogs',
   },
-  [SDKTypes.EndDialog]: {
+  [SDKTypes.EndTurn]: {
+    label: () => formatMessage('End Turn'),
     helpLink: 'https://aka.ms/bfc-understanding-dialogs',
   },
   [SDKTypes.Foreach]: {
+    label: () => formatMessage('Loop: For Each'),
     order: ['itemsProperty', '*'],
     hidden: ['actions'],
     helpLink: 'https://aka.ms/bfc-controlling-conversation-flow',
   },
   [SDKTypes.ForeachPage]: {
+    label: () => formatMessage('Loop: For Each Page'),
     order: ['itemsProperty', 'pageSize', '*'],
     hidden: ['actions'],
     helpLink: 'https://aka.ms/bfc-controlling-conversation-flow',
   },
   [SDKTypes.HttpRequest]: {
+    label: () => formatMessage('HTTP Request'),
     order: ['method', 'url', 'body', 'headers', '*'],
     helpLink: 'https://aka.ms/bfc-using-http',
   },
   [SDKTypes.IfCondition]: {
+    label: () => formatMessage('Branch: If/Else'),
     hidden: ['actions', 'elseActions'],
     helpLink: 'https://aka.ms/bfc-controlling-conversation-flow',
   },
   [SDKTypes.LogAction]: {
+    label: () => formatMessage('Log to console'),
     helpLink: 'https://aka.ms/bfc-debugging-bots',
   },
-  [SDKTypes.LuisRecognizer]: {
-    helpLink: 'https://aka.ms/BFC-Using-LU',
-  },
-  [SDKTypes.MultiLanguageRecognizer]: {
-    helpLink: 'https://aka.ms/BFC-Using-LU',
-  },
   [SDKTypes.NumberInput]: {
+    label: () => formatMessage('Prompt for a number'),
     helpLink: 'https://aka.ms/bfc-ask-for-user-input',
   },
   [SDKTypes.OAuthInput]: {
+    label: () => formatMessage('OAuth Login'),
     helpLink: 'https://aka.ms/bfc-using-oauth',
+    order: ['connectionName', '*'],
+  },
+  [SDKTypes.OnActivity]: {
+    ...triggerUiSchema,
+    label: () => formatMessage('Activities'),
+    subtitle: () => formatMessage('Activity recieved'),
+  },
+  [SDKTypes.OnBeginDialog]: {
+    ...triggerUiSchema,
+    label: () => formatMessage('Dialog started'),
+    subtitle: () => formatMessage('Begin dialog event'),
   },
-  [SDKTypes.OAuthInput]: { order: ['connectionName', '*'] },
-  [SDKTypes.OnActivity]: { ...triggerUiSchema },
-  [SDKTypes.OnBeginDialog]: { ...triggerUiSchema },
   [SDKTypes.OnCancelDialog]: { ...triggerUiSchema },
-  [SDKTypes.OnCondition]: { ...triggerUiSchema },
+  [SDKTypes.OnCondition]: {
+    ...triggerUiSchema,
+    label: () => formatMessage('Handle a condition'),
+    subtitle: () => formatMessage('Condition'),
+  },
   [SDKTypes.OnConversationUpdateActivity]: {
-    label: 'Greeting',
-    description: 'Handle the events fired when a user begins a new conversation with the bot.',
+    ...triggerUiSchema,
+    label: () => formatMessage('Greeting'),
+    subtitle: () => formatMessage('ConversationUpdate activity'),
+    description: () => formatMessage('Handle the events fired when a user begins a new conversation with the bot.'),
     helpLink:
       'https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-conversations?view=azure-bot-service-4.0#conversation-lifetime',
+  },
+  [SDKTypes.OnCustomEvent]: {
+    ...triggerUiSchema,
+    label: () => formatMessage('Handle an Event'),
+    subtitle: () => formatMessage('Custom event'),
+  },
+  [SDKTypes.OnDialogEvent]: {
+    ...triggerUiSchema,
+    label: () => formatMessage('Dialog events'),
+    subtitle: () => formatMessage('Dialog event'),
+  },
+  [SDKTypes.OnEndOfConversationActivity]: {
+    ...triggerUiSchema,
+    label: () => formatMessage('Conversation ended'),
+    subtitle: () => formatMessage('EndOfConversation activity'),
+  },
+  [SDKTypes.OnError]: {
+    ...triggerUiSchema,
+    label: () => formatMessage('Error occurred'),
+    subtitle: () => formatMessage('Error event'),
+  },
+  [SDKTypes.OnEventActivity]: {
     ...triggerUiSchema,
+    label: () => formatMessage('Event received'),
+    subtitle: () => formatMessage('Event activity'),
+  },
+  [SDKTypes.OnHandoffActivity]: {
+    ...triggerUiSchema,
+    label: () => formatMessage('Handover to human'),
+    subtitle: () => formatMessage('Handoff activity'),
   },
-  [SDKTypes.OnCustomEvent]: { ...triggerUiSchema },
-  [SDKTypes.OnDialogEvent]: { ...triggerUiSchema },
-  [SDKTypes.OnEndOfConversationActivity]: { ...triggerUiSchema },
-  [SDKTypes.OnError]: { ...triggerUiSchema },
-  [SDKTypes.OnEventActivity]: { ...triggerUiSchema },
-  [SDKTypes.OnHandoffActivity]: { ...triggerUiSchema },
   [SDKTypes.OnIntent]: {
+    label: () => formatMessage('Intent recognized'),
+    subtitle: () => formatMessage('Intent recognized'),
     order: ['intent', 'condition', 'entities', '*'],
     hidden: ['actions'],
     properties: {
@@ -134,54 +188,96 @@ const DefaultUISchema: UISchema = {
       },
     },
   },
-  [SDKTypes.OnInvokeActivity]: { ...triggerUiSchema },
-  [SDKTypes.OnMessageActivity]: { ...triggerUiSchema },
-  [SDKTypes.OnMessageDeleteActivity]: { ...triggerUiSchema },
-  [SDKTypes.OnMessageReactionActivity]: { ...triggerUiSchema },
-  [SDKTypes.OnMessageUpdateActivity]: { ...triggerUiSchema },
-  [SDKTypes.OnRepromptDialog]: { ...triggerUiSchema },
-  [SDKTypes.OnTypingActivity]: { ...triggerUiSchema },
-  [SDKTypes.OnUnknownIntent]: { ...triggerUiSchema },
+  [SDKTypes.OnInvokeActivity]: {
+    ...triggerUiSchema,
+    label: () => formatMessage('Conversation invoked'),
+    subtitle: () => formatMessage('Invoke activity'),
+  },
+  [SDKTypes.OnMessageActivity]: {
+    ...triggerUiSchema,
+    label: () => formatMessage('Message recieved'),
+    subtitle: () => formatMessage('Message recieved activity'),
+  },
+  [SDKTypes.OnMessageDeleteActivity]: {
+    ...triggerUiSchema,
+    label: () => formatMessage('Message deleted'),
+    subtitle: () => formatMessage('Message deleted activity'),
+  },
+  [SDKTypes.OnMessageReactionActivity]: {
+    ...triggerUiSchema,
+    label: () => formatMessage('Message reaction'),
+    subtitle: () => formatMessage('Message reaction activity'),
+  },
+  [SDKTypes.OnMessageUpdateActivity]: {
+    ...triggerUiSchema,
+    label: () => formatMessage('Message updated'),
+    subtitle: () => formatMessage('Message updated activity'),
+  },
+  [SDKTypes.OnRepromptDialog]: {
+    ...triggerUiSchema,
+    label: () => formatMessage('Re-prompt for input'),
+    subtitle: () => formatMessage('Reprompt dialog event'),
+  },
+  [SDKTypes.OnTypingActivity]: {
+    ...triggerUiSchema,
+    label: () => formatMessage('User is typing'),
+    subtitle: () => formatMessage('Typing activity'),
+  },
+  [SDKTypes.OnUnknownIntent]: {
+    ...triggerUiSchema,
+    label: () => formatMessage('Unknown intent'),
+    subtitle: () => formatMessage('Unknown intent recognized'),
+  },
   [SDKTypes.QnAMakerDialog]: {
+    label: () => formatMessage('QnAMakerDialog'),
     helpLink: 'https://aka.ms/bfc-using-QnA',
   },
   [SDKTypes.Recognizer]: {
     field: RecognizerField,
     helpLink: 'https://aka.ms/BFC-Using-LU',
   },
-  [SDKTypes.RegexRecognizer]: { hidden: ['entities'] },
+  [SDKTypes.RegexRecognizer]: {
+    hidden: ['entities'],
+  },
   [SDKTypes.RepeatDialog]: {
+    label: () => formatMessage('Repeat this Dialog'),
     helpLink: 'https://aka.ms/bfc-understanding-dialogs',
     order: ['options', 'includeActivity', '*'],
   },
   [SDKTypes.ReplaceDialog]: {
+    label: () => formatMessage('Replace this Dialog'),
     helpLink: 'https://aka.ms/bfc-understanding-dialogs',
     order: ['dialog', 'options', 'includeActivity', '*'],
   },
   [SDKTypes.SendActivity]: {
+    label: () => formatMessage('Send an Activity'),
     helpLink: 'https://aka.ms/bfc-send-activity',
     order: ['activity', '*'],
   },
   [SDKTypes.SetProperty]: {
-    helpLink: 'https://aka.ms/bfc-using-memory',
     label: () => formatMessage('Set a Property'),
+    helpLink: 'https://aka.ms/bfc-using-memory',
   },
   [SDKTypes.SetProperties]: {
-    helpLink: 'https://aka.ms/bfc-using-memory',
     label: () => formatMessage('Set Properties'),
+    helpLink: 'https://aka.ms/bfc-using-memory',
   },
   [SDKTypes.SkillDialog]: {
+    label: () => formatMessage('Call a remote skill'),
     helpLink: 'https://aka.ms/bfc-call-skill',
   },
   [SDKTypes.SwitchCondition]: {
+    label: () => formatMessage('Branch: Switch'),
     helpLink: 'https://aka.ms/bfc-controlling-conversation-flow',
     hidden: ['default'],
     properties: { cases: { hidden: ['actions'] } },
   },
   [SDKTypes.TextInput]: {
+    label: () => formatMessage('Prompt for text'),
     helpLink: 'https://aka.ms/bfc-ask-for-user-input',
   },
   [SDKTypes.TraceActivity]: {
+    label: () => formatMessage('Emit a trace event'),
     helpLink: 'https://aka.ms/bfc-debugging-bots',
   },
 };