lanes 0.4.0 → 0.5.0

data/client/lanes/models/Base.coffee

@@ -64,6 +64,9 @@ class BaseModel
     modelTypeIdentifier: ->
         _.dasherize(_.last(@FILE?.path || ''))
 
+    extensionIdentifier: ->
+        @FILE.extension.identifier
+
     api_path: ->
         id = @FILE?.extension.identifier
         ( if id then "/#{id}" else '' ) + '/' + _.pluralize(@modelTypeIdentifier())
@@ -137,11 +140,11 @@ class BaseModel
         record
 
     # Sets the attribute data from a server respose
-    setFromServer: (data, options) ->
+    setFromServer: (data, options, method) ->
         data = if _.isArray(data) then data[0] else data
         BaseModel.__super__.set.call(this, data )
         @unset('errors')
-        this.associations.setFromServer(this, data, options) if this.associations
+        this.associations?.setFromServer(this, data, options, method)
         this.isDirty = false
 
     # save the model's data to the server
@@ -203,7 +206,7 @@ class BaseModel
     unCacheDerived: (name) ->
         delete this._cache[name]
 
-    # True if the model has "name" as either a prop or session attribute
+    # True if the model has "name" as either a prop, session, or derived attribute
     hasAttribute: (name) ->
         !! (this._definition[name] || this._derived[name])
 

data/client/lanes/models/Collection.coffee

@@ -199,9 +199,7 @@ class Lanes.Models.AssociationCollection extends Lanes.Models.Collection
             _.extend(attrs, @associationFilter)
         model = super
         if @options.inverse
-            parent = this.parent.clone()
-            parent[@options.inverse.without].reset() if @options.inverse.without
-            model.set(@options.inverse.name, parent, options)
+            model.set(@options.inverse.name, @parent, options)
         model
 
     fetch: (options) ->

data/client/lanes/models/JobStatus.coffee

@@ -11,6 +11,9 @@ class Lanes.Models.JobStatus extends Lanes.Models.Base
         errors:      'any'
         data:        'object'
 
+    session:
+        parent: 'object'
+
     events:
         'remote-update': 'onUpdate'
 

data/client/lanes/models/Query.coffee

@@ -271,15 +271,16 @@ class Lanes.Models.Query extends Lanes.Models.Base
     reset: ->
         unless @defaultSort is false
             sort = @defaultSort or @fields.findWhere(visible: true).id
-            @setSortField( @fields.findWhere(id: sort), sortAscending: true, silent: true )
+            @setSortField( @fields.findWhere(id: sort), sortAscending: @sortAscending, silent: true )
 
         @clauses.reset([
             {query: this, available_fields: @fields, field: @initialField}
         ])
 
     setSortField: (field, options = {silent: false}) ->
+        options.sortAscending ?= (if @sortField is field then !@sortAscending else true)
         @set({
-            sortAscending: options.sortAscending || (if @sortField is field then !@sortAscending else true)
+            sortAscending: options.sortAscending
             sortField: field
         }, options)
 

data/client/lanes/models/Sync.coffee

