npm - @microsoft/teamsfx-core - Versions diffs - 1.8.0 → 1.8.1-alpha.324752dff.0 - Mend

@microsoft/teamsfx-core 1.8.0 → 1.8.1-alpha.324752dff.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 (527) hide show

package/build/plugins/solution/fx-solution/debug/util/tasksNext.js CHANGED Viewed

@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateM365Tasks = exports.generateTasks = void 0;
+exports.mergeTasks = exports.generateM365Tasks = exports.generateTasks = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const constants_1 = require("../../../../../common/local/constants");
 // TODO: add spfx tasks with "validate-local-prerequisites"
@@ -97,6 +97,44 @@ function generateM365Tasks(includeFrontend, includeBackend, includeBot, programm
     return tasks;
 }
 exports.generateM365Tasks = generateM365Tasks;
+function mergeTasks(existingData, newData) {
+    var _a, _b;
+    const mergedData = {};
+    Object.assign(mergedData, existingData);
+    if (mergedData.version === undefined) {
+        mergedData.version = "2.0.0";
+    }
+    if (mergedData.tasks === undefined) {
+        mergedData.tasks = newData.tasks;
+    }
+    else {
+        const existingTasks = mergedData.tasks;
+        const newTasks = ((_a = newData.tasks) !== null && _a !== void 0 ? _a : []);
+        const keptTasks = [];
+        for (const existingTask of existingTasks) {
+            if (!newTasks.some((newTask) => existingTask.label === newTask.label && existingTask.type === newTask.type)) {
+                keptTasks.push(existingTask);
+            }
+        }
+        mergedData.tasks = [...keptTasks, ...newTasks];
+    }
+    if (mergedData.inputs === undefined) {
+        mergedData.inputs = newData.inputs;
+    }
+    else {
+        const existingInputs = mergedData.inputs;
+        const newInputs = ((_b = newData.inputs) !== null && _b !== void 0 ? _b : []);
+        const keptInputs = [];
+        for (const existingInput of existingInputs) {
+            if (!newInputs.some((newInput) => existingInput.id === newInput.id && existingInput.type === newInput.type)) {
+                keptInputs.push(existingInput);
+            }
+        }
+        mergedData.inputs = [...keptInputs, ...newInputs];
+    }
+    return mergedData;
+}
+exports.mergeTasks = mergeTasks;
 function preDebugCheckAndStartAll(includeBot) {
     return {
         label: "Pre Debug Check & Start All",
@@ -246,7 +284,7 @@ function startFuncHostedBot(includeFrontend, programmingLanguage) {
         type: "shell",
         command: "npm run dev:teamsfx",
         isBackground: true,
-        problemMatcher: "$teamsfx-backend-watch",
+        problemMatcher: "$teamsfx-func-hosted-bot-watch",
         options: {
             cwd: "${workspaceFolder}/bot",
             env: {

package/build/plugins/solution/fx-solution/debug/util/tasksNext.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"tasksNext.js","sourceRoot":"","sources":["../../../../../../src/plugins/solution/fx-solution/debug/util/tasksNext.ts"],"names":[],"mappings":"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~~wBAAwB~~;~~QACxC~~,OAAO,EAAE;YACP,GAAG,EAAE,wBAAwB;YAC7B,GAAG,EAAE;gBACH,IAAI,EAAE,kDAAkD;aACzD;SACF;KACyB,CAAC;IAE7B,IAAI,eAAe,EAAE;QACnB,MAAM,CAAC,YAAY,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;KAC5C;IAED,MAAM,SAAS,GAAa,CAAC,wBAAwB,CAAC,CAAC;IACvD,IAAI,mBAAmB,KAAK,+BAAmB,CAAC,UAAU,EAAE;QAC1D,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;KAC7B;IACD,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC;IAE7B,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,UAAU;IACjB,OAAO;QACL,KAAK,EAAE,aAAa;QACpB,SAAS,EAAE,GAAG,yBAAW,eAAe;KACzC,CAAC;AACJ,CAAC;AAED,SAAS,QAAQ,CACf,eAAwB,EACxB,cAAuB,EACvB,UAAmB;IAEnB,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,IAAI,eAAe,EAAE;QACnB,SAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;KAClC;IACD,IAAI,cAAc,EAAE;QAClB,SAAS,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;KACjC;IACD,IAAI,UAAU,EAAE;QACd,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;KAC7B;IACD,OAAO;QACL,KAAK,EAAE,WAAW;QAClB,SAAS;KACV,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB;IAC3B,OAAO;QACL,KAAK,EAAE,wBAAwB;QAC/B,IAAI,EAAE,OAAO;QACb,OAAO,EAAE,iCAAiC;QAC1C,YAAY,EAAE,IAAI;QAClB,cAAc,EAAE;YACd,OAAO,EAAE;gBACP;oBACE,MAAM,EAAE,MAAM;oBACd,IAAI,EAAE,CAAC;oBACP,QAAQ,EAAE,CAAC;oBACX,OAAO,EAAE,CAAC;iBACX;aACF;YACD,UAAU,EAAE;gBACV,aAAa,EAAE,IAAI;gBACnB,aAAa,EAAE,SAAS;gBACxB,WAAW,EAAE,wBAAwB;aACtC;SACF;QACD,OAAO,EAAE;YACP,GAAG,EAAE,wBAAwB;SAC9B;QACD,YAAY,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE;KACnC,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB;IACxB,OAAO;QACL,KAAK,EAAE,sBAAsB;QAC7B,IAAI,EAAE,OAAO;QACb,OAAO,EAAE,mDAAmD;QAC5D,YAAY,EAAE;YACZ,MAAM,EAAE,OAAO;SAChB;KACF,CAAC;AACJ,CAAC"}
1	+ {"version":3,"file":"tasksNext.js","sourceRoot":"","sources":["../../../../../../src/plugins/solution/fx-solution/debug/util/tasksNext.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAEb,wDAAqD;AACrD,qEAA4E;AAE5E,2DAA2D;AAC3D,SAAgB,aAAa,CAC3B,eAAwB,EACxB,cAAuB,EACvB,UAAmB,EACnB,oBAA6B,EAC7B,mBAA2B;IAE3B;;;;;;;;;;;;;OAaG;IACH,MAAM,KAAK,GAA8B;QACvC,wBAAwB,CAAC,UAAU,CAAC;QACpC,0BAA0B,EAAE;KAC7B,CAAC;IAEF,IAAI,UAAU,EAAE;QACd,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;KAC1B;IAED,KAAK,CAAC,IAAI,CAAC,uBAAuB,EAAE,CAAC,CAAC;IAEtC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC,CAAC;IAElE,IAAI,eAAe,EAAE;QACnB,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;KAC7B;IAED,IAAI,cAAc,EAAE;QAClB,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC,CAAC;QAC9C,IAAI,mBAAmB,KAAK,+BAAmB,CAAC,UAAU,EAAE;YAC1D,KAAK,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;SAC5B;KACF;IAED,IAAI,UAAU,EAAE;QACd,IAAI,oBAAoB,EAAE;YACxB,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,eAAe,EAAE,mBAAmB,CAAC,CAAC,CAAC;YACrE,KAAK,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAC;YACnC,IAAI,mBAAmB,KAAK,+BAAmB,CAAC,UAAU,EAAE;gBAC1D,KAAK,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;aAClC;SACF;aAAM;YACL,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC;SACvC;KACF;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AA1DD,sCA0DC;AAED,SAAgB,iBAAiB,CAC/B,eAAwB,EACxB,cAAuB,EACvB,UAAmB,EACnB,mBAA2B;IAE3B;;;;;;;;;;;;;;;OAeG;IACH,MAAM,KAAK,GAA8B;QACvC,wBAAwB,CAAC,UAAU,CAAC;QACpC,qCAAqC,CAAC,UAAU,CAAC;QACjD,0BAA0B,EAAE;KAC7B,CAAC;IAEF,IAAI,UAAU,EAAE;QACd,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;KAC1B;IAED,KAAK,CAAC,IAAI,CAAC,uBAAuB,EAAE,CAAC,CAAC;IAEtC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC,CAAC;IAElE,KAAK,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;IAEhC,IAAI,eAAe,EAAE;QACnB,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;KAC7B;IAED,IAAI,cAAc,EAAE;QAClB,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC,CAAC;QAC9C,IAAI,mBAAmB,KAAK,+BAAmB,CAAC,UAAU,EAAE;YAC1D,KAAK,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;SAC5B;KACF;IAED,IAAI,UAAU,EAAE;QACd,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC;KACvC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAtDD,8CAsDC;AAED,SAAgB,UAAU,CACxB,YAAqC,EACrC,OAAgC;;IAEhC,MAAM,UAAU,GAAG,EAA6B,CAAC;IACjD,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IAExC,IAAI,UAAU,CAAC,OAAO,KAAK,SAAS,EAAE;QACpC,UAAU,CAAC,OAAO,GAAG,OAAO,CAAC;KAC9B;IAED,IAAI,UAAU,CAAC,KAAK,KAAK,SAAS,EAAE;QAClC,UAAU,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;KAClC;SAAM;QACL,MAAM,aAAa,GAAG,UAAU,CAAC,KAAkC,CAAC;QACpE,MAAM,QAAQ,GAAG,CAAC,MAAA,OAAO,CAAC,KAAK,mCAAI,EAAE,CAA8B,CAAC;QACpE,MAAM,SAAS,GAAG,EAAE,CAAC;QACrB,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE;YACxC,IACE,CAAC,QAAQ,CAAC,IAAI,CACZ,CAAC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,KAAK,KAAK,OAAO,CAAC,KAAK,IAAI,YAAY,CAAC,IAAI,KAAK,OAAO,CAAC,IAAI,CACxF,EACD;gBACA,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;aAC9B;SACF;QACD,UAAU,CAAC,KAAK,GAAG,CAAC,GAAG,SAAS,EAAE,GAAG,QAAQ,CAAC,CAAC;KAChD;IAED,IAAI,UAAU,CAAC,MAAM,KAAK,SAAS,EAAE;QACnC,UAAU,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;KACpC;SAAM;QACL,MAAM,cAAc,GAAG,UAAU,CAAC,MAAmC,CAAC;QACtE,MAAM,SAAS,GAAG,CAAC,MAAA,OAAO,CAAC,MAAM,mCAAI,EAAE,CAA8B,CAAC;QACtE,MAAM,UAAU,GAAG,EAAE,CAAC;QACtB,KAAK,MAAM,aAAa,IAAI,cAAc,EAAE;YAC1C,IACE,CAAC,SAAS,CAAC,IAAI,CACb,CAAC,QAAQ,EAAE,EAAE,CAAC,aAAa,CAAC,EAAE,KAAK,QAAQ,CAAC,EAAE,IAAI,aAAa,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI,CACvF,EACD;gBACA,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;aAChC;SACF;QACD,UAAU,CAAC,MAAM,GAAG,CAAC,GAAG,UAAU,EAAE,GAAG,SAAS,CAAC,CAAC;KACnD;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAhDD,gCAgDC;AAED,SAAS,wBAAwB,CAAC,UAAmB;IACnD,OAAO;QACL,KAAK,EAAE,6BAA6B;QACpC,SAAS,EAAE,UAAU;YACnB,CAAC,CAAC,CAAC,8BAA8B,EAAE,aAAa,EAAE,2BAA2B,EAAE,WAAW,CAAC;YAC3F,CAAC,CAAC,CAAC,8BAA8B,EAAE,2BAA2B,EAAE,WAAW,CAAC;QAC9E,YAAY,EAAE,UAAU;KACzB,CAAC;AACJ,CAAC;AAED,SAAS,qCAAqC,CAAC,UAAmB;IAChE,OAAO;QACL,KAAK,EAAE,2CAA2C;QAClD,SAAS,EAAE,UAAU;YACnB,CAAC,CAAC;gBACE,8BAA8B;gBAC9B,aAAa;gBACb,2BAA2B;gBAC3B,WAAW;gBACX,sBAAsB;aACvB;YACH,CAAC,CAAC;gBACE,8BAA8B;gBAC9B,2BAA2B;gBAC3B,WAAW;gBACX,sBAAsB;aACvB;QACL,YAAY,EAAE,UAAU;KACzB,CAAC;AACJ,CAAC;AAED,SAAS,0BAA0B;IACjC,OAAO;QACL,KAAK,EAAE,8BAA8B;QACrC,IAAI,EAAE,OAAO;QACb,OAAO,EAAE,2DAA2D;QACpE,YAAY,EAAE;YACZ,MAAM,EAAE,OAAO;SAChB;KACF,CAAC;AACJ,CAAC;AAED,SAAS,uBAAuB;IAC9B,OAAO;QACL,KAAK,EAAE,2BAA2B;QAClC,IAAI,EAAE,OAAO;QACb,OAAO,EAAE,8CAA8C;QACvD,YAAY,EAAE;YACZ,MAAM,EAAE,OAAO;SAChB;KACF,CAAC;AACJ,CAAC;AAED,SAAS,aAAa;IACpB,OAAO;QACL,KAAK,EAAE,gBAAgB;QACvB,IAAI,EAAE,OAAO;QACb,OAAO,EAAE,qBAAqB;QAC9B,YAAY,EAAE,IAAI;QAClB,cAAc,EAAE,yBAAyB;QACzC,OAAO,EAAE;YACP,GAAG,EAAE,yBAAyB;SAC/B;KACF,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CAAC,mBAA2B;IAC/C,MAAM,MAAM,GAAG;QACb,KAAK,EAAE,eAAe;QACtB,IAAI,EAAE,OAAO;QACb,OAAO,EAAE,qBAAqB;QAC9B,YAAY,EAAE,IAAI;QAClB,cAAc,EAAE,wBAAwB;QACxC,OAAO,EAAE;YACP,GAAG,EAAE,wBAAwB;YAC7B,GAAG,EAAE;gBACH,IAAI,EAAE,kDAAkD;aACzD;SACF;QACD,YAAY,EAAE;YACZ,MAAM,EAAE,QAAQ;SACjB;KACyB,CAAC;IAE7B,IAAI,mBAAmB,KAAK,+BAAmB,CAAC,UAAU,EAAE;QAC1D,MAAM,CAAC,SAAS,GAAG,eAAe,CAAC;KACpC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,YAAY;IACnB,OAAO;QACL,KAAK,EAAE,eAAe;QACtB,IAAI,EAAE,OAAO;QACb,OAAO,EAAE,uBAAuB;QAChC,YAAY,EAAE,IAAI;QAClB,cAAc,EAAE,YAAY;QAC5B,OAAO,EAAE;YACP,GAAG,EAAE,wBAAwB;SAC9B;QACD,YAAY,EAAE;YACZ,MAAM,EAAE,QAAQ;SACjB;KACF,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB;IACzB,OAAO;QACL,KAAK,EAAE,WAAW;QAClB,IAAI,EAAE,OAAO;QACb,OAAO,EAAE,uBAAuB;QAChC,YAAY,EAAE,IAAI;QAClB,cAAc,EAAE,YAAY;QAC5B,OAAO,EAAE;YACP,GAAG,EAAE,wBAAwB;SAC9B;QACD,YAAY,EAAE;YACZ,MAAM,EAAE,QAAQ;SACjB;KACF,CAAC;AACJ,CAAC;AAED,SAAS,QAAQ,CAAC,eAAwB;IACxC,MAAM,MAAM,GAAG;QACb,KAAK,EAAE,WAAW;QAClB,IAAI,EAAE,OAAO;QACb,OAAO,EAAE,qBAAqB;QAC9B,YAAY,EAAE,IAAI;QAClB,cAAc,EAAE;YACd,OAAO,EAAE;gBACP;oBACE,MAAM,EAAE,MAAM;oBACd,IAAI,EAAE,CAAC;oBACP,QAAQ,EAAE,CAAC;oBACX,OAAO,EAAE,CAAC;iBACX;aACF;YACD,UAAU,EAAE;gBACV,aAAa,EAAE,IAAI;gBACnB,aAAa,EAAE,oBAAoB;gBACnC,WAAW,EAAE,wEAAwE;aACtF;SACF;QACD,OAAO,EAAE;YACP,GAAG,EAAE,wBAAwB;SAC9B;KACyB,CAAC;IAE7B,IAAI,eAAe,EAAE;QACnB,MAAM,CAAC,YAAY,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;KAC5C;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,kBAAkB,CACzB,eAAwB,EACxB,mBAA2B;IAE3B,MAAM,MAAM,GAAG;QACb,KAAK,EAAE,WAAW;QAClB,IAAI,EAAE,OAAO;QACb,OAAO,EAAE,qBAAqB;QAC9B,YAAY,EAAE,IAAI;QAClB,cAAc,EAAE,gCAAgC;QAChD,OAAO,EAAE;YACP,GAAG,EAAE,wBAAwB;YAC7B,GAAG,EAAE;gBACH,IAAI,EAAE,kDAAkD;aACzD;SACF;KACyB,CAAC;IAE7B,IAAI,eAAe,EAAE;QACnB,MAAM,CAAC,YAAY,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;KAC5C;IAED,MAAM,SAAS,GAAa,CAAC,wBAAwB,CAAC,CAAC;IACvD,IAAI,mBAAmB,KAAK,+BAAmB,CAAC,UAAU,EAAE;QAC1D,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;KAC7B;IACD,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC;IAE7B,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,UAAU;IACjB,OAAO;QACL,KAAK,EAAE,aAAa;QACpB,SAAS,EAAE,GAAG,yBAAW,eAAe;KACzC,CAAC;AACJ,CAAC;AAED,SAAS,QAAQ,CACf,eAAwB,EACxB,cAAuB,EACvB,UAAmB;IAEnB,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,IAAI,eAAe,EAAE;QACnB,SAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;KAClC;IACD,IAAI,cAAc,EAAE;QAClB,SAAS,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;KACjC;IACD,IAAI,UAAU,EAAE;QACd,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;KAC7B;IACD,OAAO;QACL,KAAK,EAAE,WAAW;QAClB,SAAS;KACV,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB;IAC3B,OAAO;QACL,KAAK,EAAE,wBAAwB;QAC/B,IAAI,EAAE,OAAO;QACb,OAAO,EAAE,iCAAiC;QAC1C,YAAY,EAAE,IAAI;QAClB,cAAc,EAAE;YACd,OAAO,EAAE;gBACP;oBACE,MAAM,EAAE,MAAM;oBACd,IAAI,EAAE,CAAC;oBACP,QAAQ,EAAE,CAAC;oBACX,OAAO,EAAE,CAAC;iBACX;aACF;YACD,UAAU,EAAE;gBACV,aAAa,EAAE,IAAI;gBACnB,aAAa,EAAE,SAAS;gBACxB,WAAW,EAAE,wBAAwB;aACtC;SACF;QACD,OAAO,EAAE;YACP,GAAG,EAAE,wBAAwB;SAC9B;QACD,YAAY,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE;KACnC,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB;IACxB,OAAO;QACL,KAAK,EAAE,sBAAsB;QAC7B,IAAI,EAAE,OAAO;QACb,OAAO,EAAE,mDAAmD;QAC5D,YAAY,EAAE;YACZ,MAAM,EAAE,OAAO;SAChB;KACF,CAAC;AACJ,CAAC"}

package/build/plugins/solution/fx-solution/question.d.ts CHANGED Viewed

@@ -2,6 +2,7 @@ import { FuncQuestion, MultiSelectQuestion, OptionItem, TextInputQuestion } from
 export declare const TabOptionItem: OptionItem;
 export declare const TabNewUIOptionItem: OptionItem;
 export declare const BotOptionItem: OptionItem;
+export declare const BotNewUIOptionItem: OptionItem;
 export declare const NotificationOptionItem: OptionItem;
 export declare const CommandAndResponseOptionItem: OptionItem;
 export declare const ExistingTabOptionItem: OptionItem;
@@ -25,14 +26,22 @@ export declare enum AzureSolutionQuestionNames {
     AskSub = "subscription",
     ProgrammingLanguage = "programming-language",
     Solution = "solution",
-    Scenarios = "scenarios"
+    Scenarios = "scenarios",
+    Features = "features"
 }
 export declare const HostTypeOptionAzure: OptionItem;
 export declare const HostTypeOptionSPFx: OptionItem;
 export declare const AzureResourceSQL: OptionItem;
+export declare const AzureResourceSQLNewUI: OptionItem;
 export declare const AzureResourceFunction: OptionItem;
+export declare const AzureResourceFunctionNewUI: OptionItem;
 export declare const AzureResourceApim: OptionItem;
+export declare const AzureResourceApimNewUI: OptionItem;
 export declare const AzureResourceKeyVault: OptionItem;
+export declare const AzureResourceKeyVaultNewUI: OptionItem;
+export declare const SingleSignOnOptionItem: OptionItem;
+export declare const ApiConnectionOptionItem: OptionItem;
+export declare const CicdOptionItem: OptionItem;
 export declare enum BotScenario {
     NotificationBot = "notificationBot",
     CommandAndResponseBot = "commandAndResponseBot"
@@ -44,8 +53,10 @@ export declare const BotNotificationTriggers: {
 export declare type BotNotificationTrigger = typeof BotNotificationTriggers[keyof typeof BotNotificationTriggers];
 export declare const AzureResourcesQuestion: MultiSelectQuestion;
 export declare function createAddAzureResourceQuestion(alreadyHaveFunction: boolean, alreadyHaveSQL: boolean, alreadyHaveAPIM: boolean, alreadyHaveKeyVault: boolean): MultiSelectQuestion;
+export declare function createAddCloudResourceOptions(alreadyHaveAPIM: boolean, alreadyHaveKeyVault: boolean): OptionItem[];
 export declare function addCapabilityQuestion(alreadyHaveTab: boolean, alreadyHaveBot: boolean): MultiSelectQuestion;
 export declare const DeployPluginSelectQuestion: MultiSelectQuestion;
 export declare const AskSubscriptionQuestion: FuncQuestion;
 export declare function getUserEmailQuestion(currentUserEmail: string): TextInputQuestion;
+export declare const BotFeatureIds: string[];
 //# sourceMappingURL=question.d.ts.map

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

	@@ -1 +1 @@
1	- {"version":3,"file":"question.d.ts","sourceRoot":"","sources":["../../../../src/plugins/solution/fx-solution/question.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EAEZ,mBAAmB,EAEnB,UAAU,EACV,iBAAiB,EAElB,MAAM,wBAAwB,CAAC;AAIhC,eAAO,MAAM,aAAa,EAAE,UAM3B,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,UAMhC,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,UAM3B,CAAC;AAEF,eAAO,MAAM,sBAAsB,EAAE,~~UAMpC~~,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,~~UAO1C~~,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,~~UAMnC~~,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,UAMlC,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,UAMvC,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,UAMzB,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,UAM9B,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,~~UAMxB~~,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,UAMxB,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,~~UAO3B~~,CAAC;AAEF,eAAO,MAAM,2BAA2B,EAAE,UAMzC,CAAC;AAEF,eAAO,MAAM,uBAAuB,EAAE,UAMrC,CAAC;AAEF,oBAAY,0BAA0B;IACpC,YAAY,iBAAiB;IAC7B,SAAS,eAAe;IACxB,QAAQ,cAAc;IACtB,cAAc,oBAAoB;IAClC,qBAAqB,kBAAkB;IACvC,YAAY,wBAAwB;IACpC,OAAO,aAAa;IACpB,MAAM,iBAAiB;IACvB,mBAAmB,yBAAyB;IAC5C,QAAQ,aAAa;IACrB,SAAS,cAAc;~~CACxB~~;AAED,eAAO,MAAM,mBAAmB,EAAE,UAIjC,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,UAIhC,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,UAI9B,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,UAGnC,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,UAI/B,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,UAInC,CAAC;AAEF,oBAAY,WAAW;IACrB,eAAe,oBAAoB;IACnC,qBAAqB,0BAA0B;CAChD;AAED,eAAO,MAAM,uBAAuB;;;CAG1B,CAAC;AAEX,oBAAY,sBAAsB,GAChC,OAAO,uBAAuB,CAAC,MAAM,OAAO,uBAAuB,CAAC,CAAC;AAEvE,eAAO,MAAM,sBAAsB,EAAE,mBAgBpC,CAAC;AAEF,wBAAgB,8BAA8B,CAC5C,mBAAmB,EAAE,OAAO,EAC5B,cAAc,EAAE,OAAO,EACvB,eAAe,EAAE,OAAO,EACxB,mBAAmB,EAAE,OAAO,GAC3B,mBAAmB,CAsBrB;AAED,wBAAgB,qBAAqB,CACnC,cAAc,EAAE,OAAO,EACvB,cAAc,EAAE,OAAO,GACtB,mBAAmB,CAkBrB;AAED,eAAO,MAAM,0BAA0B,EAAE,mBAOxC,CAAC;AAEF,eAAO,MAAM,uBAAuB,EAAE,YAMrC,CAAC;AAEF,wBAAgB,oBAAoB,CAAC,gBAAgB,EAAE,MAAM,GAAG,iBAAiB,CA8BhF"}
1	+ {"version":3,"file":"question.d.ts","sourceRoot":"","sources":["../../../../src/plugins/solution/fx-solution/question.ts"],"names":[],"mappings":"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"}

package/build/plugins/solution/fx-solution/question.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserEmailQuestion = exports.AskSubscriptionQuestion = exports.DeployPluginSelectQuestion = exports.addCapabilityQuestion = exports.createAddAzureResourceQuestion = exports.AzureResourcesQuestion = exports.BotNotificationTriggers = exports.BotScenario = exports.AzureResourceKeyVault = exports.AzureResourceApim = exports.AzureResourceFunction = exports.AzureResourceSQL = exports.HostTypeOptionSPFx = exports.HostTypeOptionAzure = exports.AzureSolutionQuestionNames = exports.M365SearchAppOptionItem = exports.M365SsoLaunchPageOptionItem = exports.TabNonSsoItem = exports.BotSsoItem = exports.TabSsoItem = exports.TabSPFxNewUIItem = exports.TabSPFxItem = exports.MessageExtensionNewUIItem = exports.MessageExtensionItem = exports.ExistingTabOptionItem = exports.CommandAndResponseOptionItem = exports.NotificationOptionItem = exports.BotOptionItem = exports.TabNewUIOptionItem = exports.TabOptionItem = void 0;
+exports.BotFeatureIds = exports.getUserEmailQuestion = exports.AskSubscriptionQuestion = exports.DeployPluginSelectQuestion = exports.addCapabilityQuestion = exports.createAddCloudResourceOptions = exports.createAddAzureResourceQuestion = exports.AzureResourcesQuestion = exports.BotNotificationTriggers = exports.BotScenario = exports.CicdOptionItem = exports.ApiConnectionOptionItem = exports.SingleSignOnOptionItem = exports.AzureResourceKeyVaultNewUI = exports.AzureResourceKeyVault = exports.AzureResourceApimNewUI = exports.AzureResourceApim = exports.AzureResourceFunctionNewUI = exports.AzureResourceFunction = exports.AzureResourceSQLNewUI = exports.AzureResourceSQL = exports.HostTypeOptionSPFx = exports.HostTypeOptionAzure = exports.AzureSolutionQuestionNames = exports.M365SearchAppOptionItem = exports.M365SsoLaunchPageOptionItem = exports.TabNonSsoItem = exports.BotSsoItem = exports.TabSsoItem = exports.TabSPFxNewUIItem = exports.TabSPFxItem = exports.MessageExtensionNewUIItem = exports.MessageExtensionItem = exports.ExistingTabOptionItem = exports.CommandAndResponseOptionItem = exports.NotificationOptionItem = exports.BotNewUIOptionItem = exports.BotOptionItem = exports.TabNewUIOptionItem = exports.TabOptionItem = void 0;
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
@@ -15,10 +15,10 @@ exports.TabOptionItem = {
 };
 exports.TabNewUIOptionItem = {
     id: "Tab",
-    label: localizeUtils_1.getLocalizedString("core.TabOption.labelNew"),
+    label: `$(browser) ${localizeUtils_1.getLocalizedString("core.TabOption.labelNew")}`,
     cliName: "tab",
     detail: localizeUtils_1.getLocalizedString("core.TabOption.detailNew"),
-    groupName: localizeUtils_1.getLocalizedString("core.TeamsAppSeparatorOptionItem.label"),
+    groupName: localizeUtils_1.getLocalizedString("core.options.separator.scenario"),
 };
 exports.BotOptionItem = {
     id: "Bot",
@@ -27,41 +27,74 @@ exports.BotOptionItem = {
     description: localizeUtils_1.getLocalizedString("core.BotOption.description"),
     detail: localizeUtils_1.getLocalizedString("core.BotOption.detail"),
 };
+exports.BotNewUIOptionItem = {
+    id: "Bot",
+    label: `$(hubot) ${localizeUtils_1.getLocalizedString("core.BotNewUIOption.label")}`,
+    cliName: "bot",
+    detail: localizeUtils_1.getLocalizedString("core.BotNewUIOption.detail"),
+    groupName: localizeUtils_1.getLocalizedString("core.options.separator.basic"),
+};
 exports.NotificationOptionItem = {
     id: "Notification",
-    label: localizeUtils_1.getLocalizedString("core.NotificationOption.label"),
+    label: `$(hubot) ${localizeUtils_1.getLocalizedString("core.NotificationOption.label")}`,
+    description: localizeUtils_1.getLocalizedString("core.Option.recommend"),
     cliName: "notification",
     detail: localizeUtils_1.getLocalizedString("core.NotificationOption.detail"),
-    groupName: localizeUtils_1.getLocalizedString("core.TeamsAppSeparatorOptionItem.label"),
+    groupName: localizeUtils_1.getLocalizedString("core.options.separator.scenario"),
+    data: "https://aka.ms/teamsfx-send-notification",
+    buttons: [
+        {
+            iconPath: "tasklist",
+            tooltip: localizeUtils_1.getLocalizedString("core.option.tutorial"),
+            command: "fx-extension.openTutorial",
+        },
+    ],
 };
 exports.CommandAndResponseOptionItem = {
     // For default option, id and cliName must be the same
     id: "command-bot",
-    label: localizeUtils_1.getLocalizedString("core.CommandAndResponseOption.label"),
+    label: `$(hubot) ${localizeUtils_1.getLocalizedString("core.CommandAndResponseOption.label")}`,
+    description: localizeUtils_1.getLocalizedString("core.Option.recommend"),
     cliName: "command-bot",
     detail: localizeUtils_1.getLocalizedString("core.CommandAndResponseOption.detail"),
-    groupName: localizeUtils_1.getLocalizedString("core.TeamsAppSeparatorOptionItem.label"),
+    groupName: localizeUtils_1.getLocalizedString("core.options.separator.scenario"),
+    data: "https://aka.ms/teamsfx-create-command",
+    buttons: [
+        {
+            iconPath: "tasklist",
+            tooltip: localizeUtils_1.getLocalizedString("core.option.tutorial"),
+            command: "fx-extension.openTutorial",
+        },
+    ],
 };
 exports.ExistingTabOptionItem = {
     id: "ExistingTab",
-    label: localizeUtils_1.getLocalizedString("core.ExistingTabOption.label"),
+    label: `$(browser) ${localizeUtils_1.getLocalizedString("core.ExistingTabOption.label")}`,
     cliName: "existing-tab",
     detail: localizeUtils_1.getLocalizedString("core.ExistingTabOption.detail"),
-    groupName: localizeUtils_1.getLocalizedString("core.TeamsAppSeparatorOptionItem.label"),
+    groupName: localizeUtils_1.getLocalizedString("core.options.separator.scenario"),
+    data: "https://aka.ms/teamsfx-embed-existing-web",
+    buttons: [
+        {
+            iconPath: "tasklist",
+            tooltip: localizeUtils_1.getLocalizedString("core.option.tutorial"),
+            command: "fx-extension.openTutorial",
+        },
+    ],
 };
 exports.MessageExtensionItem = {
     id: "MessagingExtension",
     label: localizeUtils_1.getLocalizedString("core.MessageExtensionOption.label"),
-    cliName: "messaging-extension",
+    cliName: "message-extension",
     description: localizeUtils_1.getLocalizedString("core.MessageExtensionOption.description"),
     detail: localizeUtils_1.getLocalizedString("core.MessageExtensionOption.detail"),
 };
 exports.MessageExtensionNewUIItem = {
     id: "MessagingExtension",
-    label: localizeUtils_1.getLocalizedString("core.MessageExtensionOption.labelNew"),
-    cliName: "messaging-extension",
+    label: `$(comment-discussion) ${localizeUtils_1.getLocalizedString("core.MessageExtensionOption.labelNew")}`,
+    cliName: "message-extension",
     detail: localizeUtils_1.getLocalizedString("core.MessageExtensionOption.detail"),
-    groupName: localizeUtils_1.getLocalizedString("core.TeamsAppSeparatorOptionItem.label"),
+    groupName: localizeUtils_1.getLocalizedString("core.options.separator.basic"),
 };
 exports.TabSPFxItem = {
     id: "TabSPFx",
@@ -72,10 +105,10 @@ exports.TabSPFxItem = {
 };
 exports.TabSPFxNewUIItem = {
     id: "TabSPFx",
-    label: localizeUtils_1.getLocalizedString("core.TabSPFxOption.labelNew"),
+    label: `$(browser) ${localizeUtils_1.getLocalizedString("core.TabSPFxOption.labelNew")}`,
     cliName: "tab-spfx",
     detail: localizeUtils_1.getLocalizedString("core.TabSPFxOption.detailNew"),
-    groupName: localizeUtils_1.getLocalizedString("core.TeamsAppSeparatorOptionItem.label"),
+    groupName: localizeUtils_1.getLocalizedString("core.options.separator.scenario"),
 };
 exports.TabSsoItem = {
     id: "TabSSO",
@@ -83,6 +116,7 @@ exports.TabSsoItem = {
     cliName: "tab-sso",
     description: localizeUtils_1.getLocalizedString("core.TabSso.description"),
     detail: localizeUtils_1.getLocalizedString("core.TabSso.detail"),
+    groupName: localizeUtils_1.getLocalizedString("core.options.separator.scenario"),
 };
 exports.BotSsoItem = {
     id: "BotSSO",
@@ -93,25 +127,24 @@ exports.BotSsoItem = {
 };
 exports.TabNonSsoItem = {
     id: "TabNonSso",
-    label: localizeUtils_1.getLocalizedString("core.TabNonSso.label"),
+    label: `$(browser) ${localizeUtils_1.getLocalizedString("core.TabNonSso.label")}`,
     cliName: "tab-non-sso",
-    description: localizeUtils_1.getLocalizedString("core.TabNonSso.description"),
     detail: localizeUtils_1.getLocalizedString("core.TabNonSso.detail"),
-    groupName: localizeUtils_1.getLocalizedString("core.TeamsAppSeparatorOptionItem.label"),
+    groupName: localizeUtils_1.getLocalizedString("core.options.separator.basic"),
 };
 exports.M365SsoLaunchPageOptionItem = {
     id: "M365SsoLaunchPage",
-    label: "SSO enabled launch page",
+    label: `$(browser) ${localizeUtils_1.getLocalizedString("core.M365SsoLaunchPageOptionItem.label")}`,
     cliName: "sso-launch-page",
     detail: localizeUtils_1.getLocalizedString("core.M365SsoLaunchPageOptionItem.detail"),
-    groupName: localizeUtils_1.getLocalizedString("core.TeamsM365AppSeparatorOptionItem.label"),
+    groupName: localizeUtils_1.getLocalizedString("core.options.separator.m365"),
 };
 exports.M365SearchAppOptionItem = {
     id: "M365SearchApp",
-    label: "Search app",
+    label: `$(comment-discussion) ${localizeUtils_1.getLocalizedString("core.M365SearchAppOptionItem.label")}`,
     cliName: "search-app",
     detail: localizeUtils_1.getLocalizedString("core.M365SearchAppOptionItem.detail"),
-    groupName: localizeUtils_1.getLocalizedString("core.TeamsM365AppSeparatorOptionItem.label"),
+    groupName: localizeUtils_1.getLocalizedString("core.options.separator.m365"),
 };
 var AzureSolutionQuestionNames;
 (function (AzureSolutionQuestionNames) {
@@ -126,6 +159,7 @@ var AzureSolutionQuestionNames;
     AzureSolutionQuestionNames["ProgrammingLanguage"] = "programming-language";
     AzureSolutionQuestionNames["Solution"] = "solution";
     AzureSolutionQuestionNames["Scenarios"] = "scenarios";
+    AzureSolutionQuestionNames["Features"] = "features";
 })(AzureSolutionQuestionNames = exports.AzureSolutionQuestionNames || (exports.AzureSolutionQuestionNames = {}));
 exports.HostTypeOptionAzure = {
     id: "Azure",
@@ -142,20 +176,78 @@ exports.AzureResourceSQL = {
     label: localizeUtils_1.getLocalizedString("core.AzureResourceSQL.label"),
     description: localizeUtils_1.getLocalizedString("core.AzureResourceSQL.description"),
 };
+exports.AzureResourceSQLNewUI = {
+    id: "sql",
+    label: `$(azure) ${localizeUtils_1.getLocalizedString("core.AzureResourceSQLNewUI.label")}`,
+    detail: localizeUtils_1.getLocalizedString("core.AzureResourceSQLNewUI.detail"),
+    groupName: localizeUtils_1.getLocalizedString("core.options.separator.resource"),
+};
 exports.AzureResourceFunction = {
     id: "function",
     label: localizeUtils_1.getLocalizedString("core.AzureResourceFunction.label"),
 };
+exports.AzureResourceFunctionNewUI = {
+    id: "function",
+    label: `$(azure) ${localizeUtils_1.getLocalizedString("core.AzureResourceFunctionNewUI.label")}`,
+    detail: localizeUtils_1.getLocalizedString("core.AzureResourceFunctionNewUI.detail"),
+    groupName: localizeUtils_1.getLocalizedString("core.options.separator.resource"),
+};
 exports.AzureResourceApim = {
     id: "apim",
     label: localizeUtils_1.getLocalizedString("core.AzureResourceApim.label"),
     description: localizeUtils_1.getLocalizedString("core.AzureResourceApim.description"),
 };
+exports.AzureResourceApimNewUI = {
+    id: "apim",
+    label: `$(azure) ${localizeUtils_1.getLocalizedString("core.AzureResourceApimNewUI.label")}`,
+    detail: localizeUtils_1.getLocalizedString("core.AzureResourceApimNewUI.detail"),
+    groupName: localizeUtils_1.getLocalizedString("core.options.separator.resource"),
+};
 exports.AzureResourceKeyVault = {
     id: "keyvault",
     label: localizeUtils_1.getLocalizedString("core.AzureResourceKeyVault.label"),
     description: localizeUtils_1.getLocalizedString("core.AzureResourceKeyVault.description"),
 };
+exports.AzureResourceKeyVaultNewUI = {
+    id: "keyvault",
+    label: `$(azure) ${localizeUtils_1.getLocalizedString("core.AzureResourceKeyVaultNewUI.label")}`,
+    detail: localizeUtils_1.getLocalizedString("core.AzureResourceKeyVaultNewUI.detail"),
+    groupName: localizeUtils_1.getLocalizedString("core.options.separator.resource"),
+};
+exports.SingleSignOnOptionItem = {
+    id: "sso",
+    label: `$(unlock) ${localizeUtils_1.getLocalizedString("core.SingleSignOnOption.label")}`,
+    detail: localizeUtils_1.getLocalizedString("core.SingleSignOnOption.detail"),
+    groupName: localizeUtils_1.getLocalizedString("core.options.separator.additional"),
+    data: "https://aka.ms/teamsfx-add-sso",
+    buttons: [
+        {
+            iconPath: "tasklist",
+            tooltip: localizeUtils_1.getLocalizedString("core.option.tutorial"),
+            command: "fx-extension.openTutorial",
+        },
+    ],
+};
+exports.ApiConnectionOptionItem = {
+    id: "api-connection",
+    label: `$(arrow-swap) ${localizeUtils_1.getLocalizedString("core.ApiConnectionOption.label")}`,
+    detail: localizeUtils_1.getLocalizedString("core.ApiConnectionOption.detail"),
+    groupName: localizeUtils_1.getLocalizedString("core.options.separator.additional"),
+    data: "https://aka.ms/teamsfx-connect-api",
+    buttons: [
+        {
+            iconPath: "tasklist",
+            tooltip: localizeUtils_1.getLocalizedString("core.option.tutorial"),
+            command: "fx-extension.openTutorial",
+        },
+    ],
+};
+exports.CicdOptionItem = {
+    id: "cicd",
+    label: `$(sync) ${localizeUtils_1.getLocalizedString("core.cicdWorkflowOption.label")}`,
+    detail: localizeUtils_1.getLocalizedString("core.cicdWorkflowOption.detail"),
+    groupName: localizeUtils_1.getLocalizedString("core.options.separator.additional"),
+};
 var BotScenario;
 (function (BotScenario) {
     BotScenario["NotificationBot"] = "notificationBot";
@@ -202,6 +294,16 @@ function createAddAzureResourceQuestion(alreadyHaveFunction, alreadyHaveSQL, alr
     };
 }
 exports.createAddAzureResourceQuestion = createAddAzureResourceQuestion;
+function createAddCloudResourceOptions(alreadyHaveAPIM, alreadyHaveKeyVault) {
+    const options = [exports.AzureResourceFunctionNewUI];
+    if (!alreadyHaveAPIM)
+        options.push(exports.AzureResourceApimNewUI);
+    options.push(exports.AzureResourceSQLNewUI);
+    if (!alreadyHaveKeyVault)
+        options.push(exports.AzureResourceKeyVaultNewUI);
+    return options;
+}
+exports.createAddCloudResourceOptions = createAddCloudResourceOptions;
 function addCapabilityQuestion(alreadyHaveTab, alreadyHaveBot) {
     const options = [];
     if (!alreadyHaveTab)
@@ -267,4 +369,10 @@ function getUserEmailQuestion(currentUserEmail) {
     };
 }
 exports.getUserEmailQuestion = getUserEmailQuestion;
+exports.BotFeatureIds = [
+    exports.BotOptionItem.id,
+    exports.NotificationOptionItem.id,
+    exports.CommandAndResponseOptionItem.id,
+    exports.MessageExtensionItem.id,
+];
 //# sourceMappingURL=question.js.map

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

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

package/build/plugins/solution/fx-solution/utils/ResourceGroupHelper.js CHANGED Viewed

@@ -53,7 +53,7 @@ class ResourceGroupApiError extends teamsfx_api_1.UserError {
             super(constants_2.SolutionSource, errorName, `${baseErrorMessage}, error: '${rawErrorString}'`);
         }
         else if (error instanceof Error) {
-            super({ name: errorName, error: error });
+            super({ name: errorName, error: error, source: constants_2.SolutionSource });
         }
         else {
             super(constants_2.SolutionSource, errorName, `${baseErrorMessage}, error: '${JSON.stringify(error)}'`);

package/build/plugins/solution/fx-solution/utils/ResourceGroupHelper.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ResourceGroupHelper.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/utils/ResourceGroupHelper.ts"],"names":[],"mappings":";;;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,wDAAgE;AAChE,gEAA8D;AAC9D,kDAA8C;AAC9C,6CAAiF;AACjF,wDAYgC;AAChC,4DAAiE;AACjE,oEAAwF;AACxF,6EAAwE;AACxE,wDAKmC;AACnC,4CAA6D;AAE7D,MAAM,WAAW,GAAG,qBAAqB,CAAC;AAC1C,MAAM,cAAc,GAAG,gBAAgB,CAAC;AAO3B,QAAA,4BAA4B,GAAG,SAAS,CAAC;AAOtD,+DAA+D;AAC/D,MAAM,sBAAsB,GAAG,sBAAsB,CAAC;AAEtD,SAAgB,2BAA2B,CAAC,SAAiB;IAC3D,OAAO,KAAK,EAAE,GAAgB,EAAE,IAAkB,EAAE,EAAE;QACpD,MAAM,iBAAiB,GACrB,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,QAAQ;YAC9D,CAAC,CAAE,GAAG,CAAC,SAAS,CAAC,CAAC,CAAY;YAC9B,CAAC,CAAC,SAAS,CAAC;QAChB,IAAI;YACF,MAAM,IAAI,EAAE,CAAC;SACd;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,OAAO,GAAG,IAAI,qBAAqB,CAAC,SAAS,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC;YAC3E,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,OAAO,CAAC,CAAC;SAC3B;IACH,CAAC,CAAC;AACJ,CAAC;AAbD,kEAaC;AAED,MAAa,qBAAsB,SAAQ,uBAAS;IAClD,YAAY,SAAiB,EAAE,iBAA0B,EAAE,KAAW;QACpE,MAAM,gBAAgB,GAAG,GAAG,SAAS,WACnC,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,GAAG,iBAAiB,CAAC,CAAC,CAAC,EAC9D,EAAE,CAAC;QACH,MAAM,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC;QAClC,IAAI,CAAC,KAAK;YAAE,KAAK,CAAC,0BAAc,EAAE,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;aAChE,IAAI,KAAK,YAAY,sBAAS,EAAE;YACnC,MAAM,SAAS,GAAG,KAAkB,CAAC;YACrC,yEAAyE;YACzE,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC;gBACpC,IAAI,EAAE,SAAS,CAAC,IAAI;gBACpB,UAAU,EAAE,SAAS,CAAC,UAAU;gBAChC,IAAI,EAAE,SAAS,CAAC,IAAI;gBACpB,IAAI,EAAE,SAAS,CAAC,IAAI;gBACpB,OAAO,EAAE,SAAS,CAAC,OAAO;aAC3B,CAAC,CAAC;YACH,KAAK,CAAC,0BAAc,EAAE,SAAS,EAAE,GAAG,gBAAgB,aAAa,cAAc,GAAG,CAAC,CAAC;SACrF;aAAM,IAAI,KAAK,YAAY,KAAK,EAAE;YACjC,KAAK,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;~~SAC1C~~;aAAM;YACL,KAAK,CAAC,0BAAc,EAAE,SAAS,EAAE,GAAG,gBAAgB,aAAa,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SAC5F;IACH,CAAC;CACF;AAxBD,sDAwBC;AAED,MAAa,mBAAmB;IAE9B,KAAK,CAAC,sBAAsB,CAC1B,iBAAyB,EACzB,oBAA0C,EAC1C,cAAsB,EACtB,QAAgB;QAEhB,MAAM,UAAU,GAAG,MAAM,oBAAoB,CAAC,yBAAyB,EAAE,CAAC;QAC1E,IAAI,CAAC,UAAU;YACb,OAAO,iBAAG,CACR,IAAI,uBAAS,CACX,0BAAc,EACd,yBAAa,CAAC,0BAA0B,EACxC,gCAAgC,CACjC,CACF,CAAC;QACJ,MAAM,QAAQ,GAAG,IAAI,wCAAwB,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;QAC1E,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC;QACvF,IAAI,UAAU,CAAC,KAAK,EAAE,EAAE;YACtB,OAAO,iBAAG,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;SAC9B;QACD,IAAI,UAAU,CAAC,KAAK,EAAE;YACpB,OAAO,iBAAG,CACR,IAAI,uBAAS,CACX,0BAAc,EACd,yBAAa,CAAC,2BAA2B,EACzC,oCAAoC,iBAAiB,8BAA8B,CACpF,CACF,CAAC;SACH;QACD,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC,iBAAiB,EAAE;YAC/E,QAAQ,EAAE,QAAQ;YAClB,IAAI,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE;SAClC,CAAC,CAAC;QACH,IAAI,QAAQ,CAAC,IAAI,KAAK,SAAS,EAAE;YAC/B,OAAO,iBAAG,CAAC,IAAI,qBAAqB,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC,CAAC;SACpE;QACD,OAAO,gBAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC;IAGD,KAAK,CAAC,2BAA2B,CAC/B,iBAAyB,EACzB,QAAkC;QAElC,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC;QACjF,OAAO,gBAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;IAGD,KAAK,CAAC,oBAAoB,CACxB,iBAAyB,EACzB,QAAkC;QAElC,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QACpE,IAAI,MAAM,CAAC,IAAI,EAAE;YACf,OAAO,gBAAE,CAAC;gBACR,sBAAsB,EAAE,KAAK;gBAC7B,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,QAAQ,EAAE,MAAM,CAAC,QAAQ;aAC1B,CAAC,CAAC;SACJ;;YAAM,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;IAC9B,CAAC;IAGD,KAAK,CAAC,kBAAkB,CACtB,QAAkC;QAElC,MAAM,oBAAoB,GAAG,MAAM,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;QAClE,MAAM,0BAA0B,GAAG,oBAAoB;aACpD,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;aAC3B,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAqB,CAAC,CAAC;QACjE,OAAO,gBAAE,CAAC,0BAA0B,CAAC,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,oBAA0C,EAC1C,QAAkC;;QAElC,MAAM,UAAU,GAAG,MAAM,oBAAoB,CAAC,yBAAyB,EAAE,CAAC;QAC1E,IAAI,CAAC,UAAU;YACb,OAAO,iBAAG,CACR,IAAI,uBAAS,CACX,0BAAc,EACd,yBAAa,CAAC,0BAA0B,EACxC,gCAAgC,CACjC,CACF,CAAC;QACJ,MAAM,kBAAkB,GAAG,IAAI,sCAAkB,CAAC,UAAU,CAAC,CAAC;QAC9D,MAAM,SAAS,GAAG,MAAM,oBAAoB,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;QAC3E,MAAM,aAAa,GAAG,MAAM,kBAAkB,CAAC,aAAa,CAAC,aAAa,CACxE,SAAU,CAAC,cAAc,CAC1B,CAAC;QACF,MAAM,SAAS,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAChE,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC/D,MAAM,gBAAgB,GAAG,MAAA,YAAY,CAAC,aAAa,0CAAE,IAAI,CACvD,CAAC,EAAE,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,EAAE,CAAC,YAAY,0CAAE,WAAW,EAAE,MAAK,cAAc,CAAC,WAAW,EAAE,CAAA,EAAA,CACxE,CAAC;QACF,MAAM,iBAAiB,GAAG,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,SAAS,CAAC;QACtD,MAAM,WAAW,GAAG,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QAClF,IAAI,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,IAAI,CAAC,EAAE;YAC3C,OAAO,iBAAG,CACR,IAAI,uBAAS,CACX,0BAAc,EACd,yBAAa,CAAC,iCAAiC,EAC/C,gCAAgB,CAAC,yCAAyC,CAAC,EAC3D,kCAAkB,CAAC,yCAAyC,CAAC,CAC9D,CACF,CAAC;SACH;QACD,OAAO,gBAAE,CAAC,WAAW,CAAC,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,4BAA4B,CAChC,wBAAgC,EAChC,kCAAsD,EACtD,kBAA4B;QAE5B,MAAM,mBAAmB,GAAG,sCAA2B,CAAC;QACxD,MAAM,aAAa,GAAiB;YAClC,EAAE,EAAE,EAAE,sBAAsB,EAAE,KAAK,EAAE,sBAAsB,EAAE;SAC9D,CAAC;QACF,mBAAmB,CAAC,aAAa,GAAG,aAAa,CAAC,MAAM,CACtD,kCAAkC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YAC9C,OAAO;gBACL,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC;gBACX,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;gBACd,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC;aACrB,CAAC;QACJ,CAAC,CAAC,CACH,CAAC;QAEF,MAAM,IAAI,GAAG,IAAI,uBAAS,CAAC,mBAAmB,CAAC,CAAC;QAEhD,MAAM,yBAAyB,GAAG,uCAA4B,CAAC;QAC/D,yBAAyB,CAAC,OAAO,GAAG,wBAAwB,CAAC;QAC7D,MAAM,wBAAwB,GAAG,IAAI,uBAAS,CAAC,yBAAyB,CAAC,CAAC;QAC1E,wBAAwB,CAAC,SAAS,GAAG,EAAE,MAAM,EAAE,sBAAsB,EAAE,CAAC;QACxE,IAAI,CAAC,QAAQ,CAAC,wBAAwB,CAAC,CAAC;QAExC,MAAM,cAAc,GAAG,2CAAgC,CAAC;QACxD,oCAAoC;QACpC,cAAc,CAAC,aAAa,GAAG,kBAAkB,CAAC;QAClD,MAAM,4BAA4B,GAAG,IAAI,uBAAS,CAAC,cAAc,CAAC,CAAC;QACnE,wBAAwB,CAAC,QAAQ,CAAC,4BAA4B,CAAC,CAAC;QAEhE,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;IACrB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,oBAAoB,CACxB,GAAe,EACf,MAAc,EACd,oBAA0C,EAC1C,QAAkC,EAClC,wBAAgC;;QAEhC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAC1D,IAAI,SAAS,CAAC,KAAK,EAAE;YAAE,OAAO,iBAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAEnD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,oBAAoB,EAAE,QAAQ,CAAC,CAAC;QAChF,IAAI,eAAe,CAAC,KAAK,EAAE,EAAE;YAC3B,OAAO,iBAAG,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;SACnC;QAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAClD,wBAAwB,EACxB,SAAS,CAAC,KAAK,EACf,eAAe,CAAC,KAAK,CACtB,CAAC;QACF,IAAI,IAAI,EAAE;YACR,MAAM,GAAG,GAAG,MAAM,sBAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC;YAC9D,IAAI,GAAG,CAAC,KAAK,EAAE,EAAE;gBACf,MAAA,GAAG,CAAC,WAAW,0CAAE,KAAK,CACpB,IAAI,6BAAiB,CAAC,QAAQ,2DAA2D,CAC1F,CAAC;gBACF,OAAO,iBAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;aACvB;YAED,MAAM,YAAY,GAAG,2BAAW,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAC/C,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CACnB,IACE,6BAAiB,CAAC,QACpB,+DAA+D,IAAI,CAAC,SAAS,CAC3E,YAAY,CACb,EAAE,CACJ,CAAC;SACH;QACD,MAAM,uBAAuB,GAAG,MAAM,CAAC,uBAAuB,CAAC;QAC/D,IAAI,CAAC,uBAAuB,IAAI,OAAO,uBAAuB,KAAK,QAAQ,EAAE;YAC3E,OAAO,iBAAG,CACR,IAAI,uBAAS,CAAC,0BAAc,EAAE,mBAAmB,EAAE,iCAAiC,CAAC,CACtF,CAAC;SACH;QACD,MAAM,iBAAiB,GAAG,MAAM,CAAC,uBAAuB,CAAC;QACzD,IAAI,iBAAiB,KAAK,sBAAsB,EAAE;YAChD,OAAO,gBAAE,CAAC;gBACR,IAAI,EAAE,MAAM,CAAC,4BAAiB,CAAC,oBAAoB,CAAC;gBACpD,QAAQ,EAAE,MAAM,CAAC,4BAAiB,CAAC,wBAAwB,CAAC;gBAC5D,sBAAsB,EAAE,IAAI;aAC7B,CAAC,CAAC;SACJ;aAAM;YACL,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,uBAAuB,CAAC,CAAC;YAClF,MAAM,QAAQ,GAAG,MAAO,CAAC,CAAC,CAAC,CAAC,CAAC,uEAAuE;YACpG,OAAO,gBAAE,CAAC;gBACR,sBAAsB,EAAE,KAAK;gBAC7B,IAAI,EAAE,uBAAuB;gBAC7B,QAAQ,EAAE,QAAQ;aACnB,CAAC,CAAC;SACJ;IACH,CAAC;CACF;AApNC;IADC,aAAK,CAAC,CAAC,2BAA2B,CAAC,QAAQ,CAAC,CAAC,CAAC;;;;iEAsC9C;AAGD;IADC,aAAK,CAAC,CAAC,2BAA2B,CAAC,gBAAgB,CAAC,CAAC,CAAC;;qDAG3C,wCAAwB;;sEAInC;AAGD;IADC,aAAK,CAAC,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC,CAAC;;qDAGhC,wCAAwB;;+DAUnC;AAGD;IADC,aAAK,CAAC,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAC,CAAC;;6CAEjC,wCAAwB;;6DAOnC;AA1EH,kDAsNC;AAEY,QAAA,mBAAmB,GAAG,IAAI,mBAAmB,EAAE,CAAC"}
1	+ {"version":3,"file":"ResourceGroupHelper.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/utils/ResourceGroupHelper.ts"],"names":[],"mappings":"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"}

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

	@@ -1 +1 @@
1	- {"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAEb,OAAO,EACP,MAAM,EAGN,MAAM,EACN,EAAE,EACF,IAAI,EAKL,MAAM,wBAAwB,CAAC;~~AA6BhC~~,wBAAsB,MAAM,CAC1B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,~~CAyKhC~~"}
1	+ {"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAEb,OAAO,EACP,MAAM,EAGN,MAAM,EACN,EAAE,EACF,IAAI,EAKL,MAAM,wBAAwB,CAAC;AA+BhC,wBAAsB,MAAM,CAC1B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAmNhC"}

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

@@ -20,8 +20,10 @@ async function deploy(ctx, inputs, envInfo, tokenProvider) {
         [constants_3.SolutionTelemetryProperty.Component]: constants_3.SolutionTelemetryComponentName,
         [constants_3.SolutionTelemetryProperty.IncludeAadManifest]: (_b = inputs[constants_2.Constants.INCLUDE_AAD_MANIFEST]) !== null && _b !== void 0 ? _b : "no",
     });
+    const isDeployAADManifestFromVSCode = inputs[constants_2.Constants.INCLUDE_AAD_MANIFEST] === "yes" && inputs.platform === teamsfx_api_1.Platform.VSCode;
     const provisionOutputs = envInfo.state;
     const inAzureProject = utils_1.isAzureProject(utils_1.getAzureSolutionSettings(ctx));
+    const botTroubleShootMsg = utils_1.getBotTroubleShootMessage(utils_1.getAzureSolutionSettings(ctx));
     const provisioned = provisionOutputs[constants_3.GLOBAL_CONFIG][constants_3.SOLUTION_PROVISION_SUCCEEDED] ||
         inputs[constants_2.Constants.DEPLOY_AAD_FROM_CODELENS] === "yes";
     if (inAzureProject && !provisioned) {
@@ -49,7 +51,7 @@ async function deploy(ctx, inputs, envInfo, tokenProvider) {
     let optionsToDeploy = [];
     if (!isVsProject) {
         optionsToDeploy = inputs[question_1.AzureSolutionQuestionNames.PluginSelectionDeploy];
-        if (inputs[constants_2.Constants.INCLUDE_AAD_MANIFEST] === "yes" && inputs.platform === teamsfx_api_1.Platform.VSCode) {
+        if (isDeployAADManifestFromVSCode) {
             optionsToDeploy = [constants_3.PluginNames.AAD];
         }
         if (inputs[constants_2.Constants.INCLUDE_AAD_MANIFEST] !== "yes" && inputs.platform === teamsfx_api_1.Platform.CLI) {
@@ -87,14 +89,45 @@ async function deploy(ctx, inputs, envInfo, tokenProvider) {
     const result = await executor_1.executeConcurrently(thunks, ctx.logProvider);
     if (result.kind === "success") {
         if (inAzureProject) {
-            const msg = localizeUtils_1.getLocalizedString("core.deploy.successNotice", ctx.projectSetting.appName);
+            let msg = localizeUtils_1.getLocalizedString("core.deploy.successNotice", ctx.projectSetting.appName) +
+                botTroubleShootMsg.textForLogging;
+            if (isDeployAADManifestFromVSCode) {
+                msg = localizeUtils_1.getLocalizedString("core.deploy.aadManifestSuccessNotice");
+            }
             ctx.logProvider.info(msg);
-            ctx.userInteraction.showMessage("info", msg, false);
+            if (botTroubleShootMsg.textForLogging && !isDeployAADManifestFromVSCode) {
+                // Show a `Learn more` action button for bot trouble shooting.
+                ctx.userInteraction
+                    .showMessage("info", `${localizeUtils_1.getLocalizedString("core.deploy.successNotice", ctx.projectSetting.appName)} ${botTroubleShootMsg.textForMsgBox}`, false, botTroubleShootMsg.textForActionButton)
+                    .then((result) => {
+                    const userSelected = result.isOk() ? result.value : undefined;
+                    if (userSelected === botTroubleShootMsg.textForActionButton) {
+                        ctx.userInteraction.openUrl(botTroubleShootMsg.troubleShootLink);
+                    }
+                });
+            }
+            else {
+                if (isDeployAADManifestFromVSCode) {
+                    ctx.userInteraction
+                        .showMessage("info", msg, false, localizeUtils_1.getLocalizedString("core.deploy.aadManifestLearnMore"))
+                        .then((result) => {
+                        var _a;
+                        const userSelected = result.isOk() ? result.value : undefined;
+                        if (userSelected === localizeUtils_1.getLocalizedString("core.deploy.aadManifestLearnMore")) {
+                            (_a = ctx.userInteraction) === null || _a === void 0 ? void 0 : _a.openUrl(constants_3.ViewAadAppHelpLink);
+                        }
+                    });
+                }
+                else {
+                    ctx.userInteraction.showMessage("info", msg, false);
+                }
+            }
         }
         return teamsfx_api_1.ok(teamsfx_api_1.Void);
     }
     else {
-        const msg = localizeUtils_1.getLocalizedString("core.deploy.failNotice", ctx.projectSetting.appName);
+        const msg = localizeUtils_1.getLocalizedString("core.deploy.failNotice", ctx.projectSetting.appName) +
+            botTroubleShootMsg.textForLogging;
         ctx.logProvider.info(msg);
         return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_3.SolutionTelemetryEvent.Deploy, result.error, ctx.telemetryReporter));
     }

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

	@@ -1 +1 @@
1	- {"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/deploy.ts"],"names":[],"mappings":";;;AAAA,wDAcgC;AAChC,mCAAqC;AAErC,4DAAiE;AACjE,oEAAwF;AACxF,oFAAyF;AACzF,+DAA4D;AAC5D,wDAAwE;AACxE,~~4CASsB~~;AACtB,0CAAyD;AACzD,wCAAkE;AAClE,+CAAsD;AACtD,yCAA6D;AAC7D,~~mCAKiB~~;AAEV,KAAK,UAAU,MAAM,CAC1B,GAAe,EACf,MAAc,EACd,OAAsC,EACtC,aAA4B;;IAE5B,MAAA,GAAG,CAAC,iBAAiB,0CAAE,kBAAkB,CAAC,kCAAsB,CAAC,WAAW,EAAE;QAC5E,CAAC,qCAAyB,CAAC,SAAS,CAAC,EAAE,0CAA8B;QACrE,CAAC,qCAAyB,CAAC,kBAAkB,CAAC,EAAE,MAAA,MAAM,CAAC,qBAAS,CAAC,oBAAoB,CAAC,mCAAI,IAAI;KAC/F,CAAC,CAAC;~~IACH~~,MAAM,gBAAgB,GAAS,OAAO,CAAC,KAAK,CAAC;IAC7C,MAAM,cAAc,GAAG,sBAAc,CAAC,gCAAwB,CAAC,GAAG,CAAC,CAAC,CAAC;IACrE,MAAM,WAAW,GACd,gBAAgB,CAAC,yBAAa,CAAC,CAAC,wCAA4B,CAAa;QAC1E,MAAM,CAAC,qBAAS,CAAC,wBAAwB,CAAC,KAAK,KAAK,CAAC;IAEvD,IAAI,cAAc,IAAI,CAAC,WAAW,EAAE;QAClC,OAAO,iBAAG,CACR,wCAAiC,CAC/B,kCAAsB,CAAC,MAAM,EAC7B,IAAI,uBAAS,CACX,0BAAc,EACd,yBAAa,CAAC,2BAA2B,EACzC,gCAAgB,CAAC,2BAA2B,EAAE,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,EACzE,kCAAkB,CAAC,2BAA2B,EAAE,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CAC5E,EACD,GAAG,CAAC,iBAAiB,CACtB,CACF,CAAC;KACH;IAED,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,kBAAkB,GAAG,MAAM,aAAa,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC;QAE9E,IAAI,kBAAkB,EAAE;YACtB,MAAM,SAAS,GAAG,MAAM,iCAAe,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,kBAAkB,CAAC,CAAC;YAC3F,IAAI,SAAS,CAAC,KAAK,EAAE,EAAE;gBACrB,OAAO,SAAS,CAAC;aAClB;SACF;aAAM;YACL,OAAO,iBAAG,CACR,wCAAiC,CAC/B,kCAAsB,CAAC,MAAM,EAC7B,IAAI,yBAAW,CACb,0BAAc,EACd,yBAAa,CAAC,gBAAgB,EAC9B,gCAAgB,CAAC,6BAA6B,CAAC,EAC/C,kCAAkB,CAAC,6BAA6B,CAAC,CAClD,EACD,GAAG,CAAC,iBAAiB,CACtB,CACF,CAAC;SACH;KACF;SAAM;QACL,MAAM,UAAU,GAAG,MAAM,mCAAiB,CACxC,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAC7B,aAAa,CAAC,oBAAoB,CACnC,CAAC;QACF,IAAI,UAAU,CAAC,KAAK,EAAE,EAAE;YACtB,OAAO,UAAU,CAAC;SACnB;KACF;IAED,MAAM,WAAW,GAAG,mCAAW,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAEpD,IAAI,eAAe,GAAa,EAAE,CAAC;IACnC,IAAI,CAAC,WAAW,EAAE;QAChB,eAAe,GAAG,MAAM,CAAC,qCAA0B,CAAC,qBAAqB,CAAa,CAAC;QACvF,IAAI,~~MAAM~~,~~CAAC,qBAAS,CAAC,oBAAoB,CAAC,KAAK,KAAK,IAAI,MAAM,CAAC,QAAQ,KAAK,sBAAQ,CAAC,MAAM,~~EAAE;~~YAC3F~~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~~MAAM~~,GAAG,~~GAAG~~,kCAAkB,CAAC,2BAA2B,EAAE,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;~~YACxF~~,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC1B,GAAG,CAAC,eAAe,CAAC,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;~~SACrD~~;QACD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;KACjB;SAAM;QACL,MAAM,GAAG,~~GAAG~~,kCAAkB,CAAC,wBAAwB,EAAE,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;~~QACrF~~,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC1B,OAAO,iBAAG,CACR,wCAAiC,CAC/B,kCAAsB,CAAC,MAAM,EAC7B,MAAM,CAAC,KAAK,EACZ,GAAG,CAAC,iBAAiB,CACtB,CACF,CAAC;KACH;AACH,CAAC;~~AA9KD~~,~~wBA8KC~~"}
1	+ {"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/deploy.ts"],"names":[],"mappings":"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"}