Merge pull request #77 from CBIIT/dev-1.0.0

Dev 1.0.0
CBIIT · Sep 28, 2022 · 2485e64 · 2485e64
2 parents 3643200 + 4f81d93
commit 2485e64
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/components/Footer/FooterView.js b/src/components/Footer/FooterView.js
@@ -31,7 +31,7 @@ const INSFooter = () => {
       <Footer classes={styles} data={footerUpdatedData} />
       <div>
         <div className="beVersion">
-          Site Data Update (Projects, Publications, Patents): 08/01/2022
+          Site Data Update (Projects, Publications, Patents): 09/26/2022
           <br />
           <br />
           Site Data Update (Datasets, Clinical Trials): 05/26/2022

diff --git a/src/components/serverPaginatedTable/serverPaginatedTable.js b/src/components/serverPaginatedTable/serverPaginatedTable.js
@@ -405,9 +405,11 @@ class ServerPaginatedTableView extends React.Component {
           open={(isLoading || this.props.isLoading) && data !== 'undefined'}
           className={this.props.classes.backdrop}
         >
-          <CircularProgress />
+          <div style={{ width: '1535px' }}>
+            <CircularProgress style={{ height: '60px' }} />
+          </div>
         </Backdrop>
-        {isLoading || this.props.isLoading || data === 'undefined' ? <CircularProgress /> : (
+        {this.props.isLoading || data === 'undefined' || formatedUpdatedData === 'undefined' ? <div style={{ width: '1535px' }}><CircularProgress style={{ height: '60px' }} /></div> : (
           <CustomDataTable
             data={formatedUpdatedData}
             columns={columns}

diff --git a/src/pages/programDetail/programDetailView.js b/src/pages/programDetail/programDetailView.js
@@ -40,7 +40,7 @@ const ProgramView = ({ classes, data, theme }) => {
       datafield: 'programs',
       groupName: 'Program',
       isChecked: true,
-      name: programData.program_acronym,
+      name: programData.program_id,
       section: 'Filter By Cases',
     }]);
   };