npm - @microsoft/teamsfx-core - Versions diffs - 1.1.3-alpha.cef16e3d.0 → 1.2.0 - Mend

@microsoft/teamsfx-core 1.1.3-alpha.cef16e3d.0 → 1.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (223) hide show

package/build/plugins/solution/fx-solution/v2/getQuestions.js CHANGED Viewed

@@ -12,8 +12,6 @@ const ResourcePluginContainer_1 = require("../ResourcePluginContainer");
 const utils_1 = require("./utils");
 const __1 = require("../../../..");
 const constants_3 = require("./constants");
-const constants_4 = require("../v3/constants");
-const executeUserTask_1 = require("./executeUserTask");
 async function getQuestionsForScaffolding(ctx, inputs) {
     const node = new teamsfx_api_1.QTreeNode({
         name: "azure-solution-group",
@@ -294,94 +292,116 @@ exports.getQuestionsForUserTask = getQuestionsForUserTask;
 async function getQuestionsForAddCapability(ctx, inputs) {
     var _a;
     const settings = ctx.projectSetting.solutionSettings;
-    const addCapQuestion = {
-        name: question_1.AzureSolutionQuestionNames.Capabilities,
-        title: "Choose capabilities",
-        type: "multiSelect",
-        staticOptions: [],
-        default: [],
-    };
     const isDynamicQuestion = teamsfx_api_1.DynamicPlatforms.includes(inputs.platform);
-    if (!isDynamicQuestion) {
-        // For CLI_HELP
-        addCapQuestion.staticOptions = [question_1.TabOptionItem.id, question_1.BotOptionItem.id, question_1.MessageExtensionItem.id];
-        return teamsfx_api_1.ok(new teamsfx_api_1.QTreeNode(addCapQuestion));
+    if (!(settings.hostType === question_1.HostTypeOptionAzure.id) && isDynamicQuestion) {
+        return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error("Add capability is not supported for SPFx project"), constants_2.SolutionSource, constants_2.SolutionError.AddResourceNotSupport));
     }
-    const canProceed = executeUserTask_1.canAddCapability(settings, ctx.telemetryReporter);
-    if (canProceed.isErr()) {
-        return teamsfx_api_1.err(canProceed.error);
-    }
-    const appStudioPlugin = typedi_1.default.get(constants_4.BuiltInResourcePluginNames.appStudio);
-    const tabExceedRes = await appStudioPlugin.capabilityExceedLimit(ctx, inputs, "staticTab");
-    if (tabExceedRes.isErr()) {
-        return teamsfx_api_1.err(tabExceedRes.error);
-    }
-    const isTabAddable = !tabExceedRes.value;
-    const botExceedRes = await appStudioPlugin.capabilityExceedLimit(ctx, inputs, "Bot");
-    if (botExceedRes.isErr()) {
-        return teamsfx_api_1.err(botExceedRes.error);
-    }
-    const isBotAddable = !botExceedRes.value;
-    const meExceedRes = await appStudioPlugin.capabilityExceedLimit(ctx, inputs, "MessageExtension");
-    if (meExceedRes.isErr()) {
-        return teamsfx_api_1.err(meExceedRes.error);
-    }
-    const isMEAddable = !meExceedRes.value;
-    if (!(isTabAddable || isBotAddable || isMEAddable)) {
-        (_a = ctx.userInteraction) === null || _a === void 0 ? void 0 : _a.showMessage("error", tools_1.getStrings().solution.addCapability.ExceedMaxLimit, false);
+    const capabilities = settings.capabilities || [];
+    const alreadyHaveTab = capabilities.includes(question_1.TabOptionItem.id);
+    const alreadyHaveBotOrMe = capabilities.includes(question_1.BotOptionItem.id) || capabilities.includes(question_1.MessageExtensionItem.id);
+    if (alreadyHaveBotOrMe && alreadyHaveTab) {
+        const cannotAddCapWarnMsg = "Your App already has both Tab and Bot/Messaging extension, can not Add Capability.";
+        (_a = ctx.userInteraction) === null || _a === void 0 ? void 0 : _a.showMessage("error", cannotAddCapWarnMsg, false);
         return teamsfx_api_1.ok(undefined);
     }
-    const options = [];
-    if (isTabAddable)
-        options.push(question_1.TabOptionItem.id);
-    if (isBotAddable)
-        options.push(question_1.BotOptionItem.id);
-    if (isMEAddable)
-        options.push(question_1.MessageExtensionItem.id);
-    addCapQuestion.staticOptions = options;
-    return teamsfx_api_1.ok(new teamsfx_api_1.QTreeNode(addCapQuestion));
+    const addCapQuestion = question_1.addCapabilityQuestion(alreadyHaveTab, alreadyHaveBotOrMe);
+    const addCapNode = new teamsfx_api_1.QTreeNode(addCapQuestion);
+    //Tab sub tree
+    if (!alreadyHaveTab || !isDynamicQuestion) {
+        const tabRes = await getTabScaffoldQuestionsV2(ctx, inputs, false);
+        if (tabRes.isErr())
+            return tabRes;
+        if (tabRes.value) {
+            const tabNode = tabRes.value;
+            tabNode.condition = { contains: question_1.TabOptionItem.id };
+            addCapNode.addChild(tabNode);
+        }
+    }
+    // Bot has no question at all
+    return teamsfx_api_1.ok(addCapNode);
 }
 exports.getQuestionsForAddCapability = getQuestionsForAddCapability;
 async function getQuestionsForAddResource(ctx, inputs, func, envInfo, tokenProvider) {
     const settings = ctx.projectSetting.solutionSettings;
     const isDynamicQuestion = teamsfx_api_1.DynamicPlatforms.includes(inputs.platform);
-    if (!isDynamicQuestion) {
-        const question = question_1.createAddAzureResourceQuestion(false, false, false, false);
-        return teamsfx_api_1.ok(new teamsfx_api_1.QTreeNode(question));
+    if (isDynamicQuestion &&
+        !(settings.hostType === question_1.HostTypeOptionAzure.id &&
+            settings.capabilities &&
+            settings.capabilities.includes(question_1.TabOptionItem.id))) {
+        return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_2.SolutionError.AddResourceNotSupport, "Add resource is only supported for Tab app hosted in Azure.", constants_2.SolutionSource));
     }
-    const canProceed = executeUserTask_1.canAddResource(ctx.projectSetting, ctx.telemetryReporter);
-    if (canProceed.isErr()) {
-        return teamsfx_api_1.err(canProceed.error);
+    const selectedPlugins = settings.activeResourcePlugins || [];
+    if (!selectedPlugins) {
+        return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error("selectedPlugins is empty"), constants_2.SolutionSource, constants_2.SolutionError.InternelError));
     }
-    const alreadyHaveFunction = settings.azureResources.includes(question_1.AzureResourceFunction.id);
-    const alreadyHaveSQL = settings.azureResources.includes(question_1.AzureResourceSQL.id);
-    const alreadyHaveAPIM = settings.azureResources.includes(question_1.AzureResourceApim.id);
-    const alreadyHaveKeyVault = settings.azureResources.includes(question_1.AzureResourceKeyVault.id);
-    const addQuestion = question_1.createAddAzureResourceQuestion(alreadyHaveFunction, alreadyHaveSQL, alreadyHaveAPIM, alreadyHaveKeyVault);
+    const functionPlugin = typedi_1.default.get(ResourcePluginContainer_1.ResourcePluginsV2.FunctionPlugin);
+    const sqlPlugin = typedi_1.default.get(ResourcePluginContainer_1.ResourcePluginsV2.SqlPlugin);
+    const apimPlugin = typedi_1.default.get(ResourcePluginContainer_1.ResourcePluginsV2.ApimPlugin);
+    const keyVaultPlugin = typedi_1.default.get(ResourcePluginContainer_1.ResourcePluginsV2.KeyVaultPlugin);
+    const alreadyHaveFunction = selectedPlugins.includes(functionPlugin.name);
+    const alreadyHaveSQL = selectedPlugins.includes(sqlPlugin.name);
+    const alreadyHaveAPIM = selectedPlugins.includes(apimPlugin.name);
+    const alreadyHavekeyVault = selectedPlugins.includes(keyVaultPlugin.name);
+    const addQuestion = question_1.createAddAzureResourceQuestion(alreadyHaveFunction, alreadyHaveSQL, alreadyHaveAPIM, alreadyHavekeyVault);
     const addAzureResourceNode = new teamsfx_api_1.QTreeNode(addQuestion);
-    //traverse plugins' getQuestionsForUserTask
-    const pluginsWithResources = [
-        [ResourcePluginContainer_1.ResourcePluginsV2.FunctionPlugin, question_1.AzureResourceFunction.id],
-        [ResourcePluginContainer_1.ResourcePluginsV2.SqlPlugin, question_1.AzureResourceSQL.id],
-        [ResourcePluginContainer_1.ResourcePluginsV2.ApimPlugin, question_1.AzureResourceApim.id],
-        [ResourcePluginContainer_1.ResourcePluginsV2.KeyVaultPlugin, question_1.AzureResourceKeyVault.id],
-    ];
-    for (const pair of pluginsWithResources) {
-        const pluginName = pair[0];
-        const resourceName = pair[1];
-        const plugin = typedi_1.default.get(pluginName);
-        if (plugin.getQuestionsForUserTask) {
-            const res = await plugin.getQuestionsForUserTask(ctx, inputs, func, envInfo, tokenProvider);
-            if (res.isErr())
-                return res;
-            if (res.value) {
-                const node = res.value;
-                node.condition = { contains: resourceName };
-                if (node.data)
-                    addAzureResourceNode.addChild(node);
+    // there two cases to add function re-scaffold: 1. select add function   2. select add sql and function is not selected when creating
+    if (functionPlugin.getQuestionsForUserTask) {
+        const res = await functionPlugin.getQuestionsForUserTask(ctx, inputs, func, envInfo, tokenProvider);
+        if (res.isErr())
+            return res;
+        if (res.value) {
+            const azure_function = res.value;
+            if (alreadyHaveFunction) {
+                // if already has function, the question will appear depends on whether user select function, otherwise, the question will always show
+                azure_function.condition = { contains: question_1.AzureResourceFunction.id };
+            }
+            else {
+                // if not function activated, select any option will trigger function question
+                azure_function.condition = {
+                    containsAny: [question_1.AzureResourceApim.id, question_1.AzureResourceFunction.id, question_1.AzureResourceSQL.id],
+                };
             }
+            if (azure_function.data)
+                addAzureResourceNode.addChild(azure_function);
         }
     }
+    // //Azure SQL
+    // if (sqlPlugin.getQuestionsForUserTask && !alreadyHaveSQL) {
+    //   const res = await sqlPlugin.getQuestionsForUserTask(ctx, inputs, func, envInfo, tokenProvider);
+    //   if (res.isErr()) return res;
+    //   if (res.value) {
+    //     const azure_sql = res.value as QTreeNode;
+    //     azure_sql.condition = { contains: AzureResourceSQL.id };
+    //     if (azure_sql.data) addAzureResourceNode.addChild(azure_sql);
+    //   }
+    // }
+    // //APIM
+    // if (apimPlugin.getQuestionsForUserTask && (!alreadyHaveAPIM || !isDynamicQuestion)) {
+    //   const res = await apimPlugin.getQuestionsForUserTask(ctx, inputs, func, envInfo, tokenProvider);
+    //   if (res.isErr()) return res;
+    //   if (res.value) {
+    //     const apim = res.value as QTreeNode;
+    //     if (apim.data.type !== "group" || (apim.children && apim.children.length > 0)) {
+    //       const groupNode = new QTreeNode({ type: "group" });
+    //       groupNode.condition = { contains: AzureResourceApim.id };
+    //       addAzureResourceNode.addChild(groupNode);
+    //       const funcNode = new QTreeNode(AskSubscriptionQuestion);
+    //       AskSubscriptionQuestion.func = async (
+    //         inputs: Inputs
+    //       ): Promise<Result<SubscriptionInfo, FxError>> => {
+    //         const res = await checkSubscription(envInfo, tokenProvider.azureAccountProvider);
+    //         if (res.isOk()) {
+    //           const sub = res.value;
+    //           inputs.subscriptionId = sub.subscriptionId;
+    //           inputs.tenantId = sub.tenantId;
+    //         }
+    //         return res;
+    //       };
+    //       groupNode.addChild(funcNode);
+    //       groupNode.addChild(apim);
+    //     }
+    //   }
+    // }
     return teamsfx_api_1.ok(addAzureResourceNode);
 }
 exports.getQuestionsForAddResource = getQuestionsForAddResource;

package/build/plugins/solution/fx-solution/v2/getQuestions.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getQuestions.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/getQuestions.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"getQuestions.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/getQuestions.ts"],"names":[],"mappings":"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"}

package/build/plugins/solution/fx-solution/v2/scaffolding.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"scaffolding.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/scaffolding.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAGN,IAAI,EAIJ,IAAI,EACL,MAAM,wBAAwB,CAAC;AA8BhC,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA4EhC;AAED,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,OAAO,EAAE,EAAE,CAAC,cAAc,EAAE,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,~~CAkChC~~;AAED,wBAAsB,cAAc,CAClC,YAAY,EAAE,MAAM,EAAE,EACtB,cAAc,EAAE,MAAM,EAAE,EACxB,WAAW,EAAE,MAAM,EACnB,aAAa,CAAC,EAAE,OAAO,GACtB,OAAO,CAAC,IAAI,CAAC,CAmBf"}
1	+ {"version":3,"file":"scaffolding.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/scaffolding.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAGN,IAAI,EAIJ,IAAI,EACL,MAAM,wBAAwB,CAAC;AA8BhC,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA4EhC;AAED,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,OAAO,EAAE,EAAE,CAAC,cAAc,EAAE,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA8BhC;AAED,wBAAsB,cAAc,CAClC,YAAY,EAAE,MAAM,EAAE,EACtB,cAAc,EAAE,MAAM,EAAE,EACxB,WAAW,EAAE,MAAM,EACnB,aAAa,CAAC,EAAE,OAAO,GACtB,OAAO,CAAC,IAAI,CAAC,CAmBf"}

package/build/plugins/solution/fx-solution/v2/scaffolding.js CHANGED Viewed

@@ -82,10 +82,6 @@ async function scaffoldSourceCode(ctx, inputs) {
 }
 exports.scaffoldSourceCode = scaffoldSourceCode;
 async function scaffoldByPlugins(ctx, inputs, localSettings, plugins) {
-    var _a, _b, _c;
-    if (plugins.length === 0)
-        return teamsfx_api_1.ok(teamsfx_api_1.Void);
-    (_a = ctx.logProvider) === null || _a === void 0 ? void 0 : _a.info(`start scaffolding ${plugins.map((p) => p.name).join(",")}.....`);
     const thunks = plugins
         .filter((plugin) => !!plugin.scaffoldSourceCode)
         .map((plugin) => {
@@ -104,11 +100,9 @@ async function scaffoldByPlugins(ctx, inputs, localSettings, plugins) {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         await scaffoldReadme(capabilities, azureResources, inputs.projectPath);
         ctx.userInteraction.showMessage("info", `Success: ${tools_1.getStrings().solution.ScaffoldSuccessNotice}`, false);
-        (_b = ctx.logProvider) === null || _b === void 0 ? void 0 : _b.info(`finish scaffolding ${plugins.map((p) => p.name).join(",")}!`);
         return teamsfx_api_1.ok(teamsfx_api_1.Void);
     }
     else {
-        (_c = ctx.logProvider) === null || _c === void 0 ? void 0 : _c.info(`failed to scaffold ${plugins.map((p) => p.name).join(",")}!`);
         return teamsfx_api_1.err(result.error);
     }
 }

package/build/plugins/solution/fx-solution/v2/scaffolding.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"scaffolding.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/scaffolding.ts"],"names":[],"mappings":"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~~IAAI,OAAO,CAAC,~~MAAM,KAAK,CAAC;QAAE,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;IAC1C,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,qBAAqB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACxF,MAAM,~~MAAM,~~GAAuB,OAAO;SACvC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC;SAC/C,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACd,OAAO;YACL,UAAU,EAAE,GAAG,MAAM,CAAC,IAAI,EAAE;YAC5B,QAAQ,EAAE,oBAAoB;YAC9B,oEAAoE;YACpE,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,kBAAmB,CAAC,GAAG,EAAE,MAAM,CAAC;SACrD,CAAC;IACJ,CAAC,CAAC,CAAC;IAEL,MAAM,MAAM,GAAG,MAAM,8BAAmB,CAAC,MAAM,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;IAClE,MAAM,gBAAgB,GAAG,gCAAwB,CAAC,GAAG,CAAC,CAAC;IACvD,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE;QAC7B,MAAM,YAAY,GAAG,gBAAgB,CAAC,YAAY,CAAC;QACnD,MAAM,cAAc,GAAG,gBAAgB,CAAC,cAAc,CAAC;QAEvD,oEAAoE;QACpE,MAAM,cAAc,CAAC,YAAY,EAAE,cAAc,EAAE,MAAM,CAAC,WAAY,CAAC,CAAC;QAExE,GAAG,CAAC,eAAe,CAAC,WAAW,CAC7B,MAAM,EACN,YAAY,kBAAU,EAAE,CAAC,QAAQ,CAAC,qBAAqB,EAAE,EACzD,KAAK,CACN,CAAC;QACF,~~MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,sBAAsB,~~OAAO,~~CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACrF,OAAO,~~gBAAE,CAAC,kBAAI,CAAC,CAAC;KACjB;SAAM;QACL,~~MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,sBAAsB,~~OAAO,~~CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACrF,OAAO,~~iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KAC1B;AACH,CAAC;~~AAvCD~~,~~8CAuCC~~;AAEM,KAAK,UAAU,cAAc,CAClC,YAAsB,EACtB,cAAwB,EACxB,WAAmB,EACnB,aAAuB;IAEvB,YAAY,GAAG,YAAY,IAAI,EAAE,CAAC;IAClC,cAAc,GAAG,cAAc,IAAI,EAAE,CAAC;IACtC,MAAM,MAAM,GAAG,YAAY,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC,CAAC;IACvD,MAAM,SAAS,GAAG,YAAY,CAAC,QAAQ,CAAC,+BAAoB,CAAC,EAAE,CAAC,CAAC;IACjE,MAAM,MAAM,GAAG,YAAY,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC,CAAC;IACvD,IAAI,MAAM,IAAI,CAAC,MAAM,IAAI,SAAS,CAAC,EAAE;QACnC,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,sBAAkB,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;QACnF,IAAI,MAAM,kBAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YAC/B,MAAM,kBAAE,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,WAAW,IAAI,iCAAmB,EAAE,CAAC,CAAC;SAChE;KACF;IAED,IAAI,aAAa,EAAE;QACjB,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,sBAAkB,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;QACzF,IAAI,MAAM,kBAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YAC/B,MAAM,kBAAE,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,WAAW,IAAI,iCAAmB,EAAE,CAAC,CAAC;SAChE;KACF;AACH,CAAC;AAxBD,wCAwBC"}
1	+ {"version":3,"file":"scaffolding.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/scaffolding.ts"],"names":[],"mappings":"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"}

