Fix sort of Side Drawer Advance Filters (CRASM-967)

backend/src/api/search/buildRequest.ts

@@ -196,7 +196,9 @@ export function buildRequest(
         aggs: {
           severity: {
             terms: {
-              field: 'vulnerabilities.severity.keyword'
+              field: 'vulnerabilities.severity.keyword',
+              missing: 'null',
+              size: 50
             }
           },
           cve: {

backend/src/tasks/search-sync-domains.ts

@@ -11,9 +11,7 @@ import pRetry from 'p-retry';
 export const DOMAIN_CHUNK_SIZE = typeof jest === 'undefined' ? 50 : 10;
 export const ORGANIZATION_CHUNK_SIZE = typeof jest === 'undefined' ? 50 : 10;
 
-export const handler = async (commandOptions: CommandOptions) => {
-  const { organizationId, domainId } = commandOptions;
-
+export const handler = async (organizationId?: string) => {
   console.log('Running searchSync');
   await connectToDatabase();
 

backend/src/tasks/syncdb.ts

@@ -139,17 +139,8 @@ export const handler: Handler = async (event) => {
       }
     }
 
-    console.log('Done. Running search sync...');
-    for (const organizationId of organizationIds) {
-      await searchSyncDomains({
-        organizationId,
-        scanId: 'scanId',
-        scanName: 'scanName',
-        organizationName: 'organizationName',
-        scanTaskId: 'scanTaskId'
-      });
-    }
     console.log('Done.');
   }
+  await searchSyncDomains();
   await searchSyncOrgs();
 };

backend/src/tasks/test/search-sync.test.ts

@@ -45,13 +45,7 @@ describe('search_sync', () => {
       domain
     }).save();
 
-    await searchSync({
-      organizationId: organization.id,
-      organizationName: 'organizationName',
-      scanId: 'scanId',
-      scanName: 'scanName',
-      scanTaskId: 'scanTaskId'
-    });
+    await searchSync(organization.id);
 
     expect(updateDomains).not.toBeCalled();
   });
@@ -71,13 +65,7 @@ describe('search_sync', () => {
       updatedAt: new Date('9999-10-11')
     }).save();
 
-    await searchSync({
-      organizationId: organization.id,
-      organizationName: 'organizationName',
-      scanId: 'scanId',
-      scanName: 'scanName',
-      scanTaskId: 'scanTaskId'
-    });
+    await searchSync(organization.id);
 
     expect(updateDomains).toBeCalled();
   });
@@ -97,13 +85,7 @@ describe('search_sync', () => {
       updatedAt: new Date('9999-9-11')
     }).save();
 
-    await searchSync({
-      organizationId: organization.id,
-      organizationName: 'organizationName',
-      scanId: 'scanId',
-      scanName: 'scanName',
-      scanTaskId: 'scanTaskId'
-    });
+    await searchSync(organization.id);
 
     expect(updateDomains).not.toBeCalled();
   });
@@ -122,13 +104,7 @@ describe('search_sync', () => {
       updatedAt: new Date('9999-10-11')
     }).save();
 
-    await searchSync({
-      organizationId: organization.id,
-      organizationName: 'organizationName',
-      scanId: 'scanId',
-      scanName: 'scanName',
-      scanTaskId: 'scanTaskId'
-    });
+    await searchSync(organization.id);
 
     expect(updateDomains).toBeCalled();
   });
@@ -147,13 +123,7 @@ describe('search_sync', () => {
       updatedAt: new Date('9999-9-11')
     }).save();
 
-    await searchSync({
-      organizationId: organization.id,
-      organizationName: 'organizationName',
-      scanId: 'scanId',
-      scanName: 'scanName',
-      scanTaskId: 'scanTaskId'
-    });
+    await searchSync(organization.id);
 
     expect(updateDomains).not.toBeCalled();
   });
@@ -174,13 +144,7 @@ describe('search_sync', () => {
       syncedAt: new Date('9999-10-10')
     }).save();
 
-    await searchSync({
-      organizationId: organization.id,
-      organizationName: 'organizationName',
-      scanId: 'scanId',
-      scanName: 'scanName',
-      scanTaskId: 'scanTaskId'
-    });
+    await searchSync(organization.id);
 
     expect(updateDomains).toBeCalled();
   });
@@ -201,13 +165,7 @@ describe('search_sync', () => {
       syncedAt: new Date('9999-10-10')
     }).save();
 
-    await searchSync({
-      organizationId: organization.id,
-      organizationName: 'organizationName',
-      scanId: 'scanId',
-      scanName: 'scanName',
-      scanTaskId: 'scanTaskId'
-    });
+    await searchSync(organization.id);
 
     expect(updateDomains).not.toBeCalled();
   });
@@ -233,13 +191,7 @@ describe('search_sync', () => {
       domain
     }).save();
 
