projects
/
osm
/
UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NOTICKET: Merging OSM/master to OSM/projects
[osm/UI.git]
/
skyquake
/
plugins
/
project_management
/
src
/
dashboard
/
dashboard.jsx
diff --git
a/skyquake/plugins/project_management/src/dashboard/dashboard.jsx
b/skyquake/plugins/project_management/src/dashboard/dashboard.jsx
index
6b613cc
..
bc67dbf
100644
(file)
--- 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 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';
import 'style/layout.scss';
import './projectMgmt.scss';
import {Panel, PanelWrapper} from 'widgets/panel/panel';
@@
-20,6
+21,10
@@
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 imgAdd from '../../node_modules/open-iconic/svg/plus.svg'
import imgRemove from '../../node_modules/open-iconic/svg/trash.svg'
+import ROLES from 'utils/roleConstants.js';
+const PROJECT_ROLES = ROLES.PROJECT;
+const PLATFORM = ROLES.PLATFORM;
+
class ProjectManagementDashboard extends React.Component {
constructor(props) {
super(props);
class ProjectManagementDashboard extends React.Component {
constructor(props) {
super(props);
@@
-86,19
+91,23
@@
class ProjectManagementDashboard extends React.Component {
deleteProject = (e) => {
e.preventDefault();
e.stopPropagation();
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']
});
'name': this.state['name']
});
+ }
}
createProject = (e) => {
let self = this;
e.preventDefault();
e.stopPropagation();
}
createProject = (e) => {
let self = this;
e.preventDefault();
e.stopPropagation();
+ let projectName = self.state['name'];
let projectUsers = self.state.projectUsers;
let projectUsers = self.state.projectUsers;
- let cleanUsers = this.cleanUsers(projectUsers);
+ let cleanUsers = this.cleanUsers(projectUsers, projectName);
+
this.Store.createProject({
this.Store.createProject({
- 'name':
self.state['name']
,
+ 'name':
projectName
,
'description': self.state.description,
'project-config' : {
'user': cleanUsers
'description': self.state.description,
'project-config' : {
'user': cleanUsers
@@
-109,18
+118,20
@@
class ProjectManagementDashboard extends React.Component {
let self = this;
e.preventDefault();
e.stopPropagation();
let self = this;
e.preventDefault();
e.stopPropagation();
+ let projectName = self.state['name'];
let projectUsers = self.state.projectUsers;
let projectUsers = self.state.projectUsers;
- let cleanUsers = this.cleanUsers(projectUsers);
+ let cleanUsers = this.cleanUsers(projectUsers, projectName);
+
this.Store.updateProject(_.merge({
this.Store.updateProject(_.merge({
- 'name':
self.state['name']
,
+ 'name':
projectName
,
'description': self.state.description,
'project-config' : {
'user': cleanUsers
}
}));
}
'description': self.state.description,
'project-config' : {
'user': cleanUsers
}
}));
}
- cleanUsers(projectUsers) {
+ cleanUsers(projectUsers
, projectName
) {
let cleanUsers = [];
//Remove null values from role
projectUsers.map((u) => {
let cleanUsers = [];
//Remove null values from role
projectUsers.map((u) => {
@@
-128,8
+139,10
@@
class ProjectManagementDashboard extends React.Component {
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.
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
|| ( !r || ((r.role || r['keys']) && (!r.role || !r['keys'])))
) {
+ if(!r.role ) {
} else {
} else {
+ delete r.keys;
+ // r.keys = projectName;
cleanRoles.push(r)
}
});
cleanRoles.push(r)
}
});
@@
-206,9
+219,9
@@
class ProjectManagementDashboard extends React.Component {
let state = this.state;
let passwordSectionHTML = null;
let formButtonsHTML = (
let state = this.state;
let passwordSectionHTML = null;
let formButtonsHTML = (
- <ButtonGroup className="buttonGroup">
- <Button label="EDIT" type="submit" onClick={this.editProject} />
- </ButtonGroup>
+
<ButtonGroup className="buttonGroup">
+
<Button label="EDIT" type="submit" onClick={this.editProject} />
+
</ButtonGroup>
);
let projectUsers = [];
self.state.projectUsers.map((u) => {
);
let projectUsers = [];
self.state.projectUsers.map((u) => {
@@
-274,9
+287,11
@@
class ProjectManagementDashboard extends React.Component {
)
})}
</Panel>
)
})}
</Panel>
- <ButtonGroup className="buttonGroup" style={{margin: '0 0.5rem 0.5rem', background: '#ddd', paddingBottom: '0.5rem'}}>
- <Button label="Add Project" onClick={this.addProject} />
- </ButtonGroup>
+ <SkyquakeRBAC className="rbacButtonGroup">
+ <ButtonGroup className="buttonGroup">
+ <Button label="Add Project" onClick={this.addProject} />
+ </ButtonGroup>
+ </SkyquakeRBAC>
</PanelWrapper>
<PanelWrapper onKeyUp={this.evaluateSubmit}
className={`ProjectAdmin column`}>
</PanelWrapper>
<PanelWrapper onKeyUp={this.evaluateSubmit}
className={`ProjectAdmin column`}>
@@
-360,8
+375,9
@@
class ProjectManagementDashboard extends React.Component {
</FormSection>
</Panel>
</FormSection>
</Panel>
+ <SkyquakeRBAC allow={[PROJECT_ROLES.PROJECT_ADMIN]} project={this.state.name} className="rbacButtonGroup">
{formButtonsHTML}
{formButtonsHTML}
-
+ </SkyquakeRBAC>
</PanelWrapper>
</PanelWrapper>