Merge pull request #754 from DiamondLightSource/fix/lims-1288/pato-re…

…direct-url [LIMS-1288] SynchWeb link to PATo with undefined session
DiamondLightSource · Apr 15, 2024 · 362848f · 362848f
2 parents f58b3df + c1eee45
commit 362848f
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/client/src/js/modules/types/em/dc/redirect.vue b/client/src/js/modules/types/em/dc/redirect.vue
@@ -21,9 +21,25 @@ export default {
     },
     'computed': {
         redirectUrl: function () {
+            let redirectLocation = this.$store.state.appOptions.redirects.em;
             const visitStr = this.collection.queryParams.visit;
-            const [proposal, visit] = visitStr.split("-");
-            return `${this.$store.state.appOptions.redirects.em}/proposals/${proposal}/sessions/${visit}`
+
+            if (visitStr) {
+                const [proposal, visit] = visitStr.split("-");
+                redirectLocation += `/proposals/${proposal}/sessions/${visit}`;
+            } else {
+                const pathParams = window.location.pathname.split("/");
+                const lastParam = pathParams.pop().split("-");
+
+                if(lastParam.length === 2) {
+                    redirectLocation += `/proposals/${lastParam[0]}`
+                    if(!isNaN(lastParam[1])) {
+                        redirectLocation += `/sessions/${lastParam[1]}`;
+                    }
+                }
+            }
+
+            return redirectLocation;
         }
     },
 }