improve useLinksCount

sujjeee · Oct 7, 2024 · b20303f · b20303f
1 parent d1bcbd9
commit b20303f
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 43 deletions.
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/settings/tags/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/settings/tags/page-client.tsx
@@ -26,7  26,12 @@ export default function WorkspaceTagsClient() {
   const { AddEditTagModal, AddTagButton } = useAddEditTagModal();
 
   const { tags, loading } = useTags();
-  const { data: tagsCount } = useLinksCount({
   const { data: tagsCount } = useLinksCount<
     {
       tagId: string;
       _count: number;
     }[]
   >({
     groupBy: "tagId",
     showArchived: true,
   });

diff --git a/apps/web/lib/swr/use-links-count.ts b/apps/web/lib/swr/use-links-count.ts
@@ -8,7  8,7 @@ import useWorkspace from "./use-workspace";
 
 const partialQuerySchema = getLinksCountQuerySchema.partial();
 
-export default function useLinksCount(
 export default function useLinksCount<T = any>(
   opts: z.infer<typeof partialQuerySchema> & { ignoreParams?: boolean } = {},
 ) {
   const { id: workspaceId } = useWorkspace();
@@ -49,7  49,7 @@ export default function useLinksCount(
   );
 
   return {
-    data,
     data: data as T,
     loading: !error && data === undefined,
     error,
   };

diff --git a/apps/web/ui/layout/toolbar/onboarding/onboarding-button.tsx b/apps/web/ui/layout/toolbar/onboarding/onboarding-button.tsx
@@ -31,7  31,7 @@ function OnboardingButtonInner({
   const { slug } = useParams() as { slug: string };
 
   const { data: domainsCount, loading: domainsLoading } = useDomainsCount();
-  const { data: linksCount, loading: linksLoading } = useLinksCount({
   const { data: linksCount, loading: linksLoading } = useLinksCount<number>({
     ignoreParams: true,
   });
   const { users, loading: usersLoading } = useUsers();

diff --git a/apps/web/ui/links/archived-links-hint.tsx b/apps/web/ui/links/archived-links-hint.tsx
@@ -15,8  15,8 @@ export default function ArchivedLinksHint() {
 }
 
 function ArchivedLinksHintHelper() {
-  const { data: count } = useLinksCount();
-  const { data: totalCount } = useLinksCount({ showArchived: true });
   const { data: count } = useLinksCount<number>();
   const { data: totalCount } = useLinksCount<number>({ showArchived: true });
   const archivedCount = totalCount - count;
 
   const { setShowArchived } = useContext(LinksDisplayContext);

diff --git a/apps/web/ui/links/links-container.tsx b/apps/web/ui/links/links-container.tsx
@@ -39,7  39,7 @@ export default function LinksContainer({
   const { viewMode, sort, showArchived } = useContext(LinksDisplayContext);
 
   const { links, isValidating } = useLinks({ sort, showArchived });
-  const { data: count } = useLinksCount({ showArchived });
   const { data: count } = useLinksCount<number>({ showArchived });
 
   return (
     <MaxWidthWrapper className="grid gap-y-2">

diff --git a/apps/web/ui/links/use-link-filters.tsx b/apps/web/ui/links/use-link-filters.tsx
@@ -1,10  1,8 @@
-import useDomains from "@/lib/swr/use-domains";
 import useLinksCount from "@/lib/swr/use-links-count";
 import useTags from "@/lib/swr/use-tags";
 import useUsers from "@/lib/swr/use-users";
-import useWorkspace from "@/lib/swr/use-workspace";
 import { Avatar, BlurImage, Globe, Tag, User, useRouterStuff } from "@dub/ui";
-import { DUB_WORKSPACE_ID, GOOGLE_FAVICON_URL, nFormatter } from "@dub/utils";
 import { GOOGLE_FAVICON_URL, nFormatter } from "@dub/utils";
 import { useContext, useMemo } from "react";
 import { LinksDisplayContext } from "./links-display-provider";
 import TagBadge from "./tag-badge";
@@ -143,50  141,40 @@ export function useLinkFilters() {
 }
 
 function useDomainFilterOptions() {
-  const { id: workspaceId } = useWorkspace();
   const { showArchived } = useContext(LinksDisplayContext);
 
-  const { data: domainsCount } = useLinksCount({
   const { data: domainsCount } = useLinksCount<
     {
       domain: string;
       _count: number;
     }[]
   >({
     groupBy: "domain",
     showArchived,
   });
-  const { activeWorkspaceDomains, activeDefaultDomains } = useDomains();
 
   return useMemo(() => {
-    if (domainsCount?.length === 0) return [];
-
-    const workspaceDomains = activeWorkspaceDomains?.map((domain) => ({
-      ...domain,
-      count:
-        domainsCount?.find(({ domain: d }) => d === domain.slug)?._count || 0,
-    }));
-
-    const defaultDomains =
-      workspaceId === `ws_${DUB_WORKSPACE_ID}`
-        ? []
-        : activeDefaultDomains
-            ?.map((domain) => ({
-              ...domain,
-              count:
-                domainsCount?.find(({ domain: d }) => d === domain.slug)
-                  ?._count || 0,
-            }))
-            .filter((d) => d.count > 0);
-
-    const finalOptions = [
-      ...(workspaceDomains || []),
-      ...(defaultDomains || []),
-    ].sort((a, b) => b.count - a.count);
-
-    return finalOptions;
-  }, [activeWorkspaceDomains, activeDefaultDomains, domainsCount, workspaceId]);
     if (!domainsCount || domainsCount.length === 0) return [];
 
     return domainsCount
       .map(({ domain, _count }) => ({
         slug: domain,
         count: _count,
       }))
       .sort((a, b) => b.count - a.count);
   }, [domainsCount]);
 }
 
 function useTagFilterOptions() {
   const { tags } = useTags();
   const { showArchived } = useContext(LinksDisplayContext);
 
-  const { data: tagsCount } = useLinksCount({ groupBy: "tagId", showArchived });
   const { data: tagsCount } = useLinksCount<
     {
       tagId: string;
       _count: number;
     }[]
   >({ groupBy: "tagId", showArchived });
 
   return useMemo(
     () =>
@@ -204,7  192,12 @@ function useUserFilterOptions() {
   const { users } = useUsers();
   const { showArchived } = useContext(LinksDisplayContext);
 
-  const { data: usersCount } = useLinksCount({
   const { data: usersCount } = useLinksCount<
     {
       userId: string;
       _count: number;
     }[]
   >({
     groupBy: "userId",
     showArchived,
   });

diff --git a/apps/web/ui/modals/complete-setup-modal.tsx b/apps/web/ui/modals/complete-setup-modal.tsx
@@ -25,7  25,7 @@ function CompleteSetupModal({
   const { slug } = useParams() as { slug: string };
 
   const { data: domainsCount } = useDomainsCount();
-  const { data: linksCount } = useLinksCount({ ignoreParams: true });
   const { data: linksCount } = useLinksCount<number>({ ignoreParams: true });
   const { users } = useUsers();
   const { users: invites } = useUsers({ invites: true });
   const { setShowLinkBuilder } = useContext(ModalContext);