lanes 0.1.9.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9ee3d792d48f1c5052df8f8def69d9b41feb772
-  data.tar.gz: 65421bc19936cb0890bf8309ca3496e9088a46c8
+  metadata.gz: 0bef7dd4d1ad62c9921002f1316cd341936b76fa
+  data.tar.gz: 5fbe57c48a6c3c55228985871247a840ab385b40
 SHA512:
-  metadata.gz: 7af3b91f0c5a4a899ce73523d7723b1ae360de9550a0e6146207247545d2a2f4e6f011396d9ab4fd21b0632fde382445b284aba1f653656af8aa1b9144b9ab8f
-  data.tar.gz: f7d0b171766d83f2b6253a4c702a9d4a9b1b66ec32bad409c2519f14230e832cc14a106c858a5ca517b56696ffe7e16181bd14bebe0d4cfc0ab1f055b0dfbd74
+  metadata.gz: a3ded106dcb9b1569a36f1d744194af7027d1a441e74292aaf41b726f361fd94651eda041b3de921b0ada3662e8287364dc467a1487fbc67088a4d7588343667
+  data.tar.gz: 24ac1aa4769187583415eeee331225480ce4315decaf080964d2b0d6c78809fb329e957ab4304afd31a387d6b922b05bb92c9da0f5ab044a4d143929fca8fcb9

data/Gemfile

@@ -4,5 +4,6 @@ gem "yard-activerecord",   github: 'nathanstitt/yard-activerecord',   branch: 'd
 gem "active_record_mocks", github: 'nathanstitt/active_record_mocks', branch: 'develop'
 
 gem 'puma'
+gem 'pry-byebug'
 
 gemspec

data/Rakefile

@@ -5,7 +5,7 @@ require 'yard'
 require 'yard-activerecord'
 require_relative 'yard_ext/all'
 require 'guard'
-
+require 'lanes/rake_tasks'
 Dir.glob('tasks/*.rake').each { |r| load r}
 
 Rake::TestTask.new do |t|

data/client/lanes/Boot.cjsx

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

data/client/lanes/Config.coffee

@@ -1,21 +1,56 @@
+class SystemSettings extends Lanes.Models.Base
+
+    mixins: [ Lanes.Models.Mixins.FileSupport ]
+
+    props:
+        id:       {type:"integer"}
+        logo:     "file"
+        settings: "object"
+
+    modelTypeIdentifier: -> 'system-settings'
+    url: -> Lanes.config.api_path + 'system-settings'
+    initialize: ->
+        @on('change:settings', @setDefaultSettings)
+        @setDefaultSettings()
+
+    setDefaultSettings: ->
+        @settings ||= {}
+        @settings.lanes || = {}
+
+    forExtension: (ext) ->
+        @settings[ext] ||= {}
+
+    setValueForExtension: (ext, key, value) ->
+        @forExtension(ext)[key] = value
+
 class Config extends Lanes.Models.State
-    constructor: -> super
 
     session:
         csrf_token:  { type: 'string', setOnce: true }
-        api_path:    { type: 'string', default: '', setOnce: true }
+        root_path:   { type: 'string', setOnce: true }
+        api_path:    { type: 'string', setOnce: true }
         assets_path_prefix: { type: 'string', setOnce: true }
         environment: { type: 'string', setOnce: true }
         initial_workspace_screen_id: { type: 'string', setOnce: true }
+        system_settings: { type: 'state', required: true }
 
     derived:
         env:
             deps: ['environment'], fn: ->
                 {
-                    test:     this.environment == 'test',
+                    test:        this.environment == 'test',
                     development: this.environment == 'development',
                     production:  this.environment == 'production'
                 }
 
+    initialize: ->
+        @system_settings = new SystemSettings
+
+    bootstrap: (options) ->
+        if options.system_settings
+            @system_settings.set(options.system_settings)
+            delete options.system_settings
+        @set(options)
+        Lanes.Extensions.setBootstrapData(options) if _.isObject(options)
 
 Lanes.config = new Config

