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

Move Impersonate from User to Workspace (#2630)

Browse Source 
* Fix impersonate

* align core typeorm config with metadata config + add allowImpersonation to workspace

* move allowImpersonation to workspace

* remove allowImpersonation from workspaceMember workspace table
This commit is contained in:
Weiko
2023-11-22 14:12:39 +01:00
committed by GitHub
parent 680e9b6aa5
commit a6abe09163
33 changed files with 199 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
front/src/pages/auth/CreateWorkspace.tsx
View File

@ -77,6 +77,8 @@ export const CreateWorkspace = () => {
setCurrentWorkspace({
id: result.data?.updateWorkspace?.id ?? '',
displayName: data.name,
allowImpersonation:
result.data?.updateWorkspace?.allowImpersonation ?? false,
});
if (result.errors || !result.data?.updateWorkspace) {

8
front/src/pages/settings/SettingsProfile.tsx
View File

@ -5,7 +5,6 @@ import { DeleteAccount } from '@/settings/profile/components/DeleteAccount';
import { EmailField } from '@/settings/profile/components/EmailField';
import { NameFields } from '@/settings/profile/components/NameFields';
import { ProfilePictureUploader } from '@/settings/profile/components/ProfilePictureUploader';
import { ToggleField } from '@/settings/profile/components/ToggleField';
import { IconSettings } from '@/ui/display/icon';
import { H1Title } from '@/ui/display/typography/components/H1Title';
import { H2Title } from '@/ui/display/typography/components/H2Title';
@ -35,13 +34,6 @@ export const SettingsProfile = () => (
/>
<EmailField />
</Section>
<Section>
<H2Title
title="Support"
addornment={<ToggleField />}
description="Grant Twenty support temporary access to your account so we can troubleshoot problems or recover content on your behalf. You can revoke access at any time."
/>
</Section>
<Section>
<DeleteAccount />
</Section>

9
front/src/pages/settings/SettingsWorkspace.tsx
View File

@ -3,6 +3,7 @@ import styled from '@emotion/styled';
import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
import { DeleteWorkspace } from '@/settings/profile/components/DeleteWorkspace';
import { NameField } from '@/settings/workspace/components/NameField';
import { ToggleImpersonate } from '@/settings/workspace/components/ToggleImpersonate';
import { WorkspaceLogoUploader } from '@/settings/workspace/components/WorkspaceLogoUploader';
import { IconSettings } from '@/ui/display/icon';
import { H1Title } from '@/ui/display/typography/components/H1Title';
@ -26,7 +27,13 @@ export const SettingsWorkspace = () => (
<H2Title title="Name" description="Name of your workspace" />
<NameField />
</Section>
<Section>
<H2Title
title="Support"
addornment={<ToggleImpersonate />}
description="Grant Twenty support temporary access to your workspace so we can troubleshoot problems or recover content on your behalf. You can revoke access at any time."
/>
</Section>
<Section>
<DeleteWorkspace />
</Section>