@@ -38,13 +38,15 @@ Lanes.Models.Sync = {
             handler = (reply) ->
                 delete model.requestInProgress
                 model.lastServerMessage = reply.message
-                model.setFromServer(reply.data, options, method)
-                model.trigger("save", model, reply, options) if isSave
-                model.trigger("sync", model, reply, options)
-                if reply.errors
+                if reply.errors or reply.success is false
                     Lanes.warn reply.errors
                     model.errors = reply.errors
                     model.trigger("error", model, options)
+                else
+                    model.setFromServer(reply.data, options, method)
+                    model.trigger("save", model, reply, options) if isSave
+                    model.trigger("sync", model, reply, options)
+
                 resolve(model)
 
             Lanes.Models.Sync.perform(method, options).then (reply) ->

data/client/lanes/react/mixins/Access.coffee

@@ -13,7 +13,7 @@ calculateAccess = (comp, props) ->
     comp.setState({accessRight}) if accessRight
 
 Lanes.React.Mixins.Access = {
-
+    getInitialState: -> {}
     componentDidMount: ->
         calculateAccess(this, @props)
 

data/client/lanes/react/mixins/Data.coffee

@@ -13,33 +13,34 @@ class DataWrapper
 
     rebind: (objects, options = {}) ->
         customEvents = _.result(@component, 'bindDataEvents', {})
-        for name, state of objects
-            if false == state
-                continue
-            unless state
-                Lanes.warn "#{name} is not set on #{@componentName()}"
-                continue
-            prevState = @states[name]
-            # onto next if the object is the same
-            continue if prevState == state
-
-            @states[name] = state
-            this.stopListening(prevState) if prevState
-
-            this.bindEvents(name, state, customEvents[name]) if state
-
-            if Lanes.u.isModel(state)
-                @listenToNetworkEvents(state) if @component.listenNetworkEvents
-                if @isStateUsingPubsub(name)
-                    if !prevState? or prevState.getId() != state.getId()
-                        Lanes.Models.PubSub.remove(prevState) if prevState
-                        unless false == state.pubsub
-                            if state.isNew()
-                                state.once "change:#{state.idAttribute}", -> Lanes.Models.PubSub.add(state)
-                            else
-                                Lanes.Models.PubSub.add(state)
-                    @listenTo(state, 'remote-update', @onPubSubChangeSet)
-        this.setComponentState({}) unless _.isEmpty(objects) or options.silent
+        @_rebindAttr(name, state, customEvents[name], options) for name, state of objects when state isnt false
+
+    _rebindAttr: (name, state, ev, options) ->
+        unless state
+            Lanes.warn "#{name} is not set on #{@componentName()}"
+            return
+
+        prevState = @states[name]
+
+        # onto next if the object is the same
+        return if prevState == state
+
+        @states[name] = state
+
+        this.bindEvents(name, state, ev)
+
+        if Lanes.u.isModel(state)
+            @listenToNetworkEvents(state) if @component.listenNetworkEvents
+            if @isStateUsingPubsub(name, state)
+                if !prevState? or prevState.getId() != state.getId()
+                    Lanes.Models.PubSub.remove(prevState) if prevState
+                    unless false == state.pubsub
+                        if state.isNew()
+                            state.once "change:#{state.idAttribute}", -> Lanes.Models.PubSub.add(state)
+                        else
+                            Lanes.Models.PubSub.add(state)
+                @listenTo(state, 'remote-update', @onPubSubChangeSet)
+        this.setComponentState({}) unless options.silent
 
     listenToNetworkEvents: (state) ->
         @listenTo(state,     'error',     @onError)
@@ -102,11 +103,12 @@ class DataWrapper
             @component.setState(state)
         true
 
-    isStateUsingPubsub: (name) ->
-        not (false == @component.pubsub or false == @component.pubsub?[name])
+    isStateUsingPubsub: (name, state) ->
+        _.result(state, 'registerforPubSub') isnt false and
+            not (false == @component.pubsub or false == @component.pubsub?[name])
 
     destroy: (state, events, fn) ->
-        for name, state of @states when @isStateUsingPubsub(name)
+        for name, state of @states when @isStateUsingPubsub(name, state)
             Lanes.Models.PubSub.remove(state) if Lanes.u.isModel(state)
         this.stopListening()
         delete @component.data
@@ -142,7 +144,7 @@ Lanes.React.Mixins.Data = {
         newState = readDataObjects(this, newProps)
         return if _.isEmpty(newState)
         if @data
-            @data.rebind(newState, silent:true)
+            @data.rebind(newState)
         else
             @data = new DataWrapper(this, newState)
 

data/client/lanes/screens/Commands.coffee

@@ -18,7 +18,6 @@ class Lanes.Screens.Commands extends Lanes.Models.State
         @options.modelDidRebind?(model)
 
     canEditModel: ->
-
         @screen.hasWriteAccess?()
 
     getSyncOptions: ->

data/client/lanes/screens/Definitions.coffee

@@ -95,7 +95,7 @@ class ScreenDefinition extends Lanes.Models.BasicModel
                     resolve(me)
                 else if attempt < 3
                     attempt += 1
-                    _.delay(done, 500)
+                    _.delay(done, 500 * attempt)
                 else
                     reject("Screen #{me.view} not definied after file retrieval")
             err = (msg) ->

data/client/lanes/screens/SystemSettings.cjsx

@@ -13,27 +13,37 @@ class Lanes.Screens.SystemSettings extends Lanes.React.Screen
 
     renderFileOptions: ->
         dir = @config.settings.lanes.storage_dir
-        <LC.FieldWrapper label='Store Directory' sm=9 {...@props} value={dir}>
+        <LC.FieldWrapper
+            model={@config} displayComponent={<span />}
+            label='Store Directory' sm=9 {...@props} value={dir}>
             <input type="text" className='value form-control'
                 placeholder="Directory to store files" value={dir}
                 onChange={_.partial(@onChange, 'storage_dir')} />
         </LC.FieldWrapper>
 
+    fogValue: ->
+        @state.fogValue or
+            JSON.stringify(@config.settings.lanes.fog_credentials, null, 2)
+    setFog: (ev) ->
+        @setState(fogValue: ev.target.value)
+
     renderFogOptions: ->
-        value = JSON.stringify(@config.settings.lanes.fog_credentials, null, 2)
-        <LC.FieldWrapper label='Fog Options' sm=9 {...@props} value={value}>
-            <BS.Input type="textarea" placeholder="FOG options (as JSON)" value={value}
-                onChange={_.partial(@onChange, 'fog_credentials')} />
-        </LC.FieldWrapper>
+        <LC.TextArea sm=9 name='fog' placeholder="FOG options (as JSON)" model={@config}
+            getValue={@fogValue} onChange={@setFog} />
 
     saveConfig: ->
+        comp.onBeforeSave?() for id, comp of @refs
+        if @state.fogValue
+            try
+                @config.settings.lanes.fog_credentials = JSON.parse(@state.fogValue)
         @config.save(saveAll: true)
+        comp.onSave?() for id, comp of @refs
 
     render: ->
         choices = ['file', 'fog']
         storage = @config.settings.lanes?.storage || 'file'
 
-        <LC.ScreenWrapper identifier="user-preferences">
+        <LC.ScreenWrapper identifier="system-settings">
             <BS.Nav bsStyle="pills" className="lanes-toolbar">
                 <BS.Button navItem componentClass="button"
                     onClick={@saveConfig} className="save navbar-btn control">
@@ -42,15 +52,17 @@ class Lanes.Screens.SystemSettings extends Lanes.React.Screen
             </BS.Nav>
 
             <BS.Row>
-                <LC.FieldWrapper label='File Storage' sm=3 {...@props} value={storage}>
+                <LC.FieldWrapper
+                    model={@config} displayComponent={<span />}
+                    label='File Storage' sm=3 {...@props} value={storage}>
                     <Lanes.Vendor.ReactWidgets.DropdownList
                         data={choices} value={storage} onChange={_.partial(@onChange, 'storage')} />
                 </LC.FieldWrapper>
                 {if storage is 'file' then @renderFileOptions() else @renderFogOptions()}
             </BS.Row>
             <BS.Row>
-                <LC.ImageSaver label='Logo' sm=4 model={@config} name='logo' />
+                <LC.ImageAsset sm=4 model={@config} name='logo' label='Logo' size='thumb' />
             </BS.Row>
-            {for id, Ext of Lanes.Extensions.instances when Ext.settingsElement
-                <Ext.settingsElement settings={@config.settings[id]} key={id} /> }
+            {for id, Ext of Lanes.Extensions.instances when Ext.getSettingsElement
+                Ext.getSettingsElement(ref: id, key: id, settings: @config.settings[id])}
         </LC.ScreenWrapper>

data/client/lanes/screens/UserPreferences.cjsx

@@ -16,6 +16,7 @@ class Lanes.Screens.UserPreferences extends Lanes.React.Screen
             {id, label: screen.label}
         )
 
+
     render: ->
         <LC.ScreenWrapper identifier="user-preferences">
             <Lanes.Screens.CommonComponents commands={@state.commands} />
@@ -33,6 +34,6 @@ class Lanes.Screens.UserPreferences extends Lanes.React.Screen
                     getSelection={@getScreens}
                 />
             </BS.Row>
-            {for id, Ext of Lanes.Extensions.instances when Ext.preferenceElement
-                <Ext.preferenceElement key={id} /> }
+            {for id, Ext of Lanes.Extensions.instances when Ext.getPreferenceElement
+                Ext.getPreferenceElement(key: id)}
         </LC.ScreenWrapper>

data/client/lanes/styles/bootstrap-custom-grid.scss

@@ -90,9 +90,11 @@
     }
 }
 
