603: Fix - sort jobs in workflow (#604)

Author: jozefbakus

src/main/scala/za/co/absa/hyperdrive/trigger/persistance/WorkflowRepository.scala

@@ -151,7 +151,7 @@ class WorkflowRepositoryImpl @Inject()(
             sensor = s,
             dagDefinitionJoined = DagDefinitionJoined(
               workflowId = dd.workflowId,
-              jobDefinitions = wsddjd.map(_._4),
+              jobDefinitions = wsddjd.map(_._4).sortBy(_.order),
               id = dd.id
             ),
             id = w.id

ui/src/app/stores/workflows/workflows.effects.spec.ts

@@ -1168,4 +1168,51 @@ describe('WorkflowsEffects', () => {
       expect(toastrServiceSpy).toHaveBeenCalledWith(texts.LOAD_WORKFLOW_FROM_HISTORY_FAILURE_NOTIFICATION);
     });
   });
+
+  describe('sortJobsInWorkflow', () => {
+    it('should return input workflow if workflow contains 0 jobs', () => {
+      const workflow = WorkflowJoinedModelFactory.createEmpty();
+      const inputWorkflow = { ...workflow, dagDefinitionJoined: { ...workflow.dagDefinitionJoined, jobDefinitions: [] } };
+
+      const result = underTest.sortJobsInWorkflow(inputWorkflow);
+
+      expect(result).toEqual(inputWorkflow);
+    });
+
+    it('should return input workflow with sorted jobs', () => {
+      const workflow = WorkflowJoinedModelFactory.createEmpty();
+      const firstJob = JobDefinitionModelFactory.createDefault(0);
+      const secondJob = JobDefinitionModelFactory.createDefault(1);
+      const thirdJob = JobDefinitionModelFactory.createDefault(2);
+
+      const inputWorkflow = {
+        ...workflow,
+        dagDefinitionJoined: { ...workflow.dagDefinitionJoined, jobDefinitions: [thirdJob, secondJob, firstJob] },
+      };
+      const expectedWorkflow = {
+        ...workflow,
+        dagDefinitionJoined: { ...workflow.dagDefinitionJoined, jobDefinitions: [firstJob, secondJob, thirdJob] },
+      };
+
+      const result = underTest.sortJobsInWorkflow(inputWorkflow);
+
+      expect(result).toEqual(expectedWorkflow);
+    });
+
+    it('should return input workflow if jobs are already sorted', () => {
+      const workflow = WorkflowJoinedModelFactory.createEmpty();
+      const firstJob = JobDefinitionModelFactory.createDefault(0);
+      const secondJob = JobDefinitionModelFactory.createDefault(1);
+      const thirdJob = JobDefinitionModelFactory.createDefault(2);
+
+      const inputWorkflow = {
+        ...workflow,
+        dagDefinitionJoined: { ...workflow.dagDefinitionJoined, jobDefinitions: [firstJob, secondJob, thirdJob] },
+      };
+
+      const result = underTest.sortJobsInWorkflow(inputWorkflow);
+
+      expect(result).toEqual(inputWorkflow);
+    });
+  });
 });

ui/src/app/stores/workflows/workflows.effects.ts

@@ -139,7 +139,7 @@ export class WorkflowsEffects {
               return [
                 {
                   type: WorkflowActions.LOAD_WORKFLOW_SUCCESS,
-                  payload: workflow,
+                  payload: this.sortJobsInWorkflow(workflow),
                 },
               ];
             }),
@@ -563,7 +563,7 @@ export class WorkflowsEffects {
             return [
               {
                 type: WorkflowActions.LOAD_WORKFLOW_SUCCESS,
-                payload: workflow,
+                payload: this.sortJobsInWorkflow(workflow),
               },
             ];
           }),
@@ -649,7 +649,7 @@ export class WorkflowsEffects {
           return [
             {
               type: WorkflowActions.REVERT_WORKFLOW_SUCCESS,
-              payload: workflow,
+              payload: this.sortJobsInWorkflow(workflow),
             },
           ];
         }),
@@ -664,4 +664,9 @@ export class WorkflowsEffects {
       );
     }),
   );
+
+  sortJobsInWorkflow(workflow: WorkflowJoinedModel): WorkflowJoinedModel {
+    const sortedJobs = workflow.dagDefinitionJoined.jobDefinitions.sort((jobLeft, jobRight) => jobLeft.order - jobRight.order);
+    return { ...workflow, dagDefinitionJoined: { ...workflow.dagDefinitionJoined, jobDefinitions: sortedJobs } };
+  }
 }