Skip to content

Commit 3d98e69

Browse files
WeikocharlesBochet
authored andcommitted
Add object level form to role creation (twentyhq#12826)
## Context - Add object-level form to role creation - Add isSaving props for save button isLoading state <img width="594" alt="Screenshot 2025-06-24 at 15 03 59" src="https://github.com/user-attachments/assets/77d9d399-4e1a-4e35-be45-c19100ef06c1" /> --------- Co-authored-by: Charles Bochet <[email protected]>
1 parent b64eed7 commit 3d98e69

File tree

9 files changed

+180
-152
lines changed

9 files changed

+180
-152
lines changed

packages/twenty-front/src/modules/settings/roles/role-assignment/components/stories/SettingsRoleAssignment.stories.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ import { settingsDraftRoleFamilyState } from '@/settings/roles/states/settingsDr
33
import { Meta, StoryObj } from '@storybook/react';
44
import { useSetRecoilState } from 'recoil';
55
import { isDefined } from 'twenty-shared/utils';
6-
import { PENDING_ROLE_ID } from '~/pages/settings/roles/SettingsRoleCreate';
6+
import { ComponentDecorator, RouterDecorator } from 'twenty-ui/testing';
77
import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
88
import { getRolesMock } from '~/testing/mock-data/roles';
9-
import { ComponentDecorator, RouterDecorator } from 'twenty-ui/testing';
109

1110
const SettingsRoleAssignmentWrapper = (
1211
args: React.ComponentProps<typeof SettingsRoleAssignment>,
@@ -41,6 +40,6 @@ export const Default: Story = {
4140

4241
export const PendingRole: Story = {
4342
args: {
44-
roleId: PENDING_ROLE_ID,
43+
roleId: 'newRoleId',
4544
},
4645
};

packages/twenty-front/src/modules/settings/roles/role-permissions/components/SettingsRolePermissions.tsx

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,22 @@ const StyledRolePermissionsContainer = styled.div`
1212
type SettingsRolePermissionsProps = {
1313
roleId: string;
1414
isEditable: boolean;
15-
isCreateMode: boolean;
1615
};
1716

1817
export const SettingsRolePermissions = ({
1918
roleId,
2019
isEditable,
21-
isCreateMode,
2220
}: SettingsRolePermissionsProps) => {
2321
return (
2422
<StyledRolePermissionsContainer>
2523
<SettingsRolePermissionsObjectsSection
2624
roleId={roleId}
2725
isEditable={isEditable}
2826
/>
29-
{!isCreateMode && (
30-
<SettingsRolePermissionsObjectLevelSection
31-
roleId={roleId}
32-
isEditable={isEditable}
33-
/>
34-
)}
27+
<SettingsRolePermissionsObjectLevelSection
28+
roleId={roleId}
29+
isEditable={isEditable}
30+
/>
3531
<SettingsRolePermissionsSettingsSection
3632
roleId={roleId}
3733
isEditable={isEditable}

packages/twenty-front/src/modules/settings/roles/role-permissions/components/stories/SettingsRolePermissions.stories.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { Meta, StoryObj } from '@storybook/react';
44
import { useSetRecoilState } from 'recoil';
55
import { isDefined } from 'twenty-shared/utils';
66
import { ComponentDecorator, RouterDecorator } from 'twenty-ui/testing';
7-
import { PENDING_ROLE_ID } from '~/pages/settings/roles/SettingsRoleCreate';
87
import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
98
import { getRolesMock } from '~/testing/mock-data/roles';
109

@@ -57,7 +56,7 @@ export const ReadOnly: Story = {
5756

5857
export const PendingRole: Story = {
5958
args: {
60-
roleId: PENDING_ROLE_ID,
59+
roleId: 'newRoleId',
6160
isEditable: true,
6261
isCreateMode: true,
6362
},

packages/twenty-front/src/modules/settings/roles/role-settings/components/stories/SettingsRoleSettings.stories.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { Meta, StoryObj } from '@storybook/react';
44
import { useSetRecoilState } from 'recoil';
55
import { isDefined } from 'twenty-shared/utils';
66
import { ComponentDecorator, RouterDecorator } from 'twenty-ui/testing';
7-
import { PENDING_ROLE_ID } from '~/pages/settings/roles/SettingsRoleCreate';
87
import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
98
import { getRolesMock } from '~/testing/mock-data/roles';
109

@@ -57,7 +56,7 @@ export const ReadOnly: Story = {
5756

5857
export const PendingRole: Story = {
5958
args: {
60-
roleId: PENDING_ROLE_ID,
59+
roleId: 'newRoleId',
6160
isEditable: true,
6261
isCreateMode: false,
6362
},

0 commit comments

Comments
 (0)