Handle setting no access for user environment roles:

- use constant for no access string
- update no access constant
- update language and permissions for rendering remove app member button
This commit is contained in:
dandds
2019-05-15 09:27:07 -04:00
parent 0dc0397702
commit 815632ed00
13 changed files with 47 additions and 33 deletions

View File

@@ -1,5 +1,5 @@
import { shallowMount } from '@vue/test-utils'
import EditEnvironmentRole from '../forms/edit_environment_role'
import { NO_ACCESS, EditEnvironmentRole } from '../forms/edit_environment_role'
describe('EditEnvironmentRole', () => {
var initialRoleCategories, wrapper
@@ -7,7 +7,7 @@ describe('EditEnvironmentRole', () => {
beforeEach(() => {
initialRoleCategories = [
{
role: 'no_access',
role: NO_ACCESS,
members: [
{ role_name: null, user_id: '123' },
{ role_name: null, user_id: '456' },
@@ -41,10 +41,10 @@ describe('EditEnvironmentRole', () => {
it('removes null roles to no_access', () => {
let roles = wrapper.vm.sanitizeValues([
{ role: 'no_access', members: [{ role_name: null }] },
{ role: NO_ACCESS, members: [{ role_name: null }] },
])
expect(roles).toEqual([
{ role: 'no_access', members: [{ role_name: 'no_access' }] },
{ role: NO_ACCESS, members: [{ role_name: NO_ACCESS }] },
])
})

View File

@@ -1,7 +1,7 @@
import FormMixin from '../../mixins/form'
import Modal from '../../mixins/modal'
import toggler from '../toggler'
import EditEnvironmentRole from './edit_environment_role'
import { EditEnvironmentRole } from './edit_environment_role'
export default {
name: 'edit-application-roles',

View File

@@ -5,7 +5,9 @@ import Modal from '../../mixins/modal'
// https://github.com/dod-ccpo/atst/pull/799/files#r282240663
// May also want to reconsider the data structure by storing the roles and members separately
export default {
export const NO_ACCESS = 'No Access'
export const EditEnvironmentRole = {
name: 'edit-environment-role',
mixins: [FormMixin],
@@ -26,7 +28,7 @@ export default {
roles.forEach(role => {
role.members.forEach(member => {
if (member.role_name === null) {
member.role_name = 'no_access'
member.role_name = NO_ACCESS
}
})
})
@@ -34,7 +36,7 @@ export default {
},
checkNoAccess: function(role) {
return role === 'no_access'
return role === NO_ACCESS
},
toggleSection: function(sectionName) {

View File

@@ -1,4 +1,4 @@
import editEnvironmentRole from './forms/edit_environment_role'
import { EditEnvironmentRole } from './forms/edit_environment_role'
import FormMixin from '../mixins/form'
import optionsinput from './options_input'
import textinput from './text_input'
@@ -17,7 +17,7 @@ export default {
},
components: {
editEnvironmentRole,
EditEnvironmentRole,
optionsinput,
textinput,
optionsinput,

View File

@@ -18,7 +18,7 @@ import poc from './components/forms/poc'
import oversight from './components/forms/oversight'
import toggler from './components/toggler'
import NewApplication from './components/forms/new_application'
import EditEnvironmentRole from './components/forms/edit_environment_role'
import { EditEnvironmentRole } from './components/forms/edit_environment_role'
import EditApplicationRoles from './components/forms/edit_application_roles'
import MultiStepModalForm from './components/forms/multi_step_modal_form'
import funding from './components/forms/funding'