Merge branch 'master' into feature/skill-mainfest-modal

BotProject/Templates/CSharp/BotProject.csproj

@@ -17,16 +17,16 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.2" />
-    <PackageReference Include="Microsoft.Bot.Builder" Version="4.9.0-preview.200426-124932" />
-    <PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.9.0-preview.200426-124932" />
-    <PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.9.0-preview.200426-124932" />
-    <PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.9.0-preview.200426-124932" />
-    <PackageReference Include="Microsoft.Bot.Builder.Dialogs.Debugging" Version="4.9.0-preview.200426-124932" />
-    <PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.9.0-preview.200426-124932" />
-    <PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.9.0-preview.200426-124932" />
-    <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.9.0-preview.200426-124932" />
-    <PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.9.0-preview.200426-124932" />
-    <PackageReference Include="Microsoft.Bot.Connector" Version="4.9.0-preview.200426-124932" />
+    <PackageReference Include="Microsoft.Bot.Builder" Version="4.9.0-preview.200427-125093" />
+    <PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.9.0-preview.200427-125093" />
+    <PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.9.0-preview.200427-125093" />
+    <PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.9.0-preview.200427-125093" />
+    <PackageReference Include="Microsoft.Bot.Builder.Dialogs.Debugging" Version="4.9.0-preview.200427-125093" />
+    <PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.9.0-preview.200427-125093" />
+    <PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.9.0-preview.200427-125093" />
+    <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.9.0-preview.200427-125093" />
+    <PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.9.0-preview.200427-125093" />
+    <PackageReference Include="Microsoft.Bot.Connector" Version="4.9.0-preview.200427-125093" />
     <PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.66">
       <PrivateAssets>all</PrivateAssets>

Composer/packages/client/__tests__/components/CreationFlow/DefineConversation/index.test.tsx

@@ -5,14 +5,30 @@ import * as React from 'react';
 import { render, fireEvent } from '@bfc/test-utils';
 
 import { StoreContext } from '../../../../src/store';
