hippo-fw 0.9.8 → 0.9.9

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hippo-fw",
-  "version": "0.9.7",
+  "version": "0.9.8",
   "description": "Hippo is a framework for easily writing single page web applications",
   "main": "client/hippo/index.js",
   "repository": "https://github.com/argosity/hippo",
@@ -10,7 +10,20 @@
     "client"
   ],
   "dependencies": {
-    "actioncable": "^5.1.2",
+    "@ckeditor/ckeditor5-autoformat": "^1.0.0-alpha.2",
+    "@ckeditor/ckeditor5-basic-styles": "^1.0.0-alpha.2",
+    "@ckeditor/ckeditor5-block-quote": "^1.0.0-alpha.2",
+    "@ckeditor/ckeditor5-core": "^1.0.0-alpha.2",
+    "@ckeditor/ckeditor5-editor-balloon": "^1.0.0-alpha.2",
+    "@ckeditor/ckeditor5-editor-classic": "^1.0.0-alpha.2",
+    "@ckeditor/ckeditor5-engine": "^1.0.0-alpha.2",
+    "@ckeditor/ckeditor5-essentials": "^1.0.0-alpha.2",
+    "@ckeditor/ckeditor5-heading": "^1.0.0-alpha.2",
+    "@ckeditor/ckeditor5-image": "^1.0.0-alpha.2",
+    "@ckeditor/ckeditor5-link": "^1.0.0-alpha.2",
+    "@ckeditor/ckeditor5-list": "^1.0.0-alpha.2",
+    "@ckeditor/ckeditor5-paragraph": "^1.0.0-alpha.2",
+    "@ckeditor/ckeditor5-upload": "^1.0.0-alpha.2",
     "babel-core": "^6.25.0",
     "babel-jest": "^20.0.3",
     "babel-loader": "^7.1.1",
@@ -35,7 +48,7 @@
     "domtastic": "^0.15.1",
     "enzyme": "^2.9.1",
     "eslint": "^4.9.0",
-    "eslint-config-argosity": "^1.4.1",
+    "eslint-config-argosity": "^1.4.2",
     "file-loader": "^0.11.2",
     "flatpickr": "^3.0.7",
     "flexboxgrid": "^6.3.1",
@@ -52,12 +65,13 @@
     "lodash": "^4.17.4",
     "loglevel": "^1.4.1",
     "mobx": "^3.2.1",
-    "mobx-decorated-models": "^0.7.1",
+    "mobx-decorated-models": "^0.8.1",
+    "mobx-persist": "^0.3.4",
     "mobx-react": "^4.2.2",
     "moment-timezone": "^0.5.13",
     "node-sass": "^4.5.0",
     "object-hash": "^1.1.8",
-    "ory-editor": "^0.2.25",
+    "payment-fields": "^0.4.0",
     "pluralize": "^6.0.0",
     "prop-types": "^15.5.8",
     "qs": "^6.5.0",

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--align-center grommetux-box--responsive grommetux-box--pad-between-small clause"
+    className="grommetux-box grommetux-box--direction-row grommetux-box--align-center grommetux-box--pad-between-small grommetux-box--pad-between-thirds clause"
     id={undefined}
     onClick={undefined}
     role={undefined}
@@ -77,6 +77,39 @@ exports[`Query Builder Component renders and matches snapshot 1`] = `
       }
       value=""
     />
+    <button
+      aria-label={undefined}
+      className="grommetux-button grommetux-button--plain"
+      disabled={false}
+      href={undefined}
+      onBlur={[Function]}
+      onClick={[Function]}
+      onFocus={[Function]}
+      onMouseDown={[Function]}
+      onMouseUp={[Function]}
+      type="button"
+    >
+      <span
+        className="grommetux-button__icon"
+      >
+        <svg
+          aria-label="refresh"
+          className="grommetux-control-icon grommetux-control-icon-refresh grommetux-control-icon--responsive"
+          height="24px"
+          role="img"
+          version="1.1"
+          viewBox="0 0 24 24"
+          width="24px"
+        >
+          <path
+            d="M20,8 C18.5974037,5.04031171 15.536972,3 12,3 C7.02943725,3 3,7.02943725 3,12 C3,16.9705627 7.02943725,21 12,21 L12,21 C16.9705627,21 21,16.9705627 21,12 M21,3 L21,9 L15,9"
+            fill="none"
+            stroke="#000"
+            strokeWidth="2"
+          />
+        </svg>
+      </span>
+    </button>
   </div>
 </div>
 `;

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

@@ -30,6 +30,7 @@ exports[`RecordFinder Component renders 1`] = `
         onKeyDown={[Function]}
         onKeyPress={[Function]}
         placeholder={undefined}
+        readOnly={false}
         tabIndex={0}
         type="text"
         value=""

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

@@ -1,4 +1,5 @@
 import { autorun, observe } from 'mobx';
+import moment from 'moment';
 import { Ship, Container, Box } from '../test-models';
 
 describe('BaseModel Test', () => {
@@ -84,4 +85,10 @@ describe('BaseModel Test', () => {
         box.errors = { foo: 'cannot be blank', baz: 'is very invalid' };
         expect(box.errorMessage).toEqual('Foo cannot be blank and Baz is very invalid');
     });
+
+    it('uses momentjs for dates', () => {
+        const ship = Ship.deserialize({ sail_date: '2012-11-14T01:03:42.415Z' });
+        expect(moment.isMoment(ship.sail_date)).toBe(true);
+        expect(ship.sail_date.toISOString()).toEqual('2012-11-14T01:03:42.415Z');
+    });
 });

data/spec/client/models/subscription.spec.js

@@ -0,0 +1,8 @@
+import Subscription from 'hippo/models/subscription';
+
+describe('Model Subscription', () => {
+    it('can be instantiated', () => {
+        const model = new Subscription();
+        expect(model).toBeInstanceOf(Subscription);
+    });
+});

data/spec/client/screens/__snapshots__/preferences.spec.jsx.snap

@@ -0,0 +1,223 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Screen Preferences renders and matches snapshot 1`] = `
+<div
+  className="hippo-screen preferences is-active"
+  data-screen-id="preferences"
+>
+  <div
+    className="grommetux-header__container grommetux-header__container--fixed"
+  >
+    <div
+      className="grommetux-header__mirror"
+    />
+    <div
+      className="grommetux-header__wrapper"
+    >
+      <div
+        className="grommetux-box grommetux-box--direction-column grommetux-box--responsive grommetux-box--pad-none grommetux-box--flex-off"
+        id={undefined}
+        onClick={undefined}
+        role={undefined}
+        style={Object {}}
+        tabIndex={undefined}
+      >
+        <header
+          className="grommetux-box grommetux-box--direction-row grommetux-box--align-center grommetux-box--pad-horizontal-small grommetux-box--pad-vertical-small grommetux-box--pad-between-small grommetux-background-color-index-light-2 grommetux-background-color-index--light grommetux-header hippo-toolbar"
+          id={undefined}
+          onClick={undefined}
+          role={undefined}
+          style={Object {}}
+          tabIndex={undefined}
+        >
+          <button
+            aria-label={undefined}
+            className="grommetux-button grommetux-button--primary save-button"
+            disabled={false}
+            href={undefined}
+            onBlur={[Function]}
+            onClick={[Function]}
+            onFocus={[Function]}
+            onMouseDown={[Function]}
+            onMouseUp={[Function]}
+            type="button"
+          >
+            <span
+              className="grommetux-button__icon"
+            >
+              <svg
+                aria-label="save"
+                className="grommetux-control-icon grommetux-control-icon-save grommetux-control-icon--responsive"
+                height="24px"
+                role="img"
+                version="1.1"
+                viewBox="0 0 24 24"
+                width="24px"
+              >
+                <path
+                  d="M3,2 L3,21 L21,21 L21,3 L12,3 L12,14 M8,11 L12,15 L16,11"
+                  fill="none"
+                  stroke="#000"
+                  strokeWidth="2"
+                />
+              </svg>
+            </span>
+            <span
+              className="grommetux-button__label"
+            >
+              Save
+            </span>
+          </button>
+        </header>
+      </div>
+    </div>
+  </div>
+  <h4>
+    Account information:
+  </h4>
+  <div
+    className="row"
+  >
+    <div
+      className="form-field text col-xs-6"
+    >
+      <div
+        className="grommetux-form-field grommetux-form-field--size-medium"
+        onClick={[Function]}
+      >
+        <label
+          className="grommetux-form-field__label"
+          htmlFor={undefined}
+        >
+          Login
+        </label>
+        <span
+          className="grommetux-form-field__contents"
+        >
+          <input
+            autoComplete="off"
+            autoFocus={undefined}
+            className="grommetux-text-input grommetux-input"
+            defaultValue={undefined}
+            name="login"
+            onBlur={[Function]}
+            onChange={[Function]}
+            onFocus={[Function]}
+            onInput={[Function]}
+            onKeyDown={[Function]}
+            placeholder={undefined}
+            tabIndex={0}
+            type="text"
+            value=""
+          />
+        </span>
+      </div>
+    </div>
+    <div
+      className="form-field text col-xs-6"
+    >
+      <div
+        className="grommetux-form-field grommetux-form-field--size-medium"
+        onClick={[Function]}
+      >
+        <label
+          className="grommetux-form-field__label"
+          htmlFor={undefined}
+        >
+          Name
+        </label>
+        <span
+          className="grommetux-form-field__contents"
+        >
+          <input
+            autoComplete="off"
+            autoFocus={undefined}
+            className="grommetux-text-input grommetux-input"
+            defaultValue={undefined}
+            name="name"
+            onBlur={[Function]}
+            onChange={[Function]}
+            onFocus={[Function]}
+            onInput={[Function]}
+            onKeyDown={[Function]}
+            placeholder={undefined}
+            tabIndex={0}
+            type="text"
+            value=""
+          />
+        </span>
+      </div>
+    </div>
+    <div
+      className="form-field text col-sm-6 col-xs-12"
+    >
+      <div
+        className="grommetux-form-field grommetux-form-field--size-medium"
+        onClick={[Function]}
+      >
+        <label
+          className="grommetux-form-field__label"
+          htmlFor={undefined}
+        >
+          Email
+        </label>
+        <span
+          className="grommetux-form-field__contents"
+        >
+          <input
+            autoComplete="off"
+            autoFocus={undefined}
+            className="grommetux-text-input grommetux-input"
+            defaultValue={undefined}
+            name="email"
+            onBlur={[Function]}
+            onChange={[Function]}
+            onFocus={[Function]}
+            onInput={[Function]}
+            onKeyDown={[Function]}
+            placeholder={undefined}
+            tabIndex={0}
+            type="text"
+            value=""
+          />
+        </span>
+      </div>
+    </div>
+    <div
+      className="form-field password col-sm-6 col-xs-12"
+    >
+      <div
+        className="grommetux-form-field grommetux-form-field--size-medium"
+        onClick={[Function]}
+      >
+        <label
+          className="grommetux-form-field__label"
+          htmlFor={undefined}
+        >
+          Password
+        </label>
+        <span
+          className="grommetux-form-field__contents"
+        >
+          <input
+            autoComplete="off"
+            autoFocus={undefined}
+            className="grommetux-text-input grommetux-input"
+            defaultValue={undefined}
+            name="password"
+            onBlur={[Function]}
+            onChange={[Function]}
+            onFocus={[Function]}
+            onInput={[Function]}
+            onKeyDown={[Function]}
+            placeholder={undefined}
+            tabIndex={0}
+            type="password"
+            value=""
+          />
+        </span>
+      </div>
+    </div>
+  </div>
+</div>
+`;

