From 2e980664ac524958bc84a543a691782efada7304 Mon Sep 17 00:00:00 2001
From: Faruk AYDIN <omerfaruk26@gmail.com>
Date: Sun, 7 Aug 2022 12:45:59 +0300
Subject: [PATCH] fix: Order associated steps by position for the flow

---
 packages/backend/src/models/flow.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/models/flow.ts b/packages/backend/src/models/flow.ts
index 01733ded..458175d6 100644
--- a/packages/backend/src/models/flow.ts
+++ b/packages/backend/src/models/flow.ts
@@ -1,5 +1,5 @@
 import { ValidationError } from 'objection';
-import type { ModelOptions, QueryContext } from 'objection';
+import type { ModelOptions, QueryContext, QueryBuilder } from 'objection';
 import Base from './base';
 import Step from './step';
 import Execution from './execution';
@@ -33,6 +33,9 @@ class Flow extends Base {
         from: 'flows.id',
         to: 'steps.flow_id',
       },
+      filter(builder: QueryBuilder<Step>) {
+        builder.orderBy('position', 'asc');
+      },
     },
     executions: {
       relation: Base.HasManyRelation,
@@ -44,7 +47,10 @@ class Flow extends Base {
     },
   });
 
-  async $beforeUpdate(opt: ModelOptions, queryContext: QueryContext): Promise<void> {
+  async $beforeUpdate(
+    opt: ModelOptions,
+    queryContext: QueryContext
+  ): Promise<void> {
     await super.$beforeUpdate(opt, queryContext);
 
     if (!this.active) return;