lanes 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e996b32bc8dc10aa628ae2eaf9683e14f070ae9
-  data.tar.gz: 7b1e8f708c347328a33e5962068db0df86669ad6
+  metadata.gz: fa9dfa9407c5c84e02cac8d1ec0aba080ba79f3b
+  data.tar.gz: 6e04d2ad5c485bb3b216b8a0a4b272f7c6ed7f47
 SHA512:
-  metadata.gz: 841d9120509bc907ea6e434068b82346e37efdf9ed85baefa2e3f1293c3e947af65ed3c53ae4060f47e89caddcff2e02c72e9c4f785ce869b86a2651dd31fb49
-  data.tar.gz: 9828cea8c1618a6635b090a19c93260b6ffe1939484325b2e4f26d41040cd786319a9d3893bb692e867a198cd6c0a31f6f461ecdff714ee0948df79c2e31f52d
+  metadata.gz: e15bcd8e90226888c02d1fb4a174aba4211a422740d6844f3d6ef22543c48715c540f35c900398a54d500d53a4320e0002dc9a6e2d46a4c0df9e72416fa8268b
+  data.tar.gz: d08bb632d089915d690715f11b63277526886db844fa0ceef43a64f755d3af94c712f8f065b5ff6f6f8d89f2f9756269ef0b322e8ae5913a1eab68327f595852

data/.rubocop.yml

@@ -1,3 +1,5 @@
+Metrics/LineLength:
+  Max: 100
 
 StringLiterals:
   Enabled: false

data/Gemfile

@@ -3,9 +3,8 @@ source 'https://rubygems.org'
 gem "yard-activerecord",
     git: 'https://github.com/nathanstitt/yard-activerecord',
     branch: 'develop'
-gem "active_record_mocks",
-    git: 'https://github.com/active_record_mocks',
-    branch: 'develop'
+
+gem "temping"
 
 gem 'puma'
 gem 'pry-byebug'

data/client/lanes/boot.jsx

@@ -1,7 +1,7 @@
 import React        from 'react';
 import ReactDOM     from 'react-dom';
 import whenDomReady from 'when-dom-ready';
-import { delay } from 'lodash'
+import { delay } from 'lodash';
 import { AppContainer } from 'react-hot-loader';
 import { withAsyncComponents } from 'react-async-component';
 

data/client/lanes/index.js

@@ -1,12 +1 @@
-//= require ./lib
-//= require ./extension
-//= require ./models
-//= require ./Config
-//= require ./react
-//= require ./components
-//= require ./screens
-//= require ./extension/LateLoaded
-//= require ./Boot
-
-import Config from './config';
 import Boot from './boot';

data/client/lanes/jest/matchers.js

@@ -0,0 +1,14 @@
+module.exports = {
+
+    toHaveRendered(wrapper, selector) {
+        const matchCount = wrapper.find(selector).length;
+        const result = { pass: 1 === matchCount };
+        if (result.pass) {
+            result.message = `${selector} was found`;
+        } else {
+            result.message = `Expected wrapper to contain '${selector}' only once, but it was found ${matchCount} times`;
+        }
+        return result;
+    },
+
+};

data/{lib/js/jest/mocks.js → client/lanes/jest/mocks/fetch.js}

