hippo-fw 0.9.4 → 0.9.5

data/client/hippo/extensions/hippo.js

@@ -3,9 +3,12 @@ import {
     BaseExtension, identifiedBy, identifier,
 } from './base';
 
+import Extensions from './index';
+
 @identifiedBy('extensions/hippo')
 export default class HippoExtension extends BaseExtension {
-
     @identifier id = 'hippo';
-
 }
+
+
+Extensions.register(HippoExtension);

data/client/hippo/extensions/index.js

@@ -1,7 +1,7 @@
 import { invoke, each } from 'lodash';
 import { observable } from 'mobx';
 
-export default {
+const Extensions = {
 
     instances: observable.map(),
 
@@ -38,10 +38,16 @@ export default {
     },
 
     setBootstrapData(bootstrapData) {
-        this.controlling_id = bootstrapData.controlling_extension;
+        if (bootstrapData.controlling_extension) {
+            this.controlling_id = bootstrapData.controlling_extension;
+        }
         this.instances.forEach((instance, key) => {
-            invoke(instance, 'setBootstrapData', bootstrapData[key]);
+            if (bootstrapData[key]) {
+                invoke(instance, 'setBootstrapData', bootstrapData[key]);
+            }
         });
     },
 
 };
+
+export default Extensions;

data/client/hippo/lib/__mocks__/request-assets.js

@@ -1,6 +1,6 @@
 /* global jest */
 
 const MockedRequestAssets = jest.fn((...urls) =>
-                                    new Promise(resolve => resolve(urls)),
-                                   );
+    new Promise(resolve => resolve(urls)),
+);
 export default MockedRequestAssets;

data/client/hippo/lib/bootstrap.js

