Skip to content

Commit 54d821e

Browse files
authored
Merge pull request #236 from MetaCell/development
Fix bugs with storing version number and update version to use August 13 dataset releases
2 parents e3fee1d + 4ffaace commit 54d821e

2 files changed

Lines changed: 16 additions & 16 deletions

File tree

src/components/DatasetsListViewer/DatasetsListDialog.js

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -107,23 +107,20 @@ const DatasetsListDialog = (props) => {
107107
datasets.forEach( node => node.attributes ? node.attributes.lowerCaseLabel = node.attributes?.label?.[0]?.toLowerCase() : null );
108108
datasets = datasets.filter( node => node?.attributes?.statusOnPlatform?.[0]?.includes(PUBLISHED) );
109109

110-
111110
let version = config.version;
112111
let datasetStorage = {};
113-
if ( version !== undefined && JSON.parse(localStorage.getItem(config.datasetsStorage))?.version !== version ) {
114-
let parsedDatasets = []
115-
datasets.forEach( node => {
116-
parsedDatasets.push({ name : node.name , doi : node.attributes?.hasDoi?.[0], label : node.attributes ? node.attributes.lowerCaseLabel : null});
117-
});
118-
datasetStorage = {
119-
version : version,
120-
datasets : parsedDatasets
121-
}
122-
123-
localStorage.setItem(config.datasetsStorage, JSON.stringify(datasetStorage));
124-
dispatch(setDatasetsList(datasetStorage.datasets));
125-
setFilteredDatasets(datasetStorage.datasets);
112+
let parsedDatasets = []
113+
datasets?.forEach( node => {
114+
parsedDatasets.push({ name : node.name , doi : node.attributes?.hasDoi?.[0], label : node.attributes ? node.attributes?.lowerCaseLabel : null});
115+
});
116+
datasetStorage = {
117+
version : version,
118+
datasets : parsedDatasets
126119
}
120+
121+
localStorage.setItem(config.datasetsStorage, JSON.stringify(datasetStorage));
122+
dispatch(setDatasetsList(datasetStorage.datasets));
123+
setFilteredDatasets(datasetStorage.datasets);
127124
};
128125
const summaryURL = config.repository_url + config.available_datasets;
129126
fileHandler.get_remote_file(summaryURL, callback);
@@ -156,7 +153,10 @@ const DatasetsListDialog = (props) => {
156153

157154
useEffect(() => {
158155
if ( open && datasets.length === 0 ) {
159-
if ( localStorage.getItem(config.datasetsStorage) ) {
156+
let version = config.version;
157+
const storage = JSON.parse(localStorage.getItem(config.datasetsStorage));
158+
const storageVersion = storage?.version
159+
if ( localStorage.getItem(config.datasetsStorage) && version === storageVersion ) {
160160
let storedDatasetsInfo = JSON.parse(localStorage.getItem(config.datasetsStorage));
161161
dispatch(setDatasetsList(storedDatasetsInfo.datasets));
162162
setFilteredDatasets(storedDatasetsInfo.datasets);

src/config/app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
"datasetsButtonSubtitleText" : "Select a dataset to load"
2020
},
2121
"datasetsStorage" : "publishedDatasets",
22-
"version" : "1.1"
22+
"version" : "13-Aug-2024"
2323
}

0 commit comments

Comments
 (0)