lanes 0.5.6 → 0.6.0

data/client/lanes/models/query/ArrayResult.coffee

@@ -59,22 +59,12 @@ class Page
 
     modelAt: (index, options) ->
         row = @_rowAt(index)
-        @modelCache ||= {}
-        id = @idForRow(row)
-        if _.isBlank(id)
-            @_rowToModel(row)
-        else
-            @modelCache[id] ||= @_rowToModel(row)
+        @_rowToModel(row)
 
     saveModelChanges: (model, index) ->
         row = @_rowAt(index)
-        @modelCache[ @idForRow(row)] = model
-        data = model.serialize()
         for field, i in @result.query.fields.models
-            row[field.fetchIndex] = data[field.id]
-
-    idForRow: (row) ->
-        row[@result.query.idIndex]
+            row[field.fetchIndex] = model[field.id]
 
     addBlankRow: (index) ->
         model = new @result.query.model
@@ -127,7 +117,7 @@ class Lanes.Models.Query.ArrayResult extends Lanes.Models.Query.Result
     eachRow: (fn) ->
         for i in [0...@length]
             row = @rowAt(i)
-            fn(row, row[@xDataColumn], i)
+            return i if 'break' is fn(row, row[@xDataColumn], i)
 
     map: (fn) ->
         rows = []
@@ -135,6 +125,12 @@ class Lanes.Models.Query.ArrayResult extends Lanes.Models.Query.Result
             rows.push fn(row, xd, i)
         rows
 
+    findById: (id) ->
+        @eachRow (row, xd, i) =>
+            return 'break' if id is @idForRow(row)
+
+    idForRow: (row) ->
+        row[@query.idIndex]
 
     filteredRows: (fn) ->
         found = []
@@ -146,7 +142,10 @@ class Lanes.Models.Query.ArrayResult extends Lanes.Models.Query.Result
         @pageForIndex(index).modelAt(index)
 
     saveModelChanges: (model, index) ->
+        if _.isUndefined(index)
+            index = @findById( model.getId() )
         @pageForIndex(index).saveModelChanges(model, index)
+        @query.markModified()
 
     removeRow: (index = 0) ->
         @total -= 1
@@ -184,8 +183,8 @@ class Lanes.Models.Query.ArrayResult extends Lanes.Models.Query.Result
     rowRepresentation: (rowNum) ->
         @pageForIndex(rowNum).rowAt(rowNum)
 
-    valueForField: (rowNum, field) ->
-        @rowAt(rowNum)[ field.fetchIndex ]
+    valueForField: (row, field) ->
+        if field.fetchIndex? then row[ field.fetchIndex ] else undefined
 
     _updateSort: ->
         fn = @sortingFunction()
@@ -194,11 +193,11 @@ class Lanes.Models.Query.ArrayResult extends Lanes.Models.Query.Result
             rows = if @query.sortAscending then rows.reverse() else rows
             page = new Page(0, @, rows: rows)
             @pages = [page]
-            @query.changeCount += 1
+            @query.markModified()
             @
         else
             @reload().then =>
-                @query.changeCount += 1
+                @query.markModified()
                 @
 
 Object.defineProperty Lanes.Models.Query.ArrayResult.prototype, 'length',

data/client/lanes/models/query/CollectionResult.coffee

@@ -5,7 +5,7 @@ class Lanes.Models.Query.CollectionResult extends Lanes.Models.Query.Result
             @query.trigger('change', @query)
         )
         @collection.on('sort', =>
-            @query.changeCount += 1
+            @query.markModified()
         )
 
         this
@@ -28,7 +28,7 @@ class Lanes.Models.Query.CollectionResult extends Lanes.Models.Query.Result
 
         @collection.remove(old)
         @collection.add(model, at:index)
-        @query.changeCount++
+        @query.markModified()
 
     addBlankRow: (index) ->
         @collection.add({}, at: index)
@@ -49,8 +49,8 @@ class Lanes.Models.Query.CollectionResult extends Lanes.Models.Query.Result
     rowRepresentation: (rowNum) ->
         @modelAt(rowNum)
 
-    valueForField: (rowNum, field) ->
-        @collection.at(rowNum)[field.id]
+    valueForField: (model, field) ->
+        model[field.id]
 
     fieldToSortValue:
         any:    (v) -> v

data/client/lanes/react/Component.coffee