@@ -7,7 +7,6 @@ const ERROR    = Symbol('ERROR');
 const COMPLETE = Symbol('COMPLETE');
 
 export default class Bootstrap {
-
     constructor(options = {}) {
         this.options = options;
         this.callbacks = { onReady: [] };

data/client/hippo/lib/smooth-scroll.js

@@ -17,7 +17,6 @@ const POSITION = function(start, end, elapsed, duration) {
 };
 
 export default class SmoothScroll {
-
     constructor(link, destination, options = {}) {
         this.link = link;
         this.destination = destination;

data/client/hippo/lib/util.js

@@ -29,7 +29,7 @@ export function titleize(words) {
     return (words)
         .replace(/[\W_]/g, ' ')
         .replace(/\S+/g, word => (word.charAt(0).toUpperCase() + word.slice(1)),
-    );
+        );
 }
 
 export function underscored(str) {
@@ -41,15 +41,15 @@ export function underscored(str) {
 
 export function humanize(str) {
     return capitalize(trim(underscored(str)
-                           .replace(/_id$/, '')
-                           .replace(/_/g, ' ')));
+        .replace(/_id$/, '')
+        .replace(/_/g, ' ')));
 }
 
 export function renameProperties(object, keyMap) {
     each(keyMap, (to, from) => {
         if (object[from]) {
             object[to] = object[from]; // eslint-disable-line no-param-reassign
-            delete object[from];       // eslint-disable-line no-param-reassign
+            delete object[from]; // eslint-disable-line no-param-reassign
         }
     });
     return object;

data/client/hippo/models/asset.js

@@ -1,5 +1,5 @@
-import { includes, get } from 'lodash';
-import { observe } from 'mobx';
+import { includes, get, extend } from 'lodash';
+import { observe, action } from 'mobx';
 import {
     BaseModel, identifiedBy, field, session, identifier, computed,
 } from './base';
@@ -15,10 +15,8 @@ const UPDATE_METHODS = { POST: true, PUT: true, PATCH: true };
 
 @identifiedBy('hippo/asset')
 export default class Asset extends BaseModel {
-
     @identifier id;
     @field order;
-    @session file_data;
 
     @session file;
 
@@ -30,27 +28,50 @@ export default class Asset extends BaseModel {
 
     constructor(props) {
         super(props);
-        observe(this, 'owner', ({ newValue: owner }) => {
-            if (this.ownerSaveDisposer) { this.ownerSaveDisposer(); }
-            if (!owner || !owner.isModel) { return; }
-            this.ownerSaveDisposer = observe(owner, 'syncInProgress', ({ newValue, oldValue }) => {
-                if (this.isDirty &&
-                    !this.syncInProgress &&
-                    !oldValue &&
-                    newValue && newValue.isUpdate
-                   ) {
-                    newValue.whenComplete(() => this.save());
-                }
-            });
-        }, true);
+        observe(this, 'owner', this.onOwnerChange, true);
+    }
+
+    static get syncUrl() {
+        return Config.api_path + Config.assets_path_prefix;
     }
 
-    @computed get baseUrl() {
-        return Config.api_host + Config.api_path + Config.assets_path_prefix;
+
+    @action.bound
+    onOwnerChange({ newValue: owner }) {
+        if (this.ownerSaveDisposer) { this.ownerSaveDisposer(); }
+        if (!owner || !owner.isModel) { return; }
+        this.ownerSaveDisposer = observe(owner, 'syncInProgress', ({ newValue, oldValue }) => {
+            if (this.isDirty &&
+                !this.syncInProgress &&
+                !oldValue &&
+                newValue && newValue.isUpdate
+            ) {
+                newValue.whenComplete(() => this.save());
+            }
+        });
     }
 
+    setFile(file) {
+        if (file.preview) {
+            this.file = file;
+            return Promise.resolve(this);
+        }
+        return new Promise((resolve) => {
+            const reader = new FileReader();
+            reader.onloadend = (ev) => {
+                if ('loadend' === ev.type) {
+                    extend(file, { preview: reader.result });
+                    this.file = file;
+                    resolve(this);
+                }
+            };
+            reader.readAsDataURL(file);
+        });
+    }
+
+
     @computed get isDirty() {
-        return !!this.file;
+        return Boolean(this.isNew || !this.file);
     }
 
     @computed get exists() {
@@ -68,13 +89,13 @@ export default class Asset extends BaseModel {
         );
     }
 
-    @computed get previewUrl() {
+    get previewUrl() {
         return get(this, 'file.preview', this.urlFor('thumbnail'));
     }
 
     urlFor(type = 'original') {
         const url = get(this, `file_data.${type}.id`);
-        return url ? `${this.baseUrl}/${url}` : null;
+        return url ? `${Config.api_host}${this.constructor.syncUrl}/${url}` : null;
     }
 
     save() {
@@ -98,5 +119,4 @@ export default class Asset extends BaseModel {
                 return json;
             }).then(json => this.set(json.data));
     }
-
 }

data/client/hippo/models/base.js

@@ -29,7 +29,6 @@ export {
 };
 
 export class BaseModel {
-
     static get propType() {
         return PropTypes.instanceOf(this);
     }
@@ -122,7 +121,7 @@ export class BaseModel {
 
     fetch(options = {}) {
         invariant((!this.isNew || options.query),
-                  'Unable to fetch record without it’s identifier being set or a query');
+            'Unable to fetch record without it’s identifier being set or a query');
         const fetchOptions = extend(options, { limit: 1, method: 'GET' });
         if (!fetchOptions.query) {
             fetchOptions.query = { [`${this.constructor.identifierFieldName}`]: this.identifierFieldValue };

data/client/hippo/models/config.js

@@ -56,5 +56,4 @@ export default class Config {
         this.access_token = null;
         if (this.user) { this.user.reset(); }
     }
-
 }

data/client/hippo/models/decorators.js

@@ -36,20 +36,20 @@ function validateChangeType(validator, propertyName, change) {
     invariant(VALIDATORS[validator], `Unknown TypeCheck: ${validator} does not exist`);
     if (COERCE[validator]) { COERCE[validator](change); }
     invariant(VALIDATORS[validator](change.newValue),
-              `Bad Type: Attempted to set ${propertyName} to '${change.newValue}' which is not ${validator}`);
+        `Bad Type: Attempted to set ${propertyName} to '${change.newValue}' which is not ${validator}`);
     return change;
 }
 
 function addTypeSafeInterceptor(target, property, type) {
     if (isEmpty(type)) { return; }
     addLazyInitializer(target, (partial(intercept, partial.placeholder, property,
-                                        partial(validateChangeType, type, property))));
+        partial(validateChangeType, type, property))));
 }
 
 function decoratorWrapper(decorator, defaultOptions = {}) {
     return (targetOrOptions, ...args) => {
         const options = isEmpty(args) ?
-              defaults(targetOrOptions, defaultOptions) : defaultOptions;
+            defaults(targetOrOptions, defaultOptions) : defaultOptions;
 
         const wrap = (target, property, descriptor) => {
             const decorationFn = decorator(options);

data/client/hippo/models/pub_sub.js

@@ -1,9 +1,8 @@
 import { Atom, when, reaction } from 'mobx';
 import ActionCable from 'actioncable';
 import invariant from 'invariant';
-import { omit, invoke, mapValues } from 'lodash';
+import { invoke, mapValues } from 'lodash';
 
-import { logger } from '../lib/util';
 import User from '../user';
 import Config from '../config';
 
@@ -12,7 +11,6 @@ import PubSubCableChannel from './pub_sub/channel';
 let PubSub;
 
 class PubSubMap {
-
     constructor(modelKlass) {
         this.channel_prefix = modelKlass.identifiedBy;
         this.map = Object.create(null);
@@ -53,7 +51,7 @@ class PubSubMap {
     remove(model) {
         const { id, models } = this.forModel(model);
         const indx = models.indexOf(model);
-        invariant(-1 !== indx, "Asked to remove model from pubsub but it was never observed");
+        invariant(-1 !== indx, 'Asked to remove model from pubsub but it was never observed');
         if (1 === models.length) {
             delete this.map[id];
             PubSub.channel.unsubscribe(this.channelForId(id));
@@ -120,7 +118,6 @@ export function stop() {
 }
 
 export class PubSubAtom {
-
     constructor(model) {
         this.model = model;
         if (model.identifierFieldValue) {

data/client/hippo/models/pub_sub/channel.js

@@ -6,7 +6,6 @@ import { BaseModel } from '../base';
 const CHANNEL_SPLITTER = new RegExp('^(.*):(.*)/([^/]+)$');
 
 export default class PubSubCableChannel {
-
     constructor(pub_sub) {
         this.channel = pub_sub.cable.subscriptions.create(
             'pubsub', this,

data/client/hippo/models/query.js

@@ -14,7 +14,6 @@ import ArrayResult from './query/array-result';
 // needs to inherit from Base so network events will be listened to
 @identifiedBy('hippo/query')
 export default class Query extends BaseModel {
-
     @belongsTo src;
 
     @identifier id;

data/client/hippo/models/query/array-result.js

@@ -11,7 +11,6 @@ import {
 
 @identifiedBy('hippo/query/array-result')
 export default class ArrayResult extends Result {
-
     @belongsTo query;
     @observable totalCount = 0;
     @observable rows;

data/client/hippo/models/query/clause.js

@@ -5,7 +5,6 @@ import {
 
 @identifiedBy('hippo/query/clause')
 export default class Clause extends BaseModel {
-
     @observable id = uniqueId('clause');
 
     @observable value;

data/client/hippo/models/query/field.js

@@ -6,7 +6,6 @@ import {
 
 @identifiedBy('hippo/query/field')
 export default class Field extends BaseModel {
-
     @identifier({ type: 'string' }) id;
     @session title;
     @session selected   = false;

data/client/hippo/models/query/info.js

@@ -2,7 +2,6 @@ import { filter, reduce, find } from 'lodash';
 import { computed } from 'mobx';
 
 export default class Info {
-
     constructor(query) {
         this.query = query;
     }
@@ -38,6 +37,4 @@ export default class Info {
         const property = this.query.src.identifierFieldName;
         return find(this.query.fields, { id: property });
     }
-
-
 }

data/client/hippo/models/query/operator.js

@@ -4,7 +4,6 @@ import {
 
 @identifiedBy('hippo/query/operators/operator')
 export default class Operator extends BaseModel {
-
     @identifier({ type: 'string' }) id;
     @session label;
     @session selected;
@@ -17,5 +16,4 @@ export default class Operator extends BaseModel {
         if (!this.types.length) { return true; }
         return !!this.types.find(t => t === field.queryType);
     }
-
 }

data/client/hippo/models/query/result.js

@@ -8,7 +8,6 @@ import {
 
 @identifiedBy('hippo/query/result')
 export default class Result extends BaseModel {
-
     @belongsTo({ type: 'hippo/query' }) query;
 
     sortingFunction() {

data/client/hippo/models/sync.js

@@ -82,7 +82,7 @@ function perform(urlPrefix, defaultOptions = {}) {
 }
 
 const peformMobxyRequest = action('SyncforModel', (mobxObj, options = {}) => {
-    mobxObj.syncInProgress = new SyncProgess(options);  // eslint-disable-line no-param-reassign
+    mobxObj.syncInProgress = new SyncProgess(options); // eslint-disable-line no-param-reassign
     return perform(options.url || mobxObj.syncUrl, options)
         .then(action('syncSuccessHandler', (json) => {
             extend(mobxObj, {

data/client/hippo/models/system-setting.js

@@ -8,7 +8,6 @@ import Asset from './asset';
 
 @identifiedBy('hippo/system-settings')
 export default class SystemSettings extends BaseModel {
-
     @identifier id;
     @field({ type: 'object' }) settings;
 
@@ -22,5 +21,4 @@ export default class SystemSettings extends BaseModel {
     @computed get syncUrl() {
         return this.constructor.syncUrl;
     }
-
 }

data/client/hippo/models/tenant.js

@@ -10,7 +10,6 @@ const CACHE = observable({
 
 @identifiedBy('hippo/tenant')
 export default class Tenant extends BaseModel {
-
     @computed static get current() {
         if (!CACHE.Tenant) {
             CACHE.Tenant = new Tenant();

data/client/hippo/screens/definition.js

@@ -12,7 +12,6 @@ export { asyncComponent } from 'react-async-component';
 
 @identifiedBy('hippo/screen/definition')
 export default class ScreenDefinition extends BaseModel {
-
     @identifier({ type: 'string' }) id;
     @session title;
     @session url_prefix;
@@ -63,5 +62,4 @@ export default class ScreenDefinition extends BaseModel {
         instance.isActive = true;
         return instance;
     }
-
 }

data/client/hippo/screens/group.js

@@ -7,7 +7,6 @@ const All = observable.array();
 
 @identifiedBy('ScreensGroup')
 export default class ScreensGroup extends BaseModel {
-
     static all = All;
 
     @identifier({ type: 'string' }) id;
@@ -31,5 +30,4 @@ export default class ScreensGroup extends BaseModel {
         }
         return group;
     }
-
 }

data/client/hippo/screens/instance.js

@@ -6,7 +6,6 @@ import {
 } from '../models/base';
 
 class InstanceCollection {
-
     @observable models = []
     @observable active;
 
@@ -33,7 +32,6 @@ class InstanceCollection {
 
     add(model) { this.models.push(model); }
     remove(model) { this.models.remove(model); }
-
 }
 
 const displaying = new InstanceCollection();
@@ -41,7 +39,6 @@ export { displaying };
 
 @identifiedBy('hippo/screen-view')
 export default class Instance extends BaseModel {
-
     static get displaying() {
         return displaying.models;
     }