hippo-fw 0.9.7 → 0.9.8

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

@@ -2,7 +2,7 @@ import {
     isEmpty, isNil, extend, map, bindAll, inRange, find, range, isUndefined,
 } from 'lodash';
 import { reaction, observe, toJS } from 'mobx';
-
+import objectHash from 'object-hash';
 import Sync from '../sync';
 import Result from './result';
 import {
@@ -11,6 +11,7 @@ import {
 
 @identifiedBy('hippo/query/array-result')
 export default class ArrayResult extends Result {
+
     @belongsTo query;
     @observable totalCount = 0;
     @observable rows;
@@ -18,6 +19,7 @@ export default class ArrayResult extends Result {
     @observable sortAscending;
     @observable sortField;
     @observable.shallow loadingRows = [];
+    @observable syncInProgress;
 
     constructor(attrs) {
         super(attrs);
@@ -33,18 +35,30 @@ export default class ArrayResult extends Result {
     }
 
     @computed get fingerprint() {
-        return [
-            this.query.fingerprint,
-            this.rows.length,
-            (this.sortField ? this.sortField.id : 'none'),
-            this.sortAscending,
-            this.rowUpdateCount,
-        ].join(';');
+        return objectHash({
+            q: this.query.fingerprint,
+            sy: toJS(this.syncInProgress),
+            rl: this.rows.length,
+            sf: (this.sortField ? this.sortField.id : 'none'),
+            sa: this.sortAscending,
+            ru: this.rowUpdateCount,
+        });
+    }
+
+    createModel(attrs = {}) {
+        return new this.query.src(attrs); // eslint-disable-line new-cap
     }
 
-    insertRow() {
-        this.rows.unshift(Array(this.query.info.loadableFields.length));
+    insertRow({ index = 0, model = this.createModel(), observeSave = false } = {}) {
+        if (-1 === index) { index = this.rows.length; } // eslint-disable-line
+        const row = Array(this.query.info.loadableFields.length);
+        this.query.fields.forEach((f) => {
+            if (!isUndefined(model[f.id])) { row[f.dataIndex] = model[f.id]; }
+        });
+        this.rows.splice(index, 0, row);
         this.totalCount += 1;
+        if (observeSave) { this.observeModelSave(model, index); }
+        return { model, index };
     }
 
     isIndexSaved(index) {
@@ -67,8 +81,7 @@ export default class ArrayResult extends Result {
         return obj;
     }
 
-    modelForRow(index) {
-        const model = new this.query.src(this.rowAsObject(index)); // eslint-disable-line new-cap
+    observeModelSave(model, index) {
         observe(model, 'syncInProgress', ({ newValue, oldValue }) => {
             if (newValue && !oldValue && newValue.isUpdate) {
                 newValue.whenComplete(() => {
@@ -80,6 +93,11 @@ export default class ArrayResult extends Result {
                 }, 99);
             }
         });
+    }
+
+    modelForRow(index) {
+        const model = this.createModel(this.rowAsObject(index));
+        this.observeModelSave(model, index);
         return model;
     }
 
@@ -143,6 +161,14 @@ export default class ArrayResult extends Result {
         return !!find(this.loadingRows, ([start, end]) => inRange(index, start, end));
     }
 
+    canKeySetPage(index) {
+        return Boolean(
+            this.rows.length && this.rows.length >= index &&
+            this.query.sortField && this.query.sortField.dataIndex &&
+            !isEmpty(this.rows[index - 1]),
+        );
+    }
+
     fetch({ start = this.rows.length, limit = this.query.pageSize } = {}) {
         const inProgress = [start, start + limit];
         this.loadingRows.push(inProgress);
@@ -155,7 +181,6 @@ export default class ArrayResult extends Result {
         });
 
         const options = extend({}, toJS(this.query.syncOptions), {
-            start,
             limit,
             total_count: 't',
             format: 'array',
@@ -166,12 +191,22 @@ export default class ArrayResult extends Result {
             options.query = query;
         }
 
-        if (!isNil(this.sortField)) {
+        if (this.query.sortField) {
             options.order = {
-                [`${this.sortField.id}`]: (this.sortAscending ? 'asc' : 'desc'),
+                [`${this.query.sortField.id}`]: this.query.sortAscending ? 'asc' : 'desc',
             };
         }
 
+        if (this.canKeySetPage(start)) {
+            const lastKey = this.rows[start - 1][this.query.sortField.dataIndex];
+            options.query[this.query.sortField.id] = {
+                op: this.query.sortAscending ? 'gt' : 'lt',
+                value: lastKey,
+            };
+        } else {
+            options.start = start;
+        }
+
         extend(options, toJS(this.query.info.syncOptions));
 
         this.syncInProgress = options;
@@ -184,8 +219,9 @@ export default class ArrayResult extends Result {
             this.rows.splice(start, Math.max(limit, rows.length), ...rows);
             this.totalCount = resp.total;
             this.loadingRows.remove(inProgress);
-            delete this.syncInProgress;
+            this.syncInProgress = null;
             return this;
         });
     }
+
 }

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

@@ -1,4 +1,4 @@
-import { get, compact, first, filter, uniqueId } from 'lodash';
+import { get, compact, first, filter, uniqueId, isNil, isEmpty } from 'lodash';
 import { action, observe } from 'mobx';
 import {
     BaseModel, identifiedBy, belongsTo, computed, observable, session,
@@ -6,6 +6,7 @@ import {
 
 @identifiedBy('hippo/query/clause')
 export default class Clause extends BaseModel {
+
     @observable id = uniqueId('clause');
     @session visible = true;
     @session value;
@@ -19,7 +20,10 @@ export default class Clause extends BaseModel {
         if (!this.field) {
             this.field = first(this.query.info.queryableFields);
         }
-        observe(this, 'field', this.updateOperatorOnFieldChange, true);
+        if (!this.operator) {
+            this.operator = this.field.preferredOperator;
+        }
+        observe(this, 'field', this.updateOperatorOnFieldChange);
     }
 
     @computed get description() {
@@ -35,13 +39,14 @@ export default class Clause extends BaseModel {
     }
 
     @computed get isValid() {
-        return !!(this.value && this.operator.isValidForField(this.field));
+        if ('like' === this.operator.id) { return !isEmpty(this.value); }
+        return Boolean(!isNil(this.value) && this.operator.isValidForField(this.field));
     }
 
     toParam() {
         const param = {};
         let op = this.operator.id;
-        let value = this.value;
+        let { value } = this;
         if ('like' === op) { value += '%'; }
         if ('contains' === op) {
             op = 'like';
@@ -54,6 +59,8 @@ export default class Clause extends BaseModel {
 
     @action.bound
     updateOperatorOnFieldChange() {
+        this.value = this.field.defaultValue;
         this.operator = this.field.preferredOperator;
     }
+
 }

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

@@ -7,6 +7,7 @@ import {
 
 @identifiedBy('hippo/query/field')
 export default class Field extends BaseModel {
+
     @identifier({ type: 'string' }) id;
     @session title;
     @session selected   = false;
@@ -23,7 +24,6 @@ export default class Field extends BaseModel {
     @session dataType   = 'string'
     @session cellRenderer;
     @session defaultValue;
-    @session fetchIndex;
     @session sortBy;
 
     @observable onColumnClick;
@@ -80,4 +80,5 @@ export default class Field extends BaseModel {
     @computed get preferredOperator() {
         return this.query.operators.find(o => o.isValidForField(this));
     }
+
 }

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

@@ -1,7 +1,8 @@
-import { filter, reduce, find } from 'lodash';
+import { isNil, filter, reduce, find } from 'lodash';
 import { computed } from 'mobx';
 
 export default class Info {
+
     constructor(query) {
         this.query = query;
     }
@@ -41,4 +42,9 @@ export default class Info {
         const property = this.query.src.identifierFieldName;
         return find(this.query.fields, { id: property });
     }
+
+    @computed get valuedClauses() {
+        return filter(this.query.clauses, c => !isNil(c.value));
+    }
+
 }

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

@@ -4,6 +4,7 @@ import {
 
 @identifiedBy('hippo/query/operators/operator')
 export default class Operator extends BaseModel {
+
     @identifier({ type: 'string' }) id;
     @session label;
     @session selected;
@@ -16,4 +17,5 @@ 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,6 +8,7 @@ import {
 
 @identifiedBy('hippo/query/result')
 export default class Result extends BaseModel {
+
     @belongsTo({ type: 'hippo/query' }) query;
 
     sortingFunction() {
@@ -17,4 +18,5 @@ export default class Result extends BaseModel {
     }
 
     loadFully() { return Promise.resolve(this); }
+
 }

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

@@ -2,4 +2,8 @@ export default {
     LIKE_QUERY_TYPES:         ['string', 'code', 'visible_id'],
     LESS_THAN_QUERY_TYPES:    ['integer', 'bigdec', 'number'],
     GREATER_THAN_QUERY_TYPES: ['integer', 'bigdec', 'number'],
+    BETWEEN_TYPES:            ['date'],
+    EQUAL_TYPES: [
+        'string', 'code', 'visible_id', 'integer', 'bigdec', 'number',
+    ],
 };

data/client/hippo/models/sync.js

@@ -32,6 +32,7 @@ function isUpdate(method) {
 }
 
 class SyncProgess {
+
     constructor(options) {
         extend(this, options);
         this._whenComplete = [];
@@ -42,6 +43,7 @@ class SyncProgess {
     get isFetch() { return 'GET' === this.method; }
     get isCreate() { return 'POST' === this.method; }
     get isUpdate() { return isUpdate(this.method); }
+
 }
 
 function invokeWhenComplete(json, progress) {

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

@@ -1,14 +1,13 @@
 import { merge } from 'lodash';
-import { when } from 'mobx';
 import {
     BaseModel, identifiedBy, identifier, belongsTo, field, computed,
 } from './base';
 import Sync  from './sync';
-import Config from '../config';
 import Asset from './asset';
 
 @identifiedBy('hippo/system-settings')
 export default class SystemSettings extends BaseModel {
+
     @identifier id;
     @field({ type: 'object' }) settings;
 
@@ -23,17 +22,4 @@ export default class SystemSettings extends BaseModel {
         return this.constructor.syncUrl;
     }
 
-    get syncData() {
-        return this.serialize();
-    }
-
-    set syncData(data) {
-        super.syncData = data;
-        if (this.logo && this.logo.isDirty) {
-            when(
-                () => !this.logo.isDirty,
-                () => { Config.logo = this.logo.file_data; },
-            );
-        }
-    }
 }

data/client/hippo/models/tenant.js

@@ -1,29 +1,45 @@
-import { observable } from 'mobx';
+import { observable, computed } from 'mobx';
+import { first } from 'lodash';
 import {
-    BaseModel, identifiedBy, field, identifier, computed,
+    BaseModel, identifiedBy, field, identifier,
 } from './base';
 import Config from '../config';
 
-
 const CACHED = observable.box();
 
 @identifiedBy('hippo/tenant')
 export default class Tenant extends BaseModel {
+
     @computed static get current() {
         let tenant = CACHED.get();
         if (!tenant) {
-            tenant = new Tenant();
+            tenant = new Tenant({
+                slug: first(window.location.host.split('.')),
+            });
             CACHED.set(tenant);
-            tenant.fetch({ query: 'current' });
         }
         return tenant;
     }
 
-    @identifier id;
-    @field slug = Tenant.slug;
+    static bootstrap(data) {
+        Tenant.current.update(data);
+        if (data.bootstrap) {
+            Config.update(data.bootstrap);
+        }
+    }
+
+    @identifier({ type: 'string' }) identifier = 'current';
     @field name;
+    @field email;
+    @field slug;
+
 
     @computed get domain() {
         return `${this.slug}.${Config.website_domain}`;
     }
+
+    set syncData(data) {
+        Tenant.bootstrap(data);
+    }
+
 }

data/client/hippo/react/Root.jsx

@@ -3,6 +3,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 export default class Root extends React.Component {
+
     static childContextTypes = {
         viewport: PropTypes.object,
     }
@@ -20,4 +21,5 @@ export default class Root extends React.Component {
             </div>
         );
     }
+
 }

data/client/hippo/react/component-not-found.jsx

@@ -4,6 +4,7 @@ import { get } from 'lodash';
 import { classify } from '../lib/util';
 
 export default class ComponentNotFound extends React.PureComponent {
+
     static propTypes = {
         extension: PropTypes.shape({
             identifier: PropTypes.string,
@@ -18,4 +19,5 @@ export default class ComponentNotFound extends React.PureComponent {
             </div>
         );
     }
+
 }

data/client/hippo/screens/definition.js

@@ -12,6 +12,7 @@ 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;
@@ -62,4 +63,5 @@ export default class ScreenDefinition extends BaseModel {
         instance.isActive = true;
         return instance;
     }
+
 }

data/client/hippo/screens/group.js

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

data/client/hippo/screens/instance.js

@@ -6,6 +6,7 @@ import {
 } from '../models/base';
 
 class InstanceCollection {
+
     @observable models = []
     @observable active;
 
@@ -17,7 +18,7 @@ class InstanceCollection {
         const len = this.models.length;
         if (!len) { return; }
         if (1 === len) {
-            this.active = this.models[0];
+            [this.active] = this.models;
         } else if (!this.active) {
             this.active = this.models[len - 1];
         }
@@ -32,6 +33,7 @@ class InstanceCollection {
 
     add(model) { this.models.push(model); }
     remove(model) { this.models.remove(model); }
+
 }
 
 const displaying = new InstanceCollection();
@@ -39,6 +41,7 @@ export { displaying };
 
 @identifiedBy('hippo/screen-view')
 export default class Instance extends BaseModel {
+
     static get displaying() {
         return displaying.models;
     }
@@ -93,4 +96,5 @@ export default class Instance extends BaseModel {
     remove() {
         displaying.remove(this);
     }
+
 }