remove extra components

This commit is contained in:
miloschwartz
2025-09-06 21:38:17 -07:00
parent 3d5f73e344
commit 374ed79a18
4 changed files with 66 additions and 896 deletions

View File

@@ -59,7 +59,7 @@ export default function AccessControlsPage() {
const formSchema = z.object({
username: z.string(),
roleId: z.string().min(1, { message: t('accessRoleSelectPlease') }),
roleId: z.string().min(1, { message: t("accessRoleSelectPlease") }),
autoProvisioned: z.boolean()
});
@@ -80,10 +80,10 @@ export default function AccessControlsPage() {
console.error(e);
toast({
variant: "destructive",
title: t('accessRoleErrorFetch'),
title: t("accessRoleErrorFetch"),
description: formatAxiosError(
e,
t('accessRoleErrorFetchDescription')
t("accessRoleErrorFetchDescription")
)
});
});
@@ -105,7 +105,9 @@ export default function AccessControlsPage() {
try {
// Execute both API calls simultaneously
const [roleRes, userRes] = await Promise.all([
api.post<AxiosResponse<InviteUserResponse>>(`/role/${values.roleId}/add/${user.userId}`),
api.post<AxiosResponse<InviteUserResponse>>(
`/role/${values.roleId}/add/${user.userId}`
),
api.post(`/org/${orgId}/user/${user.userId}`, {
autoProvisioned: values.autoProvisioned
})
@@ -114,17 +116,17 @@ export default function AccessControlsPage() {
if (roleRes.status === 200 && userRes.status === 200) {
toast({
variant: "default",
title: t('userSaved'),
description: t('userSavedDescription')
title: t("userSaved"),
description: t("userSavedDescription")
});
}
} catch (e) {
toast({
variant: "destructive",
title: t('accessRoleErrorAdd'),
title: t("accessRoleErrorAdd"),
description: formatAxiosError(
e,
t('accessRoleErrorAddDescription')
t("accessRoleErrorAddDescription")
)
});
}
@@ -136,9 +138,11 @@ export default function AccessControlsPage() {
<SettingsContainer>
<SettingsSection>
<SettingsSectionHeader>
<SettingsSectionTitle>{t('accessControls')}</SettingsSectionTitle>
<SettingsSectionTitle>
{t("accessControls")}
</SettingsSectionTitle>
<SettingsSectionDescription>
{t('accessControlsDescription')}
{t("accessControlsDescription")}
</SettingsSectionDescription>
</SettingsSectionHeader>
@@ -151,38 +155,48 @@ export default function AccessControlsPage() {
id="access-controls-form"
>
{/* IDP Type Display */}
{user.type !== UserType.Internal && user.idpType && (
<div className="flex items-center space-x-2 mb-4">
<span className="text-sm font-medium text-muted-foreground">
{t("idp")}:
</span>
<IdpTypeBadge
type={user.idpType}
variant={user.idpVariant || undefined}
name={user.idpName || undefined}
/>
</div>
)}
{user.type !== UserType.Internal &&
user.idpType && (
<div className="flex items-center space-x-2 mb-4">
<span className="text-sm font-medium text-muted-foreground">
{t("idp")}:
</span>
<IdpTypeBadge
type={user.idpType}
variant={
user.idpVariant || undefined
}
name={user.idpName || undefined}
/>
</div>
)}
<FormField
control={form.control}
name="roleId"
render={({ field }) => (
<FormItem>
<FormLabel>{t('role')}</FormLabel>
<FormLabel>{t("role")}</FormLabel>
<Select
onValueChange={(value) => {
field.onChange(value);
// If auto provision is enabled, set it to false when role changes
if (user.idpAutoProvision) {
form.setValue("autoProvisioned", false);
form.setValue(
"autoProvisioned",
false
);
}
}}
value={field.value}
>
<FormControl>
<SelectTrigger>
<SelectValue placeholder={t('accessRoleSelect')} />
<SelectValue
placeholder={t(
"accessRoleSelect"
)}
/>
</SelectTrigger>
</FormControl>
<SelectContent>
@@ -202,28 +216,32 @@ export default function AccessControlsPage() {
/>
{user.idpAutoProvision && (
<FormField
control={form.control}
name="autoProvisioned"
render={({ field }) => (
<FormItem className="flex flex-row items-start space-x-3 space-y-0">
<FormControl>
<Checkbox
checked={field.value}
onCheckedChange={field.onChange}
/>
</FormControl>
<div className="space-y-1 leading-none">
<FormLabel>
{t('autoProvisioned')}
</FormLabel>
<p className="text-sm text-muted-foreground">
{t('autoProvisionedDescription')}
</p>
</div>
</FormItem>
)}
/>
<FormField
control={form.control}
name="autoProvisioned"
render={({ field }) => (
<FormItem className="flex flex-row items-start space-x-2 space-y-0">
<FormControl>
<Checkbox
checked={field.value}
onCheckedChange={
field.onChange
}
/>
</FormControl>
<div className="space-y-1 leading-none">
<FormLabel>
{t("autoProvisioned")}
</FormLabel>
<p className="text-sm text-muted-foreground">
{t(
"autoProvisionedDescription"
)}
</p>
</div>
</FormItem>
)}
/>
)}
</form>
</Form>
@@ -237,7 +255,7 @@ export default function AccessControlsPage() {
disabled={loading}
form="access-controls-form"
>
{t('accessControlsSubmit')}
{t("accessControlsSubmit")}
</Button>
</SettingsSectionFooter>
</SettingsSection>