X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=skyquake%2Fplugins%2Fproject_management%2Fsrc%2Fdashboard%2Fdashboard.jsx;h=8cda8026990b62fc55051719af3a8d0154984952;hb=2279bd2b93eb7cf73526ee3cc1ae299f4bcfe48e;hp=cabad1e3d802d3b0e3865e14566f477373b1d72f;hpb=223b8d21b98a9ff27367ab77fe9507e603e744b2;p=osm%2FUI.git diff --git a/skyquake/plugins/project_management/src/dashboard/dashboard.jsx b/skyquake/plugins/project_management/src/dashboard/dashboard.jsx index cabad1e3d..8cda80269 100644 --- a/skyquake/plugins/project_management/src/dashboard/dashboard.jsx +++ b/skyquake/plugins/project_management/src/dashboard/dashboard.jsx @@ -94,25 +94,17 @@ class ProjectManagementDashboard extends React.Component { let self = this; e.preventDefault(); e.stopPropagation(); + let projectName = self.state['name']; let projectUsers = self.state.projectUsers; - let cleanUsers = []; - //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 { - cleanUsers.push(u); - } - }) - }) + let cleanUsers = this.cleanUsers(projectUsers, projectName); + + this.Store.createProject({ - 'name': self.state['name'], + 'name': projectName, 'description': self.state.description, 'project-config' : { - 'user': projectUsers + 'name-ref': projectName, + 'user': cleanUsers } }); } @@ -120,29 +112,39 @@ class ProjectManagementDashboard extends React.Component { let self = this; e.preventDefault(); e.stopPropagation(); + let projectName = self.state['name']; let projectUsers = self.state.projectUsers; + let cleanUsers = this.cleanUsers(projectUsers, projectName); + + + this.Store.updateProject(_.merge({ + 'name': projectName, + 'description': self.state.description, + 'project-config' : { + 'name-ref': projectName, + 'user': cleanUsers + } + })); + } + cleanUsers(projectUsers, projectName) { let cleanUsers = []; //Remove null values from role projectUsers.map((u) => { + let cleanRoles = []; 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']))) { - if(!r || ((r.role || r['keys']) && (!r.role || !r['keys']))) { - // projectUsers.splice(i, 1); + if(!r.role ) { } else { - cleanUsers.push(u); - } - }) - }) - - this.Store.updateProject(_.merge({ - 'name': self.state['name'], - 'description': self.state.description, - 'project-config' : { - 'user': cleanUsers + delete r.keys; + // r.keys = projectName; + cleanRoles.push(r) } - })); + }); + u.role = cleanRoles; + cleanUsers.push(u); + }); + return cleanUsers; } evaluateSubmit = (e) => { if (e.keyCode == 13) { @@ -265,10 +267,10 @@ class ProjectManagementDashboard extends React.Component { platformRoles.push(
{ state.roles.map((r,j) => { - return | -1)} /> | + return-1)} /> | }) }