refactor: unify stack creation (#651)

Author: Cahllagerfeld

src/app/stacks/create/existing-infrastructure/steps/container_registry/useContainerRegistry.tsx

@@ -1,7 +1,7 @@
 import AlertCircle from "@/assets/icons/alert-circle.svg?react";
 import { useWizardContext } from "@/context/WizardContext";
 import { stackQueries } from "@/data/stacks";
-import { useCreateFullstack } from "@/data/stacks/full-stack-create";
+import { useCreateStack } from "@/data/stacks/create-stack";
 import { ComponentResourceInfo } from "@/types/service-connectors";
 import { useQueryClient } from "@tanstack/react-query";
 import { useToast } from "@zenml-io/react-component-library";
@@ -15,7 +15,7 @@ export function useContainerRegistries() {
 	const { toast } = useToast();
 
 	const { setCurrentStep } = useWizardContext();
-	const { mutate } = useCreateFullstack({
+	const { mutate } = useCreateStack({
 		onError: (error) => {
 			if (error instanceof Error) {
 				toast({
@@ -73,9 +73,9 @@ export function useContainerRegistries() {
 				name: updatedData.stackName || Math.random().toString(36).substring(7),
 				service_connectors: updatedData.connectorConfig ? [updatedData.connectorConfig] : [],
 				components: {
-					orchestrator: { ...updatedData.orchestratorConfig, service_connector_index: 0 },
-					artifact_store: { ...updatedData.artifactStoreConfig, service_connector_index: 0 },
-					container_registry: { ...updatedData.registryConfig, service_connector_index: 0 }
+					orchestrator: [{ ...updatedData.orchestratorConfig, service_connector_index: 0 }],
+					artifact_store: [{ ...updatedData.artifactStoreConfig, service_connector_index: 0 }],
+					container_registry: [{ ...updatedData.registryConfig, service_connector_index: 0 }]
 				}
 			}
 		});

src/app/stacks/create/manual/useManualStack.tsx

@@ -1,7 +1,6 @@
 import AlertCircle from "@/assets/icons/alert-circle.svg?react";
 import { stackQueries } from "@/data/stacks";
 import { useCreateStack } from "@/data/stacks/create-stack";
-import { useCurrentUser } from "@/data/users/current-user-query";
 import { workspaceQueries } from "@/data/workspaces";
 import { routes } from "@/router/routes";
 import { StackRequest } from "@/types/stack";
@@ -14,7 +13,6 @@ import { FormType, formSchema } from "./schema";
 
 export function useManualStack() {
 	const workspace = useQuery({ ...workspaceQueries.workspaceDetail("default") });
-	const user = useCurrentUser();
 	const { toast } = useToast();
 	const navigate = useNavigate();
 	const queryClient = useQueryClient();
@@ -48,8 +46,6 @@ export function useManualStack() {
 
 		const payload: StackRequest = {
 			name: data.stackName,
-			user: user.data?.id || "",
-			workspace: workspace.data?.id || "",
 			components: components
 		};
 

src/data/stacks/full-stack-create.ts

@@ -2405,30 +2405,12 @@ export type paths = {
 		 * Args:
 		 *     workspace_name_or_id: Name or ID of the workspace.
 		 *     stack: Stack to register.
-		 *
-		 * Returns:
-		 *     The created stack.
-		 *
-		 * Raises:
-		 *     IllegalOperationError: If the workspace specified in the stack
-		 *         does not match the current workspace.
-		 */
-		post: operations["create_stack_api_v1_workspaces__workspace_name_or_id__stacks_post"];
-	};
-	"/api/v1/workspaces/{workspace_name_or_id}/full-stack": {
-		/**
-		 * Create Full Stack
-		 * @description Creates a stack for a particular workspace.
-		 *
-		 * Args:
-		 *     workspace_name_or_id: Name or ID of the workspace.
-		 *     full_stack: Stack to register.
 		 *     auth_context: Authentication context.
 		 *
 		 * Returns:
 		 *     The created stack.
 		 */
-		post: operations["create_full_stack_api_v1_workspaces__workspace_name_or_id__full_stack_post"];
+		post: operations["create_stack_api_v1_workspaces__workspace_name_or_id__stacks_post"];
 	};
 	"/api/v1/workspaces/{workspace_name_or_id}/components": {
 		/**
@@ -4493,40 +4475,6 @@ export type components = {
 			/** The workspace to which this resource belongs. */
 			workspace?: string | null;
 		};
-		/**
-		 * FullStackRequest
-		 * @description Request model for a full-stack.
-		 */
-		FullStackRequest: {
-			/** User */
-			user?: string | null;
-			/** Workspace */
-			workspace?: string | null;
-			/** The name of the stack. */
-			name: string;
-			/**
-			 * The description of the stack
-			 * @default
-			 */
-			description?: string | null;
-			/** The stack labels. */
-			labels?: {
-				[key: string]: unknown;
-			} | null;
-			/**
-			 * The service connectors dictionary for the full stack registration.
-			 * @description The UUID of an already existing service connector or request information to create a service connector from scratch.
-			 * @default []
-			 */
-			service_connectors?: (string | components["schemas"]["ServiceConnectorInfo"])[];
-			/**
-			 * The mapping for the components of the full stack registration.
-			 * @description The mapping from component types to either UUIDs of existing components or request information for brand new components.
-			 */
-			components: {
-				[key: string]: unknown;
-			};
-		};
 		/** HTTPValidationError */
 		HTTPValidationError: {
 			/** Detail */
@@ -8172,19 +8120,13 @@ export type components = {
 		StackDeploymentProvider: "aws" | "gcp" | "azure";
 		/**
 		 * StackRequest
-		 * @description Request model for stacks.
+		 * @description Request model for a stack.
 		 */
 		StackRequest: {
-			/**
-			 * The id of the user that created this resource.
-			 * Format: uuid
-			 */
-			user: string;
-			/**
-			 * The workspace to which this resource belongs.
-			 * Format: uuid
-			 */
-			workspace: string;
+			/** User */
+			user?: string | null;
+			/** Workspace */
+			workspace?: string | null;
 			/** The name of the stack. */
 			name: string;
 			/**
@@ -8194,14 +8136,23 @@ export type components = {
 			description?: string;
 			/** The path to the stack spec used for mlstacks deployments. */
 			stack_spec_path?: string | null;
-			/** A mapping of stack component types to the actualinstances of components of this type. */
-			components?: {
+			/**
+			 * The mapping for the components of the full stack registration.
+			 * @description The mapping from component types to either UUIDs of existing components or request information for brand new components.
+			 */
+			components: {
 				[key: string]: unknown;
-			} | null;
+			};
 			/** The stack labels. */
 			labels?: {
 				[key: string]: unknown;
 			} | null;
+			/**
+			 * The service connectors dictionary for the full stack registration.
+			 * @description The UUID of an already existing service connector or request information to create a service connector from scratch.
+			 * @default []
+			 */
+			service_connectors?: (string | components["schemas"]["ServiceConnectorInfo"])[];
 		};
 		/**
 		 * StackResponse
@@ -18444,13 +18395,10 @@ export type operations = {
 	 * Args:
 	 *     workspace_name_or_id: Name or ID of the workspace.
 	 *     stack: Stack to register.
+	 *     auth_context: Authentication context.
 	 *
 	 * Returns:
 	 *     The created stack.
-	 *
-	 * Raises:
-	 *     IllegalOperationError: If the workspace specified in the stack
-	 *         does not match the current workspace.
 	 */
 	create_stack_api_v1_workspaces__workspace_name_or_id__stacks_post: {
 		parameters: {
@@ -18490,56 +18438,6 @@ export type operations = {
 			};
 		};
 	};
-	/**
-	 * Create Full Stack
-	 * @description Creates a stack for a particular workspace.
-	 *
-	 * Args:
-	 *     workspace_name_or_id: Name or ID of the workspace.
-	 *     full_stack: Stack to register.
-	 *     auth_context: Authentication context.
-	 *
-	 * Returns:
-	 *     The created stack.
-	 */
-	create_full_stack_api_v1_workspaces__workspace_name_or_id__full_stack_post: {
-		parameters: {
-			path: {
-				workspace_name_or_id: string;
-			};
-		};
-		requestBody: {
-			content: {
-				"application/json": components["schemas"]["FullStackRequest"];
-			};
-		};
-		responses: {
-			/** @description Successful Response */
-			200: {
-				content: {
-					"application/json": components["schemas"]["StackResponse"];
-				};
-			};
-			/** @description Unauthorized */
-			401: {
-				content: {
-					"application/json": components["schemas"]["ErrorModel"];
-				};
-			};
-			/** @description Conflict */
-			409: {
-				content: {
-					"application/json": components["schemas"]["ErrorModel"];
-				};
-			};
-			/** @description Unprocessable Entity */
-			422: {
-				content: {
-					"application/json": components["schemas"]["ErrorModel"];
-				};
-			};
-		};
-	};
 	/**
 	 * List Workspace Stack Components
 	 * @description List stack components that are part of a specific workspace.

src/types/core.ts

@@ -27,5 +27,4 @@ export type StackDeploymentStack = components["schemas"]["DeployedStack"];
 
 export type StackDeploymentProvider = components["schemas"]["StackDeploymentProvider"];
 
-export type FullStackRequest = components["schemas"]["FullStackRequest"];
 export type StackRequest = components["schemas"]["StackRequest"];