From 4e2acb4ecc6ad700e6cf79ac957f849aa4dba9a8 Mon Sep 17 00:00:00 2001
From: Jacob Lowe <jalowe13@gmail.com>
Date: Thu, 21 Nov 2024 14:41:15 -0600
Subject: [PATCH 1/7] Adding error messages to upload modal ui

---
 .../DataFilesUploadModalListingTable.jsx      |  8 ++++-
 .../components/Submissions/Submissions.jsx    | 36 ++++++++++++++-----
 client/src/components/Workbench/Workbench.jsx |  3 +-
 .../src/redux/reducers/datafiles.reducers.js  | 10 ++++++
 client/src/redux/sagas/datafiles.sagas.js     | 25 +++++++++++++
 server/portal/settings/settings_default.py    |  2 +-
 6 files changed, 73 insertions(+), 11 deletions(-)

diff --git a/client/src/components/DataFiles/DataFilesModals/DataFilesUploadModalListing/DataFilesUploadModalListingTable.jsx b/client/src/components/DataFiles/DataFilesModals/DataFilesUploadModalListing/DataFilesUploadModalListingTable.jsx
index 4506e2bfd..01126b3e7 100644
--- a/client/src/components/DataFiles/DataFilesModals/DataFilesUploadModalListing/DataFilesUploadModalListingTable.jsx
+++ b/client/src/components/DataFiles/DataFilesModals/DataFilesUploadModalListing/DataFilesUploadModalListingTable.jsx
@@ -5,11 +5,13 @@ import { LoadingSpinner, InlineMessage, Button } from '_common';
 import { FileLengthCell } from '../../DataFilesListing/DataFilesListingCells';
 import { useUpload } from 'hooks/datafiles/mutations';
 import styles from './DataFilesUploadModalListingTable.module.scss';
