Allow updating custom metadata

Cargo.toml

@@ -144,6 +144,7 @@ serde_with = { version = "=3.11.0", features = ["chrono_0_4"] }
 serde-xml-rs = "=0.6.0"
 slug = "=0.1.6"
 sonarr-api-rs = "=3.0.0"
+sqlx = { version = "=0.8.2", default-features = false, features = ["postgres"] }
 strum = { version = "=0.26.3", features = ["derive"] }
 struson = { version = "=0.6.0", features = ["serde"] }
 reqwest = { version = "=0.12.9", features = ["json", "stream"] }

apps/frontend/app/components/common.tsx

@@ -73,6 +73,7 @@ import {
 	convertDecimalToThreePointSmiley,
 	dayjsLib,
 	getSurroundingElements,
+	openConfirmationModal,
 	reviewYellow,
 } from "~/lib/generals";
 import {
@@ -88,7 +89,6 @@ import {
 import { useReviewEntity } from "~/lib/state/media";
 import type { action } from "~/routes/actions";
 import classes from "~/styles/common.module.css";
-import { confirmWrapper } from "./confirmation";
 import {
 	ExerciseDisplayItem,
 	WorkoutDisplayItem,
@@ -541,24 +541,24 @@ export const ReviewItemDisplay = (props: {
 									<IconEdit size={16} />
 								</ActionIcon>
 								<ActionIcon
-									onClick={async () => {
-										const conf = await confirmWrapper({
-											confirmation:
-												"Are you sure you want to delete this review? This action cannot be undone.",
-										});
-										if (conf)
-											deleteReviewFetcher.submit(
-												{
-													shouldDelete: "true",
-													reviewId: props.review.id || null,
-												},
-												{
-													method: "post",
-													action: $path("/actions", {
-														intent: "performReviewAction",
-													}),
-												},
-											);
+									onClick={() => {
+										openConfirmationModal(
+											"Are you sure you want to delete this review? This action cannot be undone.",
+											() => {
+												deleteReviewFetcher.submit(
+													{
+														shouldDelete: "true",
+														reviewId: props.review.id || null,
+													},
+													{
+														method: "post",
+														action: $path("/actions", {
+															intent: "performReviewAction",
+														}),
+													},
+												);
+											},
+										);
 									}}
 									color="red"
 								>
@@ -732,14 +732,13 @@ export const ReviewItemDisplay = (props: {
 															<ActionIcon
 																color="red"
 																type="submit"
-																onClick={async (e) => {
+																onClick={(e) => {
 																	const form = e.currentTarget.form;
 																	e.preventDefault();
-																	const conf = await confirmWrapper({
-																		confirmation:
-																			"Are you sure you want to delete this comment?",
-																	});
-																	if (conf && form) submit(form);
+																	openConfirmationModal(
+																		"Are you sure you want to delete this comment?",
+																		() => submit(form),
+																	);
 																}}
 															>
 																<IconTrash size={16} />
@@ -886,14 +885,13 @@ export const DisplayCollection = (props: {
 					/>
 					<ActionIcon
 						size={16}
-						onClick={async (e) => {
+						onClick={(e) => {
 							const form = e.currentTarget.form;
 							e.preventDefault();
-							const conf = await confirmWrapper({
-								confirmation:
-									"Are you sure you want to remove this media from this collection?",
-							});
-							if (conf && form) submit(form);
+							openConfirmationModal(
+								"Are you sure you want to remove this media from this collection?",
+								() => submit(form),
+							);
 						}}
 					>
 						<IconX />

apps/frontend/app/components/media.tsx

@@ -40,10 +40,10 @@ import {
 	DisplayThreePointReview,
 	MEDIA_DETAILS_HEIGHT,
 } from "~/components/common";
-import { confirmWrapper } from "~/components/confirmation";
 import {
 	clientGqlService,
 	getPartialMetadataDetailsQuery,
+	openConfirmationModal,
 	queryFactory,
 	reviewYellow,
 } from "~/lib/generals";
@@ -397,14 +397,12 @@ export const ToggleMediaMonitorMenuItem = (props: {
 					const form = e.currentTarget.form;
 					if (form) {
 						e.preventDefault();
-						if (isMonitored) {
-							const conf = await confirmWrapper({
-								confirmation: "Are you sure you want to stop monitoring?",
-							});
-							if (conf) submit(form);
-						} else {
-							submit(form);
-						}
+						if (isMonitored)
+							openConfirmationModal(
+								"Are you sure you want to stop monitoring?",
+								() => submit(form),
+							);
+						else submit(form);
 					}
 				}}
 			>

apps/frontend/app/lib/generals.ts → apps/frontend/app/lib/generals.tsx

@@ -3,7 +3,8 @@ import {
 	createQueryKeys,
 	mergeQueryKeys,
 } from "@lukemorales/query-key-factory";
-import type { MantineColor } from "@mantine/core";
+import { type MantineColor, Text } from "@mantine/core";
+import { modals } from "@mantine/modals";
 import {
 	MediaLot,
 	MediaSource,
@@ -306,10 +307,10 @@ export const getStringAsciiValue = (input: string) => {
 	return total;
 };
 
-export const selectRandomElement = <T>(array: T[], input: string): T => {
+export function selectRandomElement<T>(array: T[], input: string): T {
 	// taken from https://stackoverflow.com/questions/44975435/using-mod-operator-in-javascript-to-wrap-around#comment76926119_44975435
 	return array[(getStringAsciiValue(input) + array.length) % array.length];
-};
+}
 
 export const getMetadataIcon = (lot: MediaLot) =>
 	match(lot)
@@ -338,16 +339,16 @@ export const clientGqlService = new GraphQLClient(
 	},
 );
 
-export const getSurroundingElements = <T>(
+export function getSurroundingElements<T>(
 	array: Array<T>,
 	elementIndex: number,
-): Array<number> => {
+): Array<number> {
 	if (array.length === 1) return [0];
 	const lastIndex = array.length - 1;
 	if (elementIndex === 0) return [lastIndex, elementIndex, elementIndex + 1];
 	if (elementIndex === lastIndex) return [elementIndex - 1, elementIndex, 0];
 	return [elementIndex - 1, elementIndex, elementIndex + 1];
-};
+}
 
 const mediaQueryKeys = createQueryKeys("media", {
 	metadataPartialDetails: (metadataId: string) => ({
@@ -488,3 +489,11 @@ export const MediaColors: EntityColor = {
 	REVIEW: "green.5",
 	USER_MEASUREMENT: "indigo",
 };
+
+export const openConfirmationModal = (title: string, onConfirm: () => void) =>
+	modals.openConfirmModal({
+		title: "Confirmation",
+		onConfirm: onConfirm,
+		children: <Text size="sm">{title}</Text>,
+		labels: { confirm: "Confirm", cancel: "Cancel" },
+	});

apps/frontend/app/lib/hooks.ts

@@ -1,6 +1,7 @@
 import { useComputedColorScheme, useMantineTheme } from "@mantine/core";
-import { useForceUpdate, useListState } from "@mantine/hooks";
+import { useForceUpdate } from "@mantine/hooks";
 import {
+	useNavigate,
 	useRevalidator,
 	useRouteLoaderData,
 	useSearchParams,
@@ -86,20 +87,22 @@ export const useAppSearchParam = (cookieKey: string) => {
 
 export const useConfirmSubmit = () => {
 	const submit = useSubmit();
-	const fn = (e: FormEvent<HTMLFormElement> | HTMLFormElement) => {
+	const fn = (e: FormEvent<HTMLFormElement> | HTMLFormElement | null) => {
+		if (!e) return;
 		if (e.preventDefault) e.preventDefault();
 		submit(e.currentTarget || e, { navigate: false });
 	};
 	return fn;
 };
 
 export const useGetWorkoutStarter = () => {
+	const navigate = useNavigate();
 	const revalidator = useRevalidator();
 	const [_, setCurrentWorkout] = useCurrentWorkout();
 
 	const fn = (wkt: InProgressWorkout, action: FitnessAction) => {
 		setCurrentWorkout(wkt);
-		window.location.href = $path("/fitness/:action", { action });
+		navigate($path("/fitness/:action", { action }), { flushSync: true });
 		revalidator.revalidate();
 	};
 	return fn;
@@ -187,22 +190,6 @@ export const useGetWatchProviders = (mediaLot: MediaLot) => {
 	return watchProviders;
 };
 
-export const useComplexJsonUpdate = () => {
-	const [toUpdatePreferences, updateUserPreferencesHandler] = useListState<
-		[string, string]
-	>([]);
-
-	const reset = () => updateUserPreferencesHandler.setState([]);
-
-	const appendPref = (property: string, value: string) => {
-		const index = toUpdatePreferences.findIndex((p) => p[0] === property);
-		if (index !== -1) updateUserPreferencesHandler.remove(index);
-		updateUserPreferencesHandler.append([property, value]);
-	};
-
-	return { reset, appendPref, toUpdatePreferences };
-};
-
 export const useIsFitnessActionActive = () => {
 	const [currentWorkout] = useCurrentWorkout();
 	const action = currentWorkout?.currentActionOrCompleted;

apps/frontend/app/lib/state/fitness.ts

@@ -112,7 +112,7 @@ export const useGetSetAtIndex = (exerciseIdx: number, setIdx: number) => {
 export const getDefaultWorkout = (
 	fitnessEntity: FitnessAction,
 ): InProgressWorkout => {
-	const date = dayjsLib().add(4, "second");
+	const date = dayjsLib().add(3, "second");
 	return {
 		images: [],
 		videos: [],