data/client/lanes/access/Extension.coffee

@@ -11,7 +11,7 @@ class Lanes.Access.Extension extends Lanes.Extensions.Base
             Lanes.current_user.access_data = data.access
 
     showLogin: ->
-        Lanes.Workspace.Extension.uistate.modalDialog = Lanes.Access.LoginDialog.instance()
+        Lanes.Access.LoginDialog.instance().show(@viewport)
 
     hideLogin: ->
         Lanes.Workspace.Extension.uistate.modalDialog = null

data/client/lanes/access/LoginDialog.cjsx

@@ -1,5 +1,6 @@
 class Session extends Lanes.Models.Base
-    api_path: 'user-session'
+    api_path: 'lanes-access/user-session'
+
     props:
         id:         'integer'
         login:      'string'
@@ -10,69 +11,78 @@ class Session extends Lanes.Models.Base
 
 class Lanes.Access.LoginDialog extends Lanes.React.Component
 
+    statics:
+        show: (viewport, props = {}) ->
+            session = new Session
+
+            attemptLogin = (dlg) ->
+                session.save(ignoreErrors: true).then ->
+                    if session.user
+                        Lanes.current_user.setLoginData(session.user, session.access)
+                        dlg.hide()
+                    _.extend(viewport.modalProps, {show: !session.user})
+
+            viewport.modalProps = _.extend({}, props,
+                title: 'Please Login'
+                onCancel: null, onOk: attemptLogin, show: true,
+                buttons: [{ title: 'Login', style: 'primary', eventKey: 'ok'}]
+                body: (props) ->
+                    <Lanes.Access.LoginDialog
+                        {...props}
+                        model={session}
+                        attemptLogin={attemptLogin} />
+            )
+
+
+
     mixins: [
         Lanes.React.Mixins.RelayEditingState
     ]
+    listenNetworkEvents: true
 
     getDefaultProps: ->
         writable: true, editOnly: true
 
     dataObjects: ->
-        model: new Session
-
-    login: ->
-        @model.save().then =>
-            Lanes.current_user.setLoginData(@model.user, @model.access) if @model.user
+        model: 'props'
 
     warning: ->
         <BS.Alert bsStyle='warning'>
-             <strong>{@model.lastServerMessage}</strong>
+            <strong>{@model.lastServerMessage}</strong>
         </BS.Alert>
 
     render: ->
-        <LC.Modal title='Please log in'
-            backdrop={false}
-            closeButton=false
-            animation={false}>
-
-            <div className='modal-body'>
-
-                {@warning() if @state?.hasError}
-
-                <BS.Row>
-                    <BS.Col mdOffset={2} xs={12} md={8}>
-
-                        <LC.TextField
-                            model={@model}
-                            autoFocus writable
-                            name="login"
-                            label='Username'
-                            placeholder='Enter Login'
-                        />
-
-                        <LC.TextField
-                            writable
-                            model={@model}
-                            name="password"
-                            type='password'
-                            label='Password'
-                            placeholder='Enter Password'
-                        />
-
-                    </BS.Col>
-                </BS.Row>
-            </div>
-
-
-            <div className='modal-footer'>
-                <BS.Button onClick={@login} bsStyle='primary'>Login</BS.Button>
-            </div>
-
-        </LC.Modal>
+        <div>
+            {@warning() if @state?.hasError}
+            <BS.Row>
+                <BS.Col mdOffset={2} xs={12} md={8}>
+
+                    <LC.Input
+                        model={@model}
+                        onEnter={=> @props.attemptLogin(@props.modal)}
+                        autoFocus writable
+                        name="login"
+                        label='Username'
+                        placeholder='Enter Login'
+                    />
+
+                    <LC.Input
+                        writable
+                        model={@model}
+                        onEnter={=> @props.attemptLogin(@props.modal)}
+                        name="password"
+                        type='password'
+                        label='Password'
+                        placeholder='Enter Password'
+                    />
+
+                </BS.Col>
+            </BS.Row>
+        </div>
 
 
 
 # Function that returns a factory (or function) for the LoginDialog.
 # Intended as an extension point for other users to override if needed
 Lanes.Access.LoginDialog.instance = ->