package/build/plugins/solution/fx-solution/v3/addResource.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"addResource.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/addResource.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,oBAAoB,EAEpB,OAAO,EAIP,SAAS,EACT,MAAM,EACN,aAAa,EACb,EAAE,EACF,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;~~AAShC~~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~~CAwDhC~~"}
1	+ {"version":3,"file":"addResource.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/addResource.ts"],"names":[],"mappings":"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"}

package/build/plugins/solution/fx-solution/v3/addResource.js CHANGED Viewed

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addResource = exports.getQuestionsForAddResource = exports.SPFxResourcePlugin = exports.AzureWebAppPlugin = exports.AzureBotPlugin = exports.AzureStoragePlugin = void 0;
 const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const lodash_1 = require("lodash");
 const typedi_1 = require("typedi");
 const arm_1 = tslib_1.__importDefault(require("../arm"));
 const constants_1 = require("./constants");
@@ -195,8 +194,6 @@ async function addResource(ctx, inputs) {
         return teamsfx_api_1.err(new error_2.InvalidInputError(inputs, "inputs.resource undefined"));
     }
     const solutionSettings = ctx.projectSetting.solutionSettings;
-    const originalSettings = lodash_1.cloneDeep(solutionSettings);
-    const inputsNew = Object.assign(Object.assign({}, inputs), { existingResources: originalSettings.activeResourcePlugins });
     if (inputs.module !== undefined) {
         const module = utils_1.getModule(solutionSettings, inputs.module);
         if (module) {
@@ -221,7 +218,7 @@ async function addResource(ctx, inputs) {
     //call arm module to generate arm templates
     const activatedPlugins = solutionSettings.activeResourcePlugins.map((n) => typedi_1.Container.get(n));
     const addedPlugins = Array.from(addedResourceNames).map((n) => typedi_1.Container.get(n));
-    const armRes = await arm_1.default.generateArmTemplate(ctx, inputsNew, activatedPlugins, addedPlugins);
+    const armRes = await arm_1.default.generateArmTemplate(ctx, inputs, activatedPlugins, addedPlugins);
     if (armRes.isErr()) {
         return teamsfx_api_1.err(armRes.error);
     }
@@ -230,7 +227,7 @@ async function addResource(ctx, inputs) {
         const plugin = typedi_1.Container.get(pluginName);
         if (addedResourceNames.has(pluginName) && !existingResourceNames.has(pluginName)) {
             if (plugin.addResource) {
-                const res = await plugin.addResource(ctx, inputsNew);
+                const res = await plugin.addResource(ctx, inputs);
                 if (res.isErr()) {
                     return teamsfx_api_1.err(res.error);
                 }

package/build/plugins/solution/fx-solution/v3/addResource.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"addResource.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/addResource.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAagC;AAChC,~~mCAAmC;AACnC,~~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~~MAAM,gBAAgB,GAAG,kBAAS,CAAC,gBAAgB,CAAC,CAAC;IACrD,MAAM,SAAS,mCACV,MAAM,KACT,iBAAiB,EAAE,gBAAgB,CAAC,qBAAqB,GAC1D,CAAC;IACF,~~IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,EAAE;QAC/B,MAAM,MAAM,GAAG,iBAAS,CAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAC1D,IAAI,MAAM,EAAE;YACV,IAAI,MAAM,CAAC,aAAa,KAAK,MAAM,CAAC,QAAQ,EAAE;gBAC5C,OAAO,iBAAG,CAAC,IAAI,iCAAyB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;aAC5D;YACD,MAAM,CAAC,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAC;SACxC;KACF;IACD,gCAAgC;IAChC,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAU,CAAC;IAC7C,MAAM,qBAAqB,GAAG,IAAI,GAAG,EAAU,CAAC;IAChD,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAU,CAAC;IAC3C,gBAAgB,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACpF,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACxC,MAAM,UAAU,GAAG,MAAM,2BAA2B,CAAC,GAAG,EAAE,MAAM,EAAE,kBAAkB,CAAC,CAAC;IACtF,IAAI,UAAU,CAAC,KAAK,EAAE;QAAE,OAAO,iBAAG,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IACrD,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3D,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9D,gBAAgB,CAAC,qBAAqB,GAAG,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAEtE,2CAA2C;IAC3C,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACxE,kBAAS,CAAC,GAAG,CAAoB,CAAC,CAAC,CACpC,CAAC;IACF,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAC5D,kBAAS,CAAC,GAAG,CAAoB,CAAC,CAAC,CACpC,CAAC;IACF,MAAM,MAAM,GAAG,MAAM,aAAG,CAAC,mBAAmB,CAAC,GAAG,EAAE,~~SAAS~~,EAAE,gBAAgB,EAAE,YAAY,CAAC,CAAC;~~IAC7F~~,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;QAClB,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KAC1B;IAED,sBAAsB;IACtB,KAAK,MAAM,UAAU,IAAI,gBAAgB,CAAC,MAAM,EAAE,EAAE;QAClD,MAAM,MAAM,GAAG,kBAAS,CAAC,GAAG,CAAoB,UAAU,CAAC,CAAC;QAC5D,IAAI,kBAAkB,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;YAChF,IAAI,MAAM,CAAC,WAAW,EAAE;gBACtB,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,~~SAAS~~,CAAC,CAAC;~~gBACrD~~,IAAI,GAAG,CAAC,KAAK,EAAE,EAAE;oBACf,OAAO,iBAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;iBACvB;aACF;SACF;KACF;IACD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;~~AA3DD~~,~~kCA2DC~~;AAED,KAAK,UAAU,2BAA2B,CACxC,GAAe,EACf,MAAyE,EACzE,kBAA+B;IAE/B,OAAO,IAAI,EAAE;QACX,MAAM,KAAK,GAAG,kBAAkB,CAAC,IAAI,CAAC;QACtC,KAAK,MAAM,IAAI,IAAI,kBAAkB,EAAE;YACrC,MAAM,MAAM,GAAG,kBAAS,CAAC,GAAG,CAAoB,IAAI,CAAC,CAAC;YACtD,IAAI,MAAM,CAAC,kBAAkB,EAAE;gBAC7B,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;gBAC5D,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;oBAClB,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;iBAC1B;gBACD,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,KAAK,EAAE;oBAC9B,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;iBAC7B;aACF;SACF;QACD,MAAM,KAAK,GAAG,kBAAkB,CAAC,IAAI,CAAC;QACtC,IAAI,KAAK,KAAK,KAAK;YAAE,MAAM;KAC5B;IACD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;AACvB,CAAC"}
1	+ {"version":3,"file":"addResource.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/addResource.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/teamsfx-core",
-  "version": "1.1.3-alpha.cef16e3d.0",
+  "version": "1.2.0",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "license": "MIT",
@@ -8,7 +8,7 @@
     "lint:staged": "lint-staged",
     "lint": "eslint \"src/**/*.ts\" \"tests/**/*.ts\"",
     "test:bot": "nyc mocha \"tests/plugins/resource/bot/**/*.test.ts\"",
-    "test:dotnet": "nyc mocha \"tests/plugins/resource/dotnet/**/*.test.ts\"",
+    "test:blazor": "nyc mocha \"tests/plugins/resource/blazor/**/*.test.ts\"",
     "test:function": "nyc mocha \"tests/plugins/resource/function/**/*.test.ts\"",
     "test:localdebug": "nyc mocha \"tests/plugins/resource/localdebug/**/*.test.ts\"",
     "test:frontend": "nyc mocha \"tests/plugins/resource/frontend/**/*.test.ts\"",
@@ -57,7 +57,7 @@
     "@azure/storage-blob": "^12.7.0",
     "@dbpiper/timer": "1.0.0-beta.2",
     "@feathersjs/hooks": "^0.6.5",
-    "@microsoft/teamsfx-api": "0.12.1-alpha.cef16e3d.0",
+    "@microsoft/teamsfx-api": "^0.13.0",
     "@npmcli/package-json": "^1.0.1",
     "@types/jwt-decode": "3.1.0",
     "@types/proper-lockfile": "^4.1.1",
@@ -170,7 +170,7 @@
     "resource/**/*",
     "templates/**/*"
   ],
-  "gitHead": "518de5c68bb46312e800c4518b9dcda64a4b84ca",
+  "gitHead": "bd24b384fac0378c6ea91f631dfbfdd01fc00bd0",
   "publishConfig": {
     "access": "public"
   },

package/resource/strings.json CHANGED Viewed

@@ -13,22 +13,12 @@
     "FailedToDeployBeforeProvision": "Failed to deploy because the resources have not been provisioned yet. Make sure you do the provision first. Click Get Help to learn more about why you need to provision.",
     "FailedToPublishBeforeProvision": "Failed to publish because the resources have not been provisioned yet. Make sure you do the provision first. Click Get Help to learn more about why you need to provision.",
     "SPFxAskProvisionBeforePublish": "Failed to publish because the teams app has not been provisioned yet. Please provision first. Click Get Help to learn more about why you need to provision.",
-    "addCapability" : {
-      "OnlySupportAzure": "Add capability is only supported for project hosted in Azure",
-      "ExceedMaxLimit": "Your App reaches maximal limit for Tabs, Bot and Message Extension.",
-      "AddCapabilityNotice": "[Teams Toolkit] Capability %s has been successfully added to your project. F5 to local debug the application or trigger 'Teams: Provision in the cloud' to create resources in your Azure subscription for hosting.",
-      "AddCapabilitiesNotice": "[Teams Toolkit] Capabilities %s have been successfully added to your project. F5 to local debug the application or trigger 'Teams: Provision in the cloud' to create resources in your Azure subscription for hosting.",
-      "AddCapabilityNoticeForCli": "[Teams Toolkit] Capability %s has been successfully added to your project. Run 'teamsfx provision' to create resources in your Azure subscription for hosting.",
-      "AddCapabilitiesNoticeForCli": "[Teams Toolkit] Capabilities %s have been successfully added to your project. Run 'teamsfx provision' to create resources in your Azure subscription for hosting."
-    },
-    "addResource": {
-      "OnlySupportAzure": "Add resource is only supported for project hosted in Azure",
-      "NotSupportForVSProject": "Add resource is not supported for csharp project",
-      "AddResourceNotice": "[Teams Toolkit] Resource \"%s\" has been successfully configured for your project, trigger 'Teams: Provision in the cloud' will create the resource in your Azure subscription.",
-      "AddResourceNoticeForCli": "[Teams Toolkit] Resource \"%s\" has been successfully configured for your project, run 'teamsfx provision' will create the resource in your Azure subscription.",
-      "AddResourcesNotice": "[Teams Toolkit] Resources \"%s\" have been successfully configured for your project, trigger 'Teams: Provision in the cloud' will create the resources in your Azure subscription.",
-      "AddResourcesNoticeForCli": "[Teams Toolkit] Resources \"%s\" have been successfully configured for your project, run 'teamsfx provision' will create the resources in your Azure subscription."
-    },
+    "AddResourceNotice": "[Teams Toolkit] Resource \"%s\" have been successfully configured for your project, trigger 'Teams: Provision in the cloud' will create the resource(s) in your Azure subscription.",
+    "AddResourceNoticeForCli": "[Teams Toolkit] Resource \"%s\" have been successfully configured for your project, run 'teamsfx provision' will create the resource(s) in your Azure subscription.",
+    "AddCapabilityNotice": "[Teams Toolkit] Capability %s has been successfully added to your project. F5 to local debug the application or trigger 'Teams: Provision in the cloud' to create resources in your Azure subscription for hosting.",
+    "AddCapabilitiesNotice": "[Teams Toolkit] Capabilities %s have been successfully added to your project. F5 to local debug the application or trigger 'Teams: Provision in the cloud' to create resources in your Azure subscription for hosting.",
+    "AddCapabilityNoticeForCli": "[Teams Toolkit] Capability %s has been successfully added to your project. Run 'teamsfx provision' to create resources in your Azure subscription for hosting.",
+    "AddCapabilitiesNoticeForCli": "[Teams Toolkit] Capabilities %s have been successfully added to your project. Run 'teamsfx provision' to create resources in your Azure subscription for hosting.",
     "CancelProvision": "CancelProvision",
     "AlreadyProvisionNotice": "'%s' is already provisioned in the cloud, will create the teams app again if it has been removed.",
     "NotProvisionedNotice": "'%s' is not provisioned in the cloud yet. Please provision first.",
@@ -64,7 +54,7 @@
       "buildNotice": "SharePoint package successfully built at %s.",
       "deployNotice": "SharePoint package %s has been successfully deployed to [%s](%s).",
       "deployFailedNotice": "You don't have permission to upload and deploy package to App Catalog %s, please use site admin account, or you can get your own free Microsoft 365 tenant from [M365 developer program](https://developer.microsoft.com/en-us/microsoft-365/dev-program)",
-      "createAppCatalogNotice": "There is no tenant app catalog under %s, do you want to create one?"
+      "createAppCatalogNotice": "There is no tenant app catalog under %s, you can Read more about how to create app catalog site."
     }
   }
 }

package/templates/plugins/resource/apim/bicep/apimConfiguration.bicep CHANGED Viewed

@@ -38,7 +38,6 @@ var scope = '${m365ApplicationIdUri}/.default'
 var authorizationEndpoint = uri(m365OauthAuthorityHost, '${m365TenantId}/oauth2/v2.0/authorize')
 var tokenEndpoint = uri(m365OauthAuthorityHost, '${m365TenantId}/oauth2/v2.0/token')
-//Enables Microsoft Power Platform to access your APIs hosted in Function App
 resource apimServiceAuthServer 'Microsoft.ApiManagement/service/authorizationServers@2020-12-01' = {
   name: '${apimServiceName}/${oauthServerName}'
   properties: {

package/templates/plugins/resource/apim/bicep/apimProvision.bicep CHANGED Viewed

@@ -2,13 +2,12 @@
 param provisionParameters object
 var resourceBaseName = provisionParameters['resourceBaseName']
-var apimServiceName = contains(provisionParameters, 'apimServiceName') ? provisionParameters['apimServiceName'] : '${resourceBaseName}' // Try to read name for APIM Service from parameters
-var apimServiceSku = contains(provisionParameters, 'apimServiceSku') ? provisionParameters['apimServiceSku'] : 'Consumption'  // Try to read SKU for APIM Service from parameters
-var productName = contains(provisionParameters, 'apimProductName') ? provisionParameters['apimProductName'] : '${resourceBaseName}'  // Try to read name for APIM Product from parameters
-var publisherEmail = provisionParameters['apimPublisherEmail']  // Read publisher email for APIM Service from parameters, this parameter is required
-var publisherName = provisionParameters['apimPublisherName'] // Read publisher name for APIM Service from parameters, this parameter is required
+var apimServiceName = contains(provisionParameters, 'apimServiceName') ? provisionParameters['apimServiceName'] : '${resourceBaseName}'
+var apimServiceSku = contains(provisionParameters, 'apimServiceSku') ? provisionParameters['apimServiceSku'] : 'Consumption'
+var productName = contains(provisionParameters, 'apimProductName') ? provisionParameters['apimProductName'] : '${resourceBaseName}'
+var publisherEmail = provisionParameters['apimPublisherEmail']
+var publisherName = provisionParameters['apimPublisherName']
-// APIM Service that helps manage your APIs
 resource apimService 'Microsoft.ApiManagement/service@2020-12-01' = {
   name: apimServiceName
   location: resourceGroup().location
@@ -22,7 +21,6 @@ resource apimService 'Microsoft.ApiManagement/service@2020-12-01' = {
   }
 }
-// Group your APIs, define terms of use and runtime policies
 resource apimServiceProduct 'Microsoft.ApiManagement/service/products@2020-12-01' = {
   parent: apimService
   name: productName

package/templates/plugins/resource/apim/bicep/config.template.bicep CHANGED Viewed

@@ -1,4 +1,3 @@
-// Add TeamsFx configurations to APIM resources
 module teamsFxApimConfig '\{{fx-resource-apim.Configuration.apim.path}}' = {
   name: 'addTeamsFxApimConfiguration'
   params: {

package/templates/plugins/resource/bot/bicep/botConfiguration.template.bicep CHANGED Viewed

@@ -38,21 +38,21 @@ var m365ApplicationIdUri = 'api://botid-${botId}'
 resource botWebAppSettings 'Microsoft.Web/sites/config@2021-02-01' = {
   name: '${botWebAppName}/appsettings'
   properties: union({
-    INITIATE_LOGIN_ENDPOINT: uri(provisionOutputs.botOutput.value.siteEndpoint, 'auth-start.html') // The page is used to let users consent required OAuth permissions during bot SSO process
-    M365_AUTHORITY_HOST: m365OauthAuthorityHost // AAD authority host
-    M365_CLIENT_ID: m365ClientId // Client id of AAD application
-    M365_CLIENT_SECRET: m365ClientSecret // Client secret of AAD application
-    M365_TENANT_ID: m365TenantId // Tenant id of AAD application
-    M365_APPLICATION_ID_URI: m365ApplicationIdUri // Application ID URI of AAD application
-    BOT_ID: botAadAppClientId // ID of your bot
-    BOT_PASSWORD: botAadAppClientSecret // Secret of your bot
+    INITIATE_LOGIN_ENDPOINT: uri(provisionOutputs.botOutput.value.siteEndpoint, 'auth-start.html')
+    M365_AUTHORITY_HOST: m365OauthAuthorityHost
+    M365_CLIENT_ID: m365ClientId
+    M365_CLIENT_SECRET: m365ClientSecret
+    M365_TENANT_ID: m365TenantId
+    M365_APPLICATION_ID_URI: m365ApplicationIdUri
+    BOT_ID: botAadAppClientId
+    BOT_PASSWORD: botAadAppClientSecret
     {{#if (contains "fx-resource-function" plugins) }}
-    API_ENDPOINT: provisionOutputs.functionOutput.value.functionEndpoint // Azure Function endpoint
+    API_ENDPOINT: provisionOutputs.functionOutput.value.functionEndpoint
     {{/if}}
     {{#if (contains "fx-resource-azure-sql" plugins)}}
-    SQL_DATABASE_NAME: \{{fx-resource-azure-sql.References.databaseName}} // SQL database name
-    SQL_ENDPOINT: \{{fx-resource-azure-sql.References.sqlEndpoint}} // SQL server endpoint
+    SQL_DATABASE_NAME: \{{fx-resource-azure-sql.References.databaseName}}
+    SQL_ENDPOINT: \{{fx-resource-azure-sql.References.sqlEndpoint}}
     {{/if}}
-    IDENTITY_ID: \{{fx-resource-identity.References.identityClientId}} // User assigned identity id, the identity is used to access other Azure resources
+    IDENTITY_ID: \{{fx-resource-identity.References.identityClientId}}
   }, currentAppSettings)
 }