mirror of
https://github.com/hanzoai/sign.git
synced 2026-10-30 14:57:59 +00:00
Radix was leaking out of the primitive layer into application code. Thirty dialog components under apps/remix imported `@radix-ui/react-dialog` purely to spell `Omit<DialogPrimitive.DialogProps, 'children'>`, and two more imported `TooltipArrow` directly. Each of those is a place the UI substrate has to be swapped when it changes, for no gain — the app never touched Radix behaviour, only a type and one arrow element. `packages/ui/primitives/dialog.tsx` now exports `DialogProps` and `tooltip.tsx` exports `TooltipArrow`, so callers name the primitive, not the library behind it. Radix imports outside packages/ui: 32 -> 0. Eleven vendored shadcn primitives had no importers at all — aspect-ratio, auto-sized-text, calendar, collapsible, context-menu, menubar, navigation-menu, slider, toggle, a stray document-flow dialog and a signature-pad Canvas class shadowed by skia-canvas. Dead component code reads as supported API in review, so it is deleted rather than carried. That retires eight Radix packages plus react-day-picker from packages/ui and @radix-ui/react-tabs from apps/docs, which was declared and never imported: 28 declared Radix packages -> 19. The embedding doc taught Tailwind classes in a snippet third parties copy into their own apps; it now uses the same inline styles as the plain-HTML example directly above it. `.cursorrules` told every AI touching this repo to write "Shadcn UI, Radix, and Tailwind Aria" — it now points at @hanzo/gui and says the inherited layer is to be replaced, not extended. Verified: apps/remix typecheck 0 errors, client+server build green, prisma 38/38.
225 lines
7.0 KiB
TypeScript
225 lines
7.0 KiB
TypeScript
import { useEffect, useState } from 'react';
|
|
|
|
import { zodResolver } from '@hookform/resolvers/zod';
|
|
import { useLingui } from '@lingui/react/macro';
|
|
import { Trans } from '@lingui/react/macro';
|
|
import { OrganisationMemberRole } from '@prisma/client';
|
|
import { useForm } from 'react-hook-form';
|
|
import { useNavigate } from 'react-router';
|
|
import { match } from 'ts-pattern';
|
|
import { z } from 'zod';
|
|
|
|
import { getHighestOrganisationRoleInGroup } from '@hanzo/esign-lib/utils/organisations';
|
|
import type { TGetAdminOrganisationResponse } from '@hanzo/esign-trpc/server/admin-router/get-admin-organisation.types';
|
|
import type {
|
|
TUpdateOrganisationMemberRoleRequest,
|
|
TUpdateOrganisationMemberRoleResponse,
|
|
} from '@hanzo/esign-trpc/server/admin-router/update-organisation-member-role.types';
|
|
import { useZapMutation } from '@hanzo/esign-trpc/zap/react';
|
|
import { Button } from '@hanzo/esign-ui/primitives/button';
|
|
import {
|
|
Dialog,
|
|
DialogContent,
|
|
DialogDescription,
|
|
DialogFooter,
|
|
DialogHeader,
|
|
type DialogProps,
|
|
DialogTitle,
|
|
DialogTrigger,
|
|
} from '@hanzo/esign-ui/primitives/dialog';
|
|
import {
|
|
Form,
|
|
FormControl,
|
|
FormField,
|
|
FormItem,
|
|
FormLabel,
|
|
FormMessage,
|
|
} from '@hanzo/esign-ui/primitives/form/form';
|
|
import {
|
|
Select,
|
|
SelectContent,
|
|
SelectItem,
|
|
SelectTrigger,
|
|
SelectValue,
|
|
} from '@hanzo/esign-ui/primitives/select';
|
|
import { useToast } from '@hanzo/esign-ui/primitives/use-toast';
|
|
|
|
export type AdminOrganisationMemberUpdateDialogProps = {
|
|
trigger?: React.ReactNode;
|
|
organisationId: string;
|
|
organisationMember: TGetAdminOrganisationResponse['members'][number];
|
|
isOwner: boolean;
|
|
} & Omit<DialogProps, 'children'>;
|
|
|
|
const ZUpdateOrganisationMemberFormSchema = z.object({
|
|
role: z.enum(['OWNER', 'ADMIN', 'MANAGER', 'MEMBER']),
|
|
});
|
|
|
|
type ZUpdateOrganisationMemberSchema = z.infer<typeof ZUpdateOrganisationMemberFormSchema>;
|
|
|
|
export const AdminOrganisationMemberUpdateDialog = ({
|
|
trigger,
|
|
organisationId,
|
|
organisationMember,
|
|
isOwner,
|
|
...props
|
|
}: AdminOrganisationMemberUpdateDialogProps) => {
|
|
const [open, setOpen] = useState(false);
|
|
|
|
const { t } = useLingui();
|
|
const { toast } = useToast();
|
|
const navigate = useNavigate();
|
|
|
|
// Determine the current role value for the form
|
|
const currentRoleValue = isOwner
|
|
? 'OWNER'
|
|
: getHighestOrganisationRoleInGroup(
|
|
organisationMember.organisationGroupMembers.map((ogm) => ogm.group),
|
|
);
|
|
const organisationMemberName = organisationMember.user.name ?? organisationMember.user.email;
|
|
|
|
const form = useForm<ZUpdateOrganisationMemberSchema>({
|
|
resolver: zodResolver(ZUpdateOrganisationMemberFormSchema),
|
|
defaultValues: {
|
|
role: currentRoleValue,
|
|
},
|
|
});
|
|
|
|
const { mutateAsync: updateOrganisationMemberRole } = useZapMutation<
|
|
TUpdateOrganisationMemberRoleResponse,
|
|
TUpdateOrganisationMemberRoleRequest
|
|
>('admin.organisationMember.updateRole');
|
|
|
|
const onFormSubmit = async ({ role }: ZUpdateOrganisationMemberSchema) => {
|
|
try {
|
|
await updateOrganisationMemberRole({
|
|
organisationId,
|
|
userId: organisationMember.userId,
|
|
role,
|
|
});
|
|
|
|
const roleLabel = match(role)
|
|
.with('OWNER', () => t`Owner`)
|
|
.with(OrganisationMemberRole.ADMIN, () => t`Admin`)
|
|
.with(OrganisationMemberRole.MANAGER, () => t`Manager`)
|
|
.with(OrganisationMemberRole.MEMBER, () => t`Member`)
|
|
.exhaustive();
|
|
|
|
toast({
|
|
title: t`Success`,
|
|
description:
|
|
role === 'OWNER'
|
|
? t`Ownership transferred to ${organisationMemberName}.`
|
|
: t`Updated ${organisationMemberName} to ${roleLabel}.`,
|
|
duration: 5000,
|
|
});
|
|
|
|
setOpen(false);
|
|
|
|
// Refresh the page to show updated data
|
|
await navigate(0);
|
|
} catch (err) {
|
|
console.error(err);
|
|
|
|
toast({
|
|
title: t`An unknown error occurred`,
|
|
description: t`We encountered an unknown error while attempting to update this organisation member. Please try again later.`,
|
|
variant: 'destructive',
|
|
});
|
|
}
|
|
};
|
|
|
|
useEffect(() => {
|
|
if (!open) {
|
|
return;
|
|
}
|
|
|
|
form.reset({
|
|
role: currentRoleValue,
|
|
});
|
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
}, [open, currentRoleValue, form]);
|
|
|
|
return (
|
|
<Dialog
|
|
{...props}
|
|
open={open}
|
|
onOpenChange={(value) => !form.formState.isSubmitting && setOpen(value)}
|
|
>
|
|
<DialogTrigger onClick={(e) => e.stopPropagation()} asChild>
|
|
{trigger ?? (
|
|
<Button variant="secondary">
|
|
<Trans>Update role</Trans>
|
|
</Button>
|
|
)}
|
|
</DialogTrigger>
|
|
|
|
<DialogContent position="center">
|
|
<DialogHeader>
|
|
<DialogTitle>
|
|
<Trans>Update organisation member</Trans>
|
|
</DialogTitle>
|
|
|
|
<DialogDescription className="mt-4">
|
|
<Trans>
|
|
You are currently updating <span className="font-bold">{organisationMemberName}</span>
|
|
.
|
|
</Trans>
|
|
</DialogDescription>
|
|
</DialogHeader>
|
|
|
|
<Form {...form}>
|
|
<form onSubmit={form.handleSubmit(onFormSubmit)}>
|
|
<fieldset className="flex h-full flex-col" disabled={form.formState.isSubmitting}>
|
|
<FormField
|
|
control={form.control}
|
|
name="role"
|
|
render={({ field }) => (
|
|
<FormItem className="w-full">
|
|
<FormLabel required>
|
|
<Trans>Role</Trans>
|
|
</FormLabel>
|
|
<FormControl>
|
|
<Select {...field} onValueChange={field.onChange}>
|
|
<SelectTrigger className="text-muted-foreground">
|
|
<SelectValue />
|
|
</SelectTrigger>
|
|
|
|
<SelectContent className="w-full" position="popper">
|
|
<SelectItem value="OWNER">
|
|
<Trans>Owner</Trans>
|
|
</SelectItem>
|
|
<SelectItem value={OrganisationMemberRole.ADMIN}>
|
|
<Trans>Admin</Trans>
|
|
</SelectItem>
|
|
<SelectItem value={OrganisationMemberRole.MANAGER}>
|
|
<Trans>Manager</Trans>
|
|
</SelectItem>
|
|
<SelectItem value={OrganisationMemberRole.MEMBER}>
|
|
<Trans>Member</Trans>
|
|
</SelectItem>
|
|
</SelectContent>
|
|
</Select>
|
|
</FormControl>
|
|
<FormMessage />
|
|
</FormItem>
|
|
)}
|
|
/>
|
|
|
|
<DialogFooter className="mt-4">
|
|
<Button type="button" variant="secondary" onClick={() => setOpen(false)}>
|
|
<Trans>Cancel</Trans>
|
|
</Button>
|
|
|
|
<Button type="submit" loading={form.formState.isSubmitting}>
|
|
<Trans>Update</Trans>
|
|
</Button>
|
|
</DialogFooter>
|
|
</fieldset>
|
|
</form>
|
|
</Form>
|
|
</DialogContent>
|
|
</Dialog>
|
|
);
|
|
};
|