lanes 0.5.0 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98fcf2619dab60aa9576d6e71d67be4385a56ef6
-  data.tar.gz: a8d42b6cec864bc69e333bff826689378551c033
+  metadata.gz: 423cf2958270fce5f4d1fb05fbba10fd56afbcd8
+  data.tar.gz: e5a90b6559ebbadf4c9eb63833d0aa59e1b4d017
 SHA512:
-  metadata.gz: 2e3d155815b2991ab8221bf0faca2e44005e44bcebe4900d9273ed7913d830a971b647faf9ba1002365de6113610a13a9286e876679c572fe5037fbe9f2ccd96
-  data.tar.gz: 7e51bfeecd2a829219816d435f7a636829d0e90f388ec85ff961cdbc9e5e2cbc8ecd4485ec3c0c04a240fdd5d84b7557e61130ed471b3487c6b002d6b25cb237
+  metadata.gz: 7f24e95dc672cdb9d18f6937fac870a5d216046739771d534291997369ab4488c807c92a7ad82151428b310466970085e69fd6f7c48caffd94f0a5471baa97cc
+  data.tar.gz: f680982d7d8767bfc225b61bfd38a97e6ab11185d426e60a6c3fad7319479d7433f21bc2a2b843d24d00a32445a9e84c49f611e5cf515f06531216237cd497c6

data/client/lanes/Boot.cjsx

@@ -1,9 +1,4 @@
 Lanes.renderScreenTo = (selector, options) ->
     Lanes.config.bootstrap(options)
     document.addEventListener "DOMContentLoaded", ->
-        viewport = new Lanes.React.Viewport(selector: selector)
-        Lanes.Models.PubSub.initialize()
-        Lanes.Extensions.fireOnInitialized(viewport)
-        viewport.renderRoot()
-        Lanes.Extensions.fireOnAvailable(viewport)
-        viewport.onBoot()
+        viewport = new Lanes.React.Viewport({selector, options})

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

@@ -1,3 +1,12 @@
+class AllRows extends Lanes.React.BaseComponent
+    render: ->
+        len = @props.length
+        rows = []
+        for i in [0...len - 1] by 1
+            rows.push @props.itemRenderer(i, i)
+        <div>{rows}</div>
+
+
 class Lanes.Components.Grid.Body extends Lanes.React.BaseComponent
 
     propTypes:
@@ -72,7 +81,10 @@ class Lanes.Components.Grid.Body extends Lanes.React.BaseComponent
             {fields}
         </div>
 
+
     render: ->
+        Rows = if @props.renderCompleteResults then AllRows else Lanes.Vendor.List
+
         <div className={_.classnames('grid-body', 'is-editing': @props.editing)}>
 
             <LC.NetworkActivityOverlay model={@props.query} />
@@ -84,7 +96,8 @@ class Lanes.Components.Grid.Body extends Lanes.React.BaseComponent
                 onCancel={@props.onEditCancel}
                 editing={@props.editing} />
 
-            <Lanes.Vendor.List
+
+            <Rows
                 useTranslate3d
                 isEditing={!!@props.editing}
                 itemRenderer={@renderRow}

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

@@ -10,23 +10,6 @@
 
 class Lanes.Components.Grid extends Lanes.React.Component
 
-    mixins: [
-        Lanes.React.Mixins.MonitorSize
-    ]
-
-    dataObjects:
-        query: 'props'
-
-    bindDataEvents:
-        query: 'load change sort'
-
-    getInitialState: ->
-        {}
-
-    componentWillReceiveProps: (nextProps) ->
-        if nextProps.autoLoadQuery and nextProps.query isnt @props.query
-            nextProps.query.ensureLoaded()
-
     propTypes:
         query:  React.PropTypes.instanceOf(Lanes.Models.Query).isRequired
         width:  React.PropTypes.number
