openstack/skyline-console
Code Issues Proposed changes

fix: Fix the user manager & group manager

Browse Source 
Fix the page error when the role list is empty

Change-Id: Id72aaf1da2d96695fdf879de7f57f3a9f0183995
This commit is contained in:
xusongfu 2022-03-15 11:52:49 +08:00
parent 83a1b938c1
commit 2960516e5e
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pages/identity/containers/Project/actions/UserGroupManager.jsx
View File

@ -187,7 +187,7 @@ export class UserGroupManager extends ModalAction {
const defaultGroups = Object.keys(groupRoles);
const promiseList = [];
defaultGroups.forEach((group_id) => {
if (!values.select_group.includes(group_id)) {
if (values.select_group && !values.select_group.includes(group_id)) {
(oldGroupRoles[group_id] || []).forEach((role_id) => {
promiseList.push(
globalProjectStore.removeGroupRole({ id, group_id, role_id })
@ -195,7 +195,7 @@ export class UserGroupManager extends ModalAction {
});
} else {
(oldGroupRoles[group_id] || []).forEach((role_id) => {
if (!groupRoles[group_id].includes(role_id)) {
if (groupRoles[group_id] && !groupRoles[group_id].includes(role_id)) {
promiseList.push(
globalProjectStore.removeGroupRole({ id, group_id, role_id })
);
@ -203,8 +203,8 @@ export class UserGroupManager extends ModalAction {
});
}
});
values.select_group.forEach((group_id) => {
if (!defaultGroups.includes(group_id)) {
(values.select_group || []).forEach((group_id) => {
if (defaultGroups && !defaultGroups.includes(group_id)) {
if (groupRoles[group_id]) {
groupRoles[group_id].forEach((role_id) => {
promiseList.push(

8
src/pages/identity/containers/Project/actions/UserManager.jsx
View File

@ -286,7 +286,7 @@ export class UserManager extends ModalAction {
const defaultUsers = Object.keys(oldUserRoles);
const promiseList = [];
defaultUsers.forEach((user_id) => {
if (!values.select_user.includes(user_id)) {
if (values.select_user && !values.select_user.includes(user_id)) {
(oldUserRoles[user_id] || []).forEach((role_id) => {
promiseList.push(
globalProjectStore.removeUserRole({ id, user_id, role_id })
@ -294,7 +294,7 @@ export class UserManager extends ModalAction {
});
} else {
(oldUserRoles[user_id] || []).forEach((role_id) => {
if (!userRoles[user_id].includes(role_id)) {
if (userRoles[user_id] && !userRoles[user_id].includes(role_id)) {
promiseList.push(
globalProjectStore.removeUserRole({ id, user_id, role_id })
);
@ -302,8 +302,8 @@ export class UserManager extends ModalAction {
});
}
});
values.select_user.forEach((user_id) => {
if (!defaultUsers.includes(user_id)) {
(values.select_user || []).forEach((user_id) => {
if (defaultUsers && !defaultUsers.includes(user_id)) {
if (userRoles[user_id]) {
userRoles[user_id].forEach((role_id) => {
promiseList.push(

6
src/pages/identity/containers/User/actions/SystemRole.jsx
View File

@ -289,7 +289,7 @@ export class SystemRole extends ModalAction {
const defaultProjects = Object.keys(oldProjectRoles);
const promiseList = [];
defaultProjects.forEach((id) => {
if (!values.select_project.includes(id)) {
if (values.select_project && !values.select_project.includes(id)) {
(oldProjectRoles[id] || []).forEach((role_id) => {
promiseList.push(
globalProjectStore.removeUserRole({ id, user_id, role_id })
@ -305,8 +305,8 @@ export class SystemRole extends ModalAction {
});
}
});
values.select_project.forEach((id) => {
if (!defaultProjects.includes(id)) {
(values.select_project || []).forEach((id) => {
if (defaultProjects && !defaultProjects.includes(id)) {
if (projectRoles[id]) {
projectRoles[id].forEach((role_id) => {
promiseList.push(