projects
/
osm
/
UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Nav re-order. Profile page
[osm/UI.git]
/
skyquake
/
plugins
/
project_management
/
src
/
dashboard
/
projectMgmtStore.js
diff --git
a/skyquake/plugins/project_management/src/dashboard/projectMgmtStore.js
b/skyquake/plugins/project_management/src/dashboard/projectMgmtStore.js
index
857e9a7
..
ec3a099
100644
(file)
--- a/
skyquake/plugins/project_management/src/dashboard/projectMgmtStore.js
+++ b/
skyquake/plugins/project_management/src/dashboard/projectMgmtStore.js
@@
-15,8
+15,7
@@
export default class ProjectManagementStore {
this.projectUsers = [];
this.selectedUser = null;
this.selectedRole = null;
this.projectUsers = [];
this.selectedUser = null;
this.selectedRole = null;
- this.roles = ['rw-rbac-platform:super-admin', 'operator_role'
- // 'some_other_role', 'yet_another_role', 'operator_role', 'some_other_role', 'yet_another_role'
+ this.roles = ['rw-project:project-admin', 'rw-project:project-oper', 'rw-project:project-create'
];
this.users = [];
this.activeIndex = null;
];
this.users = [];
this.activeIndex = null;
@@
-60,7
+59,7
@@
export default class ProjectManagementStore {
let project = data[0];
let projectIndex = data[1];
let project = data[0];
let projectIndex = data[1];
- let Project
User
= {
+ let Project
Data
= {
'name': project['name'],
'description': project['description'],
'projectUsers': project['project-config'] && project['project-config']['user'] || []
'name': project['name'],
'description': project['description'],
'projectUsers': project['project-config'] && project['project-config']['user'] || []
@@
-70,7
+69,7
@@
export default class ProjectManagementStore {
projectOpen: true,
isEdit: true,
isReadOnly: true
projectOpen: true,
isEdit: true,
isReadOnly: true
- }, Project
User
);
+ }, Project
Data
);
this.setState(state)
}
editProject(isEdit) {
this.setState(state)
}
editProject(isEdit) {
@@
-147,17
+146,17
@@
export default class ProjectManagementStore {
});
}
handleAddUser(e) {
});
}
handleAddUser(e) {
+ let self = this;
let u = JSON.parse(this.selectedUser);
let r = this.selectedRole;
let projectUsers = this.projectUsers;
let u = JSON.parse(this.selectedUser);
let r = this.selectedRole;
let projectUsers = this.projectUsers;
- let keys = ',';
console.log('adding user')
projectUsers.push({
'user-name': u['user-name'],
'user-domain': u['user-domain'],
"role":[{
"role": r,
console.log('adding user')
projectUsers.push({
'user-name': u['user-name'],
'user-domain': u['user-domain'],
"role":[{
"role": r,
- "keys":
keys
+ "keys":
self.name
}
]
})
}
]
})
@@
-168,15
+167,14
@@
export default class ProjectManagementStore {
let {userIndex, roleIndex, checked} = data;
let projectUsers = this.projectUsers;
let selectedRole = self.roles[roleIndex];
let {userIndex, roleIndex, checked} = data;
let projectUsers = this.projectUsers;
let selectedRole = self.roles[roleIndex];
- let keys = ',';
if(checked) {
if(checked) {
+ if(!projectUsers[userIndex].role) projectUsers[userIndex].role = [];
projectUsers[userIndex].role.push({
projectUsers[userIndex].role.push({
- role: self.roles[roleIndex],
- keys: keys
+ role: self.roles[roleIndex]
})
} else {
let role = projectUsers[userIndex].role;
})
} else {
let role = projectUsers[userIndex].role;
- let roleIndex = _.findIndex(role, {role:selectedRole
, keys: keys
})
+ let roleIndex = _.findIndex(role, {role:selectedRole})
projectUsers[userIndex].role.splice(roleIndex, 1)
}
self.setState({projectUsers});
projectUsers[userIndex].role.splice(roleIndex, 1)
}
self.setState({projectUsers});
@@
-185,9
+183,7
@@
export default class ProjectManagementStore {
handleUpdateUserRoleInProject(data) {
let {userIndex, roleIndex, value} = data;
let projectUsers = this.projectUsers;
handleUpdateUserRoleInProject(data) {
let {userIndex, roleIndex, value} = data;
let projectUsers = this.projectUsers;
- let keys = ',';
projectUsers[userIndex].role[roleIndex].role = value;
projectUsers[userIndex].role[roleIndex].role = value;
- projectUsers[userIndex].role[roleIndex]['keys'] = keys;
}
addRoleToUserInProject(userIndex) {
}
addRoleToUserInProject(userIndex) {
@@
-195,11
+191,8
@@
export default class ProjectManagementStore {
if(!projectUsers[userIndex].role) {
projectUsers[userIndex].role = [];
}
if(!projectUsers[userIndex].role) {
projectUsers[userIndex].role = [];
}
- let keys = ',';
projectUsers[userIndex].role.push({
projectUsers[userIndex].role.push({
- 'role': null,
- //temp until we get actual keys
- 'keys' : keys
+ 'role': null
});
this.setState({
projectUsers
});
this.setState({
projectUsers