mirror of
https://github.com/andwati/dokploy.git
synced 2026-11-17 01:15:19 +00:00
Refactor organization management in Sidebar: streamline organization selection and default setting logic. Update API to return organization memberships with default status. Improve UI for organization actions in the sidebar.
This commit is contained in:
@@ -498,7 +498,6 @@ function SidebarLogo() {
|
|||||||
const { data: isCloud } = api.settings.isCloud.useQuery();
|
const { data: isCloud } = api.settings.isCloud.useQuery();
|
||||||
const { data: user } = api.user.get.useQuery();
|
const { data: user } = api.user.get.useQuery();
|
||||||
const { data: session } = authClient.useSession();
|
const { data: session } = authClient.useSession();
|
||||||
|
|
||||||
const {
|
const {
|
||||||
data: organizations,
|
data: organizations,
|
||||||
refetch,
|
refetch,
|
||||||
@@ -597,118 +596,124 @@ function SidebarLogo() {
|
|||||||
<DropdownMenuLabel className="text-xs text-muted-foreground">
|
<DropdownMenuLabel className="text-xs text-muted-foreground">
|
||||||
Organizations
|
Organizations
|
||||||
</DropdownMenuLabel>
|
</DropdownMenuLabel>
|
||||||
{organizations?.map((org) => (
|
{organizations?.map((org) => {
|
||||||
<div className="flex flex-row justify-between" key={org.name}>
|
const isDefault = org.members?.[0]?.isDefault ?? false;
|
||||||
<DropdownMenuItem
|
return (
|
||||||
onClick={async () => {
|
<div
|
||||||
await authClient.organization.setActive({
|
className="flex flex-row justify-between"
|
||||||
organizationId: org.id,
|
key={org.name}
|
||||||
});
|
|
||||||
window.location.reload();
|
|
||||||
}}
|
|
||||||
className="w-full gap-2 p-2"
|
|
||||||
>
|
>
|
||||||
<div className="flex flex-col gap-1">
|
<DropdownMenuItem
|
||||||
<div className="flex items-center gap-2">
|
onClick={async () => {
|
||||||
{org.name}
|
await authClient.organization.setActive({
|
||||||
|
organizationId: org.id,
|
||||||
|
});
|
||||||
|
window.location.reload();
|
||||||
|
}}
|
||||||
|
className="w-full gap-2 p-2"
|
||||||
|
>
|
||||||
|
<div className="flex flex-col gap-1">
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
{org.name}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<div className="flex size-6 items-center justify-center rounded-sm border">
|
||||||
<div className="flex size-6 items-center justify-center rounded-sm border">
|
<Logo
|
||||||
<Logo
|
className={cn(
|
||||||
className={cn(
|
"transition-all",
|
||||||
"transition-all",
|
state === "collapsed" ? "size-6" : "size-10",
|
||||||
state === "collapsed" ? "size-6" : "size-10",
|
)}
|
||||||
)}
|
logoUrl={org.logo ?? undefined}
|
||||||
logoUrl={org.logo ?? undefined}
|
/>
|
||||||
/>
|
</div>
|
||||||
</div>
|
</DropdownMenuItem>
|
||||||
</DropdownMenuItem>
|
{org.ownerId === session?.user?.id && (
|
||||||
{org.ownerId === session?.user?.id && (
|
<div className="flex items-center gap-2">
|
||||||
<div className="flex items-center gap-2">
|
|
||||||
<Button
|
|
||||||
variant="ghost"
|
|
||||||
size="icon"
|
|
||||||
className={cn(
|
|
||||||
"group",
|
|
||||||
org.isDefault
|
|
||||||
? "hover:bg-yellow-500/10"
|
|
||||||
: "hover:bg-blue-500/10",
|
|
||||||
)}
|
|
||||||
isLoading={isSettingDefault && !org.isDefault}
|
|
||||||
disabled={org.isDefault}
|
|
||||||
onClick={async (e) => {
|
|
||||||
if (org.isDefault) return;
|
|
||||||
e.stopPropagation();
|
|
||||||
await setDefaultOrganization({
|
|
||||||
organizationId: org.id,
|
|
||||||
})
|
|
||||||
.then(() => {
|
|
||||||
refetch();
|
|
||||||
toast.success("Default organization updated");
|
|
||||||
})
|
|
||||||
.catch((error) => {
|
|
||||||
toast.error(
|
|
||||||
error?.message ||
|
|
||||||
"Error setting default organization",
|
|
||||||
);
|
|
||||||
});
|
|
||||||
}}
|
|
||||||
title={
|
|
||||||
org.isDefault
|
|
||||||
? "Default organization"
|
|
||||||
: "Set as default"
|
|
||||||
}
|
|
||||||
>
|
|
||||||
{org.isDefault ? (
|
|
||||||
<Star
|
|
||||||
fill="#eab308"
|
|
||||||
stroke="#eab308"
|
|
||||||
className="size-4 text-yellow-500"
|
|
||||||
/>
|
|
||||||
) : (
|
|
||||||
<Star
|
|
||||||
fill="none"
|
|
||||||
stroke="currentColor"
|
|
||||||
className="size-4 text-gray-400 group-hover:text-blue-500 transition-colors"
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</Button>
|
|
||||||
<AddOrganization organizationId={org.id} />
|
|
||||||
<DialogAction
|
|
||||||
title="Delete Organization"
|
|
||||||
description="Are you sure you want to delete this organization?"
|
|
||||||
type="destructive"
|
|
||||||
onClick={async () => {
|
|
||||||
await deleteOrganization({
|
|
||||||
organizationId: org.id,
|
|
||||||
})
|
|
||||||
.then(() => {
|
|
||||||
refetch();
|
|
||||||
toast.success(
|
|
||||||
"Organization deleted successfully",
|
|
||||||
);
|
|
||||||
})
|
|
||||||
.catch((error) => {
|
|
||||||
toast.error(
|
|
||||||
error?.message ||
|
|
||||||
"Error deleting organization",
|
|
||||||
);
|
|
||||||
});
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<Button
|
<Button
|
||||||
variant="ghost"
|
variant="ghost"
|
||||||
size="icon"
|
size="icon"
|
||||||
className="group hover:bg-red-500/10"
|
className={cn(
|
||||||
isLoading={isRemoving}
|
"group",
|
||||||
|
isDefault
|
||||||
|
? "hover:bg-yellow-500/10"
|
||||||
|
: "hover:bg-blue-500/10",
|
||||||
|
)}
|
||||||
|
isLoading={isSettingDefault && !isDefault}
|
||||||
|
disabled={isDefault}
|
||||||
|
onClick={async (e) => {
|
||||||
|
if (isDefault) return;
|
||||||
|
e.stopPropagation();
|
||||||
|
await setDefaultOrganization({
|
||||||
|
organizationId: org.id,
|
||||||
|
})
|
||||||
|
.then(() => {
|
||||||
|
refetch();
|
||||||
|
toast.success("Default organization updated");
|
||||||
|
})
|
||||||
|
.catch((error) => {
|
||||||
|
toast.error(
|
||||||
|
error?.message ||
|
||||||
|
"Error setting default organization",
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}}
|
||||||
|
title={
|
||||||
|
isDefault
|
||||||
|
? "Default organization"
|
||||||
|
: "Set as default"
|
||||||
|
}
|
||||||
>
|
>
|
||||||
<Trash2 className="size-4 text-primary group-hover:text-red-500" />
|
{isDefault ? (
|
||||||
|
<Star
|
||||||
|
fill="#eab308"
|
||||||
|
stroke="#eab308"
|
||||||
|
className="size-4 text-yellow-500"
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<Star
|
||||||
|
fill="none"
|
||||||
|
stroke="currentColor"
|
||||||
|
className="size-4 text-gray-400 group-hover:text-blue-500 transition-colors"
|
||||||
|
/>
|
||||||
|
)}
|
||||||
</Button>
|
</Button>
|
||||||
</DialogAction>
|
<AddOrganization organizationId={org.id} />
|
||||||
</div>
|
<DialogAction
|
||||||
)}
|
title="Delete Organization"
|
||||||
</div>
|
description="Are you sure you want to delete this organization?"
|
||||||
))}
|
type="destructive"
|
||||||
|
onClick={async () => {
|
||||||
|
await deleteOrganization({
|
||||||
|
organizationId: org.id,
|
||||||
|
})
|
||||||
|
.then(() => {
|
||||||
|
refetch();
|
||||||
|
toast.success(
|
||||||
|
"Organization deleted successfully",
|
||||||
|
);
|
||||||
|
})
|
||||||
|
.catch((error) => {
|
||||||
|
toast.error(
|
||||||
|
error?.message ||
|
||||||
|
"Error deleting organization",
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
size="icon"
|
||||||
|
className="group hover:bg-red-500/10"
|
||||||
|
isLoading={isRemoving}
|
||||||
|
>
|
||||||
|
<Trash2 className="size-4 text-primary group-hover:text-red-500" />
|
||||||
|
</Button>
|
||||||
|
</DialogAction>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
})}
|
||||||
{(user?.role === "owner" || isCloud) && (
|
{(user?.role === "owner" || isCloud) && (
|
||||||
<>
|
<>
|
||||||
<DropdownMenuSeparator />
|
<DropdownMenuSeparator />
|
||||||
|
|||||||
@@ -46,85 +46,16 @@ export const organizationRouter = createTRPCRouter({
|
|||||||
where: eq(member.userId, ctx.user.id),
|
where: eq(member.userId, ctx.user.id),
|
||||||
});
|
});
|
||||||
|
|
||||||
const isFirstOrganization = existingMemberships.length === 0;
|
|
||||||
|
|
||||||
await db.insert(member).values({
|
await db.insert(member).values({
|
||||||
organizationId: result.id,
|
organizationId: result.id,
|
||||||
role: "owner",
|
role: "owner",
|
||||||
createdAt: new Date(),
|
createdAt: new Date(),
|
||||||
userId: ctx.user.id,
|
userId: ctx.user.id,
|
||||||
isDefault: isFirstOrganization, // Mark as default if it's the first organization
|
|
||||||
});
|
});
|
||||||
return result;
|
return result;
|
||||||
}),
|
}),
|
||||||
all: protectedProcedure.query(async ({ ctx }) => {
|
all: protectedProcedure.query(async ({ ctx }) => {
|
||||||
// Get all memberships for the user with organization info
|
const memberResult = await db.query.organization.findMany({
|
||||||
// Query memberships first to get the isDefault value correctly
|
|
||||||
const memberships = await db
|
|
||||||
.select({
|
|
||||||
organizationId: member.organizationId,
|
|
||||||
isDefault: member.isDefault,
|
|
||||||
createdAt: member.createdAt,
|
|
||||||
})
|
|
||||||
.from(member)
|
|
||||||
.where(eq(member.userId, ctx.user.id));
|
|
||||||
|
|
||||||
// If no default is set, set the oldest organization as default
|
|
||||||
const hasDefault = memberships.some((m) => m.isDefault === true);
|
|
||||||
if (!hasDefault && memberships.length > 0) {
|
|
||||||
// Find the oldest membership (first created)
|
|
||||||
const oldestMembership = memberships.reduce((oldest, current) =>
|
|
||||||
current.createdAt < oldest.createdAt ? current : oldest,
|
|
||||||
);
|
|
||||||
|
|
||||||
// Set it as default
|
|
||||||
await db
|
|
||||||
.update(member)
|
|
||||||
.set({ isDefault: true })
|
|
||||||
.where(
|
|
||||||
and(
|
|
||||||
eq(member.organizationId, oldestMembership.organizationId),
|
|
||||||
eq(member.userId, ctx.user.id),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
|
|
||||||
// Update the memberships array
|
|
||||||
const updatedMemberships = memberships.map((m) =>
|
|
||||||
m.organizationId === oldestMembership.organizationId
|
|
||||||
? { ...m, isDefault: true }
|
|
||||||
: m,
|
|
||||||
);
|
|
||||||
|
|
||||||
// Get all organizations for the user
|
|
||||||
const organizations = await db.query.organization.findMany({
|
|
||||||
where: (organization) =>
|
|
||||||
exists(
|
|
||||||
db
|
|
||||||
.select()
|
|
||||||
.from(member)
|
|
||||||
.where(
|
|
||||||
and(
|
|
||||||
eq(member.organizationId, organization.id),
|
|
||||||
eq(member.userId, ctx.user.id),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
});
|
|
||||||
|
|
||||||
// Create a map of organizationId to isDefault
|
|
||||||
const defaultMap = new Map(
|
|
||||||
updatedMemberships.map((m) => [m.organizationId, Boolean(m.isDefault)]),
|
|
||||||
);
|
|
||||||
|
|
||||||
// Map organizations with their isDefault flag
|
|
||||||
return organizations.map((org) => ({
|
|
||||||
...org,
|
|
||||||
isDefault: defaultMap.get(org.id) ?? false,
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get all organizations for the user
|
|
||||||
const organizations = await db.query.organization.findMany({
|
|
||||||
where: (organization) =>
|
where: (organization) =>
|
||||||
exists(
|
exists(
|
||||||
db
|
db
|
||||||
@@ -137,18 +68,13 @@ export const organizationRouter = createTRPCRouter({
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
with: {
|
||||||
|
members: {
|
||||||
|
where: eq(member.userId, ctx.user.id),
|
||||||
|
},
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
return memberResult;
|
||||||
// Create a map of organizationId to isDefault
|
|
||||||
const defaultMap = new Map(
|
|
||||||
memberships.map((m) => [m.organizationId, Boolean(m.isDefault)]),
|
|
||||||
);
|
|
||||||
|
|
||||||
// Map organizations with their isDefault flag
|
|
||||||
return organizations.map((org) => ({
|
|
||||||
...org,
|
|
||||||
isDefault: defaultMap.get(org.id) ?? false,
|
|
||||||
}));
|
|
||||||
}),
|
}),
|
||||||
one: protectedProcedure
|
one: protectedProcedure
|
||||||
.input(
|
.input(
|
||||||
@@ -271,7 +197,7 @@ export const organizationRouter = createTRPCRouter({
|
|||||||
setDefault: protectedProcedure
|
setDefault: protectedProcedure
|
||||||
.input(
|
.input(
|
||||||
z.object({
|
z.object({
|
||||||
organizationId: z.string(),
|
organizationId: z.string().min(1),
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
.mutation(async ({ ctx, input }) => {
|
.mutation(async ({ ctx, input }) => {
|
||||||
|
|||||||
Reference in New Issue
Block a user