@@ -1,20 +1,21 @@
-createHelper = (component, name) ->
-    unless component.prototype[name]
-        Object.defineProperty(component.prototype, name,
-            configurable: true, enumerable: true
-            get: -> @data?.states[name]
-            set: (val) ->
-                @data?.rebind("#{name}": val)
-        )
+# createHelper = (component, name) ->
+#     unless component.prototype[name]
+#         Object.defineProperty(component.prototype, name,
+#             configurable: true, enumerable: true
+#             get: -> @data?.states[name]
+#             set: (val) ->
+#                 @data?.rebind("#{name}": val)
+#         )
 
-extendComponent = (component) ->
-    names = _.keys(component.prototype.dataObjects).concat(['collection', 'model'])
-    for name in _.uniq(names)
-        createHelper(component, name)
+# extendComponent = (component) ->
+#     names = _.keys(component.prototype.dataObjects).concat(['collection', 'model'])
+#     for name in _.uniq(names)
+#         createHelper(component, name)
 
 Lanes.React.Component = {
 
     defaultMixins: [
+        Lanes.Vendor.ReactModelMixin
         Lanes.React.Mixins.Data
         Lanes.React.Mixins.Viewport
         Lanes.React.Mixins.Component
@@ -24,7 +25,7 @@ Lanes.React.Component = {
         klass::mixins ||= []
         klass::mixins = _.uniq(klass::mixins.concat(mixins))
         comp = React.createClass(klass.prototype)
-        extendComponent(comp)
+#        extendComponent(comp)
         return Lanes.lib.HotReload?.remember(comp) or comp
 }
 

data/client/lanes/react/Root.cjsx

@@ -6,6 +6,6 @@ Lanes.React.Root = React.createClass
         viewport: @props.viewport
 
     render: ->
-        <div classNames="root">
+        <div className="root">
             {this.props.children}
         </div>

data/client/lanes/react/Screen.coffee

@@ -1,6 +1,7 @@
 Lanes.React.Screen = {
 
     defaultMixins: [
+        Lanes.Vendor.ReactModelMixin
         Lanes.React.Mixins.Data
         Lanes.React.Mixins.Viewport
         Lanes.React.Mixins.Screen

data/client/lanes/react/Viewport.coffee

@@ -1,4 +1,7 @@
 ALL_INSTANCES = []
+class FakeHistory
+    push:    Lanes.emptyFn
+    replace: Lanes.emptyFn
 
 class Lanes.React.Viewport extends Lanes.Models.State
 
@@ -6,17 +9,20 @@ class Lanes.React.Viewport extends Lanes.Models.State
     @displayError: (msg) -> _.first(ALL_INSTANCES)?.displayError(msg)
 
     session:
-        width:      'number'
-        height:     'number'
-        el:         'element'
-        selector:   'string'
-        domRoot:    'element'
-        reactRoot:  'object'
-        lanes:      'element'
-        modalProps: 'object'
+        width:          'number'
+        height:         'number'
+        el:             'element'
+        selector:       'string'
+        domRoot:        'element'
+        reactRoot:      'object'
+        lanes:          'element'
+        modalProps:     'object'
         pubSubDisabled: 'boolean'
-        rootComponent: 'any'
-        rootProps:   'object'
+        rootComponent:  'any'
+        rootProps:      'object'
+        rootElement:    'object'
+        history:        'object'
+        useHistory:     {type: 'boolean', default: true}
 
     constructor: ->
         super
@@ -27,6 +33,7 @@ class Lanes.React.Viewport extends Lanes.Models.State
         Lanes.fatal("Root selector #{@selector} not found") unless @domRoot
         _.dom(@domRoot).html = "<div class='lanes'/>"
         this.lanes = @domRoot.querySelector('.lanes')
+
         Lanes.lib.ResizeSensor(@domRoot, _.debounce( =>
             @_updateDimensions()
         , 250))
@@ -41,10 +48,39 @@ class Lanes.React.Viewport extends Lanes.Models.State
 
     onBoot: ->
         prev = _.dom(this.domRoot.previousElementSibling)
-        prev.addClass('complete') if prev.hasClass('loading')
-        _.delay(->
-            prev.remove()
-        , 100)
+        if @useHistory
+            @initializeHistory()
+        else
+            @history = new FakeHistory
+        if prev.hasClass('loading')
+            prev.addClass('complete')
+            _.delay(->
+                prev.remove()
+            , 100)
+
+    initializeHistory: ->
+        useBasename = Lanes.Vendor.BrowserHistory.useBasename
+
+        @history = useBasename(Lanes.Vendor.BrowserHistory.createHistory)({
+            basename: Lanes.config.root_path
+        })
+        @_historyStopListening = @history.listen (location) ->
+            Lanes.Screens.Definitions.setBrowserLocation(location)
+
+        Lanes.Screens.Definitions.setBrowserLocation(
+            @history.getCurrentLocation()
+        )
+
+        Lanes.Screens.Definitions.displaying.on('change:active', (screen) =>
+            if screen.active
+                @history.replace(screen.historyUrl())
+            if Lanes.Screens.Definitions.displaying.length is 0
+                @history.push('/')
+        )
+
+    close: ->
+        @hideModal()
+        @_historyStopListening?()
 
     _updateDimensions: ->
         this.set
@@ -70,7 +106,7 @@ class Lanes.React.Viewport extends Lanes.Models.State
             component = cntrl?.rootComponent?(this) ||
                 Lanes.React.Root.DefaultComponentNotFound
         )
-        root = React.createElement(Lanes.React.Root, {viewport: @},
+        @rootElement = React.createElement(Lanes.React.Root, {viewport: @},
             React.createElement(component, _.extend(@rootProps, extension: cntrl))
         )
-        @reactRoot = Lanes.Vendor.ReactDOM.render(root, @lanes)
+        @reactRoot = Lanes.Vendor.ReactDOM.render(@rootElement, @lanes)

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

@@ -17,6 +17,11 @@ Lanes.React.Mixins.Access = {
     componentDidMount: ->
         calculateAccess(this, @props)
 
+    propTypes:
+        writable: React.PropTypes.bool
+        readable: React.PropTypes.bool
+        readonly: React.PropTypes.bool
+
     componentWillReceiveProps: (newProps) ->
         calculateAccess(this, newProps)
 

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

@@ -1,157 +1,65 @@
-# Patterned loosely after Backbone React
-# https://github.com/magalhas/backbone-react-component/blob/master/lib/component.js
-
-# Mixing `Backbone.Events` into `Wrapper.prototype`
-# Binds models and collections to a `React.Component`. It mixes `Backbone.Events`.
-
-class DataWrapper
-
-    constructor: (@component, initialState = {}) ->
-        # Object to store data state (not the component state)
-        @states = {}
-        @rebind(_.clone(initialState), silent: true)
-
-    rebind: (objects, options = {}) ->
-        customEvents = _.result(@component, 'bindDataEvents', {})
-        @_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)
-            .listenTo(state, 'request',   @onRequest)
-            .listenTo(state, 'load sync', @onSync)
-
-    onPubSubChangeSet: (model, cs) ->
-        screen = @component.context?.screen || @component.getChildContext?()?.screen
-        screen?.onPubSubChangeSet?(model, cs)
-
-    componentName: ->
-        @component.constructor.displayName
-
-    onProxyReplace: (name, model) ->
-        @states[name] = model
-        @setComponentState(name, model)
-
-    bindEvents: (name, state, events) ->
-        if state.isProxy
-            @listenTo(state, 'proxyreplace', _.partial(@onProxyReplace, name))
-        if !events
-            if state.isState or state.isProxy
-                events ||= 'change'
-            else if Lanes.u.isCollection(state)
-                events ||= 'add remove change sort reset'
-            else
-                Lanes.warn "Unable to listen to unknown type #{name}"
-
-        @listenTo(state, events, _.partial(@setComponentState, name, state))
+class NetworkEventListener
 
-    onError: (modelOrCollection, options) ->
-        # Set state only if there's no silent option
-        unless options.silent
-            @setComponentState
-                isRequesting: false
-                hasError: modelOrCollection?.errorMessage or true
-                error: modelOrCollection.errors
+    constructor: (component) -> @component = component
+
+    bindEvents: (events, model) ->
+        model.on('error', @onError, @)
+            .on('request', @onRequest, @)
+            .on('load sync', @onSync, @)
+
+    unBindEvents: (events, model) ->
+        model.off(null, null, @)
 
-    onInvalid: (model, res, options) ->
-        @setComponentState(isInvalid: true) unless options.silent
+    setState: (state, options) ->
+        return if options?.silent
+        fn = @component.setNetworkActivity or @component.setState
+        fn.call(@component, state)
+
+    onError: (modelOrCollection, options) ->
+        @setState(
+            isRequesting: false
+            hasError: modelOrCollection?.errorMessage or true
+            errors: modelOrCollection.errors
+        )
 
     onRequest: (modelOrCollection, type, options) ->
-        # Set `state` only if there's no silent option
-        unless options.silent
-            @setComponentState
-                isRequesting: type
-                hasError: false
-                isInvalid: false
+        @setState(
+            isRequesting: true
+            hasError: false
+            errors: []
+        )
 
     onSync: (modelOrCollection, res, options = {}) ->
-        # Calls `setReactState` only if there's no silent option
-        this.setComponentState(isRequesting: false) unless options.silent
-
-    setComponentState: (key, value, args...) ->
-        return unless @component.isMounted()
-        state = if _.isObject(key) then key else {"#{key}": value}
-        if _.isFunction(@component.setDataState)
-            @component.setDataState(state, args...)
-        else
-            @component.setState(state)
-        true
-
-    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, state)
-            Lanes.Models.PubSub.remove(state) if Lanes.u.isModel(state)
-        this.stopListening()
-        delete @component.data
-
-
-Lanes.Vendor.Events.createEmitter(DataWrapper.prototype)
-#_.extend(DataWrapper.prototype, Lanes.Vendor.BBEvents)
-
-readDataObjects = (comp, newProps) ->
-    bound = _.clone _.result(comp, 'dataObjects') || {}
-    bound.model ||= 'props' if comp.props.model
-    bound.collection ||= 'props' if comp.props.collection
-    _.mapValues(bound, (value, name) ->
-        if _.isFunction(value)
-            if _.isEmpty(comp.data?.states[name]) then value.call(comp) else false
-        else if 'props' == value then newProps?[name] or comp.props[name]
-        else value
-    )
+        @setState(isRequesting: false)
+
+getNetworkListener = (component) ->
+    return unless _.result(component, 'listenNetworkEvents') is true
+    component._networkEventsListener ||= new NetworkEventListener(component)
 
 Lanes.React.Mixins.Data = {
-    # When the component gets the initial state, instance a `DataWrapper` to take
-    # care of models and collections binding
-    getInitialState: ->
-        defaults = readDataObjects(this)
-        @data = new DataWrapper(this, defaults) unless _.isEmpty(defaults)
-        {}
-
-    # When the component unmounts, dispose listeners and delete @data reference.
-    componentWillUnmount: ->
-        @data.destroy() if @data
-
-    componentWillReceiveProps: (newProps) ->
-        newState = readDataObjects(this, newProps)
-        return if _.isEmpty(newState)
-        if @data
-            @data.rebind(newState)
+
+    onModelUnbind: (model, name) ->
+        Lanes.Models.PubSub.remove(model)
+        getNetworkListener(@)?.unBindEvents(@modelBindings, model)
+
+    onModelBind: (model, name) ->
+        model = this[name]
+        return unless Lanes.u.isModel(model)
+
+        getNetworkListener(@)?.bindEvents(@modelBindings, @[name])
+
+        return if _.result(model, 'registerForPubSub') is false or
+            _.result(@, 'registerForPubSub') is false
+
+        if model.isNew()
+            model.once "change:#{model.idAttribute}", -> Lanes.Models.PubSub.add(model)
         else
-            @data = new DataWrapper(this, newState)
+            Lanes.Models.PubSub.add(model)
 
-    listenTo: (state, events, fn) ->
-        @data.listenTo(state, events, fn)
+        this.modelBindings.listenTo(model, 'remote-update', (model, cs) =>
+            screen = @context?.screen || @getChildContext?()?.screen
+            screen?.onPubSubChangeSet?(model, cs)
+        )
 
-    stopListening: (state, events, fn) ->
-        @data.stopListening(state, events, fn)
 
 }

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

@@ -7,5 +7,5 @@ Lanes.React.Mixins.MonitorSize = {
 
     componentDidMount: ->
         if @context.viewport
-            @data.listenTo(@context.viewport, 'change:height change:width', @_updateViewportSize)
+            @modelBindings.listenTo(@context.viewport, 'change:height change:width', @_updateViewportSize)
 }

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

@@ -6,6 +6,9 @@ Lanes.React.Mixins.ReadEditingState = {
         writable: React.PropTypes.bool
         readonly: React.PropTypes.bool
 
+    propTypes:
+        editOnly:  React.PropTypes.bool
+
     isEditingRecord: ->
         @props.editOnly or @context.recordDisplay == 'edit'
 }

data/client/lanes/screens/Commands.coffee

@@ -13,7 +13,7 @@ class Lanes.Screens.Commands extends Lanes.Models.State
 
     setModel: (model) ->
         @options.modelWillRebind?(model)
-        @screen.data.rebind("#{@options.modelName}": model)
+        @screen.modelBindings.reset({"#{@options.modelName}": model})
         @screen.setModelUrl?(model)
         @options.modelDidRebind?(model)
 

data/client/lanes/screens/CommonComponents.cjsx

@@ -1,7 +1,7 @@
 class Lanes.Screens.CommonComponents extends Lanes.React.Component
 
     propTypes:
-        commands:        React.PropTypes.instanceOf(Lanes.Screens.Commands).isRequired
+        commands:        React.PropTypes.object.isRequired
         errors:          React.PropTypes.bool
         networkActivity: React.PropTypes.bool
         toolbarProps:    React.PropTypes.object
@@ -13,7 +13,7 @@ class Lanes.Screens.CommonComponents extends Lanes.React.Component
         <div>
             {unless @networkActivity is false
                 <LC.NetworkActivityOverlay model={model} {...@props} /> }
-            <LC.Toolbar {...@props} {...@props.toolbarProps}>
+            <LC.Toolbar {...@props} {...@props.toolbarProps} model={model}>
                 {@props.children}
             </LC.Toolbar>
             {<LC.ErrorDisplay model={model} {...@props} /> unless @errors  is false}

data/client/lanes/screens/Definitions.coffee

@@ -64,7 +64,9 @@ class ScreenDefinition extends Lanes.Models.BasicModel
                     @url_prefix
                 else
                     "#{@extension.toLowerCase()}/screens"
-                @assets.map (asset) -> "#{prefix}/#{asset}"
+                @assets.map (asset) ->
+                    "//#{Lanes.config.api_host}" +
+                        "#{Lanes.config.assets_path_prefix}/#{prefix}/#{asset}"
 
         extension_path:
             deps: ['extension', 'model'], fn: ->

data/client/lanes/screens/SystemSettings.cjsx

@@ -1,6 +1,6 @@
 class Lanes.Screens.SystemSettings extends Lanes.React.Screen
 
-    dataObjects:
+    modelBindings:
         config: -> Lanes.config.system_settings
 
     getInitialState: ->
@@ -15,7 +15,7 @@ class Lanes.Screens.SystemSettings extends Lanes.React.Screen
         dir = @config.settings.lanes.storage_dir
         <LC.FieldWrapper
             model={@config} displayComponent={<span />}
-            label='Store Directory' sm=9 {...@props} value={dir}>
+            label='Store Directory' sm=9 value={dir}>
             <input type="text" className='value form-control'
                 placeholder="Directory to store files" value={dir}
                 onChange={_.partial(@onChange, 'storage_dir')} />
@@ -45,24 +45,19 @@ class Lanes.Screens.SystemSettings extends Lanes.React.Screen
 
         <LC.ScreenWrapper identifier="system-settings">
             <BS.Nav bsStyle="pills" className="lanes-toolbar">
-                <BS.Button navItem componentClass="button"
-                    onClick={@saveConfig} className="save navbar-btn control">
-                    <LC.Icon type="cloud-upload" />Save
-                </BS.Button>
+                <BS.NavItem>
+                    <BS.Button componentClass="button"
+                        onClick={@saveConfig}
+                        className="save control"
+                    >
+                        <LC.Icon type="cloud-upload" />Save
+                    </BS.Button>
+                </BS.NavItem>
             </BS.Nav>
-
-            <BS.Row>
-                <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.ImageAsset sm=4 model={@config} name='logo' label='Logo' size='thumb' />
+                <LC.ImageAsset sm=4 model={@config} name='logo'
+                    label='Logo' size='thumb' />
             </BS.Row>
             {for id, Ext of Lanes.Extensions.instances when Ext.getSettingsElement
-                Ext.getSettingsElement(ref: id, key: id, settings: @config.settings[id])}
+                Ext.getSettingsElement(ref: id, key: id, settings: @config.settings[id] || {})}
         </LC.ScreenWrapper>

data/client/lanes/screens/UserPreferences.cjsx

@@ -1,6 +1,6 @@
 class Lanes.Screens.UserPreferences extends Lanes.React.Screen
 
-    dataObjects:
+    modelBindings:
         user: -> Lanes.current_user
 
     getInitialState: ->

data/client/lanes/styles/fonts.scss

@@ -4,10 +4,9 @@ $lanes-icon-font: 'FontAwesome';
 
 @import "./fonts/font-awesome";
 
-button, a.btn {
-    .icon {
+button, a.btn, [role=button] {
+    .icon:not(.flush) {
         margin-right: 0.5em;
-        &.flush { margin-right: 0; }
     }
     &.icon:before{
         font-family: $lanes-icon-font;

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

@@ -1,5 +1,6 @@
 a               { cursor: pointer;       }
-.cursor-pointer { cursor: pointer;       }
+.cursor-pointer,
+.clickable      { cursor: pointer;       }
 .non-printable  { @include hidden-print; }
 .align-right    { text-align: right;     }
 .align-center   { text-align: center;    }