fix: fixed extraction of workflow's ui definition (#2608)

ballerine-io · Aug 4, 2024 · 5d9a1f6 · 5d9a1f6
1 parent 48c56ad
commit 5d9a1f6
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 18 deletions.
diff --git a/services/workflows-service/prisma/data-migrations b/services/workflows-service/prisma/data-migrations
diff --git a/services/workflows-service/src/collection-flow/collection-flow.service.ts b/services/workflows-service/src/collection-flow/collection-flow.service.ts
@@ -21,7 +21,7 @@ import { WorkflowService } from '@/workflow/workflow.service';
 import { AnyRecord } from '@ballerine/common';
 import { BUILT_IN_EVENT } from '@ballerine/workflow-core';
 import { Injectable } from '@nestjs/common';
-import { EndUser, UiDefinition, UiDefinitionContext, WorkflowRuntimeData } from '@prisma/client';
+import { EndUser, Prisma, UiDefinition, WorkflowRuntimeData } from '@prisma/client';
 import { randomUUID } from 'crypto';
 import get from 'lodash/get';
 
@@ -75,22 +75,23 @@ export class CollectionFlowService {
   }
 
   async getFlowConfiguration(
-    configurationId: string,
+    workflowDefinitionId: string,
     context: WorkflowRuntimeData['context'],
     language: string,
     projectIds: TProjectIds,
+    args?: Prisma.UiDefinitionFindFirstOrThrowArgs,
   ): Promise<FlowConfigurationModel> {
     const workflowDefinition = await this.workflowService.getWorkflowDefinitionById(
-      configurationId,
+      workflowDefinitionId,
       {},
       projectIds,
     );
 
     const uiDefintion = await this.uiDefinitionService.getByWorkflowDefinitionId(
       workflowDefinition.id,
-      'collection_flow' as keyof typeof UiDefinitionContext,
+      'collection_flow' as const,
       projectIds,
-      {},
+      args,
     );
 
     const translationService = new TranslationService(

diff --git a/services/workflows-service/src/ui-definition/ui-definition.controller.internal.ts b/services/workflows-service/src/ui-definition/ui-definition.controller.internal.ts
@@ -62,7 +62,6 @@ export class UiDefinitionControllerInternal {
       params.workflowDefinitionId,
       params.uiContext,
       projectIds,
-      {},
     );
 
     return uiDefinition;

diff --git a/services/workflows-service/src/ui-definition/ui-definition.repository.ts b/services/workflows-service/src/ui-definition/ui-definition.repository.ts
@@ -42,18 +42,22 @@ export class UiDefinitionRepository {
   async findByWorkflowDefinitionId(
     workflowDefinitionId: string,
     uiContext: keyof typeof UiDefinitionContext,
-    args: Prisma.UiDefinitionFindFirstOrThrowArgs,
     projectIds: TProjectIds,
+    args?: Prisma.UiDefinitionFindFirstOrThrowArgs,
   ): Promise<UiDefinition> {
     return await this.prisma.uiDefinition.findFirstOrThrow(
       this.scopeService.scopeFindFirst(
         {
+          ...args,
           where: {
-            workflowDefinitionId,
-            uiContext: uiContext,
-            ...args?.where,
+            or: [
+              {
+                workflowDefinitionId,
+                uiContext: uiContext,
+              },
+              ...(args?.where ? [args.where] : []),
+            ],
           },
-          ...args,
         },
         projectIds,
       ),

diff --git a/services/workflows-service/src/ui-definition/ui-definition.service.ts b/services/workflows-service/src/ui-definition/ui-definition.service.ts
@@ -32,13 +32,13 @@ export class UiDefinitionService {
     workflowDefinitionId: string,
     uiContext: keyof typeof UiDefinitionContext,
     projectIds: TProjectIds,
-    args: Prisma.UiDefinitionFindFirstOrThrowArgs,
+    args?: Prisma.UiDefinitionFindFirstOrThrowArgs,
   ) {
     return await this.repository.findByWorkflowDefinitionId(
       workflowDefinitionId,
       uiContext,
-      args,
       projectIds,
+      args,
     );
   }
 
@@ -52,9 +52,7 @@ export class UiDefinitionService {
 
     return this.getByWorkflowDefinitionId(runtime.workflowDefinitionId, uiContext, projectIds, {
       ...args,
-      where: {
-        ...(runtime.uiDefinitionId ? { id: runtime.uiDefinitionId } : {}),
-      },
+      ...(runtime.uiDefinitionId ? { where: { id: runtime.uiDefinitionId } } : {}),
     });
   }
 

diff --git a/services/workflows-service/src/workflow/workflow.service.ts b/services/workflows-service/src/workflow/workflow.service.ts
@@ -1465,7 +1465,6 @@ export class WorkflowService {
             workflowDefinitionId,
             UiDefinitionContext.collection_flow,
             projectIds,
-            {},
           );
         } catch (err) {
           if (isErrorWithMessage(err)) {