-    await searchSync({
-      organizationId: organization.id,
-      organizationName: 'organizationName',
-      scanId: 'scanId',
-      scanName: 'scanName',
-      scanTaskId: 'scanTaskId'
-    });
+    await searchSync(organization.id);
 
     expect(updateDomains).toBeCalled();
     expect(
@@ -272,12 +224,7 @@ describe('search_sync', () => {
       )
     );
 
-    await searchSync({
-      organizationId: organization.id,
-      scanId: 'scanId',
-      scanName: 'scanName',
-      scanTaskId: 'scanTaskId'
-    });
+    await searchSync(organization.id);
 
     expect(updateDomains).toBeCalledTimes(2);
   });

backend/test/__snapshots__/search.test.ts.snap

@@ -57,6 +57,8 @@ Object {
         "severity": Object {
           "terms": Object {
             "field": "vulnerabilities.severity.keyword",
+            "missing": "null",
+            "size": 50,
           },
         },
       },
@@ -195,6 +197,8 @@ Object {
         "severity": Object {
           "terms": Object {
             "field": "vulnerabilities.severity.keyword",
+            "missing": "null",
+            "size": 50,
           },
         },
       },

frontend/src/components/DrawerInterior.tsx

@@ -44,6 +44,15 @@ interface Props {
   initialFilters: any[];
 }
 
+interface SeverityData {
+  value: string;
+  count: number;
+}
+
+interface GroupedData {
+  [key: string]: number;
+}
+
 const FiltersApplied: React.FC = () => {
   return (
     <div className={classes.applied}>
@@ -151,26 +160,80 @@ export const DrawerInterior: React.FC<Props> = (props) => {
   );
 
   const portFacet: any[] = facets['services.port']
-    ? facets['services.port'][0].data
+    ? facets['services.port'][0].data.sort(
+        (a: { value: number }, b: { value: number }) => a.value - b.value
+      )
     : [];
 
   const fromDomainFacet: any[] = facets['fromRootDomain']
-    ? facets['fromRootDomain'][0].data
+    ? facets['fromRootDomain'][0].data.sort(
+        (a: { value: string }, b: { value: string }) =>
+          a.value.localeCompare(b.value)
+      )
     : [];
 
   const cveFacet: any[] = facets['vulnerabilities.cve']
-    ? facets['vulnerabilities.cve'][0].data
+    ? facets['vulnerabilities.cve'][0].data.sort(
+        (a: { value: string }, b: { value: string }) =>
+          a.value.localeCompare(b.value)
+      )
     : [];
 
-  const severityFacet: any[] = facets['vulnerabilities.severity']
-    ? facets['vulnerabilities.severity'][0].data
+  // To-Do: Create array(s) to handle permutations of null and N/A values
+  const titleCaseSeverityFacet = facets['vulnerabilities.severity']
+    ? facets['vulnerabilities.severity'][0].data.map(
+        (d: { value: string; count: number }) => {
+          if (
+            d.value === null ||
+            d.value === 'null' ||
+            d.value === 'NULL' ||
+            d.value === undefined ||
+            d.value === '' ||
+            d.value === 'N/A'
+          ) {
+            return { value: 'N/A', count: d.count };
+          } else {
+            return {
+              value:
+                d.value[0]?.toUpperCase() + d.value.slice(1)?.toLowerCase(),
+              count: d.count
+            };
+          }
+        }
+      )
     : [];
 
-  // Always show all severities
-  for (const value of ['Critical', 'High', 'Medium', 'Low']) {
-    if (!severityFacet.find((severity) => value === severity.value))
-      severityFacet.push({ value, count: 0 });
-  }
+  const groupedData: GroupedData = titleCaseSeverityFacet
+    .map((d: SeverityData) => {
+      const severityLevels = [
+        'N/A',
+        'Low',
+        'Medium',
+        'High',
+        'Critical',
+        'Other'
+      ];
+      if (severityLevels.includes(d.value)) {
+        return d;
+      } else {
+        return { value: 'Other', count: d.count };
+      }
+    })
+    .reduce((acc: GroupedData, curr: SeverityData) => {
+      if (acc[curr.value]) {
+        acc[curr.value] += curr.count;
+      } else {
+        acc[curr.value] = curr.count;
+      }
+      return acc;
+    }, {});
+
+  const sortedSeverityFacets = Object.entries(groupedData)
+    .map(([value, count]) => ({ value, count }))
+    .sort((a, b) => {
+      const order = ['N/A', 'Low', 'Medium', 'High', 'Critical', 'Other'];
+      return order.indexOf(a.value) - order.indexOf(b.value);
+    });
 
   return (
     <StyledWrapper style={{ overflowY: 'auto' }}>
@@ -360,7 +423,7 @@ export const DrawerInterior: React.FC<Props> = (props) => {
           </AccordionDetails>
         </Accordion>
       )}
-      {severityFacet.length > 0 && (
+      {sortedSeverityFacets.length > 0 && (
         <Accordion
           elevation={0}
           square
@@ -386,7 +449,7 @@ export const DrawerInterior: React.FC<Props> = (props) => {
           </AccordionSummary>
           <AccordionDetails classes={{ root: classes.details }}>
             <FacetFilter
-              options={severityFacet}
+              options={sortedSeverityFacets}
               selected={filtersByColumn['vulnerabilities.severity'] ?? []}
               onSelect={(value) =>
                 addFilter('vulnerabilities.severity', value, 'any')