Cleanup sourcetable

globaldothealth · May 1, 2024 · 6b4ab01 · 6b4ab01
1 parent 8c8355f
commit 6b4ab01
Show file tree

Hide file tree

Showing 4 changed files with 453 additions and 511 deletions.
diff --git a/verification/curator-service/ui/src/components/App/App.test.tsx b/verification/curator-service/ui/src/components/App/App.test.tsx
@@ -62,7 +62,7 @@ describe('<App />', () => {
         });
 
         render(<App />, { initialState: initialLoggedInState });
-        expect(axios.get).toHaveBeenCalledTimes(6);
+        expect(axios.get).toHaveBeenCalledTimes(5);
         expect(axios.get).toHaveBeenCalledWith('/auth/profile');
         expect(axios.get).toHaveBeenCalledWith('/version');
         expect(axios.get).toHaveBeenCalledWith('/env');
@@ -184,7 +184,10 @@ describe('<App />', () => {
                 return Promise.resolve(axiosResponse);
             }
         });
-        render(<App />, { initialRoute: '/cases' });
+        render(<App />, {
+            initialState: initialLoggedInState,
+            initialRoute: '/cases',
+        });
 
         fireEvent.click(await screen.findByTestId('profile-menu'));
 

diff --git a/verification/curator-service/ui/src/components/Sidebar/index.tsx b/verification/curator-service/ui/src/components/Sidebar/index.tsx
@@ -162,24 +162,22 @@ const Sidebar = ({ drawerOpen }: SidebarProps): JSX.Element => {
                             <MenuItem>New bulk upload</MenuItem>
                         </Link>
                         {hasAnyRole(user, [Role.Curator]) && (
-                            <>
-                                <Link
-                                    to="/sources/automated"
-                                    onClick={closeCreateNewPopup}
-                                    className={classes.link}
-                                >
-                                    <MenuItem>New automated source</MenuItem>
-                                </Link>
-                                <Link
-                                    to="/sources/backfill"
-                                    onClick={closeCreateNewPopup}
-                                    className={classes.link}
-                                >
-                                    <MenuItem>
-                                        New automated source backfill
-                                    </MenuItem>
-                                </Link>
-                            </>
+                            <Link
+                                to="/sources/automated"
+                                onClick={closeCreateNewPopup}
+                                className={classes.link}
+                            >
+                                <MenuItem>New automated source</MenuItem>
+                            </Link>
+                        )}
+                        {hasAnyRole(user, [Role.Curator]) && (
+                            <Link
+                                to="/sources/automated"
+                                onClick={closeCreateNewPopup}
+                                className={classes.link}
+                            >
+                                <MenuItem>New automated source</MenuItem>
+                            </Link>
                         )}
                     </Menu>
                 </>