-    @cache ||= React.createFactory(Lanes.Access.LoginDialog)
+    Lanes.Access.LoginDialog

data/client/lanes/access/Roles.coffee

@@ -51,9 +51,9 @@ class Lanes.Models.UserRoleSet
             @locked_fields = role.decodeLockedFields(access.locked_fields, @locked_fields)
 
     can: (method, model, field) ->
-        if model instanceof Lanes.Models.Base
+        return true unless model
+        if model.constructor and not model.prototype
             model = model.constructor
-
         if field && ( locks = @locked_fields[model::api_path()] ) && ( grants = locks[field] )
             for grant in grants
                 if grant.only && grant.only != method

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: -> 'users'
+    api_path: -> 'lanes-access/users'
     derived:
         roles:
             deps: ['role_names', 'access_data']
@@ -25,7 +25,7 @@ class Lanes.Models.User extends Lanes.Models.Base
         access_data: 'object'
 
     props:
-        id:         { type: "integer", required:true }
+        id:          'integer'
         login:       'string'
         name:        'string'
         email:       'string'
@@ -33,6 +33,7 @@ class Lanes.Models.User extends Lanes.Models.Base
         options:     'object'
         password:    'string'
 
+    hasAccess: (access, model, field) -> this.roles.can(access, model, field)
     canRead: (model, field)  -> this.roles.canRead(model, field)
     canWrite: (model, field) -> this.roles.canWrite(model, field)
     canDelete: (model)       -> this.roles.canDelete(model)
@@ -63,7 +64,7 @@ class Lanes.Models.User extends Lanes.Models.Base
 
 
 class Session extends Lanes.Models.Base
-    api_path: 'user-session'
+    api_path: 'lanes-access/user-session'
     props:
         id:         'integer'
         login:      'string'

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

@@ -5,37 +5,38 @@ class Lanes.Access.Screens.UserManagement extends Lanes.React.Screen
             {id:'id', visible: false}
             'login', 'name', 'email', {id:'role_names', title:'Role Names'}
         ]
-        query: new Lanes.Models.Query({
-            fields: fields, modelClass: Lanes.Models.User
-        })
+        query: new Lanes.Models.Query(fields: fields, src: Lanes.Models.User)
 
     rolesForUser: (user) ->
-        {value: user.role_names, roles: _.map(user.role_names, _.field2title)}
+        _.map user.role_names, (rn) -> {id: rn, name: _.titleize(rn) }
 
-    setRolesForUser: (model, roles) ->
-        model.role_names = _.pluck(roles, 'id')
+    setRolesForUser: (roles, options) ->
+        options.model.role_names = _.pluck(roles, 'id')
 
     editors: (props) ->
         role_names: ({model}) =>
             <LC.SelectField
                 id="role_names"
                 key="row-select"
-                editOnly multi writable unstyled
+                queryModel={Lanes.Models.User}
+                editOnly multiSelect writable unstyled
                 model={model}
-                name="roles"
+                labelField='name'
                 getSelection={@rolesForUser}
                 setSelection={@setRolesForUser}
-                collection={Lanes.Models.Role.all}
+                choices={Lanes.Models.Role.all.models}
+                fetchWhenOpen={false}
                 name="role_names"
             />
 
     render: ->
-        <div>
+        <LC.ScreenWrapper identifier="user-management" flexVertical>
             <h1>Users Management</h1>
             <LC.Grid
+                editorProps={height: 400, syncImmediatly: true}
                 query={@state.query}
                 allowCreate
                 editor={Lanes.Access.Screens.UserManagement.Editor}
                 columEditors={@editors()}
                 ref="grid"/>
