Merge pull request #621 from mfts/feat/group

feat: updates to groups
mfts · Sep 29, 2024 · 05ada08 · 05ada08
2 parents 7ef97ec + 976a616
commit 05ada08
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 13 deletions.
diff --git a/components/datarooms/groups/group-card.tsx b/components/datarooms/groups/group-card.tsx
@@ -1,7 +1,7 @@
 import { useState } from "react";
 
 import { ViewerGroup } from "@prisma/client";
-import { Layers2Icon, PenIcon, UsersIcon } from "lucide-react";
+import { BoxesIcon, Layers2Icon, PenIcon } from "lucide-react";
 
 import BarChart from "@/components/shared/icons/bar-chart";
 import MoreVertical from "@/components/shared/icons/more-vertical";
@@ -25,7 +25,7 @@ export default function GroupCard({
 
   return (
     <>
-      <div className="hover:drop-shadow-card-hover group rounded-xl border border-gray-200 bg-white p-4 transition-[filter] sm:p-5">
+      <div className="hover:drop-shadow-card-hover group rounded-xl border border-gray-200 bg-white p-4 transition-[filter] dark:bg-gray-800 sm:p-5">
         <div className="flex items-center justify-between gap-3 sm:gap-4">
           <div className="flex min-w-0 items-center gap-4">
             <div className="hidden rounded-full border border-gray-200 sm:block">
@@ -34,12 +34,12 @@ export default function GroupCard({
                   "rounded-full border border-white bg-gradient-to-t from-gray-100 p-1 md:p-3",
                 )}
               >
-                <UsersIcon className="size-5" />
+                <BoxesIcon className="size-5" />
               </div>
             </div>
             <div className="overflow-hidden">
               <div className="flex flex-col gap-1">
-                <p className="truncate text-sm font-medium" title="Group Name">
+                <p className="truncate text-sm font-medium text-foreground">
                   {group.name}
                 </p>
                 <span className="text-xs text-muted-foreground">

diff --git a/components/links/links-table.tsx b/components/links/links-table.tsx
@@ -4,7 +4,7 @@ import { useState } from "react";
 
 import { useTeam } from "@/context/team-context";
 import { DocumentVersion } from "@prisma/client";
-import { EyeIcon, LinkIcon, Settings2Icon } from "lucide-react";
+import { BoxesIcon, EyeIcon, LinkIcon, Settings2Icon } from "lucide-react";
 import { toast } from "sonner";
 import { mutate } from "swr";
 
@@ -245,13 +245,20 @@ export default function LinksTable({
                       <>
                         <TableRow key={link.id} className="group/row">
                           <TableCell className="w-[250px] truncate font-medium">
-                            {link.name || `Link #${link.id.slice(-5)}`}
+                            <div className="flex items-center gap-x-2">
+                              {link.groupId ? (
+                                <ButtonTooltip content="Group Link">
+                                  <BoxesIcon className="size-4" />
+                                </ButtonTooltip>
+                              ) : null}
+                              {link.name || `Link #${link.id.slice(-5)}`}
 
-                            {link.domainId && hasFreePlan ? (
-                              <span className="ml-2 rounded-full bg-destructive px-2.5 py-0.5 text-xs text-foreground ring-1 ring-destructive">
-                                Inactive
-                              </span>
-                            ) : null}
+                              {link.domainId && hasFreePlan ? (
+                                <span className="ml-2 rounded-full bg-destructive px-2.5 py-0.5 text-xs text-foreground ring-1 ring-destructive">
+                                  Inactive
+                                </span>
+                              ) : null}
+                            </div>
                           </TableCell>
                           <TableCell className="flex items-center gap-x-2 sm:min-w-[300px] md:min-w-[400px] lg:min-w-[450px]">
                             <div

diff --git a/components/view/DataroomViewer.tsx b/components/view/DataroomViewer.tsx
@@ -109,6 +109,7 @@ export default function DataroomViewer({
       delete currentQuery.email;
       delete currentQuery.domain;
       delete currentQuery.slug;
+      delete currentQuery.linkId;
 
       const currentPath = router.asPath.split("?")[0];
 

diff --git a/components/view/PagesViewerNew.tsx b/components/view/PagesViewerNew.tsx
@@ -334,7 +334,7 @@ export default function PagesViewer({
     };
 
     if (!dataroomId && router.query.token) {
-      removeQueryParams(["token", "email", "domain", "slug"]);
+      removeQueryParams(["token", "email", "domain", "slug", "linkId"]);
     }
   }, []); // Run once on mount
 

diff --git a/components/view/dataroom/dataroom-view.tsx b/components/view/dataroom/dataroom-view.tsx
@@ -218,6 +218,7 @@ export default function DataroomView({
         delete currentQuery.email;
         delete currentQuery.domain;
         delete currentQuery.slug;
+        delete currentQuery.linkId;
 
         const currentPath = router.asPath.split("?")[0];
 

diff --git a/components/view/document-view.tsx b/components/view/document-view.tsx
@@ -179,6 +179,7 @@ export default function DocumentView({
         delete currentQuery.email;
         delete currentQuery.domain;
         delete currentQuery.slug;
+        delete currentQuery.linkId;
 
         const currentPath = router.asPath.split("?")[0];
 

diff --git a/components/view/viewer/image-viewer.tsx b/components/view/viewer/image-viewer.tsx
@@ -229,7 +229,7 @@ export default function ImageViewer({
     };
 
     if (!dataroomId && router.query.token) {
-      removeQueryParams(["token", "email", "domain", "slug"]);
+      removeQueryParams(["token", "email", "domain", "slug", "linkId"]);
     }
   }, []); // Run once on mount