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

Fix permissions front followup (#10758)

Browse Source
This commit is contained in:
Weiko
2025-03-10 18:56:23 +01:00
committed by GitHub
parent c8b44aa242
commit 5fb613a8f7
9 changed files with 109 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
packages/twenty-front/src/pages/settings/roles/SettingsRoleEdit.tsx
View File

@ -43,8 +43,6 @@ export const SettingsRoleEdit = () => {
}
}, [role, navigateSettings, rolesLoading]);
if (!role) return null;
const tabs = [
{
id: SETTINGS_ROLE_DETAIL_TABS.TABS_IDS.ASSIGNMENT,
@ -67,6 +65,10 @@ export const SettingsRoleEdit = () => {
];
const renderActiveTabContent = () => {
if (!role) {
return null;
}
switch (activeTabId) {
case SETTINGS_ROLE_DETAIL_TABS.TABS_IDS.ASSIGNMENT:
return <RoleAssignment role={role} />;
@ -81,7 +83,7 @@ export const SettingsRoleEdit = () => {
return (
<SubMenuTopBarContainer
title={<H3Title title={role.label} />}
title={role && <H3Title title={role.label} />}
links={[
{
children: 'Workspace',
@ -92,18 +94,22 @@ export const SettingsRoleEdit = () => {
href: getSettingsPath(SettingsPath.Roles),
},
{
children: role.label,
children: role?.label,
},
]}
>
<SettingsPageContainer>
<TabList
tabListInstanceId={SETTINGS_ROLE_DETAIL_TABS.COMPONENT_INSTANCE_ID}
tabs={tabs}
className="tab-list"
/>
{renderActiveTabContent()}
</SettingsPageContainer>
{!rolesLoading && role ? (
<SettingsPageContainer>
<TabList
tabListInstanceId={SETTINGS_ROLE_DETAIL_TABS.COMPONENT_INSTANCE_ID}
tabs={tabs}
className="tab-list"
/>
{renderActiveTabContent()}
</SettingsPageContainer>
) : (
<></>
)}
</SubMenuTopBarContainer>
);
};

9
packages/twenty-front/src/pages/settings/roles/SettingsRoles.tsx
View File

@ -5,6 +5,7 @@ import { Roles } from '@/settings/roles/components/Roles';
import { RolesDefaultRole } from '@/settings/roles/components/RolesDefaultRole';
import { SettingsPath } from '@/types/SettingsPath';
import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
import { H3Title } from 'twenty-ui';
import { useGetRolesQuery } from '~/generated/graphql';
import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
@ -16,7 +17,7 @@ export const SettingsRoles = () => {
return (
<SubMenuTopBarContainer
title={t`Roles`}
title={rolesData && <H3Title title={t`Roles`} />}
links={[
{
children: <Trans>Workspace</Trans>,
@ -26,10 +27,10 @@ export const SettingsRoles = () => {
]}
>
<SettingsPageContainer>
{!rolesLoading && (
{!rolesLoading && rolesData && (
<>
<Roles roles={rolesData?.getRoles ?? []} />
<RolesDefaultRole roles={rolesData?.getRoles ?? []} />
<Roles roles={rolesData.getRoles ?? []} />
<RolesDefaultRole roles={rolesData.getRoles ?? []} />
</>
)}
</SettingsPageContainer>