From 88c6a448aa440492bd5f53db81fba0b8fd22bbb8 Mon Sep 17 00:00:00 2001
From: BrickheadJohnny <johnny.zgen@gmail.com>
Date: Wed, 2 Oct 2024 14:15:26 +0200
Subject: [PATCH] chore: migrate the `MemberCount` component to Tailwind CSS &
 Radix UI

---
 .../components/DraggableRoleCard.tsx          |   7 +-
 .../[guild]/GuildPageImageAndName.tsx         |  12 +-
 .../[guild]/RecheckAccessesAndLeaveButton.tsx |   5 +-
 .../RoleCard/components/MemberCount.tsx       | 144 ++++++++----------
 .../components/MemberCountLastSyncTooltip.tsx |  74 ++++-----
 src/components/[guild]/RoleOptionCard.tsx     |   7 +-
 .../ExportMembers/ExportCard/ExportCard.tsx   |   7 +-
 .../crm/FilterByRoles/FilterByRoles.tsx       |   1 +
 src/hooks/useActiveStatusUpdates.ts           |   4 +-
 9 files changed, 121 insertions(+), 140 deletions(-)

diff --git a/src/components/[guild]/AddAndOrderRoles/components/DraggableRoleCard.tsx b/src/components/[guild]/AddAndOrderRoles/components/DraggableRoleCard.tsx
index be3f289f8b..42488eddfb 100644
--- a/src/components/[guild]/AddAndOrderRoles/components/DraggableRoleCard.tsx
+++ b/src/components/[guild]/AddAndOrderRoles/components/DraggableRoleCard.tsx
@@ -1,6 +1,6 @@
 import { HStack, Heading, Icon, Spacer } from "@chakra-ui/react"
 import { DotsSixVertical } from "@phosphor-icons/react"
-import MemberCount from "components/[guild]/RoleCard/components/MemberCount"
+import { MemberCount } from "components/[guild]/RoleCard/components/MemberCount"
 import Visibility from "components/[guild]/Visibility"
 import Card from "components/common/Card"
 import GuildLogo from "components/common/GuildLogo"
