@microsoft/teamsfx-core 2.0.8-alpha.2f5decfcc.0 → 2.0.8-alpha.784d957e7.0

package/build/question/create.js

@@ -2,7 +2,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createProjectCliHelpNode = exports.createSampleProjectQuestionNode = exports.createProjectQuestionNode = exports.capabilitySubTree = exports.CustomCopilotAssistantOptions = exports.CustomCopilotRagOptions = exports.apiOperationQuestion = exports.apiMessageExtensionAuthQuestion = exports.openAIPluginManifestLocationQuestion = exports.apiSpecLocationQuestion = exports.ApiMessageExtensionAuthOptions = exports.RuntimeOptions = exports.appNameQuestion = exports.AppNamePattern = exports.folderQuestion = exports.programmingLanguageQuestion = exports.ProgrammingLanguage = exports.getLanguageOptions = exports.OfficeAddinFrameworkQuestion = exports.getAddinHostOptions = exports.officeAddinHostingQuestion = exports.getTemplate = exports.SPFxImportFolderQuestion = exports.SPFxVersionOptionIds = exports.SPFxWebpartNameQuestion = exports.SPFxFrameworkQuestion = exports.SPFxPackageSelectQuestion = exports.NotificationTriggerOptions = exports.meArchitectureQuestion = exports.MeArchitectureOptions = exports.capabilityQuestion = exports.CapabilityOptions = exports.OfficeAddinCapabilityOptions = exports.ProjectTypeOptions = exports.ScratchOptions = void 0;
+exports.createProjectCliHelpNode = exports.createSampleProjectQuestionNode = exports.createProjectQuestionNode = exports.capabilitySubTree = exports.CustomCopilotAssistantOptions = exports.CustomCopilotRagOptions = exports.apiOperationQuestion = exports.apiMessageExtensionAuthQuestion = exports.openAIPluginManifestLocationQuestion = exports.apiSpecLocationQuestion = exports.ApiMessageExtensionAuthOptions = exports.RuntimeOptions = exports.appNameQuestion = exports.AppNamePattern = exports.folderQuestion = exports.programmingLanguageQuestion = exports.ProgrammingLanguage = exports.getLanguageOptions = exports.getOfficeAddinFramework = exports.OfficeAddinFrameworkQuestion = exports.officeAddinHostingQuestion = exports.SPFxImportFolderQuestion = exports.SPFxVersionOptionIds = exports.SPFxWebpartNameQuestion = exports.SPFxFrameworkQuestion = exports.SPFxPackageSelectQuestion = exports.NotificationTriggerOptions = exports.meArchitectureQuestion = exports.MeArchitectureOptions = exports.capabilityQuestion = exports.CapabilityOptions = exports.OfficeAddinHostOptions = exports.ProjectTypeOptions = exports.ScratchOptions = void 0;
 const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
@@ -11,6 +11,7 @@ const lodash_1 = require("lodash");
 const os = tslib_1.__importStar(require("os"));
 const path = tslib_1.__importStar(require("path"));
 const constants_1 = require("../common/constants");
+const correlator_1 = require("../common/correlator");
 const featureFlags_1 = require("../common/featureFlags");
 const localizeUtils_1 = require("../common/localizeUtils");
 const samples_1 = require("../common/samples");
@@ -18,18 +19,16 @@ const utils_1 = require("../common/utils");
 const developerPortalScaffoldUtils_1 = require("../component/developerPortalScaffoldUtils");
 const utils_2 = require("../component/driver/teamsApp/utils/utils");
 const helper_1 = require("../component/generator/copilotPlugin/helper");
-const projectsJsonData_1 = tslib_1.__importDefault(require("../component/generator/officeAddin/config/projectsJsonData"));
+const projectConfig_1 = require("../component/generator/officeXMLAddin/projectConfig");
 const error_1 = require("../component/generator/spfx/error");
 const spfxGenerator_1 = require("../component/generator/spfx/spfxGenerator");
 const constants_2 = require("../component/generator/spfx/utils/constants");
 const utils_3 = require("../component/generator/spfx/utils/utils");
 const utils_4 = require("../component/utils");
 const error_2 = require("../error");
