Items not loaded when visiting a Catalog for a second time #509

radiantearth · Nov 25, 2024 · 11a3de1 · 11a3de1
1 parent 32eaefd
commit 11a3de1
Showing 1 changed file with 37 additions and 40 deletions.
diff --git a/src/store/index.js b/src/store/index.js
@@ -726,49 +726,46 @@ function getStore(config, router) {
           cx.commit('updateLoading', { url, show });
           return;
         }
-        else if (data instanceof STAC && !data.isPotentiallyIncomplete()) {
-          if (show) {
-            cx.commit('showPage', { url });
-          }
-          return;
-        }
 
-        cx.commit('loading', { url, loading });
-        try {
-          const response = await stacRequest(cx, url);
-          if (!Utils.isObject(response.data)) {
-            throw new BrowserError(i18n.t('errors.invalidJsonObject'));
-          }
-          data = new STAC(response.data, url, path);
-          cx.commit('loaded', { url, data });
-
-          if (show) {
-            // If we prefer another language abort redirect to the new language
-            let localeLink = data.getLocaleLink(cx.state.dataLanguage);
-            if (localeLink) {
-              router.replace(cx.getters.toBrowserPath(localeLink.href));
-              return;
+        const hasData = data instanceof STAC && !data.isPotentiallyIncomplete();
+        if (!hasData) {
+          cx.commit('loading', { url, loading });
+          try {
+            const response = await stacRequest(cx, url);
+            if (!Utils.isObject(response.data)) {
+              throw new BrowserError(i18n.t('errors.invalidJsonObject'));
             }
-          }
+            data = new STAC(response.data, url, path);
+            cx.commit('loaded', { url, data });
 
-          // Handle conformance classes
-          let conformanceLink = data.getStacLinkWithRel('conformance');
-          if (Array.isArray(data.conformsTo) && data.conformsTo.length > 0) {
-            cx.commit('setConformanceClasses', data.conformsTo);
-          }
-          else if (conformanceLink) {
-            await cx.dispatch('loadOgcApiConformance', conformanceLink);
-          }
-        } catch (error) {
-          if (!noRetry && cx.state.authConfig && isAuthenticationError(error)) {
-            await cx.dispatch('tryLogin', {
-              url,
-              action: () => cx.dispatch('load', Object.assign({noRetry: true, force: true, show: true}, args))
-            });
-            return;
+            if (show) {
+              // If we prefer another language abort redirect to the new language
+              let localeLink = data.getLocaleLink(cx.state.dataLanguage);
+              if (localeLink) {
+                router.replace(cx.getters.toBrowserPath(localeLink.href));
+                return;
+              }
+            }
+
+            // Handle conformance classes
+            let conformanceLink = data.getStacLinkWithRel('conformance');
+            if (Array.isArray(data.conformsTo) && data.conformsTo.length > 0) {
+              cx.commit('setConformanceClasses', data.conformsTo);
+            }
+            else if (conformanceLink) {
+              await cx.dispatch('loadOgcApiConformance', conformanceLink);
+            }
+          } catch (error) {
+            if (!noRetry && cx.state.authConfig && isAuthenticationError(error)) {
+              await cx.dispatch('tryLogin', {
+                url,
+                action: () => cx.dispatch('load', Object.assign({noRetry: true, force: true, show: true}, args))
+              });
+              return;
+            }
+            console.error(error);
+            cx.commit('errored', { url, error });
           }
-          console.error(error);
-          cx.commit('errored', { url, error });
         }
 
         // Load API Collections
@@ -784,7 +781,7 @@ function getStore(config, router) {
           }
         }
         // Load API Items
-        if (data.getApiItemsLink()) {
+        else if (data.getApiItemsLink()) {
           let args = { stac: data, show: loading.show };
           try {
             await cx.dispatch('loadApiItems', args);