hippo-fw 0.9.1 → 0.9.2

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

@@ -0,0 +1,90 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { observer } from 'mobx-react';
+import { observable } from 'mobx';
+import { Row, Col } from 'react-flexbox-grid';
+import Heading from 'grommet/components/Heading';
+import Box from 'grommet/components/Box';
+import { Form, Field, FormState, nonBlank } from 'hippo/components/form';
+
+import Notification from 'grommet/components/Notification';
+import Extensions from '../../extensions';
+import Layer from 'grommet/components/Layer';
+import Paragraph from 'grommet/components/Paragraph';
+import Anchor from 'grommet/components/Anchor';
+import LinkIcon from 'grommet/components/icons/base/Link';
+
+import Tenant from '../../models/tenant';
+import Config from '../../config';
+
+function onTenantSlugChangeClose() { }
+
+function TenantSlugChange({ oldSlug }) {
+    if (!oldSlug) { return null; }
+    return (
+        <Layer onClose={onTenantSlugChangeClose}>
+            <Box pad="medium">
+                <Heading tag="h3">Your account identifier has changed!</Heading>
+                <Paragraph size='large'>
+                    You will need to login to your account from the updated address at:
+                </Paragraph>
+                <Anchor icon={<LinkIcon />} label={Tenant.current.domain} href={`https://${Tenant.current.domain}`} primary={true} />
+            </Box>
+        </Layer>
+    );
+}
+
+@observer
+export default class TenantConfig extends React.PureComponent {
+
+    formState = new FormState()
+
+    @observable slugChangedFrom;
+
+    onSave() {
+        const originalSlug = Tenant.current.slug;
+        this.formState
+            .persistTo(Tenant.current)
+            .then(() => Tenant.current.save())
+            .then(() => {
+                if (Tenant.current.slug !== originalSlug) {
+                    this.slugChangedFrom = originalSlug;
+                }
+            });
+    }
+
+    componentWillMount() {
+        this.formState.setFromModel(Tenant.current);
+    }
+
+    renderIdChangeWarning() {
+        const slug = this.formState.get('slug.value');
+        if (!Tenant.current.slug || slug === Tenant.current.slug) {
+            return null;
+        }
+        return (
+            <Notification
+                size="small" status="warning"
+                message={`Warning:  Changing the identifier will also change where you login at. The updated address will be: ${slug}.${Config.website_domain}`}
+            />
+        );
+    }
+
+    render() {
+        return (
+            <Form tag="div" className="tenant-edit-form" state={this.formState}>
+                <TenantSlugChange oldSlug={this.slugChangedFrom} />
+                <Heading tag="h3">Account</Heading>
+                <Row>
+                    <Field
+                        md={4} xs={6} name="slug"
+                        label="Identifier"
+                        validate={nonBlank}
+                    />
+                    <Field md={4} xs={6} name="name" validate={nonBlank} />
+                </Row>
+                {this.renderIdChangeWarning()}
+            </Form>
+        );
+    }
+}

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

@@ -6,12 +6,13 @@ import { isNil, forIn, get, pick, mapValues, keys, extend } from 'lodash';
 import { observer }   from 'mobx-react';
 import { action, observable, computed } from 'mobx';
 
-import Button    from 'grommet/components/Button';
+import Box    from 'grommet/components/Box';
+import Button from 'grommet/components/Button';
 import Warning from 'hippo/components/warning-notification';
 
 import Query from 'hippo/models/query';
 
