From 2001c44838af7e33aa5bf77b874706456cf31e67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Viguier?= <ildyria@users.noreply.github.com>
Date: Sat, 9 Nov 2024 15:19:41 +0100
Subject: [PATCH] Improvements (#2655)

---
 .../forms/photo/PhotoCopyDialog.vue           |  9 +++---
 .../js/components/headers/AlbumHeader.vue     |  3 +-
 .../js/components/headers/AlbumsHeader.vue    |  6 ++--
 resources/js/router/routes.ts                 | 31 ++++++++++---------
 4 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/resources/js/components/forms/photo/PhotoCopyDialog.vue b/resources/js/components/forms/photo/PhotoCopyDialog.vue
index 308760e0a22..0f9f5e455ee 100644
--- a/resources/js/components/forms/photo/PhotoCopyDialog.vue
+++ b/resources/js/components/forms/photo/PhotoCopyDialog.vue
@@ -13,11 +13,11 @@
 				</div>
 			</div>
 			<div v-else>
-				<div class="p-9" v-if="error_no_target">
+				<div class="p-9" v-if="error_no_target === false">
 					<span class="font-bold">
 						{{ question }}
 					</span>
-					<SearchTargetAlbum :album-id="parentId" @selected="selected" @no-target="error_no_target = true" />
+					<SearchTargetAlbum :album-id="undefined" @selected="selected" @no-target="error_no_target = true" />
 				</div>
 				<div v-else class="p-9">
 					<p class="text-center text-muted-color">{{ "No album to copy to." }}</p>
@@ -96,14 +96,13 @@ function execute() {
 	PhotoService.copy(destination_id.value, photoCopiedIds).then(() => {
 		toast.add({
 			severity: "success",
-			summary: "Photo moved",
+			summary: "Photo copied",
 			life: 3000,
 		});
-		// Clear the cache for the current album and the destination album
+		// Clear the cache for the destination album
 		AlbumService.clearCache(destination_id.value);
 
 		emits("copy");
-		// Todo emit that we moved things.
 	});
 }
 </script>
diff --git a/resources/js/components/headers/AlbumHeader.vue b/resources/js/components/headers/AlbumHeader.vue
index 930c7f4f4d4..e38f1622e29 100644
--- a/resources/js/components/headers/AlbumHeader.vue
+++ b/resources/js/components/headers/AlbumHeader.vue
@@ -1,5 +1,5 @@
 <template>
-	<UploadPanel v-if="canUpload" @refresh="refresh" />
+	<UploadPanel v-if="canUpload" @refresh="refresh" key="upload_modal" />
 	<DropBox v-if="canUpload" v-model:visible="isImportFromDropboxOpen" :album-id="props.album.id" />
 	<ImportFromLink v-if="canUpload" v-model:visible="isImportFromLinkOpen" :parent-id="props.album.id" @refresh="refresh" />
 	<AlbumCreateDialog
@@ -7,6 +7,7 @@
 		v-model:visible="isCreateAlbumOpen"
 		v-model:parent-id="props.album.id"
 		@close="isCreateAlbumOpen = false"
+		key="create_album_modal"
 	/>
 	<Toolbar class="w-full border-0 h-14" v-if="album">
 		<template #start>
diff --git a/resources/js/components/headers/AlbumsHeader.vue b/resources/js/components/headers/AlbumsHeader.vue
index 8d6affd2c6b..fc2a1530582 100644
--- a/resources/js/components/headers/AlbumsHeader.vue
+++ b/resources/js/components/headers/AlbumsHeader.vue
@@ -1,12 +1,12 @@
 <template>
 	<LoginModal v-if="props.user.id === null" v-model:visible="is_login_open" @logged-in="refresh" @open-webauthn="isWebAuthnOpen = true" />
 	<WebauthnModal v-if="props.user.id === null && !isWebAuthnUnavailable" v-model:visible="isWebAuthnOpen" @logged-in="refresh" />
-	<UploadPanel v-if="canUpload" @refresh="refresh" />
+	<UploadPanel v-if="canUpload" @refresh="refresh" key="upload_modal" />
 	<ImportFromServer v-if="canUpload" v-model:visible="isImportFromServerOpen" />
 	<ImportFromLink v-if="canUpload" v-model:visible="isImportFromLinkOpen" :parent-id="null" />
 	<DropBox v-if="canUpload" v-model:visible="isImportFromDropboxOpen" :album-id="null" />
-	<AlbumCreateDialog v-if="canUpload" v-model:visible="isCreateAlbumOpen" :parent-id="null" />
-	<AlbumCreateTagDialog v-if="canUpload" v-model:visible="isCreateTagAlbumOpen" />
+	<AlbumCreateDialog v-if="canUpload" v-model:visible="isCreateAlbumOpen" :parent-id="null" key="create_album_modal" />
+	<AlbumCreateTagDialog v-if="canUpload" v-model:visible="isCreateTagAlbumOpen" key="create_tag_album_modal" />
 	<Toolbar
 		class="w-full border-0 h-14"
 		:pt:root:class="'flex-nowrap relative'"
diff --git a/resources/js/router/routes.ts b/resources/js/router/routes.ts
index 64113018d21..b67a32d06f1 100644
--- a/resources/js/router/routes.ts
+++ b/resources/js/router/routes.ts
@@ -1,19 +1,20 @@
-import Diagnostics from "@/views/Diagnostics.vue";
-import Jobs from "@/views/Jobs.vue";
-import Landing from "@/views/Landing.vue";
-import Maintenance from "@/views/Maintenance.vue";
-import Profile from "@/views/Profile.vue";
-import Settings from "@/views/Settings.vue";
-import Sharing from "@/views/Sharing.vue";
-import Users from "@/views/Users.vue";
 import Album from "@/views/gallery-panels/Album.vue";
 import Albums from "@/views/gallery-panels/Albums.vue";
 import Photo from "@/views/gallery-panels/Photo.vue";
-import Search from "@/views/gallery-panels/Search.vue";
-import Permissions from "@/views/Permissions.vue";
-import Frame from "@/views/gallery-panels/Frame.vue";
-import Map from "@/views/gallery-panels/Map.vue";
-import Statistics from "@/views/Statistics.vue";
+
+const Landing = () => import("@/views/Landing.vue");
+const Frame = () => import("@/views/gallery-panels/Frame.vue");
+const Search = () => import("@/views/gallery-panels/Search.vue");
+const MapView = () => import("@/views/gallery-panels/Map.vue");
+const Permissions = () => import("@/views/Permissions.vue");
+const Users = () => import("@/views/Users.vue");
+const Sharing = () => import("@/views/Sharing.vue");
+const Settings = () => import("@/views/Settings.vue");
+const Profile = () => import("@/views/Profile.vue");
+const Maintenance = () => import("@/views/Maintenance.vue");
+const Diagnostics = () => import("@/views/Diagnostics.vue");
+const Statistics = () => import("@/views/Statistics.vue");
+const Jobs = () => import("@/views/Jobs.vue");
 
 const routes_ = [
 	{
@@ -52,12 +53,12 @@ const routes_ = [
 	{
 		name: "map",
 		path: "/map",
-		component: Map,
+		component: MapView,
 	},
 	{
 		name: "map-with-album",
 		path: "/map/:albumid",
-		component: Map,
+		component: MapView,
 		props: true,
 	},
 	{