@@ -29,7 +29,10 @@ const DraggableRoleCard = ({ role }: Props) => {
             {role.name}
           </Heading>
 
-          <MemberCount memberCount={role.members?.length ?? role.memberCount} />
+          <MemberCount
+            memberCount={role.members?.length ?? role.memberCount}
+            className="!bg-transparent text-muted-foreground"
+          />
           <Visibility
             ml={-2}
             mt={0.5}
diff --git a/src/components/[guild]/GuildPageImageAndName.tsx b/src/components/[guild]/GuildPageImageAndName.tsx
index ff787e7270..452e8fc656 100644
--- a/src/components/[guild]/GuildPageImageAndName.tsx
+++ b/src/components/[guild]/GuildPageImageAndName.tsx
@@ -3,13 +3,13 @@ import { LayoutTitle } from "@/components/Layout"
 import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/Avatar"
 import { Skeleton } from "@/components/ui/Skeleton"
 import { cn } from "@/lib/utils"
-import MemberCount from "./RoleCard/components/MemberCount"
+import { MemberCount } from "./RoleCard/components/MemberCount"
 import { useThemeContext } from "./ThemeContext"
 import useGuild from "./hooks/useGuild"
 
 const GuildPageImageAndName = () => {
   const { imageUrl, name, tags, memberCount } = useGuild()
-  const { avatarBg, textColor, buttonColorScheme } = useThemeContext()
+  const { avatarBg, buttonColorSchemeClassName } = useThemeContext()
 
   return (
     <>
@@ -33,9 +33,11 @@ const GuildPageImageAndName = () => {
 
         <MemberCount
           memberCount={memberCount ?? 0}
-          bgColor={`${buttonColorScheme}.200`}
-          color={textColor}
-          maxW="max-content"
+          className={cn(
+            buttonColorSchemeClassName,
+            // TODO: we're essentially resetting bg color in hover/active states, this looks quite hacky, so we should find a better solution here
+            "max-w-max hover:bg-[''] active:bg-['']"
+          )}
         />
       </div>
     </>
diff --git a/src/components/[guild]/RecheckAccessesAndLeaveButton.tsx b/src/components/[guild]/RecheckAccessesAndLeaveButton.tsx
index 0e71de2ca4..3baac73ef4 100644
--- a/src/components/[guild]/RecheckAccessesAndLeaveButton.tsx
+++ b/src/components/[guild]/RecheckAccessesAndLeaveButton.tsx
@@ -17,7 +17,10 @@ const RecheckAccessesAndLeaveButton = () => {
     <ButtonGroup isAttached>
       <TopRecheckAccessesButton
         // TODO: find a better solution for this once we migrate the whole guild page to Tailwind
-        className={cn(buttonColorSchemeClassName, "h-11 rounded-r-none")}
+        className={cn(
+          buttonColorSchemeClassName,
+          "h-11 rounded-r-none text-banner-foreground"
+        )}
       />
       <Divider orientation="vertical" h="var(--chakra-sizes-11)" />
       <LeaveButton {...chakraButtonProps} />
diff --git a/src/components/[guild]/RoleCard/components/MemberCount.tsx b/src/components/[guild]/RoleCard/components/MemberCount.tsx
index a614109834..b6a9e31b3b 100644
--- a/src/components/[guild]/RoleCard/components/MemberCount.tsx
+++ b/src/components/[guild]/RoleCard/components/MemberCount.tsx
@@ -1,62 +1,45 @@
+import { Badge, BadgeProps } from "@/components/ui/Badge"
+import { ProgressIndicator, ProgressRoot } from "@/components/ui/Progress"
 import {
-  HStack,
-  Popover,
-  PopoverArrow,
-  PopoverBody,
-  PopoverContent,
-  PopoverFooter,
-  PopoverHeader,
-  PopoverTrigger,
-  Portal,
-  Progress,
-  Spinner,
-  Tag,
-  TagLabel,
-  TagLeftIcon,
-  TagProps,
-  TagRightIcon,
-  Text,
-} from "@chakra-ui/react"
-import { Users } from "@phosphor-icons/react"
+  Tooltip,
+  TooltipContent,
+  TooltipPortal,
+  TooltipTrigger,
+} from "@/components/ui/Tooltip"
+import { cn } from "@/lib/utils"
+import { CircleNotch, Users } from "@phosphor-icons/react/dist/ssr"
 import useGuild from "components/[guild]/hooks/useGuild"
 import useGuildPermission from "components/[guild]/hooks/useGuildPermission"
 import useUser from "components/[guild]/hooks/useUser"
 import useActiveStatusUpdates from "hooks/useActiveStatusUpdates"
 import { PropsWithChildren } from "react"
-import MemberCountLastSyncTooltip, {
+import {
+  MemberCountLastSyncTooltip,
   SyncRoleButton,
 } from "./MemberCountLastSyncTooltip"
 
 type Props = {
   memberCount: number
   size?: "sm" | "md"
-} & TagProps
+} & BadgeProps
 
 const MemberCount = ({
   memberCount,
   size = "md",
   children,
-  ...rest
+  className,
+  ...badgeProps
 }: PropsWithChildren<Props>) => {
-  const iconSize = size === "sm" ? "14px" : "16px"
-
   return (
-    <Tag
-      bg="unset"
-      color="gray"
-      mt="3px !important"
-      flexShrink={0}
-      size={size}
-      {...rest}
-    >
-      <TagLeftIcon as={Users} boxSize={iconSize} mr="1.5" />
-      <TagLabel mb="-1px">
+    <Badge className={cn("group mt-1 shrink-0", className)} {...badgeProps}>
+      <Users weight="bold" />
+      <span>
         {new Intl.NumberFormat("en", { notation: "compact" }).format(
           memberCount ?? 0
         )}
-      </TagLabel>
+      </span>
       {children}
-    </Tag>
+    </Badge>
   )
 }
 
@@ -64,7 +47,7 @@ type WithSyncProps = Props & {
   roleId?: number
 }
 
-export const MemberCountWithSyncIndicator = ({
+const MemberCountWithSyncIndicator = ({
   roleId,
   ...rest
 }: PropsWithChildren<WithSyncProps>) => {
@@ -72,52 +55,49 @@ export const MemberCountWithSyncIndicator = ({
 
   if (status === "STARTED")
     return (
-      <Popover trigger="hover" placement="bottom" isLazy>
-        <PopoverTrigger>
-          <MemberCount colorScheme="blue" mt="2px !important" {...rest}>
-            <TagRightIcon as={Spinner} />
+      <Tooltip>
+        <TooltipTrigger>
+          <MemberCount {...rest}>
+            <CircleNotch weight="bold" className="animate-spin" />
           </MemberCount>
-        </PopoverTrigger>
-        <Portal>
-          <PopoverContent>
-            <PopoverArrow />
-            <PopoverHeader fontWeight="semibold" border={0} px={3} pb={0}>
-              Syncing members
-            </PopoverHeader>
-            <PopoverBody pt="1">
-              Updating all member accesses. This can take a few hours, feel free to
-              come back later!
-              <StatusProgress {...{ data, status }} />
-            </PopoverBody>
-          </PopoverContent>
-        </Portal>
-      </Popover>
+        </TooltipTrigger>
+        <TooltipPortal>
+          <TooltipContent variant="popover" side="bottom" className="text-left">
+            <div className="mb-1 font-semibold">Syncing members</div>
+            <div>
+              <p>
+                Updating all member accesses. This can take a few hours, feel free to
+                come back later!
+              </p>
+              <StatusProgress data={data} status={status} />
+            </div>
+          </TooltipContent>
+        </TooltipPortal>
+      </Tooltip>
     )
 
-  return <MemberCount mt="3px !important" {...rest} />
+  return <MemberCount {...rest} />
 }
 
-const StatusProgress = ({ data, status }) => {
-  const percentage = (data.doneChunks / data.totalChunks) * 100
+const StatusProgress = ({
+  data,
+  status,
+}: Pick<ReturnType<typeof useActiveStatusUpdates>, "data" | "status">) => {
+  const percentage = !!data ? data.doneChunks / data.totalChunks : 0
 
   return (
-    <HStack mt="3" mb="1">
-      <Progress
-        value={status === null ? 100 : percentage || 1}
-        colorScheme="blue"
-        size="sm"
-        borderRadius={"full"}
-        flex={1}
-        transition="width .3s"
-      />
-      <Text colorScheme="gray" fontSize="sm" fontWeight={"bold"} flexShrink={0}>
+    <div className="mt-3 mb-1 flex items-center gap-1">
+      <ProgressRoot>
+        <ProgressIndicator value={status === null ? 1 : percentage || 0.01} />
+      </ProgressRoot>
+      <span className="shrink-0 font-bold text-muted-foreground text-sm">
         {percentage.toFixed(0)}%
-      </Text>
-    </HStack>
+      </span>
+    </div>
   )
 }
 
-export const RoleCardMemberCount = ({
+const RoleCardMemberCount = ({
   memberCount,
   roleId,
   lastSyncedAt,
@@ -127,21 +107,19 @@ export const RoleCardMemberCount = ({
   const { isSuperAdmin } = useUser()
 
   return (
-    <MemberCountWithSyncIndicator memberCount={memberCount} roleId={roleId}>
+    <MemberCountWithSyncIndicator
+      memberCount={memberCount}
+      roleId={roleId}
+      className="!bg-transparent text-muted-foreground"
+    >
       {isSuperAdmin ? (
         <MemberCountLastSyncTooltip lastSyncedAt={lastSyncedAt}>
-          <PopoverFooter
-            pt={0.5}
-            pb={3}
-            display="flex"
-            justifyContent={"flex-end"}
-            border={0}
-          >
+          <div className="mt-2 flex justify-end">
             <SyncRoleButton roleId={roleId} />
-          </PopoverFooter>
+          </div>
         </MemberCountLastSyncTooltip>
       ) : isAdmin &&
-        featureFlags.includes("PERIODIC_SYNC") &&
+        featureFlags?.includes("PERIODIC_SYNC") &&
         /* temporarily only showing for superAdmins when lastSyncedAt is null, until we know what to communicate to admins in this case */
         lastSyncedAt ? (
         <MemberCountLastSyncTooltip lastSyncedAt={lastSyncedAt} />
@@ -150,4 +128,4 @@ export const RoleCardMemberCount = ({
   )
 }
 
-export default MemberCount
+export { MemberCount, MemberCountWithSyncIndicator, RoleCardMemberCount }
diff --git a/src/components/[guild]/RoleCard/components/MemberCountLastSyncTooltip.tsx b/src/components/[guild]/RoleCard/components/MemberCountLastSyncTooltip.tsx
index 008049c3f7..0f31a4ecb9 100644
--- a/src/components/[guild]/RoleCard/components/MemberCountLastSyncTooltip.tsx
+++ b/src/components/[guild]/RoleCard/components/MemberCountLastSyncTooltip.tsx
@@ -1,17 +1,14 @@
+import { Button } from "@/components/ui/Button"
 import {
-  Popover,
-  PopoverArrow,
-  PopoverContent,
-  PopoverHeader,
-  PopoverTrigger,
-  Portal,
-  TagRightIcon,
-} from "@chakra-ui/react"
-import { Info, UserSwitch } from "@phosphor-icons/react"
-import Button from "components/common/Button"
-import useShowErrorToast from "hooks/useShowErrorToast"
+  Tooltip,
+  TooltipContent,
+  TooltipPortal,
+  TooltipTrigger,
+} from "@/components/ui/Tooltip"
+import { useErrorToast } from "@/components/ui/hooks/useErrorToast"
+import { useToast } from "@/components/ui/hooks/useToast"
+import { Info, UserSwitch } from "@phosphor-icons/react/dist/ssr"
 import useSubmit from "hooks/useSubmit"
-import useToast from "hooks/useToast"
 import { PropsWithChildren, useMemo } from "react"
 import fetcher from "utils/fetcher"
 import formatRelativeTimeFromNow, {
@@ -44,35 +41,30 @@ const MemberCountLastSyncTooltip = ({
   }, [lastSyncedAt])
 
   return (
-    <Popover trigger="hover" placement="bottom" isLazy>
-      <PopoverTrigger>
-        <TagRightIcon
-          as={Info}
-          opacity={0}
-          _groupHover={{ opacity: 1 }}
-          transition={"opacity .2s"}
-          mt="1px"
+    <Tooltip>
+      <TooltipTrigger className="group/trigger">
+        <Info
+          weight="bold"
+          className="opacity-0 transition-opacity group-hover:opacity-100 group-[&:not([data-state=closed])]/trigger:opacity-100"
         />
-      </PopoverTrigger>
-      <Portal>
-        <PopoverContent minW="max-content">
-          <PopoverArrow />
-          <PopoverHeader
-            border="0"
-            px={3}
-            fontSize={"sm"}
-            fontWeight={"medium"}
-          >{`Last updated all member accesses ${readableDate} ago`}</PopoverHeader>
+      </TooltipTrigger>
+      <TooltipPortal>
+        <TooltipContent
+          variant="popover"
+          side="bottom"
+          className="min-w-max text-left"
+        >
+          <p className="font-medium text-sm">{`Last updated all member accesses ${readableDate} ago`}</p>
           {children}
-        </PopoverContent>
-      </Portal>
-    </Popover>
+        </TooltipContent>
+      </TooltipPortal>
+    </Tooltip>
   )
 }
 
 export const SyncRoleButton = ({ roleId }) => {
-  const toast = useToast()
-  const showErrorToast = useShowErrorToast()
+  const { toast } = useToast()
+  const errorToast = useErrorToast()
 
   const submit = () =>
     // TODO: use fetcherWithSign (with params in array) when the BE will add auth back
@@ -81,22 +73,18 @@ export const SyncRoleButton = ({ roleId }) => {
   const { onSubmit, isLoading } = useSubmit(submit, {
     onSuccess: () => {
       toast({
-        status: "success",
+        variant: "success",
         title: "Successfully moved job to the start of the queue",
       })
     },
-    onError: (err) => {
-      showErrorToast(err)
-    },
+    onError: (err) => errorToast(err),
   })
 
   return (
     <Button
       size="sm"
       variant="outline"
-      leftIcon={<UserSwitch />}
-      borderRadius="lg"
-      borderWidth="1.5px"
+      leftIcon={<UserSwitch weight="bold" />}
       onClick={onSubmit}
       isLoading={isLoading}
     >
@@ -105,4 +93,4 @@ export const SyncRoleButton = ({ roleId }) => {
   )
 }
 
-export default MemberCountLastSyncTooltip
+export { MemberCountLastSyncTooltip }
diff --git a/src/components/[guild]/RoleOptionCard.tsx b/src/components/[guild]/RoleOptionCard.tsx
index 99afd0bea8..de9dc1ecd9 100644
--- a/src/components/[guild]/RoleOptionCard.tsx
+++ b/src/components/[guild]/RoleOptionCard.tsx
@@ -1,5 +1,5 @@
 import { Checkbox, CheckboxProps, HStack, Heading } from "@chakra-ui/react"
-import MemberCount from "components/[guild]/RoleCard/components/MemberCount"
+import { MemberCount } from "components/[guild]/RoleCard/components/MemberCount"
 import Card from "components/common/Card"
 import GuildLogo from "components/common/GuildLogo"
 import { forwardRef } from "react"
@@ -36,7 +36,10 @@ const RoleOptionCard = forwardRef(
           >
             {role.name}
           </Heading>
-          <MemberCount memberCount={role.members?.length ?? role.memberCount} />
+          <MemberCount
+            memberCount={role.members?.length ?? role.memberCount}
+            className="!bg-transparent text-muted-foreground"
+          />
         </HStack>
       </Checkbox>
     </Card>
diff --git a/src/components/[guild]/crm/ExportMembers/ExportCard/ExportCard.tsx b/src/components/[guild]/crm/ExportMembers/ExportCard/ExportCard.tsx
index 965d137e66..5873cb9d57 100644
--- a/src/components/[guild]/crm/ExportMembers/ExportCard/ExportCard.tsx
+++ b/src/components/[guild]/crm/ExportMembers/ExportCard/ExportCard.tsx
@@ -8,7 +8,7 @@ import {
   Tooltip,
 } from "@chakra-ui/react"
 import { Download } from "@phosphor-icons/react"
-import MemberCount from "components/[guild]/RoleCard/components/MemberCount"
+import { MemberCount } from "components/[guild]/RoleCard/components/MemberCount"
 import useGuild from "components/[guild]/hooks/useGuild"
 import Card from "components/common/Card"
 import CardMotionWrapper from "components/common/CardMotionWrapper"
@@ -53,7 +53,10 @@ const ExportCard = ({ exp }: { exp: ExportData }) => {
         </Box>
         {exp.status === "FINISHED" ? (
           <>
-            <MemberCount memberCount={exp.data.count} mt="0" mr="0.5" size="sm" />
+            <MemberCount
+              memberCount={exp.data.count}
+              className="!bg-transparent mt-0 mr-0.5 text-muted-foreground"
+            />
             <DownloadExportButton filename={exp.filename} />
           </>
         ) : exp.status === "FAILED" ? (
diff --git a/src/components/[guild]/crm/FilterByRoles/FilterByRoles.tsx b/src/components/[guild]/crm/FilterByRoles/FilterByRoles.tsx
index 0a29d88489..9b6df3beb8 100644
--- a/src/components/[guild]/crm/FilterByRoles/FilterByRoles.tsx
+++ b/src/components/[guild]/crm/FilterByRoles/FilterByRoles.tsx
@@ -233,6 +233,7 @@ const RoleCheckbox = memo(({ role, isChecked, onChange }: RoleCheckboxProps) =>
           roleId={role.id}
           memberCount={role.memberCount}
           size="sm"
+          className="!bg-transparent text-muted-foreground"
         />
       </HStack>
     </Checkbox>
diff --git a/src/hooks/useActiveStatusUpdates.ts b/src/hooks/useActiveStatusUpdates.ts
index f011189d5a..ac8c4ba122 100644
--- a/src/hooks/useActiveStatusUpdates.ts
+++ b/src/hooks/useActiveStatusUpdates.ts
@@ -56,8 +56,8 @@ const useActiveStatusUpdates = (roleId?: number, onSuccess?: () => void) => {
     status:
       dataToReturn?.length > 0
         ? dataToReturn.every((job) => job.done)
-          ? "DONE"
-          : "STARTED"
+          ? ("DONE" as const)
+          : ("STARTED" as const)
         : null,
     isValidating,
     mutate,