X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=blobdiff_plain;f=skyquake%2Fplugins%2Fproject_management%2Fsrc%2Fdashboard%2Fdashboard.jsx;h=66c3f4873496d7cb08b01ededabf7e2f16792a85;hp=2b252271ee0854d0255722469201057639b7304a;hb=fd7cbe8c26487430f96511d5c3277d1c1f641e74;hpb=fcd961a41694875eee6f2ed7ac0e7d3fcd5e8cac
diff --git a/skyquake/plugins/project_management/src/dashboard/dashboard.jsx b/skyquake/plugins/project_management/src/dashboard/dashboard.jsx
index 2b252271e..66c3f4873 100644
--- a/skyquake/plugins/project_management/src/dashboard/dashboard.jsx
+++ b/skyquake/plugins/project_management/src/dashboard/dashboard.jsx
@@ -7,6 +7,7 @@ import ReactDOM from 'react-dom';
import AppHeader from 'widgets/header/header.jsx';
import ProjectManagementStore from './projectMgmtStore.js';
import SkyquakeComponent from 'widgets/skyquake_container/skyquakeComponent.jsx';
+import SkyquakeRBAC from 'widgets/skyquake_rbac/skyquakeRBAC.jsx';
import 'style/layout.scss';
import './projectMgmt.scss';
import {Panel, PanelWrapper} from 'widgets/panel/panel';
@@ -19,6 +20,10 @@ import SelectOption from 'widgets/form_controls/selectOption.jsx';
import 'widgets/form_controls/formControls.scss';
import imgAdd from '../../node_modules/open-iconic/svg/plus.svg'
import imgRemove from '../../node_modules/open-iconic/svg/trash.svg'
+import _ from 'lodash';
+import ROLES from 'utils/roleConstants.js';
+const PROJECT_ROLES = ROLES.PROJECT;
+const PLATFORM = ROLES.PLATFORM;
class ProjectManagementDashboard extends React.Component {
constructor(props) {
@@ -71,7 +76,7 @@ class ProjectManagementDashboard extends React.Component {
this.actions.handleAddProject();
}
viewProject = (un, index) => {
- this.actions.viewProject(un, index);
+ this.actions.viewProject(un, index, true);
}
editProject = () => {
this.actions.editProject(false);
@@ -86,33 +91,26 @@ class ProjectManagementDashboard extends React.Component {
deleteProject = (e) => {
e.preventDefault();
e.stopPropagation();
- this.Store.deleteProject({
+ if (confirm('Are you sure you want to delete this project?')) {
+ this.Store.deleteProject({
'name': this.state['name']
});
+ }
}
createProject = (e) => {
let self = this;
e.preventDefault();
e.stopPropagation();
+ let projectName = self.state['name'];
let projectUsers = self.state.projectUsers;
+ let cleanUsers = this.cleanUsers(projectUsers, projectName);
+
- //Remove null values from role
- projectUsers.map((u) => {
- u.role && u.role.map((r,i) => {
- let role = {};
- //you may add a user without a role or a keys, but if one is present then the other must be as well.
- if(!r || ((r.role || r['keys']) && (!r.role || !r['keys']))) {
- projectUsers.splice(i, 1);
- } else {
- return u;
- }
- })
- })
this.Store.createProject({
- 'name': self.state['name'],
+ 'name': projectName,
'description': self.state.description,
'project-config' : {
- 'user': projectUsers
+ 'user': cleanUsers
}
});
}
@@ -120,28 +118,46 @@ class ProjectManagementDashboard extends React.Component {
let self = this;
e.preventDefault();
e.stopPropagation();
- let projectUsers = self.state.projectUsers;
+ let projectName = self.state['name'];
+ let projectUsers = _.cloneDeep(self.state.projectUsers);
+ let cleanUsers = this.cleanUsers(projectUsers, projectName);
+
+ this.Store.updateProject({
+ 'name': projectName,
+ 'description': self.state.description,
+ 'project-config' : {
+ 'user': cleanUsers
+ }
+ });
+ }
+ cleanUsers(projectUsers, projectName) {
+ let self = this;
+ let cleanUsers = [];
//Remove null values from role
projectUsers.map((u) => {
+ let cleanRoles = [];
+ let cleanManoRoles = [];
u.role && u.role.map((r,i) => {
let role = {};
//you may add a user without a role or a keys, but if one is present then the other must be as well.
- if(!r || ((r.role || r['keys']) && (!r.role || !r['keys']))) {
- projectUsers.splice(i, 1);
- } else {
- return u;
- }
- })
- })
-
- this.Store.updateProject(_.merge({
- 'name': self.state['name'],
- 'description': self.state.description,
- 'project-config' : {
- 'user': projectUsers
+ if(r.role) {
+ delete r.keys;
+ // r.keys = projectName;
+ switch(ROLES.PROJECT.TYPE[r.role]) {
+ case 'rw-project-mano' : cleanManoRoles.push(r); break;
+ case 'rw-project' : cleanRoles.push(r); break;
+ }
}
- }));
+ });
+ u.role = cleanRoles;
+ u["rw-project-mano:mano-role"] = u["rw-project-mano:mano-role"] || [];
+ u["rw-project-mano:mano-role"] = u["rw-project-mano:mano-role"].concat(cleanManoRoles);
+ if (u['user-name'] != self.context.userProfile.userId) {
+ cleanUsers.push(u);
+ }
+ });
+ return cleanUsers;
}
evaluateSubmit = (e) => {
if (e.keyCode == 13) {
@@ -160,16 +176,18 @@ class ProjectManagementDashboard extends React.Component {
})
}
addUserToProject = (e) => {
- this.actions.handleAddUser();
+ let selectUserList = this.selectUserList;
+ console.log(ReactDOM.findDOMNode(selectUserList))
+ this.actions.handleAddUser(e);
}
removeUserFromProject = (userIndex, e) => {
this.actions.handleRemoveUserFromProject(userIndex);
}
- updateUserRoleInProject = (userIndex, roleIndex, e) => {
- this.actions.handleUpdateUserRoleInProject({
+ toggleUserRoleInProject = (userIndex, roleIndex, e) => {
+ this.actions.handleToggleUserRoleInProject({
userIndex,
roleIndex,
- value: JSON.parse(e.target.value)
+ checked: JSON.parse(e.currentTarget.checked)
})
}
removeRoleFromUserInProject = (userIndex, roleIndex, e) => {
@@ -202,10 +220,23 @@ class ProjectManagementDashboard extends React.Component {
let state = this.state;
let passwordSectionHTML = null;
let formButtonsHTML = (
-