-.modal {
+.lanes-modal, .modal, .popover {
+    @include make-grid-columns();
+
     &.lg {
-        .modal-lg {
+        .modal-lg, .popover-content {
             @include make-grid(xs);
             @include make-grid(sm);
             @include make-grid(md);
@@ -100,14 +102,14 @@
         }
     }
     &.md {
-        .modal-lg {
+        .modal-lg, .popover-content {
             @include make-grid(xs);
             @include make-grid(sm);
             @include make-grid(md);
         }
     }
     &.sm {
-        .modal-lg {
+        .modal-lg, .popover-content {
             @include make-grid(xs);
             @include make-grid(sm);
         }

data/client/lanes/styles/fonts.scss

@@ -13,3 +13,12 @@ button, a.btn {
         font-family: $lanes-icon-font;
     }
 }
+
+
+// replace glyphicons with fa
+.glyphicon {
+    @extend .icon;
+    &.glyphicon-ok:before           { content: $fa-var-check;                }
+    &.glyphicon-warning-sign:before { content: $fa-var-exclamation-triangle; }
+    &.glyphicon-error:before        { content: $fa-var-exclamation;          }
+}

data/client/lanes/styles/global/styles.scss

@@ -1 +1,2 @@
 .cursor-pointer { cursor: pointer; }
+a { cursor: pointer; }

data/client/lanes/styles/variables.scss

@@ -1,4 +1,4 @@
-$lanes-field-value-height: 34px;
+$lanes-field-value-height: 30px;
 
 $lanes-color-selections: (
     #4D4D4D, // (gray)

data/client/lanes/testing/Helpers.coffee

@@ -25,12 +25,14 @@ Lanes.Test.renderComponent = (component, args = {}) ->
 Lanes.Test.Utils = Lanes.Vendor.ReactTestUtils
 
 wrap = (name) ->
-    ->
-        Lanes.Test.Utils.Simulate[name](@el, arguments...)
+    (options = {}) ->
+        args = _.extend {target: @el}, options
+        Lanes.Test.Utils.Simulate[name](@el, args)
         return @
 
 for name, func of Lanes.Test.Utils.Simulate
     Lanes.lib.Dom::[name] = wrap(name, func)
 
 Lanes.lib.Dom::setValue = (value) ->
-    @setAttribute('value', value).change()
+    @value = value
+    @change()