chore: release v0.4.4 (#158)

* chore: release v0.4.1-hotfix.3 * fix(data-migration): early return if no categories have parents (#128) Signed-off-by: Robert Goniszewski <robertgoniszewski@outlook.com> * Closes #130 (#131) Signed-off-by: Robert Goniszewski <robertgoniszewski@outlook.com> * fix(database): use dynamic path for SQLite database file Signed-off-by: Robert Goniszewski <robertgoniszewski@outlook.com> * docs(readme): use single README file for latest/preview version Signed-off-by: Robert Goniszewski <robertgoniszewski@outlook.com> * feat(ci): add manual deployment workflow and adjust tag conditions Signed-off-by: Robert Goniszewski <robertgoniszewski@outlook.com> * refactor(workflow): simplify manual-deploy GitHub Action Signed-off-by: Robert Goniszewski <robertgoniszewski@outlook.com> * fix(metadata): handle multiple image URLs in mainImageUrl field Signed-off-by: Robert Goniszewski <robertgoniszewski@outlook.com> * fix: auth error handling (#144) * refactor(api): migrate Swagger UI to external documentation and enhance health endpoint Signed-off-by: Robert Goniszewski <robertgoniszewski@outlook.com> * chore: release v0.4.3 * fix(docker): resolve issue with data directory permissions (#150) * Fix issue #153: creation/update of root categories (#157) * chore: release v0.4.3 (#149) * chore: release v0.4.1-hotfix.3 * fix(data-migration): early return if no categories have parents (#128) Signed-off-by: Robert Goniszewski <robertgoniszewski@outlook.com> * Closes #130 (#131) Signed-off-by: Robert Goniszewski <robertgoniszewski@outlook.com> * fix(database): use dynamic path for SQLite database file Signed-off-by: Robert Goniszewski <robertgoniszewski@outlook.com> * docs(readme): use single README file for latest/preview version Signed-off-by: Robert Goniszewski <robertgoniszewski@outlook.com> * feat(ci): add manual deployment workflow and adjust tag conditions Signed-off-by: Robert Goniszewski <robertgoniszewski@outlook.com> * refactor(workflow): simplify manual-deploy GitHub Action Signed-off-by: Robert Goniszewski <robertgoniszewski@outlook.com> * fix(metadata): handle multiple image URLs in mainImageUrl field Signed-off-by: Robert Goniszewski <robertgoniszewski@outlook.com> * fix: auth error handling (#144) * refactor(api): migrate Swagger UI to external documentation and enhance health endpoint Signed-off-by: Robert Goniszewski <robertgoniszewski@outlook.com> * chore: release v0.4.3 --------- Signed-off-by: Robert Goniszewski <robertgoniszewski@outlook.com> Co-authored-by: Prabhanjan <zetabytes.pp@gmail.com> * Fix creation/update of root categories --------- Signed-off-by: Robert Goniszewski <robertgoniszewski@outlook.com> Co-authored-by: Robert Goniszewski <43510122+goniszewski@users.noreply.github.com> Co-authored-by: Prabhanjan <zetabytes.pp@gmail.com> * Fix issue #145: bookmarks without images (#156) * chore: release v0.4.3 (#149) * chore: release v0.4.1-hotfix.3 * fix(data-migration): early return if no categories have parents (#128) Signed-off-by: Robert Goniszewski <robertgoniszewski@outlook.com> * Closes #130 (#131) Signed-off-by: Robert Goniszewski <robertgoniszewski@outlook.com> * fix(database): use dynamic path for SQLite database file Signed-off-by: Robert Goniszewski <robertgoniszewski@outlook.com> * docs(readme): use single README file for latest/preview version Signed-off-by: Robert Goniszewski <robertgoniszewski@outlook.com> * feat(ci): add manual deployment workflow and adjust tag conditions Signed-off-by: Robert Goniszewski <robertgoniszewski@outlook.com> * refactor(workflow): simplify manual-deploy GitHub Action Signed-off-by: Robert Goniszewski <robertgoniszewski@outlook.com> * fix(metadata): handle multiple image URLs in mainImageUrl field Signed-off-by: Robert Goniszewski <robertgoniszewski@outlook.com> * fix: auth error handling (#144) * refactor(api): migrate Swagger UI to external documentation and enhance health endpoint Signed-off-by: Robert Goniszewski <robertgoniszewski@outlook.com> * chore: release v0.4.3 --------- Signed-off-by: Robert Goniszewski <robertgoniszewski@outlook.com> Co-authored-by: Prabhanjan <zetabytes.pp@gmail.com> * Fix bookmark creation/update without image --------- Signed-off-by: Robert Goniszewski <robertgoniszewski@outlook.com> Co-authored-by: Robert Goniszewski <43510122+goniszewski@users.noreply.github.com> Co-authored-by: Prabhanjan <zetabytes.pp@gmail.com> * chore: release v0.4.4 --------- Signed-off-by: Robert Goniszewski <robertgoniszewski@outlook.com> Co-authored-by: Prabhanjan <zetabytes.pp@gmail.com> Co-authored-by: Guillaume Poussel <gpoussel@users.noreply.github.com>
goniszewski · Dec 9, 2024 · df7971a · df7971a
1 parent a7ccb95
commit df7971a
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 34 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -8,7 +8,7 @@ RUN apt-get update && apt-get install -y python3 python3-pip wget build-essentia
     bun i -g svelte-kit@latest
 
 RUN adduser --disabled-password --gecos '' grimoire
-RUN mkdir -p /app/data && chown -R grimoire:grimoire /app/data && chmod 755 /app/data
+RUN mkdir -p /app/data && chown -R grimoire:grimoire /app/data && chmod 766 /app/data
 WORKDIR /app
 
 FROM base AS dependencies
@@ -35,6 +35,7 @@ COPY --from=build /app/build ./build
 COPY --from=build /app/migrations ./migrations
 COPY --from=build /app/migrate.js ./migrate.js
 COPY --from=build /app/package.json ./package.json
+COPY docker-entrypoint.sh /
 ENV NODE_ENV=production \
     PUBLIC_ORIGIN=${PUBLIC_ORIGIN:-http://localhost:5173} \
     ORIGIN=${PUBLIC_ORIGIN:-http://localhost:5173} \
@@ -43,8 +44,9 @@ ENV NODE_ENV=production \
     PUBLIC_SIGNUP_DISABLED=${PUBLIC_SIGNUP_DISABLED:-false} \
     BODY_SIZE_LIMIT=${BODY_SIZE_LIMIT:-5000000}
 
+RUN chmod +x /docker-entrypoint.sh
 USER grimoire
 EXPOSE ${PORT}
 HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
     CMD wget --no-verbose --tries=1 --spider http://localhost:$PORT/api/health || exit 1
-ENTRYPOINT ["sh", "-c", "bun --bun run run-migrations && bun ./build/index.js"]
+ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+chown -R grimoire:grimoire /app/data
+chmod 755 /app/data
+bun --bun run run-migrations && bun ./build/index.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "grimoire",
-	"version": "0.4.3",
+	"version": "0.4.4",
 	"description": "Bookmark manager for the wizards 🧙",
 	"author": "Robert Goniszewski <robert@goniszewski.com>",
 	"main": "./build/index.js",

diff --git a/src/lib/components/AddCategoryForm/AddCategoryForm.svelte b/src/lib/components/AddCategoryForm/AddCategoryForm.svelte
@@ -28,25 +28,25 @@
 	let form: HTMLFormElement;
 	export let closeModal: () => void;
 
-	const categoriesOptions = writable<{ value: string; label: string }[]>([
+	const categoriesOptions = writable<{ value: string | null; label: string }[]>([
 		{
-			value: 'null',
+			value: null,
 			label: 'No parent'
 		}
 	]);
 
 	$: {
 		$categoriesOptions = [
 			{
-				value: 'null',
+				value: null,
 				label: 'No parent'
 			},
 			...$page.data.categories
 				.filter((c) => {
 					return c.id !== $category.id;
 				})
 				.map((c) => ({
-					value: c.id,
+					value: c.id.toString(),
 					label: c.name
 				}))
 		];
@@ -224,13 +224,12 @@
 						name="parent"
 						searchable
 						placeholder="Select parent category..."
-						required
-						value={$category.parent?.id || $categoriesOptions[0].value}
+						value={$category.parent?.id?.toString() || $categoriesOptions[0].value}
 						items={$categoriesOptions}
 						class="this-select input input-bordered w-max"
 						on:change={(event) => {
 							// @ts-ignore-next-line
-							$category.parent = $page.data.categories.find((c) => c.id === event.detail.value);
+							$category.parent = $page.data.categories.find((c) => c.id.toString() === event.detail.value);
 						}}
 					/>
 				</div>

diff --git a/src/lib/components/EditCategoryForm/EditCategoryForm.svelte b/src/lib/components/EditCategoryForm/EditCategoryForm.svelte
@@ -16,25 +16,25 @@
 	let form: HTMLFormElement;
 	export let closeModal: () => void;
 
-	const categoriesOptions = writable<{ value: number; label: string }[]>([
+	const categoriesOptions = writable<{ value: string | null; label: string }[]>([
 		{
-			value: 0,
+			value: null,
 			label: 'No parent'
 		}
 	]);
 
 	$: {
 		$categoriesOptions = [
 			{
-				value: 0,
+				value: null,
 				label: 'No parent'
 			},
 			...$page.data.categories
 				.filter((c) => {
 					return c.id !== $category.id;
 				})
 				.map((c) => ({
-					value: c.id,
+					value: c.id.toString(),
 					label: c.name
 				}))
 		];
@@ -214,13 +214,12 @@
 							name="parent"
 							searchable
 							placeholder="Select parent category..."
-							required
-							value={$category.parent?.id || $categoriesOptions[0].value}
+							value={$category.parent?.id?.toString() || $categoriesOptions[0].value}
 							items={$categoriesOptions}
 							class="this-select input input-bordered w-max"
 							on:change={(event) => {
 								// @ts-ignore-next-line
-								$category.parent = $page.data.categories.find((c) => c.id === event.detail.value);
+								$category.parent = $page.data.categories.find((c) => c.id.toString() === event.detail.value);
 							}}
 						/>
 					</div>

diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts
@@ -71,16 +71,15 @@ export const actions = {
 					error: 'Failed to add bookmark'
 				};
 			}
-			const { id: mainImageId } = await storage.storeImage(
-				mainImageUrl,
-				title,
-				ownerId,
-				bookmark.id
-			);
-			const { id: iconId } = await storage.storeImage(iconUrl, title, ownerId, bookmark.id);
+			const mainImage = mainImageUrl
+				? await storage.storeImage(mainImageUrl, title, ownerId, bookmark.id)
+				: undefined;
+			const icon = iconUrl
+				? await storage.storeImage(iconUrl, title, ownerId, bookmark.id)
+				: undefined;
 			const updatedBookmark = await updateBookmark(bookmark.id, ownerId, {
-				mainImageId,
-				iconId
+				...(mainImage ? { mainImageId: mainImage.id } : {}),
+				...(icon ? { iconId: icon.id } : {})
 			});
 
 			await upsertTagsForBookmark(bookmark.id, ownerId, tagNames);
@@ -149,8 +148,10 @@ export const actions = {
 
 		const tagNames = tags.map((tag: any) => tag.label);
 
-		const { id: mainImageId } = await storage.storeImage(mainImageUrl, title, ownerId, id);
-		const { id: iconId } = await storage.storeImage(iconUrl, title, ownerId, id);
+		const mainImage = mainImageUrl
+			? await storage.storeImage(mainImageUrl, title, ownerId, id)
+			: undefined;
+		const icon = iconUrl ? await storage.storeImage(iconUrl, title, ownerId, id) : undefined;
 
 		const bookmarkData = {
 			author,
@@ -169,8 +170,8 @@ export const actions = {
 			title,
 			url,
 			read,
-			...(mainImageId ? { mainImageId } : {}),
-			...(iconId ? { iconId } : {})
+			...(mainImage ? { mainImageId: mainImage.id } : {}),
+			...(icon ? { iconId: icon.id } : {})
 		};
 
 		const bookmark = await updateBookmark(id, ownerId, bookmarkData);
@@ -290,7 +291,7 @@ export const actions = {
 		const description = data.get('description') as string;
 		const icon = data.get('icon') as string;
 		const color = data.get('color') as string;
-		const parent = JSON.parse(data.get('parent') as string);
+		const parent = data.get('parent') ? JSON.parse(data.get('parent') as string) : null;
 		const parentValue = parent?.value ? parent.value : parent;
 		const archived = data.get('archived') === 'on' ? new Date() : null;
 		const setPublic = data.get('public') === 'on' ? new Date() : null;
@@ -301,7 +302,7 @@ export const actions = {
 			description,
 			icon,
 			color,
-			parentId: parentValue === 'null' ? null : parentValue,
+			parentId: parentValue,
 			archived,
 			public: setPublic,
 			ownerId,
@@ -332,7 +333,7 @@ export const actions = {
 		const description = data.get('description') as string;
 		const icon = data.get('icon') as string;
 		const color = data.get('color') as string;
-		const parent = JSON.parse(data.get('parent') as string);
+		const parent = data.get('parent') ? JSON.parse(data.get('parent') as string) : null;
 		const parentValue = parent?.value ? parent.value : parent;
 		const archived = data.get('archived') === 'on' ? new Date() : null;
 		const setPublic = data.get('public') === 'on' ? new Date() : null;
@@ -343,7 +344,7 @@ export const actions = {
 			description,
 			icon,
 			color,
-			parentId: parentValue === 'null' ? null : parentValue,
+			parentId: parentValue,
 			archived,
 			public: setPublic
 		};