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=f1fca657c4f9ac0bdc58a6ae949577438caf2369;hb=fd7cbe8c26487430f96511d5c3277d1c1f641e74;hpb=bb11c05914869028a39a685cf5bf2ec347f299a1

diff --git a/skyquake/plugins/project_management/src/dashboard/dashboard.jsx b/skyquake/plugins/project_management/src/dashboard/dashboard.jsx
index f1fca657c..66c3f4873 100644
--- a/skyquake/plugins/project_management/src/dashboard/dashboard.jsx
+++ b/skyquake/plugins/project_management/src/dashboard/dashboard.jsx
@@ -20,7 +20,7 @@ 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;
@@ -76,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);
@@ -91,9 +91,11 @@ 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;
@@ -116,36 +118,44 @@ class ProjectManagementDashboard extends React.Component {
         let self = this;
         e.preventDefault();
         e.stopPropagation();
-         let projectName = self.state['name'];
-        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(_.merge({
+        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.role ) {
-            } else {
+            if(r.role) {
                 delete r.keys;
-                    // r.keys = projectName;
-                    cleanRoles.push(r)
+                // 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;
-           cleanUsers.push(u);
+           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;
     }
@@ -173,13 +183,6 @@ class ProjectManagementDashboard extends React.Component {
     removeUserFromProject = (userIndex, e) => {
         this.actions.handleRemoveUserFromProject(userIndex);
     }
-    updateUserRoleInProject = (userIndex, roleIndex, e) => {
-        this.actions.handleUpdateUserRoleInProject({
-            userIndex,
-            roleIndex,
-            value: JSON.parse(e.target.value)
-        })
-    }
     toggleUserRoleInProject = (userIndex, roleIndex, e) => {
         this.actions.handleToggleUserRoleInProject({
             userIndex,
@@ -323,9 +326,13 @@ class ProjectManagementDashboard extends React.Component {
                             <tbody>
                                 {
                             state.projectUsers.map((u,i)=> {
-                                let userRoles = u.role && u.role.map((r) => {
-                                    return r.role;
-                                }) || [];
+                                let userRoles = []
+                                u.role && u.role.map((r) => {
+                                    userRoles.push(r.role);
+                                });
+                                u["rw-project-mano:mano-role"] && u["rw-project-mano:mano-role"].map((r) => {
+                                    userRoles.push(r.role);
+                                });
                                 return (
                                     <tr key={i}>
                                         {!state.isReadOnly ? <td><span
@@ -386,7 +393,8 @@ class ProjectManagementDashboard extends React.Component {
 }
 // onClick={this.Store.update.bind(null, Account)}
 ProjectManagementDashboard.contextTypes = {
-    router: React.PropTypes.object
+    router: React.PropTypes.object,
+    userProfile: React.PropTypes.object
 };
 
 ProjectManagementDashboard.defaultProps = {