feat: Plugin loader and multi-user capabilities

Composer/Dockerfile

@@ -27,6 +27,7 @@ COPY --from=build /src/Composer/package.json .
 COPY --from=build /src/Composer/packages/server ./packages/server
 COPY --from=build /src/Composer/packages/lib ./packages/lib
 COPY --from=build /src/Composer/packages/tools ./packages/tools
+COPY --from=build /src/Composer/plugins ./plugins
 
 ENV NODE_ENV "production"
 RUN yarn --production --frozen-lockfile --force && yarn cache clean

Composer/cypress/integration/LUPage.spec.ts

@@ -2,16 +2,16 @@
 // Licensed under the MIT License.
 
 context('LU Page', () => {
-  before(() => {
+  beforeEach(() => {
     cy.visit(Cypress.env('COMPOSER_URL'));
     cy.createBot('ToDoBotWithLuisSample');
   });
 
   it('can open language understanding page', () => {
     cy.findByTestId('LeftNav-CommandBarButtonUser Input').click();
-
+    cy.wait(1000);
     // left nav tree
-    cy.contains('ToDoBotWithLuisSample.Main');
+    cy.contains('__TestToDoBotWithLuisSample.Main');
     cy.contains('All');
 
     cy.get('.toggleEditMode button').should('not.exist');

Composer/cypress/integration/LuisDeploy.spec.ts

@@ -4,19 +4,18 @@
 context('Luis Deploy', () => {
   beforeEach(() => {
     cy.server();
-    cy.route('GET', '/api/launcher/connect?botEnvironment=production', 'OK');
-    cy.route('POST', '/api/launcher/sync', 'OK');
-    cy.route('POST', 'api/projects/opened/settings', 'OK');
+    cy.route('POST', '/api/publish/*/publish/default', 'OK');
+    cy.route('POST', '/api/projects/*/settings', 'OK');
     cy.visit(Cypress.env('COMPOSER_URL'));
     cy.createBot('ToDoBotWithLuisSample');
   });
 
   it('can deploy luis success', () => {
     cy.findByTestId('LeftNav-CommandBarButtonUser Input').click();
-
+    cy.wait(1000);
     cy.route({
       method: 'POST',
-      url: '/api/projects/opened/luFiles/publish',
+      url: 'api/projects/*/luFiles/publish',
       status: 200,
       response: 'fixture:luPublish/success',
     });
@@ -39,7 +38,7 @@ context('Luis Deploy', () => {
 
     cy.route({
       method: 'POST',
-      url: '/api/projects/opened/luFiles/publish',
+      url: 'api/projects/*/luFiles/publish',
       status: 400,
       response: 'fixture:luPublish/error',
     });

Composer/cypress/integration/NotificationPage.spec.ts

@@ -13,9 +13,9 @@ context('Notification Page', () => {
 
     cy.get('.toggleEditMode button').as('switchButton');
     cy.get('@switchButton').click();
-    cy.get('textarea').type('test lg syntax error#');
+    cy.get('textarea').type('#');
 
-    cy.visitPage('Notifications');
+    cy.get('[data-testid="notifications-info-button"]').click();
 
     cy.get('[data-testid="notifications-table-view"]').within(() => {
       cy.findAllByText('common.lg')
@@ -35,9 +35,9 @@ context('Notification Page', () => {
     });
 
     cy.get('.toggleEditMode button').click();
-    cy.get('textarea').type('test lu syntax error');
+    cy.get('textarea').type('t');
 
-    cy.visitPage('Notifications');
+    cy.get('[data-testid="notifications-info-button"]').click();
 
     cy.get('[data-testid="notifications-table-view"]').within(() => {
       cy.findAllByText('Main.lu')
@@ -65,7 +65,7 @@ context('Notification Page', () => {
       cy.get('.ObjectItem input').type('()');
     });
 
-    cy.visitPage('Notifications');
+    cy.get('[data-testid="notifications-info-button"]').click();
 
     cy.get('[data-testid="notifications-table-view"]').within(() => {
       cy.findAllByText('Main.dialog')

Composer/cypress/integration/ToDoBot.spec.ts

@@ -2,9 +2,10 @@
 // Licensed under the MIT License.
 
 context('ToDo Bot', () => {
-  beforeEach(() => {
+  before(() => {
     cy.visit(Cypress.env('COMPOSER_URL'));
     cy.createBot('TodoSample');
+    cy.wait(5000);
   });
 
   it('can open the main dialog', () => {

Composer/package.json

@@ -20,14 +20,15 @@
     "packages/tools/language-servers/*"
   ],
   "scripts": {
-    "build": "node scripts/update.js && node scripts/begin.js && yarn build:prod",
+    "build": "node scripts/update.js && node scripts/begin.js && yarn build:prod && yarn build:plugins",
     "build:prod": "yarn build:dev && yarn build:server && yarn build:client",
-    "build:dev": "yarn build:lib && yarn build:tools && yarn build:extensions",
+    "build:dev": "yarn build:lib && yarn build:tools && yarn build:extensions && yarn build:plugins",
     "build:lib": "yarn workspace @bfc/libs build:all",
     "build:extensions": "yarn workspace @bfc/extensions build:all",
     "build:server": "yarn workspace @bfc/server build",
     "build:client": "yarn workspace @bfc/client build",
     "build:tools": "yarn workspace @bfc/tools build:all",
+    "build:plugins": "cd plugins/localPublish && yarn install && yarn build",
     "start": "cross-env NODE_ENV=production PORT=3000 yarn start:server",
     "startall": "node scripts/update.js && yarn start",
     "start:dev": "concurrently  \"npm:start:client\" \"npm:start:server:dev\"",

Composer/packages/client/config/env.js

@@ -91,6 +91,8 @@ function getClientEnvironment(publicUrl) {
           .replace('\n', ''),
         SDK_PACKAGE_VERSION: '4.7.0-preview-191208-1', // TODO: change this when Composer supports custom schema/custom runtime
         COMPOSER_VERSION: 'Preview 2.0',
+        LOCAL_PUBLISH_PATH:
+          process.env.LOCAL_PUBLISH_PATH || path.resolve(process.cwd(), '../../plugins/localPublish/hostedBots'),
       }
     );
   // Stringify all values so we can feed into Webpack DefinePlugin

Composer/packages/client/package.json

@@ -101,4 +101,4 @@
     "webpack-manifest-plugin": "2.1.0",
     "workbox-webpack-plugin": "4.3.1"
   }
-}
+}

Composer/packages/client/src/App.tsx

@@ -27,7 +27,8 @@ const Onboarding = React.lazy(() => import('./Onboarding'));
 // eslint-disable-next-line react/display-name
 const Content = forwardRef<HTMLDivElement>((props, ref) => <div css={content} {...props} ref={ref} />);
 
-const topLinks = (botLoaded: boolean) => {
+const topLinks = (projectId: string) => {
+  const botLoaded = !!projectId;
   let links = [
     {
       to: '/home',
@@ -37,7 +38,7 @@ const topLinks = (botLoaded: boolean) => {
       disabled: false,
     },
     {
-      to: '/dialogs/Main',
+      to: `/bot/${projectId}/dialogs/Main`,
       iconName: 'SplitObject',
       labelName: formatMessage('Design Flow'),
       exact: false,
@@ -51,14 +52,14 @@ const topLinks = (botLoaded: boolean) => {
     //   disabled: true, // will delete
     // },
     {
-      to: '/language-generation',
+      to: `/bot/${projectId}/language-generation`,
       iconName: 'Robot',
       labelName: formatMessage('Bot Responses'),
       exact: false,
       disabled: !botLoaded,
     },
     {
-      to: '/language-understanding',
+      to: `/bot/${projectId}/language-understanding`,
       iconName: 'People',
       labelName: formatMessage('User Input'),
       exact: false,
@@ -72,14 +73,14 @@ const topLinks = (botLoaded: boolean) => {
     //   disabled: true,
     // },
     {
-      to: '/notifications',
+      to: `/bot/${projectId}/notifications`,
       iconName: 'Warning',
       labelName: formatMessage('Notifications'),
       exact: true,
       disabled: !botLoaded,
     },
     {
-      to: '/setting/',
+      to: `/bot/${projectId}/setting/`,
       iconName: 'Settings',
       labelName: formatMessage('Settings'),
       exact: false,
@@ -114,7 +115,7 @@ const bottomLinks = [
 export const App: React.FC = () => {
   const { state, actions } = useContext(StoreContext);
   const [sideBarExpand, setSideBarExpand] = useState(false);
-  const { botName, creationFlowStatus } = state;
+  const { botName, projectId, creationFlowStatus } = state;
   const { setCreationFlowStatus } = actions;
   const mapNavItemTo = x => resolveToBasePath(BASEPATH, x);
 
@@ -136,7 +137,7 @@ export const App: React.FC = () => {
               ariaLabel={sideBarExpand ? formatMessage('Collapse Nav') : formatMessage('Expand Nav')}
             />
             <div css={dividerTop} />{' '}
-            {topLinks(!!botName).map((link, index) => {
+            {topLinks(projectId).map((link, index) => {
               return (
                 <NavItem
                   key={'NavLeftBar' + index}

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

@@ -28,7 +28,7 @@ interface FormDataError {
   name?: string;
 }
 
-interface Bots {
+interface Files {
   name: '';
   path: '';
 }
@@ -40,13 +40,13 @@ interface DefineConversationProps {
   onGetErrorMessage?: (text: string) => void;
   focusedStorageFolder?: StorageFolder;
   currentPath?: string;
-  bots?: Bots[];
+  files?: Files[];
 }
 
 const initialFormDataError: FormDataError = {};
 
 export const DefineConversation: React.FC<DefineConversationProps> = props => {
-  const { onSubmit, onDismiss, onCurrentPathUpdate, focusedStorageFolder, currentPath, bots } = props;
+  const { onSubmit, onDismiss, onCurrentPathUpdate, focusedStorageFolder, currentPath, files } = props;
   const { state } = useContext(StoreContext);
   const { templateId } = state;
 
@@ -58,9 +58,9 @@ export const DefineConversation: React.FC<DefineConversationProps> = props => {
       i++;
       defaultName = `${bot}-${i}`;
     } while (
-      bots &&
-      bots.find(bot => {
-        return bot.name === defaultName;
+      files &&
+      files.find(file => {
+        return file.name.toLowerCase() === defaultName.toLowerCase();
       }) &&
       i < MAXTRYTIMES
     );
@@ -94,9 +94,9 @@ export const DefineConversation: React.FC<DefineConversationProps> = props => {
         : '';
     if (
       name &&
-      bots &&
-      bots.find(bot => {
-        return bot.path === newBotPath;
+      files &&
+      files.find(bot => {
+        return bot.path.toLowerCase() === newBotPath.toLowerCase();
       })
     ) {
       errors.name = formatMessage('Duplication of names');
@@ -116,7 +116,7 @@ export const DefineConversation: React.FC<DefineConversationProps> = props => {
       setDisable(false);
     }
     setFormDataErrors(errors);
-  }, [bots, formData.name]);
+  }, [files, formData.name]);
 
   const handleSubmit = e => {
     e.preventDefault();

Composer/packages/client/src/CreationFlow/index.js

@@ -17,7 +17,7 @@ import { navigateTo } from './../utils/navigation';
 
 export function CreationFlow(props) {
   const { state, actions } = useContext(StoreContext);
-  const [bots, setBots] = useState([]);
+  const [files, setFiles] = useState([]);
   const [step, setStep] = useState();
   // eslint-disable-next-line react/prop-types
   const { creationFlowStatus, setCreationFlowStatus } = props;
@@ -47,13 +47,7 @@ export function CreationFlow(props) {
   useEffect(() => {
     const allFilesInFolder = get(focusedStorageFolder, 'children', []);
 
-    const botsInCurrentFolder = allFilesInFolder.filter(file => {
-      if (file.type === FileTypes.BOT) {
-        return file;
-      }
-    });
-
-    setBots(botsInCurrentFolder);
+    setFiles(allFilesInFolder);
     if (Object.keys(focusedStorageFolder).length) {
       setCurrentPath(Path.join(focusedStorageFolder.parent, focusedStorageFolder.name));
     }
@@ -105,7 +99,7 @@ export function CreationFlow(props) {
 
   const openBot = async botFolder => {
     await openBotProject(botFolder);
-    navigateTo('/dialogs/Main');
+    // navigateTo(`/bot/${state.projectId}/dialogs/Main`);
     handleDismiss();
   };
 
@@ -114,7 +108,7 @@ export function CreationFlow(props) {
   };
 
   const handleSaveAs = async formData => {
-    await saveProjectAs(formData.name, formData.description, formData.location);
+    await saveProjectAs(state.projectId, formData.name, formData.description, formData.location);
   };
 
   const handleSubmit = formData => {
@@ -123,11 +117,11 @@ export function CreationFlow(props) {
       case CreationFlowStatus.NEW_FROM_TEMPLATE:
       case CreationFlowStatus.NEW:
         handleCreateNew(formData);
-        navigateTo('/dialogs/Main');
+        //navigateTo(`/bot/${state.projectId}/dialogs/Main`);
         break;
       case CreationFlowStatus.SAVEAS:
         handleSaveAs(formData);
-        navigateTo('/dialogs/Main');
+        navigateTo(`/bot/${state.projectId}/dialogs/Main`);
         break;
       default:
         setStep(Steps.NONE);
@@ -167,7 +161,7 @@ export function CreationFlow(props) {
           onCurrentPathUpdate={updateCurrentPath}
           focusedStorageFolder={focusedStorageFolder}
           currentPath={currentPath}
-          bots={bots}
+          files={files}
         />
       ),
     },

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

@@ -24,10 +24,11 @@ const Onboarding: React.FC = () => {
     state: {
       dialogs,
       onboarding: { complete },
+      projectId,
     },
   } = useContext(StoreContext);
 
-  const [stepSets, setStepSets] = useState<IStepSet[]>(defaultStepSets());
+  const [stepSets, setStepSets] = useState<IStepSet[]>(defaultStepSets(projectId));
   const [currentSet, setCurrentSet] = useState<number>(getCurrentSet(stepSets));
   const [currentStep, setCurrentStep] = useState<number>(0);
   const [hideModal, setHideModal] = useState(true);
@@ -67,7 +68,7 @@ const Onboarding: React.FC = () => {
   }, [currentSet, currentStep, setTeachingBubble]);
 
   useEffect(() => {
-    const sets = defaultStepSets()
+    const sets = defaultStepSets(projectId)
       .map(stepSet => ({
         ...stepSet,
         steps: stepSet.steps.filter(({ targetId }) => {
@@ -85,7 +86,7 @@ const Onboarding: React.FC = () => {
   }, [dialogs]);
 
   useEffect(() => {
-    setHideModal(pathname !== '/dialogs/Main');
+    setHideModal(pathname !== `/bot/${projectId}/dialogs/Main`);
     if (currentSet === 0) {
       setCurrentStep(pathname === '/home' ? 0 : -1);
     }