Merge pull request #138 from CBIIT/dev-1.1.0

Dev 1.1.0
CBIIT · Dec 23, 2022 · cb4c8a9 · cb4c8a9
2 parents 26d9769 + c47f005
commit cb4c8a9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/public/Release_v1.1.0.pdf b/public/Release_v1.1.0.pdf
diff --git a/src/pages/caseDetail/caseDetailController.js b/src/pages/caseDetail/caseDetailController.js
@@ -2,7 +2,7 @@ import React, { useEffect } from 'react';
 import { useSelector } from 'react-redux';
 import CircularProgress from '@material-ui/core/CircularProgress';
 import CaseDetailView from './caseDetailView';
-import { Typography } from '../../components/Wrappers/Wrappers';
+import Error from '../error/Error';
 import {
   dataRoot, caseIDField,
 } from '../../bento/caseDetailData';
@@ -33,9 +33,7 @@ const CaseDetailContainer = ({ match }) => {
   if (loading) return <CircularProgress />;
   if (error || !data || data[dataRoot][caseIDField] !== match.params.id) {
     return (
-      <Typography variant="h5" color="error" size="sm">
-        {error ? `An error has occurred in loading stats component: ${error}` : 'Recieved wrong data'}
-      </Typography>
+      <Error />
     );
   }
 

diff --git a/src/pages/programDetail/programDetailController.js b/src/pages/programDetail/programDetailController.js
@@ -4,7 +4,7 @@ import _ from 'lodash';
 import { useQuery } from '@apollo/client';
 import CircularProgress from '@material-ui/core/CircularProgress';
 import ProgramView from './programDetailView';
-import { Typography } from '../../components/Wrappers/Wrappers';
+import Error from '../error/Error';
 import { GET_PROGRAM_DETAIL_DATA_QUERY } from '../../bento/programDetailData';
 import {
   GET_PROJECTS_OVERVIEW_QUERY,
@@ -56,11 +56,9 @@ const ProgramDetailContainer = ({ match }) => {
   }
 
   if (programDetailsLoading || projectOverviewLoading) return <CircularProgress />;
-  if (programDetailsError || projectOverviewError || !programDetailsData || !projectOverviewData || programDetailsData.programDetail.program_id !== match.params.id) {
+  if (programDetailsError || projectOverviewError || !programDetailsData || !projectOverviewData || !programDetailsData.programDetail || programDetailsData.programDetail.program_id !== match.params.id) {
     return (
-      <Typography variant="headline" color="error" size="sm">
-        {programDetailsError ? `An error has occurred in loading stats component: ${programDetailsError}` : projectOverviewError ? `An error has occurred in loading stats component: ${projectOverviewError}` : 'Recieved wrong data'}
-      </Typography>
+      <Error />
     );
   }
   return <ProgramView data={[transformedData, projectOverviewData]} />;