lanes 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bef7dd4d1ad62c9921002f1316cd341936b76fa
-  data.tar.gz: 5fbe57c48a6c3c55228985871247a840ab385b40
+  metadata.gz: 4672ec1ecf5544a9da08b8eb826b5e573987ac7d
+  data.tar.gz: 53fb32ae3e09dec506b5cb9e1a961444c61bb122
 SHA512:
-  metadata.gz: a3ded106dcb9b1569a36f1d744194af7027d1a441e74292aaf41b726f361fd94651eda041b3de921b0ada3662e8287364dc467a1487fbc67088a4d7588343667
-  data.tar.gz: 24ac1aa4769187583415eeee331225480ce4315decaf080964d2b0d6c78809fb329e957ab4304afd31a387d6b922b05bb92c9da0f5ab044a4d143929fca8fcb9
+  metadata.gz: a8a6599cce4d9aaa1e0bcea8969636d7d83ecbd6263e4d6a325743af0531287ce74dee0b6fb69577b6607906114fbe4483bf1516be174f3a767279fa53ac65e8
+  data.tar.gz: f5e2136c4240d70c59c7ab485879e075d3600b0f4336e1b7da185823b4bdbcabaddae9abc38361f53b803c8fb4074583500b718df1f1e01db0eecaa6df1b975e

data/.gitignore

@@ -18,3 +18,5 @@ test/version_tmp
 npm-build/node_modules
 tmp
 db/schema*
+client/lanes/vendor/development/calendar.scss
+client/lanes/vendor/production/calendar.scss

data/client/lanes/Config.coffee

@@ -8,7 +8,7 @@ class SystemSettings extends Lanes.Models.Base
         settings: "object"
 
     modelTypeIdentifier: -> 'system-settings'
-    url: -> Lanes.config.api_path + 'system-settings'
+    url: -> Lanes.config.api_path + '/system-settings'
     initialize: ->
         @on('change:settings', @setDefaultSettings)
         @setDefaultSettings()

data/client/lanes/access/LoginDialog.cjsx

@@ -1,5 +1,5 @@
 class Session extends Lanes.Models.Base
-    api_path: 'lanes-access/user-session'
+    api_path: '/lanes-access/user-session'
 
     props:
         id:         'integer'

data/client/lanes/access/Roles.coffee

@@ -66,7 +66,7 @@ class Lanes.Models.UserRoleSet
             return this.testModelAccess(method, model)
 
     testModelAccess:(method, model) ->
-        !!_.detect( @roles, (role) -> role.can(method, model) )
+        !!_.find( @roles, (role) -> role.can(method, model) )
 
     canRead:(model, field) ->
         this.can('read', model, field)

data/client/lanes/access/User.coffee

@@ -4,7 +4,7 @@ class Lanes.Models.User extends Lanes.Models.Base
         super
         this.access_data = access
 
-    api_path: -> 'lanes-access/users'
+    api_path: -> '/lanes-access/users'
     derived:
         roles:
             deps: ['role_names', 'access_data']
@@ -64,7 +64,7 @@ class Lanes.Models.User extends Lanes.Models.Base
 
 
 class Session extends Lanes.Models.Base
-    api_path: 'lanes-access/user-session'
+    api_path: '/lanes-access/user-session'
     props:
         id:         'integer'
         login:      'string'

data/client/lanes/access/screens/user-management/UserManagement.cjsx

@@ -11,7 +11,7 @@ class Lanes.Access.Screens.UserManagement extends Lanes.React.Screen
         _.map user.role_names, (rn) -> {id: rn, name: _.titleize(rn) }
 
     setRolesForUser: (roles, options) ->
-        options.model.role_names = _.pluck(roles, 'id')
+        options.model.role_names = _.map(roles, 'id')
 
     editors: (props) ->
         role_names: ({model}) =>

data/client/lanes/components/calendar/styles.scss

@@ -1,3 +1,3 @@
 $dayz-event-colors: $lanes-color-selections;
 $dayz-event-text-colors: $lanes-text-color-selections;
-@import "lanes/vendor/calendar";
+@import "lanes/vendor/styles/calendar";

data/client/lanes/components/grid/Body.cjsx

@@ -15,7 +15,10 @@ class Lanes.Components.Grid.Body extends Lanes.React.BaseComponent
         )
         left = ev.clientX - ourBounds.left
         selectedIndex = (if @props.selectedIndex == index then null else index)
