Task: isolate steps module (#5590)

microsoft · Oct 15, 2024 · 2214964 · 2214964
1 parent 307c2d6
commit 2214964
Show file tree

Hide file tree

Showing 11 changed files with 699 additions and 681 deletions.
diff --git a/vscode/microsoft-kiota/src/commands/generate/generateClientCommand.ts b/vscode/microsoft-kiota/src/commands/generate/generateClientCommand.ts
@@ -6,9 +6,9 @@ import { API_MANIFEST_FILE, extensionId, treeViewFocusCommand, treeViewId } from
 import { setGenerationConfiguration } from "../../handlers/configurationHandler";
 import { clearDeepLinkParams, getDeepLinkParams } from "../../handlers/deepLinkParamsHandler";
 import { ConsumerOperation, generationLanguageToString, getLogEntriesForLevel, KiotaLogEntry, LogLevel } from "../../kiotaInterop";
+import { GenerateState, generateSteps } from "../../modules/steps/generateSteps";
 import { DependenciesViewProvider } from "../../providers/dependenciesViewProvider";
 import { OpenApiTreeProvider } from "../../providers/openApiTreeProvider";
-import { GenerateState, generateSteps } from "../../steps";
 import { GenerationType, KiotaGenerationLanguage, KiotaPluginType } from "../../types/enums";
 import { ExtensionSettings, getExtensionSettings } from "../../types/extensionSettings";
 import { GeneratedOutputState } from "../../types/GeneratedOutputState";

diff --git a/vscode/microsoft-kiota/src/commands/openApiTreeView/filterDescriptionCommand.ts b/vscode/microsoft-kiota/src/commands/openApiTreeView/filterDescriptionCommand.ts
@@ -1,6 +1,6 @@
 import { treeViewId } from "../../constants";
+import { filterSteps } from "../../modules/steps/filterSteps";
 import { OpenApiTreeProvider } from "../../providers/openApiTreeProvider";
-import { filterSteps } from "../../steps";
 import { Command } from "../Command";
 
 export class FilterDescriptionCommand extends Command {

diff --git a/vscode/microsoft-kiota/src/commands/openApidescription/searchOrOpenApiDescriptionCommand.ts b/vscode/microsoft-kiota/src/commands/openApidescription/searchOrOpenApiDescriptionCommand.ts
@@ -3,8 +3,8 @@ import * as vscode from "vscode";
 
 import { extensionId, treeViewId } from "../../constants";
 import { setDeepLinkParams } from "../../handlers/deepLinkParamsHandler";
+import { searchSteps } from "../../modules/steps/searchSteps";
 import { OpenApiTreeProvider } from "../../providers/openApiTreeProvider";
-import { searchSteps } from "../../steps";
 import { getExtensionSettings } from "../../types/extensionSettings";
 import { IntegrationParams, validateDeepLinkQueryParams } from "../../utilities/deep-linking";
 import { openTreeViewWithProgress } from "../../utilities/progress";

diff --git a/vscode/microsoft-kiota/src/handlers/configurationHandler.ts b/vscode/microsoft-kiota/src/handlers/configurationHandler.ts
@@ -1,4 +1,4 @@
-import { GenerateState } from "../steps";
+import { GenerateState } from "../modules/steps/generateSteps";
 
 let configuration: Partial<GenerateState>;
 

diff --git a/vscode/microsoft-kiota/src/modules/steps/filterSteps.ts b/vscode/microsoft-kiota/src/modules/steps/filterSteps.ts
@@ -0,0 +1,27 @@
+import { l10n } from "vscode";
+import { BaseStepsState, MultiStepInput } from ".";
+import { shouldResume } from "./utils";
+
+export async function filterSteps(existingFilter: string, filterCallback: (searchQuery: string) => void) {
+  const state = {} as Partial<BaseStepsState>;
+  const title = l10n.t('Filter the API description');
+  let step = 1;
+  let totalSteps = 1;
+  async function inputFilterQuery(input: MultiStepInput, state: Partial<BaseStepsState>) {
+    await input.showInputBox({
+      title,
+      step: step++,
+      totalSteps: totalSteps,
+      value: existingFilter,
+      prompt: l10n.t('Enter a filter'),
+      validate: x => {
+        filterCallback(x.length === 0 && existingFilter.length > 0 ? existingFilter : x);
+        existingFilter = '';
+        return Promise.resolve(undefined);
+      },
+      shouldResume: shouldResume
+    });
+  }
+  await MultiStepInput.run(input => inputFilterQuery(input, state), () => step -= 2);
+  return state;
+}