hippo-fw 0.9.7 → 0.9.8

data/client/hippo/components/text-editor/image-plugin/Component/Form/index.js

@@ -10,6 +10,7 @@ import Display from '../Display';
 @inject('model', 'images_attribute')
 @observer
 export default class Form extends React.PureComponent {
+
     get assets() {
         return this.props.model[this.props.images_attribute];
     }
@@ -37,4 +38,5 @@ export default class Form extends React.PureComponent {
             </div>
         );
     }
+
 }

data/client/hippo/components/text-editor/renderer.jsx

@@ -9,6 +9,7 @@ import 'ory-editor-core/lib/index.css';
 
 @observer
 export default class TextEditorRenderer extends React.PureComponent {
+
     static defaultProps = {
         assets: observable.array(),
     }
@@ -34,4 +35,5 @@ export default class TextEditorRenderer extends React.PureComponent {
             </Provider>
         );
     }
+
 }

data/client/hippo/components/text-editor/text-editor.scss

@@ -8,6 +8,7 @@
 
     .text-editor-content {
         flex: 1;
+        overflow: auto;
     }
 
 
@@ -25,12 +26,17 @@
         margin-bottom: 0;
     }
 
-    .content-image {
-        width: 100%;
-        height: auto;
+    .content-image-wrapper {
+        .image-drop-zone {
+            text-align: center;
+        }
+        .content-image {
+            max-width: 100%;
+            width: auto;
+            height: auto;
+        }
     }
 
-
     button:not(.grommetux-button) {
         min-width: inherit;
         padding: 0;
@@ -44,5 +50,8 @@
         .active {
             border-bottom: 2px solid $focus-border-color;
         }
+        button + button {
+            margin-left: 0.5rem;
+        }
     }
 }

data/client/hippo/components/time-zone-select.jsx

@@ -9,6 +9,7 @@ import moment from 'moment-timezone';
 
 @observer
 export default class TimeZoneSelect extends React.PureComponent {
+
     static propTypes = {
         value: PropTypes.string,
         onChange: PropTypes.func.isRequired,
@@ -57,4 +58,5 @@ export default class TimeZoneSelect extends React.PureComponent {
             />
         );
     }
+
 }

data/client/hippo/components/tool-tip.jsx

