make tags visible on public collections

components/ModalContent/EditCollectionSharingModal.tsx

@@ -130,31 +130,6 @@ export default function EditCollectionSharingModal({
           </div>
         )}
 
-        {permissions === true && collection.isPublic && (
-          <div>
-            <p>Show tags in public collection</p>
-
-            <label className="label cursor-pointer justify-start gap-2">
-              <input
-                type="checkbox"
-                checked={collection.tagsArePublic}
-                onChange={() =>
-                  setCollection({
-                    ...collection,
-                    tagsArePublic: !collection.tagsArePublic,
-                  })
-                }
-                className="checkbox checkbox-primary"
-              />
-              <span className="label-text">Show tags in public collection</span>
-            </label>
-
-            <p className="text-neutral text-sm">
-              This will let <b>Anyone</b> view this collections tags and search
-              this collections links by them.
-            </p>
-          </div>
-        )}
         {collection.isPublic && (
           <div>
             <p className="mb-2">{t("sharable_link")}</p>

lib/api/controllers/collections/collectionId/updateCollectionById.ts

@@ -84,7 +84,6 @@ export default async function updateCollection(
         icon: data.icon,
         iconWeight: data.iconWeight,
         isPublic: data.isPublic,
-        tagsArePublic: data.tagsArePublic,
         parent:
           data.parentId && data.parentId !== "root"
             ? {

lib/shared/schemaValidation.ts

@@ -190,7 +190,6 @@ export const UpdateCollectionSchema = z.object({
   isPublic: z.boolean().optional(),
   icon: z.string().trim().max(50).nullish(),
   iconWeight: z.string().trim().max(50).nullish(),
-  tagsArePublic: z.boolean().optional(),
   parentId: z.union([z.number(), z.literal("root")]).nullish(),
   members: z.array(
     z.object({

pages/public/collections/[id].tsx

@@ -25,7 +25,6 @@ import { usePublicLinks } from "@/hooks/store/publicLinks";
 import Links from "@/components/LinkViews/Links";
 import { Disclosure, Transition } from "@headlessui/react";
 
-
 export default function PublicCollections() {
   const { t } = useTranslation();
 
@@ -39,7 +38,18 @@ const { settings } = useLocalSettingsStore();
 
   const handleTagSelection = (tag: string | undefined) => {
     if (tag) {
-      Object.keys(searchFilter).forEach((v) => searchFilter[(v as keyof {name: boolean, url: boolean, description: boolean, tags: boolean, textContent: boolean})] = false)
+      Object.keys(searchFilter).forEach(
+        (v) =>
+          (searchFilter[
+            v as keyof {
+              name: boolean;
+              url: boolean;
+              description: boolean;
+              tags: boolean;
+              textContent: boolean;
+            }
+          ] = false)
+      );
       searchFilter.tags = true;
       return router.push(
         "/public/collections/" +
@@ -48,11 +58,9 @@ const { settings } = useLocalSettingsStore();
           encodeURIComponent(tag || "")
       );
     } else {
-      return router.push(
+      return router.push("/public/collections/" + router.query.id);
-        "/public/collections/" +
-        router.query.id)
-    }
     }
+  };
 
   const [searchFilter, setSearchFilter] = useState({
     name: true,
@@ -243,8 +251,7 @@ useEffect(() => {
                 }
               />
             </LinkListOptions>
-            {collection.tagsArePublic &&
+            {linksForWholeCollection?.flatMap((l) => l.tags)[0] && (
-              linksForWholeCollection?.flatMap((l) => l.tags)[0] && (
               <Disclosure defaultOpen={tagDisclosure}>
                 <Disclosure.Button
                   onClick={() => {
@@ -287,9 +294,7 @@ useEffect(() => {
                       {linksForWholeCollection
                         .flatMap((l) => l.tags)
                         .map((t) => t.name)
-                          .filter(
+                        .filter((item, pos, self) => self.indexOf(item) === pos)
-                            (item, pos, self) => self.indexOf(item) === pos
-                          )
                         .sort((a, b) => a.localeCompare(b))
                         .map((e, i) => {
                           const active = router.query.q === e;

prisma/migrations/20241102220059_add_fields_to_collections/migration.sql

@@ -1,2 +0,0 @@
--- AlterTable
-ALTER TABLE "Collection" ADD COLUMN     "tagsArePublic" BOOLEAN NOT NULL DEFAULT false;

prisma/schema.prisma

@@ -105,7 +105,6 @@ model Collection {
   parent          Collection?           @relation("SubCollections", fields: [parentId], references: [id])
   subCollections  Collection[]          @relation("SubCollections")
   isPublic        Boolean               @default(false)
-  tagsArePublic   Boolean               @default(false) 
   owner           User                  @relation(fields: [ownerId], references: [id])
   ownerId         Int
   members         UsersAndCollections[]