fix invalid & no changes

bcgov · Oct 18, 2024 · baaa457 · baaa457
1 parent 05bbbc2
commit baaa457
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/apps/api/src/admin/admin.service.ts b/apps/api/src/admin/admin.service.ts
@@ -264,7 +264,7 @@ export class AdminService {
       !v.countryOfEducation &&
       !v.message
     ) {
-      v.message = 'No updates';
+      v.message = 'No changes';
     }
 
     v.valid = !v.message;

diff --git a/apps/web/src/components/admin/BccnmNcasPreview.tsx b/apps/web/src/components/admin/BccnmNcasPreview.tsx
@@ -26,12 +26,12 @@ export const BccnmNcasPreview = ({ data }: { data: BccnmNcasValidation[] }) => {
     switch (filter) {
       case FilterOption.VALID:
         setFilteredData(data.filter(e => e.valid));
+        break;      
+      case FilterOption.NO_CHANGES:
+        setFilteredData(data.filter(e => !e.valid && e.message === 'No changes'));
         break;
       case FilterOption.INVALID:
-        setFilteredData(data.filter(e => !e.valid));
-        break;
-      case FilterOption.NO_CHANGES:
-        setFilteredData(data.filter(e => e.valid && e.message === 'No changes'));
+        setFilteredData(data.filter(e => !e.valid && e.message !== 'No changes'));
         break;
       default:
         setFilteredData(data);

diff --git a/apps/web/src/components/admin/BccnmNcasUpdateFilter.tsx b/apps/web/src/components/admin/BccnmNcasUpdateFilter.tsx
@@ -31,10 +31,10 @@ export const BccnmNcasUpdateFilter = ({ data, onChange }: BccnmNcasUpdateSummary
     switch (option) {
       case FilterOption.VALID:
         return data.filter(e => e.valid).length;
-      case FilterOption.INVALID:
-        return data.filter(e => !e.valid).length;
       case FilterOption.NO_CHANGES:
-        return data.filter(e => e.valid && e.message === 'No changes').length;
+        return data.filter(e => !e.valid && e.message === 'No changes').length;
+      case FilterOption.INVALID:
+        return data.filter(e => !e.valid && e.message !== 'No changes').length;
       default:
         return data.length;
     }