hippo-fw 0.9.7 → 0.9.8

data/client/hippo/screens/system-settings.jsx

@@ -15,11 +15,13 @@ import SaveButton from '../components/save-button';
 import ScreenInstance from '../screens/instance';
 import Extensions from '../extensions';
 import MailerConfig from './system-settings/mailer-config';
+import Config from '../config';
 import TenantSettings from  './system-settings/tenant';
 import './system-settings/system-settings.scss';
 
 @observer
 export default class SystemSettings extends React.PureComponent {
+
     @observable settings = new Settings();
     extensionPanelRefs = new Map();
 
@@ -53,9 +55,20 @@ export default class SystemSettings extends React.PureComponent {
 
     @action.bound
     onSave() {
-        this.extensionPanelRefs.forEach(panel => invoke(panel, 'onSave'));
-        this.tenantSettings.onSave();
-        this.settings.save();
+        const saves = [];
+        ['logo', 'print_logo'].forEach((attr) => {
+            if (this.settings[attr] && this.settings[attr].isDirty) {
+                saves.push(this.settings[attr].save());
+            }
+        });
+        Promise.all(saves).then(() => {
+            if (saves.length) {
+                Config.logo = this.settings.logo.file_data;
+            }
+            this.extensionPanelRefs.forEach(panel => invoke(panel, 'onSave'));
+            this.tenantSettings.onSave();
+            this.settings.save();
+        });
     }
 
     @action.bound
@@ -77,10 +90,10 @@ export default class SystemSettings extends React.PureComponent {
                 <TenantSettings ref={this.setTenantRef} />
                 <Heading tag="h3">Images</Heading>
                 <Row>
-                    <Col sm={4} xs={12}>
+                    <Col sm={6} xs={12}>
                         <Asset model={this.settings} name="logo" />
                     </Col>
-                    <Col sm={4} xs={12}>
+                    <Col sm={6} xs={12}>
                         <Asset model={this.settings} name="print_logo" />
                     </Col>
                 </Row>
@@ -92,4 +105,5 @@ export default class SystemSettings extends React.PureComponent {
             </Screen>
         );
     }
+
 }

data/client/hippo/screens/system-settings/mailer-config.jsx

@@ -8,6 +8,7 @@ import { Form, Field, FormState, nonBlank, validEmail  } from 'hippo/components/
 
 @observer
 export default class MailerConfig extends React.PureComponent {
+
     formState = new FormState()
 
     @action.bound
@@ -32,11 +33,12 @@ export default class MailerConfig extends React.PureComponent {
                 <Heading tag="h3">Email settings</Heading>
                 <Form state={this.formState}>
                     <Row className="section">
-                        <Field md={4} xs={6} name="from_email" label="From Email" validate={validEmail} />
-                        <Field md={4} xs={6} name="from_name" label="From Name" validate={nonBlank} />
+                        <Field xs={6} name="from_email" label="From Email" validate={validEmail} />
+                        <Field xs={6} name="from_name" label="From Name" validate={nonBlank} />
                     </Row>
                 </Form>
             </div>
         );
     }
+
 }

data/client/hippo/screens/system-settings/system-settings.scss

@@ -4,5 +4,5 @@
         margin-top: 1rem;
     }
 
-
+    padding-bottom: 200px;
 }

data/client/hippo/screens/system-settings/tenant.jsx

@@ -34,6 +34,7 @@ function TenantSlugChange({ oldSlug }) {
 
 @observer
 export default class TenantConfig extends React.PureComponent {
+
     formState = new FormState()
 
     @observable slugChangedFrom;
@@ -74,14 +75,15 @@ export default class TenantConfig extends React.PureComponent {
                 <Heading tag="h3">Account</Heading>
                 <Row>
                     <Field
-                        md={4} xs={6} name="slug"
+                        xs={6} name="slug"
                         label="Identifier"
                         validate={nonBlank}
                     />
-                    <Field md={4} xs={6} name="name" validate={nonBlank} />
+                    <Field xs={6} name="name" validate={nonBlank} />
                 </Row>
                 {this.renderIdChangeWarning()}
             </Form>
         );
     }
+
 }

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

@@ -15,6 +15,7 @@ import Editor from './user-management/edit-form';
 
 @observer
 export default class UserManagement extends React.PureComponent {
+
     @observable editingId;
 
     static contextTypes = {
@@ -63,4 +64,5 @@ export default class UserManagement extends React.PureComponent {
             </Screen>
         );
     }
+
 }

data/client/hippo/screens/user-management/edit-form.jsx

@@ -15,6 +15,7 @@ import { Form, Field, FormState, nonBlank, validEmail, booleanValue } from '../.
 
 @observer
 export default class EditForm extends React.PureComponent {
+
     static propTypes = {
         query:      PropTypes.instanceOf(Query).isRequired,
         rowIndex:   PropTypes.number.isRequired,
@@ -82,4 +83,5 @@ export default class EditForm extends React.PureComponent {
             </Form>
         );
     }
+
 }