@@ -40,17 +23,35 @@ class Lanes.Components.Grid extends Lanes.React.Component
         onColumnClick: React.PropTypes.func
         onSelectionChange: React.PropTypes.func
         autoLoadQuery: React.PropTypes.bool
+        renderCompleteResults: React.PropTypes.bool
         toolbarChildren: React.PropTypes.oneOfType([
             React.PropTypes.element,
             React.PropTypes.arrayOf(React.PropTypes.element)
         ])
 
-    getDefaultProps: ->
-        editorProps: {}, autoLoadQuery: true
+    mixins: [
+        Lanes.React.Mixins.MonitorSize
+    ]
+
+    dataObjects:
+        query: 'props'
+
+    bindDataEvents:
+        query: 'load change sort'
+
+    componentWillReceiveProps: (nextProps) ->
+        if nextProps.autoLoadQuery and nextProps.query isnt @props.query
+            nextProps.query.ensureLoaded()
 
     componentWillMount: ->
         @query.ensureLoaded() if @props.autoLoadQuery
 
+    getInitialState: ->
+        {}
+
+    getDefaultProps: ->
+        editorProps: {}, autoLoadQuery: true
+
     onSortChange: (sortInfo) ->
         for sortConfig in sortInfo
             sort = @query.fields.at(sortConfig.name).sortBy

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

@@ -1,7 +1,7 @@
 class Lanes.Components.Grid.Toolbar extends Lanes.React.BaseComponent
 
     propTypes:
