Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit019da85

Browse files
committed
feat: add assign org role permission
1 parenta00ac98 commit019da85

File tree

4 files changed

+24
-16
lines changed

4 files changed

+24
-16
lines changed

‎site/src/contexts/auth/permissions.tsx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ export const checks = {
1212
viewExternalAuthConfig:"viewExternalAuthConfig",
1313
viewDeploymentStats:"viewDeploymentStats",
1414
editWorkspaceProxies:"editWorkspaceProxies",
15+
assignOrgRole:"assignOrgRole",
1516
}asconst;
1617

1718
exportconstpermissionsToCheck={
@@ -93,6 +94,12 @@ export const permissionsToCheck = {
9394
},
9495
action:"create",
9596
},
97+
[checks.assignOrgRole]:{
98+
object:{
99+
resource_type:"assign_org_role",
100+
},
101+
action:"create",
102+
},
96103
}asconst;
97104

98105
exporttypePermissions=Record<keyoftypeofpermissionsToCheck,boolean>;

‎site/src/pages/ManagementSettingsPage/CustomRolesPage/CustomRolesPage.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ import CustomRolesPageView from "./CustomRolesPageView";
2222

2323
exportconstCustomRolesPage:FC=()=>{
2424
const{ permissions}=useAuthenticated();
25-
const{createGroup:canCreateGroup}=permissions;
25+
const{assignOrgRole:canAssignOrgRole}=permissions;
2626
const{
2727
multiple_organizations:organizationsEnabled,
28-
template_rbac:isTemplateRBACEnabled,
28+
custom_roles:isCustomRolesEnabled,
2929
}=useFeatureVisibility();
3030
const{ experiments}=useDashboard();
3131
constlocation=useLocation();
@@ -62,7 +62,7 @@ export const CustomRolesPage: FC = () => {
6262
<PageHeader
6363
actions={
6464
<>
65-
{canCreateGroup&&isTemplateRBACEnabled&&(
65+
{canAssignOrgRole&&isCustomRolesEnabled&&(
6666
<Button
6767
component={RouterLink}
6868
startIcon={<GroupAdd/>}
@@ -79,8 +79,8 @@ export const CustomRolesPage: FC = () => {
7979

8080
<CustomRolesPageView
8181
roles={organizationRolesQuery.data}
82-
canCreateGroup={canCreateGroup}
83-
isTemplateRBACEnabled={isTemplateRBACEnabled}
82+
canAssignOrgRole={canAssignOrgRole}
83+
isCustomRolesEnabled={isCustomRolesEnabled}
8484
/>
8585
</>
8686
);

‎site/src/pages/ManagementSettingsPage/CustomRolesPage/CustomRolesPageView.tsx

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,25 +29,25 @@ import { docs } from "utils/docs";
2929

3030
exporttypeCustomRolesPageViewProps={
3131
roles:Role[]|undefined;
32-
canCreateGroup:boolean;
33-
isTemplateRBACEnabled:boolean;
32+
canAssignOrgRole:boolean;
33+
isCustomRolesEnabled:boolean;
3434
};
3535

3636
// const filter = createFilterOptions<Role>();
3737

3838
exportconstCustomRolesPageView:FC<CustomRolesPageViewProps>=({
3939
roles,
40-
canCreateGroup,
41-
isTemplateRBACEnabled,
40+
canAssignOrgRole,
41+
isCustomRolesEnabled,
4242
})=>{
4343
constisLoading=Boolean(roles===undefined);
4444
constisEmpty=Boolean(roles&&roles.length===0);
4545
// const [selectedRole, setSelectedRole] = useState<Role | null>(null);
46-
46+
console.log({ roles});
4747
return(
4848
<>
4949
<ChooseOne>
50-
<Condcondition={!isTemplateRBACEnabled}>
50+
<Condcondition={!isCustomRolesEnabled}>
5151
<Paywall
5252
message="Custom Roles"
5353
description="Organize users into groups with restricted access to templates. You need an Enterprise license to use this feature."
@@ -77,19 +77,19 @@ export const CustomRolesPageView: FC<CustomRolesPageViewProps> = ({
7777
<EmptyState
7878
message="No groups yet"
7979
description={
80-
canCreateGroup
81-
?"Create your firstgroup"
82-
:"You don't have permission to create agroup"
80+
canAssignOrgRole
81+
?"Create your firstcustom role"
82+
:"You don't have permission to create acustom role"
8383
}
8484
cta={
85-
canCreateGroup&&(
85+
canAssignOrgRole&&(
8686
<Button
8787
component={RouterLink}
8888
to="create"
8989
startIcon={<AddOutlined/>}
9090
variant="contained"
9191
>
92-
Creategroup
92+
Createcustom role
9393
</Button>
9494
)
9595
}

‎site/src/testHelpers/entities.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2485,6 +2485,7 @@ export const MockPermissions: Permissions = {
24852485
viewDeploymentStats:true,
24862486
viewExternalAuthConfig:true,
24872487
editWorkspaceProxies:true,
2488+
assignOrgRole:true,
24882489
};
24892490

24902491
exportconstMockDeploymentConfig:DeploymentConfig={

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp