Skip to content

Commit 537848a

Browse files
author
FalkWolsky
committed
Adding super_admin to ADMIN_ROLE
1 parent bf7b1fb commit 537848a

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

client/packages/lowcoder/src/constants/orgConstants.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import { CommonSettingResponseData } from "api/commonSettingApi";
22
import { trans } from "i18n";
33

4-
export const ADMIN_ROLE = "admin";
4+
export const ADMIN_ROLE = "admin" || "super_admin";
55
export const MEMBER_ROLE = "member";
6+
67
export const NEW_ORG_PREFIX = trans("orgSettings.newOrg");
78

89
export const TacoRoles = [ADMIN_ROLE, MEMBER_ROLE] as const;
@@ -11,10 +12,7 @@ type RoleInfoType = Record<RoleIdType, { name: string; desc: string }>;
1112

1213
export const GroupRoleInfo: RoleInfoType = {
1314
admin: { name: trans("memberSettings.admin"), desc: trans("memberSettings.adminGroupRoleInfo") },
14-
member: {
15-
name: trans("memberSettings.member"),
16-
desc: trans("memberSettings.memberGroupRoleInfo"),
17-
},
15+
member: { name: trans("memberSettings.member"), desc: trans("memberSettings.memberGroupRoleInfo"), },
1816
};
1917

2018
export const OrgRoleInfo: RoleInfoType = {

client/packages/lowcoder/src/util/permissionUtils.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
import { ADMIN_ROLE } from "constants/orgConstants";
1+
import { ADMIN_ROLE} from "constants/orgConstants";
22
import { ApplicationMeta } from "constants/applicationConstants";
33
import { User } from "constants/userConstants";
44

5+
56
export function currentOrgAdmin(user: User) {
7+
console.log("userRole", user.orgRoleMap.get(user.currentOrgId));
8+
69
return user.orgRoleMap.get(user.currentOrgId) === ADMIN_ROLE;
710
}
811

0 commit comments

Comments
 (0)