Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

refactor organizations

Bill Yang79f64f8a1dfb
diff --git a/client/src/api/admin/organizations.ts b/client/src/api/admin/organizations.ts
new file mode 100644
index 000000000..72926e048
--- /dev/null
+++ b/client/src/api/admin/organizations.ts
@@ -0,0 +1,27 @@
+import { useQuery } from "@tanstack/react-query";
+import { BACKEND_URL } from "../../lib/const";
+import { authedFetch } from "../utils";
+import { APIResponse } from "../types";
+
+export type UserOrganization = {
+ id: string;
+ name: string;
+ slug: string;
+ logo: string | null;
+ createdAt: string;
+ metadata: string | null;
+ role: string;
+};
+
+export function getUserOrganizations(): Promise<UserOrganization[]> {
+ return authedFetch(`${BACKEND_URL}/user/organizations`).then((res) =>
+ res.json()
+ );
+}
+
+export function useUserOrganizations() {
+ return useQuery({
+ queryKey: ["userOrganizations"],
+ queryFn: getUserOrganizations,
+ });
+}
diff --git a/client/src/api/admin/sites.ts b/client/src/api/admin/sites.ts
index d8528b75e..9d46e458c 100644
--- a/client/src/api/admin/sites.ts
+++ b/client/src/api/admin/sites.ts
@@ -54,3 +54,11 @@ export function changeSiteDomain(siteId: number, newDomain: string) {
export function useSiteHasData(siteId: string) {
return useGenericQuery<boolean>(`site-has-data/${siteId}`);
}
+
+export function useGetSiteMetadata(siteId: string | number) {
+ const { data, isLoading } = useGetSites();
+ return {
+ siteMetadata: data?.data?.find((site) => site.siteId === Number(siteId)),
+ isLoading,
+ };
+}
diff --git a/client/src/api/hooks.ts b/client/src/api/hooks.ts
deleted file mode 100644
index cb2169ee9..000000000
--- a/client/src/api/hooks.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { useQuery } from "@tanstack/react-query";
-import { BACKEND_URL } from "../lib/const";
-import { useGetSites } from "./admin/sites";
-import { authedFetch } from "./utils";
-
-export function useGetSiteMetadata(siteId: string | number) {
- const { data, isLoading } = useGetSites();
- return {
- siteMetadata: data?.data?.find((site) => site.siteId === Number(siteId)),
- isLoading,
- };
-}
-
-export function useUserOrganizations() {
- const { data: orgsData, isLoading: orgsLoading } = useQuery({
- queryKey: ["userOrganizations"],
- queryFn: () =>
- authedFetch(`${BACKEND_URL}/user/organizations`).then((res) =>
- res.json()
- ),
- });
-
- return {
- organizations: orgsData?.data || [],
- isLoading: orgsLoading,
- };
-}
diff --git a/client/src/app/[site]/layout.tsx b/client/src/app/[site]/layout.tsx
index 5f10cf3cb..8942760df 100644
--- a/client/src/app/[site]/layout.tsx
+++ b/client/src/app/[site]/layout.tsx
@@ -4,8 +4,7 @@ import { useEffect } from "react";
import { useStore } from "../../lib/store";
import { useSyncStateWithUrl } from "../../lib/urlParams";
import { Header } from "./Header/Header";
-import { useSiteHasData } from "../../api/admin/sites";
-import { useGetSiteMetadata } from "../../api/hooks";
+import { useSiteHasData, useGetSiteMetadata } from "../../api/admin/sites";
import { NoData } from "./components/NoData";
export default function SiteLayout({
diff --git a/client/src/app/[site]/main/page.tsx b/client/src/app/[site]/main/page.tsx
index 2821f6fb7..ef5782006 100644
--- a/client/src/app/[site]/main/page.tsx
+++ b/client/src/app/[site]/main/page.tsx
@@ -1,8 +1,6 @@
"use client";
-import { useSiteHasData } from "../../../api/admin/sites";
-import { useGetSiteMetadata } from "../../../api/hooks";
+import { useGetSiteMetadata } from "../../../api/admin/sites";
import { useStore } from "../../../lib/store";
-import { NoData } from "../components/NoData";
import { SubHeader } from "../components/SubHeader/SubHeader";
import { MainSection } from "./components/MainSection/MainSection";
import { Browsers } from "./components/sections/Browsers";
diff --git a/client/src/app/[site]/user/[userId]/page.tsx b/client/src/app/[site]/user/[userId]/page.tsx
index cf42087de..01bece6ce 100644
--- a/client/src/app/[site]/user/[userId]/page.tsx
+++ b/client/src/app/[site]/user/[userId]/page.tsx
@@ -6,13 +6,13 @@ import { Browser } from "../../components/shared/icons/Browser";
import { OperatingSystem } from "../../components/shared/icons/OperatingSystem";
import { CountryFlag } from "../../components/shared/icons/CountryFlag";
import { getCountryName } from "@/lib/utils";
-import { useGetSiteMetadata } from "../../../../api/hooks";
import { useStore } from "../../../../lib/store";
import { DateTime } from "luxon";
import {
useGetUserSessions,
UserSessionsResponse,
} from "../../../../api/analytics/userSessions";
+import { useGetSiteMetadata } from "../../../../api/admin/sites";
// Helper function to format duration in seconds to a readable format
const formatDuration = (seconds: number): string => {
diff --git a/client/src/app/settings/organizations/page.tsx b/client/src/app/settings/organizations/page.tsx
index 8f106f94c..59143dada 100644
--- a/client/src/app/settings/organizations/page.tsx
+++ b/client/src/app/settings/organizations/page.tsx
@@ -21,8 +21,11 @@ import { DeleteOrganizationDialog } from "./components/DeleteOrganizationDialog"
import { EditOrganizationDialog } from "./components/EditOrganizationDialog";
import { InviteMemberDialog } from "./components/InviteMemberDialog";
import { RemoveMemberDialog } from "./components/RemoveMemberDialog";
-import { useUserOrganizations } from "../../../api/hooks";
import { useOrganizationMembers } from "../../../api/admin/auth";
+import {
+ UserOrganization,
+ useUserOrganizations,
+} from "../../../api/admin/organizations";
// Types for our component
export type Organization = {
@@ -47,7 +50,7 @@ export type Member = {
};
// Organization Component with Members Table
-function Organization({ org }: { org: Organization }) {
+function Organization({ org }: { org: UserOrganization }) {
const { data: members, refetch } = useOrganizationMembers(org.id);
const { data } = authClient.useSession();
@@ -143,30 +146,11 @@ function Organization({ org }: { org: Organization }) {
);
}
-// OrganizationsInner component
-function OrganizationsInner({
- organizations,
-}: {
- organizations: Organization[];
-}) {
- return (
- <div className="flex flex-col gap-6">
- {organizations?.map((organization) => (
- <Organization key={organization.id} org={organization} />
- ))}
- </div>
- );
-}
-
// Main Organizations component
export default function Organizations() {
- const userOrganizations = authClient.useListOrganizations();
+ const { data, isLoading } = useUserOrganizations();
- const { organizations, isLoading } = useUserOrganizations();
-
- console.log(organizations);
-
- if (userOrganizations.isPending) {
+ if (isLoading) {
return (
<div className="flex justify-center py-8">
<div className="animate-pulse">Loading organizations...</div>
@@ -174,7 +158,7 @@ export default function Organizations() {
);
}
- if (!userOrganizations.data) {
+ if (!data?.length) {
return (
<Card className="p-6 text-center text-muted-foreground">
No organizations found
@@ -182,5 +166,11 @@ export default function Organizations() {
);
}
- return <OrganizationsInner organizations={userOrganizations.data as any} />;
+ return (
+ <div className="flex flex-col gap-6">
+ {data?.map((organization) => (
+ <Organization key={organization.id} org={organization} />
+ ))}
+ </div>
+ );
}
diff --git a/client/src/components/SiteSettings/SiteSettings.tsx b/client/src/components/SiteSettings/SiteSettings.tsx
index 2e0773bc7..32f8bf196 100644
--- a/client/src/components/SiteSettings/SiteSettings.tsx
+++ b/client/src/components/SiteSettings/SiteSettings.tsx
@@ -34,10 +34,10 @@ import {
changeSiteDomain,
deleteSite,
GetSitesResponse,
+ useGetSiteMetadata,
useGetSites,
} from "@/api/admin/sites";
import { BACKEND_URL } from "@/lib/const";
-import { useGetSiteMetadata } from "../../api/hooks";
interface SiteSettingsProps {
siteId: number;
diff --git a/server/src/api/getUserOrganizations.ts b/server/src/api/user/getUserOrganizations.ts
similarity index 57%
rename from server/src/api/getUserOrganizations.ts
rename to server/src/api/user/getUserOrganizations.ts
index faf89866a..5b318b9a9 100644
--- a/server/src/api/getUserOrganizations.ts
+++ b/server/src/api/user/getUserOrganizations.ts
@@ -1,8 +1,8 @@
import { FastifyRequest, FastifyReply } from "fastify";
-import { db } from "../db/postgres/postgres.js";
+import { db } from "../../db/postgres/postgres.js";
import { eq } from "drizzle-orm";
-import { member, organization } from "../db/postgres/schema.js";
-import { getSession } from "../lib/auth-utils.js";
+import { member, organization } from "../../db/postgres/schema.js";
+import { getSession } from "../../lib/auth-utils.js";
export const getUserOrganizations = async (
request: FastifyRequest,
@@ -17,22 +17,21 @@ export const getUserOrganizations = async (
const userOrganizations = await db
.select({
- organization: organization,
+ id: organization.id,
+ name: organization.name,
+ slug: organization.slug,
+ logo: organization.logo,
+ createdAt: organization.createdAt,
+ metadata: organization.metadata,
role: member.role,
})
.from(member)
.innerJoin(organization, eq(member.organizationId, organization.id))
.where(eq(member.userId, session?.user.id));
- return reply.send({
- success: true,
- data: userOrganizations,
- });
+ return reply.send(userOrganizations);
} catch (error) {
console.error("Error fetching user organizations:", error);
- return reply.status(500).send({
- success: false,
- error: "Failed to fetch user organizations",
- });
+ return reply.status(500).send("Failed to fetch user organizations");
}
};
diff --git a/server/src/api/getUserSubscription.ts b/server/src/api/user/getUserSubscription.ts
similarity index 88%
rename from server/src/api/getUserSubscription.ts
rename to server/src/api/user/getUserSubscription.ts
index a66822247..c121a87fe 100644
--- a/server/src/api/getUserSubscription.ts
+++ b/server/src/api/user/getUserSubscription.ts
@@ -1,10 +1,10 @@
import { FastifyRequest, FastifyReply } from "fastify";
-import { getSession } from "../lib/auth-utils.js";
-import { getUserEventLimit } from "./sites/getSites.js";
-import { db } from "../db/postgres/postgres.js";
-import { user, subscription } from "../db/postgres/schema.js";
+import { getSession } from "../../lib/auth-utils.js";
+import { getUserEventLimit } from "../sites/getSites.js";
+import { db } from "../../db/postgres/postgres.js";
+import { user, subscription } from "../../db/postgres/schema.js";
import { eq, and, inArray } from "drizzle-orm";
-import { STRIPE_PRICES } from "../lib/const.js";
+import { STRIPE_PRICES } from "../../lib/const.js";
// Define the plan interface
interface StripePlan {
diff --git a/server/src/index.ts b/server/src/index.ts
index cae0b6dca..f42940a65 100644
--- a/server/src/index.ts
+++ b/server/src/index.ts
@@ -27,9 +27,9 @@ import { auth } from "./lib/auth.js";
import { mapHeaders } from "./lib/auth-utils.js";
import { trackPageView } from "./tracker/trackPageView.js";
import { listOrganizationMembers } from "./api/listOrganizationMembers.js";
-import { getUserOrganizations } from "./api/getUserOrganizations.js";
+import { getUserOrganizations } from "./api/user/getUserOrganizations.js";
import { initializeCronJobs } from "./cron/index.js";
-import { getUserSubscription } from "./api/getUserSubscription.js";
+import { getUserSubscription } from "./api/user/getUserSubscription.js";
const __filename = fileURLToPath(import.meta.url);
const __dirname = dirname(__filename);