Merge branch 'main' into fix/impersonate-url

TACC · Nov 20, 2023 · a7cf505 · a7cf505
2 parents d02f5ac + a181f6a
commit a7cf505
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 11 deletions.
diff --git a/client/src/components/Allocations/tests/AllocationsCells.test.js b/client/src/components/Allocations/tests/AllocationsCells.test.js
@@ -67,11 +67,6 @@ const mockInitialState = {
       results: {},
     },
   },
-  profile: {
-    data: {
-      demographics: {},
-    },
-  },
 };
 const Wrapper = ({ store, children }) => (
   <Provider store={store}>{children}</Provider>

diff --git a/client/src/components/Allocations/tests/AllocationsTables.test.js b/client/src/components/Allocations/tests/AllocationsTables.test.js
@@ -27,7 +27,6 @@ describe('Allocations Table', () => {
       <Provider
         store={mockStore({
           allocations: mockInitialState,
-          profile: { data: { demographics: { firstName: '', lastName: '' } } },
         })}
       >
         <MemoryRouter initialEntries={['/workbench/allocations']}>
@@ -56,7 +55,6 @@ describe('Allocations Table', () => {
         ...mockInitialState,
         errors: { listing: new Error('PC Load Letter') },
       },
-      profile: { data: { demographics: { firstName: '', lastName: '' } } },
     });
     rerender(
       <Provider store={storeWithError}>

diff --git a/client/src/components/DataFiles/DataFilesModals/DataFilesPreviewModal.jsx b/client/src/components/DataFiles/DataFilesModals/DataFilesPreviewModal.jsx
@@ -116,7 +116,11 @@ const DataFilesPreviewModal = () => {
             <SectionMessage type="warning" className={styles['error-message']}>
               {error}
             </SectionMessage>
-            <Button className={styles.button} href={href} target="_blank">
+            <Button
+              className={styles.button}
+              href={href}
+              target={fileType === 'other' ? '' : '_blank'}
+            >
               <i className="icon-exit" />
               <span className="toolbar-button-text">Preview File</span>
             </Button>

diff --git a/client/src/components/Workbench/AppRouter.jsx b/client/src/components/Workbench/AppRouter.jsx
@@ -19,7 +19,6 @@ function AppRouter() {
 
   useEffect(() => {
     dispatch({ type: 'FETCH_AUTHENTICATED_USER' });
-    dispatch({ type: 'GET_PROFILE_DATA' });
     dispatch({ type: 'FETCH_WORKBENCH' });
     fetchSystems();
   }, []);

diff --git a/client/src/components/Workbench/index.test.js b/client/src/components/Workbench/index.test.js
@@ -22,7 +22,6 @@ describe('AppRouter', () => {
     renderComponent(<AppRouter />, store);
     expect(store.getActions()).toEqual([
       { type: 'FETCH_AUTHENTICATED_USER' },
-      { type: 'GET_PROFILE_DATA' },
       { type: 'FETCH_WORKBENCH' },
       { type: 'FETCH_SYSTEMS' },
       { type: 'FETCH_INTRO' },

diff --git a/client/src/styles/components/dropdown-menu.css b/client/src/styles/components/dropdown-menu.css
@@ -13,7 +13,8 @@ Styleguide Components.Dropdown
     border-radius: 0;
     margin-top: 11px;
     padding: 0;
-    width: 200px;
+    min-width: 200px;
+    width: auto;
     vertical-align: top;
   }
   .dropdown-menu::before,