fix: wrong capabilities if .NET flag is enabled (#12014)

* fix: dotnet * fix: more * fix: more * fix: more * test: ut
OfficeDev · Jul 17, 2024 · 446fc5b · 446fc5b
1 parent 152ecad
commit 446fc5b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 17 deletions.
diff --git a/packages/fx-core/src/question/constants.ts b/packages/fx-core/src/question/constants.ts
@@ -142,12 +142,10 @@ export class RuntimeOptions {
 
 export function getRuntime(inputs: Inputs): string {
   let runtime = RuntimeOptions.NodeJS().id;
-  if (featureFlagManager.getBooleanValue(FeatureFlags.CLIDotNet)) {
+  if (inputs?.platform === Platform.VS) {
+    runtime = RuntimeOptions.DotNet().id;
+  } else if (featureFlagManager.getBooleanValue(FeatureFlags.CLIDotNet)) {
     runtime = inputs[QuestionNames.Runtime] || runtime;
-  } else {
-    if (inputs?.platform === Platform.VS) {
-      runtime = RuntimeOptions.DotNet().id;
-    }
   }
   return runtime;
 }
@@ -475,7 +473,7 @@ export class CapabilityOptions {
     };
   }
   static bots(inputs?: Inputs): OptionItem[] {
-    if (inputs?.platform === Platform.VS) {
+    if (inputs && getRuntime(inputs) === RuntimeOptions.DotNet().id) {
       return [
         CapabilityOptions.basicBot(),
         CapabilityOptions.aiBot(),
@@ -647,6 +645,9 @@ export class CapabilityOptions {
    * dynamic capability list, which depends on feature flags
    */
   static all(inputs?: Inputs): OptionItem[] {
+    if (inputs && getRuntime(inputs) === RuntimeOptions.DotNet().id) {
+      return CapabilityOptions.dotnetCaps(inputs);
+    }
     const capabilityOptions = [
       ...CapabilityOptions.bots(inputs),
       ...CapabilityOptions.tabs(),

diff --git a/packages/fx-core/src/question/create.ts b/packages/fx-core/src/question/create.ts
@@ -94,8 +94,11 @@ export function projectTypeQuestion(): SingleSelectQuestion {
         staticOptions.push(ProjectTypeOptions.copilotPlugin(inputs.platform));
       }
 
+      if (getRuntime(inputs) === RuntimeOptions.NodeJS().id) {
+        staticOptions.push(ProjectTypeOptions.customCopilot(inputs.platform));
+      }
+
       staticOptions.push(
-        ProjectTypeOptions.customCopilot(inputs.platform),
         ProjectTypeOptions.bot(inputs.platform),
         ProjectTypeOptions.tab(inputs.platform),
         ProjectTypeOptions.me(inputs.platform)
@@ -106,7 +109,7 @@ export function projectTypeQuestion(): SingleSelectQuestion {
         if (projectType) {
           return [projectType];
         }
-      } else {
+      } else if (getRuntime(inputs) === RuntimeOptions.NodeJS().id) {
         if (featureFlagManager.getBooleanValue(FeatureFlags.OfficeAddin)) {
           staticOptions.push(ProjectTypeOptions.officeAddin(inputs.platform));
         } else {
@@ -206,7 +209,7 @@ export function capabilityQuestion(): SingleSelectQuestion {
         }
       }
       // dotnet capabilities
-      if (getRuntime(inputs) === RuntimeOptions.DotNet().id) {
+      if (inputs.platform === Platform.VS) {
         return CapabilityOptions.dotnetCaps(inputs);
       }
 
@@ -215,7 +218,7 @@ export function capabilityQuestion(): SingleSelectQuestion {
         return CapabilityOptions.all(inputs);
       }
 
-      // nodejs capabilities
+      // capabilities if VSC or CLI interactive mode
       const projectType = inputs[QuestionNames.ProjectType];
       if (projectType === ProjectTypeOptions.bot().id) {
         return CapabilityOptions.bots(inputs);
@@ -1383,12 +1386,13 @@ export function capabilitySubTree(): IQTreeNode {
         data: programmingLanguageQuestion(),
         condition: (inputs: Inputs) => {
           return (
-            !!inputs[QuestionNames.Capabilities] &&
-            inputs[QuestionNames.Capabilities] !== CapabilityOptions.copilotPluginApiSpec().id &&
-            inputs[QuestionNames.Capabilities] !== CapabilityOptions.customizeGptBasic().id &&
-            inputs[QuestionNames.MeArchitectureType] !== MeArchitectureOptions.apiSpec().id &&
-            inputs[QuestionNames.Capabilities] !== CapabilityOptions.officeAddinImport().id &&
-            inputs[QuestionNames.Capabilities] !== CapabilityOptions.outlookAddinImport().id
+            (!!inputs[QuestionNames.Capabilities] &&
+              inputs[QuestionNames.Capabilities] !== CapabilityOptions.copilotPluginApiSpec().id &&
+              inputs[QuestionNames.Capabilities] !== CapabilityOptions.customizeGptBasic().id &&
+              inputs[QuestionNames.MeArchitectureType] !== MeArchitectureOptions.apiSpec().id &&
+              inputs[QuestionNames.Capabilities] !== CapabilityOptions.officeAddinImport().id &&
+              inputs[QuestionNames.Capabilities] !== CapabilityOptions.outlookAddinImport().id) ||
+            getRuntime(inputs) === RuntimeOptions.DotNet().id
           );
         },
       },

diff --git a/packages/vscode-extension/test/officeChat/utils.test.ts b/packages/vscode-extension/test/officeChat/utils.test.ts
@@ -174,7 +174,7 @@ describe("File: officeChat/utils.ts", () => {
           shortDescription: "Using Shape related APIs to insert and format to work as a dashboard.",
           fullDescription:
             "The sample add-in demonstrates Excel add-in capablities to help users using shape API to work as a dashboard.",
-          tags: ["TS", "Shape", "Excel", "Office Add-in"],
+          tags: ["TS", "Shape", "Excel"],
           time: "5min to run",
           thumbnailPath: "assets/thumbnail.png",
           suggested: false,