-import { Form, Field, FieldDefinitions, nonBlank, validEmail, booleanValue, field  } from 'hippo/components/form';
+import { Form, Field, FormState, nonBlank, validEmail, booleanValue, field  } from 'hippo/components/form';
 
 @observer
 export default class EditForm extends React.PureComponent {
@@ -22,15 +23,9 @@ export default class EditForm extends React.PureComponent {
         onComplete: PropTypes.func.isRequired,
     }
 
-    static desiredHeight = 400
+    static desiredHeight = 300
 
-    fields = new FieldDefinitions({
-        is_admin: booleanValue,
-        login: nonBlank,
-        name:  nonBlank,
-        email: validEmail,
-        password: field,
-    })
+    formState = new FormState();
 
     constructor(props) {
         super(props);
@@ -39,12 +34,12 @@ export default class EditForm extends React.PureComponent {
     }
 
     componentDidMount() {
-        this.fields.setFromModel(this.user);
+        this.formState.setFromModel(this.user);
     }
 
     @action.bound
     onSave() {
-        this.fields.persistTo(this.user);
+        this.formState.persistTo(this.user);
         this.user.save().then(this.onSaved);
     }
 
@@ -62,30 +57,25 @@ export default class EditForm extends React.PureComponent {
         this.props.onComplete();
     }
 
-
     render() {
-        const { fields } = this;
-
         return (
-            <Form tag="div" className="user-edit-form" fields={fields}>
+            <Form tag="div" className="user-edit-form" state={this.formState}>
                 <Warning message={this.errorMessage} />
                 <Row middle='sm'>
-                    <Field md={4} xs={6} name="login" />
-                    <Field md={4} xs={6} name="name"  />
-                    <Field md={4} xs={6} name="email" />
+                    <Field md={4} xs={6} name="login" validate={nonBlank} />
+                    <Field md={4} xs={6} name="name"  validate={nonBlank} />
+                    <Field md={4} xs={6} name="email" validate={validEmail} />
                     <Field md={4} xs={6} type="password" name="password" />
-                    <Field md={4} xs={6} type="checkbox" name="is_admin" />
-                </Row>
-                <Row>
+                    <Field md={4} xs={6} type="checkbox" name="is_admin" validate={booleanValue} />
                     <Col md={4} xs={6}>
-                        <Row middle="xs" around="xs">
+                        <Box justify="around" direction="row">
                             <Button label="Cancel" onClick={this.onCancel} accent />
                             <Button
                                 label="Save"
-                                onClick={fields.isValid ? this.onSave : null}
+                                onClick={this.formState.isValid ? this.onSave : null}
                                 primary
                             />
-                        </Row>
+                        </Box>
                     </Col>
                 </Row>
             </Form>

data/client/hippo/testing/index.js

@@ -1,3 +1,4 @@
+/* global jest */
 export React from 'react';
 
 export { getScreenInstance, Snapshot } from './screens';

data/client/hippo/workspace/styles.scss

@@ -35,27 +35,4 @@ pre {
     &.is-active {
         display: flex;
     }
-
 }
-
-/* $workspace-header-height: 50px; */
-
-/* @import "../styles/bootstrap"; */
-/* @import "../styles/fonts"; */
-/* @import "../styles/global"; */
-
-/* // extensions are rooted at .hippo */
-/* .hippo { */
-/*   padding: 0px; */
-/*   margin: 0px; */
-/*   background-color: $body-bg; */
-/*   position: relative; */
-/*   min-height: 10px; // needs height for resizing sensor to function */
-/* } */
-
-/* @import "styles/layout"; */
-/* @import "styles/header"; */
-/* @import "styles/tabs"; */
-/* @import "styles/screens"; */
-/* @import "styles/forms"; */
-/* @import "styles/keybindings"; */

data/command-reference-files/initial/.babelrc

@@ -6,15 +6,17 @@
         "transform-function-bind",
         "transform-react-jsx",
         "transform-runtime"
+        "lodash"
     ],
     "presets": [
-        "es2015",
+        ["es2015", {"modules": false}],
         "react",
-        "stage-1"
-    ],
-    "env": {
-        "test": {
-            "plugins": ["transform-es2015-modules-commonjs"]
-        }
-    }
+        "stage-1",
+        ["env", {
+            "targets": {
+                "browsers": ["> 1%"]
+            },
+            "debug": true
+        }]
+    ]
 }

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", git: "https://github.com/argosity/hippo", branch: 'master'
 
-# gem "hippo", '0.8.3'
+# gem "hippo", '0.9.1'
 
 gem "rake"
 gem 'puma'

data/{views/index.html → command-reference-files/initial/views/index.erb}

@@ -66,6 +66,7 @@
               Hippo::Extensions.client_bootstrap_data
               ) %>
         </script>
+        <%= javascript_tags :hippo %>
       </div>
     </body>
 </html>

