resolved conflict

TIER · Sep 1, 2021 · 8c06e53 · 8c06e53
2 parents 254a0b1 + 271727f
commit 8c06e53
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/ui/src/app/core/components/Header.js b/ui/src/app/core/components/Header.js
@@ -6,7 +6,8 @@ import Navbar from 'react-bootstrap/Navbar';
 import Dropdown from 'react-bootstrap/Dropdown';
 
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { faTh, faSignOutAlt, faPlusCircle, faCube, faCubes, faUsersCog, faSpinner, faUserCircle, faCog, faLayerGroup, faFileArchive } from '@fortawesome/free-solid-svg-icons';
+
+import { faTh, faSignOutAlt, faPlusCircle, faCube, faCubes, faUsersCog, faSpinner, faSpinner, faUserCircle, faCog } from '@fortawesome/free-solid-svg-icons';
 
 import Translate from '../../i18n/components/translate';
 import { useTranslator } from '../../i18n/hooks';

diff --git a/ui/src/app/core/components/Header.test.js b/ui/src/app/core/components/Header.test.js
@@ -9,14 +9,20 @@ jest.mock('../../i18n/hooks', () => ({
 }));
 
 const mockIsAdmin = jest.fn();
+const mockCurrentUser = jest.fn();
+const mockCurrentUserLoading = jest.fn();
 
 jest.mock('../user/UserContext', () => ({
-    useIsAdmin: () => mockIsAdmin()
+    useIsAdmin: () => mockIsAdmin(),
+    useCurrentUser: () => mockCurrentUser(),
+    useCurrentUserLoading: () => mockCurrentUserLoading()
 }));
 
 describe('header for admins', () => {
     beforeEach(() => {
         mockIsAdmin.mockReturnValue(true);
+        mockCurrentUser.mockReturnValue({ username: 'foo', groupId: 'bar' });
+        mockCurrentUserLoading.mockReturnValue(false);
     });
 
     it('should display logo and navigation', () => {