Move wizard common files to wizard folder (#2187)

MarceloRGonc · web-flow · commit 152a26066510 · 2026-04-01T12:55:49.000+01:00
Part of OPS-4044.
diff --git a/packages/server/api/src/app/benchmark/attach-benchmark-flows.service.ts b/packages/server/api/src/app/benchmark/attach-benchmark-flows.service.ts
@@ -1,16 +1,16 @@
 import {
   BenchmarkProviders,
+  WizardState,
   openOpsId,
+  throwValidationError,
   type BenchmarkWebhookPayload,
   type BenchmarkWorkflowBase,
-  type WizardState,
 } from '@openops/shared';
 import { webhookUtils } from 'server-worker';
 import { transaction } from '../core/db/transaction';
 import { benchmarkFlowRepo } from './benchmark-flow.repo';
 import type { BenchmarkRow } from './benchmark.entity';
 import { benchmarkRepo } from './benchmark.repo';
-import { throwValidationError } from './errors';
 
 export type AttachFlowsToBenchmarkRequest = {
   wizardState: WizardState;
diff --git a/packages/server/api/src/app/benchmark/benchmark-feature-guard.ts b/packages/server/api/src/app/benchmark/benchmark-feature-guard.ts
@@ -1,6 +1,6 @@
 import { AppSystemProp, logger, system } from '@openops/server-shared';
+import { throwFeatureDisabledError } from '@openops/shared';
 import { preHandlerAsyncHookHandler } from 'fastify';
-import { throwFeatureDisabledError } from './errors';
 
 export const assertBenchmarkFeatureEnabled: preHandlerAsyncHookHandler = async (
   request,
diff --git a/packages/server/api/src/app/benchmark/benchmark.controller.ts b/packages/server/api/src/app/benchmark/benchmark.controller.ts
@@ -15,11 +15,11 @@ import {
 } from '@openops/shared';
 import { StatusCodes } from 'http-status-codes';
 import { getProjectScopedRoutePolicy } from '../core/security/route-policies/route-security-policy-factory';
+import { resolveWizardNavigation } from '../wizard/wizard.service';
 import { assertBenchmarkFeatureEnabled } from './benchmark-feature-guard';
 import { getBenchmarkStatus, listBenchmarks } from './benchmark-status.service';
 import { createBenchmark } from './create-benchmark.service';
 import { getProvider } from './providers/providers-registry';
-import { resolveWizardNavigation } from './wizard.service';
 
 export const benchmarkController: FastifyPluginAsyncTypebox = async (app) => {
   app.addHook('preHandler', assertBenchmarkFeatureEnabled);
diff --git a/packages/server/api/src/app/benchmark/catalog-resolver.ts b/packages/server/api/src/app/benchmark/catalog-resolver.ts
@@ -1,10 +1,10 @@
+import { throwValidationError } from '@openops/shared';
 import fs from 'node:fs';
 import path from 'node:path';
 import {
   type LifecycleWorkflow,
   PROVIDER_LIFECYCLE_WORKFLOWS,
 } from './catalog-manifests';
-import { throwValidationError } from './errors';
 
 const WORKFLOWS_CATALOG_DIR = 'workflows-catalog';
 
diff --git a/packages/server/api/src/app/benchmark/create-benchmark.service.ts b/packages/server/api/src/app/benchmark/create-benchmark.service.ts
@@ -6,6 +6,7 @@ import {
   ContentType,
   ErrorCode,
   Folder,
+  throwValidationError,
   type WizardState,
 } from '@openops/shared';
 import { IsNull } from 'typeorm';
@@ -25,7 +26,6 @@ import {
   type CategorizedWorkflowPaths,
   resolveWorkflowPathsForSeed,
 } from './catalog-resolver';
-import { throwValidationError } from './errors';
 
 function validateWizardState(wizardState: WizardState): void {
   const connection = wizardState.connection ?? [];
diff --git a/packages/server/api/src/app/benchmark/errors.ts b/packages/server/api/src/app/benchmark/errors.ts
diff --git a/packages/server/api/src/app/benchmark/providers/aws/index.ts b/packages/server/api/src/app/benchmark/providers/aws/index.ts
diff --git a/packages/server/api/src/app/benchmark/providers/azure/index.ts b/packages/server/api/src/app/benchmark/providers/azure/index.ts
diff --git a/packages/server/api/src/app/benchmark/providers/providers-registry.ts b/packages/server/api/src/app/benchmark/providers/providers-registry.ts
@@ -1,7 +1,13 @@
-import { BenchmarkProviders, ProviderAdapter } from '@openops/shared';
-import { throwValidationError } from '../errors';
-import { awsProviderAdapter } from './aws';
-import { azureProviderAdapter } from './azure';
+import {
+  BenchmarkProviders,
+  ProviderAdapter,
+  throwValidationError,
+  WizardConfig,
+} from '@openops/shared';
+import { awsProviderAdapter } from '../../wizard/aws-provider-adapter';
+import { azureProviderAdapter } from '../../wizard/azure-provider-adapter';
+import awsConfig from './aws/aws.json';
+import azureConfig from './azure/azure.json';
 
 const providers = new Map<string, ProviderAdapter>();
 
@@ -16,8 +22,15 @@ export function getProvider(provider: string): ProviderAdapter {
 }
 
 function registerProviders(): void {
-  providers.set(BenchmarkProviders.AWS, awsProviderAdapter);
-  providers.set(BenchmarkProviders.AZURE, azureProviderAdapter);
+  providers.set(
+    BenchmarkProviders.AWS,
+    awsProviderAdapter(awsConfig as WizardConfig),
+  );
+
+  providers.set(
+    BenchmarkProviders.AZURE,
+    azureProviderAdapter(azureConfig as WizardConfig),
+  );
 }
 
 registerProviders();
diff --git a/packages/server/api/src/app/openops-analytics/benchmark/benchmark-dashboard-service.ts b/packages/server/api/src/app/openops-analytics/benchmark/benchmark-dashboard-service.ts
@@ -1,5 +1,4 @@
-import { BenchmarkProviders } from '@openops/shared';
-import { throwValidationError } from '../../benchmark/errors';
+import { BenchmarkProviders, throwValidationError } from '@openops/shared';
 import { createAwsBenchmarkDashboard } from './create-aws-benchmark-dashboard';
 import { createAzureBenchmarkDashboard } from './create-azure-benchmark-dashboard';
 
diff --git a/packages/server/api/src/app/wizard/aws-provider-adapter.ts b/packages/server/api/src/app/wizard/aws-provider-adapter.ts
@@ -0,0 +1,11 @@
+import { ProviderAdapter, WizardConfig } from '@openops/shared';
+import { evaluateCondition } from './resolvers/aws/aws-condition-resolver';
+import { resolveOptions } from './resolvers/aws/aws-option-resolver';
+
+export const awsProviderAdapter = (config: WizardConfig): ProviderAdapter => {
+  return {
+    config,
+    resolveOptions,
+    evaluateCondition,
+  };
+};
diff --git a/packages/server/api/src/app/wizard/azure-provider-adapter.ts b/packages/server/api/src/app/wizard/azure-provider-adapter.ts
@@ -0,0 +1,9 @@
+import { ProviderAdapter, WizardConfig } from '@openops/shared';
+import { resolveOptions } from './resolvers/azure/azure-option-resolver';
+
+export const azureProviderAdapter = (config: WizardConfig): ProviderAdapter => {
+  return {
+    config,
+    resolveOptions,
+  };
+};
diff --git a/packages/server/api/src/app/wizard/resolvers/aws/aws-condition-resolver.ts b/packages/server/api/src/app/wizard/resolvers/aws/aws-condition-resolver.ts
@@ -1,5 +1,4 @@
-import { WizardContext } from '@openops/shared';
-import { throwValidationError } from '../../errors';
+import { throwValidationError, WizardContext } from '@openops/shared';
 import { getConnectionAccounts } from './aws-option-resolver';
 
 export async function evaluateCondition(
diff --git a/packages/server/api/src/app/wizard/resolvers/aws/aws-option-resolver.ts b/packages/server/api/src/app/wizard/resolvers/aws/aws-option-resolver.ts
@@ -2,15 +2,12 @@ import { getRegionsList, parseArn } from '@openops/common';
 import {
   CustomAuthConnectionValue,
   REGION_IMAGE_LOGO_URL,
+  throwValidationError,
   WizardContext,
   WizardOption,
 } from '@openops/shared';
 import { appConnectionService } from '../../../app-connection/app-connection-service/app-connection-service';
-import {
-  getAuthProviderLogoUrl,
-  listConnections,
-} from '../../common-resolvers';
-import { throwValidationError } from '../../errors';
+import { getAuthProviderLogoUrl, listConnections } from '../common-resolvers';
 
 type AwsAuthProps = {
   roles?: Array<{ assumeRoleArn: string; accountName: string }>;
diff --git a/packages/server/api/src/app/wizard/resolvers/azure/azure-option-resolver.ts b/packages/server/api/src/app/wizard/resolvers/azure/azure-option-resolver.ts
@@ -7,15 +7,12 @@ import { logger } from '@openops/server-shared';
 import {
   CustomAuthConnectionValue,
   REGION_IMAGE_LOGO_URL,
+  throwValidationError,
   WizardContext,
   WizardOption,
 } from '@openops/shared';
 import { appConnectionService } from '../../../app-connection/app-connection-service/app-connection-service';
-import {
-  getAuthProviderLogoUrl,
-  listConnections,
-} from '../../common-resolvers';
-import { throwValidationError } from '../../errors';
+import { getAuthProviderLogoUrl, listConnections } from '../common-resolvers';
 
 export async function resolveOptions(
   method: string,
diff --git a/packages/server/api/src/app/wizard/resolvers/common-resolvers.ts b/packages/server/api/src/app/wizard/resolvers/common-resolvers.ts
@@ -1,11 +1,11 @@
 import {
   AppConnectionStatus,
+  throwValidationError,
   WizardContext,
   WizardOption,
 } from '@openops/shared';
-import { appConnectionService } from '../app-connection/app-connection-service/app-connection-service';
-import { getAuthProviderMetadata } from '../app-connection/connection-providers-resolver';
-import { throwValidationError } from './errors';
+import { appConnectionService } from '../../app-connection/app-connection-service/app-connection-service';
+import { getAuthProviderMetadata } from '../../app-connection/connection-providers-resolver';
 
 export async function getAuthProviderLogoUrl(
   authProviderKey: string,
diff --git a/packages/server/api/src/app/wizard/wizard.service.ts b/packages/server/api/src/app/wizard/wizard.service.ts
@@ -1,14 +1,14 @@
 import {
   ProviderAdapter,
   StaticOptionValue,
+  throwValidationError,
   WizardConfig,
   WizardConfigStep,
   WizardContext,
   WizardOption,
   WizardRequest,
   WizardStepResponse,
 } from '@openops/shared';
-import { throwValidationError } from './errors';
 
 function getStepProgress(
   config: WizardConfig,
diff --git a/packages/server/api/test/integration/ce/benchmark/benchmark-module.test.ts b/packages/server/api/test/integration/ce/benchmark/benchmark-module.test.ts
@@ -1,10 +1,7 @@
 const wizardServiceMock = {
   resolveWizardNavigation: jest.fn(),
 };
-jest.mock(
-  '../../../../src/app/benchmark/wizard.service',
-  () => wizardServiceMock,
-);
+jest.mock('../../../../src/app/wizard/wizard.service', () => wizardServiceMock);
 
 const createBenchmarkServiceMock = {
   createBenchmark: jest.fn(),
diff --git a/packages/server/api/test/unit/benchmark/common-resolvers.test.ts b/packages/server/api/test/unit/benchmark/common-resolvers.test.ts
@@ -1,5 +1,5 @@
 import { AppConnectionStatus } from '@openops/shared';
-import { listConnections } from '../../../src/app/benchmark/common-resolvers';
+import { listConnections } from '../../../src/app/wizard/resolvers/common-resolvers';
 
 const mockList = jest.fn();
 const mockGetAuthProviderMetadata = jest.fn();
diff --git a/packages/server/api/test/unit/benchmark/providers/aws/aws-condition-resolver.test.ts b/packages/server/api/test/unit/benchmark/providers/aws/aws-condition-resolver.test.ts
@@ -1,8 +1,8 @@
-import { evaluateCondition } from '../../../../../src/app/benchmark/providers/aws/aws-condition-resolver';
+import { evaluateCondition } from '../../../../../src/app/wizard/resolvers/aws/aws-condition-resolver';
 
 const mockGetConnectionAccounts = jest.fn();
 jest.mock(
-  '../../../../../src/app/benchmark/providers/aws/aws-option-resolver',
+  '../../../../../src/app/wizard/resolvers/aws/aws-option-resolver',
   () => ({
     getConnectionAccounts: (
       ...args: unknown[]
diff --git a/packages/server/api/test/unit/benchmark/providers/aws/aws-option-resolver.test.ts b/packages/server/api/test/unit/benchmark/providers/aws/aws-option-resolver.test.ts
@@ -1,12 +1,14 @@
 import { REGION_IMAGE_LOGO_URL } from '@openops/shared';
 
-import { resolveOptions } from '../../../../../src/app/benchmark/providers/aws/aws-option-resolver';
+import { resolveOptions } from '../../../../../src/app/wizard/resolvers/aws/aws-option-resolver';
 
 const mockListConnections = jest.fn();
 const mockGetRegionsList = jest.fn();
 const mockGetAuthProviderMetadata = jest.fn();
-jest.mock('../../../../../src/app/benchmark/common-resolvers', () => ({
-  ...jest.requireActual('../../../../../src/app/benchmark/common-resolvers'),
+jest.mock('../../../../../src/app/wizard/resolvers/common-resolvers', () => ({
+  ...jest.requireActual(
+    '../../../../../src/app/wizard/resolvers/common-resolvers',
+  ),
   listConnections: (
     ...args: unknown[]
   ): ReturnType<typeof mockListConnections> => mockListConnections(...args),
diff --git a/packages/server/api/test/unit/benchmark/providers/azure/azure-option-resolver.test.ts b/packages/server/api/test/unit/benchmark/providers/azure/azure-option-resolver.test.ts
@@ -1,15 +1,17 @@
 import { ErrorCode, REGION_IMAGE_LOGO_URL } from '@openops/shared';
 
-import { resolveOptions } from '../../../../../src/app/benchmark/providers/azure/azure-option-resolver';
+import { resolveOptions } from '../../../../../src/app/wizard/resolvers/azure/azure-option-resolver';
 
 const mockListConnections = jest.fn();
 const mockAuthenticateUserWithAzure = jest.fn();
 const mockGetAzureSubscriptionsList = jest.fn();
 const mockGetAzureRegionsList = jest.fn();
 const mockGetAuthProviderLogoUrl = jest.fn();
 
-jest.mock('../../../../../src/app/benchmark/common-resolvers', () => ({
-  ...jest.requireActual('../../../../../src/app/benchmark/common-resolvers'),
+jest.mock('../../../../../src/app/wizard/resolvers/common-resolvers', () => ({
+  ...jest.requireActual(
+    '../../../../../src/app/wizard/resolvers/common-resolvers',
+  ),
   listConnections: (
     ...args: unknown[]
   ): ReturnType<typeof mockListConnections> => mockListConnections(...args),
diff --git a/packages/server/api/test/unit/benchmark/wizard.service.test.ts b/packages/server/api/test/unit/benchmark/wizard.service.test.ts
@@ -1,5 +1,5 @@
 import type { ProviderAdapter } from '@openops/shared';
-import { resolveWizardNavigation } from '../../../src/app/benchmark/wizard.service';
+import { resolveWizardNavigation } from '../../../src/app/wizard/wizard.service';
 
 const mockResolveOptions = jest.fn().mockResolvedValue([]);
 const mockEvaluateCondition = jest.fn().mockResolvedValue(true);
diff --git a/packages/shared/src/lib/common/application-error.ts b/packages/shared/src/lib/common/application-error.ts
@@ -498,3 +498,17 @@ export enum ErrorCode {
   TEMPLATE_NOT_FOUND = 'TEMPLATE_NOT_FOUND',
   OPENAI_COMPATIBLE_PROVIDER_BASE_URL_REQUIRED = 'OPENAI_COMPATIBLE_PROVIDER_BASE_URL_REQUIRED',
 }
+
+export function throwFeatureDisabledError(message: string): never {
+  throw new ApplicationError(
+    { code: ErrorCode.FEATURE_DISABLED, params: { message } },
+    message,
+  );
+}
+
+export function throwValidationError(message: string): never {
+  throw new ApplicationError(
+    { code: ErrorCode.VALIDATION, params: { message } },
+    message,
+  );
+}