data/config/routes.rb

@@ -1,28 +1,59 @@
-Hippo::API.routes.for_extension 'hippo' do
+module Hippo::API
 
-    get 'job-statuses/:id.json' do
-        wrap_reply do
-            status = Hippo::Job.status_for_id(params[:id])
-            raise ActiveRecord::RecordNotFound unless status
-            std_api_reply :update, status, success: true
+    routes.for_extension 'hippo' do
+        get 'job-statuses/:id.json' do
+            wrap_reply do
+                status = Hippo::Job.status_for_id(params[:id])
+                raise ActiveRecord::RecordNotFound unless status
+                std_api_reply :update, status, success: true
+            end
         end
-    end
 
-    post "user-sessions.json", &Hippo::API::Handlers::UserSession.create
-    get "user-sessions/test.json", &Hippo::API::Handlers::UserSession.check
+        post "user-sessions.json", &Hippo::API::Handlers::UserSession.create
+        get "user-sessions/test.json", &Hippo::API::Handlers::UserSession.check
 
-    delete "user-sessions/:id.json" do
-        wrap_reply do
-            { success: true, message: "Logout succeeded", data: {}, token: '' }
+        delete "user-sessions/:id.json" do
+            wrap_reply do
+                { success: true, message: "Logout succeeded", data: {}, token: '' }
+            end
         end
-    end
 
-    get 'bootstrap.json' do
-        wrap_reply do
-            { success: true, data: Hippo::Extensions.client_bootstrap_data }
+        get 'bootstrap.json' do
+            wrap_reply do
+                { success: true, data: Hippo::Extensions.client_bootstrap_data }
+            end
         end
+
+        resources Hippo::User
+        resources Hippo::Tenant, controller: Hippo::API::Handlers::Tenant
+    end
+
+    routes.draw do
+
+        put Hippo.config.api_path + '/hippo/system-settings.json',
+            &Hippo::SystemSettings.update_handler
+
+        get Hippo.config.api_path + '/hippo/system-settings.json',
+            &Hippo::SystemSettings.get_handler
+
+        post Hippo.config.api_path + Hippo.config.assets_path_prefix,
+             &Hippo::API::Handlers::Asset.saver
+
+        get Hippo.config.api_path + Hippo.config.assets_path_prefix + '/*',
+            &Hippo::API::Handlers::Asset.file_getter
+
+        get Hippo.config.assets_path_prefix + '/:asset.js',
+            &Hippo::API::Handlers::Asset.asset_getter
+
+        get Hippo.config.api_path + Hippo.config.print_path_prefix + '/:template_id/:model_id.pdf',
+            &Hippo::API::Handlers::Print.getter
+
     end
 
-    resources Hippo::User
+end
 
+Hippo::API::Routing.root_view_route ||= lambda do
+    Hippo::API::Root.get '/*' do
+        erb :index
+    end
 end

data/config/webpack.config.js

@@ -1,4 +1,3 @@
-const HtmlWebpackPlugin = require('html-webpack-plugin');
 const webpack = require('webpack');
 const path = require('path');
 
