Add components field to migrated settings. Guard against missing fiel…

…d during component merge (#7674) Co-authored-by: Dong Lei <donglei@microsoft.com> Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>
microsoft · Jun 3, 2021 · 8fb459e · 8fb459e
1 parent fbd6d83
commit 8fb459e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/Composer/packages/server/src/services/project.ts b/Composer/packages/server/src/services/project.ts
@@ -528,6 +528,7 @@ export class BotProjectService {
         const newSettings: DialogSetting = {
           ...currentProject.settings,
           runtimeSettings: {
+            components: [],
             features: {
               showTyping: originalProject.settings?.feature?.UseShowTypingMiddleware || false,
               useInspection: originalProject.settings?.feature?.UseInspectionMiddleware || false,

diff --git a/extensions/packageManager/src/node/index.ts b/extensions/packageManager/src/node/index.ts
@@ -367,11 +367,6 @@ export default async (composer: IExtensionRegistration): Promise<void> => {
 
             const installedComponents = await loadPackageAssets(mergeResults.components.filter(isAdaptiveComponent));
             if (mergeResults) {
-              res.json({
-                success: true,
-                components: installedComponents,
-              });
-
               let runtimeLanguage = 'c#';
               if (
                 currentProject.settings.runtime.key === 'node-azurewebapp' ||
@@ -387,18 +382,27 @@ export default async (composer: IExtensionRegistration): Promise<void> => {
                 !currentProject.settings.runtimeSettings?.components?.find((p) => p.name === newlyInstalledPlugin.name)
               ) {
                 const newSettings = await currentProject.getEnvSettings();
+                // guard against missing settings keys
                 if (!newSettings.runtimeSettings) {
                   newSettings.runtimeSettings = {
                     components: [],
                   };
                 }
+                if (!newSettings.runtimeSettings.components) {
+                  newSettings.runtimeSettings.components = [];
+                }
                 newSettings.runtimeSettings.components.push({
                   name: newlyInstalledPlugin.name,
                   settingsPrefix: newlyInstalledPlugin.name,
                 });
                 currentProject.updateEnvSettings(newSettings);
               }
               updateRecentlyUsed(installedComponents, runtimeLanguage);
+
+              res.json({
+                success: true,
+                components: installedComponents,
+              });
             } else {
               res.json({
                 success: false,