+import { useSelector } from 'react-redux';
 
 const DataFilesUploadStatus = ({ i, removeCallback, rejectedFiles }) => {
   if (rejectedFiles.filter((f) => f.id === i).length > 0) {
     return <InlineMessage type="error">Exceeds File Size Limit</InlineMessage>;
   }
+  const errorMessage = useSelector((state) => state.files.error.message);
   const status = useUpload().status[i];
   switch (status) {
     case 'UPLOADING':
@@ -17,7 +19,11 @@ const DataFilesUploadStatus = ({ i, removeCallback, rejectedFiles }) => {
     case 'SUCCESS':
       return <span className="badge badge-success">SUCCESS</span>;
     case 'ERROR':
-      return <InlineMessage type="error">Upload Failed</InlineMessage>;
+      return (
+        <InlineMessage type="error">
+          Upload Failed: {errorMessage}
+        </InlineMessage>
+      );
     default:
       return (
         <Button type="link" onClick={() => removeCallback(i)}>
diff --git a/client/src/components/Submissions/Submissions.jsx b/client/src/components/Submissions/Submissions.jsx
index 5a2dedb06..0a1c8abb4 100644
--- a/client/src/components/Submissions/Submissions.jsx
+++ b/client/src/components/Submissions/Submissions.jsx
@@ -19,7 +19,8 @@ export const SubmissionsUpload = () => {
   };
 
   const { data: allSystems } = useSystems();
-  const submissionSystem = allSystems.find((s) => s.type === 'submission');
+  console.log('Systems are', allSystems);
+  let submissionSystem = allSystems.find((s) => s.type === 'submission');
   const uploadPath = '';
 
   const { status, upload } = useUpload();
@@ -30,13 +31,26 @@ export const SubmissionsUpload = () => {
     const filteredFiles = uploadedFiles.filter(
       (f) => status[f.id] !== 'SUCCESS' && !rejectedFiles.includes(f)
     );
-    filteredFiles.length > 0 &&
-      upload({
+    console.log('Trying to upload with');
+    console.log('Path', uploadPath);
+    console.log('FilteredFiles', filteredFiles);
+
+    submissionSystem = allSystems.find((s) => s.name === 'My Data (Work)');
+
+    if (!submissionSystem || !submissionSystem.system) {
+      const msg = "System 'submission' does not exist in submission systems";
+      throw new Error(msg, submissionSystem);
+    }
+    console.log('Submission System', submissionSystem);
+    if (filteredFiles.length > 0) {
+      let result = upload({
         system: submissionSystem.system,
         path: uploadPath,
         files: filteredFiles,
         reloadCallback,
       });
+      console.log('RESULT', result);
+    }
   };
 
   const dropZoneDisabled = uploadedFiles.length > 0;
@@ -124,15 +138,20 @@ export const SubmissionsUpload = () => {
 
 const Submissions = () => {
   const getSubmitterRole = async () => {
-    const response = await fetchUtil({
-      url: '/submissions/check-submitter-role/',
-    });
-    return response;
+    // let response = await fetchUtil({
+    //   url: '/submissions/check-submitter-role/',
+    // });
+    // Override for now with fake data
+    const fakeResponse = {
+      is_submitter: true,
+      isLoading: false,
+    };
+    return fakeResponse;
   };
 
   const useSubmitterRole = () => {
     const query = useQuery({
-      queryKey: 'submitter-role',
+      queryKey: ['submitter-role'],
       queryFn: getSubmitterRole,
     });
     return query;
@@ -140,6 +159,7 @@ const Submissions = () => {
 
   const { data, isLoading } = useSubmitterRole();
 
+  console.log('The data is ', data);
   const is_submitter = data?.is_submitter;
 
   const Unauthorized = () => (
diff --git a/client/src/components/Workbench/Workbench.jsx b/client/src/components/Workbench/Workbench.jsx
index f71055a1a..9e8151979 100644
--- a/client/src/components/Workbench/Workbench.jsx
+++ b/client/src/components/Workbench/Workbench.jsx
@@ -75,7 +75,8 @@ function Workbench() {
       dispatch({ type: 'PROJECTS_GET_LISTING' });
     }
   }, [setupComplete]);
-
+  console.log('Submissions', showSubmissions);
+  console.log('Current path:', path, ROUTES.SUBMISSIONS);
   return (
     <div className="workbench-wrapper">
       <NotificationToast />
diff --git a/client/src/redux/reducers/datafiles.reducers.js b/client/src/redux/reducers/datafiles.reducers.js
index c5ea8e8cb..e0043841a 100644
--- a/client/src/redux/reducers/datafiles.reducers.js
+++ b/client/src/redux/reducers/datafiles.reducers.js
@@ -122,6 +122,7 @@ export const initialFilesState = {
   error: {
     FilesListing: false,
     modal: false,
+    message: '',
   },
   listing: {
     FilesListing: [],
@@ -331,6 +332,15 @@ export function files(state = initialFilesState, action) {
           [action.payload.section]: setValue,
         },
       };
+    case 'DATA_FILES_SET_ERROR':
+      console.log('Reducer for setting the error');
+      return {
+        ...state,
+        error: {
+          ...state.error,
+          message: action.payload.message,
+        },
+      };
     case 'DATA_FILES_SET_LOADING':
       return {
         ...state,
diff --git a/client/src/redux/sagas/datafiles.sagas.js b/client/src/redux/sagas/datafiles.sagas.js
index 18b5fb982..d832bb5f1 100644
--- a/client/src/redux/sagas/datafiles.sagas.js
+++ b/client/src/redux/sagas/datafiles.sagas.js
@@ -492,6 +492,20 @@ export async function uploadFileUtil(api, scheme, system, path, file) {
     body: formData,
   });
   if (!request.ok) {
+    // Error Information is here
+    // 403, 404, Inline and UI
+    // Tapis Errors, Inline
+    /*
+    switch (code) {
+      case 400:
+        if (ClientTapisMessage) {
+          return 'themessage';
+        }
+        // Return client side message
+        return message;
+    }
+    */
+    console.log(request);
     throw new Error(request.status);
   }
   return request;
@@ -533,6 +547,10 @@ export function* uploadFiles(action) {
 }
 
 export function* uploadFile(api, scheme, system, path, file, index) {
+  console.log('Need to upload at ');
+  console.log('System', system);
+  console.log('Path', path);
+  console.log('File', file);
   yield put({
     type: 'DATA_FILES_SET_OPERATION_STATUS_BY_KEY',
     payload: { status: 'UPLOADING', key: index, operation: 'upload' },
@@ -544,10 +562,17 @@ export function* uploadFile(api, scheme, system, path, file, index) {
       payload: { status: 'SUCCESS', key: index, operation: 'upload' },
     });
   } catch (e) {
+    console.log('Found an error of', e);
     yield put({
       type: 'DATA_FILES_SET_OPERATION_STATUS_BY_KEY',
       payload: { status: 'ERROR', key: index, operation: 'upload' },
     });
+    // Add description of error to the state with some kind of put to a reducer
+
+    yield put({
+      type: 'DATA_FILES_SET_ERROR',
+      payload: { message: 'Error Right here' },
+    });
     return 'ERR';
   }
   return 'SUCCESS';
diff --git a/server/portal/settings/settings_default.py b/server/portal/settings/settings_default.py
index 421d62e19..e5ad93be0 100644
--- a/server/portal/settings/settings_default.py
+++ b/server/portal/settings/settings_default.py
@@ -227,7 +227,7 @@
     "makePublic": True,
     "hideApps": False,
     "hideDataFiles": False,
-    "showSubmissions": False,
+    "showSubmissions": True,
     "hideAllocations": False,
     "hideManageAccount": False,
     "hideSystemStatus": False,

From fae17f104a14e482cef2f86cfb1103a47c472b37 Mon Sep 17 00:00:00 2001
From: Jacob Lowe <jalowe13@gmail.com>
Date: Fri, 22 Nov 2024 15:11:14 -0600
Subject: [PATCH 2/7] response text for 403

---
 client/src/redux/sagas/datafiles.sagas.js | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/client/src/redux/sagas/datafiles.sagas.js b/client/src/redux/sagas/datafiles.sagas.js
index d832bb5f1..f5dda3996 100644
--- a/client/src/redux/sagas/datafiles.sagas.js
+++ b/client/src/redux/sagas/datafiles.sagas.js
@@ -492,21 +492,10 @@ export async function uploadFileUtil(api, scheme, system, path, file) {
     body: formData,
   });
   if (!request.ok) {
-    // Error Information is here
-    // 403, 404, Inline and UI
-    // Tapis Errors, Inline
-    /*
-    switch (code) {
-      case 400:
-        if (ClientTapisMessage) {
-          return 'themessage';
-        }
-        // Return client side message
-        return message;
+    if (request.status === 403) {
+      const responseText = await request.text();
+      throw new Error(responseText);
     }
-    */
-    console.log(request);
-    throw new Error(request.status);
   }
   return request;
 }
@@ -571,7 +560,7 @@ export function* uploadFile(api, scheme, system, path, file, index) {
 
     yield put({
       type: 'DATA_FILES_SET_ERROR',
-      payload: { message: 'Error Right here' },
+      payload: { message: e.toString() },
     });
     return 'ERR';
   }

From cb765f52b8da2706009dae5009a73757d8b1122f Mon Sep 17 00:00:00 2001
From: Jacob Lowe <jalowe13@gmail.com>
Date: Fri, 22 Nov 2024 15:36:31 -0600
Subject: [PATCH 3/7] remove logs and testing code

---
 .../components/Submissions/Submissions.jsx    | 33 ++++---------------
 client/src/components/Workbench/Workbench.jsx |  2 --
 client/src/redux/sagas/datafiles.sagas.js     |  7 ----
 server/portal/settings/settings_default.py    |  2 +-
 4 files changed, 8 insertions(+), 36 deletions(-)

diff --git a/client/src/components/Submissions/Submissions.jsx b/client/src/components/Submissions/Submissions.jsx
index 0a1c8abb4..f74c0bef5 100644
--- a/client/src/components/Submissions/Submissions.jsx
+++ b/client/src/components/Submissions/Submissions.jsx
@@ -19,8 +19,8 @@ export const SubmissionsUpload = () => {
   };
 
   const { data: allSystems } = useSystems();
-  console.log('Systems are', allSystems);
   let submissionSystem = allSystems.find((s) => s.type === 'submission');
+  submissionSystem = allSystems.find((s) => s.name === 'My Data (Work)');
   const uploadPath = '';
 
   const { status, upload } = useUpload();
@@ -31,26 +31,13 @@ export const SubmissionsUpload = () => {
     const filteredFiles = uploadedFiles.filter(
       (f) => status[f.id] !== 'SUCCESS' && !rejectedFiles.includes(f)
     );
-    console.log('Trying to upload with');
-    console.log('Path', uploadPath);
-    console.log('FilteredFiles', filteredFiles);
-
-    submissionSystem = allSystems.find((s) => s.name === 'My Data (Work)');
-
-    if (!submissionSystem || !submissionSystem.system) {
-      const msg = "System 'submission' does not exist in submission systems";
-      throw new Error(msg, submissionSystem);
-    }
-    console.log('Submission System', submissionSystem);
-    if (filteredFiles.length > 0) {
-      let result = upload({
+    filteredFiles.length > 0 &&
+      upload({
         system: submissionSystem.system,
         path: uploadPath,
         files: filteredFiles,
         reloadCallback,
       });
-      console.log('RESULT', result);
-    }
   };
 
   const dropZoneDisabled = uploadedFiles.length > 0;
@@ -138,15 +125,10 @@ export const SubmissionsUpload = () => {
 
 const Submissions = () => {
   const getSubmitterRole = async () => {
-    // let response = await fetchUtil({
-    //   url: '/submissions/check-submitter-role/',
-    // });
-    // Override for now with fake data
-    const fakeResponse = {
-      is_submitter: true,
-      isLoading: false,
-    };
-    return fakeResponse;
+    let response = await fetchUtil({
+      url: '/submissions/check-submitter-role/',
+    });
+    return response;
   };
 
   const useSubmitterRole = () => {
@@ -159,7 +141,6 @@ const Submissions = () => {
 
   const { data, isLoading } = useSubmitterRole();
 
-  console.log('The data is ', data);
   const is_submitter = data?.is_submitter;
 
   const Unauthorized = () => (
diff --git a/client/src/components/Workbench/Workbench.jsx b/client/src/components/Workbench/Workbench.jsx
index 9e8151979..daedc35e7 100644
--- a/client/src/components/Workbench/Workbench.jsx
+++ b/client/src/components/Workbench/Workbench.jsx
@@ -75,8 +75,6 @@ function Workbench() {
       dispatch({ type: 'PROJECTS_GET_LISTING' });
     }
   }, [setupComplete]);
-  console.log('Submissions', showSubmissions);
-  console.log('Current path:', path, ROUTES.SUBMISSIONS);
   return (
     <div className="workbench-wrapper">
       <NotificationToast />
diff --git a/client/src/redux/sagas/datafiles.sagas.js b/client/src/redux/sagas/datafiles.sagas.js
index f5dda3996..5d983dcec 100644
--- a/client/src/redux/sagas/datafiles.sagas.js
+++ b/client/src/redux/sagas/datafiles.sagas.js
@@ -536,10 +536,6 @@ export function* uploadFiles(action) {
 }
 
 export function* uploadFile(api, scheme, system, path, file, index) {
-  console.log('Need to upload at ');
-  console.log('System', system);
-  console.log('Path', path);
-  console.log('File', file);
   yield put({
     type: 'DATA_FILES_SET_OPERATION_STATUS_BY_KEY',
     payload: { status: 'UPLOADING', key: index, operation: 'upload' },
@@ -551,13 +547,10 @@ export function* uploadFile(api, scheme, system, path, file, index) {
       payload: { status: 'SUCCESS', key: index, operation: 'upload' },
     });
   } catch (e) {
-    console.log('Found an error of', e);
     yield put({
       type: 'DATA_FILES_SET_OPERATION_STATUS_BY_KEY',
       payload: { status: 'ERROR', key: index, operation: 'upload' },
     });
-    // Add description of error to the state with some kind of put to a reducer
-
     yield put({
       type: 'DATA_FILES_SET_ERROR',
       payload: { message: e.toString() },
diff --git a/server/portal/settings/settings_default.py b/server/portal/settings/settings_default.py
index e5ad93be0..421d62e19 100644
--- a/server/portal/settings/settings_default.py
+++ b/server/portal/settings/settings_default.py
@@ -227,7 +227,7 @@
     "makePublic": True,
     "hideApps": False,
     "hideDataFiles": False,
-    "showSubmissions": True,
+    "showSubmissions": False,
     "hideAllocations": False,
     "hideManageAccount": False,
     "hideSystemStatus": False,

From 4129c409bb17924160d32d2c2fe0fa7fe7aa5ed9 Mon Sep 17 00:00:00 2001
From: Jacob Lowe <jalowe13@gmail.com>
Date: Fri, 22 Nov 2024 15:43:44 -0600
Subject: [PATCH 4/7] additional testing reversal

---
 client/src/components/Submissions/Submissions.jsx | 5 ++---
 client/src/components/Workbench/Workbench.jsx     | 1 +
 client/src/redux/sagas/datafiles.sagas.js         | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/client/src/components/Submissions/Submissions.jsx b/client/src/components/Submissions/Submissions.jsx
index f74c0bef5..59eca7300 100644
--- a/client/src/components/Submissions/Submissions.jsx
+++ b/client/src/components/Submissions/Submissions.jsx
@@ -19,8 +19,7 @@ export const SubmissionsUpload = () => {
   };
 
   const { data: allSystems } = useSystems();
-  let submissionSystem = allSystems.find((s) => s.type === 'submission');
-  submissionSystem = allSystems.find((s) => s.name === 'My Data (Work)');
+  const submissionSystem = allSystems.find((s) => s.type === 'submission');
   const uploadPath = '';
 
   const { status, upload } = useUpload();
@@ -125,7 +124,7 @@ export const SubmissionsUpload = () => {
 
 const Submissions = () => {
   const getSubmitterRole = async () => {
-    let response = await fetchUtil({
+    const response = await fetchUtil({
       url: '/submissions/check-submitter-role/',
     });
     return response;
diff --git a/client/src/components/Workbench/Workbench.jsx b/client/src/components/Workbench/Workbench.jsx
index daedc35e7..f71055a1a 100644
--- a/client/src/components/Workbench/Workbench.jsx
+++ b/client/src/components/Workbench/Workbench.jsx
@@ -75,6 +75,7 @@ function Workbench() {
       dispatch({ type: 'PROJECTS_GET_LISTING' });
     }
   }, [setupComplete]);
+
   return (
     <div className="workbench-wrapper">
       <NotificationToast />
diff --git a/client/src/redux/sagas/datafiles.sagas.js b/client/src/redux/sagas/datafiles.sagas.js
index 5d983dcec..804e911b5 100644
--- a/client/src/redux/sagas/datafiles.sagas.js
+++ b/client/src/redux/sagas/datafiles.sagas.js
@@ -496,6 +496,7 @@ export async function uploadFileUtil(api, scheme, system, path, file) {
       const responseText = await request.text();
       throw new Error(responseText);
     }
+    throw new Error(request.status);
   }
   return request;
 }

From 3e5736a8f4a167b5b42294da2f22f78e7a144fa5 Mon Sep 17 00:00:00 2001
From: Jacob Lowe <jalowe13@gmail.com>
Date: Fri, 22 Nov 2024 15:50:53 -0600
Subject: [PATCH 5/7] console log removal

---
 client/src/redux/reducers/datafiles.reducers.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/src/redux/reducers/datafiles.reducers.js b/client/src/redux/reducers/datafiles.reducers.js
index e0043841a..2ccbf59a5 100644
--- a/client/src/redux/reducers/datafiles.reducers.js
+++ b/client/src/redux/reducers/datafiles.reducers.js
@@ -333,7 +333,6 @@ export function files(state = initialFilesState, action) {
         },
       };
     case 'DATA_FILES_SET_ERROR':
-      console.log('Reducer for setting the error');
       return {
         ...state,
         error: {

From 7d07fc60fe579bd23966fa1ee73845c9f7a61ff2 Mon Sep 17 00:00:00 2001
From: Jacob Lowe <jalowe13@gmail.com>
Date: Mon, 25 Nov 2024 09:41:30 -0600
Subject: [PATCH 6/7] 500 errors for testing

---
 client/src/redux/sagas/datafiles.sagas.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/redux/sagas/datafiles.sagas.js b/client/src/redux/sagas/datafiles.sagas.js
index 804e911b5..c695f78d3 100644
--- a/client/src/redux/sagas/datafiles.sagas.js
+++ b/client/src/redux/sagas/datafiles.sagas.js
@@ -492,7 +492,7 @@ export async function uploadFileUtil(api, scheme, system, path, file) {
     body: formData,
   });
   if (!request.ok) {
-    if (request.status === 403) {
+    if (request.status === 403 || request.status === 500) {
       const responseText = await request.text();
       throw new Error(responseText);
     }

From 90aabb2ba58480f6e33ad3ce4a49c30e583ae07f Mon Sep 17 00:00:00 2001
From: Jacob Lowe <jalowe13@gmail.com>
Date: Wed, 27 Nov 2024 12:26:35 -0600
Subject: [PATCH 7/7] try catch for http and network errors

---
 client/src/redux/sagas/datafiles.sagas.js | 27 +++++++++++++----------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/client/src/redux/sagas/datafiles.sagas.js b/client/src/redux/sagas/datafiles.sagas.js
index c695f78d3..8985c6b71 100644
--- a/client/src/redux/sagas/datafiles.sagas.js
+++ b/client/src/redux/sagas/datafiles.sagas.js
@@ -485,20 +485,23 @@ export async function uploadFileUtil(api, scheme, system, path, file) {
     `/api/datafiles/${api}/upload/${scheme}/${system}/${apiPath}/`
   );
 
-  const request = await fetch(url, {
-    method: 'POST',
-    headers: { 'X-CSRFToken': Cookies.get('csrftoken') },
-    credentials: 'same-origin',
-    body: formData,
-  });
-  if (!request.ok) {
-    if (request.status === 403 || request.status === 500) {
-      const responseText = await request.text();
-      throw new Error(responseText);
+  try {
+    const request = await fetch(url, {
+      method: 'POST',
+      headers: { 'X-CSRFToken': Cookies.get('csrftoken') },
+      credentials: 'same-origin',
+      body: formData,
+    });
+    if (!request.ok) {
+      throw new Error(`HTTP error: ${request.status}`);
     }
-    throw new Error(request.status);
+    return request;
+  } catch (error) {
+    if (error instanceof TypeError) {
+      throw new Error('Network error: The file upload was blocked.');
+    }
+    throw error;
   }
-  return request;
 }
 
 export function* watchUpload() {