@@ -10,12 +9,15 @@ const config = {
         ],
     },
     output: {
-        path: __dirname,
-        publicPath: '/',
-        filename: '<%= Hippo::Extensions.controlling.identifier + '.js' %>',
+        path: '<%= config_directory.join('..','public', 'assets') %>',
+        publicPath: '<%= Hippo.env.production? ? '/assets/' : 'http://test.hippo.dev:8889/assets/' %>',
+        filename: '[name]-[hash].js',
     },
     resolve: {
-        modules: ["<%= module_paths.join('","') %>"],
+        modules: [
+            "<%= Hippo::Extensions.client_module_paths.join('","') %>",
+            "<%= generated_directory.to_s %>",
+        ],
         extensions: ['.js', '.jsx'],
     },
     module: {
@@ -57,13 +59,6 @@ const config = {
     },
     devtool: 'source-map',
     plugins: [
-        new webpack.optimize.CommonsChunkPlugin({
-            name: 'vendor', minChunks: Infinity, filename: '[name].[hash].js',
-        }),
-        new HtmlWebpackPlugin({
-            filename: 'index.html',
-            template: '<%= directory.join('index.html') %>',
-        }),
         new webpack.DefinePlugin({
             'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || 'development'),
         }),

data/db/migrate/01_create_tenants.rb

@@ -0,0 +1,13 @@
+class CreateTenants < ActiveRecord::Migration[5.0]
+    def change
+        create_table :tenants do |t|
+            t.string :slug, :email, null: false
+            t.text   :identifier, :name, null: false
+            t.text :address, :phone_number
+            t.integer :subscription, limit: 1
+            t.timestamps null: false
+        end
+        add_index :tenants, :slug, :unique => true
+        add_index :tenants, :identifier, :unique => true
+    end
+end

data/db/migrate/{01_create_system_settings.rb → 02_create_system_settings.rb}

@@ -1,7 +1,8 @@
 class CreateSystemSettings < ActiveRecord::Migration[5.0]
     def change
 
-        create_table "system_settings" do |t|
+        create_table "system_settings", partition_key: :tenant_id do |t|
+            t.integer :tenant_id, null: false
             t.integer :configuration_id
             t.jsonb  "settings", null: false, default: {}
         end

data/db/migrate/{02_create_assets.rb → 03_create_assets.rb}

@@ -1,13 +1,11 @@
 class CreateAssets < ActiveRecord::Migration[5.0]
     def change
-
-        create_table "assets" do |t|
+        create_table "assets", partition_key: :tenant_id do |t|
+            t.integer :tenant_id, null: false
             t.references :owner, polymorphic: true, null: false
             t.integer    :order
             t.jsonb      :file_data, null: false, default: {}
         end
-
         add_index :assets, [:owner_id, :owner_type]
-
     end
 end

data/db/migrate/{20140615031600_create_users.rb → 04_create_users.rb}

@@ -1,12 +1,14 @@
 class CreateUsers < ActiveRecord::Migration[5.0]
     def change
-        create_table :users do | t |
+        create_table :users, partition_key: :tenant_id do | t |
+            t.integer :tenant_id, null: false
             t.string :login, :name, :email,  null: false
             t.string :password_digest, null: false
             t.string  "role_names",   array: true, null:false, default: []
             t.jsonb   "options",      null: false, default:  {}
             t.timestamps null:false
         end
-        add_index  :users, :role_names, using: 'gin'
+
+        add_index :users, [:login, :tenant_id], unique: true
     end
 end

data/db/seed.rb

@@ -1 +1,10 @@
-Hippo::User.seed_admin_account
+system = Hippo::Tenant.system
+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.perform do
+    Hippo::User.seed_admin_account
+end

data/hippo-fw.gemspec

@@ -24,56 +24,58 @@ Gem::Specification.new do |spec|
 
     spec.required_ruby_version = ">= 2.0"
 
-    spec.add_dependency "activejob",              "~> 5.0.0"
-    spec.add_dependency "activerecord",           "~> 5.0.0"
-    spec.add_dependency "actioncable",            "~> 5.0.0"
-    spec.add_dependency "mail",                   "~> 2.6"
-    spec.add_dependency "liquid",                 "~> 4.0"
-    spec.add_dependency 'erb_latex',              "~> 1.0"
-    spec.add_dependency 'shrine-memory',          "~> 0.2"
-    spec.add_dependency 'factory_girl',           "~> 4.8"
-    spec.add_dependency 'faker',                  "~> 1.7"
-    spec.add_dependency 'webmock',                "~> 3.0"
-    spec.add_dependency "database_cleaner",       "~> 1.3"
-    spec.add_dependency 'vcr',                    "~> 3.0"
-    spec.add_dependency "sinatra",                "~> 2.0.0.rc2"
-    spec.add_dependency "rack-protection",        "~> 2.0.0.rc2"
-    spec.add_dependency "rack",                   "~> 2.0"
-
-    spec.add_dependency "rack-cors",              "~> 0.4"
-    spec.add_dependency "rack-test",              "~> 0.6"
-
-    spec.add_dependency "bcrypt",                 "~> 3.1"
-    spec.add_dependency "shrine",                 "~> 2.4"
-    spec.add_dependency "image_processing",       "~> 0.4"
-
-    spec.add_dependency "execjs",                 "~> 2.6"
-    spec.add_dependency "fastimage",              "~> 2.0"
-    spec.add_dependency "guard",                  "~> 2.13"
-
-    spec.add_dependency "rspec-rails",            "~> 3.5"
-
-    spec.add_dependency "guard-jest",             "~> 0.1"
-    spec.add_dependency "guard-rspec",            "~> 4.7"
-    spec.add_dependency "hashie",                 "~> 3.3"
-
-    spec.add_dependency "jobba",                  "~> 1.4"
-    spec.add_dependency "jwt",                    "~> 1.5"
-    spec.add_dependency "mini_magick",            "~> 4.3"
-
-    spec.add_dependency "oj",                     "~> 2.1"
-    spec.add_dependency "pg",                     "~> 0.8"
-    spec.add_dependency "rake",                   "~> 12.0"
-    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.2"
-    spec.add_dependency "knitter",                "~> 0.2.2"
-
-    spec.add_dependency "thor",                   "~> 0.19"
-
-    spec.add_development_dependency "bundler",    "~> 1.5"
-    spec.add_development_dependency "diffy",      "~> 3.0"
-    spec.add_development_dependency "growl",      "~> 1.0"
+    spec.add_dependency "activejob",                 "~> 5.0.0"
+    spec.add_dependency "activerecord",              "~> 5.0.0"
+    spec.add_dependency "actioncable",               "~> 5.0.0"
+#    spec.add_dependency "activerecord-multi-tenant", "~> 0.5"
+    spec.add_dependency "mail",                      "~> 2.6"
+    spec.add_dependency "scenic",                    "~> 1.4"
+    spec.add_dependency "liquid",                    "~> 4.0"
+    spec.add_dependency 'erb_latex',                 "~> 1.0"
+    spec.add_dependency 'shrine-memory',             "~> 0.2"
+    spec.add_dependency 'factory_girl',              "~> 4.8"
+    spec.add_dependency 'faker',                     "~> 1.7"
+    spec.add_dependency 'webmock',                   "~> 3.0"
+    spec.add_dependency "database_cleaner",          "~> 1.3"
+    spec.add_dependency 'vcr',                       "~> 3.0"
+    spec.add_dependency "sinatra",                   "~> 2.0.0"
+    spec.add_dependency "rack-protection",           "~> 2.0.0"
+    spec.add_dependency "rack",                      "~> 2.0"
+
+    spec.add_dependency "rack-cors",                 "~> 0.4"
+    spec.add_dependency "rack-test",                 "~> 0.6"
+
+    spec.add_dependency "bcrypt",                    "~> 3.1"
+    spec.add_dependency "shrine",                    "~> 2.4"
+    spec.add_dependency "image_processing",          "~> 0.4"
+
+    spec.add_dependency "execjs",                    "~> 2.6"
+    spec.add_dependency "fastimage",                 "~> 2.0"
+    spec.add_dependency "guard",                     "~> 2.13"
+
+    spec.add_dependency "rspec-rails",               "~> 3.6"
+
+    spec.add_dependency "guard-jest",                "~> 0.1"
+    spec.add_dependency "guard-rspec",               "~> 4.7"
+    spec.add_dependency "hashie",                    "~> 3.3"
+
+    spec.add_dependency "jobba",                     "~> 1.4"
+    spec.add_dependency "jwt",                       "~> 1.5"
+    spec.add_dependency "mini_magick",               "~> 4.3"
+
+    spec.add_dependency "oj",                        "~> 2.1"
+    spec.add_dependency "pg",                        "~> 0.8"
+    spec.add_dependency "rake",                      "~> 12.0"
+    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 "knitter",                   "~> 0.2.2"
+
+    spec.add_dependency "thor",                      "~> 0.19"
+
+    spec.add_development_dependency "bundler",       "~> 1.5"
+    spec.add_development_dependency "diffy",         "~> 3.0"
+    spec.add_development_dependency "growl",         "~> 1.0"
     spec.add_development_dependency "shrine-memory", "~> 0.2"
 end