data/spec/client/screens/preferences.spec.jsx

@@ -0,0 +1,10 @@
+import { React, Snapshot, getScreenInstance } from 'hippo/testing/index'; // eslint-disable-line
+import Preferences from 'hippo/screens/preferences';
+
+const screenInstance = getScreenInstance('preferences');
+
+describe('Screen Preferences', () => {
+    it('renders and matches snapshot', () => {
+        expect(Snapshot(<Preferences screen={screenInstance} />)).toMatchSnapshot();
+    });
+});

data/spec/client/test-models.js

@@ -12,7 +12,7 @@ import ScreenDefinition from 'hippo/screens/definition';
 export class Ship extends BaseModel {
 
     @identifier({ type: 'string' }) name;
-
+    @field({ type: 'date' }) sail_date;
     @belongsTo({ model: 'test/container', inverseOf: 'vessel' }) container;
 
 }

data/spec/client/workspace/__snapshots__/menu.spec.jsx.snap

@@ -36,6 +36,18 @@ exports[`Workspace Menu has groups with screens 1`] = `
       </h4>
     </header>
   </div>
+  <a
+    aria-label={undefined}
+    className="grommetux-anchor"
+    href={undefined}
+    onClick={[Function]}
+  >
+    <span
+      aria-hidden={true}
+      className="fa fa-heartbeat icon"
+    />
+    Preferences
+  </a>
   <a
     aria-label={undefined}
     className="grommetux-anchor"

data/spec/factories/subscription.rb

@@ -0,0 +1,6 @@
+FactoryBot.define do
+    factory :subscription, class: Hippo::Subscription do
+        tenant { Hippo::Tenant.current }
+
+    end
+end

data/spec/factories/tenant.rb

@@ -1,6 +1,6 @@
 require 'faker'
 
-FactoryGirl.define do
+FactoryBot.define do
     factory :tenant, class: Hippo::Tenant do
         slug         { Faker::Internet.domain_word }
         name         { Faker::Company.name }

data/spec/factories/user.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
     factory :user, class: Hippo::User do
         name { Faker::Name.name }
         email { Faker::Internet.email }

data/spec/server/api/tenant_change_spec.rb

@@ -3,18 +3,21 @@ require_relative '../spec_helper'
 
 describe "Tenant changes", api: true, vcr: VCR_OPTS do
 
-    let(:tenant) { FactoryGirl.create :tenant, slug: 'foo' }
+    let(:tenant) { FactoryBot.create :tenant, slug: 'foo' }
 
-    let!(:user) { FactoryGirl.create :user, tenant: tenant, role_names: ['administrator'] }
+    let!(:user) { FactoryBot.create :user, tenant: tenant, role_names: ['administrator'] }
+
+    around(:each){ |spec| with_payment_proccessor { spec.run } }
 
     it 'sends email when tenant identifier changes' do
         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",
-             }
+                'slug' => 'RED'
+            }.to_json, {
+                'HTTP_AUTHORIZATION' => user.jwt_token,
+                'HTTP_ACCEPT' => 'application/json',
+                'CONTENT_TYPE' => '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