-        addRecord: React.PropTypes.func
+        onAddRecord: React.PropTypes.func
         startEdit: React.PropTypes.func
         toolbarChildren: React.PropTypes.oneOfType([
             React.PropTypes.element,
@@ -13,16 +13,19 @@ class Lanes.Components.Grid.Toolbar extends Lanes.React.BaseComponent
         @props.startEdit(0)
 
     AddButton: ->
-        return null unless @props.allowCreate
+        return null unless @props.onAddRecord and @props.allowCreate
         <BS.Button className="navbar-btn add-row pull-right"
             onClick={@onAddRecord} bsSize='small'
         >
             <LC.Icon type="plus" />Add Row
         </BS.Button>
 
+
+    shouldDisplay: ->
+        not ( ( false == @props.commands?.isEditing() or not @props.allowCreate ) and not @props.toolbarChildren )
+
     render: ->
-        if ( ( false == @props.commands?.isEditing() or not @props.allowCreate ) and not @props.toolbarChildren )
-            return null
+        return null unless @shouldDisplay()
 
         props = _.extend {}, @props,
         <Lanes.Components.Grid.Toolbar key="toolbar" {...props} />

data/client/lanes/components/grid/editors.scss

@@ -5,7 +5,7 @@ $editor-border-color: #a8a8a8;
 $editor-border: 1px solid $editor-border-color;
 
 .toolbar {
-    .add-row { margin-right: 10px; }
+    .pull-right { margin-right: 10px; }
 }
 
 .editor {

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

@@ -9,7 +9,6 @@
     flex-direction: column;
     flex: 1;
 
-
     // styles shared between header and row
     .header, .r {
         display: flex;
@@ -17,13 +16,12 @@
         min-height: 40px;
         display: flex;
         flex-direction: row;
+        page-break-inside: avoid;
         .c {
             padding: $table-cell-padding;
             line-height: $line-height-base;
-
             display: flex;
             flex-direction: row;
-
             &.center { justify-content: center;   }
             &.right  { justify-content: flex-end; }
 
@@ -54,6 +52,11 @@
                     right: -5px;
                     color: lightgray;
                 }
+                &:not(.asc):not(.desc) {
+                    &:after {
+                        @include hidden-print;
+                    }
+                }
                 &.asc:after {
                     color: gray;
                     content: $fa-var-sort-asc;
@@ -65,13 +68,21 @@
             }
         }
     }
-
+    .r {
+        margin-right: 10px;
+        /* page-break-inside: avoid; */
+        break-inside: avoid-page;
+    }
     .grid-body {
         border-top: 1px solid $table-border-color;
         overflow: auto;
         position: relative; // for absolutely positioned row editor
         flex-grow: 1;
-        height: 1px;
+        height: 1px; // panel needs height to force scroll
+        @media print {
+            overflow: visible;
+            height: initial;
+        }
         .r:nth-child(odd) {
             background-color: $table-bg-accent;
         }

data/client/lanes/components/modal/Modal.cjsx

@@ -25,15 +25,15 @@ class Lanes.Components.Modal extends Lanes.React.Component
     getInitialState: ->
         show: false
 
-    onOkButton: -> @state.onOk?(this)
-    onCancelButton: -> @state.onCancel?(this)
-    onButton: (btn) ->
+    onOkButton: (ev) -> @state.onOk?(this, ev)
+    onCancelButton: (ev) -> @state.onCancel?(this, ev)
+    onButton: (ev, btn) ->
         @selected = btn
-        @_hide() if @state.autoHide
         if btn.eventKey is 'ok'
-            @onOkButton()
+            @onOkButton(ev)
         else
-            @onCancelButton()
+            @onCancelButton(ev)
+        @_hide() if @state.autoHide and ev.defaultPrevented isnt true
 
     componentWillReceiveProps: (nextProps) ->
         @replaceState(nextProps)
@@ -46,9 +46,7 @@ class Lanes.Components.Modal extends Lanes.React.Component
         @context.viewport.modalProps.show = true
         @setState(show: true)
 
-    hide: ->
-        @_hide()
-        @state.onCancel?()
+    hide: -> @_hide()
 
     render: ->
         return null unless @state.show
@@ -58,7 +56,7 @@ class Lanes.Components.Modal extends Lanes.React.Component
             button.eventKey ||= (button.key or button.title).toLowerCase()
             <BS.Button key={button.title}
                 bsStyle={button.style || 'default'} className={name}
-                onClick={_.partial(@onButton, button)}>{button.title}</BS.Button>
+                onClick={_.partial(@onButton, _, button)}>{button.title}</BS.Button>
 
         cls = _.classnames('lanes-modal', @state.className, @context.uistate?.layout_size)
         Body = @state.body
@@ -68,7 +66,7 @@ class Lanes.Components.Modal extends Lanes.React.Component
             </BS.Modal.Header>
 
             <BS.Modal.Body style={maxHeight: @context.viewport.height - 250}>
-                <Body modal={@} />
+                <Body ref="body" {...@props} modal={@} />
             </BS.Modal.Body>
 
             <BS.Modal.Footer>{buttons}</BS.Modal.Footer>

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

@@ -49,7 +49,7 @@ class Lanes.Components.RecordFinder extends Lanes.React.Component
 
     getValue: (ev) ->
         value = if @props.parentModel
-            @props.parentModel[@props.associationName][@props.name]
+            @props.parentModel[@props.associationName]?[@props.name]
         else
             @props.model[@props.name]
         value or ''
@@ -59,7 +59,7 @@ class Lanes.Components.RecordFinder extends Lanes.React.Component
                 # editOnly writable
         model = @props.parentModel or @props.model
 
-        <BS.InputGroup>
+        <BS.InputGroup className="record-finder">
 
             <BS.FormControl
                 {...props} {...handlers}

data/client/lanes/components/record-finder/styles.scss

@@ -4,13 +4,15 @@
 }
 
 
-.record-finder-query-string {
-  text-transform: uppercase;
-}
-
 .record-finder {
   .form-control {
-
+      @media print {
+          border-bottom-right-radius: $border-radius-base;
+          border-top-right-radius: $border-radius-base;
+      }
+  }
+  .input-group-btn {
+      @include hidden-print;
   }
 }
 

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

@@ -26,7 +26,7 @@ class Lanes.Components.FormGroup extends Lanes.React.Component
         })
         <BS.Col {...colProps} className={className}>
             <BS.FormGroup className={valueClassNames}>
