fix(settings): move board access control out of the nested form (#6662)
This commit is contained in:
1 parent
365ef7f02b
commit
1fbe844598
1 file changed
+28
-26
@@ -178,35 +178,37 @@ export const BoardSettingsForm = ({ board, permissions, hasFullAccess, hideVisib
|
|||||||
const isPending = savePartialSettings.isPending || saveLayouts.isPending;
|
const isPending = savePartialSettings.isPending || saveLayouts.isPending;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<form onSubmit={form.onSubmit((values) => void handleSubmitAsync(values))}>
|
<Stack gap="xl">
|
||||||
<Stack gap="xl">
|
<form onSubmit={form.onSubmit((values) => void handleSubmitAsync(values))}>
|
||||||
<GeneralSettingsContent board={board} form={form} />
|
<Stack gap="xl">
|
||||||
<LayoutSettingsContent form={form} />
|
<GeneralSettingsContent board={board} form={form} />
|
||||||
<BackgroundSettingsContent form={form} />
|
<LayoutSettingsContent form={form} />
|
||||||
<ColorSettingsContent form={form} />
|
<BackgroundSettingsContent form={form} />
|
||||||
<CustomCssSettingsContent form={form} />
|
<ColorSettingsContent form={form} />
|
||||||
<BehaviorSettingsContent form={form} />
|
<CustomCssSettingsContent form={form} />
|
||||||
|
<BehaviorSettingsContent form={form} />
|
||||||
|
|
||||||
{hasFullAccess && (
|
{form.isDirty() && (
|
||||||
<SectionCard title={tSection("access.title")}>
|
<UnsavedChangesBar>
|
||||||
<BoardAccessSettings board={board} initialPermissions={permissions} />
|
<Button type="button" disabled={isPending} variant="default" onClick={handleDiscard}>
|
||||||
</SectionCard>
|
{t("common.action.discard")}
|
||||||
)}
|
</Button>
|
||||||
|
<Button loading={isPending} type="submit" disabled={!form.isValid()}>
|
||||||
|
{t("common.action.saveChanges")}
|
||||||
|
</Button>
|
||||||
|
</UnsavedChangesBar>
|
||||||
|
)}
|
||||||
|
</Stack>
|
||||||
|
</form>
|
||||||
|
|
||||||
{hasFullAccess && <DangerZoneSettingsContent hideVisibility={hideVisibility} />}
|
{hasFullAccess && (
|
||||||
|
<SectionCard title={tSection("access.title")}>
|
||||||
|
<BoardAccessSettings board={board} initialPermissions={permissions} />
|
||||||
|
</SectionCard>
|
||||||
|
)}
|
||||||
|
|
||||||
{form.isDirty() && (
|
{hasFullAccess && <DangerZoneSettingsContent hideVisibility={hideVisibility} />}
|
||||||
<UnsavedChangesBar>
|
</Stack>
|
||||||
<Button type="button" disabled={isPending} variant="default" onClick={handleDiscard}>
|
|
||||||
{t("common.action.discard")}
|
|
||||||
</Button>
|
|
||||||
<Button loading={isPending} type="submit" disabled={!form.isValid()}>
|
|
||||||
{t("common.action.saveChanges")}
|
|
||||||
</Button>
|
|
||||||
</UnsavedChangesBar>
|
|
||||||
)}
|
|
||||||
</Stack>
|
|
||||||
</form>
|
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user