+import { StorageFolder } from '../../../../src/store/types';
 import DefineConversation from '../../../../src/components/CreationFlow/DefineConversation';
 
 describe('<DefineConversation/>', () => {
   let onSubmitMock;
   let onDismissMock;
   const onCurrentPathUpdateMock = jest.fn();
   let component, storeContext, saveTemplateMock, locationMock;
-
+  const focusedStorageFolder: StorageFolder = {
+    name: 'Desktop',
+    parent: '/test-folder',
+    writable: true,
+    type: 'folder',
+    path: '/test-folder/Desktop',
+    children: [
+      {
+        name: 'EchoBot-0',
+        type: 'bot',
+        path: 'Desktop/EchoBot-11299',
+        lastModified: 'Wed Apr 22 2020 17:51:07 GMT-0700 (Pacific Daylight Time)',
+        size: 1,
+      },
+    ],
+  };
   function renderComponent() {
     return render(
       <StoreContext.Provider value={storeContext}>
@@ -21,6 +37,7 @@ describe('<DefineConversation/>', () => {
           onDismiss={onDismissMock}
           onCurrentPathUpdate={onCurrentPathUpdateMock}
           location={locationMock}
+          focusedStorageFolder={focusedStorageFolder}
         />
       </StoreContext.Provider>
     );
@@ -49,20 +66,6 @@ describe('<DefineConversation/>', () => {
 
   it('should update formdata with data passed through location props', async () => {
     storeContext.state.templateId = 'EchoBot';
-    storeContext.state.focusedStorageFolder = {
-      name: 'Desktop',
-      parent: '/test-folder',
-      writable: true,
-      children: [
-        {
-          name: 'EchoBot-0',
-          type: 'bot',
-          path: 'Desktop/EchoBot-11299',
-          lastModified: 'Wed Apr 22 2020 17:51:07 GMT-0700 (Pacific Daylight Time)',
-          size: '',
-        },
-      ],
-    };
     locationMock = {
       search:
         'schemaUrl%3Dhttps%3A%2F%2Fraw.luolix.top%2Fmicrosoft%2Fbotframework-sdk%2Fmaster%2Fschemas%2Fcomponent%2Fcomponent.schema%26name%3DEchoBot-11299%26description%3DTest%20Echo',
@@ -72,7 +75,6 @@ describe('<DefineConversation/>', () => {
     fireEvent.click(node);
     expect(onSubmitMock).toHaveBeenCalledWith({
       description: 'Test Echo',
-      location: '',
       name: 'EchoBot-11299',
       schemaUrl:
         'https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema',

Composer/packages/client/__tests__/components/CreationFlow/index.test.tsx

@@ -64,8 +64,9 @@ describe('<CreationFlow/>', () => {
   it('should render the component', async () => {
     const expectedTemplateId = 'EchoBot';
     storeContext.state.templateId = 'EchoBot';
-    storeContext.actions.createProject = async templateId => {
+    storeContext.actions.createProject = async (templateId, name, description, location) => {
       expect(templateId).toBe(expectedTemplateId);
+      expect(location === '\\test-folder\\Desktop' || location === '/test-folder/Desktop').toBeTruthy();
     };
     storeContext.state.focusedStorageFolder = {
       name: 'Desktop',
@@ -77,7 +78,7 @@ describe('<CreationFlow/>', () => {
           type: 'bot',
           path: 'Desktop/EchoBot-11299',
           lastModified: 'Wed Apr 22 2020 17:51:07 GMT-0700 (Pacific Daylight Time)',
-          size: '',
+          size: 1,
         },
       ],
     };

Composer/packages/client/__tests__/utils/luUtil.test.ts

@@ -25,6 +25,7 @@ describe('getReferredFiles', () => {
           { intent: 'dia2_trigger', dialogs: ['dia2'] },
           { intent: 'dias_trigger', dialogs: ['dia5', 'dia6'] },
           { intent: 'no_dialog', dialogs: [] },
+          { intent: 'dialog_without_lu', dialogs: ['dialog_without_lu'] },
           { intent: '', dialogs: ['start_dialog_without_intent'] },
         ],
       },
@@ -66,6 +67,10 @@ describe('getReferredFiles', () => {
         luFile: 'start_dialog_without_intent',
         intentTriggers: [],
       },
+      {
+        id: 'dialog_without_lu',
+        intentTriggers: [],
+      },
     ];
     const luFiles = [
       { id: 'main.en-us' },
@@ -86,6 +91,7 @@ describe('getReferredFiles', () => {
     expect(config.triggerRules['main.en-us.lu'].dias_trigger.length).toBe(2);
     expect(config.triggerRules['dia1.en-us.lu'].dia3_trigger).toEqual('dia3.en-us.lu');
     expect(config.triggerRules['dia1.en-us.lu']['dia4.en-us.lu']).toBeUndefined();
+    expect(config.triggerRules['main.en-us.lu'].dialog_without_lu).toEqual('');
   });
 
   it('check the lu files before publish', () => {

Composer/packages/client/src/components/CreationFlow/DefineConversation/index.tsx

@@ -9,7 +9,7 @@ import { DialogFooter } from 'office-ui-fabric-react/lib/Dialog';
 import formatMessage from 'format-message';
 import { PrimaryButton, DefaultButton } from 'office-ui-fabric-react/lib/Button';
 import { Stack, StackItem } from 'office-ui-fabric-react/lib/Stack';
-import React, { useState, Fragment, useEffect, useContext } from 'react';
+import React, { useState, Fragment, useEffect } from 'react';
 import { TextField } from 'office-ui-fabric-react/lib/TextField';
 import { RouteComponentProps } from '@reach/router';
 import querystring from 'query-string';
@@ -18,21 +18,19 @@ import { DialogCreationCopy } from '../../../constants';
 import { DialogWrapper } from '../../DialogWrapper';
 import { DialogTypes } from '../../DialogWrapper/styles';
 import { LocationSelectContent } from '../LocationBrowser/LocationSelectContent';
-import { StoreContext } from '../../../store';
+import { StorageFolder } from '../../../store/types';
 
 import { name, description, halfstack, stackinput } from './styles';
 const MAXTRYTIMES = 10000;
 
 interface FormData {
   name: string;
   description: string;
-  location: string;
   schemaUrl: string;
 }
 
 interface FormDataError {
   name?: string;
-  location?: string;
 }
 
 interface DefineConversationProps
@@ -45,16 +43,14 @@ interface DefineConversationProps
   onCurrentPathUpdate: (newPath?: string, storageId?: string) => void;
   onGetErrorMessage?: (text: string) => void;
   saveTemplateId?: (templateId: string) => void;
+  focusedStorageFolder: StorageFolder;
 }
 
 const initialFormDataError: FormDataError = {};
 
 const DefineConversation: React.FC<DefineConversationProps> = props => {
-  const { onSubmit, onDismiss, onCurrentPathUpdate, saveTemplateId, templateId } = props;
-  const { state } = useContext(StoreContext);
-  const { focusedStorageFolder } = state;
+  const { onSubmit, onDismiss, onCurrentPathUpdate, saveTemplateId, templateId, focusedStorageFolder } = props;
   const files = get(focusedStorageFolder, 'children', []);
-
   const getDefaultName = () => {
     let i = -1;
     const bot = templateId;
@@ -72,7 +68,7 @@ const DefineConversation: React.FC<DefineConversationProps> = props => {
     return defaultName;
   };
 
-  const initalFormData: FormData = { name: '', description: '', location: '', schemaUrl: '' };
+  const initalFormData: FormData = { name: '', description: '', schemaUrl: '' };
   const [formData, setFormData] = useState(initalFormData);
   const [formDataErrors, setFormDataErrors] = useState(initialFormDataError);
   const [disable, setDisable] = useState(false);
@@ -109,11 +105,6 @@ const DefineConversation: React.FC<DefineConversationProps> = props => {
     return errors;
   };
 
-  useEffect(() => {
-    const currentPath = Path.join(focusedStorageFolder.parent || '', focusedStorageFolder.name || '');
-    updateForm('location')(null, currentPath);
-  }, [focusedStorageFolder]);
-
   useEffect(() => {
     if (formData.name) {
       const errors = validateForm(formData);
@@ -133,7 +124,7 @@ const DefineConversation: React.FC<DefineConversationProps> = props => {
   });
 
   useEffect(() => {
-    const formData: FormData = { name: getDefaultName(), description: '', location: '', schemaUrl: '' };
+    const formData: FormData = { name: getDefaultName(), description: '', schemaUrl: '' };
     setFormData(formData);
     if (props.location && props.location.search) {
       const updatedFormData = {
@@ -171,7 +162,6 @@ const DefineConversation: React.FC<DefineConversationProps> = props => {
       ...formData,
     });
   };
-
   return (
     <Fragment>
       <DialogWrapper
@@ -209,6 +199,7 @@ const DefineConversation: React.FC<DefineConversationProps> = props => {
           <LocationSelectContent
             operationMode={{ read: true, write: true }}
             onCurrentPathUpdate={onCurrentPathUpdate}
+            focusedStorageFolder={focusedStorageFolder}
           />
 
           <DialogFooter>

Composer/packages/client/src/components/CreationFlow/LocationBrowser/LocationSelectContent.tsx

@@ -11,6 +11,7 @@ import { CreationFlowStatus } from '../../../constants';
 import { File } from '../../../store/types';
 import { StoreContext } from '../../../store';
 import { FileTypes } from '../../../constants';
+import { StorageFolder } from '../../../store/types';
 
 import { FileSelector } from './FileSelector';
 import { loading, fileSelectorContainer } from './styles';
@@ -20,14 +21,15 @@ interface LocationSelectContentProps {
     read: boolean;
     write: boolean;
   };
+  focusedStorageFolder: StorageFolder;
   onOpen?: (path: string, storage: string) => void;
   onCurrentPathUpdate: (newPath?: string, storageId?: string) => void;
 }
 
 export const LocationSelectContent: React.FC<LocationSelectContentProps> = props => {
-  const { onOpen, onCurrentPathUpdate, operationMode } = props;
+  const { onOpen, onCurrentPathUpdate, operationMode, focusedStorageFolder } = props;
   const { state } = useContext(StoreContext);
-  const { storages, storageFileLoadingStatus, creationFlowStatus, focusedStorageFolder } = state;
+  const { storages, storageFileLoadingStatus, creationFlowStatus } = state;
   const currentStorageIndex = useRef(0);
   const onFileChosen = (item: File) => {
     if (item) {

Composer/packages/client/src/components/CreationFlow/OpenProject/index.tsx

@@ -13,15 +13,16 @@ import { DialogCreationCopy } from '../../../constants';
 import { DialogWrapper } from '../../DialogWrapper';
 import { DialogTypes } from '../../DialogWrapper/styles';
 import { LocationSelectContent } from '../LocationBrowser/LocationSelectContent';
-
+import { StorageFolder } from '../../../store/types';
 interface OpenProjectProps extends RouteComponentProps<{}> {
+  focusedStorageFolder: StorageFolder;
   onOpen: (path: string, storage: string) => void;
   onCurrentPathUpdate: (newPath?: string, storageId?: string) => void;
   onDismiss: () => void;
 }
 
 export const OpenProject: React.FC<OpenProjectProps> = props => {
-  const { onOpen, onDismiss, onCurrentPathUpdate } = props;
+  const { onOpen, onDismiss, onCurrentPathUpdate, focusedStorageFolder } = props;
 
   return (
     <DialogWrapper
@@ -38,6 +39,7 @@ export const OpenProject: React.FC<OpenProjectProps> = props => {
           }}
           onOpen={onOpen}
           onCurrentPathUpdate={onCurrentPathUpdate}
+          focusedStorageFolder={focusedStorageFolder}
         />
         <DialogFooter>
           <DefaultButton onClick={onDismiss} text={formatMessage('Cancel')} />

Composer/packages/client/src/components/CreationFlow/index.tsx

@@ -30,7 +30,7 @@ const CreationFlow: React.FC<CreationFlowProps> = () => {
     fetchFolderItemsByPath,
     setCreationFlowStatus,
   } = actions;
-  const { templateId, templateProjects, storages } = state;
+  const { templateId, templateProjects, storages, focusedStorageFolder } = state;
   const currentStorageIndex = useRef(0);
   const storage = storages[currentStorageIndex.current];
   const currentStorageId = storage ? storage.id : 'default';
@@ -70,11 +70,22 @@ const CreationFlow: React.FC<CreationFlowProps> = () => {
   };
 
   const handleCreateNew = async formData => {
-    await createProject(templateId || '', formData.name, formData.description, formData.location, formData.schemaUrl);
+    await createProject(
+      templateId || '',
+      formData.name,
+      formData.description,
+      Path.join(focusedStorageFolder.parent || '', focusedStorageFolder.name || ''),
+      formData.schemaUrl
+    );
   };
 
   const handleSaveAs = async formData => {
-    await saveProjectAs(state.projectId, formData.name, formData.description, formData.location);
+    await saveProjectAs(
+      state.projectId,
+      formData.name,
+      formData.description,
+      Path.join(focusedStorageFolder.parent || '', focusedStorageFolder.name || '')
+    );
   };
 
   const handleSubmit = formData => {
@@ -106,6 +117,7 @@ const CreationFlow: React.FC<CreationFlowProps> = () => {
           onSubmit={handleSubmit}
           onDismiss={handleDismiss}
           onCurrentPathUpdate={updateCurrentPath}
+          focusedStorageFolder={focusedStorageFolder}
           path="create/:templateId"
           saveTemplateId={saveTemplateId}
         />
@@ -114,9 +126,16 @@ const CreationFlow: React.FC<CreationFlowProps> = () => {
           onSubmit={handleSubmit}
           onDismiss={handleDismiss}
           onCurrentPathUpdate={updateCurrentPath}
-          path=":projectId/save"
+          focusedStorageFolder={focusedStorageFolder}
+          path=":projectId/:templateId/save"
+        />
+        <OpenProject
+          onOpen={openBot}
+          onDismiss={handleDismiss}
+          onCurrentPathUpdate={updateCurrentPath}
+          focusedStorageFolder={focusedStorageFolder}
+          path="open"
         />
-        <OpenProject onOpen={openBot} onDismiss={handleDismiss} onCurrentPathUpdate={updateCurrentPath} path="open" />
       </Router>
     </Fragment>
   );

Composer/packages/client/src/components/NavItem/styles.ts

@@ -29,7 +29,6 @@ export const link = (active: boolean, disabled: boolean) => css`
     : `&:hover {
       background-color: ${NeutralColors.gray50};
     }
-
     &:focus {
       outline: none;
       .ms-Fabric--isFocusVisible &::after {