Removed instance storing code that will be added in a different branch

jjoderis · jjoderis · commit de1ec640f5af · 2026-03-31T10:16:09.000+02:00
diff --git a/src/management-system-v2/app/(dashboard)/[environmentId]/(automation)/executions/deployment-hook.ts b/src/management-system-v2/app/(dashboard)/[environmentId]/(automation)/executions/deployment-hook.ts
@@ -1,5 +1,4 @@
 import { useEnvironment, useSession } from '@/components/auth-can';
-import { addInstance } from '@/lib/data/instances';
 import {
   DeployedProcessInfo,
   InstanceInfo,
@@ -16,7 +15,7 @@ import { Engine } from '@/lib/engines/machines';
 import { getStartFormFromMachine } from '@/lib/engines/tasklist';
 import useEngines from '@/lib/engines/use-engines';
 import { asyncFilter, asyncForEach, deepEquals } from '@/lib/helpers/javascriptHelpers';
-import { getErrorMessage, isUserErrorResponse, userError } from '@/lib/user-error';
+import { getErrorMessage, userError } from '@/lib/user-error';
 import { useQuery } from '@tanstack/react-query';
 import { useCallback } from 'react';
 
@@ -104,27 +103,10 @@ function useDeployment(definitionId: string, initialData?: DeployedProcessInfo)
     if (engines?.length) {
       // TODO: in case of static deployment or different versions on different engines we will have
       // to check if the engine can actually be used to start an instance
-      const instanceId = await startInstanceOnMachine(
-        definitionId,
-        versionId,
-        engines[0],
-        variables,
-        {
-          processInitiator: session?.user.id,
-          spaceIdOfProcessInitiator: space.spaceId,
-        },
-      );
-
-      if (isUserErrorResponse(instanceId)) return instanceId;
-
-      await addInstance({
-        id: instanceId,
-        definitionId,
-        initiatorId: session?.user.id || '',
-        initiatorSpaceId: space.spaceId,
+      return await startInstanceOnMachine(definitionId, versionId, engines[0], variables, {
+        processInitiator: session?.user.id,
+        spaceIdOfProcessInitiator: space.spaceId,
       });
-
-      return instanceId;
     }
   };
 
diff --git a/src/management-system-v2/app/(dashboard)/[environmentId]/tasks/form-list.tsx b/src/management-system-v2/app/(dashboard)/[environmentId]/tasks/form-list.tsx
@@ -195,7 +195,7 @@ const FormList: React.FC<FormListProps> = ({ data }) => {
           id: v4(),
           name: task.name,
           taskId: '',
-          instanceID: undefined,
+          instanceID: '',
           fileName: '',
           state: 'READY',
           machineId: 'ms-local',
diff --git a/src/management-system-v2/lib/data/db/instances.ts b/src/management-system-v2/lib/data/db/instances.ts
diff --git a/src/management-system-v2/lib/data/db/machine-config.ts b/src/management-system-v2/lib/data/db/machine-config.ts
@@ -25,7 +25,7 @@ import {
 } from '@/lib/data/machine-config-aas-schema';
 import { getFolderById, getRootFolder } from './folders';
 import db from '.';
-import { UserError, isUserErrorResponse, userError } from '@/lib/user-error';
+import { UserError, userError } from '@/lib/user-error';
 import { getCurrentUser } from '@/components/auth';
 import Ability, { UnauthorizedError } from '@/lib/ability/abilityHelper';
 import { asyncFilter, asyncForEach, asyncMap } from '@/lib/helpers/javascriptHelpers';
@@ -526,7 +526,7 @@ export async function addMachineConfigVersion(
   previousMachine: Parameter,
   currentMachine: Parameter,
   versionNo: Int,
-) {}
+) { }
 
 // TODO rework: versioning
 /**
@@ -2025,8 +2025,8 @@ export async function updateParameter(
     // make sure to remove backlinks from unlinked parameters
     let linkIds = parameter.transformation
       ? Object.values(parameter.transformation.linkedInputParameters).map(
-          ({ id }: { id: any }) => id,
-        )
+        ({ id }: { id: any }) => id,
+      )
       : [];
     const removedIds = linkIds.filter(
       (id) =>
@@ -2181,8 +2181,8 @@ export async function convertParameterType(
             inputParam.id === parameterId
               ? { data: { value: (newParameter as Parameter).value ?? updatedParameter.value } }
               : await db.configParameter.findUnique({
-                  where: { id: inputParam.id },
-                });
+                where: { id: inputParam.id },
+              });
 
           // convert to number if possible
           inputValues[key.substring(1)] = possiblyNumber(
@@ -2310,7 +2310,7 @@ export async function removeParameter(parameterId: string) {
   const parameterPath = findPathToParameter(parameter.id, fullConfig, [], 'config');
   if (
     parameterPath.slice(0, 2).toString() ==
-      ['identity-and-access-management', 'common-user-data'].toString() &&
+    ['identity-and-access-management', 'common-user-data'].toString() &&
     fullConfig.configType == 'organization'
   ) {
     await removeCommonUserDataPropagation(parameterPath.slice(2), fullConfig);
@@ -2404,7 +2404,7 @@ export async function removeConfigVersion(configId: string, versionNo: number) {
       const error = e as Error;
       throw userError(
         error.message ??
-          `There was an error removing the config versions: ${configId}-${versionNo}`,
+        `There was an error removing the config versions: ${configId}-${versionNo}`,
       );
     }
   } else {
diff --git a/src/management-system-v2/lib/data/instances.ts b/src/management-system-v2/lib/data/instances.ts
diff --git a/src/management-system-v2/lib/engines/server-actions.ts b/src/management-system-v2/lib/engines/server-actions.ts
@@ -1,12 +1,6 @@
 'use server';
 
-import {
-  UserErrorType,
-  UserFacingError,
-  getErrorMessage,
-  isUserErrorResponse,
-  userError,
-} from '../user-error';
+import { UserFacingError, getErrorMessage, isUserErrorResponse, userError } from '../user-error';
 import {
   deployProcess as _deployProcess,
   getDeployments as fetchDeployments,
@@ -52,11 +46,8 @@ import {
 import { getFileFromMachine, submitFileToMachine, updateVariablesOnMachine } from './instances';
 import { getProcessIds, getVariablesFromElementById } from '@proceed/bpmn-helper';
 import { Variable } from '@proceed/bpmn-helper/src/getters';
-import { getUsersInSpace } from '../data/db/iam/memberships';
 import Ability from '../ability/abilityHelper';
 import { getUserById } from '../data/db/iam/users';
-import { getNestedOrgParameter, getNestedUserParameter } from '../data/db/machine-config';
-import { deleteInstances, getInstanceById } from '../data/instances';
 import { getDataObject, isErrorResponse } from '@/app/api/spaces/[spaceId]/data/helper';
 
 export async function getCorrectTargetEngines(
@@ -134,8 +125,6 @@ export async function removeDeployment(definitionId: string, spaceId: string) {
     });
 
     await removeDeploymentFromMachines(engines, definitionId);
-
-    await deleteInstances(definitionId);
   } catch (e) {
     const message = getErrorMessage(e);
     return userError(message);
@@ -412,11 +401,16 @@ export async function getTasklistEntryHTML(
     let globalVars: Record<string, any> = {};
 
     if (storedUserTask.instanceID) {
-      const instance = await getInstanceById(storedUserTask.instanceID);
+      if (!engine) throw new Error('Cannot retrieve the instance initiator information.');
+      const [definitionId] = storedUserTask.instanceID.split('-_');
+      const deployment = await fetchDeployment(engine, definitionId);
+      const instance = deployment.instances.find(
+        (i) => i.processInstanceId === storedUserTask.instanceID,
+      );
       if (!instance) throw new Error('Unknown instance');
-      if (isUserErrorResponse(instance)) throw instance;
+      if (!instance.processInitiator) throw new Error('Missing initiator information');
 
-      globalVars = await getGlobalVariablesForHTML(spaceId, instance.initiatorId, html);
+      globalVars = await getGlobalVariablesForHTML(spaceId, instance.processInitiator, html);
     }
 
     variableChanges = { ...variableChanges, ...globalVars };
diff --git a/src/management-system-v2/lib/user-task-schema.tsx b/src/management-system-v2/lib/user-task-schema.tsx
@@ -4,7 +4,7 @@ export const UserTaskInputSchema = z.object({
   id: z.string(),
   taskId: z.string(),
   name: z.string().nullish(),
-  instanceID: z.string().optional(),
+  instanceID: z.string(),
   fileName: z.string(),
   html: z.string().nullish(),
   state: z.string(),
diff --git a/src/management-system-v2/prisma/migrations/20260304144124_instance_information/migration.sql b/src/management-system-v2/prisma/migrations/20260304144124_instance_information/migration.sql
diff --git a/src/management-system-v2/prisma/schema.prisma b/src/management-system-v2/prisma/schema.prisma
@@ -49,7 +49,6 @@ model User {
   emailVerificationTokens EmailVerificationToken[] @relation("verificationToken")
   mcpPairingCodes         McpPairingCode[]         @relation("pairingCode")
   Config                  Config[]
-  startedInstances        ProcessInstance[]        @relation("instanceInitiator")
 
   @@map("user")
 }
@@ -145,26 +144,25 @@ model ArtifactVersionReference {
 }
 
 model Space {
-  id                 String               @id @default(uuid())
+  id                 String         @id @default(uuid())
   name               String?
   isOrganization     Boolean
   isActive           Boolean?
   description        String?
   contactPhoneNumber String?
   contactEmail       String?
   spaceLogo          String?
-  owner              User?                @relation("spaceOwner", fields: [ownerId], references: [id], onDelete: Cascade)
+  owner              User?          @relation("spaceOwner", fields: [ownerId], references: [id], onDelete: Cascade)
   ownerId            String?
   members            Membership[]
   folders            Folder[]
   processes          Process[]
   htmlForms          HtmlForm[]
   roles              Role[]
   engines            Engine[]
-  settings           SpaceSettings?       @relation("spaceSettings")
+  settings           SpaceSettings? @relation("spaceSettings")
   Config             Config[]
   mcpPairingCodes    McpPairingCode[]
-  instances          ProcessInstance[]    @relation("instanceInitiatorSpace")
 
   @@map("space")
 }
@@ -326,24 +324,11 @@ model HtmlForm {
   @@map("html-form")
 }
 
-model ProcessInstance {
-  id                String              @id
-  definitionId      String
-  initiator         User                @relation("instanceInitiator", fields: [initiatorId], references: [id], onDelete: Cascade)
-  initiatorId       String
-  initiatorSpace    Space               @relation("instanceInitiatorSpace", fields: [initiatorSpaceId], references: [id], onDelete: Cascade)
-  initiatorSpaceId  String
-  userTasks         UserTask[]          @relation("instance")
-
-  @@map("process-instance")
-}
-
 model UserTask {
-  id                String              @id
+  id                String    @id
   taskId            String
   name              String?
-  instance          ProcessInstance?     @relation("instance", fields: [instanceID], references: [id], onDelete: Cascade)
-  instanceID        String?
+  instanceID        String
   fileName          String
   html              String?
   state             String
