Allow hiding collections

apps/frontend/app/components/common.tsx

@@ -107,7 +107,7 @@ import {
 	useFallbackImageUrl,
 	useGetMantineColors,
 	useGetRandomMantineColor,
-	useUserCollections,
+	useNonHiddenUserCollections,
 	useUserDetails,
 	useUserPreferences,
 	useUserUnitSystem,
@@ -265,7 +265,7 @@ export const DebouncedSearchInput = (props: {
 	);
 
 	useDidUpdate(() => {
-		setP(props.queryParam || "query", debounced);
+		setP(props.queryParam || "query", debounced.trim());
 	}, [debounced]);
 
 	return (
@@ -508,7 +508,7 @@ export const CollectionsFilter = (props: {
 	collections?: string[];
 	invertCollection?: boolean;
 }) => {
-	const collections = useUserCollections();
+	const collections = useNonHiddenUserCollections();
 	const [_, { setP }] = useAppSearchParam(props.cookieName);
 
 	return (
@@ -525,8 +525,8 @@ export const CollectionsFilter = (props: {
 				{
 					group: "My collections",
 					items: collections.map((c) => ({
-						value: c.id.toString(),
 						label: c.name,
+						value: c.id.toString(),
 					})),
 				},
 			]}

apps/frontend/app/lib/hooks.ts

@@ -145,6 +145,17 @@ export const useUserPreferences = () => useUserDetails().preferences;
 export const useUserCollections = () =>
 	useDashboardLayoutData().userCollections;
 
+export const useNonHiddenUserCollections = () => {
+	const userCollections = useUserCollections();
+	const userDetails = useUserDetails();
+	const toDisplay = userCollections.filter(
+		(c) =>
+			c.collaborators.find((c) => c.collaborator.id === userDetails.id)
+				?.extraInformation?.isHidden !== true,
+	);
+	return toDisplay;
+};
+
 export const useUserUnitSystem = () =>
 	useUserPreferences().fitness.exercises.unitSystem;
 

apps/frontend/app/routes/_dashboard.collections.list.tsx

@@ -52,13 +52,7 @@ import {
 import { useQuery } from "@tanstack/react-query";
 import { ClientError } from "graphql-request";
 import { useEffect, useState } from "react";
-import {
-	Form,
-	Link,
-	useLoaderData,
-	useNavigation,
-	useSearchParams,
-} from "react-router";
+import { Form, Link, useLoaderData, useNavigation } from "react-router";
 import { Virtuoso } from "react-virtuoso";
 import { $path } from "safe-routes";
 import { match } from "ts-pattern";
@@ -79,6 +73,7 @@ import {
 	zodCommaDelimitedString,
 } from "~/lib/generals";
 import {
+	useAppSearchParam,
 	useConfirmSubmit,
 	useCoreDetails,
 	useFallbackImageUrl,
@@ -181,6 +176,9 @@ const createOrUpdateSchema = z.object({
 	updateId: z.string().optional(),
 	description: z.string().optional(),
 	collaborators: zodCommaDelimitedString,
+	extraInformation: z
+		.object({ isHidden: zodCheckboxAsString.optional() })
+		.optional(),
 	informationTemplate: z
 		.array(
 			z.object({
@@ -205,23 +203,30 @@ type UpdateCollectionInput = {
 
 export default function Page() {
 	const transition = useNavigation();
+	const userDetails = useUserDetails();
 	const collections = useUserCollections();
 	const loaderData = useLoaderData<typeof loader>();
-	const [params] = useSearchParams();
-	const query = params.get("query") || undefined;
-
-	const filteredCollections = collections.filter((c) =>
-		query ? c.name.toLowerCase().includes(query.toLowerCase()) : true,
-	);
-
 	const [toUpdateCollection, setToUpdateCollection] =
 		useState<UpdateCollectionInput | null>(null);
+	const [params, { setP }] = useAppSearchParam(loaderData.cookieName);
+	const query = params.get("query") || undefined;
+	const showHidden = Boolean(params.get("showHidden"));
+
 	useEffect(() => {
-		if (transition.state !== "submitting") {
-			setToUpdateCollection(null);
-		}
+		if (transition.state !== "submitting") setToUpdateCollection(null);
 	}, [transition.state]);
 
+	const filteredCollections = collections
+		.filter((c) =>
+			showHidden
+				? true
+				: c.collaborators.find((c) => c.collaborator.id === userDetails.id)
+						?.extraInformation?.isHidden !== true,
+		)
+		.filter((c) =>
+			query ? c.name.toLowerCase().includes(query.toLowerCase()) : true,
+		);
+
 	return (
 		<Container size="sm">
 			<Stack>
@@ -249,10 +254,19 @@ export default function Page() {
 						cacheId={loaderData.userCollectionsList.cacheId}
 					/>
 				</Group>
-				<DebouncedSearchInput
-					initialValue={query}
-					enhancedQueryParams={loaderData.cookieName}
-				/>
+				<Group wrap="nowrap">
+					<DebouncedSearchInput
+						initialValue={query}
+						enhancedQueryParams={loaderData.cookieName}
+					/>
+					<Checkbox
+						size="xs"
+						name="showHidden"
+						label="Show hidden"
+						defaultChecked={showHidden}
+						onChange={(e) => setP("showHidden", e.target.checked ? "yes" : "")}
+					/>
+				</Group>
 				<Virtuoso
 					style={{ height: "80vh" }}
 					data={filteredCollections}
@@ -330,9 +344,9 @@ const DisplayCollection = (props: {
 		additionalDisplay.push(`By ${props.collection.creator.name}`);
 	if (props.collection.count > 0)
 		additionalDisplay.push(`${props.collection.count} items`);
-	if (props.collection.collaborators.length > 0)
+	if (props.collection.collaborators.length > 1)
 		additionalDisplay.push(
-			`${props.collection.collaborators.length} collaborators`,
+			`${props.collection.collaborators.length - 1} collaborators`,
 		);
 
 	const FallBackImage = () => (
@@ -538,6 +552,21 @@ const CreateOrUpdateModal = (props: {
 					label="Description"
 					defaultValue={props.toUpdateCollection?.description}
 				/>
+				<Tooltip
+					label={PRO_REQUIRED_MESSAGE}
+					disabled={coreDetails.isServerKeyValidated}
+				>
+					<Checkbox
+						label="Hide collection"
+						name="extraInformation.isHidden"
+						disabled={!coreDetails.isServerKeyValidated}
+						defaultChecked={
+							props.toUpdateCollection?.collaborators?.find(
+								(c) => c.collaborator.id === userDetails.id,
+							)?.extraInformation?.isHidden || undefined
+						}
+					/>
+				</Tooltip>
 				<Tooltip
 					label={PRO_REQUIRED_MESSAGE}
 					disabled={coreDetails.isServerKeyValidated}
@@ -548,7 +577,7 @@ const CreateOrUpdateModal = (props: {
 						disabled={!coreDetails.isServerKeyValidated}
 						description="Add collaborators to this collection"
 						defaultValue={(props.toUpdateCollection?.collaborators || []).map(
-							(c) => c.id,
+							(c) => c.collaborator.id,
 						)}
 						data={loaderData.usersList.map((u) => ({
 							value: u.id,

apps/frontend/app/routes/_dashboard.fitness.exercises.list.tsx

@@ -73,7 +73,7 @@ import {
 	useAppSearchParam,
 	useCoreDetails,
 	useIsFitnessActionActive,
-	useUserCollections,
+	useNonHiddenUserCollections,
 	useUserPreferences,
 } from "~/lib/hooks";
 import {
@@ -331,7 +331,7 @@ export default function Page() {
 const FiltersModalForm = () => {
 	const loaderData = useLoaderData<typeof loader>();
 	const coreDetails = useCoreDetails();
-	const collections = useUserCollections();
+	const collections = useNonHiddenUserCollections();
 	const [_, { setP }] = useAppSearchParam(loaderData.cookieName);
 
 	return (

apps/frontend/app/routes/_dashboard.settings.imports-and-exports._index.tsx

@@ -48,7 +48,7 @@ import {
 	useApplicationEvents,
 	useConfirmSubmit,
 	useCoreDetails,
-	useUserCollections,
+	useNonHiddenUserCollections,
 } from "~/lib/hooks";
 import {
 	createToastHeaders,
@@ -188,7 +188,7 @@ export default function Page() {
 	const coreDetails = useCoreDetails();
 	const submit = useConfirmSubmit();
 	const fileUploadNotAllowed = !coreDetails.fileStorageEnabled;
-	const userCollections = useUserCollections();
+	const userCollections = useNonHiddenUserCollections();
 	const events = useApplicationEvents();
 	const [deployImportSource, setDeployImportSource] = useState<ImportSource>();
 

apps/frontend/app/routes/_dashboard.settings.integrations.tsx

@@ -61,7 +61,7 @@ import {
 import {
 	useConfirmSubmit,
 	useCoreDetails,
-	useUserCollections,
+	useNonHiddenUserCollections,
 } from "~/lib/hooks";
 import { createToastHeaders, serverGqlService } from "~/lib/utilities.server";
 import type { Route } from "./+types/_dashboard.settings.integrations";
@@ -625,7 +625,7 @@ const CreateIntegrationModal = (props: {
 };
 
 const ArrInputs = (props: { name: string }) => {
-	const collections = useUserCollections();
+	const collections = useNonHiddenUserCollections();
 
 	return (
 		<>

apps/frontend/app/routes/_dashboard.tsx

@@ -141,7 +141,7 @@ import {
 	useGetWatchProviders,
 	useIsFitnessActionActive,
 	useMetadataDetails,
-	useUserCollections,
+	useNonHiddenUserCollections,
 	useUserDetails,
 	useUserMetadataDetails,
 	useUserPreferences,
@@ -1776,7 +1776,7 @@ const AddEntityToCollectionForm = ({
 	closeAddEntityToCollectionModal: () => void;
 }) => {
 	const userDetails = useUserDetails();
-	const collections = useUserCollections();
+	const collections = useNonHiddenUserCollections();
 	const events = useApplicationEvents();
 	const submit = useConfirmSubmit();
 	const [selectedCollection, setSelectedCollection] =

crates/migrations/src/lib.rs

@@ -30,6 +30,7 @@ mod m20250118_is_v8_migration;
 mod m20250122_changes_for_issue_1188;
 mod m20250126_changes_for_issue_1201;
 mod m20250201_changes_for_issue_1211;
+mod m20250204_changes_for_issue_1231;
 
 pub use m20230404_create_user::User as AliasedUser;
 pub use m20230410_create_metadata::Metadata as AliasedMetadata;
@@ -81,6 +82,7 @@ impl MigratorTrait for Migrator {
             Box::new(m20250122_changes_for_issue_1188::Migration),
             Box::new(m20250126_changes_for_issue_1201::Migration),
             Box::new(m20250201_changes_for_issue_1211::Migration),
+            Box::new(m20250204_changes_for_issue_1231::Migration),
         ]
     }
 }

crates/migrations/src/m20231017_create_user_to_entity.rs

@@ -2,8 +2,8 @@ use indoc::indoc;
 use sea_orm_migration::prelude::*;
 
 use super::{
-    m20230410_create_metadata::Metadata, m20230413_create_person::Person,
-    m20230404_create_user::User, m20230411_create_metadata_group::MetadataGroup,
+    m20230404_create_user::User, m20230410_create_metadata::Metadata,
+    m20230411_create_metadata_group::MetadataGroup, m20230413_create_person::Person,
     m20230504_create_collection::Collection, m20230505_create_exercise::Exercise,
 };
 
@@ -36,22 +36,21 @@ pub static CONSTRAINT_SQL: &str = indoc! { r#"
 /// - has reviewed it
 #[derive(Iden)]
 pub enum UserToEntity {
-    Table,
     Id,
+    Table,
     UserId,
+    PersonId,
     CreatedOn,
-    LastUpdatedOn,
-    NeedsToBeUpdated,
-    // the entities that can be associated
     MetadataId,
     ExerciseId,
-    PersonId,
-    MetadataGroupId,
+    MediaReason,
     CollectionId,
-    // specifics
+    LastUpdatedOn,
+    MetadataGroupId,
+    NeedsToBeUpdated,
     ExerciseExtraInformation,
+    CollectionExtraInformation,
     ExerciseNumTimesInteracted,
-    MediaReason,
 }
 
 #[async_trait::async_trait]
@@ -91,6 +90,7 @@ impl MigrationTrait for Migration {
                             .default(PgFunc::gen_random_uuid())
                             .primary_key(),
                     )
+                    .col(ColumnDef::new(UserToEntity::CollectionExtraInformation).json_binary())
                     .foreign_key(
                         ForeignKey::create()
                             .name("user_to_entity-fk1")

crates/migrations/src/m20250204_changes_for_issue_1231.rs

@@ -0,0 +1,20 @@
+use sea_orm_migration::prelude::*;
+
+#[derive(DeriveMigrationName)]
+pub struct Migration;
+
+#[async_trait::async_trait]
+impl MigrationTrait for Migration {
+    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        let db = manager.get_connection();
+        db.execute_unprepared(
+            r#"ALTER TABLE "user_to_entity" ADD COLUMN "collection_extra_information" JSONB"#,
+        )
+        .await?;
+        Ok(())
+    }
+
+    async fn down(&self, _manager: &SchemaManager) -> Result<(), DbErr> {
+        Ok(())
+    }
+}

crates/models/common/src/lib.rs

@@ -345,3 +345,20 @@ pub struct YoutubeMusicSongListened {
     pub id: String,
     pub listened_on: NaiveDate,
 }
+
+#[derive(
+    Eq,
+    Debug,
+    Clone,
+    Default,
+    Serialize,
+    PartialEq,
+    InputObject,
+    Deserialize,
+    SimpleObject,
+    FromJsonQueryResult,
+)]
+#[graphql(input_name = "UserToCollectionExtraInformationInput")]
+pub struct UserToCollectionExtraInformation {
+    pub is_hidden: Option<bool>,
+}