@@ -49,4 +49,4 @@ fetch.mockResponses = (...responses) => {
 // Default mock is just a empty string.
 fetch.mockResponse('');
 
-module.exports = { fetch };
+module.exports = fetch;

data/client/lanes/models/base.js

@@ -24,30 +24,6 @@ export {
     field, session, identifier,
 } from './decorators';
 
-// const ModelsMap = new Map();
-
-// lookupModelUsing((propertyName, propertyOptions = {}) =>
-//     ModelsMap[propertyOptions.className] ||
-//                  ModelsMap[capitalize(propertyName)] ||
-//                  ModelsMap[capitalize(singular(propertyName))],
-// );
-
-// rememberModelUsing((klass) => {
-//     invariant(
-//         klass.identifiedBy,
-//         `${klass.name} lacks a static identifiedBy property, use model decorator to auto-set it`,
-//     );
-//     ModelsMap[klass.identifiedBy] = klass;
-// });
-
-// const REPLACEABLE_PROP_TYPES = {
-//     hasMany: true, array: true,
-// };
-
-// function propIsReplacable(prop) {
-//     return !!REPLACEABLE_PROP_TYPES[prop.type] || REPLACEABLE_PROP_TYPES[get(prop, 'options.type')];
-// }
-
 export {
     observable, computed,
 };
@@ -57,14 +33,6 @@ export class BaseModel {
         return findModel(name);
     }
 
-    // static get replaceableKeys() {
-    //     const replaceable = [];
-    //     this.$schema.forEach((prop, name) => {
-    //         if (propIsReplacable(prop)) { replaceable.push(name); }
-    //     });
-    //     return replaceable;
-    // }
-
     static get assignableKeys() {
         return this.$schema.keys();
     }

data/client/lanes/screens/definition.js

@@ -1,5 +1,5 @@
 import { autorun, observable } from 'mobx';
-import { get, delay, extend, filter } from 'lodash';
+import { get, delay, extend, filter, map, uniq } from 'lodash';
 
 import { classify, logger } from '../lib/util';
 import Config from '../config'
@@ -16,14 +16,13 @@ import Group from './group';
 import { createAsyncComponent } from 'react-async-component';
 
 export { createAsyncComponent };
+import Registry from './index';
 
-const All = observable.map();
+import Groups from './group';
 
 @modelDecorator('lanes/screen/definition')
 export default class ScreenDefinition extends BaseModel {
 
-    static all = All;
-
     @identifier({ type: 'string' }) id;
     @session title;
     @session url_prefix;
@@ -37,17 +36,17 @@ export default class ScreenDefinition extends BaseModel {
     @session model;
     @session({ type: 'object' }) component;
     @session asset;
-//    @session({ type: 'array' }) assets;
+
     @session url;
 
     static register(json, comp) {
-        let screen = All.get(json.id);
+        let screen = Registry.all.get(json.id);
         if (screen) {
             screen.update(json);
         } else {
             screen = new ScreenDefinition(json);
-            All.set(screen.id, screen);
-            const group = Group.forId(screen.group_id);
+            Registry.all.set(screen.id, screen);
+            const group = Groups.forId(screen.group_id);
             if (group) { group.screens.push(screen); }
         }
         screen.component = comp;

data/client/lanes/screens/index.js

@@ -1,252 +1,36 @@
-import { computed } from 'mobx';
-import { compact } from 'lodash';
-import Instance from './instance';
-import Definition from './definition';
+import { observable, autorun } from 'mobx';
+import { map, uniq } from 'lodash';
 import Group from './group';
-import { createAsyncComponent } from 'react-async-component';
+import Config from '../config';
+import Sync from '../models/sync';
 
-export default {
+import user from '../user';
 
-    @computed get active() {
-        return Instance.active;
-    },
+const Screens = observable({
 
-    @computed get groups() {
-        return Group.all;
-    },
+    all: observable.map(),
 
-    @computed get displaying() {
-        return Instance.displaying;
-    },
+    active: observable.array(),
 
+    groups: observable.map(),
 
-    getDefinition(screenId) {
-        return Definition.all.get(screenId);
+    get activeGroups() {
+        return uniq(map(this.active, s => Group.forId(s.group_id)));
     },
 
-    setBrowserLocation(location) {
-        let instance;
-        const [instanceId, screenId, ...args] = Array.from(compact(location.pathname.split('/')));
-        if (!screenId) { return; }
-        if (instanceId) {
-            instance = Instance.displaying.findInstance(screenId, instanceId);
-        } else {
-            instance = Instance.displaying.find((instance) => instance.screen.id === screenId);
-        }
-        if (instance) {
-            instance.active = true;
-        } else {
-            this.display(screenId, { args });
-        }
+    refresh() {
+        Sync.perform(`${Config.api_path}/lanes/screens`).then(({ data: { screens: screenIds } }) => {
+            this.active.replace(map(screenIds, id => this.all.get(id)));
+        });
     },
 
-    // display(screenId, props = {}) {
-    //     const screen = Definition.all.get(screenId);
-    //     if (!screen) {
-    //         msg = `Unable to find screen definition for ${screenId}`;
-    //         logger.warn(msg);
-    //         Promise.reject(msg);
-    //     }
-    //     return new Instance({ screen, props, active: true });
-    // },
-};
-
-// import { autorun, observable } from 'mobx';
-// import { get, delay, extend } from 'lodash';
-
-// import { classify, warn } from '../lib/util';
-// import RequestAssets from '../lib/RequestAssets';
-
-// import {
-//     BaseModel, modelDecorator, session,
-//     belongsTo, identifier, computed,
-// } from '../models/base';
-// import User from '../User';
-
-// import ScreenDefinition from './definition';
-
-// let Displaying;
-// let All;
-
-
-// All = observable.map([]);
-// const registerScreen = (json) => {
-//     const definition = new ScreenDefinition(json);
-//     All.set(json.id, definition);
-//     return definition;
-// }
-
-// const registerGroup = (json) => {
-//     const group = new Group(json)
-//     Groups.set(json.id, new Group(json));
-//     return group;
-// }
-
-// export { All, registerScreen, registerGroup };
-
-
-// @modelDecorator('ScreenViewSet')
-// class ScreenViewSet extends BaseModel {
-
-// //    static model = ScreenView;
-
-
-//     active() {
-//         return this.findWhere({ active: true });
-//     }
-
-//     constructor(models, options) {
-//         super();
-//         if (options == null) { options = {}; }
-//         autorun(this::onUserChange);
-//     }
-
-//     onUserChange() {
-//         if (User.isLoggedIn) {
-//             get(User, 'options.initial_screens', []).forEach(
-//                 screenId => All.get(screenId).display(),
-//             );
-//         } else {
-//             this.reset();
-//         }
-//     }
-
-//     remove(model) {
-//         const index = this.indexOf(model);
-//         super.remove(...arguments);
-//         if (model.active && this.length) {
-//             this.at(_.min([index, this.length - 1])).active = true;
-//         }
-//         model.active = false;
-//         return this;
-//     }
-
-//     @computed onActiveChange(changed, active) {
-//         if (!changed.active) { return; }
-//         return this.each(function(screen) {
-//             if (screen !== changed) { return screen.set({ active: false }); }
-//         });
-//     }
-
-//     activateNext() { return this._moveActive(+1); }
-//     activatePrev() { return this._moveActive(-1); }
-
-//     _moveActive(inc) {
-//         if (this.length === 1) { return; }
-//         let current = this.findIndexWhere({ active: true });
-//         if (current === -1) { return; }
-//         if ((inc > 0) && (current === (this.length - 1))) {
-//             current = -1;
-//         }
-//         if ((inc < 0) && (current === 0)) {
-//             current = this.length;
-//         }
-//         return this.at(current + inc).active = true;
-//     }
-
-//     findInstance(screenId, instanceId) {
-//         return this.find(instance => (instance.screen.id === screenId) && (instance.id === instanceId));
-//     }
-// }
-
-//ScreenViewSet.initClass();
-
-// @SerializableModel
-// class ScreenSet extends BaseModel {
-
-//     @observable.map models;
-
-//     // static initClass() {
-//     //     this.prototype.model = ScreenDefinition;
-//     //     this.prototype.register = Lanes.emptyFn;
-//     // }
-
-//     get(id) {
-
-//     }
-
-//     addScreen(screen) {
-//         const screen = this.add( screen );
-//         return screen.set({active:true});
-//     }
-
-//     isLoading() {
-//         return !!this.findWhere({loading: true});
-//     }
-// }
-
-
-
-
-
-// @modelDecorator('MenuGroupSet')
-// class MenuGroupSet extends BaseModel {
-//     // static initClass() {
-//     //     this.prototype.model = MenuGroup;
-//     // }
-
-//     constructor() {
-//         super(...arguments);
-//     }
-
-//     available() {
-//         return this.cache || (this.cache = new Lanes.Models.SubCollection(this, {
-//             filter(group) {
-//                 group.screens().filter();
-//                 return group.screens().length > 0;
-//             }
-//         }));
-//     }
-// }
-
-
-// Lanes.Screens.display_id = function(screen_id) {
-//     const definition = Lanes.Screens.Definitions.all.get(screen_id);
-//     if (definition) {
-//         return definition.display();
-//     } else {
-//         return Lanes.warn(`Unable to find definition for screen ${screen_id}`);
-//     }
-// };
-
-
-// Definitions = {
-
-//     displaying: new ScreenViewSet([], { single_active_only: true }),
-//     groups:  new MenuGroupSet,
-//     register(spec) {
-//         return this.all.add( spec );
-//     },
-//     setBrowserLocation(location) {
-//         let instance;
-//         const [instanceId, screenId, ...args] = Array.from(_.compact(location.pathname.split('/')));
-//         if (!screenId) { return; }
-
-//         if (instanceId && ( instance = this.displaying.findInstance(screenId, instanceId) )) {
-//             return instance.active = true;
-//         } else {
-//             return __guard__(this.all.get(screenId), x => x.display({id: instanceId, props: {args}}));
-//         }
-//     }
-
-// };
-
-// Lanes.current_user.on("change:isLoggedIn", function(user) {
-//     Lanes.Screens.Definitions.groups.each(group => delete group.cache);
-//     delete Lanes.Screens.Definitions.groups.cache;
-
-//     if (!user.isLoggedIn) {
-//         return Lanes.Screens.Definitions.displaying.reset();
-//     }
-// });
+});
+export default Screens;
 
-// function __guardMethod__(obj, methodName, transform) {
-//   if (typeof obj !== 'undefined' && obj !== null && typeof obj[methodName] === 'function') {
-//     return transform(obj, methodName);
-//   } else {
-//     return undefined;
-//   }
-// }
-// function __guard__(value, transform) {
-//   return (typeof value !== 'undefined' && value !== null) ? transform(value) : undefined;
-// }
+let previousLoggedIn = null;
+autorun(() => {
+    if (user.isLoggedIn !== previousLoggedIn){
+        previousLoggedIn = user.isLoggedIn;
+        Screens.refresh();
+    }
+});

data/client/lanes/workspace/menu.jsx

@@ -16,11 +16,10 @@ import Icon from '../components/icon';
 import User from '../user';
 
 const OnLogoutClick = (ev) => {
-    debugger
     ev.stopPropagation();
     ev.preventDefault();
     User.logout();
-}
+};
 
 function Logout() {
     return (
@@ -32,19 +31,8 @@ function Logout() {
     );
 }
 
+@observer
 export default class WorkspaceMenu extends React.Component {
-    /* renderGroup(group) {
-     *     return (
-     *         <ScreenGroup {...this.props} model={group} key={group.id} />
-     *     );
-     * }
-
-     * logOut(ev) {
-     *     ev.preventDefault();
-     *     return (
-     *         Lanes.current_user.logout()
-     *     );
-     * }*/
 
     render() {
         return (
@@ -55,7 +43,7 @@ export default class WorkspaceMenu extends React.Component {
                 <Header justify="between" size="large" pad={{ horizontal: 'medium' }}>
                     Logo
                 </Header>
-                {Screens.groups.map(g => <Group key={g.id} group={g} />)}
+                {Screens.activeGroups.map(g => <Group key={g.id} group={g} />)}
                 <Footer size="large" primary pad={{ horizontal: 'medium' }}>
                     <Logout />
                 </Footer>
@@ -63,22 +51,3 @@ export default class WorkspaceMenu extends React.Component {
         );
     }
 }
-
-/*
- *
- * <div className="screens-menu">
- * <div className="screens-menu-content">
- * <ul className="navigation">
- * {Screens.groups.map(g => <Group key={g.id} group={g} />)}
- * </ul>
- * </div>
- * <ul className="navigation">
- * <li
- * className="group logout"
- * data-tooltip-message="Log Out"
- * data-placement="right"
- * >
- * <Logout />
- * </li>
- * </ul>
- * </div>*/