lanes 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61899d6310319e01eeb5f8d3143de6381d59ef22
-  data.tar.gz: 7684de7e8724e81d9bb3a294dc995d3f74a7a8e5
+  metadata.gz: 16b8badf6014b9cc559daad0046bffa56d08e791
+  data.tar.gz: b0018988b0ef191d183965f06ace441c7875b073
 SHA512:
-  metadata.gz: 6037b22dcff009ca206df7145b6058bd8b0e4403e0459f1ce0367afc63a94db7cdd700d225d9cd1c29d86e065392bb087927e71b0f9d039a5c023a14d52b031e
-  data.tar.gz: b227ee2a57df19679fff4767d23734ff4fff44cb92d98494ec1f75c97669793356a6b4610470de0885dba064d91a455ec93e8b0eeac092493ebe50331f67779c
+  metadata.gz: ddbc32e5e1dd43e8ca84e27e2a1bd02117dab786ab085900288990de9e32c7bfa406ffb23b3c32c7cb48a8c6da1c404f71f49b7064372b23bdfe922591de83a3
+  data.tar.gz: 2e4d091cfa1abcf667cf59dde4384f88c885825f436b7dd746528d9d5316f00ec3427db1cbb02176230bf9458d164d0dcaada35e1042ecf790dad3f83ba16a0c

data/client/lanes/Config.coffee

@@ -7,17 +7,20 @@ class SystemSettings extends Lanes.Models.Base
         settings: "object"
 
     associations:
-        logo:  { model: "Lanes.Models.Asset" }
+        logo:        { model: "Lanes.Models.Asset"        }
+        smtp:        { model: "Lanes.Models.SmtpSettings" }
+        print_logo:  { model: "Lanes.Models.Asset"        }
 
     modelTypeIdentifier: -> 'system-settings'
     url: -> Lanes.config.api_path + '/system-settings'
     initialize: ->
         @on('change:settings', @setDefaultSettings)
+        @smtp.set(@settings?.lanes?.smtp)
         @setDefaultSettings()
 
     setDefaultSettings: ->
         @settings ||= {}
-        @settings.lanes || = {}
+        @settings.lanes ||= {}
 
     forExtension: (ext) ->
         @settings[ext] ||= {}
@@ -25,17 +28,27 @@ class SystemSettings extends Lanes.Models.Base
     setValueForExtension: (ext, key, value) ->
         @forExtension(ext)[key] = value
 
+    set: (data) ->
+        ret = super
+        @smtp.set(@settings?.lanes?.smtp)
+        ret
+
+    dataForSave: ->
+        data = super
+        data.settings.lanes.smtp = @smtp.serialize()
+        data
+
 class Config extends Lanes.Models.State
 
     session:
-        csrf_token:  { type: 'string', setOnce: true   }
-        root_path:   { type: 'string', setOnce: true   }
-        api_path:    { type: 'string', default: '/api' }
-        api_host:    { type: 'string', default: window.location.host }
-        environment: { type: 'string', setOnce: true }
+        csrf_token:  { type: 'string', setOnce: true     }
+        root_path:   { type: 'string', setOnce: true     }
+        api_path:    { type: 'string', default: '/api'   }
+        environment: { type: 'string', setOnce: true     }
         system_settings: { type: 'state', required: true }
         assets_path_prefix: { type: 'string', setOnce: true }
-        initial_workspace_screen_id: { type: 'string', setOnce: true }
+        api_host:    { type: 'string', default: "//#{window.location.host }" }
+        initial_workspace_screen_id: { type: 'string', setOnce: true      }
 
     derived:
         env:
@@ -56,4 +69,8 @@ class Config extends Lanes.Models.State
         @set(options)
         Lanes.Extensions.setBootstrapData(options) if _.isObject(options)
 
-Lanes.config = new Config
+configInstance = new Config
+
+Object.defineProperty Lanes, 'config',
+    get: -> configInstance
+    set: -> throw new Error("Unable to reset config")

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

@@ -25,7 +25,7 @@ class Lanes.Access.Screens.UserManagement extends Lanes.React.Screen
                 getSelection={@rolesForUser}
                 setSelection={@setRolesForUser}
                 choices={Lanes.Models.Role.all.models}
-                fetchWhenOpen={false}
+                fetchOnSelect={false}
                 name="role_names"
             />
 

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

@@ -14,15 +14,19 @@ Lanes.Components.Grid.EditingMixin = {
             React.PropTypes.bool, React.PropTypes.func
         ])
 
