Fixed submission sorting

bcgov · Oct 10, 2023 · e42069f · e42069f
1 parent 5f137fb
commit e42069f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/app/frontend/src/components/forms/SubmissionsTable.vue b/app/frontend/src/components/forms/SubmissionsTable.vue
@@ -333,8 +333,8 @@ export default {
   },
   async mounted() {
     this.debounceInput = _.debounce(async () => {
-      this.forceTableRefresh += 1;
       this.refreshSubmissions();
+      this.forceTableRefresh += 1;
     }, 300);
 
     this.refreshSubmissions();

diff --git a/app/src/forms/common/models/views/submissionMetadata.js b/app/src/forms/common/models/views/submissionMetadata.js
@@ -62,12 +62,10 @@ class SubmissionMetadata extends Model {
         if (!pagination) {
           builder.orderBy('createdAt', 'DESC');
         } else {
-          let orderBy = params?.sortBy;
-          let orderDesc = params?.sortDesc;
-          if (orderDesc === 'true') {
-            builder.orderBy(orderBy, 'desc');
-          } else if (orderDesc === 'false') {
-            builder.orderBy(orderBy, 'asc');
+          let orderBy = params?.sortBy.column;
+          let orderDirection = params?.sortBy.order;
+          if (orderBy && orderDirection) {
+            builder.orderBy(orderBy, orderDirection);
           }
         }
       },