-                <LC.ControlLabel {...@props} />
+                <BS.ControlLabel>{@props.label}</BS.ControlLabel>
                 {@props.children}
             </BS.FormGroup>
         </BS.Col>

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

@@ -1,4 +1,4 @@
-class Lanes.Components.Icon extends Lanes.React.Component
+class Lanes.Components.Icon extends Lanes.React.BaseComponent
 
     propTypes:
         type: React.PropTypes.string.isRequired
@@ -7,7 +7,8 @@ class Lanes.Components.Icon extends Lanes.React.Component
     render: ->
 
         classes = _.classnames 'icon', "icon-#{@props.type}", @props.className,
-            'cursor-pointer'      : @props.onClick,
+            'non-printable': @props.noPrint,
+            'with-action' : @props.onClick,
             "icon-#{@props.size}" : @props.size,
             'icon-pulse' : @props.animated
             'flush'      : @props.flush

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

@@ -6,6 +6,7 @@ class Lanes.Components.Input extends Lanes.React.Component
 
     renderInputField: (props, handlers) ->
         <BS.FormControl
+            type={@props.type or 'text'}
             {...props}
             {...handlers}
             onChange={@fieldMixinSetValue}

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

@@ -0,0 +1,8 @@
+class Lanes.Components.PanelHeader extends Lanes.React.BaseComponent
+
+    render: ->
+        <div className="lanes-panel-heading">
+            <h3 className="panel-title">{@props.title}</h3>
+            <div className="spacer" />
+            {@props.children}
+        </div>

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

@@ -20,20 +20,16 @@ $lanes-field-margin: 6px;
         }
 
     }
-
     &.align-right{
-        text-align: right;
         .control-label, .value, .rw-widget input {text-align: right; }
     }
     &.align-center{
-        text-align: center;
         .control-label, .value, .rw-widget input { text-align: center; }
     }
 
     &.select {
         .form-control-feedback { right: 30px; }
     }
-
     .form-group {
         background-color: rgba(255, 255, 255, 1);
         transition: background-color 1000ms linear;
@@ -49,4 +45,9 @@ $lanes-field-margin: 6px;
             background-color: darken($color-rgba, 20%);
         }
     }
+
+    .rw-datetimepicker {
+        &.rw-has-both { padding-right: 0; }
+        .rw-select { @include hidden-print; }
+    }
 }

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

@@ -44,3 +44,21 @@
     justify-content: center;
     .progress { width: 100%; }
 }