-        </div>
+        </LC.ScreenWrapper>

data/client/lanes/components/calendar/Calendar.cjsx

@@ -0,0 +1,16 @@
+class Lanes.Components.Calendar extends Lanes.React.Component
+
+    statics:
+        Events: Lanes.Vendor.Dayz.EventsCollection
+
+    propTypes:
+        display:           React.PropTypes.oneOf(['month', 'week', 'day']),
+        date:              React.PropTypes.object.isRequired,
+        dayComponent:      React.PropTypes.func,
+        events:            React.PropTypes.instanceOf(Lanes.Vendor.Dayz.EventsCollection),
+        dayLabelComponent: React.PropTypes.func,
+        onDayClick:        React.PropTypes.func,
+        onEventClick:      React.PropTypes.func
+
+    render: ->
+        <Lanes.Vendor.Dayz {...@props}>{@props.children}</Lanes.Vendor.Dayz>

data/client/lanes/components/calendar/index.js

@@ -0,0 +1,3 @@
+//= require 'lanes/vendor/calendar'
+//= require ./Calendar
+//= require_tree .

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

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

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

@@ -0,0 +1,86 @@
+class Lanes.Components.Grid.Body extends Lanes.React.BaseComponent
+
+    propTypes:
+        query:      React.PropTypes.instanceOf(Lanes.Models.Query).isRequired
+        cellStyles: React.PropTypes.object.isRequired
+
+    fieldConvertors:
+        bigdec: (v) -> _.bigDecimal(v).toFixed(2)
+
+    onRowClick: (ev, row, index) ->
+        ourBounds = _.dom(@).el.getBoundingClientRect()
+        clickBounds = _.dom(ev.target).el.getBoundingClientRect()
+        top = this.refs.list.getScroll() + (
+            clickBounds.top - ourBounds.top
+        )
+        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
+        @props.onRowClick(selectedModel, selectedIndex,
+            {top, left, container: ourBounds, rowHeight: clickBounds.height}
+        )
+
+    convertValue: (value, field) ->
+        if @fieldConvertors[field.type] then @fieldConvertors[field.type](value) else value
+
+    renderColumn: (rowNum, index, field, results, row) ->
+        value = results.valueForField(rowNum, field)
+
+        onColClick = if field.onColumnClick
+            _.partial(field.onColumnClick, _,
+                {value, field, index, rowNum, row, query: @props.query }
+            )
+        else
+            null
+
+        value = if field.format
+            field.format(value, row, @props.query)
+        else
+            @convertValue(value, field)
+
+        value = React.createElement( field.component,
+            {value: value, query: @props.query, row}
+        ) if field.component
+
+        <div key={field.id}
+            onClick={onColClick}
+            {...@props.cellStyles.props[index]}
+        >
+            {value}
+        </div>
+
+    renderRow: (rowNum, ref) ->
+        fields = []
+        results = @props.query.results
+        row = results.rowRepresentation(rowNum)
+        for field, index in @props.query.fields.models when field.visible
+            fields.push @renderColumn(rowNum, index, field, results, row)
+
+        if @props.onRowClick
+            onClick = _.partial(@onRowClick, _, row, rowNum)
+        <div key={rowNum} ref={ref} className="r" onClick={onClick} >
+            {fields}
+        </div>
+
+    render: ->
+        <div className={_.classnames('grid-body', 'is-editing': @props.editing)}>
+
+            <LC.NetworkActivityOverlay model={@props.query} />
+
+            <Lanes.Components.Grid.Editor
+                {...@props}
+
+                cellStyles={@props.cellStyles}
+                onCancel={@props.onEditCancel}
+                editing={@props.editing} />
+
+            <Lanes.Vendor.List
+                useTranslate3d
+                isEditing={!!@props.editing}
+                itemRenderer={@renderRow}
+                length={@props.query.results.length}
+                forceUpdateProp={@props.query.changeCount}
+                type='variable'
+                ref="list"
+            />
+        </div>