diff --git a/package-lock.json b/package-lock.json
index 4d5ff30d..6eb15cf2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -75,7 +75,6 @@
"react-swipeable-views": "^0.13.9",
"react-syntax-highlighter": "^10.2.0",
"react-toastify": "^4.5.2",
- "react-use-googlelogin": "^0.12.5",
"react-uuid": "^1.0.2",
"react-vis": "^1.11.7",
"react-zoom-pan-pinch": "^1.4.5",
@@ -28250,14 +28249,6 @@
"typescript": "^3.5.2"
}
},
- "node_modules/react-use-googlelogin": {
- "version": "0.12.5",
- "resolved": "https://registry.npmjs.org/react-use-googlelogin/-/react-use-googlelogin-0.12.5.tgz",
- "integrity": "sha512-30TF9rJyhDx7mO5T+BVChaKxd4xztLMMRCkG2/gdk8o9+JMfipSvBM26OJCDnG7Ug3KxBSNR+9uKgtQ4FCI0fg==",
- "peerDependencies": {
- "react": ">=16.8"
- }
- },
"node_modules/react-uuid": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/react-uuid/-/react-uuid-1.0.2.tgz",
@@ -56113,12 +56104,6 @@
"integrity": "sha512-XL+Rup9Hosxx3Ap9xpyQMbVwuUa4BSqiOjfBb2zDuGs4uv2FesFV+m8Z/huRx2BNptMd9ARPqFuSNA62zhCozg==",
"requires": {}
},
- "react-use-googlelogin": {
- "version": "0.12.5",
- "resolved": "https://registry.npmjs.org/react-use-googlelogin/-/react-use-googlelogin-0.12.5.tgz",
- "integrity": "sha512-30TF9rJyhDx7mO5T+BVChaKxd4xztLMMRCkG2/gdk8o9+JMfipSvBM26OJCDnG7Ug3KxBSNR+9uKgtQ4FCI0fg==",
- "requires": {}
- },
"react-uuid": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/react-uuid/-/react-uuid-1.0.2.tgz",
diff --git a/src/bento/caseDetailData.js b/src/bento/caseDetailData.js
index 38bf3b40..1fb75745 100644
--- a/src/bento/caseDetailData.js
+++ b/src/bento/caseDetailData.js
@@ -242,8 +242,8 @@ export const tabContainers = [
},
},
{
- dataField: 'nih_percentile',
- header: 'NIH Percentile',
+ dataField: 'publish_date',
+ header: 'Publish Date',
sort: 'asc',
display: true,
headerStyles: {
@@ -573,7 +573,6 @@ query publicationOverViewByProject(
publish_date,
citation_count,
relative_citation_ratio,
- nih_percentile,
doi,
}
}
diff --git a/src/bento/dashboardTabData.js b/src/bento/dashboardTabData.js
index 8bdb3aa2..3c42f30a 100644
--- a/src/bento/dashboardTabData.js
+++ b/src/bento/dashboardTabData.js
@@ -263,8 +263,8 @@ export const tabContainers = [
},
},
{
- dataField: 'nih_percentile',
- header: 'NIH Percentile',
+ dataField: 'publish_date',
+ header: 'Publish Date',
sort: 'asc',
display: true,
headerStyles: {
@@ -909,7 +909,6 @@ query publicationOverView(
publish_date,
citation_count,
relative_citation_ratio,
- nih_percentile,
doi,
queried_project_ids
}
diff --git a/src/bento/tableDownloadCSV.js b/src/bento/tableDownloadCSV.js
index f5021a0c..d8eadb24 100644
--- a/src/bento/tableDownloadCSV.js
+++ b/src/bento/tableDownloadCSV.js
@@ -175,7 +175,6 @@ query publicationOverView(
publish_date,
citation_count,
relative_citation_ratio,
- nih_percentile,
doi,
queried_project_ids
}
@@ -190,7 +189,7 @@ export const customPublicationsTabDownloadCSV = {
'authors',
'citation_count',
'relative_citation_ratio',
- 'nih_percentile',
+ 'publish_date',
],
header: [
'PubMed ID',
@@ -199,7 +198,7 @@ export const customPublicationsTabDownloadCSV = {
'Authors',
'Citation Count',
'Relative Citation Ratio',
- 'NIH Percentile',
+ 'Publish Date',
],
query: GET_PUBLICATIONS_TAB,
apiVariable: 'publicationOverView',
@@ -389,7 +388,6 @@ query publicationOverViewByProject(
publish_date,
citation_count,
relative_citation_ratio,
- nih_percentile,
doi,
}
}
@@ -402,7 +400,7 @@ export const customCaseDetailPublicationsTabDownloadCSV = {
'authors',
'citation_count',
'relative_citation_ratio',
- 'nih_percentile',
+ 'publish_date',
],
header: [
'PubMed ID',
@@ -410,7 +408,7 @@ export const customCaseDetailPublicationsTabDownloadCSV = {
'Authors',
'Citation Count',
'Relative Citation Ratio',
- 'NIH Percentile',
+ 'Publish Date',
],
query: GET_CASE_DETAIL_PUBLICATIONS_TAB,
apiVariable: 'publicationOverViewByProject',
diff --git a/src/components/Footer/FooterView.js b/src/components/Footer/FooterView.js
index b70e803b..c21bdf40 100644
--- a/src/components/Footer/FooterView.js
+++ b/src/components/Footer/FooterView.js
@@ -33,6 +33,9 @@ const INSFooter = () => {
+ Software Version: v1.1.0
+
+
Site Data Update (Projects, Publications, Patents): 09/26/2022
diff --git a/src/components/Layout/LayoutView.js b/src/components/Layout/LayoutView.js
index 22864add..c0a8e489 100644
--- a/src/components/Layout/LayoutView.js
+++ b/src/components/Layout/LayoutView.js
@@ -37,7 +37,7 @@ const Layout = ({ classes, isSidebarOpened }) => (
>
-
+
diff --git a/src/components/Tab/Tab.js b/src/components/Tab/Tab.js
index a9d157ea..25a896b5 100644
--- a/src/components/Tab/Tab.js
+++ b/src/components/Tab/Tab.js
@@ -11,7 +11,7 @@ const TabItems = ({
currentTab,
orientation,
}) => {
- function getTabLalbel(title, image, index) {
+ function getTabLabel(title, image, index) {
return (
Promise.resolve();
-}
-
-export function AsyncFetchAllDataForCaseDetailDataTable() {
- return async (dispatch, getState) => Promise.resolve();
-}
-
export function fetchDataForCaseDetailDataTable() {
return (dispatch, getState) => dispatch(readyCaseDetail());
}
diff --git a/src/pages/caseDetail/caseDetailTabController.js b/src/pages/caseDetail/caseDetailTabController.js
index 392aa6de..19d11013 100644
--- a/src/pages/caseDetail/caseDetailTabController.js
+++ b/src/pages/caseDetail/caseDetailTabController.js
@@ -62,7 +62,7 @@ const caseDetailTabController = ({ projectID, classes }) => {
return `${tabIndex[currentTab].primaryColor}`;
}
- function getTabLalbel(title, count) {
+ function getTabLabel(title, count) {
const tabObj = tabIndex[currentTab];
if (!tabObj || !tabObj.title) {
@@ -89,7 +89,7 @@ const caseDetailTabController = ({ projectID, classes }) => {
key={index}
id={tab.id}
label={
- getTabLalbel(tab.title, caseDetailStats[dataRoot][tab.count]
+ getTabLabel(tab.title, caseDetailStats[dataRoot][tab.count]
? caseDetailStats[dataRoot][tab.count] : 0)
}
/>
@@ -102,11 +102,7 @@ const caseDetailTabController = ({ projectID, classes }) => {
options={getOptions(container, classes)}
data={caseDetail[container.dataField] ? caseDetail[container.dataField] : 'undefined'}
customColumn={container}
- buttonText={container.buttonText}
tableID={container.tableID}
- saveButtonDefaultStyle={container.saveButtonDefaultStyle}
- ActiveSaveButtonDefaultStyle={container.ActiveSaveButtonDefaultStyle}
- DeactiveSaveButtonDefaultStyle={container.DeactiveSaveButtonDefaultStyle}
// eslint-disable-next-line jsx-a11y/tabindex-no-positive
tabIndex={container.tabIndex}
externalLinkIcon={externalLinkIcon}
diff --git a/src/pages/caseDetail/caseDetailTabView.js b/src/pages/caseDetail/caseDetailTabView.js
index a0ddd7bd..438944b8 100644
--- a/src/pages/caseDetail/caseDetailTabView.js
+++ b/src/pages/caseDetail/caseDetailTabView.js
@@ -22,7 +22,6 @@ const TabView = ({
classes,
data,
customColumn,
- primaryKeyIndex = 0,
tableID,
externalLinkIcon,
options,
diff --git a/src/pages/caseDetail/caseDetailView.js b/src/pages/caseDetail/caseDetailView.js
index fadbc264..667b3ee6 100644
--- a/src/pages/caseDetail/caseDetailView.js
+++ b/src/pages/caseDetail/caseDetailView.js
@@ -4,7 +4,6 @@ import {
withStyles,
} from '@material-ui/core';
import _ from 'lodash';
-import { useDispatch } from 'react-redux';
import StatsView from '../../components/Stats/StatsView';
import { Typography } from '../../components/Wrappers/Wrappers';
import icon from '../../assets/icons/Cases.Icon.svg';
diff --git a/src/pages/caseDetail/store/caseDetailReducer.js b/src/pages/caseDetail/store/caseDetailReducer.js
index 3de2d6d7..f74b0897 100644
--- a/src/pages/caseDetail/store/caseDetailReducer.js
+++ b/src/pages/caseDetail/store/caseDetailReducer.js
@@ -2,10 +2,6 @@
/* eslint-disable arrow-body-style */
/* eslint-disable react/destructuring-assignment */
import _ from 'lodash';
-import {
- customSort,
- transformAPIDataIntoCheckBoxData,
-} from 'bento-components';
import store from '../../../store';
import client from '../../../utils/graphqlClient';
@@ -17,7 +13,6 @@ import {
GET_DATASETS_OVERVIEW_QUERY,
GET_CLINICAL_TRIALS_OVERVIEW_QUERY,
GET_PATENTS_OVERVIEW_QUERY,
- // caseIDField,
} from '../../../bento/caseDetailData';
const storeKey = 'caseDetailTab';
@@ -153,37 +148,8 @@ export function setCaseDetailTableLoading() {
store.dispatch({ type: 'SET_CASE_DETAIL_TABLE_LOADING' });
}
-/**
- * Reducer for sorting checkboxes.
- *
- * @return distpatcher
- */
-
-export function sortSection(groupName, sortBy) {
- store.dispatch({
- type: 'SORT_SINGLE_GROUP_CHECKBOX',
- payload: {
- groupName,
- sortBy,
- },
- });
-}
-
-export function sortAll() {
- store.dispatch({
- type: 'SORT_ALL_GROUP_CHECKBOX_CASE_DETAIL',
- });
-}
-
export const getCaseDetail = () => getState();
-export function setSearchCriteria(payload) {
- store.dispatch({
- type: 'SET_SEARCH_CRITERIA',
- payload,
- });
-}
-
// reducers
const reducers = {
CASE_DETAIL_TAB_QUERY_ERR: (state, item) => ({
@@ -216,17 +182,11 @@ const reducers = {
},
}
),
- SET_SEARCH_CRITERIA: (state, item) => ({
- ...state,
- searchCriteria: item,
- }),
REQUEST_CASE_DETAIL_TAB: (state) => ({ ...state, isLoading: true }),
- SET_SIDEBAR_LOADING: (state) => ({ ...state, setSideBarLoading: true }),
SET_CASE_DETAIL_TABLE_LOADING: (state) => ({ ...state, isCaseDetailTableLoading: true }),
RECEIVE_CASE_DETAIL_TAB: (state, rawItem) => {
const item = rawItem;
const filter = { project_id: item.data.projectDetail.project_id };
- // fetchDataForCaseDetailTab(tabIndex[0].title, allFilters(), null, null, null, null, null);
return item.data
? {
...state.caseDetail,
@@ -243,76 +203,6 @@ const reducers = {
data: item.data,
} : { ...state };
},
- CLEAR_SECTION_SORT: (state, item) => {
- const { sortByList = {} } = state;
- const { groupName } = item;
- // eslint-disable-next-line
- sortByList[groupName] ? delete sortByList[groupName] : null;
-
- return { ...state, sortByList };
- },
- SET_SAMPLE_SELECTION: (state, item) => (
- {
- ...state,
- dataSampleSelected: item,
- }
- ),
-
- CLEAR_TABLE_SELECTION: (state) => ({
- ...state,
- dataSampleSelected: {
- selectedRowInfo: [],
- selectedRowIndex: [],
- },
- dataFileSelected: {
- selectedRowInfo: [],
- selectedRowIndex: [],
- },
- dataClinicalTrialSelected: {
- selectedRowInfo: [],
- selectedRowIndex: [],
- },
- dataPatentSelected: {
- selectedRowInfo: [],
- selectedRowIndex: [],
- },
- }),
- RESET_ALL: (state) => ({
- ...state,
- autoCompleteSelection: {
- subject_ids: [],
- sample_ids: [],
- file_ids: [],
- },
- bulkUpload: {
- subject_ids: [],
- sample_ids: [],
- file_ids: [],
- },
- allActiveFilters: {},
- }),
- RESET_ALL_EXCEPT_BULK_UPLOAD: (state) => ({
- ...state,
- autoCompleteSelection: {
- subject_ids: [],
- sample_ids: [],
- file_ids: [],
- },
- allActiveFilters: {},
- }),
- ADD_AUTOCOMPLETE_DATA: (state, { type, value }) => ({
- ...state,
- autoCompleteSelection: {
- ...state.autoCompleteSelection,
- [`${type}_ids`]: value,
- },
- }),
- ADD_BULKSEARCHDATA: (state, { type, value }) => ({
- ...state,
- bulkUpload: {
- [`${type}_ids`]: value,
- },
- }),
};
// INJECT-REDUCERS INTO REDUX STORE
diff --git a/src/pages/dashboardTab/components/tabController.js b/src/pages/dashboardTab/components/tabController.js
index 12d6b1f6..2fa6effe 100644
--- a/src/pages/dashboardTab/components/tabController.js
+++ b/src/pages/dashboardTab/components/tabController.js
@@ -98,7 +98,7 @@ const tabController = (classes) => {
return `${tabIndex[currentTab].primaryColor}`;
}
- function getTabLalbel(title, count) {
+ function getTabLabel(title, count) {
const tabObj = tabIndex[currentTab];
// NOTE: refactor white color to theme's white color.
const primaryColor = (tabObj.title === title) ? tabIndex[currentTab].selectedColor : undefined;
@@ -194,7 +194,7 @@ const tabController = (classes) => {
key={index}
id={tab.id}
label={
- getTabLalbel(tab.title, dashboardStats[tab.count] ? dashboardStats[tab.count] : 0)
+ getTabLabel(tab.title, dashboardStats[tab.count] ? dashboardStats[tab.count] : 0)
}
/>
));