+    cleanProps: (props) ->
+        _.omit(props, 'index', 'field', 'props', 'query', 'rowIndex')
+
     editorTypes:
         text: (props) ->
-            props.value ||= ''
-            <input type="text" {...props}
+            inputProps = _.omit(@cleanProps(props), 'model')
+            inputProps.value ?= ''
+            <input type="text" {...inputProps}
                 onChange={_.partial(@onFieldChange, _, props.field)} />
         bigdec: (props) ->
-            <LC.NumberInput unstyled {...props} />
+            <LC.NumberInput unstyled {...@cleanProps(props)} />
         date: (props) ->
-            <LC.DateTime {...props} inputOnly step={15}
+            <LC.DateTime {...@cleanProps(props)} inputOnly step={15}
                 onChange={_.partial(@onDateFieldChange, _, props.field)} />
 
     displayTypes:

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

@@ -1,5 +1,9 @@
 ##= require ./EditingMixin
-
+BAD_PROPS = [
+    'position', 'model', 'index', 'syncImmediatly', 'query',
+    'onCancel', 'onSave', 'cellStyles', 'editors', 'rowIndex',
+    'rowHeight', 'allowDelete'
+]
 Lanes.Components.Grid.PopoverMixin = {
 
     mixins: [
@@ -25,6 +29,8 @@ Lanes.Components.Grid.PopoverMixin = {
         props.arrowOffsetTop = Math.min(position.top + 20, (props.height - 75))
         props.positionTop    = Math.max(5, position.top - props.arrowOffsetTop + (position.rowHeight / 2))
 
+        props = _.omit(props, BAD_PROPS)
+
         <div className="editor po">
             <BS.Popover
                 id="editing-form"

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

@@ -25,6 +25,12 @@ class Lanes.Components.Modal extends Lanes.React.Component
     getInitialState: ->
         show: false
 
+    setBusy: (isBusy) ->
+        @setState({isBusy})
+
+    busyMessage: ->
+        (if _.isString(@state.isBusy) then @state.isBusy else '') + '…'
+
     onOkButton: (ev) -> @state.onOk?(this, ev)
     onCancelButton: (ev) -> @state.onCancel?(this, ev)
     onButton: (ev, btn) ->
@@ -56,7 +62,9 @@ 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>
+                disabled={!!@state.isBusy}
+                onClick={_.partial(@onButton, _, button)}
+            >{button.title}</BS.Button>
 
         cls = _.classnames('lanes-modal', @state.className, @context.uistate?.layout_size)
         Body = @state.body
@@ -74,6 +82,8 @@ class Lanes.Components.Modal extends Lanes.React.Component
                 </BS.Modal.Header>
 
                 <BS.Modal.Body style={maxHeight: @context.viewport.height - 250}>
+                    <LC.NetworkActivityOverlay visible={!!@state.isBusy}
+                        message={@busyMessage()} />
                     <Body {...@props} modal={@} />
                 </BS.Modal.Body>
 

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

@@ -8,8 +8,13 @@ class Lanes.Components.RecordFinder extends Lanes.React.Component
         parentModel: Lanes.PropTypes.State
         commands:    React.PropTypes.object
         onModelSet:  React.PropTypes.func
+        autoFocus:   React.PropTypes.bool
+        inputType:   React.PropTypes.string
         associationName: React.PropTypes.string
 
+    getDefaultProps: ->
+        inputType: 'text'
+
     mixins: [
         Lanes.Components.Form.InputFieldMixin
     ]
@@ -63,15 +68,14 @@ class Lanes.Components.RecordFinder extends Lanes.React.Component
 
     renderInputField: (props, handlers) ->
         model = @props.parentModel or @props.model
-
         <BS.InputGroup className="record-finder">
-            <BS.FormControl
-                {...props} {...handlers}
+            <input className="form-control"
+                type={@props.inputType}
+                autoFocus={@props.autoFocus}
                 onChange={@fieldMixinSetValue}
                 value={@getValue()}
                 onKeyPress={@onKeyPress}
             />
-
             <BS.InputGroup.Button>
                 <button className='btn btn-primary' onClick={@showFinder}>
                     <LC.Icon lg

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

@@ -16,20 +16,22 @@ class Lanes.Components.DateTime extends Lanes.React.Component
     handleKeyDown: (ev) ->
         @props.onEnter() if ev.key is 'Enter'
 
-    handleDateTimeChange: (val) ->
-        @fieldMixinSetValue({target: {value: val}})
-
-
     renderDisplay: (props) ->
         clean = LC.Form.FieldMixin.statics.cleanSizeProps(props)
         <BS.FormControl.Static {...clean}>
-            {_.moment(@model[@props.name]).format(@props.format)}
+            {@getDateValue().format(this.props.format)}
         </BS.FormControl.Static>
 
+    getDateValue: ->
+        _.moment.utc(@fieldMixinGetValue())
+
+    handleDateTimeChange: (val) ->
+        @fieldMixinSetValue({target: {value: Lanes.u.utcToLocalDate(val)}})
+
     renderEdit: (props) ->
         props = _.extend({
             ref:       'control'
-            value:     @fieldMixinGetValue()
+            value:     Lanes.u.dateToUTC(@getDateValue().toDate())
             onChange:  @handleDateTimeChange
         }, @props)
         props = _.omit(LC.Form.FieldMixin.statics.cleanSizeProps(props), 'writable')

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

@@ -1,4 +1,4 @@
-Lanes.Components.Form || = {}
+Lanes.Components.Form ||= {}
 
 
 Lanes.Components.Form.FieldMixin = {
@@ -152,9 +152,9 @@ Lanes.Components.Form.FieldMixin = {
                 'has-error': hasError
             }
         )
-
+        fieldProps = Lanes.u.cleanBsSizes(props)
         field = (@[ "render#{method}" ] || @["_fieldMixinRender#{method}"])(
-            if @props.fieldOnly then props else _.omit(props, 'className')
+            if @props.fieldOnly then fieldProps else _.omit(fieldProps, 'className')
         )
         if @props.fieldOnly
             field

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

@@ -34,7 +34,7 @@ class Lanes.Components.Icon extends Lanes.React.BaseComponent
             'clickable'  : @props.clickable or (@props.tooltip and @props.tooltipProps.trigger is 'click')
 
         icon =
-            <i style={@props.style} className={classes} />
+            <i style={@props.style} className={classes} onClick={@props.onClick} />
 
         if @props.tooltip
             props = _.extend({}, DEFAULT_TOOLTIP_PROPS, @props.tooltipProps)

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

@@ -2,6 +2,7 @@ class Lanes.Components.ImageAsset extends Lanes.React.Component
 
     propTypes:
         asset: Lanes.PropTypes.Model.isRequired
+        label: React.PropTypes.string
         size: React.PropTypes.oneOf([
             'thumb', 'medium', 'original'
         ]).isRequired
@@ -11,8 +12,9 @@ class Lanes.Components.ImageAsset extends Lanes.React.Component
 
     listenNetworkEvents: true
 
-    bindEvents: ->
-        model: "change:#{@props.name} change:#{@props.name}_data"
+    mixins: [
+        Lanes.React.Mixins.ReadEditingState
+    ]
 
     handleImageChange: (ev) ->
         ev.preventDefault()
@@ -24,8 +26,25 @@ class Lanes.Components.ImageAsset extends Lanes.React.Component
     blankImage: ->
         null
 
+    Label: ->
+        return null unless @props.label
+        <label>{@props.label}</label>
+
+    Edit: ->
+        return null unless @isEditingRecord()
+        <form>
+            <label className="selector">
+                <span>
+                    {if @asset.isPresent then 'Change' else 'Add'}
+                </span>
+                <input id='file' className="file" type="file"
+                    onChange={@handleImageChange} />
+            </label>
+        </form>
+
     render: ->
         Component = if @asset.hasImage then @renderImage else @blankImage
+
         className = _.classnames('image-asset', @props.className, {
             'with-image': @asset.hasImage
         })
@@ -33,14 +52,7 @@ class Lanes.Components.ImageAsset extends Lanes.React.Component
             {...Lanes.u.bsSizes(@props)}
             className={className}
         >
+            <@Label />
             <Component />
-            <form>
-                <label className="selector">
-                    <span>
-                        {if @asset.isPresent then 'Change' else 'Add'}
-                    </span>
-                    <input id='file' className="file" type="file"
-                        onChange={@handleImageChange} />
-                </label>
-            </form>
+            <@Edit />
         </BS.Col>

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

@@ -1,3 +1,5 @@
+##= require 'lanes/components/shared/Icon'
+
 class Lanes.Components.NetworkActivityOverlay extends Lanes.React.Component
 
     propTypes:

data/client/lanes/extension/Base.coffee

@@ -6,6 +6,8 @@ class BaseExtension
     title: ->
         _.titleize @identifier
 
+    setBootstrapData: (data) ->
+        @data = data
 
 Lanes.Extensions.Base = Lanes.lib.MakeBaseClass(
     Lanes.Vendor.Ampersand.State, BaseExtension

data/client/lanes/lib/RequestAssets.coffee

@@ -0,0 +1,30 @@
+class Lanes.lib.AssetLoader
+
+    constructor: (urls, cb) ->
+        finished = 0
+        completed = {}
+        onComplete = (url, success, error = false) ->
+            finished += 1
+            completed[url] = { success: success == true, error: error }
+            cb(completed) if finished == urls.length
+
+        for baseUrl in urls
+            url = "#{baseUrl}?#{parseInt(Math.random() * 100000)}"
+            if /.css($|\?)/.test(url)
+                Lanes.lib.loader.css(url, onComplete)
+            else
+                Lanes.lib.loader.js(url, onComplete)
+
+Lanes.lib.RequestAssets = (urls...) ->
+    urls = urls[0] if urls.length == 1 && _.isArray(urls[0])
+    new _.Promise(  (resolve, reject) ->
+
+        new Lanes.lib.AssetLoader(urls, (completed) ->
+            failures = _.pick(completed, (status, url) -> !status.success )
+            if _.isEmpty(failures)
+                resolve(completed)
+            else
+                Lanes.warn( _.keys(failures).join(',') + " failed to load" )
+                reject( failures )
+        )
+    )

data/client/lanes/lib/all.js

@@ -3,6 +3,7 @@
 //= require ./objToParam
 //= require ./ModuleSupport
 //= require ./loader
+//= require ./RequestAssets
 //= require ./MakeBaseClass
 //= require ./el
 //= require ./polyfills

data/client/lanes/lib/loader.js

@@ -0,0 +1,93 @@
+//= require ./namespace
+
+// https://pie.gd/test/script-link-events/
+
+(function( w ){
+    var insertBefore = function(){
+        var refs = doc.getElementsByTagName( "head" )[ 0 ].childNodes;
+        return refs[ refs.length - 1];
+    };
+
+    var doc = w.document;
+
+    // https://github.com/filamentgroup/loadJS/blob/master/loadJS.js
+    var loadJS = function( src, cb ){
+        "use strict";
+        var ref = insertBefore();
+        var script = doc.createElement( "script" );
+        script.src = src;
+        script.async = true;
+        ref.parentNode.insertBefore( script, ref );
+        if (cb && typeof(cb) === "function") {
+            script.onload = function(ev){
+                cb(script, ev);
+            }
+        }
+        return script;
+    };
+
+
+    // https://github.com/filamentgroup/loadCSS/blob/master/src/loadCSS.js
+    var loadCSS = function( href, cb){
+        var ss = doc.createElement( "link" );
+        var ref = insertBefore();
+
+        var sheets = doc.styleSheets;
+        ss.rel = "stylesheet";
+        ss.href = href;
+        ss.media = "only x";
+
+        // wait until body is defined before injecting link. This ensures a non-blocking load in IE11.
+        function ready( cb ){
+            if( doc.body ){
+                return cb();
+            }
+            setTimeout(function(){
+                ready( cb );
+            });
+        }
+        // Inject link
+        // Note: the ternary preserves the existing behavior of "before" argument, but we could choose to change the argument to "after" in a later release and standardize on ref.nextSibling for all refs
+        // Note: `insertBefore` is used instead of `appendChild`, for safety re: http://www.paulirish.com/2011/surefire-dom-element-insertion/
+        ready( function(){
+            ref.parentNode.insertBefore( ss, ref.nextSibling );
+        });
+        // A method (exposed on return object for external use) that mimics onload by polling document.styleSheets until it includes the new sheet.
+        var onloadcssdefined = function( cb ){
+            var resolvedHref = ss.href;
+            var i = sheets.length;
+            while( i-- ){
+                if( sheets[ i ].href === resolvedHref ){
+                    return cb(sheets[i]);
+                }
+            }
+            setTimeout(function() {
+                onloadcssdefined( cb );
+            });
+        };
+
+        function loadCB(ev){
+            if( ss.addEventListener ){
+                ss.removeEventListener( "load", loadCB );
+            }
+            ss.media = "all";
+            if (cb && typeof(cb) === "function") {
+                cb(ss, ev);
+            }
+        }
+
+        // once loaded, set link's media back to `all` so that the stylesheet applies once it loads
+        if( ss.addEventListener ){
+            ss.addEventListener( "load", loadCB);
+        } else {
+            onloadcssdefined( loadCB );
+        }
+        return ss;
+    };
+
+    w.Lanes.lib.loader = {
+        js: loadJS,
+        css: loadCSS
+    };
+
+}( typeof global !== "undefined" ? global : this ));