admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix confirmation modal on subdomain settings (#12845)

Browse Source 
before - 


https://github.com/user-attachments/assets/ff063912-0c1e-41e4-b01d-15081ecb04a1

after - 



https://github.com/user-attachments/assets/0ee6022d-f0a8-4243-a108-c4295d0fb560
This commit is contained in:
nitin
2025-06-24 21:04:03 +05:30
committed by GitHub
parent 77f0ed2208
commit d7c6806ad4
1 changed files with 44 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
packages/twenty-front/src/pages/settings/workspace/SettingsDomain.tsx
View File

@ -68,7 +68,7 @@ export const SettingsDomain = () => {
currentWorkspaceState,
);
const { openModal } = useModal();
const { openModal, closeModal } = useModal();
const form = useForm<{
subdomain: string;
@ -141,6 +141,7 @@ export const SettingsDomain = () => {
error instanceof ApolloError &&
error.graphQLErrors[0]?.extensions?.code === 'CONFLICT'
) {
closeModal(SUBDOMAIN_CHANGE_CONFIRMATION_MODAL_ID);
return form.control.setError('subdomain', {
type: 'manual',
message: t`Subdomain already taken`,
@ -203,45 +204,47 @@ export const SettingsDomain = () => {
};
return (
<form onSubmit={form.handleSubmit(handleSave)}>
{/* eslint-disable-next-line react/jsx-props-no-spreading */}
<FormProvider {...form}>
<SubMenuTopBarContainer
title={t`Domain`}
links={[
{
children: <Trans>Workspace</Trans>,
href: getSettingsPath(SettingsPath.Workspace),
},
{
children: <Trans>General</Trans>,
href: getSettingsPath(SettingsPath.Workspace),
},
{ children: <Trans>Domain</Trans> },
]}
actionButton={
<SaveAndCancelButtons
onCancel={() => navigate(SettingsPath.Workspace)}
isSaveDisabled={form.formState.isSubmitting}
/>
}
>
<SettingsPageContainer>
<SettingsSubdomain />
<SettingsCustomDomain />
</SettingsPageContainer>
</SubMenuTopBarContainer>
<ConfirmationModal
modalId={SUBDOMAIN_CHANGE_CONFIRMATION_MODAL_ID}
title={t`Change subdomain?`}
subtitle={t`You're about to change your workspace subdomain. This action will log out all users.`}
onConfirmClick={() => {
const values = form.getValues();
currentWorkspace &&
updateSubdomain(values.subdomain, currentWorkspace);
}}
/>
</FormProvider>
</form>
<>
<form onSubmit={form.handleSubmit(handleSave)}>
{/* eslint-disable-next-line react/jsx-props-no-spreading */}
<FormProvider {...form}>
<SubMenuTopBarContainer
title={t`Domain`}
links={[
{
children: <Trans>Workspace</Trans>,
href: getSettingsPath(SettingsPath.Workspace),
},
{
children: <Trans>General</Trans>,
href: getSettingsPath(SettingsPath.Workspace),
},
{ children: <Trans>Domain</Trans> },
]}
actionButton={
<SaveAndCancelButtons
onCancel={() => navigate(SettingsPath.Workspace)}
isSaveDisabled={form.formState.isSubmitting}
/>
}
>
<SettingsPageContainer>
<SettingsSubdomain />
<SettingsCustomDomain />
</SettingsPageContainer>
</SubMenuTopBarContainer>
</FormProvider>
</form>
<ConfirmationModal
modalId={SUBDOMAIN_CHANGE_CONFIRMATION_MODAL_ID}
title={t`Change subdomain?`}
subtitle={t`You're about to change your workspace subdomain. This action will log out all users.`}
onConfirmClick={() => {
const values = form.getValues();
currentWorkspace &&
updateSubdomain(values.subdomain, currentWorkspace);
}}
/>
</>
);
};