From cf0da6327f61604da98cd80f659bce25d7e9affe Mon Sep 17 00:00:00 2001
From: Michael Mayer <michael@photoprism.app>
Date: Wed, 20 Sep 2023 23:51:57 +0200
Subject: [PATCH] Places: Improve routing when browsing pictures in a cluster
 #1187

Signed-off-by: Michael Mayer <michael@photoprism.app>
---
 frontend/src/app/routes.js               | 17 +++++++++++++----
 frontend/src/component/photo/toolbar.vue | 11 ++++++-----
 frontend/src/page/album/photos.vue       |  2 +-
 frontend/src/page/places.vue             |  2 +-
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/frontend/src/app/routes.js b/frontend/src/app/routes.js
index 04e15d7fa..5b2d56f7f 100644
--- a/frontend/src/app/routes.js
+++ b/frontend/src/app/routes.js
@@ -263,16 +263,25 @@ export default [
     meta: { title: $gettext("Places"), auth: true },
   },
   {
-    name: "places_scope",
-    path: "/places/:s",
+    name: "places_view",
+    path: "/places/view/:s",
     component: Places,
     meta: { title: $gettext("Places"), auth: true },
   },
   {
-    name: "places_location",
-    path: "/location",
+    name: "places_browse",
+    path: "/places/browse",
     component: Photos,
     meta: { title: $gettext("Places"), auth: true },
+    beforeEnter: (to, from, next) => {
+      if (session.loginRequired()) {
+        next({ name: "login" });
+      } else if (config.deny("photos", "search")) {
+        next({ name: "albums" });
+      } else {
+        next();
+      }
+    },
   },
   {
     name: "states",
diff --git a/frontend/src/component/photo/toolbar.vue b/frontend/src/component/photo/toolbar.vue
index cc28f0c45..93fc99c4f 100644
--- a/frontend/src/component/photo/toolbar.vue
+++ b/frontend/src/component/photo/toolbar.vue
@@ -56,7 +56,7 @@
       </template>
       <template v-else>
         <v-spacer></v-spacer>
-        <v-btn v-if="canAccessLibrary" icon :title="$gettext('Open')" class="action-open-tab" @click.stop="openInTab">
+        <v-btn v-if="canAccessLibrary" icon :title="$gettext('Browse')" class="action-browse" @click.stop="onBrowse">
           <v-icon size="20">tab</v-icon>
         </v-btn>
         <v-btn v-if="onClose !== undefined" icon :title="$gettext('Close')" class="action-close" @click.stop="onClose">
@@ -334,10 +334,11 @@ export default {
     clearLocation() {
       this.$router.push({ name: "browse" });
     },
-    openInTab() {
-      const url = this.$router.resolve({name: 'places_location', query: this.staticFilter}).href;
-      if (url) {
-        window.open(url, '_blank');
+    onBrowse() {
+      const route = {name: 'places_browse', query: this.staticFilter};
+      const routeUrl = this.$router.resolve(route).href;
+      if (routeUrl) {
+        window.open(routeUrl, '_blank');
       }
     },
     batchDelete() {
diff --git a/frontend/src/page/album/photos.vue b/frontend/src/page/album/photos.vue
index ccc87f6b0..99e80f790 100644
--- a/frontend/src/page/album/photos.vue
+++ b/frontend/src/page/album/photos.vue
@@ -198,7 +198,7 @@ export default {
       if (this.canAccessLibrary && photo.CellID && photo.CellID !== "zz") {
         this.$router.push({name: "places", query: {q: photo.CellID}});
       } else if (this.uid) {
-        this.$router.push({name: "places_scope", params: {s: this.uid}, query: {q: photo.CellID}});
+        this.$router.push({name: "places_view", params: {s: this.uid}, query: {q: photo.CellID}});
       }
     },
     editPhoto(index) {
diff --git a/frontend/src/page/places.vue b/frontend/src/page/places.vue
index 253efdbce..6af246d32 100644
--- a/frontend/src/page/places.vue
+++ b/frontend/src/page/places.vue
@@ -441,7 +441,7 @@ export default {
 
       if (this.query() !== this.filter.q) {
         if (this.filter.s) {
-          this.$router.replace({name: "places_scope", params: {s: this.filter.s}, query: {q: this.filter.q}});
+          this.$router.replace({name: "places_view", params: {s: this.filter.s}, query: {q: this.filter.q}});
         } else if (this.filter.q) {
           this.$router.replace({name: "places", query: {q: this.filter.q}});
         } else {