add regeneration button on api explorer

microsoft · May 13, 2024 · 2bebba5 · 2bebba5
1 parent b03f5b2
commit 2bebba5
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 36 deletions.
diff --git a/vscode/microsoft-kiota/package-lock.json b/vscode/microsoft-kiota/package-lock.json
diff --git a/vscode/microsoft-kiota/package.json b/vscode/microsoft-kiota/package.json
@@ -240,22 +240,27 @@
         {
           "command": "kiota.openApiExplorer.searchOrOpenApiDescription",
           "when": "view == kiota.openApiExplorer",
-          "group": "navigation@2"
+          "group": "navigation@1"
         },
         {
           "command": "kiota.openApiExplorer.filterDescription",
           "when": "view == kiota.openApiExplorer",
-          "group": "navigation@3"
+          "group": "navigation@2"
         },
         {
           "command": "kiota.openApiExplorer.generateClient",
           "when": "view == kiota.openApiExplorer",
-          "group": "navigation@4"
+          "group": "navigation@3"
         },
         {
           "command": "kiota.openApiExplorer.openFile",
           "when": "view == kiota.workspace",
-          "group": "navigation@2"
+          "group": "navigation@1"
+        },
+        {
+          "command": "kiota.openApiExplorer.regenerateButton",
+          "when": "view == kiota.openApiExplorer",
+          "group": "navigation@4"
         }
       ],
       "view/item/context": [
@@ -352,6 +357,13 @@
         "enablement": "kiota.openApiExplorer.showIcons",
         "icon": "$(run-all)"
       },
+      {
+        "command": "kiota.openApiExplorer.regenerateButton",
+        "category": "Kiota",
+        "title": "%kiota.openApiExplorer.regenerateButton.title%",
+        "enablement": "kiota.openApiExplorer.showRegenerateIcon",
+        "icon": "$(sync)"
+      },
       {
         "command": "kiota.openApiExplorer.filterDescription",
         "category": "Kiota",
@@ -413,11 +425,11 @@
       },
       {
         "command": "kiota.editPaths",
-        "title": "Edit Paths"
+        "title": "%kiota.openApiExplorer.editPaths.title%"
       },
       {
         "command": "kiota.regenerate",
-        "title": "Re-generate"
+        "title": "%kiota.openApiExplorer.regenerateButton.title%"
       }
     ],
     "languages": [

diff --git a/vscode/microsoft-kiota/package.nls.json b/vscode/microsoft-kiota/package.nls.json
@@ -29,5 +29,8 @@
   "kiota.generate.structuredMimeTypes.description": "The MIME types and preference to use for structured data model generation. As per RFC9110 Accept header notation.",
   "kiota.generate.includeAdditionalData.description": "Will include the 'AdditionalData' property for models",
   "kiota.workspace.name": "My Workspace",
-  "kiota.openApiExplorer.openFile.title": "Open file"
+  "kiota.openApiExplorer.openFile.title": "Open file",
+  "kiota.openApiExplorer.regenerateButton.title": "Re-generate",
+  "kiota.openApiExplorer.editPaths.title": "Edit paths"
+
 }
