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

Revert "[Permissions] Force open title input for role label when empty" (#12817)

Browse Source 
Reverts twentyhq/twenty#12710
This commit is contained in:
Weiko
2025-06-24 14:08:16 +02:00
committed by GitHub
parent 074cd22a67
commit 6f1107eecd
10 changed files with 11 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/twenty-front/src/modules/settings/roles/role-settings/components/SettingsRoleSettings.tsx
View File

@ -68,7 +68,7 @@ export const SettingsRoleSettings = ({
label: value,
});
}}
placeholder={t`Untitled Role`}
placeholder={t`Role name`}
disabled={!isEditable}
/>
</StyledInputsContainer>

26
packages/twenty-front/src/modules/settings/roles/role/components/SettingsRole.tsx
View File

@ -7,7 +7,6 @@ import { SettingsRoleAssignment } from '@/settings/roles/role-assignment/compone
import { SettingsRolePermissions } from '@/settings/roles/role-permissions/components/SettingsRolePermissions';
import { SettingsRoleSettings } from '@/settings/roles/role-settings/components/SettingsRoleSettings';
import { SettingsRoleLabelContainer } from '@/settings/roles/role/components/SettingsRoleLabelContainer';
import { SettingsRoleLabelContainerEffect } from '@/settings/roles/role/components/SettingsRoleLabelContainerEffect';
import { SETTINGS_ROLE_DETAIL_TABS } from '@/settings/roles/role/constants/SettingsRoleDetailTabs';
import { settingsDraftRoleFamilyState } from '@/settings/roles/states/settingsDraftRoleFamilyState';
import { settingsPersistedRoleFamilyState } from '@/settings/roles/states/settingsPersistedRoleFamilyState';
@ -20,7 +19,6 @@ import { TabList } from '@/ui/layout/tab-list/components/TabList';
import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';
import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
import { getOperationName } from '@apollo/client/utilities';
import styled from '@emotion/styled';
import { t } from '@lingui/core/macro';
import { useRecoilState, useRecoilValue } from 'recoil';
import { isDefined } from 'twenty-shared/utils';
@ -54,10 +52,6 @@ const ROLE_BASIC_KEYS: Array<keyof Role> = [
'canDestroyAllObjectRecords',
];
const StyledUntitledRole = styled.span`
color: ${({ theme }) => theme.font.color.tertiary};
`;
export const SettingsRole = ({ roleId, isCreateMode }: SettingsRoleProps) => {
const activeTabId = useRecoilComponentValueV2(
activeTabIdComponentState,
@ -281,12 +275,7 @@ export const SettingsRole = ({ roleId, isCreateMode }: SettingsRoleProps) => {
return (
<SubMenuTopBarContainer
title={
<>
<SettingsRoleLabelContainer roleId={roleId} />
<SettingsRoleLabelContainerEffect roleId={roleId} />
</>
}
title={<SettingsRoleLabelContainer roleId={roleId} />}
links={[
{
children: 'Workspace',
@ -297,19 +286,14 @@ export const SettingsRole = ({ roleId, isCreateMode }: SettingsRoleProps) => {
href: getSettingsPath(SettingsPath.Roles),
},
{
children:
isDefined(settingsDraftRole.label) &&
settingsDraftRole.label !== '' ? (
settingsDraftRole.label
) : (
<StyledUntitledRole>{t`Untitled Role`}</StyledUntitledRole>
),
children: settingsDraftRole.label,
},
]}
actionButton={
isRoleEditable && isDirty ? (
isRoleEditable &&
isDirty && (
<SaveAndCancelButtons onSave={handleSave} onCancel={handleCancel} />
) : null
)
}
>
<SettingsPageContainer>

5
packages/twenty-front/src/modules/settings/roles/role/components/SettingsRoleLabelContainer.tsx
View File

@ -29,8 +29,6 @@ export const SettingsRoleLabelContainer = ({
settingsDraftRoleFamilyState(roleId),
);
const titleInputInstanceId = `settings-role-label-${roleId}`;
const handleChange = (newValue: string) => {
setSettingsDraftRole({
...settingsDraftRole,
@ -45,9 +43,8 @@ export const SettingsRoleLabelContainer = ({
sizeVariant="md"
value={settingsDraftRole.label}
onChange={handleChange}
placeholder={t`Untitled Role`}
placeholder={t`Role name`}
hotkeyScope={ROLE_LABEL_EDIT_HOTKEY_SCOPE}
instanceId={titleInputInstanceId}
/>
</StyledHeaderTitle>
);

34
packages/twenty-front/src/modules/settings/roles/role/components/SettingsRoleLabelContainerEffect.tsx
View File

@ -1,34 +0,0 @@
import { settingsDraftRoleFamilyState } from '@/settings/roles/states/settingsDraftRoleFamilyState';
import { titleInputComponentState } from '@/ui/input/states/titleInputComponentState';
import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2';
import { useEffect } from 'react';
import { useRecoilValue } from 'recoil';
export const SettingsRoleLabelContainerEffect = ({
roleId,
}: {
roleId: string;
}) => {
const settingsDraftRole = useRecoilValue(
settingsDraftRoleFamilyState(roleId),
);
const titleInputInstanceId = `settings-role-label-${roleId}`;
const [isTitleInputOpen, setIsTitleInputOpen] = useRecoilComponentStateV2(
titleInputComponentState,
titleInputInstanceId,
);
useEffect(() => {
if (settingsDraftRole.label === '' && !isTitleInputOpen) {
setIsTitleInputOpen(true);
}
}, [
settingsDraftRole.label,
setIsTitleInputOpen,
titleInputInstanceId,
isTitleInputOpen,
]);
return <></>;
};