Merge branch 'main' into dependabot/pip/server/paramiko-3.4.0

TACC · Dec 20, 2023 · ce70eaf · ce70eaf
2 parents 84230bb + df09006
commit ce70eaf
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/client/src/components/Applications/AppForm/AppForm.jsx b/client/src/components/Applications/AppForm/AppForm.jsx
@@ -189,6 +189,7 @@ AppInfo.propTypes = {
 
 export const AppSchemaForm = ({ app }) => {
   const dispatch = useDispatch();
+
   useEffect(() => {
     dispatch({ type: 'GET_SYSTEM_MONITOR' });
   }, [dispatch]);
@@ -387,6 +388,7 @@ export const AppSchemaForm = ({ app }) => {
           </SectionMessage>
         </div>
       )}
+
       {jobSubmission.response && (
         <>
           {jobSubmission.error ? (

diff --git a/client/src/components/DataFiles/DataFilesModals/DataFilesPreviewModal.jsx b/client/src/components/DataFiles/DataFilesModals/DataFilesPreviewModal.jsx
@@ -122,7 +122,7 @@ const DataFilesPreviewModal = () => {
               target={fileType === 'other' ? '' : '_blank'}
             >
               <i className="icon-exit" />
-              <span className="toolbar-button-text">Preview File</span>
+              <span className="toolbar-button-text">Download File</span>
             </Button>
           </div>
         )}

diff --git a/client/src/components/DataFiles/DataFilesModals/tests/DataFilesPreviewModal.test.js b/client/src/components/DataFiles/DataFilesModals/tests/DataFilesPreviewModal.test.js
@@ -69,6 +69,6 @@ describe('Data Files Preview Modal', () => {
     expect(getByText(/File Preview:/)).toBeDefined();
     expect(getByText(/test\.txt/)).toBeDefined();
     expect(getByText('Unable to show preview.')).toBeDefined();
-    expect(getByText(/Preview File/)).toBeDefined();
+    expect(getByText(/Download File/)).toBeDefined();
   });
 });
diff --git a/client/src/redux/sagas/apps.sagas.js b/client/src/redux/sagas/apps.sagas.js
@@ -18,15 +18,7 @@ const getCurrentApp = (state) => state.app;
 
 function* getApp(action) {
   const { appId, appVersion } = action.payload;
-  const currentApp = yield select(getCurrentApp);
 
-  if (
-    currentApp.definition.id === appId &&
-    currentApp.definition.version === appVersion &&
-    !currentApp.systemNeedsKeys
-  ) {
-    return;
-  }
   yield put({ type: 'FLUSH_SUBMIT' });
   yield put({ type: 'GET_APP_START' });
   try {