@@ -6,6 +6,7 @@ import 'react-tippy/dist/tippy.css';
 // Use a wrapper component even though it doesn't really add any functionality
 // In the future we'll add a Manager wrapper so that multiple tooltips cannot be shown at once
 export default class ToolTip extends React.PureComponent {
+
     render() {
         const { children, ...tipProps } = this.props;
         return (
@@ -16,4 +17,5 @@ export default class ToolTip extends React.PureComponent {
             </Tippy>
         );
     }
+
 }

data/client/hippo/extensions/base.js

@@ -6,6 +6,7 @@ import RootView from '../workspace/root-view';
 export { identifiedBy, identifier } from '../models/base';
 
 export class BaseExtension {
+
     @observable data;
 
     static register() {
@@ -27,4 +28,5 @@ export class BaseExtension {
     rootView() {
         return RootView;
     }
+
 }

data/client/hippo/extensions/hippo.js

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

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

@@ -1,6 +1,5 @@
 /* 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,6 +7,7 @@ const ERROR    = Symbol('ERROR');
 const COMPLETE = Symbol('COMPLETE');
 
 export default class Bootstrap {
+
     constructor(options = {}) {
         this.options = options;
         this.callbacks = { onReady: [] };
@@ -41,4 +42,5 @@ export default class Bootstrap {
         this.status = COMPLETE;
         this.callbacks.onReady.map(cb => cb(host, data));
     }
+
 }

data/client/hippo/lib/computed-properties.js

@@ -0,0 +1,24 @@
+import { forIn } from 'lodash';
+import { computed } from 'mobx';
+
+export function addComputedProperty(obj, name, fn) {
+    Object.defineProperty(obj, name, {
+        configurable: true,
+        get() {
+            const getter = computed(fn, { context: this });
+            Object.defineProperty(this, name, {
+                configurable: false,
+                get: () => getter.get(),
+            });
+            return getter.get();
+        },
+    });
+}
+
+export function addMethods(properties) {
+    return (collection) => {
+        forIn(properties, (fn, prop) => {
+            addComputedProperty(collection, prop, fn);
+        });
+    };
+}

data/client/hippo/lib/date-range.js

@@ -1,10 +1,16 @@
-import { isString, isEmpty, map } from 'lodash';
+import moment from 'moment';
+import { observable, computed } from 'mobx';
+import { isString, isEmpty, map, isNaN } from 'lodash';
 import {
     identifiedBy,
 } from 'mobx-decorated-models';
 
 @identifiedBy('date-range')
 export default class DateRange {
+
+    @observable start;
+    @observable end;
+
     constructor(range) {
         if (isString(range) && !isEmpty(range)) {
             [this.start, this.end] = map(range.split('...'), d => new Date(d));
@@ -15,7 +21,7 @@ export default class DateRange {
     }
 
     toJSON() {
-        if (this.start && this.end) {
+        if (this.start && this.end && !isNaN(this.start) && !isNaN(this.end)) {
             // this strange format is what PG user and is therefore what active record expects
             return `[${this.start.toISOString()},${this.end.toISOString()})`;
         }
@@ -25,4 +31,9 @@ export default class DateRange {
     static serialize(range) {
         return (range ? range.toJSON() : '');
     }
+
+    @computed get isCurrent() {
+        return moment(this.end).isAfter() && moment(this.start).isBefore();
+    }
+
 }

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

@@ -3,6 +3,7 @@ import { loadCSS, loadJS } from './loader';
 import { logger } from './util';
 
 class AssetLoader {
+
     constructor(urls, cb) {
         let finished = 0;
         const completed = {};
@@ -21,6 +22,7 @@ class AssetLoader {
             }
         });
     }
+
 }
 
 export default function RequestAssets(...urlArgs) {
@@ -33,6 +35,5 @@ export default function RequestAssets(...urlArgs) {
             }
             logger.warn(`${keys(failures).join(',')} failed to load`);
             return reject(failures);
-        }),
-    );
+        }));
 }

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

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

data/client/hippo/lib/util.js

@@ -34,8 +34,7 @@ export function titleize(words) {
     if ('string' !== typeof words) { return words; }
     return (words)
         .replace(/[\W_]/g, ' ')
-        .replace(/\S+/g, word => (word.charAt(0).toUpperCase() + word.slice(1)),
-        );
+        .replace(/\S+/g, word => (word.charAt(0).toUpperCase() + word.slice(1)));
 }
 
 export function underscored(str) {

data/client/hippo/models/asset.js

@@ -15,6 +15,7 @@ const UPDATE_METHODS = { POST: true, PUT: true, PATCH: true };
 
 @identifiedBy('hippo/asset')
 export default class Asset extends BaseModel {
+
     @identifier id;
     @field order;
 
@@ -127,4 +128,5 @@ export default class Asset extends BaseModel {
                 return json;
             });
     }
+
 }

data/client/hippo/models/base.js

@@ -29,6 +29,7 @@ export {
 };
 
 export class BaseModel {
+
     static get propType() {
         return PropTypes.instanceOf(this);
     }
@@ -43,7 +44,7 @@ export class BaseModel {
 
     static get propertyOptions() {
         const options = {};
-        this.$schema.forEach((val, name) => (options[name] = val.options));
+        this.$schema.forEach((val, name) => { options[name] = val.options; });
         return options;
     }
 
@@ -59,7 +60,8 @@ export class BaseModel {
     }
 
     static get Collection() {
-        return this.$collection || (this.$collection = new ModelCollection(this));
+        if (!this.$collection) { this.$collection = new ModelCollection(this); }
+        return this.$collection;
     }
 
     constructor(attrs) {
@@ -136,6 +138,7 @@ export class BaseModel {
     destroy(options = {}) {
         return Sync.forModel(this, extend(options, { action: 'destroy' }));
     }
+
 }
 
 export default BaseModel;

data/client/hippo/models/collection.js

@@ -44,6 +44,7 @@ function extendAry(modelClass, models = [], options = {}) {
 }
 
 export default class ModelCollection {
+
     constructor(model) {
         this.$model = model;
         this.$collection = extendAry(model, [], {}, this);
@@ -52,4 +53,5 @@ export default class ModelCollection {
     create(models = [], options = {}) {
         return extendAry(this.$model, models, options, this);
     }
+
 }

data/client/hippo/models/config.js

@@ -7,6 +7,7 @@ import Extensions from '../extensions';
 const STORAGE_KEY = 'hippo-user-data';
 
 export default class Config {
+
     @persist @observable api_host = get(window, 'location.origin', '');
     @persist @observable api_path = '/api';
     @persist @observable access_token;
@@ -23,7 +24,7 @@ export default class Config {
     static create(hydrationConfig) {
         const hydrate = createHydrator(hydrationConfig);
         const ConfigInstance = new Config();
-        hydrate('config', ConfigInstance).then(() => (ConfigInstance.isIntialized = true));
+        hydrate('config', ConfigInstance).then(() => { ConfigInstance.isIntialized = true; });
         return ConfigInstance;
     }
 
@@ -56,4 +57,5 @@ export default class Config {
         this.access_token = null;
         if (this.user) { this.user.reset(); }
     }
+
 }

data/client/hippo/models/pub_sub.js

@@ -77,6 +77,7 @@ export function stop() {
 }
 
 export class PubSubAtom {
+
     constructor(model) {
         this.model = model;
         if (model.identifierFieldValue) {
@@ -100,6 +101,7 @@ export class PubSubAtom {
     reportObserved() {
         if (this.atom) { this.atom.reportObserved(); }
     }
+
 }
 
 export function observePubSub(...models) {

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

@@ -5,6 +5,7 @@ import { logger } from '../../lib/util';
 const CHANNEL_SPLITTER = new RegExp('^(.*):(.*)/([^/]+)$');
 
 export default class PubSubCableChannel {
+
     constructor(pub_sub) {
         this.callbacks = observable.map();
         this.channel = pub_sub.cable.subscriptions.create(
@@ -53,4 +54,5 @@ export default class PubSubCableChannel {
             this.pub_sub.onModelChange(modelId, id, omit(data, 'channel'));
         }
     }
+
 }

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

@@ -2,6 +2,7 @@ import invariant from 'invariant';
 import { isEmpty, mapValues } from 'lodash';
 
 export default class PubSubMap {
+
     constructor(modelKlass, channel) {
         this.channel = channel;
         this.channel_prefix = modelKlass.identifiedBy;
@@ -54,4 +55,5 @@ export default class PubSubMap {
             models.splice(indx, 1);
         }
     }
+
 }

data/client/hippo/models/query.js

@@ -1,9 +1,9 @@
 import { get, isString, find, extend, toPairs } from 'lodash';
-import { action, reaction, observe, observable } from 'mobx';
+import { toJS, action, reaction, observe, observable } from 'mobx';
+import objectHash from 'object-hash';
 import {
     BaseModel, identifiedBy, field, belongsTo, hasMany, identifier, computed, session,
 } from './base';
-
 import Info        from './query/info';
 import Types       from './query/types';
 import Operator    from './query/operator';
@@ -14,6 +14,7 @@ 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;
@@ -37,12 +38,6 @@ export default class Query extends BaseModel {
     @hasMany({ model: Operator, inverseOf: 'query' }) operators;
     @hasMany({ model: Field, inverseOf: 'query' }) fields;
 
-    @action
-    setSort({ field: f, ascending }) {
-        this.sortField = f;
-        this.sortAscending = ascending;
-    }
-
     constructor(attrs = {}) {
         for (let i = 0; i < get(attrs, 'fields.length', 0); i += 1) {
             if (isString(attrs.fields[i])) {
@@ -52,10 +47,12 @@ export default class Query extends BaseModel {
         super(attrs);
         [
             { id: 'like', label: 'Starts With', types: Types.LIKE_QUERY_TYPES },
-            { id: 'eq', label: 'Equals' },
+            { id: 'eq', label: 'Equals', types: Types.EQUAL_TYPES },
+            { id: 'between', label: 'Between', types: Types.BETWEEN_TYPES },
             { id: 'contains', label: 'Contains', types: Types.LIKE_QUERY_TYPES },
             { id: 'lt', label: 'Less Than', types: Types.LESS_THAN_QUERY_TYPES },
             { id: 'gt', label: 'More Than', types: Types.LESS_THAN_QUERY_TYPES },
+
         ].forEach(op => this.operators.push(op));
         this.info = new Info(this);
         this.results = new ArrayResult({ query: this });
@@ -68,13 +65,22 @@ export default class Query extends BaseModel {
         if (attrs.sort) {
             const [fieldId, dir] = toPairs(attrs.sort)[0];
             this.sortField = find(this.fields, { id: fieldId });
-            this.sortAscending = ('ASC' === dir);
+            this.sortAscending = ('ASC' === dir.toUpperCase());
         }
         observe(this, 'autoFetch', this._onAutoFetchChange);
     }
 
+    @action
+    setSort({ field: f, ascending }) {
+        this.sortField = f;
+        this.sortAscending = ascending;
+    }
+
     @computed get fingerprint() {
-        return this.clauses.map(o => o.fingerprint).join(';');
+        return objectHash({
+            so: toJS(this.syncOptions),
+            vc: this.info.valuedClauses.map(c => c.fingerprint),
+        });
     }
 
     open() {
@@ -123,8 +129,11 @@ export default class Query extends BaseModel {
         if (this.autoFetchDisposer) { return; }
         this.autoFetchDisposer = reaction(
             () => this.fingerprint,
-            this.fetch,
+            () => {
+                this.results.reset().fetch();
+            },
             { delay: 100, compareStructural: true, fireImmediately: true },
         );
     }
+
 }