Refactor Save search modal

backend/src/api/saved-searches.ts

@@ -62,12 +62,12 @@ class NewSavedSearch {
   @IsArray()
   filters: { field: string; values: any[]; type: string }[];
 
-  @IsBoolean()
-  createVulnerabilities: boolean;
+  // @IsBoolean()
+  // createVulnerabilities: boolean;
 
-  @IsObject()
-  @IsOptional()
-  vulnerabilityTemplate: Partial<Vulnerability>;
+  // @IsObject()
+  // @IsOptional()
+  // vulnerabilityTemplate: Partial<Vulnerability>;
 }
 
 const PAGE_SIZE = 20;

backend/src/models/saved-search.ts

@@ -41,17 +41,17 @@ export class SavedSearch extends BaseEntity {
 
   @Column()
   searchPath: string;
-
-  @Column({
-    default: false
-  })
-  createVulnerabilities: boolean;
-
-  // Content of vulnerability when search is configured to create vulnerabilities from results
-  @Column({ type: 'jsonb', default: '{}' })
-  vulnerabilityTemplate: Partial<Vulnerability> & {
-    title: string;
-  };
+  // TODO: Add this back if we have the ability to create vulnerabilities from search results
+  // @Column({
+  //   default: false
+  // })
+  // createVulnerabilities: boolean;
+
+  // // Content of vulnerability when search is configured to create vulnerabilities from results
+  // @Column({ type: 'jsonb', default: '{}' })
+  // vulnerabilityTemplate: Partial<Vulnerability> & {
+  //   title: string;
+  // };
 
   @ManyToOne((type) => User, {
     onDelete: 'SET NULL',

backend/src/tasks/saved-search.ts

@@ -51,20 +51,20 @@ export const handler = async (commandOptions: CommandOptions) => {
     search.count = hits;
     search.save();
 
-    if (search.createVulnerabilities) {
-      const results = await fetchAllResults(filters, restrictions);
-      const vulnerabilities: Vulnerability[] = results.map((domain) =>
-        plainToClass(Vulnerability, {
-          domain: domain,
-          lastSeen: new Date(Date.now()),
-          ...search.vulnerabilityTemplate,
-          state: 'open',
-          source: 'saved-search',
-          needsPopulation: false
-        })
-      );
-      await saveVulnerabilitiesToDb(vulnerabilities, false);
-    }
+    // if (search.createVulnerabilities) {
+    //   const results = await fetchAllResults(filters, restrictions);
+    //   const vulnerabilities: Vulnerability[] = results.map((domain) =>
+    //     plainToClass(Vulnerability, {
+    //       domain: domain,
+    //       lastSeen: new Date(Date.now()),
+    //       ...search.vulnerabilityTemplate,
+    //       state: 'open',
+    //       source: 'saved-search',
+    //       needsPopulation: false
+    //     })
+    //   );
+    //   await saveVulnerabilitiesToDb(vulnerabilities, false);
+    // }
   }
 
   console.log(`Saved search finished for ${savedSearches.length} searches`);

backend/test/__snapshots__/saved-searches.test.ts.snap

@@ -3,7 +3,6 @@
 exports[`saved-search create create by user should succeed 1`] = `
 Object {
   "count": 3,
-  "createVulnerabilities": false,
   "createdAt": Any<String>,
   "createdBy": Object {
     "id": Any<String>,
@@ -16,6 +15,5 @@ Object {
   "sortDirection": "",
   "sortField": "",
   "updatedAt": Any<String>,
-  "vulnerabilityTemplate": Object {},
 }
 `;

backend/test/saved-searches.test.ts

@@ -45,9 +45,9 @@ describe('saved-search', () => {
           sortField: '',
           searchTerm: '',
           searchPath: '',
-          filters: [],
-          createVulnerabilities: false,
-          vulnerabilityTemplate: {}
+          filters: []
+          // createVulnerabilities: false,
+          // vulnerabilityTemplate: {}
         })
         .expect(200);
       expect(response.body).toMatchSnapshot({
@@ -71,14 +71,14 @@ describe('saved-search', () => {
           sortField: '',
           searchTerm: '',
           searchPath: '',
-          filters: [],
-          createVulnerabilities: false,
-          vulnerabilityTemplate: {}
+          filters: []
+          // createVulnerabilities: false,
+          // vulnerabilityTemplate: {}
         };
         const search = await SavedSearch.create(body).save();
         body.name = 'test-' + Math.random();
         body.searchTerm = '123';
-        body.createVulnerabilities = true;
+        // body.createVulnerabilities = true;
         const response = await request(app)
           .put(`/saved-searches/${search.id}`)
           .set(
@@ -104,17 +104,17 @@ describe('saved-search', () => {
           sortField: '',
           searchTerm: '',
           searchPath: '',
-          filters: [],
-          createVulnerabilities: false,
-          vulnerabilityTemplate: {}
+          filters: []
+          // createVulnerabilities: false,
+          // vulnerabilityTemplate: {}
         };
         const search = await SavedSearch.create({
           ...body,
           createdBy: user
         }).save();
         body.name = 'test-' + Math.random();
         body.searchTerm = '123';
-        body.createVulnerabilities = true;
+        // body.createVulnerabilities = true;
         const response = await request(app)
           .put(`/saved-searches/${search.id}`)
           .set(
@@ -128,9 +128,9 @@ describe('saved-search', () => {
           .expect(200);
         expect(response.body.name).toEqual(body.name);
         expect(response.body.searchTerm).toEqual(body.searchTerm);
-        expect(response.body.createVulnerabilities).toEqual(
-          body.createVulnerabilities
-        );
+        // expect(response.body.createVulnerabilities).toEqual(
+        //   body.createVulnerabilities
+        // );
       });
       it('update by standard user without access should fail', async () => {
         const user = await User.create({
@@ -153,8 +153,8 @@ describe('saved-search', () => {
           searchTerm: '',
           searchPath: '',
           filters: [],
-          createVulnerabilities: false,
-          vulnerabilityTemplate: {},
+          // createVulnerabilities: false,
+          // vulnerabilityTemplate: {},
           createdBy: user
         };
         const search = await SavedSearch.create(body).save();
@@ -179,9 +179,9 @@ describe('saved-search', () => {
           sortField: '',
           searchTerm: '',
           searchPath: '',
-          filters: [],
-          createVulnerabilities: false,
-          vulnerabilityTemplate: {}
+          filters: []
+          // createVulnerabilities: false,
+          // vulnerabilityTemplate: {}
         };
         const search = await SavedSearch.create(body).save();
         const response = await request(app)
@@ -206,9 +206,9 @@ describe('saved-search', () => {
           sortField: '',
           searchTerm: '',
           searchPath: '',
-          filters: [],
-          createVulnerabilities: false,
-          vulnerabilityTemplate: {}
+          filters: []
+          // createVulnerabilities: false,
+          // vulnerabilityTemplate: {}
         }).save();
         const response = await request(app)
           .delete(`/saved-searches/${search.id}`)
@@ -235,8 +235,8 @@ describe('saved-search', () => {
           searchTerm: '',
           searchPath: '',
           filters: [],
-          createVulnerabilities: false,
-          vulnerabilityTemplate: {},
+          // createVulnerabilities: false,
+          // vulnerabilityTemplate: {},
           createdBy: user
         }).save();
         const response = await request(app)
@@ -272,8 +272,8 @@ describe('saved-search', () => {
           searchTerm: '',
           searchPath: '',
           filters: [],
-          createVulnerabilities: false,
-          vulnerabilityTemplate: {},
+          // createVulnerabilities: false,
+          // vulnerabilityTemplate: {},
           createdBy: user
         }).save();
         const response = await request(app)
@@ -309,8 +309,8 @@ describe('saved-search', () => {
           searchTerm: '',
           searchPath: '',
           filters: [],
-          createVulnerabilities: false,
-          vulnerabilityTemplate: {},
+          // createVulnerabilities: false,
+          // vulnerabilityTemplate: {},
           createdBy: user
         }).save();
         const response = await request(app)
@@ -335,9 +335,9 @@ describe('saved-search', () => {
           sortField: '',
           searchTerm: '',
           searchPath: '',
-          filters: [],
-          createVulnerabilities: false,
-          vulnerabilityTemplate: {}
+          filters: []
+          // createVulnerabilities: false,
+          // vulnerabilityTemplate: {}
         }).save();
         const response = await request(app)
           .get(`/saved-searches`)
@@ -371,8 +371,8 @@ describe('saved-search', () => {
           searchTerm: '',
           searchPath: '',
           filters: [],
-          createVulnerabilities: false,
-          vulnerabilityTemplate: {},
+          // createVulnerabilities: false,
+          // vulnerabilityTemplate: {},
           createdBy: user
         }).save();
         // this org should not show up in the response
@@ -384,8 +384,8 @@ describe('saved-search', () => {
           searchTerm: '',
           searchPath: '',
           filters: [],
-          createVulnerabilities: false,
-          vulnerabilityTemplate: {},
+          // createVulnerabilities: false,
+          // vulnerabilityTemplate: {},
           createdBy: user1
         }).save();
         const response = await request(app)
@@ -411,9 +411,9 @@ describe('saved-search', () => {
           sortField: '',
           searchTerm: '',
           searchPath: '',
-          filters: [],
-          createVulnerabilities: false,
-          vulnerabilityTemplate: {}
+          filters: []
+          // createVulnerabilities: false,
+          // vulnerabilityTemplate: {}
         }).save();
         const response = await request(app)
           .get(`/saved-searches/${search.id}`)
@@ -440,8 +440,8 @@ describe('saved-search', () => {
           searchTerm: '',
           searchPath: '',
           filters: [],
-          createVulnerabilities: false,
-          vulnerabilityTemplate: {},
+          // createVulnerabilities: false,
+          // vulnerabilityTemplate: {},
           createdBy: user
         }).save();
         const response = await request(app)
@@ -477,8 +477,8 @@ describe('saved-search', () => {
           searchTerm: '',
           searchPath: '',
           filters: [],
-          createVulnerabilities: false,
-          vulnerabilityTemplate: {},
+          // createVulnerabilities: false,
+          // vulnerabilityTemplate: {},
           createdBy: user1
         }).save();
         const response = await request(app)

frontend/src/components/DrawerInterior.tsx

@@ -67,8 +67,13 @@ export const DrawerInterior: React.FC<Props> = (props) => {
   } = props;
   const { apiGet, apiDelete } = useAuthContext();
 
-  const { savedSearches, setSavedSearches, setSavedSearchCount } =
-    useSavedSearchContext();
+  const {
+    savedSearches,
+    setSavedSearches,
+    setSavedSearchCount,
+    activeSearchId,
+    setActiveSearchId
+  } = useSavedSearchContext();
 
   const deleteSearch = async (id: string) => {
     try {
@@ -84,7 +89,6 @@ export const DrawerInterior: React.FC<Props> = (props) => {
   const displaySavedSearch = (id: string) => {
     const savedSearch = savedSearches.find((search) => search.id === id);
     if (savedSearch) {
-      localStorage.setItem('savedSearch', JSON.stringify(savedSearch));
       setSearchTerm(savedSearch.searchTerm, {
         shouldClearFilters: true,
         autocompleteResults: false
@@ -96,6 +100,7 @@ export const DrawerInterior: React.FC<Props> = (props) => {
         addFilter(filter.field, value, 'any');
       });
     });
+    setActiveSearchId(id);
   };
   const restoreInitialFilters = () => {
     initialFilters.forEach((filter) => {
@@ -110,11 +115,12 @@ export const DrawerInterior: React.FC<Props> = (props) => {
       shouldClearFilters: true,
       autocompleteResults: false
     });
-    localStorage.removeItem('savedSearch');
     restoreInitialFilters();
+    setActiveSearchId('');
   };
   const toggleSavedSearches = (id: string) => {
     const savedSearch = savedSearches.filter((search) => search.id === id);
+
     if (savedSearch) {
       if (!isSavedSearchActive(id)) {
         displaySavedSearch(id);
@@ -124,13 +130,16 @@ export const DrawerInterior: React.FC<Props> = (props) => {
     }
   };
 
-  const isSavedSearchActive = (id: string) => {
-    const activeSearch = JSON.parse(
-      localStorage.getItem('savedSearch') || '{}'
-    );
-    return activeSearch.id === id;
+  const isSavedSearchActive = (id: string): boolean => {
+    return activeSearchId === id;
   };
 
+  const ascendingSavedSearches = savedSearches.sort((a, b) =>
+    a.name.localeCompare(b.name)
+  );
+
+  console.log(ascendingSavedSearches);
+
   const filtersByColumn = useMemo(
     () =>
       filters.reduce(
@@ -405,9 +414,9 @@ export const DrawerInterior: React.FC<Props> = (props) => {
           <Typography>Saved Searches</Typography>
         </AccordionSummary>
         <AccordionDetails>
-          {savedSearches.length > 0 ? (
+          {ascendingSavedSearches.length > 0 ? (
             <List>
-              {savedSearches.map((search) => (
+              {ascendingSavedSearches.map((search) => (
                 <ListItem
                   key={search.id}
                   sx={{ justifyContent: 'space-between', padding: '0px' }}