data/client/hippo/testing/screens.js

@@ -1,6 +1,7 @@
 /* global jest */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import SnapShot   from 'react-test-renderer';
 
 import Screens from 'hippo/screens';
@@ -14,6 +15,7 @@ export function getScreenInstance(screenId) {
 
 
 class TestRouter {
+
     constructor() {
         Object.assign(this, {
             isActive:   jest.fn(),
@@ -26,6 +28,7 @@ class TestRouter {
             }),
         });
     }
+
 }
 
 function makeContext() {
@@ -36,28 +39,33 @@ function makeContext() {
 
 function childContextTypes() {
     return {
-        router: React.PropTypes.object,
+        router: PropTypes.object,
     };
 }
 
 export class Context {
+
     constructor() {
         this.childContextTypes = childContextTypes();
         this.context = makeContext();
     }
+
 }
 
 export function Snapshot(el) {
     class Wrapper extends React.Component {
+
         static childContextTypes = childContextTypes();
 
         getChildContext() {
-            return this._childContext || (this._childContext = makeContext());
+            if (!this._childContext) { this._childContext = makeContext(); }
+            return this._childContext;
         }
 
         render() {
             return el;
         }
+
     }
     const snapshot = SnapShot.create(React.createElement(Wrapper, {}, el));
     return snapshot.toJSON();

data/client/hippo/user.js

@@ -10,6 +10,7 @@ import Config from './config';
 
 @identifiedBy('hippo/user-session')
 class Session extends BaseModel {
+
     @identifier id;
     @field login;
     @field password;
@@ -21,12 +22,14 @@ class Session extends BaseModel {
     get syncData() {
         return this.serialize();
     }
+
 }
 
 const ADMIN = 'administrator';
 
 @identifiedBy('hippo/user')
 export class UserModel extends BaseModel {
+
     @identifier({ type: 'number' }) id;
     @field login;
     @field name;
@@ -83,6 +86,7 @@ export class UserModel extends BaseModel {
     toJSON() {
         return merge(this.serialize(), { is_admin: this.is_admin });
     }
+
 }
 
 const current_user = new UserModel();

data/client/hippo/workspace/index.jsx

@@ -35,6 +35,7 @@ function NoMatch({ match: { path } }) {
 
 @observer
 class Workspace extends React.Component {
+
     @observable sidebarOpen   = true;
     @observable sidebarDocked = false;
 
@@ -69,7 +70,7 @@ class Workspace extends React.Component {
             <App centered={false}>
                 <LoginDialog />
                 <Sidebar
-                    styles={{ sidebar: { zIndex: 5 } }}
+                    styles={{ sidebar: { zIndex: 60 }, overlay: { zIndex: 59 } }}
                     sidebar={<Menu
                         isOpen={this.sidebarOpen}
                         isDocked={this.sidebarDocked}
@@ -94,6 +95,7 @@ class Workspace extends React.Component {
             </App>
         );
     }
+
 }
 
 export default function WorkspaceRoot() {

data/client/hippo/workspace/menu-group.jsx

@@ -11,6 +11,7 @@ import Icon  from '../components/icon';
 
 @observer
 export default class Group extends React.PureComponent {
+
     static propTypes = {
         group: PropTypes.shape({
             active: PropTypes.bool.isRequired,
@@ -33,4 +34,5 @@ export default class Group extends React.PureComponent {
             </Menu>
         );
     }
+
 }

data/client/hippo/workspace/menu-option.jsx

@@ -7,6 +7,7 @@ import Icon from '../components/icon';
 
 @observer
 export default class MenuOption extends React.Component {
+
     static propTypes = {
         screen: PropTypes.shape({
             title:   PropTypes.string.isRequired,
@@ -33,4 +34,5 @@ export default class MenuOption extends React.Component {
             </Anchor>
         );
     }
+
 }

data/client/hippo/workspace/menu.jsx

@@ -4,7 +4,6 @@ import { action } from 'mobx';
 import { isEmpty, get } from 'lodash';
 import PropTypes from 'prop-types';
 import Box     from 'grommet/components/Box';
-import Sidebar from 'grommet/components/Sidebar';
 import Button from 'grommet/components/Button';
 import CloseIcon from 'grommet/components/icons/base/Close';
 import Header  from 'grommet/components/Header';
@@ -20,6 +19,7 @@ import Asset from '../models/asset';
 
 @observer
 class Logout extends React.PureComponent {
+
     static contextTypes = {
         router: PropTypes.object,
     }
@@ -43,6 +43,7 @@ class Logout extends React.PureComponent {
             </Menu>
         );
     }
+
 }
 
 const Logo = observer(() => {
@@ -59,6 +60,7 @@ const Logo = observer(() => {
 
 @observer
 export default class WorkspaceMenu extends React.PureComponent {
+
     renderUnGrouped() {
         if (!User.isLoggedIn || isEmpty(Screens.unGrouped)) { return null; }
         return (
@@ -77,7 +79,7 @@ export default class WorkspaceMenu extends React.PureComponent {
 
     render() {
         return (
-            <Sidebar
+            <Box
                 full size="small" separator="right"
                 colorIndex="brand"
                 className="screen-selection-menu"
@@ -89,7 +91,8 @@ export default class WorkspaceMenu extends React.PureComponent {
                 {Screens.activeGroups.map(g => <Group key={g.id} group={g} />)}
                 {this.renderUnGrouped()}
                 <Logout />
-            </Sidebar>
+            </Box>
         );
     }
+
 }

data/client/hippo/workspace/navbar.jsx

@@ -13,6 +13,7 @@ function Logo() {
 }
 
 export default class Navbar extends React.Component {
+
     static contextTypes = {
         uistate: PropTypes.object.isRequired,
     }
@@ -42,4 +43,5 @@ export default class Navbar extends React.Component {
             </div>
         );
     }
+
 }

data/client/hippo/workspace/screen.jsx

@@ -15,6 +15,7 @@ ScreenView.displayName = 'ScreenView';
 
 @observer
 export default class Screen extends React.Component {
+
     static propTypes = {
         match: PropTypes.shape({
             params: PropTypes.shape({
@@ -46,4 +47,5 @@ export default class Screen extends React.Component {
 
         );
     }
+
 }

data/client/hippo/workspace/styles.scss

@@ -6,7 +6,10 @@
     flex-direction: column;
     padding: 0.5rem;
     display: none;
+
+
     min-height: min-content; min-height: -moz-min-content; min-height: -webkit-min-content;
+
     &.is-active {
         display: flex;
     }
@@ -30,11 +33,12 @@
 }
 
 .screen-selection-menu {
+    min-width: 250px;
     .grommetux-anchor > .icon {
         margin-right: 0.5rem;
     }
 }
 
 .screens-wrapper {
-    overflow: hidden;
+    overflow: auto
 }

data/command-reference-files/initial/.eslintrc.js

@@ -1,7 +1,4 @@
 module.exports = {
     "extends": "argosity",
     "parser": "babel-eslint",
-    rules: {
-        'no-underscore-dangle': 0,
-    },
 };

data/command-reference-files/initial/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 # For development while Hippo is evolving track master branch
 gem "hippo-fw", git: "https://github.com/argosity/hippo", branch: 'master'
 
-# gem "hippo", '0.9.6'
+# gem "hippo", '0.9.7'
 
 gem "rake"
 gem 'puma'

data/config/routes.rb

@@ -25,7 +25,9 @@ module Hippo::API
         end
 
         resources Hippo::User
-        resources Hippo::Tenant, controller: Hippo::API::Handlers::Tenant
+        resources Hippo::Tenant,
+                  controller: Hippo::API::Handlers::Tenant,
+                  cors: '*', public: true
     end
 
     routes.draw do

data/db/seed.rb

@@ -3,7 +3,7 @@ system.perform do
     Hippo::User.seed_admin_account
 end
 
-testing = Hippo::Tenant.find_or_create_by(slug: 'test', name: 'testing tenant', email: 'test@test.com')
+testing = Hippo::Tenant.find_or_create_by(slug: 'dev', name: 'dev testing tenant', email: 'test@test.com')
 
 testing.perform do
     Hippo::User.seed_admin_account

data/hippo-fw.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
     spec.license       = "MIT"
 
     spec.files         = `git ls-files`.split($/)
-    spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+    spec.executables   = ['hippo']
     spec.test_files    = spec.files.grep(%r{^test/})
     spec.require_paths = ["lib"]
 
@@ -72,7 +72,7 @@ Gem::Specification.new do |spec|
     spec.add_dependency "require_all",               "~> 1.3"
     spec.add_dependency "resque",                    "~> 1.27"
     spec.add_dependency "sanitize",                  "~> 3.0"
-    spec.add_dependency "webpack_driver",            "~> 0.3.7"
+    spec.add_dependency "webpack_driver",            "~> 0.4.1"
     spec.add_dependency "knitter",                   "~> 0.2.2"
 
     spec.add_dependency "thor",                      "~> 0.19"

data/lib/hippo/api/controller_base.rb

@@ -132,7 +132,7 @@ module Hippo
 
             # Should the result include the total number of available records
             def should_include_total_count?
-                requested_limit && params[:s] && !params[:id]
+                requested_limit && params[:id].blank?
             end
 
             # Extract options that are suitable for use in 'as_json'
@@ -291,6 +291,7 @@ module Hippo
                 when 'lt'   then field.lt(value)
                 when 'in'   then field.in(Range.new(*value))
                 when 'gt'   then field.gt(value)
+                when 'between' then field.between(Range.new(*value.split('...')))
                 else
                     value =~ /%/ ? field.matches(value) : field.eq(value)
                 end