Merge branch 'fix-fe-validations' into medis-imp-export-api-fe-valid

bcgov · Aug 18, 2023 · dc706e4 · dc706e4
2 parents 3a18c4d + b168519
commit dc706e4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/app/frontend/src/components/forms/SubmissionsTable.vue b/app/frontend/src/components/forms/SubmissionsTable.vue
@@ -487,11 +487,7 @@ export default {
           (h) => !this.tableFilterIgnore.some((fd) => fd.value === h.value)
         );
 
-        if (headers.length > 2) {
-          headers.splice(headers.length - 2, 0, ...this.USER_PREFERENCES);
-        } else {
-          headers = headers.concat(this.USER_PREFERENCES);
-        }
+        headers.splice(headers.length - 2, 0, ...this.USER_PREFERENCES);
       }
 
       return headers;

diff --git a/app/frontend/src/components/forms/submission/MySubmissionsTable.vue b/app/frontend/src/components/forms/submission/MySubmissionsTable.vue
@@ -262,11 +262,7 @@ export default {
           (h) => !this.tableFilterIgnore.some((fd) => fd.value === h.value)
         );
 
-        if (headers.length > 2) {
-          headers.splice(headers.length - 2, 0, ...this.filterData);
-        } else {
-          headers = headers.concat(this.filterData);
-        }
+        headers.splice(headers.length - 1, 0, ...this.filterData);
       }
       return headers;
     },