diff --git a/atst/forms/data.py b/atst/forms/data.py index ebdeacbb..959dec96 100644 --- a/atst/forms/data.py +++ b/atst/forms/data.py @@ -186,6 +186,23 @@ ENVIRONMENT_ROLES = [ ), ] +ENVIRONMENT_ROLES = [ + ( + "developer", + { + "name": "Developer", + "description": "Configures cloud-based IaaS and PaaS computing, networking, and storage services.", + }, + ), + ( + "owner", + { + "name": "Workspace Owner", + "description": "Can add, edit, deactivate access to all projects, environments, and members. Can view budget reports. Can start and edit JEDI Cloud requests.", + }, + ), +] + FUNDING_TYPES = [ ("", "- Select -"), ("RDTE", "Research, Development, Testing & Evaluation (RDT&E)"), diff --git a/atst/forms/edit_member.py b/atst/forms/edit_member.py index e76df6d0..3fa3ed3c 100644 --- a/atst/forms/edit_member.py +++ b/atst/forms/edit_member.py @@ -3,7 +3,7 @@ from wtforms.validators import Optional from atst.forms.fields import SelectField -from .data import WORKSPACE_ROLES +from .data import WORKSPACE_ROLES, ENVIRONMENT_ROLES class EditMemberForm(Form): @@ -11,3 +11,7 @@ class EditMemberForm(Form): workspace_role = SelectField( "Workspace Role", choices=WORKSPACE_ROLES, validators=[Optional()] ) + + environment_role = SelectField( + "Environment Role", choices=ENVIRONMENT_ROLES, validators=[Optional()] + ) diff --git a/atst/routes/workspaces.py b/atst/routes/workspaces.py index d4e79fe9..23e05740 100644 --- a/atst/routes/workspaces.py +++ b/atst/routes/workspaces.py @@ -14,6 +14,7 @@ from atst.domain.projects import Projects from atst.domain.reports import Reports from atst.domain.workspaces import Workspaces from atst.domain.workspace_users import WorkspaceUsers +from atst.domain.environments import Environments from atst.forms.new_project import NewProjectForm from atst.forms.new_member import NewMemberForm from atst.forms.edit_member import EditMemberForm diff --git a/js/index.js b/js/index.js index 653038f4..204f9871 100644 --- a/js/index.js +++ b/js/index.js @@ -13,6 +13,7 @@ import poc from './components/forms/poc' import financial from './components/forms/financial' import toggler from './components/toggler' import NewProject from './components/forms/new_project' +import EditWorkspaceMember from './components/forms/edit_workspace_member' import Modal from './mixins/modal' import selector from './components/selector' import BudgetChart from './components/charts/budget_chart' @@ -39,7 +40,8 @@ const app = new Vue({ BudgetChart, SpendTable, CcpoApproval, - LocalDatetime + LocalDatetime, + EditWorkspaceMember, }, mounted: function() {