-        selectedModel = if selectedIndex? then @props.query.results.modelAt(selectedIndex)?.clone() else null
+
+        selectedModel = if selectedIndex?
+            @props.query.results.modelAt(selectedIndex, clone: true)
+        else null
         @props.onRowClick(selectedModel, selectedIndex,
             {top, left, container: ourBounds, rowHeight: clickBounds.height}
         )
@@ -69,8 +72,8 @@ class Lanes.Components.Grid.Body extends Lanes.React.BaseComponent
 
             <Lanes.Components.Grid.Editor
                 {...@props}
-
                 cellStyles={@props.cellStyles}
+                onSave={@props.onEditSave}
                 onCancel={@props.onEditCancel}
                 editing={@props.editing} />
 

data/client/lanes/components/grid/EditingMixin.cjsx

@@ -13,6 +13,7 @@ Lanes.Components.Grid.EditingMixin = {
         syncImmediatly: React.PropTypes.oneOfType([
             React.PropTypes.bool, React.PropTypes.func
         ])
+
     editorTypes:
         text: (props) ->
             <input type="text" {...props}
@@ -31,6 +32,8 @@ Lanes.Components.Grid.EditingMixin = {
 
     listenNetworkEvents: true
     getDefaultProps: -> editors: {}
+    componentDidMount: ->
+        _.dom(@).qs('input').focusAndSelect()
 
     renderControls: ->
         if @props.allowDelete

data/client/lanes/components/grid/Editor.cjsx

@@ -11,21 +11,13 @@ class Lanes.Components.Grid.Editor extends Lanes.React.BaseComponent
 
     onEditSave: (model, isDeleted = false) ->
         if (isDeleted)
-            @props.query.results.removeRow(@state.selectedIndex)
+            @props.query.results.removeRow(@props.editing.index)
         else
-            @props.query.results.saveModelChanges(model, @state.selectedIndex)
-        this.hideEditor()
-
-    componentWillReceiveProps: (nextProps) ->
-        if nextProps.editingRowIndex?
-            @setState(
-                selectedIndex: nextProps.editingRowIndex
-                selectedModel: @props.query.results.modelAt(nextProps.editingRowIndex)?.clone()
-            )
+            @props.query.results.saveModelChanges(model, @props.editing.index)
+        @props.onSave()
 
     render: ->
         return null unless @props.editing
-
         Editor = if true == @props.editor
             Lanes.Components.Grid.RowEditor
         else

data/client/lanes/components/grid/Grid.cjsx

@@ -58,21 +58,17 @@ class Lanes.Components.Grid extends Lanes.React.Component
 
         @setState(sortInfo: sortInfo, selectedIndex: undefined, selectedModel: undefined)
 
-    startEdit: (editingRowIndex = 0) ->
-        @setState({editingRowIndex})
-        _.defer => @setState({editingRowIndex: null})
-
-    cancelEdit: ->
-        if @state.editing?.model.isNew()
-            @props.query.results.removeRow(@state.editing.index)
-        @setState(editing: null)
-
-    onRowClick: (selectedModel, selectedIndex, position) ->
+    startEdit: (index, options = {}) ->
+        editing = _.extend({}, options, {
+            index: index,
+            model: options.model or @props.query.results.modelAt(index)
+            position: options.position or (index * 50)
+        })
         set = (attrs = {}) =>
             if @props.editor and false isnt @props.commands?.isEditing()
-                @setState(_.extend(attrs, editing: {index: selectedIndex, model: selectedModel, position}))
+                @setState( _.extend({}, attrs, {editing}) )
         if @props.onSelectionChange
-            osc = @props.onSelectionChange(selectedModel, selectedIndex)
+            osc = @props.onSelectionChange(editing.model, editing.index)
             if _.isPromise(osc)
                 @setState(is_loading: true)
                 osc.then -> set(is_loading: false)
@@ -81,14 +77,28 @@ class Lanes.Components.Grid extends Lanes.React.Component
         else
             set()
 
+    cancelEdit: ->
+        if @state.editing?.model.isNew()
+            @props.query.results.removeRow(@state.editing.index)
+        @setState(editing: null)
+
+    saveEdit: ->
+        @setState(editing: null)
+
+    onRowClick: (model, selectedIndex, position) ->
+        @startEdit(selectedIndex, {position, model})
+
     render: ->
         cellStyles = new Lanes.Components.Grid.CellStyles(@query.fields)
+
         <div className='grid-component'>
             <Lanes.Components.Grid.Toolbar {...@props} startEdit={@startEdit} />
             <Lanes.Components.Grid.Header  {...@props} cellStyles={cellStyles} />
             <Lanes.Components.Grid.Body
                 {...@props}
+                ref='body'
                 editing={@state.editing}
+                onEditSave={@saveEdit}
                 onEditCancel={@cancelEdit}
                 isLoading={@state.isLoading}
                 cellStyles={cellStyles}

data/client/lanes/components/grid/Selections.cjsx

@@ -12,7 +12,8 @@ class CheckBox extends Lanes.React.BaseComponent
         <input type="checkbox" checked={selected} onChange={@onChange} />
 
 
-class Lanes.Components.Grid.Selections
+
+DEFAULTS =
     id: 'selected'
     query: false
     textAlign: 'center'
@@ -21,7 +22,9 @@ class Lanes.Components.Grid.Selections
     sortBy: (row, indx, all) ->
         false == this.xtraData(indx)?.selected
 
+class Lanes.Components.Grid.Selections
     constructor: (options) ->
+        _.extend(@, DEFAULTS)
         @onChange = options.onChange
         @choices = {}
         _.bindAll(@, 'onColumnClick')

data/client/lanes/components/grid/Toolbar.cjsx

@@ -9,7 +9,7 @@ class Lanes.Components.Grid.Toolbar extends Lanes.React.BaseComponent
         ])
 
     onAddRecord: ->
