@microsoft/teamsfx-core 2.0.8-alpha.7fe3da414.0 → 2.0.8-alpha.b015b287e.0

package/build/component/driver/teamsApp/validateTestCases.js

@@ -4,6 +4,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ValidateWithTestCasesDriver = void 0;
 const tslib_1 = require("tslib");
+const os_1 = require("os");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const lib_1 = require("@feathersjs/hooks/lib");
 const typedi_1 = require("typedi");
@@ -20,6 +21,7 @@ const constants_1 = require("./constants");
 const metadataUtil_1 = require("../../utils/metadataUtil");
 const common_1 = require("../../../error/common");
 const AsyncAppValidationResponse_1 = require("./interfaces/AsyncAppValidationResponse");
+const constant_1 = require("../../configManager/constant");
 const actionName = "teamsApp/validateWithTestCases";
 let ValidateWithTestCasesDriver = class ValidateWithTestCasesDriver {
     constructor() {
@@ -35,7 +37,7 @@ let ValidateWithTestCasesDriver = class ValidateWithTestCasesDriver {
         };
     }
     async validate(args, context) {
-        var _a;
+        var _a, _b;
         const result = this.validateArgs(args);
         if (result.isErr()) {
             return teamsfx_api_1.err(result.error);
@@ -64,6 +66,33 @@ let ValidateWithTestCasesDriver = class ValidateWithTestCasesDriver {
                 return teamsfx_api_1.err(appStudioTokenRes.error);
             }
             const appStudioToken = appStudioTokenRes.value;
+            // Check if the app has ongoing validation
+            const existingValidationResponse = await appStudioClient_1.AppStudioClient.getAppValidationRequestList(manifest.id, appStudioToken);
+            if (existingValidationResponse.appValidations) {
+                for (const validation of existingValidationResponse.appValidations) {
+                    if (validation.status === AsyncAppValidationResponse_1.AsyncAppValidationStatus.InProgress ||
+                        validation.status === AsyncAppValidationResponse_1.AsyncAppValidationStatus.Created) {
+                        if (context.platform === teamsfx_api_1.Platform.CLI) {
+                            const message = [
+                                {
+                                    content: `A validation is currently in progress, please submit later. You can find this existing validation from `,
+                                    color: teamsfx_api_1.Colors.BRIGHT_YELLOW,
+                                },
+                                {
+                                    content: `${constants_1.getAppStudioEndpoint()}/apps/${manifest.id}/app-validation/${validation.id}`,
+                                    color: teamsfx_api_1.Colors.BRIGHT_CYAN,
+                                },
+                            ];
+                            (_a = context.ui) === null || _a === void 0 ? void 0 : _a.showMessage("warn", message, false);
+                        }
+                        else {
+                            const message = localizeUtils_1.getLocalizedString("driver.teamsApp.progressBar.validateWithTestCases.conflict", `${constants_1.getAppStudioEndpoint()}/apps/${manifest.id}/app-validation/${validation.id}`);
+                            context.logProvider.warning(message);
+                        }
+                        return teamsfx_api_1.ok(new Map());
+                    }
+                }
+            }
             const response = await appStudioClient_1.AppStudioClient.submitAppValidationRequest(manifest.id, appStudioToken);
             if (context.platform === teamsfx_api_1.Platform.CLI) {
                 const message = [
@@ -76,7 +105,7 @@ let ValidateWithTestCasesDriver = class ValidateWithTestCasesDriver {
                         color: teamsfx_api_1.Colors.BRIGHT_CYAN,
                     },
                 ];
-                (_a = context.ui) === null || _a === void 0 ? void 0 : _a.showMessage("info", message, false);
+                (_b = context.ui) === null || _b === void 0 ? void 0 : _b.showMessage("info", message, false);
             }
             else {
                 const message = localizeUtils_1.getLocalizedString("driver.teamsApp.progressBar.validateWithTestCases.step", response.status, `${constants_1.getAppStudioEndpoint()}/apps/${manifest.id}/app-validation`);
@@ -99,7 +128,6 @@ let ValidateWithTestCasesDriver = class ValidateWithTestCasesDriver {
      * @param teamsAppId
      */
     async runningBackgroundJob(args, context, appStudioToken, response, teamsAppId) {
-        const validationStatusUrl = `${constants_1.getAppStudioEndpoint()}/apps/${teamsAppId}/app-validation/${response.appValidationId}`;
         const validationRequestListUrl = `${constants_1.getAppStudioEndpoint()}/apps/${teamsAppId}/app-validation`;
         try {
             if (args.showProgressBar && context.ui) {
@@ -108,43 +136,15 @@ let ValidateWithTestCasesDriver = class ValidateWithTestCasesDriver {
                 const message = localizeUtils_1.getLocalizedString("driver.teamsApp.progressBar.validateWithTestCases.step", response.status, validationRequestListUrl);
                 await context.progressBar.next(message);
             }
-            while (response.status !== AsyncAppValidationResponse_1.AsyncAppValidationStatus.Completed &&
-                response.status !== AsyncAppValidationResponse_1.AsyncAppValidationStatus.Aborted) {
+            let resultResp = response;
+            while (resultResp.status !== AsyncAppValidationResponse_1.AsyncAppValidationStatus.Completed &&
+                resultResp.status !== AsyncAppValidationResponse_1.AsyncAppValidationStatus.Aborted) {
                 await tools_1.waitSeconds(constants_1.CEHCK_VALIDATION_RESULTS_INTERVAL_SECONDS);
-                const message = localizeUtils_1.getLocalizedString("driver.teamsApp.progressBar.validateWithTestCases.step", response.status, validationRequestListUrl);
+                const message = localizeUtils_1.getLocalizedString("driver.teamsApp.progressBar.validateWithTestCases.step", resultResp.status, validationRequestListUrl);
                 context.logProvider.info(message);
-                response = await appStudioClient_1.AppStudioClient.getAppValidationById(response.appValidationId, appStudioToken);
-            }
-            if (response.status === AsyncAppValidationResponse_1.AsyncAppValidationStatus.Completed) {
-                if (args.showMessage && context.ui) {
-                    void context.ui
-                        .showMessage("info", localizeUtils_1.getLocalizedString("driver.teamsApp.summary.validateWithTestCases", response.status), false, localizeUtils_1.getLocalizedString("driver.teamsApp.summary.validateWithTestCases.viewResult"))
-                        .then(async (res) => {
-                        var _a;
-                        if (res.isOk() &&
-                            res.value ===
-                                localizeUtils_1.getLocalizedString("driver.teamsApp.summary.validateWithTestCases.viewResult")) {
-                            await ((_a = context.ui) === null || _a === void 0 ? void 0 : _a.openUrl(validationStatusUrl));
-                        }
-                    });
-                }
-                context.logProvider.info(localizeUtils_1.getLocalizedString("driver.teamsApp.summary.validateWithTestCases", response.status, validationStatusUrl));
-            }
-            else {
-                if (args.showMessage && context.ui) {
-                    void context.ui
-                        .showMessage("error", localizeUtils_1.getLocalizedString("driver.teamsApp.summary.validateWithTestCases.result", response.status), false, localizeUtils_1.getLocalizedString("driver.teamsApp.summary.validateWithTestCases.viewResult"))
-                        .then(async (res) => {
-                        var _a;
-                        if (res.isOk() &&
-                            res.value ===
-                                localizeUtils_1.getLocalizedString("driver.teamsApp.summary.validateWithTestCases.viewResult")) {
-                            await ((_a = context.ui) === null || _a === void 0 ? void 0 : _a.openUrl(validationStatusUrl));
-                        }
-                    });
-                }
-                context.logProvider.error(localizeUtils_1.getLocalizedString("driver.teamsApp.summary.validateWithTestCases", response.status, validationStatusUrl));
+                resultResp = await appStudioClient_1.AppStudioClient.getAppValidationById(resultResp.appValidationId, appStudioToken);
             }
+            this.evaluateValidationResults(args, context, resultResp, teamsAppId);
         }
         finally {
             if (args.showProgressBar && context.progressBar) {
@@ -152,6 +152,59 @@ let ValidateWithTestCasesDriver = class ValidateWithTestCasesDriver {
             }
         }
     }
+    /**
+     * Evaluate the validation results and log the summary
+     * @param args
+     * @param context
+     * @param resultResp
+     * @param teamsAppId
+     */
+    evaluateValidationResults(args, context, resultResp, teamsAppId) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        const validationStatusUrl = `${constants_1.getAppStudioEndpoint()}/apps/${teamsAppId}/app-validation/${resultResp.appValidationId}`;
+        const failed = (_c = (_b = (_a = resultResp.validationResults) === null || _a === void 0 ? void 0 : _a.failures) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0;
+        const warns = (_f = (_e = (_d = resultResp.validationResults) === null || _d === void 0 ? void 0 : _d.warnings) === null || _e === void 0 ? void 0 : _e.length) !== null && _f !== void 0 ? _f : 0;
+        const skipped = (_j = (_h = (_g = resultResp.validationResults) === null || _g === void 0 ? void 0 : _g.skipped) === null || _h === void 0 ? void 0 : _h.length) !== null && _j !== void 0 ? _j : 0;
+        const passed = (_m = (_l = (_k = resultResp.validationResults) === null || _k === void 0 ? void 0 : _k.successes) === null || _l === void 0 ? void 0 : _l.length) !== null && _m !== void 0 ? _m : 0;
+        const summaryStrArr = [];
+        const detailStrArr = [];
+        if (failed > 0) {
+            summaryStrArr.push(localizeUtils_1.getLocalizedString("driver.teamsApp.summary.validate.failed", failed));
+            for (const failure of resultResp.validationResults.failures) {
+                detailStrArr.push(localizeUtils_1.getLocalizedString("driver.teamsApp.summary.validateWithTestCases.result.detail", constant_1.SummaryConstant.Failed, failure.title, failure.message));
+            }
+        }
+        if (warns > 0) {
+            summaryStrArr.push(localizeUtils_1.getLocalizedString("driver.teamsApp.summary.validate.warning", warns));
+            for (const warning of resultResp.validationResults.warnings) {
+                detailStrArr.push(localizeUtils_1.getLocalizedString("driver.teamsApp.summary.validateWithTestCases.result.detail", constant_1.SummaryConstant.Warning, warning.title, warning.message));
+            }
+        }
+        if (skipped > 0) {
+            summaryStrArr.push(localizeUtils_1.getLocalizedString("driver.teamsApp.summary.validate.skipped", skipped));
+        }
+        if (passed > 0) {
+            summaryStrArr.push(localizeUtils_1.getLocalizedString("driver.teamsApp.summary.validate.succeed", passed));
+        }
+        const summaryStr = summaryStrArr.join(", ");
+        let detailStr = detailStrArr.join(os_1.EOL);
+        // start a new line if the detail is not empty.
+        if (detailStr.length > 0) {
+            detailStr = os_1.EOL + detailStr;
+        }
+        if (resultResp.status === AsyncAppValidationResponse_1.AsyncAppValidationStatus.Completed) {
+            if (args.showMessage && context.ui) {
+                void context.ui.showMessage("info", localizeUtils_1.getLocalizedString("driver.teamsApp.summary.validateWithTestCases.result", resultResp.status, summaryStr), false);
+            }
+            context.logProvider.info(localizeUtils_1.getLocalizedString("driver.teamsApp.summary.validateWithTestCases", resultResp.status, summaryStr, validationStatusUrl, detailStr));
+        }
+        else {
+            if (args.showMessage && context.ui) {
+                void context.ui.showMessage("error", localizeUtils_1.getLocalizedString("driver.teamsApp.summary.validateWithTestCases.result", resultResp.status, ""), false);
+            }
+            context.logProvider.error(localizeUtils_1.getLocalizedString("driver.teamsApp.summary.validateWithTestCases", resultResp.status, "", validationStatusUrl, ""));
+        }
+    }
     validateArgs(args) {
         if (!args || !args.appPackagePath) {
             return teamsfx_api_1.err(new common_1.InvalidActionInputError(actionName, ["appPackagePath"]));

package/build/component/driver/teamsApp/validateTestCases.js.map

@@ -1 +1 @@
-{"version":3,"file":"validateTestCases.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validateTestCases.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validateTestCases.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validateTestCases.ts"],"names":[],"mappings":"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"}

package/build/component/generator/officeXMLAddin/generator.d.ts

@@ -1,9 +1,10 @@
 import { Context, FxError, Inputs, Result } from "@microsoft/teamsfx-api";
+import { ActionContext } from "../../middleware/actionExecutionMW";
 /**
  * project-type=office-xml-addin-type addin-host!==outlook
  */
 export declare class OfficeXMLAddinGenerator {
-    static generate(context: Context, inputs: Inputs, destinationPath: string): Promise<Result<undefined, FxError>>;
+    static generate(context: Context, inputs: Inputs, destinationPath: string, actionContext?: ActionContext): Promise<Result<undefined, FxError>>;
     static childProcessExec(cmdLine: string): Promise<{
         stdout: string;
         stderr: string;

package/build/component/generator/officeXMLAddin/generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/officeXMLAddin/generator.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAW,MAAM,wBAAwB,CAAC;AAmBnF;;GAEG;AACH,qBAAa,uBAAuB;WASrB,QAAQ,CACnB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;WA2ElB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;QAC7D,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CAGH"}
+{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/officeXMLAddin/generator.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAW,MAAM,wBAAwB,CAAC;AASnF,OAAO,EAAqB,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAkBtF;;GAEG;AACH,qBAAa,uBAAuB;WASrB,QAAQ,CACnB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;WA0FlB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;QAC7D,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CAGH"}

package/build/component/generator/officeXMLAddin/generator.js

@@ -10,7 +10,7 @@ const tslib_1 = require("tslib");
 const lib_1 = require("@feathersjs/hooks/lib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const childProcess = tslib_1.__importStar(require("child_process"));
-const lodash_1 = tslib_1.__importDefault(require("lodash"));
+const lodash_1 = tslib_1.__importStar(require("lodash"));
 const office_addin_manifest_1 = require("office-addin-manifest");
 const path_1 = require("path");
 const util_1 = require("util");
@@ -25,22 +25,29 @@ const utils_1 = require("../utils");
 const COMPONENT_NAME = "office-xml-addin";
 const TELEMETRY_EVENT = "generate";
 const TEMPLATE_BASE = "office-xml-addin";
+const TEMPLATE_COMMON_NAME = "office-xml-addin-common";
+const TEMPLATE_COMMON_LANG = "common";
 /**
  * project-type=office-xml-addin-type addin-host!==outlook
  */
 class OfficeXMLAddinGenerator {
-    static async generate(context, inputs, destinationPath) {
+    static async generate(context, inputs, destinationPath, actionContext) {
         const host = inputs[questionNames_1.QuestionNames.OfficeAddinHost];
         const capability = inputs[questionNames_1.QuestionNames.Capabilities];
         const lang = lodash_1.default.toLower(inputs[questionNames_1.QuestionNames.ProgrammingLanguage]);
         const langKey = utils_1.convertToLangKey(lang);
         const appName = inputs[questionNames_1.QuestionNames.AppName];
         const projectType = inputs[questionNames_1.QuestionNames.ProjectType];
-        const templteConfig = projectConfig_1.getOfficeAddinTemplateConfig(projectType, host);
-        const templateName = templteConfig[capability].localTemplate;
-        const projectLink = templteConfig[capability].framework["default"][lang];
+        const templateConfig = projectConfig_1.getOfficeAddinTemplateConfig(projectType, host);
+        const templateName = templateConfig[capability].localTemplate;
+        const projectLink = templateConfig[capability].framework["default"][lang];
         const workingDir = process.cwd();
         const progressBar = context.userInteraction.createProgressBar(localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.bar.title"), 1);
+        lodash_1.merge(actionContext === null || actionContext === void 0 ? void 0 : actionContext.telemetryProps, {
+            ["office-xml-addin-host" /* host */]: host,
+            ["office-xml-addin-project" /* project */]: capability,
+            ["office-xml-addin-lang" /* lang */]: lang,
+        });
         try {
             process.chdir(destinationPath);
             await progressBar.start();
@@ -57,14 +64,18 @@ class OfficeXMLAddinGenerator {
                 // -> Step: Copy proj files for manifest-only project
                 const getManifestOnlyProjectTemplateRes = await generator_1.Generator.generateTemplate(context, destinationPath, `${TEMPLATE_BASE}-manifest-only`, langKey);
                 if (getManifestOnlyProjectTemplateRes.isErr())
-                    return teamsfx_api_1.err(getManifestOnlyProjectTemplateRes.error);
+                    throw teamsfx_api_1.err(getManifestOnlyProjectTemplateRes.error);
             }
             // -> Common Step: Copy the README (or with manifest for manifest-only proj)
             const getReadmeTemplateRes = await generator_1.Generator.generateTemplate(context, destinationPath, `${TEMPLATE_BASE}-${templateName}`, langKey);
             if (getReadmeTemplateRes.isErr())
-                return teamsfx_api_1.err(getReadmeTemplateRes.error);
+                throw teamsfx_api_1.err(getReadmeTemplateRes.error);
             // -> Common Step: Modify the Manifest
             await office_addin_manifest_1.OfficeAddinManifest.modifyManifestFile(`${path_1.join(destinationPath, "manifest.xml")}`, "random", `${appName}`);
+            // -> Common Step: Generate OfficeXMLAddin specific `teamsapp.yml`
+            const generateOfficeYMLRes = await generator_1.Generator.generateTemplate(context, destinationPath, TEMPLATE_COMMON_NAME, TEMPLATE_COMMON_LANG);
+            if (generateOfficeYMLRes.isErr())
+                throw teamsfx_api_1.err(generateOfficeYMLRes.error);
             process.chdir(workingDir);
             await progressBar.end(true, true);
             return teamsfx_api_1.ok(undefined);
@@ -89,7 +100,7 @@ tslib_1.__decorate([
         }),
     ]),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object, Object, String]),
+    tslib_1.__metadata("design:paramtypes", [Object, Object, String, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], OfficeXMLAddinGenerator, "generate", null);
 exports.OfficeXMLAddinGenerator = OfficeXMLAddinGenerator;

package/build/component/generator/officeXMLAddin/generator.js.map

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

package/build/component/generator/officeXMLAddin/projectConfig.js

@@ -71,7 +71,7 @@ exports.OfficeAddinProjectConfig = {
         "excel-taskpane": Object.assign({ localTemplate: "excel-taskpane" }, CommonProjectConfig.taskpane),
         "excel-sso": Object.assign({ title: "core.createProjectQuestion.officeXMLAddin.excel.sso.title", detail: "core.createProjectQuestion.officeXMLAddin.excel.sso.detail", localTemplate: "excel-sso" }, CommonProjectConfig.sso),
         "excel-react": Object.assign({ title: "core.createProjectQuestion.officeXMLAddin.excel.react.title", detail: "core.createProjectQuestion.officeXMLAddin.excel.react.detail", localTemplate: "excel-react" }, CommonProjectConfig.react),
-        "excel-cfshared": {
+        "excel-custom-functions-shared": {
             title: "core.createProjectQuestion.officeXMLAddin.excel.cf.shared.title",
             detail: "core.createProjectQuestion.officeXMLAddin.excel.cf.shared.detail",
             localTemplate: "excel-cf",
@@ -82,7 +82,7 @@ exports.OfficeAddinProjectConfig = {
                 },
             },
         },
-        "excel-cfjs": {
+        "excel-custom-functions-js": {
             title: "core.createProjectQuestion.officeXMLAddin.excel.cf.js.title",
             detail: "core.createProjectQuestion.officeXMLAddin.excel.cf.js.detail",
             localTemplate: "excel-cf",

package/build/component/generator/officeXMLAddin/projectConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"projectConfig.js","sourceRoot":"","sources":["../../../../src/component/generator/officeXMLAddin/projectConfig.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"projectConfig.js","sourceRoot":"","sources":["../../../../src/component/generator/officeXMLAddin/projectConfig.ts"],"names":[],"mappings":"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"}

package/build/error/script.js

@@ -15,7 +15,7 @@ class ScriptTimeoutError extends teamsfx_api_1.UserError {
         const errorOptions = {
             source: "script",
             name: "ScriptTimeoutError",
-            message: localizeUtils_1.getDefaultString(key, cmd),
+            message: localizeUtils_1.getDefaultString(key, ""),
             displayMessage: localizeUtils_1.getLocalizedString(key, cmd),
             error: error,
             categories: [types_1.ErrorCategory.External],
@@ -33,7 +33,7 @@ class ScriptExecutionError extends teamsfx_api_1.UserError {
         const errorOptions = {
             source: "script",
             name: "ScriptExecutionError",
-            message: localizeUtils_1.getDefaultString(key, script, message),
+            message: localizeUtils_1.getDefaultString(key, "", message),
             displayMessage: localizeUtils_1.getLocalizedString(key, script, message),
             error: error,
             categories: [types_1.ErrorCategory.External],

package/build/error/script.js.map

@@ -1 +1 @@
-{"version":3,"file":"script.js","sourceRoot":"","sources":["../../src/error/script.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAAqE;AACrE,2DAA+E;AAC/E,mCAAwC;AAExC;;GAEG;AACH,MAAa,kBAAmB,SAAQ,uBAAS;IAC/C,YAAY,GAAW,EAAE,KAAW;QAClC,MAAM,GAAG,GAAG,iCAAiC,CAAC;QAC9C,MAAM,YAAY,GAAqB;YACrC,MAAM,EAAE,QAAQ;YAChB,IAAI,EAAE,oBAAoB;YAC1B,OAAO,EAAE,gCAAgB,CAAC,GAAG,EAAE,GAAG,CAAC;YACnC,cAAc,EAAE,kCAAkB,CAAC,GAAG,EAAE,GAAG,CAAC;YAC5C,KAAK,EAAE,KAAK;YACZ,UAAU,EAAE,CAAC,qBAAa,CAAC,QAAQ,CAAC;SACrC,CAAC;QACF,KAAK,CAAC,YAAY,CAAC,CAAC;IACtB,CAAC;CACF;AAbD,gDAaC;AAED;;GAEG;AACH,MAAa,oBAAqB,SAAQ,uBAAS;IACjD,YAAY,MAAc,EAAE,OAAe,EAAE,KAAW;QACtD,MAAM,GAAG,GAAG,mCAAmC,CAAC;QAChD,MAAM,YAAY,GAAqB;YACrC,MAAM,EAAE,QAAQ;YAChB,IAAI,EAAE,sBAAsB;YAC5B,OAAO,EAAE,gCAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC;YAC/C,cAAc,EAAE,kCAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC;YACxD,KAAK,EAAE,KAAK;YACZ,UAAU,EAAE,CAAC,qBAAa,CAAC,QAAQ,CAAC;SACrC,CAAC;QACF,KAAK,CAAC,YAAY,CAAC,CAAC;IACtB,CAAC;CACF;AAbD,oDAaC"}
+{"version":3,"file":"script.js","sourceRoot":"","sources":["../../src/error/script.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAAqE;AACrE,2DAA+E;AAC/E,mCAAwC;AAExC;;GAEG;AACH,MAAa,kBAAmB,SAAQ,uBAAS;IAC/C,YAAY,GAAW,EAAE,KAAW;QAClC,MAAM,GAAG,GAAG,iCAAiC,CAAC;QAC9C,MAAM,YAAY,GAAqB;YACrC,MAAM,EAAE,QAAQ;YAChB,IAAI,EAAE,oBAAoB;YAC1B,OAAO,EAAE,gCAAgB,CAAC,GAAG,EAAE,EAAE,CAAC;YAClC,cAAc,EAAE,kCAAkB,CAAC,GAAG,EAAE,GAAG,CAAC;YAC5C,KAAK,EAAE,KAAK;YACZ,UAAU,EAAE,CAAC,qBAAa,CAAC,QAAQ,CAAC;SACrC,CAAC;QACF,KAAK,CAAC,YAAY,CAAC,CAAC;IACtB,CAAC;CACF;AAbD,gDAaC;AAED;;GAEG;AACH,MAAa,oBAAqB,SAAQ,uBAAS;IACjD,YAAY,MAAc,EAAE,OAAe,EAAE,KAAW;QACtD,MAAM,GAAG,GAAG,mCAAmC,CAAC;QAChD,MAAM,YAAY,GAAqB;YACrC,MAAM,EAAE,QAAQ;YAChB,IAAI,EAAE,sBAAsB;YAC5B,OAAO,EAAE,gCAAgB,CAAC,GAAG,EAAE,EAAE,EAAE,OAAO,CAAC;YAC3C,cAAc,EAAE,kCAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC;YACxD,KAAK,EAAE,KAAK;YACZ,UAAU,EAAE,CAAC,qBAAa,CAAC,QAAQ,CAAC;SACrC,CAAC;QACF,KAAK,CAAC,YAAY,CAAC,CAAC;IACtB,CAAC;CACF;AAbD,oDAaC"}

package/build/question/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/question/constants.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,4BAA4B,gCAAgC,CAAC;AAC1E,eAAO,MAAM,iCAAiC,iCAAiC,CAAC;AAChF,eAAO,MAAM,iCAAiC,UAG7C,CAAC;AACF,eAAO,MAAM,2BAA2B,2BAA2B,CAAC;AACpE,eAAO,MAAM,sBAAsB,UAIlC,CAAC;AACF,eAAO,MAAM,4BAA4B,UAA2B,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/question/constants.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,4BAA4B,gCAAgC,CAAC;AAC1E,eAAO,MAAM,iCAAiC,iCAAiC,CAAC;AAChF,eAAO,MAAM,iCAAiC,UAG7C,CAAC;AACF,eAAO,MAAM,2BAA2B,2BAA2B,CAAC;AACpE,eAAO,MAAM,sBAAsB,UAIlC,CAAC;AACF,eAAO,MAAM,4BAA4B,UAAiD,CAAC"}

package/build/question/constants.js

@@ -15,5 +15,5 @@ exports.copilotPluginOptionIds = [
     exports.copilotPluginApiSpecOptionId,
     exports.copilotPluginOpenAIPluginOptionId,
 ];
-exports.capabilitiesHavePythonOption = ["custom-copilot-basic"];
+exports.capabilitiesHavePythonOption = ["custom-copilot-basic", "custom-copilot-rag"];
 //# sourceMappingURL=constants.js.map

package/build/question/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/question/constants.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAErB,QAAA,4BAA4B,GAAG,6BAA6B,CAAC;AAC7D,QAAA,iCAAiC,GAAG,8BAA8B,CAAC;AACnE,QAAA,iCAAiC,GAAG;IAC/C,oCAA4B;IAC5B,yCAAiC;CAClC,CAAC;AACW,QAAA,2BAA2B,GAAG,wBAAwB,CAAC;AACvD,QAAA,sBAAsB,GAAG;IACpC,mCAA2B;IAC3B,oCAA4B;IAC5B,yCAAiC;CAClC,CAAC;AACW,QAAA,4BAA4B,GAAG,CAAC,sBAAsB,CAAC,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/question/constants.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAErB,QAAA,4BAA4B,GAAG,6BAA6B,CAAC;AAC7D,QAAA,iCAAiC,GAAG,8BAA8B,CAAC;AACnE,QAAA,iCAAiC,GAAG;IAC/C,oCAA4B;IAC5B,yCAAiC;CAClC,CAAC;AACW,QAAA,2BAA2B,GAAG,wBAAwB,CAAC;AACvD,QAAA,sBAAsB,GAAG;IACpC,mCAA2B;IAC3B,oCAA4B;IAC5B,yCAAiC;CAClC,CAAC;AACW,QAAA,4BAA4B,GAAG,CAAC,sBAAsB,EAAE,oBAAoB,CAAC,CAAC"}

package/build/question/create.d.ts

@@ -61,6 +61,7 @@ export declare class CapabilityOptions {
     static all(inputs?: Inputs): OptionItem[];
     static outlookAddinImport(): OptionItem;
     static officeAddinImport(): OptionItem;
+    static officeContentAddin(): OptionItem;
     static nonSsoTabAndBot(): OptionItem;
     static botAndMe(): OptionItem;
     static copilotPluginNewApi(): OptionItem;

package/build/question/create.d.ts.map

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

package/build/question/create.js

@@ -83,7 +83,7 @@ class ProjectTypeOptions {
     static officeXMLAddin(platform) {
         return {
             id: "office-xml-addin-type",
-            label: `${platform === teamsfx_api_1.Platform.VSCode ? "$(inbox) " : ""}${localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.mainEntry.title")}`,
+            label: `${platform === teamsfx_api_1.Platform.VSCode ? "$(teamsfx-m365) " : ""}${localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.mainEntry.title")}`,
             detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.mainEntry.detail"),
         };
     }
@@ -460,6 +460,7 @@ class CapabilityOptions {
                 items.push(CapabilityOptions.outlookAddinImport());
             }
             else if (isOfficeAddin) {
+                items.push(CapabilityOptions.officeContentAddin());
                 items.push(CapabilityOptions.officeAddinImport());
             }
         }
@@ -488,7 +489,7 @@ class CapabilityOptions {
     static customCopilots() {
         return [
             CapabilityOptions.customCopilotBasic(),
-            // CapabilityOptions.customCopilotRag(),
+            CapabilityOptions.customCopilotRag(),
             CapabilityOptions.customCopilotAssistant(),
         ];
     }
@@ -561,6 +562,13 @@ class CapabilityOptions {
             description: localizeUtils_1.getLocalizedString("core.createProjectQuestion.option.description.previewOnWindow"),
         };
     }
+    static officeContentAddin() {
+        return {
+            id: "office-content-addin",
+            label: localizeUtils_1.getLocalizedString("core.officeContentAddin.label"),
+            detail: localizeUtils_1.getLocalizedString("core.officeContentAddin.detail"),
+        };
+    }
     // static officeXMLAddinHostOptionItems(host: string): OptionItem[] {
     //   return getOfficeXMLAddinHostProjectOptions(host).map((x) => ({
     //     id: x.proj,
@@ -1173,10 +1181,14 @@ function getLanguageOptions(inputs) {
                 host === OfficeAddinHostOptions.outlook().id)) {
             return [{ id: ProgrammingLanguage.TS, label: "TypeScript" }];
         }
-        return [
-            { id: ProgrammingLanguage.TS, label: "TypeScript" },
-            { id: ProgrammingLanguage.JS, label: "JavaScript" },
-        ];
+        const officeXMLAddinLangConfig = projectConfig_1.getOfficeAddinTemplateConfig(projectType, host)[capabilities]
+            .framework["default"];
+        const officeXMLAddinLangOptions = [];
+        if (!!officeXMLAddinLangConfig.typescript)
+            officeXMLAddinLangOptions.push({ id: ProgrammingLanguage.TS, label: "TypeScript" });
+        if (!!officeXMLAddinLangConfig.javascript)
+            officeXMLAddinLangOptions.push({ id: ProgrammingLanguage.JS, label: "JavaScript" });
+        return officeXMLAddinLangOptions;
     }
     if (capabilities === CapabilityOptions.SPFxTab().id) {
         // SPFx only supports typescript
@@ -1831,10 +1843,10 @@ class CustomCopilotRagOptions {
     }
     static all() {
         return [
-            CustomCopilotRagOptions.customize(),
+            // CustomCopilotRagOptions.customize(),
             CustomCopilotRagOptions.azureAISearch(),
-            CustomCopilotRagOptions.customApi(),
-            CustomCopilotRagOptions.microsoft365(),
+            // CustomCopilotRagOptions.customApi(),
+            // CustomCopilotRagOptions.microsoft365(),
         ];
     }
 }
@@ -2041,32 +2053,26 @@ function capabilitySubTree() {
                 },
                 data: apiMessageExtensionAuthQuestion(),
             },
-            /*
             {
-              condition: (inputs: Inputs) => {
-                return inputs[QuestionNames.Capabilities] == CapabilityOptions.customCopilotRag().id;
-              },
-              data: customCopilotRagQuestion(),
-              children: [
-                {
-                  condition: (inputs: Inputs) => {
-                    return (
-                      inputs[QuestionNames.CustomCopilotRag] === CustomCopilotRagOptions.customApi().id
-                    );
-                  },
-                  data: apiSpecLocationQuestion(),
-                },
-                {
-                  condition: (inputs: Inputs) => {
-                    return (
-                      inputs[QuestionNames.CustomCopilotRag] === CustomCopilotRagOptions.customApi().id
-                    );
-                  },
-                  data: apiOperationQuestion(),
+                condition: (inputs) => {
+                    return inputs[questionNames_1.QuestionNames.Capabilities] == CapabilityOptions.customCopilotRag().id;
                 },
-              ],
+                data: customCopilotRagQuestion(),
+                children: [
+                    {
+                        condition: (inputs) => {
+                            return (inputs[questionNames_1.QuestionNames.CustomCopilotRag] === CustomCopilotRagOptions.customApi().id);
+                        },
+                        data: apiSpecLocationQuestion(),
+                    },
+                    {
+                        condition: (inputs) => {
+                            return (inputs[questionNames_1.QuestionNames.CustomCopilotRag] === CustomCopilotRagOptions.customApi().id);
+                        },
+                        data: apiOperationQuestion(),
+                    },
+                ],
             },
-            */
             {
                 condition: (inputs) => {
                     return (inputs[questionNames_1.QuestionNames.Capabilities] == CapabilityOptions.customCopilotAssistant().id);