PlatformRoleMgmt: Appropriate user is now deleted

[osm/UI.git] / skyquake / plugins / user_management / src / platformRoleManagement / platformRoleManagementStore.js

diff --git a/skyquake/plugins/user_management/src/platformRoleManagement/platformRoleManagementStore.js b/skyquake/plugins/user_management/src/platformRoleManagement/platformRoleManagementStore.js
index 89f77b2..8a5b7f8 100644 (file)
--- a/skyquake/plugins/user_management/src/platformRoleManagement/platformRoleManagementStore.js
+++ b/skyquake/plugins/user_management/src/platformRoleManagement/platformRoleManagementStore.js
@@ -56,27 +56,18 @@ export default class PlatformRoleManagementStore {
             projectRoles
         });
     }
-    viewProject(data) {
-        let project = data[0];
-        let projectIndex = data[1];
-
-        let ProjectUser = {
-            'name': project['name'],
-            'description': project['description'],
-            'platformUsers': project['project-config'] && project['project-config']['user'] || []
-        }
+    editPlatform(isReadOnly) {
         let state = _.merge({
-            activeIndex: projectIndex,
-            projectOpen: true,
             isEdit: true,
-            isReadOnly: true
-        }, ProjectUser);
+            isReadOnly: isReadOnly,
+        }, {
+            'platformUsers': this.cachedUsers
+        });
         this.setState(state)
     }
-    editProject(isEdit) {
-        this.setState({
-            isReadOnly: isEdit
-        })
+
+    handleCancelEdit() {
+
     }
     handleCloseProjectPanel() {
         this.setState({
@@ -150,14 +141,12 @@ export default class PlatformRoleManagementStore {
         let u = JSON.parse(this.selectedUser);
         let r = this.selectedRole;
         let platformUsers = this.platformUsers;
-        let keys = ","
         console.log('adding user')
         platformUsers.push({
           'user-name': u['user-name'],
           'user-domain': u['user-domain'],
           "role":[{
-                      "role": r,
-                      "keys": keys
+                      "role": r
             }
           ]
         })
@@ -168,17 +157,14 @@ export default class PlatformRoleManagementStore {
         let {userIndex, roleIndex, checked} = data;
         let platformUsers = this.platformUsers;
         let selectedRole = self.roles[roleIndex];
-        let keys = ","
         if(checked) {
             if(!platformUsers[userIndex].role) platformUsers[userIndex].role = [];
             platformUsers[userIndex].role.push({
-                role: selectedRole,
-                keys: keys
+                role: selectedRole
             })
         } else {
             let role = platformUsers[userIndex].role;
-            let roleIndex = _.findIndex(role, {role:selectedRole, keys: keys})
-            platformUsers[userIndex].role.splice(roleIndex, 1)
+            platformUsers[userIndex].role.splice(_.findIndex(role, function(r) { return r.role == selectedRole; }), 1)
         }
        self.setState({platformUsers});
 
@@ -187,7 +173,6 @@ export default class PlatformRoleManagementStore {
         let {userIndex, roleIndex, value} = data;
         let platformUsers = this.platformUsers;
         platformUsers[userIndex].role[roleIndex].role = value;
-        platformUsers[userIndex].role[roleIndex]['keys'] = value;
 
     }
     addRoleToUserInProject(userIndex) {
@@ -196,9 +181,7 @@ export default class PlatformRoleManagementStore {
             platformUsers[userIndex].role = [];
         }
         platformUsers[userIndex].role.push({
-              'role': null,
-              //temp until we get actual keys
-              'keys' : ','
+              'role': null
             });
         this.setState({
             platformUsers
@@ -225,13 +208,14 @@ export default class PlatformRoleManagementStore {
     }
     getPlatformSuccess(platform) {
         this.alt.actions.global.hideScreenLoader.defer();
-        let platformUsers = platform.user
+        let platformUsers = platform && platform.user || [];
         let state = _.merge({
             platform: platform,
             projectOpen: true,
             isEdit: true,
             isReadOnly: true,
-            platformUsers: platformUsers
+            platformUsers: platformUsers,
+            cachedUsers: platformUsers
         });
         this.setState(state)
     }
@@ -240,15 +224,12 @@ export default class PlatformRoleManagementStore {
         this.alt.actions.global.hideScreenLoader.defer();
         this.setState({users});
     }
-    updateProjectSuccess() {
+    updatePlatformSuccess() {
         this.alt.actions.global.hideScreenLoader.defer();
-        let projects = this.projects || [];
-        projects[this.activeIndex] = {
-            'name': this['name'],
-            'description': this['description']
-        }
+        let platformUsers = this.platformUsers;
         this.setState({
-            projects,
+            platformUsers,
+            cachedUsers: platformUsers,
             isEdit: true,
             isReadOnly: true
         })