Merge pull request #28 from Nike-Inc/disallow_custom_owner_groups

Only allow owners to which a user belongs
Nike-Inc · Dec 12, 2017 · c6490ca · c6490ca
2 parents 3fc099f + 96441c1
commit c6490ca
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,4 +11,5 @@ build/metadata.json
 reports/
 logs/
 vault/
-*.tar.gz
+*.tar.gz
+package-lock.json
diff --git a/app/components/CreateSDBoxForm/CreateSDBoxForm.js b/app/components/CreateSDBoxForm/CreateSDBoxForm.js
@@ -127,6 +127,7 @@ export default class CreateSDBoxForm extends Component {
                         <label id="category-select-label" className='ncss-label'>Owner</label>
                         <GroupsSelect {...owner}
                             userGroups={userGroups}
+                            allowCustomValues={false}
                             handleBeingTouched={() => {
                                       dispatch(touch(formName, owner.name))
                                   }} />

diff --git a/app/components/EditSDBoxForm/EditSDBoxForm.js b/app/components/EditSDBoxForm/EditSDBoxForm.js
@@ -54,6 +54,7 @@ class EditSDBoxForm extends Component {
                     <label id="category-select-label" className='ncss-label'>Owner</label>
                     <GroupsSelect {...owner}
                         userGroups={userGroups}
+                        allowCustomValues={false}
                         handleBeingTouched={() => {
                                   dispatch(touch(formName, owner.name))
                               }} />

diff --git a/app/components/GroupSelect/GroupsSelect.js b/app/components/GroupSelect/GroupsSelect.js
@@ -6,7 +6,7 @@ import log from 'logger'
 export default class GroupsSelect extends Component {
 
     render() {
-        const {userGroups, value, onChange, handleBeingTouched, touched, error} = this.props
+        const {userGroups, allowCustomValues, value, onChange, handleBeingTouched, touched, error} = this.props
 
         var options = userGroups.map(function(group) {
             return {label: group, value: group}
@@ -28,13 +28,24 @@ export default class GroupsSelect extends Component {
 
         return (
             <div className='group-select ncss-form-group'>
-                <Select.Creatable
-                    className={((touched && error) ? 'category-select select-container-error' : 'category-select select-container')}
-                    onChange = {(v) => { handleBeingTouched(); onChange(v)}}
-                    onBlur={() => { handleBeingTouched() }}
-                    value={value}
-                    placeholder="Select a user group"
-                    options={options} />
+                { allowCustomValues &&
+                    <Select.Creatable
+                        className={((touched && error) ? 'category-select select-container-error' : 'category-select select-container')}
+                        onChange = {(v) => { handleBeingTouched(); onChange(v)}}
+                        onBlur={() => { handleBeingTouched() }}
+                        value={value}
+                        placeholder="Select a user group"
+                        options={options} />
+                }
+                { !allowCustomValues &&
+                    <Select
+                        className={((touched && error) ? 'category-select select-container-error' : 'category-select select-container')}
+                        onChange = {(v) => { handleBeingTouched(); onChange(v)}}
+                        onBlur={() => { handleBeingTouched() }}
+                        value={value}
+                        placeholder="Select a user group"
+                        options={options} />
+                }
                 {touched && error && <div className='select-error-msg'>{error}</div>}
             </div>
         )

diff --git a/app/components/UserGroupPermissionsFieldSet/UserGroupPermissionsFieldSet.js b/app/components/UserGroupPermissionsFieldSet/UserGroupPermissionsFieldSet.js
@@ -38,6 +38,7 @@ export default class UserGroupPermissionsFieldSet extends Component {
 
                                 <GroupsSelect {...permission.name}
                                     userGroups={userGroups}
+                                    allowCustomValues={true}
                                     handleBeingTouched={() => {
                                                           dispatch(touch(formName, permission.name.name))
                                                       }} />

diff --git a/package.json b/package.json
@@ -58,7 +58,7 @@
     "isparta-loader": "2.0.0",
     "json-loader": "0.5.4",
     "lolex": "1.5.0",
-    "node-sass": "3.8.0",
+    "node-sass": "3.11.0",
     "react-addons-test-utils": "15.1.0",
     "redbird": "0.5.2",
     "redux-devtools": "3.3.1",