The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Fix admin user page spacing and simplify the data export table (#29041)
Thomas des Francsa10ed2e062e3
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminTwoFactorAuthenticationRecoveryCode.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminTwoFactorAuthenticationRecoveryCode.tsxindex 340693da40b..e1559076ad6 100644--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminTwoFactorAuthenticationRecoveryCode.tsx+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminTwoFactorAuthenticationRecoveryCode.tsx@@ -12,14 +12,10 @@ import { isDefined } from 'twenty-shared/utils';import { useToast } from 'twenty-ui/components/feedback';import { IconKey } from 'twenty-ui/icon';import { Button } from 'twenty-ui/primitives/input';-import { themeCssVariables } from 'twenty-ui/theme';import { GenerateTwoFactorAuthenticationRecoveryCodeAsServerAdminDocument } from '~/generated-admin/graphql';-const StyledContainer = styled.div`- display: flex;- flex-direction: column;- gap: ${themeCssVariables.spacing[3]};- margin-top: ${themeCssVariables.spacing[3]};+const StyledRecoveryCodeContainer = styled.div`+ width: 100%;`;type SettingsAdminTwoFactorAuthenticationRecoveryCodeProps = {@@ -75,27 +71,27 @@ export const SettingsAdminTwoFactorAuthenticationRecoveryCode = ({};return (- <StyledContainer>+ <>+ <Button+ startIcon={<IconKey />}+ variant="outline"+ onClick={() => openDialog(dialogId)}+ >{t`Generate 2FA recovery code`}</Button>{isDefined(generatedRecoveryCode) && (- <TwoFactorAuthenticationRecoveryCodeDisplay- recoveryCode={generatedRecoveryCode.recoveryCode}- expiresAt={generatedRecoveryCode.expiresAt}- memberName={memberName}- onExpire={clearGeneratedRecoveryCode}- />+ <StyledRecoveryCodeContainer>+ <TwoFactorAuthenticationRecoveryCodeDisplay+ recoveryCode={generatedRecoveryCode.recoveryCode}+ expiresAt={generatedRecoveryCode.expiresAt}+ memberName={memberName}+ onExpire={clearGeneratedRecoveryCode}+ />+ </StyledRecoveryCodeContainer>)}- <div>- <Button- startIcon={<IconKey />}- variant="outline"- onClick={() => openDialog(dialogId)}- >{t`Generate 2FA recovery code`}</Button>- </div><TwoFactorAuthenticationRecoveryCodeConfirmationDialogdialogId={dialogId}memberName={memberName}onConfirm={handleGenerate}/>- </StyledContainer>+ </>);};diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminUserWorkspaceActions.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminUserWorkspaceActions.tsxnew file mode 100644index 00000000000..b78808cc92b--- /dev/null+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminUserWorkspaceActions.tsx@@ -0,0 +1,65 @@+import { currentUserState } from '@/auth/states/currentUserState';+import { SettingsAdminTwoFactorAuthenticationRecoveryCode } from '@/settings/admin-panel/components/SettingsAdminTwoFactorAuthenticationRecoveryCode';+import { useHandleImpersonate } from '@/settings/admin-panel/hooks/useHandleImpersonate';+import { type WorkspaceInfo } from '@/settings/admin-panel/types/WorkspaceInfo';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { styled } from '@linaria/react';+import { t } from '@lingui/core/macro';+import { isDefined } from 'twenty-shared/utils';+import { IconEyeShare } from 'twenty-ui/icon';+import { Button } from 'twenty-ui/primitives/input';+import { themeCssVariables } from 'twenty-ui/theme';++const StyledActionRow = styled.div`+ column-gap: ${themeCssVariables.spacing[2]};+ display: flex;+ flex-wrap: wrap;+ row-gap: ${themeCssVariables.spacing[3]};+`;++type SettingsAdminUserWorkspaceActionsProps = {+ userId: string;+ workspace: Pick<WorkspaceInfo, 'id' | 'allowImpersonation'>;+ memberName: string;+};++export const SettingsAdminUserWorkspaceActions = ({+ userId,+ workspace,+ memberName,+}: SettingsAdminUserWorkspaceActionsProps) => {+ const currentUser = useAtomStateValue(currentUserState);+ const { handleImpersonate, impersonatingUserId } = useHandleImpersonate();++ if (!isDefined(currentUser) || currentUser.id === userId) {+ return null;+ }++ return (+ <StyledActionRow>+ {currentUser.canImpersonate && (+ <Button+ startIcon={<IconEyeShare />}+ onClick={() => handleImpersonate(userId, workspace.id)}+ disabled={+ impersonatingUserId !== null ||+ workspace.allowImpersonation === false+ }+ variant="outline"+ >+ {workspace.allowImpersonation === false+ ? t`Impersonation is disabled for this workspace`+ : t`Impersonate`}+ </Button>+ )}+ {currentUser.canAccessFullAdminPanel && (+ <SettingsAdminTwoFactorAuthenticationRecoveryCode+ key={`${userId}-${workspace.id}`}+ userId={userId}+ workspaceId={workspace.id}+ memberName={memberName}+ />+ )}+ </StyledActionRow>+ );+};diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceContent.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceContent.tsxindex 651287de490..04f102929a6 100644--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceContent.tsx+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceContent.tsx@@ -13,7 +13,7 @@ import { UserContext } from '@/users/contexts/UserContext';import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';import { isNonEmptyString } from '@sniptt/guards';-import { useContext } from 'react';+import { type ReactNode, useContext } from 'react';import { SettingsPath } from 'twenty-shared/types';import {formatUpgradeCommandName,@@ -41,18 +41,25 @@ import { getWorkspaceUrl } from '~/utils/getWorkspaceUrl';type SettingsAdminWorkspaceContentProps = {activeWorkspace: WorkspaceInfo | undefined;workspaceUpgradeStatus?: GetUpgradeStatusQuery['getUpgradeStatus'][number];+ workspaceInfoActions?: ReactNode;};const StyledContainer = styled.div`+ display: flex;+ flex-direction: column;+ gap: ${themeCssVariables.spacing[8]};+`;++const StyledWorkspaceInfo = styled.div`display: flex;flex-direction: column;gap: ${themeCssVariables.spacing[3]};- margin-top: ${themeCssVariables.spacing[6]};`;export const SettingsAdminWorkspaceContent = ({activeWorkspace,workspaceUpgradeStatus,+ workspaceInfoActions,}: SettingsAdminWorkspaceContentProps) => {const { t } = useLingui();const { formatNumber } = useNumberFormat();@@ -145,10 +152,13 @@ export const SettingsAdminWorkspaceContent = ({title={t`Workspace Info`}description={t`About this workspace`}/>- <SettingsTableCard- items={workspaceInfoItems}- gridAutoColumns="1fr 4fr"- />+ <StyledWorkspaceInfo>+ <SettingsTableCard+ items={workspaceInfoItems}+ gridAutoColumns="1fr 4fr"+ />+ {workspaceInfoActions}+ </StyledWorkspaceInfo></Section.Root>{workspaceUpgradeStatus && (<Section.Root>diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceDataExportSection.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceDataExportSection.tsxindex 8107273223e..c6e42ea14bc 100644--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceDataExportSection.tsx+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceDataExportSection.tsx@@ -1,11 +1,13 @@import { useMutation } from '@apollo/client/react';+import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';import { useContext } from 'react';import { formatBytes, isDefined, isNonEmptyArray } from 'twenty-shared/utils';import { useToast } from 'twenty-ui/components/feedback';-import { IconDownload, IconFileExport } from 'twenty-ui/icon';-import { Tag } from 'twenty-ui/primitives/data-display';+import { IconDownload } from 'twenty-ui/icon';+import { Status } from 'twenty-ui/primitives/data-display';import { Button } from 'twenty-ui/primitives/input';+import { themeCssVariables } from 'twenty-ui/theme';import { downloadFile } from '@/activities/files/utils/downloadFile';import { useNumberFormat } from '@/localization/hooks/useNumberFormat';@@ -35,6 +37,10 @@ type SettingsAdminWorkspaceDataExportSectionProps = {type WorkspaceDataExportRow =WorkspaceDataExportsQuery['workspaceDataExports'][number];+const StyledCreatedAt = styled.span`+ color: ${themeCssVariables.font.color.primary};+`;+export const SettingsAdminWorkspaceDataExportSection = ({workspaceId,workspaceName,@@ -80,21 +86,12 @@ export const SettingsAdminWorkspaceDataExportSection = ({<SettingsTableListSection<WorkspaceDataExportRow>title={t`Data export`}description={t`Every object of this workspace as CSV files in one zip, kept for 1 day. Works for suspended workspaces.`}- headerAdornment={- <Button- startIcon={<IconFileExport />}- size="sm"- variant="outline"- disabled={isCreating || hasPendingExport}- onClick={() => createWorkspaceDataExport()}- >{t`Export data`}</Button>- }items={adminPanelWorkspaceDataExports}columns={[{label: t`Created`,Cell: ({ item }) => (- <>+ <StyledCreatedAt>{formatDateTimeString({value: item.createdAt,timeZone,@@ -102,37 +99,28 @@ export const SettingsAdminWorkspaceDataExportSection = ({timeFormat,localeCatalog,})}- </>+ </StyledCreatedAt>),},{- label: t`Objects`,+ label: t`Contents`,Cell: ({ item }) => {if (!isNonEmptyArray(item.objects)) {return <>-</>;}- const { objectCount, fieldCount } = getWorkspaceDataExportSummary(- item.objects,- );+ const { objectCount, recordCount } =+ getWorkspaceDataExportSummary(item.objects);++ if (item.status !== WorkspaceDataExportStatus.COMPLETED) {+ return <>{t`${formatNumber(objectCount)} objects`}</>;+ }return (- <>{t`${formatNumber(objectCount)} objects, ${formatNumber(fieldCount)} fields`}</>+ <>{t`${formatNumber(objectCount)} objects, ${formatNumber(recordCount)} records`}</>);},},- {- label: t`Records`,- Cell: ({ item }) => (- <>- {isNonEmptyArray(item.objects)- ? formatNumber(- getWorkspaceDataExportSummary(item.objects).recordCount,- )- : '-'}- </>- ),- },{label: t`Size`,Cell: ({ item }) => (@@ -144,33 +132,29 @@ export const SettingsAdminWorkspaceDataExportSection = ({),},{- label: t`Status`,+ label: '',+ align: 'right',Cell: ({ item }) => {- if (item.status === WorkspaceDataExportStatus.COMPLETED) {- return <Tag color="green">{t`Ready`}</Tag>;- }-if (item.status === WorkspaceDataExportStatus.FAILED) {- return <Tag color="red">{t`Failed`}</Tag>;+ return <Status color="red" weight="medium">{t`Failed`}</Status>;}- const { objectCount, exportedObjectCount } =- getWorkspaceDataExportSummary(item.objects);- const progress =- objectCount > 0 ? ` ${exportedObjectCount}/${objectCount}` : '';+ if (item.status === WorkspaceDataExportStatus.PENDING) {+ const { objectCount, exportedObjectCount } =+ getWorkspaceDataExportSummary(item.objects);+ const progress =+ objectCount > 0+ ? ` ${exportedObjectCount}/${objectCount}`+ : '';++ return (+ <Status color="turquoise" weight="medium" loading>+ {t`In progress`}+ {progress}+ </Status>+ );+ }- return (- <Tag color="orange">- {t`In progress`}- {progress}- </Tag>- );- },- },- {- label: '',- align: 'right',- Cell: ({ item }) => {const { downloadUrl } = item;if (!isDefined(downloadUrl)) {@@ -193,7 +177,10 @@ export const SettingsAdminWorkspaceDataExportSection = ({},},]}- gridAutoColumns="3fr 3fr 2fr 2fr 2fr 140px"+ gridAutoColumns="3fr 4fr 2fr 180px"+ footerButtonLabel={t`Export data`}+ onFooterButtonClick={() => createWorkspaceDataExport()}+ isFooterButtonDisabled={isCreating || hasPendingExport}/></>);diff --git a/packages/twenty-front/src/modules/settings/components/SettingsTableListSection.tsx b/packages/twenty-front/src/modules/settings/components/SettingsTableListSection.tsxindex 16bd44013f2..9db826ba53d 100644--- a/packages/twenty-front/src/modules/settings/components/SettingsTableListSection.tsx+++ b/packages/twenty-front/src/modules/settings/components/SettingsTableListSection.tsx@@ -63,6 +63,7 @@ type SettingsTableListSectionProps<Item extends { id: string }> = {onRowClick?: (item: Item) => void;footerButtonLabel?: string;onFooterButtonClick?: () => void;+ isFooterButtonDisabled?: boolean;};export const SettingsTableListSection = <@@ -79,6 +80,7 @@ export const SettingsTableListSection = <onRowClick,footerButtonLabel,onFooterButtonClick,+ isFooterButtonDisabled,}: SettingsTableListSectionProps<Item>) => {const resolvedGridAutoColumns = showRowChevron? `${gridAutoColumns} ${CHEVRON_COLUMN_WIDTH}`@@ -143,6 +145,7 @@ export const SettingsTableListSection = <size="sm"onClick={onFooterButtonClick}variant="outline"+ disabled={isFooterButtonDisabled}>{footerButtonLabel}</Button>diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminUserDetail.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminUserDetail.tsxindex 0570a8fa94e..ff660b79449 100644--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminUserDetail.tsx+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminUserDetail.tsx@@ -3,7 +3,6 @@ import { Tabs } from 'twenty-ui/primitives/navigation';import { useParams } from 'react-router-dom';import { useQuery } from '@apollo/client/react';-import { styled } from '@linaria/react';import { t } from '@lingui/core/macro';import { isNonEmptyString } from '@sniptt/guards';import { SettingsPath } from 'twenty-shared/types';@@ -17,10 +16,9 @@ import {import { currentUserState } from '@/auth/states/currentUserState';import { useApolloAdminClient } from '@/settings/admin-panel/apollo/hooks/useApolloAdminClient';import { SettingsAdminServerAdminAccess } from '@/settings/admin-panel/components/SettingsAdminServerAdminAccess';-import { SettingsAdminTwoFactorAuthenticationRecoveryCode } from '@/settings/admin-panel/components/SettingsAdminTwoFactorAuthenticationRecoveryCode';+import { SettingsAdminUserWorkspaceActions } from '@/settings/admin-panel/components/SettingsAdminUserWorkspaceActions';import { SettingsAdminWorkspaceContent } from '@/settings/admin-panel/components/SettingsAdminWorkspaceContent';import { SETTINGS_ADMIN_USER_LOOKUP_WORKSPACE_TABS_ID } from '@/settings/admin-panel/constants/SettingsAdminUserLookupWorkspaceTabsId';-import { useHandleImpersonate } from '@/settings/admin-panel/hooks/useHandleImpersonate';import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';import { SettingsSkeletonLoader } from '@/settings/components/SettingsSkeletonLoader';import { SettingsTableCard } from '@/settings/components/SettingsTableCard';@@ -33,25 +31,18 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateimport { Section } from 'twenty-ui/components/layout';import {IconCalendar,- IconEyeShare,IconId,IconLock,IconMail,IconUser,} from 'twenty-ui/icon';import { Avatar } from 'twenty-ui/primitives/data-display';-import { Button } from 'twenty-ui/primitives/input';-import { themeCssVariables } from 'twenty-ui/theme';import { REACT_APP_SERVER_BASE_URL } from '~/config';import {type UserLookupAdminPanelQuery,UserLookupAdminPanelDocument,} from '~/generated-admin/graphql';-const StyledButtonContainer = styled.div`- margin-top: ${themeCssVariables.spacing[3]};-`;-export const SettingsAdminUserDetail = () => {const { userId } = useParams<{ userId: string }>();const apolloAdminClient = useApolloAdminClient();@@ -71,7 +62,6 @@ export const SettingsAdminUserDetail = () => {const userLookupResult = userLookupData?.userLookupAdminPanel;const currentUser = useAtomStateValue(currentUserState);- const { handleImpersonate, impersonatingUserId } = useHandleImpersonate();const effectiveTabId = activeTabId || userLookupResult?.workspaces?.[0]?.id;const user = userLookupResult?.user;@@ -139,40 +129,19 @@ export const SettingsAdminUserDetail = () => {];const workspaceContent = (- <Section.Root>- <SettingsAdminWorkspaceContent activeWorkspace={activeWorkspace} />- {currentUser?.canImpersonate &&- activeWorkspace &&- isDefined(user) &&- user.id !== currentUser.id && (- <StyledButtonContainer>- <Button- startIcon={<IconEyeShare />}- onClick={() => handleImpersonate(user.id, activeWorkspace.id)}- disabled={- impersonatingUserId !== null ||- activeWorkspace.allowImpersonation === false- }- variant="outline"- >- {activeWorkspace.allowImpersonation === false- ? t`Impersonation is disabled for this workspace`- : t`Impersonate`}- </Button>- </StyledButtonContainer>- )}- {currentUser?.canAccessFullAdminPanel &&- activeWorkspace &&- isDefined(user) &&- user.id !== currentUser.id && (- <SettingsAdminTwoFactorAuthenticationRecoveryCode- key={`${user.id}-${activeWorkspace.id}`}+ <SettingsAdminWorkspaceContent+ activeWorkspace={activeWorkspace}+ workspaceInfoActions={+ isDefined(activeWorkspace) &&+ isDefined(user) && (+ <SettingsAdminUserWorkspaceActionsuserId={user.id}- workspaceId={activeWorkspace.id}+ workspace={activeWorkspace}memberName={displayName}/>- )}- </Section.Root>+ )+ }+ />);if (isLoading) {