+
+.icon {
+    &.with-action {
+        cursor: pointer;
+        &:hover{ text-shadow: 1px 2px 2px #666666; }
+    }
+}
+
+.lanes-panel-heading {
+    display: flex;
+    align-items: center;
+    .spacer {
+        flex: 1;
+    }
+    > *:not(.panel-title){
+        margin-left: 0.5rem;
+    }
+}

data/client/lanes/index.js

@@ -2,7 +2,6 @@
 //= require ./extension
 //= require ./models
 //= require ./Config
-//= require ./plugins
 //= require ./react
 //= require ./components
 //= require ./screens

data/client/lanes/lib/all.js

@@ -0,0 +1,13 @@
+//= require ./namespace
+//= require ./utilFunctions
+//= require ./objToParam
+//= require ./ModuleSupport
+//= require ./loader
+//= require ./MakeBaseClass
+//= require ./el
+//= require ./dom-polyfills
+//= require ./dom
+//= require ./format
+//= require ./promise_helpers
+//= require ./results
+//= require ./ResizeSensor

data/client/lanes/lib/dom.coffee

@@ -66,7 +66,7 @@ _.dom = (unknown, query) ->
         throw new TypeError("Selector / DOM node is not present")
     else if _.isElement(unknown)
         unknown
-    else if unknown.isReactComponent
+    else if unknown.isReactComponent or unknown.render
         Lanes.Vendor.ReactDOM.findDOMNode(unknown)
     else if unknown.nodeType is 9 # body tag
         unknown

data/client/lanes/lib/format.coffee

@@ -1,9 +1,9 @@
 Lanes.u.format ||= {}
 
-Lanes.u.format.shartDate = (d) ->
+Lanes.u.format.shortDate = (d) ->
     _.moment(d).format('L')
 
-Lanes.u.format.shartDateTime = (d) ->
+Lanes.u.format.shortDateTime = (d) ->
     _.moment(d).format('lll')
 
 Lanes.u.format.currency = (v) ->

data/client/lanes/lib/index.js.erb

@@ -1,16 +1,4 @@
-//= require ./noConflict
-//= require ./namespace
-//= require ./utilFunctions
-//= require ./objToParam
-//= require ./ModuleSupport
-//= require ./loader
-//= require ./MakeBaseClass
-//= require ./el
-//= require ./dom-polyfills
-//= require ./dom
-//= require ./format
-//= require ./promise_helpers
-//= require ./results
+//=require ./all
 <% if Lanes.env.development?
     require_asset "./development"
 else

data/client/lanes/lib/loader.coffee

@@ -2,7 +2,7 @@
 #
 GECKO = /Gecko\//.test(navigator.userAgent)
 
-class Loader
+class Lanes.lib.AssetLoader
 
     constructor: (urls, cb) ->
         finished = 0
@@ -91,7 +91,7 @@ Lanes.lib.RequestAssets = (urls...) ->
     for url, i in urls
         urls[i] = Lanes.config.assets_path_prefix.concat( '/', urls[i] )
     new _.Promise(  (resolve, reject) ->
-        new Loader(urls, (completed) ->
+        new Lanes.lib.AssetLoader(urls, (completed) ->
             failures = _.pick(completed, (status, url) -> !status.success )
             if _.isEmpty(failures)
                 resolve(completed)

data/client/lanes/lib/utilFunctions.coffee

@@ -122,6 +122,8 @@ lcDash = (char, match, index) ->
 
 originalTitleize = _.titleize
 
+
+# some are taken from https://github.com/epeli/underscore.string
 _.mixin({
     dasherize: (str) ->
         _.trim(str).replace(/([A-Z])/g, lcDash).replace(/[-_\s]+/g, '-').toLowerCase()
@@ -144,6 +146,16 @@ _.mixin({
     isPromise: (obj) ->
         !!obj && (_.isObject(obj) || _.isFunction(obj)) && _.isFunction(obj.then)
 
+    classify: (str) ->
+        s = _.toString(str)
+        @capitalize(@camelCase(s.replace(/[\W_]/g, ' ')).replace(/\s/g, ''))
+
+    humanize: (str) ->
+        @capitalize(@trim(@underscored(str).replace(/_id$/, '').replace(/_/g, ' ')))
+
+    underscored: (str) ->
+        return @trim(str).replace(/([a-z\d])([A-Z]+)/g, '$1_$2').replace(/[-\s]+/g, '_').toLowerCase()
+
     isBlank: (value) ->
         switch true
             when _.isDate(value)

data/client/lanes/models/AssociationMap.coffee

@@ -4,7 +4,7 @@
 # Note!  An AssociationMap is created for each type of Model, and    #
 # is shared between all instances                                    #
 # ------------------------------------------------------------------ #
-class Lanes.Models.AssocationMap
+class Lanes.Models.AssociationMap
     constructor: (@klass) ->
         @klass::derived ||= {}
         @definitions = @klass::associations
@@ -45,6 +45,8 @@ class Lanes.Models.AssocationMap
     getOptions: (name, model) ->
         definition = @definitions[name]
         options = { parent: model }
+        if definition.inverse
+            options[ definition.inverse.name ] = model
         if definition.options
             _.extend(options, Lanes.u.resultsFor(model, definition.options))
         options
@@ -131,27 +133,34 @@ class Lanes.Models.AssocationMap
             continue if not @exists(name) or
                 (_.isEmpty(value) and not @isCreated(model, name))
 
-            association = model[name]
+            definition = @definitions[name]
 
-            if association.isProxy and Lanes.u.isModel(value) and not value.isProxy
-                association.replaceWithModel(value, association_name: name)
+            if @isCreated(model, name)
+                association = model[name]
+                # nothing to do if setting to same object
+                continue if value is association
 
-            else if Lanes.u.isModel(association)
-                continue if association is value
-
-                if !value
-                    association.clear()
-                else
-                    model.set(this.pk(name), value.id, options) if value.id
-                    if Lanes.u.isModel(value)
-                        @replace(model, name, value)
+                if association.isProxy and Lanes.u.isModel(value) and not value.isProxy
+                    association.replaceWithModel(value, association_name: name)
+                else if definition.model
+                    if value
+                        @_setModel(model, name, value, options, fn_name)
                     else
-                        association[fn_name]( value )
-
-                if options?.silent isnt true and not association.isProxy
-                    model.trigger("change:#{name}", value, {})
+                        association.clear()
+                else
+                    if value then association[fn_name]( value, options ) else association.clear()
             else
-                if value then association[fn_name]( value, options ) else association.clear()
+                @_setModel(model, name, value, options, fn_name)
+
+    _setModel: (model, name, value, options, fn_name) ->
+        model.set(this.pk(name), value.id, options) if value.id
+
+        if Lanes.u.isModel(value)
+            @replace(model, name, value)
+        else
+            model[name][fn_name]( value )
+        if options?.silent isnt true
+            model.trigger("change:#{name}", value, {})
 
     pk: (name) ->
         def = @definitions[name]

data/client/lanes/models/Base.coffee

@@ -20,6 +20,9 @@ class BaseModel
             deps: ['invalidAttributes'], fn: ->
                 _.isEmpty @invalidAttributes #_calculateInvalidAttributes()
 
+        hasErrors:
+            deps: ['errors'], fn: -> not _.isEmpty(@errors)
+
         errorMessage:
             deps:['errors'], fn: ->
                 if !@errors then ''
@@ -198,9 +201,14 @@ class BaseModel
             data = this.getAttributes(props:true, true)
         else
             data = this.unsavedAttributes()
-        if this.associations && (!_.isEmpty(data) || !this.isNew()) && !options.excludeAssociations
-            data.id = this.getId() unless this.isNew()
-            _.extend(data, this.associations.dataForSave(this, options))
+        if this.associations && !options.excludeAssociations
+            # empty associations are not included
+            associationData = this.associations.dataForSave(this, options)
+            _.extend(data, associationData)
+            # if submitting associations, we must include our id so they can be updated
+            unless this.isNew() or _.isEmpty(associationData)
+                data[@idAttribute] = this.getId()
+
         data
 
     unCacheDerived: (name) ->
@@ -255,7 +263,7 @@ class BaseModel
         klass::session['updated_at'] ||= 'date'
 
         if klass::associations
-            klass::associations = new Lanes.Models.AssocationMap(klass)
+            klass::associations = new Lanes.Models.AssociationMap(klass)
 
     @afterExtended: (klass) ->
         return if klass::abstractClass

data/client/lanes/models/Collection.coffee

@@ -123,7 +123,9 @@ class ModelsCollection
 
     # true if any models have unsaved data
     isDirty: ->
-        !!this.findWhere(isDirty: true)
+        !!@find( (model) ->
+            _.result(model, 'isDirty') isnt false
+        )
 
     url: -> @model::urlRoot()
 
@@ -140,8 +142,8 @@ class ModelsCollection
     dataForSave: (options) ->
         unsaved = []
         for model in @models
-            if options.saveAll || model.isDirty
-                unsaved.push( model.dataForSave(options) )
+            if options.saveAll || model.isDirty isnt false
+                unsaved.push( model.dataForSave?(options) or model.serialize())
         unsaved
 
     mixins:[