Fix browser path handling in in Browse/load

radiantearth · Aug 11, 2023 · bcb4a81 · bcb4a81
1 parent c42cdb3
commit bcb4a81
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/src/store/index.js b/src/store/index.js
@@ -702,16 +702,10 @@ function getStore(config, router) {
         cx.commit('parents', parents);
       },
       async load(cx, args) {
-        let { url, fromBrowser, show, loadApi, loadRoot, force } = args;
-        let path;
-        if (fromBrowser) {
-          path = url.startsWith('/') ? url : '/' + url;
-          url = cx.getters.fromBrowserPath(url);
-        }
-        else {
-          url = Utils.toAbsolute(url, cx.state.url);
-          path = cx.getters.toBrowserPath(url);
-        }
+        let { url, show, loadApi, loadRoot, force } = args;
+
+        let path = cx.getters.toBrowserPath(url);
+        url = Utils.toAbsolute(url, cx.state.url);
 
         // Load the root catalog data if not available (e.g. after page refresh or external access)
         if (!loadRoot && path !== '/' && cx.state.catalogUrl && !cx.getters.getStac(cx.state.catalogUrl)) {
@@ -980,4 +974,4 @@ function getStore(config, router) {
   });
 }
 
-export default getStore;
+export default getStore;
diff --git a/src/views/Browse.vue b/src/views/Browse.vue
@@ -32,7 +32,7 @@ export default {
   },
   computed: {
     ...mapState(["allowExternalAccess", "url", "data", "redirectLegacyUrls"]),
-    ...mapGetters(["isItem", "error", "loading"]),
+    ...mapGetters(["fromBrowserPath", "isItem", "error", "loading"]),
     errorId() {
       if (this.error instanceof Error && this.error.isAxiosError && Utils.isObject(this.error.response)) {
         let res = this.error.response;
@@ -99,7 +99,8 @@ export default {
           return;
         }
 
-        this.$store.dispatch("load", { url: path || '/', fromBrowser: true, show: true, loadApi: true });
+        let url = this.fromBrowserPath(path || '/');
+        this.$store.dispatch("load", { url, show: true, loadApi: true });
       }
     }
   },