-        model = @props.query.results.addBlankRow(0)
+        @props.query.results.addBlankRow(0)
         @props.startEdit(0)
 
     AddButton: ->

data/client/lanes/components/record-finder/RecordFinder.cjsx

@@ -44,11 +44,11 @@ class Lanes.Components.RecordFinder extends Lanes.React.Component
         null
 
     getValue: ->
-        if @props.parentModel
+        value = if @props.parentModel
             @props.parentModel[@props.associationName][@props.name]
         else
             @props.model[@props.name]
-
+        value or ''
 
     render: ->
         findIcon = <button className="btn btn-primary icon icon-search icon-lg" onClick={@showFinder}/>

data/client/lanes/components/select-field/SelectField.cjsx

@@ -3,25 +3,20 @@ class Lanes.Components.SelectField extends Lanes.React.Component
 
     propTypes:
         choices: React.PropTypes.arrayOf(
-            React.PropTypes.shape({
-                id: React.PropTypes.any
-                label: React.PropTypes.string
-            })
+            React.PropTypes.object
         )
-        model:        Lanes.PropTypes.Model
+        model:        Lanes.PropTypes.State.isRequired
+        idField:      React.PropTypes.string
         labelField:   React.PropTypes.string
         getSelection: React.PropTypes.func
         setSelection: React.PropTypes.func
         displayLimit: React.PropTypes.number
         syncOptions:  React.PropTypes.object
         multiSelect:  React.PropTypes.bool
-        fetchWhenOpen: React.PropTypes.bool
-        allowFreeForm: React.PropTypes.bool
         includeBlankRow: React.PropTypes.bool
-        displayFallback: React.PropTypes.string
 
     getDefaultProps: ->
-        labelField: 'code', idField: 'id'
+        labelField: 'label', idField: 'id'
 
     dataObjects:
         query: ->
@@ -31,24 +26,29 @@ class Lanes.Components.SelectField extends Lanes.React.Component
                 syncOptions: Lanes.Models.Query.mergedSyncOptions(@props.syncOptions)
                 src: src
                 fields: [
-                    {id: (@props.model?.idAttribute or 'id'), visible: false},
+                    {id: @props.idField, visible: false},
                     @props.labelField
                 ]
             })
 
     renderDisplayValue: ->
-        value = @getValue()?[@props.labelField]
-        <span>{value}</span>
+        value = @getValue()
+        label = if _.isArray(value)
+            _.toSentence( _.map(value, @props.labelField) )
+        else if _.isObject(value)
+            value[@props.labelField]
+        else
+            value
+        <span>{label}</span>
 
     getValue: ->
         return undefined if @state.isOpen and not @props.multiSelect
         return @state.tempDisplayValue if @state.tempDisplayValue
         model = @props.getSelection?(@model, @props) or @model?[@props.name]