+const constants_3 = require("./constants");
 const questionNames_1 = require("./questionNames");
 const util_1 = require("./util");
-const constants_3 = require("./constants");
-const correlator_1 = require("../common/correlator");
-const projectConfig_1 = require("../component/generator/officeXMLAddin/projectConfig");
 class ScratchOptions {
     static yes() {
         return {
@@ -95,6 +94,13 @@ class ProjectTypeOptions {
             detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.officeAddin.detail"),
         };
     }
+    static officeAddinAllIds(platform) {
+        return [
+            ProjectTypeOptions.officeAddin(platform).id,
+            ProjectTypeOptions.officeXMLAddin(platform).id,
+            ProjectTypeOptions.outlookAddin(platform).id,
+        ];
+    }
     static copilotPlugin(platform) {
         return {
             id: "copilot-plugin-type",
@@ -154,12 +160,29 @@ function projectTypeQuestion() {
         skipSingleOption: true,
     };
 }
-class OfficeAddinCapabilityOptions {
+class OfficeAddinHostOptions {
+    static all(platform) {
+        return [
+            OfficeAddinHostOptions.outlook(platform),
+            OfficeAddinHostOptions.word(),
+            OfficeAddinHostOptions.excel(),
+            OfficeAddinHostOptions.powerpoint(),
+        ];
+    }
+    static outlook(platform) {
+        return {
+            id: "outlook",
+            label: `${platform === teamsfx_api_1.Platform.VSCode ? "$(mail) " : ""}${localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.outlookAddin.label")}`,
+            detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.outlookAddin.detail"),
+            data: "Outlook",
+        };
+    }
     static word() {
         return {
             id: "word",
             label: localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.word.title"),
             detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.word.detail"),
+            data: "Word",
         };
     }
     static excel() {
@@ -167,6 +190,7 @@ class OfficeAddinCapabilityOptions {
             id: "excel",
             label: localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.excel.title"),
             detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.excel.detail"),
+            data: "Excel",
         };
     }
     static powerpoint() {
@@ -174,10 +198,11 @@ class OfficeAddinCapabilityOptions {
             id: "powerpoint",
             label: localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.powerpoint.title"),
             detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.powerpoint.detail"),
+            data: "PowerPoint",
         };
     }
 }
-exports.OfficeAddinCapabilityOptions = OfficeAddinCapabilityOptions;
+exports.OfficeAddinHostOptions = OfficeAddinHostOptions;
 class CapabilityOptions {
     // bot
     static basicBot() {
@@ -399,8 +424,60 @@ class CapabilityOptions {
                 CapabilityOptions.linkUnfurling(),
             ];
     }
-    static officeAll() {
-        return [...CapabilityOptions.officeAddinItems(), CapabilityOptions.officeAddinImport()];
+    static officeAddinStaticCapabilities(host) {
+        const items = [];
+        for (const h of Object.keys(projectConfig_1.OfficeAddinProjectConfig)) {
+            if (host && h !== host)
+                continue;
+            const hostValue = projectConfig_1.OfficeAddinProjectConfig[h];
+            for (const capability of Object.keys(hostValue)) {
+                const capabilityValue = hostValue[capability];
+                items.push({
+                    id: capability,
+                    label: localizeUtils_1.getLocalizedString(capabilityValue.title),
+                    detail: localizeUtils_1.getLocalizedString(capabilityValue.detail),
+                });
+            }
+        }
+        return items;
+    }
+    static officeAddinDynamicCapabilities(projectType, host) {
+        const items = [];
+        const isOutlookAddin = projectType === ProjectTypeOptions.outlookAddin().id;
+        const isOfficeAddin = projectType === ProjectTypeOptions.officeAddin().id;
+        const isOfficeXMLAddinForOutlook = projectType === ProjectTypeOptions.officeXMLAddin().id &&
+            host === OfficeAddinHostOptions.outlook().id;
+        const pushToItems = (option) => {
+            const capabilityValue = projectConfig_1.OfficeAddinProjectConfig.json[option];
+            items.push({
+                id: option,
+                label: localizeUtils_1.getLocalizedString(capabilityValue.title),
+                detail: localizeUtils_1.getLocalizedString(capabilityValue.detail),
+            });
+        };
+        if (isOutlookAddin || isOfficeAddin || isOfficeXMLAddinForOutlook) {
+            pushToItems("json-taskpane");
+            if (isOutlookAddin || isOfficeXMLAddinForOutlook) {
+                items.push(CapabilityOptions.outlookAddinImport());
+            }
+            else if (isOfficeAddin) {
+                items.push(CapabilityOptions.officeAddinImport());
+            }
+        }
+        else {
+            if (host) {
+                const hostValue = projectConfig_1.OfficeAddinProjectConfig[host];
+                for (const capability of Object.keys(hostValue)) {
+                    const capabilityValue = hostValue[capability];
+                    items.push({
+                        id: capability,
+                        label: localizeUtils_1.getLocalizedString(capabilityValue.title),
+                        detail: localizeUtils_1.getLocalizedString(capabilityValue.detail),
+                    });
+                }
+            }
+        }
+        return items;
     }
     static copilotPlugins() {
         return [
@@ -436,16 +513,7 @@ class CapabilityOptions {
             ...CapabilityOptions.customCopilots(),
             ...CapabilityOptions.tdpIntegrationCapabilities(),
         ];
-        if (featureFlags_1.isOfficeXMLAddinEnabled()) {
-            capabilityOptions.push(...[
-                ...CapabilityOptions.officeXMLAddinHostOptionItems(OfficeAddinCapabilityOptions.word().id),
-                ...CapabilityOptions.officeXMLAddinHostOptionItems(OfficeAddinCapabilityOptions.excel().id),
-                ...CapabilityOptions.officeXMLAddinHostOptionItems(OfficeAddinCapabilityOptions.powerpoint().id),
-            ]);
-        }
-        else {
-            capabilityOptions.push(...CapabilityOptions.outlookAddinItems());
-        }
+        capabilityOptions.push(...CapabilityOptions.officeAddinStaticCapabilities());
         return capabilityOptions;
     }
     /**
@@ -456,7 +524,6 @@ class CapabilityOptions {
             ...CapabilityOptions.bots(inputs),
             ...CapabilityOptions.tabs(),
             ...CapabilityOptions.collectMECaps(),
-            ...CapabilityOptions.outlookAddinItems(),
         ];
         if (featureFlags_1.isApiCopilotPluginEnabled()) {
             capabilityOptions.push(...CapabilityOptions.copilotPlugins());
@@ -466,45 +533,59 @@ class CapabilityOptions {
             // test templates that are used by TDP integration only
             capabilityOptions.push(...CapabilityOptions.tdpIntegrationCapabilities());
         }
+        capabilityOptions.push(...CapabilityOptions.officeAddinDynamicCapabilities(inputs === null || inputs === void 0 ? void 0 : inputs.projectType, inputs === null || inputs === void 0 ? void 0 : inputs.host));
+        // if (isOfficeXMLAddinEnabled()) {
+        //   capabilityOptions.push(
+        //     ...[
+        //       ...CapabilityOptions.officeAddinStaticCapabilities("word"),
+        //       ...CapabilityOptions.officeAddinStaticCapabilities("excel"),
+        //       ...CapabilityOptions.officeAddinStaticCapabilities("powerpoint"),
+        //     ]
+        //   );
+        // } else {
+        //   capabilityOptions.push(...CapabilityOptions.officeAddinStaticCapabilities("json"));
+        // }
         return capabilityOptions;
     }
     static outlookAddinImport() {
         return {
-            id: "import",
+            id: "outlook-addin-import",
             label: localizeUtils_1.getLocalizedString("core.importAddin.label"),
             detail: localizeUtils_1.getLocalizedString("core.importAddin.detail"),
         };
     }
     static officeAddinImport() {
         return {
-            id: "import",
+            id: "office-addin-import",
             label: localizeUtils_1.getLocalizedString("core.importOfficeAddin.label"),
             detail: localizeUtils_1.getLocalizedString("core.importAddin.detail"),
             description: localizeUtils_1.getLocalizedString("core.createProjectQuestion.option.description.previewOnWindow"),
         };
     }
-    static officeXMLAddinHostOptionItems(host) {
-        return projectConfig_1.getOfficeXMLAddinHostProjectOptions(host).map((x) => ({
-            id: x.proj,
-            label: localizeUtils_1.getLocalizedString(x.title),
-            detail: localizeUtils_1.getLocalizedString(x.detail),
-        }));
-    }
-    static outlookAddinItems() {
-        return officeAddinJsonData.getProjectTemplateNames().map((template) => ({
-            id: template,
-            label: localizeUtils_1.getLocalizedString(officeAddinJsonData.getProjectDisplayName(template)),
-            detail: localizeUtils_1.getLocalizedString(officeAddinJsonData.getProjectDetails(template)),
-            description: localizeUtils_1.getLocalizedString("core.createProjectQuestion.option.description.previewOnWindow"),
-        }));
-    }
-    static officeAddinItems() {
-        return officeAddinJsonData.getProjectTemplateNames().map((template) => ({
-            id: template,
-            label: localizeUtils_1.getLocalizedString(officeAddinJsonData.getProjectDisplayName(template)),
-            detail: localizeUtils_1.getLocalizedString(officeAddinJsonData.getProjectDetails(template)),
-        }));
-    }
+    // static officeXMLAddinHostOptionItems(host: string): OptionItem[] {
+    //   return getOfficeXMLAddinHostProjectOptions(host).map((x) => ({
+    //     id: x.proj,
+    //     label: getLocalizedString(x.title),
+    //     detail: getLocalizedString(x.detail),
+    //   }));
+    // }
+    // static jsonAddinTaskpane(): OptionItem {
+    //   return {
+    //     id: "json-taskpane",
+    //     label: getLocalizedString("core.newTaskpaneAddin.label"),
+    //     detail: getLocalizedString("core.newTaskpaneAddin.detail"),
+    //     description: getLocalizedString(
+    //       "core.createProjectQuestion.option.description.previewOnWindow"
+    //     ),
+    //   };
+    // }
+    // static officeAddinItems(): OptionItem[] {
+    //   return officeAddinJsonData.getProjectTemplateNames().map((template) => ({
+    //     id: template,
+    //     label: getLocalizedString(officeAddinJsonData.getProjectDisplayName(template)),
+    //     detail: getLocalizedString(officeAddinJsonData.getProjectDetails(template)),
+    //   }));
+    // }
     static nonSsoTabAndBot() {
         return {
             id: "TabNonSsoAndBot",
@@ -582,19 +663,6 @@ function capabilityQuestion() {
     return {
         name: questionNames_1.QuestionNames.Capabilities,
         title: (inputs) => {
-            // Office Add-in Capability
-            if (featureFlags_1.isOfficeXMLAddinEnabled()) {
-                switch (inputs[questionNames_1.QuestionNames.OfficeAddinCapability]) {
-                    case ProjectTypeOptions.outlookAddin().id:
-                        return localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.outlookAddin.title");
-                    case OfficeAddinCapabilityOptions.word().id:
-                        return localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.word.create.title");
-                    case OfficeAddinCapabilityOptions.excel().id:
-                        return localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.excel.create.title");
-                    case OfficeAddinCapabilityOptions.powerpoint().id:
-                        return localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.powerpoint.create.title");
-                }
-            }
             const projectType = inputs[questionNames_1.QuestionNames.ProjectType];
             switch (projectType) {
                 case ProjectTypeOptions.bot().id:
@@ -604,9 +672,20 @@ function capabilityQuestion() {
                 case ProjectTypeOptions.me().id:
                     return localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.messageExtension.title");
                 case ProjectTypeOptions.outlookAddin().id:
-                    return localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.outlookAddin.title");
                 case ProjectTypeOptions.officeAddin().id:
+                case ProjectTypeOptions.officeXMLAddin().id: {
+                    switch (inputs[questionNames_1.QuestionNames.OfficeAddinHost]) {
+                        case OfficeAddinHostOptions.outlook().id:
+                            return localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.outlookAddin.title");
+                        case OfficeAddinHostOptions.word().id:
+                            return localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.word.create.title");
+                        case OfficeAddinHostOptions.excel().id:
+                            return localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.excel.create.title");
+                        case OfficeAddinHostOptions.powerpoint().id:
+                            return localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.powerpoint.create.title");
+                    }
                     return localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.officeAddin.title");
+                }
                 case ProjectTypeOptions.copilotPlugin().id:
                     return localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.copilotPlugin.title");
                 case ProjectTypeOptions.customCopilot().id:
@@ -640,7 +719,6 @@ function capabilityQuestion() {
             }
             // nodejs capabilities
             const projectType = inputs[questionNames_1.QuestionNames.ProjectType];
-            const officeHost = inputs[questionNames_1.QuestionNames.OfficeAddinCapability];
             if (projectType === ProjectTypeOptions.bot().id) {
                 return CapabilityOptions.bots(inputs);
             }
@@ -650,18 +728,8 @@ function capabilityQuestion() {
             else if (projectType === ProjectTypeOptions.me().id) {
                 return CapabilityOptions.mes();
             }
-            else if ((!featureFlags_1.isOfficeXMLAddinEnabled() && projectType === ProjectTypeOptions.outlookAddin().id) ||
-                (featureFlags_1.isOfficeXMLAddinEnabled() &&
-                    projectType === ProjectTypeOptions.officeXMLAddin().id &&
-                    officeHost === ProjectTypeOptions.outlookAddin().id)) {
-                return [...CapabilityOptions.outlookAddinItems(), CapabilityOptions.outlookAddinImport()];
-            }
-            else if (featureFlags_1.isOfficeXMLAddinEnabled() &&
-                projectType === ProjectTypeOptions.officeXMLAddin().id) {
-                return CapabilityOptions.officeXMLAddinHostOptionItems(officeHost);
-            }
-            else if (projectType === ProjectTypeOptions.officeAddin().id) {
-                return CapabilityOptions.officeAll();
+            else if (ProjectTypeOptions.officeAddinAllIds().includes(projectType)) {
+                return CapabilityOptions.officeAddinDynamicCapabilities(projectType, inputs[questionNames_1.QuestionNames.OfficeAddinHost]);
             }
             else if (projectType === ProjectTypeOptions.copilotPlugin().id) {
                 return CapabilityOptions.copilotPlugins();
@@ -1042,51 +1110,15 @@ function SPFxImportFolderQuestion(hasDefaultFunc = false) {
     };
 }
 exports.SPFxImportFolderQuestion = SPFxImportFolderQuestion;
-const getTemplate = (inputs) => {
-    const capabilities = inputs[questionNames_1.QuestionNames.Capabilities];
-    const templates = officeAddinJsonData.getProjectTemplateNames();
-    const foundTemplate = templates.find((template) => {
-        return capabilities && capabilities.includes(template);
-    });
-    return foundTemplate !== null && foundTemplate !== void 0 ? foundTemplate : "";
-};
-exports.getTemplate = getTemplate;
 function officeAddinHostingQuestion() {
-    const OfficeHostQuestion = {
-        type: "singleSelect",
+    return {
         name: questionNames_1.QuestionNames.OfficeAddinHost,
-        title: "Add-in Host",
-        staticOptions: [],
-        dynamicOptions: getAddinHostOptions,
-        default: (inputs) => {
-            const template = exports.getTemplate(inputs);
-            const options = officeAddinJsonData.getHostTemplateNames(template);
-            return options[0] || "No Options";
-        },
-        skipSingleOption: true,
+        title: localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.create.title"),
+        type: "singleSelect",
+        staticOptions: OfficeAddinHostOptions.all(),
     };
-    return OfficeHostQuestion;
 }
 exports.officeAddinHostingQuestion = officeAddinHostingQuestion;
-function getAddinHostOptions(inputs) {
-    // office addin supports host defined in officeAddinJsonData
-    const projectType = inputs[questionNames_1.QuestionNames.ProjectType];
-    const template = exports.getTemplate(inputs);
-    const hostTypes = officeAddinJsonData.getHostTemplateNames(template);
-    const options = [];
-    hostTypes.forEach((host) => {
-        options.push({ label: officeAddinJsonData.getHostDisplayName(host), id: host });
-    });
-    // Outlook addin only supports outlook
-    if (projectType === ProjectTypeOptions.outlookAddin().id) {
-        return [options[0] || { label: "No Options", id: "No Options" }];
-    }
-    else if (projectType === ProjectTypeOptions.officeAddin().id) {
-        return options;
-    }
-    return options || "No Options";
-}
-exports.getAddinHostOptions = getAddinHostOptions;
 function OfficeAddinFrameworkQuestion() {
     return {
         type: "singleSelect",
@@ -1103,63 +1135,72 @@ function OfficeAddinFrameworkQuestion() {
     };
 }
 exports.OfficeAddinFrameworkQuestion = OfficeAddinFrameworkQuestion;
-const officeAddinJsonData = new projectsJsonData_1.default();
+/**
+ * when project-type=office-addin-type(office-addin-framework-type=default or react), use selected value;
+ * when project-type=outlook-addin-type, no framework to select, office-addin-framework-type=default_old
+ * when project-type=office-xml-addin-type, no framework to select, office-addin-framework-type=default_old
+ */
+function getOfficeAddinFramework(inputs) {
+    const projectType = inputs[questionNames_1.QuestionNames.ProjectType];
+    if (projectType === ProjectTypeOptions.officeAddin().id &&
+        inputs[questionNames_1.QuestionNames.OfficeAddinFramework]) {
+        return inputs[questionNames_1.QuestionNames.OfficeAddinFramework];
+    }
+    else if (projectType === ProjectTypeOptions.officeXMLAddin().id &&
+        inputs[questionNames_1.QuestionNames.OfficeAddinHost] !== OfficeAddinHostOptions.outlook().id) {
+        return "default";
+    }
+    else {
+        return "default_old";
+    }
+}
+exports.getOfficeAddinFramework = getOfficeAddinFramework;
 function getLanguageOptions(inputs) {
     const runtime = getRuntime(inputs);
     // dotnet runtime only supports C#
     if (runtime === RuntimeOptions.DotNet().id) {
-        return [{ id: "csharp", label: "C#" }];
+        return [{ id: ProgrammingLanguage.CSharp, label: "C#" }];
     }
+    const capabilities = inputs[questionNames_1.QuestionNames.Capabilities];
+    const host = inputs[questionNames_1.QuestionNames.OfficeAddinHost];
     // office addin supports language defined in officeAddinJsonData
     const projectType = inputs[questionNames_1.QuestionNames.ProjectType];
-    const officeHost = inputs[questionNames_1.QuestionNames.OfficeAddinCapability];
-    if ((!featureFlags_1.isOfficeXMLAddinEnabled() && projectType === ProjectTypeOptions.outlookAddin().id) ||
-        (featureFlags_1.isOfficeXMLAddinEnabled() &&
-            projectType === ProjectTypeOptions.officeXMLAddin().id &&
-            officeHost === ProjectTypeOptions.outlookAddin().id)) {
-        const template = exports.getTemplate(inputs);
-        const supportedTypes = officeAddinJsonData.getSupportedScriptTypes(template);
-        const options = supportedTypes.map((language) => ({ label: language, id: language }));
-        return options.length > 0 ? options : [{ label: "No Options", id: "No Options" }];
-    }
-    if (featureFlags_1.isOfficeXMLAddinEnabled() && projectType === ProjectTypeOptions.officeXMLAddin().id) {
-        const officeProject = inputs[questionNames_1.QuestionNames.Capabilities];
-        return officeProject !== "manifest"
-            ? projectConfig_1.getOfficeXMLAddinHostProjectLangOptions(officeHost, officeProject)
-            : [{ id: "javascript", label: "JavaScript" }];
-    }
-    if (projectType === ProjectTypeOptions.officeAddin().id) {
-        const template = exports.getTemplate(inputs);
-        const supportedTypes = officeAddinJsonData.getSupportedScriptTypesNew(template);
-        const options = [];
-        supportedTypes.forEach((language) => {
-            if (language === "TypeScript") {
-                options.push({ label: "TypeScript", id: "typescript" });
-            }
-            else if (language === "JavaScript") {
-                options.push({ label: "JavaScript", id: "javascript" });
-            }
-        });
-        return options.length > 0 ? options : [{ label: "No Options", id: "No Options" }];
+    if (ProjectTypeOptions.officeAddinAllIds().includes(projectType)) {
+        if (capabilities.endsWith("-manifest")) {
+            return [{ id: ProgrammingLanguage.JS, label: "JavaScript" }];
+        }
+        if (projectType === ProjectTypeOptions.outlookAddin().id ||
+            (projectType === ProjectTypeOptions.officeXMLAddin().id &&
+                host === OfficeAddinHostOptions.outlook().id)) {
+            return [{ id: ProgrammingLanguage.TS, label: "TypeScript" }];
+        }
+        return [
+            { id: ProgrammingLanguage.TS, label: "TypeScript" },
+            { id: ProgrammingLanguage.JS, label: "JavaScript" },
+        ];
     }
-    const capabilities = inputs[questionNames_1.QuestionNames.Capabilities];
     if (capabilities === CapabilityOptions.SPFxTab().id) {
         // SPFx only supports typescript
-        return [{ id: "typescript", label: "TypeScript" }];
+        return [{ id: ProgrammingLanguage.TS, label: "TypeScript" }];
     }
     else if (constants_3.capabilitiesHavePythonOption.includes(capabilities)) {
         // support python language
         return [
-            { id: "javascript", label: "JavaScript" },
-            { id: "typescript", label: "TypeScript" },
-            { id: "python", label: "Python" },
+            { id: ProgrammingLanguage.JS, label: "JavaScript" },
+            { id: ProgrammingLanguage.TS, label: "TypeScript" },
+            {
+                id: ProgrammingLanguage.PY,
+                label: "Python",
+                detail: "",
+                description: localizeUtils_1.getLocalizedString("core.createProjectQuestion.option.description.preview"),
+            },
         ];
     }
     else {
         // other cases
         return [
-            { id: "javascript", label: "JavaScript" },
-            { id: "typescript", label: "TypeScript" },
+            { id: ProgrammingLanguage.JS, label: "JavaScript" },
+            { id: ProgrammingLanguage.TS, label: "TypeScript" },
         ];
     }
 }
@@ -1193,14 +1234,14 @@ function programmingLanguageQuestion() {
             if (runtime === RuntimeOptions.DotNet().id) {
                 return "";
             }
-            // office addin
-            const projectType = inputs[questionNames_1.QuestionNames.ProjectType];
-            if (projectType === ProjectTypeOptions.outlookAddin().id) {
-                const template = exports.getTemplate(inputs);
-                const options = officeAddinJsonData.getSupportedScriptTypesNew(template);
-                return options[0] || "No Options";
-            }
             const capabilities = inputs[questionNames_1.QuestionNames.Capabilities];
+            // // office addin
+            // const projectType = inputs[QuestionNames.ProjectType];
+            // if (projectType === ProjectTypeOptions.outlookAddin().id) {
+            //   const template = getTemplate(inputs);
+            //   const options = officeAddinJsonData.getSupportedScriptTypesNew(template);
+            //   return options[0] || "No Options";
+            // }
             // SPFx
             if (capabilities === CapabilityOptions.SPFxTab().id) {
                 return localizeUtils_1.getLocalizedString("core.ProgrammingLanguageQuestion.placeholder.spfx");
@@ -1937,8 +1978,13 @@ function capabilitySubTree() {
                 ],
             },
             {
-                // office addin import sub-tree
-                condition: { equals: CapabilityOptions.outlookAddinImport().id },
+                // office addin import sub-tree (capabilities=office-addin-import | outlook-addin-import)
+                condition: {
+                    enum: [
+                        CapabilityOptions.outlookAddinImport().id,
+                        CapabilityOptions.officeAddinImport().id,
+                    ],
+                },
                 data: { type: "group", name: questionNames_1.QuestionNames.OfficeAddinImport },
                 children: [
                     {
@@ -1957,15 +2003,6 @@ function capabilitySubTree() {
                     },
                 ],
             },
-            {
-                // office addin other items sub-tree
-                condition: (inputs) => featureFlags_1.isOfficeXMLAddinEnabled()
-                    ? false
-                    : CapabilityOptions.outlookAddinItems()
-                        .map((i) => i.id)
-                        .includes(inputs[questionNames_1.QuestionNames.Capabilities]),
-                data: officeAddinHostingQuestion(),
-            },
             {
                 // Search ME sub-tree
                 condition: { equals: CapabilityOptions.m365SearchMe().id },
@@ -2045,7 +2082,9 @@ function capabilitySubTree() {
                         inputs[questionNames_1.QuestionNames.Capabilities] !== CapabilityOptions.copilotPluginApiSpec().id &&
                         inputs[questionNames_1.QuestionNames.Capabilities] !==
                             CapabilityOptions.copilotPluginOpenAIPlugin().id &&
-                        inputs[questionNames_1.QuestionNames.MeArchitectureType] !== MeArchitectureOptions.apiSpec().id);
+                        inputs[questionNames_1.QuestionNames.MeArchitectureType] !== MeArchitectureOptions.apiSpec().id &&
+                        inputs[questionNames_1.QuestionNames.Capabilities] !== CapabilityOptions.officeAddinImport().id &&
+                        inputs[questionNames_1.QuestionNames.Capabilities] !== CapabilityOptions.outlookAddinImport().id);
                 },
             },
             {
@@ -2078,7 +2117,8 @@ function capabilitySubTree() {
             {
                 // WXP addin framework
                 condition: (inputs) => {
-                    return inputs[questionNames_1.QuestionNames.ProjectType] === ProjectTypeOptions.officeAddin().id;
+                    return (inputs[questionNames_1.QuestionNames.ProjectType] === ProjectTypeOptions.officeAddin().id &&
+                        inputs[questionNames_1.QuestionNames.Capabilities] !== CapabilityOptions.officeAddinImport().id);
                 },
                 data: OfficeAddinFrameworkQuestion(),
             },
@@ -2109,19 +2149,8 @@ function createProjectQuestionNode() {
                 cliOptionDisabled: "self",
             },
             {
-                condition: (inputs) => featureFlags_1.isOfficeXMLAddinEnabled() &&
-                    inputs[questionNames_1.QuestionNames.ProjectType] === ProjectTypeOptions.officeXMLAddin().id,
-                data: {
-                    name: questionNames_1.QuestionNames.OfficeAddinCapability,
-                    title: localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.create.title"),
-                    type: "singleSelect",
-                    staticOptions: [
-                        ProjectTypeOptions.outlookAddin(),
-                        OfficeAddinCapabilityOptions.word(),
-                        OfficeAddinCapabilityOptions.excel(),
-                        OfficeAddinCapabilityOptions.powerpoint(),
-                    ],
-                },
+                condition: (inputs) => inputs[questionNames_1.QuestionNames.ProjectType] === ProjectTypeOptions.officeXMLAddin().id,
+                data: officeAddinHostingQuestion(),
             },
             capabilitySubTree(),
             {