Conflicts

microsoft · Mar 10, 2020 · 05a02ee · 05a02ee
2 parents 42164f7 + ceb8186
commit 05a02ee
Show file tree

Hide file tree

Showing 26 changed files with 305 additions and 100 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,57 @@
 
 ## Releases
 
+### 03-09-2020
+
+#### Added
+
+- feat: Remove input LU when deconstructing prompts ([#2180](https://github.com/microsoft/BotFramework-Composer/pull/2180)) ([@tdurnford](https://github.com/tdurnford))
+- feat: Add cross train before luis publish ([#2069](https://github.com/microsoft/BotFramework-Composer/pull/2069)) ([@cwhitten](https://github.com/cwhitten))
+- feat: Added inline lu to prompts ([#2159](https://github.com/microsoft/BotFramework-Composer/pull/2159)) ([@cwhitten](https://github.com/cwhitten))
+- feat: implement new action design to improve readability ([#2136](https://github.com/microsoft/BotFramework-Composer/pull/2136)) ([@cwhitten](https://github.com/cwhitten))
+- feat: repaint ui for setProperties in visual editor ([#2017](https://github.com/microsoft/BotFramework-Composer/pull/2017)) ([@alanlong9278](https://github.com/alanlong9278))
+- feat: Update package and schema to 200216 ([#1997](https://github.com/microsoft/BotFramework-Composer/pull/1997)) ([@luhan2017](https://github.com/luhan2017))
+- feat: update new trigger modal according to design ([#1786](https://github.com/microsoft/BotFramework-Composer/pull/1786)) ([@liweitian](https://github.com/liweitian))
+- feat: display 6 actions as contentless node ([#2108](https://github.com/microsoft/BotFramework-Composer/pull/2108)) ([@yeze322](https://github.com/yeze322))
+- feat: support multi-line node block in Visual Editor ([#2005](https://github.com/microsoft/BotFramework-Composer/pull/2005)) ([@yeze322](https://github.com/yeze322))
+- feat: add more help links ([#2070](https://github.com/microsoft/BotFramework-Composer/pull/2070)) ([@a-b-r-o-w-n](https://github.com/a-b-r-o-w-n))
+- feat: support inline LU section editing ([#1994](https://github.com/microsoft/BotFramework-Composer/pull/1994)) ([@zhixzhan](https://github.com/zhixzhan))
+
+#### Fixed
+
+- fix: trigger creation bug ([#2151](https://github.com/microsoft/BotFramework-Composer/pull/2151)) ([@liweitian](https://github.com/liweitian))
+- fix: lu build bug when training empty intents ([#2201](https://github.com/microsoft/BotFramework-Composer/pull/2201)) ([@lei9444](https://github.com/lei9444))
+- fix: use nightly build to replace the private bf-lu package ([#2190](https://github.com/microsoft/BotFramework-Composer/pull/2190)) ([@lei9444](https://github.com/lei9444))
+- fix: Moved value field to user tab and removed inline lu from attachment input ([#2194](https://github.com/microsoft/BotFramework-Composer/pull/2194)) ([@tdurnford](https://github.com/tdurnford))
+- fix: load schema files when loading bot project ([#2170](https://github.com/microsoft/BotFramework-Composer/pull/2170)) ([@a-b-r-o-w-n](https://github.com/a-b-r-o-w-n))
+- fix: deployment script, decouple debugging and deployment settings ([#2153](https://github.com/microsoft/BotFramework-Composer/pull/2153)) ([@zidaneymar](https://github.com/zidaneymar))
+- fix: Double scroll bars in dialog's properties pane ([#2163](https://github.com/microsoft/BotFramework-Composer/pull/2163)) ([@alanlong9278](https://github.com/alanlong9278))
+- fix: lg template display wrong in visual & form editor ([#2191](https://github.com/microsoft/BotFramework-Composer/pull/2191)) ([@alanlong9278](https://github.com/alanlong9278))
+- fix: remove edit button in lu all up view ([#2146](https://github.com/microsoft/BotFramework-Composer/pull/2146)) ([@cwhitten](https://github.com/cwhitten))
+- a11y: Use header tag for trigger in visual editor ([#2128](https://github.com/microsoft/BotFramework-Composer/pull/2128)) ([@cwhitten](https://github.com/cwhitten))
+- fix: update lu format link ([#2107](https://github.com/microsoft/BotFramework-Composer/pull/2107)) ([@liweitian](https://github.com/liweitian))
+- fix: resolve known bugs in LU LSP. ([#2098](https://github.com/microsoft/BotFramework-Composer/pull/2098)) ([@cosmicshuai](https://github.com/cosmicshuai))
+- fix: no longer show duplicate lg error notifications ([#2100](https://github.com/microsoft/BotFramework-Composer/pull/2100)) ([@zhixzhan](https://github.com/zhixzhan))
+- fix: replace animated screenshots with a static screenshot ([#2045](https://github.com/microsoft/BotFramework-Composer/pull/2045)) ([@benbrown](https://github.com/benbrown))
+- fix: support copy actions across dialogs ([#2198](https://github.com/microsoft/BotFramework-Composer/pull/2198)) ([@yeze322](https://github.com/yeze322))
+- fix: Default ActivityProcessed to true (bool) ([#2189](https://github.com/microsoft/BotFramework-Composer/pull/2189)) ([@cwhitten](https://github.com/cwhitten))
+- a11y: add name for nodeMenu, arrow and endNode ([#2131](https://github.com/microsoft/BotFramework-Composer/pull/2131)) ([@cwhitten](https://github.com/cwhitten))
+- a11y: add role, name, posinset for paste in edgeMenu ([#2126](https://github.com/microsoft/BotFramework-Composer/pull/2126)) ([@alanlong9278](https://github.com/alanlong9278))
+- fix: fix 'sort()' function of steps and cases in visual editor ([#2166](https://github.com/microsoft/BotFramework-Composer/pull/2166)) ([@yeze322](https://github.com/yeze322))
+
+#### Changed
+
+- style: fix hover state nodes ui ([#2065](https://github.com/microsoft/BotFramework-Composer/pull/2065)) ([@alanlong9278](https://github.com/alanlong9278))
+
+#### Other
+
+- ci: add a11y pr title prefix for accessibility prs ([#2171](https://github.com/microsoft/BotFramework-Composer/pull/2171)) ([@a-b-r-o-w-n](https://github.com/a-b-r-o-w-n))
+- docs: update docs to fix LU file format link ([#2071](https://github.com/microsoft/BotFramework-Composer/pull/2071)) ([@vishwacsena](https://github.com/vishwacsena))
+- chore: merge stable release into master ([@a-b-r-o-w-n](https://github.com/a-b-r-o-w-n))
+- docs: clarify setup ([#2145](https://github.com/microsoft/BotFramework-Composer/pull/2145)) ([@DaraOladapo](https://github.com/DaraOladapo))
+- docs: update dotnet requirement in setup docs ([#2160](https://github.com/microsoft/BotFramework-Composer/pull/2160)) ([@vkacherov](https://github.com/vkacherov))
+- samples: Update HttpRequest sample ([#2161](https://github.com/microsoft/BotFramework-Composer/pull/2161)) ([@luhan2017](https://github.com/luhan2017))
+
 ### 02-21-2020
 
 #### Added

diff --git a/Composer/packages/client/package.json b/Composer/packages/client/package.json
@@ -20,7 +20,7 @@
     "@bfc/extensions": "*",
     "@bfc/indexers": "*",
     "@bfc/shared": "*",
-    "@microsoft/bf-lu": "4.8.0-preview.110925",
+    "@microsoft/bf-lu": "4.8.0-preview.111952",
     "@emotion/core": "^10.0.7",
     "@reach/router": "^1.2.1",
     "axios": "^0.18.0",

diff --git a/Composer/packages/client/src/ShellApi.ts b/Composer/packages/client/src/ShellApi.ts
@@ -9,6 +9,7 @@ import get from 'lodash/get';
 import { isExpression } from './utils';
 import * as lgUtil from './utils/lgUtil';
 import * as luUtil from './utils/luUtil';
+import { updateRegExIntent } from './utils/dialogUtil';
 import { StoreContext } from './store';
 import ApiClient from './messenger/ApiClient';
 import { getDialogData, setDialogData, sanitizeDialogData } from './utils';
@@ -243,6 +244,14 @@ export const ShellApi: React.FC = () => {
     return await updateLuFile({ id, content });
   }
 
+  async function updateRegExIntentHandler({ id, intentName, pattern }, event) {
+    if (isEventSourceValid(event) === false) return false;
+    const dialog = dialogs.find(dialog => dialog.id === id);
+    if (!dialog) throw new Error(`dialog ${dialogId} not found`);
+    const newDialog = updateRegExIntent(dialog, intentName, pattern);
+    return await updateDialog({ id, content: newDialog.content });
+  }
+
   async function fileHandler(fileTargetType, fileChangeType, { id, content }, event) {
     if (isEventSourceValid(event) === false) return false;
 
@@ -345,6 +354,7 @@ export const ShellApi: React.FC = () => {
     apiClient.registerApi('addLuIntent', addLuIntentHandler);
     apiClient.registerApi('updateLuIntent', updateLuIntentHandler);
     apiClient.registerApi('removeLuIntent', removeLuIntentHandler);
+    apiClient.registerApi('updateRegExIntent', updateRegExIntentHandler);
     apiClient.registerApi('navTo', navTo);
     apiClient.registerApi('onFocusEvent', focusEvent);
     apiClient.registerApi('onFocusSteps', focusSteps);

diff --git a/Composer/packages/client/src/components/ProjectTree/TriggerCreationModal.tsx b/Composer/packages/client/src/components/ProjectTree/TriggerCreationModal.tsx
@@ -17,7 +17,7 @@ import get from 'lodash/get';
 import { LuEditor } from '@bfc/code-editor';
 
 import {
-  addNewTrigger,
+  generateNewDialog,
   getTriggerTypes,
   TriggerFormData,
   TriggerFormDataErrors,
@@ -28,16 +28,21 @@ import {
   getEventTypes,
   getActivityTypes,
   getMessageTypes,
+  regexRecognizerKey,
 } from '../../utils/dialogUtil';
 import { addIntent } from '../../utils/luUtil';
 import { StoreContext } from '../../store';
 
 import { styles, dropdownStyles, dialogWindow, intent } from './styles';
 
 const nameRegex = /^[a-zA-Z0-9-_.]+$/;
-const validateForm = (data: TriggerFormData): TriggerFormDataErrors => {
+const validateForm = (
+  data: TriggerFormData,
+  isRegEx: boolean,
+  regExIntents: [{ intent: string; pattern: string }]
+): TriggerFormDataErrors => {
   const errors: TriggerFormDataErrors = {};
-  const { $type, specifiedType, intent, triggerPhrases } = data;
+  const { $type, specifiedType, intent, triggerPhrases, regexEx } = data;
 
   if ($type === eventTypeKey && !specifiedType) {
     errors.specifiedType = formatMessage('Please select a event type');
@@ -47,17 +52,29 @@ const validateForm = (data: TriggerFormData): TriggerFormDataErrors => {
     errors.specifiedType = formatMessage('Please select an activity type');
   }
 
+  if ($type === messageTypeKey && !specifiedType) {
+    errors.specifiedType = formatMessage('Please select a message type');
+  }
+
   if (!$type) {
     errors.$type = formatMessage('Please select a trigger type');
   }
 
-  if (!intent || !nameRegex.test(intent)) {
+  if ($type === intentTypeKey && (!intent || !nameRegex.test(intent))) {
     errors.intent = formatMessage(
       'Spaces and special characters are not allowed. Use letters, numbers, -, or _., numbers, -, and _'
     );
   }
 
-  if (!triggerPhrases) {
+  if ($type === intentTypeKey && isRegEx && regExIntents.find(ri => ri.intent === intent)) {
+    errors.intent = `regEx ${intent} is already defined`;
+  }
+
+  if ($type === intentTypeKey && isRegEx && !regexEx) {
+    errors.regexEx = formatMessage('Please input regEx pattern');
+  }
+
+  if ($type === intentTypeKey && !isRegEx && !triggerPhrases) {
     errors.triggerPhrases = formatMessage('Please input trigger phrases');
   }
   if (data.errors.triggerPhrases) {
@@ -66,7 +83,7 @@ const validateForm = (data: TriggerFormData): TriggerFormDataErrors => {
   return errors;
 };
 
-interface LuFilePayload {
+export interface LuFilePayload {
   id: string;
   content: string;
 }
@@ -75,7 +92,7 @@ interface TriggerCreationModalProps {
   dialogId: string;
   isOpen: boolean;
   onDismiss: () => void;
-  onSubmit: (dialog: DialogInfo, luFilePayload: LuFilePayload) => void;
+  onSubmit: (dialog: DialogInfo, luFilePayload?: LuFilePayload) => void;
 }
 
 const initialFormData: TriggerFormData = {
@@ -84,6 +101,7 @@ const initialFormData: TriggerFormData = {
   specifiedType: '',
   intent: '',
   triggerPhrases: '',
+  regexEx: '',
 };
 
 const triggerTypeOptions: IDropdownOption[] = getTriggerTypes();
@@ -94,10 +112,12 @@ export const TriggerCreationModal: React.FC<TriggerCreationModalProps> = props =
   const { state } = useContext(StoreContext);
   const { dialogs, luFiles } = state;
   const luFile = luFiles.find(lu => lu.id === dialogId);
-
+  const dialogFile = dialogs.find(dialog => dialog.id === dialogId);
+  const isRegEx = get(dialogFile, 'content.recognizer.$type', '') === regexRecognizerKey;
+  const regexIntents = get(dialogFile, 'content.recognizer.intents', []);
   const onClickSubmitButton = e => {
     e.preventDefault();
-    const errors = validateForm(formData);
+    const errors = validateForm(formData, isRegEx, regexIntents);
 
     if (Object.keys(errors).length) {
       setFormData({
@@ -108,13 +128,17 @@ export const TriggerCreationModal: React.FC<TriggerCreationModalProps> = props =
     }
 
     const content = get(luFile, 'content', '');
-    const newContent = addIntent(content, { Name: formData.intent, Body: formData.triggerPhrases });
-    const updateLuFile = {
-      id: dialogId,
-      content: newContent,
-    };
-    const newDialog = addNewTrigger(dialogs, dialogId, formData);
-    onSubmit(newDialog, updateLuFile);
+    const newDialog = generateNewDialog(dialogs, dialogId, formData);
+    if (formData.$type === intentTypeKey && !isRegEx) {
+      const newContent = addIntent(content, { Name: formData.intent, Body: formData.triggerPhrases });
+      const updateLuFile = {
+        id: dialogId,
+        content: newContent,
+      };
+      onSubmit(newDialog, updateLuFile);
+    } else {
+      onSubmit(newDialog);
+    }
     onDismiss();
   };
 
@@ -130,6 +154,10 @@ export const TriggerCreationModal: React.FC<TriggerCreationModalProps> = props =
     setFormData({ ...formData, intent: name });
   };
 
+  const onChangeRegEx = (e, pattern) => {
+    setFormData({ ...formData, regexEx: pattern });
+  };
+
   const onTriggerPhrasesChange = (body: string) => {
     const errors = formData.errors;
     const content = '#' + formData.intent + '\n' + body;
@@ -142,7 +170,9 @@ export const TriggerCreationModal: React.FC<TriggerCreationModalProps> = props =
   const activityTypes: IDropdownOption[] = getActivityTypes();
   const messageTypes: IDropdownOption[] = getMessageTypes();
 
-  const showIntentFields = formData.$type === intentTypeKey;
+  const showIntentName = formData.$type === intentTypeKey;
+  const showRegExDropDown = formData.$type === intentTypeKey && isRegEx;
+  const showTriggerPhrase = formData.$type === intentTypeKey && !isRegEx;
   const showEventDropDown = formData.$type === eventTypeKey;
   const showActivityDropDown = formData.$type === activityTypeKey;
   const showMessageDropDown = formData.$type === messageTypeKey;
@@ -172,7 +202,6 @@ export const TriggerCreationModal: React.FC<TriggerCreationModalProps> = props =
             data-testid={'triggerTypeDropDown'}
             defaultSelectedKey={intentTypeKey}
           />
-
           {showEventDropDown && (
             <Dropdown
               placeholder={formatMessage('Select a event type')}
@@ -206,17 +235,30 @@ export const TriggerCreationModal: React.FC<TriggerCreationModalProps> = props =
               data-testid={'messageTypeDropDown'}
             />
           )}
-          {showIntentFields && (
+          {showIntentName && (
             <TextField
-              label={formatMessage('What is the name of this trigger')}
+              label={
+                isRegEx
+                  ? formatMessage('What is the name of this trigger (RegEx)')
+                  : formatMessage('What is the name of this trigger (Luis)')
+              }
               styles={intent}
               onChange={onNameChange}
               errorMessage={formData.errors.intent}
               data-testid="TriggerName"
             />
           )}
-          {showIntentFields && <Label>{formatMessage('Trigger Phrases')}</Label>}
-          {showIntentFields && (
+
+          {showRegExDropDown && (
+            <TextField
+              label={formatMessage('Please input regex pattern')}
+              onChange={onChangeRegEx}
+              errorMessage={formData.errors.regexEx}
+              data-testid={'RegExDropDown'}
+            />
+          )}
+          {showTriggerPhrase && <Label>{formatMessage('Trigger phrases')}</Label>}
+          {showTriggerPhrase && (
             <LuEditor
               onChange={onTriggerPhrasesChange}
               value={formData.triggerPhrases}

diff --git a/Composer/packages/client/src/extension-container/ExtensionContainer.tsx b/Composer/packages/client/src/extension-container/ExtensionContainer.tsx
@@ -114,6 +114,10 @@ const shellApi: ShellApi = {
     return apiClient.apiCall('createDialog', { actions });
   },
 
+  updateRegExIntent: (id, intentName, pattern) => {
+    return apiClient.apiCall('updateRegExIntent', { id, intentName, pattern });
+  },
+
   validateExpression: expression => {
     return apiClient.apiCall('isExpression', { expression });
   },

diff --git a/Composer/packages/client/src/pages/design/index.tsx b/Composer/packages/client/src/pages/design/index.tsx
@@ -12,12 +12,13 @@ import { globalHistory } from '@reach/router';
 import get from 'lodash/get';
 import { PromptTab } from '@bfc/shared';
 import { getNewDesigner, seedNewDialog } from '@bfc/shared';
+import { DialogInfo } from '@bfc/indexers';
 
 import { VisualEditorAPI } from '../../messenger/FrameAPI';
 import { TestController } from '../../TestController';
 import { BASEPATH, DialogDeleting } from '../../constants';
 import { createSelectedPath, deleteTrigger, getbreadcrumbLabel } from '../../utils';
-import { TriggerCreationModal } from '../../components/ProjectTree/TriggerCreationModal';
+import { TriggerCreationModal, LuFilePayload } from '../../components/ProjectTree/TriggerCreationModal';
 import { Conversation } from '../../components/Conversation';
 import { DialogStyle } from '../../components/Modal/styles';
 import { OpenConfirmModal } from '../../components/Modal/Confirm';
@@ -171,18 +172,21 @@ function DesignPage(props) {
     setTriggerModalVisibility(true);
   };
 
-  const onTriggerCreationSubmit = (dialog, luFile) => {
+  const onTriggerCreationSubmit = (dialog: DialogInfo, luFile?: LuFilePayload) => {
     const dialogPayload = {
       id: dialog.id,
       content: dialog.content,
     };
-    const luFilePayload = {
-      id: luFile.id,
-      content: luFile.content,
-    };
+    if (luFile) {
+      const luFilePayload = {
+        id: luFile.id,
+        content: luFile.content,
+      };
+      actions.updateLuFile(luFilePayload);
+    }
+
     const index = get(dialog, 'content.triggers', []).length - 1;
     actions.selectTo(`triggers[${index}]`);
-    actions.updateLuFile(luFilePayload);
     actions.updateDialog(dialogPayload);
   };