refactor: modify work in M365 tag for CEA templates (#12609)

* refactor: modify work in M365 tag for CEA templates * fix: fix bad lint * fix: fix bad feature flag reference * test: add test case * fix: lint * fix: uncovered cases
OfficeDev · Oct 29, 2024 · 36de4c2 · 36de4c2
1 parent 09af212
commit 36de4c2
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/packages/fx-core/src/question/constants.ts b/packages/fx-core/src/question/constants.ts
@@ -771,6 +771,9 @@ export class CapabilityOptions {
 
   // custom copilot
   static customCopilotBasic(): OptionItem {
+    const description = featureFlagManager.getBooleanValue(FeatureFlags.CEAEnabled)
+      ? getLocalizedString("core.createProjectQuestion.capability.customEngineAgent.description")
+      : undefined;
     return {
       id: "custom-copilot-basic",
       label: getLocalizedString(
@@ -779,13 +782,14 @@ export class CapabilityOptions {
       detail: getLocalizedString(
         "core.createProjectQuestion.capability.customCopilotBasicOption.detail"
       ),
-      description: getLocalizedString(
-        "core.createProjectQuestion.capability.customEngineAgent.description"
-      ),
+      description: description,
     };
   }
 
   static customCopilotRag(): OptionItem {
+    const description = featureFlagManager.getBooleanValue(FeatureFlags.CEAEnabled)
+      ? getLocalizedString("core.createProjectQuestion.capability.customEngineAgent.description")
+      : undefined;
     return {
       id: "custom-copilot-rag",
       label: getLocalizedString(
@@ -794,10 +798,14 @@ export class CapabilityOptions {
       detail: getLocalizedString(
         "core.createProjectQuestion.capability.customCopilotRagOption.detail"
       ),
+      description: description,
     };
   }
 
   static customCopilotAssistant(): OptionItem {
+    const description = featureFlagManager.getBooleanValue(FeatureFlags.CEAEnabled)
+      ? getLocalizedString("core.createProjectQuestion.capability.customEngineAgent.description")
+      : undefined;
     return {
       id: "custom-copilot-agent",
       label: getLocalizedString(
@@ -806,6 +814,7 @@ export class CapabilityOptions {
       detail: getLocalizedString(
         "core.createProjectQuestion.capability.customCopilotAssistantOption.detail"
       ),
+      description: description,
     };
   }
 }

diff --git a/packages/fx-core/tests/component/generator/generator.test.ts b/packages/fx-core/tests/component/generator/generator.test.ts
@@ -52,6 +52,7 @@ import { ActionContext } from "../../../src/component/middleware/actionExecution
 import { CapabilityOptions, ProgrammingLanguage, QuestionNames } from "../../../src/question";
 import sampleConfigV3 from "../../common/samples-config-v3.json";
 import { MockTools, randomAppName } from "../../core/utils";
+import { getLocalizedString } from "../../../src/common/localizeUtils";
 
 const mockedSampleInfo: SampleConfig = {
   id: "test-id",
@@ -1190,6 +1191,23 @@ describe("render template", () => {
         : Generator.getDefaultVariables("test");
       assert.equal(vars.CEAEnabled, "");
     });
+
+    it("CEA works in M365 tag shows when CEA enabled", async () => {
+      sandbox.stub(process, "env").value({ TEAMSFX_CEA_ENABLED: "true" });
+      const descriptionAnswer = getLocalizedString(
+        "core.createProjectQuestion.capability.customEngineAgent.description"
+      );
+      assert.equal(CapabilityOptions.customCopilotBasic().description, descriptionAnswer);
+      assert.equal(CapabilityOptions.customCopilotRag().description, descriptionAnswer);
+      assert.equal(CapabilityOptions.customCopilotAssistant().description, descriptionAnswer);
+    });
+
+    it("CEA works in M365 tag doesn't show when CEA disabled", async () => {
+      sandbox.stub(process, "env").value({ TEAMSFX_CEA_ENABLED: "false" });
+      assert.equal(CapabilityOptions.customCopilotBasic().description, undefined);
+      assert.equal(CapabilityOptions.customCopilotRag().description, undefined);
+      assert.equal(CapabilityOptions.customCopilotAssistant().description, undefined);
+    });
   });
 });