feat(web): permanent url in shared link (#9083)

immich-app · Apr 25, 2024 · 912d0c4 · 912d0c4
1 parent adb607c
commit 912d0c4
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 34 deletions.
diff --git a/web/src/lib/utils/navigation.ts b/web/src/lib/utils/navigation.ts
@@ -18,8 +18,8 @@ export const isPeopleRoute = (route?: string | null) => !!route?.startsWith('/(u
 export const isAssetViewerRoute = (target?: NavigationTarget | null) =>
   !!(target?.route.id?.endsWith('/[[assetId=id]]') && 'assetId' in (target?.params || {}));
 
-export function getAssetInfoFromParam({ assetId }: { assetId?: string }) {
-  return assetId && getAssetInfo({ id: assetId });
+export function getAssetInfoFromParam({ assetId, key }: { assetId?: string; key?: string }) {
+  return assetId && getAssetInfo({ id: assetId, key });
 }
 
 function currentUrlWithoutAsset() {

diff --git a/...rc/routes/(user)/share/[key]/+page.svelte → ...otos=photos]]/[[assetId=id]]/+page.svelte b/...rc/routes/(user)/share/[key]/+page.svelte → ...otos=photos]]/[[assetId=id]]/+page.svelte
diff --git a/web/src/routes/(user)/share/[key]/+page.ts → ...[[photos=photos]]/[[assetId=id]]/+page.ts b/web/src/routes/(user)/share/[key]/+page.ts → ...[[photos=photos]]/[[assetId=id]]/+page.ts
@@ -1,11 +1,13 @@
 import { getAssetThumbnailUrl, setSharedLink } from '$lib/utils';
 import { authenticate } from '$lib/utils/auth';
+import { getAssetInfoFromParam } from '$lib/utils/navigation';
 import { ThumbnailFormat, getMySharedLink, isHttpError } from '@immich/sdk';
 import type { PageLoad } from './$types';
 
 export const load = (async ({ params }) => {
   const { key } = params;
   await authenticate({ public: true });
+  const asset = await getAssetInfoFromParam(params);
 
   try {
     const sharedLink = await getMySharedLink({ key });
@@ -15,6 +17,8 @@ export const load = (async ({ params }) => {
 
     return {
       sharedLink,
+      asset,
+      key,
       meta: {
         title: sharedLink.album ? sharedLink.album.albumName : 'Public Share',
         description: sharedLink.description || `${assetCount} shared photos & videos.`,

diff --git a/web/src/routes/(user)/share/[key]/photos/[assetId]/+page.svelte b/web/src/routes/(user)/share/[key]/photos/[assetId]/+page.svelte
diff --git a/web/src/routes/(user)/share/[key]/photos/[assetId]/+page.ts b/web/src/routes/(user)/share/[key]/photos/[assetId]/+page.ts