Merge branch 'master' into fix-tree

.github/workflows/php_no_legacy_tests.yml

@@ -118,7 +118,7 @@ jobs:
 
       - name: SonarCloud Scan
         if: ${{ env.SONAR_TOKEN }}
-        uses: SonarSource/sonarcloud-github-action@9f9bba2c7aaf7a55eac26abbac906c3021d211b2 # master
+        uses: SonarSource/sonarcloud-github-action@982992a35a56c6bebd7c76c65e5c3e4c18e634c8 # master
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/php_tests.yml

@@ -114,7 +114,7 @@ jobs:
 
       - name: SonarCloud Scan
         if: ${{ env.SONAR_TOKEN }}
-        uses: SonarSource/sonarcloud-github-action@9f9bba2c7aaf7a55eac26abbac906c3021d211b2 # master
+        uses: SonarSource/sonarcloud-github-action@982992a35a56c6bebd7c76c65e5c3e4c18e634c8 # master
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

package.json

@@ -17,7 +17,7 @@
         "@types/leaflet-rotatedmarker": "^0.2.5",
         "@types/leaflet.markercluster": "^1.5.5",
         "@types/mousetrap": "^1.6.15",
-        "@types/node": "^22.9.0",
+        "@types/node": "^22.10.1",
         "@types/photoswipe": "^4.1.6",
         "@types/qrcode": "^1.5.5",
         "@types/sprintf-js": "^1.1.4",
@@ -42,11 +42,11 @@
         "leaflet-gpx": "^2.1.2",
         "leaflet-rotatedmarker": "^0.2.0",
         "leaflet.markercluster": "^1.5.3",
-        "pinia": "^2.1.7",
+        "pinia": "^2.2.8",
         "postcss": "^8.4.49",
-        "prettier": "^3.2.4",
+        "prettier": "^3.4.1",
         "primeicons": "^7.0.0",
-        "primevue": "^4.2.3",
+        "primevue": "^4.2.4",
         "qrcode": "^1.5.3",
         "sprintf-js": "^1.1.3",
         "tailwindcss": "^3.4.15",
@@ -58,7 +58,7 @@
         "vite-plugin-commonjs": "^0.10.4",
         "vue": "^3.5.13",
         "vue-collapsed": "^1.3.3",
-        "vue-i18n": "^10.0.4",
+        "vue-i18n": "^10.0.5",
         "vue-router": "^4.5.0"
     },
     "browserslist": [

resources/js/composables/album/albumRefresher.ts

@@ -4,6 +4,7 @@ import { computed, Ref, ref } from "vue";
 
 export function useAlbumRefresher(albumId: Ref<string>, auth: AuthStore, isLoginOpen: Ref<boolean>, nsfw_consented: Ref<string[]>) {
 	const isPasswordProtected = ref(false);
+	const isLoading = ref(false);
 	const user = ref<App.Http.Resources.Models.UserResource | undefined>(undefined);
 	const modelAlbum = ref<App.Http.Resources.Models.AlbumResource | undefined>(undefined);
 	const tagAlbum = ref<App.Http.Resources.Models.TagAlbumResource | undefined>(undefined);
@@ -23,6 +24,8 @@ export function useAlbumRefresher(albumId: Ref<string>, auth: AuthStore, isLogin
 	}
 
 	function loadAlbum(): Promise<void> {
+		isLoading.value = true;
+
 		return AlbumService.get(albumId.value)
 			.then((data) => {
 				isPasswordProtected.value = false;
@@ -50,6 +53,9 @@ export function useAlbumRefresher(albumId: Ref<string>, auth: AuthStore, isLogin
 				} else {
 					console.error(error);
 				}
+			})
+			.finally(() => {
+				isLoading.value = false;
 			});
 	}
 
@@ -60,6 +66,7 @@ export function useAlbumRefresher(albumId: Ref<string>, auth: AuthStore, isLogin
 	return {
 		isAlbumConsented,
 		isPasswordProtected,
+		isLoading,
 		albumId,
 		user,
 		modelAlbum,

resources/js/composables/album/albumsRefresher.ts

@@ -8,15 +8,18 @@ export function useAlbumsRefresher(auth: AuthStore, lycheeStore: LycheeStateStor
 	const { spliter } = useSplitter();
 	const user = ref<App.Http.Resources.Models.UserResource | undefined>(undefined);
 	const isKeybindingsHelpOpen = ref(false);
+	const isLoading = ref(false);
 	const smartAlbums = ref<App.Http.Resources.Models.ThumbAlbumResource[]>([]);
 	const albums = ref<App.Http.Resources.Models.ThumbAlbumResource[]>([]);
 	const sharedAlbums = ref<SplitData<App.Http.Resources.Models.ThumbAlbumResource>[]>([]);
 	const rootConfig = ref<App.Http.Resources.GalleryConfigs.RootConfig | undefined>(undefined);
 	const rootRights = ref<App.Http.Resources.Rights.RootAlbumRightsResource | undefined>(undefined);
 	const selectableAlbums = computed(() => albums.value.concat(sharedAlbums.value.map((album) => album.data).flat()));
 
-	function refresh(): Promise<void> {
-		auth.getUser().then((data) => {
+	function refresh(): Promise<[void, void]> {
+		isLoading.value = true;
+
+		const getUser = auth.getUser().then((data) => {
 			user.value = data;
 
 			const body_width = document.body.scrollWidth;
@@ -26,7 +29,7 @@ export function useAlbumsRefresher(auth: AuthStore, lycheeStore: LycheeStateStor
 			}
 		});
 
-		return AlbumService.getAll()
+		const getAlbums = AlbumService.getAll()
 			.then((data) => {
 				smartAlbums.value = (data.data.smart_albums as App.Http.Resources.Models.ThumbAlbumResource[]) ?? [];
 				albums.value = data.data.albums as App.Http.Resources.Models.ThumbAlbumResource[];
@@ -54,11 +57,16 @@ export function useAlbumsRefresher(auth: AuthStore, lycheeStore: LycheeStateStor
 					console.error(error);
 				}
 			});
+
+		return Promise.all([getUser, getAlbums]).finally(() => {
+			isLoading.value = false;
+		});
 	}
 
 	return {
 		user,
 		isKeybindingsHelpOpen,
+		isLoading,
 		smartAlbums,
 		albums,
 		sharedAlbums,

resources/js/layouts/PhotoLayout.ts

@@ -62,8 +62,8 @@ export function useGetLayoutConfig() {
 	const layoutConfig = ref(null) as Ref<null | App.Http.Resources.GalleryConfigs.PhotoLayoutConfig>;
 	const layout = ref("square") as Ref<App.Enum.PhotoLayoutType>;
 
-	function loadLayoutConfig() {
-		AlbumService.getLayout().then((data) => {
+	function loadLayoutConfig(): Promise<void> {
+		return AlbumService.getLayout().then((data) => {
 			layoutConfig.value = data.data;
 		});
 	}