diff --git a/vscode/microsoft-kiota/src/codelensProvider.ts b/vscode/microsoft-kiota/src/codelensProvider.ts
@@ -21,7 +21,7 @@ export class CodeLensProvider implements vscode.CodeLensProvider {
                             const editPathsCommand = {
                                 title: "Edit Paths",
                                 command: "kiota.editPaths",
-                                arguments: [clientObject] 
+                                arguments: [clientKey, clientObject] 
                             };
                             codeLenses.push(new vscode.CodeLens(rangeBeforeClient, editPathsCommand));
                             const regenerateCommand = {

diff --git a/vscode/microsoft-kiota/src/extension.ts b/vscode/microsoft-kiota/src/extension.ts
@@ -39,6 +39,8 @@ const treeViewId = `${extensionId}.openApiExplorer`;
 const treeViewFocusCommand = `${treeViewId}${focusCommandId}`;
 const dependenciesInfo = `${extensionId}.dependenciesInfo`;
 export const kiotaLockFile = "workspace.json";
+let globalClientKey: string;
+let globalClientObject: any;
 
 // This method is called when your extension is activated
 // Your extension is activated the very first time the command is executed
@@ -222,6 +224,7 @@ export async function activate(
         if (config.descriptionPath) {
           await openTreeViewWithProgress(() => openApiTreeProvider.setDescriptionUrl(config.descriptionPath!));
           await vscode.commands.executeCommand('setContext',`${treeViewId}.showIcons`, true);
+          await vscode.commands.executeCommand('setContext', `${treeViewId}.showRegenerateIcon`, false);
         }
       }
     ),
@@ -266,10 +269,26 @@ export async function activate(
       `${treeViewId}.pasteManifest`,
       () => openManifestFromClipboard(openApiTreeProvider, "")
     ),
-    registerCommandWithTelemetry(reporter, `${extensionId}.editPaths`, async (clientObject: any) => {
-     await loadEditPaths(clientObject, openApiTreeProvider);
-     await vscode.commands.executeCommand('setContext',`${treeViewId}.showIcons`, true);
+    registerCommandWithTelemetry(reporter, `${extensionId}.editPaths`, async (clientKey: string, clientObject: any) => {
+     globalClientKey = clientKey;
+     globalClientObject = clientObject;
+      await loadEditPaths(clientObject, openApiTreeProvider);
+     await vscode.commands.executeCommand('setContext',`${treeViewId}.showIcons`, false);
+     await vscode.commands.executeCommand('setContext', `${treeViewId}.showRegenerateIcon`, true);
     }),
+
+     vscode.commands.registerCommand(`${treeViewId}.regenerateButton`, async (clientKey: string, clientObject: any) => {
+      const settings = getExtensionSettings(extensionId); 
+      const selectedPaths = openApiTreeProvider.getSelectedPaths();
+     if (selectedPaths.length === 0) {
+      await vscode.window.showErrorMessage(
+        vscode.l10n.t("No endpoints selected, select endpoints first")
+      );
+    }
+      await regenerateClient(globalClientKey, globalClientObject, settings, selectedPaths);      
+    }),
+
+
     registerCommandWithTelemetry(reporter, `${extensionId}.regenerate`, async (clientKey: string, clientObject: any) => {
       const settings = getExtensionSettings(extensionId); 
       await regenerateClient(clientKey, clientObject, settings);
@@ -421,41 +440,22 @@ export async function activate(
       await exportLogsAndShowErrors(result);
     }
   }
-  async function regenerateClient(clientKey: string, clientObject:any, settings: ExtensionSettings): Promise<void> {
+  async function regenerateClient(clientKey: string, clientObject:any, settings: ExtensionSettings,  selectedPaths?: string[]): Promise<void> {
     const language =
           typeof clientObject.language === "string"
             ? parseGenerationLanguage(clientObject.language)
             : KiotaGenerationLanguage.CSharp;
-            console.log(
-              context,
-        clientObject.descriptionLocation,
-        clientObject.outputPath,
-        language,
-        clientObject.includePatterns,
-        clientObject.excludePatterns,
-        clientKey,
-        clientObject.clientNamespaceName,
-        clientObject.usesBackingStore,
-        true, // clearCache
-        true, // cleanOutput
-        clientObject.excludeBackwardCompatible,
-        clientObject.disabledValidationRules,
-        settings.languagesSerializationConfiguration[language].serializers,
-        settings.languagesSerializationConfiguration[language].deserializers,
-        clientObject.structuredMimeTypes,
-        clientObject.includeAdditionalData
-            );
      await vscode.window.withProgress({
       location: vscode.ProgressLocation.Notification,
       cancellable: false,
-      title: vscode.l10n.t("Generating client...")  
+      title: vscode.l10n.t("Re-generating client...")  
     }, async (progress, _) => {
       const result = await generateClient(
         context,
         clientObject.descriptionLocation,
         clientObject.outputPath,
         language,
-        clientObject.includePatterns,
+        selectedPaths ? selectedPaths : clientObject.includePatterns,
         clientObject.excludePatterns,
         clientKey,
         clientObject.clientNamespaceName,
@@ -473,7 +473,8 @@ export async function activate(
     return result;
     });
 
-  void vscode.window.showInformationMessage(`Client ${clientKey} regenerated successfully.`);
+  void vscode.window.showInformationMessage(`Client ${clientKey} re-generated successfully.`);
+  openApiTreeProvider.closeDescription();
   }
 
   // create a new status bar item that we can now manage