DT-969: Show server errors when creating a draft DAR (#2714)

DataBiosphere · Nov 6, 2024 · 3711e14 · 3711e14
1 parent 2bada7b
commit 3711e14
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 14 deletions.
diff --git a/src/components/data_search/DatasetSearchTable.jsx b/src/components/data_search/DatasetSearchTable.jsx
@@ -187,8 +187,18 @@ export const DatasetSearchTable = (props) => {
     doSearch();
   };
   const applyForAccess = async () => {
-    const darDraft = await DAR.postDarDraft({ datasetId: selected });
-    history.push(`/dar_application/${darDraft.referenceId}`);
+    try {
+      const draftResponse = await DAR.postDarDraft({ datasetId: selected  });
+      if (draftResponse.referenceId) {
+        history.push(`/dar_application/${draftResponse.referenceId}`);
+      } else if (draftResponse.message) {
+        Notifications.showError({ text: draftResponse.message + ' Please contact customer support for help.' });
+      } else {
+        Notifications.showError({ text: 'Error: Unable to create a Draft Data Access Request' });
+      }
+    } catch (error) {
+      Notifications.showError({ text: 'Error: Unable to create a Draft Data Access Request' });
+    }
   };
 
   useEffect(() => {
@@ -207,11 +217,11 @@ export const DatasetSearchTable = (props) => {
       <Box sx={{ display: 'flex', flexDirection: 'column' }}>
         <TableHeaderSection icon={icon} title={title} description="Search, filter, and select datasets, then click 'Apply for Access' to request access" />
         <Box sx={{paddingTop: '2em', paddingLeft: '2em'}}>
-          <div className="right-header-section" style={Styles.RIGHT_HEADER_SECTION}>
+          <div className='right-header-section' style={Styles.RIGHT_HEADER_SECTION}>
             <input
-              data-cy="search-bar"
-              type="text"
-              placeholder="Enter search terms"
+              data-cy='search-bar'
+              type='text'
+              placeholder='Enter search terms'
               style={{
                 width: '100%',
                 border: '1px solid #cecece',
@@ -227,7 +237,7 @@ export const DatasetSearchTable = (props) => {
             />
             <div/>
             <Box sx={{ display: 'flex', flexDirection: 'row', justifyContent: 'flex-end', paddingLeft: '1em', height: '4rem' }}>
-              <Button variant="contained" onClick={() => {filterHandler(null, datasets, 'search', '')}} sx={{ width: '100px' }}>
+              <Button variant='contained' onClick={() => {filterHandler(null, datasets, 'search', '');}} sx={{ width: '100px' }}>
                 Clear Search
               </Button>
             </Box>
@@ -274,7 +284,7 @@ export const DatasetSearchTable = (props) => {
         <Box sx={{ display: 'flex', flexDirection: 'row', justifyContent: 'flex-end', padding: '2em 4em' }}>
           {
             !isEmpty(datasets) &&
-          <Button variant="contained" onClick={applyForAccess} sx={{ transform: 'scale(1.5)' }} >
+          <Button variant='contained' onClick={applyForAccess} sx={{ transform: 'scale(1.5)' }} >
             Apply for Access
           </Button>
           }

diff --git a/src/libs/ajax/DAR.js b/src/libs/ajax/DAR.js
@@ -33,7 +33,7 @@ export const DAR = {
     const url = DAAUtils.isEnabled() ?
       `${await getApiUrl()}/api/dar/v3/draft` :
       `${await getApiUrl()}/api/dar/v2/draft`;
-    const res = await axios.post(url, dar, Config.authOpts());
+    const res = await axios.post(url, dar, Object.assign({}, Config.authOpts(), {validateStatus: () => true}));
     return res.data;
   },
 

diff --git a/src/pages/DatasetStatistics.jsx b/src/pages/DatasetStatistics.jsx
@@ -20,8 +20,18 @@ export default function DatasetStatistics(props) {
   const [isLoading, setIsLoading] = useState(true);
 
   const applyForAccess = async () => {
-    const darDraft = await DAR.postDarDraft({ datasetId: [datasetId]  });
-    history.push(`/dar_application/${darDraft.referenceId}`);
+    try {
+      const draftResponse = await DAR.postDarDraft({ datasetId: [datasetId]  });
+      if (draftResponse.referenceId) {
+        history.push(`/dar_application/${draftResponse.referenceId}`);
+      } else if (draftResponse.message) {
+        Notifications.showError({ text: draftResponse.message + ' Please contact customer support for help.' });
+      } else {
+        Notifications.showError({ text: 'Error: Unable to create a Draft Data Access Request' });
+      }
+    } catch (error) {
+      Notifications.showError({ text: 'Error: Unable to create a Draft Data Access Request' });
+    }
   };
 
   useEffect(() => {
@@ -69,7 +79,7 @@ export default function DatasetStatistics(props) {
               </div>
             </div>
             <div style={{ paddingTop: '20px', paddingLeft: '30px' }}>
-              <Button variant="contained" onClick={applyForAccess} sx={{ transform: 'scale(1.5)' }} >
+              <Button variant='contained' onClick={applyForAccess} sx={{ transform: 'scale(1.5)' }} >
                 Apply for Access
               </Button>
             </div>
@@ -109,8 +119,8 @@ export default function DatasetStatistics(props) {
             <div style={Styles.READ_MORE} id={`${dar.darCode}`} key={`${dar.darCode}`}>
               <ReadMore
                 props={props}
-                readLessText="Show less"
-                readMoreText="Show More"
+                readLessText='Show less'
+                readMoreText='Show More'
                 readStyle={{ fontWeight: 500, margin: '20px', height: 0 }}
                 content={[
                   <div key='dar' style={{ display: 'flex' }}>