X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=skyquake%2Fplugins%2Fproject_management%2Fsrc%2Fdashboard%2FprojectMgmtStore.js;h=71c10a272a9b3e24a15c52adbcff89cf14453273;hb=119e39d96483d5cec756be95cc0cb735fb6f9a74;hp=6ad46be415862b08c4f39a3d6db8bb574c20393e;hpb=e8b5e73cb3b410744daf1c096ae2697da171f9bb;p=osm%2FUI.git

diff --git a/skyquake/plugins/project_management/src/dashboard/projectMgmtStore.js b/skyquake/plugins/project_management/src/dashboard/projectMgmtStore.js
index 6ad46be41..71c10a272 100644
--- a/skyquake/plugins/project_management/src/dashboard/projectMgmtStore.js
+++ b/skyquake/plugins/project_management/src/dashboard/projectMgmtStore.js
@@ -3,6 +3,7 @@
  */
 import ProjectManagementActions from './projectMgmtActions.js';
 import ProjectManagementSource from './projectMgmtSource.js';
+import ROLES from 'utils/roleConstants.js';
 import _ from 'lodash';
 export default class ProjectManagementStore {
     constructor() {
@@ -15,9 +16,10 @@ export default class ProjectManagementStore {
         this.projectUsers = [];
         this.selectedUser = null;
         this.selectedRole = null;
-        this.roles = ['super_admin', 'operator_role'
-        // 'some_other_role', 'yet_another_role', 'operator_role', 'some_other_role', 'yet_another_role'
-        ];
+        this.roles = Object.keys(ROLES.PROJECT).map((p) => {
+            return ROLES.PROJECT[p];
+        })
+        // this.roles = ['rw-project:project-admin', 'rw-project:project-oper', 'rw-project:project-create'];
         this.users = [];
         this.activeIndex = null;
         this.isReadOnly = true;
@@ -60,7 +62,7 @@ export default class ProjectManagementStore {
         let project = data[0];
         let projectIndex = data[1];
 
-        let ProjectUser = {
+        let ProjectData = {
             'name': project['name'],
             'description': project['description'],
             'projectUsers': project['project-config'] && project['project-config']['user'] || []
@@ -70,7 +72,7 @@ export default class ProjectManagementStore {
             projectOpen: true,
             isEdit: true,
             isReadOnly: true
-        }, ProjectUser);
+        }, ProjectData);
         this.setState(state)
     }
     editProject(isEdit) {
@@ -146,7 +148,8 @@ export default class ProjectManagementStore {
             selectedUser: JSON.parse(user)
         });
     }
-    handleAddUser() {
+    handleAddUser(e) {
+        let self = this;
         let u = JSON.parse(this.selectedUser);
         let r = this.selectedRole;
         let projectUsers = this.projectUsers;
@@ -156,11 +159,11 @@ export default class ProjectManagementStore {
           'user-domain': u['user-domain'],
           "role":[{
                       "role": r,
-                      "keys": r
+                      "keys": self.name
             }
           ]
         })
-        this.setState({projectUsers, selectedUser: null})
+        this.setState({projectUsers, selectedUser: JSON.stringify(null)})
     }
     handleToggleUserRoleInProject(data) {
         let self = this;
@@ -168,13 +171,13 @@ export default class ProjectManagementStore {
         let projectUsers = this.projectUsers;
         let selectedRole = self.roles[roleIndex];
         if(checked) {
+            if(!projectUsers[userIndex].role) projectUsers[userIndex].role = [];
             projectUsers[userIndex].role.push({
-                role: self.roles[roleIndex],
-                keys: self.roles[roleIndex]
+                role: self.roles[roleIndex]
             })
         } else {
             let role = projectUsers[userIndex].role;
-            let roleIndex = _.findIndex(role, {role:selectedRole, keys: selectedRole})
+            let roleIndex = _.findIndex(role, {role:selectedRole})
             projectUsers[userIndex].role.splice(roleIndex, 1)
         }
        self.setState({projectUsers});
@@ -184,7 +187,6 @@ export default class ProjectManagementStore {
         let {userIndex, roleIndex, value} = data;
         let projectUsers = this.projectUsers;
         projectUsers[userIndex].role[roleIndex].role = value;
-        projectUsers[userIndex].role[roleIndex]['keys'] = value;
 
     }
     addRoleToUserInProject(userIndex) {
@@ -193,9 +195,7 @@ export default class ProjectManagementStore {
             projectUsers[userIndex].role = [];
         }
         projectUsers[userIndex].role.push({
-              'role': null,
-              //temp until we get actual keys
-              'keys' : 'some key'
+              'role': null
             });
         this.setState({
             projectUsers
@@ -227,10 +227,14 @@ export default class ProjectManagementStore {
     }
     updateProjectSuccess() {
         this.alt.actions.global.hideScreenLoader.defer();
+        let self = this;
         let projects = this.projects || [];
         projects[this.activeIndex] = {
             'name': this['name'],
-            'description': this['description']
+            'description': this['description'],
+            'project-config': {
+                'user': self.projectUsers
+            }
         }
         this.setState({
             projects,