Merge branch 'main' into benbrown/createstatus

microsoft · Feb 26, 2021 · 53bea4f · 53bea4f
2 parents 728e331 + 43355d4
commit 53bea4f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 34 deletions.
diff --git a/Composer/packages/server/src/controllers/eject.ts b/Composer/packages/server/src/controllers/eject.ts
@@ -7,15 +7,15 @@ import { LocalDiskStorage } from '../models/storage/localDiskStorage';
 
 export const EjectController = {
   getTemplates: async (req, res) => {
-    res.json(ExtensionContext.extensions.runtimeTemplates);
+    res.json(ExtensionContext.extensions.runtimeTemplates.filter((t) => (t.eject ? true : false)));
   },
   eject: async (req, res) => {
     const user = await ExtensionContext.getUserFromRequest(req);
     const projectId = req.params.projectId;
     const currentProject = await BotProjectService.getProjectById(projectId, user);
 
     const template = ExtensionContext.extensions.runtimeTemplates.find((i) => i.key === req.params.template);
-    if (template) {
+    if (template?.eject) {
       let runtimePath;
       try {
         runtimePath = await template.eject(currentProject, new LocalDiskStorage(), req.body?.isReplace);

diff --git a/Composer/packages/server/src/locales/en-US.json b/Composer/packages/server/src/locales/en-US.json
@@ -1055,6 +1055,9 @@
   "downloading_bb6fb34b": {
     "message": "Downloading..."
   },
+  "downloading_language_model_9d40c817": {
+    "message": "Downloading Language Model"
+  },
   "duplicate_31cec192": {
     "message": "Duplicate"
   },

diff --git a/Composer/packages/server/src/utility/project.ts b/Composer/packages/server/src/utility/project.ts
@@ -65,9 +65,12 @@ export async function ejectAndMerge(currentProject: BotProject, jobId: string) {
     const runtimePath = currentProject.getRuntimePath();
     if (runtimePath) {
       if (!fs.existsSync(runtimePath)) {
-        await runtime.eject(currentProject, currentProject.fileStorage);
+        if (runtime.eject) {
+          await runtime.eject(currentProject, currentProject.fileStorage);
+        } else {
+          log('Eject skipped for project with invalid runtime setting');
+        }
       }
-
       // install all dependencies and build the app
       BackgroundProcessManager.updateProcess(jobId, 202, formatMessage('Building runtime'));
       await runtime.build(runtimePath, currentProject);

diff --git a/Composer/packages/types/src/runtime.ts b/Composer/packages/types/src/runtime.ts
@@ -52,7 +52,7 @@ export type BotTemplate = {
 
 export type RuntimeTemplate = {
   /** method used to eject the runtime into a project. returns resulting path of runtime! */
-  eject: (project: IBotProject, localDisk?: any, isReplace?: boolean) => Promise<string>;
+  eject?: (project: IBotProject, localDisk?: any, isReplace?: boolean) => Promise<string>;
 
   /** build method used for local publish */
   build: (runtimePath: string, project: IBotProject) => Promise<void>;

diff --git a/extensions/runtimes/src/index.ts b/extensions/runtimes/src/index.ts
@@ -165,7 +165,7 @@ export default async (composer: any): Promise<void> => {
         await copyDir(schemaSrcPath, localDisk, schemaDstPath, project.fileStorage, pathsToExclude);
         const schemaFolderInRuntime = path.join(destPath, 'azurewebapp/Schemas');
         await removeDirAndFiles(schemaFolderInRuntime);
-        return path.relative(project.dir, destPath);
+        return path.relative(path.join(project.dir, 'settings'), destPath);
       }
       throw new Error(`Runtime already exists at ${destPath}`);
     },
@@ -308,7 +308,7 @@ export default async (composer: any): Promise<void> => {
         const schemaFolderInRuntime = path.join(destPath, 'schemas');
         await removeDirAndFiles(schemaFolderInRuntime);
 
-        return path.relative(project.dir, destPath);
+        return path.relative(path.join(project.dir, 'settings'), destPath);
       }
       throw new Error(`Runtime already exists at ${destPath}`);
     },
@@ -452,33 +452,6 @@ export default async (composer: any): Promise<void> => {
       // return the location of the build artifiacts
       return publishFolder;
     },
-    eject: async (project, localDisk: IFileStorage, isReplace: boolean) => {
-      const sourcePath = dotnetTemplatePath;
-      const destPath = path.join(project.dir, 'runtime');
-      if ((await project.fileStorage.exists(destPath)) && isReplace) {
-        // remove runtime folder
-        await removeDirAndFiles(destPath);
-      }
-      if (!(await project.fileStorage.exists(destPath))) {
-        // used to read bot project template from source (bundled in plugin)
-        await copyDir(sourcePath, localDisk, destPath, project.fileStorage);
-        const schemaDstPath = path.join(project.dir, 'schemas');
-        const schemaSrcPath = path.join(sourcePath, 'azurewebapp/Schemas');
-        const customSchemaExists = fs.existsSync(schemaDstPath);
-        const pathsToExclude: Set<string> = new Set();
-        if (customSchemaExists) {
-          const sdkExcludePath = await localDisk.glob('sdk.schema', schemaSrcPath);
-          if (sdkExcludePath.length > 0) {
-            pathsToExclude.add(path.join(schemaSrcPath, sdkExcludePath[0]));
-          }
-        }
-        await copyDir(schemaSrcPath, localDisk, schemaDstPath, project.fileStorage, pathsToExclude);
-        const schemaFolderInRuntime = path.join(destPath, 'azurewebapp/Schemas');
-        await removeDirAndFiles(schemaFolderInRuntime);
-        return path.relative(project.dir, destPath);
-      }
-      throw new Error(`Runtime already exists at ${destPath}`);
-    },
     setSkillManifest: async (
       dstRuntimePath: string,
       dstStorage: IFileStorage,