Merge pull request #236 from MetaCell/development

Fix bugs with storing version number and update version to use August 13 dataset releases
MetaCell · Sep 9, 2024 · 54d821e · 54d821e
2 parents e3fee1d + 4ffaace
commit 54d821e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/src/components/DatasetsListViewer/DatasetsListDialog.js b/src/components/DatasetsListViewer/DatasetsListDialog.js
@@ -107,23 +107,20 @@ const DatasetsListDialog = (props) => {
       datasets.forEach( node => node.attributes ? node.attributes.lowerCaseLabel = node.attributes?.label?.[0]?.toLowerCase() : null );
       datasets = datasets.filter( node => node?.attributes?.statusOnPlatform?.[0]?.includes(PUBLISHED) );
 
-
       let version = config.version;
       let datasetStorage = {};
-      if ( version !== undefined && JSON.parse(localStorage.getItem(config.datasetsStorage))?.version !== version ) {
-        let parsedDatasets = []
-        datasets.forEach( node =>  {
-          parsedDatasets.push({ name : node.name , doi : node.attributes?.hasDoi?.[0], label : node.attributes ? node.attributes.lowerCaseLabel : null}); 
-        });
-        datasetStorage = {
-          version : version,
-          datasets : parsedDatasets
-        }
-
-        localStorage.setItem(config.datasetsStorage, JSON.stringify(datasetStorage));
-        dispatch(setDatasetsList(datasetStorage.datasets));
-        setFilteredDatasets(datasetStorage.datasets);
+      let parsedDatasets = []
+      datasets?.forEach( node =>  {
+        parsedDatasets.push({ name : node.name , doi : node.attributes?.hasDoi?.[0], label : node.attributes ? node.attributes?.lowerCaseLabel : null}); 
+      });
+      datasetStorage = {
+        version : version,
+        datasets : parsedDatasets
       }
+
+      localStorage.setItem(config.datasetsStorage, JSON.stringify(datasetStorage));
+      dispatch(setDatasetsList(datasetStorage.datasets));
+      setFilteredDatasets(datasetStorage.datasets);
     };
     const summaryURL = config.repository_url + config.available_datasets;
     fileHandler.get_remote_file(summaryURL, callback);
@@ -156,7 +153,10 @@ const DatasetsListDialog = (props) => {
 
   useEffect(() => {
     if ( open && datasets.length === 0 ) {
-      if ( localStorage.getItem(config.datasetsStorage) ) {
+      let version = config.version;
+      const storage = JSON.parse(localStorage.getItem(config.datasetsStorage));
+      const storageVersion = storage?.version
+      if ( localStorage.getItem(config.datasetsStorage) && version === storageVersion ) {
         let storedDatasetsInfo = JSON.parse(localStorage.getItem(config.datasetsStorage));
         dispatch(setDatasetsList(storedDatasetsInfo.datasets));
         setFilteredDatasets(storedDatasetsInfo.datasets);

diff --git a/src/config/app.json b/src/config/app.json
@@ -19,5 +19,5 @@
         "datasetsButtonSubtitleText" : "Select a dataset to load"
     },
     "datasetsStorage" : "publishedDatasets",
-    "version" : "1.1"
+    "version" : "13-Aug-2024"
 }