hippo-fw 0.9.7 → 0.9.8

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hippo-fw",
-  "version": "0.9.6",
+  "version": "0.9.7",
   "description": "Hippo is a framework for easily writing single page web applications",
   "main": "client/hippo/index.js",
   "repository": "https://github.com/argosity/hippo",
@@ -12,7 +12,6 @@
   "dependencies": {
     "actioncable": "^5.1.2",
     "babel-core": "^6.25.0",
-    "babel-eslint": "^7.2.3",
     "babel-jest": "^20.0.3",
     "babel-loader": "^7.1.1",
     "babel-plugin-lodash": "^3.2.11",
@@ -32,12 +31,11 @@
     "classnames": "^2.2.5",
     "compression-webpack-plugin": "^1.0.0",
     "core-decorators": "^0.19.0",
-    "create-react-class": "^15.6.0",
     "css-loader": "^0.28.4",
     "domtastic": "^0.15.1",
     "enzyme": "^2.9.1",
-    "eslint": "^4.2.0",
-    "eslint-config-argosity": "^1.1.5",
+    "eslint": "^4.9.0",
+    "eslint-config-argosity": "^1.4.1",
     "file-loader": "^0.11.2",
     "flatpickr": "^3.0.7",
     "flexboxgrid": "^6.3.1",
@@ -54,19 +52,18 @@
     "lodash": "^4.17.4",
     "loglevel": "^1.4.1",
     "mobx": "^3.2.1",
-    "mobx-decorated-models": "^0.6.5",
-    "mobx-persist": "^0.3.3",
+    "mobx-decorated-models": "^0.7.1",
     "mobx-react": "^4.2.2",
     "moment-timezone": "^0.5.13",
     "node-sass": "^4.5.0",
-    "ory-editor": "^0.2.12",
+    "object-hash": "^1.1.8",
+    "ory-editor": "^0.2.25",
     "pluralize": "^6.0.0",
     "prop-types": "^15.5.8",
     "qs": "^6.5.0",
     "react": "^15.6.1",
-    "react-addons-shallow-compare": "^15.6.0",
     "react-addons-test-utils": "^15.6.0",
-    "react-async-component": "^1.0.0-beta.3",
+    "react-async-component": "^1.0.2",
     "react-braintree-fields": "^0.6.0",
     "react-dom": "^15.6.1",
     "react-dropzone": "^3.13.3",
@@ -74,18 +71,19 @@
     "react-fontawesome": "^1.6.1",
     "react-hot-loader": "3.0.0-beta.6",
     "react-input-slider": "^2.0.0",
-    "react-motion": "^0.5.0",
     "react-native-storage": "^0.2.2",
     "react-router": "^4.1.2",
     "react-router-dom": "^4.1.2",
     "react-sidebar": "^2.3.0",
     "react-swipeable-views": "^0.12.8",
+    "react-tag-autocomplete": "^5.4.1",
     "react-tap-event-plugin": "^2.0.1",
     "react-test-renderer": "^15.6.1",
     "react-tippy": "^1.0.2",
     "react-virtualized": "^9.9.0",
     "resolve-url-loader": "^2.1.0",
     "sass-loader": "^6.0.6",
+    "serializr": "^1.1.13",
     "sockjs-client": "^1.1.4",
     "sprintf-js": "^1.0.3",
     "style-loader": "^0.18.2",

data/spec/client/access/login-dialog.spec.jsx

@@ -7,8 +7,8 @@ jest.mock('hippo/models/sync');
 jest.mock('hippo/config');
 
 describe('Login Dialog', () => {
-    beforeEach(() => (Config.access_token = '0123456789'));
-    afterEach(() => (Config.access_token = ''));
+    beforeEach(() => { Config.access_token = '0123456789'; });
+    afterEach(() => { Config.access_token = ''; });
 
     it('does not render when user isnt logged in', () => {
         expect(User.isLoggedIn).toBe(true);

data/spec/client/components/__snapshots__/query-builder.spec.jsx.snap

@@ -5,7 +5,7 @@ exports[`Query Builder Component renders and matches snapshot 1`] = `
   className="query-builder"
 >
   <div
-    className="grommetux-box grommetux-box--direction-row grommetux-box--responsive grommetux-box--pad-between-small"
+    className="grommetux-box grommetux-box--direction-row grommetux-box--align-center grommetux-box--responsive grommetux-box--pad-between-small clause"
     id={undefined}
     onClick={undefined}
     role={undefined}

data/spec/client/components/__snapshots__/record-finder.spec.jsx.snap

@@ -2,7 +2,7 @@
 
 exports[`RecordFinder Component renders 1`] = `
 <div
-  className="form-field record-finder"
+  className="form-field text record-finder"
 >
   <div
     className="grommetux-form-field grommetux-form-field--size-medium"

data/spec/client/components/master-detail.spec.jsx

@@ -11,7 +11,8 @@ describe('Master Detail Component', () => {
             <MasterDetail
                 master={<MasterComp />}
                 detail={<DetailComp />}
-            />)).toMatchSnapshot();
+            />,
+        )).toMatchSnapshot();
     });
 
     it('renders and then can add detail', () => {

data/spec/client/components/query-builder.spec.jsx

@@ -28,14 +28,14 @@ describe('Query Builder Component', () => {
     });
 
     it('autoloads query when changed', () => {
-        query.fetch = jest.fn();
+        query.results.fetch = jest.fn();
         expect(query.autoFetch).toBe(false);
         const builder = mount(<QueryBuilder query={query} autoFetch />);
         expect(query.autoFetch).toBe(true);
-        expect(query.fetch).toHaveBeenCalled();
+        expect(query.results.fetch).toHaveBeenCalled();
         query.clauses[0].value = 'test';
         jest.runAllTimers();
-        expect(query.fetch).toHaveBeenCalledTimes(2);
+        expect(query.results.fetch).toHaveBeenCalledTimes(2);
         builder.unmount();
         expect(query.autoFetch).toBe(false);
     });

data/spec/client/extension/base.spec.js

@@ -2,7 +2,9 @@ import { BaseExtension } from 'hippo/extensions/base';
 import { observable } from 'mobx';
 
 class TestExtension extends BaseExtension {
+
     @observable identifier = 'foo-bar-baz';
+
 }
 
 describe('Base Extension', () => {

data/spec/client/models/base.spec.js

@@ -40,7 +40,9 @@ describe('BaseModel Test', () => {
 
     it('is set from sync', () => {
         const box = new Box({ id: 11, width: 5 });
-        expect(box.syncData).toEqual({ id: 11, height: 1, depth: 1, width: 5 });
+        expect(box.syncData).toEqual({
+            id: 11, height: 1, depth: 1, width: 5,
+        });
         const spy = jest.fn();
         observe(box, 'syncData', spy);
         box.syncData = { id: 2 };
@@ -67,12 +69,12 @@ describe('BaseModel Test', () => {
         const box = new Box();
         box.id = 23;
         expect(Box.propertyOptions.id.type).toEqual('number');
-        expect(() => (box.id = 'red')).toThrow('Bad Type');
+        expect(() => { box.id = 'red'; }).toThrow('Bad Type');
         expect(box.id).toEqual(23);
 
         const container = new Container();
         container.id = 'test';
-        expect(() => (container.id = 42)).toThrow('Bad Type');
+        expect(() => { container.id = 42; }).toThrow('Bad Type');
         expect(container.id).toEqual('test');
     });
 

data/spec/client/models/query.spec.js

@@ -23,20 +23,20 @@ describe('Model Queries', () => {
     });
 
     it('autoloads query when changed', () => {
-        query.fetch = jest.fn();
+        query.results.fetch = jest.fn();
         query.autoFetch = true;
-        expect(query.fetch).toHaveBeenCalled();
+        expect(query.results.fetch).toHaveBeenCalled();
         query.clauses[0].value = 'test value';
         jest.runAllTimers();
-        expect(query.fetch).toHaveBeenCalledTimes(2);
+        expect(query.results.fetch).toHaveBeenCalledTimes(2);
         query.clauses[0].value = 'test two value';
         jest.runAllTimers();
-        expect(query.fetch).toHaveBeenCalledTimes(3);
+        expect(query.results.fetch).toHaveBeenCalledTimes(3);
 
         query.autoFetch = false;
         query.clauses[0].value = 'yet another value';
         jest.runAllTimers();
-        expect(query.fetch).toHaveBeenCalledTimes(3);
+        expect(query.results.fetch).toHaveBeenCalledTimes(3);
     });
 
     it('calculates fields', () => {
@@ -74,7 +74,7 @@ describe('Model Queries', () => {
         expect(clause.field.id).toEqual('computed');
         expect(clause.operator.id).toEqual('like');
         expect(map(clause.validOperators, 'id')).toEqual(['like', 'eq', 'contains']);
-        clause.field = query.fields[3];
+        clause.field = find(query.fields, { id: 'width' });
         expect(clause.operator.id).toEqual('eq');
         expect(map(clause.validOperators, 'id')).toEqual(['eq', 'lt', 'gt']);
     });
@@ -233,4 +233,16 @@ describe('Model Queries', () => {
             );
         });
     });
+
+    it('sets valued queries', () => {
+        const { fingerprint } = query;
+        query.clauses.replace([
+            { field: query.fields[0], value: 123 },
+            { field: query.fields[1] },
+        ]);
+        expect(query.info.valuedClauses).toHaveLength(1);
+        expect(query.info.valuedClauses[0].value).toEqual(123);
+        expect(query.info.valuedClauses[0].field).toEqual(query.fields[0]);
+        expect(query.fingerprint).not.toEqual(fingerprint);
+    });
 });

data/spec/client/models/sync.spec.js

@@ -44,6 +44,7 @@ describe('Network sync', () => {
         Sync.forModel(box).then(() => expect(box.width).toEqual(12));
         expect(fetch).lastCalledWith(
             '/api/test/box/11.json',
-            { body, headers: { 'Content-Type': 'application/json' }, method: 'PUT' });
+            { body, headers: { 'Content-Type': 'application/json' }, method: 'PUT' },
+        );
     });
 });

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

@@ -1,6 +1,5 @@
 import SystemSettings from 'hippo/models/system-setting';
 import Asset from 'hippo/models/asset';
-import Config from 'hippo/config';
 
 jest.mock('hippo/config');
 
@@ -19,15 +18,4 @@ describe('SystemSettings Model', () => {
         ss.logo = { };
         expect(ss.logo).toBeInstanceOf(Asset);
     });
-
-    it('sets Config logo when updated', () => {
-        const ss = new SystemSettings(TEST_SETTINGS);
-        ss.logo = TEST_SETTINGS.logo;
-        ss.logo.file = { mockData: true };
-        expect(ss.logo.isDirty).toEqual(true);
-        ss.syncData = { foo: 'bar' };
-        ss.logo.file = null;
-        expect(Config.logo).toEqual(ss.logo.file_data);
-        expect(ss.syncData).toMatchObject({ settings: TEST_SETTINGS.settings });
-    });
 });

data/spec/client/screens/user-management.spec.jsx

@@ -19,8 +19,7 @@ describe('User Management Screen', () => {
             total: 5,
             success: true,
             data: map(range(0, 5), i =>
-                [i, `login-${i}`, `name ${i}`, `email-${i}@test.com`],
-            ),
+                [i, `login-${i}`, `name ${i}`, `email-${i}@test.com`]),
         });
         Element.prototype.getBoundingClientRect = jest.fn(() => ({
             width: 800, height: 1024,

data/spec/client/test-models.js

@@ -10,14 +10,17 @@ import ScreenDefinition from 'hippo/screens/definition';
 
 @identifiedBy('test/boat')
 export class Ship extends BaseModel {
+
     @identifier({ type: 'string' }) name;
 
     @belongsTo({ model: 'test/container', inverseOf: 'vessel' }) container;
+
 }
 
 
 @identifiedBy('test/model/image')
 export class TestImage extends BaseModel {
+
     @identifier id;
     @belongsTo({ inverseOf: 'owner', model: 'hippo/asset' }) asset;
     @observable syncInProgress = false;
@@ -25,11 +28,13 @@ export class TestImage extends BaseModel {
     save() {
         this.syncInProgress = { method: 'POST' };
     }
+
 }
 
 
 @identifiedBy('test/box')
 export class Box extends BaseModel {
+
     @session visibleIdentifier;
 
     @session({ type: 'string' }) label;
@@ -45,10 +50,12 @@ export class Box extends BaseModel {
     }
 
     @belongsTo container;
+
 }
 
 @identifiedBy('test/container')
 export class Container extends BaseModel {
+
     @identifier({ type: 'string' }) id;
 
     @field name;
@@ -67,6 +74,7 @@ export class Container extends BaseModel {
     @computed get areaInUse() {
         return this.boxes.reduce((acc, box) => (acc + box.volume), 0);
     }
+
 }
 
 export function getTestScreen(attrs = {}) {
@@ -87,6 +95,8 @@ export function getTestScreen(attrs = {}) {
 }
 
 export class TestExtension extends BaseExtension {
+
     get id() { return 'test'; }
+
 }
 TestExtension.register();

data/spec/server/api/tenant_change_spec.rb

@@ -8,14 +8,13 @@ describe "Tenant changes", api: true, vcr: VCR_OPTS do
     let!(:user) { FactoryGirl.create :user, tenant: tenant, role_names: ['administrator'] }
 
     it 'sends email when tenant identifier changes' do
-        post '/api/hippo/tenant.json', {
+        put "/api/hippo/tenant/#{tenant.identifier}.json", {
                  'slug' => 'RED'
              }.to_json, {
                  'HTTP_AUTHORIZATION' => user.jwt_token,
                  'HTTP_ACCEPT' => 'application/json',
                  'SERVER_NAME' => "#{tenant.slug}.example.ua",
              }
-
         expect(tenant.reload.slug).to eq('red')
         email = Mail::TestMailer.deliveries.last
         expect(email).not_to be_nil

data/spec/server/asset_spec.rb

@@ -27,12 +27,12 @@ describe Hippo::Asset do
 
         expect(@model.save).to eq(true)
 
-        expect(@model.asset.file_data.keys).to eq(["original", "medium", "thumbnail"])
+        expect(@model.asset.file_data.keys).to eq(["original", "large", "medium", "thumbnail"])
         expect(
             @model.asset.file_data['original']['metadata'].without('filename')
         ).to include(
                  "mime_type" =>"image/png",
-                 "size"      => a_value_within(100).of(42200), # different magic versions will be different size
+                 "size"      => a_value_within(100).of(49172), # different magic versions will be different size
                  "width"     =>500,
                  "height"    =>223
                 )

data/templates/js/config-data.js

@@ -7,4 +7,4 @@ import <%= name %> from '<%= ext.client_extension_path %>';
 
 <% end %>
 
-Config.update(<%= Hippo::Extensions.client_bootstrap_data.to_json %>);
+Config.update(<%= Hippo::Extensions.static_bootstrap_data.to_json %>);

data/templates/spec/factories/model.rb

@@ -1,6 +1,6 @@
 FactoryGirl.define do
     factory :<%= file_name %>, class: <%= namespace %>::<%= class_name %> do
-        tenant {  Hippo::Tenant.current }
+        tenant { Hippo::Tenant.current }
 
     end
 end

data/views/hippo_root_view.erb

@@ -63,9 +63,7 @@
       <div class="loading">Loading&#8230;</div>
       <div id="hippo-root">
         <script type="text/json" id="bootstrap-data">
-          <%= Hippo::API.to_json(
-              Hippo::Extensions.client_bootstrap_data
-              ) %>
+          <%= Hippo::API.to_json(Hippo::Tenant.current.bootstrap_data) %>
         </script>
       </div>
       <%= javascript_tags :app %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hippo-fw
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Nathan Stitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-09 00:00:00.000000000 Z
+date: 2017-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -576,14 +576,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: knitter
   requirement: !ruby/object:Gem::Requirement
@@ -716,8 +716,11 @@ files:
 - client/hippo/components/form/fields/date-wrapper.jsx
 - client/hippo/components/form/fields/form-field.scss
 - client/hippo/components/form/fields/label.jsx
+- client/hippo/components/form/fields/react-tags.scss
 - client/hippo/components/form/fields/select-wrapper.jsx
+- client/hippo/components/form/fields/tags-wrapper.jsx
 - client/hippo/components/form/fields/text-wrapper.jsx
+- client/hippo/components/form/fields/textarea-wrapper.jsx
 - client/hippo/components/form/validations.js
 - client/hippo/components/form/wrapper.jsx
 - client/hippo/components/grid/config.json
@@ -725,6 +728,7 @@ files:
 - client/hippo/components/grid/index.js
 - client/hippo/components/grid/row-editor.scss
 - client/hippo/components/grid/styles.scss
+- client/hippo/components/help.jsx
 - client/hippo/components/icon.jsx
 - client/hippo/components/index.js
 - client/hippo/components/master-detail.jsx
@@ -733,7 +737,13 @@ files:
 - client/hippo/components/modal/styles.scss
 - client/hippo/components/network-activity-overlay.jsx
 - client/hippo/components/network-activity-overlay.scss
+- client/hippo/components/popout-window.jsx
 - client/hippo/components/query-builder.jsx
+- client/hippo/components/query-builder/boolean-picker.jsx
+- client/hippo/components/query-builder/clause-filter.jsx
+- client/hippo/components/query-builder/clause.jsx
+- client/hippo/components/query-builder/date-picker.jsx
+- client/hippo/components/query-builder/query-builder.scss
 - client/hippo/components/record-finder.jsx
 - client/hippo/components/record-finder/config.json
 - client/hippo/components/record-finder/query-layer.jsx
@@ -745,7 +755,6 @@ files:
 - client/hippo/components/select-field/styles.scss
 - client/hippo/components/text-editor.jsx
 - client/hippo/components/text-editor/display-modes/Button.jsx
-- client/hippo/components/text-editor/display-modes/SaveState.jsx
 - client/hippo/components/text-editor/display-modes/ToggleEdit.jsx
 - client/hippo/components/text-editor/display-modes/ToggleInsert.jsx
 - client/hippo/components/text-editor/display-modes/ToggleLayout.jsx
@@ -783,6 +792,7 @@ files:
 - client/hippo/lib/__mocks__/request-assets.js
 - client/hippo/lib/all.js
 - client/hippo/lib/bootstrap.js
+- client/hippo/lib/computed-properties.js
 - client/hippo/lib/date-range.js
 - client/hippo/lib/index.js.erb
 - client/hippo/lib/loader.js
@@ -1048,6 +1058,7 @@ files:
 - lib/hippo/templates/base.rb
 - lib/hippo/templates/latex.rb
 - lib/hippo/templates/liquid.rb
+- lib/hippo/templates/liquid/pluralize.rb
 - lib/hippo/templates/mail.rb
 - lib/hippo/templates/tenant_change.rb
 - lib/hippo/tenant.rb
@@ -1233,7 +1244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Hippo is a framework for easily writing single page web applications