-        return undefined unless model
-        return model if @props.multiSelect
+        return model if @props.multiSelect or not model?
         label = model[@props.labelField] or @props.defaultLabel
         if !label and not _.isEmpty(@props.choices)
-            label = _.findWhere( @props.choices, id: model.id)?[@props.labelField]
+            label = _.find( @props.choices, id: model.id)?[@props.labelField]
         if label
             {id: model.id, "#{@props.labelField}": label}
         else if model.id
@@ -81,7 +81,10 @@ class Lanes.Components.SelectField extends Lanes.React.Component
         else
             if _.isObject(value)
                 model = if Lanes.u.isState(value) then value else new @query.model(value)
-                model.fetch(@props.syncOptions).then(@setModel)
+                if false is @props.fetchOnSelect
+                    @setModel(model)
+                else
+                    model.fetch(@props.syncOptions).then(@setModel)
                 @setState(isOpen: false, tempDisplayValue: value, requestInProgress: true)
             else
                 if not @props.choices

data/client/lanes/components/select-field/styles.scss

@@ -1,4 +1,4 @@
-@import "lanes/vendor/widgets";
+@import "lanes/vendor/styles/widgets";
 
 .rw-combobox, .rw-datetimepicker, .rw-numberpicker, .rw-dropdownlist {
     padding-bottom: 1px; // push down so border isn't covered

data/client/lanes/components/shared/FieldMixin.cjsx

@@ -27,9 +27,9 @@ Lanes.Components.Form.FieldMixin = {
 
     _getValue: ->
         if @props.getValue
-            @props.getValue.call(@model, @props)
+            @props.getValue.call(@model, @props) or ''
         else
-            @model[@props.name]
+            @model[@props.name] or ''
 
     _setValue: (value) ->
         if @props.setValue then @props.setValue(value) else @model[@props.name] = value

data/client/lanes/components/shared/Input.cjsx

@@ -4,16 +4,5 @@ class Lanes.Components.Input extends Lanes.React.Component
         Lanes.Components.Form.InputFieldMixin
     ]
 
-    renderInputField: (props, handlers, label) ->
-        if @props.inputOnly then @renderPlain(props, handlers) else @renderStyled(props, handlers, label)
-
-    renderPlain: (props, handlers) ->
-        <input {...props} {...handlers} />
-
-    renderStyled: (props, handlers, label) ->
-        colProps = _.omit(@props, 'name', 'label', 'type', 'editing', 'display')
-
-        colClassName = _.classnames("align-#{@props.align}": @props.align, @formGroupClassNames(), 'field')
-        <BS.Col {...colProps} className={colClassName}>
-            <BS.Input {...props} {...handlers} />
-        </BS.Col>
+    renderInputField: (props, handlers) ->
+        <BS.Input standalone {...props} {...handlers} />

data/client/lanes/components/shared/InputFieldMixin.cjsx

@@ -13,7 +13,7 @@ Lanes.Components.Form.InputFieldMixin =
         type: 'text'
 
     getValue: ->
-        @refs.input.getValue()
+        @refs.input.getValue() or ''
 
     handleKeyDown: (ev) ->
         @props.onEnter() if ev.key is 'Enter'
@@ -26,23 +26,30 @@ Lanes.Components.Form.InputFieldMixin =
         @props.onBlur?()
 
     renderEdit: (label) ->
-        value = @props.value or @_getValue()
-        label ||= @props.label or _.field2title(@props.name)
+        value = @props.value or @_getValue() or ''
 
         props = _.extend({
             ref:       'input'
-            className: _.classnames('value',
+            className: _.classnames('edit',
                 changeset: @state.changeset
             )
-
             label:     if @props.unlabeled then false else label
-            onChange:  @handleChange
         }, @props, {value: value})
 
-        handlers = { onBlur: @onFieldBlur }
+        handlers = { onBlur: @onFieldBlur, onChange: @handleChange }
 
         if @isFieldValueInvalid() then props.bsStyle   = 'error'
         if @props.onEnter         then handlers.onKeyDown = @handleKeyDown
         if @props.selectOnFocus   then handlers.onFocus   = @selectOnFocus
 
-        @renderInputField(props, handlers, label)
+        props = _.omit(props, 'label')
+        field = @renderInputField(props, handlers)
+
+        if props.inputOnly
+            field
+        else
+            label ||= @props.label or _.field2title(@props.name)
+
+            <LC.FormGroup display {...props} label={label}>
+                {field}
+            </LC.FormGroup>

data/client/lanes/components/shared/NetworkActivityOverlay.cjsx

@@ -1,7 +1,7 @@
 class Lanes.Components.NetworkActivityOverlay extends Lanes.React.Component
 
     propTypes:
-        model:   Lanes.PropTypes.Model.isRequired
+        model:   Lanes.PropTypes.Model
         message: React.PropTypes.string
         timeout: React.PropTypes.number
         visible: React.PropTypes.bool

data/client/lanes/components/shared/NumberInput.cjsx

@@ -4,12 +4,14 @@ class Lanes.Components.NumberInput extends Lanes.React.Component
         Lanes.Components.Form.InputFieldMixin
     ]
     handleNumberChange: (n) ->
-        @handleChange(target: value: n)
+        value = if _.isNull(n) then 0 else n
+        @handleChange(target: {value})
 
     renderInputField: (props, handlers, label) ->
         props.format ||= '#,###.00'
         props = _.omit(props, 'label')
-        input = <Lanes.Vendor.ReactWidgets.NumberPicker
+
+        <Lanes.Vendor.ReactWidgets.NumberPicker
             ref="select"
             className={@props.className}
             {...handlers}
@@ -17,13 +19,3 @@ class Lanes.Components.NumberInput extends Lanes.React.Component
             onChange={@handleNumberChange}
             value={Number(props.value)}
         />
-        if @props.unstyled
-            input
-        else
-            <LC.FormGroup
-                {...@props}
-                className={@formGroupClassNames()}
-                label={@getLabelValue()}
-            >
-                {input}
-            </LC.FormGroup>

data/client/lanes/components/shared/ToggleField.cjsx

@@ -5,7 +5,6 @@ class Lanes.Components.ToggleField extends Lanes.React.Component
 
     renderDisplayValue: ->
         <Lanes.Vendor.ReactToggle
-            defaultChecked={!!@props.model[@props.name]}
             checked={!!@props.model[@props.name]}
             disabled={true}
         />
@@ -19,7 +18,6 @@ class Lanes.Components.ToggleField extends Lanes.React.Component
         toggle = <Lanes.Vendor.ReactToggle
             onChange={@handleToggleChange}
             checked={!!@props.model[@props.name]}
-            defaultChecked={!!@props.model[@props.name]}
             />
         if @props.unstyled
             toggle

data/client/lanes/components/shared/fields.scss

@@ -26,6 +26,15 @@ label.field {
         }
 
     }
