From 47673dd7730d68205a2abbc3e3f574c274c27ead Mon Sep 17 00:00:00 2001
From: Michel Heusschen <59014050+michelheusschen@users.noreply.github.com>
Date: Fri, 2 Jun 2023 15:50:35 +0200
Subject: [PATCH] fix(web): use id instead of assetId (#2643)

---
 web/src/lib/stores/asset-interaction.store.ts |  2 +-
 .../[key]/photos/[assetId]/+page.server.ts    | 23 ++++++++++---------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/web/src/lib/stores/asset-interaction.store.ts b/web/src/lib/stores/asset-interaction.store.ts
index bc3e3bea35211..3b05258fd1db3 100644
--- a/web/src/lib/stores/asset-interaction.store.ts
+++ b/web/src/lib/stores/asset-interaction.store.ts
@@ -57,7 +57,7 @@ function createAssetInteractionStore() {
 	};
 
 	const setViewingAssetId = async (id: string) => {
-		const { data } = await api.assetApi.getAssetById({ assetId: id });
+		const { data } = await api.assetApi.getAssetById({ id });
 		viewingAssetStoreState.set(data);
 		isViewingAssetStoreState.set(true);
 	};
diff --git a/web/src/routes/(user)/share/[key]/photos/[assetId]/+page.server.ts b/web/src/routes/(user)/share/[key]/photos/[assetId]/+page.server.ts
index f5672b1c10a6a..af5e6b6528136 100644
--- a/web/src/routes/(user)/share/[key]/photos/[assetId]/+page.server.ts
+++ b/web/src/routes/(user)/share/[key]/photos/[assetId]/+page.server.ts
@@ -1,18 +1,19 @@
-export const prerender = false;
-
 import { error } from '@sveltejs/kit';
 import type { PageServerLoad } from './$types';
 
 export const load = (async ({ params, locals: { api } }) => {
-	try {
-		const { key, assetId } = params;
-		const { data: asset } = await api.assetApi.getAssetById({ assetId, key });
+	const { key, assetId } = params;
+	const { data: asset } = await api.assetApi.getAssetById({ id: assetId, key });
 
-		if (!asset) {
-			return error(404, 'Asset not found');
-		}
-		return { asset, key };
-	} catch (e) {
-		console.log('Error', e);
+	if (!asset) {
+		throw error(404, 'Asset not found');
 	}
+
+	return {
+		asset,
+		key,
+		meta: {
+			title: 'Public Share'
+		}
+	};
 }) satisfies PageServerLoad;