From 7214d6e68f69a852a955c695eb3df2bc9f049d41 Mon Sep 17 00:00:00 2001 From: huimiu Date: Fri, 17 Jan 2025 16:48:19 +0800 Subject: [PATCH 1/3] refactor: remove bot-plugin option from message extension templates --- .../generator/templates/templateNames.ts | 10 ---------- packages/fx-core/src/question/constants.ts | 16 +--------------- .../src/question/inputs/CreateProjectInputs.ts | 2 +- .../src/question/options/CreateProjectOptions.ts | 2 +- 4 files changed, 3 insertions(+), 27 deletions(-) diff --git a/packages/fx-core/src/component/generator/templates/templateNames.ts b/packages/fx-core/src/component/generator/templates/templateNames.ts index 4a3fb00690..4248e21538 100644 --- a/packages/fx-core/src/component/generator/templates/templateNames.ts +++ b/packages/fx-core/src/component/generator/templates/templateNames.ts @@ -33,7 +33,6 @@ export enum TemplateNames { MessageExtension = "message-extension", MessageExtensionAction = "message-extension-action", MessageExtensionSearch = "message-extension-search", - MessageExtensionCopilot = "message-extension-copilot", M365MessageExtension = "m365-message-extension", TabAndDefaultBot = "non-sso-tab-default-bot", BotAndMessageExtension = "default-bot-message-extension", @@ -85,8 +84,6 @@ export const Feature2TemplateName = { [`${CapabilityOptions.me().id}:undefined`]: TemplateNames.MessageExtension, [`${CapabilityOptions.collectFormMe().id}:undefined`]: TemplateNames.MessageExtensionAction, [`${CapabilityOptions.SearchMe().id}:undefined`]: TemplateNames.MessageExtensionSearch, - [`${CapabilityOptions.m365SearchMe().id}:undefined:${MeArchitectureOptions.botPlugin().id}`]: - TemplateNames.MessageExtensionCopilot, [`${CapabilityOptions.m365SearchMe().id}:undefined:${MeArchitectureOptions.botMe().id}`]: TemplateNames.M365MessageExtension, [`${CapabilityOptions.nonSsoTabAndBot().id}:undefined`]: TemplateNames.TabAndDefaultBot, @@ -204,13 +201,6 @@ export const inputsToTemplateName: Map<{ [key: string]: any }, TemplateNames> = { [QuestionNames.Capabilities]: CapabilityOptions.SearchMe().id }, TemplateNames.MessageExtensionSearch, ], - [ - { - [QuestionNames.Capabilities]: CapabilityOptions.m365SearchMe().id, - [QuestionNames.MeArchitectureType]: MeArchitectureOptions.botPlugin().id, - }, - TemplateNames.MessageExtensionCopilot, - ], [ { [QuestionNames.Capabilities]: CapabilityOptions.m365SearchMe().id, diff --git a/packages/fx-core/src/question/constants.ts b/packages/fx-core/src/question/constants.ts index 99eb8fd76c..e0b61bba8d 100644 --- a/packages/fx-core/src/question/constants.ts +++ b/packages/fx-core/src/question/constants.ts @@ -835,19 +835,6 @@ export class MeArchitectureOptions { }; } - static botPlugin(): OptionItem { - return { - id: "bot-plugin", - label: getLocalizedString("core.createProjectQuestion.capability.botMessageExtension.label"), - detail: getLocalizedString( - "core.createProjectQuestion.capability.botMessageExtension.detail" - ), - description: getLocalizedString( - "core.createProjectQuestion.option.description.worksInOutlookCopilot" - ), - }; - } - static newApi(): OptionItem { return { id: "new-api", @@ -876,7 +863,7 @@ export class MeArchitectureOptions { return [ MeArchitectureOptions.newApi(), MeArchitectureOptions.apiSpec(), - MeArchitectureOptions.botPlugin(), + MeArchitectureOptions.botMe(), ]; } @@ -884,7 +871,6 @@ export class MeArchitectureOptions { return [ MeArchitectureOptions.newApi(), MeArchitectureOptions.apiSpec(), - MeArchitectureOptions.botPlugin(), MeArchitectureOptions.botMe(), ]; } diff --git a/packages/fx-core/src/question/inputs/CreateProjectInputs.ts b/packages/fx-core/src/question/inputs/CreateProjectInputs.ts index eb285462a8..7bf9d8b0bc 100644 --- a/packages/fx-core/src/question/inputs/CreateProjectInputs.ts +++ b/packages/fx-core/src/question/inputs/CreateProjectInputs.ts @@ -57,7 +57,7 @@ export interface CreateProjectInputs extends Inputs { /** @description SPFx solution folder */ "spfx-folder"?: string; /** @description Architecture of Search Based Message Extension */ - "me-architecture"?: "new-api" | "api-spec" | "bot-plugin" | "bot"; + "me-architecture"?: "new-api" | "api-spec" | "bot"; /** @description Create Declarative Agent */ "with-plugin"?: "no" | "yes"; /** @description Create API Plugin */ diff --git a/packages/fx-core/src/question/options/CreateProjectOptions.ts b/packages/fx-core/src/question/options/CreateProjectOptions.ts index af3bf88bcc..b7d26a520e 100644 --- a/packages/fx-core/src/question/options/CreateProjectOptions.ts +++ b/packages/fx-core/src/question/options/CreateProjectOptions.ts @@ -106,7 +106,7 @@ export const CreateProjectOptions: CLICommandOption[] = [ shortName: "m", description: "Architecture of Search Based Message Extension.", default: "new-api", - choices: ["new-api", "api-spec", "bot-plugin", "bot"], + choices: ["new-api", "api-spec", "bot"], }, { name: "with-plugin", From a4a270f30bd20eb30e620fcd059641e3d1b326a5 Mon Sep 17 00:00:00 2001 From: huimiu Date: Fri, 17 Jan 2025 17:05:26 +0800 Subject: [PATCH 2/3] refactor: remove worksInOutlookCopilot description from project creation options --- packages/fx-core/resource/package.nls.json | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/fx-core/resource/package.nls.json b/packages/fx-core/resource/package.nls.json index 9bf71fec39..8c1a7aaf55 100644 --- a/packages/fx-core/resource/package.nls.json +++ b/packages/fx-core/resource/package.nls.json @@ -295,7 +295,6 @@ "core.createProjectQuestion.option.description.preview": "Preview", "core.createProjectQuestion.option.description.worksInOutlook": "Works in Teams and Outlook", "core.createProjectQuestion.option.description.worksInOutlookM365": "Works in Teams, Outlook, and the Microsoft 365 application", - "core.createProjectQuestion.option.description.worksInOutlookCopilot": "Works in Teams, Outlook and Copilot", "core.createProjectQuestion.projectType.bot.detail": "Create instant, engaging chat experiences that automate tasks seamlessly", "core.createProjectQuestion.projectType.bot.label": "Bot", "core.createProjectQuestion.projectType.bot.title": "App Features Using a Bot", From 226d43fb032ad70fd86104b1967517191172ddb7 Mon Sep 17 00:00:00 2001 From: huimiu Date: Fri, 17 Jan 2025 17:06:32 +0800 Subject: [PATCH 3/3] test: update success result in scaffold question test for botMe option --- packages/fx-core/tests/question/create.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fx-core/tests/question/create.test.ts b/packages/fx-core/tests/question/create.test.ts index c9b34f70f0..8a6e01f693 100644 --- a/packages/fx-core/tests/question/create.test.ts +++ b/packages/fx-core/tests/question/create.test.ts @@ -3932,7 +3932,7 @@ describe("scaffold question", () => { const select = question as SingleSelectQuestion; const options = await select.dynamicOptions!(inputs); assert.isTrue(options.length === 3); - return ok({ type: "success", result: MeArchitectureOptions.botPlugin().id }); + return ok({ type: "success", result: MeArchitectureOptions.botMe().id }); } else if (question.name === QuestionNames.ProgrammingLanguage) { const select = question as SingleSelectQuestion; const options = await select.dynamicOptions!(inputs);