+    &.edit {
+        // bootstrap styles
+        .value > div > input:only-child {
+            border-top-left-radius: $border-radius-base;
+            border-top-right-radius: $border-radius-base;
+            border-bottom-left-radius: $border-radius-base;
+            border-bottom-right-radius: $border-radius-base;
+        }
+    }
     &.read-only .input-group {
         @extend .form-control !optional;
         padding: 6px 12px;

data/client/lanes/components/shared/styles.scss

@@ -4,7 +4,8 @@
 @import "./overlay";
 @import "./image-saver";
 @import "./throbber";
-@import "lanes/vendor/toggle";
+@import "lanes/vendor/styles/toggle";
+@import "lanes/vendor/styles/widgets";
 
 .record-finder {
     .icon { cursor: pointer; }

data/client/lanes/components/toolbar/Toolbar.cjsx

@@ -26,7 +26,7 @@ class Lanes.Components.Toolbar extends Lanes.React.Component
                <Lanes.Vendor.ReactToggle
                aria-labelledby="Editing"
                onChange={@props.commands.toggleEdit}
-               defaultChecked={@props.commands.isEditing()} />
+               checked={@props.commands.isEditing()} />
                <span>Edit</span>
             </label>
         </li>

data/client/lanes/lib/HotReload.coffee

@@ -3,7 +3,7 @@ REACT_CACHE = Object.create(null)
 Lanes.lib.HotReload =
 
     remember: (klass) ->
-        return klass unless klass::FILE
+        return klass # unless klass::FILE
         path = klass::FILE.path.join("/") + ".js"
         if REACT_CACHE[path]
             return klass
@@ -24,7 +24,7 @@ Lanes.lib.HotReload =
                 Lanes.Vendor.deepForceUpdate(viewport.reactRoot)
 
     initiate: (assets) ->
-        Lanes.lib.RequestAssets (_.pluck(assets, 'path'))...
+        Lanes.lib.RequestAssets (_.map(assets, 'path'))...
             .then (a) =>
                 for asset in assets
                     if asset.type == "css"

data/client/lanes/lib/development.coffee

@@ -1,5 +1,5 @@
 ##= require ./HotReload
-##= require lanes/vendor/development
+##= require lanes/vendor/development/helpers
 ##= require_self
 
 Lanes.log.setDefaultLevel(Lanes.log.levels.TRACE)

data/client/lanes/lib/loader.coffee

@@ -15,13 +15,13 @@ class Loader
         this.head = document.querySelector('head')
         this.body = document.body
 
-        _.each(urls, (url) ->
-            url += "?#{parseInt(Math.random() * 100000)}"
+        for baseUrl in urls
+            url = "#{baseUrl}?#{parseInt(Math.random() * 100000)}"
             if /.css($|\?)/.test(url)
                 this.loadCSS(url, onComplete)
             else
                 this.loadJS(url, onComplete)
-        , this)
+
 
 
     loadCSS: (url, fn) ->

data/client/lanes/models/AssociationMap.coffee

@@ -161,7 +161,7 @@ class Lanes.Models.AssocationMap
         return ret if options.saveDepth > 5
         for name, def_options of @definitions when @isCreated(model, name)
             continue if def_options.readOnly or
-                (options.onlyAssociations and not _.include(options.onlyAssociations, name))
+                (options.onlyAssociations and not _.includes(options.onlyAssociations, name))
             assoc = model[name]
             ret[name] = assoc.dataForSave(
                 _.extend({}, options, def_options)

data/client/lanes/models/AssociationProxy.coffee

@@ -50,6 +50,7 @@ ProxyMethods = {
     api_path:     -> @_proxied_model::api_path()
     getId:        -> @_proxied_options.parent[@_proxied_config.association_pk]
     isNew:        -> _.isBlank(@getId())
+    clear:        -> null
     invalidMessageFor: (name) ->
         if @_proxied_model::_definition[name]?.required
             "Cannot be empty"

data/client/lanes/models/Base.coffee

@@ -1,7 +1,7 @@
 # These prototype properties are also
 # set on any Collections that are created
 PROPERTIES_SHARED_WITH_DEFAULT_COLLECTION = [
-    'cacheDuration'
+
 ]
 
 # Da Model. Handles all things dataish
@@ -65,8 +65,8 @@ class BaseModel
         _.dasherize(_.last(@FILE?.path || ''))
 
     api_path: ->
-        id = @FILE?.extension.identifier || ''
-        id + '/' + _.pluralize(@modelTypeIdentifier())
+        id = @FILE?.extension.identifier
+        ( if id then "/#{id}" else '' ) + '/' + _.pluralize(@modelTypeIdentifier())
 
     urlRoot: ->
         Lanes.config.api_path + _.result(this, 'api_path')
@@ -163,10 +163,7 @@ class BaseModel
     # triggering a `"change"` event.
     fetch:  (original_options = {}) ->
         options = _.extend({}, original_options, {limit:1, ignoreUnsaved:true})
-        if this.cacheDuration && _.isEmpty(original_options)
-            Lanes.Models.ServerCache.fetchRecord(this, options)
-        else
-            this.sync('read', this, options)
+        this.sync('read', this, options)
 
     @fetch: (options = {}) ->
         record = new this()
@@ -217,8 +214,8 @@ class BaseModel
     # Check if an attribute named "name" can be set to "value"
     # Returns an empty string if value, and an appropriate error message if not
     invalidMessageFor: (name) ->
-        return '' unless @unmaskedInvalidFields and _.include(@requiredAttributes, name) and
-            _.include(@unmaskedInvalidFields, name)
+        return '' unless @unmaskedInvalidFields and _.includes(@requiredAttributes, name) and
+            _.includes(@unmaskedInvalidFields, name)
 
         if @isBlank(name)
             "Cannot be empty"
@@ -234,7 +231,7 @@ class BaseModel
             @trigger("invalid-fields", this, @unmaskedInvalidFields)
         else if @unmaskedInvalidFields isnt 'all'
             @unmaskedInvalidFields ||= []
-            if _.include(@requiredAttributes, attr) and !_.include(@unmaskedInvalidFields, attr)
+            if _.includes(@requiredAttributes, attr) and !_.includes(@unmaskedInvalidFields, attr)
                 @unmaskedInvalidFields.push(attr)
                 @trigger("invalid-field:#{attr}", this)