From d80683c1af907364ca6140c2941e61e005f160a3 Mon Sep 17 00:00:00 2001
From: Victor Vlasenko <victor.vlasenko@sysgears.com>
Date: Tue, 21 Nov 2017 15:12:34 +0200
Subject: [PATCH 001/327] Reduce node_modules size by removing tcomb

---
 .spinrc.json      |   2 +-
 .spinrc.prod.json |   2 +-
 package.json      |   3 -
 yarn.lock         | 199 ++++++++++++++++++++++++----------------------
 4 files changed, 106 insertions(+), 100 deletions(-)

diff --git a/.spinrc.json b/.spinrc.json
index 1dbeb64e83..3bbeb62390 100644
--- a/.spinrc.json
+++ b/.spinrc.json
@@ -27,7 +27,7 @@
     "frontendBuildDir": "build/client",
     "dllBuildDir": "build/dll",
     "overridesConfig": "tools/webpackAppConfig.js",
-    "stack": ["apollo", "react", "styled-components", "sass", "less", "es6", "tcomb", "webpack"],
+    "stack": ["apollo", "react", "styled-components", "sass", "less", "es6", "webpack"],
     "backendUrl": "http://localhost:8080/graphql",
     "ssr": true,
     "webpackDll": true,
diff --git a/.spinrc.prod.json b/.spinrc.prod.json
index 82d884f12d..73a35cc82e 100644
--- a/.spinrc.prod.json
+++ b/.spinrc.prod.json
@@ -28,7 +28,7 @@
     "frontendBuildDir": "build/client",
     "dllBuildDir": "build/dll",
     "overridesConfig": "tools/webpackAppConfig.js",
-    "stack": ["apollo", "react", "styled-components", "sass", "less", "es6", "tcomb", "webpack"],
+    "stack": ["apollo", "react", "styled-components", "sass", "less", "es6", "webpack"],
     "backendUrl": "https://apollo-universal-starter-kit.herokuapp.com/graphql",
     "ssr": true,
     "webpackDll": true,
diff --git a/package.json b/package.json
index fe56483c43..4442d721ff 100644
--- a/package.json
+++ b/package.json
@@ -134,7 +134,6 @@
     "babel-eslint": "^8.0.2",
     "babel-loader": "^7.1.2",
     "babel-plugin-styled-components": "^1.3.0",
-    "babel-plugin-tcomb": "^0.3.26",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.10",
@@ -170,7 +169,6 @@
     "file-loader": "^1.1.5",
     "flow-bin": "^0.59.0",
     "freeport-async": "^1.1.1",
-    "fs-extra": "^4.0.2",
     "haul": "1.0.0-beta.10",
     "html-webpack-plugin": "^2.30.1",
     "http-proxy-middleware": "^0.17.4",
@@ -203,7 +201,6 @@
     "source-list-map": "^2.0.0",
     "spinjs": "^0.4.41",
     "style-loader": "^0.19.0",
-    "tcomb": "^3.2.24",
     "url-loader": "^0.6.2",
     "wait-on": "^2.0.2",
     "webpack": "^3.8.1",
diff --git a/yarn.lock b/yarn.lock
index 14713ba658..7c80ce8685 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -339,8 +339,8 @@ ansicolors@~0.2.1:
   resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.2.1.tgz#be089599097b74a5c9c4a84a0cdbcdb62bd87aef"
 
 antd@^3.0.0-beta.7:
-  version "3.0.0-beta.7"
-  resolved "https://registry.yarnpkg.com/antd/-/antd-3.0.0-beta.7.tgz#4f752502b63c2a4c91f0bbed20938ae5cc0aa2e0"
+  version "3.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/antd/-/antd-3.0.0-rc.1.tgz#5ab140523dd6448cd8e0c3d84e68c382c4616033"
   dependencies:
     array-tree-filter "~1.0.0"
     babel-runtime "6.x"
@@ -355,28 +355,28 @@ antd@^3.0.0-beta.7:
     rc-animate "^2.4.1"
     rc-calendar "~9.2.0"
     rc-cascader "~0.12.0"
-    rc-checkbox "~2.0.3"
+    rc-checkbox "~2.1.1"
     rc-collapse "~1.7.5"
     rc-dialog "~7.0.0"
     rc-dropdown "~2.1.0"
     rc-editor-mention "^1.0.2"
-    rc-form "~1.5.0"
-    rc-input-number "~3.6.0"
+    rc-form "~2.0.0"
+    rc-input-number "~4.0.0"
     rc-menu "~6.1.0"
     rc-notification "~3.0.0"
     rc-pagination "~1.12.4"
     rc-progress "~2.2.2"
-    rc-rate "~2.1.1"
-    rc-select "~7.1.0"
+    rc-rate "~2.2.0"
+    rc-select "~7.2.0"
     rc-slider "~8.4.0"
     rc-steps "~3.0.0"
-    rc-switch "~1.5.1"
-    rc-table "~5.6.9"
+    rc-switch "~1.6.0"
+    rc-table "~6.1.0"
     rc-tabs "~9.1.2"
-    rc-time-picker "~3.1.0"
+    rc-time-picker "~3.2.1"
     rc-tooltip "~3.7.0"
     rc-tree "~1.7.0"
-    rc-tree-select "~1.11.0"
+    rc-tree-select "~1.12.0"
     rc-upload "~2.4.0"
     rc-util "^4.0.4"
     react-lazy-load "^3.0.12"
@@ -800,7 +800,7 @@ atob@~1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/atob/-/atob-1.1.3.tgz#95f13629b12c3a51a5d215abdce2aa9f32f80773"
 
-attr-accept@^1.0.3, attr-accept@^1.1.0:
+attr-accept@^1.0.3:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/attr-accept/-/attr-accept-1.1.0.tgz#b5cd35227f163935a8f1de10ed3eba16941f6be6"
 
@@ -925,18 +925,6 @@ babel-eslint@^8.0.2:
     "@babel/types" "^7.0.0-beta.31"
     babylon "^7.0.0-beta.31"
 
-babel-generator@6.19.0:
-  version "6.19.0"
-  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.19.0.tgz#9b2f244204777a3d6810ec127c673c87b349fac5"
-  dependencies:
-    babel-messages "^6.8.0"
-    babel-runtime "^6.9.0"
-    babel-types "^6.19.0"
-    detect-indent "^4.0.0"
-    jsesc "^1.3.0"
-    lodash "^4.2.0"
-    source-map "^0.5.0"
-
 babel-generator@^6.24.1, babel-generator@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.0.tgz#ac1ae20070b79f6e3ca1d3269613053774f20dc5"
@@ -1084,7 +1072,7 @@ babel-loader@^7.1.2:
     loader-utils "^1.0.2"
     mkdirp "^0.5.1"
 
-babel-messages@^6.23.0, babel-messages@^6.8.0:
+babel-messages@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
   dependencies:
@@ -1179,12 +1167,6 @@ babel-plugin-syntax-trailing-function-commas@^6.20.0, babel-plugin-syntax-traili
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
 
-babel-plugin-tcomb@^0.3.26:
-  version "0.3.26"
-  resolved "https://registry.yarnpkg.com/babel-plugin-tcomb/-/babel-plugin-tcomb-0.3.26.tgz#f8fa81d63ca68ba045f873fe6cc2a53736a361cb"
-  dependencies:
-    babel-generator "6.19.0"
-
 babel-plugin-transform-async-generator-functions@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz#f058900145fd3e9907a6ddf28da59f215258a5db"
@@ -1739,7 +1721,7 @@ babel-register@^6.24.0, babel-register@^6.24.1, babel-register@^6.26.0:
     mkdirp "^0.5.1"
     source-map-support "^0.4.15"
 
-babel-runtime@6.x, babel-runtime@^6.0.0, babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.22.0, babel-runtime@^6.23.0, babel-runtime@^6.25.0, babel-runtime@^6.26.0, babel-runtime@^6.9.0, babel-runtime@^6.9.2:
+babel-runtime@6.x, babel-runtime@^6.0.0, babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.22.0, babel-runtime@^6.23.0, babel-runtime@^6.25.0, babel-runtime@^6.26.0, babel-runtime@^6.9.2:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
   dependencies:
@@ -5106,7 +5088,7 @@ hoek@4.x.x:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d"
 
-hoist-non-react-statics@1.x, hoist-non-react-statics@^1.2.0:
+hoist-non-react-statics@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb"
 
@@ -6584,6 +6566,10 @@ lodash.memoize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
 
+lodash.merge@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.0.tgz#69884ba144ac33fe699737a6086deffadd0f89c5"
+
 lodash.mergewith@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz#150cf0a16791f5903b8891eab154609274bdea55"
@@ -7029,6 +7015,14 @@ min-document@^2.19.0:
   dependencies:
     dom-walk "^0.1.0"
 
+mini-store@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/mini-store/-/mini-store-1.0.3.tgz#190e90831be7a3862baa532168b579273b00d818"
+  dependencies:
+    hoist-non-react-statics "^2.3.1"
+    prop-types "^15.6.0"
+    shallowequal "^1.0.2"
+
 minilog@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/minilog/-/minilog-3.1.0.tgz#d2d0f1887ca363d1acf0ea86d5c4df293b3fb675"
@@ -7133,7 +7127,11 @@ mocha@^4.0.1:
     mkdirp "0.5.1"
     supports-color "4.4.0"
 
-moment@2.x, moment@2.x.x, moment@^2.10.6, moment@^2.18.1:
+moment@2.x, moment@^2.18.1:
+  version "2.19.2"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.19.2.tgz#8a7f774c95a64550b4c7ebd496683908f9419dbe"
+
+moment@2.x.x, moment@^2.10.6:
   version "2.19.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.19.1.tgz#56da1a2d1cbf01d38b7e1afc31c10bcfa1929167"
 
@@ -7216,8 +7214,8 @@ mv@^2.1.1, mv@~2:
     rimraf "~2.4.0"
 
 mysql2@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-1.5.0.tgz#12c67fe7be718fb71ec9124c1adc85a0086ca4f9"
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-1.5.1.tgz#2411d6fb958af86b2304b7a53bc54b26e77e682b"
   dependencies:
     cardinal "1.0.0"
     denque "^1.1.1"
@@ -8857,9 +8855,9 @@ rc-cascader@~0.12.0:
     rc-util "^4.0.4"
     shallow-equal "^1.0.0"
 
-rc-checkbox@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/rc-checkbox/-/rc-checkbox-2.0.3.tgz#436a9d508948e224980f0535ea738b48177a8f25"
+rc-checkbox@~2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/rc-checkbox/-/rc-checkbox-2.1.1.tgz#7b2d3632285eaad9cad78612a6643d7d34589e72"
   dependencies:
     babel-runtime "^6.23.0"
     classnames "2.x"
@@ -8916,15 +8914,15 @@ rc-editor-mention@^1.0.2:
     rc-animate "^2.3.0"
     rc-editor-core "~0.7.7"
 
-rc-form@~1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/rc-form/-/rc-form-1.5.0.tgz#9c78ab93e998e66af02921b99eea12296c68205c"
+rc-form@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/rc-form/-/rc-form-2.0.0.tgz#af69b0f14abf5bc925566d0b8da93f3297705f27"
   dependencies:
     async-validator "1.x"
     babel-runtime "6.x"
     create-react-class "^15.5.3"
     dom-scroll-into-view "1.x"
-    hoist-non-react-statics "1.x"
+    hoist-non-react-statics "^2.3.1"
     lodash "^4.17.4"
     warning "^3.0.0"
 
@@ -8936,19 +8934,31 @@ rc-hammerjs@~0.6.0:
     hammerjs "^2.0.8"
     prop-types "^15.5.9"
 
-rc-input-number@~3.6.0:
-  version "3.6.9"
-  resolved "https://registry.yarnpkg.com/rc-input-number/-/rc-input-number-3.6.9.tgz#1ea872dd68b8f297aef8400c63f05673a2ac03b8"
+rc-input-number@~4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/rc-input-number/-/rc-input-number-4.0.0.tgz#a7302d875e6fb8e7c3aa177c57f0d96bdedc1d8c"
   dependencies:
     babel-runtime "6.x"
     classnames "^2.2.0"
-    create-react-class "^15.5.2"
     prop-types "^15.5.7"
-    rc-touchable "^1.0.0"
+    rmc-feedback "^1.0.0"
+
+rc-menu@^6.1.0:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/rc-menu/-/rc-menu-6.2.1.tgz#5d4515c1ac09b1984b1cb34d4abc4411989c0747"
+  dependencies:
+    babel-runtime "6.x"
+    classnames "2.x"
+    create-react-class "^15.5.2"
+    dom-scroll-into-view "1.x"
+    prop-types "^15.5.6"
+    rc-animate "2.x"
+    rc-trigger "^2.3.0"
+    rc-util "^4.1.0"
 
-rc-menu@^6.1.0, rc-menu@~6.1.0:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/rc-menu/-/rc-menu-6.1.2.tgz#b68dbb52702d324ac497f75af262f50b91af7c79"
+rc-menu@~6.1.0:
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/rc-menu/-/rc-menu-6.1.3.tgz#ff6bb587ebbb39b1d97997fc89368176a6181956"
   dependencies:
     babel-runtime "6.x"
     classnames "2.x"
@@ -8983,16 +8993,17 @@ rc-progress@~2.2.2:
     babel-runtime "6.x"
     prop-types "^15.5.8"
 
-rc-rate@~2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/rc-rate/-/rc-rate-2.1.1.tgz#88aeda8b3d6470bbae4f6518c652a02a959bddc5"
+rc-rate@~2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/rc-rate/-/rc-rate-2.2.0.tgz#6b095900fe2289b8a889a17ae3513ca9989e8122"
   dependencies:
+    babel-runtime "^6.26.0"
     classnames "^2.2.5"
     prop-types "^15.5.8"
 
-rc-select@~7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-7.1.0.tgz#eaebab34b21ea5abaf51f3ed6978bb3276e8fab5"
+rc-select@~7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-7.2.0.tgz#9a3a12ea15cb04bf27611d7d2bd4ac1d4f0d4818"
   dependencies:
     babel-runtime "^6.23.0"
     classnames "2.x"
@@ -9026,24 +9037,26 @@ rc-steps@~3.0.0:
     lodash.debounce "^4.0.8"
     prop-types "^15.5.7"
 
-rc-switch@~1.5.1:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/rc-switch/-/rc-switch-1.5.3.tgz#283c2608bac57ebd7cdc4033269de14b6753eb39"
+rc-switch@~1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/rc-switch/-/rc-switch-1.6.0.tgz#c2d7369bdb87c1fd45e84989a27c1fb2f201d2fd"
   dependencies:
     babel-runtime "^6.23.0"
     classnames "^2.2.1"
     prop-types "^15.5.6"
 
-rc-table@~5.6.9:
-  version "5.6.13"
-  resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-5.6.13.tgz#ca73021dc6a3aa0af2846d07ee80c01c713ff0de"
+rc-table@~6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-6.1.0.tgz#72ab51e7c960454c823049b7d1b6cbfe7dff07a5"
   dependencies:
     babel-runtime "6.x"
     component-classes "^1.2.6"
     lodash.get "^4.4.2"
+    lodash.merge "^4.6.0"
+    mini-store "^1.0.2"
     prop-types "^15.5.8"
-    rc-util "4.x"
-    shallowequal "^0.2.2"
+    rc-util "^4.0.4"
+    shallowequal "^1.0.2"
     warning "^3.0.0"
 
 rc-tabs@~9.1.2:
@@ -9059,9 +9072,9 @@ rc-tabs@~9.1.2:
     rc-util "^4.0.4"
     warning "^3.0.0"
 
-rc-time-picker@~3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/rc-time-picker/-/rc-time-picker-3.1.0.tgz#85553e03d0a20d7f7bd4c21803ddfffcd7a93a47"
+rc-time-picker@~3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/rc-time-picker/-/rc-time-picker-3.2.1.tgz#e105fed32814bb95f37dbc60b49495cd787abfa2"
   dependencies:
     babel-runtime "6.x"
     classnames "2.x"
@@ -9077,15 +9090,9 @@ rc-tooltip@^3.7.0, rc-tooltip@~3.7.0:
     prop-types "^15.5.8"
     rc-trigger "^2.2.2"
 
-rc-touchable@^1.0.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/rc-touchable/-/rc-touchable-1.2.3.tgz#5f498324e3d0b9ba601a9c4834958eaa2c713618"
-  dependencies:
-    babel-runtime "6.x"
-
-rc-tree-select@~1.11.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/rc-tree-select/-/rc-tree-select-1.11.0.tgz#edfc14bd6f7ae53a319eb071dabc8f5d4c4f4f96"
+rc-tree-select@~1.12.0:
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/rc-tree-select/-/rc-tree-select-1.12.1.tgz#8eade37cf6044845676d25988b2d41a2c62c5531"
   dependencies:
     babel-runtime "^6.23.0"
     classnames "^2.2.1"
@@ -9097,8 +9104,8 @@ rc-tree-select@~1.11.0:
     rc-util "^4.0.2"
 
 rc-tree@~1.7.0, rc-tree@~1.7.1:
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-1.7.8.tgz#9c5cd86a901474c655c94be1956c486de0648012"
+  version "1.7.9"
+  resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-1.7.9.tgz#5cefaff0c1a9f1179702782b265846e3b494a08a"
   dependencies:
     babel-runtime "^6.23.0"
     classnames "2.x"
@@ -9107,30 +9114,29 @@ rc-tree@~1.7.0, rc-tree@~1.7.1:
     rc-util "^4.0.4"
     warning "^3.0.0"
 
-rc-trigger@^2.2.0, rc-trigger@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/rc-trigger/-/rc-trigger-2.2.2.tgz#b0c666b37cce4ed27300a7e710d67bf7444d12ad"
+rc-trigger@^2.2.0, rc-trigger@^2.2.2, rc-trigger@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/rc-trigger/-/rc-trigger-2.3.0.tgz#f42cfe4bc17dab4e4cd613a1d4a156738d252728"
   dependencies:
     babel-runtime "6.x"
     create-react-class "15.x"
     prop-types "15.x"
     rc-align "2.x"
     rc-animate "2.x"
-    rc-util "^4.2.0"
+    rc-util "^4.3.0"
 
 rc-upload@~2.4.0:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/rc-upload/-/rc-upload-2.4.3.tgz#df793c1dccd5d6815ad256fe776b870bb593edfc"
+  version "2.4.4"
+  resolved "https://registry.yarnpkg.com/rc-upload/-/rc-upload-2.4.4.tgz#28e1e6a3e44d1b1f92e57e21927cfa2763ac2a21"
   dependencies:
-    attr-accept "^1.1.0"
     babel-runtime "6.x"
     classnames "^2.2.5"
     prop-types "^15.5.7"
     warning "2.x"
 
-rc-util@4.x, rc-util@^4.0.2, rc-util@^4.0.4, rc-util@^4.1.0, rc-util@^4.1.1, rc-util@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-4.2.0.tgz#dacec50735675a211f1c94571306a90e8b97248f"
+rc-util@4.x, rc-util@^4.0.2, rc-util@^4.0.4, rc-util@^4.1.0, rc-util@^4.1.1, rc-util@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-4.3.0.tgz#31c61e747e3e107acfe78049f98b275a8051a398"
   dependencies:
     add-dom-event-listener "1.x"
     babel-runtime "6.x"
@@ -10065,6 +10071,13 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
     hash-base "^2.0.0"
     inherits "^2.0.1"
 
+rmc-feedback@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/rmc-feedback/-/rmc-feedback-1.0.3.tgz#efd9d75c51998857c7a9a495ee507313a81aaee9"
+  dependencies:
+    babel-runtime "6.x"
+    classnames "^2.2.5"
+
 rndm@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/rndm/-/rndm-1.2.0.tgz#f33fe9cfb52bbfd520aa18323bc65db110a1b76c"
@@ -10339,7 +10352,7 @@ shallowequal@^0.2.2:
   dependencies:
     lodash.keys "^3.1.2"
 
-shallowequal@^1.0.1:
+shallowequal@^1.0.1, shallowequal@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.0.2.tgz#1561dbdefb8c01408100319085764da3fcf83f8f"
 
@@ -10533,7 +10546,7 @@ source-map@0.5.6:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
 
-source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3, source-map@~0.5.6:
+source-map@0.5.x, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3, source-map@~0.5.6:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 
@@ -11041,10 +11054,6 @@ tar@^4.0.2:
     mkdirp "^0.5.0"
     yallist "^3.0.2"
 
-tcomb@^3.2.24:
-  version "3.2.24"
-  resolved "https://registry.yarnpkg.com/tcomb/-/tcomb-3.2.24.tgz#7f427053cc393b5997c4c3d859ca20411180887b"
-
 temp@0.8.3:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.3.tgz#e0c6bc4d26b903124410e4fed81103014dfc1f59"

From 8e622d2dcde79f1745715fe7432e45f022cd476a Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 21 Nov 2017 14:32:30 +0100
Subject: [PATCH 002/327] update fragment .graphql file

---
 tools/cli.js                                  |  5 ++-
 tools/cli/module.js                           | 39 +++++++++++++++++++
 .../module/client/graphql/ModuleQuery.graphql |  4 +-
 3 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/tools/cli.js b/tools/cli.js
index 1a535a90d3..374483673a 100644
--- a/tools/cli.js
+++ b/tools/cli.js
@@ -20,6 +20,9 @@ prog
     ['both', 'server', 'client'],
     'both'
   )
-  .action((args, options, logger) => moduleCmd('deletemodule', args, options, logger));
+  .action((args, options, logger) => moduleCmd('deletemodule', args, options, logger))
+  .command('updateschema', 'Update Module Schema')
+  .argument('<module>', 'Module name')
+  .action((args, options, logger) => moduleCmd('updateschema', args, options, logger));
 
 prog.parse(process.argv);
diff --git a/tools/cli/module.js b/tools/cli/module.js
index afc6d43ebc..4db99025ee 100644
--- a/tools/cli/module.js
+++ b/tools/cli/module.js
@@ -1,3 +1,7 @@
+/* eslint-disable import/no-dynamic-require */
+require('babel-register')({ presets: ['env'], plugins: ['transform-class-properties'] });
+require('babel-polyfill');
+
 const shell = require('shelljs');
 const fs = require('fs');
 
@@ -105,6 +109,36 @@ function deleteFiles(logger, templatePath, module, location) {
   }
 }
 
+function updateSchema(logger, module) {
+  logger.info(`Updating ${module} Schema…`);
+
+  // get fragment file
+  const path = `${__dirname}/../../src/client/modules/${module}/graphql/`;
+  const file = `${module.toCamelCase().capitalize()}.graphql`;
+  const re = /\{([^()]+)\}/g;
+
+  // get module schema
+  const schema = require(`../../src/server/modules/${module}/schema`);
+
+  // regenerate graphql fragment
+  let graphql = '{\n';
+  for (const key of Object.keys(schema[module.toCamelCase().capitalize()].values)) {
+    graphql += `  ${key}\n`;
+  }
+  graphql += '}';
+
+  // override graphql fragment file
+  shell.cd(path);
+  // remove all new lines
+  shell.exec(`tr -d '\n' < ${file} > ${file}.tmp`);
+  // replace content
+  shell.sed('-i', re, graphql, `${file}.tmp`);
+  // remove old file
+  shell.rm(file);
+  // rename tmp file
+  shell.mv(`${file}.tmp`, file);
+}
+
 module.exports = (action, args, options, logger) => {
   const templatePath = `${__dirname}/../templates/module`;
 
@@ -130,4 +164,9 @@ module.exports = (action, args, options, logger) => {
       deleteFiles(logger, templatePath, args.module, 'server');
     }
   }
+
+  // update schema
+  if (action === 'updateschema') {
+    updateSchema(logger, args.module);
+  }
 };
diff --git a/tools/templates/module/client/graphql/ModuleQuery.graphql b/tools/templates/module/client/graphql/ModuleQuery.graphql
index f16c43a24b..61470c8960 100644
--- a/tools/templates/module/client/graphql/ModuleQuery.graphql
+++ b/tools/templates/module/client/graphql/ModuleQuery.graphql
@@ -1 +1,3 @@
-# GraphQL queries
+fragment $Module$Info on $Module$ {
+  id
+}
\ No newline at end of file

From 595ffd51856d949b63f0dd6801254b9aa5df6c48 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 21 Nov 2017 14:41:01 +0100
Subject: [PATCH 003/327] remove graphql related stuff in yarn addmodule

---
 .../module/client/containers/Module.jsx       |  6 +----
 .../module/client/graphql/ModuleQuery.graphql |  3 ---
 tools/templates/module/server/Module.spec.js  | 23 -------------------
 tools/templates/module/server/index.js        |  9 +-------
 tools/templates/module/server/resolvers.js    |  6 -----
 tools/templates/module/server/schema.graphqls |  5 ----
 tools/templates/module/server/sql.js          |  4 ----
 7 files changed, 2 insertions(+), 54 deletions(-)
 delete mode 100644 tools/templates/module/client/graphql/ModuleQuery.graphql
 delete mode 100644 tools/templates/module/server/Module.spec.js
 delete mode 100644 tools/templates/module/server/resolvers.js
 delete mode 100644 tools/templates/module/server/schema.graphqls
 delete mode 100644 tools/templates/module/server/sql.js

diff --git a/tools/templates/module/client/containers/Module.jsx b/tools/templates/module/client/containers/Module.jsx
index 59510a61c5..2eb0c5d34e 100644
--- a/tools/templates/module/client/containers/Module.jsx
+++ b/tools/templates/module/client/containers/Module.jsx
@@ -1,6 +1,4 @@
-/*eslint-disable no-unused-vars*/
 import React from 'react';
-import { graphql, compose } from 'react-apollo';
 
 import $Module$View from '../components/$Module$View';
 
@@ -10,6 +8,4 @@ class $Module$ extends React.Component {
   }
 }
 
-const $Module$WithApollo = compose()($Module$);
-
-export default $Module$WithApollo;
+export default $Module$;
diff --git a/tools/templates/module/client/graphql/ModuleQuery.graphql b/tools/templates/module/client/graphql/ModuleQuery.graphql
deleted file mode 100644
index 61470c8960..0000000000
--- a/tools/templates/module/client/graphql/ModuleQuery.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-fragment $Module$Info on $Module$ {
-  id
-}
\ No newline at end of file
diff --git a/tools/templates/module/server/Module.spec.js b/tools/templates/module/server/Module.spec.js
deleted file mode 100644
index 223aad95c8..0000000000
--- a/tools/templates/module/server/Module.spec.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/*eslint-disable no-unused-vars*/
-import chai from 'chai';
-import { step } from 'mocha-steps';
-import { getServer, getApollo } from '../../testHelpers/integrationSetup';
-
-describe('$Module$ API works', () => {
-  let server, apollo;
-
-  before(() => {
-    server = getServer();
-    apollo = getApollo();
-  });
-
-  step('Has GraphiQL endpoint', () => {
-    return chai
-      .request(server)
-      .get('/graphiql')
-      .end((err, res) => {
-        res.status.should.be(200);
-        res.body.should.be('{}');
-      });
-  });
-});
diff --git a/tools/templates/module/server/index.js b/tools/templates/module/server/index.js
index 250cfbc59f..eec5baca53 100644
--- a/tools/templates/module/server/index.js
+++ b/tools/templates/module/server/index.js
@@ -1,10 +1,3 @@
-import $Module$ from './sql';
-import schema from './schema.graphqls';
-import createResolvers from './resolvers';
 import Feature from '../connector';
 
-export default new Feature({
-  schema,
-  createResolversFunc: createResolvers,
-  createContextFunc: () => ({ $Module$: new $Module$() })
-});
+export default new Feature({});
diff --git a/tools/templates/module/server/resolvers.js b/tools/templates/module/server/resolvers.js
deleted file mode 100644
index 13582f9182..0000000000
--- a/tools/templates/module/server/resolvers.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/*eslint-disable no-unused-vars*/
-export default pubsub => ({
-  Query: {},
-  Mutation: {},
-  Subscription: {}
-});
diff --git a/tools/templates/module/server/schema.graphqls b/tools/templates/module/server/schema.graphqls
deleted file mode 100644
index b224b3517b..0000000000
--- a/tools/templates/module/server/schema.graphqls
+++ /dev/null
@@ -1,5 +0,0 @@
-extend type Query {}
-
-extend type Mutation {}
-
-extend type Subscription {}
diff --git a/tools/templates/module/server/sql.js b/tools/templates/module/server/sql.js
deleted file mode 100644
index a358efaab1..0000000000
--- a/tools/templates/module/server/sql.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*eslint-disable no-unused-vars*/
-import knex from '../../../server/sql/connector';
-
-export default class $Module$ {}

From 052d707ada9f6344195806348c3cd466273604fa Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 21 Nov 2017 14:51:49 +0100
Subject: [PATCH 004/327] separate template folder for `addcrud`

---
 tools/cli.js                                  |  3 ++
 tools/cli/module.js                           | 31 ++++++++++++-------
 .../crud/client/components/ModuleView.jsx     | 31 +++++++++++++++++++
 .../crud/client/components/ModuleView.web.jsx | 28 +++++++++++++++++
 .../crud/client/containers/Module.jsx         | 15 +++++++++
 .../crud/client/containers/Module.spec.js     | 17 ++++++++++
 .../crud/client/graphql/ModuleQuery.graphql   |  3 ++
 tools/templates/crud/client/index.jsx         | 21 +++++++++++++
 tools/templates/crud/client/index.web.jsx     | 19 ++++++++++++
 tools/templates/crud/client/reducers/index.js |  8 +++++
 tools/templates/crud/server/Module.spec.js    | 23 ++++++++++++++
 tools/templates/crud/server/index.js          | 10 ++++++
 tools/templates/crud/server/resolvers.js      |  6 ++++
 tools/templates/crud/server/schema.graphqls   |  5 +++
 tools/templates/crud/server/sql.js            |  4 +++
 15 files changed, 213 insertions(+), 11 deletions(-)
 create mode 100644 tools/templates/crud/client/components/ModuleView.jsx
 create mode 100644 tools/templates/crud/client/components/ModuleView.web.jsx
 create mode 100644 tools/templates/crud/client/containers/Module.jsx
 create mode 100644 tools/templates/crud/client/containers/Module.spec.js
 create mode 100644 tools/templates/crud/client/graphql/ModuleQuery.graphql
 create mode 100644 tools/templates/crud/client/index.jsx
 create mode 100644 tools/templates/crud/client/index.web.jsx
 create mode 100644 tools/templates/crud/client/reducers/index.js
 create mode 100644 tools/templates/crud/server/Module.spec.js
 create mode 100644 tools/templates/crud/server/index.js
 create mode 100644 tools/templates/crud/server/resolvers.js
 create mode 100644 tools/templates/crud/server/schema.graphqls
 create mode 100644 tools/templates/crud/server/sql.js

diff --git a/tools/cli.js b/tools/cli.js
index 374483673a..5a48ff1378 100644
--- a/tools/cli.js
+++ b/tools/cli.js
@@ -12,6 +12,9 @@ prog
     'both'
   )
   .action((args, options, logger) => moduleCmd('addmodule', args, options, logger))
+  .command('addcrud', 'Create a new Module with CRUD')
+  .argument('<module>', 'Module name')
+  .action((args, options, logger) => moduleCmd('addcrud', args, options, logger))
   .command('deletemodule', 'Delete a Module')
   .argument('<module>', 'Module name')
   .argument(
diff --git a/tools/cli/module.js b/tools/cli/module.js
index 4db99025ee..042831def3 100644
--- a/tools/cli/module.js
+++ b/tools/cli/module.js
@@ -140,33 +140,42 @@ function updateSchema(logger, module) {
 }
 
 module.exports = (action, args, options, logger) => {
-  const templatePath = `${__dirname}/../templates/module`;
+  const module = args.module;
+  let location = 'both';
+  if (args.location) {
+    location = args.location;
+  }
+
+  let templatePath = `${__dirname}/../templates/module`;
+  if (action === 'addcrud') {
+    templatePath = `${__dirname}/../templates/crud`;
+  }
 
   if (!fs.existsSync(templatePath)) {
-    logger.error(`The requested location for ${args.location} wasn't found.`);
+    logger.error(`The requested location for ${location} wasn't found.`);
     process.exit(1);
   }
 
   // client
-  if (args.location === 'client' || args.location === 'both') {
-    if (action === 'addmodule') {
-      copyFiles(logger, templatePath, args.module, 'client');
+  if (location === 'client' || location === 'both') {
+    if (action === 'addmodule' || action === 'addcrud') {
+      copyFiles(logger, templatePath, module, 'client');
     } else if (action === 'deletemodule') {
-      deleteFiles(logger, templatePath, args.module, 'client');
+      deleteFiles(logger, templatePath, module, 'client');
     }
   }
 
   // server
-  if (args.location === 'server' || args.location === 'both') {
-    if (action === 'addmodule') {
-      copyFiles(logger, templatePath, args.module, 'server');
+  if (location === 'server' || location === 'both') {
+    if (action === 'addmodule' || action === 'addcrud') {
+      copyFiles(logger, templatePath, module, 'server');
     } else if (action === 'deletemodule') {
-      deleteFiles(logger, templatePath, args.module, 'server');
+      deleteFiles(logger, templatePath, module, 'server');
     }
   }
 
   // update schema
   if (action === 'updateschema') {
-    updateSchema(logger, args.module);
+    updateSchema(logger, module);
   }
 };
diff --git a/tools/templates/crud/client/components/ModuleView.jsx b/tools/templates/crud/client/components/ModuleView.jsx
new file mode 100644
index 0000000000..04c16384fe
--- /dev/null
+++ b/tools/templates/crud/client/components/ModuleView.jsx
@@ -0,0 +1,31 @@
+import React from 'react';
+import { StyleSheet, Text, View } from 'react-native';
+
+const $Module$View = () => {
+  return (
+    <View style={styles.container}>
+      <View style={styles.element}>
+        <Text style={styles.box}>Hello $Module$!</Text>
+      </View>
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    backgroundColor: '#fff',
+    alignItems: 'center',
+    justifyContent: 'center'
+  },
+  element: {
+    paddingTop: 30
+  },
+  box: {
+    textAlign: 'center',
+    marginLeft: 15,
+    marginRight: 15
+  }
+});
+
+export default $Module$View;
diff --git a/tools/templates/crud/client/components/ModuleView.web.jsx b/tools/templates/crud/client/components/ModuleView.web.jsx
new file mode 100644
index 0000000000..49bca7ba8b
--- /dev/null
+++ b/tools/templates/crud/client/components/ModuleView.web.jsx
@@ -0,0 +1,28 @@
+import React from 'react';
+import Helmet from 'react-helmet';
+import { PageLayout } from '../../common/components/web';
+
+const renderMetaData = () => (
+  <Helmet
+    title="$Module$"
+    meta={[
+      {
+        name: 'description',
+        content: '$Module$ page'
+      }
+    ]}
+  />
+);
+
+const $Module$View = () => {
+  return (
+    <PageLayout>
+      {renderMetaData()}
+      <div className="text-center mt-4 mb-4">
+        <p>Hello $Module$!</p>
+      </div>
+    </PageLayout>
+  );
+};
+
+export default $Module$View;
diff --git a/tools/templates/crud/client/containers/Module.jsx b/tools/templates/crud/client/containers/Module.jsx
new file mode 100644
index 0000000000..59510a61c5
--- /dev/null
+++ b/tools/templates/crud/client/containers/Module.jsx
@@ -0,0 +1,15 @@
+/*eslint-disable no-unused-vars*/
+import React from 'react';
+import { graphql, compose } from 'react-apollo';
+
+import $Module$View from '../components/$Module$View';
+
+class $Module$ extends React.Component {
+  render() {
+    return <$Module$View {...this.props} />;
+  }
+}
+
+const $Module$WithApollo = compose()($Module$);
+
+export default $Module$WithApollo;
diff --git a/tools/templates/crud/client/containers/Module.spec.js b/tools/templates/crud/client/containers/Module.spec.js
new file mode 100644
index 0000000000..29ebdb682e
--- /dev/null
+++ b/tools/templates/crud/client/containers/Module.spec.js
@@ -0,0 +1,17 @@
+import { expect } from 'chai';
+import { step } from 'mocha-steps';
+import Renderer from '../../../../client/testHelpers/Renderer';
+import Routes from '../../../../client/app/Routes';
+
+describe('$Module$ UI works', () => {
+  const renderer = new Renderer({});
+  let app;
+  let content;
+
+  step('$Module$ page renders on mount', () => {
+    app = renderer.mount(Routes);
+    renderer.history.push('/$module$');
+    content = app.find('#content');
+    expect(content).to.not.be.empty;
+  });
+});
diff --git a/tools/templates/crud/client/graphql/ModuleQuery.graphql b/tools/templates/crud/client/graphql/ModuleQuery.graphql
new file mode 100644
index 0000000000..61470c8960
--- /dev/null
+++ b/tools/templates/crud/client/graphql/ModuleQuery.graphql
@@ -0,0 +1,3 @@
+fragment $Module$Info on $Module$ {
+  id
+}
\ No newline at end of file
diff --git a/tools/templates/crud/client/index.jsx b/tools/templates/crud/client/index.jsx
new file mode 100644
index 0000000000..e61b873a24
--- /dev/null
+++ b/tools/templates/crud/client/index.jsx
@@ -0,0 +1,21 @@
+import { Ionicons } from '@expo/vector-icons';
+import { createTabBarIconWrapper } from '../common/components/native';
+import $Module$ from './containers/$Module$';
+import reducers from './reducers';
+
+import Feature from '../connector';
+
+export default new Feature({
+  tabItem: {
+    $Module$: {
+      screen: $Module$,
+      navigationOptions: {
+        tabBarIcon: createTabBarIconWrapper(Ionicons, {
+          name: 'ios-browsers-outline',
+          size: 30
+        })
+      }
+    }
+  },
+  reducer: { $module$: reducers }
+});
diff --git a/tools/templates/crud/client/index.web.jsx b/tools/templates/crud/client/index.web.jsx
new file mode 100644
index 0000000000..ba6a70cd43
--- /dev/null
+++ b/tools/templates/crud/client/index.web.jsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import { Route, NavLink } from 'react-router-dom';
+import { MenuItem } from '../../modules/common/components/web';
+import $Module$ from './containers/$Module$';
+import reducers from './reducers';
+
+import Feature from '../connector';
+
+export default new Feature({
+  route: <Route exact path="/$module$" component={$Module$} />,
+  navItem: (
+    <MenuItem key="$module$">
+      <NavLink to="/$module$" className="nav-link" activeClassName="active">
+        $Module$
+      </NavLink>
+    </MenuItem>
+  ),
+  reducer: { $module$: reducers }
+});
diff --git a/tools/templates/crud/client/reducers/index.js b/tools/templates/crud/client/reducers/index.js
new file mode 100644
index 0000000000..6c6ee75a42
--- /dev/null
+++ b/tools/templates/crud/client/reducers/index.js
@@ -0,0 +1,8 @@
+const defaultState = {};
+
+export default function(state = defaultState, action) {
+  switch (action.type) {
+    default:
+      return state;
+  }
+}
diff --git a/tools/templates/crud/server/Module.spec.js b/tools/templates/crud/server/Module.spec.js
new file mode 100644
index 0000000000..223aad95c8
--- /dev/null
+++ b/tools/templates/crud/server/Module.spec.js
@@ -0,0 +1,23 @@
+/*eslint-disable no-unused-vars*/
+import chai from 'chai';
+import { step } from 'mocha-steps';
+import { getServer, getApollo } from '../../testHelpers/integrationSetup';
+
+describe('$Module$ API works', () => {
+  let server, apollo;
+
+  before(() => {
+    server = getServer();
+    apollo = getApollo();
+  });
+
+  step('Has GraphiQL endpoint', () => {
+    return chai
+      .request(server)
+      .get('/graphiql')
+      .end((err, res) => {
+        res.status.should.be(200);
+        res.body.should.be('{}');
+      });
+  });
+});
diff --git a/tools/templates/crud/server/index.js b/tools/templates/crud/server/index.js
new file mode 100644
index 0000000000..250cfbc59f
--- /dev/null
+++ b/tools/templates/crud/server/index.js
@@ -0,0 +1,10 @@
+import $Module$ from './sql';
+import schema from './schema.graphqls';
+import createResolvers from './resolvers';
+import Feature from '../connector';
+
+export default new Feature({
+  schema,
+  createResolversFunc: createResolvers,
+  createContextFunc: () => ({ $Module$: new $Module$() })
+});
diff --git a/tools/templates/crud/server/resolvers.js b/tools/templates/crud/server/resolvers.js
new file mode 100644
index 0000000000..13582f9182
--- /dev/null
+++ b/tools/templates/crud/server/resolvers.js
@@ -0,0 +1,6 @@
+/*eslint-disable no-unused-vars*/
+export default pubsub => ({
+  Query: {},
+  Mutation: {},
+  Subscription: {}
+});
diff --git a/tools/templates/crud/server/schema.graphqls b/tools/templates/crud/server/schema.graphqls
new file mode 100644
index 0000000000..b224b3517b
--- /dev/null
+++ b/tools/templates/crud/server/schema.graphqls
@@ -0,0 +1,5 @@
+extend type Query {}
+
+extend type Mutation {}
+
+extend type Subscription {}
diff --git a/tools/templates/crud/server/sql.js b/tools/templates/crud/server/sql.js
new file mode 100644
index 0000000000..a358efaab1
--- /dev/null
+++ b/tools/templates/crud/server/sql.js
@@ -0,0 +1,4 @@
+/*eslint-disable no-unused-vars*/
+import knex from '../../../server/sql/connector';
+
+export default class $Module$ {}

From 206fca5880f733717a8ffd770e31deb05a06ed82 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 21 Nov 2017 14:58:12 +0100
Subject: [PATCH 005/327] add domain schema packages

---
 package.json |  4 ++++
 yarn.lock    | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/package.json b/package.json
index 4442d721ff..4e41979c2f 100644
--- a/package.json
+++ b/package.json
@@ -72,6 +72,10 @@
     "bootstrap": "4.0.0-beta.2",
     "cors": "^2.8.4",
     "dataloader": "^1.3.0",
+    "domain-graphql": "^0.0.7",
+    "domain-knex": "^0.0.7",
+    "domain-react-forms": "^0.0.7",
+    "domain-schema": "^0.0.7",
     "dotenv": "^4.0.0",
     "expo": "^23.0.0",
     "express": "^4.16.2",
diff --git a/yarn.lock b/yarn.lock
index 7c80ce8685..14e0c08ef1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3383,6 +3383,24 @@ domain-browser@^1.1.1:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
 
+domain-graphql@^0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/domain-graphql/-/domain-graphql-0.0.7.tgz#c7e2d8f9a4025dad859a7f9805306faf0054fb9e"
+
+domain-knex@^0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/domain-knex/-/domain-knex-0.0.7.tgz#134ae39221f523fbed5d717f200a8b3aaa1758d9"
+  dependencies:
+    humps "^2.0.1"
+
+domain-react-forms@^0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/domain-react-forms/-/domain-react-forms-0.0.7.tgz#8d3979a36e451568d9d0b3e1f09c1fae23448427"
+
+domain-schema@^0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/domain-schema/-/domain-schema-0.0.7.tgz#14daf81202438b02206036cd7723f21110f6e51b"
+
 domelementtype@1, domelementtype@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"

From 4984eae75d3049f5da14a83358e6cce1f77d55cb Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 21 Nov 2017 15:13:56 +0100
Subject: [PATCH 006/327] initial setup for cli `addcrud`

---
 tools/cli/module.js                           | 19 ++++++++++---------
 .../crud/database/migrations/_Module.js       |  7 +++++++
 .../templates/crud/database/seeds/_Module.js  |  9 +++++++++
 tools/templates/crud/server/schema.js         |  9 +++++++++
 4 files changed, 35 insertions(+), 9 deletions(-)
 create mode 100644 tools/templates/crud/database/migrations/_Module.js
 create mode 100644 tools/templates/crud/database/seeds/_Module.js
 create mode 100644 tools/templates/crud/server/schema.js

diff --git a/tools/cli/module.js b/tools/cli/module.js
index 042831def3..c0895cfcf2 100644
--- a/tools/cli/module.js
+++ b/tools/cli/module.js
@@ -16,7 +16,7 @@ String.prototype.capitalize = function() {
   return this.charAt(0).toUpperCase() + this.slice(1);
 };
 
-function copyFiles(logger, templatePath, module, location) {
+function copyFiles(logger, templatePath, module, action, location) {
   logger.info(`Copying ${location} files…`);
 
   // create new module directory
@@ -64,11 +64,15 @@ function copyFiles(logger, templatePath, module, location) {
     // add module to Feature function
     shell.sed('-i', re, `Feature(${module}, ${match[1]})`, 'index.js');
 
+    if (action === 'addcrud' && location === 'server') {
+      console.log('copy database files');
+    }
+
     logger.info(`✔ Module for ${location} successfully created!`);
   }
 }
 
-function deleteFiles(logger, templatePath, module, location) {
+function deleteFiles(logger, templatePath, module, action, location) {
   logger.info(`Deleting ${location} files…`);
 
   const modulePath = `${__dirname}/../../src/${location}/modules/${module}`;
@@ -80,9 +84,6 @@ function deleteFiles(logger, templatePath, module, location) {
     // change to destination directory
     shell.cd(`${__dirname}/../../src/${location}/modules/`);
 
-    // add module to Feature function
-    //let ok = shell.sed('-i', `import ${module} from '.\/${module}';`, '', 'index.js');
-
     // get module input data
     const path = `${__dirname}/../../src/${location}/modules/index.js`;
     let data = fs.readFileSync(path);
@@ -159,18 +160,18 @@ module.exports = (action, args, options, logger) => {
   // client
   if (location === 'client' || location === 'both') {
     if (action === 'addmodule' || action === 'addcrud') {
-      copyFiles(logger, templatePath, module, 'client');
+      copyFiles(logger, templatePath, module, action, 'client');
     } else if (action === 'deletemodule') {
-      deleteFiles(logger, templatePath, module, 'client');
+      deleteFiles(logger, templatePath, module, action, 'client');
     }
   }
 
   // server
   if (location === 'server' || location === 'both') {
     if (action === 'addmodule' || action === 'addcrud') {
-      copyFiles(logger, templatePath, module, 'server');
+      copyFiles(logger, templatePath, module, action, 'server');
     } else if (action === 'deletemodule') {
-      deleteFiles(logger, templatePath, module, 'server');
+      deleteFiles(logger, templatePath, module, action, 'server');
     }
   }
 
diff --git a/tools/templates/crud/database/migrations/_Module.js b/tools/templates/crud/database/migrations/_Module.js
new file mode 100644
index 0000000000..661a1a3b26
--- /dev/null
+++ b/tools/templates/crud/database/migrations/_Module.js
@@ -0,0 +1,7 @@
+import KnexGenerator from 'domain-knex';
+
+import { $Module$ } from '../../modules/$module$/schema';
+
+exports.up = knex => new KnexGenerator(knex).createTables($Module$);
+
+exports.down = knex => new KnexGenerator(knex).dropTables($Module$);
diff --git a/tools/templates/crud/database/seeds/_Module.js b/tools/templates/crud/database/seeds/_Module.js
new file mode 100644
index 0000000000..050959a956
--- /dev/null
+++ b/tools/templates/crud/database/seeds/_Module.js
@@ -0,0 +1,9 @@
+import truncateTables from '../../../common/db';
+
+export async function seed(knex, Promise) {
+  await truncateTables(knex, Promise, ['$module$']);
+
+  await knex('$module$')
+    .returning('id')
+    .insert({});
+}
diff --git a/tools/templates/crud/server/schema.js b/tools/templates/crud/server/schema.js
new file mode 100644
index 0000000000..ffe8d19155
--- /dev/null
+++ b/tools/templates/crud/server/schema.js
@@ -0,0 +1,9 @@
+import DomainSchema, { Schema } from 'domain-schema';
+
+/* eslint import/prefer-default-export: 0 */
+
+export const $Module$ = new DomainSchema(
+  class $Module$ extends Schema {
+    id = DomainSchema.Integer;
+  }
+);

From 74d6585fa6e405d0642c807e1d70eb6c7db6e9b7 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 21 Nov 2017 15:46:02 +0100
Subject: [PATCH 007/327] add database files

---
 tools/cli/module.js | 64 +++++++++++++++++++++++++++++++--------------
 1 file changed, 44 insertions(+), 20 deletions(-)

diff --git a/tools/cli/module.js b/tools/cli/module.js
index c0895cfcf2..09981ff916 100644
--- a/tools/cli/module.js
+++ b/tools/cli/module.js
@@ -16,6 +16,29 @@ String.prototype.capitalize = function() {
   return this.charAt(0).toUpperCase() + this.slice(1);
 };
 
+function renameFiles(destinationPath, templatePath, module, location) {
+  shell.cp('-R', `${templatePath}/${location}/*`, destinationPath);
+
+  // change to destination directory
+  shell.cd(destinationPath);
+
+  // rename files
+  shell.ls('-Rl', '.').forEach(entry => {
+    if (entry.isFile()) {
+      const moduleFile = entry.name.replace('Module', module.capitalize());
+      shell.mv(entry.name, moduleFile);
+    }
+  });
+
+  // replace module names
+  shell.ls('-Rl', '.').forEach(entry => {
+    if (entry.isFile()) {
+      shell.sed('-i', /\$module\$/g, module, entry.name);
+      shell.sed('-i', /\$Module\$/g, module.toCamelCase().capitalize(), entry.name);
+    }
+  });
+}
+
 function copyFiles(logger, templatePath, module, action, location) {
   logger.info(`Copying ${location} files…`);
 
@@ -25,29 +48,10 @@ function copyFiles(logger, templatePath, module, action, location) {
   // continue only if directory does not jet exist
   if (mkdir.code === 0) {
     const destinationPath = `${__dirname}/../../src/${location}/modules/${module}`;
-    shell.cp('-R', `${templatePath}/${location}/*`, destinationPath);
+    renameFiles(destinationPath, templatePath, module, location);
 
     logger.info(`✔ The ${location} files have been copied!`);
 
-    // change to destination directory
-    shell.cd(destinationPath);
-
-    // rename files
-    shell.ls('-Rl', '.').forEach(entry => {
-      if (entry.isFile()) {
-        const moduleFile = entry.name.replace('Module', module.capitalize());
-        shell.mv(entry.name, moduleFile);
-      }
-    });
-
-    // replace module names
-    shell.ls('-Rl', '.').forEach(entry => {
-      if (entry.isFile()) {
-        shell.sed('-i', /\$module\$/g, module, entry.name);
-        shell.sed('-i', /\$Module\$/g, module.toCamelCase().capitalize(), entry.name);
-      }
-    });
-
     shell.cd('..');
     // get module input data
     const path = `${__dirname}/../../src/${location}/modules/index.js`;
@@ -66,6 +70,16 @@ function copyFiles(logger, templatePath, module, action, location) {
 
     if (action === 'addcrud' && location === 'server') {
       console.log('copy database files');
+      const destinationPath = `${__dirname}/../../src/${location}/database`;
+      renameFiles(destinationPath, templatePath, module, 'database');
+
+      const timestamp = new Date().getTime();
+      shell.cd(`${__dirname}/../../src/${location}/database/migrations`);
+      shell.mv(`_${module.toCamelCase().capitalize()}.js`, `${timestamp}_${module.toCamelCase().capitalize()}.js`);
+      shell.cd(`${__dirname}/../../src/${location}/database/seeds`);
+      shell.mv(`_${module.toCamelCase().capitalize()}.js`, `${timestamp}_${module.toCamelCase().capitalize()}.js`);
+
+      logger.info(`✔ The database files have been copied!`);
     }
 
     logger.info(`✔ Module for ${location} successfully created!`);
@@ -103,6 +117,16 @@ function deleteFiles(logger, templatePath, module, action, location) {
     // remove module from Feature function
     shell.sed('-i', re, `Feature(${modules.toString().trim()})`, 'index.js');
 
+    if (action === 'addcrud' && location === 'server') {
+      // change to destination directory
+      shell.cd(`${__dirname}/../../src/${location}/database/migrations`);
+      // TODO: remove database files
+      /*const aa = shell.find('.').filter(function(file) {
+        return file.match(/\.js$/);
+      });
+      console.log(aa);*/
+    }
+
     // continue only if directory does not jet exist
     logger.info(`✔ Module for ${location} successfully deleted!`);
   } else {

From 4792baa26a81ba64b6bd8f01417a42c82f694eab Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 22 Nov 2017 08:11:20 +0100
Subject: [PATCH 008/327] handle migration files, add log colors, fix
 `schemaupdate`

---
 tools/cli/module.js                           | 91 +++++++++++--------
 .../{ModuleQuery.graphql => Module.graphql}   |  0
 2 files changed, 55 insertions(+), 36 deletions(-)
 rename tools/templates/crud/client/graphql/{ModuleQuery.graphql => Module.graphql} (100%)

diff --git a/tools/cli/module.js b/tools/cli/module.js
index 09981ff916..75e2a72242 100644
--- a/tools/cli/module.js
+++ b/tools/cli/module.js
@@ -4,6 +4,7 @@ require('babel-polyfill');
 
 const shell = require('shelljs');
 const fs = require('fs');
+const chalk = require('chalk');
 
 String.prototype.toCamelCase = function() {
   return this.replace(/^([A-Z])|\s(\w)/g, function(match, p1, p2) {
@@ -50,7 +51,7 @@ function copyFiles(logger, templatePath, module, action, location) {
     const destinationPath = `${__dirname}/../../src/${location}/modules/${module}`;
     renameFiles(destinationPath, templatePath, module, location);
 
-    logger.info(`✔ The ${location} files have been copied!`);
+    logger.info(chalk.green(`✔ The ${location} files have been copied!`));
 
     shell.cd('..');
     // get module input data
@@ -79,14 +80,14 @@ function copyFiles(logger, templatePath, module, action, location) {
       shell.cd(`${__dirname}/../../src/${location}/database/seeds`);
       shell.mv(`_${module.toCamelCase().capitalize()}.js`, `${timestamp}_${module.toCamelCase().capitalize()}.js`);
 
-      logger.info(`✔ The database files have been copied!`);
+      logger.info(chalk.green(`✔ The database files have been copied!`));
     }
 
-    logger.info(`✔ Module for ${location} successfully created!`);
+    logger.info(chalk.green(`✔ Module for ${location} successfully created!`));
   }
 }
 
-function deleteFiles(logger, templatePath, module, action, location) {
+function deleteFiles(logger, templatePath, module, location) {
   logger.info(`Deleting ${location} files…`);
 
   const modulePath = `${__dirname}/../../src/${location}/modules/${module}`;
@@ -117,20 +118,32 @@ function deleteFiles(logger, templatePath, module, action, location) {
     // remove module from Feature function
     shell.sed('-i', re, `Feature(${modules.toString().trim()})`, 'index.js');
 
-    if (action === 'addcrud' && location === 'server') {
-      // change to destination directory
+    if (location === 'server') {
+      // change to database migrations directory
       shell.cd(`${__dirname}/../../src/${location}/database/migrations`);
-      // TODO: remove database files
-      /*const aa = shell.find('.').filter(function(file) {
-        return file.match(/\.js$/);
-      });
-      console.log(aa);*/
+      // check if any migrations files for this module exist
+      if (shell.find('.').filter(file => file.search(`_${module.toCamelCase().capitalize()}.js`) > -1).length > 0) {
+        let okMigrations = shell.rm(`*_${module.toCamelCase().capitalize()}.js`);
+        if (okMigrations) {
+          logger.info(chalk.green(`✔ Database migrations files successfully deleted!`));
+        }
+      }
+
+      // change to database seeds directory
+      shell.cd(`${__dirname}/../../src/${location}/database/seeds`);
+      // check if any seed files for this module exist
+      if (shell.find('.').filter(file => file.search(`_${module.toCamelCase().capitalize()}.js`) > -1).length > 0) {
+        let okSeeds = shell.rm(`*_${module.toCamelCase().capitalize()}.js`);
+        if (okSeeds) {
+          logger.info(chalk.green(`✔ Database seed files successfully deleted!`));
+        }
+      }
     }
 
     // continue only if directory does not jet exist
-    logger.info(`✔ Module for ${location} successfully deleted!`);
+    logger.info(chalk.green(`✔ Module for ${location} successfully deleted!`));
   } else {
-    logger.info(`✔ Module ${location} location for ${modulePath} wasn't found!`);
+    logger.info(chalk.red(`✘ Module ${location} location for ${modulePath} not found!`));
   }
 }
 
@@ -139,29 +152,35 @@ function updateSchema(logger, module) {
 
   // get fragment file
   const path = `${__dirname}/../../src/client/modules/${module}/graphql/`;
-  const file = `${module.toCamelCase().capitalize()}.graphql`;
-  const re = /\{([^()]+)\}/g;
+  if (fs.existsSync(path)) {
+    const file = `${module.toCamelCase().capitalize()}.graphql`;
+    const re = /\{([^()]+)\}/g;
 
-  // get module schema
-  const schema = require(`../../src/server/modules/${module}/schema`);
+    // get module schema
+    const schema = require(`../../src/server/modules/${module}/schema`);
 
-  // regenerate graphql fragment
-  let graphql = '{\n';
-  for (const key of Object.keys(schema[module.toCamelCase().capitalize()].values)) {
-    graphql += `  ${key}\n`;
+    // regenerate graphql fragment
+    let graphql = '{\n';
+    for (const key of Object.keys(schema[module.toCamelCase().capitalize()].values)) {
+      graphql += `  ${key}\n`;
+    }
+    graphql += '}';
+
+    // override graphql fragment file
+    shell.cd(path);
+    // remove all new lines
+    shell.exec(`tr -d '\n' < ${file} > ${file}.tmp`);
+    // replace content
+    shell.sed('-i', re, graphql, `${file}.tmp`);
+    // remove old file
+    shell.rm(file);
+    // rename tmp file
+    shell.mv(`${file}.tmp`, file);
+
+    logger.info(chalk.green(`✔ Fragment in ${path}${file} successfully updated!`));
+  } else {
+    logger.error(chalk.red(`✘ Path ${path} not found!`));
   }
-  graphql += '}';
-
-  // override graphql fragment file
-  shell.cd(path);
-  // remove all new lines
-  shell.exec(`tr -d '\n' < ${file} > ${file}.tmp`);
-  // replace content
-  shell.sed('-i', re, graphql, `${file}.tmp`);
-  // remove old file
-  shell.rm(file);
-  // rename tmp file
-  shell.mv(`${file}.tmp`, file);
 }
 
 module.exports = (action, args, options, logger) => {
@@ -177,7 +196,7 @@ module.exports = (action, args, options, logger) => {
   }
 
   if (!fs.existsSync(templatePath)) {
-    logger.error(`The requested location for ${location} wasn't found.`);
+    logger.error(chalk.red(`The requested location for ${location} not found.`));
     process.exit(1);
   }
 
@@ -186,7 +205,7 @@ module.exports = (action, args, options, logger) => {
     if (action === 'addmodule' || action === 'addcrud') {
       copyFiles(logger, templatePath, module, action, 'client');
     } else if (action === 'deletemodule') {
-      deleteFiles(logger, templatePath, module, action, 'client');
+      deleteFiles(logger, templatePath, module, 'client');
     }
   }
 
@@ -195,7 +214,7 @@ module.exports = (action, args, options, logger) => {
     if (action === 'addmodule' || action === 'addcrud') {
       copyFiles(logger, templatePath, module, action, 'server');
     } else if (action === 'deletemodule') {
-      deleteFiles(logger, templatePath, module, action, 'server');
+      deleteFiles(logger, templatePath, module, 'server');
     }
   }
 
diff --git a/tools/templates/crud/client/graphql/ModuleQuery.graphql b/tools/templates/crud/client/graphql/Module.graphql
similarity index 100%
rename from tools/templates/crud/client/graphql/ModuleQuery.graphql
rename to tools/templates/crud/client/graphql/Module.graphql

From 01d6db62f7c025f1fc5f99c3ca15d882fb9b744a Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 22 Nov 2017 08:57:23 +0100
Subject: [PATCH 009/327] auto generate select

---
 knexfile.js                                 | 2 +-
 src/server/modules/user/sql.js              | 1 -
 tools/templates/crud/server/index.js        | 5 ++++-
 tools/templates/crud/server/resolvers.js    | 6 +++++-
 tools/templates/crud/server/schema.graphqls | 4 +++-
 tools/templates/crud/server/sql.js          | 9 +++++++--
 6 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/knexfile.js b/knexfile.js
index 280055a346..23f3d2caf8 100644
--- a/knexfile.js
+++ b/knexfile.js
@@ -1,5 +1,5 @@
 /* eslint import/no-extraneous-dependencies: 0 */
-require('babel-register')({ presets: ['env'] });
+require('babel-register')({ presets: ['env'], plugins: ['transform-class-properties'] });
 require('babel-polyfill');
 const config = require('./knexdata');
 
diff --git a/src/server/modules/user/sql.js b/src/server/modules/user/sql.js
index 4be3a1f7a1..3e989b4822 100644
--- a/src/server/modules/user/sql.js
+++ b/src/server/modules/user/sql.js
@@ -1,4 +1,3 @@
-// Helpers
 import { camelizeKeys, decamelizeKeys, decamelize } from 'humps';
 import { has } from 'lodash';
 import bcrypt from 'bcryptjs';
diff --git a/tools/templates/crud/server/index.js b/tools/templates/crud/server/index.js
index 250cfbc59f..4dad072b00 100644
--- a/tools/templates/crud/server/index.js
+++ b/tools/templates/crud/server/index.js
@@ -1,10 +1,13 @@
+import GraphQLGenerator from 'domain-graphql';
+
+import { $Module$ as $Module$Schema } from './schema';
 import $Module$ from './sql';
 import schema from './schema.graphqls';
 import createResolvers from './resolvers';
 import Feature from '../connector';
 
 export default new Feature({
-  schema,
+  schema: [schema, new GraphQLGenerator().generateTypes($Module$Schema)],
   createResolversFunc: createResolvers,
   createContextFunc: () => ({ $Module$: new $Module$() })
 });
diff --git a/tools/templates/crud/server/resolvers.js b/tools/templates/crud/server/resolvers.js
index 13582f9182..a55f46ac02 100644
--- a/tools/templates/crud/server/resolvers.js
+++ b/tools/templates/crud/server/resolvers.js
@@ -1,6 +1,10 @@
 /*eslint-disable no-unused-vars*/
 export default pubsub => ({
-  Query: {},
+  Query: {
+    $module$s: (obj, args, { $Module$ }) => {
+      return $Module$.get$Module$s();
+    }
+  },
   Mutation: {},
   Subscription: {}
 });
diff --git a/tools/templates/crud/server/schema.graphqls b/tools/templates/crud/server/schema.graphqls
index b224b3517b..6dc1ba5533 100644
--- a/tools/templates/crud/server/schema.graphqls
+++ b/tools/templates/crud/server/schema.graphqls
@@ -1,4 +1,6 @@
-extend type Query {}
+extend type Query {
+  $module$s: [$Module$]
+}
 
 extend type Mutation {}
 
diff --git a/tools/templates/crud/server/sql.js b/tools/templates/crud/server/sql.js
index a358efaab1..628f840a83 100644
--- a/tools/templates/crud/server/sql.js
+++ b/tools/templates/crud/server/sql.js
@@ -1,4 +1,9 @@
-/*eslint-disable no-unused-vars*/
+import { camelizeKeys } from 'humps';
+
 import knex from '../../../server/sql/connector';
 
-export default class $Module$ {}
+export default class $Module$ {
+  async get$Module$s() {
+    return camelizeKeys(await knex.select('id').from('$module$'));
+  }
+}

From c3f66e22c4abc0dd06dbc058d11904f4194b56b8 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 22 Nov 2017 11:21:18 +0100
Subject: [PATCH 010/327] module list

---
 .../modules/user/containers/UsersList.jsx     |  5 ---
 tools/cli/module.js                           |  1 +
 .../{ModuleView.jsx => ModuleListView.jsx}    |  4 +--
 .../client/components/ModuleListView.web.jsx  | 32 +++++++++++++++++++
 .../crud/client/components/ModuleView.web.jsx | 28 ----------------
 .../crud/client/containers/Module.jsx         | 15 ---------
 .../crud/client/containers/ModuleList.jsx     | 26 +++++++++++++++
 .../crud/client/graphql/ModulesQuery.graphql  |  7 ++++
 tools/templates/crud/client/index.jsx         |  4 +--
 tools/templates/crud/client/index.web.jsx     |  4 +--
 .../client/components/ModuleView.web.jsx      |  2 +-
 11 files changed, 73 insertions(+), 55 deletions(-)
 rename tools/templates/crud/client/components/{ModuleView.jsx => ModuleListView.jsx} (88%)
 create mode 100644 tools/templates/crud/client/components/ModuleListView.web.jsx
 delete mode 100644 tools/templates/crud/client/components/ModuleView.web.jsx
 delete mode 100644 tools/templates/crud/client/containers/Module.jsx
 create mode 100644 tools/templates/crud/client/containers/ModuleList.jsx
 create mode 100644 tools/templates/crud/client/graphql/ModulesQuery.graphql

diff --git a/src/client/modules/user/containers/UsersList.jsx b/src/client/modules/user/containers/UsersList.jsx
index a220c7850b..0f89ac0eea 100644
--- a/src/client/modules/user/containers/UsersList.jsx
+++ b/src/client/modules/user/containers/UsersList.jsx
@@ -1,15 +1,10 @@
 /*eslint-disable no-unused-vars*/
-// React
 import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-
-// Apollo
 import { graphql, compose } from 'react-apollo';
 
-// Components
 import UsersListView from '../components/UsersListView';
-
 import USERS_QUERY from '../graphql/UsersQuery.graphql';
 import DELETE_USER from '../graphql/DeleteUser.graphql';
 
diff --git a/tools/cli/module.js b/tools/cli/module.js
index 75e2a72242..c9642eea61 100644
--- a/tools/cli/module.js
+++ b/tools/cli/module.js
@@ -36,6 +36,7 @@ function renameFiles(destinationPath, templatePath, module, location) {
     if (entry.isFile()) {
       shell.sed('-i', /\$module\$/g, module, entry.name);
       shell.sed('-i', /\$Module\$/g, module.toCamelCase().capitalize(), entry.name);
+      shell.sed('-i', /\$MODULE\$/g, module.toUpperCase(), entry.name);
     }
   });
 }
diff --git a/tools/templates/crud/client/components/ModuleView.jsx b/tools/templates/crud/client/components/ModuleListView.jsx
similarity index 88%
rename from tools/templates/crud/client/components/ModuleView.jsx
rename to tools/templates/crud/client/components/ModuleListView.jsx
index 04c16384fe..8397d51928 100644
--- a/tools/templates/crud/client/components/ModuleView.jsx
+++ b/tools/templates/crud/client/components/ModuleListView.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { StyleSheet, Text, View } from 'react-native';
 
-const $Module$View = () => {
+const $Module$ListView = () => {
   return (
     <View style={styles.container}>
       <View style={styles.element}>
@@ -28,4 +28,4 @@ const styles = StyleSheet.create({
   }
 });
 
-export default $Module$View;
+export default $Module$ListView;
diff --git a/tools/templates/crud/client/components/ModuleListView.web.jsx b/tools/templates/crud/client/components/ModuleListView.web.jsx
new file mode 100644
index 0000000000..8e2b8530f8
--- /dev/null
+++ b/tools/templates/crud/client/components/ModuleListView.web.jsx
@@ -0,0 +1,32 @@
+import React from 'react';
+import Helmet from 'react-helmet';
+import { PageLayout } from '../../common/components/web';
+
+class $Module$ListView extends React.PureComponent {
+  renderMetaData = () => (
+    <Helmet
+      title="$Module$"
+      meta={[
+        {
+          name: 'description',
+          content: '$Module$ page'
+        }
+      ]}
+    />
+  );
+
+  render() {
+    const { loading, $module$s } = this.props;
+    console.log($module$s);
+    return (
+      <PageLayout>
+        {this.renderMetaData()}
+        <div className="text-center">
+          <p>Hello $Module$ list!</p>
+        </div>
+      </PageLayout>
+    );
+  }
+};
+
+export default $Module$ListView;
diff --git a/tools/templates/crud/client/components/ModuleView.web.jsx b/tools/templates/crud/client/components/ModuleView.web.jsx
deleted file mode 100644
index 49bca7ba8b..0000000000
--- a/tools/templates/crud/client/components/ModuleView.web.jsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import React from 'react';
-import Helmet from 'react-helmet';
-import { PageLayout } from '../../common/components/web';
-
-const renderMetaData = () => (
-  <Helmet
-    title="$Module$"
-    meta={[
-      {
-        name: 'description',
-        content: '$Module$ page'
-      }
-    ]}
-  />
-);
-
-const $Module$View = () => {
-  return (
-    <PageLayout>
-      {renderMetaData()}
-      <div className="text-center mt-4 mb-4">
-        <p>Hello $Module$!</p>
-      </div>
-    </PageLayout>
-  );
-};
-
-export default $Module$View;
diff --git a/tools/templates/crud/client/containers/Module.jsx b/tools/templates/crud/client/containers/Module.jsx
deleted file mode 100644
index 59510a61c5..0000000000
--- a/tools/templates/crud/client/containers/Module.jsx
+++ /dev/null
@@ -1,15 +0,0 @@
-/*eslint-disable no-unused-vars*/
-import React from 'react';
-import { graphql, compose } from 'react-apollo';
-
-import $Module$View from '../components/$Module$View';
-
-class $Module$ extends React.Component {
-  render() {
-    return <$Module$View {...this.props} />;
-  }
-}
-
-const $Module$WithApollo = compose()($Module$);
-
-export default $Module$WithApollo;
diff --git a/tools/templates/crud/client/containers/ModuleList.jsx b/tools/templates/crud/client/containers/ModuleList.jsx
new file mode 100644
index 0000000000..e0f1f26cf5
--- /dev/null
+++ b/tools/templates/crud/client/containers/ModuleList.jsx
@@ -0,0 +1,26 @@
+import React from 'react';
+import { graphql, compose } from 'react-apollo';
+
+import $Module$ListView from '../components/$Module$ListView';
+import $MODULE$S_QUERY from '../graphql/$Module$sQuery.graphql';
+
+class $Module$ extends React.Component {
+  render() {
+    return <$Module$ListView {...this.props} />;
+  }
+}
+
+const $Module$WithApollo = compose(
+  graphql($MODULE$S_QUERY, {
+    options: () => {
+      return {
+        fetchPolicy: 'cache-and-network'
+      };
+    },
+    props({ data: { loading, $module$s, refetch, error } }) {
+      return { loading, $module$s, refetch, errors: error ? error.graphQLErrors : null };
+    }
+  }),
+)($Module$);
+
+export default $Module$WithApollo;
diff --git a/tools/templates/crud/client/graphql/ModulesQuery.graphql b/tools/templates/crud/client/graphql/ModulesQuery.graphql
new file mode 100644
index 0000000000..b818cb8fbc
--- /dev/null
+++ b/tools/templates/crud/client/graphql/ModulesQuery.graphql
@@ -0,0 +1,7 @@
+#import "./$Module$.graphql"
+
+query $module$s {
+  $module$s {
+    ...$Module$Info
+  }
+}
diff --git a/tools/templates/crud/client/index.jsx b/tools/templates/crud/client/index.jsx
index e61b873a24..907df0b37c 100644
--- a/tools/templates/crud/client/index.jsx
+++ b/tools/templates/crud/client/index.jsx
@@ -1,6 +1,6 @@
 import { Ionicons } from '@expo/vector-icons';
 import { createTabBarIconWrapper } from '../common/components/native';
-import $Module$ from './containers/$Module$';
+import $Module$List from './containers/$Module$List';
 import reducers from './reducers';
 
 import Feature from '../connector';
@@ -8,7 +8,7 @@ import Feature from '../connector';
 export default new Feature({
   tabItem: {
     $Module$: {
-      screen: $Module$,
+      screen: $Module$List,
       navigationOptions: {
         tabBarIcon: createTabBarIconWrapper(Ionicons, {
           name: 'ios-browsers-outline',
diff --git a/tools/templates/crud/client/index.web.jsx b/tools/templates/crud/client/index.web.jsx
index ba6a70cd43..560e9ea9b3 100644
--- a/tools/templates/crud/client/index.web.jsx
+++ b/tools/templates/crud/client/index.web.jsx
@@ -1,13 +1,13 @@
 import React from 'react';
 import { Route, NavLink } from 'react-router-dom';
 import { MenuItem } from '../../modules/common/components/web';
-import $Module$ from './containers/$Module$';
+import $Module$List from './containers/$Module$List';
 import reducers from './reducers';
 
 import Feature from '../connector';
 
 export default new Feature({
-  route: <Route exact path="/$module$" component={$Module$} />,
+  route: <Route exact path="/$module$" component={$Module$List} />,
   navItem: (
     <MenuItem key="$module$">
       <NavLink to="/$module$" className="nav-link" activeClassName="active">
diff --git a/tools/templates/module/client/components/ModuleView.web.jsx b/tools/templates/module/client/components/ModuleView.web.jsx
index 49bca7ba8b..0f3c1bfe3e 100644
--- a/tools/templates/module/client/components/ModuleView.web.jsx
+++ b/tools/templates/module/client/components/ModuleView.web.jsx
@@ -18,7 +18,7 @@ const $Module$View = () => {
   return (
     <PageLayout>
       {renderMetaData()}
-      <div className="text-center mt-4 mb-4">
+      <div className="text-center">
         <p>Hello $Module$!</p>
       </div>
     </PageLayout>

From 4c21c15beaba4a838d54f84b363cd7418ee76563 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 22 Nov 2017 11:46:05 +0100
Subject: [PATCH 011/327] list table

---
 .../modules/ui-bootstrap/components/Table.jsx |  8 +--
 .../client/components/ModuleListView.web.jsx  | 49 +++++++++++++++++--
 2 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/src/client/modules/ui-bootstrap/components/Table.jsx b/src/client/modules/ui-bootstrap/components/Table.jsx
index 4cb4e0f62f..82e44d8374 100644
--- a/src/client/modules/ui-bootstrap/components/Table.jsx
+++ b/src/client/modules/ui-bootstrap/components/Table.jsx
@@ -24,20 +24,22 @@ const renderData = (columns, entry) => {
   });
 };
 
-const Table = ({ dataSource, columns, ...props }) => {
+const Table = ({ dataSource, columns, pagination, loading, ...props }) => {
   return (
     <RSTable {...props}>
       <thead>
         <tr>{renderHead(columns)}</tr>
       </thead>
-      <tbody>{renderBody(columns, dataSource)}</tbody>
+      <tbody>{dataSource && renderBody(columns, dataSource)}</tbody>
     </RSTable>
   );
 };
 
 Table.propTypes = {
   dataSource: PropTypes.array,
-  columns: PropTypes.array
+  columns: PropTypes.array,
+  pagination: PropTypes.bool,
+  loading: PropTypes.bool
 };
 
 export default Table;
diff --git a/tools/templates/crud/client/components/ModuleListView.web.jsx b/tools/templates/crud/client/components/ModuleListView.web.jsx
index 8e2b8530f8..df185ad32b 100644
--- a/tools/templates/crud/client/components/ModuleListView.web.jsx
+++ b/tools/templates/crud/client/components/ModuleListView.web.jsx
@@ -1,6 +1,9 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 import Helmet from 'react-helmet';
-import { PageLayout } from '../../common/components/web';
+import { Link } from 'react-router-dom';
+
+import { PageLayout, Table, Button } from '../../common/components/web';
 
 class $Module$ListView extends React.PureComponent {
   renderMetaData = () => (
@@ -15,18 +18,54 @@ class $Module$ListView extends React.PureComponent {
     />
   );
 
+  hendleDelete$Module$ = async id => {
+    console.log(id);
+    /*const { deleteUser } = this.props;
+    const result = await deleteUser(id);
+    if (result && result.errors) {
+      this.setState({ errors: result.errors });
+    } else {
+      this.setState({ errors: [] });
+    }*/
+  };
+
+  columns = [
+    {
+      title: 'Id',
+      dataIndex: 'id',
+      key: 'id',
+      render: (text, record) => (
+        <Link className="$module$-link" to={`/$module$/${record.id}`}>
+          {text}
+        </Link>
+      )
+    },
+    {
+      title: 'Actions',
+      key: 'actions',
+      render: (text, record) => (
+        <Button color="primary" size="sm" onClick={() => this.hendleDelete$Module$(record.id)}>
+          Delete
+        </Button>
+      )
+    }
+  ];
+
   render() {
     const { loading, $module$s } = this.props;
-    console.log($module$s);
+
     return (
       <PageLayout>
         {this.renderMetaData()}
-        <div className="text-center">
-          <p>Hello $Module$ list!</p>
-        </div>
+        <Table dataSource={$module$s} columns={this.columns} pagination={false} loading={loading && !$module$s} />
       </PageLayout>
     );
   }
+}
+
+$Module$ListView.propTypes = {
+  loading: PropTypes.bool.isRequired,
+  $module$s: PropTypes.array
 };
 
 export default $Module$ListView;

From 1edfdecb4405fad7415bed8ac2484b998a677ad3 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 22 Nov 2017 13:09:35 +0100
Subject: [PATCH 012/327] refactor update schema

---
 tools/cli/module.js | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/tools/cli/module.js b/tools/cli/module.js
index c9642eea61..2d9ff01e84 100644
--- a/tools/cli/module.js
+++ b/tools/cli/module.js
@@ -155,28 +155,19 @@ function updateSchema(logger, module) {
   const path = `${__dirname}/../../src/client/modules/${module}/graphql/`;
   if (fs.existsSync(path)) {
     const file = `${module.toCamelCase().capitalize()}.graphql`;
-    const re = /\{([^()]+)\}/g;
 
     // get module schema
     const schema = require(`../../src/server/modules/${module}/schema`);
 
     // regenerate graphql fragment
-    let graphql = '{\n';
+    let graphql = '';
     for (const key of Object.keys(schema[module.toCamelCase().capitalize()].values)) {
       graphql += `  ${key}\n`;
     }
-    graphql += '}';
 
-    // override graphql fragment file
     shell.cd(path);
-    // remove all new lines
-    shell.exec(`tr -d '\n' < ${file} > ${file}.tmp`);
-    // replace content
-    shell.sed('-i', re, graphql, `${file}.tmp`);
-    // remove old file
-    shell.rm(file);
-    // rename tmp file
-    shell.mv(`${file}.tmp`, file);
+    // override graphql fragment file
+    shell.ShellString(shell.cat(file).replace(/Crud {(.|\n)*\n}/, `Crud {\n${graphql}}`)).to(file);
 
     logger.info(chalk.green(`✔ Fragment in ${path}${file} successfully updated!`));
   } else {

From 97b1fe3937ffed121f0a90b2b5593c870b124ed2 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 22 Nov 2017 13:42:45 +0100
Subject: [PATCH 013/327] make it work if adding new field to schema

---
 src/client/modules/common/util.js             | 43 +++++++++++++++++++
 .../client/components/ModuleListView.web.jsx  | 31 ++++---------
 tools/templates/crud/server/sql.js            |  2 +-
 3 files changed, 52 insertions(+), 24 deletions(-)
 create mode 100644 src/client/modules/common/util.js

diff --git a/src/client/modules/common/util.js b/src/client/modules/common/util.js
new file mode 100644
index 0000000000..1583440f42
--- /dev/null
+++ b/src/client/modules/common/util.js
@@ -0,0 +1,43 @@
+/* eslint-disable react/display-name */
+import React from 'react';
+import { Link } from 'react-router-dom';
+import { Button } from './components/web';
+
+const createTableColumns = schema => {
+  let columns = [];
+
+  for (const key of Object.keys(schema.values)) {
+    if (key === 'id') {
+      columns.push({
+        title: 'Id',
+        dataIndex: 'id',
+        key: 'id',
+        render: (text, record) => (
+          <Link className="$module$-link" to={`/$module$/${record.id}`}>
+            {text}
+          </Link>
+        )
+      });
+    } else {
+      columns.push({
+        title: key,
+        dataIndex: key,
+        key: key
+      });
+    }
+  }
+
+  columns.push({
+    title: 'Actions',
+    key: 'actions',
+    render: (text, record) => (
+      <Button color="primary" size="sm" onClick={() => this.hendleDeleteCrud(record.id)}>
+        Delete
+      </Button>
+    )
+  });
+
+  return columns;
+};
+
+export default createTableColumns;
diff --git a/tools/templates/crud/client/components/ModuleListView.web.jsx b/tools/templates/crud/client/components/ModuleListView.web.jsx
index df185ad32b..1cf0ec414e 100644
--- a/tools/templates/crud/client/components/ModuleListView.web.jsx
+++ b/tools/templates/crud/client/components/ModuleListView.web.jsx
@@ -4,6 +4,8 @@ import Helmet from 'react-helmet';
 import { Link } from 'react-router-dom';
 
 import { PageLayout, Table, Button } from '../../common/components/web';
+import createTableColumns from '../../common/util';
+import { $Module$ as $Module$Schema } from '../../../../server/modules/$module$/schema';
 
 class $Module$ListView extends React.PureComponent {
   renderMetaData = () => (
@@ -29,35 +31,18 @@ class $Module$ListView extends React.PureComponent {
     }*/
   };
 
-  columns = [
-    {
-      title: 'Id',
-      dataIndex: 'id',
-      key: 'id',
-      render: (text, record) => (
-        <Link className="$module$-link" to={`/$module$/${record.id}`}>
-          {text}
-        </Link>
-      )
-    },
-    {
-      title: 'Actions',
-      key: 'actions',
-      render: (text, record) => (
-        <Button color="primary" size="sm" onClick={() => this.hendleDelete$Module$(record.id)}>
-          Delete
-        </Button>
-      )
-    }
-  ];
-
   render() {
     const { loading, $module$s } = this.props;
 
     return (
       <PageLayout>
         {this.renderMetaData()}
-        <Table dataSource={$module$s} columns={this.columns} pagination={false} loading={loading && !$module$s} />
+        <Table
+          dataSource={$module$s}
+          columns={createTableColumns($Module$Schema)}
+          pagination={false}
+          loading={loading && !$module$s}
+        />
       </PageLayout>
     );
   }
diff --git a/tools/templates/crud/server/sql.js b/tools/templates/crud/server/sql.js
index 628f840a83..0041714244 100644
--- a/tools/templates/crud/server/sql.js
+++ b/tools/templates/crud/server/sql.js
@@ -4,6 +4,6 @@ import knex from '../../../server/sql/connector';
 
 export default class $Module$ {
   async get$Module$s() {
-    return camelizeKeys(await knex.select('id').from('$module$'));
+    return camelizeKeys(await knex.select('*').from('$module$'));
   }
 }

From 0b45c88e3ec1e1d968d81d0ed639773c7b3046bd Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 22 Nov 2017 14:14:02 +0100
Subject: [PATCH 014/327] delete entry

---
 src/client/modules/common/util.js             |  4 +--
 .../client/components/ModuleListView.web.jsx  | 20 ++++++---------
 .../crud/client/containers/ModuleList.jsx     | 20 +++++++++++++++
 .../crud/client/graphql/DeleteModule.graphql  | 11 ++++++++
 tools/templates/crud/server/resolvers.js      | 25 ++++++++++++++++++-
 tools/templates/crud/server/schema.graphqls   |  9 ++++++-
 tools/templates/crud/server/sql.js            | 10 ++++++++
 7 files changed, 82 insertions(+), 17 deletions(-)
 create mode 100644 tools/templates/crud/client/graphql/DeleteModule.graphql

diff --git a/src/client/modules/common/util.js b/src/client/modules/common/util.js
index 1583440f42..a5ea41ecc9 100644
--- a/src/client/modules/common/util.js
+++ b/src/client/modules/common/util.js
@@ -3,7 +3,7 @@ import React from 'react';
 import { Link } from 'react-router-dom';
 import { Button } from './components/web';
 
-const createTableColumns = schema => {
+const createTableColumns = (schema, hendleDelete) => {
   let columns = [];
 
   for (const key of Object.keys(schema.values)) {
@@ -31,7 +31,7 @@ const createTableColumns = schema => {
     title: 'Actions',
     key: 'actions',
     render: (text, record) => (
-      <Button color="primary" size="sm" onClick={() => this.hendleDeleteCrud(record.id)}>
+      <Button color="primary" size="sm" onClick={() => hendleDelete(record.id)}>
         Delete
       </Button>
     )
diff --git a/tools/templates/crud/client/components/ModuleListView.web.jsx b/tools/templates/crud/client/components/ModuleListView.web.jsx
index 1cf0ec414e..40c0a1042f 100644
--- a/tools/templates/crud/client/components/ModuleListView.web.jsx
+++ b/tools/templates/crud/client/components/ModuleListView.web.jsx
@@ -1,9 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import Helmet from 'react-helmet';
-import { Link } from 'react-router-dom';
 
-import { PageLayout, Table, Button } from '../../common/components/web';
+import { PageLayout, Table } from '../../common/components/web';
 import createTableColumns from '../../common/util';
 import { $Module$ as $Module$Schema } from '../../../../server/modules/$module$/schema';
 
@@ -20,15 +19,9 @@ class $Module$ListView extends React.PureComponent {
     />
   );
 
-  hendleDelete$Module$ = async id => {
-    console.log(id);
-    /*const { deleteUser } = this.props;
-    const result = await deleteUser(id);
-    if (result && result.errors) {
-      this.setState({ errors: result.errors });
-    } else {
-      this.setState({ errors: [] });
-    }*/
+  hendleDelete$Module$ = id => {
+    const { delete$Module$ } = this.props;
+    delete$Module$(id);
   };
 
   render() {
@@ -39,7 +32,7 @@ class $Module$ListView extends React.PureComponent {
         {this.renderMetaData()}
         <Table
           dataSource={$module$s}
-          columns={createTableColumns($Module$Schema)}
+          columns={createTableColumns($Module$Schema, this.hendleDelete$Module$)}
           pagination={false}
           loading={loading && !$module$s}
         />
@@ -50,7 +43,8 @@ class $Module$ListView extends React.PureComponent {
 
 $Module$ListView.propTypes = {
   loading: PropTypes.bool.isRequired,
-  $module$s: PropTypes.array
+  $module$s: PropTypes.array,
+  delete$Module$: PropTypes.func.isRequired
 };
 
 export default $Module$ListView;
diff --git a/tools/templates/crud/client/containers/ModuleList.jsx b/tools/templates/crud/client/containers/ModuleList.jsx
index e0f1f26cf5..0bf57d2e17 100644
--- a/tools/templates/crud/client/containers/ModuleList.jsx
+++ b/tools/templates/crud/client/containers/ModuleList.jsx
@@ -3,6 +3,7 @@ import { graphql, compose } from 'react-apollo';
 
 import $Module$ListView from '../components/$Module$ListView';
 import $MODULE$S_QUERY from '../graphql/$Module$sQuery.graphql';
+import DELETE_$MODULE$ from '../graphql/Delete$Module$.graphql';
 
 class $Module$ extends React.Component {
   render() {
@@ -21,6 +22,25 @@ const $Module$WithApollo = compose(
       return { loading, $module$s, refetch, errors: error ? error.graphQLErrors : null };
     }
   }),
+  graphql(DELETE_$MODULE$, {
+    props: ({ ownProps: { refetch }, mutate }) => ({
+      delete$Module$: async id => {
+        try {
+          const { data: { delete$Module$ } } = await mutate({
+            variables: { id }
+          });
+
+          if (delete$Module$.errors) {
+            return { errors: delete$Module$.errors };
+          }
+
+          refetch();
+        } catch (e) {
+          console.log(e.graphQLErrors);
+        }
+      }
+    })
+  })
 )($Module$);
 
 export default $Module$WithApollo;
diff --git a/tools/templates/crud/client/graphql/DeleteModule.graphql b/tools/templates/crud/client/graphql/DeleteModule.graphql
new file mode 100644
index 0000000000..2274ef6473
--- /dev/null
+++ b/tools/templates/crud/client/graphql/DeleteModule.graphql
@@ -0,0 +1,11 @@
+mutation delete$Module$($id: Int!) {
+  delete$Module$(id: $id) {
+    $module$ {
+      id
+    }
+    errors {
+      field
+      message
+    }
+  }
+}
diff --git a/tools/templates/crud/server/resolvers.js b/tools/templates/crud/server/resolvers.js
index a55f46ac02..9002051ec6 100644
--- a/tools/templates/crud/server/resolvers.js
+++ b/tools/templates/crud/server/resolvers.js
@@ -1,10 +1,33 @@
 /*eslint-disable no-unused-vars*/
+import FieldError from '../../../common/FieldError';
+
 export default pubsub => ({
   Query: {
     $module$s: (obj, args, { $Module$ }) => {
       return $Module$.get$Module$s();
     }
   },
-  Mutation: {},
+  Mutation: {
+    delete$Module$: async (obj, { id }, { $Module$ }) => {
+      try {
+        const e = new FieldError();
+        const $module$ = await $Module$.get$Module$(id);
+        if (!$module$) {
+          e.setError('delete', '$Module$ does not exist.');
+          e.throwIf();
+        }
+
+        const isDeleted = await $Module$.delete$Module$(id);
+        if (isDeleted) {
+          return { $module$ };
+        } else {
+          e.setError('delete', 'Could not delete $module$. Please try again later.');
+          e.throwIf();
+        }
+      } catch (e) {
+        return { errors: e };
+      }
+    }
+  },
   Subscription: {}
 });
diff --git a/tools/templates/crud/server/schema.graphqls b/tools/templates/crud/server/schema.graphqls
index 6dc1ba5533..61fadd66cb 100644
--- a/tools/templates/crud/server/schema.graphqls
+++ b/tools/templates/crud/server/schema.graphqls
@@ -1,7 +1,14 @@
+type $Module$Payload {
+  $module$: $Module$
+  errors: [FieldError!]
+}
+
 extend type Query {
   $module$s: [$Module$]
 }
 
-extend type Mutation {}
+extend type Mutation {
+  delete$Module$(id: Int!): $Module$Payload!
+}
 
 extend type Subscription {}
diff --git a/tools/templates/crud/server/sql.js b/tools/templates/crud/server/sql.js
index 0041714244..4a461d3862 100644
--- a/tools/templates/crud/server/sql.js
+++ b/tools/templates/crud/server/sql.js
@@ -6,4 +6,14 @@ export default class $Module$ {
   async get$Module$s() {
     return camelizeKeys(await knex.select('*').from('$module$'));
   }
+
+  async get$Module$() {
+    return camelizeKeys(await knex.select('*').from('$module$').first());
+  }
+
+  delete$Module$(id) {
+    return knex('$module$')
+      .where('id', '=', id)
+      .del();
+  }
 }

From 4fdf5b908ce30bafd4f6c107fd0562972152b51a Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 22 Nov 2017 15:40:58 +0100
Subject: [PATCH 015/327] add, edit module wip

---
 src/client/modules/common/util.js             |  4 +-
 src/client/modules/user/index.web.jsx         |  2 +-
 .../crud/client/components/ModuleEditView.jsx | 31 +++++++
 .../client/components/ModuleEditView.web.jsx  | 75 +++++++++++++++++
 .../crud/client/components/ModuleForm.web.jsx | 39 +++++++++
 .../client/components/ModuleListView.web.jsx  | 10 ++-
 .../crud/client/containers/ModuleEdit.jsx     | 82 +++++++++++++++++++
 .../crud/client/graphql/AddModule.graphql     | 13 +++
 .../crud/client/graphql/EditModule.graphql    | 13 +++
 .../crud/client/graphql/ModuleQuery.graphql   |  8 ++
 tools/templates/crud/client/index.web.jsx     |  6 +-
 tools/templates/crud/server/resolvers.js      | 27 ++++++
 tools/templates/crud/server/schema.graphqls   |  9 +-
 tools/templates/crud/server/sql.js            | 12 +++
 14 files changed, 324 insertions(+), 7 deletions(-)
 create mode 100644 tools/templates/crud/client/components/ModuleEditView.jsx
 create mode 100644 tools/templates/crud/client/components/ModuleEditView.web.jsx
 create mode 100644 tools/templates/crud/client/components/ModuleForm.web.jsx
 create mode 100644 tools/templates/crud/client/containers/ModuleEdit.jsx
 create mode 100644 tools/templates/crud/client/graphql/AddModule.graphql
 create mode 100644 tools/templates/crud/client/graphql/EditModule.graphql
 create mode 100644 tools/templates/crud/client/graphql/ModuleQuery.graphql

diff --git a/src/client/modules/common/util.js b/src/client/modules/common/util.js
index a5ea41ecc9..cb60d4f34f 100644
--- a/src/client/modules/common/util.js
+++ b/src/client/modules/common/util.js
@@ -3,7 +3,7 @@ import React from 'react';
 import { Link } from 'react-router-dom';
 import { Button } from './components/web';
 
-const createTableColumns = (schema, hendleDelete) => {
+const createTableColumns = (schema, path, hendleDelete) => {
   let columns = [];
 
   for (const key of Object.keys(schema.values)) {
@@ -13,7 +13,7 @@ const createTableColumns = (schema, hendleDelete) => {
         dataIndex: 'id',
         key: 'id',
         render: (text, record) => (
-          <Link className="$module$-link" to={`/$module$/${record.id}`}>
+          <Link className="$module$-link" to={`/${path}/${record.id}`}>
             {text}
           </Link>
         )
diff --git a/src/client/modules/user/index.web.jsx b/src/client/modules/user/index.web.jsx
index 088696acca..e98e749f01 100644
--- a/src/client/modules/user/index.web.jsx
+++ b/src/client/modules/user/index.web.jsx
@@ -43,7 +43,7 @@ export default new Feature({
   route: [
     <AuthRoute exact path="/profile" scope="user" component={Profile} />,
     <AuthRoute exact path="/users" scope="admin" component={Users} />,
-    <Route exact path="/users/:id" component={UserEdit} />,
+    <AuthRoute exact path="/users/:id" component={UserEdit} />,
     <Route exact path="/register" component={Register} />,
     <Route exact path="/login" component={Login} />,
     <Route exact path="/forgot-password" component={ForgotPassword} />,
diff --git a/tools/templates/crud/client/components/ModuleEditView.jsx b/tools/templates/crud/client/components/ModuleEditView.jsx
new file mode 100644
index 0000000000..427ca99db9
--- /dev/null
+++ b/tools/templates/crud/client/components/ModuleEditView.jsx
@@ -0,0 +1,31 @@
+import React from 'react';
+import { StyleSheet, Text, View } from 'react-native';
+
+const $Module$EditView = () => {
+  return (
+    <View style={styles.container}>
+      <View style={styles.element}>
+        <Text style={styles.box}>Hello $Module$ Edit!</Text>
+      </View>
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    backgroundColor: '#fff',
+    alignItems: 'center',
+    justifyContent: 'center'
+  },
+  element: {
+    paddingTop: 30
+  },
+  box: {
+    textAlign: 'center',
+    marginLeft: 15,
+    marginRight: 15
+  }
+});
+
+export default $Module$EditView;
diff --git a/tools/templates/crud/client/components/ModuleEditView.web.jsx b/tools/templates/crud/client/components/ModuleEditView.web.jsx
new file mode 100644
index 0000000000..80d97d804d
--- /dev/null
+++ b/tools/templates/crud/client/components/ModuleEditView.web.jsx
@@ -0,0 +1,75 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Helmet from 'react-helmet';
+import { Link } from 'react-router-dom';
+import { SubmissionError } from 'redux-form';
+import { PageLayout } from '../../common/components/web';
+
+import $Module$Form from './$Module$Form';
+import settings from '../../../../../settings';
+
+class $Module$EditView extends React.PureComponent {
+  onSubmit = async values => {
+    const { $module$, add$Module$, edit$Module$ } = this.props;
+    let result = null;
+
+    if ($module$) {
+      result = await edit$Module$({ id: $module$.id, ...values });
+    } else {
+      result = await add$Module$(values);
+    }
+
+    if (result.errors) {
+      let submitError = {
+        _error: 'Edit $module$ failed!'
+      };
+      result.errors.map(error => (submitError[error.field] = error.message));
+      throw new SubmissionError(submitError);
+    }
+  };
+
+  renderMetaData = () => (
+    <Helmet
+      title={`${settings.app.name} - Edit $Module$`}
+      meta={[
+        {
+          name: 'description',
+          content: `${settings.app.name} - Edit $module$ example page`
+        }
+      ]}
+    />
+  );
+
+  render() {
+    const { loading, $module$ } = this.props;
+
+    if (loading && !$module$) {
+      return (
+        <PageLayout>
+          {this.renderMetaData()}
+          <div className="text-center">Loading...</div>
+        </PageLayout>
+      );
+    } else {
+      return (
+        <PageLayout>
+          {this.renderMetaData()}
+          <Link id="back-button" to="/$module$">
+            Back
+          </Link>
+          <h2>{$module$ ? 'Edit' : 'Create'} $Module$</h2>
+          <$Module$Form onSubmit={this.onSubmit} initialValues={$module$} />
+        </PageLayout>
+      );
+    }
+  }
+}
+
+$Module$EditView.propTypes = {
+  loading: PropTypes.bool.isRequired,
+  $module$: PropTypes.object,
+  add$Module$: PropTypes.func.isRequired,
+  edit$Module$: PropTypes.func.isRequired
+};
+
+export default $Module$EditView;
diff --git a/tools/templates/crud/client/components/ModuleForm.web.jsx b/tools/templates/crud/client/components/ModuleForm.web.jsx
new file mode 100644
index 0000000000..55ee18ad80
--- /dev/null
+++ b/tools/templates/crud/client/components/ModuleForm.web.jsx
@@ -0,0 +1,39 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Field, reduxForm } from 'redux-form';
+import { Form, RenderField, Button, Alert } from '../../common/components/web';
+
+const required = value => (value ? undefined : 'Required');
+
+const validate = values => {
+  const errors = {};
+
+  if (values.password !== values.passwordConfirmation) {
+    errors.passwordConfirmation = 'Passwords do not match';
+  }
+  return errors;
+};
+
+const $Module$Form = ({ handleSubmit, submitting, onSubmit, error }) => {
+  return (
+    <Form name="post" onSubmit={handleSubmit(onSubmit)}>
+      <Field name="id" component={RenderField} type="text" label="Id" validate={[required]} />
+      {error && <Alert color="error">{error}</Alert>}
+      <Button color="primary" type="submit" disabled={submitting}>
+        Save
+      </Button>
+    </Form>
+  );
+};
+
+$Module$Form.propTypes = {
+  handleSubmit: PropTypes.func,
+  onSubmit: PropTypes.func,
+  submitting: PropTypes.bool,
+  error: PropTypes.string
+};
+
+export default reduxForm({
+  form: '$module$',
+  validate
+})($Module$Form);
diff --git a/tools/templates/crud/client/components/ModuleListView.web.jsx b/tools/templates/crud/client/components/ModuleListView.web.jsx
index 40c0a1042f..ab6952bb9d 100644
--- a/tools/templates/crud/client/components/ModuleListView.web.jsx
+++ b/tools/templates/crud/client/components/ModuleListView.web.jsx
@@ -1,8 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import Helmet from 'react-helmet';
+import { Link } from 'react-router-dom';
 
-import { PageLayout, Table } from '../../common/components/web';
+import { PageLayout, Table, Button } from '../../common/components/web';
 import createTableColumns from '../../common/util';
 import { $Module$ as $Module$Schema } from '../../../../server/modules/$module$/schema';
 
@@ -30,9 +31,14 @@ class $Module$ListView extends React.PureComponent {
     return (
       <PageLayout>
         {this.renderMetaData()}
+        <h2>$Module$s</h2>
+        <Link to="/$module$/0">
+          <Button color="primary">Add</Button>
+        </Link>
+        <hr />
         <Table
           dataSource={$module$s}
-          columns={createTableColumns($Module$Schema, this.hendleDelete$Module$)}
+          columns={createTableColumns($Module$Schema, '$module$', this.hendleDelete$Module$)}
           pagination={false}
           loading={loading && !$module$s}
         />
diff --git a/tools/templates/crud/client/containers/ModuleEdit.jsx b/tools/templates/crud/client/containers/ModuleEdit.jsx
new file mode 100644
index 0000000000..654af8ed50
--- /dev/null
+++ b/tools/templates/crud/client/containers/ModuleEdit.jsx
@@ -0,0 +1,82 @@
+import React from 'react';
+import { graphql, compose } from 'react-apollo';
+
+import $Module$EditView from '../components/$Module$EditView';
+
+import $MODULE$_QUERY from '../graphql/$Module$Query.graphql';
+import ADD_$MODULE$ from '../graphql/Add$Module$.graphql';
+import EDIT_$MODULE$ from '../graphql/Edit$Module$.graphql';
+
+class $Module$Edit extends React.Component {
+  render() {
+    return <$Module$EditView {...this.props} />;
+  }
+}
+
+export default compose(
+  graphql($MODULE$_QUERY, {
+    options: props => {
+      let id = 0;
+      if (props.match) {
+        id = props.match.params.id;
+      } else if (props.navigation) {
+        id = props.navigation.state.params.id;
+      }
+
+      return {
+        variables: { id }
+      };
+    },
+    props({ data: { loading, $module$ } }) {
+      return { loading, $module$ };
+    }
+  }),
+  graphql(ADD_$MODULE$, {
+    props: ({ ownProps: { history, navigation }, mutate }) => ({
+      add$Module$: async input => {
+        try {
+          const { data: { add$Module$ } } = await mutate({
+            variables: { input }
+          });
+
+          if (add$Module$.errors) {
+            return { errors: add$Module$.errors };
+          }
+
+          if (history) {
+            return history.push('/$module$');
+          }
+          if (navigation) {
+            return navigation.goBack();
+          }
+        } catch (e) {
+          console.log(e.graphQLErrors);
+        }
+      }
+    })
+  }),
+  graphql(EDIT_$MODULE$, {
+    props: ({ ownProps: { history, navigation }, mutate }) => ({
+      edit$Module$: async input => {
+        try {
+          const { data: { edit$Module$ } } = await mutate({
+            variables: { input }
+          });
+
+          if (edit$Module$.errors) {
+            return { errors: edit$Module$.errors };
+          }
+
+          if (history) {
+            return history.push('/$module$');
+          }
+          if (navigation) {
+            return navigation.goBack();
+          }
+        } catch (e) {
+          console.log(e.graphQLErrors);
+        }
+      }
+    })
+  })
+)($Module$Edit);
diff --git a/tools/templates/crud/client/graphql/AddModule.graphql b/tools/templates/crud/client/graphql/AddModule.graphql
new file mode 100644
index 0000000000..b5e66390cb
--- /dev/null
+++ b/tools/templates/crud/client/graphql/AddModule.graphql
@@ -0,0 +1,13 @@
+#import "./$Module$.graphql"
+
+mutation add$Module$($input: $Module$Input!) {
+  add$Module$(input: $input) {
+    $module$ {
+      ...$Module$Info
+    }
+    errors {
+      field
+      message
+    }
+  }
+}
diff --git a/tools/templates/crud/client/graphql/EditModule.graphql b/tools/templates/crud/client/graphql/EditModule.graphql
new file mode 100644
index 0000000000..aa7d88b404
--- /dev/null
+++ b/tools/templates/crud/client/graphql/EditModule.graphql
@@ -0,0 +1,13 @@
+#import "./$Module$.graphql"
+
+mutation edit$Module$($input: $Module$Input!) {
+  edit$Module$(input: $input) {
+    $module$ {
+      ...$Module$Info
+    }
+    errors {
+      field
+      message
+    }
+  }
+}
diff --git a/tools/templates/crud/client/graphql/ModuleQuery.graphql b/tools/templates/crud/client/graphql/ModuleQuery.graphql
new file mode 100644
index 0000000000..895d734f24
--- /dev/null
+++ b/tools/templates/crud/client/graphql/ModuleQuery.graphql
@@ -0,0 +1,8 @@
+#import "./$Module$.graphql"
+
+query $module$ {
+  $module$ {
+    ...$Module$Info
+  }
+}
+
diff --git a/tools/templates/crud/client/index.web.jsx b/tools/templates/crud/client/index.web.jsx
index 560e9ea9b3..a68d4399e5 100644
--- a/tools/templates/crud/client/index.web.jsx
+++ b/tools/templates/crud/client/index.web.jsx
@@ -2,12 +2,16 @@ import React from 'react';
 import { Route, NavLink } from 'react-router-dom';
 import { MenuItem } from '../../modules/common/components/web';
 import $Module$List from './containers/$Module$List';
+import $Module$Edit from './containers/$Module$Edit';
 import reducers from './reducers';
 
 import Feature from '../connector';
 
 export default new Feature({
-  route: <Route exact path="/$module$" component={$Module$List} />,
+  route: [
+    <Route exact path="/$module$" component={$Module$List} />,
+    <Route exact path="/$module$/:id" component={$Module$Edit} />
+  ],
   navItem: (
     <MenuItem key="$module$">
       <NavLink to="/$module$" className="nav-link" activeClassName="active">
diff --git a/tools/templates/crud/server/resolvers.js b/tools/templates/crud/server/resolvers.js
index 9002051ec6..4b497ec778 100644
--- a/tools/templates/crud/server/resolvers.js
+++ b/tools/templates/crud/server/resolvers.js
@@ -8,6 +8,33 @@ export default pubsub => ({
     }
   },
   Mutation: {
+    add$Module$: async (obj, { input }, { $Module$ }) => {
+      try {
+        const e = new FieldError();
+        e.throwIf();
+
+        const [id] = await $Module$.add$Module$(input);
+        const $module$ = await $Module$.get$Module$(id);
+
+        return { $module$ };
+      } catch (e) {
+        return { errors: e };
+      }
+    },
+    edit$Module$: async (obj, { input }, { $Module$ }) => {
+      try {
+        const e = new FieldError();
+        e.throwIf();
+
+        await $Module$.edit$Module$(input);
+
+        const $module$ = await $Module$.get$Module$(input.id);
+
+        return { $module$ };
+      } catch (e) {
+        return { errors: e };
+      }
+    },
     delete$Module$: async (obj, { id }, { $Module$ }) => {
       try {
         const e = new FieldError();
diff --git a/tools/templates/crud/server/schema.graphqls b/tools/templates/crud/server/schema.graphqls
index 61fadd66cb..3588ff5007 100644
--- a/tools/templates/crud/server/schema.graphqls
+++ b/tools/templates/crud/server/schema.graphqls
@@ -3,12 +3,19 @@ type $Module$Payload {
   errors: [FieldError!]
 }
 
+input $Module$Input {
+  id: String
+}
+
 extend type Query {
   $module$s: [$Module$]
+  $module$: $Module$
 }
 
 extend type Mutation {
+  add$Module$(input: $Module$Input!): $Module$Payload!
+  edit$Module$(input: $Module$Input!): $Module$Payload!
   delete$Module$(id: Int!): $Module$Payload!
 }
 
-extend type Subscription {}
+extend type Subscription {}
\ No newline at end of file
diff --git a/tools/templates/crud/server/sql.js b/tools/templates/crud/server/sql.js
index 4a461d3862..4e893b47c4 100644
--- a/tools/templates/crud/server/sql.js
+++ b/tools/templates/crud/server/sql.js
@@ -11,6 +11,18 @@ export default class $Module$ {
     return camelizeKeys(await knex.select('*').from('$module$').first());
   }
 
+  add$Module$(input) {
+    return knex('$module$')
+      .insert(input)
+      .returning('id');
+  }
+
+  edit$Module$({ id, ...input}) {
+    return knex('$module$')
+      .update(input)
+      .where({ id });
+  }
+
   delete$Module$(id) {
     return knex('$module$')
       .where('id', '=', id)

From fd591b967287918b91e276f66f5c6218667f76be Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 23 Nov 2017 06:43:40 +0100
Subject: [PATCH 016/327] fix getModule by id

---
 tools/templates/crud/client/graphql/ModuleQuery.graphql | 4 ++--
 tools/templates/crud/server/resolvers.js                | 3 +++
 tools/templates/crud/server/schema.graphqls             | 2 +-
 tools/templates/crud/server/sql.js                      | 4 ++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/tools/templates/crud/client/graphql/ModuleQuery.graphql b/tools/templates/crud/client/graphql/ModuleQuery.graphql
index 895d734f24..2506aea2a8 100644
--- a/tools/templates/crud/client/graphql/ModuleQuery.graphql
+++ b/tools/templates/crud/client/graphql/ModuleQuery.graphql
@@ -1,7 +1,7 @@
 #import "./$Module$.graphql"
 
-query $module$ {
-  $module$ {
+query $module$($id: Int!) {
+  $module$(id: $id) {
     ...$Module$Info
   }
 }
diff --git a/tools/templates/crud/server/resolvers.js b/tools/templates/crud/server/resolvers.js
index 4b497ec778..078e052331 100644
--- a/tools/templates/crud/server/resolvers.js
+++ b/tools/templates/crud/server/resolvers.js
@@ -5,6 +5,9 @@ export default pubsub => ({
   Query: {
     $module$s: (obj, args, { $Module$ }) => {
       return $Module$.get$Module$s();
+    },
+    $module$: (obj, { id }, { $Module$ }) => {
+      return $Module$.get$Module$(id);
     }
   },
   Mutation: {
diff --git a/tools/templates/crud/server/schema.graphqls b/tools/templates/crud/server/schema.graphqls
index 3588ff5007..32f38fa9f4 100644
--- a/tools/templates/crud/server/schema.graphqls
+++ b/tools/templates/crud/server/schema.graphqls
@@ -9,7 +9,7 @@ input $Module$Input {
 
 extend type Query {
   $module$s: [$Module$]
-  $module$: $Module$
+  $module$(id: Int!): $Module$
 }
 
 extend type Mutation {
diff --git a/tools/templates/crud/server/sql.js b/tools/templates/crud/server/sql.js
index 4e893b47c4..3dd3565165 100644
--- a/tools/templates/crud/server/sql.js
+++ b/tools/templates/crud/server/sql.js
@@ -7,8 +7,8 @@ export default class $Module$ {
     return camelizeKeys(await knex.select('*').from('$module$'));
   }
 
-  async get$Module$() {
-    return camelizeKeys(await knex.select('*').from('$module$').first());
+  async get$Module$(id) {
+    return camelizeKeys(await knex.select('*').from('$module$').where({ id }).first());
   }
 
   add$Module$(input) {

From 94c3cadb837d193eac2c6278c9d433a15f49dc10 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 23 Nov 2017 07:02:18 +0100
Subject: [PATCH 017/327] hardcode first field for now

---
 .../crud/client/components/ModuleEditView.web.jsx          | 7 +++++--
 tools/templates/crud/client/components/ModuleForm.web.jsx  | 2 +-
 tools/templates/crud/database/seeds/_Module.js             | 2 +-
 tools/templates/crud/server/schema.graphqls                | 3 ++-
 tools/templates/crud/server/schema.js                      | 3 +++
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/tools/templates/crud/client/components/ModuleEditView.web.jsx b/tools/templates/crud/client/components/ModuleEditView.web.jsx
index 80d97d804d..d41369706c 100644
--- a/tools/templates/crud/client/components/ModuleEditView.web.jsx
+++ b/tools/templates/crud/client/components/ModuleEditView.web.jsx
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import Helmet from 'react-helmet';
 import { Link } from 'react-router-dom';
 import { SubmissionError } from 'redux-form';
+import { pick } from 'lodash';
 import { PageLayout } from '../../common/components/web';
 
 import $Module$Form from './$Module$Form';
@@ -13,10 +14,12 @@ class $Module$EditView extends React.PureComponent {
     const { $module$, add$Module$, edit$Module$ } = this.props;
     let result = null;
 
+    let insertValues = pick(values, ['name']);
+
     if ($module$) {
-      result = await edit$Module$({ id: $module$.id, ...values });
+      result = await edit$Module$({ id: $module$.id, ...insertValues });
     } else {
-      result = await add$Module$(values);
+      result = await add$Module$(insertValues);
     }
 
     if (result.errors) {
diff --git a/tools/templates/crud/client/components/ModuleForm.web.jsx b/tools/templates/crud/client/components/ModuleForm.web.jsx
index 55ee18ad80..d234639047 100644
--- a/tools/templates/crud/client/components/ModuleForm.web.jsx
+++ b/tools/templates/crud/client/components/ModuleForm.web.jsx
@@ -17,7 +17,7 @@ const validate = values => {
 const $Module$Form = ({ handleSubmit, submitting, onSubmit, error }) => {
   return (
     <Form name="post" onSubmit={handleSubmit(onSubmit)}>
-      <Field name="id" component={RenderField} type="text" label="Id" validate={[required]} />
+      <Field name="name" component={RenderField} type="text" label="Name" validate={[required]} />
       {error && <Alert color="error">{error}</Alert>}
       <Button color="primary" type="submit" disabled={submitting}>
         Save
diff --git a/tools/templates/crud/database/seeds/_Module.js b/tools/templates/crud/database/seeds/_Module.js
index 050959a956..63e9f481c7 100644
--- a/tools/templates/crud/database/seeds/_Module.js
+++ b/tools/templates/crud/database/seeds/_Module.js
@@ -5,5 +5,5 @@ export async function seed(knex, Promise) {
 
   await knex('$module$')
     .returning('id')
-    .insert({});
+    .insert({ name: 'test' });
 }
diff --git a/tools/templates/crud/server/schema.graphqls b/tools/templates/crud/server/schema.graphqls
index 32f38fa9f4..e966b251f7 100644
--- a/tools/templates/crud/server/schema.graphqls
+++ b/tools/templates/crud/server/schema.graphqls
@@ -4,7 +4,8 @@ type $Module$Payload {
 }
 
 input $Module$Input {
-  id: String
+  id: Int!
+  namme: String!
 }
 
 extend type Query {
diff --git a/tools/templates/crud/server/schema.js b/tools/templates/crud/server/schema.js
index ffe8d19155..34bcc3bd6d 100644
--- a/tools/templates/crud/server/schema.js
+++ b/tools/templates/crud/server/schema.js
@@ -5,5 +5,8 @@ import DomainSchema, { Schema } from 'domain-schema';
 export const $Module$ = new DomainSchema(
   class $Module$ extends Schema {
     id = DomainSchema.Integer;
+    name = {
+      type: String
+    };
   }
 );

From 3f73ae304d25f7c0c7b00c95905e1d3ae1a56258 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 23 Nov 2017 07:36:35 +0100
Subject: [PATCH 018/327] pick values

---
 src/client/modules/common/util.js                    |  7 +++++--
 .../crud/client/components/ModuleEditView.web.jsx    |  9 +++++----
 .../crud/client/components/ModuleListView.web.jsx    |  2 +-
 .../templates/crud/client/graphql/AddModule.graphql  |  2 +-
 .../templates/crud/client/graphql/EditModule.graphql |  2 +-
 tools/templates/crud/server/schema.graphqls          | 12 ++++++++----
 6 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/client/modules/common/util.js b/src/client/modules/common/util.js
index cb60d4f34f..aeb6b5ed71 100644
--- a/src/client/modules/common/util.js
+++ b/src/client/modules/common/util.js
@@ -1,9 +1,10 @@
 /* eslint-disable react/display-name */
 import React from 'react';
 import { Link } from 'react-router-dom';
+import { pick } from 'lodash';
 import { Button } from './components/web';
 
-const createTableColumns = (schema, path, hendleDelete) => {
+export const createTableColumns = (schema, path, hendleDelete) => {
   let columns = [];
 
   for (const key of Object.keys(schema.values)) {
@@ -40,4 +41,6 @@ const createTableColumns = (schema, path, hendleDelete) => {
   return columns;
 };
 
-export default createTableColumns;
+export const pickInputFields = (schema, values) => {
+  return pick(values, Object.keys(schema.values));
+};
diff --git a/tools/templates/crud/client/components/ModuleEditView.web.jsx b/tools/templates/crud/client/components/ModuleEditView.web.jsx
index d41369706c..56bd28b5f8 100644
--- a/tools/templates/crud/client/components/ModuleEditView.web.jsx
+++ b/tools/templates/crud/client/components/ModuleEditView.web.jsx
@@ -3,9 +3,10 @@ import PropTypes from 'prop-types';
 import Helmet from 'react-helmet';
 import { Link } from 'react-router-dom';
 import { SubmissionError } from 'redux-form';
-import { pick } from 'lodash';
-import { PageLayout } from '../../common/components/web';
 
+import { pickInputFields } from '../../common/util';
+import { $Module$ as $Module$Schema } from '../../../../server/modules/$module$/schema';
+import { PageLayout } from '../../common/components/web';
 import $Module$Form from './$Module$Form';
 import settings from '../../../../../settings';
 
@@ -14,10 +15,10 @@ class $Module$EditView extends React.PureComponent {
     const { $module$, add$Module$, edit$Module$ } = this.props;
     let result = null;
 
-    let insertValues = pick(values, ['name']);
+    const insertValues = pickInputFields($Module$Schema, values);
 
     if ($module$) {
-      result = await edit$Module$({ id: $module$.id, ...insertValues });
+      result = await edit$Module$(insertValues);
     } else {
       result = await add$Module$(insertValues);
     }
diff --git a/tools/templates/crud/client/components/ModuleListView.web.jsx b/tools/templates/crud/client/components/ModuleListView.web.jsx
index ab6952bb9d..31bd8549b5 100644
--- a/tools/templates/crud/client/components/ModuleListView.web.jsx
+++ b/tools/templates/crud/client/components/ModuleListView.web.jsx
@@ -4,7 +4,7 @@ import Helmet from 'react-helmet';
 import { Link } from 'react-router-dom';
 
 import { PageLayout, Table, Button } from '../../common/components/web';
-import createTableColumns from '../../common/util';
+import { createTableColumns } from '../../common/util';
 import { $Module$ as $Module$Schema } from '../../../../server/modules/$module$/schema';
 
 class $Module$ListView extends React.PureComponent {
diff --git a/tools/templates/crud/client/graphql/AddModule.graphql b/tools/templates/crud/client/graphql/AddModule.graphql
index b5e66390cb..56814fa41a 100644
--- a/tools/templates/crud/client/graphql/AddModule.graphql
+++ b/tools/templates/crud/client/graphql/AddModule.graphql
@@ -1,6 +1,6 @@
 #import "./$Module$.graphql"
 
-mutation add$Module$($input: $Module$Input!) {
+mutation add$Module$($input: Add$Module$Input!) {
   add$Module$(input: $input) {
     $module$ {
       ...$Module$Info
diff --git a/tools/templates/crud/client/graphql/EditModule.graphql b/tools/templates/crud/client/graphql/EditModule.graphql
index aa7d88b404..c3b639bd64 100644
--- a/tools/templates/crud/client/graphql/EditModule.graphql
+++ b/tools/templates/crud/client/graphql/EditModule.graphql
@@ -1,6 +1,6 @@
 #import "./$Module$.graphql"
 
-mutation edit$Module$($input: $Module$Input!) {
+mutation edit$Module$($input: Edit$Module$Input!) {
   edit$Module$(input: $input) {
     $module$ {
       ...$Module$Info
diff --git a/tools/templates/crud/server/schema.graphqls b/tools/templates/crud/server/schema.graphqls
index e966b251f7..8db675f72f 100644
--- a/tools/templates/crud/server/schema.graphqls
+++ b/tools/templates/crud/server/schema.graphqls
@@ -3,9 +3,13 @@ type $Module$Payload {
   errors: [FieldError!]
 }
 
-input $Module$Input {
+input Add$Module$Input {
+  name: String!
+}
+
+input Edit$Module$Input {
   id: Int!
-  namme: String!
+  name: String!
 }
 
 extend type Query {
@@ -14,8 +18,8 @@ extend type Query {
 }
 
 extend type Mutation {
-  add$Module$(input: $Module$Input!): $Module$Payload!
-  edit$Module$(input: $Module$Input!): $Module$Payload!
+  add$Module$(input: Add$Module$Input!): $Module$Payload!
+  edit$Module$(input: Edit$Module$Input!): $Module$Payload!
   delete$Module$(id: Int!): $Module$Payload!
 }
 

From 9e94c30b403a0544b8da6fab38a33cf4db1e4f82 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 23 Nov 2017 07:50:41 +0100
Subject: [PATCH 019/327] create form fields

---
 src/client/modules/common/util.js             | 21 +++++++++++++++++--
 .../crud/client/components/ModuleForm.web.jsx |  9 ++++----
 .../crud/client/graphql/Module.graphql        |  1 +
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/client/modules/common/util.js b/src/client/modules/common/util.js
index aeb6b5ed71..72368ef4c8 100644
--- a/src/client/modules/common/util.js
+++ b/src/client/modules/common/util.js
@@ -1,8 +1,9 @@
 /* eslint-disable react/display-name */
 import React from 'react';
 import { Link } from 'react-router-dom';
-import { pick } from 'lodash';
-import { Button } from './components/web';
+import { pick, capitalize } from 'lodash';
+import { Field } from 'redux-form';
+import { RenderField, Button } from './components/web';
 
 export const createTableColumns = (schema, path, hendleDelete) => {
   let columns = [];
@@ -41,6 +42,22 @@ export const createTableColumns = (schema, path, hendleDelete) => {
   return columns;
 };
 
+const required = value => (value ? undefined : 'Required');
+
+export const createFormFields = schema => {
+  let fields = [];
+
+  for (const key of Object.keys(schema.values)) {
+    if (key !== 'id') {
+      fields.push(
+        <Field name={key} component={RenderField} type="text" label={capitalize(key)} validate={[required]} />
+      );
+    }
+  }
+
+  return fields;
+};
+
 export const pickInputFields = (schema, values) => {
   return pick(values, Object.keys(schema.values));
 };
diff --git a/tools/templates/crud/client/components/ModuleForm.web.jsx b/tools/templates/crud/client/components/ModuleForm.web.jsx
index d234639047..a1ee1174fb 100644
--- a/tools/templates/crud/client/components/ModuleForm.web.jsx
+++ b/tools/templates/crud/client/components/ModuleForm.web.jsx
@@ -1,9 +1,10 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Field, reduxForm } from 'redux-form';
-import { Form, RenderField, Button, Alert } from '../../common/components/web';
+import { reduxForm } from 'redux-form';
 
-const required = value => (value ? undefined : 'Required');
+import { createFormFields } from '../../common/util';
+import { $Module$ as $Module$Schema } from '../../../../server/modules/$module$/schema';
+import { Form, Button, Alert } from '../../common/components/web';
 
 const validate = values => {
   const errors = {};
@@ -17,7 +18,7 @@ const validate = values => {
 const $Module$Form = ({ handleSubmit, submitting, onSubmit, error }) => {
   return (
     <Form name="post" onSubmit={handleSubmit(onSubmit)}>
-      <Field name="name" component={RenderField} type="text" label="Name" validate={[required]} />
+      {createFormFields($Module$Schema)}
       {error && <Alert color="error">{error}</Alert>}
       <Button color="primary" type="submit" disabled={submitting}>
         Save
diff --git a/tools/templates/crud/client/graphql/Module.graphql b/tools/templates/crud/client/graphql/Module.graphql
index 61470c8960..a6d63fad05 100644
--- a/tools/templates/crud/client/graphql/Module.graphql
+++ b/tools/templates/crud/client/graphql/Module.graphql
@@ -1,3 +1,4 @@
 fragment $Module$Info on $Module$ {
   id
+  name
 }
\ No newline at end of file

From 425c35aac0eeb83b09687ae068e286b84b3c7310 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 23 Nov 2017 09:51:49 +0100
Subject: [PATCH 020/327] update scheme inputs, cleanup cli/module

---
 src/client/modules/common/util.js |   8 +--
 tools/cli.js                      |   3 +
 tools/cli/module.js               | 109 +++++++++++++++++++++---------
 3 files changed, 85 insertions(+), 35 deletions(-)

diff --git a/src/client/modules/common/util.js b/src/client/modules/common/util.js
index 72368ef4c8..e3548b115d 100644
--- a/src/client/modules/common/util.js
+++ b/src/client/modules/common/util.js
@@ -8,7 +8,7 @@ import { RenderField, Button } from './components/web';
 export const createTableColumns = (schema, path, hendleDelete) => {
   let columns = [];
 
-  for (const key of Object.keys(schema.values)) {
+  for (const key of schema.keys()) {
     if (key === 'id') {
       columns.push({
         title: 'Id',
@@ -47,10 +47,10 @@ const required = value => (value ? undefined : 'Required');
 export const createFormFields = schema => {
   let fields = [];
 
-  for (const key of Object.keys(schema.values)) {
+  for (const key of schema.keys()) {
     if (key !== 'id') {
       fields.push(
-        <Field name={key} component={RenderField} type="text" label={capitalize(key)} validate={[required]} />
+        <Field name={key} key={key} component={RenderField} type="text" label={capitalize(key)} validate={[required]} />
       );
     }
   }
@@ -59,5 +59,5 @@ export const createFormFields = schema => {
 };
 
 export const pickInputFields = (schema, values) => {
-  return pick(values, Object.keys(schema.values));
+  return pick(values, schema.keys());
 };
diff --git a/tools/cli.js b/tools/cli.js
index 5a48ff1378..14d5611603 100644
--- a/tools/cli.js
+++ b/tools/cli.js
@@ -1,3 +1,6 @@
+require('babel-register')({ presets: ['env'], plugins: ['transform-class-properties'] });
+require('babel-polyfill');
+
 const prog = require('caporal');
 const moduleCmd = require('./cli/module');
 
diff --git a/tools/cli/module.js b/tools/cli/module.js
index 2d9ff01e84..8969ed1a46 100644
--- a/tools/cli/module.js
+++ b/tools/cli/module.js
@@ -1,10 +1,10 @@
 /* eslint-disable import/no-dynamic-require */
-require('babel-register')({ presets: ['env'], plugins: ['transform-class-properties'] });
-require('babel-polyfill');
 
-const shell = require('shelljs');
-const fs = require('fs');
-const chalk = require('chalk');
+import shell from 'shelljs';
+import fs from 'fs';
+import chalk from 'chalk';
+import GraphQLGenerator from 'domain-graphql';
+import { pascalize } from 'humps';
 
 String.prototype.toCamelCase = function() {
   return this.replace(/^([A-Z])|\s(\w)/g, function(match, p1, p2) {
@@ -13,11 +13,10 @@ String.prototype.toCamelCase = function() {
   });
 };
 
-String.prototype.capitalize = function() {
-  return this.charAt(0).toUpperCase() + this.slice(1);
-};
-
 function renameFiles(destinationPath, templatePath, module, location) {
+  // pascalize
+  const Module = pascalize(module);
+
   shell.cp('-R', `${templatePath}/${location}/*`, destinationPath);
 
   // change to destination directory
@@ -26,7 +25,7 @@ function renameFiles(destinationPath, templatePath, module, location) {
   // rename files
   shell.ls('-Rl', '.').forEach(entry => {
     if (entry.isFile()) {
-      const moduleFile = entry.name.replace('Module', module.capitalize());
+      const moduleFile = entry.name.replace('Module', Module);
       shell.mv(entry.name, moduleFile);
     }
   });
@@ -35,7 +34,7 @@ function renameFiles(destinationPath, templatePath, module, location) {
   shell.ls('-Rl', '.').forEach(entry => {
     if (entry.isFile()) {
       shell.sed('-i', /\$module\$/g, module, entry.name);
-      shell.sed('-i', /\$Module\$/g, module.toCamelCase().capitalize(), entry.name);
+      shell.sed('-i', /\$Module\$/g, Module, entry.name);
       shell.sed('-i', /\$MODULE\$/g, module.toUpperCase(), entry.name);
     }
   });
@@ -44,6 +43,9 @@ function renameFiles(destinationPath, templatePath, module, location) {
 function copyFiles(logger, templatePath, module, action, location) {
   logger.info(`Copying ${location} files…`);
 
+  // pascalize
+  const Module = pascalize(module);
+
   // create new module directory
   const mkdir = shell.mkdir(`${__dirname}/../../src/${location}/modules/${module}`);
 
@@ -77,9 +79,9 @@ function copyFiles(logger, templatePath, module, action, location) {
 
       const timestamp = new Date().getTime();
       shell.cd(`${__dirname}/../../src/${location}/database/migrations`);
-      shell.mv(`_${module.toCamelCase().capitalize()}.js`, `${timestamp}_${module.toCamelCase().capitalize()}.js`);
+      shell.mv(`_${Module}.js`, `${timestamp}_${Module}.js`);
       shell.cd(`${__dirname}/../../src/${location}/database/seeds`);
-      shell.mv(`_${module.toCamelCase().capitalize()}.js`, `${timestamp}_${module.toCamelCase().capitalize()}.js`);
+      shell.mv(`_${Module}.js`, `${timestamp}_${Module}.js`);
 
       logger.info(chalk.green(`✔ The database files have been copied!`));
     }
@@ -91,6 +93,9 @@ function copyFiles(logger, templatePath, module, action, location) {
 function deleteFiles(logger, templatePath, module, location) {
   logger.info(`Deleting ${location} files…`);
 
+  // pascalize
+  const Module = pascalize(module);
+
   const modulePath = `${__dirname}/../../src/${location}/modules/${module}`;
 
   if (fs.existsSync(modulePath)) {
@@ -123,8 +128,8 @@ function deleteFiles(logger, templatePath, module, location) {
       // change to database migrations directory
       shell.cd(`${__dirname}/../../src/${location}/database/migrations`);
       // check if any migrations files for this module exist
-      if (shell.find('.').filter(file => file.search(`_${module.toCamelCase().capitalize()}.js`) > -1).length > 0) {
-        let okMigrations = shell.rm(`*_${module.toCamelCase().capitalize()}.js`);
+      if (shell.find('.').filter(file => file.search(`_${Module}.js`) > -1).length > 0) {
+        let okMigrations = shell.rm(`*_${Module}.js`);
         if (okMigrations) {
           logger.info(chalk.green(`✔ Database migrations files successfully deleted!`));
         }
@@ -133,8 +138,8 @@ function deleteFiles(logger, templatePath, module, location) {
       // change to database seeds directory
       shell.cd(`${__dirname}/../../src/${location}/database/seeds`);
       // check if any seed files for this module exist
-      if (shell.find('.').filter(file => file.search(`_${module.toCamelCase().capitalize()}.js`) > -1).length > 0) {
-        let okSeeds = shell.rm(`*_${module.toCamelCase().capitalize()}.js`);
+      if (shell.find('.').filter(file => file.search(`_${Module}.js`) > -1).length > 0) {
+        let okSeeds = shell.rm(`*_${Module}.js`);
         if (okSeeds) {
           logger.info(chalk.green(`✔ Database seed files successfully deleted!`));
         }
@@ -151,27 +156,69 @@ function deleteFiles(logger, templatePath, module, location) {
 function updateSchema(logger, module) {
   logger.info(`Updating ${module} Schema…`);
 
-  // get fragment file
-  const path = `${__dirname}/../../src/client/modules/${module}/graphql/`;
-  if (fs.existsSync(path)) {
-    const file = `${module.toCamelCase().capitalize()}.graphql`;
+  // pascalize
+  const Module = pascalize(module);
+
+  const modulePath = `${__dirname}/../../src/server/modules/${module}`;
 
+  if (fs.existsSync(modulePath)) {
     // get module schema
-    const schema = require(`../../src/server/modules/${module}/schema`);
+    const schema = require(`${modulePath}/schema`)[Module];
+
+    // get schema file
+    const pathSchema = `${__dirname}/../../src/server/modules/${module}/`;
+    if (fs.existsSync(pathSchema)) {
+      const file = `schema.graphqls`;
+
+      // regenerate input fields
+      let inputAdd = '';
+      let inputEdit = '';
+      for (const key of schema.keys()) {
+        const value = schema.values[key];
+        if (key !== 'id') {
+          inputAdd += new GraphQLGenerator()._generateField(schema.name, key, value) + '\n';
+        }
+        inputEdit += new GraphQLGenerator()._generateField(schema.name, key, value) + '\n';
+      }
+
+      shell.cd(pathSchema);
+
+      // override AddCrudInput in schema.graphqls file
+      const replaceAdd = `Add${Module}Input {([^}])*\\n}`;
+      shell.ShellString(shell.cat(file).replace(RegExp(replaceAdd, 'g'), `Add${Module}Input {\n${inputAdd}}`)).to(file);
+
+      // override EditCrudInput in schema.graphqls file
+      const replaceEdit = `Edit${Module}Input {([^}])*\\n}`;
+      shell
+        .ShellString(shell.cat(file).replace(RegExp(replaceEdit, 'g'), `Edit${Module}Input {\n${inputEdit}}`))
+        .to(file);
 
-    // regenerate graphql fragment
-    let graphql = '';
-    for (const key of Object.keys(schema[module.toCamelCase().capitalize()].values)) {
-      graphql += `  ${key}\n`;
+      logger.info(chalk.green(`✔ Schema in ${pathSchema}${file} successfully updated!`));
+    } else {
+      logger.error(chalk.red(`✘ Schema path ${pathSchema} not found!`));
     }
 
-    shell.cd(path);
-    // override graphql fragment file
-    shell.ShellString(shell.cat(file).replace(/Crud {(.|\n)*\n}/, `Crud {\n${graphql}}`)).to(file);
+    // get fragment file
+    const pathFragment = `${__dirname}/../../src/client/modules/${module}/graphql/`;
+    if (fs.existsSync(pathFragment)) {
+      const file = `${Module}.graphql`;
 
-    logger.info(chalk.green(`✔ Fragment in ${path}${file} successfully updated!`));
+      // regenerate graphql fragment
+      let graphql = '';
+      for (const key of schema.keys()) {
+        graphql += `  ${key}\n`;
+      }
+
+      shell.cd(pathFragment);
+      // override graphql fragment file
+      shell.ShellString(shell.cat(file).replace(/Crud {(.|\n)*\n}/, `Crud {\n${graphql}}`)).to(file);
+
+      logger.info(chalk.green(`✔ Fragment in ${pathFragment}${file} successfully updated!`));
+    } else {
+      logger.error(chalk.red(`✘ Fragment path ${pathFragment} not found!`));
+    }
   } else {
-    logger.error(chalk.red(`✘ Path ${path} not found!`));
+    logger.info(chalk.red(`✘ Module ${module} in path ${modulePath} not found!`));
   }
 }
 

From 895d16ca86e06bd1d99516187c45269fa32b77bf Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 23 Nov 2017 10:08:45 +0100
Subject: [PATCH 021/327] correctly assign validate in form

---
 src/client/modules/common/util.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/client/modules/common/util.js b/src/client/modules/common/util.js
index e3548b115d..a5e07378b4 100644
--- a/src/client/modules/common/util.js
+++ b/src/client/modules/common/util.js
@@ -49,8 +49,14 @@ export const createFormFields = schema => {
 
   for (const key of schema.keys()) {
     if (key !== 'id') {
+      const value = schema.values[key];
+      let validate = [];
+      if (!value.optional) {
+        validate.push(required);
+      }
+
       fields.push(
-        <Field name={key} key={key} component={RenderField} type="text" label={capitalize(key)} validate={[required]} />
+        <Field name={key} key={key} component={RenderField} type="text" label={capitalize(key)} validate={validate} />
       );
     }
   }

From 8aa500ff19214b6d9b7997b774b399b80b79e121 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 23 Nov 2017 16:21:54 +0100
Subject: [PATCH 022/327] add join monster, apollo errors, refactor error
 handling

---
 package.json                                  |  7 +-
 src/common/FieldError.js                      |  8 ++-
 src/server/api/schema.js                      |  2 +
 src/server/middleware/graphql.js              |  2 +
 src/server/modules/connector.js               | 15 ++--
 .../client/components/ModuleEditView.web.jsx  |  2 +-
 .../crud/client/containers/ModuleEdit.jsx     | 16 ++---
 .../crud/client/graphql/AddModule.graphql     |  8 +--
 .../crud/client/graphql/DeleteModule.graphql  |  8 +--
 .../crud/client/graphql/EditModule.graphql    |  8 +--
 tools/templates/crud/server/index.js          |  2 +
 tools/templates/crud/server/metadata.js       | 20 ++++++
 tools/templates/crud/server/resolvers.js      | 69 ++++++++-----------
 tools/templates/crud/server/schema.graphqls   | 11 +--
 tools/templates/crud/server/sql.js            | 10 ---
 yarn.lock                                     | 43 ++++++++++++
 16 files changed, 129 insertions(+), 102 deletions(-)
 create mode 100644 tools/templates/crud/server/metadata.js

diff --git a/package.json b/package.json
index b5f5a05546..d088d13be8 100644
--- a/package.json
+++ b/package.json
@@ -29,10 +29,6 @@
     "*.{js,jsx,json}": [
       "eslint --fix",
       "git add"
-    ],
-    "*.graphql": [
-      "prettier --parser graphql --write",
-      "git add"
     ]
   },
   "repository": {
@@ -59,6 +55,7 @@
     "apollo-cache-inmemory": "^1.1.1",
     "apollo-client": "^2.0.3",
     "apollo-engine": "^0.5.4",
+    "apollo-errors": "^1.5.1",
     "apollo-fetch": "^0.6.0",
     "apollo-fetch-upload": "^1.1.0",
     "apollo-link": "^1.0.3",
@@ -89,6 +86,8 @@
     "humps": "^2.0.1",
     "immutability-helper": "^2.5.0",
     "isomorphic-fetch": "^2.2.1",
+    "join-monster": "^2.0.15",
+    "join-monster-graphql-tools-adapter": "^0.0.2",
     "jsonwebtoken": "^8.1.0",
     "jwt-decode": "^2.2.0",
     "knex": "^0.14.0",
diff --git a/src/common/FieldError.js b/src/common/FieldError.js
index 0d58d6fb53..fb328ddd71 100644
--- a/src/common/FieldError.js
+++ b/src/common/FieldError.js
@@ -1,3 +1,9 @@
+import { createError } from 'apollo-errors';
+
+const BaseError = createError('BaseError', {
+  message: 'A error has occurred'
+});
+
 export default class FieldError {
   constructor() {
     this.errors = {};
@@ -20,7 +26,7 @@ export default class FieldError {
 
   throwIf() {
     if (this.hasAny()) {
-      throw this.getErrors();
+      throw new BaseError({ data: this.getErrors() });
     }
   }
 }
diff --git a/src/server/api/schema.js b/src/server/api/schema.js
index d9adbfc9ba..7a728f6fdf 100644
--- a/src/server/api/schema.js
+++ b/src/server/api/schema.js
@@ -1,4 +1,5 @@
 import { makeExecutableSchema, addErrorLoggingToSchema } from 'graphql-tools';
+import joinMonsterAdapt from 'join-monster-graphql-tools-adapter';
 
 import rootSchemaDef from './rootSchema.graphqls';
 import modules from '../modules';
@@ -11,5 +12,6 @@ const executableSchema = makeExecutableSchema({
 });
 
 addErrorLoggingToSchema(executableSchema, { log: e => log.error(e) });
+joinMonsterAdapt(executableSchema, modules.createMetadata());
 
 export default executableSchema;
diff --git a/src/server/middleware/graphql.js b/src/server/middleware/graphql.js
index 82be3530ff..251d3bf9cd 100644
--- a/src/server/middleware/graphql.js
+++ b/src/server/middleware/graphql.js
@@ -1,4 +1,5 @@
 import { graphqlExpress } from 'apollo-server-express';
+import { formatError } from 'apollo-errors';
 import 'isomorphic-fetch';
 
 import log from '../../common/log';
@@ -10,6 +11,7 @@ export default graphqlExpress(async req => {
   try {
     return {
       schema,
+      formatError,
       context: await modules.createContext(req),
       tracing: !!settings.analytics.apolloEngine.key,
       cacheControl: !!settings.analytics.apolloEngine.key
diff --git a/src/server/modules/connector.js b/src/server/modules/connector.js
index 362cab93bd..f78d22a55c 100644
--- a/src/server/modules/connector.js
+++ b/src/server/modules/connector.js
@@ -12,6 +12,7 @@ const combine = (features, extractor): any =>
 
 type FeatureParams = {
   schema: DocumentNode | DocumentNode[],
+  createMetadataFunc?: Function | Function[],
   createResolversFunc?: Function | Function[],
   createContextFunc?: Function | Function[],
   beforeware?: Middleware | Middleware[],
@@ -21,6 +22,7 @@ type FeatureParams = {
 
 class Feature {
   schema: DocumentNode[];
+  createMetadataFunc: Function[];
   createResolversFunc: Function[];
   createContextFunc: Function[];
   createFetchOptions: Function[];
@@ -30,6 +32,7 @@ class Feature {
   constructor(feature?: FeatureParams, ...features: Feature[]) {
     // console.log(feature.schema[0] instanceof DocumentNode);
     this.schema = combine(arguments, arg => arg.schema);
+    this.createMetadataFunc = combine(arguments, arg => arg.createMetadataFunc);
     this.createResolversFunc = combine(arguments, arg => arg.createResolversFunc);
     this.createContextFunc = combine(arguments, arg => arg.createContextFunc);
     this.beforeware = combine(arguments, arg => arg.beforeware);
@@ -41,6 +44,14 @@ class Feature {
     return this.schema;
   }
 
+  createMetadata() {
+    return merge({}, ...this.createMetadataFunc.map(createMetadata => createMetadata()));
+  }
+
+  createResolvers(pubsub: any) {
+    return merge({}, ...this.createResolversFunc.map(createResolvers => createResolvers(pubsub)));
+  }
+
   async createContext(req: $Request, connectionParams: any, webSocket: any) {
     const results = await Promise.all(
       this.createContextFunc.map(createContext => createContext(req, connectionParams, webSocket))
@@ -48,10 +59,6 @@ class Feature {
     return merge({}, ...results);
   }
 
-  createResolvers(pubsub: any) {
-    return merge({}, ...this.createResolversFunc.map(createResolvers => createResolvers(pubsub)));
-  }
-
   get beforewares(): Middleware[] {
     return this.beforeware;
   }
diff --git a/tools/templates/crud/client/components/ModuleEditView.web.jsx b/tools/templates/crud/client/components/ModuleEditView.web.jsx
index 56bd28b5f8..0a3e13cd8a 100644
--- a/tools/templates/crud/client/components/ModuleEditView.web.jsx
+++ b/tools/templates/crud/client/components/ModuleEditView.web.jsx
@@ -27,7 +27,7 @@ class $Module$EditView extends React.PureComponent {
       let submitError = {
         _error: 'Edit $module$ failed!'
       };
-      result.errors.map(error => (submitError[error.field] = error.message));
+      Object.keys(result.errors).map(key => (submitError[result.errors[key].field] = result.errors[key].message));
       throw new SubmissionError(submitError);
     }
   };
diff --git a/tools/templates/crud/client/containers/ModuleEdit.jsx b/tools/templates/crud/client/containers/ModuleEdit.jsx
index 654af8ed50..75b98275ab 100644
--- a/tools/templates/crud/client/containers/ModuleEdit.jsx
+++ b/tools/templates/crud/client/containers/ModuleEdit.jsx
@@ -35,14 +35,10 @@ export default compose(
     props: ({ ownProps: { history, navigation }, mutate }) => ({
       add$Module$: async input => {
         try {
-          const { data: { add$Module$ } } = await mutate({
+          await mutate({
             variables: { input }
           });
 
-          if (add$Module$.errors) {
-            return { errors: add$Module$.errors };
-          }
-
           if (history) {
             return history.push('/$module$');
           }
@@ -50,7 +46,7 @@ export default compose(
             return navigation.goBack();
           }
         } catch (e) {
-          console.log(e.graphQLErrors);
+          return { errors: e.graphQLErrors[0].data };
         }
       }
     })
@@ -59,14 +55,10 @@ export default compose(
     props: ({ ownProps: { history, navigation }, mutate }) => ({
       edit$Module$: async input => {
         try {
-          const { data: { edit$Module$ } } = await mutate({
+          await mutate({
             variables: { input }
           });
 
-          if (edit$Module$.errors) {
-            return { errors: edit$Module$.errors };
-          }
-
           if (history) {
             return history.push('/$module$');
           }
@@ -74,7 +66,7 @@ export default compose(
             return navigation.goBack();
           }
         } catch (e) {
-          console.log(e.graphQLErrors);
+          return { errors: e.graphQLErrors[0].data };
         }
       }
     })
diff --git a/tools/templates/crud/client/graphql/AddModule.graphql b/tools/templates/crud/client/graphql/AddModule.graphql
index 56814fa41a..008f3738e6 100644
--- a/tools/templates/crud/client/graphql/AddModule.graphql
+++ b/tools/templates/crud/client/graphql/AddModule.graphql
@@ -2,12 +2,6 @@
 
 mutation add$Module$($input: Add$Module$Input!) {
   add$Module$(input: $input) {
-    $module$ {
-      ...$Module$Info
-    }
-    errors {
-      field
-      message
-    }
+    ...$Module$Info
   }
 }
diff --git a/tools/templates/crud/client/graphql/DeleteModule.graphql b/tools/templates/crud/client/graphql/DeleteModule.graphql
index 2274ef6473..7d278994e4 100644
--- a/tools/templates/crud/client/graphql/DeleteModule.graphql
+++ b/tools/templates/crud/client/graphql/DeleteModule.graphql
@@ -1,11 +1,5 @@
 mutation delete$Module$($id: Int!) {
   delete$Module$(id: $id) {
-    $module$ {
-      id
-    }
-    errors {
-      field
-      message
-    }
+    id
   }
 }
diff --git a/tools/templates/crud/client/graphql/EditModule.graphql b/tools/templates/crud/client/graphql/EditModule.graphql
index c3b639bd64..af2f4d2b16 100644
--- a/tools/templates/crud/client/graphql/EditModule.graphql
+++ b/tools/templates/crud/client/graphql/EditModule.graphql
@@ -2,12 +2,6 @@
 
 mutation edit$Module$($input: Edit$Module$Input!) {
   edit$Module$(input: $input) {
-    $module$ {
-      ...$Module$Info
-    }
-    errors {
-      field
-      message
-    }
+    ...$Module$Info
   }
 }
diff --git a/tools/templates/crud/server/index.js b/tools/templates/crud/server/index.js
index 4dad072b00..4eeac0bccc 100644
--- a/tools/templates/crud/server/index.js
+++ b/tools/templates/crud/server/index.js
@@ -3,11 +3,13 @@ import GraphQLGenerator from 'domain-graphql';
 import { $Module$ as $Module$Schema } from './schema';
 import $Module$ from './sql';
 import schema from './schema.graphqls';
+import createMetadata from './metadata';
 import createResolvers from './resolvers';
 import Feature from '../connector';
 
 export default new Feature({
   schema: [schema, new GraphQLGenerator().generateTypes($Module$Schema)],
+  createMetadataFunc: createMetadata,
   createResolversFunc: createResolvers,
   createContextFunc: () => ({ $Module$: new $Module$() })
 });
diff --git a/tools/templates/crud/server/metadata.js b/tools/templates/crud/server/metadata.js
new file mode 100644
index 0000000000..31023c9380
--- /dev/null
+++ b/tools/templates/crud/server/metadata.js
@@ -0,0 +1,20 @@
+export default () => ({
+  Query: {
+    fields: {
+      cruds: {
+        orderBy: { id: 'desc' }
+      },
+      crud: {
+        where: (table, { id }) => `${table}.id = ${id}`
+      }
+    }
+  },
+  Crud: {
+    sqlTable: 'crud',
+    uniqueKey: 'id',
+    fields: {
+      id: { sqlColumn: 'id' },
+      name: { sqlColumn: 'name' }
+    }
+  }
+});
diff --git a/tools/templates/crud/server/resolvers.js b/tools/templates/crud/server/resolvers.js
index 078e052331..1eb70bce8c 100644
--- a/tools/templates/crud/server/resolvers.js
+++ b/tools/templates/crud/server/resolvers.js
@@ -1,61 +1,48 @@
 /*eslint-disable no-unused-vars*/
+import joinMonster from 'join-monster';
 import FieldError from '../../../common/FieldError';
+import knex from '../../../server/sql/connector';
 
 export default pubsub => ({
   Query: {
-    $module$s: (obj, args, { $Module$ }) => {
-      return $Module$.get$Module$s();
+    $module$s: (obj, args, context, info) => {
+      return joinMonster(info, args, sql => knex.raw(sql));
     },
-    $module$: (obj, { id }, { $Module$ }) => {
-      return $Module$.get$Module$(id);
+    $module$: (obj, args, context, info) => {
+      return joinMonster(info, args, sql => knex.raw(sql));
     }
   },
   Mutation: {
-    add$Module$: async (obj, { input }, { $Module$ }) => {
-      try {
-        const e = new FieldError();
-        e.throwIf();
+    add$Module$: async (obj, { input }, { $Module$ }, info) => {
+      const e = new FieldError();
+      e.throwIf();
 
-        const [id] = await $Module$.add$Module$(input);
-        const $module$ = await $Module$.get$Module$(id);
+      const [id] = await $Module$.add$Module$(input);
 
-        return { $module$ };
-      } catch (e) {
-        return { errors: e };
-      }
+      return joinMonster(info, { id }, sql => knex.raw(sql));
     },
-    edit$Module$: async (obj, { input }, { $Module$ }) => {
-      try {
-        const e = new FieldError();
-        e.throwIf();
-
-        await $Module$.edit$Module$(input);
+    edit$Module$: async (obj, { input }, { $Module$ }, info) => {
+      const e = new FieldError();
+      e.throwIf();
 
-        const $module$ = await $Module$.get$Module$(input.id);
+      await $Module$.edit$Module$(input);
 
-        return { $module$ };
-      } catch (e) {
-        return { errors: e };
-      }
+      return joinMonster(info, { id: input.id }, sql => knex.raw(sql));
     },
     delete$Module$: async (obj, { id }, { $Module$ }) => {
-      try {
-        const e = new FieldError();
-        const $module$ = await $Module$.get$Module$(id);
-        if (!$module$) {
-          e.setError('delete', '$Module$ does not exist.');
-          e.throwIf();
-        }
+      const e = new FieldError();
+      const $module$ = await $Module$.get$Module$(id);
+      if (!$module$) {
+        e.setError('delete', '$Module$ does not exist.');
+        e.throwIf();
+      }
 
-        const isDeleted = await $Module$.delete$Module$(id);
-        if (isDeleted) {
-          return { $module$ };
-        } else {
-          e.setError('delete', 'Could not delete $module$. Please try again later.');
-          e.throwIf();
-        }
-      } catch (e) {
-        return { errors: e };
+      const isDeleted = await $Module$.delete$Module$(id);
+      if (isDeleted) {
+        return { id };
+      } else {
+        e.setError('delete', 'Could not delete $module$. Please try again later.');
+        e.throwIf();
       }
     }
   },
diff --git a/tools/templates/crud/server/schema.graphqls b/tools/templates/crud/server/schema.graphqls
index 8db675f72f..7675abc1b9 100644
--- a/tools/templates/crud/server/schema.graphqls
+++ b/tools/templates/crud/server/schema.graphqls
@@ -1,8 +1,3 @@
-type $Module$Payload {
-  $module$: $Module$
-  errors: [FieldError!]
-}
-
 input Add$Module$Input {
   name: String!
 }
@@ -18,9 +13,9 @@ extend type Query {
 }
 
 extend type Mutation {
-  add$Module$(input: Add$Module$Input!): $Module$Payload!
-  edit$Module$(input: Edit$Module$Input!): $Module$Payload!
-  delete$Module$(id: Int!): $Module$Payload!
+  add$Module$(input: Add$Module$Input!): $Module$
+  edit$Module$(input: Edit$Module$Input!): $Module$
+  delete$Module$(id: Int!): $Module$
 }
 
 extend type Subscription {}
\ No newline at end of file
diff --git a/tools/templates/crud/server/sql.js b/tools/templates/crud/server/sql.js
index 3dd3565165..8aa009b7b1 100644
--- a/tools/templates/crud/server/sql.js
+++ b/tools/templates/crud/server/sql.js
@@ -1,16 +1,6 @@
-import { camelizeKeys } from 'humps';
-
 import knex from '../../../server/sql/connector';
 
 export default class $Module$ {
-  async get$Module$s() {
-    return camelizeKeys(await knex.select('*').from('$module$'));
-  }
-
-  async get$Module$(id) {
-    return camelizeKeys(await knex.select('*').from('$module$').where({ id }).first());
-  }
-
   add$Module$(input) {
     return knex('$module$')
       .insert(input)
diff --git a/yarn.lock b/yarn.lock
index dd854a51f3..b2855edc0b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -128,6 +128,12 @@
     component-type "^1.2.1"
     join-component "^1.1.0"
 
+"@stem/nesthydrationjs@0.4.0":
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/@stem/nesthydrationjs/-/nesthydrationjs-0.4.0.tgz#5e797efd8b64ea33307ced2a6c4cde9c0227fcf4"
+  dependencies:
+    lodash "4.13.1"
+
 "@types/async@2.0.45", "@types/async@^2.0.31":
   version "2.0.45"
   resolved "https://registry.yarnpkg.com/@types/async/-/async-2.0.45.tgz#0cfe971d7ed5542695740338e0455c91078a0e83"
@@ -485,6 +491,12 @@ apollo-engine@^0.5.4:
     apollo-engine-binary-linux "^0.2017.11-40-g9585bfc6"
     apollo-engine-binary-windows "^0.2017.11-40-g9585bfc6"
 
+apollo-errors@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/apollo-errors/-/apollo-errors-1.5.1.tgz#956d705fb5bad41de256cdcb41bc009c66e0bb3e"
+  dependencies:
+    es6-error "^4.0.0"
+
 apollo-fetch-upload@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/apollo-fetch-upload/-/apollo-fetch-upload-1.1.0.tgz#01e20e4243cb14f722fb9044154834532237aa09"
@@ -3254,6 +3266,10 @@ depd@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.0.1.tgz#80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa"
 
+deprecate@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/deprecate/-/deprecate-1.0.0.tgz#661490ed2428916a6c8883d8834e5646f4e4a4a8"
+
 deprecated-decorator@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/deprecated-decorator/-/deprecated-decorator-0.1.6.tgz#00966317b7a12fe92f3cc831f7583af329b86c37"
@@ -4655,6 +4671,10 @@ generate-function@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
 
+generatorics@^1.0.8:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/generatorics/-/generatorics-1.1.0.tgz#695060bb8d88b909b30171a5cb3d424768661138"
+
 generic-pool@^3.1.7:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-3.2.0.tgz#c1d485ecbd6f18c0513d4741d098a6715eaeeca8"
@@ -4848,6 +4868,10 @@ graphql-iso-date@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/graphql-iso-date/-/graphql-iso-date-3.3.0.tgz#cbe434b41e035e806338121b1b2b509a0f72bb80"
 
+graphql-relay@^0.5.0:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/graphql-relay/-/graphql-relay-0.5.3.tgz#56a78ac07c87d89795a34db6b8e9681b827be5b5"
+
 graphql-subscriptions@^0.5.4:
   version "0.5.4"
   resolved "https://registry.yarnpkg.com/graphql-subscriptions/-/graphql-subscriptions-0.5.4.tgz#efb9374bdf505acad3c262bcd8bc61da085a198b"
@@ -5928,6 +5952,21 @@ join-component@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/join-component/-/join-component-1.1.0.tgz#b8417b750661a392bee2c2537c68b2a9d4977cd5"
 
+join-monster-graphql-tools-adapter@^0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/join-monster-graphql-tools-adapter/-/join-monster-graphql-tools-adapter-0.0.2.tgz#8f0ef874e104c2d1fab6f32ace190f2cd581d43f"
+
+join-monster@^2.0.15:
+  version "2.0.15"
+  resolved "https://registry.yarnpkg.com/join-monster/-/join-monster-2.0.15.tgz#992c8ac39ecd741d3db289a8c89542e82b5ce62f"
+  dependencies:
+    "@stem/nesthydrationjs" "0.4.0"
+    debug "^3.0.1"
+    deprecate "^1.0.0"
+    generatorics "^1.0.8"
+    graphql-relay "^0.5.0"
+    lodash "^4.13.1"
+
 js-base64@^2.1.8, js-base64@^2.1.9:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.3.2.tgz#a79a923666372b580f8e27f51845c6f7e8fbfbaf"
@@ -6665,6 +6704,10 @@ lodash@3.7.x:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.7.0.tgz#3678bd8ab995057c07ade836ed2ef087da811d45"
 
+lodash@4.13.1:
+  version "4.13.1"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.13.1.tgz#83e4b10913f48496d4d16fec4a560af2ee744b68"
+
 lodash@4.17.4, "lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.14.1, lodash@^4.15.0, lodash@^4.16.5, lodash@^4.16.6, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.6.0, lodash@^4.6.1, lodash@~4.17.4:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"

From 07f5258c21b3bbed74e37358715bb2c26537e5ba Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 23 Nov 2017 16:29:01 +0100
Subject: [PATCH 023/327] fix delete module

---
 tools/templates/crud/server/resolvers.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/templates/crud/server/resolvers.js b/tools/templates/crud/server/resolvers.js
index 1eb70bce8c..f3989a6427 100644
--- a/tools/templates/crud/server/resolvers.js
+++ b/tools/templates/crud/server/resolvers.js
@@ -29,9 +29,9 @@ export default pubsub => ({
 
       return joinMonster(info, { id: input.id }, sql => knex.raw(sql));
     },
-    delete$Module$: async (obj, { id }, { $Module$ }) => {
+    delete$Module$: async (obj, { id }, { $Module$ }, info) => {
       const e = new FieldError();
-      const $module$ = await $Module$.get$Module$(id);
+      const $module$ = await joinMonster(info, { id }, sql => knex.raw(sql));
       if (!$module$) {
         e.setError('delete', '$Module$ does not exist.');
         e.throwIf();

From b46d5c2bd97dea6a29e78af0439768ecb7f619e8 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 24 Nov 2017 08:17:25 +0100
Subject: [PATCH 024/327] Revert "fix delete module"

This reverts commit 07f5258c21b3bbed74e37358715bb2c26537e5ba.
---
 tools/templates/crud/server/resolvers.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/templates/crud/server/resolvers.js b/tools/templates/crud/server/resolvers.js
index f3989a6427..1eb70bce8c 100644
--- a/tools/templates/crud/server/resolvers.js
+++ b/tools/templates/crud/server/resolvers.js
@@ -29,9 +29,9 @@ export default pubsub => ({
 
       return joinMonster(info, { id: input.id }, sql => knex.raw(sql));
     },
-    delete$Module$: async (obj, { id }, { $Module$ }, info) => {
+    delete$Module$: async (obj, { id }, { $Module$ }) => {
       const e = new FieldError();
-      const $module$ = await joinMonster(info, { id }, sql => knex.raw(sql));
+      const $module$ = await $Module$.get$Module$(id);
       if (!$module$) {
         e.setError('delete', '$Module$ does not exist.');
         e.throwIf();

From 2f7e8eb83eeeb7763b1baedea1ceb22d229178ff Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 24 Nov 2017 08:17:53 +0100
Subject: [PATCH 025/327] Revert "add join monster, apollo errors, refactor
 error handling"

This reverts commit 8aa500ff19214b6d9b7997b774b399b80b79e121.
---
 package.json                                  |  7 +-
 src/common/FieldError.js                      |  8 +--
 src/server/api/schema.js                      |  2 -
 src/server/middleware/graphql.js              |  2 -
 src/server/modules/connector.js               | 15 ++--
 .../client/components/ModuleEditView.web.jsx  |  2 +-
 .../crud/client/containers/ModuleEdit.jsx     | 16 +++--
 .../crud/client/graphql/AddModule.graphql     |  8 ++-
 .../crud/client/graphql/DeleteModule.graphql  |  8 ++-
 .../crud/client/graphql/EditModule.graphql    |  8 ++-
 tools/templates/crud/server/index.js          |  2 -
 tools/templates/crud/server/metadata.js       | 20 ------
 tools/templates/crud/server/resolvers.js      | 69 +++++++++++--------
 tools/templates/crud/server/schema.graphqls   | 11 ++-
 tools/templates/crud/server/sql.js            | 10 +++
 yarn.lock                                     | 43 ------------
 16 files changed, 102 insertions(+), 129 deletions(-)
 delete mode 100644 tools/templates/crud/server/metadata.js

diff --git a/package.json b/package.json
index d088d13be8..b5f5a05546 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,10 @@
     "*.{js,jsx,json}": [
       "eslint --fix",
       "git add"
+    ],
+    "*.graphql": [
+      "prettier --parser graphql --write",
+      "git add"
     ]
   },
   "repository": {
@@ -55,7 +59,6 @@
     "apollo-cache-inmemory": "^1.1.1",
     "apollo-client": "^2.0.3",
     "apollo-engine": "^0.5.4",
-    "apollo-errors": "^1.5.1",
     "apollo-fetch": "^0.6.0",
     "apollo-fetch-upload": "^1.1.0",
     "apollo-link": "^1.0.3",
@@ -86,8 +89,6 @@
     "humps": "^2.0.1",
     "immutability-helper": "^2.5.0",
     "isomorphic-fetch": "^2.2.1",
-    "join-monster": "^2.0.15",
-    "join-monster-graphql-tools-adapter": "^0.0.2",
     "jsonwebtoken": "^8.1.0",
     "jwt-decode": "^2.2.0",
     "knex": "^0.14.0",
diff --git a/src/common/FieldError.js b/src/common/FieldError.js
index fb328ddd71..0d58d6fb53 100644
--- a/src/common/FieldError.js
+++ b/src/common/FieldError.js
@@ -1,9 +1,3 @@
-import { createError } from 'apollo-errors';
-
-const BaseError = createError('BaseError', {
-  message: 'A error has occurred'
-});
-
 export default class FieldError {
   constructor() {
     this.errors = {};
@@ -26,7 +20,7 @@ export default class FieldError {
 
   throwIf() {
     if (this.hasAny()) {
-      throw new BaseError({ data: this.getErrors() });
+      throw this.getErrors();
     }
   }
 }
diff --git a/src/server/api/schema.js b/src/server/api/schema.js
index 7a728f6fdf..d9adbfc9ba 100644
--- a/src/server/api/schema.js
+++ b/src/server/api/schema.js
@@ -1,5 +1,4 @@
 import { makeExecutableSchema, addErrorLoggingToSchema } from 'graphql-tools';
-import joinMonsterAdapt from 'join-monster-graphql-tools-adapter';
 
 import rootSchemaDef from './rootSchema.graphqls';
 import modules from '../modules';
@@ -12,6 +11,5 @@ const executableSchema = makeExecutableSchema({
 });
 
 addErrorLoggingToSchema(executableSchema, { log: e => log.error(e) });
-joinMonsterAdapt(executableSchema, modules.createMetadata());
 
 export default executableSchema;
diff --git a/src/server/middleware/graphql.js b/src/server/middleware/graphql.js
index 251d3bf9cd..82be3530ff 100644
--- a/src/server/middleware/graphql.js
+++ b/src/server/middleware/graphql.js
@@ -1,5 +1,4 @@
 import { graphqlExpress } from 'apollo-server-express';
-import { formatError } from 'apollo-errors';
 import 'isomorphic-fetch';
 
 import log from '../../common/log';
@@ -11,7 +10,6 @@ export default graphqlExpress(async req => {
   try {
     return {
       schema,
-      formatError,
       context: await modules.createContext(req),
       tracing: !!settings.analytics.apolloEngine.key,
       cacheControl: !!settings.analytics.apolloEngine.key
diff --git a/src/server/modules/connector.js b/src/server/modules/connector.js
index f78d22a55c..362cab93bd 100644
--- a/src/server/modules/connector.js
+++ b/src/server/modules/connector.js
@@ -12,7 +12,6 @@ const combine = (features, extractor): any =>
 
 type FeatureParams = {
   schema: DocumentNode | DocumentNode[],
-  createMetadataFunc?: Function | Function[],
   createResolversFunc?: Function | Function[],
   createContextFunc?: Function | Function[],
   beforeware?: Middleware | Middleware[],
@@ -22,7 +21,6 @@ type FeatureParams = {
 
 class Feature {
   schema: DocumentNode[];
-  createMetadataFunc: Function[];
   createResolversFunc: Function[];
   createContextFunc: Function[];
   createFetchOptions: Function[];
@@ -32,7 +30,6 @@ class Feature {
   constructor(feature?: FeatureParams, ...features: Feature[]) {
     // console.log(feature.schema[0] instanceof DocumentNode);
     this.schema = combine(arguments, arg => arg.schema);
-    this.createMetadataFunc = combine(arguments, arg => arg.createMetadataFunc);
     this.createResolversFunc = combine(arguments, arg => arg.createResolversFunc);
     this.createContextFunc = combine(arguments, arg => arg.createContextFunc);
     this.beforeware = combine(arguments, arg => arg.beforeware);
@@ -44,14 +41,6 @@ class Feature {
     return this.schema;
   }
 
-  createMetadata() {
-    return merge({}, ...this.createMetadataFunc.map(createMetadata => createMetadata()));
-  }
-
-  createResolvers(pubsub: any) {
-    return merge({}, ...this.createResolversFunc.map(createResolvers => createResolvers(pubsub)));
-  }
-
   async createContext(req: $Request, connectionParams: any, webSocket: any) {
     const results = await Promise.all(
       this.createContextFunc.map(createContext => createContext(req, connectionParams, webSocket))
@@ -59,6 +48,10 @@ class Feature {
     return merge({}, ...results);
   }
 
+  createResolvers(pubsub: any) {
+    return merge({}, ...this.createResolversFunc.map(createResolvers => createResolvers(pubsub)));
+  }
+
   get beforewares(): Middleware[] {
     return this.beforeware;
   }
diff --git a/tools/templates/crud/client/components/ModuleEditView.web.jsx b/tools/templates/crud/client/components/ModuleEditView.web.jsx
index 0a3e13cd8a..56bd28b5f8 100644
--- a/tools/templates/crud/client/components/ModuleEditView.web.jsx
+++ b/tools/templates/crud/client/components/ModuleEditView.web.jsx
@@ -27,7 +27,7 @@ class $Module$EditView extends React.PureComponent {
       let submitError = {
         _error: 'Edit $module$ failed!'
       };
-      Object.keys(result.errors).map(key => (submitError[result.errors[key].field] = result.errors[key].message));
+      result.errors.map(error => (submitError[error.field] = error.message));
       throw new SubmissionError(submitError);
     }
   };
diff --git a/tools/templates/crud/client/containers/ModuleEdit.jsx b/tools/templates/crud/client/containers/ModuleEdit.jsx
index 75b98275ab..654af8ed50 100644
--- a/tools/templates/crud/client/containers/ModuleEdit.jsx
+++ b/tools/templates/crud/client/containers/ModuleEdit.jsx
@@ -35,10 +35,14 @@ export default compose(
     props: ({ ownProps: { history, navigation }, mutate }) => ({
       add$Module$: async input => {
         try {
-          await mutate({
+          const { data: { add$Module$ } } = await mutate({
             variables: { input }
           });
 
+          if (add$Module$.errors) {
+            return { errors: add$Module$.errors };
+          }
+
           if (history) {
             return history.push('/$module$');
           }
@@ -46,7 +50,7 @@ export default compose(
             return navigation.goBack();
           }
         } catch (e) {
-          return { errors: e.graphQLErrors[0].data };
+          console.log(e.graphQLErrors);
         }
       }
     })
@@ -55,10 +59,14 @@ export default compose(
     props: ({ ownProps: { history, navigation }, mutate }) => ({
       edit$Module$: async input => {
         try {
-          await mutate({
+          const { data: { edit$Module$ } } = await mutate({
             variables: { input }
           });
 
+          if (edit$Module$.errors) {
+            return { errors: edit$Module$.errors };
+          }
+
           if (history) {
             return history.push('/$module$');
           }
@@ -66,7 +74,7 @@ export default compose(
             return navigation.goBack();
           }
         } catch (e) {
-          return { errors: e.graphQLErrors[0].data };
+          console.log(e.graphQLErrors);
         }
       }
     })
diff --git a/tools/templates/crud/client/graphql/AddModule.graphql b/tools/templates/crud/client/graphql/AddModule.graphql
index 008f3738e6..56814fa41a 100644
--- a/tools/templates/crud/client/graphql/AddModule.graphql
+++ b/tools/templates/crud/client/graphql/AddModule.graphql
@@ -2,6 +2,12 @@
 
 mutation add$Module$($input: Add$Module$Input!) {
   add$Module$(input: $input) {
-    ...$Module$Info
+    $module$ {
+      ...$Module$Info
+    }
+    errors {
+      field
+      message
+    }
   }
 }
diff --git a/tools/templates/crud/client/graphql/DeleteModule.graphql b/tools/templates/crud/client/graphql/DeleteModule.graphql
index 7d278994e4..2274ef6473 100644
--- a/tools/templates/crud/client/graphql/DeleteModule.graphql
+++ b/tools/templates/crud/client/graphql/DeleteModule.graphql
@@ -1,5 +1,11 @@
 mutation delete$Module$($id: Int!) {
   delete$Module$(id: $id) {
-    id
+    $module$ {
+      id
+    }
+    errors {
+      field
+      message
+    }
   }
 }
diff --git a/tools/templates/crud/client/graphql/EditModule.graphql b/tools/templates/crud/client/graphql/EditModule.graphql
index af2f4d2b16..c3b639bd64 100644
--- a/tools/templates/crud/client/graphql/EditModule.graphql
+++ b/tools/templates/crud/client/graphql/EditModule.graphql
@@ -2,6 +2,12 @@
 
 mutation edit$Module$($input: Edit$Module$Input!) {
   edit$Module$(input: $input) {
-    ...$Module$Info
+    $module$ {
+      ...$Module$Info
+    }
+    errors {
+      field
+      message
+    }
   }
 }
diff --git a/tools/templates/crud/server/index.js b/tools/templates/crud/server/index.js
index 4eeac0bccc..4dad072b00 100644
--- a/tools/templates/crud/server/index.js
+++ b/tools/templates/crud/server/index.js
@@ -3,13 +3,11 @@ import GraphQLGenerator from 'domain-graphql';
 import { $Module$ as $Module$Schema } from './schema';
 import $Module$ from './sql';
 import schema from './schema.graphqls';
-import createMetadata from './metadata';
 import createResolvers from './resolvers';
 import Feature from '../connector';
 
 export default new Feature({
   schema: [schema, new GraphQLGenerator().generateTypes($Module$Schema)],
-  createMetadataFunc: createMetadata,
   createResolversFunc: createResolvers,
   createContextFunc: () => ({ $Module$: new $Module$() })
 });
diff --git a/tools/templates/crud/server/metadata.js b/tools/templates/crud/server/metadata.js
deleted file mode 100644
index 31023c9380..0000000000
--- a/tools/templates/crud/server/metadata.js
+++ /dev/null
@@ -1,20 +0,0 @@
-export default () => ({
-  Query: {
-    fields: {
-      cruds: {
-        orderBy: { id: 'desc' }
-      },
-      crud: {
-        where: (table, { id }) => `${table}.id = ${id}`
-      }
-    }
-  },
-  Crud: {
-    sqlTable: 'crud',
-    uniqueKey: 'id',
-    fields: {
-      id: { sqlColumn: 'id' },
-      name: { sqlColumn: 'name' }
-    }
-  }
-});
diff --git a/tools/templates/crud/server/resolvers.js b/tools/templates/crud/server/resolvers.js
index 1eb70bce8c..078e052331 100644
--- a/tools/templates/crud/server/resolvers.js
+++ b/tools/templates/crud/server/resolvers.js
@@ -1,48 +1,61 @@
 /*eslint-disable no-unused-vars*/
-import joinMonster from 'join-monster';
 import FieldError from '../../../common/FieldError';
-import knex from '../../../server/sql/connector';
 
 export default pubsub => ({
   Query: {
-    $module$s: (obj, args, context, info) => {
-      return joinMonster(info, args, sql => knex.raw(sql));
+    $module$s: (obj, args, { $Module$ }) => {
+      return $Module$.get$Module$s();
     },
-    $module$: (obj, args, context, info) => {
-      return joinMonster(info, args, sql => knex.raw(sql));
+    $module$: (obj, { id }, { $Module$ }) => {
+      return $Module$.get$Module$(id);
     }
   },
   Mutation: {
-    add$Module$: async (obj, { input }, { $Module$ }, info) => {
-      const e = new FieldError();
-      e.throwIf();
+    add$Module$: async (obj, { input }, { $Module$ }) => {
+      try {
+        const e = new FieldError();
+        e.throwIf();
 
-      const [id] = await $Module$.add$Module$(input);
+        const [id] = await $Module$.add$Module$(input);
+        const $module$ = await $Module$.get$Module$(id);
 
-      return joinMonster(info, { id }, sql => knex.raw(sql));
+        return { $module$ };
+      } catch (e) {
+        return { errors: e };
+      }
     },
-    edit$Module$: async (obj, { input }, { $Module$ }, info) => {
-      const e = new FieldError();
-      e.throwIf();
+    edit$Module$: async (obj, { input }, { $Module$ }) => {
+      try {
+        const e = new FieldError();
+        e.throwIf();
+
+        await $Module$.edit$Module$(input);
 
-      await $Module$.edit$Module$(input);
+        const $module$ = await $Module$.get$Module$(input.id);
 
-      return joinMonster(info, { id: input.id }, sql => knex.raw(sql));
+        return { $module$ };
+      } catch (e) {
+        return { errors: e };
+      }
     },
     delete$Module$: async (obj, { id }, { $Module$ }) => {
-      const e = new FieldError();
-      const $module$ = await $Module$.get$Module$(id);
-      if (!$module$) {
-        e.setError('delete', '$Module$ does not exist.');
-        e.throwIf();
-      }
+      try {
+        const e = new FieldError();
+        const $module$ = await $Module$.get$Module$(id);
+        if (!$module$) {
+          e.setError('delete', '$Module$ does not exist.');
+          e.throwIf();
+        }
 
-      const isDeleted = await $Module$.delete$Module$(id);
-      if (isDeleted) {
-        return { id };
-      } else {
-        e.setError('delete', 'Could not delete $module$. Please try again later.');
-        e.throwIf();
+        const isDeleted = await $Module$.delete$Module$(id);
+        if (isDeleted) {
+          return { $module$ };
+        } else {
+          e.setError('delete', 'Could not delete $module$. Please try again later.');
+          e.throwIf();
+        }
+      } catch (e) {
+        return { errors: e };
       }
     }
   },
diff --git a/tools/templates/crud/server/schema.graphqls b/tools/templates/crud/server/schema.graphqls
index 7675abc1b9..8db675f72f 100644
--- a/tools/templates/crud/server/schema.graphqls
+++ b/tools/templates/crud/server/schema.graphqls
@@ -1,3 +1,8 @@
+type $Module$Payload {
+  $module$: $Module$
+  errors: [FieldError!]
+}
+
 input Add$Module$Input {
   name: String!
 }
@@ -13,9 +18,9 @@ extend type Query {
 }
 
 extend type Mutation {
-  add$Module$(input: Add$Module$Input!): $Module$
-  edit$Module$(input: Edit$Module$Input!): $Module$
-  delete$Module$(id: Int!): $Module$
+  add$Module$(input: Add$Module$Input!): $Module$Payload!
+  edit$Module$(input: Edit$Module$Input!): $Module$Payload!
+  delete$Module$(id: Int!): $Module$Payload!
 }
 
 extend type Subscription {}
\ No newline at end of file
diff --git a/tools/templates/crud/server/sql.js b/tools/templates/crud/server/sql.js
index 8aa009b7b1..3dd3565165 100644
--- a/tools/templates/crud/server/sql.js
+++ b/tools/templates/crud/server/sql.js
@@ -1,6 +1,16 @@
+import { camelizeKeys } from 'humps';
+
 import knex from '../../../server/sql/connector';
 
 export default class $Module$ {
+  async get$Module$s() {
+    return camelizeKeys(await knex.select('*').from('$module$'));
+  }
+
+  async get$Module$(id) {
+    return camelizeKeys(await knex.select('*').from('$module$').where({ id }).first());
+  }
+
   add$Module$(input) {
     return knex('$module$')
       .insert(input)
diff --git a/yarn.lock b/yarn.lock
index b2855edc0b..dd854a51f3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -128,12 +128,6 @@
     component-type "^1.2.1"
     join-component "^1.1.0"
 
-"@stem/nesthydrationjs@0.4.0":
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/@stem/nesthydrationjs/-/nesthydrationjs-0.4.0.tgz#5e797efd8b64ea33307ced2a6c4cde9c0227fcf4"
-  dependencies:
-    lodash "4.13.1"
-
 "@types/async@2.0.45", "@types/async@^2.0.31":
   version "2.0.45"
   resolved "https://registry.yarnpkg.com/@types/async/-/async-2.0.45.tgz#0cfe971d7ed5542695740338e0455c91078a0e83"
@@ -491,12 +485,6 @@ apollo-engine@^0.5.4:
     apollo-engine-binary-linux "^0.2017.11-40-g9585bfc6"
     apollo-engine-binary-windows "^0.2017.11-40-g9585bfc6"
 
-apollo-errors@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/apollo-errors/-/apollo-errors-1.5.1.tgz#956d705fb5bad41de256cdcb41bc009c66e0bb3e"
-  dependencies:
-    es6-error "^4.0.0"
-
 apollo-fetch-upload@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/apollo-fetch-upload/-/apollo-fetch-upload-1.1.0.tgz#01e20e4243cb14f722fb9044154834532237aa09"
@@ -3266,10 +3254,6 @@ depd@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.0.1.tgz#80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa"
 
-deprecate@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/deprecate/-/deprecate-1.0.0.tgz#661490ed2428916a6c8883d8834e5646f4e4a4a8"
-
 deprecated-decorator@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/deprecated-decorator/-/deprecated-decorator-0.1.6.tgz#00966317b7a12fe92f3cc831f7583af329b86c37"
@@ -4671,10 +4655,6 @@ generate-function@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
 
-generatorics@^1.0.8:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/generatorics/-/generatorics-1.1.0.tgz#695060bb8d88b909b30171a5cb3d424768661138"
-
 generic-pool@^3.1.7:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-3.2.0.tgz#c1d485ecbd6f18c0513d4741d098a6715eaeeca8"
@@ -4868,10 +4848,6 @@ graphql-iso-date@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/graphql-iso-date/-/graphql-iso-date-3.3.0.tgz#cbe434b41e035e806338121b1b2b509a0f72bb80"
 
-graphql-relay@^0.5.0:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/graphql-relay/-/graphql-relay-0.5.3.tgz#56a78ac07c87d89795a34db6b8e9681b827be5b5"
-
 graphql-subscriptions@^0.5.4:
   version "0.5.4"
   resolved "https://registry.yarnpkg.com/graphql-subscriptions/-/graphql-subscriptions-0.5.4.tgz#efb9374bdf505acad3c262bcd8bc61da085a198b"
@@ -5952,21 +5928,6 @@ join-component@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/join-component/-/join-component-1.1.0.tgz#b8417b750661a392bee2c2537c68b2a9d4977cd5"
 
-join-monster-graphql-tools-adapter@^0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/join-monster-graphql-tools-adapter/-/join-monster-graphql-tools-adapter-0.0.2.tgz#8f0ef874e104c2d1fab6f32ace190f2cd581d43f"
-
-join-monster@^2.0.15:
-  version "2.0.15"
-  resolved "https://registry.yarnpkg.com/join-monster/-/join-monster-2.0.15.tgz#992c8ac39ecd741d3db289a8c89542e82b5ce62f"
-  dependencies:
-    "@stem/nesthydrationjs" "0.4.0"
-    debug "^3.0.1"
-    deprecate "^1.0.0"
-    generatorics "^1.0.8"
-    graphql-relay "^0.5.0"
-    lodash "^4.13.1"
-
 js-base64@^2.1.8, js-base64@^2.1.9:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.3.2.tgz#a79a923666372b580f8e27f51845c6f7e8fbfbaf"
@@ -6704,10 +6665,6 @@ lodash@3.7.x:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.7.0.tgz#3678bd8ab995057c07ade836ed2ef087da811d45"
 
-lodash@4.13.1:
-  version "4.13.1"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.13.1.tgz#83e4b10913f48496d4d16fec4a560af2ee744b68"
-
 lodash@4.17.4, "lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.14.1, lodash@^4.15.0, lodash@^4.16.5, lodash@^4.16.6, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.6.0, lodash@^4.6.1, lodash@~4.17.4:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"

From 11ecfc3d3ea404b6a770762d60900c998493d1b2 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 24 Nov 2017 09:27:29 +0100
Subject: [PATCH 026/327] working sort, filter wip

---
 src/client/modules/common/util.js             | 40 +---------
 .../client/components/ModuleListView.web.jsx  | 77 ++++++++++++++++++-
 .../crud/client/containers/ModuleList.jsx     | 24 +++++-
 .../crud/client/graphql/ModulesQuery.graphql  |  4 +-
 tools/templates/crud/client/reducers/index.js | 17 +++-
 tools/templates/crud/server/resolvers.js      |  6 +-
 tools/templates/crud/server/schema.graphqls   | 11 ++-
 tools/templates/crud/server/sql.js            | 29 ++++++-
 8 files changed, 154 insertions(+), 54 deletions(-)

diff --git a/src/client/modules/common/util.js b/src/client/modules/common/util.js
index a5e07378b4..4987175d07 100644
--- a/src/client/modules/common/util.js
+++ b/src/client/modules/common/util.js
@@ -1,46 +1,8 @@
 /* eslint-disable react/display-name */
 import React from 'react';
-import { Link } from 'react-router-dom';
 import { pick, capitalize } from 'lodash';
 import { Field } from 'redux-form';
-import { RenderField, Button } from './components/web';
-
-export const createTableColumns = (schema, path, hendleDelete) => {
-  let columns = [];
-
-  for (const key of schema.keys()) {
-    if (key === 'id') {
-      columns.push({
-        title: 'Id',
-        dataIndex: 'id',
-        key: 'id',
-        render: (text, record) => (
-          <Link className="$module$-link" to={`/${path}/${record.id}`}>
-            {text}
-          </Link>
-        )
-      });
-    } else {
-      columns.push({
-        title: key,
-        dataIndex: key,
-        key: key
-      });
-    }
-  }
-
-  columns.push({
-    title: 'Actions',
-    key: 'actions',
-    render: (text, record) => (
-      <Button color="primary" size="sm" onClick={() => hendleDelete(record.id)}>
-        Delete
-      </Button>
-    )
-  });
-
-  return columns;
-};
+import { RenderField } from './components/web';
 
 const required = value => (value ? undefined : 'Required');
 
diff --git a/tools/templates/crud/client/components/ModuleListView.web.jsx b/tools/templates/crud/client/components/ModuleListView.web.jsx
index 31bd8549b5..d1f8c53cee 100644
--- a/tools/templates/crud/client/components/ModuleListView.web.jsx
+++ b/tools/templates/crud/client/components/ModuleListView.web.jsx
@@ -2,6 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import Helmet from 'react-helmet';
 import { Link } from 'react-router-dom';
+import { capitalize } from 'lodash';
 
 import { PageLayout, Table, Button } from '../../common/components/web';
 import { createTableColumns } from '../../common/util';
@@ -20,14 +21,86 @@ class $Module$ListView extends React.PureComponent {
     />
   );
 
+  renderOrderByArrow = name => {
+    const { orderBy } = this.props;
+
+    if (orderBy && orderBy.column === name) {
+      if (orderBy.order === 'desc') {
+        return <span className="badge badge-primary">&#8595;</span>;
+      } else {
+        return <span className="badge badge-primary">&#8593;</span>;
+      }
+    } else {
+      return <span className="badge badge-secondary">&#8645;</span>;
+    }
+  };
+
   hendleDelete$Module$ = id => {
     const { delete$Module$ } = this.props;
     delete$Module$(id);
   };
 
+  orderBy = (e, name) => {
+    const { onOrderBy, orderBy } = this.props;
+
+    e.preventDefault();
+
+    let order = 'asc';
+    if (orderBy && orderBy.column === name) {
+      if (orderBy.order === 'asc') {
+        order = 'desc';
+      } else if (orderBy.order === 'desc') {
+        return onOrderBy({});
+      }
+    }
+
+    return onOrderBy({ column: name, order });
+  };
+
   render() {
     const { loading, $module$s } = this.props;
 
+    let columns = [];
+
+    for (const key of CrudSchema.keys()) {
+      if (key === 'id') {
+        columns.push({
+          title: (
+            <a onClick={e => this.orderBy(e, key)} href="#">
+              {capitalize(key)} {this.renderOrderByArrow(key)}
+            </a>
+          ),
+          dataIndex: 'id',
+          key: 'id',
+          render: (text, record) => (
+            <Link className="$module$-link" to={`/$module$/${record.id}`}>
+              {text}
+            </Link>
+          )
+        });
+      } else {
+        columns.push({
+          title: (
+            <a onClick={e => this.orderBy(e, key)} href="#">
+              {capitalize(key)} {this.renderOrderByArrow(key)}
+            </a>
+          ),
+          dataIndex: key,
+          key: key
+        });
+      }
+    }
+
+    columns.push({
+      title: 'Actions',
+      key: 'actions',
+      render: (text, record) => (
+        <Button color="primary" size="sm" onClick={() => hendleDelete(record.id)}>
+          Delete
+        </Button>
+      )
+    });
+
     return (
       <PageLayout>
         {this.renderMetaData()}
@@ -38,7 +111,7 @@ class $Module$ListView extends React.PureComponent {
         <hr />
         <Table
           dataSource={$module$s}
-          columns={createTableColumns($Module$Schema, '$module$', this.hendleDelete$Module$)}
+          columns={columns}
           pagination={false}
           loading={loading && !$module$s}
         />
@@ -50,6 +123,8 @@ class $Module$ListView extends React.PureComponent {
 $Module$ListView.propTypes = {
   loading: PropTypes.bool.isRequired,
   $module$s: PropTypes.array,
+  orderBy: PropTypes.object,
+  onOrderBy: PropTypes.func.isRequired,
   delete$Module$: PropTypes.func.isRequired
 };
 
diff --git a/tools/templates/crud/client/containers/ModuleList.jsx b/tools/templates/crud/client/containers/ModuleList.jsx
index 0bf57d2e17..60b988c7d4 100644
--- a/tools/templates/crud/client/containers/ModuleList.jsx
+++ b/tools/templates/crud/client/containers/ModuleList.jsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import { graphql, compose } from 'react-apollo';
+import { connect } from 'react-redux';
 
 import $Module$ListView from '../components/$Module$ListView';
 import $MODULE$S_QUERY from '../graphql/$Module$sQuery.graphql';
@@ -13,9 +14,13 @@ class $Module$ extends React.Component {
 
 const $Module$WithApollo = compose(
   graphql($MODULE$S_QUERY, {
-    options: () => {
+    options: ({ orderBy, searchText }) => {
       return {
-        fetchPolicy: 'cache-and-network'
+        fetchPolicy: 'cache-and-network',
+        variables: {
+          orderBy: orderBy,
+          filter: { searchText }
+        }
       };
     },
     props({ data: { loading, $module$s, refetch, error } }) {
@@ -43,4 +48,17 @@ const $Module$WithApollo = compose(
   })
 )($Module$);
 
-export default $Module$WithApollo;
+export default connect(
+  state => ({
+    searchText: state.$module$.searchText,
+    orderBy: state.$module$.orderBy
+  }),
+  dispatch => ({
+    onOrderBy(orderBy) {
+      dispatch({
+        type: '$MODULE$_ORDER_BY',
+        value: orderBy
+      });
+    }
+  })
+)($Module$WithApollo);
diff --git a/tools/templates/crud/client/graphql/ModulesQuery.graphql b/tools/templates/crud/client/graphql/ModulesQuery.graphql
index b818cb8fbc..90e1c1c3fd 100644
--- a/tools/templates/crud/client/graphql/ModulesQuery.graphql
+++ b/tools/templates/crud/client/graphql/ModulesQuery.graphql
@@ -1,7 +1,7 @@
 #import "./$Module$.graphql"
 
-query $module$s {
-  $module$s {
+query $module$s($orderBy: OrderBy$Module$Input, $filter: Filter$Module$Input) {
+  $module$s(orderBy: $orderBy, filter: $filter) {
     ...$Module$Info
   }
 }
diff --git a/tools/templates/crud/client/reducers/index.js b/tools/templates/crud/client/reducers/index.js
index 6c6ee75a42..0015f6e39a 100644
--- a/tools/templates/crud/client/reducers/index.js
+++ b/tools/templates/crud/client/reducers/index.js
@@ -1,7 +1,22 @@
-const defaultState = {};
+const defaultState = {
+  searchText: '',
+  orderBy: {}
+};
 
 export default function(state = defaultState, action) {
   switch (action.type) {
+    case '$MODULE$_FILTER_SEARCH_TEXT':
+      return {
+        ...state,
+        searchText: action.value
+      };
+
+    case '$MODULE$_ORDER_BY':
+      return {
+        ...state,
+        orderBy: action.value
+      };
+
     default:
       return state;
   }
diff --git a/tools/templates/crud/server/resolvers.js b/tools/templates/crud/server/resolvers.js
index 078e052331..3a75b11d7c 100644
--- a/tools/templates/crud/server/resolvers.js
+++ b/tools/templates/crud/server/resolvers.js
@@ -4,10 +4,10 @@ import FieldError from '../../../common/FieldError';
 export default pubsub => ({
   Query: {
     $module$s: (obj, args, { $Module$ }) => {
-      return $Module$.get$Module$s();
+      return $Module$.get$Module$s(args);
     },
-    $module$: (obj, { id }, { $Module$ }) => {
-      return $Module$.get$Module$(id);
+    $module$: (obj, args, { $Module$ }) => {
+      return $Module$.get$Module$(args);
     }
   },
   Mutation: {
diff --git a/tools/templates/crud/server/schema.graphqls b/tools/templates/crud/server/schema.graphqls
index 8db675f72f..6b7c8a540c 100644
--- a/tools/templates/crud/server/schema.graphqls
+++ b/tools/templates/crud/server/schema.graphqls
@@ -3,6 +3,15 @@ type $Module$Payload {
   errors: [FieldError!]
 }
 
+input OrderBy$Module$Input {
+  column: String
+  order: String
+}
+
+input Filter$Module$Input {
+  searchText: String
+}
+
 input Add$Module$Input {
   name: String!
 }
@@ -13,7 +22,7 @@ input Edit$Module$Input {
 }
 
 extend type Query {
-  $module$s: [$Module$]
+  $module$s(orderBy: OrderBy$Module$Input, filter: Filter$Module$Input): [$Module$]
   $module$(id: Int!): $Module$
 }
 
diff --git a/tools/templates/crud/server/sql.js b/tools/templates/crud/server/sql.js
index 3dd3565165..96631d4a4a 100644
--- a/tools/templates/crud/server/sql.js
+++ b/tools/templates/crud/server/sql.js
@@ -1,13 +1,34 @@
-import { camelizeKeys } from 'humps';
+import { camelizeKeys, decamelize } from 'humps';
+import { has } from 'lodash';
 
 import knex from '../../../server/sql/connector';
 
 export default class $Module$ {
-  async get$Module$s() {
-    return camelizeKeys(await knex.select('*').from('$module$'));
+  async get$Module$s({ orderBy, filter }) {
+    const queryBuilder = knex.select('*').from('$module$');
+
+    if (orderBy && orderBy.column) {
+      let column = orderBy.column;
+      let order = 'asc';
+      if (orderBy.order) {
+        order = orderBy.order;
+      }
+
+      queryBuilder.orderBy(decamelize(column), order);
+    }
+
+    if (filter) {
+      if (has(filter, 'searchText') && filter.searchText !== '') {
+        queryBuilder.where(function() {
+          this.where('name', 'like', `%${filter.searchText}%`);
+        });
+      }
+    }
+
+    return camelizeKeys(await queryBuilder);
   }
 
-  async get$Module$(id) {
+  async get$Module$({ id }) {
     return camelizeKeys(await knex.select('*').from('$module$').where({ id }).first());
   }
 

From 2c82992f782ea65df2efbf80e4d73f0eaf1f279f Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 24 Nov 2017 09:37:34 +0100
Subject: [PATCH 027/327] fix delete handle

---
 tools/templates/crud/client/components/ModuleListView.web.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/templates/crud/client/components/ModuleListView.web.jsx b/tools/templates/crud/client/components/ModuleListView.web.jsx
index d1f8c53cee..b1a09bab49 100644
--- a/tools/templates/crud/client/components/ModuleListView.web.jsx
+++ b/tools/templates/crud/client/components/ModuleListView.web.jsx
@@ -35,7 +35,7 @@ class $Module$ListView extends React.PureComponent {
     }
   };
 
-  hendleDelete$Module$ = id => {
+  hendleDelete = id => {
     const { delete$Module$ } = this.props;
     delete$Module$(id);
   };
@@ -95,7 +95,7 @@ class $Module$ListView extends React.PureComponent {
       title: 'Actions',
       key: 'actions',
       render: (text, record) => (
-        <Button color="primary" size="sm" onClick={() => hendleDelete(record.id)}>
+        <Button color="primary" size="sm" onClick={() => this.hendleDelete(record.id)}>
           Delete
         </Button>
       )

From 9ec8f69391a3dcb0b53c66929929f5938ed4d789 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 24 Nov 2017 10:15:52 +0100
Subject: [PATCH 028/327] working filter

---
 .../modules/user/containers/UsersFilter.jsx   |  4 --
 .../crud/client/components/Module.jsx         | 31 +++++++++++++++
 .../crud/client/components/Module.web.jsx     | 38 +++++++++++++++++++
 .../components/ModuleFilterView.web.jsx       | 34 +++++++++++++++++
 .../client/components/ModuleListView.web.jsx  | 20 +++-------
 .../crud/client/containers/ModuleFilter.jsx   | 24 ++++++++++++
 tools/templates/crud/client/index.web.jsx     |  4 +-
 7 files changed, 135 insertions(+), 20 deletions(-)
 create mode 100644 tools/templates/crud/client/components/Module.jsx
 create mode 100644 tools/templates/crud/client/components/Module.web.jsx
 create mode 100644 tools/templates/crud/client/components/ModuleFilterView.web.jsx
 create mode 100644 tools/templates/crud/client/containers/ModuleFilter.jsx

diff --git a/src/client/modules/user/containers/UsersFilter.jsx b/src/client/modules/user/containers/UsersFilter.jsx
index 4ab72b1fdb..f7441a1e82 100644
--- a/src/client/modules/user/containers/UsersFilter.jsx
+++ b/src/client/modules/user/containers/UsersFilter.jsx
@@ -1,9 +1,5 @@
-/*eslint-disable no-unused-vars*/
-// React
 import React from 'react';
 import { connect } from 'react-redux';
-
-// Components
 import UsersFilterView from '../components/UsersFilterView';
 
 class UsersFilter extends React.Component {
diff --git a/tools/templates/crud/client/components/Module.jsx b/tools/templates/crud/client/components/Module.jsx
new file mode 100644
index 0000000000..ebef044528
--- /dev/null
+++ b/tools/templates/crud/client/components/Module.jsx
@@ -0,0 +1,31 @@
+import React from 'react';
+import { StyleSheet, Text, View } from 'react-native';
+
+const $Module$ = () => {
+  return (
+    <View style={styles.container}>
+      <View style={styles.element}>
+        <Text style={styles.box}>Hello $Module$!</Text>
+      </View>
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    backgroundColor: '#fff',
+    alignItems: 'center',
+    justifyContent: 'center'
+  },
+  element: {
+    paddingTop: 30
+  },
+  box: {
+    textAlign: 'center',
+    marginLeft: 15,
+    marginRight: 15
+  }
+});
+
+export default $Module$;
diff --git a/tools/templates/crud/client/components/Module.web.jsx b/tools/templates/crud/client/components/Module.web.jsx
new file mode 100644
index 0000000000..1c36c646ae
--- /dev/null
+++ b/tools/templates/crud/client/components/Module.web.jsx
@@ -0,0 +1,38 @@
+import React from 'react';
+import Helmet from 'react-helmet';
+import { Link } from 'react-router-dom';
+import { PageLayout, Button } from '../../common/components/web';
+
+import $Module$Filter from '../containers/$Module$Filter';
+import $Module$List from '../containers/$Module$List';
+import settings from '../../../../../settings';
+
+const $Module$ = () => {
+  const renderMetaData = () => (
+    <Helmet
+      title={`${settings.app.name} - $Module$`}
+      meta={[
+        {
+          name: 'description',
+          content: `${settings.app.name} - $Module$ page`
+        }
+      ]}
+    />
+  );
+
+  return (
+    <PageLayout>
+      {renderMetaData()}
+      <h2>$Module$</h2>
+      <Link to="/$module$/0">
+        <Button color="primary">Add</Button>
+      </Link>
+      <hr />
+      <$Module$Filter />
+      <hr />
+      <$Module$List />
+    </PageLayout>
+  );
+};
+
+export default $Module$;
diff --git a/tools/templates/crud/client/components/ModuleFilterView.web.jsx b/tools/templates/crud/client/components/ModuleFilterView.web.jsx
new file mode 100644
index 0000000000..1315fb63d4
--- /dev/null
+++ b/tools/templates/crud/client/components/ModuleFilterView.web.jsx
@@ -0,0 +1,34 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { DebounceInput } from 'react-debounce-input';
+import { Form, FormItem, Input } from '../../common/components/web';
+
+class $Module$FilterView extends React.PureComponent {
+  handleSearch = e => {
+    const { onSearchTextChange } = this.props;
+    onSearchTextChange(e.target.value);
+  };
+
+  render() {
+    return (
+      <Form layout="inline">
+        <FormItem label="Filter">
+          <DebounceInput
+            minLength={2}
+            debounceTimeout={300}
+            placeholder="Search ..."
+            element={Input}
+            onChange={this.handleSearch}
+          />
+        </FormItem>
+      </Form>
+    );
+  }
+}
+
+$Module$FilterView.propTypes = {
+  searchText: PropTypes.string,
+  onSearchTextChange: PropTypes.func.isRequired
+};
+
+export default $Module$FilterView;
diff --git a/tools/templates/crud/client/components/ModuleListView.web.jsx b/tools/templates/crud/client/components/ModuleListView.web.jsx
index b1a09bab49..aa50628aec 100644
--- a/tools/templates/crud/client/components/ModuleListView.web.jsx
+++ b/tools/templates/crud/client/components/ModuleListView.web.jsx
@@ -102,20 +102,12 @@ class $Module$ListView extends React.PureComponent {
     });
 
     return (
-      <PageLayout>
-        {this.renderMetaData()}
-        <h2>$Module$s</h2>
-        <Link to="/$module$/0">
-          <Button color="primary">Add</Button>
-        </Link>
-        <hr />
-        <Table
-          dataSource={$module$s}
-          columns={columns}
-          pagination={false}
-          loading={loading && !$module$s}
-        />
-      </PageLayout>
+      <Table
+        dataSource={$module$s}
+        columns={columns}
+        pagination={false}
+        loading={loading && !$module$s}
+      />
     );
   }
 }
diff --git a/tools/templates/crud/client/containers/ModuleFilter.jsx b/tools/templates/crud/client/containers/ModuleFilter.jsx
new file mode 100644
index 0000000000..9c9175bba5
--- /dev/null
+++ b/tools/templates/crud/client/containers/ModuleFilter.jsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import { connect } from 'react-redux';
+
+import $Module$FilterView from '../components/$Module$FilterView';
+
+class $Module$Filter extends React.PureComponent {
+  render() {
+    return <$Module$FilterView {...this.props} />;
+  }
+}
+
+export default connect(
+  state => ({
+    searchText: state.$module$.searchText
+  }),
+  dispatch => ({
+    onSearchTextChange(searchText) {
+      dispatch({
+        type: '$MODULE$_FILTER_SEARCH_TEXT',
+        value: searchText
+      });
+    }
+  })
+)($Module$Filter);
diff --git a/tools/templates/crud/client/index.web.jsx b/tools/templates/crud/client/index.web.jsx
index a68d4399e5..b0cea12b0a 100644
--- a/tools/templates/crud/client/index.web.jsx
+++ b/tools/templates/crud/client/index.web.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Route, NavLink } from 'react-router-dom';
 import { MenuItem } from '../../modules/common/components/web';
-import $Module$List from './containers/$Module$List';
+import $Module$ from './components/$Module$';
 import $Module$Edit from './containers/$Module$Edit';
 import reducers from './reducers';
 
@@ -9,7 +9,7 @@ import Feature from '../connector';
 
 export default new Feature({
   route: [
-    <Route exact path="/$module$" component={$Module$List} />,
+    <Route exact path="/$module$" component={$Module$} />,
     <Route exact path="/$module$/:id" component={$Module$Edit} />
   ],
   navItem: (

From 6d1b5528aab106aae91f46ed4941a74aeacb5df9 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 24 Nov 2017 10:34:06 +0100
Subject: [PATCH 029/327] add searchText property to the domain schema

---
 src/client/modules/common/util.js                         | 1 -
 .../crud/client/components/ModuleListView.web.jsx         | 1 +
 tools/templates/crud/server/schema.js                     | 3 ++-
 tools/templates/crud/server/sql.js                        | 8 +++++++-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/client/modules/common/util.js b/src/client/modules/common/util.js
index 4987175d07..610e79059f 100644
--- a/src/client/modules/common/util.js
+++ b/src/client/modules/common/util.js
@@ -1,4 +1,3 @@
-/* eslint-disable react/display-name */
 import React from 'react';
 import { pick, capitalize } from 'lodash';
 import { Field } from 'redux-form';
diff --git a/tools/templates/crud/client/components/ModuleListView.web.jsx b/tools/templates/crud/client/components/ModuleListView.web.jsx
index aa50628aec..67b50e002e 100644
--- a/tools/templates/crud/client/components/ModuleListView.web.jsx
+++ b/tools/templates/crud/client/components/ModuleListView.web.jsx
@@ -1,3 +1,4 @@
+/* eslint-disable react/display-name */
 import React from 'react';
 import PropTypes from 'prop-types';
 import Helmet from 'react-helmet';
diff --git a/tools/templates/crud/server/schema.js b/tools/templates/crud/server/schema.js
index 34bcc3bd6d..77c98ef03f 100644
--- a/tools/templates/crud/server/schema.js
+++ b/tools/templates/crud/server/schema.js
@@ -6,7 +6,8 @@ export const $Module$ = new DomainSchema(
   class $Module$ extends Schema {
     id = DomainSchema.Integer;
     name = {
-      type: String
+      type: String,
+      searchText: true
     };
   }
 );
diff --git a/tools/templates/crud/server/sql.js b/tools/templates/crud/server/sql.js
index 96631d4a4a..abd9d644d8 100644
--- a/tools/templates/crud/server/sql.js
+++ b/tools/templates/crud/server/sql.js
@@ -1,6 +1,7 @@
 import { camelizeKeys, decamelize } from 'humps';
 import { has } from 'lodash';
 
+import { $Module$ as $Module$Schema } from './schema';
 import knex from '../../../server/sql/connector';
 
 export default class $Module$ {
@@ -20,7 +21,12 @@ export default class $Module$ {
     if (filter) {
       if (has(filter, 'searchText') && filter.searchText !== '') {
         queryBuilder.where(function() {
-          this.where('name', 'like', `%${filter.searchText}%`);
+          for (const key of CrudSchema.keys()) {
+            const value = CrudSchema.values[key];
+            if (value.searchText) {
+              this.orWhere(key, 'like', `%${filter.searchText}%`);
+            }
+          }
         });
       }
     }

From f10b2855ff175fbd1d2f95c5d4199adf4fe442e1 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 24 Nov 2017 10:46:23 +0100
Subject: [PATCH 030/327] fix getModule args

---
 tools/templates/crud/server/resolvers.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/templates/crud/server/resolvers.js b/tools/templates/crud/server/resolvers.js
index 3a75b11d7c..895b05bc2b 100644
--- a/tools/templates/crud/server/resolvers.js
+++ b/tools/templates/crud/server/resolvers.js
@@ -17,7 +17,7 @@ export default pubsub => ({
         e.throwIf();
 
         const [id] = await $Module$.add$Module$(input);
-        const $module$ = await $Module$.get$Module$(id);
+        const $module$ = await $Module$.get$Module$({ id });
 
         return { $module$ };
       } catch (e) {
@@ -31,7 +31,7 @@ export default pubsub => ({
 
         await $Module$.edit$Module$(input);
 
-        const $module$ = await $Module$.get$Module$(input.id);
+        const $module$ = await $Module$.get$Module$({ id: input.id});
 
         return { $module$ };
       } catch (e) {
@@ -41,7 +41,7 @@ export default pubsub => ({
     delete$Module$: async (obj, { id }, { $Module$ }) => {
       try {
         const e = new FieldError();
-        const $module$ = await $Module$.get$Module$(id);
+        const $module$ = await $Module$.get$Module$({ id });
         if (!$module$) {
           e.setError('delete', '$Module$ does not exist.');
           e.throwIf();

From d7f3aa358d6a9a015596fd96d659d48e5b88fb0f Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 28 Nov 2017 11:41:19 +0100
Subject: [PATCH 031/327] refactor post list to use FlatList

---
 .../modules/post/components/PostList.jsx      | 85 +++++++------------
 1 file changed, 30 insertions(+), 55 deletions(-)

diff --git a/src/client/modules/post/components/PostList.jsx b/src/client/modules/post/components/PostList.jsx
index c6a70d8476..479c168d64 100644
--- a/src/client/modules/post/components/PostList.jsx
+++ b/src/client/modules/post/components/PostList.jsx
@@ -1,71 +1,46 @@
 /*eslint-disable react/display-name*/
 import React from 'react';
 import PropTypes from 'prop-types';
-import { StyleSheet, Text, View, ListView, ScrollView, Button } from 'react-native';
+import { StyleSheet, FlatList, Text, View, Button } from 'react-native';
 
-// Row comparison function
-const rowHasChanged = (r1, r2) => r1.id !== r2.id;
+class PostList extends React.PureComponent {
+  keyExtractor = item => item.node.id;
 
-// DataSource template object
-const ds = new ListView.DataSource({ rowHasChanged });
-
-const renderRow = (deletePost, navigation) => rowData => {
-  return (
-    <View style={styles.row}>
-      <Button
-        title={rowData.title}
-        onPress={() =>
-          navigation.navigate('PostEdit', {
-            id: rowData.id
-          })
-        }
-      />
-      <Button title="Delete" onPress={() => deletePost(rowData.id)} />
-    </View>
-  );
-};
-
-function renderLoadMore(posts, loadMoreRows) {
-  if (posts.pageInfo.hasNextPage) {
+  renderItem = ({ item: { node: { id, title } } }) => {
+    const { deletePost, navigation } = this.props;
     return (
       <View style={styles.row}>
-        <Text>
-          ({posts.edges.length} / {posts.totalCount})
-        </Text>
-        <Button title="Load More ..." onPress={loadMoreRows} />
+        <Button title={title} onPress={() => navigation.navigate('PostEdit', { id })} />
+        <Button title="Delete" onPress={() => deletePost(id)} />
       </View>
     );
-  }
-}
+  };
 
-const PostList = ({ loading, posts, deletePost, loadMoreRows, navigation }) => {
-  if (loading) {
-    return (
-      <View style={styles.container}>
-        <Text>Loading...</Text>
-      </View>
-    );
-  } else {
-    const rows = posts.edges.reduce((prev, { node }) => {
-      prev.push(node);
-      return prev;
-    }, []);
-
-    const dataSource = ds.cloneWithRows(rows);
+  render() {
+    const { loading, posts, loadMoreRows } = this.props;
 
-    return (
-      <ScrollView>
-        <ListView
-          style={styles.container}
-          dataSource={dataSource}
-          renderRow={renderRow(deletePost, navigation)}
-          removeClippedSubviews={false}
+    if (loading) {
+      return (
+        <View style={styles.container}>
+          <Text>Loading...</Text>
+        </View>
+      );
+    } else {
+      return (
+        <FlatList
+          data={posts.edges}
+          keyExtractor={this.keyExtractor}
+          renderItem={this.renderItem}
+          onEndReached={() => {
+            if (posts.pageInfo.hasNextPage) {
+              return loadMoreRows();
+            }
+          }}
         />
-        {renderLoadMore(posts, loadMoreRows)}
-      </ScrollView>
-    );
+      );
+    }
   }
-};
+}
 
 PostList.propTypes = {
   loading: PropTypes.bool.isRequired,

From cf1749a8c4d6810702269c810ae5905c609aef6b Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 28 Nov 2017 12:23:07 +0100
Subject: [PATCH 032/327] add swipe action for deleting a post

---
 .../modules/common/components/native/index.js |  1 +
 .../ui-antd-mobile/components/Button.jsx      | 13 +++++++
 .../ui-antd-mobile/components/ListItem.jsx    | 13 +++++++
 .../ui-antd-mobile/components/SwipeAction.jsx | 13 +++++++
 .../ui-antd-mobile/components/index.jsx       |  4 +++
 .../modules/post/components/PostList.jsx      | 35 +++++++++++++++----
 6 files changed, 72 insertions(+), 7 deletions(-)
 create mode 100644 src/client/modules/common/components/native/ui-antd-mobile/components/Button.jsx
 create mode 100644 src/client/modules/common/components/native/ui-antd-mobile/components/ListItem.jsx
 create mode 100644 src/client/modules/common/components/native/ui-antd-mobile/components/SwipeAction.jsx
 create mode 100644 src/client/modules/common/components/native/ui-antd-mobile/components/index.jsx

diff --git a/src/client/modules/common/components/native/index.js b/src/client/modules/common/components/native/index.js
index b4eb584728..177b149b59 100644
--- a/src/client/modules/common/components/native/index.js
+++ b/src/client/modules/common/components/native/index.js
@@ -1,3 +1,4 @@
 // eslint-disable-next-line import/prefer-default-export
+export * from './ui-antd-mobile/components';
 export { default as RenderField } from './RenderField';
 export { default as createTabBarIconWrapper } from './createTabBarIconWrapper';
diff --git a/src/client/modules/common/components/native/ui-antd-mobile/components/Button.jsx b/src/client/modules/common/components/native/ui-antd-mobile/components/Button.jsx
new file mode 100644
index 0000000000..bee96f6642
--- /dev/null
+++ b/src/client/modules/common/components/native/ui-antd-mobile/components/Button.jsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Button as ADButton } from 'antd-mobile/lib/button';
+
+const Button = ({ children, ...props }) => {
+  return <ADButton {...props}>{children}</ADButton>;
+};
+
+Button.propTypes = {
+  children: PropTypes.node
+};
+
+export default Button;
diff --git a/src/client/modules/common/components/native/ui-antd-mobile/components/ListItem.jsx b/src/client/modules/common/components/native/ui-antd-mobile/components/ListItem.jsx
new file mode 100644
index 0000000000..335ba10542
--- /dev/null
+++ b/src/client/modules/common/components/native/ui-antd-mobile/components/ListItem.jsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import List from 'antd-mobile/lib/list';
+
+const ListItem = ({ children, ...props }) => {
+  return <List.Item {...props}>{children}</List.Item>;
+};
+
+ListItem.propTypes = {
+  children: PropTypes.node
+};
+
+export default ListItem;
diff --git a/src/client/modules/common/components/native/ui-antd-mobile/components/SwipeAction.jsx b/src/client/modules/common/components/native/ui-antd-mobile/components/SwipeAction.jsx
new file mode 100644
index 0000000000..b3bac79423
--- /dev/null
+++ b/src/client/modules/common/components/native/ui-antd-mobile/components/SwipeAction.jsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { SwipeAction as ADSwipeAction } from 'antd-mobile/lib/swipe-action';
+
+const SwipeAction = ({ children, ...props }) => {
+  return <ADSwipeAction {...props}>{children}</ADSwipeAction>;
+};
+
+SwipeAction.propTypes = {
+  children: PropTypes.node
+};
+
+export default SwipeAction;
diff --git a/src/client/modules/common/components/native/ui-antd-mobile/components/index.jsx b/src/client/modules/common/components/native/ui-antd-mobile/components/index.jsx
new file mode 100644
index 0000000000..ff0d03672a
--- /dev/null
+++ b/src/client/modules/common/components/native/ui-antd-mobile/components/index.jsx
@@ -0,0 +1,4 @@
+// eslint-disable-next-line import/prefer-default-export
+export { default as Button } from './Button';
+export { default as SwipeAction } from './SwipeAction';
+export { default as ListItem } from './ListItem';
diff --git a/src/client/modules/post/components/PostList.jsx b/src/client/modules/post/components/PostList.jsx
index 479c168d64..be8faabe8e 100644
--- a/src/client/modules/post/components/PostList.jsx
+++ b/src/client/modules/post/components/PostList.jsx
@@ -1,18 +1,32 @@
 /*eslint-disable react/display-name*/
 import React from 'react';
 import PropTypes from 'prop-types';
-import { StyleSheet, FlatList, Text, View, Button } from 'react-native';
+import { StyleSheet, FlatList, Text, View } from 'react-native';
+import { SwipeAction, List } from 'antd-mobile';
 
 class PostList extends React.PureComponent {
+  onEndReachedCalledDuringMomentum = false;
+
   keyExtractor = item => item.node.id;
 
   renderItem = ({ item: { node: { id, title } } }) => {
     const { deletePost, navigation } = this.props;
     return (
-      <View style={styles.row}>
-        <Button title={title} onPress={() => navigation.navigate('PostEdit', { id })} />
-        <Button title="Delete" onPress={() => deletePost(id)} />
-      </View>
+      <SwipeAction
+        style={{ backgroundColor: 'gray' }}
+        autoClose
+        right={[
+          {
+            text: 'Delete',
+            onPress: () => deletePost(id),
+            style: { backgroundColor: '#F4333C', color: 'white' }
+          }
+        ]}
+      >
+        <List.Item arrow="horizontal" onClick={() => navigation.navigate('PostEdit', { id })}>
+          {title}
+        </List.Item>
+      </SwipeAction>
     );
   };
 
@@ -31,9 +45,16 @@ class PostList extends React.PureComponent {
           data={posts.edges}
           keyExtractor={this.keyExtractor}
           renderItem={this.renderItem}
+          onEndReachedThreshold={0.5}
+          onMomentumScrollBegin={() => {
+            this.onEndReachedCalledDuringMomentum = false;
+          }}
           onEndReached={() => {
-            if (posts.pageInfo.hasNextPage) {
-              return loadMoreRows();
+            if (!this.onEndReachedCalledDuringMomentum) {
+              if (posts.pageInfo.hasNextPage) {
+                this.onEndReachedCalledDuringMomentum = true;
+                return loadMoreRows();
+              }
             }
           }}
         />

From 4909bbfd675d95a9c4671ab2763e6e7a4292a1cc Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 28 Nov 2017 12:23:53 +0100
Subject: [PATCH 033/327] add antd-package

---
 package.json |  23 +---
 yarn.lock    | 362 ++++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 353 insertions(+), 32 deletions(-)

diff --git a/package.json b/package.json
index f6e8dc9dda..4869bd76b3 100644
--- a/package.json
+++ b/package.json
@@ -20,20 +20,15 @@
     "migrate": "knex migrate:latest",
     "rollback": "knex migrate:rollback",
     "watch": "spin watch",
-    "heroku-postbuild": "rm -rf build && spin exp login -u $EXP_USERNAME -p $EXP_PASSWORD --non-interactive && spin -c .spinrc.prod.json build && spin exp p --non-interactive && npm run seed",
+    "heroku-postbuild":
+      "rm -rf build && spin exp login -u $EXP_USERNAME -p $EXP_PASSWORD --non-interactive && spin -c .spinrc.prod.json build && spin exp p --non-interactive && npm run seed",
     "precommit": "lint-staged",
     "cli": "node tools/cli",
     "postinstall": "opencollective postinstall"
   },
   "lint-staged": {
-    "*.{js,jsx,json}": [
-      "eslint --fix",
-      "git add"
-    ],
-    "*.graphql": [
-      "prettier --parser graphql --write",
-      "git add"
-    ]
+    "*.{js,jsx,json}": ["eslint --fix", "git add"],
+    "*.graphql": ["prettier --parser graphql --write", "git add"]
   },
   "repository": {
     "type": "git",
@@ -43,19 +38,13 @@
     "url": "https://github.com/sysgears/apollo-universal-starter-kit/issues"
   },
   "homepage": "https://github.com/sysgears/apollo-universal-starter-kit",
-  "keywords": [
-    "apollo",
-    "universal",
-    "starter",
-    "graphql",
-    "react",
-    "redux"
-  ],
+  "keywords": ["apollo", "universal", "starter", "graphql", "react", "redux"],
   "author": "SysGears INC",
   "license": "MIT",
   "dependencies": {
     "@expo/vector-icons": "^6.2.0",
     "antd": "^2.13.10",
+    "antd-mobile": "^2.0.3",
     "apollo-cache-inmemory": "^1.1.1",
     "apollo-client": "^2.0.3",
     "apollo-engine": "^0.5.4",
diff --git a/yarn.lock b/yarn.lock
index c0d779c10e..1f562a8c7e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -320,7 +320,7 @@ ansi-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
 
-ansi-styles@^2.2.1:
+ansi-styles@^2.1.0, ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
 
@@ -338,6 +338,39 @@ ansicolors@~0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.2.1.tgz#be089599097b74a5c9c4a84a0cdbcdb62bd87aef"
 
+antd-mobile@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/antd-mobile/-/antd-mobile-2.0.3.tgz#7eee0f2e251f70a7f074dd07ba20efc59b05e885"
+  dependencies:
+    array-tree-filter "~1.0.0"
+    babel-runtime "6.x"
+    classnames "^2.2.1"
+    normalize.css "^7.0.0"
+    rc-checkbox "~2.0.0"
+    rc-collapse "~1.7.0"
+    rc-drawer "~0.4.9"
+    rc-notification "~3.0.0"
+    rc-slider "~8.2.0"
+    rc-swipeout "~2.0.0"
+    react-native-camera-roll-picker "^1.2.1"
+    react-native-collapsible "^0.9.0"
+    react-native-drawer-layout "~1.3.0"
+    react-native-menu "^0.23.0"
+    rmc-calendar "^1.0.0"
+    rmc-cascader "~5.0.0"
+    rmc-date-picker "~6.0.0"
+    rmc-dialog "^1.0.1"
+    rmc-feedback "^1.0.0"
+    rmc-input-number "^1.0.0"
+    rmc-list-view "^0.11.0"
+    rmc-nuka-carousel "~3.0.0"
+    rmc-picker "~5.0.0"
+    rmc-pull-to-refresh "~1.0.1"
+    rmc-steps "~1.0.0"
+    rmc-tabs "~1.2.0"
+    rmc-tooltip "~1.0.0"
+    rn-topview "^0.1.6"
+
 antd@^2.13.10:
   version "2.13.10"
   resolved "https://registry.yarnpkg.com/antd/-/antd-2.13.10.tgz#bfb8cab3405b93b0b98f6a38e2069697017ebcd7"
@@ -684,7 +717,7 @@ array-slice@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.0.0.tgz#e73034f00dcc1f40876008fd20feae77bd4b7c2f"
 
-array-tree-filter@^1.0.0, array-tree-filter@~1.0.0:
+array-tree-filter@1.0.x, array-tree-filter@^1.0.0, array-tree-filter@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/array-tree-filter/-/array-tree-filter-1.0.1.tgz#0a8ad1eefd38ce88858632f9cc0423d7634e4d5d"
 
@@ -1874,6 +1907,10 @@ bluebird@^3.4.6, bluebird@^3.4.7:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
 
+blueimp-md5@^2.5.0:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/blueimp-md5/-/blueimp-md5-2.10.0.tgz#02f0843921f90dca14f5b8920a38593201d6964d"
+
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
@@ -2273,6 +2310,16 @@ chainsaw@~0.1.0:
   dependencies:
     traverse ">=0.3.0 <0.4"
 
+chalk@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.1.tgz#509afb67066e7499f7eb3535c77445772ae2d019"
+  dependencies:
+    ansi-styles "^2.1.0"
+    escape-string-regexp "^1.0.2"
+    has-ansi "^2.0.0"
+    strip-ansi "^3.0.0"
+    supports-color "^2.0.0"
+
 chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@ -2371,7 +2418,7 @@ clap@^1.0.9, clap@^1.1.3:
   dependencies:
     chalk "^1.1.3"
 
-classnames@2.x, classnames@^2.2.0, classnames@^2.2.1, classnames@^2.2.3, classnames@^2.2.5, classnames@~2.2.0:
+classnames@2.x, classnames@^2.2.0, classnames@^2.2.1, classnames@^2.2.3, classnames@^2.2.4, classnames@^2.2.5, classnames@~2.2.0:
   version "2.2.5"
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d"
 
@@ -2489,7 +2536,7 @@ code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
 
-color-convert@^1.3.0, color-convert@^1.9.0, color-convert@^1.9.1:
+color-convert@^1.3.0, color-convert@^1.8.2, color-convert@^1.9.0, color-convert@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
   dependencies:
@@ -2505,7 +2552,7 @@ color-string@^0.3.0:
   dependencies:
     color-name "^1.0.0"
 
-color-string@^1.5.2:
+color-string@^1.4.0, color-string@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.2.tgz#26e45814bc3c9a7cbd6751648a41434514a773a9"
   dependencies:
@@ -2527,6 +2574,13 @@ color@^2.0.1:
     color-convert "^1.9.1"
     color-string "^1.5.2"
 
+color@~1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/color/-/color-1.0.3.tgz#e48e832d85f14ef694fb468811c2d5cfe729b55d"
+  dependencies:
+    color-convert "^1.8.2"
+    color-string "^1.4.0"
+
 colormin@^1.0.5:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133"
@@ -4023,7 +4077,7 @@ execa@^0.8.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
-exenv@^1.2.1:
+exenv@^1.2.0, exenv@^1.2.1:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/exenv/-/exenv-1.2.2.tgz#2ae78e85d9894158670b03d47bec1f03bd91bb9d"
 
@@ -4273,7 +4327,7 @@ fbjs-scripts@^0.8.1:
     semver "^5.1.0"
     through2 "^2.0.0"
 
-fbjs@^0.8.14, fbjs@^0.8.15, fbjs@^0.8.16, fbjs@^0.8.4, fbjs@^0.8.5, fbjs@^0.8.9:
+fbjs@^0.8.14, fbjs@^0.8.15, fbjs@^0.8.16, fbjs@^0.8.3, fbjs@^0.8.4, fbjs@^0.8.5, fbjs@^0.8.9:
   version "0.8.16"
   resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
   dependencies:
@@ -4547,6 +4601,13 @@ fs-extra@^1.0.0:
     jsonfile "^2.1.0"
     klaw "^1.0.0"
 
+fs-extra@^2.0.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-2.1.2.tgz#046c70163cef9aad46b0e4a7fa467fb22d71de35"
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^2.1.0"
+
 fs-extra@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.2.tgz#f91704c53d1b461f893452b0c307d9997647ab6b"
@@ -5094,7 +5155,7 @@ hoek@4.x.x:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d"
 
-hoist-non-react-statics@1.x, hoist-non-react-statics@^1.2.0:
+hoist-non-react-statics@1.x, hoist-non-react-statics@^1.0.5, hoist-non-react-statics@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb"
 
@@ -6649,7 +6710,7 @@ lodash@3.7.x:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.7.0.tgz#3678bd8ab995057c07ade836ed2ef087da811d45"
 
-lodash@4.17.4, "lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.14.1, lodash@^4.15.0, lodash@^4.16.5, lodash@^4.16.6, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.6.0, lodash@^4.6.1, lodash@~4.17.4:
+lodash@4.17.4, "lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.10.1, lodash@^4.11.1, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.14.1, lodash@^4.15.0, lodash@^4.16.5, lodash@^4.16.6, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.6.0, lodash@^4.6.1, lodash@~4.17.4:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
@@ -6661,6 +6722,10 @@ lodash@~2.4.1:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-2.4.2.tgz#fadd834b9683073da179b3eae6d9c0d15053f73e"
 
+lodash@~4.11.1:
+  version "4.11.2"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.11.2.tgz#d6b4338b110a58e21dae5cebcfdbbfd2bc4cdb3b"
+
 lodash@~4.5.1:
   version "4.5.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.5.1.tgz#80e8a074ca5f3893a6b1c10b2a636492d710c316"
@@ -7242,6 +7307,33 @@ nan@^2.3.0, nan@^2.3.2, nan@~2.7.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46"
 
+native-base-shoutem-theme@0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/native-base-shoutem-theme/-/native-base-shoutem-theme-0.2.1.tgz#8494783833dcc5bace945db68dc7bfce209fcc40"
+  dependencies:
+    hoist-non-react-statics "^1.0.5"
+    lodash "^4.10.1"
+    prop-types "^15.5.10"
+
+native-base@^2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/native-base/-/native-base-2.3.3.tgz#de35234cf9cf8d24b5ce5e1720f8330dd5f3c96a"
+  dependencies:
+    blueimp-md5 "^2.5.0"
+    clamp "^1.0.1"
+    color "~1.0.3"
+    fs-extra "^2.0.0"
+    lodash "~4.11.1"
+    native-base-shoutem-theme "0.2.1"
+    print-message "^2.1.0"
+    prop-types "^15.5.10"
+    react-native-drawer "https://github.com/GeekyAnts/react-native-drawer"
+    react-native-easy-grid "0.1.15"
+    react-native-keyboard-aware-scroll-view "https://github.com/GeekyAnts/react-native-keyboard-aware-scroll-view"
+    react-native-vector-icons "~4.4.2"
+    react-tween-state "^0.1.5"
+    tween-functions "^1.0.1"
+
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -7500,6 +7592,10 @@ normalize-url@^1.4.0:
     query-string "^4.1.0"
     sort-keys "^1.0.0"
 
+normalize.css@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-7.0.0.tgz#abfb1dd82470674e0322b53ceb1aaf412938e4bf"
+
 npm-path@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/npm-path/-/npm-path-2.0.3.tgz#15cff4e1c89a38da77f56f6055b24f975dfb2bbe"
@@ -8577,6 +8673,12 @@ prettyjson@^1.2.1:
     colors "^1.1.2"
     minimist "^1.2.0"
 
+print-message@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/print-message/-/print-message-2.1.0.tgz#b5588ed08b0e1bf77ac7bcb5cb78004afaf9a891"
+  dependencies:
+    chalk "1.1.1"
+
 private@^0.1.6, private@^0.1.7:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
@@ -8723,7 +8825,7 @@ quick-lru@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
 
-raf@^3.4.0:
+raf@^3.1.0, raf@^3.3.2, raf@^3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.0.tgz#a28876881b4bc2ca9117d4138163ddb80f781575"
   dependencies:
@@ -8849,7 +8951,7 @@ rc-cascader@~0.11.3:
     rc-util "4.x"
     shallow-equal "^1.0.0"
 
-rc-checkbox@~2.0.3:
+rc-checkbox@~2.0.0, rc-checkbox@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/rc-checkbox/-/rc-checkbox-2.0.3.tgz#436a9d508948e224980f0535ea738b48177a8f25"
   dependencies:
@@ -8858,7 +8960,7 @@ rc-checkbox@~2.0.3:
     prop-types "15.x"
     rc-util "^4.0.4"
 
-rc-collapse@~1.7.5:
+rc-collapse@~1.7.0, rc-collapse@~1.7.5:
   version "1.7.6"
   resolved "https://registry.yarnpkg.com/rc-collapse/-/rc-collapse-1.7.6.tgz#64433512d921f750df61433e675bb9547ba5ef6b"
   dependencies:
@@ -8877,6 +8979,14 @@ rc-dialog@~6.5.10:
     rc-animate "2.x"
     rc-util "^4.0.4"
 
+rc-drawer@~0.4.9:
+  version "0.4.11"
+  resolved "https://registry.yarnpkg.com/rc-drawer/-/rc-drawer-0.4.11.tgz#94faaec28183ab90f135f0dfe244dca14cfee799"
+  dependencies:
+    babel-runtime "6.x"
+    classnames "^2.2.4"
+    prop-types "^15.5.10"
+
 rc-dropdown@~1.5.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/rc-dropdown/-/rc-dropdown-1.5.1.tgz#633344f4d1998af35bbb9a9da9d3ed2f21876776"
@@ -8918,6 +9028,12 @@ rc-form@~1.4.0:
     lodash "^4.17.4"
     warning "^3.0.0"
 
+rc-gesture@^0.0.15:
+  version "0.0.15"
+  resolved "https://registry.yarnpkg.com/rc-gesture/-/rc-gesture-0.0.15.tgz#e9b94ec6854f7c16a3144fc287af79579cbb3796"
+  dependencies:
+    babel-runtime "6.x"
+
 rc-hammerjs@~0.6.0:
   version "0.6.9"
   resolved "https://registry.yarnpkg.com/rc-hammerjs/-/rc-hammerjs-0.6.9.tgz#9a4ddbda1b2ec8f9b9596091a6a989842a243907"
@@ -8970,6 +9086,16 @@ rc-notification@~2.0.0:
     rc-animate "2.x"
     rc-util "^4.0.4"
 
+rc-notification@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/rc-notification/-/rc-notification-3.0.0.tgz#cefbeb8a03052dc5b988a07f9ba31895e886ac2e"
+  dependencies:
+    babel-runtime "6.x"
+    classnames "2.x"
+    prop-types "^15.5.8"
+    rc-animate "2.x"
+    rc-util "^4.0.4"
+
 rc-pagination@~1.12.4:
   version "1.12.11"
   resolved "https://registry.yarnpkg.com/rc-pagination/-/rc-pagination-1.12.11.tgz#ed0a4ef4d5c44495eebe1fb669daefabdb303f3d"
@@ -9006,6 +9132,18 @@ rc-select@~6.9.0:
     rc-util "^4.0.4"
     warning "^3.0.0"
 
+rc-slider@~8.2.0:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-8.2.0.tgz#ae37d17144cad60e1da6eac0ee4ffcfea0b0a6e8"
+  dependencies:
+    babel-runtime "6.x"
+    classnames "^2.2.5"
+    prop-types "^15.5.4"
+    rc-tooltip "^3.4.2"
+    rc-util "^4.0.4"
+    shallowequal "^1.0.1"
+    warning "^3.0.0"
+
 rc-slider@~8.3.0:
   version "8.3.5"
   resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-8.3.5.tgz#41f88ab95debe089139deee7120c6e151260b52d"
@@ -9026,6 +9164,15 @@ rc-steps@~2.5.1:
     lodash.debounce "^4.0.8"
     prop-types "^15.5.7"
 
+rc-swipeout@~2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/rc-swipeout/-/rc-swipeout-2.0.4.tgz#63e7b71c462156ed8839c0aecc1209eb8742265f"
+  dependencies:
+    babel-runtime "6.x"
+    classnames "2.x"
+    rc-gesture "^0.0.15"
+    react-native-swipeout "^2.2.2"
+
 rc-switch@~1.5.1:
   version "1.5.3"
   resolved "https://registry.yarnpkg.com/rc-switch/-/rc-switch-1.5.3.tgz#283c2608bac57ebd7cdc4033269de14b6753eb39"
@@ -9069,7 +9216,7 @@ rc-time-picker@~2.4.1:
     prop-types "^15.5.8"
     rc-trigger "1.x"
 
-rc-tooltip@^3.4.3:
+rc-tooltip@^3.4.2, rc-tooltip@^3.4.3:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/rc-tooltip/-/rc-tooltip-3.7.0.tgz#3afbf109865f7cdcfe43752f3f3f501f7be37aaa"
   dependencies:
@@ -9281,6 +9428,16 @@ react-native-branch@2.0.0-beta.3:
   version "2.0.0-beta.3"
   resolved "https://registry.yarnpkg.com/react-native-branch/-/react-native-branch-2.0.0-beta.3.tgz#2167af86bbc9f964bd45bd5f37684e5b54965e32"
 
+react-native-camera-roll-picker@^1.2.1:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/react-native-camera-roll-picker/-/react-native-camera-roll-picker-1.2.3.tgz#b117fd3a2b9012dcccee1261a9bc427226b8d6d2"
+
+react-native-collapsible@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/react-native-collapsible/-/react-native-collapsible-0.9.0.tgz#207849faa15493820d19fa6a5e58f7c7b6c1b910"
+  dependencies:
+    prop-types "^15.5.10"
+
 react-native-dismiss-keyboard@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/react-native-dismiss-keyboard/-/react-native-dismiss-keyboard-1.0.0.tgz#32886242b3f2317e121f3aeb9b0a585e2b879b49"
@@ -9291,22 +9448,51 @@ react-native-drawer-layout-polyfill@^1.3.2:
   dependencies:
     react-native-drawer-layout "1.3.2"
 
-react-native-drawer-layout@1.3.2:
+react-native-drawer-layout@1.3.2, react-native-drawer-layout@~1.3.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/react-native-drawer-layout/-/react-native-drawer-layout-1.3.2.tgz#b9740d7663a1dc4f88a61b9c6d93d2d948ea426e"
   dependencies:
     react-native-dismiss-keyboard "1.0.0"
 
+"react-native-drawer@git+https://github.com/GeekyAnts/react-native-drawer.git":
+  version "2.3.0"
+  resolved "git+https://github.com/GeekyAnts/react-native-drawer.git#8d9078516d177c9cb02d2579a6860706d2370d25"
+  dependencies:
+    prop-types "^15.5.8"
+    tween-functions "^1.0.1"
+
+react-native-easy-grid@0.1.15:
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/react-native-easy-grid/-/react-native-easy-grid-0.1.15.tgz#02939ae032d74662b50c9540d902c79866ba638a"
+  dependencies:
+    lodash "^4.11.1"
+
 react-native-gesture-handler@1.0.0-alpha.30:
   version "1.0.0-alpha.30"
   resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-1.0.0-alpha.30.tgz#7f79c2da5a59cc8ce20cf04c11360409a53bef59"
   dependencies:
     prop-types "^15.5.10"
 
+"react-native-keyboard-aware-scroll-view@git+https://github.com/GeekyAnts/react-native-keyboard-aware-scroll-view.git":
+  version "0.2.9"
+  resolved "git+https://github.com/GeekyAnts/react-native-keyboard-aware-scroll-view.git#f4805f254d6cc8e3329f5fb224944401f66655db"
+  dependencies:
+    create-react-class "^15.6.0"
+    prop-types "^15.5.10"
+    react-timer-mixin "^0.13.3"
+
 react-native-maps@0.17.1:
   version "0.17.1"
   resolved "https://registry.yarnpkg.com/react-native-maps/-/react-native-maps-0.17.1.tgz#ab2236341fd984dac8864202ae55331bc262f60c"
 
+react-native-menu@^0.23.0:
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/react-native-menu/-/react-native-menu-0.23.0.tgz#3c023239aed95d419275df50c199982ad7eb062b"
+  dependencies:
+    create-react-class "^15.6.0"
+    prop-types "^15.5.10"
+    react-timer-mixin "^0.13.3"
+
 react-native-safe-module@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/react-native-safe-module/-/react-native-safe-module-1.2.0.tgz#a23824ca24edc2901913694a76646475113d570d"
@@ -9320,13 +9506,21 @@ react-native-safe-module@^1.1.0:
     color "^2.0.1"
     lodash "^4.16.6"
 
+react-native-swipeout@^2.2.2:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/react-native-swipeout/-/react-native-swipeout-2.3.1.tgz#f33e852b46d2cddb878a431a1c696428e3d9d2a5"
+  dependencies:
+    create-react-class "^15.6.0"
+    prop-types "^15.5.10"
+    react-tween-state "^0.1.5"
+
 react-native-tab-view@^0.0.70:
   version "0.0.70"
   resolved "https://registry.yarnpkg.com/react-native-tab-view/-/react-native-tab-view-0.0.70.tgz#1dd2ded32acd0cb6bfef38d26e53675db733b37b"
   dependencies:
     prop-types "^15.5.10"
 
-react-native-vector-icons@4.4.2:
+react-native-vector-icons@4.4.2, react-native-vector-icons@~4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/react-native-vector-icons/-/react-native-vector-icons-4.4.2.tgz#090f42ee0396c4cc4eae0ddaa518028ba8df40c7"
   dependencies:
@@ -9550,6 +9744,13 @@ react-transition-group@^2.3.0-beta.0:
     prop-types "^15.5.8"
     warning "^3.0.0"
 
+react-tween-state@^0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/react-tween-state/-/react-tween-state-0.1.5.tgz#e98b066551efb93cb92dd1be14995c2e3deae339"
+  dependencies:
+    raf "^3.1.0"
+    tween-functions "^1.0.1"
+
 react@^16.1.1:
   version "16.1.1"
   resolved "https://registry.yarnpkg.com/react/-/react-16.1.1.tgz#d5c4ef795507e3012282dd51261ff9c0e824fe1f"
@@ -10083,6 +10284,127 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
     hash-base "^2.0.0"
     inherits "^2.0.1"
 
+rmc-align@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/rmc-align/-/rmc-align-1.0.0.tgz#8d64ab484609a041ab424506012a15b7c5b933dd"
+  dependencies:
+    babel-runtime "6.x"
+    dom-align "1.x"
+    rc-util "4.x"
+
+rmc-calendar@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/rmc-calendar/-/rmc-calendar-1.1.2.tgz#7a0c6ac2cfca026266a955e3937da58fd48b5b4b"
+  dependencies:
+    babel-runtime "6.x"
+    rc-animate "^2.4.1"
+    rmc-date-picker "~6.0.0-alpha.10"
+
+rmc-cascader@~5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/rmc-cascader/-/rmc-cascader-5.0.0.tgz#f204e2b82a8344091409657fcf795702668b9cbe"
+  dependencies:
+    array-tree-filter "1.0.x"
+    babel-runtime "6.x"
+    rmc-picker "~5.0.0"
+
+rmc-date-picker@~6.0.0, rmc-date-picker@~6.0.0-alpha.10:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/rmc-date-picker/-/rmc-date-picker-6.0.5.tgz#abacd066d7ceb90509263f3460f3d133afefc7e8"
+  dependencies:
+    babel-runtime "6.x"
+    rmc-picker "~5.0.0"
+
+rmc-dialog@^1.0.1:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/rmc-dialog/-/rmc-dialog-1.0.6.tgz#b3a022b09e69f572c851d49c392fc682f29a0568"
+  dependencies:
+    babel-runtime "6.x"
+    rc-animate "2.x"
+
+rmc-feedback@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/rmc-feedback/-/rmc-feedback-1.0.3.tgz#efd9d75c51998857c7a9a495ee507313a81aaee9"
+  dependencies:
+    babel-runtime "6.x"
+    classnames "^2.2.5"
+
+rmc-input-number@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/rmc-input-number/-/rmc-input-number-1.0.4.tgz#6581b0a9379dcf1f7d3e802862e94c0c6ea15d10"
+  dependencies:
+    babel-runtime "6.x"
+    classnames "^2.2.0"
+    rmc-feedback "^1.0.0"
+
+rmc-list-view@^0.11.0:
+  version "0.11.3"
+  resolved "https://registry.yarnpkg.com/rmc-list-view/-/rmc-list-view-0.11.3.tgz#f6e397d751fef1e3bef2e11097e45316a9e11c6e"
+  dependencies:
+    babel-runtime "6.x"
+    classnames "^2.2.5"
+    fbjs "^0.8.3"
+    prop-types "^15.5.8"
+    warning "^3.0.0"
+    zscroller "~0.4.0"
+
+rmc-nuka-carousel@~3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/rmc-nuka-carousel/-/rmc-nuka-carousel-3.0.1.tgz#a2a997676b0f986354976dac39ec66d8701b4b71"
+  dependencies:
+    exenv "^1.2.0"
+    raf "^3.3.2"
+
+rmc-picker@~5.0.0:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/rmc-picker/-/rmc-picker-5.0.3.tgz#ea51d4f6f2d26c10c6d465b066effe31b121f785"
+  dependencies:
+    babel-runtime "6.x"
+    classnames "^2.2.0"
+    rmc-dialog "^1.0.1"
+    rmc-feedback "^1.0.0"
+
+rmc-pull-to-refresh@~1.0.1:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/rmc-pull-to-refresh/-/rmc-pull-to-refresh-1.0.5.tgz#84626a9c6a6ab5781d38da65198a019c2e0295eb"
+  dependencies:
+    babel-runtime "6.x"
+    classnames "^2.2.5"
+
+rmc-steps@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/rmc-steps/-/rmc-steps-1.0.0.tgz#0c50d0dff9d3e72e101914300a781993552dc526"
+  dependencies:
+    babel-runtime "^6.23.0"
+    classnames "^2.2.3"
+
+rmc-tabs@~1.2.0:
+  version "1.2.19"
+  resolved "https://registry.yarnpkg.com/rmc-tabs/-/rmc-tabs-1.2.19.tgz#7626acf0f0324a6b2dbdc3c5568caa2f4bdbc042"
+  dependencies:
+    babel-runtime "6.x"
+    rc-gesture "^0.0.15"
+
+rmc-tooltip@~1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/rmc-tooltip/-/rmc-tooltip-1.0.1.tgz#5af16a3e8f764fa26d2b11932975bd88b1d848d2"
+  dependencies:
+    babel-runtime "6.x"
+    rmc-trigger "1.x"
+
+rmc-trigger@1.x:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/rmc-trigger/-/rmc-trigger-1.0.7.tgz#17d414cbb0f784171a842d2d25a6e9b5d6efdafe"
+  dependencies:
+    babel-runtime "6.x"
+    rc-animate "2.x"
+    rc-util "4.x"
+    rmc-align "~1.0.0"
+
+rn-topview@^0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/rn-topview/-/rn-topview-0.1.6.tgz#b1b1216caf730f8547cd23c9b918ad0288454b11"
+
 rndm@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/rndm/-/rndm-1.2.0.tgz#f33fe9cfb52bbfd520aa18323bc65db110a1b76c"
@@ -11266,6 +11588,10 @@ tunnel-agent@^0.6.0:
   dependencies:
     safe-buffer "^5.0.1"
 
+tween-functions@^1.0.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/tween-functions/-/tween-functions-1.2.0.tgz#1ae3a50e7c60bb3def774eac707acbca73bbc3ff"
+
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
@@ -12185,3 +12511,9 @@ zen-observable-ts@^0.4.4:
 zen-observable@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.6.0.tgz#8a6157ed15348d185d948cfc4a59d90a2c0f70ee"
+
+zscroller@~0.4.0:
+  version "0.4.7"
+  resolved "https://registry.yarnpkg.com/zscroller/-/zscroller-0.4.7.tgz#3956e6e7dfb5175058df0da9abae6e4834088f8a"
+  dependencies:
+    babel-runtime "6.x"

From c0b06a2da0ad25e42a2e5cfb6b347a13a0755d1f Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 28 Nov 2017 12:32:49 +0100
Subject: [PATCH 034/327] fix imports

---
 .../components/native/ui-antd-mobile/components/Button.jsx  | 2 +-
 .../native/ui-antd-mobile/components/SwipeAction.jsx        | 2 +-
 src/client/modules/post/components/PostList.jsx             | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/client/modules/common/components/native/ui-antd-mobile/components/Button.jsx b/src/client/modules/common/components/native/ui-antd-mobile/components/Button.jsx
index bee96f6642..3aec5f3348 100644
--- a/src/client/modules/common/components/native/ui-antd-mobile/components/Button.jsx
+++ b/src/client/modules/common/components/native/ui-antd-mobile/components/Button.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Button as ADButton } from 'antd-mobile/lib/button';
+import ADButton from 'antd-mobile/lib/button';
 
 const Button = ({ children, ...props }) => {
   return <ADButton {...props}>{children}</ADButton>;
diff --git a/src/client/modules/common/components/native/ui-antd-mobile/components/SwipeAction.jsx b/src/client/modules/common/components/native/ui-antd-mobile/components/SwipeAction.jsx
index b3bac79423..ae0d2e8250 100644
--- a/src/client/modules/common/components/native/ui-antd-mobile/components/SwipeAction.jsx
+++ b/src/client/modules/common/components/native/ui-antd-mobile/components/SwipeAction.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { SwipeAction as ADSwipeAction } from 'antd-mobile/lib/swipe-action';
+import ADSwipeAction from 'antd-mobile/lib/swipe-action';
 
 const SwipeAction = ({ children, ...props }) => {
   return <ADSwipeAction {...props}>{children}</ADSwipeAction>;
diff --git a/src/client/modules/post/components/PostList.jsx b/src/client/modules/post/components/PostList.jsx
index be8faabe8e..6f3730de78 100644
--- a/src/client/modules/post/components/PostList.jsx
+++ b/src/client/modules/post/components/PostList.jsx
@@ -2,7 +2,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { StyleSheet, FlatList, Text, View } from 'react-native';
-import { SwipeAction, List } from 'antd-mobile';
+import { SwipeAction, ListItem } from '../../common/components/native';
 
 class PostList extends React.PureComponent {
   onEndReachedCalledDuringMomentum = false;
@@ -23,9 +23,9 @@ class PostList extends React.PureComponent {
           }
         ]}
       >
-        <List.Item arrow="horizontal" onClick={() => navigation.navigate('PostEdit', { id })}>
+        <ListItem arrow="horizontal" onClick={() => navigation.navigate('PostEdit', { id })}>
           {title}
-        </List.Item>
+        </ListItem>
       </SwipeAction>
     );
   };

From c20d80ce97161ad6764e974a2b51d6ccc9ba8ac8 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 29 Nov 2017 09:26:16 +0100
Subject: [PATCH 035/327] SwipeAction component

---
 package.json                                  | 23 +++++++++++---
 .../modules/common/components/Button.jsx      |  2 +-
 .../modules/common/components/native/index.js |  1 +
 .../ui-antd-mobile/components/Button.jsx      | 11 +++++--
 .../ui-antd-mobile/components/Input.jsx       | 17 ++++++++++
 .../ui-antd-mobile/components/SwipeAction.jsx | 26 ++++++++++++++--
 .../ui-antd-mobile/components/index.jsx       |  1 +
 .../ui-native-base/components/Button.jsx      | 18 +++++++++++
 .../ui-native-base/components/Input.jsx       | 17 ++++++++++
 .../ui-native-base/components/ListItem.jsx    | 13 ++++++++
 .../ui-native-base/components/SwipeAction.jsx | 31 +++++++++++++++++++
 .../ui-native-base/components/index.jsx       |  5 +++
 .../modules/post/components/PostList.jsx      | 20 +++++-------
 tools/webpackAppConfig.js                     |  2 ++
 14 files changed, 162 insertions(+), 25 deletions(-)
 create mode 100644 src/client/modules/common/components/native/ui-antd-mobile/components/Input.jsx
 create mode 100644 src/client/modules/common/components/native/ui-native-base/components/Button.jsx
 create mode 100644 src/client/modules/common/components/native/ui-native-base/components/Input.jsx
 create mode 100644 src/client/modules/common/components/native/ui-native-base/components/ListItem.jsx
 create mode 100644 src/client/modules/common/components/native/ui-native-base/components/SwipeAction.jsx
 create mode 100644 src/client/modules/common/components/native/ui-native-base/components/index.jsx

diff --git a/package.json b/package.json
index 4869bd76b3..afae096bc7 100644
--- a/package.json
+++ b/package.json
@@ -20,15 +20,20 @@
     "migrate": "knex migrate:latest",
     "rollback": "knex migrate:rollback",
     "watch": "spin watch",
-    "heroku-postbuild":
-      "rm -rf build && spin exp login -u $EXP_USERNAME -p $EXP_PASSWORD --non-interactive && spin -c .spinrc.prod.json build && spin exp p --non-interactive && npm run seed",
+    "heroku-postbuild": "rm -rf build && spin exp login -u $EXP_USERNAME -p $EXP_PASSWORD --non-interactive && spin -c .spinrc.prod.json build && spin exp p --non-interactive && npm run seed",
     "precommit": "lint-staged",
     "cli": "node tools/cli",
     "postinstall": "opencollective postinstall"
   },
   "lint-staged": {
-    "*.{js,jsx,json}": ["eslint --fix", "git add"],
-    "*.graphql": ["prettier --parser graphql --write", "git add"]
+    "*.{js,jsx,json}": [
+      "eslint --fix",
+      "git add"
+    ],
+    "*.graphql": [
+      "prettier --parser graphql --write",
+      "git add"
+    ]
   },
   "repository": {
     "type": "git",
@@ -38,7 +43,14 @@
     "url": "https://github.com/sysgears/apollo-universal-starter-kit/issues"
   },
   "homepage": "https://github.com/sysgears/apollo-universal-starter-kit",
-  "keywords": ["apollo", "universal", "starter", "graphql", "react", "redux"],
+  "keywords": [
+    "apollo",
+    "universal",
+    "starter",
+    "graphql",
+    "react",
+    "redux"
+  ],
   "author": "SysGears INC",
   "license": "MIT",
   "dependencies": {
@@ -81,6 +93,7 @@
     "lodash": "^4.17.4",
     "minilog": "^3.1.0",
     "mysql2": "^1.5.0",
+    "native-base": "^2.3.3",
     "nodemailer": "^4.4.0",
     "opencollective": "^1.0.3",
     "passport": "^0.4.0",
diff --git a/src/client/modules/common/components/Button.jsx b/src/client/modules/common/components/Button.jsx
index 3703aa1d41..e3fd54f973 100644
--- a/src/client/modules/common/components/Button.jsx
+++ b/src/client/modules/common/components/Button.jsx
@@ -6,7 +6,7 @@ const Button = ({ children, onPress, disabled }) => {
   const { buttonStyle, textStyle } = styles;
 
   return (
-    <TouchableOpacity onPress={onPress} style={buttonStyle} activeOpacity={disabled ? 1 : 0.5}>
+    <TouchableOpacity onPress={onPress} style={buttonStyle} activeOpacity={disabled ? 0.5 : 1}>
       <Text style={textStyle}>{children}</Text>
     </TouchableOpacity>
   );
diff --git a/src/client/modules/common/components/native/index.js b/src/client/modules/common/components/native/index.js
index 177b149b59..cbb4aad651 100644
--- a/src/client/modules/common/components/native/index.js
+++ b/src/client/modules/common/components/native/index.js
@@ -1,4 +1,5 @@
 // eslint-disable-next-line import/prefer-default-export
 export * from './ui-antd-mobile/components';
+//export * from './ui-native-base/components';
 export { default as RenderField } from './RenderField';
 export { default as createTabBarIconWrapper } from './createTabBarIconWrapper';
diff --git a/src/client/modules/common/components/native/ui-antd-mobile/components/Button.jsx b/src/client/modules/common/components/native/ui-antd-mobile/components/Button.jsx
index 3aec5f3348..6a4449f37e 100644
--- a/src/client/modules/common/components/native/ui-antd-mobile/components/Button.jsx
+++ b/src/client/modules/common/components/native/ui-antd-mobile/components/Button.jsx
@@ -2,12 +2,17 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import ADButton from 'antd-mobile/lib/button';
 
-const Button = ({ children, ...props }) => {
-  return <ADButton {...props}>{children}</ADButton>;
+const Button = ({ children, onPress, ...props }) => {
+  return (
+    <ADButton onClick={onPress} {...props}>
+      {children}
+    </ADButton>
+  );
 };
 
 Button.propTypes = {
-  children: PropTypes.node
+  children: PropTypes.node,
+  onPress: PropTypes.func
 };
 
 export default Button;
diff --git a/src/client/modules/common/components/native/ui-antd-mobile/components/Input.jsx b/src/client/modules/common/components/native/ui-antd-mobile/components/Input.jsx
new file mode 100644
index 0000000000..a5519f10c5
--- /dev/null
+++ b/src/client/modules/common/components/native/ui-antd-mobile/components/Input.jsx
@@ -0,0 +1,17 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import InputItem from 'antd-mobile/lib/input-item';
+
+const Input = ({ children, ...props }) => {
+  return (
+    <InputItem type={'text'} {...props}>
+      {children}
+    </InputItem>
+  );
+};
+
+Input.propTypes = {
+  children: PropTypes.node
+};
+
+export default Input;
diff --git a/src/client/modules/common/components/native/ui-antd-mobile/components/SwipeAction.jsx b/src/client/modules/common/components/native/ui-antd-mobile/components/SwipeAction.jsx
index ae0d2e8250..177574a933 100644
--- a/src/client/modules/common/components/native/ui-antd-mobile/components/SwipeAction.jsx
+++ b/src/client/modules/common/components/native/ui-antd-mobile/components/SwipeAction.jsx
@@ -1,13 +1,33 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import ADSwipeAction from 'antd-mobile/lib/swipe-action';
+import List from 'antd-mobile/lib/list';
 
-const SwipeAction = ({ children, ...props }) => {
-  return <ADSwipeAction {...props}>{children}</ADSwipeAction>;
+const SwipeAction = ({ children, onPress, right, ...props }) => {
+  return (
+    <ADSwipeAction
+      style={{ backgroundColor: 'gray' }}
+      autoClose
+      {...props}
+      right={[
+        {
+          text: right.text,
+          onPress: right.onPress,
+          style: { backgroundColor: '#F4333C', color: 'white' }
+        }
+      ]}
+    >
+      <List.Item arrow="horizontal" onClick={onPress}>
+        {children}
+      </List.Item>
+    </ADSwipeAction>
+  );
 };
 
 SwipeAction.propTypes = {
-  children: PropTypes.node
+  children: PropTypes.node,
+  right: PropTypes.object,
+  onPress: PropTypes.func
 };
 
 export default SwipeAction;
diff --git a/src/client/modules/common/components/native/ui-antd-mobile/components/index.jsx b/src/client/modules/common/components/native/ui-antd-mobile/components/index.jsx
index ff0d03672a..b139dd561f 100644
--- a/src/client/modules/common/components/native/ui-antd-mobile/components/index.jsx
+++ b/src/client/modules/common/components/native/ui-antd-mobile/components/index.jsx
@@ -1,4 +1,5 @@
 // eslint-disable-next-line import/prefer-default-export
 export { default as Button } from './Button';
+export { default as Input } from './Input';
 export { default as SwipeAction } from './SwipeAction';
 export { default as ListItem } from './ListItem';
diff --git a/src/client/modules/common/components/native/ui-native-base/components/Button.jsx b/src/client/modules/common/components/native/ui-native-base/components/Button.jsx
new file mode 100644
index 0000000000..8fb3eb3774
--- /dev/null
+++ b/src/client/modules/common/components/native/ui-native-base/components/Button.jsx
@@ -0,0 +1,18 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Text } from 'react-native';
+import { Button as NBButton } from 'native-base';
+
+const Button = ({ children, ...props }) => {
+  return (
+    <NBButton block {...props}>
+      <Text>{children}</Text>
+    </NBButton>
+  );
+};
+
+Button.propTypes = {
+  children: PropTypes.node
+};
+
+export default Button;
diff --git a/src/client/modules/common/components/native/ui-native-base/components/Input.jsx b/src/client/modules/common/components/native/ui-native-base/components/Input.jsx
new file mode 100644
index 0000000000..a5519f10c5
--- /dev/null
+++ b/src/client/modules/common/components/native/ui-native-base/components/Input.jsx
@@ -0,0 +1,17 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import InputItem from 'antd-mobile/lib/input-item';
+
+const Input = ({ children, ...props }) => {
+  return (
+    <InputItem type={'text'} {...props}>
+      {children}
+    </InputItem>
+  );
+};
+
+Input.propTypes = {
+  children: PropTypes.node
+};
+
+export default Input;
diff --git a/src/client/modules/common/components/native/ui-native-base/components/ListItem.jsx b/src/client/modules/common/components/native/ui-native-base/components/ListItem.jsx
new file mode 100644
index 0000000000..335ba10542
--- /dev/null
+++ b/src/client/modules/common/components/native/ui-native-base/components/ListItem.jsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import List from 'antd-mobile/lib/list';
+
+const ListItem = ({ children, ...props }) => {
+  return <List.Item {...props}>{children}</List.Item>;
+};
+
+ListItem.propTypes = {
+  children: PropTypes.node
+};
+
+export default ListItem;
diff --git a/src/client/modules/common/components/native/ui-native-base/components/SwipeAction.jsx b/src/client/modules/common/components/native/ui-native-base/components/SwipeAction.jsx
new file mode 100644
index 0000000000..f70561d8e4
--- /dev/null
+++ b/src/client/modules/common/components/native/ui-native-base/components/SwipeAction.jsx
@@ -0,0 +1,31 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { SwipeRow, Button, Text } from 'native-base';
+
+const SwipeAction = ({ children, onPress, right, ...props }) => {
+  return (
+    <SwipeRow
+      disableRightSwipe={true}
+      rightOpenValue={-90}
+      {...props}
+      body={
+        <Text style={{ paddingLeft: 10, flex: 1 }} onPress={onPress}>
+          {children}
+        </Text>
+      }
+      right={
+        <Button danger onPress={right.onPress}>
+          <Text>{right.text}</Text>
+        </Button>
+      }
+    />
+  );
+};
+
+SwipeAction.propTypes = {
+  children: PropTypes.node,
+  right: PropTypes.object,
+  onPress: PropTypes.func
+};
+
+export default SwipeAction;
diff --git a/src/client/modules/common/components/native/ui-native-base/components/index.jsx b/src/client/modules/common/components/native/ui-native-base/components/index.jsx
new file mode 100644
index 0000000000..b139dd561f
--- /dev/null
+++ b/src/client/modules/common/components/native/ui-native-base/components/index.jsx
@@ -0,0 +1,5 @@
+// eslint-disable-next-line import/prefer-default-export
+export { default as Button } from './Button';
+export { default as Input } from './Input';
+export { default as SwipeAction } from './SwipeAction';
+export { default as ListItem } from './ListItem';
diff --git a/src/client/modules/post/components/PostList.jsx b/src/client/modules/post/components/PostList.jsx
index 6f3730de78..c81f574f21 100644
--- a/src/client/modules/post/components/PostList.jsx
+++ b/src/client/modules/post/components/PostList.jsx
@@ -2,7 +2,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { StyleSheet, FlatList, Text, View } from 'react-native';
-import { SwipeAction, ListItem } from '../../common/components/native';
+import { SwipeAction } from '../../common/components/native';
 
 class PostList extends React.PureComponent {
   onEndReachedCalledDuringMomentum = false;
@@ -13,19 +13,13 @@ class PostList extends React.PureComponent {
     const { deletePost, navigation } = this.props;
     return (
       <SwipeAction
-        style={{ backgroundColor: 'gray' }}
-        autoClose
-        right={[
-          {
-            text: 'Delete',
-            onPress: () => deletePost(id),
-            style: { backgroundColor: '#F4333C', color: 'white' }
-          }
-        ]}
+        onPress={() => navigation.navigate('PostEdit', { id })}
+        right={{
+          text: 'Delete',
+          onPress: () => deletePost(id)
+        }}
       >
-        <ListItem arrow="horizontal" onClick={() => navigation.navigate('PostEdit', { id })}>
-          {title}
-        </ListItem>
+        {title}
       </SwipeAction>
     );
   };
diff --git a/tools/webpackAppConfig.js b/tools/webpackAppConfig.js
index 97eb4a0c3c..41b42fd691 100644
--- a/tools/webpackAppConfig.js
+++ b/tools/webpackAppConfig.js
@@ -40,6 +40,7 @@ const ios = {
 
 const dependencyPlatforms = {
   antd: 'web',
+  'antd-mobile': ['ios', 'android'],
   'apollo-engine': 'server',
   bcryptjs: 'server',
   'body-parser': 'server',
@@ -62,6 +63,7 @@ const dependencyPlatforms = {
   'jwt-decode': 'web',
   knex: 'server',
   mysql2: 'server',
+  'native-base': ['ios', 'android'],
   nodemailer: 'server',
   opencollective: 'server',
   passport: 'server',

From 0e3595c832ed45e3ef89d0082ba88e8da915af71 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 29 Nov 2017 11:36:27 +0100
Subject: [PATCH 036/327] Form components

---
 .../common/components/native/RenderField.jsx  | 59 ++++++-------------
 .../modules/common/components/native/index.js |  4 +-
 .../ui-antd-mobile/components/FormButton.jsx  | 21 +++++++
 .../ui-antd-mobile/components/FormView.jsx    | 24 ++++++++
 .../ui-antd-mobile/components/Input.jsx       | 17 ------
 .../ui-antd-mobile/components/InputItem.jsx   | 13 ++++
 .../ui-antd-mobile/components/index.jsx       |  4 +-
 .../ui-native-base/components/Button.jsx      |  2 +-
 .../ui-native-base/components/FormButton.jsx  | 31 ++++++++++
 .../ui-native-base/components/FormView.jsx    | 24 ++++++++
 .../ui-native-base/components/Input.jsx       | 17 ------
 .../ui-native-base/components/InputItem.jsx   | 27 +++++++++
 .../ui-native-base/components/index.jsx       |  4 +-
 .../modules/post/components/PostEditView.jsx  | 11 +---
 .../modules/post/components/PostForm.jsx      | 18 ++----
 15 files changed, 172 insertions(+), 104 deletions(-)
 create mode 100644 src/client/modules/common/components/native/ui-antd-mobile/components/FormButton.jsx
 create mode 100644 src/client/modules/common/components/native/ui-antd-mobile/components/FormView.jsx
 delete mode 100644 src/client/modules/common/components/native/ui-antd-mobile/components/Input.jsx
 create mode 100644 src/client/modules/common/components/native/ui-antd-mobile/components/InputItem.jsx
 create mode 100644 src/client/modules/common/components/native/ui-native-base/components/FormButton.jsx
 create mode 100644 src/client/modules/common/components/native/ui-native-base/components/FormView.jsx
 delete mode 100644 src/client/modules/common/components/native/ui-native-base/components/Input.jsx
 create mode 100644 src/client/modules/common/components/native/ui-native-base/components/InputItem.jsx

diff --git a/src/client/modules/common/components/native/RenderField.jsx b/src/client/modules/common/components/native/RenderField.jsx
index 1504ff3b10..d0cf80551c 100644
--- a/src/client/modules/common/components/native/RenderField.jsx
+++ b/src/client/modules/common/components/native/RenderField.jsx
@@ -1,53 +1,28 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { StyleSheet, View, Text, TextInput } from 'react-native';
+import { InputItem } from './';
 
-const RenderField = ({ input, label, meta: { touched, error }, ...inputProps }) => {
-  const { container, inputText, text, errorField } = styles;
+const RenderField = ({ input, label, meta: { active, error }, ...inputProps }) => {
+  let hasError = false;
+  if (active && error) {
+    hasError = true;
+  }
 
   return (
-    <View style={container}>
-      <Text style={text}>{label}</Text>
-      <TextInput
-        style={[inputText, touched && error && errorField]}
-        onChangeText={input.onChange}
-        value={input.value}
-        {...inputProps}
-      />
-    </View>
+    <InputItem
+      value={input.value}
+      placeholder="controled input"
+      onChange={input.onChange}
+      onBlur={input.onBlur}
+      onFocus={input.onFocus}
+      {...inputProps}
+      error={hasError}
+    >
+      {label}
+    </InputItem>
   );
 };
 
-const styles = StyleSheet.create({
-  inputText: {
-    backgroundColor: '#FFF',
-    color: '#000',
-    borderRadius: 5,
-    paddingLeft: 5,
-    paddingRight: 5,
-    lineHeight: 20,
-    flex: 3,
-    marginBottom: 5
-  },
-  text: {
-    alignSelf: 'center',
-    fontSize: 16,
-    paddingTop: 10,
-    paddingBottom: 10,
-    flex: 1
-  },
-  errorField: {
-    borderColor: 'red',
-    borderWidth: StyleSheet.hairlineWidth
-  },
-  container: {
-    height: 40,
-    flex: 1,
-    flexDirection: 'row',
-    alignItems: 'center'
-  }
-});
-
 RenderField.propTypes = {
   input: PropTypes.object,
   label: PropTypes.string,
diff --git a/src/client/modules/common/components/native/index.js b/src/client/modules/common/components/native/index.js
index cbb4aad651..3fd83eade2 100644
--- a/src/client/modules/common/components/native/index.js
+++ b/src/client/modules/common/components/native/index.js
@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/prefer-default-export
-export * from './ui-antd-mobile/components';
-//export * from './ui-native-base/components';
+export * from './ui-native-base/components';
+//export * from './ui-antd-mobile/components';
 export { default as RenderField } from './RenderField';
 export { default as createTabBarIconWrapper } from './createTabBarIconWrapper';
diff --git a/src/client/modules/common/components/native/ui-antd-mobile/components/FormButton.jsx b/src/client/modules/common/components/native/ui-antd-mobile/components/FormButton.jsx
new file mode 100644
index 0000000000..4f533e68a2
--- /dev/null
+++ b/src/client/modules/common/components/native/ui-antd-mobile/components/FormButton.jsx
@@ -0,0 +1,21 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import List from 'antd-mobile/lib/list';
+import Button from 'antd-mobile/lib/button';
+
+const FormButton = ({ children, onPress, ...props }) => {
+  return (
+    <List.Item>
+      <Button type="primary" onClick={onPress} {...props}>
+        {children}
+      </Button>
+    </List.Item>
+  );
+};
+
+FormButton.propTypes = {
+  children: PropTypes.node,
+  onPress: PropTypes.func
+};
+
+export default FormButton;
diff --git a/src/client/modules/common/components/native/ui-antd-mobile/components/FormView.jsx b/src/client/modules/common/components/native/ui-antd-mobile/components/FormView.jsx
new file mode 100644
index 0000000000..96e6e31381
--- /dev/null
+++ b/src/client/modules/common/components/native/ui-antd-mobile/components/FormView.jsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { StyleSheet, ScrollView } from 'react-native';
+import List from 'antd-mobile/lib/list';
+
+const FormView = ({ children }) => {
+  return (
+    <ScrollView style={styles.scroll} keyboardShouldPersistTaps="handled" keyboardDismissMode="on-drag">
+      <List>{children}</List>
+    </ScrollView>
+  );
+};
+
+FormView.propTypes = {
+  children: PropTypes.node
+};
+
+const styles = StyleSheet.create({
+  scroll: {
+    marginBottom: 5
+  }
+});
+
+export default FormView;
diff --git a/src/client/modules/common/components/native/ui-antd-mobile/components/Input.jsx b/src/client/modules/common/components/native/ui-antd-mobile/components/Input.jsx
deleted file mode 100644
index a5519f10c5..0000000000
--- a/src/client/modules/common/components/native/ui-antd-mobile/components/Input.jsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import InputItem from 'antd-mobile/lib/input-item';
-
-const Input = ({ children, ...props }) => {
-  return (
-    <InputItem type={'text'} {...props}>
-      {children}
-    </InputItem>
-  );
-};
-
-Input.propTypes = {
-  children: PropTypes.node
-};
-
-export default Input;
diff --git a/src/client/modules/common/components/native/ui-antd-mobile/components/InputItem.jsx b/src/client/modules/common/components/native/ui-antd-mobile/components/InputItem.jsx
new file mode 100644
index 0000000000..cab60729a8
--- /dev/null
+++ b/src/client/modules/common/components/native/ui-antd-mobile/components/InputItem.jsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ADInputItem from 'antd-mobile/lib/input-item';
+
+const InputItem = ({ children, ...props }) => {
+  return <ADInputItem {...props}>{children}</ADInputItem>;
+};
+
+InputItem.propTypes = {
+  children: PropTypes.node
+};
+
+export default InputItem;
diff --git a/src/client/modules/common/components/native/ui-antd-mobile/components/index.jsx b/src/client/modules/common/components/native/ui-antd-mobile/components/index.jsx
index b139dd561f..75ba84e5ff 100644
--- a/src/client/modules/common/components/native/ui-antd-mobile/components/index.jsx
+++ b/src/client/modules/common/components/native/ui-antd-mobile/components/index.jsx
@@ -1,5 +1,7 @@
 // eslint-disable-next-line import/prefer-default-export
 export { default as Button } from './Button';
-export { default as Input } from './Input';
+export { default as FormView } from './FormView';
+export { default as FormButton } from './FormButton';
+export { default as InputItem } from './InputItem';
 export { default as SwipeAction } from './SwipeAction';
 export { default as ListItem } from './ListItem';
diff --git a/src/client/modules/common/components/native/ui-native-base/components/Button.jsx b/src/client/modules/common/components/native/ui-native-base/components/Button.jsx
index 8fb3eb3774..aabf1c28bd 100644
--- a/src/client/modules/common/components/native/ui-native-base/components/Button.jsx
+++ b/src/client/modules/common/components/native/ui-native-base/components/Button.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Text } from 'react-native';
-import { Button as NBButton } from 'native-base';
+import { NBButton } from 'native-base';
 
 const Button = ({ children, ...props }) => {
   return (
diff --git a/src/client/modules/common/components/native/ui-native-base/components/FormButton.jsx b/src/client/modules/common/components/native/ui-native-base/components/FormButton.jsx
new file mode 100644
index 0000000000..69d78ac9b1
--- /dev/null
+++ b/src/client/modules/common/components/native/ui-native-base/components/FormButton.jsx
@@ -0,0 +1,31 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { StyleSheet, Text } from 'react-native';
+import { Button } from 'native-base';
+
+const FormButton = ({ children, ...props }) => {
+  return (
+    <Button block {...props} style={styles.button}>
+      <Text style={styles.textStyle}>{children}</Text>
+    </Button>
+  );
+};
+
+FormButton.propTypes = {
+  children: PropTypes.node
+};
+
+const styles = StyleSheet.create({
+  button: {
+    marginTop: 10,
+    marginLeft: 15,
+    marginRight: 15
+  },
+  textStyle: {
+    color: '#FFF',
+    fontSize: 16,
+    fontWeight: '500'
+  }
+});
+
+export default FormButton;
diff --git a/src/client/modules/common/components/native/ui-native-base/components/FormView.jsx b/src/client/modules/common/components/native/ui-native-base/components/FormView.jsx
new file mode 100644
index 0000000000..bf1eff6d3e
--- /dev/null
+++ b/src/client/modules/common/components/native/ui-native-base/components/FormView.jsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { StyleSheet, ScrollView } from 'react-native';
+
+const FormView = ({ children }) => {
+  return (
+    <ScrollView style={styles.scroll} keyboardShouldPersistTaps="handled" keyboardDismissMode="on-drag">
+      {children}
+    </ScrollView>
+  );
+};
+
+FormView.propTypes = {
+  children: PropTypes.node
+};
+
+const styles = StyleSheet.create({
+  scroll: {
+    paddingBottom: 10,
+    backgroundColor: '#fff'
+  }
+});
+
+export default FormView;
diff --git a/src/client/modules/common/components/native/ui-native-base/components/Input.jsx b/src/client/modules/common/components/native/ui-native-base/components/Input.jsx
deleted file mode 100644
index a5519f10c5..0000000000
--- a/src/client/modules/common/components/native/ui-native-base/components/Input.jsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import InputItem from 'antd-mobile/lib/input-item';
-
-const Input = ({ children, ...props }) => {
-  return (
-    <InputItem type={'text'} {...props}>
-      {children}
-    </InputItem>
-  );
-};
-
-Input.propTypes = {
-  children: PropTypes.node
-};
-
-export default Input;
diff --git a/src/client/modules/common/components/native/ui-native-base/components/InputItem.jsx b/src/client/modules/common/components/native/ui-native-base/components/InputItem.jsx
new file mode 100644
index 0000000000..cfc7340893
--- /dev/null
+++ b/src/client/modules/common/components/native/ui-native-base/components/InputItem.jsx
@@ -0,0 +1,27 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { StyleSheet } from 'react-native';
+import { Item, Label, Input, Icon } from 'native-base';
+
+const InputItem = ({ children, error, ...props }) => {
+  return (
+    <Item fixedLabel style={styles.item} error={error}>
+      <Label>{children}</Label>
+      <Input {...props} />
+      {error && <Icon name="close-circle" />}
+    </Item>
+  );
+};
+
+InputItem.propTypes = {
+  children: PropTypes.node,
+  error: PropTypes.bool
+};
+
+const styles = StyleSheet.create({
+  item: {
+    paddingLeft: 10
+  }
+});
+
+export default InputItem;
diff --git a/src/client/modules/common/components/native/ui-native-base/components/index.jsx b/src/client/modules/common/components/native/ui-native-base/components/index.jsx
index b139dd561f..75ba84e5ff 100644
--- a/src/client/modules/common/components/native/ui-native-base/components/index.jsx
+++ b/src/client/modules/common/components/native/ui-native-base/components/index.jsx
@@ -1,5 +1,7 @@
 // eslint-disable-next-line import/prefer-default-export
 export { default as Button } from './Button';
-export { default as Input } from './Input';
+export { default as FormView } from './FormView';
+export { default as FormButton } from './FormButton';
+export { default as InputItem } from './InputItem';
 export { default as SwipeAction } from './SwipeAction';
 export { default as ListItem } from './ListItem';
diff --git a/src/client/modules/post/components/PostEditView.jsx b/src/client/modules/post/components/PostEditView.jsx
index 20d2e4d5c9..682ddc6683 100644
--- a/src/client/modules/post/components/PostEditView.jsx
+++ b/src/client/modules/post/components/PostEditView.jsx
@@ -54,16 +54,7 @@ PostEditView.propTypes = {
 
 const styles = StyleSheet.create({
   container: {
-    margin: 5,
-    flexDirection: 'column'
-  },
-  element: {
-    paddingTop: 30
-  },
-  box: {
-    textAlign: 'center',
-    marginLeft: 15,
-    marginRight: 15
+    //flex: 1
   }
 });
 
diff --git a/src/client/modules/post/components/PostForm.jsx b/src/client/modules/post/components/PostForm.jsx
index d32bed209c..e0db7e6eda 100644
--- a/src/client/modules/post/components/PostForm.jsx
+++ b/src/client/modules/post/components/PostForm.jsx
@@ -1,21 +1,19 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Field, reduxForm } from 'redux-form';
-import { StyleSheet, ScrollView } from 'react-native';
-import { Button } from '../../common/components';
-import { RenderField } from '../../common/components/native';
+import { FormView, RenderField, FormButton } from '../../common/components/native';
 
 const required = value => (value ? undefined : 'Required');
 
 const PostForm = ({ handleSubmit, valid, onSubmit }) => {
   return (
-    <ScrollView style={styles.scroll} keyboardShouldPersistTaps="handled" keyboardDismissMode="on-drag">
+    <FormView>
       <Field name="title" component={RenderField} type="text" label="Title" validate={required} />
       <Field name="content" component={RenderField} type="text" label="Content" validate={required} />
-      <Button onPress={handleSubmit(onSubmit)} disabled={valid}>
+      <FormButton onPress={handleSubmit(onSubmit)} disabled={!valid}>
         Save
-      </Button>
-    </ScrollView>
+      </FormButton>
+    </FormView>
   );
 };
 
@@ -25,12 +23,6 @@ PostForm.propTypes = {
   valid: PropTypes.bool
 };
 
-const styles = StyleSheet.create({
-  scroll: {
-    marginBottom: 5
-  }
-});
-
 export default reduxForm({
   form: 'post',
   enableReinitialize: true

From 1d36d03aac91a63b38b8cd368d5da5203f7fc88f Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 29 Nov 2017 11:59:50 +0100
Subject: [PATCH 037/327] finish styling post edit

---
 .../common/components/native/RenderField.jsx  |   4 +-
 .../post/components/PostCommentForm.jsx       |  18 +--
 .../post/components/PostCommentsView.jsx      | 138 +++++++-----------
 .../modules/post/components/PostList.jsx      |  18 ---
 4 files changed, 62 insertions(+), 116 deletions(-)

diff --git a/src/client/modules/common/components/native/RenderField.jsx b/src/client/modules/common/components/native/RenderField.jsx
index d0cf80551c..dfd5e567fb 100644
--- a/src/client/modules/common/components/native/RenderField.jsx
+++ b/src/client/modules/common/components/native/RenderField.jsx
@@ -2,9 +2,9 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { InputItem } from './';
 
-const RenderField = ({ input, label, meta: { active, error }, ...inputProps }) => {
+const RenderField = ({ input, label, meta: { touched, error }, ...inputProps }) => {
   let hasError = false;
-  if (active && error) {
+  if (touched && error) {
     hasError = true;
   }
 
diff --git a/src/client/modules/post/components/PostCommentForm.jsx b/src/client/modules/post/components/PostCommentForm.jsx
index 2d65ba9934..fa89e2655e 100644
--- a/src/client/modules/post/components/PostCommentForm.jsx
+++ b/src/client/modules/post/components/PostCommentForm.jsx
@@ -1,9 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Field, reduxForm } from 'redux-form';
-import { StyleSheet, ScrollView } from 'react-native';
-import { Button } from '../../common/components';
-import { RenderField } from '../../common/components/native';
+import { FormView, RenderField, FormButton } from '../../common/components/native';
 
 const required = value => (value ? undefined : 'Required');
 
@@ -14,12 +12,12 @@ const PostCommentForm = ({ handleSubmit, valid, initialValues, onSubmit }) => {
   }
 
   return (
-    <ScrollView style={styles.scroll} keyboardShouldPersistTaps="handled" keyboardDismissMode="on-drag">
+    <FormView>
       <Field name="content" component={RenderField} type="text" label="Content" validate={required} />
-      <Button onPress={handleSubmit(onSubmit)} disabled={valid}>
+      <FormButton onPress={handleSubmit(onSubmit)} disabled={!valid}>
         {operation}
-      </Button>
-    </ScrollView>
+      </FormButton>
+    </FormView>
   );
 };
 
@@ -30,12 +28,6 @@ PostCommentForm.propTypes = {
   valid: PropTypes.bool
 };
 
-const styles = StyleSheet.create({
-  scroll: {
-    marginBottom: 5
-  }
-});
-
 export default reduxForm({
   form: 'comment',
   enableReinitialize: true
diff --git a/src/client/modules/post/components/PostCommentsView.jsx b/src/client/modules/post/components/PostCommentsView.jsx
index 80db02b607..ea89f4414d 100644
--- a/src/client/modules/post/components/PostCommentsView.jsx
+++ b/src/client/modules/post/components/PostCommentsView.jsx
@@ -1,78 +1,68 @@
-/*eslint-disable react/display-name*/
-
 import React from 'react';
 import PropTypes from 'prop-types';
-import { StyleSheet, Text, View, ListView, ScrollView, Button, Keyboard } from 'react-native';
+import { StyleSheet, FlatList, Text, View, ScrollView, Keyboard } from 'react-native';
+import { SwipeAction } from '../../common/components/native';
 
 import PostCommentForm from './PostCommentForm';
 
-function onCommentDelete(comment, deleteComment, onCommentSelect, id) {
-  if (comment.id === id) {
-    onCommentSelect({ id: null, content: '' });
-  }
+class PostCommentsView extends React.PureComponent {
+  keyExtractor = item => item.id;
 
-  deleteComment(id);
-}
+  renderItem = ({ item: { id, content } }) => {
+    const { comment, deleteComment, onCommentSelect } = this.props;
+    return (
+      <SwipeAction
+        onPress={() => onCommentSelect({ id: id, content: content })}
+        right={{
+          text: 'Delete',
+          onPress: () => this.onCommentDelete(comment, deleteComment, onCommentSelect, id)
+        }}
+      >
+        {content}
+      </SwipeAction>
+    );
+  };
 
-// Row comparison function
-const rowHasChanged = (r1, r2) => r1.id !== r2.id;
+  onCommentDelete = (comment, deleteComment, onCommentSelect, id) => {
+    if (comment.id === id) {
+      onCommentSelect({ id: null, content: '' });
+    }
 
-// DataSource template object
-const ds = new ListView.DataSource({ rowHasChanged });
+    deleteComment(id);
+  };
 
-const renderRow = (onCommentSelect, comment, deleteComment) => rowData => {
-  return (
-    <View style={styles.row}>
-      <Button title={rowData.content} onPress={() => onCommentSelect({ id: rowData.id, content: rowData.content })} />
-      <Button title="Delete" onPress={() => onCommentDelete(comment, deleteComment, onCommentSelect, rowData.id)} />
-    </View>
-  );
-};
+  onSubmit = (comment, postId, addComment, editComment, onCommentSelect, onFormSubmitted) => values => {
+    if (comment.id === null) {
+      addComment(values.content, postId);
+    } else {
+      editComment(comment.id, values.content);
+    }
 
-const onSubmit = (comment, postId, addComment, editComment, onCommentSelect, onFormSubmitted) => values => {
-  if (comment.id === null) {
-    addComment(values.content, postId);
-  } else {
-    editComment(comment.id, values.content);
-  }
+    onCommentSelect({ id: null, content: '' });
+    onFormSubmitted();
+    Keyboard.dismiss();
+  };
 
-  onCommentSelect({ id: null, content: '' });
-  onFormSubmitted();
-  Keyboard.dismiss();
-};
+  render() {
+    const { postId, comment, addComment, editComment, comments, onCommentSelect, onFormSubmitted } = this.props;
 
-const PostCommentsView = ({
-  postId,
-  comment,
-  addComment,
-  editComment,
-  comments,
-  onCommentSelect,
-  deleteComment,
-  onFormSubmitted
-}) => {
-  const dataSource = comments.length > 0 ? ds.cloneWithRows(comments) : null;
-  return (
-    <View>
-      <Text style={styles.title}>Comments</Text>
-      <PostCommentForm
-        postId={postId}
-        onSubmit={onSubmit(comment, postId, addComment, editComment, onCommentSelect, onFormSubmitted)}
-        initialValues={comment}
-      />
-      {comments.length > 0 && (
-        <ScrollView keyboardDismissMode="on-drag">
-          <ListView
-            style={styles.container}
-            dataSource={dataSource}
-            renderRow={renderRow(onCommentSelect, comment, deleteComment)}
-            removeClippedSubviews={false}
-          />
-        </ScrollView>
-      )}
-    </View>
-  );
-};
+    return (
+      <View>
+        <Text style={styles.title}>Comments</Text>
+        <PostCommentForm
+          postId={postId}
+          onSubmit={this.onSubmit(comment, postId, addComment, editComment, onCommentSelect, onFormSubmitted)}
+          initialValues={comment}
+        />
+        {comments.length > 0 && (
+          <ScrollView style={styles.list} keyboardDismissMode="on-drag">
+            <FlatList data={comments} keyExtractor={this.keyExtractor} renderItem={this.renderItem} />
+          </ScrollView>
+        )}
+      </View>
+    );
+  }
+}
 
 PostCommentsView.propTypes = {
   postId: PropTypes.number.isRequired,
@@ -87,32 +77,14 @@ PostCommentsView.propTypes = {
 };
 
 const styles = StyleSheet.create({
-  container: {
-    flex: 1
-  },
   title: {
     fontSize: 20,
     fontWeight: '600',
     textAlign: 'center',
     margin: 10
   },
-  element: {
-    paddingTop: 30
-  },
-  box: {
-    textAlign: 'center',
-    marginLeft: 15,
-    marginRight: 15
-  },
-  row: {
-    padding: 5,
-    borderWidth: 1,
-    borderTopWidth: 0,
-    borderColor: '#ddd',
-    backgroundColor: '#fff',
-    flexDirection: 'row',
-    justifyContent: 'space-between',
-    alignItems: 'center'
+  list: {
+    paddingTop: 10
   }
 });
 
diff --git a/src/client/modules/post/components/PostList.jsx b/src/client/modules/post/components/PostList.jsx
index c81f574f21..2fa9aacd7c 100644
--- a/src/client/modules/post/components/PostList.jsx
+++ b/src/client/modules/post/components/PostList.jsx
@@ -68,24 +68,6 @@ PostList.propTypes = {
 const styles = StyleSheet.create({
   container: {
     flex: 1
-  },
-  element: {
-    paddingTop: 30
-  },
-  box: {
-    textAlign: 'center',
-    marginLeft: 15,
-    marginRight: 15
-  },
-  row: {
-    padding: 5,
-    borderWidth: 1,
-    borderTopWidth: 0,
-    borderColor: '#ddd',
-    backgroundColor: '#fff',
-    flexDirection: 'row',
-    justifyContent: 'space-between',
-    alignItems: 'center'
   }
 });
 

From fecc8fbd8517325c4d39055d7455bdb4d845f41e Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 29 Nov 2017 12:12:29 +0100
Subject: [PATCH 038/327] small fix

---
 src/client/modules/post/components/PostEditView.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/modules/post/components/PostEditView.jsx b/src/client/modules/post/components/PostEditView.jsx
index 682ddc6683..cbdd96de27 100644
--- a/src/client/modules/post/components/PostEditView.jsx
+++ b/src/client/modules/post/components/PostEditView.jsx
@@ -54,7 +54,7 @@ PostEditView.propTypes = {
 
 const styles = StyleSheet.create({
   container: {
-    //flex: 1
+    flexDirection: 'column'
   }
 });
 

From 52cfe7f5d8bb278d619d491eec23def818988454 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 29 Nov 2017 13:10:20 +0100
Subject: [PATCH 039/327] move `ui-*` components into `common`

---
 src/client/modules/common/components/web/index.jsx            | 2 +-
 .../{ => common/components/web}/ui-antd/components/Alert.jsx  | 0
 .../{ => common/components/web}/ui-antd/components/Button.jsx | 0
 .../{ => common/components/web}/ui-antd/components/Card.jsx   | 0
 .../components/web}/ui-antd/components/CardGroup.jsx          | 0
 .../components/web}/ui-antd/components/CardText.jsx           | 0
 .../components/web}/ui-antd/components/CardTitle.jsx          | 0
 .../{ => common/components/web}/ui-antd/components/Col.jsx    | 0
 .../components/web}/ui-antd/components/Container.jsx          | 0
 .../{ => common/components/web}/ui-antd/components/Form.jsx   | 0
 .../components/web}/ui-antd/components/FormItem.jsx           | 0
 .../{ => common/components/web}/ui-antd/components/Input.jsx  | 0
 .../{ => common/components/web}/ui-antd/components/Label.jsx  | 0
 .../components/web}/ui-antd/components/ListGroup.jsx          | 0
 .../components/web}/ui-antd/components/ListItem.jsx           | 0
 .../components/web}/ui-antd/components/MenuItem.jsx           | 0
 .../{ => common/components/web}/ui-antd/components/NavBar.jsx | 4 ++--
 .../{ => common/components/web}/ui-antd/components/Option.jsx | 0
 .../components/web}/ui-antd/components/PageLayout.jsx         | 2 +-
 .../components/web}/ui-antd/components/RenderCheckBox.jsx     | 0
 .../components/web}/ui-antd/components/RenderField.jsx        | 0
 .../components/web}/ui-antd/components/RenderSelect.jsx       | 0
 .../{ => common/components/web}/ui-antd/components/Row.jsx    | 0
 .../{ => common/components/web}/ui-antd/components/Select.jsx | 0
 .../{ => common/components/web}/ui-antd/components/Table.jsx  | 0
 .../{ => common/components/web}/ui-antd/components/index.js   | 0
 .../modules/{ => common/components/web}/ui-antd/index.jsx     | 0
 .../modules/{ => common/components/web}/ui-antd/index.web.js  | 2 +-
 .../modules/common/components/web/ui-antd/styles/antd.less    | 1 +
 .../{ => common/components/web}/ui-antd/styles/styles.less    | 0
 .../components/web}/ui-bootstrap/components/Alert.jsx         | 0
 .../components/web}/ui-bootstrap/components/Button.jsx        | 0
 .../components/web}/ui-bootstrap/components/Card.jsx          | 0
 .../components/web}/ui-bootstrap/components/CardGroup.jsx     | 0
 .../components/web}/ui-bootstrap/components/CardText.jsx      | 0
 .../components/web}/ui-bootstrap/components/CardTitle.jsx     | 0
 .../components/web}/ui-bootstrap/components/Col.jsx           | 0
 .../components/web}/ui-bootstrap/components/Container.jsx     | 0
 .../components/web}/ui-bootstrap/components/Form.jsx          | 0
 .../components/web}/ui-bootstrap/components/FormItem.jsx      | 0
 .../components/web}/ui-bootstrap/components/Input.jsx         | 0
 .../components/web}/ui-bootstrap/components/Label.jsx         | 0
 .../components/web}/ui-bootstrap/components/ListGroup.jsx     | 0
 .../components/web}/ui-bootstrap/components/ListItem.jsx      | 0
 .../components/web}/ui-bootstrap/components/MenuItem.jsx      | 0
 .../components/web}/ui-bootstrap/components/NavBar.jsx        | 4 ++--
 .../components/web}/ui-bootstrap/components/Option.jsx        | 0
 .../components/web}/ui-bootstrap/components/PageLayout.jsx    | 2 +-
 .../web}/ui-bootstrap/components/RenderCheckBox.jsx           | 0
 .../components/web}/ui-bootstrap/components/RenderField.jsx   | 0
 .../components/web}/ui-bootstrap/components/RenderSelect.jsx  | 0
 .../components/web}/ui-bootstrap/components/Row.jsx           | 0
 .../components/web}/ui-bootstrap/components/Select.jsx        | 0
 .../components/web}/ui-bootstrap/components/Table.jsx         | 0
 .../components/web}/ui-bootstrap/components/index.js          | 0
 .../{ => common/components/web}/ui-bootstrap/index.jsx        | 0
 .../{ => common/components/web}/ui-bootstrap/index.web.js     | 2 +-
 .../common/components/web/ui-bootstrap/styles/bootstrap.scss  | 1 +
 .../components/web}/ui-bootstrap/styles/styles.scss           | 0
 src/client/modules/index.js                                   | 4 ++--
 src/client/modules/ui-antd/styles/antd.less                   | 1 -
 src/client/modules/ui-bootstrap/styles/bootstrap.scss         | 1 -
 62 files changed, 13 insertions(+), 13 deletions(-)
 rename src/client/modules/{ => common/components/web}/ui-antd/components/Alert.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-antd/components/Button.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-antd/components/Card.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-antd/components/CardGroup.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-antd/components/CardText.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-antd/components/CardTitle.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-antd/components/Col.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-antd/components/Container.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-antd/components/Form.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-antd/components/FormItem.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-antd/components/Input.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-antd/components/Label.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-antd/components/ListGroup.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-antd/components/ListItem.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-antd/components/MenuItem.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-antd/components/NavBar.jsx (93%)
 rename src/client/modules/{ => common/components/web}/ui-antd/components/Option.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-antd/components/PageLayout.jsx (93%)
 rename src/client/modules/{ => common/components/web}/ui-antd/components/RenderCheckBox.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-antd/components/RenderField.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-antd/components/RenderSelect.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-antd/components/Row.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-antd/components/Select.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-antd/components/Table.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-antd/components/index.js (100%)
 rename src/client/modules/{ => common/components/web}/ui-antd/index.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-antd/index.web.js (69%)
 create mode 100644 src/client/modules/common/components/web/ui-antd/styles/antd.less
 rename src/client/modules/{ => common/components/web}/ui-antd/styles/styles.less (100%)
 rename src/client/modules/{ => common/components/web}/ui-bootstrap/components/Alert.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-bootstrap/components/Button.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-bootstrap/components/Card.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-bootstrap/components/CardGroup.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-bootstrap/components/CardText.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-bootstrap/components/CardTitle.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-bootstrap/components/Col.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-bootstrap/components/Container.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-bootstrap/components/Form.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-bootstrap/components/FormItem.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-bootstrap/components/Input.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-bootstrap/components/Label.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-bootstrap/components/ListGroup.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-bootstrap/components/ListItem.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-bootstrap/components/MenuItem.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-bootstrap/components/NavBar.jsx (86%)
 rename src/client/modules/{ => common/components/web}/ui-bootstrap/components/Option.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-bootstrap/components/PageLayout.jsx (92%)
 rename src/client/modules/{ => common/components/web}/ui-bootstrap/components/RenderCheckBox.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-bootstrap/components/RenderField.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-bootstrap/components/RenderSelect.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-bootstrap/components/Row.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-bootstrap/components/Select.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-bootstrap/components/Table.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-bootstrap/components/index.js (100%)
 rename src/client/modules/{ => common/components/web}/ui-bootstrap/index.jsx (100%)
 rename src/client/modules/{ => common/components/web}/ui-bootstrap/index.web.js (69%)
 create mode 100644 src/client/modules/common/components/web/ui-bootstrap/styles/bootstrap.scss
 rename src/client/modules/{ => common/components/web}/ui-bootstrap/styles/styles.scss (100%)
 delete mode 100644 src/client/modules/ui-antd/styles/antd.less
 delete mode 100644 src/client/modules/ui-bootstrap/styles/bootstrap.scss

diff --git a/src/client/modules/common/components/web/index.jsx b/src/client/modules/common/components/web/index.jsx
index 609667ae84..08f50d48a9 100644
--- a/src/client/modules/common/components/web/index.jsx
+++ b/src/client/modules/common/components/web/index.jsx
@@ -1 +1 @@
-export * from '../../../ui-bootstrap/components';
+export * from './ui-bootstrap/components';
diff --git a/src/client/modules/ui-antd/components/Alert.jsx b/src/client/modules/common/components/web/ui-antd/components/Alert.jsx
similarity index 100%
rename from src/client/modules/ui-antd/components/Alert.jsx
rename to src/client/modules/common/components/web/ui-antd/components/Alert.jsx
diff --git a/src/client/modules/ui-antd/components/Button.jsx b/src/client/modules/common/components/web/ui-antd/components/Button.jsx
similarity index 100%
rename from src/client/modules/ui-antd/components/Button.jsx
rename to src/client/modules/common/components/web/ui-antd/components/Button.jsx
diff --git a/src/client/modules/ui-antd/components/Card.jsx b/src/client/modules/common/components/web/ui-antd/components/Card.jsx
similarity index 100%
rename from src/client/modules/ui-antd/components/Card.jsx
rename to src/client/modules/common/components/web/ui-antd/components/Card.jsx
diff --git a/src/client/modules/ui-antd/components/CardGroup.jsx b/src/client/modules/common/components/web/ui-antd/components/CardGroup.jsx
similarity index 100%
rename from src/client/modules/ui-antd/components/CardGroup.jsx
rename to src/client/modules/common/components/web/ui-antd/components/CardGroup.jsx
diff --git a/src/client/modules/ui-antd/components/CardText.jsx b/src/client/modules/common/components/web/ui-antd/components/CardText.jsx
similarity index 100%
rename from src/client/modules/ui-antd/components/CardText.jsx
rename to src/client/modules/common/components/web/ui-antd/components/CardText.jsx
diff --git a/src/client/modules/ui-antd/components/CardTitle.jsx b/src/client/modules/common/components/web/ui-antd/components/CardTitle.jsx
similarity index 100%
rename from src/client/modules/ui-antd/components/CardTitle.jsx
rename to src/client/modules/common/components/web/ui-antd/components/CardTitle.jsx
diff --git a/src/client/modules/ui-antd/components/Col.jsx b/src/client/modules/common/components/web/ui-antd/components/Col.jsx
similarity index 100%
rename from src/client/modules/ui-antd/components/Col.jsx
rename to src/client/modules/common/components/web/ui-antd/components/Col.jsx
diff --git a/src/client/modules/ui-antd/components/Container.jsx b/src/client/modules/common/components/web/ui-antd/components/Container.jsx
similarity index 100%
rename from src/client/modules/ui-antd/components/Container.jsx
rename to src/client/modules/common/components/web/ui-antd/components/Container.jsx
diff --git a/src/client/modules/ui-antd/components/Form.jsx b/src/client/modules/common/components/web/ui-antd/components/Form.jsx
similarity index 100%
rename from src/client/modules/ui-antd/components/Form.jsx
rename to src/client/modules/common/components/web/ui-antd/components/Form.jsx
diff --git a/src/client/modules/ui-antd/components/FormItem.jsx b/src/client/modules/common/components/web/ui-antd/components/FormItem.jsx
similarity index 100%
rename from src/client/modules/ui-antd/components/FormItem.jsx
rename to src/client/modules/common/components/web/ui-antd/components/FormItem.jsx
diff --git a/src/client/modules/ui-antd/components/Input.jsx b/src/client/modules/common/components/web/ui-antd/components/Input.jsx
similarity index 100%
rename from src/client/modules/ui-antd/components/Input.jsx
rename to src/client/modules/common/components/web/ui-antd/components/Input.jsx
diff --git a/src/client/modules/ui-antd/components/Label.jsx b/src/client/modules/common/components/web/ui-antd/components/Label.jsx
similarity index 100%
rename from src/client/modules/ui-antd/components/Label.jsx
rename to src/client/modules/common/components/web/ui-antd/components/Label.jsx
diff --git a/src/client/modules/ui-antd/components/ListGroup.jsx b/src/client/modules/common/components/web/ui-antd/components/ListGroup.jsx
similarity index 100%
rename from src/client/modules/ui-antd/components/ListGroup.jsx
rename to src/client/modules/common/components/web/ui-antd/components/ListGroup.jsx
diff --git a/src/client/modules/ui-antd/components/ListItem.jsx b/src/client/modules/common/components/web/ui-antd/components/ListItem.jsx
similarity index 100%
rename from src/client/modules/ui-antd/components/ListItem.jsx
rename to src/client/modules/common/components/web/ui-antd/components/ListItem.jsx
diff --git a/src/client/modules/ui-antd/components/MenuItem.jsx b/src/client/modules/common/components/web/ui-antd/components/MenuItem.jsx
similarity index 100%
rename from src/client/modules/ui-antd/components/MenuItem.jsx
rename to src/client/modules/common/components/web/ui-antd/components/MenuItem.jsx
diff --git a/src/client/modules/ui-antd/components/NavBar.jsx b/src/client/modules/common/components/web/ui-antd/components/NavBar.jsx
similarity index 93%
rename from src/client/modules/ui-antd/components/NavBar.jsx
rename to src/client/modules/common/components/web/ui-antd/components/NavBar.jsx
index 088324ad40..899846d4ce 100644
--- a/src/client/modules/ui-antd/components/NavBar.jsx
+++ b/src/client/modules/common/components/web/ui-antd/components/NavBar.jsx
@@ -5,8 +5,8 @@ import Menu from 'antd/lib/menu';
 import Row from 'antd/lib/row';
 import Col from 'antd/lib/col';
 
-import modules from '../../../modules';
-import settings from '../../../../../settings';
+import modules from '../../../../../../modules';
+import settings from '../../../../../../../../settings';
 
 class NavBar extends React.Component {
   state = {
diff --git a/src/client/modules/ui-antd/components/Option.jsx b/src/client/modules/common/components/web/ui-antd/components/Option.jsx
similarity index 100%
rename from src/client/modules/ui-antd/components/Option.jsx
rename to src/client/modules/common/components/web/ui-antd/components/Option.jsx
diff --git a/src/client/modules/ui-antd/components/PageLayout.jsx b/src/client/modules/common/components/web/ui-antd/components/PageLayout.jsx
similarity index 93%
rename from src/client/modules/ui-antd/components/PageLayout.jsx
rename to src/client/modules/common/components/web/ui-antd/components/PageLayout.jsx
index a9b2a7f6b3..9f884c0c3b 100644
--- a/src/client/modules/ui-antd/components/PageLayout.jsx
+++ b/src/client/modules/common/components/web/ui-antd/components/PageLayout.jsx
@@ -5,7 +5,7 @@ import enUS from 'antd/lib/locale-provider/en_US';
 import Layout from 'antd/lib/layout';
 
 import NavBar from './NavBar';
-import settings from '../../../../../settings';
+import settings from '../../../../../../../../settings';
 
 const { Header, Content, Footer } = Layout;
 
diff --git a/src/client/modules/ui-antd/components/RenderCheckBox.jsx b/src/client/modules/common/components/web/ui-antd/components/RenderCheckBox.jsx
similarity index 100%
rename from src/client/modules/ui-antd/components/RenderCheckBox.jsx
rename to src/client/modules/common/components/web/ui-antd/components/RenderCheckBox.jsx
diff --git a/src/client/modules/ui-antd/components/RenderField.jsx b/src/client/modules/common/components/web/ui-antd/components/RenderField.jsx
similarity index 100%
rename from src/client/modules/ui-antd/components/RenderField.jsx
rename to src/client/modules/common/components/web/ui-antd/components/RenderField.jsx
diff --git a/src/client/modules/ui-antd/components/RenderSelect.jsx b/src/client/modules/common/components/web/ui-antd/components/RenderSelect.jsx
similarity index 100%
rename from src/client/modules/ui-antd/components/RenderSelect.jsx
rename to src/client/modules/common/components/web/ui-antd/components/RenderSelect.jsx
diff --git a/src/client/modules/ui-antd/components/Row.jsx b/src/client/modules/common/components/web/ui-antd/components/Row.jsx
similarity index 100%
rename from src/client/modules/ui-antd/components/Row.jsx
rename to src/client/modules/common/components/web/ui-antd/components/Row.jsx
diff --git a/src/client/modules/ui-antd/components/Select.jsx b/src/client/modules/common/components/web/ui-antd/components/Select.jsx
similarity index 100%
rename from src/client/modules/ui-antd/components/Select.jsx
rename to src/client/modules/common/components/web/ui-antd/components/Select.jsx
diff --git a/src/client/modules/ui-antd/components/Table.jsx b/src/client/modules/common/components/web/ui-antd/components/Table.jsx
similarity index 100%
rename from src/client/modules/ui-antd/components/Table.jsx
rename to src/client/modules/common/components/web/ui-antd/components/Table.jsx
diff --git a/src/client/modules/ui-antd/components/index.js b/src/client/modules/common/components/web/ui-antd/components/index.js
similarity index 100%
rename from src/client/modules/ui-antd/components/index.js
rename to src/client/modules/common/components/web/ui-antd/components/index.js
diff --git a/src/client/modules/ui-antd/index.jsx b/src/client/modules/common/components/web/ui-antd/index.jsx
similarity index 100%
rename from src/client/modules/ui-antd/index.jsx
rename to src/client/modules/common/components/web/ui-antd/index.jsx
diff --git a/src/client/modules/ui-antd/index.web.js b/src/client/modules/common/components/web/ui-antd/index.web.js
similarity index 69%
rename from src/client/modules/ui-antd/index.web.js
rename to src/client/modules/common/components/web/ui-antd/index.web.js
index 6abca95093..b1b73ef7c0 100644
--- a/src/client/modules/ui-antd/index.web.js
+++ b/src/client/modules/common/components/web/ui-antd/index.web.js
@@ -1,6 +1,6 @@
 import styles from './styles/styles.less';
 
-import Feature from '../connector';
+import Feature from '../../../../connector';
 
 export default new Feature({
   stylesInsert: styles
diff --git a/src/client/modules/common/components/web/ui-antd/styles/antd.less b/src/client/modules/common/components/web/ui-antd/styles/antd.less
new file mode 100644
index 0000000000..8e2ca29cc3
--- /dev/null
+++ b/src/client/modules/common/components/web/ui-antd/styles/antd.less
@@ -0,0 +1 @@
+@import '../../../../../../../../node_modules/antd/dist/antd';
diff --git a/src/client/modules/ui-antd/styles/styles.less b/src/client/modules/common/components/web/ui-antd/styles/styles.less
similarity index 100%
rename from src/client/modules/ui-antd/styles/styles.less
rename to src/client/modules/common/components/web/ui-antd/styles/styles.less
diff --git a/src/client/modules/ui-bootstrap/components/Alert.jsx b/src/client/modules/common/components/web/ui-bootstrap/components/Alert.jsx
similarity index 100%
rename from src/client/modules/ui-bootstrap/components/Alert.jsx
rename to src/client/modules/common/components/web/ui-bootstrap/components/Alert.jsx
diff --git a/src/client/modules/ui-bootstrap/components/Button.jsx b/src/client/modules/common/components/web/ui-bootstrap/components/Button.jsx
similarity index 100%
rename from src/client/modules/ui-bootstrap/components/Button.jsx
rename to src/client/modules/common/components/web/ui-bootstrap/components/Button.jsx
diff --git a/src/client/modules/ui-bootstrap/components/Card.jsx b/src/client/modules/common/components/web/ui-bootstrap/components/Card.jsx
similarity index 100%
rename from src/client/modules/ui-bootstrap/components/Card.jsx
rename to src/client/modules/common/components/web/ui-bootstrap/components/Card.jsx
diff --git a/src/client/modules/ui-bootstrap/components/CardGroup.jsx b/src/client/modules/common/components/web/ui-bootstrap/components/CardGroup.jsx
similarity index 100%
rename from src/client/modules/ui-bootstrap/components/CardGroup.jsx
rename to src/client/modules/common/components/web/ui-bootstrap/components/CardGroup.jsx
diff --git a/src/client/modules/ui-bootstrap/components/CardText.jsx b/src/client/modules/common/components/web/ui-bootstrap/components/CardText.jsx
similarity index 100%
rename from src/client/modules/ui-bootstrap/components/CardText.jsx
rename to src/client/modules/common/components/web/ui-bootstrap/components/CardText.jsx
diff --git a/src/client/modules/ui-bootstrap/components/CardTitle.jsx b/src/client/modules/common/components/web/ui-bootstrap/components/CardTitle.jsx
similarity index 100%
rename from src/client/modules/ui-bootstrap/components/CardTitle.jsx
rename to src/client/modules/common/components/web/ui-bootstrap/components/CardTitle.jsx
diff --git a/src/client/modules/ui-bootstrap/components/Col.jsx b/src/client/modules/common/components/web/ui-bootstrap/components/Col.jsx
similarity index 100%
rename from src/client/modules/ui-bootstrap/components/Col.jsx
rename to src/client/modules/common/components/web/ui-bootstrap/components/Col.jsx
diff --git a/src/client/modules/ui-bootstrap/components/Container.jsx b/src/client/modules/common/components/web/ui-bootstrap/components/Container.jsx
similarity index 100%
rename from src/client/modules/ui-bootstrap/components/Container.jsx
rename to src/client/modules/common/components/web/ui-bootstrap/components/Container.jsx
diff --git a/src/client/modules/ui-bootstrap/components/Form.jsx b/src/client/modules/common/components/web/ui-bootstrap/components/Form.jsx
similarity index 100%
rename from src/client/modules/ui-bootstrap/components/Form.jsx
rename to src/client/modules/common/components/web/ui-bootstrap/components/Form.jsx
diff --git a/src/client/modules/ui-bootstrap/components/FormItem.jsx b/src/client/modules/common/components/web/ui-bootstrap/components/FormItem.jsx
similarity index 100%
rename from src/client/modules/ui-bootstrap/components/FormItem.jsx
rename to src/client/modules/common/components/web/ui-bootstrap/components/FormItem.jsx
diff --git a/src/client/modules/ui-bootstrap/components/Input.jsx b/src/client/modules/common/components/web/ui-bootstrap/components/Input.jsx
similarity index 100%
rename from src/client/modules/ui-bootstrap/components/Input.jsx
rename to src/client/modules/common/components/web/ui-bootstrap/components/Input.jsx
diff --git a/src/client/modules/ui-bootstrap/components/Label.jsx b/src/client/modules/common/components/web/ui-bootstrap/components/Label.jsx
similarity index 100%
rename from src/client/modules/ui-bootstrap/components/Label.jsx
rename to src/client/modules/common/components/web/ui-bootstrap/components/Label.jsx
diff --git a/src/client/modules/ui-bootstrap/components/ListGroup.jsx b/src/client/modules/common/components/web/ui-bootstrap/components/ListGroup.jsx
similarity index 100%
rename from src/client/modules/ui-bootstrap/components/ListGroup.jsx
rename to src/client/modules/common/components/web/ui-bootstrap/components/ListGroup.jsx
diff --git a/src/client/modules/ui-bootstrap/components/ListItem.jsx b/src/client/modules/common/components/web/ui-bootstrap/components/ListItem.jsx
similarity index 100%
rename from src/client/modules/ui-bootstrap/components/ListItem.jsx
rename to src/client/modules/common/components/web/ui-bootstrap/components/ListItem.jsx
diff --git a/src/client/modules/ui-bootstrap/components/MenuItem.jsx b/src/client/modules/common/components/web/ui-bootstrap/components/MenuItem.jsx
similarity index 100%
rename from src/client/modules/ui-bootstrap/components/MenuItem.jsx
rename to src/client/modules/common/components/web/ui-bootstrap/components/MenuItem.jsx
diff --git a/src/client/modules/ui-bootstrap/components/NavBar.jsx b/src/client/modules/common/components/web/ui-bootstrap/components/NavBar.jsx
similarity index 86%
rename from src/client/modules/ui-bootstrap/components/NavBar.jsx
rename to src/client/modules/common/components/web/ui-bootstrap/components/NavBar.jsx
index 8c91fdc9b3..94e1ad1229 100644
--- a/src/client/modules/ui-bootstrap/components/NavBar.jsx
+++ b/src/client/modules/common/components/web/ui-bootstrap/components/NavBar.jsx
@@ -2,8 +2,8 @@ import React from 'react';
 import { NavLink } from 'react-router-dom';
 import { Container, Navbar, Nav, NavItem } from 'reactstrap';
 
-import modules from '../../../modules';
-import settings from '../../../../../settings';
+import modules from '../../../../../../modules';
+import settings from '../../../../../../../../settings';
 
 const NavBar = () => (
   <Navbar color="faded" light>
diff --git a/src/client/modules/ui-bootstrap/components/Option.jsx b/src/client/modules/common/components/web/ui-bootstrap/components/Option.jsx
similarity index 100%
rename from src/client/modules/ui-bootstrap/components/Option.jsx
rename to src/client/modules/common/components/web/ui-bootstrap/components/Option.jsx
diff --git a/src/client/modules/ui-bootstrap/components/PageLayout.jsx b/src/client/modules/common/components/web/ui-bootstrap/components/PageLayout.jsx
similarity index 92%
rename from src/client/modules/ui-bootstrap/components/PageLayout.jsx
rename to src/client/modules/common/components/web/ui-bootstrap/components/PageLayout.jsx
index 018bb5e2ae..c252f6b41d 100644
--- a/src/client/modules/ui-bootstrap/components/PageLayout.jsx
+++ b/src/client/modules/common/components/web/ui-bootstrap/components/PageLayout.jsx
@@ -4,7 +4,7 @@ import styled from 'styled-components';
 import { Container } from 'reactstrap';
 
 import NavBar from './NavBar';
-import settings from '../../../../../settings';
+import settings from '../../../../../../../../settings';
 
 const footerHeight = '40px';
 
diff --git a/src/client/modules/ui-bootstrap/components/RenderCheckBox.jsx b/src/client/modules/common/components/web/ui-bootstrap/components/RenderCheckBox.jsx
similarity index 100%
rename from src/client/modules/ui-bootstrap/components/RenderCheckBox.jsx
rename to src/client/modules/common/components/web/ui-bootstrap/components/RenderCheckBox.jsx
diff --git a/src/client/modules/ui-bootstrap/components/RenderField.jsx b/src/client/modules/common/components/web/ui-bootstrap/components/RenderField.jsx
similarity index 100%
rename from src/client/modules/ui-bootstrap/components/RenderField.jsx
rename to src/client/modules/common/components/web/ui-bootstrap/components/RenderField.jsx
diff --git a/src/client/modules/ui-bootstrap/components/RenderSelect.jsx b/src/client/modules/common/components/web/ui-bootstrap/components/RenderSelect.jsx
similarity index 100%
rename from src/client/modules/ui-bootstrap/components/RenderSelect.jsx
rename to src/client/modules/common/components/web/ui-bootstrap/components/RenderSelect.jsx
diff --git a/src/client/modules/ui-bootstrap/components/Row.jsx b/src/client/modules/common/components/web/ui-bootstrap/components/Row.jsx
similarity index 100%
rename from src/client/modules/ui-bootstrap/components/Row.jsx
rename to src/client/modules/common/components/web/ui-bootstrap/components/Row.jsx
diff --git a/src/client/modules/ui-bootstrap/components/Select.jsx b/src/client/modules/common/components/web/ui-bootstrap/components/Select.jsx
similarity index 100%
rename from src/client/modules/ui-bootstrap/components/Select.jsx
rename to src/client/modules/common/components/web/ui-bootstrap/components/Select.jsx
diff --git a/src/client/modules/ui-bootstrap/components/Table.jsx b/src/client/modules/common/components/web/ui-bootstrap/components/Table.jsx
similarity index 100%
rename from src/client/modules/ui-bootstrap/components/Table.jsx
rename to src/client/modules/common/components/web/ui-bootstrap/components/Table.jsx
diff --git a/src/client/modules/ui-bootstrap/components/index.js b/src/client/modules/common/components/web/ui-bootstrap/components/index.js
similarity index 100%
rename from src/client/modules/ui-bootstrap/components/index.js
rename to src/client/modules/common/components/web/ui-bootstrap/components/index.js
diff --git a/src/client/modules/ui-bootstrap/index.jsx b/src/client/modules/common/components/web/ui-bootstrap/index.jsx
similarity index 100%
rename from src/client/modules/ui-bootstrap/index.jsx
rename to src/client/modules/common/components/web/ui-bootstrap/index.jsx
diff --git a/src/client/modules/ui-bootstrap/index.web.js b/src/client/modules/common/components/web/ui-bootstrap/index.web.js
similarity index 69%
rename from src/client/modules/ui-bootstrap/index.web.js
rename to src/client/modules/common/components/web/ui-bootstrap/index.web.js
index 408090f98f..bbc1e1da0b 100644
--- a/src/client/modules/ui-bootstrap/index.web.js
+++ b/src/client/modules/common/components/web/ui-bootstrap/index.web.js
@@ -1,6 +1,6 @@
 import styles from './styles/styles.scss';
 
-import Feature from '../connector';
+import Feature from '../../../../connector';
 
 export default new Feature({
   stylesInsert: styles
diff --git a/src/client/modules/common/components/web/ui-bootstrap/styles/bootstrap.scss b/src/client/modules/common/components/web/ui-bootstrap/styles/bootstrap.scss
new file mode 100644
index 0000000000..7fe75514fb
--- /dev/null
+++ b/src/client/modules/common/components/web/ui-bootstrap/styles/bootstrap.scss
@@ -0,0 +1 @@
+@import '../../../../../../../../node_modules/bootstrap/scss/bootstrap';
diff --git a/src/client/modules/ui-bootstrap/styles/styles.scss b/src/client/modules/common/components/web/ui-bootstrap/styles/styles.scss
similarity index 100%
rename from src/client/modules/ui-bootstrap/styles/styles.scss
rename to src/client/modules/common/components/web/ui-bootstrap/styles/styles.scss
diff --git a/src/client/modules/index.js b/src/client/modules/index.js
index 5643cff05c..126d71bca2 100644
--- a/src/client/modules/index.js
+++ b/src/client/modules/index.js
@@ -4,8 +4,8 @@ import upload from './upload';
 import user from './user';
 import pageNotFound from './pageNotFound';
 import './favicon';
-import ui from './ui-bootstrap';
-//import ui from './ui-antd';
+import ui from './common/components/web/ui-bootstrap';
+//import ui from './common/components/web/ui-antd';
 
 import Feature from './connector';
 
diff --git a/src/client/modules/ui-antd/styles/antd.less b/src/client/modules/ui-antd/styles/antd.less
deleted file mode 100644
index 05c25ff2c9..0000000000
--- a/src/client/modules/ui-antd/styles/antd.less
+++ /dev/null
@@ -1 +0,0 @@
-@import '../../../../../node_modules/antd/dist/antd';
\ No newline at end of file
diff --git a/src/client/modules/ui-bootstrap/styles/bootstrap.scss b/src/client/modules/ui-bootstrap/styles/bootstrap.scss
deleted file mode 100644
index 4936aca6f3..0000000000
--- a/src/client/modules/ui-bootstrap/styles/bootstrap.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import '../../../../../node_modules/bootstrap/scss/bootstrap';

From 634754e9863213e8031fe9a65dbc98c5ece7666c Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 29 Nov 2017 13:20:13 +0100
Subject: [PATCH 040/327] add docs

---
 README.md | 511 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 278 insertions(+), 233 deletions(-)

diff --git a/README.md b/README.md
index 8f5e26532d..6e26c974c7 100644
--- a/README.md
+++ b/README.md
@@ -2,110 +2,124 @@
 
 ## Apollo v2 GraphQL app Starter Kit for Mobile, Web and Server with Webpack used for every platform to enable max code reuse
 
-If you are using Apollo v1 please use [starter kit from `apollo1` branch](https://github.com/sysgears/apollo-universal-starter-kit/tree/apollo1)
+If you are using Apollo v1 please use
+[starter kit from `apollo1` branch](https://github.com/sysgears/apollo-universal-starter-kit/tree/apollo1)
 
-[![Backers on Open Collective](https://opencollective.com/apollo-universal-starter-kit/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/apollo-universal-starter-kit/sponsors/badge.svg)](#sponsors) [![Join the chat at https://gitter.im/sysgears/apollo-fullstack-starter-kit](https://badges.gitter.im/sysgears/apollo-fullstack-starter-kit.svg)](https://gitter.im/sysgears/apollo-fullstack-starter-kit?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Backers on Open Collective](https://opencollective.com/apollo-universal-starter-kit/backers/badge.svg)](#backers)
+[![Sponsors on Open Collective](https://opencollective.com/apollo-universal-starter-kit/sponsors/badge.svg)](#sponsors)
+[![Join the chat at https://gitter.im/sysgears/apollo-fullstack-starter-kit](https://badges.gitter.im/sysgears/apollo-fullstack-starter-kit.svg)](https://gitter.im/sysgears/apollo-fullstack-starter-kit?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![All Contributors](https://img.shields.io/badge/all_contributors-12-orange.svg?style=flat-square)](#contributors)
 [![Build Status](https://travis-ci.org/sysgears/apollo-universal-starter-kit.svg?branch=master)](https://travis-ci.org/sysgears/apollo-universal-starter-kit)
 [![Greenkeeper badge](https://badges.greenkeeper.io/sysgears/apollo-universal-starter-kit.svg)](https://greenkeeper.io/)
 [![Twitter Follow](https://img.shields.io/twitter/follow/sysgears.svg?style=social)](https://twitter.com/sysgears)
 
-> Apollo Universal Starter Kit is a SEO friendly boilerplate for [Universal] Mobile and Web app development 
-> built on top of [Apollo], [GraphQL], [React 16], [React Native], [Expo], [Redux], [Express] with
-> SQL storage support [Twitter Bootstrap] and [Ant Design] integration. Hot Code Reload of back end & front end using [Webpack] and 
+> Apollo Universal Starter Kit is a SEO friendly boilerplate for [Universal] Mobile and Web app development built on top
+> of [Apollo], [GraphQL], [React 16], [React Native], [Expo], [Redux], [Express] with SQL storage support, [Twitter > >
+> > Bootstrap], [Native Base] and [Ant Design] integration. Hot Code Reload of back end & front end using [Webpack] and
 > Hot Module Replacement to reflect your changes instantly and help you stay productive.
 
 ## Hot Code Reload demo
+
 ![screencast](https://user-images.githubusercontent.com/1259926/27387579-c6799ada-56a1-11e7-93fc-d08e9970640d.gif)
 
 ## Mobile app demo
+
 Checkout our [Mobile App Demo](https://expo.io/@sysgears/apollo-universal-starter-kit)
 
 ## Getting Started
 
 1. Clone starter kit locally.
 
-  ```
-  git clone https://github.com/sysgears/apollo-universal-starter-kit.git
-  cd apollo-universal-starter-kit
-  ```
+```
+git clone https://github.com/sysgears/apollo-universal-starter-kit.git
+cd apollo-universal-starter-kit
+```
 
 2. Install dependencies.
 
-  ```
-  yarn
-  ```
+```
+yarn
+```
 
 3. Seed sample database data.
 
-  ```
-  yarn seed
-  ```
+```
+yarn seed
+```
 
 4. Run starter kit in development mode.
 
-  ```
-  yarn watch
-  ```
+```
+yarn watch
+```
 
 6. You browser will open the web application automatically with web app in a new tab.
 7. Change any app code and see the changes applied immediately!
-8. Open app in multiple tabs, try to increase counter or add a new post/comment in one tab and then switch to another tab. You will see that
-counter value and post/comment are updated there as well, because the application is live updated via subscriptions.
+8. Open app in multiple tabs, try to increase counter or add a new post/comment in one tab and then switch to another
+   tab. You will see that counter value and post/comment are updated there as well, because the application is live
+   updated via subscriptions.
 
 ### Getting Started with React Native
-This starter kit adds full [React Native] integration, with [Webpack] as a packager and [Expo]. 
-No native code compilation tools are needed in order to develop native mobile applications with this kit.
-You are able to run both web and mobile versions of your app at the same time connected to the same backend.
+
+This starter kit adds full [React Native] integration, with [Webpack] as a packager and [Expo]. No native code
+compilation tools are needed in order to develop native mobile applications with this kit. You are able to run both web
+and mobile versions of your app at the same time connected to the same backend.
 
 For running Android or iOS you need to set in `.spinrc` `builders.ios.enabled` and/or `builders.android.enabled` field
- `true`.
+`true`.
 
 #### Running on a device
-You need to install [Expo] app on your Android or iOS device and then you can scan the QR shown in the terminal, 
-to start the app on your device.
+
+You need to install [Expo] app on your Android or iOS device and then you can scan the QR shown in the terminal, to
+start the app on your device.
 
 #### Running in a simulator
 
 ##### Android
 
-Download and install [Android Studio] and configure virtual phone via `Tools -> Android -> AVD Manager`. Choose Lollipop x86_64 API for your Phone, it is the lowest x86_64 API (because it is x86_64 emulator will work really fast). Make sure that you add `~/Android/Sdk/platform-tools` folder that has `adb` added into `PATH` environment variable, so that Expo inside this kit used `adb` instance from `Android SDK`.
+Download and install [Android Studio] and configure virtual phone via `Tools -> Android -> AVD Manager`. Choose Lollipop
+x86_64 API for your Phone, it is the lowest x86_64 API (because it is x86_64 emulator will work really fast). Make sure
+that you add `~/Android/Sdk/platform-tools` folder that has `adb` added into `PATH` environment variable, so that Expo
+inside this kit used `adb` instance from `Android SDK`.
 
-Then launch your virtual phone and launch starter kit after that via `yarn watch`. After starting, Expo app should start on it's own.
+Then launch your virtual phone and launch starter kit after that via `yarn watch`. After starting, Expo app should start
+on it's own.
 
-You can also use [Genymotion]. After downloading and installing you might need to install VirtualBox unless you already have it.
-Create a new emulator and start it. After starting the server Expo app should start on it's own.
-To bring up the developer menu press ⌘+M.
+You can also use [Genymotion]. After downloading and installing you might need to install VirtualBox unless you already
+have it. Create a new emulator and start it. After starting the server Expo app should start on it's own. To bring up
+the developer menu press ⌘+M.
 
 ##### iOS
-You need to install [Xcode]. Then install Command Line Tools by running `xcode-select --install`.
-Next, open up Xcode, go to preferences and click the Components tab, install a simulator from the list.
-After the installation if you run the server, simulator should start on it's own and open the app in Expo.
-To bring up the developer menu press ⌘+D.
 
-Note: If iOS simulator fail to start expo client or the app: Try to reset the simulator in `Hardware -> Erase all content and settings` and restart the application.
+You need to install [Xcode]. Then install Command Line Tools by running `xcode-select --install`. Next, open up Xcode,
+go to preferences and click the Components tab, install a simulator from the list. After the installation if you run the
+server, simulator should start on it's own and open the app in Expo. To bring up the developer menu press ⌘+D.
+
+Note: If iOS simulator fail to start expo client or the app: Try to reset the simulator in `Hardware -> Erase all
+content and settings` and restart the application.
 
 ## Support
 
 ### Community support
 
-- [Gitter channel] - questions, answers, general discussions
-- [GitHub issues] - submit issues, send feature requests
+* [Gitter channel] - questions, answers, general discussions
+* [GitHub issues] - submit issues, send feature requests
 
 ### Commercial support
 
-[SysGears](https://sysgears.com) team provides advanced support for commercial partners. A commercial partner will have a premium access to our
-team whether this is to help you with your code based on this starter kit or related technologies used in the kit. Contact
-us using [Skype](http://hatscripts.com/addskype?sysgears) or via email: [info@sysgears.com](mailto:info@sysgears.com)
+[SysGears](https://sysgears.com) team provides advanced support for commercial partners. A commercial partner will have
+a premium access to our team whether this is to help you with your code based on this starter kit or related
+technologies used in the kit. Contact us using [Skype](http://hatscripts.com/addskype?sysgears) or via email:
+[info@sysgears.com](mailto:info@sysgears.com)
 
 #### Writing the code
-This starter kit is designed so you can use it for just web, mobile or projects using both together. 
-In case you do not want to use mobile, just set both `builders.ios.enabled` or `builders.android.enabled` 
-settings in `.spinrc` to `false`.
+
+This starter kit is designed so you can use it for just web, mobile or projects using both together. In case you do not
+want to use mobile, just set both `builders.ios.enabled` or `builders.android.enabled` settings in `.spinrc` to `false`.
 
 We have integrated [React Native Web], so writing `universal` components that can run both on web and mobile platforms
-is possible. In this case you can write your components with React Native's building blocks that are supported in
-[React Native Web] and run them both on web and mobile.
+is possible. In this case you can write your components with React Native's building blocks that are supported in [React
+Native Web] and run them both on web and mobile.
 
 To cover more differences you can use platform-specific files.
 
@@ -115,193 +129,217 @@ MyComponent.android.jsx
 MyComponent.ios.jsx
 ```
 
-In case you only want to use it for `web` and do not intend to later add `mobile` version, you can omit `.web.jsx` extension
-and just use `MyComponent.jsx`. Same applies if you just wish to use it for `mobile`.
+In case you only want to use it for `web` and do not intend to later add `mobile` version, you can omit `.web.jsx`
+extension and just use `MyComponent.jsx`. Same applies if you just wish to use it for `mobile`.
 
-Currently `counter` example is implemented to support web and mobile version. If you want to try running `CounterView.jsx`
-as `universal` component, just delete or rename `CounterView.web.jsx` and you can see how the same component can be used 
-for both web and mobile.
+Currently `counter` example is implemented to support web and mobile version. If you want to try running
+`CounterView.jsx` as `universal` component, just delete or rename `CounterView.web.jsx` and you can see how the same
+component can be used for both web and mobile.
 
 #### Known issues
-Currently we do not yet support persisted queries. This can be used in this starter kit currently only for web, but it is
-planed in the future.
+
+Currently we do not yet support persisted queries. This can be used in this starter kit currently only for web, but it
+is planed in the future.
 
 ### Using with Docker
-Get latest Docker and Docker Compose:  
-https://www.docker.com/  
-https://docs.docker.com/compose/
+
+Get latest Docker and Docker Compose: https://www.docker.com/ https://docs.docker.com/compose/
 
 #### Starting Docker container for Development
+
 To run starter kit in development mode with hot code reload execute:
-  ```
-  docker-compose up
-  ```
-, then open URL `http://localhost:3000` in web browser 
-or open URL `exp://localhost:19001` in Expo Client Explore section (tap magnifier, enter URL, then tap it below).
-In case if you want to open the app on the phone use LAN IP of your development machine instead of `localhost` 
-in Expo Client (QR code scanning will not work, because QR code will have address of Docker container).
+
+```
+docker-compose up
+```
+
+, then open URL `http://localhost:3000` in web browser or open URL `exp://localhost:19001` in Expo Client Explore
+section (tap magnifier, enter URL, then tap it below). In case if you want to open the app on the phone use LAN IP of
+your development machine instead of `localhost` in Expo Client (QR code scanning will not work, because QR code will
+have address of Docker container).
 
 #### Starting Docker container for Production
+
 To run starter kit in production mode execute:
-  ```
-  docker-compose -f docker-compose.prod.yml up
-  ```
+
+```
+docker-compose -f docker-compose.prod.yml up
+```
+
 , then open URL `http://localhost:3000` in web browser.
 
 ### Configuring starter kit
+
 This starter kit supplies boilerplate code for multiple platforms:
-- Node.js backend
-- Web frontend
-- Android frontend
-- iOS frontend
-
-If you don't need some of these platforms you can turn off building their code in `.spinrc` file as well as edit 
-other build properties described below:
-
-|Option                    |Description|
-|--------------------------|-----------|
-|backendBuildDir|output directory for backend files|
-|frontendBuildDir|output directory for frontend files| 
-|dllBuildDir|output directory for Webpack DLL files used to speed up incremental builds|
-|webpackDevPort|the local port used for Webpack Dev Server process to host web frontend files|
-|backendUrl|URL to GraphQL backend endpoint|
-|ssr|Use server side rendering in backend| 
-|webpackDll|Utilize Webpack DLLs to speed up incremental builds|
-|frontendRefreshOnBackendChange|Trigger web frontend refresh when backend code changes|
-|reactHotLoader|Utilize React Hot Loader v3|
-|persistGraphQL|Generate and use persistent GraphQL queries|
+
+* Node.js backend
+* Web frontend
+* Android frontend
+* iOS frontend
+
+If you don't need some of these platforms you can turn off building their code in `.spinrc` file as well as edit other
+build properties described below:
+
+| Option                         | Description                                                                   |
+| ------------------------------ | ----------------------------------------------------------------------------- |
+| backendBuildDir                | output directory for backend files                                            |
+| frontendBuildDir               | output directory for frontend files                                           |
+| dllBuildDir                    | output directory for Webpack DLL files used to speed up incremental builds    |
+| webpackDevPort                 | the local port used for Webpack Dev Server process to host web frontend files |
+| backendUrl                     | URL to GraphQL backend endpoint                                               |
+| ssr                            | Use server side rendering in backend                                          |
+| webpackDll                     | Utilize Webpack DLLs to speed up incremental builds                           |
+| frontendRefreshOnBackendChange | Trigger web frontend refresh when backend code changes                        |
+| reactHotLoader                 | Utilize React Hot Loader v3                                                   |
+| persistGraphQL                 | Generate and use persistent GraphQL queries                                   |
 
 There are also application config options available in `app.json` to aid with debugging GraphQL and SQL:
 
-|Option                    |Description|
-|--------------------------|-----------|
-|debugSQL|Print executed by backend SQL commands|
-|apolloLogging|Log all Apollo GraphQL operations|
+| Option        | Description                            |
+| ------------- | -------------------------------------- |
+| debugSQL      | Print executed by backend SQL commands |
+| apolloLogging | Log all Apollo GraphQL operations      |
 
 ### Feature Modules Scaffolding with CLI
 
-This starter kit encourages modular design of application features. 
-Each feature should be designed as a decoupled module, deleting feature should ideally not break the remaining application.
-Basic feature module scaffolding is provided with the following command:
+This starter kit encourages modular design of application features. Each feature should be designed as a decoupled
+module, deleting feature should ideally not break the remaining application. Basic feature module scaffolding is
+provided with the following command:
+
 ```
 yarn cli addmodule <moduleName>
 ```
-This will create all the necessary files to start developing on a new feature module. It creates `client` and `server` module.
-If you would like to only add one or the other, add a second parameter like:
+
+This will create all the necessary files to start developing on a new feature module. It creates `client` and `server`
+module. If you would like to only add one or the other, add a second parameter like:
+
 ```
 yarn cli addmodule <moduleName> [client|server]
 ```
+
 If you wish to remove an existing module, do so with:
+
 ```
 yarn cli deletemodule <moduleName>
 ```
-Again you can specify `client` or `server` as a second parameter, if you only wish to delete one or the other. 
 
-This way you can easily delete existing examples, like `counter`, `post` or `user`. Do keep in mind that you need at least one
-module linked on the server side. So deleting both, before creating any new ones first, will result in
+Again you can specify `client` or `server` as a second parameter, if you only wish to delete one or the other.
+
+This way you can easily delete existing examples, like `counter`, `post` or `user`. Do keep in mind that you need at
+least one module linked on the server side. So deleting both, before creating any new ones first, will result in
 `TypeError: Cannot read property 'schema' of undefined` on the server side.
 
 Run the following command to see the CLI help:
+
 ```
 yarn cli
 ```
- 
-## Features and examples included 
 
-- Full LOGIN funcionality in user example with [JWT] tokens stored in `localStorage` and `cookies`
+## Features and examples included
+
+* Full LOGIN funcionality in user example with [JWT] tokens stored in `localStorage` and `cookies`
 
-- [GraphQL] API
+* [GraphQL] API
 
-  GraphQL is used as very flexible and much faster API in terms of bandwidth and round-trips, compared to REST.
-GraphQL requests are batched together automatically by [Apollo]
+  GraphQL is used as very flexible and much faster API in terms of bandwidth and round-trips, compared to REST. GraphQL
+  requests are batched together automatically by [Apollo]
 
-- [GraphQL] subscriptions example
+* [GraphQL] subscriptions example
 
   Full CRUD functionality with Counter updating and Subscriptions in Posts and Comments example, with [ReduxForm]
 
-- [GraphQL Cursor Pagination] Example of  [Relay-style cursor pagination]
+* [GraphQL Cursor Pagination] Example of [Relay-style cursor pagination]
 
-- [Dataloader] for loading comments in post example
+* [Dataloader] for loading comments in post example
 
-- Declarative/dynamic `head` section, using [React Helmet]
+* Declarative/dynamic `head` section, using [React Helmet]
 
-- Google Analytics integration using [React GA]
+* Google Analytics integration using [React GA]
 
-- [Webpack] for back end
+* [Webpack] for back end
 
   This starter kit is different from most of the starter kits out there, because it uses Webpack not only for front end,
-but for back-end code as well. This enables powerful Webpack features for back-end code, such as conditional compilation,
-embedding non-js files and CSS stylesheets into the code, hot code reload, etc. 
+  but for back-end code as well. This enables powerful Webpack features for back-end code, such as conditional
+  compilation, embedding non-js files and CSS stylesheets into the code, hot code reload, etc.
 
-- [Webpack] and [Expo] for mobile front-end
+* [Webpack] and [Expo] for mobile front-end
 
-  For the best code sharing support between back-end, web front-end and mobile front-end the Webpack is used to build 
-React Native JavaScript bundles with the help of using [Haul] project parts. Resulting React Native JavaScript bundles
-use [Expo], so no native code compilation tools are needed in order to develop native mobile applications with this kit.
+  For the best code sharing support between back-end, web front-end and mobile front-end the Webpack is used to build
+  React Native JavaScript bundles with the help of using [Haul] project parts. Resulting React Native JavaScript bundles
+  use [Expo], so no native code compilation tools are needed in order to develop native mobile applications with this
+  kit.
 
-- Hot Code Reload for back end and front end
+* Hot Code Reload for back end and front end
 
-  Hot Code Reload for back end is done using [Webpack]. When Webpack prepares hot patches on the filesystem,
-SIGUSR2 signal is sent to Node.js app and embedded Webpack Hot Module Runtime reacts to this signal and
-applies patches to running modules from filesystem. Hot code reload for front end is using Webpack Dev Server
-and Hot Module Replacement to apply patches to front-end code. Hot patches for React components are applied on the
-front end and back end at the same time, so React should not complain about differences in client and server code.
+  Hot Code Reload for back end is done using [Webpack]. When Webpack prepares hot patches on the filesystem, SIGUSR2
+  signal is sent to Node.js app and embedded Webpack Hot Module Runtime reacts to this signal and applies patches to
+  running modules from filesystem. Hot code reload for front end is using Webpack Dev Server and Hot Module Replacement
+  to apply patches to front-end code. Hot patches for React components are applied on the front end and back end at the
+  same time, so React should not complain about differences in client and server code.
 
-- Webpack DLL vendor bundle generation and updating out of the box
+* Webpack DLL vendor bundle generation and updating out of the box
 
-  For all the non-development dependencies of project `package.json` the [Webpack] vendor DLL bundle is generated
-  and updated automatically, so that Webpack didn't process vendor libraries on each change to the project, but only
-  when they are actually changed. This boosts speed of cold project start in development mode and speed of hot code reload
+  For all the non-development dependencies of project `package.json` the [Webpack] vendor DLL bundle is generated and
+  updated automatically, so that Webpack didn't process vendor libraries on each change to the project, but only when
+  they are actually changed. This boosts speed of cold project start in development mode and speed of hot code reload
   even if the number of dependencies is huge.
 
-- Server Side Rendering with Apollo Redux Store sync
+* Server Side Rendering with Apollo Redux Store sync
 
-  On the initial web page request back end fully renders UI and hands off Apollo Redux Store state to front end. Frontend
-then starts off from there and updates itself on user interactions.
+  On the initial web page request back end fully renders UI and hands off Apollo Redux Store state to front end.
+  Frontend then starts off from there and updates itself on user interactions.
 
   If you don't need Server Side Rendering, set `app.json` `ssr` field to `false`
 
-- Optimistic UI updates
+* Optimistic UI updates
 
-  This example application uses Apollo optimistic UI updates, that result in immediate UI update on user interaction and then,
-after data arrives from the server, UI state is finalized.
+  This example application uses Apollo optimistic UI updates, that result in immediate UI update on user interaction and
+  then, after data arrives from the server, UI state is finalized.
 
-- SQL and arbitrary data sources support
+* SQL and arbitrary data sources support
 
   [Knex] code to access SQLite is included as an example of using arbitrary data source with [Apollo] and [GraphQL].
-NoSQL storage or any other data source can be used the same way.
+  NoSQL storage or any other data source can be used the same way.
 
-  [Debug SQL] Prints out execuded queries, with respective times in development mode and can be set in `app.json` by `debugSQL` field `true`
+  [Debug SQL] Prints out execuded queries, with respective times in development mode and can be set in `app.json` by
+  `debugSQL` field `true`
 
-- Powerful stylesheets with Hot Reloading
+* Powerful stylesheets with Hot Reloading
 
-  [Twitter Bootstrap] in form of SASS stylesheets is used for styling demo application. Application has stylesheet
-in `styles.scss` for global styling which is Hot Reloaded on change. React components styling is done by [Styled Components].
+  [Twitter Bootstrap] in form of SASS stylesheets is used for styling demo application. Application has stylesheet in
+  `styles.scss` for global styling which is Hot Reloaded on change. React components styling is done by [Styled
+  Components].
 
-  If you would like to use a different styling than [Twitter Bootstrap], UI components are structured in a way to make it easy to
-  use something else. We already prepared [Ant Design] integation. To switch the UI all you need to do is change the module import in 
-  `src/client/modules/index.js` and rename the import in `src/client/modules/common/components/web/index.jsx`.
+  If you would like to use a different styling than [Twitter Bootstrap], UI components are structured in a way to make
+  it easy to use something else. We already prepared [Ant Design] integation. To switch the UI all you need to do is
+  change the module import in `src/client/modules/index.js` and rename the import in
+  `src/client/modules/common/components/web/index.jsx`.
 
-- [Babel] for ES2017 transpiling
+  [Native Base] for mobile styling, with an option to use [Ant Design Mobile]. To switch, just change the export in
+  `src/client/modules/common/components/native/index.jsx`.
 
-- [ESLint] to enforce proper code style
+* [Babel] for ES2017 transpiling
 
-- [React Hot Loader v3] for the sake of completeness this project also supports `React Hot Loader v3`, but it is turned off.
-By default this starter kit uses pure `Webpack HMR` for all hot reloading purposes and we think it covers all
-practical needs during development and using `React Hot Loader v3` in addition to `Webpack HMR` makes hot reloading less
-predictable and buggy. To turn `React Hot Loader v3` on: set `reactHotLoader` field of `app.json` to `true`. 
+* [ESLint] to enforce proper code style
 
-- [PersistGraphQL Webpack Plugin] is a tool to gather static GraphQL queries for GraphQL projects and inject them into build.
-It will make front end and back end aware of static queries used in the project and will only allow these queries
-for better security and less bandwidth. 
+* [React Hot Loader v3] for the sake of completeness this project also supports `React Hot Loader v3`, but it is turned
+  off. By default this starter kit uses pure `Webpack HMR` for all hot reloading purposes and we think it covers all
+  practical needs during development and using `React Hot Loader v3` in addition to `Webpack HMR` makes hot reloading
+  less predictable and buggy. To turn `React Hot Loader v3` on: set `reactHotLoader` field of `app.json` to `true`.
 
-- [TypeScript] support. Though the kit itself uses ES6 and [Flow] you can add source files written in TypeScript. 
-In order to do that add `'ts'` into the `.spinrc.json -> options -> stack`,
-install TypeScript devDependencies: `yarn add -D awesome-typescript-loader typescript` and put `tsconfig.json` into the root folder.
+* [PersistGraphQL Webpack Plugin] is a tool to gather static GraphQL queries for GraphQL projects and inject them into
+  build. It will make front end and back end aware of static queries used in the project and will only allow these
+  queries for better security and less bandwidth.
+
+* [TypeScript] support. Though the kit itself uses ES6 and [Flow] you can add source files written in TypeScript. In
+  order to do that add `'ts'` into the `.spinrc.json -> options -> stack`, install TypeScript devDependencies: `yarn add
+  -D awesome-typescript-loader typescript` and put `tsconfig.json` into the root folder.
 
 ## Project Structure
 
-The project structure presented in this boilerplate is **fractal**, where functionality is grouped primarily by feature rather than file type. This structure is only meant to serve as a guide, it is by no means prescriptive. That said, it aims to represent generally accepted guidelines and patterns for building scalable applications.
+The project structure presented in this boilerplate is **fractal**, where functionality is grouped primarily by feature
+rather than file type. This structure is only meant to serve as a guide, it is by no means prescriptive. That said, it
+aims to represent generally accepted guidelines and patterns for building scalable applications.
 
 ```
 .
@@ -335,74 +373,80 @@ The project structure presented in this boilerplate is **fractal**, where functi
 
 While developing, you will probably rely mostly on `yarn watch`; however, there are additional scripts at your disposal:
 
-|`npm run or yarn <script>`|Description|
-|--------------------------|-----------|
-|`watch`|Run your app in development mode and watch your changes. Hot code reload will be enabled in development.|
-|`start`|Run your app in production mode.|
-|`build`|Compiles the application to the build folder.|
-|`tests`|Runs unit tests with Mocha.|
-|`tests:watch`|Runs unit tests with Mocha and watches for changes automatically to re-run tests.|
-|`test`|Runs unit tests with Mocha and check for lint errors|
-|`lint`|Check for lint errors and runs for all `.js` and `.jsx` files.|
-|`seed`|Seed sample database using SQLite. Use `--prod` flag to run in "production" mode.|
-|`migrate`|Migrate the sample database|
-|`rollback`|Rollback the sample database to previous state.|
-|`cli`|CLI tool, currently used for modules scaffolding only.|
+| `npm run or yarn <script>` | Description                                                                                              |
+| -------------------------- | -------------------------------------------------------------------------------------------------------- |
+| `watch`                    | Run your app in development mode and watch your changes. Hot code reload will be enabled in development. |
+| `start`                    | Run your app in production mode.                                                                         |
+| `build`                    | Compiles the application to the build folder.                                                            |
+| `tests`                    | Runs unit tests with Mocha.                                                                              |
+| `tests:watch`              | Runs unit tests with Mocha and watches for changes automatically to re-run tests.                        |
+| `test`                     | Runs unit tests with Mocha and check for lint errors                                                     |
+| `lint`                     | Check for lint errors and runs for all `.js` and `.jsx` files.                                           |
+| `seed`                     | Seed sample database using SQLite. Use `--prod` flag to run in "production" mode.                        |
+| `migrate`                  | Migrate the sample database                                                                              |
+| `rollback`                 | Rollback the sample database to previous state.                                                          |
+| `cli`                      | CLI tool, currently used for modules scaffolding only.                                                   |
 
 ## Deployment to Production
 
 ### Deploying to Linux running Node.js
+
 1. Clone starter kit locally.
 
-  ```
-  git clone https://github.com/sysgears/apollo-universal-starter-kit.git
-  cd apollo-universal-starter-kit
-  ```
+```
+git clone https://github.com/sysgears/apollo-universal-starter-kit.git
+cd apollo-universal-starter-kit
+```
 
 2. Install dependencies.
 
-  ```
-  yarn
-  ```
+```
+yarn
+```
+
 3. Seed production database data.
 
-  ```
-  NODE_ENV=production yarn seed
-  ```
+```
+NODE_ENV=production yarn seed
+```
 
 5. Compile project.
 
-  ```
-  yarn build
-  ```
+```
+yarn build
+```
 
 6. Run project in production mode.
 
-  ```
-  yarn start
-  ```
+```
+yarn start
+```
 
 ### Publishing mobile apps
+
 1. Compile project for production with `ios` and `android` set to `true` in `app.json` via `yarn build`.
 2. Run `yarn exp publish` to publish, the URL like:
-[``https://exp.host/@vlasenko/apollo-universal-starter-kit``](https://exp.host/@vlasenko/apollo-universal-starter-kit)
-where your users can access mobile app from Expo Client will be printed in terminal.
+   [`https://exp.host/@vlasenko/apollo-universal-starter-kit`](https://exp.host/@vlasenko/apollo-universal-starter-kit)
+   where your users can access mobile app from Expo Client will be printed in terminal.
 
 ### Building standalone mobile apps for Play Store and App Store
+
 1. Compile project for production with `ios` and `android` set to `true` in `app.json` via `yarn build`.
 2. Run `yarn exp ba` to launch building signed `.apk` or `yarn exp bi` for signed `.iap`.
-3. Run `yarn exp bs` to get status and links for signed standalone mobile applications when build finishes.
-For more details refer to [Expo Build standalone apps documentation], but use `yarn exp ..` instead of `exp ...` command.
+3. Run `yarn exp bs` to get status and links for signed standalone mobile applications when build finishes. For more
+   details refer to [Expo Build standalone apps documentation], but use `yarn exp ..` instead of `exp ...` command.
 
 ### Deploying to [Heroku]
+
 1. Add your app to Heroku
-1. Allow Heroku to install build time dependencies from the devDependencies in `package.json`:
-   `Settings -> Config Variables -> Add`, KEY: `NPM_CONFIG_PRODUCTION`, VALUE: `false`.
-1. Add `EXP_USERNAME` and `EXP_PASSWORD` config variables there as well. They will be used to publish
-mobile Expo Client applications
+1. Allow Heroku to install build time dependencies from the devDependencies in `package.json`: `Settings -> Config
+   Variables -> Add`, KEY: `NPM_CONFIG_PRODUCTION`, VALUE: `false`.
+1. Add `EXP_USERNAME` and `EXP_PASSWORD` config variables there as well. They will be used to publish mobile Expo Client
+   applications
 1. Deploy your app on Heroku
 
 ### Heroku Demo
+
 You can see latest version of this app deployed to Heroku here:
 [https://apollo-universal-starter-kit.herokuapp.com](https://apollo-universal-starter-kit.herokuapp.com)
 
@@ -418,10 +462,10 @@ Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com
 
 <a href="https://opencollective.com/apollo-universal-starter-kit#backers" target="_blank"><img src="https://opencollective.com/apollo-universal-starter-kit/backers.svg?width=890"></a>
 
-
 ## Sponsors
 
-Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/apollo-universal-starter-kit#sponsor)]
+Support this project by becoming a sponsor. Your logo will show up here with a link to your website.
+[[Become a sponsor](https://opencollective.com/apollo-universal-starter-kit#sponsor)]
 
 <a href="https://opencollective.com/apollo-universal-starter-kit/sponsor/0/website" target="_blank"><img src="https://opencollective.com/apollo-universal-starter-kit/sponsor/0/avatar.svg"></a>
 <a href="https://opencollective.com/apollo-universal-starter-kit/sponsor/1/website" target="_blank"><img src="https://opencollective.com/apollo-universal-starter-kit/sponsor/1/avatar.svg"></a>
@@ -434,46 +478,47 @@ Support this project by becoming a sponsor. Your logo will show up here with a l
 <a href="https://opencollective.com/apollo-universal-starter-kit/sponsor/8/website" target="_blank"><img src="https://opencollective.com/apollo-universal-starter-kit/sponsor/8/avatar.svg"></a>
 <a href="https://opencollective.com/apollo-universal-starter-kit/sponsor/9/website" target="_blank"><img src="https://opencollective.com/apollo-universal-starter-kit/sponsor/9/avatar.svg"></a>
 
-
-
 ## License
+
 Copyright © 2016, 2017 [SysGears INC]. This source code is licensed under the [MIT] license.
 
-[MIT]: LICENSE
-[Universal]: https://medium.com/@mjackson/universal-javascript-4761051b7ae9
-[Apollo]: http://www.apollostack.com
-[GraphQL]: http://graphql.org
-[React 16]: https://facebook.github.io/react
-[React Hot Loader v3]: https://github.com/gaearon/react-hot-loader
-[Redux]: http://redux.js.org
-[ReduxForm]: http://redux-form.com
-[Express]: http://expressjs.com
-[Twitter Bootstrap]: http://getbootstrap.com
-[Ant Design]: https://ant.design
-[Webpack]: http://webpack.github.io
-[Babel]: http://babeljs.io
-[Styled Components]: https://www.styled-components.com
-[Knex]: http://knexjs.org
-[Debug SQL]: https://spin.atomicobject.com/2017/03/27/timing-queries-knexjs-nodejs/
-[Expo Build standalone apps documentation]: https://docs.expo.io/versions/v18.0.0/guides/building-standalone-apps.html
-[Heroku]: https://heroku.com
-[ESLint]: http://eslint.org
-[SysGears INC]: http://sysgears.com
-[PersistGraphQL Webpack Plugin]: https://github.com/sysgears/persistgraphql-webpack-plugin
-[Dataloader]: https://github.com/facebook/dataloader
-[GraphQL Cursor Pagination]: https://medium.com/@gethylgeorge/infinite-scrolling-in-react-using-apollo-and-react-virtualized-graphql-cursor-pagination-bf80617a8a1a#.jkmmu9qz8
-[Relay-style cursor pagination]: http://dev.apollodata.com/react/pagination.html#relay-cursors
-[React Helmet]: https://github.com/nfl/react-helmet
-[React GA]: https://github.com/react-ga/react-ga
-[Haul]: https://github.com/callstack-io/haul
-[React Native]: https://github.com/facebook/react-native
-[React Native Web]: https://github.com/necolas/react-native-web
-[Expo]: https://expo.io
-[Genymotion]: https://www.genymotion.com
-[Xcode]: https://developer.apple.com/xcode/
-[Android Studio]: https://developer.android.com/studio/index.html
-[JWT]: https://jwt.io
-[Gitter channel]: https://gitter.im/sysgears/apollo-fullstack-starter-kit
-[GitHub issues]: https://github.com/sysgears/apollo-universal-starter-kit/issues
-[Flow]: https://flow.org
-[TypeScript]: https://www.typescriptlang.org
+[mit]: LICENSE
+[universal]: https://medium.com/@mjackson/universal-javascript-4761051b7ae9
+[apollo]: http://www.apollostack.com
+[graphql]: http://graphql.org
+[react 16]: https://facebook.github.io/react
+[react hot loader v3]: https://github.com/gaearon/react-hot-loader
+[redux]: http://redux.js.org
+[reduxform]: http://redux-form.com
+[express]: http://expressjs.com
+[twitter bootstrap]: http://getbootstrap.com
+[nativebase]: https://nativebase.io
+[ant design]: https://ant.design
+[ant design mobile]: https://mobile.ant.design
+[webpack]: http://webpack.github.io
+[babel]: http://babeljs.io
+[styled components]: https://www.styled-components.com
+[knex]: http://knexjs.org
+[debug sql]: https://spin.atomicobject.com/2017/03/27/timing-queries-knexjs-nodejs/
+[expo build standalone apps documentation]: https://docs.expo.io/versions/v18.0.0/guides/building-standalone-apps.html
+[heroku]: https://heroku.com
+[eslint]: http://eslint.org
+[sysgears inc]: http://sysgears.com
+[persistgraphql webpack plugin]: https://github.com/sysgears/persistgraphql-webpack-plugin
+[dataloader]: https://github.com/facebook/dataloader
+[graphql cursor pagination]: https://medium.com/@gethylgeorge/infinite-scrolling-in-react-using-apollo-and-react-virtualized-graphql-cursor-pagination-bf80617a8a1a#.jkmmu9qz8
+[relay-style cursor pagination]: http://dev.apollodata.com/react/pagination.html#relay-cursors
+[react helmet]: https://github.com/nfl/react-helmet
+[react ga]: https://github.com/react-ga/react-ga
+[haul]: https://github.com/callstack-io/haul
+[react native]: https://github.com/facebook/react-native
+[react native web]: https://github.com/necolas/react-native-web
+[expo]: https://expo.io
+[genymotion]: https://www.genymotion.com
+[xcode]: https://developer.apple.com/xcode/
+[android studio]: https://developer.android.com/studio/index.html
+[jwt]: https://jwt.io
+[gitter channel]: https://gitter.im/sysgears/apollo-fullstack-starter-kit
+[github issues]: https://github.com/sysgears/apollo-universal-starter-kit/issues
+[flow]: https://flow.org
+[typescript]: https://www.typescriptlang.org

From 62f39f758eafd30e23b1eabc1263f3eba91f6446 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 29 Nov 2017 13:22:55 +0100
Subject: [PATCH 041/327] small fix

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 6e26c974c7..f093ecc904 100644
--- a/README.md
+++ b/README.md
@@ -14,8 +14,8 @@ If you are using Apollo v1 please use
 [![Twitter Follow](https://img.shields.io/twitter/follow/sysgears.svg?style=social)](https://twitter.com/sysgears)
 
 > Apollo Universal Starter Kit is a SEO friendly boilerplate for [Universal] Mobile and Web app development built on top
-> of [Apollo], [GraphQL], [React 16], [React Native], [Expo], [Redux], [Express] with SQL storage support, [Twitter > >
-> > Bootstrap], [Native Base] and [Ant Design] integration. Hot Code Reload of back end & front end using [Webpack] and
+> of [Apollo], [GraphQL], [React 16], [React Native], [Expo], [Redux], [Express] with SQL storage support, [Twitter
+> Bootstrap], [Native Base] and [Ant Design] integration. Hot Code Reload of back end & front end using [Webpack] and
 > Hot Module Replacement to reflect your changes instantly and help you stay productive.
 
 ## Hot Code Reload demo

From 60dabeff7142991ac8bb755547cf3e97b33f6c63 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 29 Nov 2017 13:25:25 +0100
Subject: [PATCH 042/327] wrong wrapping

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index f093ecc904..16dc027962 100644
--- a/README.md
+++ b/README.md
@@ -14,9 +14,9 @@ If you are using Apollo v1 please use
 [![Twitter Follow](https://img.shields.io/twitter/follow/sysgears.svg?style=social)](https://twitter.com/sysgears)
 
 > Apollo Universal Starter Kit is a SEO friendly boilerplate for [Universal] Mobile and Web app development built on top
-> of [Apollo], [GraphQL], [React 16], [React Native], [Expo], [Redux], [Express] with SQL storage support, [Twitter
-> Bootstrap], [Native Base] and [Ant Design] integration. Hot Code Reload of back end & front end using [Webpack] and
-> Hot Module Replacement to reflect your changes instantly and help you stay productive.
+> of [Apollo], [GraphQL], [React 16], [React Native], [Expo], [Redux], [Express] with SQL storage support, for styling
+> [Twitter Bootstrap], [Native Base] and [Ant Design] integration. Hot Code Reload of back end & front end using
+> [Webpack] and Hot Module Replacement to reflect your changes instantly and help you stay productive.
 
 ## Hot Code Reload demo
 

From f005506e2e8795c0776136d8d3194146648db1d4 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 29 Nov 2017 13:27:41 +0100
Subject: [PATCH 043/327] fix link

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 16dc027962..283c4a56b8 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ If you are using Apollo v1 please use
 
 > Apollo Universal Starter Kit is a SEO friendly boilerplate for [Universal] Mobile and Web app development built on top
 > of [Apollo], [GraphQL], [React 16], [React Native], [Expo], [Redux], [Express] with SQL storage support, for styling
-> [Twitter Bootstrap], [Native Base] and [Ant Design] integration. Hot Code Reload of back end & front end using
+> [Twitter Bootstrap], [NativeBase] and [Ant Design] integration. Hot Code Reload of back end & front end using
 > [Webpack] and Hot Module Replacement to reflect your changes instantly and help you stay productive.
 
 ## Hot Code Reload demo
@@ -315,7 +315,7 @@ yarn cli
   change the module import in `src/client/modules/index.js` and rename the import in
   `src/client/modules/common/components/web/index.jsx`.
 
-  [Native Base] for mobile styling, with an option to use [Ant Design Mobile]. To switch, just change the export in
+  [NativeBase] for mobile styling, with an option to use [Ant Design Mobile]. To switch, just change the export in
   `src/client/modules/common/components/native/index.jsx`.
 
 * [Babel] for ES2017 transpiling

From f17fb3bf759067ce8a7703211bc437166d6fc880 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 29 Nov 2017 13:51:28 +0100
Subject: [PATCH 044/327] fix placeholder

---
 src/client/modules/common/components/native/RenderField.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/modules/common/components/native/RenderField.jsx b/src/client/modules/common/components/native/RenderField.jsx
index dfd5e567fb..04717d25bb 100644
--- a/src/client/modules/common/components/native/RenderField.jsx
+++ b/src/client/modules/common/components/native/RenderField.jsx
@@ -11,7 +11,7 @@ const RenderField = ({ input, label, meta: { touched, error }, ...inputProps })
   return (
     <InputItem
       value={input.value}
-      placeholder="controled input"
+      placeholder={label}
       onChange={input.onChange}
       onBlur={input.onBlur}
       onFocus={input.onFocus}

From 998e642447e5f6b43ed697021a6f440e07c16977 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 29 Nov 2017 14:27:50 +0100
Subject: [PATCH 045/327] add navigation

---
 .../crud/client/components/ModuleListView.jsx | 51 +++++++++++++++----
 tools/templates/crud/client/index.jsx         | 39 +++++++++++++-
 2 files changed, 80 insertions(+), 10 deletions(-)

diff --git a/tools/templates/crud/client/components/ModuleListView.jsx b/tools/templates/crud/client/components/ModuleListView.jsx
index 8397d51928..0959b1a7b3 100644
--- a/tools/templates/crud/client/components/ModuleListView.jsx
+++ b/tools/templates/crud/client/components/ModuleListView.jsx
@@ -1,14 +1,47 @@
 import React from 'react';
-import { StyleSheet, Text, View } from 'react-native';
+import PropTypes from 'prop-types';
+import { StyleSheet, FlatList, Text, View } from 'react-native';
+import { SwipeAction } from '../../common/components/native';
 
-const $Module$ListView = () => {
-  return (
-    <View style={styles.container}>
-      <View style={styles.element}>
-        <Text style={styles.box}>Hello $Module$!</Text>
-      </View>
-    </View>
-  );
+class $Module$ListView extends React.PureComponent {
+  keyExtractor = item => item.id;
+
+  renderItem = ({ item: { id, name } }) => {
+    const { delete$Module$, navigation } = this.props;
+    return (
+      <SwipeAction
+        onPress={() => navigation.navigate('$Module$Edit', { id })}
+        right={{
+          text: 'Delete',
+          onPress: () => delete$Module$(id)
+        }}
+      >
+        {name}
+      </SwipeAction>
+    );
+  };
+
+  render() {
+    const { loading, $module$s, loadMoreRows } = this.props;
+
+    if (loading && !$module$s) {
+      return (
+        <View style={styles.container}>
+          <Text>Loading...</Text>
+        </View>
+      );
+    } else {
+      return <FlatList data={$module$s} keyExtractor={this.keyExtractor} renderItem={this.renderItem} />;
+    }
+  }
+}
+
+$Module$ListView.propTypes = {
+  loading: PropTypes.bool.isRequired,
+  $module$s: PropTypes.array,
+  orderBy: PropTypes.object,
+  onOrderBy: PropTypes.func.isRequired,
+  delete$Module$: PropTypes.func.isRequired
 };
 
 const styles = StyleSheet.create({
diff --git a/tools/templates/crud/client/index.jsx b/tools/templates/crud/client/index.jsx
index 907df0b37c..3e3656da61 100644
--- a/tools/templates/crud/client/index.jsx
+++ b/tools/templates/crud/client/index.jsx
@@ -1,14 +1,51 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Button } from 'react-native';
+import { StackNavigator } from 'react-navigation';
 import { Ionicons } from '@expo/vector-icons';
 import { createTabBarIconWrapper } from '../common/components/native';
 import $Module$List from './containers/$Module$List';
+import $Module$Edit from './containers/$Module$Edit';
 import reducers from './reducers';
 
 import Feature from '../connector';
 
+class $Module$ListScreen extends React.Component {
+  static navigationOptions = ({ navigation }) => ({
+    title: '$Module$ list',
+    headerRight: <Button title="Add" onPress={() => navigation.navigate('$Module$Edit', { id: 0 })} />
+  });
+  render() {
+    return <$Module$List navigation={this.props.navigation} />;
+  }
+}
+
+$Module$ListScreen.propTypes = {
+  navigation: PropTypes.object
+};
+
+class $Module$EditScreen extends React.Component {
+  static navigationOptions = ({ navigation }) => ({
+    title: `${navigation.state.params.id === 0 ? 'Create' : 'Edit'} $module$`
+  });
+  render() {
+    return <$Module$Edit navigation={this.props.navigation} />;
+  }
+}
+
+$Module$EditScreen.propTypes = {
+  navigation: PropTypes.object
+};
+
+const $Module$Navigator = StackNavigator({
+  $Module$List: { screen: $Module$ListScreen },
+  $Module$Edit: { screen: $Module$EditScreen }
+});
+
 export default new Feature({
   tabItem: {
     $Module$: {
-      screen: $Module$List,
+      screen: $Module$Navigator,
       navigationOptions: {
         tabBarIcon: createTabBarIconWrapper(Ionicons, {
           name: 'ios-browsers-outline',

From 684bbf843823a5d2b74e303863994bf5099396b4 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 1 Dec 2017 07:31:03 +0100
Subject: [PATCH 046/327] module edit form

---
 .../crud/client/components/ModuleEditView.jsx | 54 +++++++++++++------
 .../crud/client/components/ModuleForm.jsx     | 28 ++++++++++
 2 files changed, 67 insertions(+), 15 deletions(-)
 create mode 100644 tools/templates/crud/client/components/ModuleForm.jsx

diff --git a/tools/templates/crud/client/components/ModuleEditView.jsx b/tools/templates/crud/client/components/ModuleEditView.jsx
index 427ca99db9..8c7d53da51 100644
--- a/tools/templates/crud/client/components/ModuleEditView.jsx
+++ b/tools/templates/crud/client/components/ModuleEditView.jsx
@@ -1,14 +1,46 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 import { StyleSheet, Text, View } from 'react-native';
 
-const $Module$EditView = () => {
-  return (
-    <View style={styles.container}>
-      <View style={styles.element}>
-        <Text style={styles.box}>Hello $Module$ Edit!</Text>
+import $Module$Form from './$Module$Form';
+
+const onSubmit = ($module$, add$Module$, edit$Module$) => values => {
+  if ($module$) {
+    edit$Module$($module$.id, values.title, values.content);
+  } else {
+    add$Module$(values.title, values.content);
+  }
+};
+
+const $Module$EditView = ({ loading, $module$, navigation, add$Module$, edit$Module$ }) => {
+  let $module$Obj = $module$;
+
+  if (!$module$Obj && navigation.state) {
+    $module$Obj = navigation.state.params.$module$;
+  }
+
+  if (loading && !$module$Obj) {
+    return (
+      <View style={styles.container}>
+        <Text>Loading...</Text>
       </View>
-    </View>
-  );
+    );
+  } else {
+    return (
+      <$Module$Form
+        onSubmit={onSubmit($module$Obj, add$Module$, edit$Module$)}
+        initialValues={$module$Obj ? $module$Obj : {}}
+      />
+    );
+  }
+};
+
+$Module$EditView.propTypes = {
+  loading: PropTypes.bool.isRequired,
+  $module$: PropTypes.object,
+  add$Module$: PropTypes.func.isRequired,
+  edit$Module$: PropTypes.func.isRequired,
+  navigation: PropTypes.object.isRequired
 };
 
 const styles = StyleSheet.create({
@@ -17,14 +49,6 @@ const styles = StyleSheet.create({
     backgroundColor: '#fff',
     alignItems: 'center',
     justifyContent: 'center'
-  },
-  element: {
-    paddingTop: 30
-  },
-  box: {
-    textAlign: 'center',
-    marginLeft: 15,
-    marginRight: 15
   }
 });
 
diff --git a/tools/templates/crud/client/components/ModuleForm.jsx b/tools/templates/crud/client/components/ModuleForm.jsx
new file mode 100644
index 0000000000..610b32ed85
--- /dev/null
+++ b/tools/templates/crud/client/components/ModuleForm.jsx
@@ -0,0 +1,28 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Field, reduxForm } from 'redux-form';
+import { FormView, RenderField, FormButton } from '../../common/components/native';
+
+const required = value => (value ? undefined : 'Required');
+
+const $Module$Form = ({ handleSubmit, valid, onSubmit }) => {
+  return (
+    <FormView>
+      <Field name="name" component={RenderField} type="text" label="Name" validate={required} />
+      <FormButton onPress={handleSubmit(onSubmit)} disabled={!valid}>
+        Save
+      </FormButton>
+    </FormView>
+  );
+};
+
+$Module$Form.propTypes = {
+  handleSubmit: PropTypes.func,
+  onSubmit: PropTypes.func,
+  valid: PropTypes.bool
+};
+
+export default reduxForm({
+  form: '$module$',
+  enableReinitialize: true
+})($Module$Form);

From f7012443e5fca7d45d0082e77ce54ee88f84c3c3 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 1 Dec 2017 10:31:31 +0100
Subject: [PATCH 047/327] finish module save

---
 .../crud/client/components/ModuleEditView.jsx | 20 ++---------
 .../client/components/ModuleEditView.web.jsx  | 31 ++--------------
 .../crud/client/containers/ModuleEdit.jsx     | 35 +++++++++++++++++--
 3 files changed, 39 insertions(+), 47 deletions(-)

diff --git a/tools/templates/crud/client/components/ModuleEditView.jsx b/tools/templates/crud/client/components/ModuleEditView.jsx
index 8c7d53da51..1798d6b724 100644
--- a/tools/templates/crud/client/components/ModuleEditView.jsx
+++ b/tools/templates/crud/client/components/ModuleEditView.jsx
@@ -4,15 +4,7 @@ import { StyleSheet, Text, View } from 'react-native';
 
 import $Module$Form from './$Module$Form';
 
-const onSubmit = ($module$, add$Module$, edit$Module$) => values => {
-  if ($module$) {
-    edit$Module$($module$.id, values.title, values.content);
-  } else {
-    add$Module$(values.title, values.content);
-  }
-};
-
-const $Module$EditView = ({ loading, $module$, navigation, add$Module$, edit$Module$ }) => {
+const $Module$EditView = ({ loading, $module$, navigation, onSubmit }) => {
   let $module$Obj = $module$;
 
   if (!$module$Obj && navigation.state) {
@@ -26,20 +18,14 @@ const $Module$EditView = ({ loading, $module$, navigation, add$Module$, edit$Mod
       </View>
     );
   } else {
-    return (
-      <$Module$Form
-        onSubmit={onSubmit($module$Obj, add$Module$, edit$Module$)}
-        initialValues={$module$Obj ? $module$Obj : {}}
-      />
-    );
+    return <$Module$Form onSubmit={onSubmit} initialValues={$module$Obj ? $module$Obj : {}} />;
   }
 };
 
 $Module$EditView.propTypes = {
   loading: PropTypes.bool.isRequired,
   $module$: PropTypes.object,
-  add$Module$: PropTypes.func.isRequired,
-  edit$Module$: PropTypes.func.isRequired,
+  onSubmit: PropTypes.func.isRequired,
   navigation: PropTypes.object.isRequired
 };
 
diff --git a/tools/templates/crud/client/components/ModuleEditView.web.jsx b/tools/templates/crud/client/components/ModuleEditView.web.jsx
index 56bd28b5f8..546de66308 100644
--- a/tools/templates/crud/client/components/ModuleEditView.web.jsx
+++ b/tools/templates/crud/client/components/ModuleEditView.web.jsx
@@ -2,36 +2,12 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import Helmet from 'react-helmet';
 import { Link } from 'react-router-dom';
-import { SubmissionError } from 'redux-form';
 
-import { pickInputFields } from '../../common/util';
-import { $Module$ as $Module$Schema } from '../../../../server/modules/$module$/schema';
 import { PageLayout } from '../../common/components/web';
 import $Module$Form from './$Module$Form';
 import settings from '../../../../../settings';
 
 class $Module$EditView extends React.PureComponent {
-  onSubmit = async values => {
-    const { $module$, add$Module$, edit$Module$ } = this.props;
-    let result = null;
-
-    const insertValues = pickInputFields($Module$Schema, values);
-
-    if ($module$) {
-      result = await edit$Module$(insertValues);
-    } else {
-      result = await add$Module$(insertValues);
-    }
-
-    if (result.errors) {
-      let submitError = {
-        _error: 'Edit $module$ failed!'
-      };
-      result.errors.map(error => (submitError[error.field] = error.message));
-      throw new SubmissionError(submitError);
-    }
-  };
-
   renderMetaData = () => (
     <Helmet
       title={`${settings.app.name} - Edit $Module$`}
@@ -45,7 +21,7 @@ class $Module$EditView extends React.PureComponent {
   );
 
   render() {
-    const { loading, $module$ } = this.props;
+    const { loading, $module$, onSubmit } = this.props;
 
     if (loading && !$module$) {
       return (
@@ -62,7 +38,7 @@ class $Module$EditView extends React.PureComponent {
             Back
           </Link>
           <h2>{$module$ ? 'Edit' : 'Create'} $Module$</h2>
-          <$Module$Form onSubmit={this.onSubmit} initialValues={$module$} />
+          <$Module$Form onSubmit={onSubmit} initialValues={$module$} />
         </PageLayout>
       );
     }
@@ -72,8 +48,7 @@ class $Module$EditView extends React.PureComponent {
 $Module$EditView.propTypes = {
   loading: PropTypes.bool.isRequired,
   $module$: PropTypes.object,
-  add$Module$: PropTypes.func.isRequired,
-  edit$Module$: PropTypes.func.isRequired
+  onSubmit: PropTypes.func.isRequired
 };
 
 export default $Module$EditView;
diff --git a/tools/templates/crud/client/containers/ModuleEdit.jsx b/tools/templates/crud/client/containers/ModuleEdit.jsx
index 654af8ed50..63a843f386 100644
--- a/tools/templates/crud/client/containers/ModuleEdit.jsx
+++ b/tools/templates/crud/client/containers/ModuleEdit.jsx
@@ -1,18 +1,48 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 import { graphql, compose } from 'react-apollo';
+import { SubmissionError } from 'redux-form';
 
+import { pickInputFields } from '../../common/util';
+import { $Module$ as $Module$Schema } from '../../../../server/modules/$module$/schema';
 import $Module$EditView from '../components/$Module$EditView';
-
 import $MODULE$_QUERY from '../graphql/$Module$Query.graphql';
 import ADD_$MODULE$ from '../graphql/Add$Module$.graphql';
 import EDIT_$MODULE$ from '../graphql/Edit$Module$.graphql';
 
 class $Module$Edit extends React.Component {
+  onSubmit = async values => {
+    const { $module$, add$Module$, edit$Module$ } = this.props;
+    let result = null;
+
+    const insertValues = pickInputFields($Module$Schema, values);
+
+    if ($module$) {
+      result = await edit$Module$(insertValues);
+    } else {
+      result = await add$Module$(insertValues);
+    }
+
+    if (result.errors) {
+      let submitError = {
+        _error: 'Edit $module$ failed!'
+      };
+      result.errors.map(error => (submitError[error.field] = error.message));
+      throw new SubmissionError(submitError);
+    }
+  };
+
   render() {
-    return <$Module$EditView {...this.props} />;
+    return <$Module$EditView {...this.props} onSubmit={this.onSubmit} />;
   }
 }
 
+$Module$Edit.propTypes = {
+  crud: PropTypes.object,
+  add$Module$: PropTypes.func.isRequired,
+  edit$Module$: PropTypes.func.isRequired
+};
+
 export default compose(
   graphql($MODULE$_QUERY, {
     options: props => {
@@ -24,6 +54,7 @@ export default compose(
       }
 
       return {
+        fetchPolicy: 'cache-and-network',
         variables: { id }
       };
     },

From 3401929837ffa89e4df5c22ad86d3d6428d7df32 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 1 Dec 2017 13:05:14 +0100
Subject: [PATCH 048/327] add `native` form field generation

---
 .../templates/crud/client/components/ModuleForm.jsx  |  7 ++++---
 .../crud/client/components/ModuleForm.web.jsx        | 12 +-----------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/tools/templates/crud/client/components/ModuleForm.jsx b/tools/templates/crud/client/components/ModuleForm.jsx
index 610b32ed85..5a18a44fbf 100644
--- a/tools/templates/crud/client/components/ModuleForm.jsx
+++ b/tools/templates/crud/client/components/ModuleForm.jsx
@@ -1,14 +1,15 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Field, reduxForm } from 'redux-form';
-import { FormView, RenderField, FormButton } from '../../common/components/native';
 
-const required = value => (value ? undefined : 'Required');
+import { createFormFields } from '../../common/util';
+import { $Module$ as $Module$Schema } from '../../../../server/modules/$module$/schema';
+import { FormView, RenderField, FormButton } from '../../common/components/native';
 
 const $Module$Form = ({ handleSubmit, valid, onSubmit }) => {
   return (
     <FormView>
-      <Field name="name" component={RenderField} type="text" label="Name" validate={required} />
+      {createFormFields($Module$Schema)}
       <FormButton onPress={handleSubmit(onSubmit)} disabled={!valid}>
         Save
       </FormButton>
diff --git a/tools/templates/crud/client/components/ModuleForm.web.jsx b/tools/templates/crud/client/components/ModuleForm.web.jsx
index a1ee1174fb..7ed710f906 100644
--- a/tools/templates/crud/client/components/ModuleForm.web.jsx
+++ b/tools/templates/crud/client/components/ModuleForm.web.jsx
@@ -6,15 +6,6 @@ import { createFormFields } from '../../common/util';
 import { $Module$ as $Module$Schema } from '../../../../server/modules/$module$/schema';
 import { Form, Button, Alert } from '../../common/components/web';
 
-const validate = values => {
-  const errors = {};
-
-  if (values.password !== values.passwordConfirmation) {
-    errors.passwordConfirmation = 'Passwords do not match';
-  }
-  return errors;
-};
-
 const $Module$Form = ({ handleSubmit, submitting, onSubmit, error }) => {
   return (
     <Form name="post" onSubmit={handleSubmit(onSubmit)}>
@@ -35,6 +26,5 @@ $Module$Form.propTypes = {
 };
 
 export default reduxForm({
-  form: '$module$',
-  validate
+  form: '$module$'
 })($Module$Form);

From cd65b30d7fc6fec075ea17f2dc1ec89d7f6e14f1 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 1 Dec 2017 13:30:57 +0100
Subject: [PATCH 049/327] fix merge

---
 src/client/modules/common/components/web/ui-antd/index.js | 3 ---
 .../modules/common/components/web/ui-antd/index.jsx       | 3 +++
 .../modules/common/components/web/ui-antd/index.web.js    | 7 -------
 .../modules/common/components/web/ui-bootstrap/index.js   | 3 ---
 .../modules/common/components/web/ui-bootstrap/index.jsx  | 3 +++
 .../common/components/web/ui-bootstrap/index.web.js       | 7 -------
 yarn.lock                                                 | 8 ++++----
 7 files changed, 10 insertions(+), 24 deletions(-)
 delete mode 100644 src/client/modules/common/components/web/ui-antd/index.js
 delete mode 100644 src/client/modules/common/components/web/ui-antd/index.web.js
 delete mode 100644 src/client/modules/common/components/web/ui-bootstrap/index.js
 delete mode 100644 src/client/modules/common/components/web/ui-bootstrap/index.web.js

diff --git a/src/client/modules/common/components/web/ui-antd/index.js b/src/client/modules/common/components/web/ui-antd/index.js
deleted file mode 100644
index 924c96f455..0000000000
--- a/src/client/modules/common/components/web/ui-antd/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// eslint-disable-next-line import/prefer-default-export
-export { default as styles } from './styles/styles.less';
-export * from './components';
diff --git a/src/client/modules/common/components/web/ui-antd/index.jsx b/src/client/modules/common/components/web/ui-antd/index.jsx
index e69de29bb2..924c96f455 100644
--- a/src/client/modules/common/components/web/ui-antd/index.jsx
+++ b/src/client/modules/common/components/web/ui-antd/index.jsx
@@ -0,0 +1,3 @@
+// eslint-disable-next-line import/prefer-default-export
+export { default as styles } from './styles/styles.less';
+export * from './components';
diff --git a/src/client/modules/common/components/web/ui-antd/index.web.js b/src/client/modules/common/components/web/ui-antd/index.web.js
deleted file mode 100644
index b1b73ef7c0..0000000000
--- a/src/client/modules/common/components/web/ui-antd/index.web.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import styles from './styles/styles.less';
-
-import Feature from '../../../../connector';
-
-export default new Feature({
-  stylesInsert: styles
-});
diff --git a/src/client/modules/common/components/web/ui-bootstrap/index.js b/src/client/modules/common/components/web/ui-bootstrap/index.js
deleted file mode 100644
index 26abaf538e..0000000000
--- a/src/client/modules/common/components/web/ui-bootstrap/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// eslint-disable-next-line import/prefer-default-export
-export { default as styles } from './styles/styles.scss';
-export * from './components';
diff --git a/src/client/modules/common/components/web/ui-bootstrap/index.jsx b/src/client/modules/common/components/web/ui-bootstrap/index.jsx
index e69de29bb2..26abaf538e 100644
--- a/src/client/modules/common/components/web/ui-bootstrap/index.jsx
+++ b/src/client/modules/common/components/web/ui-bootstrap/index.jsx
@@ -0,0 +1,3 @@
+// eslint-disable-next-line import/prefer-default-export
+export { default as styles } from './styles/styles.scss';
+export * from './components';
diff --git a/src/client/modules/common/components/web/ui-bootstrap/index.web.js b/src/client/modules/common/components/web/ui-bootstrap/index.web.js
deleted file mode 100644
index bbc1e1da0b..0000000000
--- a/src/client/modules/common/components/web/ui-bootstrap/index.web.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import styles from './styles/styles.scss';
-
-import Feature from '../../../../connector';
-
-export default new Feature({
-  stylesInsert: styles
-});
diff --git a/yarn.lock b/yarn.lock
index 7deb263293..5bec8b9d1d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9472,9 +9472,9 @@ react-native-drawer-layout@1.3.2, react-native-drawer-layout@~1.3.0:
   dependencies:
     react-native-dismiss-keyboard "1.0.0"
 
-"react-native-drawer@git+https://github.com/GeekyAnts/react-native-drawer.git":
+"react-native-drawer@https://github.com/GeekyAnts/react-native-drawer":
   version "2.3.0"
-  resolved "git+https://github.com/GeekyAnts/react-native-drawer.git#8d9078516d177c9cb02d2579a6860706d2370d25"
+  resolved "https://github.com/GeekyAnts/react-native-drawer#8d9078516d177c9cb02d2579a6860706d2370d25"
   dependencies:
     prop-types "^15.5.8"
     tween-functions "^1.0.1"
@@ -9491,9 +9491,9 @@ react-native-gesture-handler@1.0.0-alpha.30:
   dependencies:
     prop-types "^15.5.10"
 
-"react-native-keyboard-aware-scroll-view@git+https://github.com/GeekyAnts/react-native-keyboard-aware-scroll-view.git":
+"react-native-keyboard-aware-scroll-view@https://github.com/GeekyAnts/react-native-keyboard-aware-scroll-view":
   version "0.2.9"
-  resolved "git+https://github.com/GeekyAnts/react-native-keyboard-aware-scroll-view.git#f4805f254d6cc8e3329f5fb224944401f66655db"
+  resolved "https://github.com/GeekyAnts/react-native-keyboard-aware-scroll-view#f4805f254d6cc8e3329f5fb224944401f66655db"
   dependencies:
     create-react-class "^15.6.0"
     prop-types "^15.5.10"

From d1cf86783dfebc6511222a0e5fdc22f104c5f680 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 1 Dec 2017 13:44:26 +0100
Subject: [PATCH 050/327] add platform specific util

---
 src/client/modules/common/util.jsx            | 30 +++++++++++++++++++
 .../modules/common/{util.js => util.web.jsx}  |  0
 2 files changed, 30 insertions(+)
 create mode 100644 src/client/modules/common/util.jsx
 rename src/client/modules/common/{util.js => util.web.jsx} (100%)

diff --git a/src/client/modules/common/util.jsx b/src/client/modules/common/util.jsx
new file mode 100644
index 0000000000..255cdee219
--- /dev/null
+++ b/src/client/modules/common/util.jsx
@@ -0,0 +1,30 @@
+import React from 'react';
+import { pick, capitalize } from 'lodash';
+import { Field } from 'redux-form';
+import { RenderField } from './components/native';
+
+const required = value => (value ? undefined : 'Required');
+
+export const createFormFields = schema => {
+  let fields = [];
+
+  for (const key of schema.keys()) {
+    if (key !== 'id') {
+      const value = schema.values[key];
+      let validate = [];
+      if (!value.optional) {
+        validate.push(required);
+      }
+
+      fields.push(
+        <Field name={key} key={key} component={RenderField} type="text" label={capitalize(key)} validate={validate} />
+      );
+    }
+  }
+
+  return fields;
+};
+
+export const pickInputFields = (schema, values) => {
+  return pick(values, schema.keys());
+};
diff --git a/src/client/modules/common/util.js b/src/client/modules/common/util.web.jsx
similarity index 100%
rename from src/client/modules/common/util.js
rename to src/client/modules/common/util.web.jsx

From fc3093fc8e1ca85a44841881694d47e6c485e5f0 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Mon, 11 Dec 2017 11:08:31 +0100
Subject: [PATCH 051/327] fix name in list view

---
 .../crud/client/components/ModuleListView.web.jsx  | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/tools/templates/crud/client/components/ModuleListView.web.jsx b/tools/templates/crud/client/components/ModuleListView.web.jsx
index 67b50e002e..41341eaf91 100644
--- a/tools/templates/crud/client/components/ModuleListView.web.jsx
+++ b/tools/templates/crud/client/components/ModuleListView.web.jsx
@@ -5,8 +5,7 @@ import Helmet from 'react-helmet';
 import { Link } from 'react-router-dom';
 import { capitalize } from 'lodash';
 
-import { PageLayout, Table, Button } from '../../common/components/web';
-import { createTableColumns } from '../../common/util';
+import { Table, Button } from '../../common/components/web';
 import { $Module$ as $Module$Schema } from '../../../../server/modules/$module$/schema';
 
 class $Module$ListView extends React.PureComponent {
@@ -63,7 +62,7 @@ class $Module$ListView extends React.PureComponent {
 
     let columns = [];
 
-    for (const key of CrudSchema.keys()) {
+    for (const key of $Module$Schema.keys()) {
       if (key === 'id') {
         columns.push({
           title: (
@@ -102,14 +101,7 @@ class $Module$ListView extends React.PureComponent {
       )
     });
 
-    return (
-      <Table
-        dataSource={$module$s}
-        columns={columns}
-        pagination={false}
-        loading={loading && !$module$s}
-      />
-    );
+    return <Table dataSource={$module$s} columns={columns} pagination={false} loading={loading && !$module$s} />;
   }
 }
 

From b85764a9ae256102c1654bb0d8c538193c8a3e2e Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Mon, 11 Dec 2017 13:17:40 +0100
Subject: [PATCH 052/327] do not autogenerate the module type

---
 tools/cli/module.js                         | 18 ++++++++++++------
 tools/templates/crud/server/index.js        |  5 +----
 tools/templates/crud/server/schema.graphqls |  5 +++++
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/tools/cli/module.js b/tools/cli/module.js
index 8969ed1a46..7f887fe6e4 100644
--- a/tools/cli/module.js
+++ b/tools/cli/module.js
@@ -183,14 +183,20 @@ function updateSchema(logger, module) {
 
       shell.cd(pathSchema);
 
-      // override AddCrudInput in schema.graphqls file
-      const replaceAdd = `Add${Module}Input {([^}])*\\n}`;
-      shell.ShellString(shell.cat(file).replace(RegExp(replaceAdd, 'g'), `Add${Module}Input {\n${inputAdd}}`)).to(file);
+      // override Module type in schema.graphqls file
+      const replaceType = `type ${Module} {([^}])*\\n}`;
+      shell.ShellString(shell.cat(file).replace(RegExp(replaceType, 'g'), `type ${Module} {\n${inputEdit}}`)).to(file);
 
-      // override EditCrudInput in schema.graphqls file
-      const replaceEdit = `Edit${Module}Input {([^}])*\\n}`;
+      // override AddModuleInput in schema.graphqls file
+      const replaceAdd = `input Add${Module}Input {([^}])*\\n}`;
       shell
-        .ShellString(shell.cat(file).replace(RegExp(replaceEdit, 'g'), `Edit${Module}Input {\n${inputEdit}}`))
+        .ShellString(shell.cat(file).replace(RegExp(replaceAdd, 'g'), `input Add${Module}Input {\n${inputAdd}}`))
+        .to(file);
+
+      // override EditmoduleInput in schema.graphqls file
+      const replaceEdit = `input Edit${Module}Input {([^}])*\\n}`;
+      shell
+        .ShellString(shell.cat(file).replace(RegExp(replaceEdit, 'g'), `input Edit${Module}Input {\n${inputEdit}}`))
         .to(file);
 
       logger.info(chalk.green(`✔ Schema in ${pathSchema}${file} successfully updated!`));
diff --git a/tools/templates/crud/server/index.js b/tools/templates/crud/server/index.js
index 4dad072b00..37cd911a6b 100644
--- a/tools/templates/crud/server/index.js
+++ b/tools/templates/crud/server/index.js
@@ -1,13 +1,10 @@
-import GraphQLGenerator from 'domain-graphql';
-
-import { $Module$ as $Module$Schema } from './schema';
 import $Module$ from './sql';
 import schema from './schema.graphqls';
 import createResolvers from './resolvers';
 import Feature from '../connector';
 
 export default new Feature({
-  schema: [schema, new GraphQLGenerator().generateTypes($Module$Schema)],
+  schema: schema,
   createResolversFunc: createResolvers,
   createContextFunc: () => ({ $Module$: new $Module$() })
 });
diff --git a/tools/templates/crud/server/schema.graphqls b/tools/templates/crud/server/schema.graphqls
index 6b7c8a540c..6fcd09a61d 100644
--- a/tools/templates/crud/server/schema.graphqls
+++ b/tools/templates/crud/server/schema.graphqls
@@ -1,3 +1,8 @@
+type $Module$ {
+  id: Int!
+  name: String!
+}
+
 type $Module$Payload {
   $module$: $Module$
   errors: [FieldError!]

From 4fd6fdc3d7c26c6fb89318c09c505af9253a8dd7 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Mon, 11 Dec 2017 13:52:16 +0100
Subject: [PATCH 053/327] fix errors

---
 .../crud/client/components/ModuleForm.jsx          |  4 ++--
 .../crud/client/components/ModuleListView.jsx      |  5 +++--
 tools/templates/crud/server/resolvers.js           |  2 +-
 tools/templates/crud/server/sql.js                 | 14 ++++++++++----
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/tools/templates/crud/client/components/ModuleForm.jsx b/tools/templates/crud/client/components/ModuleForm.jsx
index 5a18a44fbf..837bdfa521 100644
--- a/tools/templates/crud/client/components/ModuleForm.jsx
+++ b/tools/templates/crud/client/components/ModuleForm.jsx
@@ -1,10 +1,10 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Field, reduxForm } from 'redux-form';
+import { reduxForm } from 'redux-form';
 
 import { createFormFields } from '../../common/util';
 import { $Module$ as $Module$Schema } from '../../../../server/modules/$module$/schema';
-import { FormView, RenderField, FormButton } from '../../common/components/native';
+import { FormView, FormButton } from '../../common/components/native';
 
 const $Module$Form = ({ handleSubmit, valid, onSubmit }) => {
   return (
diff --git a/tools/templates/crud/client/components/ModuleListView.jsx b/tools/templates/crud/client/components/ModuleListView.jsx
index 0959b1a7b3..def0e0d0c6 100644
--- a/tools/templates/crud/client/components/ModuleListView.jsx
+++ b/tools/templates/crud/client/components/ModuleListView.jsx
@@ -22,7 +22,7 @@ class $Module$ListView extends React.PureComponent {
   };
 
   render() {
-    const { loading, $module$s, loadMoreRows } = this.props;
+    const { loading, $module$s } = this.props;
 
     if (loading && !$module$s) {
       return (
@@ -41,7 +41,8 @@ $Module$ListView.propTypes = {
   $module$s: PropTypes.array,
   orderBy: PropTypes.object,
   onOrderBy: PropTypes.func.isRequired,
-  delete$Module$: PropTypes.func.isRequired
+  delete$Module$: PropTypes.func.isRequired,
+  navigation: PropTypes.object.isRequired
 };
 
 const styles = StyleSheet.create({
diff --git a/tools/templates/crud/server/resolvers.js b/tools/templates/crud/server/resolvers.js
index 895b05bc2b..d49e8723c0 100644
--- a/tools/templates/crud/server/resolvers.js
+++ b/tools/templates/crud/server/resolvers.js
@@ -31,7 +31,7 @@ export default pubsub => ({
 
         await $Module$.edit$Module$(input);
 
-        const $module$ = await $Module$.get$Module$({ id: input.id});
+        const $module$ = await $Module$.get$Module$({ id: input.id });
 
         return { $module$ };
       } catch (e) {
diff --git a/tools/templates/crud/server/sql.js b/tools/templates/crud/server/sql.js
index abd9d644d8..a09c1595b0 100644
--- a/tools/templates/crud/server/sql.js
+++ b/tools/templates/crud/server/sql.js
@@ -21,8 +21,8 @@ export default class $Module$ {
     if (filter) {
       if (has(filter, 'searchText') && filter.searchText !== '') {
         queryBuilder.where(function() {
-          for (const key of CrudSchema.keys()) {
-            const value = CrudSchema.values[key];
+          for (const key of $Module$Schema.keys()) {
+            const value = $Module$Schema.values[key];
             if (value.searchText) {
               this.orWhere(key, 'like', `%${filter.searchText}%`);
             }
@@ -35,7 +35,13 @@ export default class $Module$ {
   }
 
   async get$Module$({ id }) {
-    return camelizeKeys(await knex.select('*').from('$module$').where({ id }).first());
+    return camelizeKeys(
+      await knex
+        .select('*')
+        .from('$module$')
+        .where({ id })
+        .first()
+    );
   }
 
   add$Module$(input) {
@@ -44,7 +50,7 @@ export default class $Module$ {
       .returning('id');
   }
 
-  edit$Module$({ id, ...input}) {
+  edit$Module$({ id, ...input }) {
     return knex('$module$')
       .update(input)
       .where({ id });

From 3eef6ee00542c03da3f5913590cec508ba4a3695 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Mon, 11 Dec 2017 14:41:06 +0100
Subject: [PATCH 054/327] update domain-schema packages and fix updateschema
 fragment

---
 package.json        |  8 ++++----
 tools/cli/module.js |  3 ++-
 yarn.lock           | 31 +++++++++++++++++++------------
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index 0da213a086..47911cdd7c 100644
--- a/package.json
+++ b/package.json
@@ -74,10 +74,10 @@
     "bootstrap": "4.0.0-beta.2",
     "cors": "^2.8.4",
     "dataloader": "^1.3.0",
-    "domain-graphql": "^0.0.7",
-    "domain-knex": "^0.0.7",
-    "domain-react-forms": "^0.0.7",
-    "domain-schema": "^0.0.7",
+    "domain-graphql": "^0.0.8",
+    "domain-knex": "^0.0.8",
+    "domain-react-forms": "^0.0.8",
+    "domain-schema": "^0.0.8",
     "dotenv": "^4.0.0",
     "error-stack-parser": "^2.0.1",
     "expo": "^23.0.6",
diff --git a/tools/cli/module.js b/tools/cli/module.js
index 7f887fe6e4..b951be193c 100644
--- a/tools/cli/module.js
+++ b/tools/cli/module.js
@@ -217,7 +217,8 @@ function updateSchema(logger, module) {
 
       shell.cd(pathFragment);
       // override graphql fragment file
-      shell.ShellString(shell.cat(file).replace(/Crud {(.|\n)*\n}/, `Crud {\n${graphql}}`)).to(file);
+      const replaceFragment = `${Module} {(.|\n)*\n}`;
+      shell.ShellString(shell.cat(file).replace(RegExp(replaceFragment, 'g'), `${Module} {\n${graphql}}`)).to(file);
 
       logger.info(chalk.green(`✔ Fragment in ${pathFragment}${file} successfully updated!`));
     } else {
diff --git a/yarn.lock b/yarn.lock
index 7081bde1f7..659e5f9baa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3471,23 +3471,30 @@ domain-browser@^1.1.1:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
 
-domain-graphql@^0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/domain-graphql/-/domain-graphql-0.0.7.tgz#c7e2d8f9a4025dad859a7f9805306faf0054fb9e"
+domain-graphql@^0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/domain-graphql/-/domain-graphql-0.0.8.tgz#d61130dad9b342631619d22beac4a7905fea7e5f"
+  dependencies:
+    debug "^3.1.0"
 
-domain-knex@^0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/domain-knex/-/domain-knex-0.0.7.tgz#134ae39221f523fbed5d717f200a8b3aaa1758d9"
+domain-knex@^0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/domain-knex/-/domain-knex-0.0.8.tgz#02bcb1e70fe31297eec0161bae25b560292b3470"
   dependencies:
+    debug "^3.1.0"
     humps "^2.0.1"
 
-domain-react-forms@^0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/domain-react-forms/-/domain-react-forms-0.0.7.tgz#8d3979a36e451568d9d0b3e1f09c1fae23448427"
+domain-react-forms@^0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/domain-react-forms/-/domain-react-forms-0.0.8.tgz#038c08e48766549f0bed5ee49c2dd0b67be2118a"
+  dependencies:
+    debug "^3.1.0"
 
-domain-schema@^0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/domain-schema/-/domain-schema-0.0.7.tgz#14daf81202438b02206036cd7723f21110f6e51b"
+domain-schema@^0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/domain-schema/-/domain-schema-0.0.8.tgz#ef1dfac128e8d028e0486e58aed22b0d06c8be4b"
+  dependencies:
+    debug "^3.1.0"
 
 domelementtype@1, domelementtype@^1.3.0:
   version "1.3.0"

From 730016f34849d9d3b501c006399fd44ba6fcb158 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 12 Dec 2017 11:45:11 +0100
Subject: [PATCH 055/327] fix file renaming

---
 tools/templates/crud/server/index.js                         | 2 +-
 .../crud/server/{schema.graphqls => schema.graphql}          | 0
 tools/templates/module/server/schema.graphql                 | 5 -----
 3 files changed, 1 insertion(+), 6 deletions(-)
 rename tools/templates/crud/server/{schema.graphqls => schema.graphql} (100%)
 delete mode 100644 tools/templates/module/server/schema.graphql

diff --git a/tools/templates/crud/server/index.js b/tools/templates/crud/server/index.js
index 37cd911a6b..cb4b4c8964 100644
--- a/tools/templates/crud/server/index.js
+++ b/tools/templates/crud/server/index.js
@@ -1,5 +1,5 @@
 import $Module$ from './sql';
-import schema from './schema.graphqls';
+import schema from './schema.graphql';
 import createResolvers from './resolvers';
 import Feature from '../connector';
 
diff --git a/tools/templates/crud/server/schema.graphqls b/tools/templates/crud/server/schema.graphql
similarity index 100%
rename from tools/templates/crud/server/schema.graphqls
rename to tools/templates/crud/server/schema.graphql
diff --git a/tools/templates/module/server/schema.graphql b/tools/templates/module/server/schema.graphql
deleted file mode 100644
index b224b3517b..0000000000
--- a/tools/templates/module/server/schema.graphql
+++ /dev/null
@@ -1,5 +0,0 @@
-extend type Query {}
-
-extend type Mutation {}
-
-extend type Subscription {}

From 04651eedf71d94906033bdc84c9648649ee07b3a Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 13 Dec 2017 08:34:09 +0100
Subject: [PATCH 056/327] add offset pagination

---
 tools/cli/module.js                           |  8 ++--
 .../client/components/ModuleListView.web.jsx  | 48 +++++++++++++++----
 .../crud/client/containers/ModuleList.jsx     | 28 +++++++++--
 .../crud/client/graphql/ModulesQuery.graphql  | 12 +++--
 tools/templates/crud/client/reducers/index.js |  7 +++
 tools/templates/crud/server/resolvers.js      | 13 ++++-
 tools/templates/crud/server/schema.graphql    | 12 ++++-
 tools/templates/crud/server/sql.js            | 16 ++++++-
 8 files changed, 120 insertions(+), 24 deletions(-)

diff --git a/tools/cli/module.js b/tools/cli/module.js
index b951be193c..3383e53d5c 100644
--- a/tools/cli/module.js
+++ b/tools/cli/module.js
@@ -168,7 +168,7 @@ function updateSchema(logger, module) {
     // get schema file
     const pathSchema = `${__dirname}/../../src/server/modules/${module}/`;
     if (fs.existsSync(pathSchema)) {
-      const file = `schema.graphqls`;
+      const file = `schema.graphql`;
 
       // regenerate input fields
       let inputAdd = '';
@@ -183,17 +183,17 @@ function updateSchema(logger, module) {
 
       shell.cd(pathSchema);
 
-      // override Module type in schema.graphqls file
+      // override Module type in schema.graphql file
       const replaceType = `type ${Module} {([^}])*\\n}`;
       shell.ShellString(shell.cat(file).replace(RegExp(replaceType, 'g'), `type ${Module} {\n${inputEdit}}`)).to(file);
 
-      // override AddModuleInput in schema.graphqls file
+      // override AddModuleInput in schema.graphql file
       const replaceAdd = `input Add${Module}Input {([^}])*\\n}`;
       shell
         .ShellString(shell.cat(file).replace(RegExp(replaceAdd, 'g'), `input Add${Module}Input {\n${inputAdd}}`))
         .to(file);
 
-      // override EditmoduleInput in schema.graphqls file
+      // override EditmoduleInput in schema.graphql file
       const replaceEdit = `input Edit${Module}Input {([^}])*\\n}`;
       shell
         .ShellString(shell.cat(file).replace(RegExp(replaceEdit, 'g'), `input Edit${Module}Input {\n${inputEdit}}`))
diff --git a/tools/templates/crud/client/components/ModuleListView.web.jsx b/tools/templates/crud/client/components/ModuleListView.web.jsx
index 41341eaf91..50f211645f 100644
--- a/tools/templates/crud/client/components/ModuleListView.web.jsx
+++ b/tools/templates/crud/client/components/ModuleListView.web.jsx
@@ -9,6 +9,15 @@ import { Table, Button } from '../../common/components/web';
 import { $Module$ as $Module$Schema } from '../../../../server/modules/$module$/schema';
 
 class $Module$ListView extends React.PureComponent {
+  static propTypes = {
+    loading: PropTypes.bool.isRequired,
+    $module$s: PropTypes.object,
+    orderBy: PropTypes.object,
+    onOrderBy: PropTypes.func.isRequired,
+    delete$Module$: PropTypes.func.isRequired,
+    loadMoreRows: PropTypes.func.isRequired
+  };
+
   renderMetaData = () => (
     <Helmet
       title="$Module$"
@@ -21,6 +30,16 @@ class $Module$ListView extends React.PureComponent {
     />
   );
 
+  renderLoadMore = ($module$s, loadMoreRows) => {
+    if ($module$s.pageInfo.hasNextPage) {
+      return (
+        <Button id="load-more" color="primary" onClick={loadMoreRows}>
+          Load more ...
+        </Button>
+      );
+    }
+  };
+
   renderOrderByArrow = name => {
     const { orderBy } = this.props;
 
@@ -58,7 +77,7 @@ class $Module$ListView extends React.PureComponent {
   };
 
   render() {
-    const { loading, $module$s } = this.props;
+    const { loading, $module$s, loadMoreRows } = this.props;
 
     let columns = [];
 
@@ -101,16 +120,25 @@ class $Module$ListView extends React.PureComponent {
       )
     });
 
-    return <Table dataSource={$module$s} columns={columns} pagination={false} loading={loading && !$module$s} />;
+    return (
+      <div>
+        <Table
+          dataSource={$module$s ? $module$s.edges : null}
+          columns={columns}
+          pagination={false}
+          loading={loading && !$module$s}
+        />
+        {$module$s && (
+          <div>
+            <small>
+              ({$module$s.edges.length} / {$module$s.pageInfo.totalCount})
+            </small>
+          </div>
+        )}
+        {$module$s && this.renderLoadMore($module$s, loadMoreRows)}
+      </div>
+    );
   }
 }
 
-$Module$ListView.propTypes = {
-  loading: PropTypes.bool.isRequired,
-  $module$s: PropTypes.array,
-  orderBy: PropTypes.object,
-  onOrderBy: PropTypes.func.isRequired,
-  delete$Module$: PropTypes.func.isRequired
-};
-
 export default $Module$ListView;
diff --git a/tools/templates/crud/client/containers/ModuleList.jsx b/tools/templates/crud/client/containers/ModuleList.jsx
index 60b988c7d4..7bfa35f324 100644
--- a/tools/templates/crud/client/containers/ModuleList.jsx
+++ b/tools/templates/crud/client/containers/ModuleList.jsx
@@ -14,17 +14,38 @@ class $Module$ extends React.Component {
 
 const $Module$WithApollo = compose(
   graphql($MODULE$S_QUERY, {
-    options: ({ orderBy, searchText }) => {
+    options: ({ limit, orderBy, searchText }) => {
       return {
         fetchPolicy: 'cache-and-network',
         variables: {
+          limit: limit,
           orderBy: orderBy,
           filter: { searchText }
         }
       };
     },
-    props({ data: { loading, $module$s, refetch, error } }) {
-      return { loading, $module$s, refetch, errors: error ? error.graphQLErrors : null };
+    props: ({ ownProps: { limit }, data: { loading, $module$s, refetch, error, fetchMore } }) => {
+      const loadMoreRows = () => {
+        return fetchMore({
+          variables: {
+            offset: $module$s.edges.length + limit
+          },
+          updateQuery: (previousResult, { fetchMoreResult }) => {
+            const newEdges = fetchMoreResult.$module$s.edges;
+            const pageInfo = fetchMoreResult.$module$s.pageInfo;
+
+            return {
+              $module$s: {
+                edges: [...previousResult.$module$s.edges, ...newEdges],
+                pageInfo,
+                __typename: '$Module$s'
+              }
+            };
+          }
+        });
+      };
+      if (error) throw new Error(error);
+      return { loading, $module$s, loadMoreRows, refetch, errors: error ? error.graphQLErrors : null };
     }
   }),
   graphql(DELETE_$MODULE$, {
@@ -50,6 +71,7 @@ const $Module$WithApollo = compose(
 
 export default connect(
   state => ({
+    limit: state.$module$.limit,
     searchText: state.$module$.searchText,
     orderBy: state.$module$.orderBy
   }),
diff --git a/tools/templates/crud/client/graphql/ModulesQuery.graphql b/tools/templates/crud/client/graphql/ModulesQuery.graphql
index 90e1c1c3fd..7217a50916 100644
--- a/tools/templates/crud/client/graphql/ModulesQuery.graphql
+++ b/tools/templates/crud/client/graphql/ModulesQuery.graphql
@@ -1,7 +1,13 @@
 #import "./$Module$.graphql"
 
-query $module$s($orderBy: OrderBy$Module$Input, $filter: Filter$Module$Input) {
-  $module$s(orderBy: $orderBy, filter: $filter) {
-    ...$Module$Info
+query $module$s($limit: Int, $offset: Int, $orderBy: OrderBy$Module$Input, $filter: Filter$Module$Input) {
+  $module$s(limit: $limit, offset: $offset, orderBy: $orderBy, filter: $filter) {
+    pageInfo {
+      totalCount
+      hasNextPage
+    }
+    edges {
+      ...$Module$Info
+    }
   }
 }
diff --git a/tools/templates/crud/client/reducers/index.js b/tools/templates/crud/client/reducers/index.js
index 0015f6e39a..5b1976e547 100644
--- a/tools/templates/crud/client/reducers/index.js
+++ b/tools/templates/crud/client/reducers/index.js
@@ -1,10 +1,17 @@
 const defaultState = {
+  limit: 50,
   searchText: '',
   orderBy: {}
 };
 
 export default function(state = defaultState, action) {
   switch (action.type) {
+    case '$MODULE$_LIMIT':
+      return {
+        ...state,
+        limit: action.value
+      };
+
     case '$MODULE$_FILTER_SEARCH_TEXT':
       return {
         ...state,
diff --git a/tools/templates/crud/server/resolvers.js b/tools/templates/crud/server/resolvers.js
index d49e8723c0..3ae27273b9 100644
--- a/tools/templates/crud/server/resolvers.js
+++ b/tools/templates/crud/server/resolvers.js
@@ -3,8 +3,17 @@ import FieldError from '../../../common/FieldError';
 
 export default pubsub => ({
   Query: {
-    $module$s: (obj, args, { $Module$ }) => {
-      return $Module$.get$Module$s(args);
+    $module$s: async (obj, args, { $Module$ }) => {
+      const $module$s = await $Module$.get$Module$s(args);
+      const { count } = await $Module$.getTotal();
+
+      return {
+        edges: $module$s,
+        pageInfo: {
+          totalCount: count,
+          hasNextPage: $module$s.length === args.limit
+        }
+      };
     },
     $module$: (obj, args, { $Module$ }) => {
       return $Module$.get$Module$(args);
diff --git a/tools/templates/crud/server/schema.graphql b/tools/templates/crud/server/schema.graphql
index 6fcd09a61d..f3d9f2b258 100644
--- a/tools/templates/crud/server/schema.graphql
+++ b/tools/templates/crud/server/schema.graphql
@@ -3,6 +3,16 @@ type $Module$ {
   name: String!
 }
 
+type PageInfo {
+  totalCount: Int
+  hasNextPage: Boolean
+}
+
+type $Module$s {
+  pageInfo: PageInfo
+  edges: [$Module$]
+}
+
 type $Module$Payload {
   $module$: $Module$
   errors: [FieldError!]
@@ -27,7 +37,7 @@ input Edit$Module$Input {
 }
 
 extend type Query {
-  $module$s(orderBy: OrderBy$Module$Input, filter: Filter$Module$Input): [$Module$]
+  $module$s(limit: Int, offset: Int, orderBy: OrderBy$Module$Input, filter: Filter$Module$Input): $Module$s
   $module$(id: Int!): $Module$
 }
 
diff --git a/tools/templates/crud/server/sql.js b/tools/templates/crud/server/sql.js
index a09c1595b0..de5ca7d3fd 100644
--- a/tools/templates/crud/server/sql.js
+++ b/tools/templates/crud/server/sql.js
@@ -5,9 +5,17 @@ import { $Module$ as $Module$Schema } from './schema';
 import knex from '../../../server/sql/connector';
 
 export default class $Module$ {
-  async get$Module$s({ orderBy, filter }) {
+  async get$Module$s({ limit, offset, orderBy, filter }) {
     const queryBuilder = knex.select('*').from('$module$');
 
+    if (limit) {
+      queryBuilder.limit(limit);
+    }
+
+    if (offset) {
+      queryBuilder.offset(offset);
+    }
+
     if (orderBy && orderBy.column) {
       let column = orderBy.column;
       let order = 'asc';
@@ -34,6 +42,12 @@ export default class $Module$ {
     return camelizeKeys(await queryBuilder);
   }
 
+  getTotal() {
+    return knex('$module$')
+      .countDistinct('id as count')
+      .first();
+  }
+
   async get$Module$({ id }) {
     return camelizeKeys(
       await knex

From fa7637dabbf8111d5fd30cc943e1ea498d17a8db Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 13 Dec 2017 11:27:48 +0100
Subject: [PATCH 057/327] move PageInfo to rootSchema

---
 src/server/api/rootSchema.graphql          | 5 +++++
 tools/templates/crud/server/schema.graphql | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/server/api/rootSchema.graphql b/src/server/api/rootSchema.graphql
index 71d9551662..44254a7c15 100644
--- a/src/server/api/rootSchema.graphql
+++ b/src/server/api/rootSchema.graphql
@@ -3,6 +3,11 @@ type FieldError {
   message: String!
 }
 
+type PageInfo {
+  totalCount: Int
+  hasNextPage: Boolean
+}
+
 type Query {
   dummy: Int
 }
diff --git a/tools/templates/crud/server/schema.graphql b/tools/templates/crud/server/schema.graphql
index f3d9f2b258..524227249c 100644
--- a/tools/templates/crud/server/schema.graphql
+++ b/tools/templates/crud/server/schema.graphql
@@ -3,11 +3,6 @@ type $Module$ {
   name: String!
 }
 
-type PageInfo {
-  totalCount: Int
-  hasNextPage: Boolean
-}
-
 type $Module$s {
   pageInfo: PageInfo
   edges: [$Module$]

From e03ff8b0a189dc624da35e00cc0183930e488ace Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 15 Dec 2017 14:27:43 +0100
Subject: [PATCH 058/327] update cli addcrud

---
 src/common/db.js                              | 50 ++++++++++++++++-
 src/server/database/seeds/001_counter.js      |  2 +-
 src/server/database/seeds/002_user.js         |  2 +-
 src/server/database/seeds/003_post.js         |  2 +-
 src/server/database/seeds/004_subscription.js |  2 +-
 tools/cli.js                                  |  7 +++
 tools/cli/module.js                           | 55 ++++++++++++++-----
 .../templates/crud/database/seeds/_Module.js  |  2 +-
 tools/templates/crud/server/resolvers.js      |  8 +--
 tools/templates/crud/server/schema.graphql    |  5 +-
 tools/templates/crud/server/sql.js            | 40 ++++++++------
 11 files changed, 132 insertions(+), 43 deletions(-)

diff --git a/src/common/db.js b/src/common/db.js
index 1f5b0888f5..521b9aa67c 100644
--- a/src/common/db.js
+++ b/src/common/db.js
@@ -1,6 +1,52 @@
+import { decamelize } from 'humps';
 import settings from '../../settings';
 
-const truncateTables = async (knex, Promise, tables) => {
+const _getSelectFields = (fields, parentPath, domainSchema, selectItems, joinNames, single) => {
+  for (const key of Object.keys(fields)) {
+    if (key !== '__typename') {
+      const value = domainSchema.values[key];
+      if (fields[key] === true) {
+        if (!value.transient) {
+          const as = parentPath.length > 0 ? `${parentPath.join('_')}_${key}` : key;
+          const arrayPrefix = single ? '' : '_';
+          selectItems.push(`${decamelize(domainSchema.name)}.${decamelize(key)} as ${arrayPrefix}${as}`);
+        }
+      } else {
+        if (!value.type.__.transient) {
+          joinNames.push({ key: decamelize(key), name: decamelize(value.type.name) });
+        }
+
+        parentPath.push(key);
+
+        _getSelectFields(fields[key], parentPath, value.type, selectItems, joinNames, single);
+
+        parentPath.pop();
+      }
+    }
+  }
+};
+
+export const selectBy = (schema, fields, single = false, prefix = '') => {
+  // form table name
+  const tableName = decamelize(schema.name);
+
+  // select fields
+  const parentPath = [];
+  const selectItems = [];
+  const joinNames = [];
+  _getSelectFields(fields, parentPath, schema, selectItems, joinNames, single);
+
+  return query => {
+    // join table names
+    joinNames.map(({ key, name }) => {
+      query.leftJoin(`${prefix}${name} as ${name}`, `${name}.id`, `${tableName}.${key}_id`);
+    });
+
+    return query.select(selectItems);
+  };
+};
+
+export const truncateTables = async (knex, Promise, tables) => {
   if (settings.db.dbType === 'sqlite' || process.env.NODE_ENV === 'test') {
     return Promise.all(tables.map(table => knex(table).truncate()));
   } else if (settings.db.dbType === 'mysql') {
@@ -14,5 +60,3 @@ const truncateTables = async (knex, Promise, tables) => {
     return Promise.all(tables.map(table => knex.raw(`TRUNCATE "${table}" RESTART IDENTITY CASCADE`)));
   }
 };
-
-export default truncateTables;
diff --git a/src/server/database/seeds/001_counter.js b/src/server/database/seeds/001_counter.js
index 9497284735..a73fdc9283 100644
--- a/src/server/database/seeds/001_counter.js
+++ b/src/server/database/seeds/001_counter.js
@@ -1,4 +1,4 @@
-import truncateTables from '../../../common/db';
+import { truncateTables } from '../../../common/db';
 
 const initialAmount = 5;
 
diff --git a/src/server/database/seeds/002_user.js b/src/server/database/seeds/002_user.js
index dced40abbb..84688c00b1 100644
--- a/src/server/database/seeds/002_user.js
+++ b/src/server/database/seeds/002_user.js
@@ -1,5 +1,5 @@
 import bcrypt from 'bcryptjs';
-import truncateTables from '../../../common/db';
+import { truncateTables } from '../../../common/db';
 
 export async function seed(knex, Promise) {
   await truncateTables(knex, Promise, ['user', 'user_profile', 'auth_certificate', 'auth_facebook']);
diff --git a/src/server/database/seeds/003_post.js b/src/server/database/seeds/003_post.js
index 69f1b36afa..fbf3efb9f1 100644
--- a/src/server/database/seeds/003_post.js
+++ b/src/server/database/seeds/003_post.js
@@ -1,4 +1,4 @@
-import truncateTables from '../../../common/db';
+import { truncateTables } from '../../../common/db';
 
 export async function seed(knex, Promise) {
   await truncateTables(knex, Promise, ['post', 'comment']);
diff --git a/src/server/database/seeds/004_subscription.js b/src/server/database/seeds/004_subscription.js
index 901a00680a..23f16feddc 100644
--- a/src/server/database/seeds/004_subscription.js
+++ b/src/server/database/seeds/004_subscription.js
@@ -1,5 +1,5 @@
 import bcrypt from 'bcryptjs';
-import truncateTables from '../../../common/db';
+import { truncateTables } from '../../../common/db';
 
 export async function seed(knex, Promise) {
   await truncateTables(knex, Promise, ['subscription']);
diff --git a/tools/cli.js b/tools/cli.js
index 14d5611603..f54b027841 100644
--- a/tools/cli.js
+++ b/tools/cli.js
@@ -17,6 +17,13 @@ prog
   .action((args, options, logger) => moduleCmd('addmodule', args, options, logger))
   .command('addcrud', 'Create a new Module with CRUD')
   .argument('<module>', 'Module name')
+  .argument(
+    '[location]',
+    'Where should new module be created. [both, server, client]',
+    ['both', 'server', 'client'],
+    'both'
+  )
+  .argument('[tablePrefix]', 'DB table prefix.')
   .action((args, options, logger) => moduleCmd('addcrud', args, options, logger))
   .command('deletemodule', 'Delete a Module')
   .argument('<module>', 'Module name')
diff --git a/tools/cli/module.js b/tools/cli/module.js
index 3383e53d5c..da378f4919 100644
--- a/tools/cli/module.js
+++ b/tools/cli/module.js
@@ -40,7 +40,7 @@ function renameFiles(destinationPath, templatePath, module, location) {
   });
 }
 
-function copyFiles(logger, templatePath, module, action, location) {
+function copyFiles(logger, templatePath, module, action, tablePrefix, location) {
   logger.info(`Copying ${location} files…`);
 
   // pascalize
@@ -70,7 +70,7 @@ function copyFiles(logger, templatePath, module, action, location) {
     fs.writeFileSync(path, prepend + data);
 
     // add module to Feature function
-    shell.sed('-i', re, `Feature(${module}, ${match[1]})`, 'index.js');
+    shell.ShellString(shell.cat('index.js').replace(RegExp(re, 'g'), `Feature(${module}, ${match[1]})`)).to('index.js');
 
     if (action === 'addcrud' && location === 'server') {
       console.log('copy database files');
@@ -84,6 +84,13 @@ function copyFiles(logger, templatePath, module, action, location) {
       shell.mv(`_${Module}.js`, `${timestamp}_${Module}.js`);
 
       logger.info(chalk.green(`✔ The database files have been copied!`));
+
+      if (tablePrefix !== '') {
+        shell.cd(`${__dirname}/../../src/${location}/modules/${module}`);
+        shell.sed('-i', /const prefix = '';/g, `const prefix = '${tablePrefix}';`, 'sql.js');
+
+        logger.info(chalk.green(`✔ Inserted db table prefix!`));
+      }
     }
 
     logger.info(chalk.green(`✔ Module for ${location} successfully created!`));
@@ -99,7 +106,7 @@ function deleteFiles(logger, templatePath, module, location) {
   const modulePath = `${__dirname}/../../src/${location}/modules/${module}`;
 
   if (fs.existsSync(modulePath)) {
-    // create new module directory
+    // remove module directory
     shell.rm('-rf', modulePath);
 
     // change to destination directory
@@ -122,7 +129,10 @@ function deleteFiles(logger, templatePath, module, location) {
     fs.writeFileSync(path, lines.join('\n'));
 
     // remove module from Feature function
-    shell.sed('-i', re, `Feature(${modules.toString().trim()})`, 'index.js');
+    //shell.sed('-i', re, `Feature(${modules.toString().trim()})`, 'index.js');
+    shell
+      .ShellString(shell.cat('index.js').replace(RegExp(re, 'g'), `Feature(${modules.toString().trim()})`))
+      .to('index.js');
 
     if (location === 'server') {
       // change to database migrations directory
@@ -175,17 +185,29 @@ function updateSchema(logger, module) {
       let inputEdit = '';
       for (const key of schema.keys()) {
         const value = schema.values[key];
-        if (key !== 'id') {
-          inputAdd += new GraphQLGenerator()._generateField(schema.name, key, value) + '\n';
+        if (!value.type.isSchema && value.type.constructor !== Array) {
+          if (key !== 'id') {
+            inputAdd += `  ${key}: ` + new GraphQLGenerator()._generateField(schema.name, value, key) + '\n';
+          }
+          inputEdit += `  ${key}: ` + new GraphQLGenerator()._generateField(schema.name + '.' + key, value, []) + '\n';
         }
-        inputEdit += new GraphQLGenerator()._generateField(schema.name, key, value) + '\n';
       }
 
       shell.cd(pathSchema);
-
       // override Module type in schema.graphql file
-      const replaceType = `type ${Module} {([^}])*\\n}`;
-      shell.ShellString(shell.cat(file).replace(RegExp(replaceType, 'g'), `type ${Module} {\n${inputEdit}}`)).to(file);
+      const replaceType = `### schema type definitions([^()]+)### end schema type definitions`;
+      shell
+        .ShellString(
+          shell
+            .cat(file)
+            .replace(
+              RegExp(replaceType, 'g'),
+              `### schema type definitions\n${new GraphQLGenerator().generateTypes(
+                schema
+              )}\n\n### end schema type definitions`
+            )
+        )
+        .to(file);
 
       // override AddModuleInput in schema.graphql file
       const replaceAdd = `input Add${Module}Input {([^}])*\\n}`;
@@ -212,7 +234,10 @@ function updateSchema(logger, module) {
       // regenerate graphql fragment
       let graphql = '';
       for (const key of schema.keys()) {
-        graphql += `  ${key}\n`;
+        const value = schema.values[key];
+        if (!value.type.isSchema && value.type.constructor !== Array) {
+          graphql += `  ${key}\n`;
+        }
       }
 
       shell.cd(pathFragment);
@@ -235,6 +260,10 @@ module.exports = (action, args, options, logger) => {
   if (args.location) {
     location = args.location;
   }
+  let tablePrefix = '';
+  if (args.tablePrefix) {
+    tablePrefix = args.tablePrefix;
+  }
 
   let templatePath = `${__dirname}/../templates/module`;
   if (action === 'addcrud') {
@@ -249,7 +278,7 @@ module.exports = (action, args, options, logger) => {
   // client
   if (location === 'client' || location === 'both') {
     if (action === 'addmodule' || action === 'addcrud') {
-      copyFiles(logger, templatePath, module, action, 'client');
+      copyFiles(logger, templatePath, module, action, tablePrefix, 'client');
     } else if (action === 'deletemodule') {
       deleteFiles(logger, templatePath, module, 'client');
     }
@@ -258,7 +287,7 @@ module.exports = (action, args, options, logger) => {
   // server
   if (location === 'server' || location === 'both') {
     if (action === 'addmodule' || action === 'addcrud') {
-      copyFiles(logger, templatePath, module, action, 'server');
+      copyFiles(logger, templatePath, module, action, tablePrefix, 'server');
     } else if (action === 'deletemodule') {
       deleteFiles(logger, templatePath, module, 'server');
     }
diff --git a/tools/templates/crud/database/seeds/_Module.js b/tools/templates/crud/database/seeds/_Module.js
index 63e9f481c7..e2e1498442 100644
--- a/tools/templates/crud/database/seeds/_Module.js
+++ b/tools/templates/crud/database/seeds/_Module.js
@@ -1,4 +1,4 @@
-import truncateTables from '../../../common/db';
+import { truncateTables } from '../../../common/db';
 
 export async function seed(knex, Promise) {
   await truncateTables(knex, Promise, ['$module$']);
diff --git a/tools/templates/crud/server/resolvers.js b/tools/templates/crud/server/resolvers.js
index 3ae27273b9..6fa573da9a 100644
--- a/tools/templates/crud/server/resolvers.js
+++ b/tools/templates/crud/server/resolvers.js
@@ -3,8 +3,8 @@ import FieldError from '../../../common/FieldError';
 
 export default pubsub => ({
   Query: {
-    $module$s: async (obj, args, { $Module$ }) => {
-      const $module$s = await $Module$.get$Module$s(args);
+    $module$s: async (obj, args, { $Module$ }, info) => {
+      const $module$s = await $Module$.get$Module$s(args, info);
       const { count } = await $Module$.getTotal();
 
       return {
@@ -15,8 +15,8 @@ export default pubsub => ({
         }
       };
     },
-    $module$: (obj, args, { $Module$ }) => {
-      return $Module$.get$Module$(args);
+    $module$: (obj, args, { $Module$ }, info) => {
+      return $Module$.get$Module$(args, info);
     }
   },
   Mutation: {
diff --git a/tools/templates/crud/server/schema.graphql b/tools/templates/crud/server/schema.graphql
index 524227249c..676727f6c1 100644
--- a/tools/templates/crud/server/schema.graphql
+++ b/tools/templates/crud/server/schema.graphql
@@ -1,7 +1,9 @@
+### schema type definitions
 type $Module$ {
   id: Int!
   name: String!
 }
+### end schema type definitions
 
 type $Module$s {
   pageInfo: PageInfo
@@ -42,4 +44,5 @@ extend type Mutation {
   delete$Module$(id: Int!): $Module$Payload!
 }
 
-extend type Subscription {}
\ No newline at end of file
+extend type Subscription {
+}
\ No newline at end of file
diff --git a/tools/templates/crud/server/sql.js b/tools/templates/crud/server/sql.js
index de5ca7d3fd..af5c6dd5bf 100644
--- a/tools/templates/crud/server/sql.js
+++ b/tools/templates/crud/server/sql.js
@@ -1,12 +1,20 @@
-import { camelizeKeys, decamelize } from 'humps';
+import { decamelize } from 'humps';
 import { has } from 'lodash';
 
+import parseFields from 'graphql-parse-fields';
+import knexnest from 'knexnest';
 import { $Module$ as $Module$Schema } from './schema';
+import { selectBy } from '../../../common/db';
 import knex from '../../../server/sql/connector';
 
+const prefix = '';
+const tableName = decamelize($Module$Schema.name);
+
 export default class $Module$ {
-  async get$Module$s({ limit, offset, orderBy, filter }) {
-    const queryBuilder = knex.select('*').from('$module$');
+  get$Module$s({ limit, offset, orderBy, filter }, info) {
+    const baseQuery = knex(`${prefix}${tableName} as ${tableName}`);
+    const select = selectBy($Module$Schema, parseFields(info).edges, false, prefix);
+    const queryBuilder = select(baseQuery);
 
     if (limit) {
       queryBuilder.limit(limit);
@@ -24,6 +32,8 @@ export default class $Module$ {
       }
 
       queryBuilder.orderBy(decamelize(column), order);
+    } else {
+      queryBuilder.orderBy(`${tableName}.id`);
     }
 
     if (filter) {
@@ -39,40 +49,36 @@ export default class $Module$ {
       }
     }
 
-    return camelizeKeys(await queryBuilder);
+    return knexnest(queryBuilder);
   }
 
   getTotal() {
-    return knex('$module$')
+    return knex(`${prefix}${tableName}`)
       .countDistinct('id as count')
       .first();
   }
 
-  async get$Module$({ id }) {
-    return camelizeKeys(
-      await knex
-        .select('*')
-        .from('$module$')
-        .where({ id })
-        .first()
-    );
+  get$Module$({ id }, info) {
+    const baseQuery = knex(`${prefix}${tableName} as ${tableName}`);
+    const select = selectBy($Module$Schema, parseFields(info), true, prefix);
+    return knexnest(select(baseQuery).where(`${tableName}.id`, '=', id));
   }
 
   add$Module$(input) {
-    return knex('$module$')
+    return knex(`${prefix}${tableName}`)
       .insert(input)
       .returning('id');
   }
 
   edit$Module$({ id, ...input }) {
-    return knex('$module$')
+    return knex(`${prefix}${tableName}`)
       .update(input)
       .where({ id });
   }
 
   delete$Module$(id) {
-    return knex('$module$')
-      .where('id', '=', id)
+    return knex(`${prefix}${tableName}`)
+      .where({ id })
       .del();
   }
 }

From fc61830600e15b9220fd1e2cd26ad3c7b6059944 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Sun, 17 Dec 2017 08:11:18 +0100
Subject: [PATCH 059/327] add missing packages

---
 package.json              |   6 +-
 tools/webpackAppConfig.js |   2 +
 yarn.lock                 | 150 ++++++++++++++++++++++++++++++++++----
 3 files changed, 142 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index 47911cdd7c..b4b03a23df 100644
--- a/package.json
+++ b/package.json
@@ -74,10 +74,10 @@
     "bootstrap": "4.0.0-beta.2",
     "cors": "^2.8.4",
     "dataloader": "^1.3.0",
-    "domain-graphql": "^0.0.8",
+    "domain-graphql": "^0.0.12",
     "domain-knex": "^0.0.8",
     "domain-react-forms": "^0.0.8",
-    "domain-schema": "^0.0.8",
+    "domain-schema": "^0.0.10",
     "dotenv": "^4.0.0",
     "error-stack-parser": "^2.0.1",
     "expo": "^23.0.6",
@@ -86,6 +86,7 @@
     "graphql": "^0.11.7",
     "graphql-auth": "^0.2.0",
     "graphql-iso-date": "^3.3.0",
+    "graphql-parse-fields": "^1.2.0",
     "graphql-subscriptions": "^0.5.5",
     "graphql-tag": "^2.5.0",
     "graphql-tools": "^2.11.0",
@@ -96,6 +97,7 @@
     "jsonwebtoken": "^8.1.0",
     "jwt-decode": "^2.2.0",
     "knex": "^0.14.2",
+    "knexnest": "^0.4.1",
     "lodash": "^4.17.4",
     "minilog": "^3.1.0",
     "mysql2": "^1.5.1",
diff --git a/tools/webpackAppConfig.js b/tools/webpackAppConfig.js
index 130e8c44ef..eddecb4690 100644
--- a/tools/webpackAppConfig.js
+++ b/tools/webpackAppConfig.js
@@ -51,6 +51,7 @@ const dependencyPlatforms = {
   'error-stack-parser': ['server', 'web'],
   expo: ['ios', 'android'],
   express: 'server',
+  'graphql-parse-fields': 'server',
   'apollo-server-express': 'server',
   'apollo-upload-server': 'server',
   'graphql-subscriptions': 'server',
@@ -62,6 +63,7 @@ const dependencyPlatforms = {
   jsonwebtoken: 'server',
   'jwt-decode': 'web',
   knex: 'server',
+  knexnest: 'server',
   mysql2: 'server',
   'native-base': ['ios', 'android'],
   nodemailer: 'server',
diff --git a/yarn.lock b/yarn.lock
index 659e5f9baa..623bd872b6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1908,7 +1908,7 @@ block-stream@*:
   dependencies:
     inherits "~2.0.0"
 
-bluebird@^2.10.2:
+bluebird@^2.10.2, bluebird@^2.9.24:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
 
@@ -2007,7 +2007,7 @@ bplist-parser@0.1.1:
   dependencies:
     big-integer "^1.6.7"
 
-brace-expansion@^1.1.7:
+brace-expansion@^1.0.0, brace-expansion@^1.1.7:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
   dependencies:
@@ -2299,6 +2299,12 @@ caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
 
+cast-array@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cast-array/-/cast-array-1.0.1.tgz#264ef1129e5888bc48cac40fe914e9f69b8d189d"
+  dependencies:
+    isarray "0.0.1"
+
 center-align@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
@@ -3199,7 +3205,7 @@ debug@*, debug@3.1.0, debug@^3.0.1, debug@^3.1.0:
   dependencies:
     ms "2.0.0"
 
-debug@2, debug@2.6.9, debug@^2.2.0, debug@^2.6.2, debug@^2.6.6, debug@^2.6.8:
+debug@2, debug@2.6.9, debug@^2.1.3, debug@^2.2.0, debug@^2.6.2, debug@^2.6.6, debug@^2.6.8:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   dependencies:
@@ -3471,9 +3477,9 @@ domain-browser@^1.1.1:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
 
-domain-graphql@^0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/domain-graphql/-/domain-graphql-0.0.8.tgz#d61130dad9b342631619d22beac4a7905fea7e5f"
+domain-graphql@^0.0.12:
+  version "0.0.12"
+  resolved "https://registry.yarnpkg.com/domain-graphql/-/domain-graphql-0.0.12.tgz#cbcb23843911f9fed2450da317e0b023ad856437"
   dependencies:
     debug "^3.1.0"
 
@@ -3490,9 +3496,9 @@ domain-react-forms@^0.0.8:
   dependencies:
     debug "^3.1.0"
 
-domain-schema@^0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/domain-schema/-/domain-schema-0.0.8.tgz#ef1dfac128e8d028e0486e58aed22b0d06c8be4b"
+domain-schema@^0.0.10:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/domain-schema/-/domain-schema-0.0.10.tgz#05f11797d2ec71802580249bcf21f051fa157fdc"
   dependencies:
     debug "^3.1.0"
 
@@ -3556,6 +3562,10 @@ dotenv@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-4.0.0.tgz#864ef1379aced55ce6f95debecdce179f7a0cd1d"
 
+double-ended-queue@^2.1.0-0:
+  version "2.1.0-0"
+  resolved "https://registry.yarnpkg.com/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz#103d3527fd31528f40188130c841efdd78264e5c"
+
 draft-js@^0.10.0, draft-js@~0.10.0:
   version "0.10.4"
   resolved "https://registry.yarnpkg.com/draft-js/-/draft-js-0.10.4.tgz#147741642097c8120d8edc232e9503e8b7fb8d35"
@@ -4282,6 +4292,10 @@ extend@3, extend@^3.0.0, extend@~3.0.0, extend@~3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
 
+extend@~2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-2.0.1.tgz#1ee8010689e7395ff9448241c98652bc759a8260"
+
 external-editor@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-1.1.1.tgz#12d7b0db850f7ff7e7081baf4005700060c4600b"
@@ -4542,6 +4556,12 @@ findup-sync@^0.4.2:
     micromatch "^2.3.7"
     resolve-dir "^0.1.0"
 
+findup-sync@~0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.2.1.tgz#e0a90a450075c49466ee513732057514b81e878c"
+  dependencies:
+    glob "~4.3.0"
+
 fined@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fined/-/fined-1.1.0.tgz#b37dc844b76a2f5e7081e884f7c0ae344f153476"
@@ -4552,7 +4572,7 @@ fined@^1.0.1:
     object.pick "^1.2.0"
     parse-filepath "^1.0.1"
 
-flagged-respawn@^0.3.2:
+flagged-respawn@^0.3.2, flagged-respawn@~0.3.0:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-0.3.2.tgz#ff191eddcd7088a675b2610fffc976be9b8074b5"
 
@@ -4878,6 +4898,15 @@ glob@^6.0.1, glob@^6.0.4:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@~4.3.0:
+  version "4.3.5"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-4.3.5.tgz#80fbb08ca540f238acce5d11d1e9bc41e75173d3"
+  dependencies:
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^2.0.1"
+    once "^1.3.0"
+
 global-modules@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-0.2.3.tgz#ea5a3bed42c6d6ce995a4f8a1269b5dae223828d"
@@ -4993,6 +5022,12 @@ graphql-iso-date@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/graphql-iso-date/-/graphql-iso-date-3.3.0.tgz#cbe434b41e035e806338121b1b2b509a0f72bb80"
 
+graphql-parse-fields@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/graphql-parse-fields/-/graphql-parse-fields-1.2.0.tgz#c97119a91951b98dcbe656c46a203e966a720f28"
+  dependencies:
+    cast-array "^1.0.1"
+
 graphql-subscriptions@^0.5.5:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/graphql-subscriptions/-/graphql-subscriptions-0.5.5.tgz#f8ad3e094a23128d5065725f9b60020d3293999d"
@@ -5157,6 +5192,10 @@ hasha@^2.2.0:
     is-stream "^1.0.1"
     pinkie-promise "^2.0.0"
 
+hashmap@^2.0.1:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/hashmap/-/hashmap-2.3.0.tgz#b13fb65da7c8ba5e3db8fc1b8c5ba1d0049daf22"
+
 haul@1.0.0-beta.10:
   version "1.0.0-beta.10"
   resolved "https://registry.yarnpkg.com/haul/-/haul-1.0.0-beta.10.tgz#98e3afcf0b0544d93c250b7cd4e3c5c82a8b1f29"
@@ -5660,6 +5699,10 @@ internal-ip@1.2.0:
   dependencies:
     meow "^3.3.0"
 
+interpret@^0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-0.5.2.tgz#377833b04b5ea693ff0d533380e3dda0c0381be0"
+
 interpret@^1.0.0, interpret@^1.0.1, interpret@^1.0.4:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
@@ -6333,6 +6376,25 @@ klaw@^1.0.0:
   optionalDependencies:
     graceful-fs "^4.1.9"
 
+knex@0.8.6:
+  version "0.8.6"
+  resolved "https://registry.yarnpkg.com/knex/-/knex-0.8.6.tgz#20f2f4a6cf98fa755b5cee9aa9fabae531af056a"
+  dependencies:
+    bluebird "^2.9.24"
+    chalk "^1.0.0"
+    commander "^2.2.0"
+    debug "^2.1.3"
+    inherits "~2.0.1"
+    interpret "^0.5.2"
+    liftoff "~2.0.0"
+    lodash "^3.7.0"
+    minimist "~1.1.0"
+    mkdirp "^0.5.0"
+    pool2 "^1.1.0"
+    readable-stream "^1.1.12"
+    tildify "~1.0.0"
+    v8flags "^2.0.2"
+
 knex@^0.14.2:
   version "0.14.2"
   resolved "https://registry.yarnpkg.com/knex/-/knex-0.14.2.tgz#f3b3fe1ea0711af842770100768af21bfcbcbaea"
@@ -6356,6 +6418,13 @@ knex@^0.14.2:
     uuid "^3.0.0"
     v8flags "^3.0.0"
 
+knexnest@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/knexnest/-/knexnest-0.4.1.tgz#f91184a575ea1e360af425cab61790bb1471141c"
+  dependencies:
+    knex "0.8.6"
+    nesthydrationjs "0.3.0"
+
 lazy-cache@^0.2.3:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-0.2.7.tgz#7feddf2dcb6edb77d11ef1d117ab5ffdf0ab1b65"
@@ -6420,6 +6489,16 @@ liftoff@2.3.0:
     rechoir "^0.6.2"
     resolve "^1.1.7"
 
+liftoff@~2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.0.3.tgz#fbab25362a506ac28a3db0c55cde9562fbd70456"
+  dependencies:
+    extend "~2.0.0"
+    findup-sync "~0.2.0"
+    flagged-respawn "~0.3.0"
+    minimist "~1.1.0"
+    resolve "~1.1.0"
+
 lint-staged@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-6.0.0.tgz#7ab7d345f2fe302ff196f1de6a005594ace03210"
@@ -6822,11 +6901,15 @@ lodash@3.7.x:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.7.0.tgz#3678bd8ab995057c07ade836ed2ef087da811d45"
 
+lodash@4.13.1:
+  version "4.13.1"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.13.1.tgz#83e4b10913f48496d4d16fec4a560af2ee744b68"
+
 lodash@4.17.4, "lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.10.1, lodash@^4.11.1, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.14.1, lodash@^4.15.0, lodash@^4.16.5, lodash@^4.16.6, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.6.0, lodash@^4.6.1, lodash@~4.17.4:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
-lodash@^3.10.1, lodash@^3.5.0:
+lodash@^3.10.1, lodash@^3.5.0, lodash@^3.7.0:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
@@ -7222,6 +7305,12 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   dependencies:
     brace-expansion "^1.1.7"
 
+minimatch@^2.0.1:
+  version "2.0.10"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"
+  dependencies:
+    brace-expansion "^1.0.0"
+
 minimist@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
@@ -7234,6 +7323,10 @@ minimist@~0.0.1:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
 
+minimist@~1.1.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.1.3.tgz#3bedfd91a92d39016fcfaa1c681e8faa1a1efda8"
+
 minipass@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.2.1.tgz#5ada97538b1027b4cf7213432428578cb564011f"
@@ -7488,6 +7581,12 @@ negotiator@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
 
+nesthydrationjs@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/nesthydrationjs/-/nesthydrationjs-0.3.0.tgz#418c33cce77682f46a3988ce3347a0cd41e2ead1"
+  dependencies:
+    lodash "4.13.1"
+
 netmask@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/netmask/-/netmask-1.0.6.tgz#20297e89d86f6f6400f250d9f4f6b4c1945fcd35"
@@ -8474,6 +8573,15 @@ pn@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/pn/-/pn-1.0.0.tgz#1cf5a30b0d806cd18f88fc41a6b5d4ad615b3ba9"
 
+pool2@^1.1.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/pool2/-/pool2-1.4.1.tgz#32fbd4f6a37764599002faeab8a0494a2a76a2d0"
+  dependencies:
+    debug "^2.1.3"
+    double-ended-queue "^2.1.0-0"
+    hashmap "^2.0.1"
+    simple-backoff "^1.0.0"
+
 popper.js@^1.12.5:
   version "1.12.9"
   resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.12.9.tgz#0dfbc2dff96c451bb332edcfcfaaf566d331d5b3"
@@ -9957,7 +10065,7 @@ readable-stream@1.1:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@1.1.x, readable-stream@^1.1.8, readable-stream@~1.1.8, readable-stream@~1.1.9:
+readable-stream@1.1.x, readable-stream@^1.1.12, readable-stream@^1.1.8, readable-stream@~1.1.8, readable-stream@~1.1.9:
   version "1.1.14"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
   dependencies:
@@ -10364,6 +10472,10 @@ resolve@^1.1.6, resolve@^1.1.7, resolve@^1.2.0, resolve@^1.3.3:
   dependencies:
     path-parse "^1.0.5"
 
+resolve@~1.1.0:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
+
 response-time@~2.3.1:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/response-time/-/response-time-2.3.2.tgz#ffa71bab952d62f7c1d49b7434355fbc68dffc5a"
@@ -10887,6 +10999,10 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
 
+simple-backoff@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/simple-backoff/-/simple-backoff-1.0.0.tgz#a4fa290ec01969c07ca136fe8bbfb40e0ef35ac2"
+
 simple-plist@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/simple-plist/-/simple-plist-0.2.1.tgz#71766db352326928cf3a807242ba762322636723"
@@ -11646,6 +11762,12 @@ tildify@1.2.0:
   dependencies:
     os-homedir "^1.0.0"
 
+tildify@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/tildify/-/tildify-1.0.0.tgz#2a021db5e8fbde0a8f8b4df37adaa8fb1d39d7dd"
+  dependencies:
+    user-home "^1.0.0"
+
 time-stamp@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
@@ -11991,7 +12113,7 @@ url@^0.11.0:
     punycode "1.3.2"
     querystring "0.2.0"
 
-user-home@^1.1.1:
+user-home@^1.0.0, user-home@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190"
 
@@ -12048,7 +12170,7 @@ uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
 
-v8flags@^2.1.1:
+v8flags@^2.0.2, v8flags@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4"
   dependencies:

From a89092ae4a7e2ff3bb1386caf03417af937acbbb Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Mon, 18 Dec 2017 08:55:24 +0100
Subject: [PATCH 060/327] small fixes

---
 src/server/sql/crud.js                        |  1 +
 .../client/components/ModuleListView.web.jsx  |  2 +-
 .../crud/client/graphql/AddModule.graphql     |  2 +-
 .../crud/client/graphql/DeleteModule.graphql  |  2 +-
 .../crud/client/graphql/EditModule.graphql    |  2 +-
 .../templates/crud/database/seeds/_Module.js  |  2 +-
 tools/templates/crud/server/resolvers.js      | 19 ++++++++++---------
 tools/templates/crud/server/schema.graphql    |  2 +-
 tools/templates/crud/server/sql.js            |  8 ++++----
 9 files changed, 21 insertions(+), 19 deletions(-)
 create mode 100644 src/server/sql/crud.js

diff --git a/src/server/sql/crud.js b/src/server/sql/crud.js
new file mode 100644
index 0000000000..e9a1935112
--- /dev/null
+++ b/src/server/sql/crud.js
@@ -0,0 +1 @@
+export default class Crud {}
diff --git a/tools/templates/crud/client/components/ModuleListView.web.jsx b/tools/templates/crud/client/components/ModuleListView.web.jsx
index 50f211645f..56061a9c20 100644
--- a/tools/templates/crud/client/components/ModuleListView.web.jsx
+++ b/tools/templates/crud/client/components/ModuleListView.web.jsx
@@ -131,7 +131,7 @@ class $Module$ListView extends React.PureComponent {
         {$module$s && (
           <div>
             <small>
-              ({$module$s.edges.length} / {$module$s.pageInfo.totalCount})
+              ({$module$s.edges ? $module$s.edges.length : 0} / {$module$s.pageInfo.totalCount})
             </small>
           </div>
         )}
diff --git a/tools/templates/crud/client/graphql/AddModule.graphql b/tools/templates/crud/client/graphql/AddModule.graphql
index 56814fa41a..0852b49478 100644
--- a/tools/templates/crud/client/graphql/AddModule.graphql
+++ b/tools/templates/crud/client/graphql/AddModule.graphql
@@ -2,7 +2,7 @@
 
 mutation add$Module$($input: Add$Module$Input!) {
   add$Module$(input: $input) {
-    $module$ {
+    node {
       ...$Module$Info
     }
     errors {
diff --git a/tools/templates/crud/client/graphql/DeleteModule.graphql b/tools/templates/crud/client/graphql/DeleteModule.graphql
index 2274ef6473..6782cc20f9 100644
--- a/tools/templates/crud/client/graphql/DeleteModule.graphql
+++ b/tools/templates/crud/client/graphql/DeleteModule.graphql
@@ -1,6 +1,6 @@
 mutation delete$Module$($id: Int!) {
   delete$Module$(id: $id) {
-    $module$ {
+    node {
       id
     }
     errors {
diff --git a/tools/templates/crud/client/graphql/EditModule.graphql b/tools/templates/crud/client/graphql/EditModule.graphql
index c3b639bd64..99d2088c67 100644
--- a/tools/templates/crud/client/graphql/EditModule.graphql
+++ b/tools/templates/crud/client/graphql/EditModule.graphql
@@ -2,7 +2,7 @@
 
 mutation edit$Module$($input: Edit$Module$Input!) {
   edit$Module$(input: $input) {
-    $module$ {
+    node {
       ...$Module$Info
     }
     errors {
diff --git a/tools/templates/crud/database/seeds/_Module.js b/tools/templates/crud/database/seeds/_Module.js
index e2e1498442..958b1366b9 100644
--- a/tools/templates/crud/database/seeds/_Module.js
+++ b/tools/templates/crud/database/seeds/_Module.js
@@ -1,4 +1,4 @@
-import { truncateTables } from '../../../common/db';
+import { truncateTables } from '../../sql/helpers';
 
 export async function seed(knex, Promise) {
   await truncateTables(knex, Promise, ['$module$']);
diff --git a/tools/templates/crud/server/resolvers.js b/tools/templates/crud/server/resolvers.js
index 6fa573da9a..411aff967f 100644
--- a/tools/templates/crud/server/resolvers.js
+++ b/tools/templates/crud/server/resolvers.js
@@ -1,56 +1,57 @@
 /*eslint-disable no-unused-vars*/
+import parseFields from 'graphql-parse-fields';
 import FieldError from '../../../common/FieldError';
 
 export default pubsub => ({
   Query: {
     $module$s: async (obj, args, { $Module$ }, info) => {
-      const $module$s = await $Module$.get$Module$s(args, info);
+      const $module$s = await $Module$.get$Module$s(args, parseFields(info).edges);
       const { count } = await $Module$.getTotal();
 
       return {
         edges: $module$s,
         pageInfo: {
           totalCount: count,
-          hasNextPage: $module$s.length === args.limit
+          hasNextPage: $module$s && $module$s.length === args.limit
         }
       };
     },
     $module$: (obj, args, { $Module$ }, info) => {
-      return $Module$.get$Module$(args, info);
+      return $Module$.get$Module$(args, parseFields(info));
     }
   },
   Mutation: {
-    add$Module$: async (obj, { input }, { $Module$ }) => {
+    add$Module$: async (obj, { input }, { $Module$ }, info) => {
       try {
         const e = new FieldError();
         e.throwIf();
 
         const [id] = await $Module$.add$Module$(input);
-        const $module$ = await $Module$.get$Module$({ id });
+        const $module$ = await $Module$.get$Module$({ id }, parseFields(info).node);
 
         return { $module$ };
       } catch (e) {
         return { errors: e };
       }
     },
-    edit$Module$: async (obj, { input }, { $Module$ }) => {
+    edit$Module$: async (obj, { input }, { $Module$ }, info) => {
       try {
         const e = new FieldError();
         e.throwIf();
 
         await $Module$.edit$Module$(input);
 
-        const $module$ = await $Module$.get$Module$({ id: input.id });
+        const $module$ = await $Module$.get$Module$({ id: input.id }, parseFields(info).node);
 
         return { $module$ };
       } catch (e) {
         return { errors: e };
       }
     },
-    delete$Module$: async (obj, { id }, { $Module$ }) => {
+    delete$Module$: async (obj, { id }, { $Module$ }, info) => {
       try {
         const e = new FieldError();
-        const $module$ = await $Module$.get$Module$({ id });
+        const $module$ = await $Module$.get$Module$({ id }, parseFields(info).node);
         if (!$module$) {
           e.setError('delete', '$Module$ does not exist.');
           e.throwIf();
diff --git a/tools/templates/crud/server/schema.graphql b/tools/templates/crud/server/schema.graphql
index 676727f6c1..3900b13923 100644
--- a/tools/templates/crud/server/schema.graphql
+++ b/tools/templates/crud/server/schema.graphql
@@ -11,7 +11,7 @@ type $Module$s {
 }
 
 type $Module$Payload {
-  $module$: $Module$
+  node: $Module$
   errors: [FieldError!]
 }
 
diff --git a/tools/templates/crud/server/sql.js b/tools/templates/crud/server/sql.js
index 4719c321ea..d3a151227a 100644
--- a/tools/templates/crud/server/sql.js
+++ b/tools/templates/crud/server/sql.js
@@ -1,19 +1,19 @@
 import { decamelize } from 'humps';
 import { has } from 'lodash';
 
-import parseFields from 'graphql-parse-fields';
 import knexnest from 'knexnest';
 import { $Module$ as $Module$Schema } from './schema';
+import Crud from '../../../server/sql/crud';
 import { selectBy } from '../../../server/sql/helpers';
 import knex from '../../../server/sql/connector';
 
 const prefix = '';
 const tableName = decamelize($Module$Schema.name);
 
-export default class $Module$ {
+export default class $Module$ extends Crud {
   get$Module$s({ limit, offset, orderBy, filter }, info) {
     const baseQuery = knex(`${prefix}${tableName} as ${tableName}`);
-    const select = selectBy($Module$Schema, parseFields(info).edges, false, prefix);
+    const select = selectBy($Module$Schema, info, false, prefix);
     const queryBuilder = select(baseQuery);
 
     if (limit) {
@@ -60,7 +60,7 @@ export default class $Module$ {
 
   get$Module$({ id }, info) {
     const baseQuery = knex(`${prefix}${tableName} as ${tableName}`);
-    const select = selectBy($Module$Schema, parseFields(info), true, prefix);
+    const select = selectBy($Module$Schema, info, true, prefix);
     return knexnest(select(baseQuery).where(`${tableName}.id`, '=', id));
   }
 

From 1f12594393b65a0e926eed8f14838f9a7e241aeb Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Mon, 18 Dec 2017 09:39:51 +0100
Subject: [PATCH 061/327] move crud methods to parent class

---
 src/server/sql/crud.js                   | 81 +++++++++++++++++++++++-
 tools/templates/crud/server/resolvers.js | 22 +++----
 tools/templates/crud/server/sql.js       | 80 ++---------------------
 3 files changed, 96 insertions(+), 87 deletions(-)

diff --git a/src/server/sql/crud.js b/src/server/sql/crud.js
index e9a1935112..a5685523fe 100644
--- a/src/server/sql/crud.js
+++ b/src/server/sql/crud.js
@@ -1 +1,80 @@
-export default class Crud {}
+import { has } from 'lodash';
+import { decamelize } from 'humps';
+import knexnest from 'knexnest';
+
+import { selectBy } from './helpers';
+import knex from './connector';
+
+export default class Crud {
+  getPaginated({ limit, offset, orderBy, filter }, info) {
+    const baseQuery = knex(`${this.prefix}${this.tableName} as ${this.tableName}`);
+    const select = selectBy(this.schema, info, false, this.prefix);
+    const queryBuilder = select(baseQuery);
+
+    if (limit) {
+      queryBuilder.limit(limit);
+    }
+
+    if (offset) {
+      queryBuilder.offset(offset);
+    }
+
+    if (orderBy && orderBy.column) {
+      let column = orderBy.column;
+      let order = 'asc';
+      if (orderBy.order) {
+        order = orderBy.order;
+      }
+
+      queryBuilder.orderBy(decamelize(column), order);
+    } else {
+      queryBuilder.orderBy(`${this.tableName}.id`);
+    }
+
+    if (filter) {
+      if (has(filter, 'searchText') && filter.searchText !== '') {
+        const schema = this.schema;
+        queryBuilder.where(function() {
+          for (const key of schema.keys()) {
+            const value = schema.values[key];
+            if (value.searchText) {
+              this.orWhere(key, 'like', `%${filter.searchText}%`);
+            }
+          }
+        });
+      }
+    }
+
+    return knexnest(queryBuilder);
+  }
+
+  getTotal() {
+    return knex(`${this.prefix}${this.tableName}`)
+      .countDistinct('id as count')
+      .first();
+  }
+
+  get({ id }, info) {
+    const baseQuery = knex(`${this.prefix}${this.tableName} as ${this.tableName}`);
+    const select = selectBy(this.schema, info, true, this.prefix);
+    return knexnest(select(baseQuery).where(`${this.tableName}.id`, '=', id));
+  }
+
+  add(input) {
+    return knex(`${this.prefix}${this.tableName}`)
+      .insert(input)
+      .returning('id');
+  }
+
+  edit({ id, ...input }) {
+    return knex(`${this.prefix}${this.tableName}`)
+      .update(input)
+      .where({ id });
+  }
+
+  delete(id) {
+    return knex(`${this.prefix}${this.tableName}`)
+      .where({ id })
+      .del();
+  }
+}
diff --git a/tools/templates/crud/server/resolvers.js b/tools/templates/crud/server/resolvers.js
index 411aff967f..c4e6762b2f 100644
--- a/tools/templates/crud/server/resolvers.js
+++ b/tools/templates/crud/server/resolvers.js
@@ -5,7 +5,7 @@ import FieldError from '../../../common/FieldError';
 export default pubsub => ({
   Query: {
     $module$s: async (obj, args, { $Module$ }, info) => {
-      const $module$s = await $Module$.get$Module$s(args, parseFields(info).edges);
+      const $module$s = await $Module$.getPaginated(args, parseFields(info).edges);
       const { count } = await $Module$.getTotal();
 
       return {
@@ -17,7 +17,7 @@ export default pubsub => ({
       };
     },
     $module$: (obj, args, { $Module$ }, info) => {
-      return $Module$.get$Module$(args, parseFields(info));
+      return $Module$.get(args, parseFields(info));
     }
   },
   Mutation: {
@@ -26,10 +26,10 @@ export default pubsub => ({
         const e = new FieldError();
         e.throwIf();
 
-        const [id] = await $Module$.add$Module$(input);
-        const $module$ = await $Module$.get$Module$({ id }, parseFields(info).node);
+        const [id] = await $Module$.add(input);
+        const $module$ = await $Module$.get({ id }, parseFields(info).node);
 
-        return { $module$ };
+        return { node: $module$ };
       } catch (e) {
         return { errors: e };
       }
@@ -39,11 +39,11 @@ export default pubsub => ({
         const e = new FieldError();
         e.throwIf();
 
-        await $Module$.edit$Module$(input);
+        await $Module$.edit(input);
 
-        const $module$ = await $Module$.get$Module$({ id: input.id }, parseFields(info).node);
+        const $module$ = await $Module$.get({ id: input.id }, parseFields(info).node);
 
-        return { $module$ };
+        return { node: $module$ };
       } catch (e) {
         return { errors: e };
       }
@@ -51,15 +51,15 @@ export default pubsub => ({
     delete$Module$: async (obj, { id }, { $Module$ }, info) => {
       try {
         const e = new FieldError();
-        const $module$ = await $Module$.get$Module$({ id }, parseFields(info).node);
+        const $module$ = await $Module$.get({ id }, parseFields(info).node);
         if (!$module$) {
           e.setError('delete', '$Module$ does not exist.');
           e.throwIf();
         }
 
-        const isDeleted = await $Module$.delete$Module$(id);
+        const isDeleted = await $Module$.delete(id);
         if (isDeleted) {
-          return { $module$ };
+          return { node: $module$ };
         } else {
           e.setError('delete', 'Could not delete $module$. Please try again later.');
           e.throwIf();
diff --git a/tools/templates/crud/server/sql.js b/tools/templates/crud/server/sql.js
index d3a151227a..39d802a915 100644
--- a/tools/templates/crud/server/sql.js
+++ b/tools/templates/crud/server/sql.js
@@ -1,84 +1,14 @@
 import { decamelize } from 'humps';
-import { has } from 'lodash';
 
-import knexnest from 'knexnest';
 import { $Module$ as $Module$Schema } from './schema';
 import Crud from '../../../server/sql/crud';
-import { selectBy } from '../../../server/sql/helpers';
-import knex from '../../../server/sql/connector';
-
-const prefix = '';
-const tableName = decamelize($Module$Schema.name);
 
 export default class $Module$ extends Crud {
-  get$Module$s({ limit, offset, orderBy, filter }, info) {
-    const baseQuery = knex(`${prefix}${tableName} as ${tableName}`);
-    const select = selectBy($Module$Schema, info, false, prefix);
-    const queryBuilder = select(baseQuery);
-
-    if (limit) {
-      queryBuilder.limit(limit);
-    }
-
-    if (offset) {
-      queryBuilder.offset(offset);
-    }
-
-    if (orderBy && orderBy.column) {
-      let column = orderBy.column;
-      let order = 'asc';
-      if (orderBy.order) {
-        order = orderBy.order;
-      }
-
-      queryBuilder.orderBy(decamelize(column), order);
-    } else {
-      queryBuilder.orderBy(`${tableName}.id`);
-    }
-
-    if (filter) {
-      if (has(filter, 'searchText') && filter.searchText !== '') {
-        queryBuilder.where(function() {
-          for (const key of $Module$Schema.keys()) {
-            const value = $Module$Schema.values[key];
-            if (value.searchText) {
-              this.orWhere(key, 'like', `%${filter.searchText}%`);
-            }
-          }
-        });
-      }
-    }
-
-    return knexnest(queryBuilder);
-  }
-
-  getTotal() {
-    return knex(`${prefix}${tableName}`)
-      .countDistinct('id as count')
-      .first();
-  }
-
-  get$Module$({ id }, info) {
-    const baseQuery = knex(`${prefix}${tableName} as ${tableName}`);
-    const select = selectBy($Module$Schema, info, true, prefix);
-    return knexnest(select(baseQuery).where(`${tableName}.id`, '=', id));
-  }
-
-  add$Module$(input) {
-    return knex(`${prefix}${tableName}`)
-      .insert(input)
-      .returning('id');
-  }
-
-  edit$Module$({ id, ...input }) {
-    return knex(`${prefix}${tableName}`)
-      .update(input)
-      .where({ id });
-  }
+  constructor() {
+    super();
 
-  delete$Module$(id) {
-    return knex(`${prefix}${tableName}`)
-      .where({ id })
-      .del();
+    this.prefix = '';
+    this.tableName = decamelize($Module$Schema.name);
+    this.schema = $Module$Schema;
   }
 }

From 7439130fe115a1c34b1b246ac2cf6c1200f23d13 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Mon, 18 Dec 2017 11:11:44 +0100
Subject: [PATCH 062/327] use common validation

---
 src/client/modules/common/util.jsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/client/modules/common/util.jsx b/src/client/modules/common/util.jsx
index 255cdee219..d9bdc0a059 100644
--- a/src/client/modules/common/util.jsx
+++ b/src/client/modules/common/util.jsx
@@ -2,8 +2,7 @@ import React from 'react';
 import { pick, capitalize } from 'lodash';
 import { Field } from 'redux-form';
 import { RenderField } from './components/native';
-
-const required = value => (value ? undefined : 'Required');
+import { required } from '../../../common/validation';
 
 export const createFormFields = schema => {
   let fields = [];

From df9c6aad42d9362138943b245f2961df07a3a2de Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 19 Dec 2017 10:51:37 +0100
Subject: [PATCH 063/327] handle schema batch resolvers

---
 package.json                             |  1 +
 src/server/modules/post/sql.js           |  2 +-
 src/server/sql/crud.js                   | 22 ++++++++++++-
 src/server/sql/helpers.js                | 30 +++++++++++-------
 tools/cli/module.js                      | 40 +++++++++++++++++++-----
 tools/templates/crud/server/resolvers.js |  2 ++
 tools/webpackAppConfig.js                |  1 +
 yarn.lock                                |  4 +++
 8 files changed, 81 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index ffb7376223..7e5e14429d 100644
--- a/package.json
+++ b/package.json
@@ -87,6 +87,7 @@
     "graphql-auth": "^0.2.0",
     "graphql-iso-date": "^3.3.0",
     "graphql-parse-fields": "^1.2.0",
+    "graphql-resolve-batch": "^1.0.2",
     "graphql-subscriptions": "^0.5.5",
     "graphql-tag": "^2.5.0",
     "graphql-tools": "^2.11.0",
diff --git a/src/server/modules/post/sql.js b/src/server/modules/post/sql.js
index 1e07bd46da..b121b670fc 100644
--- a/src/server/modules/post/sql.js
+++ b/src/server/modules/post/sql.js
@@ -17,7 +17,7 @@ export default class Post {
   }
 
   async getCommentsForPostIds(postIds) {
-    let res = await knex
+    const res = await knex
       .select('id', 'content', 'post_id AS postId')
       .from('comment')
       .whereIn('post_id', postIds);
diff --git a/src/server/sql/crud.js b/src/server/sql/crud.js
index a5685523fe..5b0f63d942 100644
--- a/src/server/sql/crud.js
+++ b/src/server/sql/crud.js
@@ -2,10 +2,22 @@ import { has } from 'lodash';
 import { decamelize } from 'humps';
 import knexnest from 'knexnest';
 
-import { selectBy } from './helpers';
+import { selectBy, orderedFor } from './helpers';
 import knex from './connector';
 
 export default class Crud {
+  getPrefix() {
+    return this.prefix;
+  }
+
+  getTableName() {
+    return this.tableName;
+  }
+
+  getSchema() {
+    return this.schema;
+  }
+
   getPaginated({ limit, offset, orderBy, filter }, info) {
     const baseQuery = knex(`${this.prefix}${this.tableName} as ${this.tableName}`);
     const select = selectBy(this.schema, info, false, this.prefix);
@@ -77,4 +89,12 @@ export default class Crud {
       .where({ id })
       .del();
   }
+
+  async getByIds(ids, by, Obj, info) {
+    info[`${by}Id`] = true;
+    const baseQuery = knex(`${Obj.getPrefix()}${Obj.getTableName()} as ${Obj.getTableName()}`);
+    const select = selectBy(Obj.getSchema(), info, false, Obj.getPrefix());
+    const res = await knexnest(select(baseQuery).whereIn(`${Obj.getTableName()}.${by}_id`, ids));
+    return orderedFor(res, ids, `${by}Id`, false);
+  }
 }
diff --git a/src/server/sql/helpers.js b/src/server/sql/helpers.js
index dd86596dc9..c3e881560c 100644
--- a/src/server/sql/helpers.js
+++ b/src/server/sql/helpers.js
@@ -34,21 +34,29 @@ const _getSelectFields = (fields, parentPath, domainSchema, selectItems, joinNam
     if (key !== '__typename') {
       const value = domainSchema.values[key];
       if (fields[key] === true) {
-        if (!value.transient) {
-          const as = parentPath.length > 0 ? `${parentPath.join('_')}_${key}` : key;
-          const arrayPrefix = single ? '' : '_';
-          selectItems.push(`${decamelize(domainSchema.name)}.${decamelize(key)} as ${arrayPrefix}${as}`);
+        if (value && value.transient) {
+          continue;
         }
+        const as = parentPath.length > 0 ? `${parentPath.join('_')}_${key}` : key;
+        const arrayPrefix = single ? '' : '_';
+        selectItems.push(`${decamelize(domainSchema.name)}.${decamelize(key)} as ${arrayPrefix}${as}`);
       } else {
-        if (!value.type.__.transient) {
-          joinNames.push({ key: decamelize(key), name: decamelize(value.type.name) });
-        }
+        if (value.type.constructor === Array) {
+          //console.log('Array');
+          //console.log(key);
+          //console.log(fields[key]);
+          //console.log(value.type[0].name);
+        } else {
+          if (!value.type.__.transient) {
+            joinNames.push({ key: decamelize(key), name: decamelize(value.type.name) });
+          }
 
-        parentPath.push(key);
+          parentPath.push(key);
 
-        _getSelectFields(fields[key], parentPath, value.type, selectItems, joinNames, single);
+          _getSelectFields(fields[key], parentPath, value.type, selectItems, joinNames, single);
 
-        parentPath.pop();
+          parentPath.pop();
+        }
       }
     }
   }
@@ -72,4 +80,4 @@ export const selectBy = (schema, fields, single = false, prefix = '') => {
 
     return query.select(selectItems);
   };
-};
\ No newline at end of file
+};
diff --git a/tools/cli/module.js b/tools/cli/module.js
index da378f4919..41b6224517 100644
--- a/tools/cli/module.js
+++ b/tools/cli/module.js
@@ -4,14 +4,7 @@ import shell from 'shelljs';
 import fs from 'fs';
 import chalk from 'chalk';
 import GraphQLGenerator from 'domain-graphql';
-import { pascalize } from 'humps';
-
-String.prototype.toCamelCase = function() {
-  return this.replace(/^([A-Z])|\s(\w)/g, function(match, p1, p2) {
-    if (p2) return p2.toUpperCase();
-    return p1.toLowerCase();
-  });
-};
+import { pascalize, decamelize } from 'humps';
 
 function renameFiles(destinationPath, templatePath, module, location) {
   // pascalize
@@ -222,6 +215,37 @@ function updateSchema(logger, module) {
         .to(file);
 
       logger.info(chalk.green(`✔ Schema in ${pathSchema}${file} successfully updated!`));
+
+      const resolverFile = `resolvers.js`;
+      let replace = '';
+      for (const key of schema.keys()) {
+        const value = schema.values[key];
+        if (value.type.constructor === Array) {
+          replace += `  ${schema.name}: {
+    ${key}: createBatchResolver((obj, args, { ${schema.name}, ${value.type[0].name} }, info) => {
+      return ${schema.name}.getByIds(obj.map(({ id }) => id), '${decamelize(schema.name)}', ${
+            value.type[0].name
+          }, parseFields(info));
+    })
+  },
+`;
+        }
+      }
+
+      // override batch resolvers in resolvers.js file
+      const replaceBatchResolvers = `// schema batch resolvers([^*]+)// end schema batch resolvers`;
+      shell
+        .ShellString(
+          shell
+            .cat(resolverFile)
+            .replace(
+              RegExp(replaceBatchResolvers, 'g'),
+              `// schema batch resolvers\n${replace}  // end schema batch resolvers`
+            )
+        )
+        .to(resolverFile);
+
+      logger.info(chalk.green(`✔ Resolver in ${pathSchema}${resolverFile} successfully updated!`));
     } else {
       logger.error(chalk.red(`✘ Schema path ${pathSchema} not found!`));
     }
diff --git a/tools/templates/crud/server/resolvers.js b/tools/templates/crud/server/resolvers.js
index c4e6762b2f..c21e153e98 100644
--- a/tools/templates/crud/server/resolvers.js
+++ b/tools/templates/crud/server/resolvers.js
@@ -20,6 +20,8 @@ export default pubsub => ({
       return $Module$.get(args, parseFields(info));
     }
   },
+  // schema batch resolvers
+  // end schema batch resolvers
   Mutation: {
     add$Module$: async (obj, { input }, { $Module$ }, info) => {
       try {
diff --git a/tools/webpackAppConfig.js b/tools/webpackAppConfig.js
index eddecb4690..c41bf880fc 100644
--- a/tools/webpackAppConfig.js
+++ b/tools/webpackAppConfig.js
@@ -52,6 +52,7 @@ const dependencyPlatforms = {
   expo: ['ios', 'android'],
   express: 'server',
   'graphql-parse-fields': 'server',
+  'graphql-resolve-batch': 'server',
   'apollo-server-express': 'server',
   'apollo-upload-server': 'server',
   'graphql-subscriptions': 'server',
diff --git a/yarn.lock b/yarn.lock
index 9d317e3664..1658a012bc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5231,6 +5231,10 @@ graphql-parse-fields@^1.2.0:
   dependencies:
     cast-array "^1.0.1"
 
+graphql-resolve-batch@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/graphql-resolve-batch/-/graphql-resolve-batch-1.0.2.tgz#ab069df8ab3410a0188701ed9fa8e382bbb8d6a5"
+
 graphql-subscriptions@^0.5.5:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/graphql-subscriptions/-/graphql-subscriptions-0.5.5.tgz#f8ad3e094a23128d5065725f9b60020d3293999d"

From 3fc7cfd0c19f79713670312eac5432149bc1adee Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 19 Dec 2017 14:59:02 +0100
Subject: [PATCH 064/327] add missing import

---
 tools/templates/crud/server/resolvers.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/templates/crud/server/resolvers.js b/tools/templates/crud/server/resolvers.js
index c21e153e98..9356bfca90 100644
--- a/tools/templates/crud/server/resolvers.js
+++ b/tools/templates/crud/server/resolvers.js
@@ -1,5 +1,6 @@
 /*eslint-disable no-unused-vars*/
 import parseFields from 'graphql-parse-fields';
+import createBatchResolver from 'graphql-resolve-batch';
 import FieldError from '../../../common/FieldError';
 
 export default pubsub => ({

From 7552a8f518cd224e27c461397ecc138e2a52683a Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 19 Dec 2017 15:19:44 +0100
Subject: [PATCH 065/327] fix import

---
 tools/templates/crud/server/resolvers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/templates/crud/server/resolvers.js b/tools/templates/crud/server/resolvers.js
index 9356bfca90..5b44b0d61b 100644
--- a/tools/templates/crud/server/resolvers.js
+++ b/tools/templates/crud/server/resolvers.js
@@ -1,6 +1,6 @@
 /*eslint-disable no-unused-vars*/
 import parseFields from 'graphql-parse-fields';
-import createBatchResolver from 'graphql-resolve-batch';
+import { createBatchResolver } from 'graphql-resolve-batch';
 import FieldError from '../../../common/FieldError';
 
 export default pubsub => ({

From 541dc31ae9521267f82372b232dd4c132c9c11cb Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 19 Dec 2017 15:22:18 +0100
Subject: [PATCH 066/327] sources

---
 tools/cli/module.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/cli/module.js b/tools/cli/module.js
index 41b6224517..e0f86d6a10 100644
--- a/tools/cli/module.js
+++ b/tools/cli/module.js
@@ -222,8 +222,8 @@ function updateSchema(logger, module) {
         const value = schema.values[key];
         if (value.type.constructor === Array) {
           replace += `  ${schema.name}: {
-    ${key}: createBatchResolver((obj, args, { ${schema.name}, ${value.type[0].name} }, info) => {
-      return ${schema.name}.getByIds(obj.map(({ id }) => id), '${decamelize(schema.name)}', ${
+    ${key}: createBatchResolver((sources, args, { ${schema.name}, ${value.type[0].name} }, info) => {
+      return ${schema.name}.getByIds(sources.map(({ id }) => id), '${decamelize(schema.name)}', ${
             value.type[0].name
           }, parseFields(info));
     })

From 27a7f623dd7c55995813c03923483b41ddd0064d Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 22 Dec 2017 16:49:06 +0100
Subject: [PATCH 067/327] update to latest crud

---
 .../web/ui-antd/components/Option.jsx         |   6 +-
 .../web/ui-antd/components/RenderSelect.jsx   |  24 +++-
 src/client/modules/common/util.web.jsx        | 113 ++++++++++++++++--
 src/server/sql/crud.js                        |  26 +++-
 tools/cli/module.js                           | 101 +++++++++++++++-
 .../client/components/ModuleEditView.web.jsx  |  14 +--
 .../crud/client/components/ModuleForm.web.jsx |   5 +-
 .../client/components/ModuleListView.web.jsx  |  46 +------
 .../crud/client/containers/ModuleEdit.jsx     |   6 +-
 .../crud/client/graphql/ModuleQuery.graphql   |   6 +-
 tools/templates/crud/server/resolvers.js      |   9 +-
 tools/templates/crud/server/schema.graphql    |   6 +-
 12 files changed, 275 insertions(+), 87 deletions(-)

diff --git a/src/client/modules/common/components/web/ui-antd/components/Option.jsx b/src/client/modules/common/components/web/ui-antd/components/Option.jsx
index b735f5d57b..e1fba2b762 100644
--- a/src/client/modules/common/components/web/ui-antd/components/Option.jsx
+++ b/src/client/modules/common/components/web/ui-antd/components/Option.jsx
@@ -1,11 +1,11 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-//import Select from 'antd/lib/select';
+import Select from 'antd/lib/select';
 
-//const ADOption = Select.Option;
+const ADOption = Select.Option;
 
 const Option = ({ children, ...props }) => {
-  return <option {...props}>{children}</option>;
+  return <ADOption {...props}>{children}</ADOption>;
 };
 
 Option.propTypes = {
diff --git a/src/client/modules/common/components/web/ui-antd/components/RenderSelect.jsx b/src/client/modules/common/components/web/ui-antd/components/RenderSelect.jsx
index 0bdb61f800..006fa5d543 100644
--- a/src/client/modules/common/components/web/ui-antd/components/RenderSelect.jsx
+++ b/src/client/modules/common/components/web/ui-antd/components/RenderSelect.jsx
@@ -4,18 +4,31 @@ import Form from 'antd/lib/form';
 import Select from 'antd/lib/select';
 
 const FormItem = Form.Item;
+const Option = Select.Option;
 
-const RenderField = ({ input, label, type, children, meta: { touched, error } }) => {
+const RenderField = ({ input: { value, ...inputRest }, label, data, meta: { touched, error } }) => {
   let validateStatus = '';
   if (touched && error) {
     validateStatus = 'error';
   }
 
+  const options = data.map(opt => (
+    <Option key={opt.id} value={opt.id.toString()}>
+      {opt.name}
+    </Option>
+  ));
+
   return (
     <FormItem label={label} validateStatus={validateStatus} help={error}>
       <div>
-        <Select {...input} type={type}>
-          {children}
+        <Select
+          showSearch
+          {...inputRest}
+          defaultValue={value.name}
+          optionFilterProp="children"
+          filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
+        >
+          {options}
         </Select>
       </div>
     </FormItem>
@@ -23,11 +36,10 @@ const RenderField = ({ input, label, type, children, meta: { touched, error } })
 };
 
 RenderField.propTypes = {
+  data: PropTypes.array,
   input: PropTypes.object,
   label: PropTypes.string,
-  type: PropTypes.string,
-  meta: PropTypes.object,
-  children: PropTypes.node
+  meta: PropTypes.object
 };
 
 export default RenderField;
diff --git a/src/client/modules/common/util.web.jsx b/src/client/modules/common/util.web.jsx
index 610e79059f..00141d1009 100644
--- a/src/client/modules/common/util.web.jsx
+++ b/src/client/modules/common/util.web.jsx
@@ -1,23 +1,107 @@
+/* eslint-disable react/display-name */
 import React from 'react';
-import { pick, capitalize } from 'lodash';
+import { capitalize } from 'lodash';
 import { Field } from 'redux-form';
-import { RenderField } from './components/web';
+import { Link } from 'react-router-dom';
 
-const required = value => (value ? undefined : 'Required');
+import { RenderField, RenderSelect, Button } from './components/web';
+import { required } from '../../../common/validation';
 
-export const createFormFields = schema => {
-  let fields = [];
+export const createColumnFields = (schema, link, orderBy, renderOrderByArrow) => {
+  let columns = [];
 
   for (const key of schema.keys()) {
-    if (key !== 'id') {
+    if (key === 'id') {
+      columns.push({
+        title: (
+          <a onClick={e => orderBy(e, key)} href="#">
+            {capitalize(key)} {renderOrderByArrow(key)}
+          </a>
+        ),
+        dataIndex: 'id',
+        key: 'id',
+        render: (text, record) => (
+          <Link className="link" to={`/${link}/${record.id}`}>
+            {text}
+          </Link>
+        )
+      });
+    } else {
       const value = schema.values[key];
+      if (value.type.isSchema) {
+        let sortBy = 'name';
+        for (const remoteKey of value.type.keys()) {
+          const remoteValue = value.type.values[remoteKey];
+          if (remoteValue.sortBy) {
+            sortBy = remoteKey;
+          }
+        }
+        columns.push({
+          title: (
+            <a onClick={e => orderBy(e, key)} href="#">
+              {capitalize(key)} {renderOrderByArrow(key)}
+            </a>
+          ),
+          dataIndex: key,
+          key: key,
+          render: text => {
+            return text[sortBy];
+          }
+        });
+      } else if (value.type.constructor !== Array) {
+        columns.push({
+          title: (
+            <a onClick={e => orderBy(e, key)} href="#">
+              {capitalize(key)} {renderOrderByArrow(key)}
+            </a>
+          ),
+          dataIndex: key,
+          key: key
+        });
+      }
+    }
+  }
+
+  columns.push({
+    title: 'Actions',
+    key: 'actions',
+    render: (text, record) => (
+      <Button color="primary" size="sm" onClick={() => this.hendleDelete(record.id)}>
+        Delete
+      </Button>
+    )
+  });
+
+  return columns;
+};
+
+export const createFormFields = (schema, formdata) => {
+  let fields = [];
+
+  for (const key of schema.keys()) {
+    const value = schema.values[key];
+    if (key !== 'id' && value.type.constructor !== Array) {
       let validate = [];
       if (!value.optional) {
         validate.push(required);
       }
 
+      let component = RenderField;
+      let data = null;
+      if (value.type.isSchema) {
+        component = RenderSelect;
+        data = formdata[`${key}s`];
+      }
       fields.push(
-        <Field name={key} key={key} component={RenderField} type="text" label={capitalize(key)} validate={validate} />
+        <Field
+          name={key}
+          key={key}
+          component={component}
+          data={data}
+          type="text"
+          label={capitalize(key)}
+          validate={validate}
+        />
       );
     }
   }
@@ -26,5 +110,18 @@ export const createFormFields = schema => {
 };
 
 export const pickInputFields = (schema, values) => {
-  return pick(values, schema.keys());
+  let inputValues = {};
+
+  for (const key of schema.keys()) {
+    if (key in values) {
+      const value = schema.values[key];
+      if (value.type.isSchema) {
+        inputValues[`${key}Id`] = Number(values[key].id ? values[key].id : values[key]);
+      } else if (value.type.constructor !== Array) {
+        inputValues[key] = values[key];
+      }
+    }
+  }
+
+  return inputValues;
 };
diff --git a/src/server/sql/crud.js b/src/server/sql/crud.js
index 5b0f63d942..c7cefe24ba 100644
--- a/src/server/sql/crud.js
+++ b/src/server/sql/crud.js
@@ -1,5 +1,5 @@
 import { has } from 'lodash';
-import { decamelize } from 'humps';
+import { decamelize, decamelizeKeys } from 'humps';
 import knexnest from 'knexnest';
 
 import { selectBy, orderedFor } from './helpers';
@@ -38,7 +38,25 @@ export default class Crud {
         order = orderBy.order;
       }
 
-      queryBuilder.orderBy(decamelize(column), order);
+      for (const key of this.schema.keys()) {
+        if (column === key) {
+          const value = this.schema.values[key];
+          if (value.type.isSchema) {
+            let sortBy = 'name';
+            for (const remoteKey of value.type.keys()) {
+              const remoteValue = value.type.values[remoteKey];
+              if (remoteValue.sortBy) {
+                sortBy = remoteKey;
+              }
+            }
+            column = `${decamelize(value.type.name)}.${sortBy}`;
+          } else {
+            column = `${this.tableName}.${decamelize(column)}`;
+          }
+        }
+      }
+
+      queryBuilder.orderBy(column, order);
     } else {
       queryBuilder.orderBy(`${this.tableName}.id`);
     }
@@ -74,13 +92,13 @@ export default class Crud {
 
   add(input) {
     return knex(`${this.prefix}${this.tableName}`)
-      .insert(input)
+      .insert(decamelizeKeys(input))
       .returning('id');
   }
 
   edit({ id, ...input }) {
     return knex(`${this.prefix}${this.tableName}`)
-      .update(input)
+      .update(decamelizeKeys(input))
       .where({ id });
   }
 
diff --git a/tools/cli/module.js b/tools/cli/module.js
index e0f86d6a10..f2ea2d0475 100644
--- a/tools/cli/module.js
+++ b/tools/cli/module.js
@@ -80,7 +80,7 @@ function copyFiles(logger, templatePath, module, action, tablePrefix, location)
 
       if (tablePrefix !== '') {
         shell.cd(`${__dirname}/../../src/${location}/modules/${module}`);
-        shell.sed('-i', /const prefix = '';/g, `const prefix = '${tablePrefix}';`, 'sql.js');
+        shell.sed('-i', /this.prefix = '';/g, `this.prefix = '${tablePrefix}';`, 'sql.js');
 
         logger.info(chalk.green(`✔ Inserted db table prefix!`));
       }
@@ -174,13 +174,20 @@ function updateSchema(logger, module) {
       const file = `schema.graphql`;
 
       // regenerate input fields
+      let moduleData = `  node: ${Module}\n`;
       let inputAdd = '';
       let inputEdit = '';
       for (const key of schema.keys()) {
         const value = schema.values[key];
-        if (!value.type.isSchema && value.type.constructor !== Array) {
+        if (value.type.isSchema) {
           if (key !== 'id') {
-            inputAdd += `  ${key}: ` + new GraphQLGenerator()._generateField(schema.name, value, key) + '\n';
+            inputAdd += `  ${key}Id: Int!\n`;
+          }
+          inputEdit += `  ${key}Id: Int!\n`;
+          moduleData += `  ${key}s: [${value.type.name}]\n`;
+        } else if (value.type.constructor !== Array) {
+          if (key !== 'id') {
+            inputAdd += `  ${key}: ` + new GraphQLGenerator()._generateField(schema.name + '.' + key, value, []) + '\n';
           }
           inputEdit += `  ${key}: ` + new GraphQLGenerator()._generateField(schema.name + '.' + key, value, []) + '\n';
         }
@@ -202,6 +209,12 @@ function updateSchema(logger, module) {
         )
         .to(file);
 
+      // override ModuleData in schema.graphql file
+      let replaceModuleData = `type ${Module}Data {([^}])*\\n}`;
+      shell
+        .ShellString(shell.cat(file).replace(RegExp(replaceModuleData, 'g'), `type ${Module}Data {\n${moduleData}}`))
+        .to(file);
+
       // override AddModuleInput in schema.graphql file
       const replaceAdd = `input Add${Module}Input {([^}])*\\n}`;
       shell
@@ -218,9 +231,22 @@ function updateSchema(logger, module) {
 
       const resolverFile = `resolvers.js`;
       let replace = '';
+      moduleData = '';
       for (const key of schema.keys()) {
         const value = schema.values[key];
-        if (value.type.constructor === Array) {
+        if (value.type.isSchema) {
+          let column = 'name';
+          for (const remoteKey of value.type.keys()) {
+            const remoteValue = value.type.values[remoteKey];
+            if (remoteValue.sortBy) {
+              column = remoteKey;
+            }
+          }
+          moduleData += `    ${key}s(obj, args, { ${value.type.name} }) {
+      return ${value.type.name}.getPaginated(args, { id: true, ${column}: true });
+    },
+`;
+        } else if (value.type.constructor === Array) {
           replace += `  ${schema.name}: {
     ${key}: createBatchResolver((sources, args, { ${schema.name}, ${value.type[0].name} }, info) => {
       return ${schema.name}.getByIds(sources.map(({ id }) => id), '${decamelize(schema.name)}', ${
@@ -232,6 +258,19 @@ function updateSchema(logger, module) {
         }
       }
 
+      // override batch resolvers in resolvers.js file
+      replaceModuleData = `// order data([^*]+)// end order data`;
+      shell
+        .ShellString(
+          shell
+            .cat(resolverFile)
+            .replace(
+              RegExp(replaceModuleData, 'g'),
+              `// order data\n${moduleData.replace(/,\s*$/, '')}    // end order data`
+            )
+        )
+        .to(resolverFile);
+
       // override batch resolvers in resolvers.js file
       const replaceBatchResolvers = `// schema batch resolvers([^*]+)// end schema batch resolvers`;
       shell
@@ -259,7 +298,19 @@ function updateSchema(logger, module) {
       let graphql = '';
       for (const key of schema.keys()) {
         const value = schema.values[key];
-        if (!value.type.isSchema && value.type.constructor !== Array) {
+        if (value.type.isSchema) {
+          let column = 'name';
+          for (const remoteKey of value.type.keys()) {
+            const remoteValue = value.type.values[remoteKey];
+            if (remoteValue.sortBy) {
+              column = remoteKey;
+            }
+          }
+          graphql += `  ${key} {\n`;
+          graphql += `    id\n`;
+          graphql += `    ${column}\n`;
+          graphql += `  }\n`;
+        } else if (value.type.constructor !== Array) {
           graphql += `  ${key}\n`;
         }
       }
@@ -273,6 +324,44 @@ function updateSchema(logger, module) {
     } else {
       logger.error(chalk.red(`✘ Fragment path ${pathFragment} not found!`));
     }
+
+    // get module query file
+    const pathModuleQuery = `${__dirname}/../../src/client/modules/${module}/graphql/`;
+    if (fs.existsSync(pathModuleQuery)) {
+      const file = `${Module}Query.graphql`;
+
+      // regenerate graphql module query
+      let graphql = '';
+      for (const key of schema.keys()) {
+        const value = schema.values[key];
+        if (value.type.isSchema) {
+          let column = 'name';
+          for (const remoteKey of value.type.keys()) {
+            const remoteValue = value.type.values[remoteKey];
+            if (remoteValue.sortBy) {
+              column = remoteKey;
+            }
+          }
+          graphql += `    ${key}s {\n`;
+          graphql += `      id\n`;
+          graphql += `      ${column}\n`;
+          graphql += `    }\n`;
+        }
+      }
+
+      shell.cd(pathModuleQuery);
+      // override graphql module query file
+      const replaceFragment = `### form data([^()]+)### end form data`;
+      shell
+        .ShellString(
+          shell.cat(file).replace(RegExp(replaceFragment, 'g'), `### form data\n${graphql}    ### end form data`)
+        )
+        .to(file);
+
+      logger.info(chalk.green(`✔ Module query in ${pathModuleQuery}${file} successfully updated!`));
+    } else {
+      logger.error(chalk.red(`✘ Module query path ${pathModuleQuery} not found!`));
+    }
   } else {
     logger.info(chalk.red(`✘ Module ${module} in path ${modulePath} not found!`));
   }
@@ -288,7 +377,7 @@ module.exports = (action, args, options, logger) => {
   if (args.tablePrefix) {
     tablePrefix = args.tablePrefix;
   }
-
+  console.log(tablePrefix);
   let templatePath = `${__dirname}/../templates/module`;
   if (action === 'addcrud') {
     templatePath = `${__dirname}/../templates/crud`;
diff --git a/tools/templates/crud/client/components/ModuleEditView.web.jsx b/tools/templates/crud/client/components/ModuleEditView.web.jsx
index 546de66308..9147718085 100644
--- a/tools/templates/crud/client/components/ModuleEditView.web.jsx
+++ b/tools/templates/crud/client/components/ModuleEditView.web.jsx
@@ -8,6 +8,12 @@ import $Module$Form from './$Module$Form';
 import settings from '../../../../../settings';
 
 class $Module$EditView extends React.PureComponent {
+  static propTypes = {
+    loading: PropTypes.bool.isRequired,
+    $module$: PropTypes.object,
+    onSubmit: PropTypes.func.isRequired
+  };
+
   renderMetaData = () => (
     <Helmet
       title={`${settings.app.name} - Edit $Module$`}
@@ -38,17 +44,11 @@ class $Module$EditView extends React.PureComponent {
             Back
           </Link>
           <h2>{$module$ ? 'Edit' : 'Create'} $Module$</h2>
-          <$Module$Form onSubmit={onSubmit} initialValues={$module$} />
+          <$Module$Form onSubmit={onSubmit} $module$={$module$} initialValues={$module$.node} />
         </PageLayout>
       );
     }
   }
 }
 
-$Module$EditView.propTypes = {
-  loading: PropTypes.bool.isRequired,
-  $module$: PropTypes.object,
-  onSubmit: PropTypes.func.isRequired
-};
-
 export default $Module$EditView;
diff --git a/tools/templates/crud/client/components/ModuleForm.web.jsx b/tools/templates/crud/client/components/ModuleForm.web.jsx
index 7ed710f906..05b4b345cf 100644
--- a/tools/templates/crud/client/components/ModuleForm.web.jsx
+++ b/tools/templates/crud/client/components/ModuleForm.web.jsx
@@ -6,10 +6,10 @@ import { createFormFields } from '../../common/util';
 import { $Module$ as $Module$Schema } from '../../../../server/modules/$module$/schema';
 import { Form, Button, Alert } from '../../common/components/web';
 
-const $Module$Form = ({ handleSubmit, submitting, onSubmit, error }) => {
+const $Module$Form = ({ handleSubmit, submitting, onSubmit, $module$, error }) => {
   return (
     <Form name="post" onSubmit={handleSubmit(onSubmit)}>
-      {createFormFields($Module$Schema)}
+      {createFormFields($Module$Schema, $module$)}
       {error && <Alert color="error">{error}</Alert>}
       <Button color="primary" type="submit" disabled={submitting}>
         Save
@@ -22,6 +22,7 @@ $Module$Form.propTypes = {
   handleSubmit: PropTypes.func,
   onSubmit: PropTypes.func,
   submitting: PropTypes.bool,
+  $module$: PropTypes.object,
   error: PropTypes.string
 };
 
diff --git a/tools/templates/crud/client/components/ModuleListView.web.jsx b/tools/templates/crud/client/components/ModuleListView.web.jsx
index 56061a9c20..75b53b174c 100644
--- a/tools/templates/crud/client/components/ModuleListView.web.jsx
+++ b/tools/templates/crud/client/components/ModuleListView.web.jsx
@@ -2,11 +2,10 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import Helmet from 'react-helmet';
-import { Link } from 'react-router-dom';
-import { capitalize } from 'lodash';
 
 import { Table, Button } from '../../common/components/web';
 import { $Module$ as $Module$Schema } from '../../../../server/modules/$module$/schema';
+import { createColumnFields } from '../../common/util';
 
 class $Module$ListView extends React.PureComponent {
   static propTypes = {
@@ -78,48 +77,7 @@ class $Module$ListView extends React.PureComponent {
 
   render() {
     const { loading, $module$s, loadMoreRows } = this.props;
-
-    let columns = [];
-
-    for (const key of $Module$Schema.keys()) {
-      if (key === 'id') {
-        columns.push({
-          title: (
-            <a onClick={e => this.orderBy(e, key)} href="#">
-              {capitalize(key)} {this.renderOrderByArrow(key)}
-            </a>
-          ),
-          dataIndex: 'id',
-          key: 'id',
-          render: (text, record) => (
-            <Link className="$module$-link" to={`/$module$/${record.id}`}>
-              {text}
-            </Link>
-          )
-        });
-      } else {
-        columns.push({
-          title: (
-            <a onClick={e => this.orderBy(e, key)} href="#">
-              {capitalize(key)} {this.renderOrderByArrow(key)}
-            </a>
-          ),
-          dataIndex: key,
-          key: key
-        });
-      }
-    }
-
-    columns.push({
-      title: 'Actions',
-      key: 'actions',
-      render: (text, record) => (
-        <Button color="primary" size="sm" onClick={() => this.hendleDelete(record.id)}>
-          Delete
-        </Button>
-      )
-    });
-
+    const columns = createColumnFields($Module$Schema, '$module$', this.orderBy, this.renderOrderByArrow);
     return (
       <div>
         <Table
diff --git a/tools/templates/crud/client/containers/ModuleEdit.jsx b/tools/templates/crud/client/containers/ModuleEdit.jsx
index 63a843f386..722ebd5f43 100644
--- a/tools/templates/crud/client/containers/ModuleEdit.jsx
+++ b/tools/templates/crud/client/containers/ModuleEdit.jsx
@@ -12,12 +12,12 @@ import EDIT_$MODULE$ from '../graphql/Edit$Module$.graphql';
 
 class $Module$Edit extends React.Component {
   onSubmit = async values => {
-    const { $module$, add$Module$, edit$Module$ } = this.props;
+    const { $module$: { node }, add$Module$, edit$Module$ } = this.props;
     let result = null;
 
     const insertValues = pickInputFields($Module$Schema, values);
 
-    if ($module$) {
+    if (node) {
       result = await edit$Module$(insertValues);
     } else {
       result = await add$Module$(insertValues);
@@ -38,7 +38,7 @@ class $Module$Edit extends React.Component {
 }
 
 $Module$Edit.propTypes = {
-  crud: PropTypes.object,
+  $module$: PropTypes.object,
   add$Module$: PropTypes.func.isRequired,
   edit$Module$: PropTypes.func.isRequired
 };
diff --git a/tools/templates/crud/client/graphql/ModuleQuery.graphql b/tools/templates/crud/client/graphql/ModuleQuery.graphql
index 2506aea2a8..06e3bdc143 100644
--- a/tools/templates/crud/client/graphql/ModuleQuery.graphql
+++ b/tools/templates/crud/client/graphql/ModuleQuery.graphql
@@ -2,7 +2,11 @@
 
 query $module$($id: Int!) {
   $module$(id: $id) {
-    ...$Module$Info
+    node {
+      ...$Module$Info
+    }
+    ### form data
+    ### end form data
   }
 }
 
diff --git a/tools/templates/crud/server/resolvers.js b/tools/templates/crud/server/resolvers.js
index 5b44b0d61b..5b32268d2d 100644
--- a/tools/templates/crud/server/resolvers.js
+++ b/tools/templates/crud/server/resolvers.js
@@ -17,10 +17,15 @@ export default pubsub => ({
         }
       };
     },
-    $module$: (obj, args, { $Module$ }, info) => {
-      return $Module$.get(args, parseFields(info));
+    $module$: async (obj, args, { $Module$ }, info) => {
+      const $module$ = await $Module$.get(args, parseFields(info).node);
+      return { node: $module$ };
     }
   },
+  $Module$Data: {
+    // order data
+    // end order data
+  },
   // schema batch resolvers
   // end schema batch resolvers
   Mutation: {
diff --git a/tools/templates/crud/server/schema.graphql b/tools/templates/crud/server/schema.graphql
index 3900b13923..64bd4b8ed1 100644
--- a/tools/templates/crud/server/schema.graphql
+++ b/tools/templates/crud/server/schema.graphql
@@ -10,6 +10,10 @@ type $Module$s {
   edges: [$Module$]
 }
 
+type $Module$Data {
+  node: $Module$
+}
+
 type $Module$Payload {
   node: $Module$
   errors: [FieldError!]
@@ -35,7 +39,7 @@ input Edit$Module$Input {
 
 extend type Query {
   $module$s(limit: Int, offset: Int, orderBy: OrderBy$Module$Input, filter: Filter$Module$Input): $Module$s
-  $module$(id: Int!): $Module$
+  $module$(id: Int!): $Module$Data
 }
 
 extend type Mutation {

From fe00c1a58a2588fdec4c3bca2100fae2199a2542 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 24 Jan 2018 08:30:17 +0100
Subject: [PATCH 068/327] update to latest crud

---
 package.json                                  |  11 +-
 .../common/components/crud/EditView.jsx       |  20 +-
 .../common/components/crud/EditView.web.jsx   |  59 +++++
 .../common/components/crud/FilterView.web.jsx |  16 +-
 .../common/components/crud/FormView.jsx       |  16 +-
 .../common/components/crud/FormView.web.jsx   |  18 +-
 .../common/components/crud/ListView.jsx       |  37 +--
 .../common/components/crud/ListView.web.jsx   | 246 ++++++++++++++++++
 .../modules/common/components/crud/index.jsx  |   5 +
 .../modules/common/components/native/index.js |   4 +-
 .../modules/common/components/web/index.jsx   |   4 +-
 .../web/ui-antd/components/Popconfirm.jsx     |  13 +
 .../web/ui-antd/components/RenderDate.jsx     |  42 +++
 .../web/ui-antd/components/RenderSwitch.jsx   |  30 +++
 .../web/ui-antd/components/Switch.jsx         |   8 +
 .../web/ui-antd/components/index.js           |   4 +
 .../components/web/ui-antd/styles/styles.less |   8 +
 src/client/modules/common/util.web.jsx        | 133 ++++++----
 src/server/api/rootSchema.graphql             |  10 +
 src/server/sql/crud.js                        |  39 ++-
 tools/cli/module.js                           |  50 ++--
 .../crud/client/components/Module.jsx         |  29 ++-
 .../crud/client/components/Module.web.jsx     |  49 ++--
 .../client/components/ModuleEditView.web.jsx  |  54 ----
 .../client/components/ModuleListView.web.jsx  | 102 --------
 .../crud/client/containers/ModuleEdit.jsx     |  65 ++---
 .../crud/client/containers/ModuleFilter.jsx   |   4 +-
 .../crud/client/containers/ModuleList.jsx     |  56 +++-
 ...AddModule.graphql => CreateModule.graphql} |   4 +-
 .../client/graphql/DeleteManyModules.graphql  |   9 +
 .../crud/client/graphql/DeleteModule.graphql  |   4 +-
 .../crud/client/graphql/EditModule.graphql    |  13 -
 .../crud/client/graphql/ModuleQuery.graphql   |   4 +-
 .../crud/client/graphql/ModulesQuery.graphql  |   2 +-
 .../crud/client/graphql/SortModules.graphql   |   9 +
 .../crud/client/graphql/UpdateModule.graphql  |  13 +
 tools/templates/crud/client/index.jsx         |   2 +-
 tools/templates/crud/client/index.web.jsx     |   2 +-
 tools/templates/crud/client/reducers/index.js |   3 +
 tools/templates/crud/server/resolvers.js      |  56 +++-
 tools/templates/crud/server/schema.graphql    |  31 +--
 tools/webpackAppConfig.js                     |   3 +-
 yarn.lock                                     |  66 +++--
 43 files changed, 918 insertions(+), 435 deletions(-)
 rename tools/templates/crud/client/components/ModuleEditView.jsx => src/client/modules/common/components/crud/EditView.jsx (53%)
 create mode 100644 src/client/modules/common/components/crud/EditView.web.jsx
 rename tools/templates/crud/client/components/ModuleFilterView.web.jsx => src/client/modules/common/components/crud/FilterView.web.jsx (67%)
 rename tools/templates/crud/client/components/ModuleForm.jsx => src/client/modules/common/components/crud/FormView.jsx (51%)
 rename tools/templates/crud/client/components/ModuleForm.web.jsx => src/client/modules/common/components/crud/FormView.web.jsx (52%)
 rename tools/templates/crud/client/components/ModuleListView.jsx => src/client/modules/common/components/crud/ListView.jsx (50%)
 create mode 100644 src/client/modules/common/components/crud/ListView.web.jsx
 create mode 100644 src/client/modules/common/components/crud/index.jsx
 create mode 100644 src/client/modules/common/components/web/ui-antd/components/Popconfirm.jsx
 create mode 100644 src/client/modules/common/components/web/ui-antd/components/RenderDate.jsx
 create mode 100644 src/client/modules/common/components/web/ui-antd/components/RenderSwitch.jsx
 create mode 100644 src/client/modules/common/components/web/ui-antd/components/Switch.jsx
 delete mode 100644 tools/templates/crud/client/components/ModuleEditView.web.jsx
 delete mode 100644 tools/templates/crud/client/components/ModuleListView.web.jsx
 rename tools/templates/crud/client/graphql/{AddModule.graphql => CreateModule.graphql} (57%)
 create mode 100644 tools/templates/crud/client/graphql/DeleteManyModules.graphql
 delete mode 100644 tools/templates/crud/client/graphql/EditModule.graphql
 create mode 100644 tools/templates/crud/client/graphql/SortModules.graphql
 create mode 100644 tools/templates/crud/client/graphql/UpdateModule.graphql

diff --git a/package.json b/package.json
index 07a7ddfe37..49715bf1a2 100644
--- a/package.json
+++ b/package.json
@@ -74,10 +74,10 @@
     "bootstrap": "4.0.0-beta.2",
     "cors": "^2.8.4",
     "dataloader": "^1.3.0",
-    "domain-graphql": "^0.0.12",
-    "domain-knex": "^0.0.8",
-    "domain-react-forms": "^0.0.8",
-    "domain-schema": "^0.0.10",
+    "domain-graphql": "^0.0.14",
+    "domain-knex": "^0.0.10",
+    "domain-react-forms": "^0.0.9",
+    "domain-schema": "^0.0.13",
     "dotenv": "^4.0.0",
     "error-stack-parser": "^2.0.1",
     "expo": "^24.0.2",
@@ -101,6 +101,7 @@
     "knexnest": "^0.4.1",
     "lodash": "^4.17.4",
     "minilog": "^3.1.0",
+    "moment": "^2.20.1",
     "mysql2": "^1.5.1",
     "native-base": "^2.3.6",
     "nodemailer": "^4.4.1",
@@ -116,6 +117,8 @@
     "react-apollo": "^2.0.4",
     "react-cookie": "^2.1.2",
     "react-debounce-input": "^3.1.0",
+    "react-dnd": "^2.5.4",
+    "react-dnd-html5-backend": "^2.5.4",
     "react-dom": "^16.2.0",
     "react-dropzone": "^4.2.3",
     "react-ga": "^2.4.0",
diff --git a/tools/templates/crud/client/components/ModuleEditView.jsx b/src/client/modules/common/components/crud/EditView.jsx
similarity index 53%
rename from tools/templates/crud/client/components/ModuleEditView.jsx
rename to src/client/modules/common/components/crud/EditView.jsx
index 1798d6b724..ced65dad32 100644
--- a/tools/templates/crud/client/components/ModuleEditView.jsx
+++ b/src/client/modules/common/components/crud/EditView.jsx
@@ -2,29 +2,29 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { StyleSheet, Text, View } from 'react-native';
 
-import $Module$Form from './$Module$Form';
+import FormView from './FormView';
 
-const $Module$EditView = ({ loading, $module$, navigation, onSubmit }) => {
-  let $module$Obj = $module$;
+const EditView = ({ loading, data, navigation, onSubmit }) => {
+  let dataObj = data;
 
-  if (!$module$Obj && navigation.state) {
-    $module$Obj = navigation.state.params.$module$;
+  if (!dataObj && navigation.state) {
+    dataObj = navigation.state.params.data;
   }
 
-  if (loading && !$module$Obj) {
+  if (loading && !dataObj) {
     return (
       <View style={styles.container}>
         <Text>Loading...</Text>
       </View>
     );
   } else {
-    return <$Module$Form onSubmit={onSubmit} initialValues={$module$Obj ? $module$Obj : {}} />;
+    return <FormView onSubmit={onSubmit} initialValues={dataObj ? dataObj : {}} />;
   }
 };
 
-$Module$EditView.propTypes = {
+EditView.propTypes = {
   loading: PropTypes.bool.isRequired,
-  $module$: PropTypes.object,
+  data: PropTypes.object,
   onSubmit: PropTypes.func.isRequired,
   navigation: PropTypes.object.isRequired
 };
@@ -38,4 +38,4 @@ const styles = StyleSheet.create({
   }
 });
 
-export default $Module$EditView;
+export default EditView;
diff --git a/src/client/modules/common/components/crud/EditView.web.jsx b/src/client/modules/common/components/crud/EditView.web.jsx
new file mode 100644
index 0000000000..79ad86cc98
--- /dev/null
+++ b/src/client/modules/common/components/crud/EditView.web.jsx
@@ -0,0 +1,59 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Helmet from 'react-helmet';
+import { Link } from 'react-router-dom';
+
+import { PageLayout } from '../web';
+import FormView from './FormView';
+import settings from '../../../../../../settings';
+
+class EditView extends React.PureComponent {
+  static propTypes = {
+    loading: PropTypes.bool.isRequired,
+    data: PropTypes.object,
+    onSubmit: PropTypes.func.isRequired,
+    schema: PropTypes.object.isRequired,
+    title: PropTypes.string.isRequired,
+    link: PropTypes.string.isRequired
+  };
+
+  renderMetaData = title => (
+    <Helmet
+      title={`${settings.app.name} - Edit ${title}`}
+      meta={[
+        {
+          name: 'description',
+          content: `${settings.app.name} - Edit ${title} example page`
+        }
+      ]}
+    />
+  );
+
+  render() {
+    const { loading, data, onSubmit, schema, title, link } = this.props;
+
+    if (loading && !data) {
+      return (
+        <PageLayout>
+          {this.renderMetaData(title)}
+          <div className="text-center">Loading...</div>
+        </PageLayout>
+      );
+    } else {
+      return (
+        <PageLayout>
+          {this.renderMetaData(title)}
+          <Link id="back-button" to={`/${link}`}>
+            Back
+          </Link>
+          <h2>
+            {data ? 'Edit' : 'Create'} {title}
+          </h2>
+          <FormView onSubmit={onSubmit} data={data} schema={schema} initialValues={data.node} />
+        </PageLayout>
+      );
+    }
+  }
+}
+
+export default EditView;
diff --git a/tools/templates/crud/client/components/ModuleFilterView.web.jsx b/src/client/modules/common/components/crud/FilterView.web.jsx
similarity index 67%
rename from tools/templates/crud/client/components/ModuleFilterView.web.jsx
rename to src/client/modules/common/components/crud/FilterView.web.jsx
index 1315fb63d4..c0364bb0c7 100644
--- a/tools/templates/crud/client/components/ModuleFilterView.web.jsx
+++ b/src/client/modules/common/components/crud/FilterView.web.jsx
@@ -1,9 +1,14 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { DebounceInput } from 'react-debounce-input';
-import { Form, FormItem, Input } from '../../common/components/web';
+import { Form, FormItem, Input } from '../web';
+
+class FilterView extends React.PureComponent {
+  static propTypes = {
+    searchText: PropTypes.string,
+    onSearchTextChange: PropTypes.func.isRequired
+  };
 
-class $Module$FilterView extends React.PureComponent {
   handleSearch = e => {
     const { onSearchTextChange } = this.props;
     onSearchTextChange(e.target.value);
@@ -26,9 +31,4 @@ class $Module$FilterView extends React.PureComponent {
   }
 }
 
-$Module$FilterView.propTypes = {
-  searchText: PropTypes.string,
-  onSearchTextChange: PropTypes.func.isRequired
-};
-
-export default $Module$FilterView;
+export default FilterView;
diff --git a/tools/templates/crud/client/components/ModuleForm.jsx b/src/client/modules/common/components/crud/FormView.jsx
similarity index 51%
rename from tools/templates/crud/client/components/ModuleForm.jsx
rename to src/client/modules/common/components/crud/FormView.jsx
index 837bdfa521..8b96d92492 100644
--- a/tools/templates/crud/client/components/ModuleForm.jsx
+++ b/src/client/modules/common/components/crud/FormView.jsx
@@ -2,14 +2,13 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { reduxForm } from 'redux-form';
 
-import { createFormFields } from '../../common/util';
-import { $Module$ as $Module$Schema } from '../../../../server/modules/$module$/schema';
-import { FormView, FormButton } from '../../common/components/native';
+import { createFormFields } from '../../util';
+import { FormView, FormButton } from '../native';
 
-const $Module$Form = ({ handleSubmit, valid, onSubmit }) => {
+const Form = ({ handleSubmit, valid, onSubmit, schema }) => {
   return (
     <FormView>
-      {createFormFields($Module$Schema)}
+      {createFormFields(schema)}
       <FormButton onPress={handleSubmit(onSubmit)} disabled={!valid}>
         Save
       </FormButton>
@@ -17,13 +16,14 @@ const $Module$Form = ({ handleSubmit, valid, onSubmit }) => {
   );
 };
 
-$Module$Form.propTypes = {
+Form.propTypes = {
   handleSubmit: PropTypes.func,
   onSubmit: PropTypes.func,
+  schema: PropTypes.object,
   valid: PropTypes.bool
 };
 
 export default reduxForm({
-  form: '$module$',
+  form: 'form',
   enableReinitialize: true
-})($Module$Form);
+})(Form);
diff --git a/tools/templates/crud/client/components/ModuleForm.web.jsx b/src/client/modules/common/components/crud/FormView.web.jsx
similarity index 52%
rename from tools/templates/crud/client/components/ModuleForm.web.jsx
rename to src/client/modules/common/components/crud/FormView.web.jsx
index 05b4b345cf..d3e3f8e48b 100644
--- a/tools/templates/crud/client/components/ModuleForm.web.jsx
+++ b/src/client/modules/common/components/crud/FormView.web.jsx
@@ -2,14 +2,13 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { reduxForm } from 'redux-form';
 
-import { createFormFields } from '../../common/util';
-import { $Module$ as $Module$Schema } from '../../../../server/modules/$module$/schema';
-import { Form, Button, Alert } from '../../common/components/web';
+import { createFormFields } from '../../util';
+import { Form, Button, Alert } from '../web';
 
-const $Module$Form = ({ handleSubmit, submitting, onSubmit, $module$, error }) => {
+const FormView = ({ handleSubmit, submitting, onSubmit, data, error, schema }) => {
   return (
     <Form name="post" onSubmit={handleSubmit(onSubmit)}>
-      {createFormFields($Module$Schema, $module$)}
+      {createFormFields(schema, data)}
       {error && <Alert color="error">{error}</Alert>}
       <Button color="primary" type="submit" disabled={submitting}>
         Save
@@ -18,14 +17,15 @@ const $Module$Form = ({ handleSubmit, submitting, onSubmit, $module$, error }) =
   );
 };
 
-$Module$Form.propTypes = {
+FormView.propTypes = {
   handleSubmit: PropTypes.func,
   onSubmit: PropTypes.func,
   submitting: PropTypes.bool,
-  $module$: PropTypes.object,
+  data: PropTypes.object,
+  schema: PropTypes.object,
   error: PropTypes.string
 };
 
 export default reduxForm({
-  form: '$module$'
-})($Module$Form);
+  form: 'form'
+})(FormView);
diff --git a/tools/templates/crud/client/components/ModuleListView.jsx b/src/client/modules/common/components/crud/ListView.jsx
similarity index 50%
rename from tools/templates/crud/client/components/ModuleListView.jsx
rename to src/client/modules/common/components/crud/ListView.jsx
index def0e0d0c6..647be348d4 100644
--- a/tools/templates/crud/client/components/ModuleListView.jsx
+++ b/src/client/modules/common/components/crud/ListView.jsx
@@ -1,19 +1,29 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { StyleSheet, FlatList, Text, View } from 'react-native';
-import { SwipeAction } from '../../common/components/native';
+import { SwipeAction } from '../native';
+
+class ListView extends React.PureComponent {
+  static propTypes = {
+    loading: PropTypes.bool.isRequired,
+    data: PropTypes.array,
+    orderBy: PropTypes.object,
+    onOrderBy: PropTypes.func.isRequired,
+    deleteEntry: PropTypes.func.isRequired,
+    navigation: PropTypes.object.isRequired,
+    nativeLink: PropTypes.string.isRequired
+  };
 
-class $Module$ListView extends React.PureComponent {
   keyExtractor = item => item.id;
 
   renderItem = ({ item: { id, name } }) => {
-    const { delete$Module$, navigation } = this.props;
+    const { deleteEntry, navigation, nativeLink } = this.props;
     return (
       <SwipeAction
-        onPress={() => navigation.navigate('$Module$Edit', { id })}
+        onPress={() => navigation.navigate(nativeLink, { id })}
         right={{
           text: 'Delete',
-          onPress: () => delete$Module$(id)
+          onPress: () => deleteEntry(id)
         }}
       >
         {name}
@@ -22,29 +32,20 @@ class $Module$ListView extends React.PureComponent {
   };
 
   render() {
-    const { loading, $module$s } = this.props;
+    const { loading, data } = this.props;
 
-    if (loading && !$module$s) {
+    if (loading && !data) {
       return (
         <View style={styles.container}>
           <Text>Loading...</Text>
         </View>
       );
     } else {
-      return <FlatList data={$module$s} keyExtractor={this.keyExtractor} renderItem={this.renderItem} />;
+      return <FlatList data={data} keyExtractor={this.keyExtractor} renderItem={this.renderItem} />;
     }
   }
 }
 
-$Module$ListView.propTypes = {
-  loading: PropTypes.bool.isRequired,
-  $module$s: PropTypes.array,
-  orderBy: PropTypes.object,
-  onOrderBy: PropTypes.func.isRequired,
-  delete$Module$: PropTypes.func.isRequired,
-  navigation: PropTypes.object.isRequired
-};
-
 const styles = StyleSheet.create({
   container: {
     flex: 1,
@@ -62,4 +63,4 @@ const styles = StyleSheet.create({
   }
 });
 
-export default $Module$ListView;
+export default ListView;
diff --git a/src/client/modules/common/components/crud/ListView.web.jsx b/src/client/modules/common/components/crud/ListView.web.jsx
new file mode 100644
index 0000000000..a6869d01ec
--- /dev/null
+++ b/src/client/modules/common/components/crud/ListView.web.jsx
@@ -0,0 +1,246 @@
+/* eslint-disable react/display-name */
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Link } from 'react-router-dom';
+import { DragDropContext, DragSource, DropTarget } from 'react-dnd';
+import HTML5Backend from 'react-dnd-html5-backend';
+import { Table, Button } from '../web';
+import { createColumnFields } from '../../util';
+
+function dragDirection(dragIndex, hoverIndex, initialClientOffset, clientOffset, sourceClientOffset) {
+  const hoverMiddleY = (initialClientOffset.y - sourceClientOffset.y) / 2;
+  const hoverClientY = clientOffset.y - sourceClientOffset.y;
+  if (dragIndex < hoverIndex && hoverClientY > hoverMiddleY) {
+    return 'downward';
+  }
+  if (dragIndex > hoverIndex && hoverClientY < hoverMiddleY) {
+    return 'upward';
+  }
+}
+
+let BodyRow = props => {
+  const {
+    isOver,
+    connectDragSource,
+    connectDropTarget,
+    moveRow,
+    dragRow,
+    clientOffset,
+    sourceClientOffset,
+    initialClientOffset,
+    ...restProps
+  } = props;
+  const style = { cursor: 'move' };
+
+  let className = restProps.className;
+  if (isOver && initialClientOffset) {
+    const direction = dragDirection(
+      dragRow.index,
+      restProps.index,
+      initialClientOffset,
+      clientOffset,
+      sourceClientOffset
+    );
+    if (direction === 'downward') {
+      className += ' drop-over-downward';
+    }
+    if (direction === 'upward') {
+      className += ' drop-over-upward';
+    }
+  }
+
+  return connectDragSource(connectDropTarget(<tr {...restProps} className={className} style={style} />));
+};
+
+const rowSource = {
+  beginDrag(props) {
+    return {
+      index: props.index
+    };
+  }
+};
+
+const rowTarget = {
+  drop(props, monitor) {
+    const dragIndex = monitor.getItem().index;
+    const hoverIndex = props.index;
+
+    // Don't replace items with themselves
+    if (dragIndex === hoverIndex) {
+      return;
+    }
+
+    // Time to actually perform the action
+    props.moveRow(dragIndex, hoverIndex);
+
+    // Note: we're mutating the monitor item here!
+    // Generally it's better to avoid mutations,
+    // but it's good here for the sake of performance
+    // to avoid expensive index searches.
+    monitor.getItem().index = hoverIndex;
+  }
+};
+
+BodyRow = DropTarget('row', rowTarget, (connect, monitor) => ({
+  connectDropTarget: connect.dropTarget(),
+  isOver: monitor.isOver(),
+  sourceClientOffset: monitor.getSourceClientOffset()
+}))(
+  DragSource('row', rowSource, (connect, monitor) => ({
+    connectDragSource: connect.dragSource(),
+    dragRow: monitor.getItem(),
+    clientOffset: monitor.getClientOffset(),
+    initialClientOffset: monitor.getInitialClientOffset()
+  }))(BodyRow)
+);
+
+class ListView extends React.PureComponent {
+  static propTypes = {
+    loading: PropTypes.bool.isRequired,
+    data: PropTypes.object,
+    orderBy: PropTypes.object,
+    onOrderBy: PropTypes.func.isRequired,
+    deleteEntry: PropTypes.func.isRequired,
+    sortEntries: PropTypes.func.isRequired,
+    deleteManyEntries: PropTypes.func.isRequired,
+    loadMoreRows: PropTypes.func.isRequired,
+    schema: PropTypes.object.isRequired,
+    link: PropTypes.string.isRequired
+  };
+
+  state = {
+    selectedRowKeys: [],
+    loading: false
+  };
+
+  components = {
+    body: {
+      row: BodyRow
+    }
+  };
+
+  moveRow = (dragIndex, hoverIndex) => {
+    const { data, sortEntries } = this.props;
+    const dragRow = data.edges[dragIndex];
+    const dragReplace = data.edges[hoverIndex];
+
+    sortEntries([dragRow.id, dragReplace.id, dragReplace.rank, dragRow.rank]);
+  };
+
+  renderLoadMore = (data, loadMoreRows) => {
+    if (data.pageInfo.hasNextPage) {
+      return (
+        <Button id="load-more" color="primary" onClick={loadMoreRows}>
+          Load more ...
+        </Button>
+      );
+    }
+  };
+
+  renderOrderByArrow = name => {
+    const { orderBy } = this.props;
+
+    if (orderBy && orderBy.column === name) {
+      if (orderBy.order === 'desc') {
+        return <span className="badge badge-primary">&#8595;</span>;
+      } else {
+        return <span className="badge badge-primary">&#8593;</span>;
+      }
+    } else {
+      return <span className="badge badge-secondary">&#8645;</span>;
+    }
+  };
+
+  hendleDelete = id => {
+    const { deleteEntry } = this.props;
+    deleteEntry(id);
+  };
+
+  hendleDeleteMany = () => {
+    const { deleteManyEntries } = this.props;
+    const { selectedRowKeys } = this.state;
+    deleteManyEntries(selectedRowKeys);
+    this.setState({ selectedRowKeys: [] });
+  };
+
+  orderBy = (e, name) => {
+    const { onOrderBy, orderBy } = this.props;
+
+    e.preventDefault();
+
+    let order = 'asc';
+    if (orderBy && orderBy.column === name) {
+      if (orderBy.order === 'asc') {
+        order = 'desc';
+      } else if (orderBy.order === 'desc') {
+        return onOrderBy({});
+      }
+    }
+
+    return onOrderBy({ column: name, order });
+  };
+
+  rowSelection = {
+    onChange: selectedRowKeys => {
+      this.setState({ selectedRowKeys });
+    }
+  };
+
+  render() {
+    const { loading, data, loadMoreRows, schema, link } = this.props;
+    const { selectedRowKeys } = this.state;
+    const hasSelected = selectedRowKeys.length > 0;
+
+    const title = () => {
+      return (
+        <Link to={`/${link}/0`}>
+          <Button color="primary">Add</Button>
+        </Link>
+      );
+    };
+
+    const footer = () => {
+      return (
+        <div>
+          <div>
+            <span style={{ marginRight: 8 }}>
+              {data && (
+                <small>
+                  ({data.edges ? data.edges.length : 0} / {data.pageInfo.totalCount})
+                </small>
+              )}
+            </span>
+            <Button color="primary" onClick={this.hendleDeleteMany} disabled={!hasSelected} loading={loading}>
+              Delete
+            </Button>
+            <span style={{ marginLeft: 8 }}>{hasSelected ? `(${selectedRowKeys.length} selected)` : ''}</span>
+          </div>
+        </div>
+      );
+    };
+
+    const columns = createColumnFields(schema, link, this.orderBy, this.renderOrderByArrow, this.hendleDelete);
+    return (
+      <div>
+        <Table
+          dataSource={data ? data.edges : null}
+          columns={columns}
+          pagination={false}
+          size="small"
+          rowSelection={this.rowSelection}
+          loading={loading && !data}
+          title={title}
+          footer={footer}
+          components={this.components}
+          onRow={(record, index) => ({
+            index,
+            moveRow: this.moveRow
+          })}
+        />
+        {data && this.renderLoadMore(data, loadMoreRows)}
+      </div>
+    );
+  }
+}
+
+export default DragDropContext(HTML5Backend)(ListView);
diff --git a/src/client/modules/common/components/crud/index.jsx b/src/client/modules/common/components/crud/index.jsx
new file mode 100644
index 0000000000..df236e0ec4
--- /dev/null
+++ b/src/client/modules/common/components/crud/index.jsx
@@ -0,0 +1,5 @@
+// eslint-disable-next-line import/prefer-default-export
+export { default as ListView } from './ListView';
+export { default as EditView } from './EditView';
+export { default as FormView } from './FormView';
+export { default as FilterView } from './FilterView';
diff --git a/src/client/modules/common/components/native/index.js b/src/client/modules/common/components/native/index.js
index 3fd83eade2..99fd3157a5 100644
--- a/src/client/modules/common/components/native/index.js
+++ b/src/client/modules/common/components/native/index.js
@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/prefer-default-export
-export * from './ui-native-base/components';
-//export * from './ui-antd-mobile/components';
+//export * from './ui-native-base/components';
+export * from './ui-antd-mobile/components';
 export { default as RenderField } from './RenderField';
 export { default as createTabBarIconWrapper } from './createTabBarIconWrapper';
diff --git a/src/client/modules/common/components/web/index.jsx b/src/client/modules/common/components/web/index.jsx
index 966a8a20c9..b51fbfc6f8 100644
--- a/src/client/modules/common/components/web/index.jsx
+++ b/src/client/modules/common/components/web/index.jsx
@@ -1,2 +1,2 @@
-export * from './ui-bootstrap';
-//export * from './ui-antd';
+//export * from './ui-bootstrap';
+export * from './ui-antd';
diff --git a/src/client/modules/common/components/web/ui-antd/components/Popconfirm.jsx b/src/client/modules/common/components/web/ui-antd/components/Popconfirm.jsx
new file mode 100644
index 0000000000..f24bf826cb
--- /dev/null
+++ b/src/client/modules/common/components/web/ui-antd/components/Popconfirm.jsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ADPopconfirm from 'antd/lib/popconfirm';
+
+const Popconfirm = ({ children, ...props }) => {
+  return <ADPopconfirm {...props}>{children}</ADPopconfirm>;
+};
+
+Popconfirm.propTypes = {
+  children: PropTypes.node
+};
+
+export default Popconfirm;
diff --git a/src/client/modules/common/components/web/ui-antd/components/RenderDate.jsx b/src/client/modules/common/components/web/ui-antd/components/RenderDate.jsx
new file mode 100644
index 0000000000..5a056d8712
--- /dev/null
+++ b/src/client/modules/common/components/web/ui-antd/components/RenderDate.jsx
@@ -0,0 +1,42 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Form from 'antd/lib/form';
+import DatePicker from 'antd/lib/date-picker';
+import moment from 'moment';
+
+const dateFormat = 'YYYY-MM-DD';
+const FormItem = Form.Item;
+
+const RenderDate = ({ input: { value, onChange, ...inputRest }, label, meta: { touched, error } }) => {
+  let validateStatus = '';
+  if (touched && error) {
+    validateStatus = 'error';
+  }
+  if (value !== '') {
+    value = moment(value, dateFormat);
+  } else {
+    value = null;
+  }
+
+  return (
+    <FormItem label={label} validateStatus={validateStatus} help={touched && error}>
+      <div>
+        <DatePicker
+          value={value}
+          format={dateFormat}
+          onChange={(date, dateString) => onChange(dateString)}
+          {...inputRest}
+        />
+      </div>
+    </FormItem>
+  );
+};
+
+RenderDate.propTypes = {
+  input: PropTypes.object,
+  label: PropTypes.string,
+  type: PropTypes.string,
+  meta: PropTypes.object
+};
+
+export default RenderDate;
diff --git a/src/client/modules/common/components/web/ui-antd/components/RenderSwitch.jsx b/src/client/modules/common/components/web/ui-antd/components/RenderSwitch.jsx
new file mode 100644
index 0000000000..8a12e8f673
--- /dev/null
+++ b/src/client/modules/common/components/web/ui-antd/components/RenderSwitch.jsx
@@ -0,0 +1,30 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Form from 'antd/lib/form';
+import Switch from 'antd/lib/switch';
+
+const FormItem = Form.Item;
+
+const RenderField = ({ input: { value, ...restInput }, label, meta: { touched, error } }) => {
+  let validateStatus = '';
+  if (touched && error) {
+    validateStatus = 'error';
+  }
+
+  return (
+    <FormItem label={label} validateStatus={validateStatus} help={touched && error}>
+      <div>
+        <Switch defaultChecked={!!value} {...restInput} />
+      </div>
+    </FormItem>
+  );
+};
+
+RenderField.propTypes = {
+  input: PropTypes.object,
+  label: PropTypes.string,
+  type: PropTypes.string,
+  meta: PropTypes.object
+};
+
+export default RenderField;
diff --git a/src/client/modules/common/components/web/ui-antd/components/Switch.jsx b/src/client/modules/common/components/web/ui-antd/components/Switch.jsx
new file mode 100644
index 0000000000..a9f891952d
--- /dev/null
+++ b/src/client/modules/common/components/web/ui-antd/components/Switch.jsx
@@ -0,0 +1,8 @@
+import React from 'react';
+import ADSwitch from 'antd/lib/switch';
+
+const witch = ({ ...props }) => {
+  return <ADSwitch {...props} />;
+};
+
+export default witch;
diff --git a/src/client/modules/common/components/web/ui-antd/components/index.js b/src/client/modules/common/components/web/ui-antd/components/index.js
index 272e7bcfcf..f6eb0a90f5 100644
--- a/src/client/modules/common/components/web/ui-antd/components/index.js
+++ b/src/client/modules/common/components/web/ui-antd/components/index.js
@@ -5,11 +5,14 @@ export { default as MenuItem } from './MenuItem';
 export { default as Form } from './Form';
 export { default as FormItem } from './FormItem';
 export { default as Input } from './Input';
+export { default as Switch } from './Switch';
 export { default as Select } from './Select';
 export { default as Option } from './Option';
 export { default as RenderField } from './RenderField';
+export { default as RenderDate } from './RenderDate';
 export { default as RenderSelect } from './RenderSelect';
 export { default as RenderCheckBox } from './RenderCheckBox';
+export { default as RenderSwitch } from './RenderSwitch';
 export { default as Alert } from './Alert';
 export { default as Container } from './Container';
 export { default as Row } from './Row';
@@ -22,3 +25,4 @@ export { default as CardText } from './CardText';
 export { default as Table } from './Table';
 export { default as ListGroup } from './ListGroup';
 export { default as ListItem } from './ListItem';
+export { default as Popconfirm } from './Popconfirm';
diff --git a/src/client/modules/common/components/web/ui-antd/styles/styles.less b/src/client/modules/common/components/web/ui-antd/styles/styles.less
index d361b77797..b360f840c5 100644
--- a/src/client/modules/common/components/web/ui-antd/styles/styles.less
+++ b/src/client/modules/common/components/web/ui-antd/styles/styles.less
@@ -12,3 +12,11 @@ body {
 .nav-link active {
   color: #000000;
 }
+
+.ant-table-tbody tr.drop-over-downward td {
+  border-bottom: 2px dashed #1890ff;
+}
+
+.ant-table-tbody tr.drop-over-upward td {
+  border-top: 2px dashed #1890ff;
+}
\ No newline at end of file
diff --git a/src/client/modules/common/util.web.jsx b/src/client/modules/common/util.web.jsx
index 00141d1009..584296b021 100644
--- a/src/client/modules/common/util.web.jsx
+++ b/src/client/modules/common/util.web.jsx
@@ -1,63 +1,78 @@
 /* eslint-disable react/display-name */
 import React from 'react';
-import { capitalize } from 'lodash';
+import { startCase } from 'lodash';
 import { Field } from 'redux-form';
 import { Link } from 'react-router-dom';
 
-import { RenderField, RenderSelect, Button } from './components/web';
+import { RenderField, RenderSelect, RenderDate, RenderSwitch, Button, Popconfirm, Switch } from './components/web';
 import { required } from '../../../common/validation';
 
-export const createColumnFields = (schema, link, orderBy, renderOrderByArrow) => {
+export const createColumnFields = (schema, link, orderBy, renderOrderByArrow, hendleDelete) => {
   let columns = [];
 
   for (const key of schema.keys()) {
-    if (key === 'id') {
-      columns.push({
-        title: (
-          <a onClick={e => orderBy(e, key)} href="#">
-            {capitalize(key)} {renderOrderByArrow(key)}
-          </a>
-        ),
-        dataIndex: 'id',
-        key: 'id',
-        render: (text, record) => (
-          <Link className="link" to={`/${link}/${record.id}`}>
-            {text}
-          </Link>
-        )
-      });
-    } else {
-      const value = schema.values[key];
-      if (value.type.isSchema) {
-        let sortBy = 'name';
-        for (const remoteKey of value.type.keys()) {
-          const remoteValue = value.type.values[remoteKey];
-          if (remoteValue.sortBy) {
-            sortBy = remoteKey;
-          }
-        }
-        columns.push({
-          title: (
-            <a onClick={e => orderBy(e, key)} href="#">
-              {capitalize(key)} {renderOrderByArrow(key)}
-            </a>
-          ),
-          dataIndex: key,
-          key: key,
-          render: text => {
-            return text[sortBy];
-          }
-        });
-      } else if (value.type.constructor !== Array) {
+    const value = schema.values[key];
+    if (value.show !== false) {
+      if (key === 'id') {
         columns.push({
           title: (
             <a onClick={e => orderBy(e, key)} href="#">
-              {capitalize(key)} {renderOrderByArrow(key)}
+              {startCase(key)} {renderOrderByArrow(key)}
             </a>
           ),
-          dataIndex: key,
-          key: key
+          dataIndex: 'id',
+          key: 'id',
+          render: (text, record) => (
+            <Link className="link" to={`/${link}/${record.id}`}>
+              {text}
+            </Link>
+          )
         });
+      } else {
+        if (value.type.isSchema) {
+          let sortBy = 'name';
+          for (const remoteKey of value.type.keys()) {
+            const remoteValue = value.type.values[remoteKey];
+            if (remoteValue.sortBy) {
+              sortBy = remoteKey;
+            }
+          }
+          columns.push({
+            title: (
+              <a onClick={e => orderBy(e, key)} href="#">
+                {startCase(key)} {renderOrderByArrow(key)}
+              </a>
+            ),
+            dataIndex: key,
+            key: key,
+            render: text => {
+              return text[sortBy];
+            }
+          });
+        } else if (value.type.name === 'Boolean') {
+          columns.push({
+            title: (
+              <a onClick={e => orderBy(e, key)} href="#">
+                {startCase(key)} {renderOrderByArrow(key)}
+              </a>
+            ),
+            dataIndex: key,
+            key: key,
+            render: text => {
+              return <Switch defaultChecked={text} disabled />;
+            }
+          });
+        } else if (value.type.constructor !== Array) {
+          columns.push({
+            title: (
+              <a onClick={e => orderBy(e, key)} href="#">
+                {startCase(key)} {renderOrderByArrow(key)}
+              </a>
+            ),
+            dataIndex: key,
+            key: key
+          });
+        }
       }
     }
   }
@@ -66,9 +81,11 @@ export const createColumnFields = (schema, link, orderBy, renderOrderByArrow) =>
     title: 'Actions',
     key: 'actions',
     render: (text, record) => (
-      <Button color="primary" size="sm" onClick={() => this.hendleDelete(record.id)}>
-        Delete
-      </Button>
+      <Popconfirm title="Sure to delete?" onConfirm={() => hendleDelete(record.id)}>
+        <Button color="primary" size="sm">
+          Delete
+        </Button>
+      </Popconfirm>
     )
   });
 
@@ -80,7 +97,8 @@ export const createFormFields = (schema, formdata) => {
 
   for (const key of schema.keys()) {
     const value = schema.values[key];
-    if (key !== 'id' && value.type.constructor !== Array) {
+
+    if (key !== 'id' && value.show !== false && value.type.constructor !== Array) {
       let validate = [];
       if (!value.optional) {
         validate.push(required);
@@ -88,10 +106,21 @@ export const createFormFields = (schema, formdata) => {
 
       let component = RenderField;
       let data = null;
+
       if (value.type.isSchema) {
         component = RenderSelect;
         data = formdata[`${key}s`];
+      } else {
+        switch (value.type.name) {
+          case 'Date':
+            component = RenderDate;
+            break;
+          case 'Boolean':
+            component = RenderSwitch;
+            break;
+        }
       }
+
       fields.push(
         <Field
           name={key}
@@ -99,10 +128,14 @@ export const createFormFields = (schema, formdata) => {
           component={component}
           data={data}
           type="text"
-          label={capitalize(key)}
+          label={startCase(key)}
           validate={validate}
         />
       );
+    } else {
+      if (value.type.constructor === Array) {
+        //console.log('key: ', value.type);
+      }
     }
   }
 
@@ -117,7 +150,7 @@ export const pickInputFields = (schema, values) => {
       const value = schema.values[key];
       if (value.type.isSchema) {
         inputValues[`${key}Id`] = Number(values[key].id ? values[key].id : values[key]);
-      } else if (value.type.constructor !== Array) {
+      } else if (key !== 'id' && value.type.constructor !== Array) {
         inputValues[key] = values[key];
       }
     }
diff --git a/src/server/api/rootSchema.graphql b/src/server/api/rootSchema.graphql
index 44254a7c15..df22c202ae 100644
--- a/src/server/api/rootSchema.graphql
+++ b/src/server/api/rootSchema.graphql
@@ -8,6 +8,16 @@ type PageInfo {
   hasNextPage: Boolean
 }
 
+type BatchManyPayload {
+    count: Int
+    errors: [FieldError!]
+}
+
+input OrderByInput {
+    column: String
+    order: String
+}
+
 type Query {
   dummy: Int
 }
diff --git a/src/server/sql/crud.js b/src/server/sql/crud.js
index c7cefe24ba..7f3b3a261c 100644
--- a/src/server/sql/crud.js
+++ b/src/server/sql/crud.js
@@ -64,11 +64,12 @@ export default class Crud {
     if (filter) {
       if (has(filter, 'searchText') && filter.searchText !== '') {
         const schema = this.schema;
+        const tableName = this.tableName;
         queryBuilder.where(function() {
           for (const key of schema.keys()) {
             const value = schema.values[key];
             if (value.searchText) {
-              this.orWhere(key, 'like', `%${filter.searchText}%`);
+              this.orWhere(`${tableName}.${key}`, 'like', `%${filter.searchText}%`);
             }
           }
         });
@@ -84,35 +85,53 @@ export default class Crud {
       .first();
   }
 
-  get({ id }, info) {
+  get({ where }, info) {
+    const { id } = where;
     const baseQuery = knex(`${this.prefix}${this.tableName} as ${this.tableName}`);
     const select = selectBy(this.schema, info, true, this.prefix);
     return knexnest(select(baseQuery).where(`${this.tableName}.id`, '=', id));
   }
 
-  add(input) {
+  create(data) {
     return knex(`${this.prefix}${this.tableName}`)
-      .insert(decamelizeKeys(input))
+      .insert(decamelizeKeys(data))
       .returning('id');
   }
 
-  edit({ id, ...input }) {
+  update(data, where) {
     return knex(`${this.prefix}${this.tableName}`)
-      .update(decamelizeKeys(input))
-      .where({ id });
+      .update(decamelizeKeys(data))
+      .where(where);
   }
 
-  delete(id) {
+  delete(where) {
     return knex(`${this.prefix}${this.tableName}`)
-      .where({ id })
+      .where(where)
       .del();
   }
 
+  deleteMany(ids) {
+    return knex(`${this.prefix}${this.tableName}`)
+      .whereIn('id', ids)
+      .del();
+  }
+
+  sort(data) {
+    return knex.raw(
+      `UPDATE ${this.prefix}${this.tableName} t1
+      JOIN ${this.prefix}${this.tableName} t2
+      ON t1.id = ? AND t2.id = ?
+      SET t1.rank = ?,
+      t2.rank = ?`,
+      data
+    );
+  }
+
   async getByIds(ids, by, Obj, info) {
     info[`${by}Id`] = true;
     const baseQuery = knex(`${Obj.getPrefix()}${Obj.getTableName()} as ${Obj.getTableName()}`);
     const select = selectBy(Obj.getSchema(), info, false, Obj.getPrefix());
-    const res = await knexnest(select(baseQuery).whereIn(`${Obj.getTableName()}.${by}_id`, ids));
+    const res = await knexnest(select(baseQuery).whereIn(`${Obj.getTableName()}.${decamelize(by)}_id`, ids));
     return orderedFor(res, ids, `${by}Id`, false);
   }
 }
diff --git a/tools/cli/module.js b/tools/cli/module.js
index f2ea2d0475..90b804df60 100644
--- a/tools/cli/module.js
+++ b/tools/cli/module.js
@@ -4,7 +4,8 @@ import shell from 'shelljs';
 import fs from 'fs';
 import chalk from 'chalk';
 import GraphQLGenerator from 'domain-graphql';
-import { pascalize, decamelize } from 'humps';
+import { pascalize, camelize } from 'humps';
+import { startCase } from 'lodash';
 
 function renameFiles(destinationPath, templatePath, module, location) {
   // pascalize
@@ -28,6 +29,7 @@ function renameFiles(destinationPath, templatePath, module, location) {
     if (entry.isFile()) {
       shell.sed('-i', /\$module\$/g, module, entry.name);
       shell.sed('-i', /\$Module\$/g, Module, entry.name);
+      shell.sed('-i', /\$MoDuLe\$/g, startCase(Module), entry.name);
       shell.sed('-i', /\$MODULE\$/g, module.toUpperCase(), entry.name);
     }
   });
@@ -175,21 +177,21 @@ function updateSchema(logger, module) {
 
       // regenerate input fields
       let moduleData = `  node: ${Module}\n`;
-      let inputAdd = '';
-      let inputEdit = '';
+      let inputCreate = '';
+      let inputUpdate = '';
       for (const key of schema.keys()) {
         const value = schema.values[key];
         if (value.type.isSchema) {
-          if (key !== 'id') {
-            inputAdd += `  ${key}Id: Int!\n`;
-          }
-          inputEdit += `  ${key}Id: Int!\n`;
-          moduleData += `  ${key}s: [${value.type.name}]\n`;
+          inputCreate += `  ${key}Id: Int!\n`;
+          inputUpdate += `  ${key}Id: Int!\n`;
+          moduleData += `  ${key}s(limit: Int, orderBy: OrderByInput): [${value.type.name}]\n`;
         } else if (value.type.constructor !== Array) {
           if (key !== 'id') {
-            inputAdd += `  ${key}: ` + new GraphQLGenerator()._generateField(schema.name + '.' + key, value, []) + '\n';
+            inputCreate +=
+              `  ${key}: ` + new GraphQLGenerator()._generateField(schema.name + '.' + key, value, []) + '\n';
+            inputUpdate +=
+              `  ${key}: ` + new GraphQLGenerator()._generateField(schema.name + '.' + key, value, []) + '\n';
           }
-          inputEdit += `  ${key}: ` + new GraphQLGenerator()._generateField(schema.name + '.' + key, value, []) + '\n';
         }
       }
 
@@ -215,16 +217,20 @@ function updateSchema(logger, module) {
         .ShellString(shell.cat(file).replace(RegExp(replaceModuleData, 'g'), `type ${Module}Data {\n${moduleData}}`))
         .to(file);
 
-      // override AddModuleInput in schema.graphql file
-      const replaceAdd = `input Add${Module}Input {([^}])*\\n}`;
+      // override CreateModuleInput in schema.graphql file
+      const replaceCreate = `input ${Module}CreateInput {([^}])*\\n}`;
       shell
-        .ShellString(shell.cat(file).replace(RegExp(replaceAdd, 'g'), `input Add${Module}Input {\n${inputAdd}}`))
+        .ShellString(
+          shell.cat(file).replace(RegExp(replaceCreate, 'g'), `input ${Module}CreateInput {\n${inputCreate}}`)
+        )
         .to(file);
 
-      // override EditmoduleInput in schema.graphql file
-      const replaceEdit = `input Edit${Module}Input {([^}])*\\n}`;
+      // override UpdateModuleInput in schema.graphql file
+      const replaceUpdate = `input ${Module}UpdateInput {([^}])*\\n}`;
       shell
-        .ShellString(shell.cat(file).replace(RegExp(replaceEdit, 'g'), `input Edit${Module}Input {\n${inputEdit}}`))
+        .ShellString(
+          shell.cat(file).replace(RegExp(replaceUpdate, 'g'), `input ${Module}UpdateInput {\n${inputUpdate}}`)
+        )
         .to(file);
 
       logger.info(chalk.green(`✔ Schema in ${pathSchema}${file} successfully updated!`));
@@ -249,7 +255,7 @@ function updateSchema(logger, module) {
         } else if (value.type.constructor === Array) {
           replace += `  ${schema.name}: {
     ${key}: createBatchResolver((sources, args, { ${schema.name}, ${value.type[0].name} }, info) => {
-      return ${schema.name}.getByIds(sources.map(({ id }) => id), '${decamelize(schema.name)}', ${
+      return ${schema.name}.getByIds(sources.map(({ id }) => id), '${camelize(schema.name)}', ${
             value.type[0].name
           }, parseFields(info));
     })
@@ -258,16 +264,18 @@ function updateSchema(logger, module) {
         }
       }
 
+      if (moduleData !== '') {
+        moduleData = `${moduleData.replace(/,\s*$/, '')}
+`;
+      }
+
       // override batch resolvers in resolvers.js file
       replaceModuleData = `// order data([^*]+)// end order data`;
       shell
         .ShellString(
           shell
             .cat(resolverFile)
-            .replace(
-              RegExp(replaceModuleData, 'g'),
-              `// order data\n${moduleData.replace(/,\s*$/, '')}    // end order data`
-            )
+            .replace(RegExp(replaceModuleData, 'g'), `// order data\n${moduleData}    // end order data`)
         )
         .to(resolverFile);
 
diff --git a/tools/templates/crud/client/components/Module.jsx b/tools/templates/crud/client/components/Module.jsx
index ebef044528..59be7214ba 100644
--- a/tools/templates/crud/client/components/Module.jsx
+++ b/tools/templates/crud/client/components/Module.jsx
@@ -1,15 +1,24 @@
 import React from 'react';
+import PropTypes from 'prop-types';
+import { connect } from 'react-redux';
 import { StyleSheet, Text, View } from 'react-native';
 
-const $Module$ = () => {
-  return (
-    <View style={styles.container}>
-      <View style={styles.element}>
-        <Text style={styles.box}>Hello $Module$!</Text>
+class $Module$ extends React.PureComponent {
+  static propTypes = {
+    title: PropTypes.string.isRequired
+  };
+
+  render() {
+    const { title } = this.props;
+    return (
+      <View style={styles.container}>
+        <View style={styles.element}>
+          <Text style={styles.box}>Hello {title}!</Text>
+        </View>
       </View>
-    </View>
-  );
-};
+    );
+  }
+}
 
 const styles = StyleSheet.create({
   container: {
@@ -28,4 +37,6 @@ const styles = StyleSheet.create({
   }
 });
 
-export default $Module$;
+export default connect(state => ({
+  title: state.$module$.title
+}))($Module$);
diff --git a/tools/templates/crud/client/components/Module.web.jsx b/tools/templates/crud/client/components/Module.web.jsx
index 1c36c646ae..daa0cb4de4 100644
--- a/tools/templates/crud/client/components/Module.web.jsx
+++ b/tools/templates/crud/client/components/Module.web.jsx
@@ -1,38 +1,45 @@
 import React from 'react';
+import PropTypes from 'prop-types';
+import { connect } from 'react-redux';
 import Helmet from 'react-helmet';
-import { Link } from 'react-router-dom';
-import { PageLayout, Button } from '../../common/components/web';
+import { PageLayout } from '../../common/components/web';
 
 import $Module$Filter from '../containers/$Module$Filter';
 import $Module$List from '../containers/$Module$List';
 import settings from '../../../../../settings';
 
-const $Module$ = () => {
-  const renderMetaData = () => (
+class $Module$ extends React.PureComponent {
+  static propTypes = {
+    title: PropTypes.string.isRequired
+  };
+
+  renderMetaData = title => (
     <Helmet
-      title={`${settings.app.name} - $Module$`}
+      title={`${settings.app.name} - ${title}`}
       meta={[
         {
           name: 'description',
-          content: `${settings.app.name} - $Module$ page`
+          content: `${settings.app.name} - ${title} page`
         }
       ]}
     />
   );
 
-  return (
-    <PageLayout>
-      {renderMetaData()}
-      <h2>$Module$</h2>
-      <Link to="/$module$/0">
-        <Button color="primary">Add</Button>
-      </Link>
-      <hr />
-      <$Module$Filter />
-      <hr />
-      <$Module$List />
-    </PageLayout>
-  );
-};
+  render() {
+    const { title } = this.props;
+    return (
+      <PageLayout>
+        {this.renderMetaData(title)}
+        <h2>{title}</h2>
+        <hr />
+        <$Module$Filter />
+        <hr />
+        <$Module$List />
+      </PageLayout>
+    );
+  }
+}
 
-export default $Module$;
+export default connect(state => ({
+  title: state.$module$.title
+}))($Module$);
diff --git a/tools/templates/crud/client/components/ModuleEditView.web.jsx b/tools/templates/crud/client/components/ModuleEditView.web.jsx
deleted file mode 100644
index 9147718085..0000000000
--- a/tools/templates/crud/client/components/ModuleEditView.web.jsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import Helmet from 'react-helmet';
-import { Link } from 'react-router-dom';
-
-import { PageLayout } from '../../common/components/web';
-import $Module$Form from './$Module$Form';
-import settings from '../../../../../settings';
-
-class $Module$EditView extends React.PureComponent {
-  static propTypes = {
-    loading: PropTypes.bool.isRequired,
-    $module$: PropTypes.object,
-    onSubmit: PropTypes.func.isRequired
-  };
-
-  renderMetaData = () => (
-    <Helmet
-      title={`${settings.app.name} - Edit $Module$`}
-      meta={[
-        {
-          name: 'description',
-          content: `${settings.app.name} - Edit $module$ example page`
-        }
-      ]}
-    />
-  );
-
-  render() {
-    const { loading, $module$, onSubmit } = this.props;
-
-    if (loading && !$module$) {
-      return (
-        <PageLayout>
-          {this.renderMetaData()}
-          <div className="text-center">Loading...</div>
-        </PageLayout>
-      );
-    } else {
-      return (
-        <PageLayout>
-          {this.renderMetaData()}
-          <Link id="back-button" to="/$module$">
-            Back
-          </Link>
-          <h2>{$module$ ? 'Edit' : 'Create'} $Module$</h2>
-          <$Module$Form onSubmit={onSubmit} $module$={$module$} initialValues={$module$.node} />
-        </PageLayout>
-      );
-    }
-  }
-}
-
-export default $Module$EditView;
diff --git a/tools/templates/crud/client/components/ModuleListView.web.jsx b/tools/templates/crud/client/components/ModuleListView.web.jsx
deleted file mode 100644
index 75b53b174c..0000000000
--- a/tools/templates/crud/client/components/ModuleListView.web.jsx
+++ /dev/null
@@ -1,102 +0,0 @@
-/* eslint-disable react/display-name */
-import React from 'react';
-import PropTypes from 'prop-types';
-import Helmet from 'react-helmet';
-
-import { Table, Button } from '../../common/components/web';
-import { $Module$ as $Module$Schema } from '../../../../server/modules/$module$/schema';
-import { createColumnFields } from '../../common/util';
-
-class $Module$ListView extends React.PureComponent {
-  static propTypes = {
-    loading: PropTypes.bool.isRequired,
-    $module$s: PropTypes.object,
-    orderBy: PropTypes.object,
-    onOrderBy: PropTypes.func.isRequired,
-    delete$Module$: PropTypes.func.isRequired,
-    loadMoreRows: PropTypes.func.isRequired
-  };
-
-  renderMetaData = () => (
-    <Helmet
-      title="$Module$"
-      meta={[
-        {
-          name: 'description',
-          content: '$Module$ page'
-        }
-      ]}
-    />
-  );
-
-  renderLoadMore = ($module$s, loadMoreRows) => {
-    if ($module$s.pageInfo.hasNextPage) {
-      return (
-        <Button id="load-more" color="primary" onClick={loadMoreRows}>
-          Load more ...
-        </Button>
-      );
-    }
-  };
-
-  renderOrderByArrow = name => {
-    const { orderBy } = this.props;
-
-    if (orderBy && orderBy.column === name) {
-      if (orderBy.order === 'desc') {
-        return <span className="badge badge-primary">&#8595;</span>;
-      } else {
-        return <span className="badge badge-primary">&#8593;</span>;
-      }
-    } else {
-      return <span className="badge badge-secondary">&#8645;</span>;
-    }
-  };
-
-  hendleDelete = id => {
-    const { delete$Module$ } = this.props;
-    delete$Module$(id);
-  };
-
-  orderBy = (e, name) => {
-    const { onOrderBy, orderBy } = this.props;
-
-    e.preventDefault();
-
-    let order = 'asc';
-    if (orderBy && orderBy.column === name) {
-      if (orderBy.order === 'asc') {
-        order = 'desc';
-      } else if (orderBy.order === 'desc') {
-        return onOrderBy({});
-      }
-    }
-
-    return onOrderBy({ column: name, order });
-  };
-
-  render() {
-    const { loading, $module$s, loadMoreRows } = this.props;
-    const columns = createColumnFields($Module$Schema, '$module$', this.orderBy, this.renderOrderByArrow);
-    return (
-      <div>
-        <Table
-          dataSource={$module$s ? $module$s.edges : null}
-          columns={columns}
-          pagination={false}
-          loading={loading && !$module$s}
-        />
-        {$module$s && (
-          <div>
-            <small>
-              ({$module$s.edges ? $module$s.edges.length : 0} / {$module$s.pageInfo.totalCount})
-            </small>
-          </div>
-        )}
-        {$module$s && this.renderLoadMore($module$s, loadMoreRows)}
-      </div>
-    );
-  }
-}
-
-export default $Module$ListView;
diff --git a/tools/templates/crud/client/containers/ModuleEdit.jsx b/tools/templates/crud/client/containers/ModuleEdit.jsx
index 722ebd5f43..665d153497 100644
--- a/tools/templates/crud/client/containers/ModuleEdit.jsx
+++ b/tools/templates/crud/client/containers/ModuleEdit.jsx
@@ -1,31 +1,39 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { graphql, compose } from 'react-apollo';
+import { connect } from 'react-redux';
 import { SubmissionError } from 'redux-form';
 
+import { EditView } from '../../common/components/crud';
 import { pickInputFields } from '../../common/util';
 import { $Module$ as $Module$Schema } from '../../../../server/modules/$module$/schema';
-import $Module$EditView from '../components/$Module$EditView';
 import $MODULE$_QUERY from '../graphql/$Module$Query.graphql';
-import ADD_$MODULE$ from '../graphql/Add$Module$.graphql';
-import EDIT_$MODULE$ from '../graphql/Edit$Module$.graphql';
+import CREATE_$MODULE$ from '../graphql/Create$Module$.graphql';
+import UPDATE_$MODULE$ from '../graphql/Update$Module$.graphql';
 
 class $Module$Edit extends React.Component {
+  static propTypes = {
+    data: PropTypes.object,
+    createEntry: PropTypes.func.isRequired,
+    updateEntry: PropTypes.func.isRequired,
+    title: PropTypes.string.isRequired
+  };
+
   onSubmit = async values => {
-    const { $module$: { node }, add$Module$, edit$Module$ } = this.props;
+    const { data: { node }, createEntry, updateEntry, title } = this.props;
     let result = null;
 
     const insertValues = pickInputFields($Module$Schema, values);
 
     if (node) {
-      result = await edit$Module$(insertValues);
+      result = await updateEntry(insertValues, { id: node.id });
     } else {
-      result = await add$Module$(insertValues);
+      result = await createEntry(insertValues);
     }
 
     if (result.errors) {
       let submitError = {
-        _error: 'Edit $module$ failed!'
+        _error: `Edit ${title} failed!`
       };
       result.errors.map(error => (submitError[error.field] = error.message));
       throw new SubmissionError(submitError);
@@ -33,17 +41,11 @@ class $Module$Edit extends React.Component {
   };
 
   render() {
-    return <$Module$EditView {...this.props} onSubmit={this.onSubmit} />;
+    return <EditView {...this.props} onSubmit={this.onSubmit} schema={$Module$Schema} />;
   }
 }
 
-$Module$Edit.propTypes = {
-  $module$: PropTypes.object,
-  add$Module$: PropTypes.func.isRequired,
-  edit$Module$: PropTypes.func.isRequired
-};
-
-export default compose(
+const $Module$EditWithApollo = compose(
   graphql($MODULE$_QUERY, {
     options: props => {
       let id = 0;
@@ -55,23 +57,23 @@ export default compose(
 
       return {
         fetchPolicy: 'cache-and-network',
-        variables: { id }
+        variables: { where: { id } }
       };
     },
     props({ data: { loading, $module$ } }) {
-      return { loading, $module$ };
+      return { loading, data: $module$ };
     }
   }),
-  graphql(ADD_$MODULE$, {
+  graphql(CREATE_$MODULE$, {
     props: ({ ownProps: { history, navigation }, mutate }) => ({
-      add$Module$: async input => {
+      createEntry: async data => {
         try {
-          const { data: { add$Module$ } } = await mutate({
-            variables: { input }
+          const { data: { create$Module$ } } = await mutate({
+            variables: { data }
           });
 
-          if (add$Module$.errors) {
-            return { errors: add$Module$.errors };
+          if (create$Module$.errors) {
+            return { errors: create$Module$.errors };
           }
 
           if (history) {
@@ -86,16 +88,16 @@ export default compose(
       }
     })
   }),
-  graphql(EDIT_$MODULE$, {
+  graphql(UPDATE_$MODULE$, {
     props: ({ ownProps: { history, navigation }, mutate }) => ({
-      edit$Module$: async input => {
+      updateEntry: async (data, where) => {
         try {
-          const { data: { edit$Module$ } } = await mutate({
-            variables: { input }
+          const { data: { update$Module$ } } = await mutate({
+            variables: { data, where }
           });
 
-          if (edit$Module$.errors) {
-            return { errors: edit$Module$.errors };
+          if (update$Module$.errors) {
+            return { errors: update$Module$.errors };
           }
 
           if (history) {
@@ -111,3 +113,8 @@ export default compose(
     })
   })
 )($Module$Edit);
+
+export default connect(state => ({
+  title: state.$module$.title,
+  link: state.$module$.link
+}))($Module$EditWithApollo);
diff --git a/tools/templates/crud/client/containers/ModuleFilter.jsx b/tools/templates/crud/client/containers/ModuleFilter.jsx
index 9c9175bba5..ad28053377 100644
--- a/tools/templates/crud/client/containers/ModuleFilter.jsx
+++ b/tools/templates/crud/client/containers/ModuleFilter.jsx
@@ -1,11 +1,11 @@
 import React from 'react';
 import { connect } from 'react-redux';
 
-import $Module$FilterView from '../components/$Module$FilterView';
+import { FilterView } from '../../common/components/crud';
 
 class $Module$Filter extends React.PureComponent {
   render() {
-    return <$Module$FilterView {...this.props} />;
+    return <FilterView {...this.props} />;
   }
 }
 
diff --git a/tools/templates/crud/client/containers/ModuleList.jsx b/tools/templates/crud/client/containers/ModuleList.jsx
index 7bfa35f324..2965503800 100644
--- a/tools/templates/crud/client/containers/ModuleList.jsx
+++ b/tools/templates/crud/client/containers/ModuleList.jsx
@@ -2,13 +2,16 @@ import React from 'react';
 import { graphql, compose } from 'react-apollo';
 import { connect } from 'react-redux';
 
-import $Module$ListView from '../components/$Module$ListView';
+import { ListView } from '../../common/components/crud';
+import { $Module$ as $Module$Schema } from '../../../../server/modules/$module$/schema';
 import $MODULE$S_QUERY from '../graphql/$Module$sQuery.graphql';
 import DELETE_$MODULE$ from '../graphql/Delete$Module$.graphql';
+import SORT_$MODULE$S from '../graphql/Sort$Module$s.graphql';
+import DELETEMANY_$MODULE$S from '../graphql/DeleteMany$Module$s.graphql';
 
 class $Module$ extends React.Component {
   render() {
-    return <$Module$ListView {...this.props} />;
+    return <ListView {...this.props} schema={$Module$Schema} />;
   }
 }
 
@@ -24,11 +27,11 @@ const $Module$WithApollo = compose(
         }
       };
     },
-    props: ({ ownProps: { limit }, data: { loading, $module$s, refetch, error, fetchMore } }) => {
+    props: ({ data: { loading, $module$s, refetch, error, fetchMore } }) => {
       const loadMoreRows = () => {
         return fetchMore({
           variables: {
-            offset: $module$s.edges.length + limit
+            offset: $module$s.edges.length
           },
           updateQuery: (previousResult, { fetchMoreResult }) => {
             const newEdges = fetchMoreResult.$module$s.edges;
@@ -45,21 +48,59 @@ const $Module$WithApollo = compose(
         });
       };
       if (error) throw new Error(error);
-      return { loading, $module$s, loadMoreRows, refetch, errors: error ? error.graphQLErrors : null };
+      return { loading, data: $module$s, loadMoreRows, refetch, errors: error ? error.graphQLErrors : null };
     }
   }),
   graphql(DELETE_$MODULE$, {
     props: ({ ownProps: { refetch }, mutate }) => ({
-      delete$Module$: async id => {
+      deleteEntry: async id => {
         try {
           const { data: { delete$Module$ } } = await mutate({
-            variables: { id }
+            variables: { where: { id } }
           });
 
           if (delete$Module$.errors) {
             return { errors: delete$Module$.errors };
           }
 
+          refetch();
+        } catch (e) {
+          console.log(e.graphQLErrors);
+        }
+      }
+    })
+  }),
+  graphql(SORT_$MODULE$S, {
+    props: ({ ownProps: { refetch }, mutate }) => ({
+      sortEntries: async data => {
+        try {
+          const { data: { sort$Module$s } } = await mutate({
+            variables: { data }
+          });
+
+          if (sort$Module$s.errors) {
+            return { errors: sort$Module$s.errors };
+          }
+
+          refetch();
+        } catch (e) {
+          console.log(e.graphQLErrors);
+        }
+      }
+    })
+  }),
+  graphql(DELETEMANY_$MODULE$S, {
+    props: ({ ownProps: { refetch }, mutate }) => ({
+      deleteManyEntries: async ids => {
+        try {
+          const { data: { deleteMany$Module$s } } = await mutate({
+            variables: { ids }
+          });
+
+          if (deleteMany$Module$s.errors) {
+            return { errors: deleteMany$Module$s.errors };
+          }
+
           refetch();
         } catch (e) {
           console.log(e.graphQLErrors);
@@ -71,6 +112,7 @@ const $Module$WithApollo = compose(
 
 export default connect(
   state => ({
+    link: state.$module$.link,
     limit: state.$module$.limit,
     searchText: state.$module$.searchText,
     orderBy: state.$module$.orderBy
diff --git a/tools/templates/crud/client/graphql/AddModule.graphql b/tools/templates/crud/client/graphql/CreateModule.graphql
similarity index 57%
rename from tools/templates/crud/client/graphql/AddModule.graphql
rename to tools/templates/crud/client/graphql/CreateModule.graphql
index 0852b49478..27f604e763 100644
--- a/tools/templates/crud/client/graphql/AddModule.graphql
+++ b/tools/templates/crud/client/graphql/CreateModule.graphql
@@ -1,7 +1,7 @@
 #import "./$Module$.graphql"
 
-mutation add$Module$($input: Add$Module$Input!) {
-  add$Module$(input: $input) {
+mutation create$Module$($data: $Module$CreateInput!) {
+  create$Module$(data: $data) {
     node {
       ...$Module$Info
     }
diff --git a/tools/templates/crud/client/graphql/DeleteManyModules.graphql b/tools/templates/crud/client/graphql/DeleteManyModules.graphql
new file mode 100644
index 0000000000..10d3b9b23a
--- /dev/null
+++ b/tools/templates/crud/client/graphql/DeleteManyModules.graphql
@@ -0,0 +1,9 @@
+mutation deleteMany$Module$s($ids: [Int!]) {
+  deleteMany$Module$s(ids: $ids) {
+    count
+    errors {
+      field
+      message
+    }
+  }
+}
diff --git a/tools/templates/crud/client/graphql/DeleteModule.graphql b/tools/templates/crud/client/graphql/DeleteModule.graphql
index 6782cc20f9..316dd1ff23 100644
--- a/tools/templates/crud/client/graphql/DeleteModule.graphql
+++ b/tools/templates/crud/client/graphql/DeleteModule.graphql
@@ -1,5 +1,5 @@
-mutation delete$Module$($id: Int!) {
-  delete$Module$(id: $id) {
+mutation delete$Module$($where: $Module$WhereUniqueInput!) {
+  delete$Module$(where: $where) {
     node {
       id
     }
diff --git a/tools/templates/crud/client/graphql/EditModule.graphql b/tools/templates/crud/client/graphql/EditModule.graphql
deleted file mode 100644
index 99d2088c67..0000000000
--- a/tools/templates/crud/client/graphql/EditModule.graphql
+++ /dev/null
@@ -1,13 +0,0 @@
-#import "./$Module$.graphql"
-
-mutation edit$Module$($input: Edit$Module$Input!) {
-  edit$Module$(input: $input) {
-    node {
-      ...$Module$Info
-    }
-    errors {
-      field
-      message
-    }
-  }
-}
diff --git a/tools/templates/crud/client/graphql/ModuleQuery.graphql b/tools/templates/crud/client/graphql/ModuleQuery.graphql
index 06e3bdc143..201dd25754 100644
--- a/tools/templates/crud/client/graphql/ModuleQuery.graphql
+++ b/tools/templates/crud/client/graphql/ModuleQuery.graphql
@@ -1,7 +1,7 @@
 #import "./$Module$.graphql"
 
-query $module$($id: Int!) {
-  $module$(id: $id) {
+query $module$($where: $Module$WhereUniqueInput!) {
+  $module$(where: $where) {
     node {
       ...$Module$Info
     }
diff --git a/tools/templates/crud/client/graphql/ModulesQuery.graphql b/tools/templates/crud/client/graphql/ModulesQuery.graphql
index 7217a50916..b6ab7f52d4 100644
--- a/tools/templates/crud/client/graphql/ModulesQuery.graphql
+++ b/tools/templates/crud/client/graphql/ModulesQuery.graphql
@@ -1,6 +1,6 @@
 #import "./$Module$.graphql"
 
-query $module$s($limit: Int, $offset: Int, $orderBy: OrderBy$Module$Input, $filter: Filter$Module$Input) {
+query $module$s($limit: Int, $offset: Int, $orderBy: OrderByInput, $filter: $Module$FilterInput) {
   $module$s(limit: $limit, offset: $offset, orderBy: $orderBy, filter: $filter) {
     pageInfo {
       totalCount
diff --git a/tools/templates/crud/client/graphql/SortModules.graphql b/tools/templates/crud/client/graphql/SortModules.graphql
new file mode 100644
index 0000000000..c9b29dc597
--- /dev/null
+++ b/tools/templates/crud/client/graphql/SortModules.graphql
@@ -0,0 +1,9 @@
+mutation sort$Module$s($data: [Int!]) {
+  sort$Module$s(data: $data) {
+    count
+    errors {
+      field
+      message
+    }
+  }
+}
diff --git a/tools/templates/crud/client/graphql/UpdateModule.graphql b/tools/templates/crud/client/graphql/UpdateModule.graphql
new file mode 100644
index 0000000000..57da8097fb
--- /dev/null
+++ b/tools/templates/crud/client/graphql/UpdateModule.graphql
@@ -0,0 +1,13 @@
+#import "./$Module$.graphql"
+
+mutation update$Module$($data: $Module$UpdateInput!, $where: $Module$WhereUniqueInput!) {
+  update$Module$(data: $data, where: $where) {
+    node {
+      ...$Module$Info
+    }
+    errors {
+      field
+      message
+    }
+  }
+}
diff --git a/tools/templates/crud/client/index.jsx b/tools/templates/crud/client/index.jsx
index 3e3656da61..3ea104db9a 100644
--- a/tools/templates/crud/client/index.jsx
+++ b/tools/templates/crud/client/index.jsx
@@ -26,7 +26,7 @@ $Module$ListScreen.propTypes = {
 
 class $Module$EditScreen extends React.Component {
   static navigationOptions = ({ navigation }) => ({
-    title: `${navigation.state.params.id === 0 ? 'Create' : 'Edit'} $module$`
+    title: `${navigation.state.params.id === 0 ? 'Create' : 'Edit'} $MoDuLe$`
   });
   render() {
     return <$Module$Edit navigation={this.props.navigation} />;
diff --git a/tools/templates/crud/client/index.web.jsx b/tools/templates/crud/client/index.web.jsx
index b0cea12b0a..2106c8294e 100644
--- a/tools/templates/crud/client/index.web.jsx
+++ b/tools/templates/crud/client/index.web.jsx
@@ -15,7 +15,7 @@ export default new Feature({
   navItem: (
     <MenuItem key="$module$">
       <NavLink to="/$module$" className="nav-link" activeClassName="active">
-        $Module$
+        $MoDuLe$
       </NavLink>
     </MenuItem>
   ),
diff --git a/tools/templates/crud/client/reducers/index.js b/tools/templates/crud/client/reducers/index.js
index 5b1976e547..99ebea4608 100644
--- a/tools/templates/crud/client/reducers/index.js
+++ b/tools/templates/crud/client/reducers/index.js
@@ -1,4 +1,7 @@
 const defaultState = {
+  title: '$MoDuLe$',
+  link: '$module$',
+  nativeLink: '$Module$Edit',
   limit: 50,
   searchText: '',
   orderBy: {}
diff --git a/tools/templates/crud/server/resolvers.js b/tools/templates/crud/server/resolvers.js
index 5b32268d2d..50d1b450c7 100644
--- a/tools/templates/crud/server/resolvers.js
+++ b/tools/templates/crud/server/resolvers.js
@@ -29,47 +29,77 @@ export default pubsub => ({
   // schema batch resolvers
   // end schema batch resolvers
   Mutation: {
-    add$Module$: async (obj, { input }, { $Module$ }, info) => {
+    create$Module$: async (obj, { data }, { $Module$ }, info) => {
       try {
         const e = new FieldError();
         e.throwIf();
 
-        const [id] = await $Module$.add(input);
-        const $module$ = await $Module$.get({ id }, parseFields(info).node);
+        const [id] = await $Module$.create(data);
+        const $module$ = await $Module$.get({ where: { id } }, parseFields(info).node);
 
         return { node: $module$ };
       } catch (e) {
         return { errors: e };
       }
     },
-    edit$Module$: async (obj, { input }, { $Module$ }, info) => {
+    update$Module$: async (obj, { data, where }, { $Module$ }, info) => {
       try {
         const e = new FieldError();
         e.throwIf();
 
-        await $Module$.edit(input);
-
-        const $module$ = await $Module$.get({ id: input.id }, parseFields(info).node);
-
+        await $Module$.update(data, where);
+        const $module$ = await $Module$.get({ where }, parseFields(info).node);
         return { node: $module$ };
       } catch (e) {
         return { errors: e };
       }
     },
-    delete$Module$: async (obj, { id }, { $Module$ }, info) => {
+    delete$Module$: async (obj, { where }, { $Module$ }, info) => {
       try {
         const e = new FieldError();
-        const $module$ = await $Module$.get({ id }, parseFields(info).node);
+
+        const $module$ = await $Module$.get({ where }, parseFields(info).node);
         if (!$module$) {
-          e.setError('delete', '$Module$ does not exist.');
+          e.setError('delete', '$MoDuLe$ does not exist.');
           e.throwIf();
         }
 
-        const isDeleted = await $Module$.delete(id);
+        const isDeleted = await $Module$.delete(where);
         if (isDeleted) {
           return { node: $module$ };
         } else {
-          e.setError('delete', 'Could not delete $module$. Please try again later.');
+          e.setError('delete', 'Could not delete $MoDuLe$. Please try again later.');
+          e.throwIf();
+        }
+      } catch (e) {
+        return { errors: e };
+      }
+    },
+    sort$Module$s: async (obj, { data }, { $Module$ }, info) => {
+      try {
+        const e = new FieldError();
+        e.throwIf();
+
+        const [sortCount] = await $Module$.sort(data);
+        if (sortCount.affectedRows > 0) {
+          return { count: sortCount.affectedRows };
+        } else {
+          e.setError('sort', 'Could not sort $MoDuLe$. Please try again later.');
+          e.throwIf();
+        }
+      } catch (e) {
+        return { errors: e };
+      }
+    },
+    deleteMany$Module$s: async (obj, { ids }, { $Module$ }) => {
+      try {
+        const e = new FieldError();
+
+        const deleteCount = await $Module$.deleteMany(ids);
+        if (deleteCount > 0) {
+          return { count: deleteCount };
+        } else {
+          e.setError('delete', 'Could not delete any of selected $MoDuLe$. Please try again later.');
           e.throwIf();
         }
       } catch (e) {
diff --git a/tools/templates/crud/server/schema.graphql b/tools/templates/crud/server/schema.graphql
index 64bd4b8ed1..dac89210ff 100644
--- a/tools/templates/crud/server/schema.graphql
+++ b/tools/templates/crud/server/schema.graphql
@@ -19,34 +19,31 @@ type $Module$Payload {
   errors: [FieldError!]
 }
 
-input OrderBy$Module$Input {
-  column: String
-  order: String
-}
-
-input Filter$Module$Input {
+input $Module$FilterInput {
   searchText: String
 }
 
-input Add$Module$Input {
+input $Module$CreateInput {
   name: String!
 }
 
-input Edit$Module$Input {
-  id: Int!
+input $Module$UpdateInput {
   name: String!
 }
 
+input $Module$WhereUniqueInput {
+  id: Int
+}
+
 extend type Query {
-  $module$s(limit: Int, offset: Int, orderBy: OrderBy$Module$Input, filter: Filter$Module$Input): $Module$s
-  $module$(id: Int!): $Module$Data
+  $module$s(limit: Int, offset: Int, orderBy: OrderByInput, filter: $Module$FilterInput): $Module$s
+  $module$(where: $Module$WhereUniqueInput!): $Module$Data
 }
 
 extend type Mutation {
-  add$Module$(input: Add$Module$Input!): $Module$Payload!
-  edit$Module$(input: Edit$Module$Input!): $Module$Payload!
-  delete$Module$(id: Int!): $Module$Payload!
+  create$Module$(data: $Module$CreateInput!): $Module$Payload!
+  update$Module$(data: $Module$UpdateInput!, where: $Module$WhereUniqueInput!): $Module$Payload!
+  delete$Module$(where: $Module$WhereUniqueInput!): $Module$Payload!
+  sort$Module$s(data: [Int!]): BatchManyPayload!
+  deleteMany$Module$s(ids: [Int!]): BatchManyPayload!
 }
-
-extend type Subscription {
-}
\ No newline at end of file
diff --git a/tools/webpackAppConfig.js b/tools/webpackAppConfig.js
index c41bf880fc..a7427101f2 100644
--- a/tools/webpackAppConfig.js
+++ b/tools/webpackAppConfig.js
@@ -47,7 +47,6 @@ const dependencyPlatforms = {
   bootstrap: 'web',
   cors: 'server',
   dotenv: 'server',
-  dataloader: 'server',
   'error-stack-parser': ['server', 'web'],
   expo: ['ios', 'android'],
   express: 'server',
@@ -78,6 +77,8 @@ const dependencyPlatforms = {
   pg: 'server',
   'redbox-react': ['server', 'web'],
   'react-cookie': ['server', 'web'],
+  'react-dnd': 'web',
+  'react-dnd-html5-backend': 'web',
   'react-dom': 'web',
   'react-dropzone': 'web',
   'react-ga': 'web',
diff --git a/yarn.lock b/yarn.lock
index 23a6d5bcb0..c683c53668 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -797,7 +797,7 @@ art@^0.10.0:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/art/-/art-0.10.1.tgz#38541883e399225c5e193ff246e8f157cf7b2146"
 
-asap@~2.0.3:
+asap@^2.0.6, asap@~2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
 
@@ -3736,10 +3736,23 @@ discontinuous-range@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a"
 
+disposables@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/disposables/-/disposables-1.0.2.tgz#36c6a674475f55a2d6913567a601444e487b4b6e"
+
 dlv@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.0.tgz#fee1a7c43f63be75f3f679e85262da5f102764a7"
 
+dnd-core@^2.5.4:
+  version "2.5.4"
+  resolved "https://registry.yarnpkg.com/dnd-core/-/dnd-core-2.5.4.tgz#0c70a8dcbb609c0b222e275fcae9fa83e5897397"
+  dependencies:
+    asap "^2.0.6"
+    invariant "^2.0.0"
+    lodash "^4.2.0"
+    redux "^3.7.1"
+
 dns-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
@@ -3813,28 +3826,28 @@ domain-browser@^1.1.1:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
 
-domain-graphql@^0.0.12:
-  version "0.0.12"
-  resolved "https://registry.yarnpkg.com/domain-graphql/-/domain-graphql-0.0.12.tgz#cbcb23843911f9fed2450da317e0b023ad856437"
+domain-graphql@^0.0.14:
+  version "0.0.14"
+  resolved "https://registry.yarnpkg.com/domain-graphql/-/domain-graphql-0.0.14.tgz#23d651ce3eaba5e083ed141069f77fad688fbe41"
   dependencies:
     debug "^3.1.0"
 
-domain-knex@^0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/domain-knex/-/domain-knex-0.0.8.tgz#02bcb1e70fe31297eec0161bae25b560292b3470"
+domain-knex@^0.0.10:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/domain-knex/-/domain-knex-0.0.10.tgz#2685acc0eb27d187dee5f4a7083e709e90ddcbac"
   dependencies:
     debug "^3.1.0"
     humps "^2.0.1"
 
-domain-react-forms@^0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/domain-react-forms/-/domain-react-forms-0.0.8.tgz#038c08e48766549f0bed5ee49c2dd0b67be2118a"
+domain-react-forms@^0.0.9:
+  version "0.0.9"
+  resolved "https://registry.yarnpkg.com/domain-react-forms/-/domain-react-forms-0.0.9.tgz#6382caf6a1e94fe4712d9eab50b781989c211f4e"
   dependencies:
     debug "^3.1.0"
 
-domain-schema@^0.0.10:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/domain-schema/-/domain-schema-0.0.10.tgz#05f11797d2ec71802580249bcf21f051fa157fdc"
+domain-schema@^0.0.13:
+  version "0.0.13"
+  resolved "https://registry.yarnpkg.com/domain-schema/-/domain-schema-0.0.13.tgz#dd47c7712d272b4a1a0850321b49c0422c2fdb52"
   dependencies:
     debug "^3.1.0"
 
@@ -5746,7 +5759,7 @@ hoist-non-react-statics@^1.0.5, hoist-non-react-statics@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb"
 
-hoist-non-react-statics@^2.2.0, hoist-non-react-statics@^2.2.1, hoist-non-react-statics@^2.2.2, hoist-non-react-statics@^2.3.0, hoist-non-react-statics@^2.3.1:
+hoist-non-react-statics@^2.1.0, hoist-non-react-statics@^2.2.0, hoist-non-react-statics@^2.2.1, hoist-non-react-statics@^2.2.2, hoist-non-react-statics@^2.3.0, hoist-non-react-statics@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.3.1.tgz#343db84c6018c650778898240135a1420ee22ce0"
 
@@ -6156,7 +6169,7 @@ interpret@^1.0.0, interpret@^1.0.1, interpret@^1.0.4:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
 
-invariant@^2.0.0, invariant@^2.2.0, invariant@^2.2.1, invariant@^2.2.2:
+invariant@^2.0.0, invariant@^2.1.0, invariant@^2.2.0, invariant@^2.2.1, invariant@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
   dependencies:
@@ -7967,6 +7980,10 @@ moment@2.x, moment@2.x.x, moment@^2.10.6, moment@^2.19.3:
   version "2.19.4"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.19.4.tgz#17e5e2c6ead8819c8ecfad83a0acccb312e94682"
 
+moment@^2.20.1:
+  version "2.20.1"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.20.1.tgz#d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd"
+
 morgan@^1.8.1:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.9.0.tgz#d01fa6c65859b76fcf31b3cb53a3821a311d8051"
@@ -10186,6 +10203,23 @@ react-devtools-core@^2.5.0:
     shell-quote "^1.6.1"
     ws "^2.0.3"
 
+react-dnd-html5-backend@^2.5.4:
+  version "2.5.4"
+  resolved "https://registry.yarnpkg.com/react-dnd-html5-backend/-/react-dnd-html5-backend-2.5.4.tgz#974ad083f67b12d56977a5b171f5ffeb29d78352"
+  dependencies:
+    lodash "^4.2.0"
+
+react-dnd@^2.5.4:
+  version "2.5.4"
+  resolved "https://registry.yarnpkg.com/react-dnd/-/react-dnd-2.5.4.tgz#0b6dc5e9d0dfc2909f4f4fe736e5534f3afd1bd9"
+  dependencies:
+    disposables "^1.0.1"
+    dnd-core "^2.5.4"
+    hoist-non-react-statics "^2.1.0"
+    invariant "^2.1.0"
+    lodash "^4.2.0"
+    prop-types "^15.5.10"
+
 react-dom@^16.2.0:
   version "16.2.0"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044"
@@ -10776,7 +10810,7 @@ redux-logger@^2.7.4:
   dependencies:
     deep-diff "0.3.4"
 
-redux@^3.4.0, redux@^3.6.0, redux@^3.7.2:
+redux@^3.4.0, redux@^3.6.0, redux@^3.7.1, redux@^3.7.2:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/redux/-/redux-3.7.2.tgz#06b73123215901d25d065be342eb026bc1c8537b"
   dependencies:

From 9171e12a1174e30c442e64ba63bdaee97fbd69c0 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 25 Jan 2018 07:51:09 +0100
Subject: [PATCH 069/327] fix cli paths

---
 tools/cli/module.js | 53 +++++++++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 24 deletions(-)

diff --git a/tools/cli/module.js b/tools/cli/module.js
index 90b804df60..c73e519e80 100644
--- a/tools/cli/module.js
+++ b/tools/cli/module.js
@@ -1,11 +1,15 @@
-/* eslint-disable import/no-dynamic-require */
-
-import shell from 'shelljs';
-import fs from 'fs';
-import chalk from 'chalk';
-import GraphQLGenerator from 'domain-graphql';
-import { pascalize, camelize } from 'humps';
-import { startCase } from 'lodash';
+const shell = require('shelljs');
+const fs = require('fs');
+const chalk = require('chalk');
+const GraphQLGenerator = require('domain-graphql');
+const { pascalize, camelize } = require('humps');
+const { startCase } = require('lodash');
+//import shell from 'shelljs';
+//import fs from 'fs';
+//import chalk from 'chalk';
+//import GraphQLGenerator from 'domain-graphql';
+//import { pascalize, camelize } from 'humps';
+//import { startCase } from 'lodash';
 
 function renameFiles(destinationPath, templatePath, module, location) {
   // pascalize
@@ -42,18 +46,18 @@ function copyFiles(logger, templatePath, module, action, tablePrefix, location)
   const Module = pascalize(module);
 
   // create new module directory
-  const mkdir = shell.mkdir(`${__dirname}/../../src/${location}/modules/${module}`);
+  const mkdir = shell.mkdir(`${__dirname}/../../packages/${location}/src/modules/${module}`);
 
   // continue only if directory does not jet exist
   if (mkdir.code === 0) {
-    const destinationPath = `${__dirname}/../../src/${location}/modules/${module}`;
+    const destinationPath = `${__dirname}/../../packages/${location}/src/modules/${module}`;
     renameFiles(destinationPath, templatePath, module, location);
 
     logger.info(chalk.green(`✔ The ${location} files have been copied!`));
 
     shell.cd('..');
     // get module input data
-    const path = `${__dirname}/../../src/${location}/modules/index.js`;
+    const path = `${__dirname}/../../packages/${location}/src/modules/index.js`;
     let data = fs.readFileSync(path);
 
     // extract Feature modules
@@ -69,19 +73,19 @@ function copyFiles(logger, templatePath, module, action, tablePrefix, location)
 
     if (action === 'addcrud' && location === 'server') {
       console.log('copy database files');
-      const destinationPath = `${__dirname}/../../src/${location}/database`;
+      const destinationPath = `${__dirname}/../../packages/${location}/src/database`;
       renameFiles(destinationPath, templatePath, module, 'database');
 
       const timestamp = new Date().getTime();
-      shell.cd(`${__dirname}/../../src/${location}/database/migrations`);
+      shell.cd(`${__dirname}/../../packages/${location}/src/database/migrations`);
       shell.mv(`_${Module}.js`, `${timestamp}_${Module}.js`);
-      shell.cd(`${__dirname}/../../src/${location}/database/seeds`);
+      shell.cd(`${__dirname}/../../packages/${location}/src/database/seeds`);
       shell.mv(`_${Module}.js`, `${timestamp}_${Module}.js`);
 
       logger.info(chalk.green(`✔ The database files have been copied!`));
 
       if (tablePrefix !== '') {
-        shell.cd(`${__dirname}/../../src/${location}/modules/${module}`);
+        shell.cd(`${__dirname}/../../packages/${location}/src/modules/${module}`);
         shell.sed('-i', /this.prefix = '';/g, `this.prefix = '${tablePrefix}';`, 'sql.js');
 
         logger.info(chalk.green(`✔ Inserted db table prefix!`));
@@ -98,17 +102,17 @@ function deleteFiles(logger, templatePath, module, location) {
   // pascalize
   const Module = pascalize(module);
 
-  const modulePath = `${__dirname}/../../src/${location}/modules/${module}`;
+  const modulePath = `${__dirname}/../../packages/${location}/src/modules/${module}`;
 
   if (fs.existsSync(modulePath)) {
     // remove module directory
     shell.rm('-rf', modulePath);
 
     // change to destination directory
-    shell.cd(`${__dirname}/../../src/${location}/modules/`);
+    shell.cd(`${__dirname}/../../packages/${location}/src/modules/`);
 
     // get module input data
-    const path = `${__dirname}/../../src/${location}/modules/index.js`;
+    const path = `${__dirname}/../../packages/${location}/src/modules/index.js`;
     let data = fs.readFileSync(path);
 
     // extract Feature modules
@@ -131,7 +135,7 @@ function deleteFiles(logger, templatePath, module, location) {
 
     if (location === 'server') {
       // change to database migrations directory
-      shell.cd(`${__dirname}/../../src/${location}/database/migrations`);
+      shell.cd(`${__dirname}/../../packages/${location}/src/database/migrations`);
       // check if any migrations files for this module exist
       if (shell.find('.').filter(file => file.search(`_${Module}.js`) > -1).length > 0) {
         let okMigrations = shell.rm(`*_${Module}.js`);
@@ -141,7 +145,7 @@ function deleteFiles(logger, templatePath, module, location) {
       }
 
       // change to database seeds directory
-      shell.cd(`${__dirname}/../../src/${location}/database/seeds`);
+      shell.cd(`${__dirname}/../../packages/${location}/src/database/seeds`);
       // check if any seed files for this module exist
       if (shell.find('.').filter(file => file.search(`_${Module}.js`) > -1).length > 0) {
         let okSeeds = shell.rm(`*_${Module}.js`);
@@ -164,14 +168,15 @@ function updateSchema(logger, module) {
   // pascalize
   const Module = pascalize(module);
 
-  const modulePath = `${__dirname}/../../src/server/modules/${module}`;
+  const modulePath = `${__dirname}/../../packages/server/src/modules/${module}`;
 
   if (fs.existsSync(modulePath)) {
     // get module schema
+    // eslint-disable-next-line import/no-dynamic-require
     const schema = require(`${modulePath}/schema`)[Module];
 
     // get schema file
-    const pathSchema = `${__dirname}/../../src/server/modules/${module}/`;
+    const pathSchema = `${__dirname}/../../packages/server/src/modules/${module}/`;
     if (fs.existsSync(pathSchema)) {
       const file = `schema.graphql`;
 
@@ -298,7 +303,7 @@ function updateSchema(logger, module) {
     }
 
     // get fragment file
-    const pathFragment = `${__dirname}/../../src/client/modules/${module}/graphql/`;
+    const pathFragment = `${__dirname}/../../packages/client/src/modules/${module}/graphql/`;
     if (fs.existsSync(pathFragment)) {
       const file = `${Module}.graphql`;
 
@@ -334,7 +339,7 @@ function updateSchema(logger, module) {
     }
 
     // get module query file
-    const pathModuleQuery = `${__dirname}/../../src/client/modules/${module}/graphql/`;
+    const pathModuleQuery = `${__dirname}/../../packages/client/src/modules/${module}/graphql/`;
     if (fs.existsSync(pathModuleQuery)) {
       const file = `${Module}Query.graphql`;
 

From 6d817d8eb7cb7924a5af56bdd5d7c2860edd179d Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 25 Jan 2018 08:08:29 +0100
Subject: [PATCH 070/327] fix crud paths

---
 tools/templates/crud/client/components/Module.web.jsx | 2 +-
 tools/templates/crud/client/containers/Module.spec.js | 4 ++--
 tools/templates/crud/client/containers/ModuleEdit.jsx | 2 +-
 tools/templates/crud/client/containers/ModuleList.jsx | 2 +-
 tools/templates/crud/server/resolvers.js              | 2 +-
 tools/templates/crud/server/sql.js                    | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tools/templates/crud/client/components/Module.web.jsx b/tools/templates/crud/client/components/Module.web.jsx
index daa0cb4de4..33d72e20ec 100644
--- a/tools/templates/crud/client/components/Module.web.jsx
+++ b/tools/templates/crud/client/components/Module.web.jsx
@@ -6,7 +6,7 @@ import { PageLayout } from '../../common/components/web';
 
 import $Module$Filter from '../containers/$Module$Filter';
 import $Module$List from '../containers/$Module$List';
-import settings from '../../../../../settings';
+import settings from '../../../../../../settings';
 
 class $Module$ extends React.PureComponent {
   static propTypes = {
diff --git a/tools/templates/crud/client/containers/Module.spec.js b/tools/templates/crud/client/containers/Module.spec.js
index 29ebdb682e..ac34fe5ce1 100644
--- a/tools/templates/crud/client/containers/Module.spec.js
+++ b/tools/templates/crud/client/containers/Module.spec.js
@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 import { step } from 'mocha-steps';
-import Renderer from '../../../../client/testHelpers/Renderer';
-import Routes from '../../../../client/app/Routes';
+import Renderer from '../../../testHelpers/Renderer';
+import Routes from '../../../app/Routes';
 
 describe('$Module$ UI works', () => {
   const renderer = new Renderer({});
diff --git a/tools/templates/crud/client/containers/ModuleEdit.jsx b/tools/templates/crud/client/containers/ModuleEdit.jsx
index 665d153497..f6779cdb2e 100644
--- a/tools/templates/crud/client/containers/ModuleEdit.jsx
+++ b/tools/templates/crud/client/containers/ModuleEdit.jsx
@@ -6,7 +6,7 @@ import { SubmissionError } from 'redux-form';
 
 import { EditView } from '../../common/components/crud';
 import { pickInputFields } from '../../common/util';
-import { $Module$ as $Module$Schema } from '../../../../server/modules/$module$/schema';
+import { $Module$ as $Module$Schema } from '../../../../../server/src/modules/$module$/schema';
 import $MODULE$_QUERY from '../graphql/$Module$Query.graphql';
 import CREATE_$MODULE$ from '../graphql/Create$Module$.graphql';
 import UPDATE_$MODULE$ from '../graphql/Update$Module$.graphql';
diff --git a/tools/templates/crud/client/containers/ModuleList.jsx b/tools/templates/crud/client/containers/ModuleList.jsx
index 2965503800..5389355f06 100644
--- a/tools/templates/crud/client/containers/ModuleList.jsx
+++ b/tools/templates/crud/client/containers/ModuleList.jsx
@@ -3,7 +3,7 @@ import { graphql, compose } from 'react-apollo';
 import { connect } from 'react-redux';
 
 import { ListView } from '../../common/components/crud';
-import { $Module$ as $Module$Schema } from '../../../../server/modules/$module$/schema';
+import { $Module$ as $Module$Schema } from '../../../../../server/src/modules/$module$/schema';
 import $MODULE$S_QUERY from '../graphql/$Module$sQuery.graphql';
 import DELETE_$MODULE$ from '../graphql/Delete$Module$.graphql';
 import SORT_$MODULE$S from '../graphql/Sort$Module$s.graphql';
diff --git a/tools/templates/crud/server/resolvers.js b/tools/templates/crud/server/resolvers.js
index 50d1b450c7..00ccb8fbdc 100644
--- a/tools/templates/crud/server/resolvers.js
+++ b/tools/templates/crud/server/resolvers.js
@@ -1,7 +1,7 @@
 /*eslint-disable no-unused-vars*/
 import parseFields from 'graphql-parse-fields';
 import { createBatchResolver } from 'graphql-resolve-batch';
-import FieldError from '../../../common/FieldError';
+import FieldError from '../../../../common/FieldError';
 
 export default pubsub => ({
   Query: {
diff --git a/tools/templates/crud/server/sql.js b/tools/templates/crud/server/sql.js
index 39d802a915..83265265b7 100644
--- a/tools/templates/crud/server/sql.js
+++ b/tools/templates/crud/server/sql.js
@@ -1,7 +1,7 @@
 import { decamelize } from 'humps';
 
 import { $Module$ as $Module$Schema } from './schema';
-import Crud from '../../../server/sql/crud';
+import Crud from '../../../src/sql/crud';
 
 export default class $Module$ extends Crud {
   constructor() {

From 303bfac8e4fb461df67050f5f1bec65a82e854bd Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 26 Jan 2018 14:08:16 +0100
Subject: [PATCH 071/327] refactor crud resolvers

---
 packages/server/src/api/rootSchema.graphql    |   2 +-
 packages/server/src/sql/crud.js               | 159 ++++++++++++++----
 tools/cli/module.js                           |  10 +-
 .../crud/client/containers/ModuleList.jsx     |   4 +-
 .../client/graphql/DeleteManyModules.graphql  |   4 +-
 .../client/graphql/UpdateManyModules.graphql  |   9 +
 tools/templates/crud/server/resolvers.js      | 112 +++---------
 tools/templates/crud/server/schema.graphql    |  11 +-
 8 files changed, 173 insertions(+), 138 deletions(-)
 create mode 100644 tools/templates/crud/client/graphql/UpdateManyModules.graphql

diff --git a/packages/server/src/api/rootSchema.graphql b/packages/server/src/api/rootSchema.graphql
index 9ba480da4e..5533e213a6 100644
--- a/packages/server/src/api/rootSchema.graphql
+++ b/packages/server/src/api/rootSchema.graphql
@@ -8,7 +8,7 @@ type PageInfo {
   hasNextPage: Boolean
 }
 
-type BatchManyPayload {
+type BatchPayload {
   count: Int
   errors: [FieldError!]
 }
diff --git a/packages/server/src/sql/crud.js b/packages/server/src/sql/crud.js
index 7f3b3a261c..67f7fb92b9 100644
--- a/packages/server/src/sql/crud.js
+++ b/packages/server/src/sql/crud.js
@@ -1,8 +1,10 @@
 import { has } from 'lodash';
 import { decamelize, decamelizeKeys } from 'humps';
 import knexnest from 'knexnest';
+import parseFields from 'graphql-parse-fields';
 
 import { selectBy, orderedFor } from './helpers';
+import FieldError from '../../../common/FieldError';
 import knex from './connector';
 
 export default class Crud {
@@ -18,9 +20,9 @@ export default class Crud {
     return this.schema;
   }
 
-  getPaginated({ limit, offset, orderBy, filter }, info) {
+  async getPaginated({ limit, offset, orderBy, filter }, info) {
     const baseQuery = knex(`${this.prefix}${this.tableName} as ${this.tableName}`);
-    const select = selectBy(this.schema, info, false, this.prefix);
+    const select = selectBy(this.schema, parseFields(info).edges, false, this.prefix);
     const queryBuilder = select(baseQuery);
 
     if (limit) {
@@ -76,7 +78,16 @@ export default class Crud {
       }
     }
 
-    return knexnest(queryBuilder);
+    const edges = await knexnest(queryBuilder);
+    const { count } = await this.getTotal();
+
+    return {
+      edges,
+      pageInfo: {
+        totalCount: count,
+        hasNextPage: edges && edges.length === limit
+      }
+    };
   }
 
   getTotal() {
@@ -85,46 +96,132 @@ export default class Crud {
       .first();
   }
 
-  get({ where }, info) {
+  async get({ where }, info) {
     const { id } = where;
+
     const baseQuery = knex(`${this.prefix}${this.tableName} as ${this.tableName}`);
-    const select = selectBy(this.schema, info, true, this.prefix);
-    return knexnest(select(baseQuery).where(`${this.tableName}.id`, '=', id));
+    const select = selectBy(this.schema, parseFields(info).node, true, this.prefix);
+    const node = await knexnest(select(baseQuery).where(`${this.tableName}.id`, '=', id));
+    return { node };
   }
 
-  create(data) {
-    return knex(`${this.prefix}${this.tableName}`)
-      .insert(decamelizeKeys(data))
-      .returning('id');
+  async create(data, info) {
+    try {
+      const e = new FieldError();
+      e.throwIf();
+
+      const [id] = await knex(`${this.prefix}${this.tableName}`)
+        .insert(decamelizeKeys(data))
+        .returning('id');
+      return await this.get({ where: { id } }, info);
+    } catch (e) {
+      return { errors: e };
+    }
   }
 
-  update(data, where) {
-    return knex(`${this.prefix}${this.tableName}`)
-      .update(decamelizeKeys(data))
-      .where(where);
+  async update(data, where, info) {
+    try {
+      const e = new FieldError();
+      e.throwIf();
+
+      await knex(`${this.prefix}${this.tableName}`)
+        .update(decamelizeKeys(data))
+        .where(where);
+
+      return await this.get({ where }, info);
+    } catch (e) {
+      return { errors: e };
+    }
   }
 
-  delete(where) {
-    return knex(`${this.prefix}${this.tableName}`)
-      .where(where)
-      .del();
+  async delete(where, info) {
+    try {
+      const e = new FieldError();
+
+      const node = await this.get({ where }, info);
+
+      if (!node) {
+        e.setError('delete', 'Node does not exist.');
+        e.throwIf();
+      }
+
+      const isDeleted = await knex(`${this.prefix}${this.tableName}`)
+        .where(where)
+        .del();
+
+      if (isDeleted) {
+        return node;
+      } else {
+        e.setError('delete', 'Could not delete Node. Please try again later.');
+        e.throwIf();
+      }
+    } catch (e) {
+      return { errors: e };
+    }
   }
 
-  deleteMany(ids) {
-    return knex(`${this.prefix}${this.tableName}`)
-      .whereIn('id', ids)
-      .del();
+  async sort(data) {
+    try {
+      const e = new FieldError();
+      e.throwIf();
+
+      const [sortCount] = await knex.raw(
+        `UPDATE ${this.prefix}${this.tableName} t1
+        JOIN ${this.prefix}${this.tableName} t2
+        ON t1.id = ? AND t2.id = ?
+        SET t1.rank = ?,
+        t2.rank = ?`,
+        data
+      );
+
+      if (sortCount.affectedRows > 0) {
+        return { count: sortCount.affectedRows };
+      } else {
+        e.setError('sort', 'Could not sort Node. Please try again later.');
+        e.throwIf();
+      }
+    } catch (e) {
+      return { errors: e };
+    }
   }
 
-  sort(data) {
-    return knex.raw(
-      `UPDATE ${this.prefix}${this.tableName} t1
-      JOIN ${this.prefix}${this.tableName} t2
-      ON t1.id = ? AND t2.id = ?
-      SET t1.rank = ?,
-      t2.rank = ?`,
-      data
-    );
+  async updateMany(data, { id_in }) {
+    try {
+      console.log('updateMany: ', id_in);
+      const e = new FieldError();
+      e.setError('update', 'Not yet implemented. Please try again later.');
+      /*const deleteCount = await knex(`${this.prefix}${this.tableName}`)
+        .whereIn('id', id_in)
+        .del();
+
+      if (deleteCount > 0) {
+        return { count: deleteCount };
+      } else {
+        e.setError('delete', 'Could not delete any of selected Node. Please try again later.');
+        e.throwIf();
+      }*/
+    } catch (e) {
+      return { errors: e };
+    }
+  }
+
+  async deleteMany({ id_in }) {
+    try {
+      const e = new FieldError();
+
+      const deleteCount = await knex(`${this.prefix}${this.tableName}`)
+        .whereIn('id', id_in)
+        .del();
+
+      if (deleteCount > 0) {
+        return { count: deleteCount };
+      } else {
+        e.setError('delete', 'Could not delete any of selected Node. Please try again later.');
+        e.throwIf();
+      }
+    } catch (e) {
+      return { errors: e };
+    }
   }
 
   async getByIds(ids, by, Obj, info) {
diff --git a/tools/cli/module.js b/tools/cli/module.js
index c73e519e80..c32b7aa153 100644
--- a/tools/cli/module.js
+++ b/tools/cli/module.js
@@ -4,12 +4,6 @@ const chalk = require('chalk');
 const GraphQLGenerator = require('domain-graphql');
 const { pascalize, camelize } = require('humps');
 const { startCase } = require('lodash');
-//import shell from 'shelljs';
-//import fs from 'fs';
-//import chalk from 'chalk';
-//import GraphQLGenerator from 'domain-graphql';
-//import { pascalize, camelize } from 'humps';
-//import { startCase } from 'lodash';
 
 function renameFiles(destinationPath, templatePath, module, location) {
   // pascalize
@@ -275,12 +269,12 @@ function updateSchema(logger, module) {
       }
 
       // override batch resolvers in resolvers.js file
-      replaceModuleData = `// order data([^*]+)// end order data`;
+      replaceModuleData = `// related data([^*]+)// end related data`;
       shell
         .ShellString(
           shell
             .cat(resolverFile)
-            .replace(RegExp(replaceModuleData, 'g'), `// order data\n${moduleData}    // end order data`)
+            .replace(RegExp(replaceModuleData, 'g'), `// related data\n${moduleData}    // end related data`)
         )
         .to(resolverFile);
 
diff --git a/tools/templates/crud/client/containers/ModuleList.jsx b/tools/templates/crud/client/containers/ModuleList.jsx
index 5389355f06..815e455879 100644
--- a/tools/templates/crud/client/containers/ModuleList.jsx
+++ b/tools/templates/crud/client/containers/ModuleList.jsx
@@ -91,10 +91,10 @@ const $Module$WithApollo = compose(
   }),
   graphql(DELETEMANY_$MODULE$S, {
     props: ({ ownProps: { refetch }, mutate }) => ({
-      deleteManyEntries: async ids => {
+      deleteManyEntries: async id_in => {
         try {
           const { data: { deleteMany$Module$s } } = await mutate({
-            variables: { ids }
+            variables: { where: { id_in } }
           });
 
           if (deleteMany$Module$s.errors) {
diff --git a/tools/templates/crud/client/graphql/DeleteManyModules.graphql b/tools/templates/crud/client/graphql/DeleteManyModules.graphql
index 10d3b9b23a..70a9836a66 100644
--- a/tools/templates/crud/client/graphql/DeleteManyModules.graphql
+++ b/tools/templates/crud/client/graphql/DeleteManyModules.graphql
@@ -1,5 +1,5 @@
-mutation deleteMany$Module$s($ids: [Int!]) {
-  deleteMany$Module$s(ids: $ids) {
+mutation deleteMany$Module$s($where: $Module$WhereInput!) {
+  deleteMany$Module$s(where: $where) {
     count
     errors {
       field
diff --git a/tools/templates/crud/client/graphql/UpdateManyModules.graphql b/tools/templates/crud/client/graphql/UpdateManyModules.graphql
new file mode 100644
index 0000000000..a388ee6ab4
--- /dev/null
+++ b/tools/templates/crud/client/graphql/UpdateManyModules.graphql
@@ -0,0 +1,9 @@
+mutation updateMany$Module$s($data: $Module$UpdateInput!, $where: $Module$WhereInput!) {
+  updateMany$Module$s(data: $data, where: $where) {
+    count
+    errors {
+      field
+      message
+    }
+  }
+}
diff --git a/tools/templates/crud/server/resolvers.js b/tools/templates/crud/server/resolvers.js
index 00ccb8fbdc..0c9b721856 100644
--- a/tools/templates/crud/server/resolvers.js
+++ b/tools/templates/crud/server/resolvers.js
@@ -1,110 +1,40 @@
-/*eslint-disable no-unused-vars*/
-import parseFields from 'graphql-parse-fields';
+// eslint-disable-next-line no-unused-vars
 import { createBatchResolver } from 'graphql-resolve-batch';
-import FieldError from '../../../../common/FieldError';
 
+// eslint-disable-next-line no-unused-vars
 export default pubsub => ({
   Query: {
-    $module$s: async (obj, args, { $Module$ }, info) => {
-      const $module$s = await $Module$.getPaginated(args, parseFields(info).edges);
-      const { count } = await $Module$.getTotal();
-
-      return {
-        edges: $module$s,
-        pageInfo: {
-          totalCount: count,
-          hasNextPage: $module$s && $module$s.length === args.limit
-        }
-      };
+    $module$s: (obj, args, { $Module$ }, info) => {
+      return $Module$.getPaginated(args, info);
     },
-    $module$: async (obj, args, { $Module$ }, info) => {
-      const $module$ = await $Module$.get(args, parseFields(info).node);
-      return { node: $module$ };
+    $module$: (obj, args, { $Module$ }, info) => {
+      return $Module$.get(args, info);
     }
   },
   $Module$Data: {
-    // order data
-    // end order data
+    // related data
+    // end related data
   },
   // schema batch resolvers
   // end schema batch resolvers
   Mutation: {
-    create$Module$: async (obj, { data }, { $Module$ }, info) => {
-      try {
-        const e = new FieldError();
-        e.throwIf();
-
-        const [id] = await $Module$.create(data);
-        const $module$ = await $Module$.get({ where: { id } }, parseFields(info).node);
-
-        return { node: $module$ };
-      } catch (e) {
-        return { errors: e };
-      }
+    create$Module$: (obj, { data }, { $Module$ }, info) => {
+      return $Module$.create(data, info);
     },
-    update$Module$: async (obj, { data, where }, { $Module$ }, info) => {
-      try {
-        const e = new FieldError();
-        e.throwIf();
-
-        await $Module$.update(data, where);
-        const $module$ = await $Module$.get({ where }, parseFields(info).node);
-        return { node: $module$ };
-      } catch (e) {
-        return { errors: e };
-      }
+    update$Module$: (obj, { data, where }, { $Module$ }, info) => {
+      return $Module$.update(data, where, info);
     },
-    delete$Module$: async (obj, { where }, { $Module$ }, info) => {
-      try {
-        const e = new FieldError();
-
-        const $module$ = await $Module$.get({ where }, parseFields(info).node);
-        if (!$module$) {
-          e.setError('delete', '$MoDuLe$ does not exist.');
-          e.throwIf();
-        }
-
-        const isDeleted = await $Module$.delete(where);
-        if (isDeleted) {
-          return { node: $module$ };
-        } else {
-          e.setError('delete', 'Could not delete $MoDuLe$. Please try again later.');
-          e.throwIf();
-        }
-      } catch (e) {
-        return { errors: e };
-      }
+    delete$Module$: (obj, { where }, { $Module$ }, info) => {
+      return $Module$.delete(where, info);
     },
-    sort$Module$s: async (obj, { data }, { $Module$ }, info) => {
-      try {
-        const e = new FieldError();
-        e.throwIf();
-
-        const [sortCount] = await $Module$.sort(data);
-        if (sortCount.affectedRows > 0) {
-          return { count: sortCount.affectedRows };
-        } else {
-          e.setError('sort', 'Could not sort $MoDuLe$. Please try again later.');
-          e.throwIf();
-        }
-      } catch (e) {
-        return { errors: e };
-      }
+    sort$Module$s: (obj, { data }, { $Module$ }) => {
+      return $Module$.sort(data);
     },
-    deleteMany$Module$s: async (obj, { ids }, { $Module$ }) => {
-      try {
-        const e = new FieldError();
-
-        const deleteCount = await $Module$.deleteMany(ids);
-        if (deleteCount > 0) {
-          return { count: deleteCount };
-        } else {
-          e.setError('delete', 'Could not delete any of selected $MoDuLe$. Please try again later.');
-          e.throwIf();
-        }
-      } catch (e) {
-        return { errors: e };
-      }
+    updateMany$Module$s: (obj, { data, where }, { $Module$ }) => {
+      return $Module$.deleteMany(data, where);
+    },
+    deleteMany$Module$s: (obj, { where }, { $Module$ }) => {
+      return $Module$.deleteMany(where);
     }
   },
   Subscription: {}
diff --git a/tools/templates/crud/server/schema.graphql b/tools/templates/crud/server/schema.graphql
index dac89210ff..2f888551df 100644
--- a/tools/templates/crud/server/schema.graphql
+++ b/tools/templates/crud/server/schema.graphql
@@ -32,7 +32,11 @@ input $Module$UpdateInput {
 }
 
 input $Module$WhereUniqueInput {
-  id: Int
+  id: Int!
+}
+
+input $Module$WhereInput {
+  id_in: [Int!]
 }
 
 extend type Query {
@@ -44,6 +48,7 @@ extend type Mutation {
   create$Module$(data: $Module$CreateInput!): $Module$Payload!
   update$Module$(data: $Module$UpdateInput!, where: $Module$WhereUniqueInput!): $Module$Payload!
   delete$Module$(where: $Module$WhereUniqueInput!): $Module$Payload!
-  sort$Module$s(data: [Int!]): BatchManyPayload!
-  deleteMany$Module$s(ids: [Int!]): BatchManyPayload!
+  sort$Module$s(data: [Int!]): BatchPayload!
+  updateMany$Module$s(data: $Module$UpdateInput!, where: $Module$WhereInput!): BatchPayload!
+  deleteMany$Module$s(where: $Module$WhereInput!): BatchPayload!
 }

From e3e20dde64c6bd8ea0ee8f9593e98fc92b874ffe Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 26 Jan 2018 14:25:04 +0100
Subject: [PATCH 072/327] fix client error

---
 tools/templates/crud/client/containers/ModuleEdit.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/templates/crud/client/containers/ModuleEdit.jsx b/tools/templates/crud/client/containers/ModuleEdit.jsx
index f6779cdb2e..5f82887d09 100644
--- a/tools/templates/crud/client/containers/ModuleEdit.jsx
+++ b/tools/templates/crud/client/containers/ModuleEdit.jsx
@@ -31,7 +31,7 @@ class $Module$Edit extends React.Component {
       result = await createEntry(insertValues);
     }
 
-    if (result.errors) {
+    if (result && result.errors) {
       let submitError = {
         _error: `Edit ${title} failed!`
       };

From 1baf15ca56172dfb3d0c20c156bfb6842e19be08 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 30 Jan 2018 13:27:00 +0100
Subject: [PATCH 073/327] update crud to allow nested mutations

---
 .../client/src/modules/common/util.web.jsx    |  83 ++++++++-
 packages/server/src/sql/crud.js               | 174 ++++++++++++++----
 tools/cli/module.js                           | 108 +++++++++--
 .../crud/client/containers/ModuleEdit.jsx     |   3 +-
 .../crud/client/containers/ModuleList.jsx     |  16 +-
 .../crud/client/graphql/ModuleQuery.graphql   |   1 -
 .../crud/client/graphql/ModulesQuery.graphql  |   4 +-
 tools/templates/crud/server/resolvers.js      |  35 ++--
 tools/templates/crud/server/schema.graphql    |   5 +-
 tools/templates/crud/server/sql.js            |   2 +-
 10 files changed, 333 insertions(+), 98 deletions(-)

diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index 3bfe53dd4a..7310b3bc50 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -1,7 +1,8 @@
 /* eslint-disable react/display-name */
 import React from 'react';
-import { startCase } from 'lodash';
-import { Field } from 'redux-form';
+import PropTypes from 'prop-types';
+import { startCase, isEqual } from 'lodash';
+import { Field, FieldArray } from 'redux-form';
 import { Link } from 'react-router-dom';
 
 import { RenderField, RenderSelect, RenderDate, RenderSwitch, Button, Popconfirm, Switch } from './components/web';
@@ -92,7 +93,33 @@ export const createColumnFields = (schema, link, orderBy, renderOrderByArrow, he
   return columns;
 };
 
-export const createFormFields = (schema, formdata) => {
+const RenderEntry = ({ fields, formdata, schema, meta: { error, submitFailed } }) => (
+  <ul>
+    <li>
+      <Button color="primary" size="sm" onClick={() => fields.push({})}>
+        Add Entry
+      </Button>
+      {submitFailed && error && <span>{error}</span>}
+    </li>
+    {fields.map((field, index) => (
+      <li key={index}>
+        <Button color="primary" size="sm" onClick={() => fields.remove(index)}>
+          Delete
+        </Button>
+        {createFormFields(schema, formdata, `${field}.`)}
+      </li>
+    ))}
+  </ul>
+);
+
+RenderEntry.propTypes = {
+  fields: PropTypes.object,
+  formdata: PropTypes.object,
+  schema: PropTypes.object,
+  meta: PropTypes.object
+};
+
+export const createFormFields = (schema, formdata, prefix = '') => {
   let fields = [];
 
   for (const key of schema.keys()) {
@@ -123,7 +150,7 @@ export const createFormFields = (schema, formdata) => {
 
       fields.push(
         <Field
-          name={key}
+          name={`${prefix}${key}`}
           key={key}
           component={component}
           data={data}
@@ -134,7 +161,9 @@ export const createFormFields = (schema, formdata) => {
       );
     } else {
       if (value.type.constructor === Array) {
-        //console.log('key: ', value.type);
+        fields.push(
+          <FieldArray name={key} key={key} component={RenderEntry} schema={value.type[0]} formdata={formdata} />
+        );
       }
     }
   }
@@ -142,16 +171,56 @@ export const createFormFields = (schema, formdata) => {
   return fields;
 };
 
-export const pickInputFields = (schema, values) => {
+export const pickInputFields = (schema, values, node = null) => {
   let inputValues = {};
 
   for (const key of schema.keys()) {
     if (key in values) {
       const value = schema.values[key];
       if (value.type.isSchema) {
-        inputValues[`${key}Id`] = Number(values[key].id ? values[key].id : values[key]);
+        if (values[key]) {
+          inputValues[`${key}Id`] = Number(values[key].id ? values[key].id : values[key]);
+        }
       } else if (key !== 'id' && value.type.constructor !== Array) {
         inputValues[key] = values[key];
+      } else if (value.type.constructor === Array) {
+        const keys1 = {};
+        const keys2 = {};
+
+        let create = [];
+        let update = [];
+        let deleted = [];
+
+        node[key].forEach(item => {
+          keys1[item.id] = item;
+        });
+
+        values[key].forEach(item => {
+          keys2[item.id] = item;
+        });
+
+        node[key].forEach(item => {
+          const obj = keys2[item.id];
+          if (!obj) {
+            deleted.push({ id: item.id });
+          } else {
+            if (!isEqual(obj, item)) {
+              update.push({ where: { id: obj.id }, data: pickInputFields(value.type[0], obj) });
+            }
+          }
+        });
+
+        values[key].forEach(item => {
+          if (!keys1[item.id]) {
+            create.push({ ...item });
+          }
+        });
+
+        //console.log('created: ', create);
+        //console.log('updated: ', update);
+        //console.log('deleted: ', deleted);
+
+        inputValues[key] = { create, update, delete: deleted };
       }
     }
   }
diff --git a/packages/server/src/sql/crud.js b/packages/server/src/sql/crud.js
index 67f7fb92b9..0e6718c310 100644
--- a/packages/server/src/sql/crud.js
+++ b/packages/server/src/sql/crud.js
@@ -1,5 +1,5 @@
 import { has } from 'lodash';
-import { decamelize, decamelizeKeys } from 'humps';
+import { decamelize, decamelizeKeys, camelize, pascalize } from 'humps';
 import knexnest from 'knexnest';
 import parseFields from 'graphql-parse-fields';
 
@@ -20,9 +20,9 @@ export default class Crud {
     return this.schema;
   }
 
-  async getPaginated({ limit, offset, orderBy, filter }, info) {
+  _getList({ limit, offset, orderBy, filter }, info) {
     const baseQuery = knex(`${this.prefix}${this.tableName} as ${this.tableName}`);
-    const select = selectBy(this.schema, parseFields(info).edges, false, this.prefix);
+    const select = selectBy(this.schema, info, false, this.prefix);
     const queryBuilder = select(baseQuery);
 
     if (limit) {
@@ -78,76 +78,155 @@ export default class Crud {
       }
     }
 
-    const edges = await knexnest(queryBuilder);
+    return knexnest(queryBuilder);
+  }
+
+  async getPaginated(args, info) {
+    const edges = await this._getList(args, parseFields(info).edges);
     const { count } = await this.getTotal();
 
     return {
       edges,
       pageInfo: {
         totalCount: count,
-        hasNextPage: edges && edges.length === limit
+        hasNextPage: edges && edges.length === args.limit
       }
     };
   }
 
+  getList(args, info) {
+    return this._getList(args, parseFields(info));
+  }
+
   getTotal() {
     return knex(`${this.prefix}${this.tableName}`)
       .countDistinct('id as count')
       .first();
   }
 
-  async get({ where }, info) {
+  _get({ where }, info) {
     const { id } = where;
 
     const baseQuery = knex(`${this.prefix}${this.tableName} as ${this.tableName}`);
-    const select = selectBy(this.schema, parseFields(info).node, true, this.prefix);
-    const node = await knexnest(select(baseQuery).where(`${this.tableName}.id`, '=', id));
+    const select = selectBy(this.schema, info, true, this.prefix);
+    return knexnest(select(baseQuery).where(`${this.tableName}.id`, '=', id));
+  }
+
+  async get(args, info) {
+    const node = await this._get(args, parseFields(info).node);
     return { node };
   }
 
-  async create(data, info) {
+  _create(data) {
+    return knex(`${this.prefix}${this.tableName}`)
+      .insert(decamelizeKeys(data))
+      .returning('id');
+  }
+
+  async create({ data }, ctx, info) {
     try {
       const e = new FieldError();
       e.throwIf();
 
-      const [id] = await knex(`${this.prefix}${this.tableName}`)
-        .insert(decamelizeKeys(data))
-        .returning('id');
+      // extract nested entries from data
+      let nestedEntries = [];
+      for (const key of this.schema.keys()) {
+        const value = this.schema.values[key];
+        if (value.type.constructor === Array && data[key]) {
+          nestedEntries.push({ key, data: data[key] });
+          delete data[key];
+        }
+      }
+
+      const [id] = await this._create(data);
+
+      // create nested entries
+      if (nestedEntries.length > 0) {
+        nestedEntries.map(nested => {
+          if (nested.data.create) {
+            nested.data.create.map(async create => {
+              create[`${camelize(this.schema.name)}Id`] = id;
+              await ctx[pascalize(nested.key)]._create(create);
+            });
+          }
+        });
+      }
+
       return await this.get({ where: { id } }, info);
     } catch (e) {
       return { errors: e };
     }
   }
 
-  async update(data, where, info) {
+  _update({ data, where }) {
+    return knex(`${this.prefix}${this.tableName}`)
+      .update(decamelizeKeys(data))
+      .where(where);
+  }
+
+  async update(args, ctx, info) {
     try {
       const e = new FieldError();
       e.throwIf();
 
-      await knex(`${this.prefix}${this.tableName}`)
-        .update(decamelizeKeys(data))
-        .where(where);
+      // extract nested entries from data
+      let nestedEntries = [];
+      for (const key of this.schema.keys()) {
+        const value = this.schema.values[key];
+        if (value.type.constructor === Array && args.data[key]) {
+          nestedEntries.push({ key, data: args.data[key] });
+          delete args.data[key];
+        }
+      }
+
+      await this._update(args);
 
-      return await this.get({ where }, info);
+      // create, update, delete nested entries
+      if (nestedEntries.length > 0) {
+        nestedEntries.map(nested => {
+          if (nested.data.create) {
+            nested.data.create.map(async create => {
+              create[`${camelize(this.schema.name)}Id`] = args.where.id;
+              await ctx[pascalize(nested.key)]._create(create);
+            });
+          }
+          if (nested.data.update) {
+            nested.data.update.map(async update => {
+              await ctx[pascalize(nested.key)]._update(update);
+            });
+          }
+          if (nested.data.delete) {
+            nested.data.delete.map(async where => {
+              await ctx[pascalize(nested.key)]._delete({ where });
+            });
+          }
+        });
+      }
+
+      return await this.get(args, info);
     } catch (e) {
       return { errors: e };
     }
   }
 
-  async delete(where, info) {
+  _delete({ where }) {
+    return knex(`${this.prefix}${this.tableName}`)
+      .where(where)
+      .del();
+  }
+
+  async delete(args, info) {
     try {
       const e = new FieldError();
 
-      const node = await this.get({ where }, info);
+      const node = await this.get(args, info);
 
       if (!node) {
         e.setError('delete', 'Node does not exist.');
         e.throwIf();
       }
 
-      const isDeleted = await knex(`${this.prefix}${this.tableName}`)
-        .where(where)
-        .del();
+      const isDeleted = await this._delete(args);
 
       if (isDeleted) {
         return node;
@@ -160,19 +239,23 @@ export default class Crud {
     }
   }
 
-  async sort(data) {
-    try {
-      const e = new FieldError();
-      e.throwIf();
-
-      const [sortCount] = await knex.raw(
-        `UPDATE ${this.prefix}${this.tableName} t1
+  _sort({ data }) {
+    return knex.raw(
+      `UPDATE ${this.prefix}${this.tableName} t1
         JOIN ${this.prefix}${this.tableName} t2
         ON t1.id = ? AND t2.id = ?
         SET t1.rank = ?,
         t2.rank = ?`,
-        data
-      );
+      data
+    );
+  }
+
+  async sort(args) {
+    try {
+      const e = new FieldError();
+      e.throwIf();
+
+      const [sortCount] = await this._sort(args);
 
       if (sortCount.affectedRows > 0) {
         return { count: sortCount.affectedRows };
@@ -185,14 +268,20 @@ export default class Crud {
     }
   }
 
-  async updateMany(data, { id_in }) {
+  _updateMany({ data, where: { id_in } }) {
+    console.log('_updateMany: data: ', data);
+    console.log('_updateMany: id_in: ', id_in);
+    //return knex(`${this.prefix}${this.tableName}`)
+    //  .whereIn('id', id_in)
+    //  .del();
+  }
+
+  async updateMany(args) {
     try {
-      console.log('updateMany: ', id_in);
+      console.log('updateMany: ', args);
       const e = new FieldError();
       e.setError('update', 'Not yet implemented. Please try again later.');
-      /*const deleteCount = await knex(`${this.prefix}${this.tableName}`)
-        .whereIn('id', id_in)
-        .del();
+      /*const deleteCount = await this._updateMany(args);
 
       if (deleteCount > 0) {
         return { count: deleteCount };
@@ -205,13 +294,17 @@ export default class Crud {
     }
   }
 
-  async deleteMany({ id_in }) {
+  _deleteMany({ where: { id_in } }) {
+    return knex(`${this.prefix}${this.tableName}`)
+      .whereIn('id', id_in)
+      .del();
+  }
+
+  async deleteMany(args) {
     try {
       const e = new FieldError();
 
-      const deleteCount = await knex(`${this.prefix}${this.tableName}`)
-        .whereIn('id', id_in)
-        .del();
+      const deleteCount = await this._deleteMany(args);
 
       if (deleteCount > 0) {
         return { count: deleteCount };
@@ -225,6 +318,7 @@ export default class Crud {
   }
 
   async getByIds(ids, by, Obj, info) {
+    info = parseFields(info);
     info[`${by}Id`] = true;
     const baseQuery = knex(`${Obj.getPrefix()}${Obj.getTableName()} as ${Obj.getTableName()}`);
     const select = selectBy(Obj.getSchema(), info, false, Obj.getPrefix());
diff --git a/tools/cli/module.js b/tools/cli/module.js
index c32b7aa153..c50a303cb3 100644
--- a/tools/cli/module.js
+++ b/tools/cli/module.js
@@ -1,7 +1,7 @@
 const shell = require('shelljs');
 const fs = require('fs');
 const chalk = require('chalk');
-const GraphQLGenerator = require('domain-graphql');
+const GraphQLGenerator = require('domain-graphql').default;
 const { pascalize, camelize } = require('humps');
 const { startCase } = require('lodash');
 
@@ -178,11 +178,13 @@ function updateSchema(logger, module) {
       let moduleData = `  node: ${Module}\n`;
       let inputCreate = '';
       let inputUpdate = '';
+      let manyInput = '';
       for (const key of schema.keys()) {
         const value = schema.values[key];
         if (value.type.isSchema) {
-          inputCreate += `  ${key}Id: Int!\n`;
-          inputUpdate += `  ${key}Id: Int!\n`;
+          let required = value.optional ? '' : '!';
+          inputCreate += `  ${key}Id: Int${required}\n`;
+          inputUpdate += `  ${key}Id: Int${required}\n`;
           moduleData += `  ${key}s(limit: Int, orderBy: OrderByInput): [${value.type.name}]\n`;
         } else if (value.type.constructor !== Array) {
           if (key !== 'id') {
@@ -191,6 +193,33 @@ function updateSchema(logger, module) {
             inputUpdate +=
               `  ${key}: ` + new GraphQLGenerator()._generateField(schema.name + '.' + key, value, []) + '\n';
           }
+        } else if (value.type.constructor === Array) {
+          inputCreate += `  ${key}: ${pascalize(key)}CreateManyInput\n`;
+          inputUpdate += `  ${key}: ${pascalize(key)}UpdateManyInput\n`;
+
+          for (const remoteKey of value.type[0].keys()) {
+            const remoteValue = value.type[0].values[remoteKey];
+            if (remoteValue.type.isSchema) {
+              moduleData += `  ${remoteKey}s: [${pascalize(remoteKey)}]\n`;
+            }
+          }
+
+          manyInput += `
+
+input ${pascalize(key)}CreateManyInput {
+  create: [${pascalize(key)}CreateInput!]
+}
+
+input ${pascalize(key)}UpdateManyInput {
+  create: [${pascalize(key)}CreateInput!]
+  delete: [${pascalize(key)}WhereUniqueInput!]
+  update: [${pascalize(key)}UpdateWhereInput!]
+}
+
+input ${pascalize(key)}UpdateWhereInput {
+  where: ${pascalize(key)}WhereUniqueInput!
+  data: ${pascalize(key)}UpdateInput!
+}`;
         }
       }
 
@@ -205,7 +234,7 @@ function updateSchema(logger, module) {
               RegExp(replaceType, 'g'),
               `### schema type definitions\n${new GraphQLGenerator().generateTypes(
                 schema
-              )}\n\n### end schema type definitions`
+              )}${manyInput}\n\n### end schema type definitions`
             )
         )
         .to(file);
@@ -240,26 +269,28 @@ function updateSchema(logger, module) {
       for (const key of schema.keys()) {
         const value = schema.values[key];
         if (value.type.isSchema) {
-          let column = 'name';
-          for (const remoteKey of value.type.keys()) {
-            const remoteValue = value.type.values[remoteKey];
-            if (remoteValue.sortBy) {
-              column = remoteKey;
-            }
-          }
-          moduleData += `    ${key}s(obj, args, { ${value.type.name} }) {
-      return ${value.type.name}.getPaginated(args, { id: true, ${column}: true });
+          moduleData += `    ${key}s(obj, args, ctx, info) {
+      return ctx.${value.type.name}.getList(args, info);
     },
 `;
         } else if (value.type.constructor === Array) {
           replace += `  ${schema.name}: {
-    ${key}: createBatchResolver((sources, args, { ${schema.name}, ${value.type[0].name} }, info) => {
-      return ${schema.name}.getByIds(sources.map(({ id }) => id), '${camelize(schema.name)}', ${
+    ${key}: createBatchResolver((sources, args, ctx, info) => {
+      return ctx.${schema.name}.getByIds(sources.map(({ id }) => id), '${camelize(schema.name)}', ctx.${
             value.type[0].name
-          }, parseFields(info));
+          }, info);
     })
   },
 `;
+          for (const remoteKey of value.type[0].keys()) {
+            const remoteValue = value.type[0].values[remoteKey];
+            if (remoteValue.type.isSchema) {
+              moduleData += `    ${remoteKey}s(obj, args, ctx, info) {
+      return ctx.${remoteValue.type.name}.getList(args, info);
+    },
+`;
+            }
+          }
         }
       }
 
@@ -302,6 +333,7 @@ function updateSchema(logger, module) {
       const file = `${Module}.graphql`;
 
       // regenerate graphql fragment
+      // TODO: refactor to generate this recursively
       let graphql = '';
       for (const key of schema.keys()) {
         const value = schema.values[key];
@@ -317,15 +349,36 @@ function updateSchema(logger, module) {
           graphql += `    id\n`;
           graphql += `    ${column}\n`;
           graphql += `  }\n`;
-        } else if (value.type.constructor !== Array) {
+        } else if (value.type.constructor === Array) {
+          graphql += `  ${key} {\n`;
+          for (const remoteKey of value.type[0].keys()) {
+            const remoteValue = value.type[0].values[remoteKey];
+            if (remoteValue.type.isSchema) {
+              let remotecolumn = 'name';
+              for (const remoteKey of remoteValue.type.keys()) {
+                const remoteValue1 = remoteValue.type.values[remoteKey];
+                if (remoteValue1.sortBy) {
+                  remotecolumn = remoteKey;
+                }
+              }
+              graphql += `  ${remoteKey} {\n`;
+              graphql += `    id\n`;
+              graphql += `    ${remotecolumn}\n`;
+              graphql += `  }\n`;
+            } else {
+              graphql += `    ${remoteKey}\n`;
+            }
+          }
+          graphql += `  }\n`;
+        } else {
           graphql += `  ${key}\n`;
         }
       }
 
       shell.cd(pathFragment);
       // override graphql fragment file
-      const replaceFragment = `${Module} {(.|\n)*\n}`;
-      shell.ShellString(shell.cat(file).replace(RegExp(replaceFragment, 'g'), `${Module} {\n${graphql}}`)).to(file);
+      const replaceFragment = `${Module} {(.|\n)*\n}\n`;
+      shell.ShellString(shell.cat(file).replace(RegExp(replaceFragment, 'g'), `${Module} {\n${graphql}}\n`)).to(file);
 
       logger.info(chalk.green(`✔ Fragment in ${pathFragment}${file} successfully updated!`));
     } else {
@@ -353,6 +406,23 @@ function updateSchema(logger, module) {
           graphql += `      id\n`;
           graphql += `      ${column}\n`;
           graphql += `    }\n`;
+        } else if (value.type.constructor === Array) {
+          for (const remoteKey of value.type[0].keys()) {
+            const remoteValue = value.type[0].values[remoteKey];
+            if (remoteValue.type.isSchema) {
+              let remotecolumn = 'name';
+              for (const remoteKey of remoteValue.type.keys()) {
+                const remoteValue1 = remoteValue.type.values[remoteKey];
+                if (remoteValue1.sortBy) {
+                  remotecolumn = remoteKey;
+                }
+              }
+              graphql += `    ${remoteKey}s {\n`;
+              graphql += `      id\n`;
+              graphql += `      ${remotecolumn}\n`;
+              graphql += `    }\n`;
+            }
+          }
         }
       }
 
diff --git a/tools/templates/crud/client/containers/ModuleEdit.jsx b/tools/templates/crud/client/containers/ModuleEdit.jsx
index 5f82887d09..5a1ecd20d0 100644
--- a/tools/templates/crud/client/containers/ModuleEdit.jsx
+++ b/tools/templates/crud/client/containers/ModuleEdit.jsx
@@ -22,8 +22,7 @@ class $Module$Edit extends React.Component {
   onSubmit = async values => {
     const { data: { node }, createEntry, updateEntry, title } = this.props;
     let result = null;
-
-    const insertValues = pickInputFields($Module$Schema, values);
+    const insertValues = pickInputFields($Module$Schema, values, node);
 
     if (node) {
       result = await updateEntry(insertValues, { id: node.id });
diff --git a/tools/templates/crud/client/containers/ModuleList.jsx b/tools/templates/crud/client/containers/ModuleList.jsx
index 815e455879..98674c5e8c 100644
--- a/tools/templates/crud/client/containers/ModuleList.jsx
+++ b/tools/templates/crud/client/containers/ModuleList.jsx
@@ -27,28 +27,28 @@ const $Module$WithApollo = compose(
         }
       };
     },
-    props: ({ data: { loading, $module$s, refetch, error, fetchMore } }) => {
+    props: ({ data: { loading, $module$sConnection, refetch, error, fetchMore } }) => {
       const loadMoreRows = () => {
         return fetchMore({
           variables: {
-            offset: $module$s.edges.length
+            offset: $module$sConnection.edges.length
           },
           updateQuery: (previousResult, { fetchMoreResult }) => {
-            const newEdges = fetchMoreResult.$module$s.edges;
-            const pageInfo = fetchMoreResult.$module$s.pageInfo;
+            const newEdges = fetchMoreResult.$module$sConnection.edges;
+            const pageInfo = fetchMoreResult.$module$sConnection.pageInfo;
 
             return {
-              $module$s: {
-                edges: [...previousResult.$module$s.edges, ...newEdges],
+              $module$sConnection: {
+                edges: [...previousResult.$module$sConnection.edges, ...newEdges],
                 pageInfo,
-                __typename: '$Module$s'
+                __typename: '$Module$sConnection'
               }
             };
           }
         });
       };
       if (error) throw new Error(error);
-      return { loading, data: $module$s, loadMoreRows, refetch, errors: error ? error.graphQLErrors : null };
+      return { loading, data: $module$sConnection, loadMoreRows, refetch, errors: error ? error.graphQLErrors : null };
     }
   }),
   graphql(DELETE_$MODULE$, {
diff --git a/tools/templates/crud/client/graphql/ModuleQuery.graphql b/tools/templates/crud/client/graphql/ModuleQuery.graphql
index 201dd25754..49b7b0da73 100644
--- a/tools/templates/crud/client/graphql/ModuleQuery.graphql
+++ b/tools/templates/crud/client/graphql/ModuleQuery.graphql
@@ -9,4 +9,3 @@ query $module$($where: $Module$WhereUniqueInput!) {
     ### end form data
   }
 }
-
diff --git a/tools/templates/crud/client/graphql/ModulesQuery.graphql b/tools/templates/crud/client/graphql/ModulesQuery.graphql
index b6ab7f52d4..327959f1ee 100644
--- a/tools/templates/crud/client/graphql/ModulesQuery.graphql
+++ b/tools/templates/crud/client/graphql/ModulesQuery.graphql
@@ -1,7 +1,7 @@
 #import "./$Module$.graphql"
 
-query $module$s($limit: Int, $offset: Int, $orderBy: OrderByInput, $filter: $Module$FilterInput) {
-  $module$s(limit: $limit, offset: $offset, orderBy: $orderBy, filter: $filter) {
+query $module$sConnection($limit: Int, $offset: Int, $orderBy: OrderByInput, $filter: $Module$FilterInput) {
+  $module$sConnection(limit: $limit, offset: $offset, orderBy: $orderBy, filter: $filter) {
     pageInfo {
       totalCount
       hasNextPage
diff --git a/tools/templates/crud/server/resolvers.js b/tools/templates/crud/server/resolvers.js
index 0c9b721856..41bf9ee552 100644
--- a/tools/templates/crud/server/resolvers.js
+++ b/tools/templates/crud/server/resolvers.js
@@ -4,11 +4,14 @@ import { createBatchResolver } from 'graphql-resolve-batch';
 // eslint-disable-next-line no-unused-vars
 export default pubsub => ({
   Query: {
-    $module$s: (obj, args, { $Module$ }, info) => {
-      return $Module$.getPaginated(args, info);
+    $module$s: (parent, args, ctx, info) => {
+      return ctx.$Module$.getList(args, info);
     },
-    $module$: (obj, args, { $Module$ }, info) => {
-      return $Module$.get(args, info);
+    $module$sConnection: (parent, args, ctx, info) => {
+      return ctx.$Module$.getPaginated(args, info);
+    },
+    $module$: (parent, args, ctx, info) => {
+      return ctx.$Module$.get(args, info);
     }
   },
   $Module$Data: {
@@ -18,23 +21,23 @@ export default pubsub => ({
   // schema batch resolvers
   // end schema batch resolvers
   Mutation: {
-    create$Module$: (obj, { data }, { $Module$ }, info) => {
-      return $Module$.create(data, info);
+    create$Module$: (parent, args, ctx, info) => {
+      return ctx.$Module$.create(args, ctx, info);
     },
-    update$Module$: (obj, { data, where }, { $Module$ }, info) => {
-      return $Module$.update(data, where, info);
+    update$Module$: (parent, args, ctx, info) => {
+      return ctx.$Module$.update(args, ctx, info);
     },
-    delete$Module$: (obj, { where }, { $Module$ }, info) => {
-      return $Module$.delete(where, info);
+    delete$Module$: (parent, args, ctx, info) => {
+      return ctx.$Module$.delete(args, info);
     },
-    sort$Module$s: (obj, { data }, { $Module$ }) => {
-      return $Module$.sort(data);
+    sort$Module$s: (parent, args, ctx) => {
+      return ctx.$Module$.sort(args);
     },
-    updateMany$Module$s: (obj, { data, where }, { $Module$ }) => {
-      return $Module$.deleteMany(data, where);
+    updateMany$Module$s: (parent, args, ctx) => {
+      return ctx.$Module$.deleteMany(args);
     },
-    deleteMany$Module$s: (obj, { where }, { $Module$ }) => {
-      return $Module$.deleteMany(where);
+    deleteMany$Module$s: (parent, args, ctx) => {
+      return ctx.$Module$.deleteMany(args);
     }
   },
   Subscription: {}
diff --git a/tools/templates/crud/server/schema.graphql b/tools/templates/crud/server/schema.graphql
index 2f888551df..201d43e44d 100644
--- a/tools/templates/crud/server/schema.graphql
+++ b/tools/templates/crud/server/schema.graphql
@@ -5,7 +5,7 @@ type $Module$ {
 }
 ### end schema type definitions
 
-type $Module$s {
+type $Module$Connection {
   pageInfo: PageInfo
   edges: [$Module$]
 }
@@ -40,7 +40,8 @@ input $Module$WhereInput {
 }
 
 extend type Query {
-  $module$s(limit: Int, offset: Int, orderBy: OrderByInput, filter: $Module$FilterInput): $Module$s
+  $module$s(limit: Int, offset: Int, orderBy: OrderByInput, filter: $Module$FilterInput): [$Module$]
+  $module$sConnection(limit: Int, offset: Int, orderBy: OrderByInput, filter: $Module$FilterInput): $Module$Connection!
   $module$(where: $Module$WhereUniqueInput!): $Module$Data
 }
 
diff --git a/tools/templates/crud/server/sql.js b/tools/templates/crud/server/sql.js
index 83265265b7..412dbf2ad1 100644
--- a/tools/templates/crud/server/sql.js
+++ b/tools/templates/crud/server/sql.js
@@ -1,7 +1,7 @@
 import { decamelize } from 'humps';
 
 import { $Module$ as $Module$Schema } from './schema';
-import Crud from '../../../src/sql/crud';
+import Crud from '../../sql/crud';
 
 export default class $Module$ extends Crud {
   constructor() {

From 8d4cf433d11d8d7c4697999d3a7fc0062d914b47 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 2 Feb 2018 16:04:16 +0100
Subject: [PATCH 074/327] update crud: inline edit, multiple edit

---
 .../common/components/crud/FormView.web.jsx   |  23 ++-
 .../common/components/crud/ListView.web.jsx   | 140 +++++++++++++-----
 .../web/ui-antd/components/Icon.jsx           |  13 ++
 .../web/ui-antd/components/RenderDate.jsx     |  16 +-
 .../web/ui-antd/components/RenderField.jsx    |  16 +-
 .../web/ui-antd/components/RenderSelect.jsx   |  16 +-
 .../web/ui-antd/components/RenderSwitch.jsx   |  16 +-
 .../web/ui-antd/components/index.js           |   1 +
 .../components/web/ui-antd/styles/styles.less |  51 +++++++
 .../client/src/modules/common/util.web.jsx    | 136 ++++++++++++++---
 packages/server/src/sql/crud.js               |  20 +--
 tools/cli/module.js                           |  65 ++++++--
 .../crud/client/containers/ModuleList.jsx     |  48 +++++-
 tools/templates/crud/server/resolvers.js      |   2 +-
 14 files changed, 452 insertions(+), 111 deletions(-)
 create mode 100644 packages/client/src/modules/common/components/web/ui-antd/components/Icon.jsx

diff --git a/packages/client/src/modules/common/components/crud/FormView.web.jsx b/packages/client/src/modules/common/components/crud/FormView.web.jsx
index d3e3f8e48b..28599ed38c 100644
--- a/packages/client/src/modules/common/components/crud/FormView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/FormView.web.jsx
@@ -3,16 +3,31 @@ import PropTypes from 'prop-types';
 import { reduxForm } from 'redux-form';
 
 import { createFormFields } from '../../util';
-import { Form, Button, Alert } from '../web';
+import { Form, FormItem, Button, Alert } from '../web';
+
+const tailFormItemLayout = {
+  wrapperCol: {
+    xs: {
+      span: 24,
+      offset: 0
+    },
+    sm: {
+      span: 16,
+      offset: 6
+    }
+  }
+};
 
 const FormView = ({ handleSubmit, submitting, onSubmit, data, error, schema }) => {
   return (
     <Form name="post" onSubmit={handleSubmit(onSubmit)}>
       {createFormFields(schema, data)}
       {error && <Alert color="error">{error}</Alert>}
-      <Button color="primary" type="submit" disabled={submitting}>
-        Save
-      </Button>
+      <FormItem {...tailFormItemLayout}>
+        <Button color="primary" type="submit" disabled={submitting}>
+          Save
+        </Button>
+      </FormItem>
     </Form>
   );
 };
diff --git a/packages/client/src/modules/common/components/crud/ListView.web.jsx b/packages/client/src/modules/common/components/crud/ListView.web.jsx
index a6869d01ec..f9cb92ef67 100644
--- a/packages/client/src/modules/common/components/crud/ListView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/ListView.web.jsx
@@ -2,10 +2,11 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Link } from 'react-router-dom';
+import { reduxForm } from 'redux-form';
 import { DragDropContext, DragSource, DropTarget } from 'react-dnd';
 import HTML5Backend from 'react-dnd-html5-backend';
-import { Table, Button } from '../web';
-import { createColumnFields } from '../../util';
+import { Table, Button, Popconfirm, Form, FormItem, Row, Col } from '../web';
+import { createColumnFields, createFormFields } from '../../util';
 
 function dragDirection(dragIndex, hoverIndex, initialClientOffset, clientOffset, sourceClientOffset) {
   const hoverMiddleY = (initialClientOffset.y - sourceClientOffset.y) / 2;
@@ -94,18 +95,22 @@ BodyRow = DropTarget('row', rowTarget, (connect, monitor) => ({
   }))(BodyRow)
 );
 
-class ListView extends React.PureComponent {
+class ListView extends React.Component {
   static propTypes = {
     loading: PropTypes.bool.isRequired,
     data: PropTypes.object,
     orderBy: PropTypes.object,
     onOrderBy: PropTypes.func.isRequired,
+    updateEntry: PropTypes.func.isRequired,
     deleteEntry: PropTypes.func.isRequired,
     sortEntries: PropTypes.func.isRequired,
     deleteManyEntries: PropTypes.func.isRequired,
+    updateManyEntries: PropTypes.func.isRequired,
     loadMoreRows: PropTypes.func.isRequired,
     schema: PropTypes.object.isRequired,
-    link: PropTypes.string.isRequired
+    link: PropTypes.string.isRequired,
+    handleSubmit: PropTypes.func,
+    submitting: PropTypes.bool
   };
 
   state = {
@@ -151,15 +156,33 @@ class ListView extends React.PureComponent {
     }
   };
 
+  hendleUpdate = (data, id) => {
+    const { updateEntry } = this.props;
+    updateEntry(data, { id });
+  };
+
   hendleDelete = id => {
     const { deleteEntry } = this.props;
-    deleteEntry(id);
+    deleteEntry({ id });
+  };
+
+  onCellChange = (key, id, updateEntry) => {
+    return value => {
+      updateEntry({ [key]: value }, id);
+    };
   };
 
   hendleDeleteMany = () => {
     const { deleteManyEntries } = this.props;
     const { selectedRowKeys } = this.state;
-    deleteManyEntries(selectedRowKeys);
+    deleteManyEntries({ id_in: selectedRowKeys });
+    this.setState({ selectedRowKeys: [] });
+  };
+
+  hendleUpdateMany = values => {
+    const { updateManyEntries } = this.props;
+    const { selectedRowKeys } = this.state;
+    updateManyEntries(values, { id_in: selectedRowKeys });
     this.setState({ selectedRowKeys: [] });
   };
 
@@ -187,7 +210,7 @@ class ListView extends React.PureComponent {
   };
 
   render() {
-    const { loading, data, loadMoreRows, schema, link } = this.props;
+    const { loading, data, loadMoreRows, schema, link, handleSubmit } = this.props;
     const { selectedRowKeys } = this.state;
     const hasSelected = selectedRowKeys.length > 0;
 
@@ -201,46 +224,85 @@ class ListView extends React.PureComponent {
 
     const footer = () => {
       return (
-        <div>
-          <div>
-            <span style={{ marginRight: 8 }}>
-              {data && (
-                <small>
-                  ({data.edges ? data.edges.length : 0} / {data.pageInfo.totalCount})
-                </small>
-              )}
-            </span>
-            <Button color="primary" onClick={this.hendleDeleteMany} disabled={!hasSelected} loading={loading}>
-              Delete
-            </Button>
-            <span style={{ marginLeft: 8 }}>{hasSelected ? `(${selectedRowKeys.length} selected)` : ''}</span>
-          </div>
-        </div>
+        <Row>
+          <Col span={1}>
+            {data && (
+              <div>
+                <div>
+                  <small>
+                    ({data.edges ? data.edges.length : 0} / {data.pageInfo.totalCount})
+                  </small>
+                </div>
+                <div>
+                  <small>{hasSelected ? `(${selectedRowKeys.length} selected)` : ''}</small>
+                </div>
+              </div>
+            )}
+          </Col>
+          <Col span={2}>
+            <Popconfirm title="Sure to delete?" onConfirm={this.hendleDeleteMany}>
+              <Button color="primary" disabled={!hasSelected} loading={loading && !data}>
+                Delete
+              </Button>
+            </Popconfirm>
+          </Col>
+          <Col span={21}>
+            <Form layout="inline" name="post" onSubmit={handleSubmit(this.hendleUpdateMany)}>
+              {createFormFields(schema, {}, ['name', 'split'])}
+              {/*error && <Alert color="error">{error}</Alert>*/}
+              <FormItem>
+                <Button color="primary" type="submit" disabled={!hasSelected} loading={loading && !data}>
+                  Update
+                </Button>
+              </FormItem>
+            </Form>
+          </Col>
+        </Row>
       );
     };
 
-    const columns = createColumnFields(schema, link, this.orderBy, this.renderOrderByArrow, this.hendleDelete);
+    const columns = createColumnFields(
+      schema,
+      link,
+      this.orderBy,
+      this.renderOrderByArrow,
+      this.hendleUpdate,
+      this.hendleDelete,
+      this.onCellChange
+    );
+
+    let tableProps = {
+      dataSource: data ? data.edges : null,
+      columns: columns,
+      agination: false,
+      size: 'small',
+      rowSelection: this.rowSelection,
+      loading: loading && !data,
+      title: title,
+      footer: footer
+    };
+
+    // only include this props if table includes rank, taht is used for sorting
+    if (schema.keys().includes('rank')) {
+      tableProps = {
+        ...tableProps,
+        components: this.components,
+        onRow: (record, index) => ({
+          index,
+          moveRow: this.moveRow
+        })
+      };
+    }
+
     return (
       <div>
-        <Table
-          dataSource={data ? data.edges : null}
-          columns={columns}
-          pagination={false}
-          size="small"
-          rowSelection={this.rowSelection}
-          loading={loading && !data}
-          title={title}
-          footer={footer}
-          components={this.components}
-          onRow={(record, index) => ({
-            index,
-            moveRow: this.moveRow
-          })}
-        />
+        {React.createElement(Table, tableProps, null)}
         {data && this.renderLoadMore(data, loadMoreRows)}
       </div>
     );
   }
 }
 
-export default DragDropContext(HTML5Backend)(ListView);
+export default reduxForm({
+  form: 'formUpdateMultiple'
+})(DragDropContext(HTML5Backend)(ListView));
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/Icon.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/Icon.jsx
new file mode 100644
index 0000000000..79f45655ea
--- /dev/null
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/Icon.jsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ADIcon from 'antd/lib/icon';
+
+const Icon = ({ children, ...props }) => {
+  return <ADIcon {...props}>{children}</ADIcon>;
+};
+
+Icon.propTypes = {
+  children: PropTypes.node
+};
+
+export default Icon;
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderDate.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderDate.jsx
index 5a056d8712..45bced2b14 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderDate.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderDate.jsx
@@ -1,11 +1,21 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import Form from 'antd/lib/form';
 import DatePicker from 'antd/lib/date-picker';
 import moment from 'moment';
+import { FormItem } from './index';
 
 const dateFormat = 'YYYY-MM-DD';
-const FormItem = Form.Item;
+
+const formItemLayout = {
+  labelCol: {
+    xs: { span: 24 },
+    sm: { span: 6 }
+  },
+  wrapperCol: {
+    xs: { span: 24 },
+    sm: { span: 12 }
+  }
+};
 
 const RenderDate = ({ input: { value, onChange, ...inputRest }, label, meta: { touched, error } }) => {
   let validateStatus = '';
@@ -19,7 +29,7 @@ const RenderDate = ({ input: { value, onChange, ...inputRest }, label, meta: { t
   }
 
   return (
-    <FormItem label={label} validateStatus={validateStatus} help={touched && error}>
+    <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
       <div>
         <DatePicker
           value={value}
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderField.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderField.jsx
index 003b3ba42a..aaca11b845 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderField.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderField.jsx
@@ -1,9 +1,17 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import Form from 'antd/lib/form';
-import Input from 'antd/lib/input';
+import { FormItem, Input } from './index';
 
-const FormItem = Form.Item;
+const formItemLayout = {
+  labelCol: {
+    xs: { span: 24 },
+    sm: { span: 6 }
+  },
+  wrapperCol: {
+    xs: { span: 24 },
+    sm: { span: 12 }
+  }
+};
 
 const RenderField = ({ input, label, type, meta: { touched, error } }) => {
   let validateStatus = '';
@@ -12,7 +20,7 @@ const RenderField = ({ input, label, type, meta: { touched, error } }) => {
   }
 
   return (
-    <FormItem label={label} validateStatus={validateStatus} help={touched && error}>
+    <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
       <div>
         <Input {...input} placeholder={label} type={type} />
       </div>
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx
index 006fa5d543..bb6198cac5 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx
@@ -1,11 +1,21 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import Form from 'antd/lib/form';
 import Select from 'antd/lib/select';
+import { FormItem } from './index';
 
-const FormItem = Form.Item;
 const Option = Select.Option;
 
+const formItemLayout = {
+  labelCol: {
+    xs: { span: 24 },
+    sm: { span: 6 }
+  },
+  wrapperCol: {
+    xs: { span: 24 },
+    sm: { span: 12 }
+  }
+};
+
 const RenderField = ({ input: { value, ...inputRest }, label, data, meta: { touched, error } }) => {
   let validateStatus = '';
   if (touched && error) {
@@ -19,7 +29,7 @@ const RenderField = ({ input: { value, ...inputRest }, label, data, meta: { touc
   ));
 
   return (
-    <FormItem label={label} validateStatus={validateStatus} help={error}>
+    <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={error}>
       <div>
         <Select
           showSearch
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSwitch.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSwitch.jsx
index 8a12e8f673..ac0019d969 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSwitch.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSwitch.jsx
@@ -1,9 +1,17 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import Form from 'antd/lib/form';
-import Switch from 'antd/lib/switch';
+import { FormItem, Switch } from './index';
 
-const FormItem = Form.Item;
+const formItemLayout = {
+  labelCol: {
+    xs: { span: 24 },
+    sm: { span: 6 }
+  },
+  wrapperCol: {
+    xs: { span: 24 },
+    sm: { span: 12 }
+  }
+};
 
 const RenderField = ({ input: { value, ...restInput }, label, meta: { touched, error } }) => {
   let validateStatus = '';
@@ -12,7 +20,7 @@ const RenderField = ({ input: { value, ...restInput }, label, meta: { touched, e
   }
 
   return (
-    <FormItem label={label} validateStatus={validateStatus} help={touched && error}>
+    <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
       <div>
         <Switch defaultChecked={!!value} {...restInput} />
       </div>
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/index.js b/packages/client/src/modules/common/components/web/ui-antd/components/index.js
index f6eb0a90f5..4ae106e5d6 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/index.js
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/index.js
@@ -26,3 +26,4 @@ export { default as Table } from './Table';
 export { default as ListGroup } from './ListGroup';
 export { default as ListItem } from './ListItem';
 export { default as Popconfirm } from './Popconfirm';
+export { default as Icon } from './Icon';
diff --git a/packages/client/src/modules/common/components/web/ui-antd/styles/styles.less b/packages/client/src/modules/common/components/web/ui-antd/styles/styles.less
index b360f840c5..cd3ce6d244 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/styles/styles.less
+++ b/packages/client/src/modules/common/components/web/ui-antd/styles/styles.less
@@ -19,4 +19,55 @@ body {
 
 .ant-table-tbody tr.drop-over-upward td {
   border-top: 2px dashed #1890ff;
+}
+
+.field-array-form {
+  padding: 16px;
+  background: #fbfbfb;
+  border: 1px solid #d9d9d9;
+  border-radius: 6px;
+  margin-bottom: 8px;
+}
+
+.editable-cell {
+  position: relative;
+}
+
+.editable-cell-input-wrapper,
+.editable-cell-text-wrapper {
+  padding-right: 24px;
+}
+
+.editable-cell-text-wrapper {
+  padding: 5px 24px 5px 5px;
+}
+
+.editable-cell-icon,
+.editable-cell-icon-check {
+  position: absolute;
+  right: 0;
+  width: 20px;
+  cursor: pointer;
+}
+
+.editable-cell-icon {
+  line-height: 18px;
+  display: none;
+}
+
+.editable-cell-icon-check {
+  line-height: 28px;
+}
+
+.editable-cell:hover .editable-cell-icon {
+  display: inline-block;
+}
+
+.editable-cell-icon:hover,
+.editable-cell-icon-check:hover {
+  color: #108ee9;
+}
+
+.editable-add-btn {
+  margin-bottom: 8px;
 }
\ No newline at end of file
diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index 7310b3bc50..11d9597986 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -5,10 +5,31 @@ import { startCase, isEqual } from 'lodash';
 import { Field, FieldArray } from 'redux-form';
 import { Link } from 'react-router-dom';
 
-import { RenderField, RenderSelect, RenderDate, RenderSwitch, Button, Popconfirm, Switch } from './components/web';
+import {
+  RenderField,
+  RenderSelect,
+  RenderDate,
+  RenderSwitch,
+  Button,
+  Popconfirm,
+  Switch,
+  FormItem,
+  Row,
+  Col,
+  Input,
+  Icon
+} from './components/web';
 import { required } from '../../../../common/validation';
 
-export const createColumnFields = (schema, link, orderBy, renderOrderByArrow, hendleDelete) => {
+export const createColumnFields = (
+  schema,
+  link,
+  orderBy,
+  renderOrderByArrow,
+  hendleUpdate,
+  hendleDelete,
+  onCellChange
+) => {
   let columns = [];
 
   for (const key of schema.keys()) {
@@ -23,6 +44,7 @@ export const createColumnFields = (schema, link, orderBy, renderOrderByArrow, he
           ),
           dataIndex: 'id',
           key: 'id',
+          width: 100,
           render: (text, record) => (
             <Link className="link" to={`/${link}/${record.id}`}>
               {text}
@@ -46,6 +68,7 @@ export const createColumnFields = (schema, link, orderBy, renderOrderByArrow, he
             ),
             dataIndex: key,
             key: key,
+            width: 300,
             render: text => {
               return text[sortBy];
             }
@@ -59,8 +82,11 @@ export const createColumnFields = (schema, link, orderBy, renderOrderByArrow, he
             ),
             dataIndex: key,
             key: key,
-            render: text => {
-              return <Switch defaultChecked={text} disabled />;
+            width: 100,
+            render: (text, record) => {
+              const data = {};
+              data[key] = !text;
+              return <Switch checked={text} onClick={() => hendleUpdate(data, record.id)} />;
             }
           });
         } else if (value.type.constructor !== Array) {
@@ -71,7 +97,10 @@ export const createColumnFields = (schema, link, orderBy, renderOrderByArrow, he
               </a>
             ),
             dataIndex: key,
-            key: key
+            key: key,
+            render: (text, record) => (
+              <EditableCell value={text} onChange={onCellChange('name', record.id, hendleUpdate)} />
+            )
           });
         }
       }
@@ -81,6 +110,7 @@ export const createColumnFields = (schema, link, orderBy, renderOrderByArrow, he
   columns.push({
     title: 'Actions',
     key: 'actions',
+    width: 100,
     render: (text, record) => (
       <Popconfirm title="Sure to delete?" onConfirm={() => hendleDelete(record.id)}>
         <Button color="primary" size="sm">
@@ -93,23 +123,40 @@ export const createColumnFields = (schema, link, orderBy, renderOrderByArrow, he
   return columns;
 };
 
+const tailFormItemLayout = {
+  wrapperCol: {
+    xs: {
+      span: 24,
+      offset: 0
+    },
+    sm: {
+      span: 16,
+      offset: 6
+    }
+  }
+};
+
 const RenderEntry = ({ fields, formdata, schema, meta: { error, submitFailed } }) => (
-  <ul>
-    <li>
-      <Button color="primary" size="sm" onClick={() => fields.push({})}>
-        Add Entry
-      </Button>
-      {submitFailed && error && <span>{error}</span>}
-    </li>
-    {fields.map((field, index) => (
-      <li key={index}>
-        <Button color="primary" size="sm" onClick={() => fields.remove(index)}>
-          Delete
+  <Row>
+    <Col span={12} offset={6}>
+      {fields.map((field, index) => (
+        <div key={index} className="field-array-form">
+          {createFormFields(schema, formdata, [], `${field}.`)}
+          <FormItem {...tailFormItemLayout}>
+            <Button color="primary" size="sm" onClick={() => fields.remove(index)}>
+              Delete
+            </Button>
+          </FormItem>
+        </div>
+      ))}
+      <FormItem {...tailFormItemLayout}>
+        {submitFailed && error && <span>{error}</span>}
+        <Button color="dashed" onClick={() => fields.push({})} style={{ width: '180px' }}>
+          Add field
         </Button>
-        {createFormFields(schema, formdata, `${field}.`)}
-      </li>
-    ))}
-  </ul>
+      </FormItem>
+    </Col>
+  </Row>
 );
 
 RenderEntry.propTypes = {
@@ -119,12 +166,16 @@ RenderEntry.propTypes = {
   meta: PropTypes.object
 };
 
-export const createFormFields = (schema, formdata, prefix = '') => {
+export const createFormFields = (schema, formdata, only = [], prefix = '') => {
   let fields = [];
 
   for (const key of schema.keys()) {
     const value = schema.values[key];
 
+    if (only.length > 0 && !only.includes(key)) {
+      continue;
+    }
+
     if (key !== 'id' && value.show !== false && value.type.constructor !== Array) {
       let validate = [];
       if (!value.optional) {
@@ -227,3 +278,46 @@ export const pickInputFields = (schema, values, node = null) => {
 
   return inputValues;
 };
+
+class EditableCell extends React.Component {
+  static propTypes = {
+    value: PropTypes.string.isRequired,
+    onChange: PropTypes.func.isRequired
+  };
+
+  state = {
+    value: this.props.value,
+    editable: false
+  };
+  handleChange = e => {
+    const value = e.target.value;
+    this.setState({ value });
+  };
+  check = () => {
+    this.setState({ editable: false });
+    if (this.props.onChange) {
+      this.props.onChange(this.state.value);
+    }
+  };
+  edit = () => {
+    this.setState({ editable: true });
+  };
+  render() {
+    const { value, editable } = this.state;
+    return (
+      <div className="editable-cell">
+        {editable ? (
+          <div className="editable-cell-input-wrapper">
+            <Input value={value} onChange={this.handleChange} onPressEnter={this.check} />
+            <Icon type="check" className="editable-cell-icon-check" onClick={this.check} />
+          </div>
+        ) : (
+          <div className="editable-cell-text-wrapper">
+            {value || ' '}
+            <Icon type="edit" className="editable-cell-icon" onClick={this.edit} />
+          </div>
+        )}
+      </div>
+    );
+  }
+}
diff --git a/packages/server/src/sql/crud.js b/packages/server/src/sql/crud.js
index 0e6718c310..82304e1458 100644
--- a/packages/server/src/sql/crud.js
+++ b/packages/server/src/sql/crud.js
@@ -269,26 +269,22 @@ export default class Crud {
   }
 
   _updateMany({ data, where: { id_in } }) {
-    console.log('_updateMany: data: ', data);
-    console.log('_updateMany: id_in: ', id_in);
-    //return knex(`${this.prefix}${this.tableName}`)
-    //  .whereIn('id', id_in)
-    //  .del();
+    return knex(`${this.prefix}${this.tableName}`)
+      .update(decamelizeKeys(data))
+      .whereIn('id', id_in);
   }
 
   async updateMany(args) {
     try {
-      console.log('updateMany: ', args);
       const e = new FieldError();
-      e.setError('update', 'Not yet implemented. Please try again later.');
-      /*const deleteCount = await this._updateMany(args);
+      const updateCount = await this._updateMany(args);
 
-      if (deleteCount > 0) {
-        return { count: deleteCount };
+      if (updateCount > 0) {
+        return { count: updateCount };
       } else {
-        e.setError('delete', 'Could not delete any of selected Node. Please try again later.');
+        e.setError('update', 'Could not update any of selected Node. Please try again later.');
         e.throwIf();
-      }*/
+      }
     } catch (e) {
       return { errors: e };
     }
diff --git a/tools/cli/module.js b/tools/cli/module.js
index c50a303cb3..ef84140277 100644
--- a/tools/cli/module.js
+++ b/tools/cli/module.js
@@ -33,6 +33,36 @@ function renameFiles(destinationPath, templatePath, module, location) {
   });
 }
 
+function generateField(value, update = false) {
+  let result = '';
+  switch (value.type.name) {
+    case 'Boolean':
+      result += 'Boolean';
+      break;
+    case 'ID':
+      result += 'ID';
+      break;
+    case 'Integer':
+      result += 'Int';
+      break;
+    case 'Number':
+      result += 'Float';
+      break;
+    case 'String':
+      result += 'String';
+      break;
+    case 'Date':
+      result += 'Date';
+      break;
+  }
+
+  if (!update && !value.optional) {
+    result += '!';
+  }
+
+  return result;
+}
+
 function copyFiles(logger, templatePath, module, action, tablePrefix, location) {
   logger.info(`Copying ${location} files…`);
 
@@ -184,14 +214,12 @@ function updateSchema(logger, module) {
         if (value.type.isSchema) {
           let required = value.optional ? '' : '!';
           inputCreate += `  ${key}Id: Int${required}\n`;
-          inputUpdate += `  ${key}Id: Int${required}\n`;
+          inputUpdate += `  ${key}Id: Int\n`;
           moduleData += `  ${key}s(limit: Int, orderBy: OrderByInput): [${value.type.name}]\n`;
         } else if (value.type.constructor !== Array) {
           if (key !== 'id') {
-            inputCreate +=
-              `  ${key}: ` + new GraphQLGenerator()._generateField(schema.name + '.' + key, value, []) + '\n';
-            inputUpdate +=
-              `  ${key}: ` + new GraphQLGenerator()._generateField(schema.name + '.' + key, value, []) + '\n';
+            inputCreate += `  ${key}: ${generateField(value)}\n`;
+            inputUpdate += `  ${key}: ${generateField(value, true)}\n`;
           }
         } else if (value.type.constructor === Array) {
           inputCreate += `  ${key}: ${pascalize(key)}CreateManyInput\n`;
@@ -204,21 +232,26 @@ function updateSchema(logger, module) {
             }
           }
 
+          let singleKey = key;
+          if (key.slice(-1) === 's') {
+            singleKey = key.slice(0, -1);
+          }
+
           manyInput += `
 
 input ${pascalize(key)}CreateManyInput {
-  create: [${pascalize(key)}CreateInput!]
+  create: [${pascalize(singleKey)}CreateInput!]
 }
 
 input ${pascalize(key)}UpdateManyInput {
-  create: [${pascalize(key)}CreateInput!]
-  delete: [${pascalize(key)}WhereUniqueInput!]
-  update: [${pascalize(key)}UpdateWhereInput!]
+  create: [${pascalize(singleKey)}CreateInput!]
+  delete: [${pascalize(singleKey)}WhereUniqueInput!]
+  update: [${pascalize(singleKey)}UpdateWhereInput!]
 }
 
-input ${pascalize(key)}UpdateWhereInput {
-  where: ${pascalize(key)}WhereUniqueInput!
-  data: ${pascalize(key)}UpdateInput!
+input ${pascalize(singleKey)}UpdateWhereInput {
+  where: ${pascalize(singleKey)}WhereUniqueInput!
+  data: ${pascalize(singleKey)}UpdateInput!
 }`;
         }
       }
@@ -361,10 +394,10 @@ input ${pascalize(key)}UpdateWhereInput {
                   remotecolumn = remoteKey;
                 }
               }
-              graphql += `  ${remoteKey} {\n`;
-              graphql += `    id\n`;
-              graphql += `    ${remotecolumn}\n`;
-              graphql += `  }\n`;
+              graphql += `    ${remoteKey} {\n`;
+              graphql += `      id\n`;
+              graphql += `      ${remotecolumn}\n`;
+              graphql += `    }\n`;
             } else {
               graphql += `    ${remoteKey}\n`;
             }
diff --git a/tools/templates/crud/client/containers/ModuleList.jsx b/tools/templates/crud/client/containers/ModuleList.jsx
index 98674c5e8c..19193734de 100644
--- a/tools/templates/crud/client/containers/ModuleList.jsx
+++ b/tools/templates/crud/client/containers/ModuleList.jsx
@@ -5,9 +5,11 @@ import { connect } from 'react-redux';
 import { ListView } from '../../common/components/crud';
 import { $Module$ as $Module$Schema } from '../../../../../server/src/modules/$module$/schema';
 import $MODULE$S_QUERY from '../graphql/$Module$sQuery.graphql';
+import UPDATE_$MODULE$ from '../graphql/Update$Module$.graphql';
 import DELETE_$MODULE$ from '../graphql/Delete$Module$.graphql';
 import SORT_$MODULE$S from '../graphql/Sort$Module$s.graphql';
 import DELETEMANY_$MODULE$S from '../graphql/DeleteMany$Module$s.graphql';
+import UPDATEMANY_$MODULE$S from '../graphql/UpdateMany$Module$s.graphql';
 
 class $Module$ extends React.Component {
   render() {
@@ -51,12 +53,31 @@ const $Module$WithApollo = compose(
       return { loading, data: $module$sConnection, loadMoreRows, refetch, errors: error ? error.graphQLErrors : null };
     }
   }),
+  graphql(UPDATE_$MODULE$, {
+    props: ({ ownProps: { refetch }, mutate }) => ({
+      updateEntry: async (data, where) => {
+        try {
+          const { data: { update$Module$ } } = await mutate({
+            variables: { data, where }
+          });
+
+          if (update$Module$.errors) {
+            return { errors: update$Module$.errors };
+          }
+
+          refetch();
+        } catch (e) {
+          console.log(e.graphQLErrors);
+        }
+      }
+    })
+  }),
   graphql(DELETE_$MODULE$, {
     props: ({ ownProps: { refetch }, mutate }) => ({
-      deleteEntry: async id => {
+      deleteEntry: async where => {
         try {
           const { data: { delete$Module$ } } = await mutate({
-            variables: { where: { id } }
+            variables: { where }
           });
 
           if (delete$Module$.errors) {
@@ -91,16 +112,35 @@ const $Module$WithApollo = compose(
   }),
   graphql(DELETEMANY_$MODULE$S, {
     props: ({ ownProps: { refetch }, mutate }) => ({
-      deleteManyEntries: async id_in => {
+      deleteManyEntries: async where => {
         try {
           const { data: { deleteMany$Module$s } } = await mutate({
-            variables: { where: { id_in } }
+            variables: { where }
           });
 
           if (deleteMany$Module$s.errors) {
             return { errors: deleteMany$Module$s.errors };
           }
 
+          refetch();
+        } catch (e) {
+          console.log(e.graphQLErrors);
+        }
+      }
+    })
+  }),
+  graphql(UPDATEMANY_$MODULE$S, {
+    props: ({ ownProps: { refetch }, mutate }) => ({
+      updateManyEntries: async (data, where) => {
+        try {
+          const { data: { updateMany$Module$s } } = await mutate({
+            variables: { data, where }
+          });
+
+          if (updateMany$Module$s.errors) {
+            return { errors: updateMany$Module$s.errors };
+          }
+
           refetch();
         } catch (e) {
           console.log(e.graphQLErrors);
diff --git a/tools/templates/crud/server/resolvers.js b/tools/templates/crud/server/resolvers.js
index 41bf9ee552..83de83c52b 100644
--- a/tools/templates/crud/server/resolvers.js
+++ b/tools/templates/crud/server/resolvers.js
@@ -34,7 +34,7 @@ export default pubsub => ({
       return ctx.$Module$.sort(args);
     },
     updateMany$Module$s: (parent, args, ctx) => {
-      return ctx.$Module$.deleteMany(args);
+      return ctx.$Module$.updateMany(args);
     },
     deleteMany$Module$s: (parent, args, ctx) => {
       return ctx.$Module$.deleteMany(args);

From aed91eae7cbcc5cb114d18a1b40a7859965c5958 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Mon, 5 Feb 2018 07:29:17 +0100
Subject: [PATCH 075/327] Introduce Sider in antd layout

---
 .../web/ui-antd/components/PageLayout.jsx     | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/PageLayout.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/PageLayout.jsx
index 13e873caf0..b2b8c0c0cd 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/PageLayout.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/PageLayout.jsx
@@ -5,23 +5,28 @@ import Layout from 'antd/lib/layout';
 import NavBar from './NavBar';
 import settings from '../../../../../../../../../settings';
 
-const { Header, Content, Footer } = Layout;
+const { Header, Content, Footer, Sider } = Layout;
 
 const PageLayout = ({ children, navBar }) => {
   return (
     <div className="flex-grow">
-      <Layout>
-        <section className="flex-grow">
-          {navBar !== false && (
-            <Header>
-              <NavBar />
-            </Header>
-          )}
-          <Content id="content" style={{ background: '#fff', padding: 24 }}>
-            {children}
-          </Content>
-        </section>
-        <Footer style={{ textAlign: 'center' }}>&copy; 2017. {settings.app.name}.</Footer>
+      <Layout hasSider={true}>
+        <Sider breakpoint="lg" collapsedWidth="0">
+          Sider
+        </Sider>
+        <Layout>
+          <section className="flex-grow">
+            {navBar !== false && (
+              <Header>
+                <NavBar />
+              </Header>
+            )}
+            <Content id="content" style={{ background: '#fff', padding: 24 }}>
+              {children}
+            </Content>
+          </section>
+          <Footer style={{ textAlign: 'center' }}>&copy; 2017. {settings.app.name}.</Footer>
+        </Layout>
       </Layout>
     </div>
   );

From 9d25c5953cc8da3d9869717c307f473e0327f6d8 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Mon, 5 Feb 2018 07:48:10 +0100
Subject: [PATCH 076/327] custom collapse sider

---
 .../web/ui-antd/components/PageLayout.jsx     | 72 +++++++++++++------
 1 file changed, 49 insertions(+), 23 deletions(-)

diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/PageLayout.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/PageLayout.jsx
index b2b8c0c0cd..81b4f63448 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/PageLayout.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/PageLayout.jsx
@@ -2,35 +2,61 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import Layout from 'antd/lib/layout';
 
+//import { Icon } from './index';
 import NavBar from './NavBar';
 import settings from '../../../../../../../../../settings';
 
 const { Header, Content, Footer, Sider } = Layout;
 
-const PageLayout = ({ children, navBar }) => {
-  return (
-    <div className="flex-grow">
-      <Layout hasSider={true}>
-        <Sider breakpoint="lg" collapsedWidth="0">
-          Sider
-        </Sider>
-        <Layout>
-          <section className="flex-grow">
-            {navBar !== false && (
-              <Header>
-                <NavBar />
-              </Header>
-            )}
-            <Content id="content" style={{ background: '#fff', padding: 24 }}>
-              {children}
-            </Content>
-          </section>
-          <Footer style={{ textAlign: 'center' }}>&copy; 2017. {settings.app.name}.</Footer>
+class PageLayout extends React.Component {
+  state = {
+    collapsed: false
+  };
+
+  toggle = () => {
+    this.setState({
+      collapsed: !this.state.collapsed
+    });
+  };
+
+  render() {
+    const { children, navBar } = this.props;
+
+    return (
+      <div className="flex-grow">
+        <Layout hasSider={true}>
+          <Sider
+            collapsible
+            collapsed={this.state.collapsed}
+            onCollapse={this.toggle}
+            breakpoint="lg"
+            collapsedWidth="0"
+          >
+            Sider
+          </Sider>
+          <Layout>
+            <section className="flex-grow">
+              {navBar !== false && (
+                <Header style={{ background: '#fff', padding: 0 }}>
+                  {/*<Icon
+                    className="trigger"
+                    type={this.state.collapsed ? 'menu-unfold' : 'menu-fold'}
+                    onClick={this.toggle}
+                  />*/}
+                  <NavBar />
+                </Header>
+              )}
+              <Content id="content" style={{ background: '#fff', padding: 24 }}>
+                {children}
+              </Content>
+            </section>
+            <Footer style={{ textAlign: 'center' }}>&copy; 2017. {settings.app.name}.</Footer>
+          </Layout>
         </Layout>
-      </Layout>
-    </div>
-  );
-};
+      </div>
+    );
+  }
+}
 
 PageLayout.propTypes = {
   children: PropTypes.node,

From 41c56d3ede51faaf5be9ac66187a0980816c0842 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Mon, 5 Feb 2018 08:00:08 +0100
Subject: [PATCH 077/327] small fix

---
 .../components/web/ui-antd/components/NavBar.jsx     |  8 ++++----
 .../components/web/ui-antd/components/PageLayout.jsx | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/NavBar.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/NavBar.jsx
index 34c78143e6..b68df2d1ad 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/NavBar.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/NavBar.jsx
@@ -10,6 +10,10 @@ import modules from '../../../../../../modules';
 import settings from '../../../../../../../../../settings';
 
 class NavBar extends React.Component {
+  static propTypes = {
+    location: PropTypes.object.isRequired
+  };
+
   state = {
     current: '/'
   };
@@ -60,8 +64,4 @@ class NavBar extends React.Component {
   }
 }
 
-NavBar.propTypes = {
-  location: PropTypes.object.isRequired
-};
-
 export default withRouter(NavBar);
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/PageLayout.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/PageLayout.jsx
index 81b4f63448..c60c85cbdd 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/PageLayout.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/PageLayout.jsx
@@ -9,6 +9,11 @@ import settings from '../../../../../../../../../settings';
 const { Header, Content, Footer, Sider } = Layout;
 
 class PageLayout extends React.Component {
+  static propTypes = {
+    children: PropTypes.node,
+    navBar: PropTypes.bool
+  };
+
   state = {
     collapsed: false
   };
@@ -37,7 +42,7 @@ class PageLayout extends React.Component {
           <Layout>
             <section className="flex-grow">
               {navBar !== false && (
-                <Header style={{ background: '#fff', padding: 0 }}>
+                <Header style={{ padding: 0 }}>
                   {/*<Icon
                     className="trigger"
                     type={this.state.collapsed ? 'menu-unfold' : 'menu-fold'}
@@ -58,9 +63,4 @@ class PageLayout extends React.Component {
   }
 }
 
-PageLayout.propTypes = {
-  children: PropTypes.node,
-  navBar: PropTypes.bool
-};
-
 export default PageLayout;

From aadeb1c31bea19d19b7c1947807801101157a80a Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Mon, 5 Feb 2018 08:12:43 +0100
Subject: [PATCH 078/327] merge PageLayout and NavBar

---
 .../web/ui-antd/components/NavBar.jsx         | 67 ------------------
 .../web/ui-antd/components/PageLayout.jsx     | 68 ++++++++++++++++---
 2 files changed, 57 insertions(+), 78 deletions(-)
 delete mode 100644 packages/client/src/modules/common/components/web/ui-antd/components/NavBar.jsx

diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/NavBar.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/NavBar.jsx
deleted file mode 100644
index b68df2d1ad..0000000000
--- a/packages/client/src/modules/common/components/web/ui-antd/components/NavBar.jsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { withRouter, NavLink } from 'react-router-dom';
-import Menu from 'antd/lib/menu';
-import Row from 'antd/lib/row';
-import Col from 'antd/lib/col';
-import MenuItem from './MenuItem';
-
-import modules from '../../../../../../modules';
-import settings from '../../../../../../../../../settings';
-
-class NavBar extends React.Component {
-  static propTypes = {
-    location: PropTypes.object.isRequired
-  };
-
-  state = {
-    current: '/'
-  };
-
-  handleClick = e => {
-    this.setState({
-      current: e.key
-    });
-  };
-
-  render() {
-    return (
-      <Row gutter={8}>
-        <Col span={14}>
-          <Menu
-            onClick={this.handleClick}
-            selectedKeys={[this.props.location.pathname]}
-            mode="horizontal"
-            theme="dark"
-            style={{ lineHeight: '64px' }}
-          >
-            <MenuItem key="/">
-              <NavLink to="/" className="nav-link">
-                {settings.app.name}
-              </NavLink>
-            </MenuItem>
-            {modules.navItems}
-          </Menu>
-        </Col>
-        <Col span={10}>
-          <Menu
-            onClick={this.handleClick}
-            selectedKeys={[this.props.location.pathname]}
-            mode="horizontal"
-            theme="dark"
-            style={{ lineHeight: '64px', float: 'right' }}
-          >
-            {modules.navItemsRight}
-            {__DEV__ && (
-              <MenuItem>
-                <a href="/graphiql">GraphiQL</a>
-              </MenuItem>
-            )}
-          </Menu>
-        </Col>
-      </Row>
-    );
-  }
-}
-
-export default withRouter(NavBar);
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/PageLayout.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/PageLayout.jsx
index c60c85cbdd..c9c6532f56 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/PageLayout.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/PageLayout.jsx
@@ -1,9 +1,11 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import { withRouter, NavLink } from 'react-router-dom';
 import Layout from 'antd/lib/layout';
+import Menu from 'antd/lib/menu';
 
-//import { Icon } from './index';
-import NavBar from './NavBar';
+import { Row, Col, MenuItem, Icon } from './index';
+import modules from '../../../../../../modules';
 import settings from '../../../../../../../../../settings';
 
 const { Header, Content, Footer, Sider } = Layout;
@@ -11,11 +13,13 @@ const { Header, Content, Footer, Sider } = Layout;
 class PageLayout extends React.Component {
   static propTypes = {
     children: PropTypes.node,
-    navBar: PropTypes.bool
+    navBar: PropTypes.bool,
+    location: PropTypes.object.isRequired
   };
 
   state = {
-    collapsed: false
+    collapsed: false,
+    current: '/'
   };
 
   toggle = () => {
@@ -24,6 +28,12 @@ class PageLayout extends React.Component {
     });
   };
 
+  handleClick = e => {
+    this.setState({
+      current: e.key
+    });
+  };
+
   render() {
     const { children, navBar } = this.props;
 
@@ -31,6 +41,7 @@ class PageLayout extends React.Component {
       <div className="flex-grow">
         <Layout hasSider={true}>
           <Sider
+            trigger={null}
             collapsible
             collapsed={this.state.collapsed}
             onCollapse={this.toggle}
@@ -43,12 +54,47 @@ class PageLayout extends React.Component {
             <section className="flex-grow">
               {navBar !== false && (
                 <Header style={{ padding: 0 }}>
-                  {/*<Icon
-                    className="trigger"
-                    type={this.state.collapsed ? 'menu-unfold' : 'menu-fold'}
-                    onClick={this.toggle}
-                  />*/}
-                  <NavBar />
+                  <Row gutter={8}>
+                    <Col span={14}>
+                      <Menu
+                        onClick={this.handleClick}
+                        selectedKeys={[this.props.location.pathname]}
+                        mode="horizontal"
+                        theme="dark"
+                        style={{ lineHeight: '64px' }}
+                      >
+                        <MenuItem key="trigger">
+                          <Icon
+                            className="trigger"
+                            type={this.state.collapsed ? 'menu-unfold' : 'menu-fold'}
+                            onClick={this.toggle}
+                          />
+                        </MenuItem>
+                        <MenuItem key="/">
+                          <NavLink to="/" className="nav-link">
+                            {settings.app.name}
+                          </NavLink>
+                        </MenuItem>
+                        {modules.navItems}
+                      </Menu>
+                    </Col>
+                    <Col span={10}>
+                      <Menu
+                        onClick={this.handleClick}
+                        selectedKeys={[this.props.location.pathname]}
+                        mode="horizontal"
+                        theme="dark"
+                        style={{ lineHeight: '64px', float: 'right' }}
+                      >
+                        {modules.navItemsRight}
+                        {__DEV__ && (
+                          <MenuItem>
+                            <a href="/graphiql">GraphiQL</a>
+                          </MenuItem>
+                        )}
+                      </Menu>
+                    </Col>
+                  </Row>
                 </Header>
               )}
               <Content id="content" style={{ background: '#fff', padding: 24 }}>
@@ -63,4 +109,4 @@ class PageLayout extends React.Component {
   }
 }
 
-export default PageLayout;
+export default withRouter(PageLayout);

From 6a70dd5eccce35811a1f7f0605a666feb1c89023 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Mon, 5 Feb 2018 10:15:43 +0100
Subject: [PATCH 079/327] how to define fields

---
 tools/templates/crud/client/reducers/index.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/templates/crud/client/reducers/index.js b/tools/templates/crud/client/reducers/index.js
index 99ebea4608..9d4161b18b 100644
--- a/tools/templates/crud/client/reducers/index.js
+++ b/tools/templates/crud/client/reducers/index.js
@@ -4,10 +4,14 @@ const defaultState = {
   nativeLink: '$Module$Edit',
   limit: 50,
   searchText: '',
-  orderBy: {}
+  orderBy: {},
+  formFields: {},
+  listFields: {},
+  filterFields: {},
+  batchUpdateFields: {}
 };
 
-export default function(state = defaultState, action) {
+export default function (state = defaultState, action) {
   switch (action.type) {
     case '$MODULE$_LIMIT':
       return {

From 99ce7391273070b97f516364e36e34708c3587b5 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 6 Feb 2018 09:47:41 +0100
Subject: [PATCH 080/327] update to latest

---
 .../common/components/crud/ListView.web.jsx   |  10 +-
 .../web/ui-antd/components/PageLayout.jsx     |  23 ++-
 .../web/ui-antd/components/RenderSelect.jsx   |  12 +-
 .../client/src/modules/common/util.web.jsx    | 144 +++++++++---------
 packages/server/package.json                  |   6 +-
 .../crud/client/containers/ModuleList.jsx     |   4 +-
 tools/templates/crud/client/index.web.jsx     |   2 +-
 tools/templates/crud/client/reducers/index.js |   6 +-
 tools/templates/module/client/index.web.jsx   |   2 +-
 yarn.lock                                     |  18 +--
 10 files changed, 109 insertions(+), 118 deletions(-)

diff --git a/packages/client/src/modules/common/components/crud/ListView.web.jsx b/packages/client/src/modules/common/components/crud/ListView.web.jsx
index f9cb92ef67..1a7680d613 100644
--- a/packages/client/src/modules/common/components/crud/ListView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/ListView.web.jsx
@@ -110,7 +110,8 @@ class ListView extends React.Component {
     schema: PropTypes.object.isRequired,
     link: PropTypes.string.isRequired,
     handleSubmit: PropTypes.func,
-    submitting: PropTypes.bool
+    submitting: PropTypes.bool,
+    customTableColumns: PropTypes.object
   };
 
   state = {
@@ -210,7 +211,7 @@ class ListView extends React.Component {
   };
 
   render() {
-    const { loading, data, loadMoreRows, schema, link, handleSubmit } = this.props;
+    const { loading, data, loadMoreRows, schema, link, handleSubmit, customTableColumns } = this.props;
     const { selectedRowKeys } = this.state;
     const hasSelected = selectedRowKeys.length > 0;
 
@@ -248,7 +249,7 @@ class ListView extends React.Component {
           </Col>
           <Col span={21}>
             <Form layout="inline" name="post" onSubmit={handleSubmit(this.hendleUpdateMany)}>
-              {createFormFields(schema, {}, ['name', 'split'])}
+              {createFormFields(schema, {}, '', true)}
               {/*error && <Alert color="error">{error}</Alert>*/}
               <FormItem>
                 <Button color="primary" type="submit" disabled={!hasSelected} loading={loading && !data}>
@@ -268,7 +269,8 @@ class ListView extends React.Component {
       this.renderOrderByArrow,
       this.hendleUpdate,
       this.hendleDelete,
-      this.onCellChange
+      this.onCellChange,
+      customTableColumns
     );
 
     let tableProps = {
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/PageLayout.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/PageLayout.jsx
index c9c6532f56..86207c0615 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/PageLayout.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/PageLayout.jsx
@@ -48,7 +48,14 @@ class PageLayout extends React.Component {
             breakpoint="lg"
             collapsedWidth="0"
           >
-            Sider
+            <Menu onClick={this.handleClick} selectedKeys={[this.props.location.pathname]} mode="vertical" theme="dark">
+              <MenuItem key="/">
+                <NavLink to="/" className="nav-link">
+                  {settings.app.name}
+                </NavLink>
+              </MenuItem>
+              {modules.navItems}
+            </Menu>
           </Sider>
           <Layout>
             <section className="flex-grow">
@@ -56,13 +63,7 @@ class PageLayout extends React.Component {
                 <Header style={{ padding: 0 }}>
                   <Row gutter={8}>
                     <Col span={14}>
-                      <Menu
-                        onClick={this.handleClick}
-                        selectedKeys={[this.props.location.pathname]}
-                        mode="horizontal"
-                        theme="dark"
-                        style={{ lineHeight: '64px' }}
-                      >
+                      <Menu mode="horizontal" theme="dark" style={{ lineHeight: '64px' }}>
                         <MenuItem key="trigger">
                           <Icon
                             className="trigger"
@@ -70,12 +71,6 @@ class PageLayout extends React.Component {
                             onClick={this.toggle}
                           />
                         </MenuItem>
-                        <MenuItem key="/">
-                          <NavLink to="/" className="nav-link">
-                            {settings.app.name}
-                          </NavLink>
-                        </MenuItem>
-                        {modules.navItems}
                       </Menu>
                     </Col>
                     <Col span={10}>
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx
index bb6198cac5..d92c4055a8 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx
@@ -22,11 +22,13 @@ const RenderField = ({ input: { value, ...inputRest }, label, data, meta: { touc
     validateStatus = 'error';
   }
 
-  const options = data.map(opt => (
-    <Option key={opt.id} value={opt.id.toString()}>
-      {opt.name}
-    </Option>
-  ));
+  const options = data
+    ? data.map(opt => (
+        <Option key={opt.id} value={opt.id.toString()}>
+          {opt.name}
+        </Option>
+      ))
+    : null;
 
   return (
     <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={error}>
diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index 11d9597986..985fd9950a 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -28,81 +28,74 @@ export const createColumnFields = (
   renderOrderByArrow,
   hendleUpdate,
   hendleDelete,
-  onCellChange
+  onCellChange,
+  customTableColumns
 ) => {
   let columns = [];
 
   for (const key of schema.keys()) {
     const value = schema.values[key];
-    if (value.show !== false) {
-      if (key === 'id') {
+    if (value.show !== false && key !== 'id') {
+      if (value.type.isSchema) {
+        let sortBy = 'name';
+        for (const remoteKey of value.type.keys()) {
+          const remoteValue = value.type.values[remoteKey];
+          if (remoteValue.sortBy) {
+            sortBy = remoteKey;
+          }
+        }
         columns.push({
           title: (
             <a onClick={e => orderBy(e, key)} href="#">
               {startCase(key)} {renderOrderByArrow(key)}
             </a>
           ),
-          dataIndex: 'id',
-          key: 'id',
-          width: 100,
-          render: (text, record) => (
-            <Link className="link" to={`/${link}/${record.id}`}>
-              {text}
-            </Link>
-          )
+          dataIndex: key,
+          key: key,
+          width: 300,
+          render: text => {
+            return text[sortBy];
+          }
         });
-      } else {
-        if (value.type.isSchema) {
-          let sortBy = 'name';
-          for (const remoteKey of value.type.keys()) {
-            const remoteValue = value.type.values[remoteKey];
-            if (remoteValue.sortBy) {
-              sortBy = remoteKey;
-            }
+      } else if (value.type.name === 'Boolean') {
+        columns.push({
+          title: (
+            <a onClick={e => orderBy(e, key)} href="#">
+              {startCase(key)} {renderOrderByArrow(key)}
+            </a>
+          ),
+          dataIndex: key,
+          key: key,
+          width: 100,
+          render: (text, record) => {
+            const data = {};
+            data[key] = !text;
+            return <Switch checked={text} onClick={() => hendleUpdate(data, record.id)} />;
           }
-          columns.push({
-            title: (
-              <a onClick={e => orderBy(e, key)} href="#">
-                {startCase(key)} {renderOrderByArrow(key)}
-              </a>
-            ),
-            dataIndex: key,
-            key: key,
-            width: 300,
-            render: text => {
-              return text[sortBy];
-            }
-          });
-        } else if (value.type.name === 'Boolean') {
-          columns.push({
-            title: (
-              <a onClick={e => orderBy(e, key)} href="#">
-                {startCase(key)} {renderOrderByArrow(key)}
-              </a>
-            ),
-            dataIndex: key,
-            key: key,
-            width: 100,
-            render: (text, record) => {
-              const data = {};
-              data[key] = !text;
-              return <Switch checked={text} onClick={() => hendleUpdate(data, record.id)} />;
-            }
-          });
-        } else if (value.type.constructor !== Array) {
-          columns.push({
-            title: (
-              <a onClick={e => orderBy(e, key)} href="#">
-                {startCase(key)} {renderOrderByArrow(key)}
-              </a>
-            ),
-            dataIndex: key,
-            key: key,
-            render: (text, record) => (
-              <EditableCell value={text} onChange={onCellChange('name', record.id, hendleUpdate)} />
+        });
+      } else if (value.type.constructor !== Array) {
+        columns.push({
+          title: (
+            <a onClick={e => orderBy(e, key)} href="#">
+              {startCase(key)} {renderOrderByArrow(key)}
+            </a>
+          ),
+          dataIndex: key,
+          key: key,
+          render: (text, record) =>
+            customTableColumns[key] && customTableColumns[key]['render'] ? (
+              customTableColumns[key]['render'](text, record)
+            ) : (
+              <EditableCell
+                value={
+                  customTableColumns[key] && customTableColumns[key]['render']
+                    ? customTableColumns[key]['render'](text, record)
+                    : text
+                }
+                onChange={onCellChange(key, record.id, hendleUpdate)}
+              />
             )
-          });
-        }
+        });
       }
     }
   }
@@ -110,14 +103,19 @@ export const createColumnFields = (
   columns.push({
     title: 'Actions',
     key: 'actions',
-    width: 100,
-    render: (text, record) => (
-      <Popconfirm title="Sure to delete?" onConfirm={() => hendleDelete(record.id)}>
+    width: 150,
+    render: (text, record) => [
+      <Link className="link" to={`/${link}/${record.id}`} key="edit">
+        <Button color="primary" size="sm">
+          Edit
+        </Button>
+      </Link>,
+      <Popconfirm title="Sure to delete?" onConfirm={() => hendleDelete(record.id)} key="delete">
         <Button color="primary" size="sm">
           Delete
         </Button>
       </Popconfirm>
-    )
+    ]
   });
 
   return columns;
@@ -141,7 +139,7 @@ const RenderEntry = ({ fields, formdata, schema, meta: { error, submitFailed } }
     <Col span={12} offset={6}>
       {fields.map((field, index) => (
         <div key={index} className="field-array-form">
-          {createFormFields(schema, formdata, [], `${field}.`)}
+          {createFormFields(schema, formdata, `${field}.`)}
           <FormItem {...tailFormItemLayout}>
             <Button color="primary" size="sm" onClick={() => fields.remove(index)}>
               Delete
@@ -166,19 +164,15 @@ RenderEntry.propTypes = {
   meta: PropTypes.object
 };
 
-export const createFormFields = (schema, formdata, only = [], prefix = '') => {
+export const createFormFields = (schema, formdata, prefix = '', batch = false) => {
   let fields = [];
 
   for (const key of schema.keys()) {
     const value = schema.values[key];
 
-    if (only.length > 0 && !only.includes(key)) {
-      continue;
-    }
-
     if (key !== 'id' && value.show !== false && value.type.constructor !== Array) {
       let validate = [];
-      if (!value.optional) {
+      if (!value.optional && !batch) {
         validate.push(required);
       }
 
@@ -211,7 +205,7 @@ export const createFormFields = (schema, formdata, only = [], prefix = '') => {
         />
       );
     } else {
-      if (value.type.constructor === Array) {
+      if (value.type.constructor === Array && !batch) {
         fields.push(
           <FieldArray name={key} key={key} component={RenderEntry} schema={value.type[0]} formdata={formdata} />
         );
@@ -281,7 +275,7 @@ export const pickInputFields = (schema, values, node = null) => {
 
 class EditableCell extends React.Component {
   static propTypes = {
-    value: PropTypes.string.isRequired,
+    value: PropTypes.string,
     onChange: PropTypes.func.isRequired
   };
 
@@ -313,7 +307,7 @@ class EditableCell extends React.Component {
           </div>
         ) : (
           <div className="editable-cell-text-wrapper">
-            {value || ' '}
+            {value || '\u00A0'}
             <Icon type="edit" className="editable-cell-icon" onClick={this.edit} />
           </div>
         )}
diff --git a/packages/server/package.json b/packages/server/package.json
index 6b3d49e18a..733cfc09c0 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -69,10 +69,10 @@
     "bcryptjs": "^2.4.3",
     "body-parser": "^1.18.2",
     "cors": "^2.8.4",
-    "domain-graphql": "^0.0.14",
-    "domain-knex": "^0.0.10",
+    "domain-graphql": "^0.0.15",
+    "domain-knex": "^0.0.11",
     "domain-react-forms": "^0.0.9",
-    "domain-schema": "^0.0.13",
+    "domain-schema": "^0.0.14",
     "dotenv": "^4.0.0",
     "error-stack-parser": "^2.0.1",
     "express": "^4.16.2",
diff --git a/tools/templates/crud/client/containers/ModuleList.jsx b/tools/templates/crud/client/containers/ModuleList.jsx
index 19193734de..b46929cc84 100644
--- a/tools/templates/crud/client/containers/ModuleList.jsx
+++ b/tools/templates/crud/client/containers/ModuleList.jsx
@@ -12,8 +12,10 @@ import DELETEMANY_$MODULE$S from '../graphql/DeleteMany$Module$s.graphql';
 import UPDATEMANY_$MODULE$S from '../graphql/UpdateMany$Module$s.graphql';
 
 class $Module$ extends React.Component {
+  customTableColumns = {};
+
   render() {
-    return <ListView {...this.props} schema={$Module$Schema} />;
+    return <ListView {...this.props} customTableColumns={this.customTableColumns} schema={$Module$Schema} />;
   }
 }
 
diff --git a/tools/templates/crud/client/index.web.jsx b/tools/templates/crud/client/index.web.jsx
index 2106c8294e..76b2e93acf 100644
--- a/tools/templates/crud/client/index.web.jsx
+++ b/tools/templates/crud/client/index.web.jsx
@@ -13,7 +13,7 @@ export default new Feature({
     <Route exact path="/$module$/:id" component={$Module$Edit} />
   ],
   navItem: (
-    <MenuItem key="$module$">
+    <MenuItem key="/$module$">
       <NavLink to="/$module$" className="nav-link" activeClassName="active">
         $MoDuLe$
       </NavLink>
diff --git a/tools/templates/crud/client/reducers/index.js b/tools/templates/crud/client/reducers/index.js
index 9d4161b18b..7fdfb0048c 100644
--- a/tools/templates/crud/client/reducers/index.js
+++ b/tools/templates/crud/client/reducers/index.js
@@ -4,11 +4,7 @@ const defaultState = {
   nativeLink: '$Module$Edit',
   limit: 50,
   searchText: '',
-  orderBy: {},
-  formFields: {},
-  listFields: {},
-  filterFields: {},
-  batchUpdateFields: {}
+  orderBy: {}
 };
 
 export default function (state = defaultState, action) {
diff --git a/tools/templates/module/client/index.web.jsx b/tools/templates/module/client/index.web.jsx
index ba6a70cd43..497368990e 100644
--- a/tools/templates/module/client/index.web.jsx
+++ b/tools/templates/module/client/index.web.jsx
@@ -9,7 +9,7 @@ import Feature from '../connector';
 export default new Feature({
   route: <Route exact path="/$module$" component={$Module$} />,
   navItem: (
-    <MenuItem key="$module$">
+    <MenuItem key="/$module$">
       <NavLink to="/$module$" className="nav-link" activeClassName="active">
         $Module$
       </NavLink>
diff --git a/yarn.lock b/yarn.lock
index bdcfd4fa44..83977851e1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4082,15 +4082,15 @@ domain-browser@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
 
-domain-graphql@^0.0.14:
-  version "0.0.14"
-  resolved "https://registry.yarnpkg.com/domain-graphql/-/domain-graphql-0.0.14.tgz#23d651ce3eaba5e083ed141069f77fad688fbe41"
+domain-graphql@^0.0.15:
+  version "0.0.15"
+  resolved "https://registry.yarnpkg.com/domain-graphql/-/domain-graphql-0.0.15.tgz#03aff3e0c678d8512aed0f4acd9037598938e074"
   dependencies:
     debug "^3.1.0"
 
-domain-knex@^0.0.10:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/domain-knex/-/domain-knex-0.0.10.tgz#2685acc0eb27d187dee5f4a7083e709e90ddcbac"
+domain-knex@^0.0.11:
+  version "0.0.11"
+  resolved "https://registry.yarnpkg.com/domain-knex/-/domain-knex-0.0.11.tgz#3de0d8e66af5125d364822b073ad04fc8add326e"
   dependencies:
     debug "^3.1.0"
     humps "^2.0.1"
@@ -4101,9 +4101,9 @@ domain-react-forms@^0.0.9:
   dependencies:
     debug "^3.1.0"
 
-domain-schema@^0.0.13:
-  version "0.0.13"
-  resolved "https://registry.yarnpkg.com/domain-schema/-/domain-schema-0.0.13.tgz#dd47c7712d272b4a1a0850321b49c0422c2fdb52"
+domain-schema@^0.0.14:
+  version "0.0.14"
+  resolved "https://registry.yarnpkg.com/domain-schema/-/domain-schema-0.0.14.tgz#911bdf6d5ae6e2e68fa4979778ec2cb622da97db"
   dependencies:
     debug "^3.1.0"
 

From 28311526eca71c7425b020610a238d545f3a1989 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 7 Feb 2018 15:21:10 +0100
Subject: [PATCH 081/327] update crud to latest changes

---
 .../common/components/crud/FormView.web.jsx   | 13 ++++-
 .../common/components/crud/ListView.web.jsx   |  2 +-
 .../web/ui-antd/components/RenderCheckBox.jsx |  7 ++-
 .../web/ui-antd/components/RenderDate.jsx     | 14 +----
 .../web/ui-antd/components/RenderField.jsx    | 14 +----
 .../web/ui-antd/components/RenderSelect.jsx   | 14 +----
 .../web/ui-antd/components/RenderSwitch.jsx   | 14 +----
 .../client/src/modules/common/util.web.jsx    |  5 +-
 packages/server/package.json                  |  7 ++-
 packages/server/src/sql/crud.js               | 57 +++++++++---------
 packages/server/src/sql/helpers.js            | 15 ++---
 tools/cli/module.js                           | 58 +++++++++----------
 .../crud/client/containers/ModuleEdit.jsx     |  2 +-
 .../crud/client/containers/ModuleList.jsx     |  2 +-
 .../crud/database/migrations/_Module.js       |  6 +-
 tools/templates/crud/server/schema.js         | 19 +++---
 tools/templates/crud/server/sql.js            |  7 +--
 17 files changed, 110 insertions(+), 146 deletions(-)

diff --git a/packages/client/src/modules/common/components/crud/FormView.web.jsx b/packages/client/src/modules/common/components/crud/FormView.web.jsx
index 28599ed38c..9d2204c1ae 100644
--- a/packages/client/src/modules/common/components/crud/FormView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/FormView.web.jsx
@@ -18,10 +18,21 @@ const tailFormItemLayout = {
   }
 };
 
+const formItemLayout = {
+  labelCol: {
+    xs: { span: 24 },
+    sm: { span: 6 }
+  },
+  wrapperCol: {
+    xs: { span: 24 },
+    sm: { span: 12 }
+  }
+};
+
 const FormView = ({ handleSubmit, submitting, onSubmit, data, error, schema }) => {
   return (
     <Form name="post" onSubmit={handleSubmit(onSubmit)}>
-      {createFormFields(schema, data)}
+      {createFormFields(schema, data, formItemLayout)}
       {error && <Alert color="error">{error}</Alert>}
       <FormItem {...tailFormItemLayout}>
         <Button color="primary" type="submit" disabled={submitting}>
diff --git a/packages/client/src/modules/common/components/crud/ListView.web.jsx b/packages/client/src/modules/common/components/crud/ListView.web.jsx
index 1a7680d613..d60cb0c05d 100644
--- a/packages/client/src/modules/common/components/crud/ListView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/ListView.web.jsx
@@ -249,7 +249,7 @@ class ListView extends React.Component {
           </Col>
           <Col span={21}>
             <Form layout="inline" name="post" onSubmit={handleSubmit(this.hendleUpdateMany)}>
-              {createFormFields(schema, {}, '', true)}
+              {createFormFields(schema, {}, null, '', true)}
               {/*error && <Alert color="error">{error}</Alert>*/}
               <FormItem>
                 <Button color="primary" type="submit" disabled={!hasSelected} loading={loading && !data}>
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderCheckBox.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderCheckBox.jsx
index e3d99becf8..58825cf57d 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderCheckBox.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderCheckBox.jsx
@@ -5,7 +5,7 @@ import Form from 'antd/lib/form';
 
 const FormItem = Form.Item;
 
-const RenderCheckBox = ({ input, label, meta: { touched, error } }) => {
+const RenderCheckBox = ({ input, label, formItemLayout, meta: { touched, error } }) => {
   let validateStatus = '';
   if (touched && error) {
     validateStatus = 'error';
@@ -14,7 +14,9 @@ const RenderCheckBox = ({ input, label, meta: { touched, error } }) => {
   return (
     <FormItem label={label} validateStatus={validateStatus} help={error}>
       <div>
-        <Checkbox {...input}>{label}</Checkbox>
+        <Checkbox {...input} {...formItemLayout}>
+          {label}
+        </Checkbox>
       </div>
     </FormItem>
   );
@@ -24,6 +26,7 @@ RenderCheckBox.propTypes = {
   input: PropTypes.object,
   label: PropTypes.string,
   type: PropTypes.string,
+  formItemLayout: PropTypes.object,
   meta: PropTypes.object
 };
 
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderDate.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderDate.jsx
index 45bced2b14..f27265c34a 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderDate.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderDate.jsx
@@ -6,18 +6,7 @@ import { FormItem } from './index';
 
 const dateFormat = 'YYYY-MM-DD';
 
-const formItemLayout = {
-  labelCol: {
-    xs: { span: 24 },
-    sm: { span: 6 }
-  },
-  wrapperCol: {
-    xs: { span: 24 },
-    sm: { span: 12 }
-  }
-};
-
-const RenderDate = ({ input: { value, onChange, ...inputRest }, label, meta: { touched, error } }) => {
+const RenderDate = ({ input: { value, onChange, ...inputRest }, label, formItemLayout, meta: { touched, error } }) => {
   let validateStatus = '';
   if (touched && error) {
     validateStatus = 'error';
@@ -46,6 +35,7 @@ RenderDate.propTypes = {
   input: PropTypes.object,
   label: PropTypes.string,
   type: PropTypes.string,
+  formItemLayout: PropTypes.object,
   meta: PropTypes.object
 };
 
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderField.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderField.jsx
index aaca11b845..ae247d7ec3 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderField.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderField.jsx
@@ -2,18 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { FormItem, Input } from './index';
 
-const formItemLayout = {
-  labelCol: {
-    xs: { span: 24 },
-    sm: { span: 6 }
-  },
-  wrapperCol: {
-    xs: { span: 24 },
-    sm: { span: 12 }
-  }
-};
-
-const RenderField = ({ input, label, type, meta: { touched, error } }) => {
+const RenderField = ({ input, label, type, formItemLayout, meta: { touched, error } }) => {
   let validateStatus = '';
   if (touched && error) {
     validateStatus = 'error';
@@ -32,6 +21,7 @@ RenderField.propTypes = {
   input: PropTypes.object,
   label: PropTypes.string,
   type: PropTypes.string,
+  formItemLayout: PropTypes.object,
   meta: PropTypes.object
 };
 
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx
index d92c4055a8..2bf373180d 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx
@@ -5,18 +5,7 @@ import { FormItem } from './index';
 
 const Option = Select.Option;
 
-const formItemLayout = {
-  labelCol: {
-    xs: { span: 24 },
-    sm: { span: 6 }
-  },
-  wrapperCol: {
-    xs: { span: 24 },
-    sm: { span: 12 }
-  }
-};
-
-const RenderField = ({ input: { value, ...inputRest }, label, data, meta: { touched, error } }) => {
+const RenderField = ({ input: { value, ...inputRest }, label, data, formItemLayout, meta: { touched, error } }) => {
   let validateStatus = '';
   if (touched && error) {
     validateStatus = 'error';
@@ -51,6 +40,7 @@ RenderField.propTypes = {
   data: PropTypes.array,
   input: PropTypes.object,
   label: PropTypes.string,
+  formItemLayout: PropTypes.object,
   meta: PropTypes.object
 };
 
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSwitch.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSwitch.jsx
index ac0019d969..c06b51a7a9 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSwitch.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSwitch.jsx
@@ -2,18 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { FormItem, Switch } from './index';
 
-const formItemLayout = {
-  labelCol: {
-    xs: { span: 24 },
-    sm: { span: 6 }
-  },
-  wrapperCol: {
-    xs: { span: 24 },
-    sm: { span: 12 }
-  }
-};
-
-const RenderField = ({ input: { value, ...restInput }, label, meta: { touched, error } }) => {
+const RenderField = ({ input: { value, ...restInput }, label, formItemLayout, meta: { touched, error } }) => {
   let validateStatus = '';
   if (touched && error) {
     validateStatus = 'error';
@@ -32,6 +21,7 @@ RenderField.propTypes = {
   input: PropTypes.object,
   label: PropTypes.string,
   type: PropTypes.string,
+  formItemLayout: PropTypes.object,
   meta: PropTypes.object
 };
 
diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index 985fd9950a..33a660b821 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -139,7 +139,7 @@ const RenderEntry = ({ fields, formdata, schema, meta: { error, submitFailed } }
     <Col span={12} offset={6}>
       {fields.map((field, index) => (
         <div key={index} className="field-array-form">
-          {createFormFields(schema, formdata, `${field}.`)}
+          {createFormFields(schema, formdata, null, `${field}.`)}
           <FormItem {...tailFormItemLayout}>
             <Button color="primary" size="sm" onClick={() => fields.remove(index)}>
               Delete
@@ -164,7 +164,7 @@ RenderEntry.propTypes = {
   meta: PropTypes.object
 };
 
-export const createFormFields = (schema, formdata, prefix = '', batch = false) => {
+export const createFormFields = (schema, formdata, formItemLayout, prefix = '', batch = false) => {
   let fields = [];
 
   for (const key of schema.keys()) {
@@ -202,6 +202,7 @@ export const createFormFields = (schema, formdata, prefix = '', batch = false) =
           type="text"
           label={startCase(key)}
           validate={validate}
+          formItemLayout={formItemLayout}
         />
       );
     } else {
diff --git a/packages/server/package.json b/packages/server/package.json
index 733cfc09c0..f3b7d8c1ea 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -69,10 +69,10 @@
     "bcryptjs": "^2.4.3",
     "body-parser": "^1.18.2",
     "cors": "^2.8.4",
-    "domain-graphql": "^0.0.15",
-    "domain-knex": "^0.0.11",
+    "domain-graphql": "^0.0.16",
+    "domain-knex": "^0.0.12",
     "domain-react-forms": "^0.0.9",
-    "domain-schema": "^0.0.14",
+    "domain-schema": "^0.0.15",
     "dotenv": "^4.0.0",
     "error-stack-parser": "^2.0.1",
     "express": "^4.16.2",
@@ -92,6 +92,7 @@
     "knexnest": "^0.4.1",
     "lodash": "^4.17.4",
     "minilog": "^3.1.0",
+    "moment": "^2.20.1",
     "mysql2": "^1.5.1",
     "nodemailer": "^4.4.1",
     "passport": "^0.4.0",
diff --git a/packages/server/src/sql/crud.js b/packages/server/src/sql/crud.js
index 82304e1458..1fe62b4ab1 100644
--- a/packages/server/src/sql/crud.js
+++ b/packages/server/src/sql/crud.js
@@ -8,12 +8,12 @@ import FieldError from '../../../common/FieldError';
 import knex from './connector';
 
 export default class Crud {
-  getPrefix() {
-    return this.prefix;
+  getTableName() {
+    return decamelize(this.schema.__.name);
   }
 
-  getTableName() {
-    return this.tableName;
+  getFullTableName() {
+    return `${this.schema.__.tablePrefix}${this.getTableName()}`;
   }
 
   getSchema() {
@@ -21,8 +21,8 @@ export default class Crud {
   }
 
   _getList({ limit, offset, orderBy, filter }, info) {
-    const baseQuery = knex(`${this.prefix}${this.tableName} as ${this.tableName}`);
-    const select = selectBy(this.schema, info, false, this.prefix);
+    const baseQuery = knex(`${this.getFullTableName()} as ${this.getTableName()}`);
+    const select = selectBy(this.schema, info, false);
     const queryBuilder = select(baseQuery);
 
     if (limit) {
@@ -51,27 +51,26 @@ export default class Crud {
                 sortBy = remoteKey;
               }
             }
-            column = `${decamelize(value.type.name)}.${sortBy}`;
+            column = `${this.getTableName()}.${sortBy}`;
           } else {
-            column = `${this.tableName}.${decamelize(column)}`;
+            column = `${this.getTableName()}.${decamelize(column)}`;
           }
         }
       }
 
       queryBuilder.orderBy(column, order);
     } else {
-      queryBuilder.orderBy(`${this.tableName}.id`);
+      queryBuilder.orderBy(`${this.getTableName()}.id`);
     }
 
     if (filter) {
       if (has(filter, 'searchText') && filter.searchText !== '') {
         const schema = this.schema;
-        const tableName = this.tableName;
         queryBuilder.where(function() {
           for (const key of schema.keys()) {
             const value = schema.values[key];
             if (value.searchText) {
-              this.orWhere(`${tableName}.${key}`, 'like', `%${filter.searchText}%`);
+              this.orWhere(`${this.getTableName()}.${key}`, 'like', `%${filter.searchText}%`);
             }
           }
         });
@@ -99,7 +98,7 @@ export default class Crud {
   }
 
   getTotal() {
-    return knex(`${this.prefix}${this.tableName}`)
+    return knex(`${this.getFullTableName()}`)
       .countDistinct('id as count')
       .first();
   }
@@ -107,9 +106,9 @@ export default class Crud {
   _get({ where }, info) {
     const { id } = where;
 
-    const baseQuery = knex(`${this.prefix}${this.tableName} as ${this.tableName}`);
-    const select = selectBy(this.schema, info, true, this.prefix);
-    return knexnest(select(baseQuery).where(`${this.tableName}.id`, '=', id));
+    const baseQuery = knex(`${this.getFullTableName()} as ${this.getTableName()}`);
+    const select = selectBy(this.schema, info, true);
+    return knexnest(select(baseQuery).where(`${this.getTableName()}.id`, '=', id));
   }
 
   async get(args, info) {
@@ -118,7 +117,7 @@ export default class Crud {
   }
 
   _create(data) {
-    return knex(`${this.prefix}${this.tableName}`)
+    return knex(`${this.getFullTableName()}`)
       .insert(decamelizeKeys(data))
       .returning('id');
   }
@@ -145,7 +144,7 @@ export default class Crud {
         nestedEntries.map(nested => {
           if (nested.data.create) {
             nested.data.create.map(async create => {
-              create[`${camelize(this.schema.name)}Id`] = id;
+              create[`${camelize(this.schema.__.name)}Id`] = id;
               await ctx[pascalize(nested.key)]._create(create);
             });
           }
@@ -159,7 +158,7 @@ export default class Crud {
   }
 
   _update({ data, where }) {
-    return knex(`${this.prefix}${this.tableName}`)
+    return knex(`${this.getFullTableName()}`)
       .update(decamelizeKeys(data))
       .where(where);
   }
@@ -186,7 +185,7 @@ export default class Crud {
         nestedEntries.map(nested => {
           if (nested.data.create) {
             nested.data.create.map(async create => {
-              create[`${camelize(this.schema.name)}Id`] = args.where.id;
+              create[`${this.getTableName()}Id`] = args.where.id;
               await ctx[pascalize(nested.key)]._create(create);
             });
           }
@@ -210,7 +209,7 @@ export default class Crud {
   }
 
   _delete({ where }) {
-    return knex(`${this.prefix}${this.tableName}`)
+    return knex(`${this.getFullTableName()}`)
       .where(where)
       .del();
   }
@@ -241,11 +240,11 @@ export default class Crud {
 
   _sort({ data }) {
     return knex.raw(
-      `UPDATE ${this.prefix}${this.tableName} t1
-        JOIN ${this.prefix}${this.tableName} t2
-        ON t1.id = ? AND t2.id = ?
-        SET t1.rank = ?,
-        t2.rank = ?`,
+      `UPDATE ${this.getFullTableName()} t1
+JOIN ${this.getFullTableName()} t2
+ON t1.id = ? AND t2.id = ?
+  SET t1.rank = ?,
+  t2.rank = ? `,
       data
     );
   }
@@ -269,7 +268,7 @@ export default class Crud {
   }
 
   _updateMany({ data, where: { id_in } }) {
-    return knex(`${this.prefix}${this.tableName}`)
+    return knex(`${this.getFullTableName()}`)
       .update(decamelizeKeys(data))
       .whereIn('id', id_in);
   }
@@ -291,7 +290,7 @@ export default class Crud {
   }
 
   _deleteMany({ where: { id_in } }) {
-    return knex(`${this.prefix}${this.tableName}`)
+    return knex(`${this.getFullTableName()}`)
       .whereIn('id', id_in)
       .del();
   }
@@ -316,8 +315,8 @@ export default class Crud {
   async getByIds(ids, by, Obj, info) {
     info = parseFields(info);
     info[`${by}Id`] = true;
-    const baseQuery = knex(`${Obj.getPrefix()}${Obj.getTableName()} as ${Obj.getTableName()}`);
-    const select = selectBy(Obj.getSchema(), info, false, Obj.getPrefix());
+    const baseQuery = knex(`${Obj.getFullTableName()} as ${Obj.getTableName()}`);
+    const select = selectBy(Obj.getSchema(), info, false);
     const res = await knexnest(select(baseQuery).whereIn(`${Obj.getTableName()}.${decamelize(by)}_id`, ids));
     return orderedFor(res, ids, `${by}Id`, false);
   }
diff --git a/packages/server/src/sql/helpers.js b/packages/server/src/sql/helpers.js
index 1a603a5e36..000cd545c5 100644
--- a/packages/server/src/sql/helpers.js
+++ b/packages/server/src/sql/helpers.js
@@ -39,7 +39,7 @@ const _getSelectFields = (fields, parentPath, domainSchema, selectItems, joinNam
         }
         const as = parentPath.length > 0 ? `${parentPath.join('_')}_${key}` : key;
         const arrayPrefix = single ? '' : '_';
-        selectItems.push(`${decamelize(domainSchema.name)}.${decamelize(key)} as ${arrayPrefix}${as}`);
+        selectItems.push(`${decamelize(domainSchema.__.name)}.${decamelize(key)} as ${arrayPrefix}${as}`);
       } else {
         if (value.type.constructor === Array) {
           //console.log('Array');
@@ -48,7 +48,7 @@ const _getSelectFields = (fields, parentPath, domainSchema, selectItems, joinNam
           //console.log(value.type[0].name);
         } else {
           if (!value.type.__.transient) {
-            joinNames.push({ key: decamelize(key), name: decamelize(value.type.name) });
+            joinNames.push({ key: decamelize(key), name: decamelize(value.type.__.name) });
           }
 
           parentPath.push(key);
@@ -62,10 +62,7 @@ const _getSelectFields = (fields, parentPath, domainSchema, selectItems, joinNam
   }
 };
 
-export const selectBy = (schema, fields, single = false, prefix = '') => {
-  // form table name
-  const tableName = decamelize(schema.name);
-
+export const selectBy = (schema, fields, single = false) => {
   // select fields
   const parentPath = [];
   const selectItems = [];
@@ -75,7 +72,11 @@ export const selectBy = (schema, fields, single = false, prefix = '') => {
   return query => {
     // join table names
     joinNames.map(({ key, name }) => {
-      query.leftJoin(`${prefix}${name} as ${name}`, `${name}.id`, `${tableName}.${key}_id`);
+      query.leftJoin(
+        `${schema.__.tablePrefix}${name} as ${name}`,
+        `${name}.id`,
+        `${decamelize(schema.__.name)}.${key}_id`
+      );
     });
 
     return query.select(selectItems);
diff --git a/tools/cli/module.js b/tools/cli/module.js
index ef84140277..bf090fbba2 100644
--- a/tools/cli/module.js
+++ b/tools/cli/module.js
@@ -1,6 +1,7 @@
 const shell = require('shelljs');
 const fs = require('fs');
 const chalk = require('chalk');
+const DomainSchema = require('domain-schema').default;
 const GraphQLGenerator = require('domain-graphql').default;
 const { pascalize, camelize } = require('humps');
 const { startCase } = require('lodash');
@@ -35,25 +36,23 @@ function renameFiles(destinationPath, templatePath, module, location) {
 
 function generateField(value, update = false) {
   let result = '';
-  switch (value.type.name) {
-    case 'Boolean':
-      result += 'Boolean';
-      break;
-    case 'ID':
-      result += 'ID';
-      break;
-    case 'Integer':
-      result += 'Int';
-      break;
-    case 'Number':
-      result += 'Float';
-      break;
-    case 'String':
-      result += 'String';
-      break;
-    case 'Date':
-      result += 'Date';
-      break;
+  const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
+  if (hasTypeOf(Boolean)) {
+    result += 'Boolean';
+  } else if (hasTypeOf(DomainSchema.ID)) {
+    result += 'ID';
+  } else if (hasTypeOf(DomainSchema.Int)) {
+    result += 'Int';
+  } else if (hasTypeOf(DomainSchema.Float)) {
+    result += 'Float';
+  } else if (hasTypeOf(String)) {
+    result += 'String';
+  } else if (hasTypeOf(Date)) {
+    result += 'Date';
+  } else if (hasTypeOf(DomainSchema.DateTime)) {
+    result += 'DateTime';
+  } else if (hasTypeOf(DomainSchema.Time)) {
+    result += 'Time';
   }
 
   if (!update && !value.optional) {
@@ -197,7 +196,7 @@ function updateSchema(logger, module) {
   if (fs.existsSync(modulePath)) {
     // get module schema
     // eslint-disable-next-line import/no-dynamic-require
-    const schema = require(`${modulePath}/schema`)[Module];
+    const schema = require(`${modulePath}/schema`)[`${Module}Schema`];
 
     // get schema file
     const pathSchema = `${__dirname}/../../packages/server/src/modules/${module}/`;
@@ -232,26 +231,21 @@ function updateSchema(logger, module) {
             }
           }
 
-          let singleKey = key;
-          if (key.slice(-1) === 's') {
-            singleKey = key.slice(0, -1);
-          }
-
           manyInput += `
 
 input ${pascalize(key)}CreateManyInput {
-  create: [${pascalize(singleKey)}CreateInput!]
+  create: [${pascalize(value.type[0].name)}CreateInput!]
 }
 
 input ${pascalize(key)}UpdateManyInput {
-  create: [${pascalize(singleKey)}CreateInput!]
-  delete: [${pascalize(singleKey)}WhereUniqueInput!]
-  update: [${pascalize(singleKey)}UpdateWhereInput!]
+  create: [${pascalize(value.type[0].name)}CreateInput!]
+  delete: [${pascalize(value.type[0].name)}WhereUniqueInput!]
+  update: [${pascalize(value.type[0].name)}UpdateWhereInput!]
 }
 
-input ${pascalize(singleKey)}UpdateWhereInput {
-  where: ${pascalize(singleKey)}WhereUniqueInput!
-  data: ${pascalize(singleKey)}UpdateInput!
+input ${pascalize(value.type[0].name)}UpdateWhereInput {
+  where: ${pascalize(value.type[0].name)}WhereUniqueInput!
+  data: ${pascalize(value.type[0].name)}UpdateInput!
 }`;
         }
       }
diff --git a/tools/templates/crud/client/containers/ModuleEdit.jsx b/tools/templates/crud/client/containers/ModuleEdit.jsx
index 5a1ecd20d0..001bd70b8b 100644
--- a/tools/templates/crud/client/containers/ModuleEdit.jsx
+++ b/tools/templates/crud/client/containers/ModuleEdit.jsx
@@ -6,7 +6,7 @@ import { SubmissionError } from 'redux-form';
 
 import { EditView } from '../../common/components/crud';
 import { pickInputFields } from '../../common/util';
-import { $Module$ as $Module$Schema } from '../../../../../server/src/modules/$module$/schema';
+import { $Module$Schema } from '../../../../../server/src/modules/$module$/schema';
 import $MODULE$_QUERY from '../graphql/$Module$Query.graphql';
 import CREATE_$MODULE$ from '../graphql/Create$Module$.graphql';
 import UPDATE_$MODULE$ from '../graphql/Update$Module$.graphql';
diff --git a/tools/templates/crud/client/containers/ModuleList.jsx b/tools/templates/crud/client/containers/ModuleList.jsx
index b46929cc84..395f71bc17 100644
--- a/tools/templates/crud/client/containers/ModuleList.jsx
+++ b/tools/templates/crud/client/containers/ModuleList.jsx
@@ -3,7 +3,7 @@ import { graphql, compose } from 'react-apollo';
 import { connect } from 'react-redux';
 
 import { ListView } from '../../common/components/crud';
-import { $Module$ as $Module$Schema } from '../../../../../server/src/modules/$module$/schema';
+import { $Module$Schema } from '../../../../../server/src/modules/$module$/schema';
 import $MODULE$S_QUERY from '../graphql/$Module$sQuery.graphql';
 import UPDATE_$MODULE$ from '../graphql/Update$Module$.graphql';
 import DELETE_$MODULE$ from '../graphql/Delete$Module$.graphql';
diff --git a/tools/templates/crud/database/migrations/_Module.js b/tools/templates/crud/database/migrations/_Module.js
index 661a1a3b26..9992b5e3b5 100644
--- a/tools/templates/crud/database/migrations/_Module.js
+++ b/tools/templates/crud/database/migrations/_Module.js
@@ -1,7 +1,7 @@
 import KnexGenerator from 'domain-knex';
 
-import { $Module$ } from '../../modules/$module$/schema';
+import { $Module$Schema } from '../../modules/$module$/schema';
 
-exports.up = knex => new KnexGenerator(knex).createTables($Module$);
+exports.up = knex => new KnexGenerator(knex).createTables($Module$Schema);
 
-exports.down = knex => new KnexGenerator(knex).dropTables($Module$);
+exports.down = knex => new KnexGenerator(knex).dropTables($Module$Schema);
diff --git a/tools/templates/crud/server/schema.js b/tools/templates/crud/server/schema.js
index 77c98ef03f..1cb2436525 100644
--- a/tools/templates/crud/server/schema.js
+++ b/tools/templates/crud/server/schema.js
@@ -1,13 +1,12 @@
 import DomainSchema, { Schema } from 'domain-schema';
 
-/* eslint import/prefer-default-export: 0 */
+export class $Module$ extends Schema {
+  __ = { name: '$Module$', tablePrefix: '' };
+  id = DomainSchema.Int;
+  name = {
+    type: String,
+    searchText: true
+  };
+}
 
-export const $Module$ = new DomainSchema(
-  class $Module$ extends Schema {
-    id = DomainSchema.Integer;
-    name = {
-      type: String,
-      searchText: true
-    };
-  }
-);
+export const $Module$Schema = new DomainSchema($Module$);
diff --git a/tools/templates/crud/server/sql.js b/tools/templates/crud/server/sql.js
index 412dbf2ad1..051c8e5e3d 100644
--- a/tools/templates/crud/server/sql.js
+++ b/tools/templates/crud/server/sql.js
@@ -1,14 +1,9 @@
-import { decamelize } from 'humps';
-
-import { $Module$ as $Module$Schema } from './schema';
+import { $Module$Schema } from './schema';
 import Crud from '../../sql/crud';
 
 export default class $Module$ extends Crud {
   constructor() {
     super();
-
-    this.prefix = '';
-    this.tableName = decamelize($Module$Schema.name);
     this.schema = $Module$Schema;
   }
 }

From 0b1a35ae8009106e02bbd9262b568e3ca1b7685c Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 7 Feb 2018 20:50:11 +0100
Subject: [PATCH 082/327] domain-schema fixes

---
 .../client/src/modules/common/util.web.jsx     | 18 ++++++++----------
 packages/mobile/.spinrc.js                     |  4 ++--
 packages/server/package.json                   |  8 ++++----
 packages/server/src/sql/crud.js                |  3 ++-
 yarn.lock                                      | 18 +++++++++---------
 5 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index 33a660b821..4c9b087b3e 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -35,6 +35,8 @@ export const createColumnFields = (
 
   for (const key of schema.keys()) {
     const value = schema.values[key];
+    const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
+
     if (value.show !== false && key !== 'id') {
       if (value.type.isSchema) {
         let sortBy = 'name';
@@ -57,7 +59,7 @@ export const createColumnFields = (
             return text[sortBy];
           }
         });
-      } else if (value.type.name === 'Boolean') {
+      } else if (hasTypeOf(Boolean)) {
         columns.push({
           title: (
             <a onClick={e => orderBy(e, key)} href="#">
@@ -169,6 +171,7 @@ export const createFormFields = (schema, formdata, formItemLayout, prefix = '',
 
   for (const key of schema.keys()) {
     const value = schema.values[key];
+    const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
 
     if (key !== 'id' && value.show !== false && value.type.constructor !== Array) {
       let validate = [];
@@ -182,15 +185,10 @@ export const createFormFields = (schema, formdata, formItemLayout, prefix = '',
       if (value.type.isSchema) {
         component = RenderSelect;
         data = formdata[`${key}s`];
-      } else {
-        switch (value.type.name) {
-          case 'Date':
-            component = RenderDate;
-            break;
-          case 'Boolean':
-            component = RenderSwitch;
-            break;
-        }
+      } else if (hasTypeOf(Boolean)) {
+        component = RenderDate;
+      } else if (hasTypeOf(Date)) {
+        component = RenderSwitch;
       }
 
       fields.push(
diff --git a/packages/mobile/.spinrc.js b/packages/mobile/.spinrc.js
index 30c6a3acf6..db945d9471 100644
--- a/packages/mobile/.spinrc.js
+++ b/packages/mobile/.spinrc.js
@@ -44,8 +44,8 @@ const config = {
 };
 
 if (process.env.NODE_ENV === 'production') {
-  config.builders.android.enabled = true;
-  config.builders.ios.enabled = true;
+  config.builders.android.enabled = false;
+  config.builders.ios.enabled = false;
   config.options.defines.__BACKEND_URL__ = '"https://apollo-universal-starter-kit.herokuapp.com/graphql"';
   // Generating source maps for production will slowdown compilation for roughly 25%
   config.options.sourceMap = false;
diff --git a/packages/server/package.json b/packages/server/package.json
index f3b7d8c1ea..8a53c35739 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -69,10 +69,10 @@
     "bcryptjs": "^2.4.3",
     "body-parser": "^1.18.2",
     "cors": "^2.8.4",
-    "domain-graphql": "^0.0.16",
-    "domain-knex": "^0.0.12",
+    "domain-graphql": "^0.0.17",
+    "domain-knex": "^0.0.13",
     "domain-react-forms": "^0.0.9",
-    "domain-schema": "^0.0.15",
+    "domain-schema": "^0.0.16",
     "dotenv": "^4.0.0",
     "error-stack-parser": "^2.0.1",
     "express": "^4.16.2",
@@ -203,4 +203,4 @@
   "optionalDependencies": {
     "spinjs": "^0.4.0"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/server/src/sql/crud.js b/packages/server/src/sql/crud.js
index 1fe62b4ab1..a344dbe421 100644
--- a/packages/server/src/sql/crud.js
+++ b/packages/server/src/sql/crud.js
@@ -66,11 +66,12 @@ export default class Crud {
     if (filter) {
       if (has(filter, 'searchText') && filter.searchText !== '') {
         const schema = this.schema;
+        const tableName = this.getTableName();
         queryBuilder.where(function() {
           for (const key of schema.keys()) {
             const value = schema.values[key];
             if (value.searchText) {
-              this.orWhere(`${this.getTableName()}.${key}`, 'like', `%${filter.searchText}%`);
+              this.orWhere(`${tableName}.${key}`, 'like', `%${filter.searchText}%`);
             }
           }
         });
diff --git a/yarn.lock b/yarn.lock
index 83977851e1..7d7989bbdc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4082,15 +4082,15 @@ domain-browser@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
 
-domain-graphql@^0.0.15:
-  version "0.0.15"
-  resolved "https://registry.yarnpkg.com/domain-graphql/-/domain-graphql-0.0.15.tgz#03aff3e0c678d8512aed0f4acd9037598938e074"
+domain-graphql@^0.0.17:
+  version "0.0.17"
+  resolved "https://registry.yarnpkg.com/domain-graphql/-/domain-graphql-0.0.17.tgz#73c47b85cc15d9a2b4c32a93e6bd05172ffa7594"
   dependencies:
     debug "^3.1.0"
 
-domain-knex@^0.0.11:
-  version "0.0.11"
-  resolved "https://registry.yarnpkg.com/domain-knex/-/domain-knex-0.0.11.tgz#3de0d8e66af5125d364822b073ad04fc8add326e"
+domain-knex@^0.0.13:
+  version "0.0.13"
+  resolved "https://registry.yarnpkg.com/domain-knex/-/domain-knex-0.0.13.tgz#bf5142b7f4fa4cf187e0fbe38b7bc10a38d64d8d"
   dependencies:
     debug "^3.1.0"
     humps "^2.0.1"
@@ -4101,9 +4101,9 @@ domain-react-forms@^0.0.9:
   dependencies:
     debug "^3.1.0"
 
-domain-schema@^0.0.14:
-  version "0.0.14"
-  resolved "https://registry.yarnpkg.com/domain-schema/-/domain-schema-0.0.14.tgz#911bdf6d5ae6e2e68fa4979778ec2cb622da97db"
+domain-schema@^0.0.16:
+  version "0.0.16"
+  resolved "https://registry.yarnpkg.com/domain-schema/-/domain-schema-0.0.16.tgz#cc0555483c5385fd28083f43fd415f70566fce39"
   dependencies:
     debug "^3.1.0"
 

From 82469dceb9163bd087b927391fb1da1edb847919 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 7 Feb 2018 20:51:36 +0100
Subject: [PATCH 083/327] customer example test

---
 .../modules/customer/components/Customer.jsx  |  42 +++++
 .../customer/components/Customer.web.jsx      |  45 +++++
 .../customer/containers/Customer.spec.js      |  17 ++
 .../customer/containers/CustomerEdit.jsx      | 119 ++++++++++++
 .../customer/containers/CustomerFilter.jsx    |  24 +++
 .../customer/containers/CustomerList.jsx      | 170 ++++++++++++++++++
 .../customer/graphql/CreateCustomer.graphql   |  13 ++
 .../modules/customer/graphql/Customer.graphql |   4 +
 .../customer/graphql/CustomerQuery.graphql    |  11 ++
 .../customer/graphql/CustomersQuery.graphql   |  23 +++
 .../customer/graphql/DeleteCustomer.graphql   |  11 ++
 .../graphql/DeleteManyCustomers.graphql       |   9 +
 .../customer/graphql/SortCustomers.graphql    |   9 +
 .../customer/graphql/UpdateCustomer.graphql   |  16 ++
 .../graphql/UpdateManyCustomers.graphql       |  12 ++
 .../client/src/modules/customer/index.jsx     |  58 ++++++
 .../client/src/modules/customer/index.web.jsx |  23 +++
 .../src/modules/customer/reducers/index.js    |  33 ++++
 packages/client/src/modules/index.js          |   3 +-
 .../migrations/1518013445349_Customer.js      |   7 +
 .../database/seeds/1518013445349_Customer.js  |   9 +
 .../src/modules/customer/Customer.spec.js     |  23 +++
 packages/server/src/modules/customer/index.js |  10 ++
 .../server/src/modules/customer/resolvers.js  |  44 +++++
 .../src/modules/customer/schema.graphql       |  74 ++++++++
 .../server/src/modules/customer/schema.js     |  12 ++
 packages/server/src/modules/customer/sql.js   |   9 +
 packages/server/src/modules/index.js          |  14 +-
 28 files changed, 842 insertions(+), 2 deletions(-)
 create mode 100644 packages/client/src/modules/customer/components/Customer.jsx
 create mode 100644 packages/client/src/modules/customer/components/Customer.web.jsx
 create mode 100644 packages/client/src/modules/customer/containers/Customer.spec.js
 create mode 100644 packages/client/src/modules/customer/containers/CustomerEdit.jsx
 create mode 100644 packages/client/src/modules/customer/containers/CustomerFilter.jsx
 create mode 100644 packages/client/src/modules/customer/containers/CustomerList.jsx
 create mode 100644 packages/client/src/modules/customer/graphql/CreateCustomer.graphql
 create mode 100644 packages/client/src/modules/customer/graphql/Customer.graphql
 create mode 100644 packages/client/src/modules/customer/graphql/CustomerQuery.graphql
 create mode 100644 packages/client/src/modules/customer/graphql/CustomersQuery.graphql
 create mode 100644 packages/client/src/modules/customer/graphql/DeleteCustomer.graphql
 create mode 100644 packages/client/src/modules/customer/graphql/DeleteManyCustomers.graphql
 create mode 100644 packages/client/src/modules/customer/graphql/SortCustomers.graphql
 create mode 100644 packages/client/src/modules/customer/graphql/UpdateCustomer.graphql
 create mode 100644 packages/client/src/modules/customer/graphql/UpdateManyCustomers.graphql
 create mode 100644 packages/client/src/modules/customer/index.jsx
 create mode 100644 packages/client/src/modules/customer/index.web.jsx
 create mode 100644 packages/client/src/modules/customer/reducers/index.js
 create mode 100644 packages/server/src/database/migrations/1518013445349_Customer.js
 create mode 100644 packages/server/src/database/seeds/1518013445349_Customer.js
 create mode 100644 packages/server/src/modules/customer/Customer.spec.js
 create mode 100644 packages/server/src/modules/customer/index.js
 create mode 100644 packages/server/src/modules/customer/resolvers.js
 create mode 100644 packages/server/src/modules/customer/schema.graphql
 create mode 100644 packages/server/src/modules/customer/schema.js
 create mode 100644 packages/server/src/modules/customer/sql.js

diff --git a/packages/client/src/modules/customer/components/Customer.jsx b/packages/client/src/modules/customer/components/Customer.jsx
new file mode 100644
index 0000000000..09a03e7c66
--- /dev/null
+++ b/packages/client/src/modules/customer/components/Customer.jsx
@@ -0,0 +1,42 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { connect } from 'react-redux';
+import { StyleSheet, Text, View } from 'react-native';
+
+class Customer extends React.PureComponent {
+  static propTypes = {
+    title: PropTypes.string.isRequired
+  };
+
+  render() {
+    const { title } = this.props;
+    return (
+      <View style={styles.container}>
+        <View style={styles.element}>
+          <Text style={styles.box}>Hello {title}!</Text>
+        </View>
+      </View>
+    );
+  }
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    backgroundColor: '#fff',
+    alignItems: 'center',
+    justifyContent: 'center'
+  },
+  element: {
+    paddingTop: 30
+  },
+  box: {
+    textAlign: 'center',
+    marginLeft: 15,
+    marginRight: 15
+  }
+});
+
+export default connect(state => ({
+  title: state.customer.title
+}))(Customer);
diff --git a/packages/client/src/modules/customer/components/Customer.web.jsx b/packages/client/src/modules/customer/components/Customer.web.jsx
new file mode 100644
index 0000000000..1ad29983a6
--- /dev/null
+++ b/packages/client/src/modules/customer/components/Customer.web.jsx
@@ -0,0 +1,45 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { connect } from 'react-redux';
+import Helmet from 'react-helmet';
+import { PageLayout } from '../../common/components/web';
+
+import CustomerFilter from '../containers/CustomerFilter';
+import CustomerList from '../containers/CustomerList';
+import settings from '../../../../../../settings';
+
+class Customer extends React.PureComponent {
+  static propTypes = {
+    title: PropTypes.string.isRequired
+  };
+
+  renderMetaData = title => (
+    <Helmet
+      title={`${settings.app.name} - ${title}`}
+      meta={[
+        {
+          name: 'description',
+          content: `${settings.app.name} - ${title} page`
+        }
+      ]}
+    />
+  );
+
+  render() {
+    const { title } = this.props;
+    return (
+      <PageLayout>
+        {this.renderMetaData(title)}
+        <h2>{title}</h2>
+        <hr />
+        <CustomerFilter />
+        <hr />
+        <CustomerList />
+      </PageLayout>
+    );
+  }
+}
+
+export default connect(state => ({
+  title: state.customer.title
+}))(Customer);
diff --git a/packages/client/src/modules/customer/containers/Customer.spec.js b/packages/client/src/modules/customer/containers/Customer.spec.js
new file mode 100644
index 0000000000..4f4941024a
--- /dev/null
+++ b/packages/client/src/modules/customer/containers/Customer.spec.js
@@ -0,0 +1,17 @@
+import { expect } from 'chai';
+import { step } from 'mocha-steps';
+import Renderer from '../../../testHelpers/Renderer';
+import Routes from '../../../app/Routes';
+
+describe('Customer UI works', () => {
+  const renderer = new Renderer({});
+  let app;
+  let content;
+
+  step('Customer page renders on mount', () => {
+    app = renderer.mount(Routes);
+    renderer.history.push('/customer');
+    content = app.find('#content');
+    expect(content).to.not.be.empty;
+  });
+});
diff --git a/packages/client/src/modules/customer/containers/CustomerEdit.jsx b/packages/client/src/modules/customer/containers/CustomerEdit.jsx
new file mode 100644
index 0000000000..79ab49643a
--- /dev/null
+++ b/packages/client/src/modules/customer/containers/CustomerEdit.jsx
@@ -0,0 +1,119 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { graphql, compose } from 'react-apollo';
+import { connect } from 'react-redux';
+import { SubmissionError } from 'redux-form';
+
+import { EditView } from '../../common/components/crud';
+import { pickInputFields } from '../../common/util';
+import { CustomerSchema } from '../../../../../server/src/modules/customer/schema';
+import CUSTOMER_QUERY from '../graphql/CustomerQuery.graphql';
+import CREATE_CUSTOMER from '../graphql/CreateCustomer.graphql';
+import UPDATE_CUSTOMER from '../graphql/UpdateCustomer.graphql';
+
+class CustomerEdit extends React.Component {
+  static propTypes = {
+    data: PropTypes.object,
+    createEntry: PropTypes.func.isRequired,
+    updateEntry: PropTypes.func.isRequired,
+    title: PropTypes.string.isRequired
+  };
+
+  onSubmit = async values => {
+    const { data: { node }, createEntry, updateEntry, title } = this.props;
+    let result = null;
+    const insertValues = pickInputFields(CustomerSchema, values, node);
+
+    if (node) {
+      result = await updateEntry(insertValues, { id: node.id });
+    } else {
+      result = await createEntry(insertValues);
+    }
+
+    if (result && result.errors) {
+      let submitError = {
+        _error: `Edit ${title} failed!`
+      };
+      result.errors.map(error => (submitError[error.field] = error.message));
+      throw new SubmissionError(submitError);
+    }
+  };
+
+  render() {
+    return <EditView {...this.props} onSubmit={this.onSubmit} schema={CustomerSchema} />;
+  }
+}
+
+const CustomerEditWithApollo = compose(
+  graphql(CUSTOMER_QUERY, {
+    options: props => {
+      let id = 0;
+      if (props.match) {
+        id = props.match.params.id;
+      } else if (props.navigation) {
+        id = props.navigation.state.params.id;
+      }
+
+      return {
+        fetchPolicy: 'cache-and-network',
+        variables: { where: { id } }
+      };
+    },
+    props({ data: { loading, customer } }) {
+      return { loading, data: customer };
+    }
+  }),
+  graphql(CREATE_CUSTOMER, {
+    props: ({ ownProps: { history, navigation }, mutate }) => ({
+      createEntry: async data => {
+        try {
+          const { data: { createCustomer } } = await mutate({
+            variables: { data }
+          });
+
+          if (createCustomer.errors) {
+            return { errors: createCustomer.errors };
+          }
+
+          if (history) {
+            return history.push('/customer');
+          }
+          if (navigation) {
+            return navigation.goBack();
+          }
+        } catch (e) {
+          console.log(e.graphQLErrors);
+        }
+      }
+    })
+  }),
+  graphql(UPDATE_CUSTOMER, {
+    props: ({ ownProps: { history, navigation }, mutate }) => ({
+      updateEntry: async (data, where) => {
+        try {
+          const { data: { updateCustomer } } = await mutate({
+            variables: { data, where }
+          });
+
+          if (updateCustomer.errors) {
+            return { errors: updateCustomer.errors };
+          }
+
+          if (history) {
+            return history.push('/customer');
+          }
+          if (navigation) {
+            return navigation.goBack();
+          }
+        } catch (e) {
+          console.log(e.graphQLErrors);
+        }
+      }
+    })
+  })
+)(CustomerEdit);
+
+export default connect(state => ({
+  title: state.customer.title,
+  link: state.customer.link
+}))(CustomerEditWithApollo);
diff --git a/packages/client/src/modules/customer/containers/CustomerFilter.jsx b/packages/client/src/modules/customer/containers/CustomerFilter.jsx
new file mode 100644
index 0000000000..09fd2ccfb3
--- /dev/null
+++ b/packages/client/src/modules/customer/containers/CustomerFilter.jsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import { connect } from 'react-redux';
+
+import { FilterView } from '../../common/components/crud';
+
+class CustomerFilter extends React.PureComponent {
+  render() {
+    return <FilterView {...this.props} />;
+  }
+}
+
+export default connect(
+  state => ({
+    searchText: state.customer.searchText
+  }),
+  dispatch => ({
+    onSearchTextChange(searchText) {
+      dispatch({
+        type: 'CUSTOMER_FILTER_SEARCH_TEXT',
+        value: searchText
+      });
+    }
+  })
+)(CustomerFilter);
diff --git a/packages/client/src/modules/customer/containers/CustomerList.jsx b/packages/client/src/modules/customer/containers/CustomerList.jsx
new file mode 100644
index 0000000000..f0d78585b2
--- /dev/null
+++ b/packages/client/src/modules/customer/containers/CustomerList.jsx
@@ -0,0 +1,170 @@
+import React from 'react';
+import { graphql, compose } from 'react-apollo';
+import { connect } from 'react-redux';
+
+import { ListView } from '../../common/components/crud';
+import { CustomerSchema } from '../../../../../server/src/modules/customer/schema';
+import CUSTOMERS_QUERY from '../graphql/CustomersQuery.graphql';
+import UPDATE_CUSTOMER from '../graphql/UpdateCustomer.graphql';
+import DELETE_CUSTOMER from '../graphql/DeleteCustomer.graphql';
+import SORT_CUSTOMERS from '../graphql/SortCustomers.graphql';
+import DELETEMANY_CUSTOMERS from '../graphql/DeleteManyCustomers.graphql';
+import UPDATEMANY_CUSTOMERS from '../graphql/UpdateManyCustomers.graphql';
+
+class Customer extends React.Component {
+  customTableColumns = {};
+
+  render() {
+    return <ListView {...this.props} customTableColumns={this.customTableColumns} schema={CustomerSchema} />;
+  }
+}
+
+const CustomerWithApollo = compose(
+  graphql(CUSTOMERS_QUERY, {
+    options: ({ limit, orderBy, searchText }) => {
+      return {
+        fetchPolicy: 'cache-and-network',
+        variables: {
+          limit: limit,
+          orderBy: orderBy,
+          filter: { searchText }
+        }
+      };
+    },
+    props: ({ data: { loading, customersConnection, refetch, error, fetchMore } }) => {
+      const loadMoreRows = () => {
+        return fetchMore({
+          variables: {
+            offset: customersConnection.edges.length
+          },
+          updateQuery: (previousResult, { fetchMoreResult }) => {
+            const newEdges = fetchMoreResult.customersConnection.edges;
+            const pageInfo = fetchMoreResult.customersConnection.pageInfo;
+
+            return {
+              customersConnection: {
+                edges: [...previousResult.customersConnection.edges, ...newEdges],
+                pageInfo,
+                __typename: 'CustomersConnection'
+              }
+            };
+          }
+        });
+      };
+      if (error) throw new Error(error);
+      return { loading, data: customersConnection, loadMoreRows, refetch, errors: error ? error.graphQLErrors : null };
+    }
+  }),
+  graphql(UPDATE_CUSTOMER, {
+    props: ({ ownProps: { refetch }, mutate }) => ({
+      updateEntry: async (data, where) => {
+        try {
+          const { data: { updateCustomer } } = await mutate({
+            variables: { data, where }
+          });
+
+          if (updateCustomer.errors) {
+            return { errors: updateCustomer.errors };
+          }
+
+          refetch();
+        } catch (e) {
+          console.log(e.graphQLErrors);
+        }
+      }
+    })
+  }),
+  graphql(DELETE_CUSTOMER, {
+    props: ({ ownProps: { refetch }, mutate }) => ({
+      deleteEntry: async where => {
+        try {
+          const { data: { deleteCustomer } } = await mutate({
+            variables: { where }
+          });
+
+          if (deleteCustomer.errors) {
+            return { errors: deleteCustomer.errors };
+          }
+
+          refetch();
+        } catch (e) {
+          console.log(e.graphQLErrors);
+        }
+      }
+    })
+  }),
+  graphql(SORT_CUSTOMERS, {
+    props: ({ ownProps: { refetch }, mutate }) => ({
+      sortEntries: async data => {
+        try {
+          const { data: { sortCustomers } } = await mutate({
+            variables: { data }
+          });
+
+          if (sortCustomers.errors) {
+            return { errors: sortCustomers.errors };
+          }
+
+          refetch();
+        } catch (e) {
+          console.log(e.graphQLErrors);
+        }
+      }
+    })
+  }),
+  graphql(DELETEMANY_CUSTOMERS, {
+    props: ({ ownProps: { refetch }, mutate }) => ({
+      deleteManyEntries: async where => {
+        try {
+          const { data: { deleteManyCustomers } } = await mutate({
+            variables: { where }
+          });
+
+          if (deleteManyCustomers.errors) {
+            return { errors: deleteManyCustomers.errors };
+          }
+
+          refetch();
+        } catch (e) {
+          console.log(e.graphQLErrors);
+        }
+      }
+    })
+  }),
+  graphql(UPDATEMANY_CUSTOMERS, {
+    props: ({ ownProps: { refetch }, mutate }) => ({
+      updateManyEntries: async (data, where) => {
+        try {
+          const { data: { updateManyCustomers } } = await mutate({
+            variables: { data, where }
+          });
+
+          if (updateManyCustomers.errors) {
+            return { errors: updateManyCustomers.errors };
+          }
+
+          refetch();
+        } catch (e) {
+          console.log(e.graphQLErrors);
+        }
+      }
+    })
+  })
+)(Customer);
+
+export default connect(
+  state => ({
+    link: state.customer.link,
+    limit: state.customer.limit,
+    searchText: state.customer.searchText,
+    orderBy: state.customer.orderBy
+  }),
+  dispatch => ({
+    onOrderBy(orderBy) {
+      dispatch({
+        type: 'CUSTOMER_ORDER_BY',
+        value: orderBy
+      });
+    }
+  })
+)(CustomerWithApollo);
diff --git a/packages/client/src/modules/customer/graphql/CreateCustomer.graphql b/packages/client/src/modules/customer/graphql/CreateCustomer.graphql
new file mode 100644
index 0000000000..27f1827fad
--- /dev/null
+++ b/packages/client/src/modules/customer/graphql/CreateCustomer.graphql
@@ -0,0 +1,13 @@
+#import "./Customer.graphql"
+
+mutation createCustomer($data: CustomerCreateInput!) {
+  createCustomer(data: $data) {
+    node {
+      ...CustomerInfo
+    }
+    errors {
+      field
+      message
+    }
+  }
+}
diff --git a/packages/client/src/modules/customer/graphql/Customer.graphql b/packages/client/src/modules/customer/graphql/Customer.graphql
new file mode 100644
index 0000000000..b2239aae06
--- /dev/null
+++ b/packages/client/src/modules/customer/graphql/Customer.graphql
@@ -0,0 +1,4 @@
+fragment CustomerInfo on Customer {
+  id
+  name
+}
diff --git a/packages/client/src/modules/customer/graphql/CustomerQuery.graphql b/packages/client/src/modules/customer/graphql/CustomerQuery.graphql
new file mode 100644
index 0000000000..17dee40c6a
--- /dev/null
+++ b/packages/client/src/modules/customer/graphql/CustomerQuery.graphql
@@ -0,0 +1,11 @@
+#import "./Customer.graphql"
+
+query customer($where: CustomerWhereUniqueInput!) {
+  customer(where: $where) {
+    node {
+      ...CustomerInfo
+    }
+    ### form data
+    ### end form data
+  }
+}
diff --git a/packages/client/src/modules/customer/graphql/CustomersQuery.graphql b/packages/client/src/modules/customer/graphql/CustomersQuery.graphql
new file mode 100644
index 0000000000..fa698a97b5
--- /dev/null
+++ b/packages/client/src/modules/customer/graphql/CustomersQuery.graphql
@@ -0,0 +1,23 @@
+#import "./Customer.graphql"
+
+query customersConnection(
+  $limit: Int
+  $offset: Int
+  $orderBy: OrderByInput
+  $filter: CustomerFilterInput
+) {
+  customersConnection(
+    limit: $limit
+    offset: $offset
+    orderBy: $orderBy
+    filter: $filter
+  ) {
+    pageInfo {
+      totalCount
+      hasNextPage
+    }
+    edges {
+      ...CustomerInfo
+    }
+  }
+}
diff --git a/packages/client/src/modules/customer/graphql/DeleteCustomer.graphql b/packages/client/src/modules/customer/graphql/DeleteCustomer.graphql
new file mode 100644
index 0000000000..a6001e3b1d
--- /dev/null
+++ b/packages/client/src/modules/customer/graphql/DeleteCustomer.graphql
@@ -0,0 +1,11 @@
+mutation deleteCustomer($where: CustomerWhereUniqueInput!) {
+  deleteCustomer(where: $where) {
+    node {
+      id
+    }
+    errors {
+      field
+      message
+    }
+  }
+}
diff --git a/packages/client/src/modules/customer/graphql/DeleteManyCustomers.graphql b/packages/client/src/modules/customer/graphql/DeleteManyCustomers.graphql
new file mode 100644
index 0000000000..bb3aec38d0
--- /dev/null
+++ b/packages/client/src/modules/customer/graphql/DeleteManyCustomers.graphql
@@ -0,0 +1,9 @@
+mutation deleteManyCustomers($where: CustomerWhereInput!) {
+  deleteManyCustomers(where: $where) {
+    count
+    errors {
+      field
+      message
+    }
+  }
+}
diff --git a/packages/client/src/modules/customer/graphql/SortCustomers.graphql b/packages/client/src/modules/customer/graphql/SortCustomers.graphql
new file mode 100644
index 0000000000..a235ba999a
--- /dev/null
+++ b/packages/client/src/modules/customer/graphql/SortCustomers.graphql
@@ -0,0 +1,9 @@
+mutation sortCustomers($data: [Int!]) {
+  sortCustomers(data: $data) {
+    count
+    errors {
+      field
+      message
+    }
+  }
+}
diff --git a/packages/client/src/modules/customer/graphql/UpdateCustomer.graphql b/packages/client/src/modules/customer/graphql/UpdateCustomer.graphql
new file mode 100644
index 0000000000..021a6750ec
--- /dev/null
+++ b/packages/client/src/modules/customer/graphql/UpdateCustomer.graphql
@@ -0,0 +1,16 @@
+#import "./Customer.graphql"
+
+mutation updateCustomer(
+  $data: CustomerUpdateInput!
+  $where: CustomerWhereUniqueInput!
+) {
+  updateCustomer(data: $data, where: $where) {
+    node {
+      ...CustomerInfo
+    }
+    errors {
+      field
+      message
+    }
+  }
+}
diff --git a/packages/client/src/modules/customer/graphql/UpdateManyCustomers.graphql b/packages/client/src/modules/customer/graphql/UpdateManyCustomers.graphql
new file mode 100644
index 0000000000..47978785d2
--- /dev/null
+++ b/packages/client/src/modules/customer/graphql/UpdateManyCustomers.graphql
@@ -0,0 +1,12 @@
+mutation updateManyCustomers(
+  $data: CustomerUpdateInput!
+  $where: CustomerWhereInput!
+) {
+  updateManyCustomers(data: $data, where: $where) {
+    count
+    errors {
+      field
+      message
+    }
+  }
+}
diff --git a/packages/client/src/modules/customer/index.jsx b/packages/client/src/modules/customer/index.jsx
new file mode 100644
index 0000000000..aceffc197b
--- /dev/null
+++ b/packages/client/src/modules/customer/index.jsx
@@ -0,0 +1,58 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Button } from 'react-native';
+import { StackNavigator } from 'react-navigation';
+import { Ionicons } from '@expo/vector-icons';
+import { createTabBarIconWrapper } from '../common/components/native';
+import CustomerList from './containers/CustomerList';
+import CustomerEdit from './containers/CustomerEdit';
+import reducers from './reducers';
+
+import Feature from '../connector';
+
+class CustomerListScreen extends React.Component {
+  static navigationOptions = ({ navigation }) => ({
+    title: 'Customer list',
+    headerRight: <Button title="Add" onPress={() => navigation.navigate('CustomerEdit', { id: 0 })} />
+  });
+  render() {
+    return <CustomerList navigation={this.props.navigation} />;
+  }
+}
+
+CustomerListScreen.propTypes = {
+  navigation: PropTypes.object
+};
+
+class CustomerEditScreen extends React.Component {
+  static navigationOptions = ({ navigation }) => ({
+    title: `${navigation.state.params.id === 0 ? 'Create' : 'Edit'} Customer`
+  });
+  render() {
+    return <CustomerEdit navigation={this.props.navigation} />;
+  }
+}
+
+CustomerEditScreen.propTypes = {
+  navigation: PropTypes.object
+};
+
+const CustomerNavigator = StackNavigator({
+  CustomerList: { screen: CustomerListScreen },
+  CustomerEdit: { screen: CustomerEditScreen }
+});
+
+export default new Feature({
+  tabItem: {
+    Customer: {
+      screen: CustomerNavigator,
+      navigationOptions: {
+        tabBarIcon: createTabBarIconWrapper(Ionicons, {
+          name: 'ios-browsers-outline',
+          size: 30
+        })
+      }
+    }
+  },
+  reducer: { customer: reducers }
+});
diff --git a/packages/client/src/modules/customer/index.web.jsx b/packages/client/src/modules/customer/index.web.jsx
new file mode 100644
index 0000000000..fafb9d81e2
--- /dev/null
+++ b/packages/client/src/modules/customer/index.web.jsx
@@ -0,0 +1,23 @@
+import React from 'react';
+import { Route, NavLink } from 'react-router-dom';
+import { MenuItem } from '../../modules/common/components/web';
+import Customer from './components/Customer';
+import CustomerEdit from './containers/CustomerEdit';
+import reducers from './reducers';
+
+import Feature from '../connector';
+
+export default new Feature({
+  route: [
+    <Route exact path="/customer" component={Customer} />,
+    <Route exact path="/customer/:id" component={CustomerEdit} />
+  ],
+  navItem: (
+    <MenuItem key="/customer">
+      <NavLink to="/customer" className="nav-link" activeClassName="active">
+        Customer
+      </NavLink>
+    </MenuItem>
+  ),
+  reducer: { customer: reducers }
+});
diff --git a/packages/client/src/modules/customer/reducers/index.js b/packages/client/src/modules/customer/reducers/index.js
new file mode 100644
index 0000000000..c791bfb61e
--- /dev/null
+++ b/packages/client/src/modules/customer/reducers/index.js
@@ -0,0 +1,33 @@
+const defaultState = {
+  title: 'Customer',
+  link: 'customer',
+  nativeLink: 'CustomerEdit',
+  limit: 50,
+  searchText: '',
+  orderBy: {}
+};
+
+export default function(state = defaultState, action) {
+  switch (action.type) {
+    case 'CUSTOMER_LIMIT':
+      return {
+        ...state,
+        limit: action.value
+      };
+
+    case 'CUSTOMER_FILTER_SEARCH_TEXT':
+      return {
+        ...state,
+        searchText: action.value
+      };
+
+    case 'CUSTOMER_ORDER_BY':
+      return {
+        ...state,
+        orderBy: action.value
+      };
+
+    default:
+      return state;
+  }
+}
diff --git a/packages/client/src/modules/index.js b/packages/client/src/modules/index.js
index bf0e144e63..9e93e578e1 100644
--- a/packages/client/src/modules/index.js
+++ b/packages/client/src/modules/index.js
@@ -1,3 +1,4 @@
+import customer from './customer';
 import counter from './counter';
 import post from './post';
 import upload from './upload';
@@ -9,4 +10,4 @@ import './favicon';
 
 import Feature from './connector';
 
-export default new Feature(counter, post, upload, user, subscription, contact, pageNotFound);
+export default new Feature(customer, counter, post, upload, user, subscription, contact, pageNotFound);
diff --git a/packages/server/src/database/migrations/1518013445349_Customer.js b/packages/server/src/database/migrations/1518013445349_Customer.js
new file mode 100644
index 0000000000..7523b9acb1
--- /dev/null
+++ b/packages/server/src/database/migrations/1518013445349_Customer.js
@@ -0,0 +1,7 @@
+import KnexGenerator from 'domain-knex';
+
+import { CustomerSchema } from '../../modules/customer/schema';
+
+exports.up = knex => new KnexGenerator(knex).createTables(CustomerSchema);
+
+exports.down = knex => new KnexGenerator(knex).dropTables(CustomerSchema);
diff --git a/packages/server/src/database/seeds/1518013445349_Customer.js b/packages/server/src/database/seeds/1518013445349_Customer.js
new file mode 100644
index 0000000000..7272b4ac86
--- /dev/null
+++ b/packages/server/src/database/seeds/1518013445349_Customer.js
@@ -0,0 +1,9 @@
+import { truncateTables } from '../../sql/helpers';
+
+export async function seed(knex, Promise) {
+  await truncateTables(knex, Promise, ['customer']);
+
+  await knex('customer')
+    .returning('id')
+    .insert({ name: 'test' });
+}
diff --git a/packages/server/src/modules/customer/Customer.spec.js b/packages/server/src/modules/customer/Customer.spec.js
new file mode 100644
index 0000000000..97955c8bfa
--- /dev/null
+++ b/packages/server/src/modules/customer/Customer.spec.js
@@ -0,0 +1,23 @@
+/*eslint-disable no-unused-vars*/
+import chai from 'chai';
+import { step } from 'mocha-steps';
+import { getServer, getApollo } from '../../testHelpers/integrationSetup';
+
+describe('Customer API works', () => {
+  let server, apollo;
+
+  before(() => {
+    server = getServer();
+    apollo = getApollo();
+  });
+
+  step('Has GraphiQL endpoint', () => {
+    return chai
+      .request(server)
+      .get('/graphiql')
+      .end((err, res) => {
+        res.status.should.be(200);
+        res.body.should.be('{}');
+      });
+  });
+});
diff --git a/packages/server/src/modules/customer/index.js b/packages/server/src/modules/customer/index.js
new file mode 100644
index 0000000000..90b4f2b261
--- /dev/null
+++ b/packages/server/src/modules/customer/index.js
@@ -0,0 +1,10 @@
+import Customer from './sql';
+import schema from './schema.graphql';
+import createResolvers from './resolvers';
+import Feature from '../connector';
+
+export default new Feature({
+  schema: schema,
+  createResolversFunc: createResolvers,
+  createContextFunc: () => ({ Customer: new Customer() })
+});
diff --git a/packages/server/src/modules/customer/resolvers.js b/packages/server/src/modules/customer/resolvers.js
new file mode 100644
index 0000000000..faedc86a11
--- /dev/null
+++ b/packages/server/src/modules/customer/resolvers.js
@@ -0,0 +1,44 @@
+// eslint-disable-next-line no-unused-vars
+import { createBatchResolver } from 'graphql-resolve-batch';
+
+// eslint-disable-next-line no-unused-vars
+export default pubsub => ({
+  Query: {
+    customers: (parent, args, ctx, info) => {
+      return ctx.Customer.getList(args, info);
+    },
+    customersConnection: (parent, args, ctx, info) => {
+      return ctx.Customer.getPaginated(args, info);
+    },
+    customer: (parent, args, ctx, info) => {
+      return ctx.Customer.get(args, info);
+    }
+  },
+  CustomerData: {
+    // related data
+    // end related data
+  },
+  // schema batch resolvers
+  // end schema batch resolvers
+  Mutation: {
+    createCustomer: (parent, args, ctx, info) => {
+      return ctx.Customer.create(args, ctx, info);
+    },
+    updateCustomer: (parent, args, ctx, info) => {
+      return ctx.Customer.update(args, ctx, info);
+    },
+    deleteCustomer: (parent, args, ctx, info) => {
+      return ctx.Customer.delete(args, info);
+    },
+    sortCustomers: (parent, args, ctx) => {
+      return ctx.Customer.sort(args);
+    },
+    updateManyCustomers: (parent, args, ctx) => {
+      return ctx.Customer.updateMany(args);
+    },
+    deleteManyCustomers: (parent, args, ctx) => {
+      return ctx.Customer.deleteMany(args);
+    }
+  },
+  Subscription: {}
+});
diff --git a/packages/server/src/modules/customer/schema.graphql b/packages/server/src/modules/customer/schema.graphql
new file mode 100644
index 0000000000..cbd233bf8d
--- /dev/null
+++ b/packages/server/src/modules/customer/schema.graphql
@@ -0,0 +1,74 @@
+type Customer {
+  id: Int!
+  name: String!
+}
+
+type CustomerConnection {
+  pageInfo: PageInfo
+  edges: [Customer]
+}
+
+type CustomerData {
+  node: Customer
+}
+
+type CustomerPayload {
+  node: Customer
+  errors: [FieldError!]
+}
+
+input OrderByInput {
+  column: String
+  order: String
+}
+
+input CustomerFilterInput {
+  searchText: String
+}
+
+input CustomerCreateInput {
+  name: String!
+}
+
+input CustomerUpdateInput {
+  name: String!
+}
+
+input CustomerWhereUniqueInput {
+  id: Int!
+}
+
+input CustomerWhereInput {
+  id_in: [Int!]
+}
+
+extend type Query {
+  customers(
+    limit: Int
+    offset: Int
+    orderBy: OrderByInput
+    filter: CustomerFilterInput
+  ): [Customer]
+  customersConnection(
+    limit: Int
+    offset: Int
+    orderBy: OrderByInput
+    filter: CustomerFilterInput
+  ): CustomerConnection!
+  customer(where: CustomerWhereUniqueInput!): CustomerData
+}
+
+extend type Mutation {
+  createCustomer(data: CustomerCreateInput!): CustomerPayload!
+  updateCustomer(
+    data: CustomerUpdateInput!
+    where: CustomerWhereUniqueInput!
+  ): CustomerPayload!
+  deleteCustomer(where: CustomerWhereUniqueInput!): CustomerPayload!
+  sortCustomers(data: [Int!]): BatchPayload!
+  updateManyCustomers(
+    data: CustomerUpdateInput!
+    where: CustomerWhereInput!
+  ): BatchPayload!
+  deleteManyCustomers(where: CustomerWhereInput!): BatchPayload!
+}
diff --git a/packages/server/src/modules/customer/schema.js b/packages/server/src/modules/customer/schema.js
new file mode 100644
index 0000000000..b1bea79e0f
--- /dev/null
+++ b/packages/server/src/modules/customer/schema.js
@@ -0,0 +1,12 @@
+import DomainSchema, { Schema } from 'domain-schema';
+
+export class Customer extends Schema {
+  __ = { name: 'Customer', tablePrefix: '' };
+  id = DomainSchema.Int;
+  name = {
+    type: String,
+    searchText: true
+  };
+}
+
+export const CustomerSchema = new DomainSchema(Customer);
diff --git a/packages/server/src/modules/customer/sql.js b/packages/server/src/modules/customer/sql.js
new file mode 100644
index 0000000000..8c47590c71
--- /dev/null
+++ b/packages/server/src/modules/customer/sql.js
@@ -0,0 +1,9 @@
+import { CustomerSchema } from './schema';
+import Crud from '../../sql/crud';
+
+export default class Customer extends Crud {
+  constructor() {
+    super();
+    this.schema = CustomerSchema;
+  }
+}
diff --git a/packages/server/src/modules/index.js b/packages/server/src/modules/index.js
index 1b43893685..476ab302a6 100644
--- a/packages/server/src/modules/index.js
+++ b/packages/server/src/modules/index.js
@@ -1,3 +1,4 @@
+import customer from './customer';
 import counter from './counter';
 import post from './post';
 import upload from './upload';
@@ -11,4 +12,15 @@ import './debug';
 
 import Feature from './connector';
 
-export default new Feature(counter, post, upload, user, subscription, contact, mailer, graphqlTypes, apolloEngine);
+export default new Feature(
+  customer,
+  counter,
+  post,
+  upload,
+  user,
+  subscription,
+  contact,
+  mailer,
+  graphqlTypes,
+  apolloEngine
+);

From f39925aac1628e7ac5e3b2cc5268d29fe2fa6d42 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 8 Feb 2018 15:18:47 +0100
Subject: [PATCH 084/327] new domain schema packages

---
 packages/mobile/.spinrc.js                 |  2 +-
 packages/server/package.json               |  8 ++++----
 packages/server/src/api/rootSchema.graphql |  5 -----
 yarn.lock                                  | 24 +++++++++++-----------
 4 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/packages/mobile/.spinrc.js b/packages/mobile/.spinrc.js
index db945d9471..0b932da0ef 100644
--- a/packages/mobile/.spinrc.js
+++ b/packages/mobile/.spinrc.js
@@ -46,7 +46,7 @@ const config = {
 if (process.env.NODE_ENV === 'production') {
   config.builders.android.enabled = false;
   config.builders.ios.enabled = false;
-  config.options.defines.__BACKEND_URL__ = '"https://apollo-universal-starter-kit.herokuapp.com/graphql"';
+  //config.options.defines.__BACKEND_URL__ = '"https://apollo-universal-starter-kit.herokuapp.com/graphql"';
   // Generating source maps for production will slowdown compilation for roughly 25%
   config.options.sourceMap = false;
 }
diff --git a/packages/server/package.json b/packages/server/package.json
index 8a53c35739..21092ab3e5 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -69,10 +69,10 @@
     "bcryptjs": "^2.4.3",
     "body-parser": "^1.18.2",
     "cors": "^2.8.4",
-    "domain-graphql": "^0.0.17",
-    "domain-knex": "^0.0.13",
-    "domain-react-forms": "^0.0.9",
-    "domain-schema": "^0.0.16",
+    "domain-graphql": "^0.0.18",
+    "domain-knex": "^0.0.18",
+    "domain-react-forms": "^0.0.18",
+    "domain-schema": "^0.0.18",
     "dotenv": "^4.0.0",
     "error-stack-parser": "^2.0.1",
     "express": "^4.16.2",
diff --git a/packages/server/src/api/rootSchema.graphql b/packages/server/src/api/rootSchema.graphql
index 5533e213a6..9dddb8b73c 100644
--- a/packages/server/src/api/rootSchema.graphql
+++ b/packages/server/src/api/rootSchema.graphql
@@ -13,11 +13,6 @@ type BatchPayload {
   errors: [FieldError!]
 }
 
-input OrderByInput {
-  column: String
-  order: String
-}
-
 type Query {
   dummy: Int
 }
diff --git a/yarn.lock b/yarn.lock
index 7d7989bbdc..6a8d4a3bd0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4082,28 +4082,28 @@ domain-browser@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
 
-domain-graphql@^0.0.17:
-  version "0.0.17"
-  resolved "https://registry.yarnpkg.com/domain-graphql/-/domain-graphql-0.0.17.tgz#73c47b85cc15d9a2b4c32a93e6bd05172ffa7594"
+domain-graphql@^0.0.18:
+  version "0.0.18"
+  resolved "https://registry.yarnpkg.com/domain-graphql/-/domain-graphql-0.0.18.tgz#a06b2245e92bcf9a3da364ca624ff55725a8f14c"
   dependencies:
     debug "^3.1.0"
 
-domain-knex@^0.0.13:
-  version "0.0.13"
-  resolved "https://registry.yarnpkg.com/domain-knex/-/domain-knex-0.0.13.tgz#bf5142b7f4fa4cf187e0fbe38b7bc10a38d64d8d"
+domain-knex@^0.0.18:
+  version "0.0.18"
+  resolved "https://registry.yarnpkg.com/domain-knex/-/domain-knex-0.0.18.tgz#2d77cd323c2f9378250314d72c32f0115a513c15"
   dependencies:
     debug "^3.1.0"
     humps "^2.0.1"
 
-domain-react-forms@^0.0.9:
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/domain-react-forms/-/domain-react-forms-0.0.9.tgz#6382caf6a1e94fe4712d9eab50b781989c211f4e"
+domain-react-forms@^0.0.18:
+  version "0.0.18"
+  resolved "https://registry.yarnpkg.com/domain-react-forms/-/domain-react-forms-0.0.18.tgz#406b0020f01b1fdc1c67d01ce1fa7829d112c456"
   dependencies:
     debug "^3.1.0"
 
-domain-schema@^0.0.16:
-  version "0.0.16"
-  resolved "https://registry.yarnpkg.com/domain-schema/-/domain-schema-0.0.16.tgz#cc0555483c5385fd28083f43fd415f70566fce39"
+domain-schema@^0.0.18:
+  version "0.0.18"
+  resolved "https://registry.yarnpkg.com/domain-schema/-/domain-schema-0.0.18.tgz#5356085d12bd6de160eea3d402f96dc99c3c3763"
   dependencies:
     debug "^3.1.0"
 

From 725dada861b46e5fe24fc96148cdeade9f32d7da Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 8 Feb 2018 15:41:17 +0100
Subject: [PATCH 085/327] comment out client __BACKEND_URL__ for prod

---
 packages/client/.spinrc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/.spinrc.js b/packages/client/.spinrc.js
index 40ffe4e026..010b844b1f 100644
--- a/packages/client/.spinrc.js
+++ b/packages/client/.spinrc.js
@@ -39,7 +39,7 @@ const config = {
 config.options.devProxy = config.options.ssr;
 
 if (process.env.NODE_ENV === 'production') {
-  config.options.defines.__BACKEND_URL__ = '"https://apollo-universal-starter-kit.herokuapp.com/graphql"';
+  //config.options.defines.__BACKEND_URL__ = '"https://apollo-universal-starter-kit.herokuapp.com/graphql"';
   // Generating source maps for production will slowdown compilation for roughly 25%
   config.options.sourceMap = false;
 }

From 5d08a5f57746583726a683262d323dc7230a4f67 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 8 Feb 2018 15:43:26 +0100
Subject: [PATCH 086/327] commit test for schema name

---
 packages/server/src/sql/crud.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/server/src/sql/crud.js b/packages/server/src/sql/crud.js
index a344dbe421..3a6455e607 100644
--- a/packages/server/src/sql/crud.js
+++ b/packages/server/src/sql/crud.js
@@ -9,6 +9,8 @@ import knex from './connector';
 
 export default class Crud {
   getTableName() {
+    console.log(this.schema);
+    console.log(this.schema.name);
     return decamelize(this.schema.__.name);
   }
 

From 8fde261d5449f2641caf3c83c58e45e16c1e5021 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 9 Feb 2018 07:04:30 +0100
Subject: [PATCH 087/327] update domain schema, remove console logs

---
 packages/server/package.json    |  8 ++++----
 packages/server/src/sql/crud.js |  2 --
 yarn.lock                       | 24 ++++++++++++------------
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 21092ab3e5..8d42929375 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -69,10 +69,10 @@
     "bcryptjs": "^2.4.3",
     "body-parser": "^1.18.2",
     "cors": "^2.8.4",
-    "domain-graphql": "^0.0.18",
-    "domain-knex": "^0.0.18",
-    "domain-react-forms": "^0.0.18",
-    "domain-schema": "^0.0.18",
+    "domain-graphql": "^0.0.19",
+    "domain-knex": "^0.0.19",
+    "domain-react-forms": "^0.0.19",
+    "domain-schema": "^0.0.19",
     "dotenv": "^4.0.0",
     "error-stack-parser": "^2.0.1",
     "express": "^4.16.2",
diff --git a/packages/server/src/sql/crud.js b/packages/server/src/sql/crud.js
index 3a6455e607..a344dbe421 100644
--- a/packages/server/src/sql/crud.js
+++ b/packages/server/src/sql/crud.js
@@ -9,8 +9,6 @@ import knex from './connector';
 
 export default class Crud {
   getTableName() {
-    console.log(this.schema);
-    console.log(this.schema.name);
     return decamelize(this.schema.__.name);
   }
 
diff --git a/yarn.lock b/yarn.lock
index 6a8d4a3bd0..57dade3f2b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4082,28 +4082,28 @@ domain-browser@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
 
-domain-graphql@^0.0.18:
-  version "0.0.18"
-  resolved "https://registry.yarnpkg.com/domain-graphql/-/domain-graphql-0.0.18.tgz#a06b2245e92bcf9a3da364ca624ff55725a8f14c"
+domain-graphql@^0.0.19:
+  version "0.0.19"
+  resolved "https://registry.yarnpkg.com/domain-graphql/-/domain-graphql-0.0.19.tgz#abbff623d39efac3ac8464538ac18a3cd4a1b3e2"
   dependencies:
     debug "^3.1.0"
 
-domain-knex@^0.0.18:
-  version "0.0.18"
-  resolved "https://registry.yarnpkg.com/domain-knex/-/domain-knex-0.0.18.tgz#2d77cd323c2f9378250314d72c32f0115a513c15"
+domain-knex@^0.0.19:
+  version "0.0.19"
+  resolved "https://registry.yarnpkg.com/domain-knex/-/domain-knex-0.0.19.tgz#90ad0fe194155e19fcfff5bab20065b0c68b001c"
   dependencies:
     debug "^3.1.0"
     humps "^2.0.1"
 
-domain-react-forms@^0.0.18:
-  version "0.0.18"
-  resolved "https://registry.yarnpkg.com/domain-react-forms/-/domain-react-forms-0.0.18.tgz#406b0020f01b1fdc1c67d01ce1fa7829d112c456"
+domain-react-forms@^0.0.19:
+  version "0.0.19"
+  resolved "https://registry.yarnpkg.com/domain-react-forms/-/domain-react-forms-0.0.19.tgz#12c22ab258774369ea25879eae750f33d3959bab"
   dependencies:
     debug "^3.1.0"
 
-domain-schema@^0.0.18:
-  version "0.0.18"
-  resolved "https://registry.yarnpkg.com/domain-schema/-/domain-schema-0.0.18.tgz#5356085d12bd6de160eea3d402f96dc99c3c3763"
+domain-schema@^0.0.19:
+  version "0.0.19"
+  resolved "https://registry.yarnpkg.com/domain-schema/-/domain-schema-0.0.19.tgz#5c28b94fb2f0a30991dab93eb7d2e2827453805c"
   dependencies:
     debug "^3.1.0"
 

From 09723e076061139729e75306283fe18913766710 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 9 Feb 2018 07:05:20 +0100
Subject: [PATCH 088/327] remove test customer module

---
 .../modules/customer/components/Customer.jsx  |  42 -----
 .../customer/components/Customer.web.jsx      |  45 -----
 .../customer/containers/Customer.spec.js      |  17 --
 .../customer/containers/CustomerEdit.jsx      | 119 ------------
 .../customer/containers/CustomerFilter.jsx    |  24 ---
 .../customer/containers/CustomerList.jsx      | 170 ------------------
 .../customer/graphql/CreateCustomer.graphql   |  13 --
 .../modules/customer/graphql/Customer.graphql |   4 -
 .../customer/graphql/CustomerQuery.graphql    |  11 --
 .../customer/graphql/CustomersQuery.graphql   |  23 ---
 .../customer/graphql/DeleteCustomer.graphql   |  11 --
 .../graphql/DeleteManyCustomers.graphql       |   9 -
 .../customer/graphql/SortCustomers.graphql    |   9 -
 .../customer/graphql/UpdateCustomer.graphql   |  16 --
 .../graphql/UpdateManyCustomers.graphql       |  12 --
 .../client/src/modules/customer/index.jsx     |  58 ------
 .../client/src/modules/customer/index.web.jsx |  23 ---
 .../src/modules/customer/reducers/index.js    |  33 ----
 packages/client/src/modules/index.js          |   3 +-
 .../migrations/1518013445349_Customer.js      |   7 -
 .../database/seeds/1518013445349_Customer.js  |   9 -
 .../src/modules/customer/Customer.spec.js     |  23 ---
 packages/server/src/modules/customer/index.js |  10 --
 .../server/src/modules/customer/resolvers.js  |  44 -----
 .../src/modules/customer/schema.graphql       |  74 --------
 .../server/src/modules/customer/schema.js     |  12 --
 packages/server/src/modules/customer/sql.js   |   9 -
 packages/server/src/modules/index.js          |  14 +-
 28 files changed, 2 insertions(+), 842 deletions(-)
 delete mode 100644 packages/client/src/modules/customer/components/Customer.jsx
 delete mode 100644 packages/client/src/modules/customer/components/Customer.web.jsx
 delete mode 100644 packages/client/src/modules/customer/containers/Customer.spec.js
 delete mode 100644 packages/client/src/modules/customer/containers/CustomerEdit.jsx
 delete mode 100644 packages/client/src/modules/customer/containers/CustomerFilter.jsx
 delete mode 100644 packages/client/src/modules/customer/containers/CustomerList.jsx
 delete mode 100644 packages/client/src/modules/customer/graphql/CreateCustomer.graphql
 delete mode 100644 packages/client/src/modules/customer/graphql/Customer.graphql
 delete mode 100644 packages/client/src/modules/customer/graphql/CustomerQuery.graphql
 delete mode 100644 packages/client/src/modules/customer/graphql/CustomersQuery.graphql
 delete mode 100644 packages/client/src/modules/customer/graphql/DeleteCustomer.graphql
 delete mode 100644 packages/client/src/modules/customer/graphql/DeleteManyCustomers.graphql
 delete mode 100644 packages/client/src/modules/customer/graphql/SortCustomers.graphql
 delete mode 100644 packages/client/src/modules/customer/graphql/UpdateCustomer.graphql
 delete mode 100644 packages/client/src/modules/customer/graphql/UpdateManyCustomers.graphql
 delete mode 100644 packages/client/src/modules/customer/index.jsx
 delete mode 100644 packages/client/src/modules/customer/index.web.jsx
 delete mode 100644 packages/client/src/modules/customer/reducers/index.js
 delete mode 100644 packages/server/src/database/migrations/1518013445349_Customer.js
 delete mode 100644 packages/server/src/database/seeds/1518013445349_Customer.js
 delete mode 100644 packages/server/src/modules/customer/Customer.spec.js
 delete mode 100644 packages/server/src/modules/customer/index.js
 delete mode 100644 packages/server/src/modules/customer/resolvers.js
 delete mode 100644 packages/server/src/modules/customer/schema.graphql
 delete mode 100644 packages/server/src/modules/customer/schema.js
 delete mode 100644 packages/server/src/modules/customer/sql.js

diff --git a/packages/client/src/modules/customer/components/Customer.jsx b/packages/client/src/modules/customer/components/Customer.jsx
deleted file mode 100644
index 09a03e7c66..0000000000
--- a/packages/client/src/modules/customer/components/Customer.jsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { StyleSheet, Text, View } from 'react-native';
-
-class Customer extends React.PureComponent {
-  static propTypes = {
-    title: PropTypes.string.isRequired
-  };
-
-  render() {
-    const { title } = this.props;
-    return (
-      <View style={styles.container}>
-        <View style={styles.element}>
-          <Text style={styles.box}>Hello {title}!</Text>
-        </View>
-      </View>
-    );
-  }
-}
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    backgroundColor: '#fff',
-    alignItems: 'center',
-    justifyContent: 'center'
-  },
-  element: {
-    paddingTop: 30
-  },
-  box: {
-    textAlign: 'center',
-    marginLeft: 15,
-    marginRight: 15
-  }
-});
-
-export default connect(state => ({
-  title: state.customer.title
-}))(Customer);
diff --git a/packages/client/src/modules/customer/components/Customer.web.jsx b/packages/client/src/modules/customer/components/Customer.web.jsx
deleted file mode 100644
index 1ad29983a6..0000000000
--- a/packages/client/src/modules/customer/components/Customer.web.jsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import Helmet from 'react-helmet';
-import { PageLayout } from '../../common/components/web';
-
-import CustomerFilter from '../containers/CustomerFilter';
-import CustomerList from '../containers/CustomerList';
-import settings from '../../../../../../settings';
-
-class Customer extends React.PureComponent {
-  static propTypes = {
-    title: PropTypes.string.isRequired
-  };
-
-  renderMetaData = title => (
-    <Helmet
-      title={`${settings.app.name} - ${title}`}
-      meta={[
-        {
-          name: 'description',
-          content: `${settings.app.name} - ${title} page`
-        }
-      ]}
-    />
-  );
-
-  render() {
-    const { title } = this.props;
-    return (
-      <PageLayout>
-        {this.renderMetaData(title)}
-        <h2>{title}</h2>
-        <hr />
-        <CustomerFilter />
-        <hr />
-        <CustomerList />
-      </PageLayout>
-    );
-  }
-}
-
-export default connect(state => ({
-  title: state.customer.title
-}))(Customer);
diff --git a/packages/client/src/modules/customer/containers/Customer.spec.js b/packages/client/src/modules/customer/containers/Customer.spec.js
deleted file mode 100644
index 4f4941024a..0000000000
--- a/packages/client/src/modules/customer/containers/Customer.spec.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { expect } from 'chai';
-import { step } from 'mocha-steps';
-import Renderer from '../../../testHelpers/Renderer';
-import Routes from '../../../app/Routes';
-
-describe('Customer UI works', () => {
-  const renderer = new Renderer({});
-  let app;
-  let content;
-
-  step('Customer page renders on mount', () => {
-    app = renderer.mount(Routes);
-    renderer.history.push('/customer');
-    content = app.find('#content');
-    expect(content).to.not.be.empty;
-  });
-});
diff --git a/packages/client/src/modules/customer/containers/CustomerEdit.jsx b/packages/client/src/modules/customer/containers/CustomerEdit.jsx
deleted file mode 100644
index 79ab49643a..0000000000
--- a/packages/client/src/modules/customer/containers/CustomerEdit.jsx
+++ /dev/null
@@ -1,119 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { graphql, compose } from 'react-apollo';
-import { connect } from 'react-redux';
-import { SubmissionError } from 'redux-form';
-
-import { EditView } from '../../common/components/crud';
-import { pickInputFields } from '../../common/util';
-import { CustomerSchema } from '../../../../../server/src/modules/customer/schema';
-import CUSTOMER_QUERY from '../graphql/CustomerQuery.graphql';
-import CREATE_CUSTOMER from '../graphql/CreateCustomer.graphql';
-import UPDATE_CUSTOMER from '../graphql/UpdateCustomer.graphql';
-
-class CustomerEdit extends React.Component {
-  static propTypes = {
-    data: PropTypes.object,
-    createEntry: PropTypes.func.isRequired,
-    updateEntry: PropTypes.func.isRequired,
-    title: PropTypes.string.isRequired
-  };
-
-  onSubmit = async values => {
-    const { data: { node }, createEntry, updateEntry, title } = this.props;
-    let result = null;
-    const insertValues = pickInputFields(CustomerSchema, values, node);
-
-    if (node) {
-      result = await updateEntry(insertValues, { id: node.id });
-    } else {
-      result = await createEntry(insertValues);
-    }
-
-    if (result && result.errors) {
-      let submitError = {
-        _error: `Edit ${title} failed!`
-      };
-      result.errors.map(error => (submitError[error.field] = error.message));
-      throw new SubmissionError(submitError);
-    }
-  };
-
-  render() {
-    return <EditView {...this.props} onSubmit={this.onSubmit} schema={CustomerSchema} />;
-  }
-}
-
-const CustomerEditWithApollo = compose(
-  graphql(CUSTOMER_QUERY, {
-    options: props => {
-      let id = 0;
-      if (props.match) {
-        id = props.match.params.id;
-      } else if (props.navigation) {
-        id = props.navigation.state.params.id;
-      }
-
-      return {
-        fetchPolicy: 'cache-and-network',
-        variables: { where: { id } }
-      };
-    },
-    props({ data: { loading, customer } }) {
-      return { loading, data: customer };
-    }
-  }),
-  graphql(CREATE_CUSTOMER, {
-    props: ({ ownProps: { history, navigation }, mutate }) => ({
-      createEntry: async data => {
-        try {
-          const { data: { createCustomer } } = await mutate({
-            variables: { data }
-          });
-
-          if (createCustomer.errors) {
-            return { errors: createCustomer.errors };
-          }
-
-          if (history) {
-            return history.push('/customer');
-          }
-          if (navigation) {
-            return navigation.goBack();
-          }
-        } catch (e) {
-          console.log(e.graphQLErrors);
-        }
-      }
-    })
-  }),
-  graphql(UPDATE_CUSTOMER, {
-    props: ({ ownProps: { history, navigation }, mutate }) => ({
-      updateEntry: async (data, where) => {
-        try {
-          const { data: { updateCustomer } } = await mutate({
-            variables: { data, where }
-          });
-
-          if (updateCustomer.errors) {
-            return { errors: updateCustomer.errors };
-          }
-
-          if (history) {
-            return history.push('/customer');
-          }
-          if (navigation) {
-            return navigation.goBack();
-          }
-        } catch (e) {
-          console.log(e.graphQLErrors);
-        }
-      }
-    })
-  })
-)(CustomerEdit);
-
-export default connect(state => ({
-  title: state.customer.title,
-  link: state.customer.link
-}))(CustomerEditWithApollo);
diff --git a/packages/client/src/modules/customer/containers/CustomerFilter.jsx b/packages/client/src/modules/customer/containers/CustomerFilter.jsx
deleted file mode 100644
index 09fd2ccfb3..0000000000
--- a/packages/client/src/modules/customer/containers/CustomerFilter.jsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import React from 'react';
-import { connect } from 'react-redux';
-
-import { FilterView } from '../../common/components/crud';
-
-class CustomerFilter extends React.PureComponent {
-  render() {
-    return <FilterView {...this.props} />;
-  }
-}
-
-export default connect(
-  state => ({
-    searchText: state.customer.searchText
-  }),
-  dispatch => ({
-    onSearchTextChange(searchText) {
-      dispatch({
-        type: 'CUSTOMER_FILTER_SEARCH_TEXT',
-        value: searchText
-      });
-    }
-  })
-)(CustomerFilter);
diff --git a/packages/client/src/modules/customer/containers/CustomerList.jsx b/packages/client/src/modules/customer/containers/CustomerList.jsx
deleted file mode 100644
index f0d78585b2..0000000000
--- a/packages/client/src/modules/customer/containers/CustomerList.jsx
+++ /dev/null
@@ -1,170 +0,0 @@
-import React from 'react';
-import { graphql, compose } from 'react-apollo';
-import { connect } from 'react-redux';
-
-import { ListView } from '../../common/components/crud';
-import { CustomerSchema } from '../../../../../server/src/modules/customer/schema';
-import CUSTOMERS_QUERY from '../graphql/CustomersQuery.graphql';
-import UPDATE_CUSTOMER from '../graphql/UpdateCustomer.graphql';
-import DELETE_CUSTOMER from '../graphql/DeleteCustomer.graphql';
-import SORT_CUSTOMERS from '../graphql/SortCustomers.graphql';
-import DELETEMANY_CUSTOMERS from '../graphql/DeleteManyCustomers.graphql';
-import UPDATEMANY_CUSTOMERS from '../graphql/UpdateManyCustomers.graphql';
-
-class Customer extends React.Component {
-  customTableColumns = {};
-
-  render() {
-    return <ListView {...this.props} customTableColumns={this.customTableColumns} schema={CustomerSchema} />;
-  }
-}
-
-const CustomerWithApollo = compose(
-  graphql(CUSTOMERS_QUERY, {
-    options: ({ limit, orderBy, searchText }) => {
-      return {
-        fetchPolicy: 'cache-and-network',
-        variables: {
-          limit: limit,
-          orderBy: orderBy,
-          filter: { searchText }
-        }
-      };
-    },
-    props: ({ data: { loading, customersConnection, refetch, error, fetchMore } }) => {
-      const loadMoreRows = () => {
-        return fetchMore({
-          variables: {
-            offset: customersConnection.edges.length
-          },
-          updateQuery: (previousResult, { fetchMoreResult }) => {
-            const newEdges = fetchMoreResult.customersConnection.edges;
-            const pageInfo = fetchMoreResult.customersConnection.pageInfo;
-
-            return {
-              customersConnection: {
-                edges: [...previousResult.customersConnection.edges, ...newEdges],
-                pageInfo,
-                __typename: 'CustomersConnection'
-              }
-            };
-          }
-        });
-      };
-      if (error) throw new Error(error);
-      return { loading, data: customersConnection, loadMoreRows, refetch, errors: error ? error.graphQLErrors : null };
-    }
-  }),
-  graphql(UPDATE_CUSTOMER, {
-    props: ({ ownProps: { refetch }, mutate }) => ({
-      updateEntry: async (data, where) => {
-        try {
-          const { data: { updateCustomer } } = await mutate({
-            variables: { data, where }
-          });
-
-          if (updateCustomer.errors) {
-            return { errors: updateCustomer.errors };
-          }
-
-          refetch();
-        } catch (e) {
-          console.log(e.graphQLErrors);
-        }
-      }
-    })
-  }),
-  graphql(DELETE_CUSTOMER, {
-    props: ({ ownProps: { refetch }, mutate }) => ({
-      deleteEntry: async where => {
-        try {
-          const { data: { deleteCustomer } } = await mutate({
-            variables: { where }
-          });
-
-          if (deleteCustomer.errors) {
-            return { errors: deleteCustomer.errors };
-          }
-
-          refetch();
-        } catch (e) {
-          console.log(e.graphQLErrors);
-        }
-      }
-    })
-  }),
-  graphql(SORT_CUSTOMERS, {
-    props: ({ ownProps: { refetch }, mutate }) => ({
-      sortEntries: async data => {
-        try {
-          const { data: { sortCustomers } } = await mutate({
-            variables: { data }
-          });
-
-          if (sortCustomers.errors) {
-            return { errors: sortCustomers.errors };
-          }
-
-          refetch();
-        } catch (e) {
-          console.log(e.graphQLErrors);
-        }
-      }
-    })
-  }),
-  graphql(DELETEMANY_CUSTOMERS, {
-    props: ({ ownProps: { refetch }, mutate }) => ({
-      deleteManyEntries: async where => {
-        try {
-          const { data: { deleteManyCustomers } } = await mutate({
-            variables: { where }
-          });
-
-          if (deleteManyCustomers.errors) {
-            return { errors: deleteManyCustomers.errors };
-          }
-
-          refetch();
-        } catch (e) {
-          console.log(e.graphQLErrors);
-        }
-      }
-    })
-  }),
-  graphql(UPDATEMANY_CUSTOMERS, {
-    props: ({ ownProps: { refetch }, mutate }) => ({
-      updateManyEntries: async (data, where) => {
-        try {
-          const { data: { updateManyCustomers } } = await mutate({
-            variables: { data, where }
-          });
-
-          if (updateManyCustomers.errors) {
-            return { errors: updateManyCustomers.errors };
-          }
-
-          refetch();
-        } catch (e) {
-          console.log(e.graphQLErrors);
-        }
-      }
-    })
-  })
-)(Customer);
-
-export default connect(
-  state => ({
-    link: state.customer.link,
-    limit: state.customer.limit,
-    searchText: state.customer.searchText,
-    orderBy: state.customer.orderBy
-  }),
-  dispatch => ({
-    onOrderBy(orderBy) {
-      dispatch({
-        type: 'CUSTOMER_ORDER_BY',
-        value: orderBy
-      });
-    }
-  })
-)(CustomerWithApollo);
diff --git a/packages/client/src/modules/customer/graphql/CreateCustomer.graphql b/packages/client/src/modules/customer/graphql/CreateCustomer.graphql
deleted file mode 100644
index 27f1827fad..0000000000
--- a/packages/client/src/modules/customer/graphql/CreateCustomer.graphql
+++ /dev/null
@@ -1,13 +0,0 @@
-#import "./Customer.graphql"
-
-mutation createCustomer($data: CustomerCreateInput!) {
-  createCustomer(data: $data) {
-    node {
-      ...CustomerInfo
-    }
-    errors {
-      field
-      message
-    }
-  }
-}
diff --git a/packages/client/src/modules/customer/graphql/Customer.graphql b/packages/client/src/modules/customer/graphql/Customer.graphql
deleted file mode 100644
index b2239aae06..0000000000
--- a/packages/client/src/modules/customer/graphql/Customer.graphql
+++ /dev/null
@@ -1,4 +0,0 @@
-fragment CustomerInfo on Customer {
-  id
-  name
-}
diff --git a/packages/client/src/modules/customer/graphql/CustomerQuery.graphql b/packages/client/src/modules/customer/graphql/CustomerQuery.graphql
deleted file mode 100644
index 17dee40c6a..0000000000
--- a/packages/client/src/modules/customer/graphql/CustomerQuery.graphql
+++ /dev/null
@@ -1,11 +0,0 @@
-#import "./Customer.graphql"
-
-query customer($where: CustomerWhereUniqueInput!) {
-  customer(where: $where) {
-    node {
-      ...CustomerInfo
-    }
-    ### form data
-    ### end form data
-  }
-}
diff --git a/packages/client/src/modules/customer/graphql/CustomersQuery.graphql b/packages/client/src/modules/customer/graphql/CustomersQuery.graphql
deleted file mode 100644
index fa698a97b5..0000000000
--- a/packages/client/src/modules/customer/graphql/CustomersQuery.graphql
+++ /dev/null
@@ -1,23 +0,0 @@
-#import "./Customer.graphql"
-
-query customersConnection(
-  $limit: Int
-  $offset: Int
-  $orderBy: OrderByInput
-  $filter: CustomerFilterInput
-) {
-  customersConnection(
-    limit: $limit
-    offset: $offset
-    orderBy: $orderBy
-    filter: $filter
-  ) {
-    pageInfo {
-      totalCount
-      hasNextPage
-    }
-    edges {
-      ...CustomerInfo
-    }
-  }
-}
diff --git a/packages/client/src/modules/customer/graphql/DeleteCustomer.graphql b/packages/client/src/modules/customer/graphql/DeleteCustomer.graphql
deleted file mode 100644
index a6001e3b1d..0000000000
--- a/packages/client/src/modules/customer/graphql/DeleteCustomer.graphql
+++ /dev/null
@@ -1,11 +0,0 @@
-mutation deleteCustomer($where: CustomerWhereUniqueInput!) {
-  deleteCustomer(where: $where) {
-    node {
-      id
-    }
-    errors {
-      field
-      message
-    }
-  }
-}
diff --git a/packages/client/src/modules/customer/graphql/DeleteManyCustomers.graphql b/packages/client/src/modules/customer/graphql/DeleteManyCustomers.graphql
deleted file mode 100644
index bb3aec38d0..0000000000
--- a/packages/client/src/modules/customer/graphql/DeleteManyCustomers.graphql
+++ /dev/null
@@ -1,9 +0,0 @@
-mutation deleteManyCustomers($where: CustomerWhereInput!) {
-  deleteManyCustomers(where: $where) {
-    count
-    errors {
-      field
-      message
-    }
-  }
-}
diff --git a/packages/client/src/modules/customer/graphql/SortCustomers.graphql b/packages/client/src/modules/customer/graphql/SortCustomers.graphql
deleted file mode 100644
index a235ba999a..0000000000
--- a/packages/client/src/modules/customer/graphql/SortCustomers.graphql
+++ /dev/null
@@ -1,9 +0,0 @@
-mutation sortCustomers($data: [Int!]) {
-  sortCustomers(data: $data) {
-    count
-    errors {
-      field
-      message
-    }
-  }
-}
diff --git a/packages/client/src/modules/customer/graphql/UpdateCustomer.graphql b/packages/client/src/modules/customer/graphql/UpdateCustomer.graphql
deleted file mode 100644
index 021a6750ec..0000000000
--- a/packages/client/src/modules/customer/graphql/UpdateCustomer.graphql
+++ /dev/null
@@ -1,16 +0,0 @@
-#import "./Customer.graphql"
-
-mutation updateCustomer(
-  $data: CustomerUpdateInput!
-  $where: CustomerWhereUniqueInput!
-) {
-  updateCustomer(data: $data, where: $where) {
-    node {
-      ...CustomerInfo
-    }
-    errors {
-      field
-      message
-    }
-  }
-}
diff --git a/packages/client/src/modules/customer/graphql/UpdateManyCustomers.graphql b/packages/client/src/modules/customer/graphql/UpdateManyCustomers.graphql
deleted file mode 100644
index 47978785d2..0000000000
--- a/packages/client/src/modules/customer/graphql/UpdateManyCustomers.graphql
+++ /dev/null
@@ -1,12 +0,0 @@
-mutation updateManyCustomers(
-  $data: CustomerUpdateInput!
-  $where: CustomerWhereInput!
-) {
-  updateManyCustomers(data: $data, where: $where) {
-    count
-    errors {
-      field
-      message
-    }
-  }
-}
diff --git a/packages/client/src/modules/customer/index.jsx b/packages/client/src/modules/customer/index.jsx
deleted file mode 100644
index aceffc197b..0000000000
--- a/packages/client/src/modules/customer/index.jsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { Button } from 'react-native';
-import { StackNavigator } from 'react-navigation';
-import { Ionicons } from '@expo/vector-icons';
-import { createTabBarIconWrapper } from '../common/components/native';
-import CustomerList from './containers/CustomerList';
-import CustomerEdit from './containers/CustomerEdit';
-import reducers from './reducers';
-
-import Feature from '../connector';
-
-class CustomerListScreen extends React.Component {
-  static navigationOptions = ({ navigation }) => ({
-    title: 'Customer list',
-    headerRight: <Button title="Add" onPress={() => navigation.navigate('CustomerEdit', { id: 0 })} />
-  });
-  render() {
-    return <CustomerList navigation={this.props.navigation} />;
-  }
-}
-
-CustomerListScreen.propTypes = {
-  navigation: PropTypes.object
-};
-
-class CustomerEditScreen extends React.Component {
-  static navigationOptions = ({ navigation }) => ({
-    title: `${navigation.state.params.id === 0 ? 'Create' : 'Edit'} Customer`
-  });
-  render() {
-    return <CustomerEdit navigation={this.props.navigation} />;
-  }
-}
-
-CustomerEditScreen.propTypes = {
-  navigation: PropTypes.object
-};
-
-const CustomerNavigator = StackNavigator({
-  CustomerList: { screen: CustomerListScreen },
-  CustomerEdit: { screen: CustomerEditScreen }
-});
-
-export default new Feature({
-  tabItem: {
-    Customer: {
-      screen: CustomerNavigator,
-      navigationOptions: {
-        tabBarIcon: createTabBarIconWrapper(Ionicons, {
-          name: 'ios-browsers-outline',
-          size: 30
-        })
-      }
-    }
-  },
-  reducer: { customer: reducers }
-});
diff --git a/packages/client/src/modules/customer/index.web.jsx b/packages/client/src/modules/customer/index.web.jsx
deleted file mode 100644
index fafb9d81e2..0000000000
--- a/packages/client/src/modules/customer/index.web.jsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import React from 'react';
-import { Route, NavLink } from 'react-router-dom';
-import { MenuItem } from '../../modules/common/components/web';
-import Customer from './components/Customer';
-import CustomerEdit from './containers/CustomerEdit';
-import reducers from './reducers';
-
-import Feature from '../connector';
-
-export default new Feature({
-  route: [
-    <Route exact path="/customer" component={Customer} />,
-    <Route exact path="/customer/:id" component={CustomerEdit} />
-  ],
-  navItem: (
-    <MenuItem key="/customer">
-      <NavLink to="/customer" className="nav-link" activeClassName="active">
-        Customer
-      </NavLink>
-    </MenuItem>
-  ),
-  reducer: { customer: reducers }
-});
diff --git a/packages/client/src/modules/customer/reducers/index.js b/packages/client/src/modules/customer/reducers/index.js
deleted file mode 100644
index c791bfb61e..0000000000
--- a/packages/client/src/modules/customer/reducers/index.js
+++ /dev/null
@@ -1,33 +0,0 @@
-const defaultState = {
-  title: 'Customer',
-  link: 'customer',
-  nativeLink: 'CustomerEdit',
-  limit: 50,
-  searchText: '',
-  orderBy: {}
-};
-
-export default function(state = defaultState, action) {
-  switch (action.type) {
-    case 'CUSTOMER_LIMIT':
-      return {
-        ...state,
-        limit: action.value
-      };
-
-    case 'CUSTOMER_FILTER_SEARCH_TEXT':
-      return {
-        ...state,
-        searchText: action.value
-      };
-
-    case 'CUSTOMER_ORDER_BY':
-      return {
-        ...state,
-        orderBy: action.value
-      };
-
-    default:
-      return state;
-  }
-}
diff --git a/packages/client/src/modules/index.js b/packages/client/src/modules/index.js
index 9e93e578e1..bf0e144e63 100644
--- a/packages/client/src/modules/index.js
+++ b/packages/client/src/modules/index.js
@@ -1,4 +1,3 @@
-import customer from './customer';
 import counter from './counter';
 import post from './post';
 import upload from './upload';
@@ -10,4 +9,4 @@ import './favicon';
 
 import Feature from './connector';
 
-export default new Feature(customer, counter, post, upload, user, subscription, contact, pageNotFound);
+export default new Feature(counter, post, upload, user, subscription, contact, pageNotFound);
diff --git a/packages/server/src/database/migrations/1518013445349_Customer.js b/packages/server/src/database/migrations/1518013445349_Customer.js
deleted file mode 100644
index 7523b9acb1..0000000000
--- a/packages/server/src/database/migrations/1518013445349_Customer.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import KnexGenerator from 'domain-knex';
-
-import { CustomerSchema } from '../../modules/customer/schema';
-
-exports.up = knex => new KnexGenerator(knex).createTables(CustomerSchema);
-
-exports.down = knex => new KnexGenerator(knex).dropTables(CustomerSchema);
diff --git a/packages/server/src/database/seeds/1518013445349_Customer.js b/packages/server/src/database/seeds/1518013445349_Customer.js
deleted file mode 100644
index 7272b4ac86..0000000000
--- a/packages/server/src/database/seeds/1518013445349_Customer.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { truncateTables } from '../../sql/helpers';
-
-export async function seed(knex, Promise) {
-  await truncateTables(knex, Promise, ['customer']);
-
-  await knex('customer')
-    .returning('id')
-    .insert({ name: 'test' });
-}
diff --git a/packages/server/src/modules/customer/Customer.spec.js b/packages/server/src/modules/customer/Customer.spec.js
deleted file mode 100644
index 97955c8bfa..0000000000
--- a/packages/server/src/modules/customer/Customer.spec.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/*eslint-disable no-unused-vars*/
-import chai from 'chai';
-import { step } from 'mocha-steps';
-import { getServer, getApollo } from '../../testHelpers/integrationSetup';
-
-describe('Customer API works', () => {
-  let server, apollo;
-
-  before(() => {
-    server = getServer();
-    apollo = getApollo();
-  });
-
-  step('Has GraphiQL endpoint', () => {
-    return chai
-      .request(server)
-      .get('/graphiql')
-      .end((err, res) => {
-        res.status.should.be(200);
-        res.body.should.be('{}');
-      });
-  });
-});
diff --git a/packages/server/src/modules/customer/index.js b/packages/server/src/modules/customer/index.js
deleted file mode 100644
index 90b4f2b261..0000000000
--- a/packages/server/src/modules/customer/index.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import Customer from './sql';
-import schema from './schema.graphql';
-import createResolvers from './resolvers';
-import Feature from '../connector';
-
-export default new Feature({
-  schema: schema,
-  createResolversFunc: createResolvers,
-  createContextFunc: () => ({ Customer: new Customer() })
-});
diff --git a/packages/server/src/modules/customer/resolvers.js b/packages/server/src/modules/customer/resolvers.js
deleted file mode 100644
index faedc86a11..0000000000
--- a/packages/server/src/modules/customer/resolvers.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// eslint-disable-next-line no-unused-vars
-import { createBatchResolver } from 'graphql-resolve-batch';
-
-// eslint-disable-next-line no-unused-vars
-export default pubsub => ({
-  Query: {
-    customers: (parent, args, ctx, info) => {
-      return ctx.Customer.getList(args, info);
-    },
-    customersConnection: (parent, args, ctx, info) => {
-      return ctx.Customer.getPaginated(args, info);
-    },
-    customer: (parent, args, ctx, info) => {
-      return ctx.Customer.get(args, info);
-    }
-  },
-  CustomerData: {
-    // related data
-    // end related data
-  },
-  // schema batch resolvers
-  // end schema batch resolvers
-  Mutation: {
-    createCustomer: (parent, args, ctx, info) => {
-      return ctx.Customer.create(args, ctx, info);
-    },
-    updateCustomer: (parent, args, ctx, info) => {
-      return ctx.Customer.update(args, ctx, info);
-    },
-    deleteCustomer: (parent, args, ctx, info) => {
-      return ctx.Customer.delete(args, info);
-    },
-    sortCustomers: (parent, args, ctx) => {
-      return ctx.Customer.sort(args);
-    },
-    updateManyCustomers: (parent, args, ctx) => {
-      return ctx.Customer.updateMany(args);
-    },
-    deleteManyCustomers: (parent, args, ctx) => {
-      return ctx.Customer.deleteMany(args);
-    }
-  },
-  Subscription: {}
-});
diff --git a/packages/server/src/modules/customer/schema.graphql b/packages/server/src/modules/customer/schema.graphql
deleted file mode 100644
index cbd233bf8d..0000000000
--- a/packages/server/src/modules/customer/schema.graphql
+++ /dev/null
@@ -1,74 +0,0 @@
-type Customer {
-  id: Int!
-  name: String!
-}
-
-type CustomerConnection {
-  pageInfo: PageInfo
-  edges: [Customer]
-}
-
-type CustomerData {
-  node: Customer
-}
-
-type CustomerPayload {
-  node: Customer
-  errors: [FieldError!]
-}
-
-input OrderByInput {
-  column: String
-  order: String
-}
-
-input CustomerFilterInput {
-  searchText: String
-}
-
-input CustomerCreateInput {
-  name: String!
-}
-
-input CustomerUpdateInput {
-  name: String!
-}
-
-input CustomerWhereUniqueInput {
-  id: Int!
-}
-
-input CustomerWhereInput {
-  id_in: [Int!]
-}
-
-extend type Query {
-  customers(
-    limit: Int
-    offset: Int
-    orderBy: OrderByInput
-    filter: CustomerFilterInput
-  ): [Customer]
-  customersConnection(
-    limit: Int
-    offset: Int
-    orderBy: OrderByInput
-    filter: CustomerFilterInput
-  ): CustomerConnection!
-  customer(where: CustomerWhereUniqueInput!): CustomerData
-}
-
-extend type Mutation {
-  createCustomer(data: CustomerCreateInput!): CustomerPayload!
-  updateCustomer(
-    data: CustomerUpdateInput!
-    where: CustomerWhereUniqueInput!
-  ): CustomerPayload!
-  deleteCustomer(where: CustomerWhereUniqueInput!): CustomerPayload!
-  sortCustomers(data: [Int!]): BatchPayload!
-  updateManyCustomers(
-    data: CustomerUpdateInput!
-    where: CustomerWhereInput!
-  ): BatchPayload!
-  deleteManyCustomers(where: CustomerWhereInput!): BatchPayload!
-}
diff --git a/packages/server/src/modules/customer/schema.js b/packages/server/src/modules/customer/schema.js
deleted file mode 100644
index b1bea79e0f..0000000000
--- a/packages/server/src/modules/customer/schema.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import DomainSchema, { Schema } from 'domain-schema';
-
-export class Customer extends Schema {
-  __ = { name: 'Customer', tablePrefix: '' };
-  id = DomainSchema.Int;
-  name = {
-    type: String,
-    searchText: true
-  };
-}
-
-export const CustomerSchema = new DomainSchema(Customer);
diff --git a/packages/server/src/modules/customer/sql.js b/packages/server/src/modules/customer/sql.js
deleted file mode 100644
index 8c47590c71..0000000000
--- a/packages/server/src/modules/customer/sql.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { CustomerSchema } from './schema';
-import Crud from '../../sql/crud';
-
-export default class Customer extends Crud {
-  constructor() {
-    super();
-    this.schema = CustomerSchema;
-  }
-}
diff --git a/packages/server/src/modules/index.js b/packages/server/src/modules/index.js
index 476ab302a6..1b43893685 100644
--- a/packages/server/src/modules/index.js
+++ b/packages/server/src/modules/index.js
@@ -1,4 +1,3 @@
-import customer from './customer';
 import counter from './counter';
 import post from './post';
 import upload from './upload';
@@ -12,15 +11,4 @@ import './debug';
 
 import Feature from './connector';
 
-export default new Feature(
-  customer,
-  counter,
-  post,
-  upload,
-  user,
-  subscription,
-  contact,
-  mailer,
-  graphqlTypes,
-  apolloEngine
-);
+export default new Feature(counter, post, upload, user, subscription, contact, mailer, graphqlTypes, apolloEngine);

From 4b201118d7bd3c4264826fed23ebd52c5a02bca1 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 9 Feb 2018 07:13:30 +0100
Subject: [PATCH 089/327] add missing input type

---
 packages/server/src/api/rootSchema.graphql | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/server/src/api/rootSchema.graphql b/packages/server/src/api/rootSchema.graphql
index 9dddb8b73c..5533e213a6 100644
--- a/packages/server/src/api/rootSchema.graphql
+++ b/packages/server/src/api/rootSchema.graphql
@@ -13,6 +13,11 @@ type BatchPayload {
   errors: [FieldError!]
 }
 
+input OrderByInput {
+  column: String
+  order: String
+}
+
 type Query {
   dummy: Int
 }

From 27bf1f3a30a52270790a2e8e3ae452d882314684 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 9 Feb 2018 07:47:54 +0100
Subject: [PATCH 090/327] switch date and boolean in forms

---
 packages/client/src/modules/common/util.web.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index 4c9b087b3e..a6d109e2b6 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -186,9 +186,9 @@ export const createFormFields = (schema, formdata, formItemLayout, prefix = '',
         component = RenderSelect;
         data = formdata[`${key}s`];
       } else if (hasTypeOf(Boolean)) {
-        component = RenderDate;
-      } else if (hasTypeOf(Date)) {
         component = RenderSwitch;
+      } else if (hasTypeOf(Date)) {
+        component = RenderDate;
       }
 
       fields.push(

From 210247eba76a113cdc99cba92d5e0f168b9bd77a Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 14 Feb 2018 13:38:59 +0100
Subject: [PATCH 091/327] fix batch label for switch, select, fix multiple
 create

---
 .../client/src/modules/common/util.web.jsx     | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index a6d109e2b6..806ccf7d7d 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -136,12 +136,12 @@ const tailFormItemLayout = {
   }
 };
 
-const RenderEntry = ({ fields, formdata, schema, meta: { error, submitFailed } }) => (
+const RenderEntry = ({ fields, formdata, formItemLayout, schema, meta: { error, submitFailed } }) => (
   <Row>
     <Col span={12} offset={6}>
       {fields.map((field, index) => (
         <div key={index} className="field-array-form">
-          {createFormFields(schema, formdata, null, `${field}.`)}
+          {createFormFields(schema, formdata, formItemLayout, `${field}.`)}
           <FormItem {...tailFormItemLayout}>
             <Button color="primary" size="sm" onClick={() => fields.remove(index)}>
               Delete
@@ -163,7 +163,8 @@ RenderEntry.propTypes = {
   fields: PropTypes.object,
   formdata: PropTypes.object,
   schema: PropTypes.object,
-  meta: PropTypes.object
+  meta: PropTypes.object,
+  formItemLayout: PropTypes.object
 };
 
 export const createFormFields = (schema, formdata, formItemLayout, prefix = '', batch = false) => {
@@ -206,7 +207,14 @@ export const createFormFields = (schema, formdata, formItemLayout, prefix = '',
     } else {
       if (value.type.constructor === Array && !batch) {
         fields.push(
-          <FieldArray name={key} key={key} component={RenderEntry} schema={value.type[0]} formdata={formdata} />
+          <FieldArray
+            name={key}
+            key={key}
+            component={RenderEntry}
+            schema={value.type[0]}
+            formdata={formdata}
+            formItemLayout={formItemLayout}
+          />
         );
       }
     }
@@ -256,7 +264,7 @@ export const pickInputFields = (schema, values, node = null) => {
 
         values[key].forEach(item => {
           if (!keys1[item.id]) {
-            create.push({ ...item });
+            create.push(pickInputFields(value.type[0], item));
           }
         });
 

From ab62e05ffa1ee06671de478b36e53ded85d73dfb Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 14 Feb 2018 15:06:07 +0100
Subject: [PATCH 092/327] remove redux-form from completely, fix knex seed

---
 .flowconfig                                   |   1 -
 packages/common/package.json                  |   5 +-
 packages/mobile/package.json                  |   3 +-
 packages/server/package.json                  |   8 +-
 tools/cli/module.js                           |   3 +-
 .../templates/crud/database/seeds/_Module.js  |   4 +-
 tools/webpackAppConfig.js                     | 115 ------------------
 yarn.lock                                     |  41 +++----
 8 files changed, 25 insertions(+), 155 deletions(-)
 delete mode 100644 tools/webpackAppConfig.js

diff --git a/.flowconfig b/.flowconfig
index d9e310dbec..1028b67494 100644
--- a/.flowconfig
+++ b/.flowconfig
@@ -13,7 +13,6 @@
 .*node_modules/react-navigation/.*
 .*node_modules/react-native/.*
 .*node_modules/react-native-web/.*
-.*node_modules/redux-form/.*
 .*node_modules/reqwest/.*
 .*node_modules/styled-components/.*
 .*node_modules/xdl/.*
diff --git a/packages/common/package.json b/packages/common/package.json
index 4c3af8eb8d..3a8bd76195 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -11,10 +11,9 @@
     "minilog": "^3.1.0",
     "react-router-redux": "^5.0.0-alpha.8",
     "redux": "^3.7.2",
-    "redux-devtools-extension": "^2.13.2",
-    "redux-form": "^7.2.0"
+    "redux-devtools-extension": "^2.13.2"
   },
   "devDependencies": {
     "eslint": "^4.13.1"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/mobile/package.json b/packages/mobile/package.json
index fba7f0d8ac..8997b9d9c0 100644
--- a/packages/mobile/package.json
+++ b/packages/mobile/package.json
@@ -70,7 +70,6 @@
     "react-redux": "^5.0.6",
     "react-stripe-elements": "^1.2.1",
     "redux": "^3.7.2",
-    "redux-form": "^7.2.0",
     "subscriptions-transport-ws": "^0.9.4"
   },
   "devDependencies": {
@@ -163,4 +162,4 @@
   "peerDependencies": {
     "spinjs": "^0.4.0"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/server/package.json b/packages/server/package.json
index 2c2faed26f..412cb8a45c 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -71,10 +71,10 @@
     "bcryptjs": "^2.4.3",
     "body-parser": "^1.18.2",
     "cors": "^2.8.4",
-    "domain-graphql": "^0.0.19",
-    "domain-knex": "^0.0.19",
-    "domain-react-forms": "^0.0.19",
-    "domain-schema": "^0.0.19",
+    "domain-graphql": "^0.0.20",
+    "domain-knex": "^0.0.20",
+    "domain-react-forms": "^0.0.20",
+    "domain-schema": "^0.0.20",
     "dotenv": "^4.0.0",
     "error-stack-parser": "^2.0.1",
     "express": "^4.16.2",
diff --git a/tools/cli/module.js b/tools/cli/module.js
index bf090fbba2..4a091acbd7 100644
--- a/tools/cli/module.js
+++ b/tools/cli/module.js
@@ -3,7 +3,7 @@ const fs = require('fs');
 const chalk = require('chalk');
 const DomainSchema = require('domain-schema').default;
 const GraphQLGenerator = require('domain-graphql').default;
-const { pascalize, camelize } = require('humps');
+const { pascalize, camelize, decamelize } = require('humps');
 const { startCase } = require('lodash');
 
 function renameFiles(destinationPath, templatePath, module, location) {
@@ -27,6 +27,7 @@ function renameFiles(destinationPath, templatePath, module, location) {
   shell.ls('-Rl', '.').forEach(entry => {
     if (entry.isFile()) {
       shell.sed('-i', /\$module\$/g, module, entry.name);
+      shell.sed('-i', /\$_module\$/g, decamelize(module), entry.name);
       shell.sed('-i', /\$Module\$/g, Module, entry.name);
       shell.sed('-i', /\$MoDuLe\$/g, startCase(Module), entry.name);
       shell.sed('-i', /\$MODULE\$/g, module.toUpperCase(), entry.name);
diff --git a/tools/templates/crud/database/seeds/_Module.js b/tools/templates/crud/database/seeds/_Module.js
index 958b1366b9..9747c2d0fb 100644
--- a/tools/templates/crud/database/seeds/_Module.js
+++ b/tools/templates/crud/database/seeds/_Module.js
@@ -1,9 +1,9 @@
 import { truncateTables } from '../../sql/helpers';
 
 export async function seed(knex, Promise) {
-  await truncateTables(knex, Promise, ['$module$']);
+  await truncateTables(knex, Promise, ['$_module$']);
 
-  await knex('$module$')
+  await knex('$_module$')
     .returning('id')
     .insert({ name: 'test' });
 }
diff --git a/tools/webpackAppConfig.js b/tools/webpackAppConfig.js
deleted file mode 100644
index 8586e227c1..0000000000
--- a/tools/webpackAppConfig.js
+++ /dev/null
@@ -1,115 +0,0 @@
-// App-specific back-end Webpack config should be here
-const server = {
-  //  entry: {
-  //    index: [
-  //      'babel-polyfill',
-  //      './src/server/index.js'
-  //    ]
-  //  }
-};
-
-// App-specific web front-end Webpack config should be here
-const web = {
-  //  entry: {
-  //    index: [
-  //      'babel-polyfill',
-  //      './src/client/index.jsx'
-  //    ]
-  //  }
-};
-
-// App-specific Android React Native front-end Webpack config should be here
-const android = {
-  //  entry: {
-  //    'index.mobile.bundle': [
-  //      require.resolve('./react-native-polyfill.js'),
-  //      './src/mobile/index.js'
-  //    ]
-  //  }
-};
-
-// App-specific iOS React Native front-end Webpack config should be here
-const ios = {
-  //  entry: {
-  //    'index.mobile.bundle': [
-  //      require.resolve('./react-native-polyfill.js'),
-  //      './src/mobile/index.js'
-  //    ]
-  //  }
-};
-
-const dependencyPlatforms = {
-  antd: 'web',
-  'antd-mobile': ['ios', 'android'],
-  'apollo-engine': 'server',
-  'babel-polyfill': 'server',
-  'babel-preset-env': 'server',
-  'babel-register': 'server',
-  bcryptjs: 'server',
-  'body-parser': 'server',
-  bootstrap: 'web',
-  cors: 'server',
-  dotenv: 'server',
-  'error-stack-parser': ['server', 'web'],
-  expo: ['ios', 'android'],
-  express: 'server',
-  'graphql-auth': 'server',
-  'graphql-parse-fields': 'server',
-  'graphql-resolve-batch': 'server',
-  'apollo-server-express': 'server',
-  'apollo-upload-server': 'server',
-  'graphql-subscriptions': 'server',
-  'graphql-tools': 'server',
-  history: 'web',
-  humps: 'server',
-  'immutability-helper': ['ios', 'android', 'web'],
-  'isomorphic-fetch': 'server',
-  jsonwebtoken: 'server',
-  'jwt-decode': 'web',
-  knex: 'server',
-  knexnest: 'server',
-  mysql2: 'server',
-  'native-base': ['ios', 'android'],
-  nodemailer: 'server',
-  opencollective: 'server',
-  passport: 'server',
-  'passport-local': 'server',
-  'passport-facebook': 'server',
-  'passport-google-oauth': 'server',
-  persistgraphql: ['server', 'web'],
-  'performance-now': 'server',
-  pg: 'server',
-  'redbox-react': ['server', 'web'],
-  'react-cookie': ['server', 'web'],
-  'react-dnd': 'web',
-  'react-dnd-html5-backend': 'web',
-  'react-dom': 'web',
-  'react-dropzone': 'web',
-  'react-ga': 'web',
-  'react-helmet': 'web',
-  'react-hot-loader': 'web',
-  'react-native': ['ios', 'android'],
-  'react-native-web': 'web',
-  'react-navigation': ['ios', 'android'],
-  'react-redux': 'web',
-  'react-router': 'web',
-  'react-router-dom': 'web',
-  'react-router-redux': 'web',
-  'react-transition-group': 'web',
-  reactstrap: 'web',
-  'redux-devtools-extension': 'web',
-  'redux-form': 'web',
-  'serialize-javascript': 'server',
-  shelljs: 'server',
-  'source-map-support': 'server',
-  'sourcemapped-stacktrace': ['server', 'web'],
-  sqlite3: 'server',
-  stripe: 'server',
-  'stripe-local': 'server',
-  'styled-components': ['server', 'web'],
-  'subscriptions-transport-ws': ['ios', 'android', 'web'],
-  'universal-cookie-express': 'server',
-  '@expo/vector-icons': ['ios', 'android']
-};
-
-module.exports = { server, web, android, ios, dependencyPlatforms };
diff --git a/yarn.lock b/yarn.lock
index 9c8d726979..61af562037 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4095,28 +4095,28 @@ domain-browser@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
 
-domain-graphql@^0.0.19:
-  version "0.0.19"
-  resolved "https://registry.yarnpkg.com/domain-graphql/-/domain-graphql-0.0.19.tgz#abbff623d39efac3ac8464538ac18a3cd4a1b3e2"
+domain-graphql@^0.0.20:
+  version "0.0.20"
+  resolved "https://registry.yarnpkg.com/domain-graphql/-/domain-graphql-0.0.20.tgz#8cf31e4d1c7e0f65dc0c1beb215ba40febe4f927"
   dependencies:
     debug "^3.1.0"
 
-domain-knex@^0.0.19:
-  version "0.0.19"
-  resolved "https://registry.yarnpkg.com/domain-knex/-/domain-knex-0.0.19.tgz#90ad0fe194155e19fcfff5bab20065b0c68b001c"
+domain-knex@^0.0.20:
+  version "0.0.20"
+  resolved "https://registry.yarnpkg.com/domain-knex/-/domain-knex-0.0.20.tgz#5090277e5a395792c78a644647c1ffa1884980ca"
   dependencies:
     debug "^3.1.0"
     humps "^2.0.1"
 
-domain-react-forms@^0.0.19:
-  version "0.0.19"
-  resolved "https://registry.yarnpkg.com/domain-react-forms/-/domain-react-forms-0.0.19.tgz#12c22ab258774369ea25879eae750f33d3959bab"
+domain-react-forms@^0.0.20:
+  version "0.0.20"
+  resolved "https://registry.yarnpkg.com/domain-react-forms/-/domain-react-forms-0.0.20.tgz#26d0bfa86d6ac99cf59609549741e568e802bce9"
   dependencies:
     debug "^3.1.0"
 
-domain-schema@^0.0.19:
-  version "0.0.19"
-  resolved "https://registry.yarnpkg.com/domain-schema/-/domain-schema-0.0.19.tgz#5c28b94fb2f0a30991dab93eb7d2e2827453805c"
+domain-schema@^0.0.20:
+  version "0.0.20"
+  resolved "https://registry.yarnpkg.com/domain-schema/-/domain-schema-0.0.20.tgz#5d7d9293d69ec0e816463a019bde00ff92cb8750"
   dependencies:
     debug "^3.1.0"
 
@@ -4409,7 +4409,7 @@ es6-error@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-3.2.0.tgz#e567cfdcb324d4e7ae5922a3700ada5de879a0ca"
 
-es6-error@^4.0.2, es6-error@^4.1.1:
+es6-error@^4.0.2:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
 
@@ -7602,7 +7602,7 @@ lock@^0.1.2, lock@~0.1.2:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/lock/-/lock-0.1.4.tgz#fec7deaef17e7c3a0a55e1da042803e25d91745d"
 
-lodash-es@^4.17.3, lodash-es@^4.2.0, lodash-es@^4.2.1:
+lodash-es@^4.2.0, lodash-es@^4.2.1:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.4.tgz#dcc1d7552e150a0640073ba9cb31d70f032950e7"
 
@@ -11343,19 +11343,6 @@ redux-devtools-extension@^2.13.2:
   version "2.13.2"
   resolved "https://registry.yarnpkg.com/redux-devtools-extension/-/redux-devtools-extension-2.13.2.tgz#e0f9a8e8dfca7c17be92c7124958a3b94eb2911d"
 
-redux-form@^7.2.0:
-  version "7.2.1"
-  resolved "https://registry.yarnpkg.com/redux-form/-/redux-form-7.2.1.tgz#011f6ff0cf050552a4a182a271f22217f4584684"
-  dependencies:
-    deep-equal "^1.0.1"
-    es6-error "^4.1.1"
-    hoist-non-react-statics "^2.3.1"
-    invariant "^2.2.2"
-    is-promise "^2.1.0"
-    lodash "^4.17.3"
-    lodash-es "^4.17.3"
-    prop-types "^15.5.9"
-
 redux-logger@^2.7.4:
   version "2.10.2"
   resolved "https://registry.yarnpkg.com/redux-logger/-/redux-logger-2.10.2.tgz#3c5a5f0a6f32577c1deadf6655f257f82c6c3937"

From f915f5db8d6a20aaac39c0cb92aa6512fd5be0e1 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 15 Feb 2018 07:38:04 +0100
Subject: [PATCH 093/327] commit testModule wip

---
 README.md                                     |   4 +-
 .../common/components/crud/FormView.jsx       |  33 ++--
 .../common/components/crud/FormView.web.jsx   |  30 ++-
 .../common/components/crud/ListView.web.jsx   |  15 +-
 .../web/ui-antd/components/RenderField.jsx    |   1 +
 packages/client/src/modules/common/util.jsx   |  13 +-
 .../client/src/modules/common/util.web.jsx    |   3 +-
 packages/client/src/modules/index.js          |   3 +-
 .../src/modules/post/components/PostForm.jsx  |   4 +-
 .../testModule/components/TestModule.jsx      |  42 +++++
 .../testModule/components/TestModule.web.jsx  |  45 +++++
 .../testModule/containers/TestModule.spec.js  |  17 ++
 .../testModule/containers/TestModuleEdit.jsx  | 118 ++++++++++++
 .../containers/TestModuleFilter.jsx           |  24 +++
 .../testModule/containers/TestModuleList.jsx  | 176 ++++++++++++++++++
 .../graphql/CreateTestModule.graphql          |  13 ++
 .../graphql/DeleteManyTestModules.graphql     |   9 +
 .../graphql/DeleteTestModule.graphql          |  11 ++
 .../graphql/SortTestModules.graphql           |   9 +
 .../testModule/graphql/TestModule.graphql     |   4 +
 .../graphql/TestModuleQuery.graphql           |  11 ++
 .../graphql/TestModulesQuery.graphql          |  23 +++
 .../graphql/UpdateManyTestModules.graphql     |  12 ++
 .../graphql/UpdateTestModule.graphql          |  16 ++
 .../client/src/modules/testModule/index.jsx   |  58 ++++++
 .../src/modules/testModule/index.web.jsx      |  23 +++
 .../src/modules/testModule/reducers/index.js  |  33 ++++
 .../user/components/ResetPasswordForm.web.jsx |   4 +-
 .../client/src/utils/FieldArrayAdapter.jsx    |  27 +++
 packages/common/createReduxStore.js           |   2 -
 packages/mobile/src/App.js                    |   3 -
 .../migrations/1518617189615_TestModule.js    |   7 +
 .../seeds/1518617189615_TestModule.js         |   9 +
 packages/server/src/modules/index.js          |  14 +-
 .../src/modules/testModule/TestModule.spec.js |  23 +++
 .../server/src/modules/testModule/index.js    |  10 +
 .../src/modules/testModule/resolvers.js       |  44 +++++
 .../src/modules/testModule/schema.graphql     |  72 +++++++
 .../server/src/modules/testModule/schema.js   |  12 ++
 packages/server/src/modules/testModule/sql.js |   9 +
 .../crud/client/containers/ModuleEdit.jsx     |   3 +-
 41 files changed, 936 insertions(+), 53 deletions(-)
 create mode 100644 packages/client/src/modules/testModule/components/TestModule.jsx
 create mode 100644 packages/client/src/modules/testModule/components/TestModule.web.jsx
 create mode 100644 packages/client/src/modules/testModule/containers/TestModule.spec.js
 create mode 100644 packages/client/src/modules/testModule/containers/TestModuleEdit.jsx
 create mode 100644 packages/client/src/modules/testModule/containers/TestModuleFilter.jsx
 create mode 100644 packages/client/src/modules/testModule/containers/TestModuleList.jsx
 create mode 100644 packages/client/src/modules/testModule/graphql/CreateTestModule.graphql
 create mode 100644 packages/client/src/modules/testModule/graphql/DeleteManyTestModules.graphql
 create mode 100644 packages/client/src/modules/testModule/graphql/DeleteTestModule.graphql
 create mode 100644 packages/client/src/modules/testModule/graphql/SortTestModules.graphql
 create mode 100644 packages/client/src/modules/testModule/graphql/TestModule.graphql
 create mode 100644 packages/client/src/modules/testModule/graphql/TestModuleQuery.graphql
 create mode 100644 packages/client/src/modules/testModule/graphql/TestModulesQuery.graphql
 create mode 100644 packages/client/src/modules/testModule/graphql/UpdateManyTestModules.graphql
 create mode 100644 packages/client/src/modules/testModule/graphql/UpdateTestModule.graphql
 create mode 100644 packages/client/src/modules/testModule/index.jsx
 create mode 100644 packages/client/src/modules/testModule/index.web.jsx
 create mode 100644 packages/client/src/modules/testModule/reducers/index.js
 create mode 100644 packages/client/src/utils/FieldArrayAdapter.jsx
 create mode 100644 packages/server/src/database/migrations/1518617189615_TestModule.js
 create mode 100644 packages/server/src/database/seeds/1518617189615_TestModule.js
 create mode 100644 packages/server/src/modules/testModule/TestModule.spec.js
 create mode 100644 packages/server/src/modules/testModule/index.js
 create mode 100644 packages/server/src/modules/testModule/resolvers.js
 create mode 100644 packages/server/src/modules/testModule/schema.graphql
 create mode 100644 packages/server/src/modules/testModule/schema.js
 create mode 100644 packages/server/src/modules/testModule/sql.js

diff --git a/README.md b/README.md
index 13860c012c..403f7e7450 100644
--- a/README.md
+++ b/README.md
@@ -256,7 +256,7 @@ Check [subscription module documentation](src/client/modules/subscription/README
 
 * [GraphQL] subscriptions example
 
-  Full CRUD functionality with Counter updating and Subscriptions in Posts and Comments example, with [ReduxForm]
+  Full CRUD functionality with Counter updating and Subscriptions in Posts and Comments example, with [Formik]
 
 * [GraphQL Cursor Pagination] Example of [Relay-style cursor pagination]
 
@@ -499,7 +499,7 @@ Copyright © 2016, 2017 [SysGears INC]. This source code is licensed under the [
 [react 16]: https://facebook.github.io/react
 [react hot loader v3]: https://github.com/gaearon/react-hot-loader
 [redux]: http://redux.js.org
-[reduxform]: http://redux-form.com
+[formik]: https://github.com/jaredpalmer/formik
 [express]: http://expressjs.com
 [twitter bootstrap]: http://getbootstrap.com
 [nativebase]: https://nativebase.io
diff --git a/packages/client/src/modules/common/components/crud/FormView.jsx b/packages/client/src/modules/common/components/crud/FormView.jsx
index 8b96d92492..2479296ded 100644
--- a/packages/client/src/modules/common/components/crud/FormView.jsx
+++ b/packages/client/src/modules/common/components/crud/FormView.jsx
@@ -1,29 +1,38 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { reduxForm } from 'redux-form';
+import { withFormik } from 'formik';
 
 import { createFormFields } from '../../util';
 import { FormView, FormButton } from '../native';
+import { minLength, required, validateForm } from '../../../../../../common/validation';
 
-const Form = ({ handleSubmit, valid, onSubmit, schema }) => {
+const formSchema = {
+  name: [required, minLength(3)]
+};
+
+const validate = values => validateForm(values, formSchema);
+
+const Form = ({ handleSubmit, schema }) => {
   return (
     <FormView>
       {createFormFields(schema)}
-      <FormButton onPress={handleSubmit(onSubmit)} disabled={!valid}>
-        Save
-      </FormButton>
+      <FormButton onPress={handleSubmit}>Save</FormButton>
     </FormView>
   );
 };
 
 Form.propTypes = {
   handleSubmit: PropTypes.func,
-  onSubmit: PropTypes.func,
-  schema: PropTypes.object,
-  valid: PropTypes.bool
+  schema: PropTypes.object
 };
 
-export default reduxForm({
-  form: 'form',
-  enableReinitialize: true
-})(Form);
+const FormWithFormik = withFormik({
+  async handleSubmit(values, { resetForm, props: { onSubmit } }) {
+    await onSubmit(values);
+    resetForm();
+  },
+  validate: values => validate(values),
+  displayName: 'Form' // helps with React DevTools
+});
+
+export default FormWithFormik(Form);
diff --git a/packages/client/src/modules/common/components/crud/FormView.web.jsx b/packages/client/src/modules/common/components/crud/FormView.web.jsx
index 9d2204c1ae..ebe4d485ab 100644
--- a/packages/client/src/modules/common/components/crud/FormView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/FormView.web.jsx
@@ -1,9 +1,10 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { reduxForm } from 'redux-form';
+import { withFormik } from 'formik';
 
 import { createFormFields } from '../../util';
 import { Form, FormItem, Button, Alert } from '../web';
+import { minLength, required, validateForm } from '../../../../../../common/validation';
 
 const tailFormItemLayout = {
   wrapperCol: {
@@ -29,13 +30,19 @@ const formItemLayout = {
   }
 };
 
-const FormView = ({ handleSubmit, submitting, onSubmit, data, error, schema }) => {
+const formSchema = {
+  name: [required, minLength(3)]
+};
+
+const validate = values => validateForm(values, formSchema);
+
+const FormView = ({ handleSubmit, data, error, schema }) => {
   return (
-    <Form name="post" onSubmit={handleSubmit(onSubmit)}>
+    <Form name="post" onSubmit={handleSubmit}>
       {createFormFields(schema, data, formItemLayout)}
       {error && <Alert color="error">{error}</Alert>}
       <FormItem {...tailFormItemLayout}>
-        <Button color="primary" type="submit" disabled={submitting}>
+        <Button color="primary" type="submit">
           Save
         </Button>
       </FormItem>
@@ -45,13 +52,18 @@ const FormView = ({ handleSubmit, submitting, onSubmit, data, error, schema }) =
 
 FormView.propTypes = {
   handleSubmit: PropTypes.func,
-  onSubmit: PropTypes.func,
-  submitting: PropTypes.bool,
   data: PropTypes.object,
   schema: PropTypes.object,
   error: PropTypes.string
 };
 
-export default reduxForm({
-  form: 'form'
-})(FormView);
+const FormWithFormik = withFormik({
+  async handleSubmit(values, { resetForm, props: { onSubmit } }) {
+    await onSubmit(values);
+    resetForm();
+  },
+  validate: values => validate(values),
+  displayName: 'Form' // helps with React DevTools
+});
+
+export default FormWithFormik(FormView);
diff --git a/packages/client/src/modules/common/components/crud/ListView.web.jsx b/packages/client/src/modules/common/components/crud/ListView.web.jsx
index d60cb0c05d..9735f1d00b 100644
--- a/packages/client/src/modules/common/components/crud/ListView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/ListView.web.jsx
@@ -2,7 +2,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Link } from 'react-router-dom';
-import { reduxForm } from 'redux-form';
+import { withFormik } from 'formik';
 import { DragDropContext, DragSource, DropTarget } from 'react-dnd';
 import HTML5Backend from 'react-dnd-html5-backend';
 import { Table, Button, Popconfirm, Form, FormItem, Row, Col } from '../web';
@@ -248,7 +248,7 @@ class ListView extends React.Component {
             </Popconfirm>
           </Col>
           <Col span={21}>
-            <Form layout="inline" name="post" onSubmit={handleSubmit(this.hendleUpdateMany)}>
+            <Form layout="inline" name="post" onSubmit={handleSubmit}>
               {createFormFields(schema, {}, null, '', true)}
               {/*error && <Alert color="error">{error}</Alert>*/}
               <FormItem>
@@ -305,6 +305,11 @@ class ListView extends React.Component {
   }
 }
 
-export default reduxForm({
-  form: 'formUpdateMultiple'
-})(DragDropContext(HTML5Backend)(ListView));
+const ListViewWithFormik = withFormik({
+  async handleSubmit(values, { resetForm, props: { onSubmit } }) {
+    await onSubmit(values);
+    resetForm();
+  }
+});
+
+export default ListViewWithFormik(DragDropContext(HTML5Backend)(ListView));
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderField.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderField.jsx
index ae247d7ec3..0d8e143c81 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderField.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderField.jsx
@@ -8,6 +8,7 @@ const RenderField = ({ input, label, type, formItemLayout, meta: { touched, erro
     validateStatus = 'error';
   }
 
+  console.log(input);
   return (
     <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
       <div>
diff --git a/packages/client/src/modules/common/util.jsx b/packages/client/src/modules/common/util.jsx
index b0650f0c9f..84faaffb0b 100644
--- a/packages/client/src/modules/common/util.jsx
+++ b/packages/client/src/modules/common/util.jsx
@@ -1,23 +1,14 @@
 import React from 'react';
 import { pick, capitalize } from 'lodash';
-import { Field } from 'redux-form';
+import Field from '../../utils/FieldAdapter';
 import { RenderField } from './components/native';
-import { required } from '../../../../common/validation';
 
 export const createFormFields = schema => {
   let fields = [];
 
   for (const key of schema.keys()) {
     if (key !== 'id') {
-      const value = schema.values[key];
-      let validate = [];
-      if (!value.optional) {
-        validate.push(required);
-      }
-
-      fields.push(
-        <Field name={key} key={key} component={RenderField} type="text" label={capitalize(key)} validate={validate} />
-      );
+      fields.push(<Field name={key} key={key} component={RenderField} type="text" label={capitalize(key)} />);
     }
   }
 
diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index 806ccf7d7d..48b019be55 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -2,9 +2,10 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { startCase, isEqual } from 'lodash';
-import { Field, FieldArray } from 'redux-form';
 import { Link } from 'react-router-dom';
 
+import Field from '../../utils/FieldAdapter';
+import FieldArray from '../../utils/FieldArrayAdapter';
 import {
   RenderField,
   RenderSelect,
diff --git a/packages/client/src/modules/index.js b/packages/client/src/modules/index.js
index bf0e144e63..773888bbbe 100644
--- a/packages/client/src/modules/index.js
+++ b/packages/client/src/modules/index.js
@@ -1,3 +1,4 @@
+import testModule from './testModule';
 import counter from './counter';
 import post from './post';
 import upload from './upload';
@@ -9,4 +10,4 @@ import './favicon';
 
 import Feature from './connector';
 
-export default new Feature(counter, post, upload, user, subscription, contact, pageNotFound);
+export default new Feature(testModule, counter, post, upload, user, subscription, contact, pageNotFound);
diff --git a/packages/client/src/modules/post/components/PostForm.jsx b/packages/client/src/modules/post/components/PostForm.jsx
index 326396a3e2..c2f2eae688 100644
--- a/packages/client/src/modules/post/components/PostForm.jsx
+++ b/packages/client/src/modules/post/components/PostForm.jsx
@@ -12,7 +12,7 @@ const postFormSchema = {
 
 const validate = values => validateForm(values, postFormSchema);
 
-const PostForm = ({ values, handleSubmit, valid, onSubmit, handleChange }) => {
+const PostForm = ({ values, handleSubmit, valid, handleChange }) => {
   return (
     <FormView>
       <Field
@@ -31,7 +31,7 @@ const PostForm = ({ values, handleSubmit, valid, onSubmit, handleChange }) => {
         value={values.content}
         onChange={handleChange}
       />
-      <FormButton onPress={handleSubmit(onSubmit)} disabled={!valid}>
+      <FormButton onPress={handleSubmit} disabled={!valid}>
         Save
       </FormButton>
     </FormView>
diff --git a/packages/client/src/modules/testModule/components/TestModule.jsx b/packages/client/src/modules/testModule/components/TestModule.jsx
new file mode 100644
index 0000000000..7cec5a09a5
--- /dev/null
+++ b/packages/client/src/modules/testModule/components/TestModule.jsx
@@ -0,0 +1,42 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { connect } from 'react-redux';
+import { StyleSheet, Text, View } from 'react-native';
+
+class TestModule extends React.PureComponent {
+  static propTypes = {
+    title: PropTypes.string.isRequired
+  };
+
+  render() {
+    const { title } = this.props;
+    return (
+      <View style={styles.container}>
+        <View style={styles.element}>
+          <Text style={styles.box}>Hello {title}!</Text>
+        </View>
+      </View>
+    );
+  }
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    backgroundColor: '#fff',
+    alignItems: 'center',
+    justifyContent: 'center'
+  },
+  element: {
+    paddingTop: 30
+  },
+  box: {
+    textAlign: 'center',
+    marginLeft: 15,
+    marginRight: 15
+  }
+});
+
+export default connect(state => ({
+  title: state.testModule.title
+}))(TestModule);
diff --git a/packages/client/src/modules/testModule/components/TestModule.web.jsx b/packages/client/src/modules/testModule/components/TestModule.web.jsx
new file mode 100644
index 0000000000..d6115d82e8
--- /dev/null
+++ b/packages/client/src/modules/testModule/components/TestModule.web.jsx
@@ -0,0 +1,45 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { connect } from 'react-redux';
+import Helmet from 'react-helmet';
+import { PageLayout } from '../../common/components/web';
+
+import TestModuleFilter from '../containers/TestModuleFilter';
+import TestModuleList from '../containers/TestModuleList';
+import settings from '../../../../../../settings';
+
+class TestModule extends React.PureComponent {
+  static propTypes = {
+    title: PropTypes.string.isRequired
+  };
+
+  renderMetaData = title => (
+    <Helmet
+      title={`${settings.app.name} - ${title}`}
+      meta={[
+        {
+          name: 'description',
+          content: `${settings.app.name} - ${title} page`
+        }
+      ]}
+    />
+  );
+
+  render() {
+    const { title } = this.props;
+    return (
+      <PageLayout>
+        {this.renderMetaData(title)}
+        <h2>{title}</h2>
+        <hr />
+        <TestModuleFilter />
+        <hr />
+        <TestModuleList />
+      </PageLayout>
+    );
+  }
+}
+
+export default connect(state => ({
+  title: state.testModule.title
+}))(TestModule);
diff --git a/packages/client/src/modules/testModule/containers/TestModule.spec.js b/packages/client/src/modules/testModule/containers/TestModule.spec.js
new file mode 100644
index 0000000000..29151d7dcc
--- /dev/null
+++ b/packages/client/src/modules/testModule/containers/TestModule.spec.js
@@ -0,0 +1,17 @@
+import { expect } from 'chai';
+import { step } from 'mocha-steps';
+import Renderer from '../../../testHelpers/Renderer';
+import Routes from '../../../app/Routes';
+
+describe('TestModule UI works', () => {
+  const renderer = new Renderer({});
+  let app;
+  let content;
+
+  step('TestModule page renders on mount', () => {
+    app = renderer.mount(Routes);
+    renderer.history.push('/testModule');
+    content = app.find('#content');
+    expect(content).to.not.be.empty;
+  });
+});
diff --git a/packages/client/src/modules/testModule/containers/TestModuleEdit.jsx b/packages/client/src/modules/testModule/containers/TestModuleEdit.jsx
new file mode 100644
index 0000000000..e5d8c8eee9
--- /dev/null
+++ b/packages/client/src/modules/testModule/containers/TestModuleEdit.jsx
@@ -0,0 +1,118 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { graphql, compose } from 'react-apollo';
+import { connect } from 'react-redux';
+
+import { EditView } from '../../common/components/crud';
+import { pickInputFields } from '../../common/util';
+import { TestModuleSchema } from '../../../../../server/src/modules/testModule/schema';
+import TESTMODULE_QUERY from '../graphql/TestModuleQuery.graphql';
+import CREATE_TESTMODULE from '../graphql/CreateTestModule.graphql';
+import UPDATE_TESTMODULE from '../graphql/UpdateTestModule.graphql';
+
+class TestModuleEdit extends React.Component {
+  static propTypes = {
+    data: PropTypes.object,
+    createEntry: PropTypes.func.isRequired,
+    updateEntry: PropTypes.func.isRequired,
+    title: PropTypes.string.isRequired
+  };
+
+  onSubmit = async values => {
+    const { data: { node }, createEntry, updateEntry, title } = this.props;
+    let result = null;
+    const insertValues = pickInputFields(TestModuleSchema, values, node);
+
+    if (node) {
+      result = await updateEntry(insertValues, { id: node.id });
+    } else {
+      result = await createEntry(insertValues);
+    }
+
+    if (result && result.errors) {
+      let submitError = {
+        _error: `Edit ${title} failed!`
+      };
+      result.errors.map(error => (submitError[error.field] = error.message));
+      throw new submitError();
+    }
+  };
+
+  render() {
+    return <EditView {...this.props} onSubmit={this.onSubmit} schema={TestModuleSchema} />;
+  }
+}
+
+const TestModuleEditWithApollo = compose(
+  graphql(TESTMODULE_QUERY, {
+    options: props => {
+      let id = 0;
+      if (props.match) {
+        id = props.match.params.id;
+      } else if (props.navigation) {
+        id = props.navigation.state.params.id;
+      }
+
+      return {
+        fetchPolicy: 'cache-and-network',
+        variables: { where: { id } }
+      };
+    },
+    props({ data: { loading, testModule } }) {
+      return { loading, data: testModule };
+    }
+  }),
+  graphql(CREATE_TESTMODULE, {
+    props: ({ ownProps: { history, navigation }, mutate }) => ({
+      createEntry: async data => {
+        try {
+          const { data: { createTestModule } } = await mutate({
+            variables: { data }
+          });
+
+          if (createTestModule.errors) {
+            return { errors: createTestModule.errors };
+          }
+
+          if (history) {
+            return history.push('/testModule');
+          }
+          if (navigation) {
+            return navigation.goBack();
+          }
+        } catch (e) {
+          console.log(e.graphQLErrors);
+        }
+      }
+    })
+  }),
+  graphql(UPDATE_TESTMODULE, {
+    props: ({ ownProps: { history, navigation }, mutate }) => ({
+      updateEntry: async (data, where) => {
+        try {
+          const { data: { updateTestModule } } = await mutate({
+            variables: { data, where }
+          });
+
+          if (updateTestModule.errors) {
+            return { errors: updateTestModule.errors };
+          }
+
+          if (history) {
+            return history.push('/testModule');
+          }
+          if (navigation) {
+            return navigation.goBack();
+          }
+        } catch (e) {
+          console.log(e.graphQLErrors);
+        }
+      }
+    })
+  })
+)(TestModuleEdit);
+
+export default connect(state => ({
+  title: state.testModule.title,
+  link: state.testModule.link
+}))(TestModuleEditWithApollo);
diff --git a/packages/client/src/modules/testModule/containers/TestModuleFilter.jsx b/packages/client/src/modules/testModule/containers/TestModuleFilter.jsx
new file mode 100644
index 0000000000..24a06b419b
--- /dev/null
+++ b/packages/client/src/modules/testModule/containers/TestModuleFilter.jsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import { connect } from 'react-redux';
+
+import { FilterView } from '../../common/components/crud';
+
+class TestModuleFilter extends React.PureComponent {
+  render() {
+    return <FilterView {...this.props} />;
+  }
+}
+
+export default connect(
+  state => ({
+    searchText: state.testModule.searchText
+  }),
+  dispatch => ({
+    onSearchTextChange(searchText) {
+      dispatch({
+        type: 'TESTMODULE_FILTER_SEARCH_TEXT',
+        value: searchText
+      });
+    }
+  })
+)(TestModuleFilter);
diff --git a/packages/client/src/modules/testModule/containers/TestModuleList.jsx b/packages/client/src/modules/testModule/containers/TestModuleList.jsx
new file mode 100644
index 0000000000..d69a492379
--- /dev/null
+++ b/packages/client/src/modules/testModule/containers/TestModuleList.jsx
@@ -0,0 +1,176 @@
+import React from 'react';
+import { graphql, compose } from 'react-apollo';
+import { connect } from 'react-redux';
+
+import { ListView } from '../../common/components/crud';
+import { TestModuleSchema } from '../../../../../server/src/modules/testModule/schema';
+import TESTMODULES_QUERY from '../graphql/TestModulesQuery.graphql';
+import UPDATE_TESTMODULE from '../graphql/UpdateTestModule.graphql';
+import DELETE_TESTMODULE from '../graphql/DeleteTestModule.graphql';
+import SORT_TESTMODULES from '../graphql/SortTestModules.graphql';
+import DELETEMANY_TESTMODULES from '../graphql/DeleteManyTestModules.graphql';
+import UPDATEMANY_TESTMODULES from '../graphql/UpdateManyTestModules.graphql';
+
+class TestModule extends React.Component {
+  customTableColumns = {};
+
+  render() {
+    return <ListView {...this.props} customTableColumns={this.customTableColumns} schema={TestModuleSchema} />;
+  }
+}
+
+const TestModuleWithApollo = compose(
+  graphql(TESTMODULES_QUERY, {
+    options: ({ limit, orderBy, searchText }) => {
+      return {
+        fetchPolicy: 'cache-and-network',
+        variables: {
+          limit: limit,
+          orderBy: orderBy,
+          filter: { searchText }
+        }
+      };
+    },
+    props: ({ data: { loading, testModulesConnection, refetch, error, fetchMore } }) => {
+      const loadMoreRows = () => {
+        return fetchMore({
+          variables: {
+            offset: testModulesConnection.edges.length
+          },
+          updateQuery: (previousResult, { fetchMoreResult }) => {
+            const newEdges = fetchMoreResult.testModulesConnection.edges;
+            const pageInfo = fetchMoreResult.testModulesConnection.pageInfo;
+
+            return {
+              testModulesConnection: {
+                edges: [...previousResult.testModulesConnection.edges, ...newEdges],
+                pageInfo,
+                __typename: 'TestModulesConnection'
+              }
+            };
+          }
+        });
+      };
+      if (error) throw new Error(error);
+      return {
+        loading,
+        data: testModulesConnection,
+        loadMoreRows,
+        refetch,
+        errors: error ? error.graphQLErrors : null
+      };
+    }
+  }),
+  graphql(UPDATE_TESTMODULE, {
+    props: ({ ownProps: { refetch }, mutate }) => ({
+      updateEntry: async (data, where) => {
+        try {
+          const { data: { updateTestModule } } = await mutate({
+            variables: { data, where }
+          });
+
+          if (updateTestModule.errors) {
+            return { errors: updateTestModule.errors };
+          }
+
+          refetch();
+        } catch (e) {
+          console.log(e.graphQLErrors);
+        }
+      }
+    })
+  }),
+  graphql(DELETE_TESTMODULE, {
+    props: ({ ownProps: { refetch }, mutate }) => ({
+      deleteEntry: async where => {
+        try {
+          const { data: { deleteTestModule } } = await mutate({
+            variables: { where }
+          });
+
+          if (deleteTestModule.errors) {
+            return { errors: deleteTestModule.errors };
+          }
+
+          refetch();
+        } catch (e) {
+          console.log(e.graphQLErrors);
+        }
+      }
+    })
+  }),
+  graphql(SORT_TESTMODULES, {
+    props: ({ ownProps: { refetch }, mutate }) => ({
+      sortEntries: async data => {
+        try {
+          const { data: { sortTestModules } } = await mutate({
+            variables: { data }
+          });
+
+          if (sortTestModules.errors) {
+            return { errors: sortTestModules.errors };
+          }
+
+          refetch();
+        } catch (e) {
+          console.log(e.graphQLErrors);
+        }
+      }
+    })
+  }),
+  graphql(DELETEMANY_TESTMODULES, {
+    props: ({ ownProps: { refetch }, mutate }) => ({
+      deleteManyEntries: async where => {
+        try {
+          const { data: { deleteManyTestModules } } = await mutate({
+            variables: { where }
+          });
+
+          if (deleteManyTestModules.errors) {
+            return { errors: deleteManyTestModules.errors };
+          }
+
+          refetch();
+        } catch (e) {
+          console.log(e.graphQLErrors);
+        }
+      }
+    })
+  }),
+  graphql(UPDATEMANY_TESTMODULES, {
+    props: ({ ownProps: { refetch }, mutate }) => ({
+      updateManyEntries: async (data, where) => {
+        try {
+          const { data: { updateManyTestModules } } = await mutate({
+            variables: { data, where }
+          });
+
+          if (updateManyTestModules.errors) {
+            return { errors: updateManyTestModules.errors };
+          }
+
+          refetch();
+        } catch (e) {
+          console.log(e.graphQLErrors);
+        }
+      }
+    })
+  })
+)(TestModule);
+
+export default connect(
+  state => ({
+    link: state.testModule.link,
+    limit: state.testModule.limit,
+    searchText: state.testModule.searchText,
+    orderBy: state.testModule.orderBy
+  }),
+  dispatch => ({
+    onOrderBy(orderBy) {
+      dispatch({
+        type: 'TESTMODULE_ORDER_BY',
+        value: orderBy
+      });
+    }
+  })
+)(TestModuleWithApollo);
diff --git a/packages/client/src/modules/testModule/graphql/CreateTestModule.graphql b/packages/client/src/modules/testModule/graphql/CreateTestModule.graphql
new file mode 100644
index 0000000000..6fd6e50ca6
--- /dev/null
+++ b/packages/client/src/modules/testModule/graphql/CreateTestModule.graphql
@@ -0,0 +1,13 @@
+#import "./TestModule.graphql"
+
+mutation createTestModule($data: TestModuleCreateInput!) {
+  createTestModule(data: $data) {
+    node {
+      ...TestModuleInfo
+    }
+    errors {
+      field
+      message
+    }
+  }
+}
diff --git a/packages/client/src/modules/testModule/graphql/DeleteManyTestModules.graphql b/packages/client/src/modules/testModule/graphql/DeleteManyTestModules.graphql
new file mode 100644
index 0000000000..9568dcd909
--- /dev/null
+++ b/packages/client/src/modules/testModule/graphql/DeleteManyTestModules.graphql
@@ -0,0 +1,9 @@
+mutation deleteManyTestModules($where: TestModuleWhereInput!) {
+  deleteManyTestModules(where: $where) {
+    count
+    errors {
+      field
+      message
+    }
+  }
+}
diff --git a/packages/client/src/modules/testModule/graphql/DeleteTestModule.graphql b/packages/client/src/modules/testModule/graphql/DeleteTestModule.graphql
new file mode 100644
index 0000000000..ad6fa58389
--- /dev/null
+++ b/packages/client/src/modules/testModule/graphql/DeleteTestModule.graphql
@@ -0,0 +1,11 @@
+mutation deleteTestModule($where: TestModuleWhereUniqueInput!) {
+  deleteTestModule(where: $where) {
+    node {
+      id
+    }
+    errors {
+      field
+      message
+    }
+  }
+}
diff --git a/packages/client/src/modules/testModule/graphql/SortTestModules.graphql b/packages/client/src/modules/testModule/graphql/SortTestModules.graphql
new file mode 100644
index 0000000000..187c2c9f6a
--- /dev/null
+++ b/packages/client/src/modules/testModule/graphql/SortTestModules.graphql
@@ -0,0 +1,9 @@
+mutation sortTestModules($data: [Int!]) {
+  sortTestModules(data: $data) {
+    count
+    errors {
+      field
+      message
+    }
+  }
+}
diff --git a/packages/client/src/modules/testModule/graphql/TestModule.graphql b/packages/client/src/modules/testModule/graphql/TestModule.graphql
new file mode 100644
index 0000000000..fea813e080
--- /dev/null
+++ b/packages/client/src/modules/testModule/graphql/TestModule.graphql
@@ -0,0 +1,4 @@
+fragment TestModuleInfo on TestModule {
+  id
+  name
+}
diff --git a/packages/client/src/modules/testModule/graphql/TestModuleQuery.graphql b/packages/client/src/modules/testModule/graphql/TestModuleQuery.graphql
new file mode 100644
index 0000000000..c562c528c8
--- /dev/null
+++ b/packages/client/src/modules/testModule/graphql/TestModuleQuery.graphql
@@ -0,0 +1,11 @@
+#import "./TestModule.graphql"
+
+query testModule($where: TestModuleWhereUniqueInput!) {
+  testModule(where: $where) {
+    node {
+      ...TestModuleInfo
+    }
+    ### form data
+    ### end form data
+  }
+}
diff --git a/packages/client/src/modules/testModule/graphql/TestModulesQuery.graphql b/packages/client/src/modules/testModule/graphql/TestModulesQuery.graphql
new file mode 100644
index 0000000000..a608862ca6
--- /dev/null
+++ b/packages/client/src/modules/testModule/graphql/TestModulesQuery.graphql
@@ -0,0 +1,23 @@
+#import "./TestModule.graphql"
+
+query testModulesConnection(
+  $limit: Int
+  $offset: Int
+  $orderBy: OrderByInput
+  $filter: TestModuleFilterInput
+) {
+  testModulesConnection(
+    limit: $limit
+    offset: $offset
+    orderBy: $orderBy
+    filter: $filter
+  ) {
+    pageInfo {
+      totalCount
+      hasNextPage
+    }
+    edges {
+      ...TestModuleInfo
+    }
+  }
+}
diff --git a/packages/client/src/modules/testModule/graphql/UpdateManyTestModules.graphql b/packages/client/src/modules/testModule/graphql/UpdateManyTestModules.graphql
new file mode 100644
index 0000000000..3601186752
--- /dev/null
+++ b/packages/client/src/modules/testModule/graphql/UpdateManyTestModules.graphql
@@ -0,0 +1,12 @@
+mutation updateManyTestModules(
+  $data: TestModuleUpdateInput!
+  $where: TestModuleWhereInput!
+) {
+  updateManyTestModules(data: $data, where: $where) {
+    count
+    errors {
+      field
+      message
+    }
+  }
+}
diff --git a/packages/client/src/modules/testModule/graphql/UpdateTestModule.graphql b/packages/client/src/modules/testModule/graphql/UpdateTestModule.graphql
new file mode 100644
index 0000000000..e7a7afd51e
--- /dev/null
+++ b/packages/client/src/modules/testModule/graphql/UpdateTestModule.graphql
@@ -0,0 +1,16 @@
+#import "./TestModule.graphql"
+
+mutation updateTestModule(
+  $data: TestModuleUpdateInput!
+  $where: TestModuleWhereUniqueInput!
+) {
+  updateTestModule(data: $data, where: $where) {
+    node {
+      ...TestModuleInfo
+    }
+    errors {
+      field
+      message
+    }
+  }
+}
diff --git a/packages/client/src/modules/testModule/index.jsx b/packages/client/src/modules/testModule/index.jsx
new file mode 100644
index 0000000000..cd8bffac12
--- /dev/null
+++ b/packages/client/src/modules/testModule/index.jsx
@@ -0,0 +1,58 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Button } from 'react-native';
+import { StackNavigator } from 'react-navigation';
+import { Ionicons } from '@expo/vector-icons';
+import { createTabBarIconWrapper } from '../common/components/native';
+import TestModuleList from './containers/TestModuleList';
+import TestModuleEdit from './containers/TestModuleEdit';
+import reducers from './reducers';
+
+import Feature from '../connector';
+
+class TestModuleListScreen extends React.Component {
+  static navigationOptions = ({ navigation }) => ({
+    title: 'TestModule list',
+    headerRight: <Button title="Add" onPress={() => navigation.navigate('TestModuleEdit', { id: 0 })} />
+  });
+  render() {
+    return <TestModuleList navigation={this.props.navigation} />;
+  }
+}
+
+TestModuleListScreen.propTypes = {
+  navigation: PropTypes.object
+};
+
+class TestModuleEditScreen extends React.Component {
+  static navigationOptions = ({ navigation }) => ({
+    title: `${navigation.state.params.id === 0 ? 'Create' : 'Edit'} Test Module`
+  });
+  render() {
+    return <TestModuleEdit navigation={this.props.navigation} />;
+  }
+}
+
+TestModuleEditScreen.propTypes = {
+  navigation: PropTypes.object
+};
+
+const TestModuleNavigator = StackNavigator({
+  TestModuleList: { screen: TestModuleListScreen },
+  TestModuleEdit: { screen: TestModuleEditScreen }
+});
+
+export default new Feature({
+  tabItem: {
+    TestModule: {
+      screen: TestModuleNavigator,
+      navigationOptions: {
+        tabBarIcon: createTabBarIconWrapper(Ionicons, {
+          name: 'ios-browsers-outline',
+          size: 30
+        })
+      }
+    }
+  },
+  reducer: { testModule: reducers }
+});
diff --git a/packages/client/src/modules/testModule/index.web.jsx b/packages/client/src/modules/testModule/index.web.jsx
new file mode 100644
index 0000000000..8c5068c3ab
--- /dev/null
+++ b/packages/client/src/modules/testModule/index.web.jsx
@@ -0,0 +1,23 @@
+import React from 'react';
+import { Route, NavLink } from 'react-router-dom';
+import { MenuItem } from '../../modules/common/components/web';
+import TestModule from './components/TestModule';
+import TestModuleEdit from './containers/TestModuleEdit';
+import reducers from './reducers';
+
+import Feature from '../connector';
+
+export default new Feature({
+  route: [
+    <Route exact path="/testModule" component={TestModule} />,
+    <Route exact path="/testModule/:id" component={TestModuleEdit} />
+  ],
+  navItem: (
+    <MenuItem key="/testModule">
+      <NavLink to="/testModule" className="nav-link" activeClassName="active">
+        Test Module
+      </NavLink>
+    </MenuItem>
+  ),
+  reducer: { testModule: reducers }
+});
diff --git a/packages/client/src/modules/testModule/reducers/index.js b/packages/client/src/modules/testModule/reducers/index.js
new file mode 100644
index 0000000000..c4fea80e17
--- /dev/null
+++ b/packages/client/src/modules/testModule/reducers/index.js
@@ -0,0 +1,33 @@
+const defaultState = {
+  title: 'Test Module',
+  link: 'testModule',
+  nativeLink: 'TestModuleEdit',
+  limit: 50,
+  searchText: '',
+  orderBy: {}
+};
+
+export default function(state = defaultState, action) {
+  switch (action.type) {
+    case 'TESTMODULE_LIMIT':
+      return {
+        ...state,
+        limit: action.value
+      };
+
+    case 'TESTMODULE_FILTER_SEARCH_TEXT':
+      return {
+        ...state,
+        searchText: action.value
+      };
+
+    case 'TESTMODULE_ORDER_BY':
+      return {
+        ...state,
+        orderBy: action.value
+      };
+
+    default:
+      return state;
+  }
+}
diff --git a/packages/client/src/modules/user/components/ResetPasswordForm.web.jsx b/packages/client/src/modules/user/components/ResetPasswordForm.web.jsx
index fd0139c378..8681929786 100644
--- a/packages/client/src/modules/user/components/ResetPasswordForm.web.jsx
+++ b/packages/client/src/modules/user/components/ResetPasswordForm.web.jsx
@@ -12,9 +12,9 @@ const contactFormSchema = {
 
 const validate = values => validateForm(values, contactFormSchema);
 
-const ResetPasswordForm = ({ handleChange, values, handleSubmit, submitting, onSubmit, error }) => {
+const ResetPasswordForm = ({ handleChange, values, handleSubmit, submitting, error }) => {
   return (
-    <Form name="resetPassword" onSubmit={handleSubmit(onSubmit)}>
+    <Form name="resetPassword" onSubmit={handleSubmit}>
       <Field
         name="password"
         component={RenderField}
diff --git a/packages/client/src/utils/FieldArrayAdapter.jsx b/packages/client/src/utils/FieldArrayAdapter.jsx
new file mode 100644
index 0000000000..3faf485722
--- /dev/null
+++ b/packages/client/src/utils/FieldArrayAdapter.jsx
@@ -0,0 +1,27 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+
+export default class FieldArrayAdapter extends Component {
+  static contextTypes = {
+    formik: PropTypes.object
+  };
+
+  static propTypes = {
+    component: PropTypes.func
+  };
+
+  constructor(props, context) {
+    super(props, context);
+    if (!context.formik) {
+      throw new Error('FieldArray must be inside a component decorated with formik()');
+    }
+  }
+
+  render() {
+    const { component } = this.props;
+
+    return React.createElement(component, {
+      ...this.props
+    });
+  }
+}
diff --git a/packages/common/createReduxStore.js b/packages/common/createReduxStore.js
index aff6840be1..1350a9f183 100644
--- a/packages/common/createReduxStore.js
+++ b/packages/common/createReduxStore.js
@@ -1,13 +1,11 @@
 import { createStore, combineReducers, applyMiddleware } from 'redux';
 import { routerReducer } from 'react-router-redux';
-import { reducer as formReducer } from 'redux-form';
 import { composeWithDevTools } from 'redux-devtools-extension/developmentOnly';
 
 import modules from '../client/src/modules';
 
 export const storeReducer = combineReducers({
   router: routerReducer,
-  form: formReducer,
   ...modules.reducers
 });
 
diff --git a/packages/mobile/src/App.js b/packages/mobile/src/App.js
index 021f1d2f32..13a3deae6e 100644
--- a/packages/mobile/src/App.js
+++ b/packages/mobile/src/App.js
@@ -4,7 +4,6 @@ import { getOperationAST } from 'graphql';
 import { ApolloProvider } from 'react-apollo';
 import { createStore, combineReducers } from 'redux';
 import { Provider } from 'react-redux';
-import { reducer as formReducer } from 'redux-form';
 import { createApolloFetch } from 'apollo-fetch';
 import { BatchHttpLink } from 'apollo-link-batch-http';
 import { ApolloLink } from 'apollo-link';
@@ -22,8 +21,6 @@ import settings from '../../../settings';
 
 const store = createStore(
   combineReducers({
-    form: formReducer,
-
     ...modules.reducers
   }),
   {} // initial state
diff --git a/packages/server/src/database/migrations/1518617189615_TestModule.js b/packages/server/src/database/migrations/1518617189615_TestModule.js
new file mode 100644
index 0000000000..1c04fdd3da
--- /dev/null
+++ b/packages/server/src/database/migrations/1518617189615_TestModule.js
@@ -0,0 +1,7 @@
+import KnexGenerator from 'domain-knex';
+
+import { TestModuleSchema } from '../../modules/testModule/schema';
+
+exports.up = knex => new KnexGenerator(knex).createTables(TestModuleSchema);
+
+exports.down = knex => new KnexGenerator(knex).dropTables(TestModuleSchema);
diff --git a/packages/server/src/database/seeds/1518617189615_TestModule.js b/packages/server/src/database/seeds/1518617189615_TestModule.js
new file mode 100644
index 0000000000..501190c257
--- /dev/null
+++ b/packages/server/src/database/seeds/1518617189615_TestModule.js
@@ -0,0 +1,9 @@
+import { truncateTables } from '../../sql/helpers';
+
+export async function seed(knex, Promise) {
+  await truncateTables(knex, Promise, ['test_module']);
+
+  await knex('test_module')
+    .returning('id')
+    .insert({ name: 'test' });
+}
diff --git a/packages/server/src/modules/index.js b/packages/server/src/modules/index.js
index 1b43893685..0f62851248 100644
--- a/packages/server/src/modules/index.js
+++ b/packages/server/src/modules/index.js
@@ -1,3 +1,4 @@
+import testModule from './testModule';
 import counter from './counter';
 import post from './post';
 import upload from './upload';
@@ -11,4 +12,15 @@ import './debug';
 
 import Feature from './connector';
 
-export default new Feature(counter, post, upload, user, subscription, contact, mailer, graphqlTypes, apolloEngine);
+export default new Feature(
+  testModule,
+  counter,
+  post,
+  upload,
+  user,
+  subscription,
+  contact,
+  mailer,
+  graphqlTypes,
+  apolloEngine
+);
diff --git a/packages/server/src/modules/testModule/TestModule.spec.js b/packages/server/src/modules/testModule/TestModule.spec.js
new file mode 100644
index 0000000000..377749b6eb
--- /dev/null
+++ b/packages/server/src/modules/testModule/TestModule.spec.js
@@ -0,0 +1,23 @@
+/*eslint-disable no-unused-vars*/
+import chai from 'chai';
+import { step } from 'mocha-steps';
+import { getServer, getApollo } from '../../testHelpers/integrationSetup';
+
+describe('TestModule API works', () => {
+  let server, apollo;
+
+  before(() => {
+    server = getServer();
+    apollo = getApollo();
+  });
+
+  step('Has GraphiQL endpoint', () => {
+    return chai
+      .request(server)
+      .get('/graphiql')
+      .end((err, res) => {
+        res.status.should.be(200);
+        res.body.should.be('{}');
+      });
+  });
+});
diff --git a/packages/server/src/modules/testModule/index.js b/packages/server/src/modules/testModule/index.js
new file mode 100644
index 0000000000..fc23683714
--- /dev/null
+++ b/packages/server/src/modules/testModule/index.js
@@ -0,0 +1,10 @@
+import TestModule from './sql';
+import schema from './schema.graphql';
+import createResolvers from './resolvers';
+import Feature from '../connector';
+
+export default new Feature({
+  schema: schema,
+  createResolversFunc: createResolvers,
+  createContextFunc: () => ({ TestModule: new TestModule() })
+});
diff --git a/packages/server/src/modules/testModule/resolvers.js b/packages/server/src/modules/testModule/resolvers.js
new file mode 100644
index 0000000000..6972e5793b
--- /dev/null
+++ b/packages/server/src/modules/testModule/resolvers.js
@@ -0,0 +1,44 @@
+// eslint-disable-next-line no-unused-vars
+import { createBatchResolver } from 'graphql-resolve-batch';
+
+// eslint-disable-next-line no-unused-vars
+export default pubsub => ({
+  Query: {
+    testModules: (parent, args, ctx, info) => {
+      return ctx.TestModule.getList(args, info);
+    },
+    testModulesConnection: (parent, args, ctx, info) => {
+      return ctx.TestModule.getPaginated(args, info);
+    },
+    testModule: (parent, args, ctx, info) => {
+      return ctx.TestModule.get(args, info);
+    }
+  },
+  TestModuleData: {
+    // related data
+    // end related data
+  },
+  // schema batch resolvers
+  // end schema batch resolvers
+  Mutation: {
+    createTestModule: (parent, args, ctx, info) => {
+      return ctx.TestModule.create(args, ctx, info);
+    },
+    updateTestModule: (parent, args, ctx, info) => {
+      return ctx.TestModule.update(args, ctx, info);
+    },
+    deleteTestModule: (parent, args, ctx, info) => {
+      return ctx.TestModule.delete(args, info);
+    },
+    sortTestModules: (parent, args, ctx) => {
+      return ctx.TestModule.sort(args);
+    },
+    updateManyTestModules: (parent, args, ctx) => {
+      return ctx.TestModule.updateMany(args);
+    },
+    deleteManyTestModules: (parent, args, ctx) => {
+      return ctx.TestModule.deleteMany(args);
+    }
+  },
+  Subscription: {}
+});
diff --git a/packages/server/src/modules/testModule/schema.graphql b/packages/server/src/modules/testModule/schema.graphql
new file mode 100644
index 0000000000..224293d324
--- /dev/null
+++ b/packages/server/src/modules/testModule/schema.graphql
@@ -0,0 +1,72 @@
+### schema type definitions
+type TestModule {
+  id: Int!
+  name: String!
+}
+
+### end schema type definitions
+
+type TestModuleConnection {
+  pageInfo: PageInfo
+  edges: [TestModule]
+}
+
+type TestModuleData {
+  node: TestModule
+}
+
+type TestModulePayload {
+  node: TestModule
+  errors: [FieldError!]
+}
+
+input TestModuleFilterInput {
+  searchText: String
+}
+
+input TestModuleCreateInput {
+  name: String!
+}
+
+input TestModuleUpdateInput {
+  name: String!
+}
+
+input TestModuleWhereUniqueInput {
+  id: Int!
+}
+
+input TestModuleWhereInput {
+  id_in: [Int!]
+}
+
+extend type Query {
+  testModules(
+    limit: Int
+    offset: Int
+    orderBy: OrderByInput
+    filter: TestModuleFilterInput
+  ): [TestModule]
+  testModulesConnection(
+    limit: Int
+    offset: Int
+    orderBy: OrderByInput
+    filter: TestModuleFilterInput
+  ): TestModuleConnection!
+  testModule(where: TestModuleWhereUniqueInput!): TestModuleData
+}
+
+extend type Mutation {
+  createTestModule(data: TestModuleCreateInput!): TestModulePayload!
+  updateTestModule(
+    data: TestModuleUpdateInput!
+    where: TestModuleWhereUniqueInput!
+  ): TestModulePayload!
+  deleteTestModule(where: TestModuleWhereUniqueInput!): TestModulePayload!
+  sortTestModules(data: [Int!]): BatchPayload!
+  updateManyTestModules(
+    data: TestModuleUpdateInput!
+    where: TestModuleWhereInput!
+  ): BatchPayload!
+  deleteManyTestModules(where: TestModuleWhereInput!): BatchPayload!
+}
diff --git a/packages/server/src/modules/testModule/schema.js b/packages/server/src/modules/testModule/schema.js
new file mode 100644
index 0000000000..84dbfde72e
--- /dev/null
+++ b/packages/server/src/modules/testModule/schema.js
@@ -0,0 +1,12 @@
+import DomainSchema, { Schema } from 'domain-schema';
+
+export class TestModule extends Schema {
+  __ = { name: 'TestModule', tablePrefix: '' };
+  id = DomainSchema.Int;
+  name = {
+    type: String,
+    searchText: true
+  };
+}
+
+export const TestModuleSchema = new DomainSchema(TestModule);
diff --git a/packages/server/src/modules/testModule/sql.js b/packages/server/src/modules/testModule/sql.js
new file mode 100644
index 0000000000..18edc2abcd
--- /dev/null
+++ b/packages/server/src/modules/testModule/sql.js
@@ -0,0 +1,9 @@
+import { TestModuleSchema } from './schema';
+import Crud from '../../sql/crud';
+
+export default class TestModule extends Crud {
+  constructor() {
+    super();
+    this.schema = TestModuleSchema;
+  }
+}
diff --git a/tools/templates/crud/client/containers/ModuleEdit.jsx b/tools/templates/crud/client/containers/ModuleEdit.jsx
index 001bd70b8b..103324aefa 100644
--- a/tools/templates/crud/client/containers/ModuleEdit.jsx
+++ b/tools/templates/crud/client/containers/ModuleEdit.jsx
@@ -2,7 +2,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { graphql, compose } from 'react-apollo';
 import { connect } from 'react-redux';
-import { SubmissionError } from 'redux-form';
 
 import { EditView } from '../../common/components/crud';
 import { pickInputFields } from '../../common/util';
@@ -35,7 +34,7 @@ class $Module$Edit extends React.Component {
         _error: `Edit ${title} failed!`
       };
       result.errors.map(error => (submitError[error.field] = error.message));
-      throw new SubmissionError(submitError);
+      throw new submitError;
     }
   };
 

From 699aba66853c61aa8a08010bac5d1f952e9028b6 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 15 Feb 2018 09:02:03 +0100
Subject: [PATCH 094/327] formik refactor wip

---
 .../common/components/crud/EditView.web.jsx   |  2 +-
 .../common/components/crud/FormView.jsx       |  5 ++--
 .../common/components/crud/FormView.web.jsx   |  6 +++--
 .../common/components/crud/ListView.web.jsx   |  5 ++--
 .../web/ui-antd/components/Option.jsx         |  6 ++---
 .../client/src/modules/common/util.web.jsx    | 26 ++++++++++++-------
 6 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/packages/client/src/modules/common/components/crud/EditView.web.jsx b/packages/client/src/modules/common/components/crud/EditView.web.jsx
index f3bc3baeb6..2c9b930639 100644
--- a/packages/client/src/modules/common/components/crud/EditView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/EditView.web.jsx
@@ -49,7 +49,7 @@ class EditView extends React.PureComponent {
           <h2>
             {data ? 'Edit' : 'Create'} {title}
           </h2>
-          <FormView onSubmit={onSubmit} data={data} schema={schema} initialValues={data.node} />
+          <FormView onSubmit={onSubmit} data={data} schema={schema} />
         </PageLayout>
       );
     }
diff --git a/packages/client/src/modules/common/components/crud/FormView.jsx b/packages/client/src/modules/common/components/crud/FormView.jsx
index 2479296ded..0f29e7c970 100644
--- a/packages/client/src/modules/common/components/crud/FormView.jsx
+++ b/packages/client/src/modules/common/components/crud/FormView.jsx
@@ -12,16 +12,17 @@ const formSchema = {
 
 const validate = values => validateForm(values, formSchema);
 
-const Form = ({ handleSubmit, schema }) => {
+const Form = ({ handleChange, handleSubmit, schema }) => {
   return (
     <FormView>
-      {createFormFields(schema)}
+      {createFormFields(handleChange, schema)}
       <FormButton onPress={handleSubmit}>Save</FormButton>
     </FormView>
   );
 };
 
 Form.propTypes = {
+  handleChange: PropTypes.func,
   handleSubmit: PropTypes.func,
   schema: PropTypes.object
 };
diff --git a/packages/client/src/modules/common/components/crud/FormView.web.jsx b/packages/client/src/modules/common/components/crud/FormView.web.jsx
index ebe4d485ab..a19d1f26e4 100644
--- a/packages/client/src/modules/common/components/crud/FormView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/FormView.web.jsx
@@ -36,10 +36,10 @@ const formSchema = {
 
 const validate = values => validateForm(values, formSchema);
 
-const FormView = ({ handleSubmit, data, error, schema }) => {
+const FormView = ({ handleChange, handleSubmit, data, error, schema }) => {
   return (
     <Form name="post" onSubmit={handleSubmit}>
-      {createFormFields(schema, data, formItemLayout)}
+      {createFormFields(handleChange, schema, data, formItemLayout)}
       {error && <Alert color="error">{error}</Alert>}
       <FormItem {...tailFormItemLayout}>
         <Button color="primary" type="submit">
@@ -51,9 +51,11 @@ const FormView = ({ handleSubmit, data, error, schema }) => {
 };
 
 FormView.propTypes = {
+  handleChange: PropTypes.func,
   handleSubmit: PropTypes.func,
   data: PropTypes.object,
   schema: PropTypes.object,
+  values: PropTypes.object,
   error: PropTypes.string
 };
 
diff --git a/packages/client/src/modules/common/components/crud/ListView.web.jsx b/packages/client/src/modules/common/components/crud/ListView.web.jsx
index 9735f1d00b..2ba7ac1593 100644
--- a/packages/client/src/modules/common/components/crud/ListView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/ListView.web.jsx
@@ -109,6 +109,7 @@ class ListView extends React.Component {
     loadMoreRows: PropTypes.func.isRequired,
     schema: PropTypes.object.isRequired,
     link: PropTypes.string.isRequired,
+    handleChange: PropTypes.func,
     handleSubmit: PropTypes.func,
     submitting: PropTypes.bool,
     customTableColumns: PropTypes.object
@@ -211,7 +212,7 @@ class ListView extends React.Component {
   };
 
   render() {
-    const { loading, data, loadMoreRows, schema, link, handleSubmit, customTableColumns } = this.props;
+    const { loading, data, loadMoreRows, schema, link, handleChange, handleSubmit, customTableColumns } = this.props;
     const { selectedRowKeys } = this.state;
     const hasSelected = selectedRowKeys.length > 0;
 
@@ -249,7 +250,7 @@ class ListView extends React.Component {
           </Col>
           <Col span={21}>
             <Form layout="inline" name="post" onSubmit={handleSubmit}>
-              {createFormFields(schema, {}, null, '', true)}
+              {createFormFields(handleChange, schema, {}, null, '', true)}
               {/*error && <Alert color="error">{error}</Alert>*/}
               <FormItem>
                 <Button color="primary" type="submit" disabled={!hasSelected} loading={loading && !data}>
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/Option.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/Option.jsx
index e1fba2b762..b735f5d57b 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/Option.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/Option.jsx
@@ -1,11 +1,11 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import Select from 'antd/lib/select';
+//import Select from 'antd/lib/select';
 
-const ADOption = Select.Option;
+//const ADOption = Select.Option;
 
 const Option = ({ children, ...props }) => {
-  return <ADOption {...props}>{children}</ADOption>;
+  return <option {...props}>{children}</option>;
 };
 
 Option.propTypes = {
diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index 48b019be55..a7edf53c55 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -20,7 +20,6 @@ import {
   Input,
   Icon
 } from './components/web';
-import { required } from '../../../../common/validation';
 
 export const createColumnFields = (
   schema,
@@ -137,12 +136,12 @@ const tailFormItemLayout = {
   }
 };
 
-const RenderEntry = ({ fields, formdata, formItemLayout, schema, meta: { error, submitFailed } }) => (
+const RenderEntry = ({ handleChange, fields, formdata, formItemLayout, schema, meta: { error, submitFailed } }) => (
   <Row>
     <Col span={12} offset={6}>
       {fields.map((field, index) => (
         <div key={index} className="field-array-form">
-          {createFormFields(schema, formdata, formItemLayout, `${field}.`)}
+          {createFormFields(handleChange, schema, formdata, formItemLayout, `${field}.`)}
           <FormItem {...tailFormItemLayout}>
             <Button color="primary" size="sm" onClick={() => fields.remove(index)}>
               Delete
@@ -161,6 +160,7 @@ const RenderEntry = ({ fields, formdata, formItemLayout, schema, meta: { error,
 );
 
 RenderEntry.propTypes = {
+  handleChange: PropTypes.func,
   fields: PropTypes.object,
   formdata: PropTypes.object,
   schema: PropTypes.object,
@@ -168,23 +168,26 @@ RenderEntry.propTypes = {
   formItemLayout: PropTypes.object
 };
 
-export const createFormFields = (schema, formdata, formItemLayout, prefix = '', batch = false) => {
+export const createFormFields = (handleChange, schema, formdata, formItemLayout, prefix = '', batch = false) => {
   let fields = [];
 
   for (const key of schema.keys()) {
     const value = schema.values[key];
+    const type = value.type.constructor === Array ? value.type[0] : value.type;
+
     const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
 
     if (key !== 'id' && value.show !== false && value.type.constructor !== Array) {
-      let validate = [];
-      if (!value.optional && !batch) {
-        validate.push(required);
-      }
+      //let validate = [];
+      //if (!value.optional && !batch) {
+      //  validate.push(required);
+      //}
 
       let component = RenderField;
       let data = null;
+      let value = formdata && formdata.node ? formdata.node[key] : '';
 
-      if (value.type.isSchema) {
+      if (type.isSchema) {
         component = RenderSelect;
         data = formdata[`${key}s`];
       } else if (hasTypeOf(Boolean)) {
@@ -199,10 +202,12 @@ export const createFormFields = (schema, formdata, formItemLayout, prefix = '',
           key={key}
           component={component}
           data={data}
+          value={value}
           type="text"
           label={startCase(key)}
-          validate={validate}
+          //validate={validate}
           formItemLayout={formItemLayout}
+          onChange={handleChange}
         />
       );
     } else {
@@ -215,6 +220,7 @@ export const createFormFields = (schema, formdata, formItemLayout, prefix = '',
             schema={value.type[0]}
             formdata={formdata}
             formItemLayout={formItemLayout}
+            handleChange={handleChange}
           />
         );
       }

From 31b4b1d7c6eba19f59d5f07977daa7a10e1a9dbf Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 16 Feb 2018 14:55:32 +0100
Subject: [PATCH 095/327] make formik work

---
 .../common/components/crud/FormView.web.jsx   | 22 +++++++++-------
 .../common/components/crud/ListView.web.jsx   |  2 +-
 .../web/ui-antd/components/RenderField.jsx    |  1 -
 .../client/src/modules/common/util.web.jsx    | 26 +++++++++++++++++--
 4 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/packages/client/src/modules/common/components/crud/FormView.web.jsx b/packages/client/src/modules/common/components/crud/FormView.web.jsx
index a19d1f26e4..0bb94146a8 100644
--- a/packages/client/src/modules/common/components/crud/FormView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/FormView.web.jsx
@@ -2,9 +2,9 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { withFormik } from 'formik';
 
-import { createFormFields } from '../../util';
+import { createFormFields, mapFormPropsToValues } from '../../util';
 import { Form, FormItem, Button, Alert } from '../web';
-import { minLength, required, validateForm } from '../../../../../../common/validation';
+//import { minLength, required, validateForm } from '../../../../../../common/validation';
 
 const tailFormItemLayout = {
   wrapperCol: {
@@ -30,16 +30,16 @@ const formItemLayout = {
   }
 };
 
-const formSchema = {
-  name: [required, minLength(3)]
-};
+//const formSchema = {
+//  name: [required, minLength(3)]
+//};
 
-const validate = values => validateForm(values, formSchema);
+//const validate = values => validateForm(values, formSchema);
 
-const FormView = ({ handleChange, handleSubmit, data, error, schema }) => {
+const FormView = ({ handleChange, handleSubmit, values, data, error, schema }) => {
   return (
     <Form name="post" onSubmit={handleSubmit}>
-      {createFormFields(handleChange, schema, data, formItemLayout)}
+      {createFormFields(handleChange, schema, values, data, formItemLayout)}
       {error && <Alert color="error">{error}</Alert>}
       <FormItem {...tailFormItemLayout}>
         <Button color="primary" type="submit">
@@ -60,11 +60,13 @@ FormView.propTypes = {
 };
 
 const FormWithFormik = withFormik({
-  async handleSubmit(values, { resetForm, props: { onSubmit } }) {
+  mapPropsToValues: ({ schema, data: { node } }) => mapFormPropsToValues(schema, node),
+  async handleSubmit(values, { resetForm, setSubmitting, props: { onSubmit } }) {
     await onSubmit(values);
     resetForm();
+    setSubmitting(false);
   },
-  validate: values => validate(values),
+  //validate: values => validate(values),
   displayName: 'Form' // helps with React DevTools
 });
 
diff --git a/packages/client/src/modules/common/components/crud/ListView.web.jsx b/packages/client/src/modules/common/components/crud/ListView.web.jsx
index 2ba7ac1593..527146c52e 100644
--- a/packages/client/src/modules/common/components/crud/ListView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/ListView.web.jsx
@@ -250,7 +250,7 @@ class ListView extends React.Component {
           </Col>
           <Col span={21}>
             <Form layout="inline" name="post" onSubmit={handleSubmit}>
-              {createFormFields(handleChange, schema, {}, null, '', true)}
+              {createFormFields(handleChange, schema, {}, {}, null, '', true)}
               {/*error && <Alert color="error">{error}</Alert>*/}
               <FormItem>
                 <Button color="primary" type="submit" disabled={!hasSelected} loading={loading && !data}>
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderField.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderField.jsx
index 0d8e143c81..ae247d7ec3 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderField.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderField.jsx
@@ -8,7 +8,6 @@ const RenderField = ({ input, label, type, formItemLayout, meta: { touched, erro
     validateStatus = 'error';
   }
 
-  console.log(input);
   return (
     <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
       <div>
diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index a7edf53c55..b41ccccc5a 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -168,7 +168,29 @@ RenderEntry.propTypes = {
   formItemLayout: PropTypes.object
 };
 
-export const createFormFields = (handleChange, schema, formdata, formItemLayout, prefix = '', batch = false) => {
+export const mapFormPropsToValues = (schema, formdata) => {
+  let fields = {};
+
+  for (const key of schema.keys()) {
+    const value = schema.values[key];
+
+    if (key !== 'id' && value.show !== false && value.type.constructor !== Array) {
+      fields[key] = formdata[key];
+    }
+  }
+
+  return fields;
+};
+
+export const createFormFields = (
+  handleChange,
+  schema,
+  values = {},
+  formdata,
+  formItemLayout,
+  prefix = '',
+  batch = false
+) => {
   let fields = [];
 
   for (const key of schema.keys()) {
@@ -185,7 +207,7 @@ export const createFormFields = (handleChange, schema, formdata, formItemLayout,
 
       let component = RenderField;
       let data = null;
-      let value = formdata && formdata.node ? formdata.node[key] : '';
+      let value = values ? values[key] : '';
 
       if (type.isSchema) {
         component = RenderSelect;

From 0e8e312ee42ad51a376e1fbc8b74e1ed29788ed6 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 16 Feb 2018 15:14:10 +0100
Subject: [PATCH 096/327] cli crud template small fix

---
 tools/templates/crud/client/containers/ModuleEdit.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/templates/crud/client/containers/ModuleEdit.jsx b/tools/templates/crud/client/containers/ModuleEdit.jsx
index 103324aefa..eddee85e46 100644
--- a/tools/templates/crud/client/containers/ModuleEdit.jsx
+++ b/tools/templates/crud/client/containers/ModuleEdit.jsx
@@ -34,7 +34,7 @@ class $Module$Edit extends React.Component {
         _error: `Edit ${title} failed!`
       };
       result.errors.map(error => (submitError[error.field] = error.message));
-      throw new submitError;
+      throw new submitError();
     }
   };
 

From 855497a6eaa69d944ee5c68a2ea60c65b325c363 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Mon, 19 Feb 2018 09:51:53 +0100
Subject: [PATCH 097/327] fix `Warning: Can only update a mounted or mounting
 component.`, make editInput non required

---
 .../src/modules/common/components/crud/FormView.web.jsx     | 6 ++----
 tools/templates/crud/server/schema.graphql                  | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/client/src/modules/common/components/crud/FormView.web.jsx b/packages/client/src/modules/common/components/crud/FormView.web.jsx
index 0bb94146a8..d876ce8cf1 100644
--- a/packages/client/src/modules/common/components/crud/FormView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/FormView.web.jsx
@@ -61,10 +61,8 @@ FormView.propTypes = {
 
 const FormWithFormik = withFormik({
   mapPropsToValues: ({ schema, data: { node } }) => mapFormPropsToValues(schema, node),
-  async handleSubmit(values, { resetForm, setSubmitting, props: { onSubmit } }) {
-    await onSubmit(values);
-    resetForm();
-    setSubmitting(false);
+  async handleSubmit(values, { setSubmitting, props: { onSubmit } }) {
+    await onSubmit(values, setSubmitting);
   },
   //validate: values => validate(values),
   displayName: 'Form' // helps with React DevTools
diff --git a/tools/templates/crud/server/schema.graphql b/tools/templates/crud/server/schema.graphql
index 201d43e44d..053c74781b 100644
--- a/tools/templates/crud/server/schema.graphql
+++ b/tools/templates/crud/server/schema.graphql
@@ -28,7 +28,7 @@ input $Module$CreateInput {
 }
 
 input $Module$UpdateInput {
-  name: String!
+  name: String
 }
 
 input $Module$WhereUniqueInput {

From 223d74460aeeb67a9869431a614fdb60c48e82e3 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Mon, 19 Feb 2018 13:08:01 +0100
Subject: [PATCH 098/327] update testModule to use `apollo-link-state` instead
 of `redux`

---
 .../common/components/crud/ListView.web.jsx   |  5 +-
 .../client/src/modules/common/util.web.jsx    |  2 +-
 .../testModule/components/TestModule.jsx      |  7 +--
 .../testModule/components/TestModule.web.jsx  | 14 ++---
 .../testModule/containers/TestModuleEdit.jsx  |  8 +--
 .../containers/TestModuleFilter.jsx           | 27 ++++----
 .../testModule/containers/TestModuleList.jsx  | 44 ++++++-------
 .../graphql/TestModuleState.client.graphql    |  9 +++
 .../TestModuleStateQuery.client.graphql       |  7 +++
 .../graphql/UpdateFilter.client.graphql       |  5 ++
 .../graphql/UpdateOrderBy.client.graphql      |  5 ++
 .../client/src/modules/testModule/index.jsx   |  6 +-
 .../src/modules/testModule/index.web.jsx      | 16 +++--
 .../src/modules/testModule/reducers/index.js  | 33 ----------
 .../src/modules/testModule/resolvers/index.js | 63 +++++++++++++++++++
 .../user/graphql/UpdateFilter.client.graphql  |  2 +-
 16 files changed, 152 insertions(+), 101 deletions(-)
 create mode 100644 packages/client/src/modules/testModule/graphql/TestModuleState.client.graphql
 create mode 100644 packages/client/src/modules/testModule/graphql/TestModuleStateQuery.client.graphql
 create mode 100644 packages/client/src/modules/testModule/graphql/UpdateFilter.client.graphql
 create mode 100644 packages/client/src/modules/testModule/graphql/UpdateOrderBy.client.graphql
 delete mode 100644 packages/client/src/modules/testModule/reducers/index.js
 create mode 100644 packages/client/src/modules/testModule/resolvers/index.js

diff --git a/packages/client/src/modules/common/components/crud/ListView.web.jsx b/packages/client/src/modules/common/components/crud/ListView.web.jsx
index 527146c52e..380951d82b 100644
--- a/packages/client/src/modules/common/components/crud/ListView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/ListView.web.jsx
@@ -198,7 +198,10 @@ class ListView extends React.Component {
       if (orderBy.order === 'asc') {
         order = 'desc';
       } else if (orderBy.order === 'desc') {
-        return onOrderBy({});
+        return onOrderBy({
+          column: '',
+          order: ''
+        });
       }
     }
 
diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index b41ccccc5a..866cd9056e 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -175,7 +175,7 @@ export const mapFormPropsToValues = (schema, formdata) => {
     const value = schema.values[key];
 
     if (key !== 'id' && value.show !== false && value.type.constructor !== Array) {
-      fields[key] = formdata[key];
+      fields[key] = formdata ? [key] : '';
     }
   }
 
diff --git a/packages/client/src/modules/testModule/components/TestModule.jsx b/packages/client/src/modules/testModule/components/TestModule.jsx
index 7cec5a09a5..5e6ad07eb1 100644
--- a/packages/client/src/modules/testModule/components/TestModule.jsx
+++ b/packages/client/src/modules/testModule/components/TestModule.jsx
@@ -1,9 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
 import { StyleSheet, Text, View } from 'react-native';
 
-class TestModule extends React.PureComponent {
+export default class TestModule extends React.PureComponent {
   static propTypes = {
     title: PropTypes.string.isRequired
   };
@@ -36,7 +35,3 @@ const styles = StyleSheet.create({
     marginRight: 15
   }
 });
-
-export default connect(state => ({
-  title: state.testModule.title
-}))(TestModule);
diff --git a/packages/client/src/modules/testModule/components/TestModule.web.jsx b/packages/client/src/modules/testModule/components/TestModule.web.jsx
index d6115d82e8..6066d2ee83 100644
--- a/packages/client/src/modules/testModule/components/TestModule.web.jsx
+++ b/packages/client/src/modules/testModule/components/TestModule.web.jsx
@@ -1,6 +1,5 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
 import Helmet from 'react-helmet';
 import { PageLayout } from '../../common/components/web';
 
@@ -8,9 +7,10 @@ import TestModuleFilter from '../containers/TestModuleFilter';
 import TestModuleList from '../containers/TestModuleList';
 import settings from '../../../../../../settings';
 
-class TestModule extends React.PureComponent {
+export default class TestModule extends React.PureComponent {
   static propTypes = {
-    title: PropTypes.string.isRequired
+    title: PropTypes.string.isRequired,
+    link: PropTypes.string.isRequired
   };
 
   renderMetaData = title => (
@@ -26,7 +26,7 @@ class TestModule extends React.PureComponent {
   );
 
   render() {
-    const { title } = this.props;
+    const { title, link } = this.props;
     return (
       <PageLayout>
         {this.renderMetaData(title)}
@@ -34,12 +34,8 @@ class TestModule extends React.PureComponent {
         <hr />
         <TestModuleFilter />
         <hr />
-        <TestModuleList />
+        <TestModuleList link={link} />
       </PageLayout>
     );
   }
 }
-
-export default connect(state => ({
-  title: state.testModule.title
-}))(TestModule);
diff --git a/packages/client/src/modules/testModule/containers/TestModuleEdit.jsx b/packages/client/src/modules/testModule/containers/TestModuleEdit.jsx
index e5d8c8eee9..6cd3223ca4 100644
--- a/packages/client/src/modules/testModule/containers/TestModuleEdit.jsx
+++ b/packages/client/src/modules/testModule/containers/TestModuleEdit.jsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { graphql, compose } from 'react-apollo';
-import { connect } from 'react-redux';
 
 import { EditView } from '../../common/components/crud';
 import { pickInputFields } from '../../common/util';
@@ -43,7 +42,7 @@ class TestModuleEdit extends React.Component {
   }
 }
 
-const TestModuleEditWithApollo = compose(
+export default compose(
   graphql(TESTMODULE_QUERY, {
     options: props => {
       let id = 0;
@@ -111,8 +110,3 @@ const TestModuleEditWithApollo = compose(
     })
   })
 )(TestModuleEdit);
-
-export default connect(state => ({
-  title: state.testModule.title,
-  link: state.testModule.link
-}))(TestModuleEditWithApollo);
diff --git a/packages/client/src/modules/testModule/containers/TestModuleFilter.jsx b/packages/client/src/modules/testModule/containers/TestModuleFilter.jsx
index 24a06b419b..12efbe607a 100644
--- a/packages/client/src/modules/testModule/containers/TestModuleFilter.jsx
+++ b/packages/client/src/modules/testModule/containers/TestModuleFilter.jsx
@@ -1,24 +1,29 @@
 import React from 'react';
-import { connect } from 'react-redux';
+import { graphql, compose } from 'react-apollo';
+import { removeTypename } from '../../../../../common/utils';
 
 import { FilterView } from '../../common/components/crud';
 
+import TESTMODULE_STATE_QUERY from '../graphql/TestModuleStateQuery.client.graphql';
+import UPDATE_FILTER from '../graphql/UpdateFilter.client.graphql';
+
 class TestModuleFilter extends React.PureComponent {
   render() {
     return <FilterView {...this.props} />;
   }
 }
 
-export default connect(
-  state => ({
-    searchText: state.testModule.searchText
-  }),
-  dispatch => ({
-    onSearchTextChange(searchText) {
-      dispatch({
-        type: 'TESTMODULE_FILTER_SEARCH_TEXT',
-        value: searchText
-      });
+export default compose(
+  graphql(TESTMODULE_STATE_QUERY, {
+    props({ data: { testModuleState: { filter } } }) {
+      return removeTypename(filter);
     }
+  }),
+  graphql(UPDATE_FILTER, {
+    props: ({ mutate }) => ({
+      onSearchTextChange(searchText) {
+        mutate({ variables: { filter: { searchText } } });
+      }
+    })
   })
 )(TestModuleFilter);
diff --git a/packages/client/src/modules/testModule/containers/TestModuleList.jsx b/packages/client/src/modules/testModule/containers/TestModuleList.jsx
index d69a492379..df3a363730 100644
--- a/packages/client/src/modules/testModule/containers/TestModuleList.jsx
+++ b/packages/client/src/modules/testModule/containers/TestModuleList.jsx
@@ -1,9 +1,12 @@
 import React from 'react';
 import { graphql, compose } from 'react-apollo';
-import { connect } from 'react-redux';
 
+import { removeTypename } from '../../../../../common/utils';
 import { ListView } from '../../common/components/crud';
 import { TestModuleSchema } from '../../../../../server/src/modules/testModule/schema';
+
+import TESTMODULE_STATE_QUERY from '../graphql/TestModuleStateQuery.client.graphql';
+import UPDATE_ORDER_BY from '../graphql/UpdateOrderBy.client.graphql';
 import TESTMODULES_QUERY from '../graphql/TestModulesQuery.graphql';
 import UPDATE_TESTMODULE from '../graphql/UpdateTestModule.graphql';
 import DELETE_TESTMODULE from '../graphql/DeleteTestModule.graphql';
@@ -19,16 +22,17 @@ class TestModule extends React.Component {
   }
 }
 
-const TestModuleWithApollo = compose(
+export default compose(
+  graphql(TESTMODULE_STATE_QUERY, {
+    props({ data: { testModuleState } }) {
+      return removeTypename(testModuleState);
+    }
+  }),
   graphql(TESTMODULES_QUERY, {
-    options: ({ limit, orderBy, searchText }) => {
+    options: ({ limit, orderBy, filter }) => {
       return {
         fetchPolicy: 'cache-and-network',
-        variables: {
-          limit: limit,
-          orderBy: orderBy,
-          filter: { searchText }
-        }
+        variables: { limit, orderBy, filter }
       };
     },
     props: ({ data: { loading, testModulesConnection, refetch, error, fetchMore } }) => {
@@ -155,22 +159,12 @@ const TestModuleWithApollo = compose(
         }
       }
     })
-  })
-)(TestModule);
-
-export default connect(
-  state => ({
-    link: state.testModule.link,
-    limit: state.testModule.limit,
-    searchText: state.testModule.searchText,
-    orderBy: state.testModule.orderBy
   }),
-  dispatch => ({
-    onOrderBy(orderBy) {
-      dispatch({
-        type: 'TESTMODULE_ORDER_BY',
-        value: orderBy
-      });
-    }
+  graphql(UPDATE_ORDER_BY, {
+    props: ({ mutate }) => ({
+      onOrderBy: orderBy => {
+        mutate({ variables: { orderBy } });
+      }
+    })
   })
-)(TestModuleWithApollo);
+)(TestModule);
diff --git a/packages/client/src/modules/testModule/graphql/TestModuleState.client.graphql b/packages/client/src/modules/testModule/graphql/TestModuleState.client.graphql
new file mode 100644
index 0000000000..7bf1483229
--- /dev/null
+++ b/packages/client/src/modules/testModule/graphql/TestModuleState.client.graphql
@@ -0,0 +1,9 @@
+fragment TestModuleStateInfo on TestModuleState {
+  orderBy {
+    column
+    order
+  }
+  filter {
+    searchText
+  }
+}
diff --git a/packages/client/src/modules/testModule/graphql/TestModuleStateQuery.client.graphql b/packages/client/src/modules/testModule/graphql/TestModuleStateQuery.client.graphql
new file mode 100644
index 0000000000..b2ad586834
--- /dev/null
+++ b/packages/client/src/modules/testModule/graphql/TestModuleStateQuery.client.graphql
@@ -0,0 +1,7 @@
+#import "./TestModuleState.client.graphql"
+
+query TestModuleState {
+  testModuleState @client {
+    ...TestModuleStateInfo
+  }
+}
diff --git a/packages/client/src/modules/testModule/graphql/UpdateFilter.client.graphql b/packages/client/src/modules/testModule/graphql/UpdateFilter.client.graphql
new file mode 100644
index 0000000000..230991e3a7
--- /dev/null
+++ b/packages/client/src/modules/testModule/graphql/UpdateFilter.client.graphql
@@ -0,0 +1,5 @@
+#import "./TestModuleState.client.graphql"
+
+mutation updateTestModuleFilter($filter: FilterTestModuleInput!) {
+  updateTestModuleFilter(filter: $filter) @client
+}
diff --git a/packages/client/src/modules/testModule/graphql/UpdateOrderBy.client.graphql b/packages/client/src/modules/testModule/graphql/UpdateOrderBy.client.graphql
new file mode 100644
index 0000000000..4d6c0f6e21
--- /dev/null
+++ b/packages/client/src/modules/testModule/graphql/UpdateOrderBy.client.graphql
@@ -0,0 +1,5 @@
+#import "./TestModuleState.client.graphql"
+
+mutation updateTestModuleOrderBy($orderBy: OrderByTestModuleInput!) {
+  updateTestModuleOrderBy(orderBy: $orderBy) @client
+}
diff --git a/packages/client/src/modules/testModule/index.jsx b/packages/client/src/modules/testModule/index.jsx
index cd8bffac12..68e70f0c6b 100644
--- a/packages/client/src/modules/testModule/index.jsx
+++ b/packages/client/src/modules/testModule/index.jsx
@@ -6,7 +6,7 @@ import { Ionicons } from '@expo/vector-icons';
 import { createTabBarIconWrapper } from '../common/components/native';
 import TestModuleList from './containers/TestModuleList';
 import TestModuleEdit from './containers/TestModuleEdit';
-import reducers from './reducers';
+import resolvers from './resolvers';
 
 import Feature from '../connector';
 
@@ -16,7 +16,7 @@ class TestModuleListScreen extends React.Component {
     headerRight: <Button title="Add" onPress={() => navigation.navigate('TestModuleEdit', { id: 0 })} />
   });
   render() {
-    return <TestModuleList navigation={this.props.navigation} />;
+    return <TestModuleList navigation={this.props.navigation} title="Test Module" />;
   }
 }
 
@@ -54,5 +54,5 @@ export default new Feature({
       }
     }
   },
-  reducer: { testModule: reducers }
+  resolver: resolvers
 });
diff --git a/packages/client/src/modules/testModule/index.web.jsx b/packages/client/src/modules/testModule/index.web.jsx
index 8c5068c3ab..7460385aab 100644
--- a/packages/client/src/modules/testModule/index.web.jsx
+++ b/packages/client/src/modules/testModule/index.web.jsx
@@ -3,14 +3,22 @@ import { Route, NavLink } from 'react-router-dom';
 import { MenuItem } from '../../modules/common/components/web';
 import TestModule from './components/TestModule';
 import TestModuleEdit from './containers/TestModuleEdit';
-import reducers from './reducers';
+import resolvers from './resolvers';
 
 import Feature from '../connector';
 
 export default new Feature({
   route: [
-    <Route exact path="/testModule" component={TestModule} />,
-    <Route exact path="/testModule/:id" component={TestModuleEdit} />
+    <Route
+      exact
+      path="/testModule"
+      render={props => <TestModule title="Test Module" link="testModule" {...props} />}
+    />,
+    <Route
+      exact
+      path="/testModule/:id"
+      render={props => <TestModuleEdit title="Test Module" link="testModule" {...props} />}
+    />
   ],
   navItem: (
     <MenuItem key="/testModule">
@@ -19,5 +27,5 @@ export default new Feature({
       </NavLink>
     </MenuItem>
   ),
-  reducer: { testModule: reducers }
+  resolver: resolvers
 });
diff --git a/packages/client/src/modules/testModule/reducers/index.js b/packages/client/src/modules/testModule/reducers/index.js
deleted file mode 100644
index c4fea80e17..0000000000
--- a/packages/client/src/modules/testModule/reducers/index.js
+++ /dev/null
@@ -1,33 +0,0 @@
-const defaultState = {
-  title: 'Test Module',
-  link: 'testModule',
-  nativeLink: 'TestModuleEdit',
-  limit: 50,
-  searchText: '',
-  orderBy: {}
-};
-
-export default function(state = defaultState, action) {
-  switch (action.type) {
-    case 'TESTMODULE_LIMIT':
-      return {
-        ...state,
-        limit: action.value
-      };
-
-    case 'TESTMODULE_FILTER_SEARCH_TEXT':
-      return {
-        ...state,
-        searchText: action.value
-      };
-
-    case 'TESTMODULE_ORDER_BY':
-      return {
-        ...state,
-        orderBy: action.value
-      };
-
-    default:
-      return state;
-  }
-}
diff --git a/packages/client/src/modules/testModule/resolvers/index.js b/packages/client/src/modules/testModule/resolvers/index.js
new file mode 100644
index 0000000000..55dbae5993
--- /dev/null
+++ b/packages/client/src/modules/testModule/resolvers/index.js
@@ -0,0 +1,63 @@
+import update from 'immutability-helper';
+
+import TESTMODULE_STATE_QUERY from '../graphql/TestModuleStateQuery.client.graphql';
+
+const TYPE_TESTMODULE_STATE = 'TestModuleState';
+const TYPE_TESTMODULE_STATE_FILTER = 'FilterTestModuleInput';
+const TYPE_TESTMODULE_STATE_ORDER_BY = 'OrderByTestModuleInput';
+
+const defaults = {
+  testModuleState: {
+    orderBy: {
+      column: '',
+      order: '',
+      __typename: TYPE_TESTMODULE_STATE_ORDER_BY
+    },
+    filter: {
+      searchText: '',
+      __typename: TYPE_TESTMODULE_STATE_FILTER
+    },
+    __typename: TYPE_TESTMODULE_STATE
+  }
+};
+
+const resolvers = {
+  Mutation: {
+    updateTestModuleOrderBy: (_, { orderBy }, { cache }) => {
+      const { testModuleState } = cache.readQuery({ query: TESTMODULE_STATE_QUERY });
+
+      const newTestModuleState = update(testModuleState, {
+        orderBy: { $merge: orderBy }
+      });
+
+      cache.writeData({
+        data: {
+          testModuleState: newTestModuleState,
+          __type: TYPE_TESTMODULE_STATE
+        }
+      });
+
+      return null;
+    },
+    updateTestModuleFilter: (_, { filter }, { cache }) => {
+      const { testModuleState } = cache.readQuery({ query: TESTMODULE_STATE_QUERY });
+      const newTestModuleState = update(testModuleState, {
+        filter: { $merge: filter }
+      });
+
+      cache.writeData({
+        data: {
+          testModuleState: newTestModuleState,
+          __type: TYPE_TESTMODULE_STATE
+        }
+      });
+
+      return null;
+    }
+  }
+};
+
+export default {
+  defaults,
+  resolvers
+};
diff --git a/packages/client/src/modules/user/graphql/UpdateFilter.client.graphql b/packages/client/src/modules/user/graphql/UpdateFilter.client.graphql
index 376496f687..a521e29e24 100644
--- a/packages/client/src/modules/user/graphql/UpdateFilter.client.graphql
+++ b/packages/client/src/modules/user/graphql/UpdateFilter.client.graphql
@@ -1,5 +1,5 @@
 #import "./UsersState.client.graphql"
 
-mutation updateFilter($filter: OrderByUserInput!) {
+mutation updateFilter($filter: FilterUserInput!) {
   updateFilter(filter: $filter) @client
 }

From 7502a57f0b367cc194150632480be8fcfaa05913 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Mon, 19 Feb 2018 13:37:45 +0100
Subject: [PATCH 099/327] update testModule

---
 .../client/src/modules/testModule/components/TestModule.jsx     | 2 +-
 .../src/modules/testModule/containers/TestModuleFilter.jsx      | 2 +-
 packages/client/src/modules/testModule/index.jsx                | 2 +-
 packages/server/src/modules/testModule/schema.graphql           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/modules/testModule/components/TestModule.jsx b/packages/client/src/modules/testModule/components/TestModule.jsx
index 5e6ad07eb1..147c3cd16b 100644
--- a/packages/client/src/modules/testModule/components/TestModule.jsx
+++ b/packages/client/src/modules/testModule/components/TestModule.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { StyleSheet, Text, View } from 'react-native';
 
-export default class TestModule extends React.PureComponent {
+export default class TestModule extends React.Component {
   static propTypes = {
     title: PropTypes.string.isRequired
   };
diff --git a/packages/client/src/modules/testModule/containers/TestModuleFilter.jsx b/packages/client/src/modules/testModule/containers/TestModuleFilter.jsx
index 12efbe607a..e275cb9edc 100644
--- a/packages/client/src/modules/testModule/containers/TestModuleFilter.jsx
+++ b/packages/client/src/modules/testModule/containers/TestModuleFilter.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { graphql, compose } from 'react-apollo';
-import { removeTypename } from '../../../../../common/utils';
 
+import { removeTypename } from '../../../../../common/utils';
 import { FilterView } from '../../common/components/crud';
 
 import TESTMODULE_STATE_QUERY from '../graphql/TestModuleStateQuery.client.graphql';
diff --git a/packages/client/src/modules/testModule/index.jsx b/packages/client/src/modules/testModule/index.jsx
index 68e70f0c6b..5d90931f54 100644
--- a/packages/client/src/modules/testModule/index.jsx
+++ b/packages/client/src/modules/testModule/index.jsx
@@ -29,7 +29,7 @@ class TestModuleEditScreen extends React.Component {
     title: `${navigation.state.params.id === 0 ? 'Create' : 'Edit'} Test Module`
   });
   render() {
-    return <TestModuleEdit navigation={this.props.navigation} />;
+    return <TestModuleEdit navigation={this.props.navigation} title="Test Module" />;
   }
 }
 
diff --git a/packages/server/src/modules/testModule/schema.graphql b/packages/server/src/modules/testModule/schema.graphql
index 224293d324..6733ddc2c6 100644
--- a/packages/server/src/modules/testModule/schema.graphql
+++ b/packages/server/src/modules/testModule/schema.graphql
@@ -29,7 +29,7 @@ input TestModuleCreateInput {
 }
 
 input TestModuleUpdateInput {
-  name: String!
+  name: String
 }
 
 input TestModuleWhereUniqueInput {

From 39b2176263726d97f08b62217ebc8354407b8699 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Mon, 19 Feb 2018 13:42:29 +0100
Subject: [PATCH 100/327] update testModule


From 4d5b9934f5196ecce676d87b22ac3a6429f094fd Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Mon, 19 Feb 2018 13:44:10 +0100
Subject: [PATCH 101/327] update cli crud to replace redux with link-state

---
 .../client/src/modules/common/util.web.jsx    |  2 +-
 .../crud/client/components/Module.jsx         |  7 +--
 .../crud/client/components/Module.web.jsx     | 14 ++---
 .../crud/client/containers/ModuleEdit.jsx     |  8 +--
 .../crud/client/containers/ModuleFilter.jsx   | 27 ++++----
 .../crud/client/containers/ModuleList.jsx     | 44 ++++++-------
 .../client/graphql/ModuleState.client.graphql |  9 +++
 .../graphql/ModuleStateQuery.client.graphql   |  7 +++
 .../graphql/UpdateFilter.client.graphql       |  5 ++
 .../graphql/UpdateOrderBy.client.graphql      |  5 ++
 tools/templates/crud/client/index.jsx         |  8 +--
 tools/templates/crud/client/index.web.jsx     |  8 +--
 tools/templates/crud/client/reducers/index.js | 33 ----------
 .../templates/crud/client/resolvers/index.js  | 63 +++++++++++++++++++
 14 files changed, 140 insertions(+), 100 deletions(-)
 create mode 100644 tools/templates/crud/client/graphql/ModuleState.client.graphql
 create mode 100644 tools/templates/crud/client/graphql/ModuleStateQuery.client.graphql
 create mode 100644 tools/templates/crud/client/graphql/UpdateFilter.client.graphql
 create mode 100644 tools/templates/crud/client/graphql/UpdateOrderBy.client.graphql
 delete mode 100644 tools/templates/crud/client/reducers/index.js
 create mode 100644 tools/templates/crud/client/resolvers/index.js

diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index 866cd9056e..e2d79fb2f3 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -175,7 +175,7 @@ export const mapFormPropsToValues = (schema, formdata) => {
     const value = schema.values[key];
 
     if (key !== 'id' && value.show !== false && value.type.constructor !== Array) {
-      fields[key] = formdata ? [key] : '';
+      fields[key] = formdata ? formdata[key] : '';
     }
   }
 
diff --git a/tools/templates/crud/client/components/Module.jsx b/tools/templates/crud/client/components/Module.jsx
index 59be7214ba..59b72c186e 100644
--- a/tools/templates/crud/client/components/Module.jsx
+++ b/tools/templates/crud/client/components/Module.jsx
@@ -1,9 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
 import { StyleSheet, Text, View } from 'react-native';
 
-class $Module$ extends React.PureComponent {
+export default class $Module$ extends React.Component {
   static propTypes = {
     title: PropTypes.string.isRequired
   };
@@ -36,7 +35,3 @@ const styles = StyleSheet.create({
     marginRight: 15
   }
 });
-
-export default connect(state => ({
-  title: state.$module$.title
-}))($Module$);
diff --git a/tools/templates/crud/client/components/Module.web.jsx b/tools/templates/crud/client/components/Module.web.jsx
index 33d72e20ec..c9f06ad5e5 100644
--- a/tools/templates/crud/client/components/Module.web.jsx
+++ b/tools/templates/crud/client/components/Module.web.jsx
@@ -1,6 +1,5 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
 import Helmet from 'react-helmet';
 import { PageLayout } from '../../common/components/web';
 
@@ -8,9 +7,10 @@ import $Module$Filter from '../containers/$Module$Filter';
 import $Module$List from '../containers/$Module$List';
 import settings from '../../../../../../settings';
 
-class $Module$ extends React.PureComponent {
+export default class $Module$ extends React.PureComponent {
   static propTypes = {
-    title: PropTypes.string.isRequired
+    title: PropTypes.string.isRequired,
+    link: PropTypes.string.isRequired
   };
 
   renderMetaData = title => (
@@ -26,7 +26,7 @@ class $Module$ extends React.PureComponent {
   );
 
   render() {
-    const { title } = this.props;
+    const { title, link } = this.props;
     return (
       <PageLayout>
         {this.renderMetaData(title)}
@@ -34,12 +34,8 @@ class $Module$ extends React.PureComponent {
         <hr />
         <$Module$Filter />
         <hr />
-        <$Module$List />
+        <$Module$List link={link} />
       </PageLayout>
     );
   }
 }
-
-export default connect(state => ({
-  title: state.$module$.title
-}))($Module$);
diff --git a/tools/templates/crud/client/containers/ModuleEdit.jsx b/tools/templates/crud/client/containers/ModuleEdit.jsx
index eddee85e46..cf8716f130 100644
--- a/tools/templates/crud/client/containers/ModuleEdit.jsx
+++ b/tools/templates/crud/client/containers/ModuleEdit.jsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { graphql, compose } from 'react-apollo';
-import { connect } from 'react-redux';
 
 import { EditView } from '../../common/components/crud';
 import { pickInputFields } from '../../common/util';
@@ -43,7 +42,7 @@ class $Module$Edit extends React.Component {
   }
 }
 
-const $Module$EditWithApollo = compose(
+export default compose(
   graphql($MODULE$_QUERY, {
     options: props => {
       let id = 0;
@@ -111,8 +110,3 @@ const $Module$EditWithApollo = compose(
     })
   })
 )($Module$Edit);
-
-export default connect(state => ({
-  title: state.$module$.title,
-  link: state.$module$.link
-}))($Module$EditWithApollo);
diff --git a/tools/templates/crud/client/containers/ModuleFilter.jsx b/tools/templates/crud/client/containers/ModuleFilter.jsx
index ad28053377..4f86378131 100644
--- a/tools/templates/crud/client/containers/ModuleFilter.jsx
+++ b/tools/templates/crud/client/containers/ModuleFilter.jsx
@@ -1,24 +1,29 @@
 import React from 'react';
-import { connect } from 'react-redux';
+import { graphql, compose } from 'react-apollo';
 
+import { removeTypename } from '../../../../../common/utils';
 import { FilterView } from '../../common/components/crud';
 
+import $MODULE$_STATE_QUERY from '../graphql/$Module$StateQuery.client.graphql';
+import UPDATE_FILTER from '../graphql/UpdateFilter.client.graphql';
+
 class $Module$Filter extends React.PureComponent {
   render() {
     return <FilterView {...this.props} />;
   }
 }
 
-export default connect(
-  state => ({
-    searchText: state.$module$.searchText
-  }),
-  dispatch => ({
-    onSearchTextChange(searchText) {
-      dispatch({
-        type: '$MODULE$_FILTER_SEARCH_TEXT',
-        value: searchText
-      });
+export default compose(
+  graphql($MODULE$_STATE_QUERY, {
+    props({ data: { $module$State: { filter } } }) {
+      return removeTypename(filter);
     }
+  }),
+  graphql(UPDATE_FILTER, {
+    props: ({ mutate }) => ({
+      onSearchTextChange(searchText) {
+        mutate({ variables: { filter: { searchText } } });
+      }
+    })
   })
 )($Module$Filter);
diff --git a/tools/templates/crud/client/containers/ModuleList.jsx b/tools/templates/crud/client/containers/ModuleList.jsx
index 395f71bc17..4b809c88fa 100644
--- a/tools/templates/crud/client/containers/ModuleList.jsx
+++ b/tools/templates/crud/client/containers/ModuleList.jsx
@@ -1,9 +1,12 @@
 import React from 'react';
 import { graphql, compose } from 'react-apollo';
-import { connect } from 'react-redux';
 
+import { removeTypename } from '../../../../../common/utils';
 import { ListView } from '../../common/components/crud';
 import { $Module$Schema } from '../../../../../server/src/modules/$module$/schema';
+
+import $MODULE$_STATE_QUERY from '../graphql/$Module$StateQuery.client.graphql';
+import UPDATE_ORDER_BY from '../graphql/UpdateOrderBy.client.graphql';
 import $MODULE$S_QUERY from '../graphql/$Module$sQuery.graphql';
 import UPDATE_$MODULE$ from '../graphql/Update$Module$.graphql';
 import DELETE_$MODULE$ from '../graphql/Delete$Module$.graphql';
@@ -19,16 +22,17 @@ class $Module$ extends React.Component {
   }
 }
 
-const $Module$WithApollo = compose(
+export default compose(
+  graphql($MODULE$_STATE_QUERY, {
+    props({ data: { $module$State } }) {
+      return removeTypename($module$State);
+    }
+  }),
   graphql($MODULE$S_QUERY, {
-    options: ({ limit, orderBy, searchText }) => {
+    options: ({ limit, orderBy, filter }) => {
       return {
         fetchPolicy: 'cache-and-network',
-        variables: {
-          limit: limit,
-          orderBy: orderBy,
-          filter: { searchText }
-        }
+        variables: { limit, orderBy, filter }
       };
     },
     props: ({ data: { loading, $module$sConnection, refetch, error, fetchMore } }) => {
@@ -149,22 +153,12 @@ const $Module$WithApollo = compose(
         }
       }
     })
-  })
-)($Module$);
-
-export default connect(
-  state => ({
-    link: state.$module$.link,
-    limit: state.$module$.limit,
-    searchText: state.$module$.searchText,
-    orderBy: state.$module$.orderBy
   }),
-  dispatch => ({
-    onOrderBy(orderBy) {
-      dispatch({
-        type: '$MODULE$_ORDER_BY',
-        value: orderBy
-      });
-    }
+  graphql(UPDATE_ORDER_BY, {
+    props: ({ mutate }) => ({
+      onOrderBy: orderBy => {
+        mutate({ variables: { orderBy } });
+      }
+    })
   })
-)($Module$WithApollo);
+)($Module$);
diff --git a/tools/templates/crud/client/graphql/ModuleState.client.graphql b/tools/templates/crud/client/graphql/ModuleState.client.graphql
new file mode 100644
index 0000000000..f376329a92
--- /dev/null
+++ b/tools/templates/crud/client/graphql/ModuleState.client.graphql
@@ -0,0 +1,9 @@
+fragment $Module$StateInfo on $Module$State {
+  orderBy {
+    column
+    order
+  }
+  filter {
+    searchText
+  }
+}
diff --git a/tools/templates/crud/client/graphql/ModuleStateQuery.client.graphql b/tools/templates/crud/client/graphql/ModuleStateQuery.client.graphql
new file mode 100644
index 0000000000..9bebe879a5
--- /dev/null
+++ b/tools/templates/crud/client/graphql/ModuleStateQuery.client.graphql
@@ -0,0 +1,7 @@
+#import "./$Module$State.client.graphql"
+
+query $Module$State {
+  $module$State @client {
+    ...$Module$StateInfo
+  }
+}
diff --git a/tools/templates/crud/client/graphql/UpdateFilter.client.graphql b/tools/templates/crud/client/graphql/UpdateFilter.client.graphql
new file mode 100644
index 0000000000..b63db8bcc5
--- /dev/null
+++ b/tools/templates/crud/client/graphql/UpdateFilter.client.graphql
@@ -0,0 +1,5 @@
+#import "./$Module$State.client.graphql"
+
+mutation update$Module$Filter($filter: Filter$Module$Input!) {
+  update$Module$Filter(filter: $filter) @client
+}
diff --git a/tools/templates/crud/client/graphql/UpdateOrderBy.client.graphql b/tools/templates/crud/client/graphql/UpdateOrderBy.client.graphql
new file mode 100644
index 0000000000..b55d1dd827
--- /dev/null
+++ b/tools/templates/crud/client/graphql/UpdateOrderBy.client.graphql
@@ -0,0 +1,5 @@
+#import "./$Module$State.client.graphql"
+
+mutation update$Module$OrderBy($orderBy: OrderBy$Module$Input!) {
+  update$Module$OrderBy(orderBy: $orderBy) @client
+}
diff --git a/tools/templates/crud/client/index.jsx b/tools/templates/crud/client/index.jsx
index 3ea104db9a..3bcedfc8bf 100644
--- a/tools/templates/crud/client/index.jsx
+++ b/tools/templates/crud/client/index.jsx
@@ -6,7 +6,7 @@ import { Ionicons } from '@expo/vector-icons';
 import { createTabBarIconWrapper } from '../common/components/native';
 import $Module$List from './containers/$Module$List';
 import $Module$Edit from './containers/$Module$Edit';
-import reducers from './reducers';
+import resolvers from './resolvers';
 
 import Feature from '../connector';
 
@@ -16,7 +16,7 @@ class $Module$ListScreen extends React.Component {
     headerRight: <Button title="Add" onPress={() => navigation.navigate('$Module$Edit', { id: 0 })} />
   });
   render() {
-    return <$Module$List navigation={this.props.navigation} />;
+    return <$Module$List navigation={this.props.navigation} title="$MoDuLe$" />;
   }
 }
 
@@ -29,7 +29,7 @@ class $Module$EditScreen extends React.Component {
     title: `${navigation.state.params.id === 0 ? 'Create' : 'Edit'} $MoDuLe$`
   });
   render() {
-    return <$Module$Edit navigation={this.props.navigation} />;
+    return <$Module$Edit navigation={this.props.navigation} title="$MoDuLe$" />;
   }
 }
 
@@ -54,5 +54,5 @@ export default new Feature({
       }
     }
   },
-  reducer: { $module$: reducers }
+  resolver: resolvers
 });
diff --git a/tools/templates/crud/client/index.web.jsx b/tools/templates/crud/client/index.web.jsx
index 76b2e93acf..927390aeb2 100644
--- a/tools/templates/crud/client/index.web.jsx
+++ b/tools/templates/crud/client/index.web.jsx
@@ -3,14 +3,14 @@ import { Route, NavLink } from 'react-router-dom';
 import { MenuItem } from '../../modules/common/components/web';
 import $Module$ from './components/$Module$';
 import $Module$Edit from './containers/$Module$Edit';
-import reducers from './reducers';
+import resolvers from './resolvers';
 
 import Feature from '../connector';
 
 export default new Feature({
   route: [
-    <Route exact path="/$module$" component={$Module$} />,
-    <Route exact path="/$module$/:id" component={$Module$Edit} />
+    <Route exact path="/$module$" render={props => <$Module$ title="$MoDuLe$" link="$module$" {...props} />} />,
+    <Route exact path="/$module$/:id" render={props => <$Module$Edit title="$MoDuLe$" link="$module$" {...props} />} />
   ],
   navItem: (
     <MenuItem key="/$module$">
@@ -19,5 +19,5 @@ export default new Feature({
       </NavLink>
     </MenuItem>
   ),
-  reducer: { $module$: reducers }
+  resolver: resolvers
 });
diff --git a/tools/templates/crud/client/reducers/index.js b/tools/templates/crud/client/reducers/index.js
deleted file mode 100644
index 7fdfb0048c..0000000000
--- a/tools/templates/crud/client/reducers/index.js
+++ /dev/null
@@ -1,33 +0,0 @@
-const defaultState = {
-  title: '$MoDuLe$',
-  link: '$module$',
-  nativeLink: '$Module$Edit',
-  limit: 50,
-  searchText: '',
-  orderBy: {}
-};
-
-export default function (state = defaultState, action) {
-  switch (action.type) {
-    case '$MODULE$_LIMIT':
-      return {
-        ...state,
-        limit: action.value
-      };
-
-    case '$MODULE$_FILTER_SEARCH_TEXT':
-      return {
-        ...state,
-        searchText: action.value
-      };
-
-    case '$MODULE$_ORDER_BY':
-      return {
-        ...state,
-        orderBy: action.value
-      };
-
-    default:
-      return state;
-  }
-}
diff --git a/tools/templates/crud/client/resolvers/index.js b/tools/templates/crud/client/resolvers/index.js
new file mode 100644
index 0000000000..e051b952da
--- /dev/null
+++ b/tools/templates/crud/client/resolvers/index.js
@@ -0,0 +1,63 @@
+import update from 'immutability-helper';
+
+import $MODULE$_STATE_QUERY from '../graphql/$Module$StateQuery.client.graphql';
+
+const TYPE_$MODULE$_STATE = '$Module$State';
+const TYPE_$MODULE$_STATE_FILTER = 'Filter$Module$Input';
+const TYPE_$MODULE$_STATE_ORDER_BY = 'OrderBy$Module$Input';
+
+const defaults = {
+  $module$State: {
+    orderBy: {
+      column: '',
+      order: '',
+      __typename: TYPE_$MODULE$_STATE_ORDER_BY
+    },
+    filter: {
+      searchText: '',
+      __typename: TYPE_$MODULE$_STATE_FILTER
+    },
+    __typename: TYPE_$MODULE$_STATE
+  }
+};
+
+const resolvers = {
+  Mutation: {
+    update$Module$OrderBy: (_, { orderBy }, { cache }) => {
+      const { $module$State } = cache.readQuery({ query: $MODULE$_STATE_QUERY });
+
+      const new$Module$State = update($module$State, {
+        orderBy: { $merge: orderBy }
+      });
+
+      cache.writeData({
+        data: {
+          $module$State: new$Module$State,
+          __type: TYPE_TESTMODULE_STATE
+        }
+      });
+
+      return null;
+    },
+    update$Module$Filter: (_, { filter }, { cache }) => {
+      const { $module$State } = cache.readQuery({ query: $MODULE$_STATE_QUERY });
+      const new$Module$State = update($module$State, {
+        filter: { $merge: filter }
+      });
+
+      cache.writeData({
+        data: {
+          $module$State: new$Module$State,
+          __type: TYPE_$MODULE$_STATE
+        }
+      });
+
+      return null;
+    }
+  }
+};
+
+export default {
+  defaults,
+  resolvers
+};

From 5567a4f415291c648eef0c20e337fe5f6077e6c7 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Mon, 19 Feb 2018 13:44:59 +0100
Subject: [PATCH 102/327] remove testModule

---
 packages/client/src/modules/index.js          |   3 +-
 .../testModule/components/TestModule.jsx      |  37 ----
 .../testModule/components/TestModule.web.jsx  |  41 -----
 .../testModule/containers/TestModule.spec.js  |  17 --
 .../testModule/containers/TestModuleEdit.jsx  | 112 ------------
 .../containers/TestModuleFilter.jsx           |  29 ---
 .../testModule/containers/TestModuleList.jsx  | 170 ------------------
 .../graphql/CreateTestModule.graphql          |  13 --
 .../graphql/DeleteManyTestModules.graphql     |   9 -
 .../graphql/DeleteTestModule.graphql          |  11 --
 .../graphql/SortTestModules.graphql           |   9 -
 .../testModule/graphql/TestModule.graphql     |   4 -
 .../graphql/TestModuleQuery.graphql           |  11 --
 .../graphql/TestModuleState.client.graphql    |   9 -
 .../TestModuleStateQuery.client.graphql       |   7 -
 .../graphql/TestModulesQuery.graphql          |  23 ---
 .../graphql/UpdateFilter.client.graphql       |   5 -
 .../graphql/UpdateManyTestModules.graphql     |  12 --
 .../graphql/UpdateOrderBy.client.graphql      |   5 -
 .../graphql/UpdateTestModule.graphql          |  16 --
 .../client/src/modules/testModule/index.jsx   |  58 ------
 .../src/modules/testModule/index.web.jsx      |  31 ----
 .../src/modules/testModule/resolvers/index.js |  63 -------
 .../migrations/1518617189615_TestModule.js    |   7 -
 .../seeds/1518617189615_TestModule.js         |   9 -
 packages/server/src/modules/index.js          |  14 +-
 .../src/modules/testModule/TestModule.spec.js |  23 ---
 .../server/src/modules/testModule/index.js    |  10 --
 .../src/modules/testModule/resolvers.js       |  44 -----
 .../src/modules/testModule/schema.graphql     |  72 --------
 .../server/src/modules/testModule/schema.js   |  12 --
 packages/server/src/modules/testModule/sql.js |   9 -
 32 files changed, 2 insertions(+), 893 deletions(-)
 delete mode 100644 packages/client/src/modules/testModule/components/TestModule.jsx
 delete mode 100644 packages/client/src/modules/testModule/components/TestModule.web.jsx
 delete mode 100644 packages/client/src/modules/testModule/containers/TestModule.spec.js
 delete mode 100644 packages/client/src/modules/testModule/containers/TestModuleEdit.jsx
 delete mode 100644 packages/client/src/modules/testModule/containers/TestModuleFilter.jsx
 delete mode 100644 packages/client/src/modules/testModule/containers/TestModuleList.jsx
 delete mode 100644 packages/client/src/modules/testModule/graphql/CreateTestModule.graphql
 delete mode 100644 packages/client/src/modules/testModule/graphql/DeleteManyTestModules.graphql
 delete mode 100644 packages/client/src/modules/testModule/graphql/DeleteTestModule.graphql
 delete mode 100644 packages/client/src/modules/testModule/graphql/SortTestModules.graphql
 delete mode 100644 packages/client/src/modules/testModule/graphql/TestModule.graphql
 delete mode 100644 packages/client/src/modules/testModule/graphql/TestModuleQuery.graphql
 delete mode 100644 packages/client/src/modules/testModule/graphql/TestModuleState.client.graphql
 delete mode 100644 packages/client/src/modules/testModule/graphql/TestModuleStateQuery.client.graphql
 delete mode 100644 packages/client/src/modules/testModule/graphql/TestModulesQuery.graphql
 delete mode 100644 packages/client/src/modules/testModule/graphql/UpdateFilter.client.graphql
 delete mode 100644 packages/client/src/modules/testModule/graphql/UpdateManyTestModules.graphql
 delete mode 100644 packages/client/src/modules/testModule/graphql/UpdateOrderBy.client.graphql
 delete mode 100644 packages/client/src/modules/testModule/graphql/UpdateTestModule.graphql
 delete mode 100644 packages/client/src/modules/testModule/index.jsx
 delete mode 100644 packages/client/src/modules/testModule/index.web.jsx
 delete mode 100644 packages/client/src/modules/testModule/resolvers/index.js
 delete mode 100644 packages/server/src/database/migrations/1518617189615_TestModule.js
 delete mode 100644 packages/server/src/database/seeds/1518617189615_TestModule.js
 delete mode 100644 packages/server/src/modules/testModule/TestModule.spec.js
 delete mode 100644 packages/server/src/modules/testModule/index.js
 delete mode 100644 packages/server/src/modules/testModule/resolvers.js
 delete mode 100644 packages/server/src/modules/testModule/schema.graphql
 delete mode 100644 packages/server/src/modules/testModule/schema.js
 delete mode 100644 packages/server/src/modules/testModule/sql.js

diff --git a/packages/client/src/modules/index.js b/packages/client/src/modules/index.js
index 773888bbbe..bf0e144e63 100644
--- a/packages/client/src/modules/index.js
+++ b/packages/client/src/modules/index.js
@@ -1,4 +1,3 @@
-import testModule from './testModule';
 import counter from './counter';
 import post from './post';
 import upload from './upload';
@@ -10,4 +9,4 @@ import './favicon';
 
 import Feature from './connector';
 
-export default new Feature(testModule, counter, post, upload, user, subscription, contact, pageNotFound);
+export default new Feature(counter, post, upload, user, subscription, contact, pageNotFound);
diff --git a/packages/client/src/modules/testModule/components/TestModule.jsx b/packages/client/src/modules/testModule/components/TestModule.jsx
deleted file mode 100644
index 147c3cd16b..0000000000
--- a/packages/client/src/modules/testModule/components/TestModule.jsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { StyleSheet, Text, View } from 'react-native';
-
-export default class TestModule extends React.Component {
-  static propTypes = {
-    title: PropTypes.string.isRequired
-  };
-
-  render() {
-    const { title } = this.props;
-    return (
-      <View style={styles.container}>
-        <View style={styles.element}>
-          <Text style={styles.box}>Hello {title}!</Text>
-        </View>
-      </View>
-    );
-  }
-}
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    backgroundColor: '#fff',
-    alignItems: 'center',
-    justifyContent: 'center'
-  },
-  element: {
-    paddingTop: 30
-  },
-  box: {
-    textAlign: 'center',
-    marginLeft: 15,
-    marginRight: 15
-  }
-});
diff --git a/packages/client/src/modules/testModule/components/TestModule.web.jsx b/packages/client/src/modules/testModule/components/TestModule.web.jsx
deleted file mode 100644
index 6066d2ee83..0000000000
--- a/packages/client/src/modules/testModule/components/TestModule.web.jsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import Helmet from 'react-helmet';
-import { PageLayout } from '../../common/components/web';
-
-import TestModuleFilter from '../containers/TestModuleFilter';
-import TestModuleList from '../containers/TestModuleList';
-import settings from '../../../../../../settings';
-
-export default class TestModule extends React.PureComponent {
-  static propTypes = {
-    title: PropTypes.string.isRequired,
-    link: PropTypes.string.isRequired
-  };
-
-  renderMetaData = title => (
-    <Helmet
-      title={`${settings.app.name} - ${title}`}
-      meta={[
-        {
-          name: 'description',
-          content: `${settings.app.name} - ${title} page`
-        }
-      ]}
-    />
-  );
-
-  render() {
-    const { title, link } = this.props;
-    return (
-      <PageLayout>
-        {this.renderMetaData(title)}
-        <h2>{title}</h2>
-        <hr />
-        <TestModuleFilter />
-        <hr />
-        <TestModuleList link={link} />
-      </PageLayout>
-    );
-  }
-}
diff --git a/packages/client/src/modules/testModule/containers/TestModule.spec.js b/packages/client/src/modules/testModule/containers/TestModule.spec.js
deleted file mode 100644
index 29151d7dcc..0000000000
--- a/packages/client/src/modules/testModule/containers/TestModule.spec.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { expect } from 'chai';
-import { step } from 'mocha-steps';
-import Renderer from '../../../testHelpers/Renderer';
-import Routes from '../../../app/Routes';
-
-describe('TestModule UI works', () => {
-  const renderer = new Renderer({});
-  let app;
-  let content;
-
-  step('TestModule page renders on mount', () => {
-    app = renderer.mount(Routes);
-    renderer.history.push('/testModule');
-    content = app.find('#content');
-    expect(content).to.not.be.empty;
-  });
-});
diff --git a/packages/client/src/modules/testModule/containers/TestModuleEdit.jsx b/packages/client/src/modules/testModule/containers/TestModuleEdit.jsx
deleted file mode 100644
index 6cd3223ca4..0000000000
--- a/packages/client/src/modules/testModule/containers/TestModuleEdit.jsx
+++ /dev/null
@@ -1,112 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { graphql, compose } from 'react-apollo';
-
-import { EditView } from '../../common/components/crud';
-import { pickInputFields } from '../../common/util';
-import { TestModuleSchema } from '../../../../../server/src/modules/testModule/schema';
-import TESTMODULE_QUERY from '../graphql/TestModuleQuery.graphql';
-import CREATE_TESTMODULE from '../graphql/CreateTestModule.graphql';
-import UPDATE_TESTMODULE from '../graphql/UpdateTestModule.graphql';
-
-class TestModuleEdit extends React.Component {
-  static propTypes = {
-    data: PropTypes.object,
-    createEntry: PropTypes.func.isRequired,
-    updateEntry: PropTypes.func.isRequired,
-    title: PropTypes.string.isRequired
-  };
-
-  onSubmit = async values => {
-    const { data: { node }, createEntry, updateEntry, title } = this.props;
-    let result = null;
-    const insertValues = pickInputFields(TestModuleSchema, values, node);
-
-    if (node) {
-      result = await updateEntry(insertValues, { id: node.id });
-    } else {
-      result = await createEntry(insertValues);
-    }
-
-    if (result && result.errors) {
-      let submitError = {
-        _error: `Edit ${title} failed!`
-      };
-      result.errors.map(error => (submitError[error.field] = error.message));
-      throw new submitError();
-    }
-  };
-
-  render() {
-    return <EditView {...this.props} onSubmit={this.onSubmit} schema={TestModuleSchema} />;
-  }
-}
-
-export default compose(
-  graphql(TESTMODULE_QUERY, {
-    options: props => {
-      let id = 0;
-      if (props.match) {
-        id = props.match.params.id;
-      } else if (props.navigation) {
-        id = props.navigation.state.params.id;
-      }
-
-      return {
-        fetchPolicy: 'cache-and-network',
-        variables: { where: { id } }
-      };
-    },
-    props({ data: { loading, testModule } }) {
-      return { loading, data: testModule };
-    }
-  }),
-  graphql(CREATE_TESTMODULE, {
-    props: ({ ownProps: { history, navigation }, mutate }) => ({
-      createEntry: async data => {
-        try {
-          const { data: { createTestModule } } = await mutate({
-            variables: { data }
-          });
-
-          if (createTestModule.errors) {
-            return { errors: createTestModule.errors };
-          }
-
-          if (history) {
-            return history.push('/testModule');
-          }
-          if (navigation) {
-            return navigation.goBack();
-          }
-        } catch (e) {
-          console.log(e.graphQLErrors);
-        }
-      }
-    })
-  }),
-  graphql(UPDATE_TESTMODULE, {
-    props: ({ ownProps: { history, navigation }, mutate }) => ({
-      updateEntry: async (data, where) => {
-        try {
-          const { data: { updateTestModule } } = await mutate({
-            variables: { data, where }
-          });
-
-          if (updateTestModule.errors) {
-            return { errors: updateTestModule.errors };
-          }
-
-          if (history) {
-            return history.push('/testModule');
-          }
-          if (navigation) {
-            return navigation.goBack();
-          }
-        } catch (e) {
-          console.log(e.graphQLErrors);
-        }
-      }
-    })
-  })
-)(TestModuleEdit);
diff --git a/packages/client/src/modules/testModule/containers/TestModuleFilter.jsx b/packages/client/src/modules/testModule/containers/TestModuleFilter.jsx
deleted file mode 100644
index e275cb9edc..0000000000
--- a/packages/client/src/modules/testModule/containers/TestModuleFilter.jsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import React from 'react';
-import { graphql, compose } from 'react-apollo';
-
-import { removeTypename } from '../../../../../common/utils';
-import { FilterView } from '../../common/components/crud';
-
-import TESTMODULE_STATE_QUERY from '../graphql/TestModuleStateQuery.client.graphql';
-import UPDATE_FILTER from '../graphql/UpdateFilter.client.graphql';
-
-class TestModuleFilter extends React.PureComponent {
-  render() {
-    return <FilterView {...this.props} />;
-  }
-}
-
-export default compose(
-  graphql(TESTMODULE_STATE_QUERY, {
-    props({ data: { testModuleState: { filter } } }) {
-      return removeTypename(filter);
-    }
-  }),
-  graphql(UPDATE_FILTER, {
-    props: ({ mutate }) => ({
-      onSearchTextChange(searchText) {
-        mutate({ variables: { filter: { searchText } } });
-      }
-    })
-  })
-)(TestModuleFilter);
diff --git a/packages/client/src/modules/testModule/containers/TestModuleList.jsx b/packages/client/src/modules/testModule/containers/TestModuleList.jsx
deleted file mode 100644
index df3a363730..0000000000
--- a/packages/client/src/modules/testModule/containers/TestModuleList.jsx
+++ /dev/null
@@ -1,170 +0,0 @@
-import React from 'react';
-import { graphql, compose } from 'react-apollo';
-
-import { removeTypename } from '../../../../../common/utils';
-import { ListView } from '../../common/components/crud';
-import { TestModuleSchema } from '../../../../../server/src/modules/testModule/schema';
-
-import TESTMODULE_STATE_QUERY from '../graphql/TestModuleStateQuery.client.graphql';
-import UPDATE_ORDER_BY from '../graphql/UpdateOrderBy.client.graphql';
-import TESTMODULES_QUERY from '../graphql/TestModulesQuery.graphql';
-import UPDATE_TESTMODULE from '../graphql/UpdateTestModule.graphql';
-import DELETE_TESTMODULE from '../graphql/DeleteTestModule.graphql';
-import SORT_TESTMODULES from '../graphql/SortTestModules.graphql';
-import DELETEMANY_TESTMODULES from '../graphql/DeleteManyTestModules.graphql';
-import UPDATEMANY_TESTMODULES from '../graphql/UpdateManyTestModules.graphql';
-
-class TestModule extends React.Component {
-  customTableColumns = {};
-
-  render() {
-    return <ListView {...this.props} customTableColumns={this.customTableColumns} schema={TestModuleSchema} />;
-  }
-}
-
-export default compose(
-  graphql(TESTMODULE_STATE_QUERY, {
-    props({ data: { testModuleState } }) {
-      return removeTypename(testModuleState);
-    }
-  }),
-  graphql(TESTMODULES_QUERY, {
-    options: ({ limit, orderBy, filter }) => {
-      return {
-        fetchPolicy: 'cache-and-network',
-        variables: { limit, orderBy, filter }
-      };
-    },
-    props: ({ data: { loading, testModulesConnection, refetch, error, fetchMore } }) => {
-      const loadMoreRows = () => {
-        return fetchMore({
-          variables: {
-            offset: testModulesConnection.edges.length
-          },
-          updateQuery: (previousResult, { fetchMoreResult }) => {
-            const newEdges = fetchMoreResult.testModulesConnection.edges;
-            const pageInfo = fetchMoreResult.testModulesConnection.pageInfo;
-
-            return {
-              testModulesConnection: {
-                edges: [...previousResult.testModulesConnection.edges, ...newEdges],
-                pageInfo,
-                __typename: 'TestModulesConnection'
-              }
-            };
-          }
-        });
-      };
-      if (error) throw new Error(error);
-      return {
-        loading,
-        data: testModulesConnection,
-        loadMoreRows,
-        refetch,
-        errors: error ? error.graphQLErrors : null
-      };
-    }
-  }),
-  graphql(UPDATE_TESTMODULE, {
-    props: ({ ownProps: { refetch }, mutate }) => ({
-      updateEntry: async (data, where) => {
-        try {
-          const { data: { updateTestModule } } = await mutate({
-            variables: { data, where }
-          });
-
-          if (updateTestModule.errors) {
-            return { errors: updateTestModule.errors };
-          }
-
-          refetch();
-        } catch (e) {
-          console.log(e.graphQLErrors);
-        }
-      }
-    })
-  }),
-  graphql(DELETE_TESTMODULE, {
-    props: ({ ownProps: { refetch }, mutate }) => ({
-      deleteEntry: async where => {
-        try {
-          const { data: { deleteTestModule } } = await mutate({
-            variables: { where }
-          });
-
-          if (deleteTestModule.errors) {
-            return { errors: deleteTestModule.errors };
-          }
-
-          refetch();
-        } catch (e) {
-          console.log(e.graphQLErrors);
-        }
-      }
-    })
-  }),
-  graphql(SORT_TESTMODULES, {
-    props: ({ ownProps: { refetch }, mutate }) => ({
-      sortEntries: async data => {
-        try {
-          const { data: { sortTestModules } } = await mutate({
-            variables: { data }
-          });
-
-          if (sortTestModules.errors) {
-            return { errors: sortTestModules.errors };
-          }
-
-          refetch();
-        } catch (e) {
-          console.log(e.graphQLErrors);
-        }
-      }
-    })
-  }),
-  graphql(DELETEMANY_TESTMODULES, {
-    props: ({ ownProps: { refetch }, mutate }) => ({
-      deleteManyEntries: async where => {
-        try {
-          const { data: { deleteManyTestModules } } = await mutate({
-            variables: { where }
-          });
-
-          if (deleteManyTestModules.errors) {
-            return { errors: deleteManyTestModules.errors };
-          }
-
-          refetch();
-        } catch (e) {
-          console.log(e.graphQLErrors);
-        }
-      }
-    })
-  }),
-  graphql(UPDATEMANY_TESTMODULES, {
-    props: ({ ownProps: { refetch }, mutate }) => ({
-      updateManyEntries: async (data, where) => {
-        try {
-          const { data: { updateManyTestModules } } = await mutate({
-            variables: { data, where }
-          });
-
-          if (updateManyTestModules.errors) {
-            return { errors: updateManyTestModules.errors };
-          }
-
-          refetch();
-        } catch (e) {
-          console.log(e.graphQLErrors);
-        }
-      }
-    })
-  }),
-  graphql(UPDATE_ORDER_BY, {
-    props: ({ mutate }) => ({
-      onOrderBy: orderBy => {
-        mutate({ variables: { orderBy } });
-      }
-    })
-  })
-)(TestModule);
diff --git a/packages/client/src/modules/testModule/graphql/CreateTestModule.graphql b/packages/client/src/modules/testModule/graphql/CreateTestModule.graphql
deleted file mode 100644
index 6fd6e50ca6..0000000000
--- a/packages/client/src/modules/testModule/graphql/CreateTestModule.graphql
+++ /dev/null
@@ -1,13 +0,0 @@
-#import "./TestModule.graphql"
-
-mutation createTestModule($data: TestModuleCreateInput!) {
-  createTestModule(data: $data) {
-    node {
-      ...TestModuleInfo
-    }
-    errors {
-      field
-      message
-    }
-  }
-}
diff --git a/packages/client/src/modules/testModule/graphql/DeleteManyTestModules.graphql b/packages/client/src/modules/testModule/graphql/DeleteManyTestModules.graphql
deleted file mode 100644
index 9568dcd909..0000000000
--- a/packages/client/src/modules/testModule/graphql/DeleteManyTestModules.graphql
+++ /dev/null
@@ -1,9 +0,0 @@
-mutation deleteManyTestModules($where: TestModuleWhereInput!) {
-  deleteManyTestModules(where: $where) {
-    count
-    errors {
-      field
-      message
-    }
-  }
-}
diff --git a/packages/client/src/modules/testModule/graphql/DeleteTestModule.graphql b/packages/client/src/modules/testModule/graphql/DeleteTestModule.graphql
deleted file mode 100644
index ad6fa58389..0000000000
--- a/packages/client/src/modules/testModule/graphql/DeleteTestModule.graphql
+++ /dev/null
@@ -1,11 +0,0 @@
-mutation deleteTestModule($where: TestModuleWhereUniqueInput!) {
-  deleteTestModule(where: $where) {
-    node {
-      id
-    }
-    errors {
-      field
-      message
-    }
-  }
-}
diff --git a/packages/client/src/modules/testModule/graphql/SortTestModules.graphql b/packages/client/src/modules/testModule/graphql/SortTestModules.graphql
deleted file mode 100644
index 187c2c9f6a..0000000000
--- a/packages/client/src/modules/testModule/graphql/SortTestModules.graphql
+++ /dev/null
@@ -1,9 +0,0 @@
-mutation sortTestModules($data: [Int!]) {
-  sortTestModules(data: $data) {
-    count
-    errors {
-      field
-      message
-    }
-  }
-}
diff --git a/packages/client/src/modules/testModule/graphql/TestModule.graphql b/packages/client/src/modules/testModule/graphql/TestModule.graphql
deleted file mode 100644
index fea813e080..0000000000
--- a/packages/client/src/modules/testModule/graphql/TestModule.graphql
+++ /dev/null
@@ -1,4 +0,0 @@
-fragment TestModuleInfo on TestModule {
-  id
-  name
-}
diff --git a/packages/client/src/modules/testModule/graphql/TestModuleQuery.graphql b/packages/client/src/modules/testModule/graphql/TestModuleQuery.graphql
deleted file mode 100644
index c562c528c8..0000000000
--- a/packages/client/src/modules/testModule/graphql/TestModuleQuery.graphql
+++ /dev/null
@@ -1,11 +0,0 @@
-#import "./TestModule.graphql"
-
-query testModule($where: TestModuleWhereUniqueInput!) {
-  testModule(where: $where) {
-    node {
-      ...TestModuleInfo
-    }
-    ### form data
-    ### end form data
-  }
-}
diff --git a/packages/client/src/modules/testModule/graphql/TestModuleState.client.graphql b/packages/client/src/modules/testModule/graphql/TestModuleState.client.graphql
deleted file mode 100644
index 7bf1483229..0000000000
--- a/packages/client/src/modules/testModule/graphql/TestModuleState.client.graphql
+++ /dev/null
@@ -1,9 +0,0 @@
-fragment TestModuleStateInfo on TestModuleState {
-  orderBy {
-    column
-    order
-  }
-  filter {
-    searchText
-  }
-}
diff --git a/packages/client/src/modules/testModule/graphql/TestModuleStateQuery.client.graphql b/packages/client/src/modules/testModule/graphql/TestModuleStateQuery.client.graphql
deleted file mode 100644
index b2ad586834..0000000000
--- a/packages/client/src/modules/testModule/graphql/TestModuleStateQuery.client.graphql
+++ /dev/null
@@ -1,7 +0,0 @@
-#import "./TestModuleState.client.graphql"
-
-query TestModuleState {
-  testModuleState @client {
-    ...TestModuleStateInfo
-  }
-}
diff --git a/packages/client/src/modules/testModule/graphql/TestModulesQuery.graphql b/packages/client/src/modules/testModule/graphql/TestModulesQuery.graphql
deleted file mode 100644
index a608862ca6..0000000000
--- a/packages/client/src/modules/testModule/graphql/TestModulesQuery.graphql
+++ /dev/null
@@ -1,23 +0,0 @@
-#import "./TestModule.graphql"
-
-query testModulesConnection(
-  $limit: Int
-  $offset: Int
-  $orderBy: OrderByInput
-  $filter: TestModuleFilterInput
-) {
-  testModulesConnection(
-    limit: $limit
-    offset: $offset
-    orderBy: $orderBy
-    filter: $filter
-  ) {
-    pageInfo {
-      totalCount
-      hasNextPage
-    }
-    edges {
-      ...TestModuleInfo
-    }
-  }
-}
diff --git a/packages/client/src/modules/testModule/graphql/UpdateFilter.client.graphql b/packages/client/src/modules/testModule/graphql/UpdateFilter.client.graphql
deleted file mode 100644
index 230991e3a7..0000000000
--- a/packages/client/src/modules/testModule/graphql/UpdateFilter.client.graphql
+++ /dev/null
@@ -1,5 +0,0 @@
-#import "./TestModuleState.client.graphql"
-
-mutation updateTestModuleFilter($filter: FilterTestModuleInput!) {
-  updateTestModuleFilter(filter: $filter) @client
-}
diff --git a/packages/client/src/modules/testModule/graphql/UpdateManyTestModules.graphql b/packages/client/src/modules/testModule/graphql/UpdateManyTestModules.graphql
deleted file mode 100644
index 3601186752..0000000000
--- a/packages/client/src/modules/testModule/graphql/UpdateManyTestModules.graphql
+++ /dev/null
@@ -1,12 +0,0 @@
-mutation updateManyTestModules(
-  $data: TestModuleUpdateInput!
-  $where: TestModuleWhereInput!
-) {
-  updateManyTestModules(data: $data, where: $where) {
-    count
-    errors {
-      field
-      message
-    }
-  }
-}
diff --git a/packages/client/src/modules/testModule/graphql/UpdateOrderBy.client.graphql b/packages/client/src/modules/testModule/graphql/UpdateOrderBy.client.graphql
deleted file mode 100644
index 4d6c0f6e21..0000000000
--- a/packages/client/src/modules/testModule/graphql/UpdateOrderBy.client.graphql
+++ /dev/null
@@ -1,5 +0,0 @@
-#import "./TestModuleState.client.graphql"
-
-mutation updateTestModuleOrderBy($orderBy: OrderByTestModuleInput!) {
-  updateTestModuleOrderBy(orderBy: $orderBy) @client
-}
diff --git a/packages/client/src/modules/testModule/graphql/UpdateTestModule.graphql b/packages/client/src/modules/testModule/graphql/UpdateTestModule.graphql
deleted file mode 100644
index e7a7afd51e..0000000000
--- a/packages/client/src/modules/testModule/graphql/UpdateTestModule.graphql
+++ /dev/null
@@ -1,16 +0,0 @@
-#import "./TestModule.graphql"
-
-mutation updateTestModule(
-  $data: TestModuleUpdateInput!
-  $where: TestModuleWhereUniqueInput!
-) {
-  updateTestModule(data: $data, where: $where) {
-    node {
-      ...TestModuleInfo
-    }
-    errors {
-      field
-      message
-    }
-  }
-}
diff --git a/packages/client/src/modules/testModule/index.jsx b/packages/client/src/modules/testModule/index.jsx
deleted file mode 100644
index 5d90931f54..0000000000
--- a/packages/client/src/modules/testModule/index.jsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { Button } from 'react-native';
-import { StackNavigator } from 'react-navigation';
-import { Ionicons } from '@expo/vector-icons';
-import { createTabBarIconWrapper } from '../common/components/native';
-import TestModuleList from './containers/TestModuleList';
-import TestModuleEdit from './containers/TestModuleEdit';
-import resolvers from './resolvers';
-
-import Feature from '../connector';
-
-class TestModuleListScreen extends React.Component {
-  static navigationOptions = ({ navigation }) => ({
-    title: 'TestModule list',
-    headerRight: <Button title="Add" onPress={() => navigation.navigate('TestModuleEdit', { id: 0 })} />
-  });
-  render() {
-    return <TestModuleList navigation={this.props.navigation} title="Test Module" />;
-  }
-}
-
-TestModuleListScreen.propTypes = {
-  navigation: PropTypes.object
-};
-
-class TestModuleEditScreen extends React.Component {
-  static navigationOptions = ({ navigation }) => ({
-    title: `${navigation.state.params.id === 0 ? 'Create' : 'Edit'} Test Module`
-  });
-  render() {
-    return <TestModuleEdit navigation={this.props.navigation} title="Test Module" />;
-  }
-}
-
-TestModuleEditScreen.propTypes = {
-  navigation: PropTypes.object
-};
-
-const TestModuleNavigator = StackNavigator({
-  TestModuleList: { screen: TestModuleListScreen },
-  TestModuleEdit: { screen: TestModuleEditScreen }
-});
-
-export default new Feature({
-  tabItem: {
-    TestModule: {
-      screen: TestModuleNavigator,
-      navigationOptions: {
-        tabBarIcon: createTabBarIconWrapper(Ionicons, {
-          name: 'ios-browsers-outline',
-          size: 30
-        })
-      }
-    }
-  },
-  resolver: resolvers
-});
diff --git a/packages/client/src/modules/testModule/index.web.jsx b/packages/client/src/modules/testModule/index.web.jsx
deleted file mode 100644
index 7460385aab..0000000000
--- a/packages/client/src/modules/testModule/index.web.jsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import React from 'react';
-import { Route, NavLink } from 'react-router-dom';
-import { MenuItem } from '../../modules/common/components/web';
-import TestModule from './components/TestModule';
-import TestModuleEdit from './containers/TestModuleEdit';
-import resolvers from './resolvers';
-
-import Feature from '../connector';
-
-export default new Feature({
-  route: [
-    <Route
-      exact
-      path="/testModule"
-      render={props => <TestModule title="Test Module" link="testModule" {...props} />}
-    />,
-    <Route
-      exact
-      path="/testModule/:id"
-      render={props => <TestModuleEdit title="Test Module" link="testModule" {...props} />}
-    />
-  ],
-  navItem: (
-    <MenuItem key="/testModule">
-      <NavLink to="/testModule" className="nav-link" activeClassName="active">
-        Test Module
-      </NavLink>
-    </MenuItem>
-  ),
-  resolver: resolvers
-});
diff --git a/packages/client/src/modules/testModule/resolvers/index.js b/packages/client/src/modules/testModule/resolvers/index.js
deleted file mode 100644
index 55dbae5993..0000000000
--- a/packages/client/src/modules/testModule/resolvers/index.js
+++ /dev/null
@@ -1,63 +0,0 @@
-import update from 'immutability-helper';
-
-import TESTMODULE_STATE_QUERY from '../graphql/TestModuleStateQuery.client.graphql';
-
-const TYPE_TESTMODULE_STATE = 'TestModuleState';
-const TYPE_TESTMODULE_STATE_FILTER = 'FilterTestModuleInput';
-const TYPE_TESTMODULE_STATE_ORDER_BY = 'OrderByTestModuleInput';
-
-const defaults = {
-  testModuleState: {
-    orderBy: {
-      column: '',
-      order: '',
-      __typename: TYPE_TESTMODULE_STATE_ORDER_BY
-    },
-    filter: {
-      searchText: '',
-      __typename: TYPE_TESTMODULE_STATE_FILTER
-    },
-    __typename: TYPE_TESTMODULE_STATE
-  }
-};
-
-const resolvers = {
-  Mutation: {
-    updateTestModuleOrderBy: (_, { orderBy }, { cache }) => {
-      const { testModuleState } = cache.readQuery({ query: TESTMODULE_STATE_QUERY });
-
-      const newTestModuleState = update(testModuleState, {
-        orderBy: { $merge: orderBy }
-      });
-
-      cache.writeData({
-        data: {
-          testModuleState: newTestModuleState,
-          __type: TYPE_TESTMODULE_STATE
-        }
-      });
-
-      return null;
-    },
-    updateTestModuleFilter: (_, { filter }, { cache }) => {
-      const { testModuleState } = cache.readQuery({ query: TESTMODULE_STATE_QUERY });
-      const newTestModuleState = update(testModuleState, {
-        filter: { $merge: filter }
-      });
-
-      cache.writeData({
-        data: {
-          testModuleState: newTestModuleState,
-          __type: TYPE_TESTMODULE_STATE
-        }
-      });
-
-      return null;
-    }
-  }
-};
-
-export default {
-  defaults,
-  resolvers
-};
diff --git a/packages/server/src/database/migrations/1518617189615_TestModule.js b/packages/server/src/database/migrations/1518617189615_TestModule.js
deleted file mode 100644
index 1c04fdd3da..0000000000
--- a/packages/server/src/database/migrations/1518617189615_TestModule.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import KnexGenerator from 'domain-knex';
-
-import { TestModuleSchema } from '../../modules/testModule/schema';
-
-exports.up = knex => new KnexGenerator(knex).createTables(TestModuleSchema);
-
-exports.down = knex => new KnexGenerator(knex).dropTables(TestModuleSchema);
diff --git a/packages/server/src/database/seeds/1518617189615_TestModule.js b/packages/server/src/database/seeds/1518617189615_TestModule.js
deleted file mode 100644
index 501190c257..0000000000
--- a/packages/server/src/database/seeds/1518617189615_TestModule.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { truncateTables } from '../../sql/helpers';
-
-export async function seed(knex, Promise) {
-  await truncateTables(knex, Promise, ['test_module']);
-
-  await knex('test_module')
-    .returning('id')
-    .insert({ name: 'test' });
-}
diff --git a/packages/server/src/modules/index.js b/packages/server/src/modules/index.js
index 0f62851248..1b43893685 100644
--- a/packages/server/src/modules/index.js
+++ b/packages/server/src/modules/index.js
@@ -1,4 +1,3 @@
-import testModule from './testModule';
 import counter from './counter';
 import post from './post';
 import upload from './upload';
@@ -12,15 +11,4 @@ import './debug';
 
 import Feature from './connector';
 
-export default new Feature(
-  testModule,
-  counter,
-  post,
-  upload,
-  user,
-  subscription,
-  contact,
-  mailer,
-  graphqlTypes,
-  apolloEngine
-);
+export default new Feature(counter, post, upload, user, subscription, contact, mailer, graphqlTypes, apolloEngine);
diff --git a/packages/server/src/modules/testModule/TestModule.spec.js b/packages/server/src/modules/testModule/TestModule.spec.js
deleted file mode 100644
index 377749b6eb..0000000000
--- a/packages/server/src/modules/testModule/TestModule.spec.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/*eslint-disable no-unused-vars*/
-import chai from 'chai';
-import { step } from 'mocha-steps';
-import { getServer, getApollo } from '../../testHelpers/integrationSetup';
-
-describe('TestModule API works', () => {
-  let server, apollo;
-
-  before(() => {
-    server = getServer();
-    apollo = getApollo();
-  });
-
-  step('Has GraphiQL endpoint', () => {
-    return chai
-      .request(server)
-      .get('/graphiql')
-      .end((err, res) => {
-        res.status.should.be(200);
-        res.body.should.be('{}');
-      });
-  });
-});
diff --git a/packages/server/src/modules/testModule/index.js b/packages/server/src/modules/testModule/index.js
deleted file mode 100644
index fc23683714..0000000000
--- a/packages/server/src/modules/testModule/index.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import TestModule from './sql';
-import schema from './schema.graphql';
-import createResolvers from './resolvers';
-import Feature from '../connector';
-
-export default new Feature({
-  schema: schema,
-  createResolversFunc: createResolvers,
-  createContextFunc: () => ({ TestModule: new TestModule() })
-});
diff --git a/packages/server/src/modules/testModule/resolvers.js b/packages/server/src/modules/testModule/resolvers.js
deleted file mode 100644
index 6972e5793b..0000000000
--- a/packages/server/src/modules/testModule/resolvers.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// eslint-disable-next-line no-unused-vars
-import { createBatchResolver } from 'graphql-resolve-batch';
-
-// eslint-disable-next-line no-unused-vars
-export default pubsub => ({
-  Query: {
-    testModules: (parent, args, ctx, info) => {
-      return ctx.TestModule.getList(args, info);
-    },
-    testModulesConnection: (parent, args, ctx, info) => {
-      return ctx.TestModule.getPaginated(args, info);
-    },
-    testModule: (parent, args, ctx, info) => {
-      return ctx.TestModule.get(args, info);
-    }
-  },
-  TestModuleData: {
-    // related data
-    // end related data
-  },
-  // schema batch resolvers
-  // end schema batch resolvers
-  Mutation: {
-    createTestModule: (parent, args, ctx, info) => {
-      return ctx.TestModule.create(args, ctx, info);
-    },
-    updateTestModule: (parent, args, ctx, info) => {
-      return ctx.TestModule.update(args, ctx, info);
-    },
-    deleteTestModule: (parent, args, ctx, info) => {
-      return ctx.TestModule.delete(args, info);
-    },
-    sortTestModules: (parent, args, ctx) => {
-      return ctx.TestModule.sort(args);
-    },
-    updateManyTestModules: (parent, args, ctx) => {
-      return ctx.TestModule.updateMany(args);
-    },
-    deleteManyTestModules: (parent, args, ctx) => {
-      return ctx.TestModule.deleteMany(args);
-    }
-  },
-  Subscription: {}
-});
diff --git a/packages/server/src/modules/testModule/schema.graphql b/packages/server/src/modules/testModule/schema.graphql
deleted file mode 100644
index 6733ddc2c6..0000000000
--- a/packages/server/src/modules/testModule/schema.graphql
+++ /dev/null
@@ -1,72 +0,0 @@
-### schema type definitions
-type TestModule {
-  id: Int!
-  name: String!
-}
-
-### end schema type definitions
-
-type TestModuleConnection {
-  pageInfo: PageInfo
-  edges: [TestModule]
-}
-
-type TestModuleData {
-  node: TestModule
-}
-
-type TestModulePayload {
-  node: TestModule
-  errors: [FieldError!]
-}
-
-input TestModuleFilterInput {
-  searchText: String
-}
-
-input TestModuleCreateInput {
-  name: String!
-}
-
-input TestModuleUpdateInput {
-  name: String
-}
-
-input TestModuleWhereUniqueInput {
-  id: Int!
-}
-
-input TestModuleWhereInput {
-  id_in: [Int!]
-}
-
-extend type Query {
-  testModules(
-    limit: Int
-    offset: Int
-    orderBy: OrderByInput
-    filter: TestModuleFilterInput
-  ): [TestModule]
-  testModulesConnection(
-    limit: Int
-    offset: Int
-    orderBy: OrderByInput
-    filter: TestModuleFilterInput
-  ): TestModuleConnection!
-  testModule(where: TestModuleWhereUniqueInput!): TestModuleData
-}
-
-extend type Mutation {
-  createTestModule(data: TestModuleCreateInput!): TestModulePayload!
-  updateTestModule(
-    data: TestModuleUpdateInput!
-    where: TestModuleWhereUniqueInput!
-  ): TestModulePayload!
-  deleteTestModule(where: TestModuleWhereUniqueInput!): TestModulePayload!
-  sortTestModules(data: [Int!]): BatchPayload!
-  updateManyTestModules(
-    data: TestModuleUpdateInput!
-    where: TestModuleWhereInput!
-  ): BatchPayload!
-  deleteManyTestModules(where: TestModuleWhereInput!): BatchPayload!
-}
diff --git a/packages/server/src/modules/testModule/schema.js b/packages/server/src/modules/testModule/schema.js
deleted file mode 100644
index 84dbfde72e..0000000000
--- a/packages/server/src/modules/testModule/schema.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import DomainSchema, { Schema } from 'domain-schema';
-
-export class TestModule extends Schema {
-  __ = { name: 'TestModule', tablePrefix: '' };
-  id = DomainSchema.Int;
-  name = {
-    type: String,
-    searchText: true
-  };
-}
-
-export const TestModuleSchema = new DomainSchema(TestModule);
diff --git a/packages/server/src/modules/testModule/sql.js b/packages/server/src/modules/testModule/sql.js
deleted file mode 100644
index 18edc2abcd..0000000000
--- a/packages/server/src/modules/testModule/sql.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { TestModuleSchema } from './schema';
-import Crud from '../../sql/crud';
-
-export default class TestModule extends Crud {
-  constructor() {
-    super();
-    this.schema = TestModuleSchema;
-  }
-}

From 8cc1ae0eb4444667fda6d1f3db7e5730d78b7ea8 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Mon, 19 Feb 2018 14:55:25 +0100
Subject: [PATCH 103/327] move onSubmit to utills/crud

---
 .../common/components/crud/EditView.jsx       |  5 +-
 .../common/components/crud/EditView.web.jsx   |  6 +-
 .../common/components/crud/FormView.web.jsx   |  5 +-
 .../client/src/modules/common/util.web.jsx    | 59 +-------------
 packages/client/src/utils/crud.js             | 77 +++++++++++++++++++
 .../crud/client/containers/ModuleEdit.jsx     | 30 +-------
 6 files changed, 86 insertions(+), 96 deletions(-)
 create mode 100644 packages/client/src/utils/crud.js

diff --git a/packages/client/src/modules/common/components/crud/EditView.jsx b/packages/client/src/modules/common/components/crud/EditView.jsx
index ced65dad32..adfece7b4c 100644
--- a/packages/client/src/modules/common/components/crud/EditView.jsx
+++ b/packages/client/src/modules/common/components/crud/EditView.jsx
@@ -4,7 +4,7 @@ import { StyleSheet, Text, View } from 'react-native';
 
 import FormView from './FormView';
 
-const EditView = ({ loading, data, navigation, onSubmit }) => {
+const EditView = ({ loading, data, navigation }) => {
   let dataObj = data;
 
   if (!dataObj && navigation.state) {
@@ -18,14 +18,13 @@ const EditView = ({ loading, data, navigation, onSubmit }) => {
       </View>
     );
   } else {
-    return <FormView onSubmit={onSubmit} initialValues={dataObj ? dataObj : {}} />;
+    return <FormView initialValues={dataObj ? dataObj : {}} />;
   }
 };
 
 EditView.propTypes = {
   loading: PropTypes.bool.isRequired,
   data: PropTypes.object,
-  onSubmit: PropTypes.func.isRequired,
   navigation: PropTypes.object.isRequired
 };
 
diff --git a/packages/client/src/modules/common/components/crud/EditView.web.jsx b/packages/client/src/modules/common/components/crud/EditView.web.jsx
index 2c9b930639..ff17ebc919 100644
--- a/packages/client/src/modules/common/components/crud/EditView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/EditView.web.jsx
@@ -11,8 +11,6 @@ class EditView extends React.PureComponent {
   static propTypes = {
     loading: PropTypes.bool.isRequired,
     data: PropTypes.object,
-    onSubmit: PropTypes.func.isRequired,
-    schema: PropTypes.object.isRequired,
     title: PropTypes.string.isRequired,
     link: PropTypes.string.isRequired
   };
@@ -30,7 +28,7 @@ class EditView extends React.PureComponent {
   );
 
   render() {
-    const { loading, data, onSubmit, schema, title, link } = this.props;
+    const { loading, data, title, link } = this.props;
 
     if (loading && !data) {
       return (
@@ -49,7 +47,7 @@ class EditView extends React.PureComponent {
           <h2>
             {data ? 'Edit' : 'Create'} {title}
           </h2>
-          <FormView onSubmit={onSubmit} data={data} schema={schema} />
+          <FormView {...this.props} />
         </PageLayout>
       );
     }
diff --git a/packages/client/src/modules/common/components/crud/FormView.web.jsx b/packages/client/src/modules/common/components/crud/FormView.web.jsx
index d876ce8cf1..6ad76d76c7 100644
--- a/packages/client/src/modules/common/components/crud/FormView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/FormView.web.jsx
@@ -2,6 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { withFormik } from 'formik';
 
+import { onSubmit } from '../../../../utils/crud';
 import { createFormFields, mapFormPropsToValues } from '../../util';
 import { Form, FormItem, Button, Alert } from '../web';
 //import { minLength, required, validateForm } from '../../../../../../common/validation';
@@ -61,8 +62,8 @@ FormView.propTypes = {
 
 const FormWithFormik = withFormik({
   mapPropsToValues: ({ schema, data: { node } }) => mapFormPropsToValues(schema, node),
-  async handleSubmit(values, { setSubmitting, props: { onSubmit } }) {
-    await onSubmit(values, setSubmitting);
+  async handleSubmit(values, { props: { schema, updateEntry, createEntry, title, data: { node } } }) {
+    await onSubmit(schema, values, updateEntry, createEntry, title, node);
   },
   //validate: values => validate(values),
   displayName: 'Form' // helps with React DevTools
diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index e2d79fb2f3..7dc45915f5 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -1,7 +1,7 @@
 /* eslint-disable react/display-name */
 import React from 'react';
 import PropTypes from 'prop-types';
-import { startCase, isEqual } from 'lodash';
+import { startCase } from 'lodash';
 import { Link } from 'react-router-dom';
 
 import Field from '../../utils/FieldAdapter';
@@ -252,63 +252,6 @@ export const createFormFields = (
   return fields;
 };
 
-export const pickInputFields = (schema, values, node = null) => {
-  let inputValues = {};
-
-  for (const key of schema.keys()) {
-    if (key in values) {
-      const value = schema.values[key];
-      if (value.type.isSchema) {
-        if (values[key]) {
-          inputValues[`${key}Id`] = Number(values[key].id ? values[key].id : values[key]);
-        }
-      } else if (key !== 'id' && value.type.constructor !== Array) {
-        inputValues[key] = values[key];
-      } else if (value.type.constructor === Array) {
-        const keys1 = {};
-        const keys2 = {};
-
-        let create = [];
-        let update = [];
-        let deleted = [];
-
-        node[key].forEach(item => {
-          keys1[item.id] = item;
-        });
-
-        values[key].forEach(item => {
-          keys2[item.id] = item;
-        });
-
-        node[key].forEach(item => {
-          const obj = keys2[item.id];
-          if (!obj) {
-            deleted.push({ id: item.id });
-          } else {
-            if (!isEqual(obj, item)) {
-              update.push({ where: { id: obj.id }, data: pickInputFields(value.type[0], obj) });
-            }
-          }
-        });
-
-        values[key].forEach(item => {
-          if (!keys1[item.id]) {
-            create.push(pickInputFields(value.type[0], item));
-          }
-        });
-
-        //console.log('created: ', create);
-        //console.log('updated: ', update);
-        //console.log('deleted: ', deleted);
-
-        inputValues[key] = { create, update, delete: deleted };
-      }
-    }
-  }
-
-  return inputValues;
-};
-
 class EditableCell extends React.Component {
   static propTypes = {
     value: PropTypes.string,
diff --git a/packages/client/src/utils/crud.js b/packages/client/src/utils/crud.js
new file mode 100644
index 0000000000..dd2f887d29
--- /dev/null
+++ b/packages/client/src/utils/crud.js
@@ -0,0 +1,77 @@
+import { isEqual } from 'lodash';
+
+export const onSubmit = async (schema, values, updateEntry, createEntry, title, node = null) => {
+  let result = null;
+  const insertValues = pickInputFields(schema, values, node);
+
+  if (node) {
+    result = await updateEntry(insertValues, { id: node.id });
+  } else {
+    result = await createEntry(insertValues);
+  }
+
+  if (result && result.errors) {
+    let submitError = {
+      _error: `Edit ${title} failed!`
+    };
+    result.errors.map(error => (submitError[error.field] = error.message));
+    throw new submitError();
+  }
+};
+
+export const pickInputFields = (schema, values, node = null) => {
+  let inputValues = {};
+
+  for (const key of schema.keys()) {
+    if (key in values) {
+      const value = schema.values[key];
+      if (value.type.isSchema) {
+        if (values[key]) {
+          inputValues[`${key}Id`] = Number(values[key].id ? values[key].id : values[key]);
+        }
+      } else if (key !== 'id' && value.type.constructor !== Array) {
+        inputValues[key] = values[key];
+      } else if (value.type.constructor === Array) {
+        const keys1 = {};
+        const keys2 = {};
+
+        let create = [];
+        let update = [];
+        let deleted = [];
+
+        node[key].forEach(item => {
+          keys1[item.id] = item;
+        });
+
+        values[key].forEach(item => {
+          keys2[item.id] = item;
+        });
+
+        node[key].forEach(item => {
+          const obj = keys2[item.id];
+          if (!obj) {
+            deleted.push({ id: item.id });
+          } else {
+            if (!isEqual(obj, item)) {
+              update.push({ where: { id: obj.id }, data: pickInputFields(value.type[0], obj) });
+            }
+          }
+        });
+
+        values[key].forEach(item => {
+          if (!keys1[item.id]) {
+            create.push(pickInputFields(value.type[0], item));
+          }
+        });
+
+        //console.log('created: ', create);
+        //console.log('updated: ', update);
+        //console.log('deleted: ', deleted);
+
+        inputValues[key] = { create, update, delete: deleted };
+      }
+    }
+  }
+
+  return inputValues;
+};
diff --git a/tools/templates/crud/client/containers/ModuleEdit.jsx b/tools/templates/crud/client/containers/ModuleEdit.jsx
index cf8716f130..59736ded97 100644
--- a/tools/templates/crud/client/containers/ModuleEdit.jsx
+++ b/tools/templates/crud/client/containers/ModuleEdit.jsx
@@ -3,42 +3,14 @@ import PropTypes from 'prop-types';
 import { graphql, compose } from 'react-apollo';
 
 import { EditView } from '../../common/components/crud';
-import { pickInputFields } from '../../common/util';
 import { $Module$Schema } from '../../../../../server/src/modules/$module$/schema';
 import $MODULE$_QUERY from '../graphql/$Module$Query.graphql';
 import CREATE_$MODULE$ from '../graphql/Create$Module$.graphql';
 import UPDATE_$MODULE$ from '../graphql/Update$Module$.graphql';
 
 class $Module$Edit extends React.Component {
-  static propTypes = {
-    data: PropTypes.object,
-    createEntry: PropTypes.func.isRequired,
-    updateEntry: PropTypes.func.isRequired,
-    title: PropTypes.string.isRequired
-  };
-
-  onSubmit = async values => {
-    const { data: { node }, createEntry, updateEntry, title } = this.props;
-    let result = null;
-    const insertValues = pickInputFields($Module$Schema, values, node);
-
-    if (node) {
-      result = await updateEntry(insertValues, { id: node.id });
-    } else {
-      result = await createEntry(insertValues);
-    }
-
-    if (result && result.errors) {
-      let submitError = {
-        _error: `Edit ${title} failed!`
-      };
-      result.errors.map(error => (submitError[error.field] = error.message));
-      throw new submitError();
-    }
-  };
-
   render() {
-    return <EditView {...this.props} onSubmit={this.onSubmit} schema={$Module$Schema} />;
+    return <EditView {...this.props} schema={$Module$Schema} />;
   }
 }
 

From 8129357a5f61f0d740a0f22eabd9438a4f1bfa51 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Mon, 19 Feb 2018 15:19:34 +0100
Subject: [PATCH 104/327] remove unused prop types

---
 tools/templates/crud/client/containers/ModuleEdit.jsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/templates/crud/client/containers/ModuleEdit.jsx b/tools/templates/crud/client/containers/ModuleEdit.jsx
index 59736ded97..da0aa60059 100644
--- a/tools/templates/crud/client/containers/ModuleEdit.jsx
+++ b/tools/templates/crud/client/containers/ModuleEdit.jsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { graphql, compose } from 'react-apollo';
 
 import { EditView } from '../../common/components/crud';

From a6ca21c7f6f2d6d500751645606a4028df535dd8 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 20 Feb 2018 15:10:13 +0100
Subject: [PATCH 105/327] update crud to work with formik, update to latest
 domain-*

---
 .../common/components/crud/FormView.web.jsx   |  17 ++-
 .../common/components/crud/ListView.web.jsx   |  19 ++-
 .../web/ui-antd/components/RenderDate.jsx     |   3 +-
 .../web/ui-antd/components/RenderSelect.jsx   |  83 ++++++-----
 .../web/ui-antd/components/RenderSwitch.jsx   |  52 ++++---
 .../client/src/modules/common/util.web.jsx    | 133 +++++++++++-------
 packages/client/src/utils/FieldAdapter.jsx    |   7 +-
 .../client/src/utils/FieldArrayAdapter.jsx    |  27 ----
 packages/client/src/utils/crud.js             |   4 +
 packages/server/package.json                  |   9 +-
 tools/cli/module.js                           |   4 +-
 .../client/graphql/ModuleState.client.graphql |   1 +
 .../templates/crud/client/resolvers/index.js  |   3 +-
 .../crud/database/migrations/_Module.js       |   2 +-
 tools/templates/crud/server/schema.js         |   2 +-
 yarn.lock                                     |  56 ++++----
 16 files changed, 236 insertions(+), 186 deletions(-)
 delete mode 100644 packages/client/src/utils/FieldArrayAdapter.jsx

diff --git a/packages/client/src/modules/common/components/crud/FormView.web.jsx b/packages/client/src/modules/common/components/crud/FormView.web.jsx
index 6ad76d76c7..92198c1fb0 100644
--- a/packages/client/src/modules/common/components/crud/FormView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/FormView.web.jsx
@@ -37,10 +37,20 @@ const formItemLayout = {
 
 //const validate = values => validateForm(values, formSchema);
 
-const FormView = ({ handleChange, handleSubmit, values, data, error, schema }) => {
+const FormView = ({
+  handleChange,
+  setFieldValue,
+  handleBlur,
+  setFieldTouched,
+  handleSubmit,
+  values,
+  data,
+  error,
+  schema
+}) => {
   return (
     <Form name="post" onSubmit={handleSubmit}>
-      {createFormFields(handleChange, schema, values, data, formItemLayout)}
+      {createFormFields(handleChange, setFieldValue, handleBlur, setFieldTouched, schema, values, data, formItemLayout)}
       {error && <Alert color="error">{error}</Alert>}
       <FormItem {...tailFormItemLayout}>
         <Button color="primary" type="submit">
@@ -53,6 +63,9 @@ const FormView = ({ handleChange, handleSubmit, values, data, error, schema }) =
 
 FormView.propTypes = {
   handleChange: PropTypes.func,
+  setFieldValue: PropTypes.func,
+  handleBlur: PropTypes.func,
+  setFieldTouched: PropTypes.func,
   handleSubmit: PropTypes.func,
   data: PropTypes.object,
   schema: PropTypes.object,
diff --git a/packages/client/src/modules/common/components/crud/ListView.web.jsx b/packages/client/src/modules/common/components/crud/ListView.web.jsx
index 380951d82b..1ce95fcdf4 100644
--- a/packages/client/src/modules/common/components/crud/ListView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/ListView.web.jsx
@@ -5,8 +5,8 @@ import { Link } from 'react-router-dom';
 import { withFormik } from 'formik';
 import { DragDropContext, DragSource, DropTarget } from 'react-dnd';
 import HTML5Backend from 'react-dnd-html5-backend';
-import { Table, Button, Popconfirm, Form, FormItem, Row, Col } from '../web';
-import { createColumnFields, createFormFields } from '../../util';
+import { Table, Button, Popconfirm, Row, Col } from '../web';
+import { createColumnFields } from '../../util';
 
 function dragDirection(dragIndex, hoverIndex, initialClientOffset, clientOffset, sourceClientOffset) {
   const hoverMiddleY = (initialClientOffset.y - sourceClientOffset.y) / 2;
@@ -109,8 +109,6 @@ class ListView extends React.Component {
     loadMoreRows: PropTypes.func.isRequired,
     schema: PropTypes.object.isRequired,
     link: PropTypes.string.isRequired,
-    handleChange: PropTypes.func,
-    handleSubmit: PropTypes.func,
     submitting: PropTypes.bool,
     customTableColumns: PropTypes.object
   };
@@ -215,7 +213,7 @@ class ListView extends React.Component {
   };
 
   render() {
-    const { loading, data, loadMoreRows, schema, link, handleChange, handleSubmit, customTableColumns } = this.props;
+    const { loading, data, loadMoreRows, schema, link, customTableColumns } = this.props;
     const { selectedRowKeys } = this.state;
     const hasSelected = selectedRowKeys.length > 0;
 
@@ -252,15 +250,16 @@ class ListView extends React.Component {
             </Popconfirm>
           </Col>
           <Col span={21}>
+            {/*
             <Form layout="inline" name="post" onSubmit={handleSubmit}>
               {createFormFields(handleChange, schema, {}, {}, null, '', true)}
-              {/*error && <Alert color="error">{error}</Alert>*/}
-              <FormItem>
-                <Button color="primary" type="submit" disabled={!hasSelected} loading={loading && !data}>
-                  Update
+            <FormItem>
+              <Button color="primary" type="submit" disabled={!hasSelected} loading={loading && !data}>
+                Update
                 </Button>
-              </FormItem>
+            </FormItem>
             </Form>
+          */}
           </Col>
         </Row>
       );
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderDate.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderDate.jsx
index f27265c34a..950e9e9072 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderDate.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderDate.jsx
@@ -11,7 +11,8 @@ const RenderDate = ({ input: { value, onChange, ...inputRest }, label, formItemL
   if (touched && error) {
     validateStatus = 'error';
   }
-  if (value !== '') {
+
+  if (value !== 'null') {
     value = moment(value, dateFormat);
   } else {
     value = null;
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx
index 2bf373180d..beec2c1d32 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx
@@ -5,43 +5,54 @@ import { FormItem } from './index';
 
 const Option = Select.Option;
 
-const RenderField = ({ input: { value, ...inputRest }, label, data, formItemLayout, meta: { touched, error } }) => {
-  let validateStatus = '';
-  if (touched && error) {
-    validateStatus = 'error';
-  }
+export default class RenderSelect extends React.Component {
+  static propTypes = {
+    data: PropTypes.array,
+    input: PropTypes.object,
+    label: PropTypes.string,
+    formItemLayout: PropTypes.object,
+    meta: PropTypes.object
+  };
+
+  handleChange = value => {
+    const { input: { onChange, name } } = this.props;
+    //console.log('RenderSelect: handleChange');
+    //console.log('name:', name);
+    //console.log('value:', value);
+    onChange(name, value);
+  };
 
-  const options = data
-    ? data.map(opt => (
-        <Option key={opt.id} value={opt.id.toString()}>
-          {opt.name}
-        </Option>
-      ))
-    : null;
+  render() {
+    const { input: { value, ...inputRest }, label, data, formItemLayout, meta: { touched, error } } = this.props;
 
-  return (
-    <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={error}>
-      <div>
-        <Select
-          showSearch
-          {...inputRest}
-          defaultValue={value.name}
-          optionFilterProp="children"
-          filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
-        >
-          {options}
-        </Select>
-      </div>
-    </FormItem>
-  );
-};
+    let validateStatus = '';
+    if (touched && error) {
+      validateStatus = 'error';
+    }
 
-RenderField.propTypes = {
-  data: PropTypes.array,
-  input: PropTypes.object,
-  label: PropTypes.string,
-  formItemLayout: PropTypes.object,
-  meta: PropTypes.object
-};
+    const options = data
+      ? data.map(opt => (
+          <Option key={opt.id} value={opt.id.toString()}>
+            {opt.name}
+          </Option>
+        ))
+      : null;
 
-export default RenderField;
+    return (
+      <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={error}>
+        <div>
+          <Select
+            showSearch
+            {...inputRest}
+            onChange={this.handleChange}
+            defaultValue={value ? String(value) : ''}
+            optionFilterProp="children"
+            filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
+          >
+            {options}
+          </Select>
+        </div>
+      </FormItem>
+    );
+  }
+}
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSwitch.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSwitch.jsx
index c06b51a7a9..eb8a0cd559 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSwitch.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSwitch.jsx
@@ -2,27 +2,37 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { FormItem, Switch } from './index';
 
-const RenderField = ({ input: { value, ...restInput }, label, formItemLayout, meta: { touched, error } }) => {
-  let validateStatus = '';
-  if (touched && error) {
-    validateStatus = 'error';
-  }
+export default class RenderSwitch extends React.Component {
+  static propTypes = {
+    input: PropTypes.object,
+    label: PropTypes.string,
+    type: PropTypes.string,
+    formItemLayout: PropTypes.object,
+    meta: PropTypes.object
+  };
+
+  handleChange = value => {
+    const { input: { onChange, name } } = this.props;
+    //console.log('RenderSwitch: handleChange');
+    //console.log('name:', name);
+    //console.log('value:', value);
+    onChange(name, value);
+  };
 
-  return (
-    <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
-      <div>
-        <Switch defaultChecked={!!value} {...restInput} />
-      </div>
-    </FormItem>
-  );
-};
+  render() {
+    const { input: { value }, label, formItemLayout, meta: { touched, error } } = this.props;
 
-RenderField.propTypes = {
-  input: PropTypes.object,
-  label: PropTypes.string,
-  type: PropTypes.string,
-  formItemLayout: PropTypes.object,
-  meta: PropTypes.object
-};
+    let validateStatus = '';
+    if (touched && error) {
+      validateStatus = 'error';
+    }
 
-export default RenderField;
+    return (
+      <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
+        <div>
+          <Switch defaultChecked={!!value} onChange={this.handleChange} />
+        </div>
+      </FormItem>
+    );
+  }
+}
diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index 7dc45915f5..e2e0105ae3 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -3,9 +3,9 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { startCase } from 'lodash';
 import { Link } from 'react-router-dom';
+import { FieldArray } from 'formik';
 
 import Field from '../../utils/FieldAdapter';
-import FieldArray from '../../utils/FieldArrayAdapter';
 import {
   RenderField,
   RenderSelect,
@@ -75,7 +75,7 @@ export const createColumnFields = (
             return <Switch checked={text} onClick={() => hendleUpdate(data, record.id)} />;
           }
         });
-      } else if (value.type.constructor !== Array) {
+      } else if (hasTypeOf(String)) {
         columns.push({
           title: (
             <a onClick={e => orderBy(e, key)} href="#">
@@ -89,15 +89,31 @@ export const createColumnFields = (
               customTableColumns[key]['render'](text, record)
             ) : (
               <EditableCell
-                value={
+                value={String(
                   customTableColumns[key] && customTableColumns[key]['render']
                     ? customTableColumns[key]['render'](text, record)
                     : text
-                }
+                )}
                 onChange={onCellChange(key, record.id, hendleUpdate)}
               />
             )
         });
+      } else if (value.type.constructor !== Array) {
+        columns.push({
+          title: (
+            <a onClick={e => orderBy(e, key)} href="#">
+              {startCase(key)} {renderOrderByArrow(key)}
+            </a>
+          ),
+          dataIndex: key,
+          key: key,
+          render: (text, record) =>
+            customTableColumns[key] && customTableColumns[key]['render']
+              ? customTableColumns[key]['render'](text, record)
+              : customTableColumns[key] && customTableColumns[key]['render']
+                ? customTableColumns[key]['render'](text, record)
+                : text
+        });
       }
     }
   }
@@ -136,46 +152,18 @@ const tailFormItemLayout = {
   }
 };
 
-const RenderEntry = ({ handleChange, fields, formdata, formItemLayout, schema, meta: { error, submitFailed } }) => (
-  <Row>
-    <Col span={12} offset={6}>
-      {fields.map((field, index) => (
-        <div key={index} className="field-array-form">
-          {createFormFields(handleChange, schema, formdata, formItemLayout, `${field}.`)}
-          <FormItem {...tailFormItemLayout}>
-            <Button color="primary" size="sm" onClick={() => fields.remove(index)}>
-              Delete
-            </Button>
-          </FormItem>
-        </div>
-      ))}
-      <FormItem {...tailFormItemLayout}>
-        {submitFailed && error && <span>{error}</span>}
-        <Button color="dashed" onClick={() => fields.push({})} style={{ width: '180px' }}>
-          Add field
-        </Button>
-      </FormItem>
-    </Col>
-  </Row>
-);
-
-RenderEntry.propTypes = {
-  handleChange: PropTypes.func,
-  fields: PropTypes.object,
-  formdata: PropTypes.object,
-  schema: PropTypes.object,
-  meta: PropTypes.object,
-  formItemLayout: PropTypes.object
-};
-
 export const mapFormPropsToValues = (schema, formdata) => {
   let fields = {};
-
   for (const key of schema.keys()) {
     const value = schema.values[key];
-
     if (key !== 'id' && value.show !== false && value.type.constructor !== Array) {
-      fields[key] = formdata ? formdata[key] : '';
+      if (value.type.isSchema) {
+        fields[key] = formdata && formdata[key] ? formdata[key].id : '';
+      } else {
+        fields[key] = formdata ? formdata[key] : '';
+      }
+    } else if (value.type.constructor === Array) {
+      fields[key] = formdata ? formdata[key] : [];
     }
   }
 
@@ -184,6 +172,9 @@ export const mapFormPropsToValues = (schema, formdata) => {
 
 export const createFormFields = (
   handleChange,
+  setFieldValue,
+  handleBlur,
+  setFieldTouched,
   schema,
   values = {},
   formdata,
@@ -207,13 +198,19 @@ export const createFormFields = (
 
       let component = RenderField;
       let data = null;
-      let value = values ? values[key] : '';
+      const value = values ? values[key] : '';
+      let onChange = handleChange;
+      let onBlur = handleBlur;
 
       if (type.isSchema) {
         component = RenderSelect;
         data = formdata[`${key}s`];
+        onChange = setFieldValue;
+        onBlur = setFieldTouched;
       } else if (hasTypeOf(Boolean)) {
         component = RenderSwitch;
+        onChange = setFieldValue;
+        onBlur = setFieldTouched;
       } else if (hasTypeOf(Date)) {
         component = RenderDate;
       }
@@ -229,22 +226,54 @@ export const createFormFields = (
           label={startCase(key)}
           //validate={validate}
           formItemLayout={formItemLayout}
-          onChange={handleChange}
+          onChange={onChange}
+          onBlur={onBlur}
         />
       );
     } else {
       if (value.type.constructor === Array && !batch) {
-        fields.push(
-          <FieldArray
-            name={key}
-            key={key}
-            component={RenderEntry}
-            schema={value.type[0]}
-            formdata={formdata}
-            formItemLayout={formItemLayout}
-            handleChange={handleChange}
-          />
-        );
+        if (formdata.node[key]) {
+          fields.push(
+            <FieldArray
+              name={key}
+              key={key}
+              render={({ push, remove }) => {
+                return (
+                  <Row>
+                    <Col span={12} offset={6}>
+                      {values[key].map((field, index) => (
+                        <div key={index} className="field-array-form">
+                          {createFormFields(
+                            handleChange,
+                            setFieldValue,
+                            handleBlur,
+                            setFieldTouched,
+                            value.type[0],
+                            mapFormPropsToValues(value.type[0], field),
+                            formdata,
+                            formItemLayout,
+                            `${key}[${index}].`
+                          )}
+                          <FormItem {...tailFormItemLayout}>
+                            <Button color="primary" size="sm" onClick={() => remove(index)}>
+                              Delete
+                            </Button>
+                          </FormItem>
+                        </div>
+                      ))}
+                      <FormItem {...tailFormItemLayout}>
+                        {/*submitFailed && error && <span>{error}</span>*/}
+                        <Button color="dashed" onClick={() => push({})} style={{ width: '180px' }}>
+                          Add field
+                        </Button>
+                      </FormItem>
+                    </Col>
+                  </Row>
+                );
+              }}
+            />
+          );
+        }
       }
     }
   }
diff --git a/packages/client/src/utils/FieldAdapter.jsx b/packages/client/src/utils/FieldAdapter.jsx
index 5d63c27866..5f54b239ae 100644
--- a/packages/client/src/utils/FieldAdapter.jsx
+++ b/packages/client/src/utils/FieldAdapter.jsx
@@ -9,8 +9,9 @@ export default class FieldAdapter extends Component {
   static propTypes = {
     component: PropTypes.func,
     onChange: PropTypes.func,
+    onBlur: PropTypes.func,
     name: PropTypes.string.isRequired,
-    value: PropTypes.string,
+    value: PropTypes.oneOfType([PropTypes.bool, PropTypes.string, PropTypes.number]),
     defaultValue: PropTypes.string,
     checked: PropTypes.bool,
     defaultChecked: PropTypes.bool,
@@ -26,7 +27,7 @@ export default class FieldAdapter extends Component {
 
   render() {
     const { formik } = this.context;
-    const { component, name, value, defaultValue, checked, defaultChecked, onChange, disabled } = this.props;
+    const { component, name, value, defaultValue, checked, defaultChecked, onChange, onBlur, disabled } = this.props;
 
     const meta = {
       touched: formik.touched[name],
@@ -35,7 +36,7 @@ export default class FieldAdapter extends Component {
 
     const input = {
       onChange,
-      onBlur: formik.handleBlur,
+      onBlur,
       name,
       value,
       checked,
diff --git a/packages/client/src/utils/FieldArrayAdapter.jsx b/packages/client/src/utils/FieldArrayAdapter.jsx
deleted file mode 100644
index 3faf485722..0000000000
--- a/packages/client/src/utils/FieldArrayAdapter.jsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-
-export default class FieldArrayAdapter extends Component {
-  static contextTypes = {
-    formik: PropTypes.object
-  };
-
-  static propTypes = {
-    component: PropTypes.func
-  };
-
-  constructor(props, context) {
-    super(props, context);
-    if (!context.formik) {
-      throw new Error('FieldArray must be inside a component decorated with formik()');
-    }
-  }
-
-  render() {
-    const { component } = this.props;
-
-    return React.createElement(component, {
-      ...this.props
-    });
-  }
-}
diff --git a/packages/client/src/utils/crud.js b/packages/client/src/utils/crud.js
index dd2f887d29..f8a891eebb 100644
--- a/packages/client/src/utils/crud.js
+++ b/packages/client/src/utils/crud.js
@@ -21,6 +21,8 @@ export const onSubmit = async (schema, values, updateEntry, createEntry, title,
 
 export const pickInputFields = (schema, values, node = null) => {
   let inputValues = {};
+  //console.log('pickInputFields');
+  //console.log(values);
 
   for (const key of schema.keys()) {
     if (key in values) {
@@ -73,5 +75,7 @@ export const pickInputFields = (schema, values, node = null) => {
     }
   }
 
+  //console.log('inputValues:', inputValues);
+
   return inputValues;
 };
diff --git a/packages/server/package.json b/packages/server/package.json
index 56b371b516..a25ad57bdb 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -71,10 +71,11 @@
     "bcryptjs": "^2.4.3",
     "body-parser": "^1.18.2",
     "cors": "^2.8.4",
-    "domain-graphql": "^0.0.20",
-    "domain-knex": "^0.0.20",
-    "domain-react-forms": "^0.0.20",
-    "domain-schema": "^0.0.20",
+    "@domain-schema/graphql": "^0.0.30",
+    "@domain-schema/knex": "^0.0.30",
+    "@domain-schema/formik": "^0.0.30",
+    "@domain-schema/core": "^0.0.30",
+    "@domain-schema/validation": "^0.0.30",
     "dotenv": "^4.0.0",
     "error-stack-parser": "^2.0.1",
     "express": "^4.16.2",
diff --git a/tools/cli/module.js b/tools/cli/module.js
index 4a091acbd7..01b17c4169 100644
--- a/tools/cli/module.js
+++ b/tools/cli/module.js
@@ -1,8 +1,8 @@
 const shell = require('shelljs');
 const fs = require('fs');
 const chalk = require('chalk');
-const DomainSchema = require('domain-schema').default;
-const GraphQLGenerator = require('domain-graphql').default;
+const DomainSchema = require('@domain-schema/core').default;
+const GraphQLGenerator = require('@domain-schema/graphql').default;
 const { pascalize, camelize, decamelize } = require('humps');
 const { startCase } = require('lodash');
 
diff --git a/tools/templates/crud/client/graphql/ModuleState.client.graphql b/tools/templates/crud/client/graphql/ModuleState.client.graphql
index f376329a92..3f90a1f774 100644
--- a/tools/templates/crud/client/graphql/ModuleState.client.graphql
+++ b/tools/templates/crud/client/graphql/ModuleState.client.graphql
@@ -1,4 +1,5 @@
 fragment $Module$StateInfo on $Module$State {
+  limit
   orderBy {
     column
     order
diff --git a/tools/templates/crud/client/resolvers/index.js b/tools/templates/crud/client/resolvers/index.js
index e051b952da..815db58b21 100644
--- a/tools/templates/crud/client/resolvers/index.js
+++ b/tools/templates/crud/client/resolvers/index.js
@@ -8,6 +8,7 @@ const TYPE_$MODULE$_STATE_ORDER_BY = 'OrderBy$Module$Input';
 
 const defaults = {
   $module$State: {
+    limit: 25,
     orderBy: {
       column: '',
       order: '',
@@ -33,7 +34,7 @@ const resolvers = {
       cache.writeData({
         data: {
           $module$State: new$Module$State,
-          __type: TYPE_TESTMODULE_STATE
+          __type: TYPE_$MODULE$_STATE
         }
       });
 
diff --git a/tools/templates/crud/database/migrations/_Module.js b/tools/templates/crud/database/migrations/_Module.js
index 9992b5e3b5..e88e86f020 100644
--- a/tools/templates/crud/database/migrations/_Module.js
+++ b/tools/templates/crud/database/migrations/_Module.js
@@ -1,4 +1,4 @@
-import KnexGenerator from 'domain-knex';
+import KnexGenerator from '@domain-schema/knex';
 
 import { $Module$Schema } from '../../modules/$module$/schema';
 
diff --git a/tools/templates/crud/server/schema.js b/tools/templates/crud/server/schema.js
index 1cb2436525..f5e22eed34 100644
--- a/tools/templates/crud/server/schema.js
+++ b/tools/templates/crud/server/schema.js
@@ -1,4 +1,4 @@
-import DomainSchema, { Schema } from 'domain-schema';
+import DomainSchema, { Schema } from '@domain-schema/core';
 
 export class $Module$ extends Schema {
   __ = { name: '$Module$', tablePrefix: '' };
diff --git a/yarn.lock b/yarn.lock
index 58207f8a53..1aea08be0c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -75,6 +75,37 @@
     lodash "^4.2.0"
     to-fast-properties "^2.0.0"
 
+"@domain-schema/core@^0.0.30":
+  version "0.0.30"
+  resolved "https://registry.yarnpkg.com/@domain-schema/core/-/core-0.0.30.tgz#53ed07001ed364afef0852aad3683adfbfb89d94"
+  dependencies:
+    debug "^3.1.0"
+
+"@domain-schema/formik@^0.0.30":
+  version "0.0.30"
+  resolved "https://registry.yarnpkg.com/@domain-schema/formik/-/formik-0.0.30.tgz#99d086f0c908a88554e350f4827e3bac34297db0"
+  dependencies:
+    debug "^3.1.0"
+
+"@domain-schema/graphql@^0.0.30":
+  version "0.0.30"
+  resolved "https://registry.yarnpkg.com/@domain-schema/graphql/-/graphql-0.0.30.tgz#27daaca798ffe889daac642c45ffa110b27a6429"
+  dependencies:
+    debug "^3.1.0"
+
+"@domain-schema/knex@^0.0.30":
+  version "0.0.30"
+  resolved "https://registry.yarnpkg.com/@domain-schema/knex/-/knex-0.0.30.tgz#ceea5d0b5a79a9b7fbf2bd64374252ef9279dcb9"
+  dependencies:
+    debug "^3.1.0"
+    humps "^2.0.1"
+
+"@domain-schema/validation@^0.0.30":
+  version "0.0.30"
+  resolved "https://registry.yarnpkg.com/@domain-schema/validation/-/validation-0.0.30.tgz#217a944f2f1c5887988fb7bcfa3dcf80790cec75"
+  dependencies:
+    debug "^3.1.0"
+
 "@expo/bunyan@^1.8.10":
   version "1.8.10"
   resolved "https://registry.yarnpkg.com/@expo/bunyan/-/bunyan-1.8.10.tgz#7d19354a6bce85aae5fea0e973569d3f0142533e"
@@ -4154,31 +4185,6 @@ domain-browser@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
 
-domain-graphql@^0.0.20:
-  version "0.0.20"
-  resolved "https://registry.yarnpkg.com/domain-graphql/-/domain-graphql-0.0.20.tgz#8cf31e4d1c7e0f65dc0c1beb215ba40febe4f927"
-  dependencies:
-    debug "^3.1.0"
-
-domain-knex@^0.0.20:
-  version "0.0.20"
-  resolved "https://registry.yarnpkg.com/domain-knex/-/domain-knex-0.0.20.tgz#5090277e5a395792c78a644647c1ffa1884980ca"
-  dependencies:
-    debug "^3.1.0"
-    humps "^2.0.1"
-
-domain-react-forms@^0.0.20:
-  version "0.0.20"
-  resolved "https://registry.yarnpkg.com/domain-react-forms/-/domain-react-forms-0.0.20.tgz#26d0bfa86d6ac99cf59609549741e568e802bce9"
-  dependencies:
-    debug "^3.1.0"
-
-domain-schema@^0.0.20:
-  version "0.0.20"
-  resolved "https://registry.yarnpkg.com/domain-schema/-/domain-schema-0.0.20.tgz#5d7d9293d69ec0e816463a019bde00ff92cb8750"
-  dependencies:
-    debug "^3.1.0"
-
 domelementtype@1, domelementtype@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"

From d0be12ac859bb329fe3ff355ed605b827a59a358 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 23 Feb 2018 06:58:23 +0100
Subject: [PATCH 106/327] implement edit related data on table inline, batch
 update, autocomplete on select input, refactor fetching related data

---
 packages/client/package.json                  |   6 +-
 .../common/components/crud/FormView.web.jsx   |   3 +-
 .../common/components/crud/ListView.web.jsx   | 109 +++++++--
 .../web/ui-antd/components/RenderDate.jsx     |  70 +++---
 .../web/ui-antd/components/RenderSelect.jsx   | 125 ++++++++--
 .../client/src/modules/common/util.web.jsx    | 219 +++++++++++++++---
 packages/client/src/utils/FieldAdapter.jsx    |   2 +-
 packages/client/src/utils/crud.js             |   6 +-
 tools/cli/module.js                           |  19 +-
 .../crud/client/containers/ModuleQuery.jsx    |  27 +++
 .../crud/client/graphql/ModuleQuery.graphql   |   2 -
 tools/templates/crud/server/resolvers.js      |   4 -
 yarn.lock                                     |  14 +-
 13 files changed, 463 insertions(+), 143 deletions(-)
 create mode 100644 tools/templates/crud/client/containers/ModuleQuery.jsx

diff --git a/packages/client/package.json b/packages/client/package.json
index 7d83c4c390..26236be54a 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -37,6 +37,7 @@
   "author": "SysGears INC",
   "license": "MIT",
   "dependencies": {
+    "@domain-schema/core": "^0.0.30",
     "antd": "^3.2.0",
     "apollo-cache-inmemory": "^1.1.4",
     "apollo-client": "^2.1.0",
@@ -44,20 +45,21 @@
     "apollo-fetch-upload": "^1.2.0",
     "apollo-link": "^1.0.6",
     "apollo-link-batch-http": "^1.0.3",
-    "apollo-link-state": "^0.3.1",
     "apollo-link-schema": "^1.0.2",
+    "apollo-link-state": "^0.3.1",
     "apollo-link-ws": "^1.0.3",
     "apollo-logger": "0.1.1",
     "babel-polyfill": "^6.26.0",
     "bootstrap": "4.0.0-beta.2",
     "error-stack-parser": "^2.0.1",
     "filesize": "^3.5.11",
-    "formik": "^0.10.5",
+    "formik": "^0.11.10",
     "graphql": "^0.12.3",
     "graphql-auth": "^0.2.0",
     "graphql-iso-date": "^3.3.0",
     "graphql-tag": "^2.6.0",
     "history": "^4.7.2",
+    "humps": "^2.0.1",
     "immutability-helper": "^2.6.2",
     "jwt-decode": "^2.2.0",
     "lodash": "^4.17.4",
diff --git a/packages/client/src/modules/common/components/crud/FormView.web.jsx b/packages/client/src/modules/common/components/crud/FormView.web.jsx
index 92198c1fb0..38f7b16d58 100644
--- a/packages/client/src/modules/common/components/crud/FormView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/FormView.web.jsx
@@ -44,13 +44,12 @@ const FormView = ({
   setFieldTouched,
   handleSubmit,
   values,
-  data,
   error,
   schema
 }) => {
   return (
     <Form name="post" onSubmit={handleSubmit}>
-      {createFormFields(handleChange, setFieldValue, handleBlur, setFieldTouched, schema, values, data, formItemLayout)}
+      {createFormFields(handleChange, setFieldValue, handleBlur, setFieldTouched, schema, values, formItemLayout)}
       {error && <Alert color="error">{error}</Alert>}
       <FormItem {...tailFormItemLayout}>
         <Button color="primary" type="submit">
diff --git a/packages/client/src/modules/common/components/crud/ListView.web.jsx b/packages/client/src/modules/common/components/crud/ListView.web.jsx
index 1ce95fcdf4..2fb611b382 100644
--- a/packages/client/src/modules/common/components/crud/ListView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/ListView.web.jsx
@@ -5,8 +5,9 @@ import { Link } from 'react-router-dom';
 import { withFormik } from 'formik';
 import { DragDropContext, DragSource, DropTarget } from 'react-dnd';
 import HTML5Backend from 'react-dnd-html5-backend';
-import { Table, Button, Popconfirm, Row, Col } from '../web';
-import { createColumnFields } from '../../util';
+import { Table, Button, Popconfirm, Row, Col, Form, FormItem } from '../web';
+import { createColumnFields, createFormFields, mapFormPropsToValues } from '../../util';
+import { pickInputFields } from '../../../../utils/crud';
 
 function dragDirection(dragIndex, hoverIndex, initialClientOffset, clientOffset, sourceClientOffset) {
   const hoverMiddleY = (initialClientOffset.y - sourceClientOffset.y) / 2;
@@ -110,7 +111,15 @@ class ListView extends React.Component {
     schema: PropTypes.object.isRequired,
     link: PropTypes.string.isRequired,
     submitting: PropTypes.bool,
-    customTableColumns: PropTypes.object
+    customTableColumns: PropTypes.object,
+    handleChange: PropTypes.func,
+    setFieldValue: PropTypes.func,
+    handleBlur: PropTypes.func,
+    setFieldTouched: PropTypes.func,
+    handleSubmit: PropTypes.func,
+    values: PropTypes.object,
+    setValues: PropTypes.func,
+    status: PropTypes.object
   };
 
   state = {
@@ -118,6 +127,14 @@ class ListView extends React.Component {
     loading: false
   };
 
+  componentWillReceiveProps(nextProps) {
+    const { status } = this.props;
+
+    if (nextProps.status !== status) {
+      this.setState({ selectedRowKeys: [] });
+    }
+  }
+
   components = {
     body: {
       row: BodyRow
@@ -206,17 +223,36 @@ class ListView extends React.Component {
     return onOrderBy({ column: name, order });
   };
 
-  rowSelection = {
-    onChange: selectedRowKeys => {
-      this.setState({ selectedRowKeys });
-    }
-  };
-
   render() {
-    const { loading, data, loadMoreRows, schema, link, customTableColumns } = this.props;
+    const {
+      loading,
+      data,
+      loadMoreRows,
+      schema,
+      link,
+      customTableColumns,
+      handleSubmit,
+      handleChange,
+      setFieldValue,
+      handleBlur,
+      setFieldTouched,
+      values
+    } = this.props;
     const { selectedRowKeys } = this.state;
     const hasSelected = selectedRowKeys.length > 0;
 
+    const rowSelection = {
+      selectedRowKeys,
+      onChange: selectedRowKeys => {
+        this.setState({ selectedRowKeys });
+
+        this.props.setValues({
+          ...this.props.values,
+          selectedRowKeys: selectedRowKeys
+        });
+      }
+    };
+
     const title = () => {
       return (
         <Link to={`/${link}/0`}>
@@ -250,16 +286,27 @@ class ListView extends React.Component {
             </Popconfirm>
           </Col>
           <Col span={21}>
-            {/*
-            <Form layout="inline" name="post" onSubmit={handleSubmit}>
-              {createFormFields(handleChange, schema, {}, {}, null, '', true)}
-            <FormItem>
-              <Button color="primary" type="submit" disabled={!hasSelected} loading={loading && !data}>
-                Update
-                </Button>
-            </FormItem>
-            </Form>
-          */}
+            {
+              <Form layout="inline" name="post" onSubmit={handleSubmit}>
+                {createFormFields(
+                  handleChange,
+                  setFieldValue,
+                  handleBlur,
+                  setFieldTouched,
+                  schema,
+                  values,
+                  {},
+                  null,
+                  '',
+                  true
+                )}
+                <FormItem>
+                  <Button color="primary" type="submit" disabled={!hasSelected} loading={loading && !data}>
+                    Update
+                  </Button>
+                </FormItem>
+              </Form>
+            }
           </Col>
         </Row>
       );
@@ -281,7 +328,7 @@ class ListView extends React.Component {
       columns: columns,
       agination: false,
       size: 'small',
-      rowSelection: this.rowSelection,
+      rowSelection: rowSelection,
       loading: loading && !data,
       title: title,
       footer: footer
@@ -309,10 +356,22 @@ class ListView extends React.Component {
 }
 
 const ListViewWithFormik = withFormik({
-  async handleSubmit(values, { resetForm, props: { onSubmit } }) {
-    await onSubmit(values);
-    resetForm();
-  }
+  mapPropsToValues: ({ schema }) => mapFormPropsToValues(schema, {}),
+  async handleSubmit(values, { resetForm, setStatus, props: { updateManyEntries, schema } }) {
+    //console.log('handleSubmit values:', values);
+
+    const { selectedRowKeys, ...restValues } = values;
+    const insertValues = pickInputFields(schema, restValues);
+    //console.log('handleSubmit selectedRowKeys:', selectedRowKeys);
+    //console.log('handleSubmit insertValues:', insertValues);
+
+    if (selectedRowKeys && Object.keys(insertValues).length > 0) {
+      await updateManyEntries(insertValues, { id_in: selectedRowKeys });
+      setStatus({ submitted: true });
+      resetForm();
+    }
+  },
+  displayName: 'BatchUpdateForm'
 });
 
 export default ListViewWithFormik(DragDropContext(HTML5Backend)(ListView));
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderDate.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderDate.jsx
index 950e9e9072..1ffb05fbb3 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderDate.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderDate.jsx
@@ -6,38 +6,46 @@ import { FormItem } from './index';
 
 const dateFormat = 'YYYY-MM-DD';
 
-const RenderDate = ({ input: { value, onChange, ...inputRest }, label, formItemLayout, meta: { touched, error } }) => {
-  let validateStatus = '';
-  if (touched && error) {
-    validateStatus = 'error';
-  }
+export default class RenderDate extends React.Component {
+  static propTypes = {
+    input: PropTypes.object,
+    label: PropTypes.string,
+    type: PropTypes.string,
+    formItemLayout: PropTypes.object,
+    meta: PropTypes.object
+  };
 
-  if (value !== 'null') {
-    value = moment(value, dateFormat);
-  } else {
-    value = null;
-  }
+  handleChange = (date, dateString) => {
+    const { input: { onChange, name } } = this.props;
+    //console.log('RenderDate: handleChange');
+    //console.log('name:', name);
+    //console.log('dateString:', dateString);
+    onChange(name, dateString);
+  };
 
-  return (
-    <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
-      <div>
-        <DatePicker
-          value={value}
-          format={dateFormat}
-          onChange={(date, dateString) => onChange(dateString)}
-          {...inputRest}
-        />
-      </div>
-    </FormItem>
-  );
-};
+  render() {
+    const { input: { value, onChange, ...inputRest }, label, formItemLayout, meta: { touched, error } } = this.props;
 
-RenderDate.propTypes = {
-  input: PropTypes.object,
-  label: PropTypes.string,
-  type: PropTypes.string,
-  formItemLayout: PropTypes.object,
-  meta: PropTypes.object
-};
+    let validateStatus = '';
+    if (touched && error) {
+      validateStatus = 'error';
+    }
 
-export default RenderDate;
+    let formatedValue = value;
+    if (value !== null && value !== undefined && value !== '') {
+      formatedValue = moment(value, dateFormat);
+    } else {
+      formatedValue = null;
+    }
+    //console.log('value:', value);
+    //console.log('typeof value:', typeof value);
+    //console.log('formatedValue:', formatedValue);
+    return (
+      <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
+        <div>
+          <DatePicker value={formatedValue} format={dateFormat} onChange={this.handleChange} {...inputRest} />
+        </div>
+      </FormItem>
+    );
+  }
+}
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx
index beec2c1d32..0c314596a0 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx
@@ -1,56 +1,135 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import Select from 'antd/lib/select';
+import Spin from 'antd/lib/spin';
+import { pascalize, camelize } from 'humps';
+
 import { FormItem } from './index';
 
 const Option = Select.Option;
 
 export default class RenderSelect extends React.Component {
   static propTypes = {
-    data: PropTypes.array,
     input: PropTypes.object,
     label: PropTypes.string,
     formItemLayout: PropTypes.object,
-    meta: PropTypes.object
+    meta: PropTypes.object,
+    schemaName: PropTypes.string,
+    style: PropTypes.object
+  };
+
+  state = {
+    searchText: '',
+    dirty: false
   };
 
-  handleChange = value => {
+  handleChange = ({ key, label }) => {
     const { input: { onChange, name } } = this.props;
     //console.log('RenderSelect: handleChange');
     //console.log('name:', name);
-    //console.log('value:', value);
-    onChange(name, value);
+    //console.log('key:', key);
+    //console.log('label:', label);
+    onChange(name, { id: key, name: label });
+  };
+
+  search = value => {
+    const { dirty } = this.state;
+    //onsole.log('search:', value);
+    if ((value && value.length >= 2) || dirty) {
+      this.setState({ searchText: value, dirty: true });
+    }
   };
 
   render() {
-    const { input: { value, ...inputRest }, label, data, formItemLayout, meta: { touched, error } } = this.props;
+    const {
+      input: { value, onChange, ...inputRest },
+      label,
+      schemaName,
+      style,
+      formItemLayout,
+      meta: { touched, error }
+    } = this.props;
+    const { searchText, dirty } = this.state;
 
     let validateStatus = '';
     if (touched && error) {
       validateStatus = 'error';
     }
 
-    const options = data
-      ? data.map(opt => (
-          <Option key={opt.id} value={opt.id.toString()}>
-            {opt.name}
-          </Option>
-        ))
-      : null;
+    const camelizeSchemaName = camelize(schemaName);
+    const pascalizeSchemaName = pascalize(schemaName);
+    let formatedValue =
+      value && value != '' && value != undefined
+        ? { key: value.id.toString(), label: value.name }
+        : { key: '', label: '' };
 
+    // eslint-disable-next-line import/no-dynamic-require
+    const Query = require(`../../../../../${camelizeSchemaName}/containers/${pascalizeSchemaName}Query`)['default'];
+    //console.log(`../../../../../${camelizeSchemaName}/containers/${pascalizeSchemaName}Query`);
+
+    let defaultStyle = { width: '100%' };
+    if (style) {
+      defaultStyle = style;
+    }
     return (
       <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={error}>
         <div>
-          <Select
-            showSearch
-            {...inputRest}
-            onChange={this.handleChange}
-            defaultValue={value ? String(value) : ''}
-            optionFilterProp="children"
-            filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
-          >
-            {options}
-          </Select>
+          <Query limit={10} filter={{ searchText }}>
+            {({ loading, data }) => {
+              if (!loading || data) {
+                const options = data.edges
+                  ? data.edges.map(opt => (
+                      <Option key={opt.id} value={opt.id.toString()}>
+                        {opt.name}
+                      </Option>
+                    ))
+                  : null;
+
+                let props = {
+                  showSearch: true,
+                  labelInValue: true,
+                  dropdownMatchSelectWidth: false,
+                  style: defaultStyle,
+                  onChange: this.handleChange,
+                  ...inputRest,
+                  defaultValue: formatedValue
+                };
+
+                if (data.pageInfo.totalCount > 10) {
+                  if (data.edges && value && value != '' && value != undefined) {
+                    if (!data.edges.find(node => node.id === value.id)) {
+                      if (!dirty) {
+                        options.unshift(
+                          <Option key={value.id} value={value.id.toString()}>
+                            {value.name}
+                          </Option>
+                        );
+                      } else {
+                        formatedValue = { key: data.edges[0].id.toString(), label: data.edges[0].name };
+                      }
+                    }
+                  }
+
+                  props = {
+                    ...props,
+                    filterOption: false,
+                    defaultValue: formatedValue,
+                    onSearch: this.search
+                  };
+                } else {
+                  props = {
+                    ...props,
+                    optionFilterProp: 'children',
+                    filterOption: (input, option) =>
+                      option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                  };
+                }
+                return React.createElement(Select, props, options);
+              } else {
+                return <Spin size="small" />;
+              }
+            }}
+          </Query>
         </div>
       </FormItem>
     );
diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index e2e0105ae3..248a3f3e6c 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -2,8 +2,14 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { startCase } from 'lodash';
+import { pascalize, camelize } from 'humps';
 import { Link } from 'react-router-dom';
 import { FieldArray } from 'formik';
+import Select from 'antd/lib/select';
+import DatePicker from 'antd/lib/date-picker';
+import Spin from 'antd/lib/spin';
+import moment from 'moment';
+import DomainSchema from '@domain-schema/core';
 
 import Field from '../../utils/FieldAdapter';
 import {
@@ -21,6 +27,8 @@ import {
   Icon
 } from './components/web';
 
+const dateFormat = 'YYYY-MM-DD';
+
 export const createColumnFields = (
   schema,
   link,
@@ -35,10 +43,14 @@ export const createColumnFields = (
 
   for (const key of schema.keys()) {
     const value = schema.values[key];
-    const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
-
-    if (value.show !== false && key !== 'id') {
+    const hasTypeOf = targetType =>
+      value.type === targetType || value.type.prototype instanceof targetType || value.type instanceof targetType;
+    //console.log(key);
+    //console.log(hasTypeOf(DomainSchema));
+    if (value.show !== false && (key !== 'id' || customTableColumns['id'])) {
       if (value.type.isSchema) {
+        //console.log(value.type);
+
         let sortBy = 'name';
         for (const remoteKey of value.type.keys()) {
           const remoteValue = value.type.values[remoteKey];
@@ -55,9 +67,23 @@ export const createColumnFields = (
           dataIndex: key,
           key: key,
           width: 300,
-          render: text => {
-            return text[sortBy];
-          }
+          render: (text, record) =>
+            customTableColumns[key] && customTableColumns[key]['render'] ? (
+              customTableColumns[key]['render'](text, record)
+            ) : (
+              <EditableCell
+                value={text}
+                hasTypeOf={hasTypeOf}
+                schemaName={value.type.name}
+                record={record}
+                render={
+                  customTableColumns[key] && customTableColumns[key]['render']
+                    ? customTableColumns[key]['render']
+                    : text => text[sortBy]
+                }
+                onChange={onCellChange(`${key}Id`, record.id, hendleUpdate)}
+              />
+            )
         });
       } else if (hasTypeOf(Boolean)) {
         columns.push({
@@ -75,7 +101,7 @@ export const createColumnFields = (
             return <Switch checked={text} onClick={() => hendleUpdate(data, record.id)} />;
           }
         });
-      } else if (hasTypeOf(String)) {
+      } else if ((hasTypeOf(String) || hasTypeOf(Number) || hasTypeOf(Date)) && key !== 'id') {
         columns.push({
           title: (
             <a onClick={e => orderBy(e, key)} href="#">
@@ -84,19 +110,18 @@ export const createColumnFields = (
           ),
           dataIndex: key,
           key: key,
-          render: (text, record) =>
-            customTableColumns[key] && customTableColumns[key]['render'] ? (
-              customTableColumns[key]['render'](text, record)
-            ) : (
-              <EditableCell
-                value={String(
-                  customTableColumns[key] && customTableColumns[key]['render']
-                    ? customTableColumns[key]['render'](text, record)
-                    : text
-                )}
-                onChange={onCellChange(key, record.id, hendleUpdate)}
-              />
-            )
+          render: (text, record) => (
+            <EditableCell
+              value={text}
+              hasTypeOf={hasTypeOf}
+              render={
+                customTableColumns[key] && customTableColumns[key]['render']
+                  ? customTableColumns[key]['render']
+                  : text => text
+              }
+              onChange={onCellChange(key, record.id, hendleUpdate)}
+            />
+          )
         });
       } else if (value.type.constructor !== Array) {
         columns.push({
@@ -157,11 +182,7 @@ export const mapFormPropsToValues = (schema, formdata) => {
   for (const key of schema.keys()) {
     const value = schema.values[key];
     if (key !== 'id' && value.show !== false && value.type.constructor !== Array) {
-      if (value.type.isSchema) {
-        fields[key] = formdata && formdata[key] ? formdata[key].id : '';
-      } else {
-        fields[key] = formdata ? formdata[key] : '';
-      }
+      fields[key] = formdata ? formdata[key] : '';
     } else if (value.type.constructor === Array) {
       fields[key] = formdata ? formdata[key] : [];
     }
@@ -177,7 +198,6 @@ export const createFormFields = (
   setFieldTouched,
   schema,
   values = {},
-  formdata,
   formItemLayout,
   prefix = '',
   batch = false
@@ -197,22 +217,26 @@ export const createFormFields = (
       //}
 
       let component = RenderField;
-      let data = null;
       const value = values ? values[key] : '';
       let onChange = handleChange;
       let onBlur = handleBlur;
+      let style = {};
 
       if (type.isSchema) {
         component = RenderSelect;
-        data = formdata[`${key}s`];
         onChange = setFieldValue;
         onBlur = setFieldTouched;
+        if (batch) {
+          style = { width: 100 };
+        }
       } else if (hasTypeOf(Boolean)) {
         component = RenderSwitch;
         onChange = setFieldValue;
         onBlur = setFieldTouched;
       } else if (hasTypeOf(Date)) {
         component = RenderDate;
+        onChange = setFieldValue;
+        onBlur = setFieldTouched;
       }
 
       fields.push(
@@ -220,9 +244,10 @@ export const createFormFields = (
           name={`${prefix}${key}`}
           key={key}
           component={component}
-          data={data}
+          schemaName={type.name}
           value={value}
           type="text"
+          style={style}
           label={startCase(key)}
           //validate={validate}
           formItemLayout={formItemLayout}
@@ -232,7 +257,7 @@ export const createFormFields = (
       );
     } else {
       if (value.type.constructor === Array && !batch) {
-        if (formdata.node[key]) {
+        if (values[key]) {
           fields.push(
             <FieldArray
               name={key}
@@ -250,7 +275,6 @@ export const createFormFields = (
                             setFieldTouched,
                             value.type[0],
                             mapFormPropsToValues(value.type[0], field),
-                            formdata,
                             formItemLayout,
                             `${key}[${index}].`
                           )}
@@ -283,39 +307,162 @@ export const createFormFields = (
 
 class EditableCell extends React.Component {
   static propTypes = {
-    value: PropTypes.string,
+    value: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.object]),
+    record: PropTypes.object,
+    render: PropTypes.func,
+    hasTypeOf: PropTypes.func,
+    schemaName: PropTypes.string,
     onChange: PropTypes.func.isRequired
   };
 
   state = {
     value: this.props.value,
+    searchText: '',
+    dirty: false,
     editable: false
   };
+  componentWillReceiveProps(nextProps) {
+    const { value } = this.props;
+
+    if (nextProps.value !== value) {
+      this.setState({ value: nextProps.value });
+    }
+  }
   handleChange = e => {
     const value = e.target.value;
     this.setState({ value });
   };
+  handleDateChange = (date, dateString) => {
+    this.setState({ value: dateString });
+  };
+  handleSelectChange = ({ key, label }) => {
+    this.setState({ value: { id: key, name: label } });
+  };
   check = () => {
+    const { hasTypeOf } = this.props;
+
     this.setState({ editable: false });
     if (this.props.onChange) {
-      this.props.onChange(this.state.value);
+      if (hasTypeOf(DomainSchema)) {
+        //console.log('check:', this.state.value);
+        this.props.onChange(this.state.value.id);
+      } else {
+        //console.log('check:', this.state.value);
+        this.props.onChange(this.state.value);
+      }
+    }
+  };
+  search = value => {
+    const { dirty } = this.state;
+    //console.log('search:', value);
+    if ((value && value.length >= 2) || dirty) {
+      this.setState({ searchText: value, dirty: true });
     }
   };
   edit = () => {
     this.setState({ editable: true });
   };
   render() {
-    const { value, editable } = this.state;
+    const { value, record, searchText, dirty, editable } = this.state;
+    const { render, hasTypeOf, schemaName } = this.props;
+
+    let input = null;
+    if (editable) {
+      let formatedValue = value;
+      //console.log(value);
+      input = <Input value={formatedValue} onChange={this.handleChange} onPressEnter={this.check} />;
+      if (hasTypeOf(Date)) {
+        if (value !== null && value !== '') {
+          formatedValue = moment(value, dateFormat);
+        } else {
+          formatedValue = null;
+        }
+
+        input = (
+          <DatePicker
+            value={formatedValue}
+            format={dateFormat}
+            onChange={this.handleDateChange}
+            onPressEnter={this.check}
+          />
+        );
+      } else if (hasTypeOf(DomainSchema)) {
+        const Option = Select.Option;
+        const camelizeSchemaName = camelize(schemaName);
+        const pascalizeSchemaName = pascalize(schemaName);
+
+        let formatedValue = { key: value.id.toString(), label: value.name };
+        // eslint-disable-next-line import/no-dynamic-require
+        const Query = require(`../${camelizeSchemaName}/containers/${pascalizeSchemaName}Query`)['default'];
+
+        input = (
+          <Query limit={10} filter={{ searchText }}>
+            {({ loading, data }) => {
+              if (!loading || data) {
+                const options = data.edges
+                  ? data.edges.map(opt => (
+                      <Option key={opt.id} value={opt.id.toString()}>
+                        {opt.name}
+                      </Option>
+                    ))
+                  : null;
+
+                let props = {
+                  showSearch: true,
+                  labelInValue: true,
+                  dropdownMatchSelectWidth: false,
+                  style: { width: '100%' },
+                  onChange: this.handleSelectChange,
+                  defaultValue: formatedValue
+                };
+
+                if (data.pageInfo.totalCount > 10) {
+                  if (data.edges) {
+                    if (!data.edges.find(node => node.id === value.id)) {
+                      if (!dirty) {
+                        options.unshift(
+                          <Option key={value.id} value={value.id.toString()}>
+                            {value.name}
+                          </Option>
+                        );
+                      } else {
+                        formatedValue = { key: data.edges[0].id.toString() };
+                      }
+                    }
+                  }
+
+                  props = {
+                    ...props,
+                    filterOption: false,
+                    onSearch: this.search
+                  };
+                } else {
+                  props = {
+                    ...props,
+                    optionFilterProp: 'children',
+                    filterOption: (input, option) =>
+                      option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                  };
+                }
+                return React.createElement(Select, props, options);
+              } else {
+                return <Spin size="small" />;
+              }
+            }}
+          </Query>
+        );
+      }
+    }
     return (
       <div className="editable-cell">
         {editable ? (
           <div className="editable-cell-input-wrapper">
-            <Input value={value} onChange={this.handleChange} onPressEnter={this.check} />
+            {input}
             <Icon type="check" className="editable-cell-icon-check" onClick={this.check} />
           </div>
         ) : (
           <div className="editable-cell-text-wrapper">
-            {value || '\u00A0'}
+            {render(value, record) || '\u00A0'}
             <Icon type="edit" className="editable-cell-icon" onClick={this.edit} />
           </div>
         )}
diff --git a/packages/client/src/utils/FieldAdapter.jsx b/packages/client/src/utils/FieldAdapter.jsx
index 5f54b239ae..fb2839f4ae 100644
--- a/packages/client/src/utils/FieldAdapter.jsx
+++ b/packages/client/src/utils/FieldAdapter.jsx
@@ -11,7 +11,7 @@ export default class FieldAdapter extends Component {
     onChange: PropTypes.func,
     onBlur: PropTypes.func,
     name: PropTypes.string.isRequired,
-    value: PropTypes.oneOfType([PropTypes.bool, PropTypes.string, PropTypes.number]),
+    value: PropTypes.oneOfType([PropTypes.bool, PropTypes.string, PropTypes.number, PropTypes.object]),
     defaultValue: PropTypes.string,
     checked: PropTypes.bool,
     defaultChecked: PropTypes.bool,
diff --git a/packages/client/src/utils/crud.js b/packages/client/src/utils/crud.js
index f8a891eebb..afa9717837 100644
--- a/packages/client/src/utils/crud.js
+++ b/packages/client/src/utils/crud.js
@@ -25,12 +25,10 @@ export const pickInputFields = (schema, values, node = null) => {
   //console.log(values);
 
   for (const key of schema.keys()) {
-    if (key in values) {
+    if (key in values && values[key]) {
       const value = schema.values[key];
       if (value.type.isSchema) {
-        if (values[key]) {
-          inputValues[`${key}Id`] = Number(values[key].id ? values[key].id : values[key]);
-        }
+        inputValues[`${key}Id`] = Number(values[key].id ? values[key].id : values[key]);
       } else if (key !== 'id' && value.type.constructor !== Array) {
         inputValues[key] = values[key];
       } else if (value.type.constructor === Array) {
diff --git a/tools/cli/module.js b/tools/cli/module.js
index 01b17c4169..a6d1735f7c 100644
--- a/tools/cli/module.js
+++ b/tools/cli/module.js
@@ -215,7 +215,7 @@ function updateSchema(logger, module) {
           let required = value.optional ? '' : '!';
           inputCreate += `  ${key}Id: Int${required}\n`;
           inputUpdate += `  ${key}Id: Int\n`;
-          moduleData += `  ${key}s(limit: Int, orderBy: OrderByInput): [${value.type.name}]\n`;
+          //moduleData += `  ${key}s(limit: Int, orderBy: OrderByInput): [${value.type.name}]\n`;
         } else if (value.type.constructor !== Array) {
           if (key !== 'id') {
             inputCreate += `  ${key}: ${generateField(value)}\n`;
@@ -293,14 +293,14 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
 
       const resolverFile = `resolvers.js`;
       let replace = '';
-      moduleData = '';
+      //moduleData = '';
       for (const key of schema.keys()) {
         const value = schema.values[key];
         if (value.type.isSchema) {
-          moduleData += `    ${key}s(obj, args, ctx, info) {
+          /*moduleData += `    ${key}s(obj, args, ctx, info) {
       return ctx.${value.type.name}.getList(args, info);
     },
-`;
+`;*/
         } else if (value.type.constructor === Array) {
           replace += `  ${schema.name}: {
     ${key}: createBatchResolver((sources, args, ctx, info) => {
@@ -310,6 +310,7 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
     })
   },
 `;
+          /*
           for (const remoteKey of value.type[0].keys()) {
             const remoteValue = value.type[0].values[remoteKey];
             if (remoteValue.type.isSchema) {
@@ -318,10 +319,10 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
     },
 `;
             }
-          }
+          }*/
         }
       }
-
+      /*
       if (moduleData !== '') {
         moduleData = `${moduleData.replace(/,\s*$/, '')}
 `;
@@ -335,7 +336,7 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
             .cat(resolverFile)
             .replace(RegExp(replaceModuleData, 'g'), `// related data\n${moduleData}    // end related data`)
         )
-        .to(resolverFile);
+        .to(resolverFile);*/
 
       // override batch resolvers in resolvers.js file
       const replaceBatchResolvers = `// schema batch resolvers([^*]+)// end schema batch resolvers`;
@@ -412,7 +413,7 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
     } else {
       logger.error(chalk.red(`✘ Fragment path ${pathFragment} not found!`));
     }
-
+    /*
     // get module query file
     const pathModuleQuery = `${__dirname}/../../packages/client/src/modules/${module}/graphql/`;
     if (fs.existsSync(pathModuleQuery)) {
@@ -466,7 +467,7 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
       logger.info(chalk.green(`✔ Module query in ${pathModuleQuery}${file} successfully updated!`));
     } else {
       logger.error(chalk.red(`✘ Module query path ${pathModuleQuery} not found!`));
-    }
+    }*/
   } else {
     logger.info(chalk.red(`✘ Module ${module} in path ${modulePath} not found!`));
   }
diff --git a/tools/templates/crud/client/containers/ModuleQuery.jsx b/tools/templates/crud/client/containers/ModuleQuery.jsx
new file mode 100644
index 0000000000..9d0a5f7f94
--- /dev/null
+++ b/tools/templates/crud/client/containers/ModuleQuery.jsx
@@ -0,0 +1,27 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { graphql } from 'react-apollo';
+
+import $MODULE$S_QUERY from '../graphql/$Module$sQuery.graphql';
+
+class $Module$sQuery extends React.Component {
+  static propTypes = {
+    children: PropTypes.func.isRequired,
+    loading: PropTypes.bool.isRequired,
+    data: PropTypes.object,
+    errors: PropTypes.object
+  };
+
+  render() {
+    const { loading, data, errors } = this.props;
+    return this.props.children({ loading, data, errors });
+  }
+}
+
+export default graphql($MODULE$S_QUERY, {
+  options: ({ limit, orderBy, filter }) => ({ variables: { limit, orderBy, filter } }),
+  props: ({ data: { loading, $module$sConnection, error } }) => {
+    if (error) throw new Error(error);
+    return { loading, data: $module$sConnection, errors: error ? error.graphQLErrors : null };
+  }
+})($Module$sQuery);
diff --git a/tools/templates/crud/client/graphql/ModuleQuery.graphql b/tools/templates/crud/client/graphql/ModuleQuery.graphql
index 49b7b0da73..76df5c5591 100644
--- a/tools/templates/crud/client/graphql/ModuleQuery.graphql
+++ b/tools/templates/crud/client/graphql/ModuleQuery.graphql
@@ -5,7 +5,5 @@ query $module$($where: $Module$WhereUniqueInput!) {
     node {
       ...$Module$Info
     }
-    ### form data
-    ### end form data
   }
 }
diff --git a/tools/templates/crud/server/resolvers.js b/tools/templates/crud/server/resolvers.js
index 83de83c52b..9d34a209c8 100644
--- a/tools/templates/crud/server/resolvers.js
+++ b/tools/templates/crud/server/resolvers.js
@@ -14,10 +14,6 @@ export default pubsub => ({
       return ctx.$Module$.get(args, info);
     }
   },
-  $Module$Data: {
-    // related data
-    // end related data
-  },
   // schema batch resolvers
   // end schema batch resolvers
   Mutation: {
diff --git a/yarn.lock b/yarn.lock
index 1aea08be0c..3ca277e8b7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5438,11 +5438,13 @@ formidable@^1.0.17, formidable@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.1.1.tgz#96b8886f7c3c3508b932d6bd70c4d3a88f35f1a9"
 
-formik@^0.10.5:
-  version "0.10.5"
-  resolved "https://registry.yarnpkg.com/formik/-/formik-0.10.5.tgz#6984d2f22e918c6d2264a3cb86b8582f7277faca"
+formik@^0.11.10:
+  version "0.11.11"
+  resolved "https://registry.yarnpkg.com/formik/-/formik-0.11.11.tgz#4b02838133c0196b1ef443aa973766cd097ec4a5"
   dependencies:
+    lodash.clonedeep "^4.5.0"
     lodash.isequal "4.5.0"
+    lodash.topath "4.5.2"
     prop-types "^15.5.10"
     warning "^3.0.0"
 
@@ -7782,7 +7784,7 @@ lodash.camelcase@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
 
-lodash.clonedeep@^4.3.2:
+lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
 
@@ -7992,6 +7994,10 @@ lodash.tonumber@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/lodash.tonumber/-/lodash.tonumber-4.0.3.tgz#0b96b31b35672793eb7f5a63ee791f1b9e9025d9"
 
+lodash.topath@4.5.2:
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/lodash.topath/-/lodash.topath-4.5.2.tgz#3616351f3bba61994a0931989660bd03254fd009"
+
 lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"

From 924a8560548cceab287513c473920da750d082a8 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Mon, 12 Mar 2018 10:35:46 +0100
Subject: [PATCH 107/327] update to latest crud

---
 .../common/components/crud/FilterView.web.jsx | 106 +++-
 .../common/components/crud/FormView.jsx       |  48 +-
 .../common/components/crud/FormView.web.jsx   |  81 ++-
 .../common/components/crud/ListView.web.jsx   | 162 +++--
 .../web/ui-antd/components/RenderField.jsx    |  86 ++-
 .../web/ui-antd/components/RenderInput.jsx    |  45 ++
 .../web/ui-antd/components/RenderSelect.jsx   |  42 +-
 .../web/ui-antd/components/RenderTextarea.jsx |  49 ++
 .../components/web/ui-antd/styles/styles.less |  16 +
 .../ui-bootstrap/components/RenderNumber.jsx  |  32 +
 .../components/RenderTextarea.jsx             |  32 +
 packages/client/src/modules/common/util.jsx   |   2 +-
 .../client/src/modules/common/util.web.jsx    | 567 +++++++++++-------
 packages/client/src/utils/FieldAdapter.jsx    |  22 +-
 packages/client/src/utils/crud.js             | 132 ++--
 packages/common/utils.js                      |   8 +
 packages/server/package.json                  |  10 +-
 packages/server/src/sql/crud.js               |  72 ++-
 packages/server/src/sql/helpers.js            |  34 +-
 tools/cli/module.js                           | 162 ++++-
 .../crud/client/components/Module.web.jsx     |   2 -
 .../crud/client/containers/ModuleFilter.jsx   |   9 +-
 .../crud/client/containers/ModuleList.jsx     |   8 +-
 .../client/graphql/ModuleState.client.graphql |   2 +
 .../templates/crud/client/resolvers/index.js  |  19 +-
 25 files changed, 1245 insertions(+), 503 deletions(-)
 create mode 100644 packages/client/src/modules/common/components/web/ui-antd/components/RenderInput.jsx
 create mode 100644 packages/client/src/modules/common/components/web/ui-antd/components/RenderTextarea.jsx
 create mode 100644 packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderNumber.jsx
 create mode 100644 packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderTextarea.jsx

diff --git a/packages/client/src/modules/common/components/crud/FilterView.web.jsx b/packages/client/src/modules/common/components/crud/FilterView.web.jsx
index c0364bb0c7..0a7b3ff03f 100644
--- a/packages/client/src/modules/common/components/crud/FilterView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/FilterView.web.jsx
@@ -1,32 +1,108 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import { Formik } from 'formik';
+
 import { DebounceInput } from 'react-debounce-input';
-import { Form, FormItem, Input } from '../web';
+import { Form, FormItem, Input, Row, Col, Button, Icon } from '../web';
+import { createFormFields } from '../../util';
+import { mapFormPropsToValues, pickInputFields } from '../../../../utils/crud';
+
+const formItemLayout = {
+  labelCol: {
+    xs: { span: 24 },
+    sm: { span: 8 }
+  },
+  wrapperCol: {
+    xs: { span: 24 },
+    sm: { span: 16 }
+  }
+};
 
 class FilterView extends React.PureComponent {
   static propTypes = {
+    schema: PropTypes.object.isRequired,
     searchText: PropTypes.string,
-    onSearchTextChange: PropTypes.func.isRequired
+    onFilterChange: PropTypes.func.isRequired,
+    customFields: PropTypes.object
+  };
+
+  state = {
+    expand: false
+  };
+
+  toggle = () => {
+    const { expand } = this.state;
+    this.setState({ expand: !expand });
   };
 
   handleSearch = e => {
-    const { onSearchTextChange } = this.props;
-    onSearchTextChange(e.target.value);
+    const { onFilterChange } = this.props;
+    onFilterChange({ searchText: e.target.value });
   };
 
   render() {
+    const { schema, onFilterChange, customFields } = this.props;
+    const { expand } = this.state;
+
+    if (customFields && customFields.constructor === Object && Object.keys(customFields).length === 0) {
+      return null;
+    }
+
     return (
-      <Form layout="inline">
-        <FormItem label="Filter">
-          <DebounceInput
-            minLength={2}
-            debounceTimeout={300}
-            placeholder="Search ..."
-            element={Input}
-            onChange={this.handleSearch}
-          />
-        </FormItem>
-      </Form>
+      <Formik
+        initialValues={mapFormPropsToValues({ schema, formType: 'filter' })}
+        onSubmit={values => {
+          //console.log('onSubmit, values:', values);
+          //console.log('onSubmit, pickInputFields values:', pickInputFields({ schema, values, formType: 'filter' }));
+          onFilterChange(pickInputFields({ schema, values, formType: 'filter' }));
+        }}
+        onReset={(values, formikBag) => {
+          //console.log('onReset, formikBag:', formikBag);
+          formikBag.resetForm();
+          onFilterChange({});
+        }}
+        render={({ values, setFieldValue, setFieldTouched, handleChange, handleBlur, handleSubmit, handleReset }) => (
+          <Form className="ant-advanced-search-form" onSubmit={handleSubmit}>
+            <Row>
+              <Col span={8}>
+                <FormItem label="Find" {...formItemLayout}>
+                  <DebounceInput
+                    minLength={2}
+                    debounceTimeout={300}
+                    placeholder="Search ..."
+                    element={Input}
+                    onChange={this.handleSearch}
+                  />
+                </FormItem>
+              </Col>
+              <Col span={16} style={{ textAlign: 'right' }}>
+                <Button type="primary" htmlType="submit">
+                  Search
+                </Button>
+                <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+                  Clear
+                </Button>
+                <a style={{ marginLeft: 8, fontSize: 12 }} onClick={this.toggle}>
+                  Advanced <Icon type={this.state.expand ? 'up' : 'down'} />
+                </a>
+              </Col>
+            </Row>
+            <Row gutter={24} style={{ display: expand ? 'block' : 'none' }}>
+              {createFormFields({
+                handleChange,
+                setFieldValue,
+                handleBlur,
+                setFieldTouched,
+                schema,
+                values,
+                formItemLayout,
+                prefix: '',
+                formType: 'filter'
+              })}
+            </Row>
+          </Form>
+        )}
+      />
     );
   }
 }
diff --git a/packages/client/src/modules/common/components/crud/FormView.jsx b/packages/client/src/modules/common/components/crud/FormView.jsx
index 0f29e7c970..44389113d3 100644
--- a/packages/client/src/modules/common/components/crud/FormView.jsx
+++ b/packages/client/src/modules/common/components/crud/FormView.jsx
@@ -1,39 +1,39 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { withFormik } from 'formik';
+import { Formik } from 'formik';
 
+import { onSubmit, mapFormPropsToValues } from '../../../../utils/crud';
 import { createFormFields } from '../../util';
 import { FormView, FormButton } from '../native';
-import { minLength, required, validateForm } from '../../../../../../common/validation';
+//import { minLength, required, validateForm } from '../../../../../../common/validation';
 
-const formSchema = {
-  name: [required, minLength(3)]
-};
+//const formSchema = {
+//  name: [required, minLength(3)]
+//};
 
-const validate = values => validateForm(values, formSchema);
+//const validate = values => validateForm(values, formSchema);
 
-const Form = ({ handleChange, handleSubmit, schema }) => {
+const Form = ({ schema, data: { node } }) => {
   return (
-    <FormView>
-      {createFormFields(handleChange, schema)}
-      <FormButton onPress={handleSubmit}>Save</FormButton>
-    </FormView>
+    <Formik
+      initialValues={mapFormPropsToValues({ schema, data: node })}
+      onSubmit={async values => {
+        //console.log('onSubmit, values:', pickInputFields({schema, values}));
+        await onSubmit({ schema, values });
+      }}
+      render={({ handleChange, handleSubmit }) => (
+        <FormView>
+          {createFormFields({ handleChange, schema })}
+          <FormButton onPress={handleSubmit}>Save</FormButton>
+        </FormView>
+      )}
+    />
   );
 };
 
 Form.propTypes = {
-  handleChange: PropTypes.func,
-  handleSubmit: PropTypes.func,
-  schema: PropTypes.object
+  schema: PropTypes.object.isRequired,
+  data: PropTypes.object
 };
 
-const FormWithFormik = withFormik({
-  async handleSubmit(values, { resetForm, props: { onSubmit } }) {
-    await onSubmit(values);
-    resetForm();
-  },
-  validate: values => validate(values),
-  displayName: 'Form' // helps with React DevTools
-});
-
-export default FormWithFormik(Form);
+export default Form;
diff --git a/packages/client/src/modules/common/components/crud/FormView.web.jsx b/packages/client/src/modules/common/components/crud/FormView.web.jsx
index 38f7b16d58..40ce98aecf 100644
--- a/packages/client/src/modules/common/components/crud/FormView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/FormView.web.jsx
@@ -1,10 +1,10 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { withFormik } from 'formik';
+import { Formik } from 'formik';
 
-import { onSubmit } from '../../../../utils/crud';
-import { createFormFields, mapFormPropsToValues } from '../../util';
-import { Form, FormItem, Button, Alert } from '../web';
+import { onSubmit, mapFormPropsToValues } from '../../../../utils/crud';
+import { createFormFields } from '../../util';
+import { Form, FormItem, Button } from '../web';
 //import { minLength, required, validateForm } from '../../../../../../common/validation';
 
 const tailFormItemLayout = {
@@ -37,48 +37,45 @@ const formItemLayout = {
 
 //const validate = values => validateForm(values, formSchema);
 
-const FormView = ({
-  handleChange,
-  setFieldValue,
-  handleBlur,
-  setFieldTouched,
-  handleSubmit,
-  values,
-  error,
-  schema
-}) => {
+const FormView = ({ schema, updateEntry, createEntry, title, customFields, data }) => {
   return (
-    <Form name="post" onSubmit={handleSubmit}>
-      {createFormFields(handleChange, setFieldValue, handleBlur, setFieldTouched, schema, values, formItemLayout)}
-      {error && <Alert color="error">{error}</Alert>}
-      <FormItem {...tailFormItemLayout}>
-        <Button color="primary" type="submit">
-          Save
-        </Button>
-      </FormItem>
-    </Form>
+    <Formik
+      initialValues={mapFormPropsToValues({ schema, data: data ? data.node : null })}
+      onSubmit={async values => {
+        //console.log('onSubmit, values:', pickInputFields({schema, values}));
+        await onSubmit({ schema, values, updateEntry, createEntry, title, data: data ? data.node : null });
+      }}
+      render={({ values, setFieldValue, setFieldTouched, handleChange, handleBlur, handleSubmit }) => (
+        <Form name="post" onSubmit={handleSubmit}>
+          {createFormFields({
+            handleChange,
+            setFieldValue,
+            handleBlur,
+            setFieldTouched,
+            schema,
+            values,
+            formItemLayout,
+            customFields
+          })}
+          {/*errors && <Alert color="error">{errors}</Alert>*/}
+          <FormItem {...tailFormItemLayout}>
+            <Button color="primary" type="submit">
+              Save
+            </Button>
+          </FormItem>
+        </Form>
+      )}
+    />
   );
 };
 
 FormView.propTypes = {
-  handleChange: PropTypes.func,
-  setFieldValue: PropTypes.func,
-  handleBlur: PropTypes.func,
-  setFieldTouched: PropTypes.func,
-  handleSubmit: PropTypes.func,
-  data: PropTypes.object,
-  schema: PropTypes.object,
-  values: PropTypes.object,
-  error: PropTypes.string
+  updateEntry: PropTypes.func.isRequired,
+  schema: PropTypes.object.isRequired,
+  createEntry: PropTypes.func.isRequired,
+  title: PropTypes.string.isRequired,
+  customFields: PropTypes.object,
+  data: PropTypes.object
 };
 
-const FormWithFormik = withFormik({
-  mapPropsToValues: ({ schema, data: { node } }) => mapFormPropsToValues(schema, node),
-  async handleSubmit(values, { props: { schema, updateEntry, createEntry, title, data: { node } } }) {
-    await onSubmit(schema, values, updateEntry, createEntry, title, node);
-  },
-  //validate: values => validate(values),
-  displayName: 'Form' // helps with React DevTools
-});
-
-export default FormWithFormik(FormView);
+export default FormView;
diff --git a/packages/client/src/modules/common/components/crud/ListView.web.jsx b/packages/client/src/modules/common/components/crud/ListView.web.jsx
index 2fb611b382..eb7bbea903 100644
--- a/packages/client/src/modules/common/components/crud/ListView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/ListView.web.jsx
@@ -2,12 +2,12 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Link } from 'react-router-dom';
-import { withFormik } from 'formik';
+import { Formik } from 'formik';
 import { DragDropContext, DragSource, DropTarget } from 'react-dnd';
 import HTML5Backend from 'react-dnd-html5-backend';
 import { Table, Button, Popconfirm, Row, Col, Form, FormItem } from '../web';
-import { createColumnFields, createFormFields, mapFormPropsToValues } from '../../util';
-import { pickInputFields } from '../../../../utils/crud';
+import { createColumnFields, createFormFields } from '../../util';
+import { mapFormPropsToValues, pickInputFields } from '../../../../utils/crud';
 
 function dragDirection(dragIndex, hoverIndex, initialClientOffset, clientOffset, sourceClientOffset) {
   const hoverMiddleY = (initialClientOffset.y - sourceClientOffset.y) / 2;
@@ -100,26 +100,20 @@ class ListView extends React.Component {
   static propTypes = {
     loading: PropTypes.bool.isRequired,
     data: PropTypes.object,
+    sortEntries: PropTypes.func.isRequired,
     orderBy: PropTypes.object,
-    onOrderBy: PropTypes.func.isRequired,
     updateEntry: PropTypes.func.isRequired,
     deleteEntry: PropTypes.func.isRequired,
-    sortEntries: PropTypes.func.isRequired,
+    onOrderBy: PropTypes.func.isRequired,
     deleteManyEntries: PropTypes.func.isRequired,
     updateManyEntries: PropTypes.func.isRequired,
     loadMoreRows: PropTypes.func.isRequired,
     schema: PropTypes.object.isRequired,
     link: PropTypes.string.isRequired,
-    submitting: PropTypes.bool,
-    customTableColumns: PropTypes.object,
-    handleChange: PropTypes.func,
-    setFieldValue: PropTypes.func,
-    handleBlur: PropTypes.func,
-    setFieldTouched: PropTypes.func,
-    handleSubmit: PropTypes.func,
-    values: PropTypes.object,
-    setValues: PropTypes.func,
-    status: PropTypes.object
+    customColumnFields: PropTypes.object,
+    customColumnActions: PropTypes.object,
+    customBatchFields: PropTypes.object,
+    tableScroll: PropTypes.object
   };
 
   state = {
@@ -127,14 +121,6 @@ class ListView extends React.Component {
     loading: false
   };
 
-  componentWillReceiveProps(nextProps) {
-    const { status } = this.props;
-
-    if (nextProps.status !== status) {
-      this.setState({ selectedRowKeys: [] });
-    }
-  }
-
   components = {
     body: {
       row: BodyRow
@@ -230,13 +216,11 @@ class ListView extends React.Component {
       loadMoreRows,
       schema,
       link,
-      customTableColumns,
-      handleSubmit,
-      handleChange,
-      setFieldValue,
-      handleBlur,
-      setFieldTouched,
-      values
+      customColumnFields = {},
+      customColumnActions = {},
+      customBatchFields,
+      updateManyEntries,
+      tableScroll = null
     } = this.props;
     const { selectedRowKeys } = this.state;
     const hasSelected = selectedRowKeys.length > 0;
@@ -245,14 +229,14 @@ class ListView extends React.Component {
       selectedRowKeys,
       onChange: selectedRowKeys => {
         this.setState({ selectedRowKeys });
-
-        this.props.setValues({
-          ...this.props.values,
-          selectedRowKeys: selectedRowKeys
-        });
       }
     };
 
+    let showBatchFields = true;
+    if (customBatchFields && customBatchFields.constructor === Object && Object.keys(customBatchFields).length === 0) {
+      showBatchFields = false;
+    }
+
     const title = () => {
       return (
         <Link to={`/${link}/0`}>
@@ -285,43 +269,61 @@ class ListView extends React.Component {
               </Button>
             </Popconfirm>
           </Col>
-          <Col span={21}>
-            {
-              <Form layout="inline" name="post" onSubmit={handleSubmit}>
-                {createFormFields(
-                  handleChange,
-                  setFieldValue,
-                  handleBlur,
-                  setFieldTouched,
-                  schema,
-                  values,
-                  {},
-                  null,
-                  '',
-                  true
+          {showBatchFields && (
+            <Col span={21}>
+              <Formik
+                initialValues={mapFormPropsToValues({ schema })}
+                onSubmit={async (values, { resetForm }) => {
+                  //console.log('handleSubmit values:', values);
+
+                  const insertValues = pickInputFields({ schema, values });
+                  //console.log('handleSubmit selectedRowKeys:', selectedRowKeys);
+                  //console.log('handleSubmit insertValues:', insertValues);
+
+                  if (selectedRowKeys && Object.keys(insertValues).length > 0) {
+                    await updateManyEntries(insertValues, { id_in: selectedRowKeys });
+                    this.setState({ selectedRowKeys: [] });
+                    resetForm();
+                  }
+                }}
+                render={({ values, setFieldValue, setFieldTouched, handleChange, handleBlur, handleSubmit }) => (
+                  <Form layout="inline" name="post" onSubmit={handleSubmit}>
+                    {createFormFields({
+                      handleChange,
+                      setFieldValue,
+                      handleBlur,
+                      setFieldTouched,
+                      schema,
+                      values,
+                      formItemLayout: {},
+                      prefix: '',
+                      formType: 'batch'
+                    })}
+                    <FormItem>
+                      <Button color="primary" type="submit" disabled={!hasSelected} loading={loading && !data}>
+                        Update
+                      </Button>
+                    </FormItem>
+                  </Form>
                 )}
-                <FormItem>
-                  <Button color="primary" type="submit" disabled={!hasSelected} loading={loading && !data}>
-                    Update
-                  </Button>
-                </FormItem>
-              </Form>
-            }
-          </Col>
+              />
+            </Col>
+          )}
         </Row>
       );
     };
 
-    const columns = createColumnFields(
+    const columns = createColumnFields({
       schema,
       link,
-      this.orderBy,
-      this.renderOrderByArrow,
-      this.hendleUpdate,
-      this.hendleDelete,
-      this.onCellChange,
-      customTableColumns
-    );
+      orderBy: this.orderBy,
+      renderOrderByArrow: this.renderOrderByArrow,
+      hendleUpdate: this.hendleUpdate,
+      hendleDelete: this.hendleDelete,
+      onCellChange: this.onCellChange,
+      customFields: customColumnFields,
+      customActions: customColumnActions
+    });
 
     let tableProps = {
       dataSource: data ? data.edges : null,
@@ -334,6 +336,13 @@ class ListView extends React.Component {
       footer: footer
     };
 
+    if (tableScroll) {
+      tableProps = {
+        ...tableProps,
+        scroll: tableScroll
+      };
+    }
+
     // only include this props if table includes rank, taht is used for sorting
     if (schema.keys().includes('rank')) {
       tableProps = {
@@ -348,30 +357,11 @@ class ListView extends React.Component {
 
     return (
       <div>
-        {React.createElement(Table, tableProps, null)}
+        <Table {...tableProps} />
         {data && this.renderLoadMore(data, loadMoreRows)}
       </div>
     );
   }
 }
 
-const ListViewWithFormik = withFormik({
-  mapPropsToValues: ({ schema }) => mapFormPropsToValues(schema, {}),
-  async handleSubmit(values, { resetForm, setStatus, props: { updateManyEntries, schema } }) {
-    //console.log('handleSubmit values:', values);
-
-    const { selectedRowKeys, ...restValues } = values;
-    const insertValues = pickInputFields(schema, restValues);
-    //console.log('handleSubmit selectedRowKeys:', selectedRowKeys);
-    //console.log('handleSubmit insertValues:', insertValues);
-
-    if (selectedRowKeys && Object.keys(insertValues).length > 0) {
-      await updateManyEntries(insertValues, { id_in: selectedRowKeys });
-      setStatus({ submitted: true });
-      resetForm();
-    }
-  },
-  displayName: 'BatchUpdateForm'
-});
-
-export default ListViewWithFormik(DragDropContext(HTML5Backend)(ListView));
+export default DragDropContext(HTML5Backend)(ListView);
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderField.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderField.jsx
index ae247d7ec3..3059593344 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderField.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderField.jsx
@@ -1,28 +1,68 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import DomainSchema from '@domain-schema/core';
+
 import { FormItem, Input } from './index';
 
-const RenderField = ({ input, label, type, formItemLayout, meta: { touched, error } }) => {
-  let validateStatus = '';
-  if (touched && error) {
-    validateStatus = 'error';
-  }
+export default class RenderField extends React.Component {
+  static propTypes = {
+    input: PropTypes.object,
+    label: PropTypes.string,
+    type: PropTypes.string,
+    formItemLayout: PropTypes.object,
+    hasTypeOf: PropTypes.func.isRequired,
+    meta: PropTypes.object
+  };
+
+  handleChange = e => {
+    const { input: { onChange, name }, hasTypeOf } = this.props;
+    //console.log('RenderField: handleChange');
+    //console.log('name:', name);
+    let value = e.target.value;
+    //console.log('value:', value);
+    if (hasTypeOf(Number)) {
+      value = value !== '' ? parseFloat(value) : '';
+      //console.log('RenderField: hasTypeOf(Number) TRUE');
+    }
+
+    onChange(name, value);
+  };
+
+  render() {
+    const {
+      input: { onChange, ...inputRest },
+      label,
+      type,
+      formItemLayout,
+      hasTypeOf,
+      meta: { touched, error }
+    } = this.props;
 
-  return (
-    <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
-      <div>
-        <Input {...input} placeholder={label} type={type} />
-      </div>
-    </FormItem>
-  );
-};
-
-RenderField.propTypes = {
-  input: PropTypes.object,
-  label: PropTypes.string,
-  type: PropTypes.string,
-  formItemLayout: PropTypes.object,
-  meta: PropTypes.object
-};
-
-export default RenderField;
+    let validateStatus = '';
+    if (touched && error) {
+      validateStatus = 'error';
+    }
+
+    let input = {
+      ...inputRest
+    };
+
+    if (hasTypeOf(DomainSchema.Float)) {
+      //console.log('RenderField: hasTypeOf(Float) TRUE');
+      input = {
+        step: '0.01',
+        ...inputRest
+      };
+    } else if (hasTypeOf(Number)) {
+      //console.log('RenderField: hasTypeOf(Number) TRUE');
+    }
+
+    return (
+      <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
+        <div>
+          <Input {...input} placeholder={label} type={type} onChange={this.handleChange} />
+        </div>
+      </FormItem>
+    );
+  }
+}
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderInput.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderInput.jsx
new file mode 100644
index 0000000000..bd43238ae1
--- /dev/null
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderInput.jsx
@@ -0,0 +1,45 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import { FormItem, Input } from './index';
+
+export default class RenderInput extends React.Component {
+  static propTypes = {
+    input: PropTypes.object,
+    label: PropTypes.string,
+    formItemLayout: PropTypes.object,
+    hasTypeOf: PropTypes.func.isRequired,
+    meta: PropTypes.object
+  };
+
+  handleChange = e => {
+    const { input: { onChange, name } } = this.props;
+    //console.log('RenderInput: handleChange');
+    //console.log('name:', name);
+    let value = e.target.value;
+    //console.log('value:', value);
+
+    onChange(name, value);
+  };
+
+  render() {
+    const { input: { onChange, ...inputRest }, label, formItemLayout, meta: { touched, error } } = this.props;
+
+    let validateStatus = '';
+    if (touched && error) {
+      validateStatus = 'error';
+    }
+
+    let input = {
+      ...inputRest
+    };
+
+    return (
+      <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
+        <div>
+          <Input {...input} placeholder={label} type="text" onChange={this.handleChange} />
+        </div>
+      </FormItem>
+    );
+  }
+}
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx
index 0c314596a0..b1ccb5e1b4 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx
@@ -14,8 +14,9 @@ export default class RenderSelect extends React.Component {
     label: PropTypes.string,
     formItemLayout: PropTypes.object,
     meta: PropTypes.object,
-    schemaName: PropTypes.string,
-    style: PropTypes.object
+    schema: PropTypes.object,
+    style: PropTypes.object,
+    formType: PropTypes.string.isRequired
   };
 
   state = {
@@ -23,19 +24,18 @@ export default class RenderSelect extends React.Component {
     dirty: false
   };
 
-  handleChange = ({ key, label }) => {
+  handleChange = value => {
     const { input: { onChange, name } } = this.props;
     //console.log('RenderSelect: handleChange');
     //console.log('name:', name);
-    //console.log('key:', key);
-    //console.log('label:', label);
-    onChange(name, { id: key, name: label });
+    //console.log('value:', value);
+    onChange(name, value ? { id: value.key, name: value.label } : undefined);
   };
 
   search = value => {
     const { dirty } = this.state;
     //onsole.log('search:', value);
-    if ((value && value.length >= 2) || dirty) {
+    if ((value && value.length >= 1) || dirty) {
       this.setState({ searchText: value, dirty: true });
     }
   };
@@ -44,10 +44,11 @@ export default class RenderSelect extends React.Component {
     const {
       input: { value, onChange, ...inputRest },
       label,
-      schemaName,
+      schema,
       style,
       formItemLayout,
-      meta: { touched, error }
+      meta: { touched, error },
+      formType
     } = this.props;
     const { searchText, dirty } = this.state;
 
@@ -56,12 +57,20 @@ export default class RenderSelect extends React.Component {
       validateStatus = 'error';
     }
 
-    const camelizeSchemaName = camelize(schemaName);
-    const pascalizeSchemaName = pascalize(schemaName);
+    const camelizeSchemaName = camelize(schema.name);
+    const pascalizeSchemaName = pascalize(schema.name);
+    let column = 'name';
+    for (const remoteKey of schema.keys()) {
+      const remoteValue = schema.values[remoteKey];
+      if (remoteValue.sortBy) {
+        column = remoteKey;
+      }
+    }
     let formatedValue =
       value && value != '' && value != undefined
-        ? { key: value.id.toString(), label: value.name }
+        ? { key: value.id.toString(), label: value.name ? value.name : value[column] }
         : { key: '', label: '' };
+    //console.log('formatedValue:', formatedValue);
 
     // eslint-disable-next-line import/no-dynamic-require
     const Query = require(`../../../../../${camelizeSchemaName}/containers/${pascalizeSchemaName}Query`)['default'];
@@ -80,12 +89,13 @@ export default class RenderSelect extends React.Component {
                 const options = data.edges
                   ? data.edges.map(opt => (
                       <Option key={opt.id} value={opt.id.toString()}>
-                        {opt.name}
+                        {opt[column]}
                       </Option>
                     ))
                   : null;
 
                 let props = {
+                  allowClear: formType !== 'form' ? true : false,
                   showSearch: true,
                   labelInValue: true,
                   dropdownMatchSelectWidth: false,
@@ -101,11 +111,11 @@ export default class RenderSelect extends React.Component {
                       if (!dirty) {
                         options.unshift(
                           <Option key={value.id} value={value.id.toString()}>
-                            {value.name}
+                            {value[column]}
                           </Option>
                         );
                       } else {
-                        formatedValue = { key: data.edges[0].id.toString(), label: data.edges[0].name };
+                        formatedValue = { key: data.edges[0].id.toString() };
                       }
                     }
                   }
@@ -124,7 +134,7 @@ export default class RenderSelect extends React.Component {
                       option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
                   };
                 }
-                return React.createElement(Select, props, options);
+                return <Select {...props}>{options}</Select>;
               } else {
                 return <Spin size="small" />;
               }
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderTextarea.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderTextarea.jsx
new file mode 100644
index 0000000000..5d398f268c
--- /dev/null
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderTextarea.jsx
@@ -0,0 +1,49 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Input from 'antd/lib/input';
+
+import { FormItem } from './index';
+
+const { TextArea } = Input;
+
+export default class RenderTextarea extends React.Component {
+  static propTypes = {
+    input: PropTypes.object,
+    label: PropTypes.string,
+    type: PropTypes.string,
+    formItemLayout: PropTypes.object,
+    hasTypeOf: PropTypes.func.isRequired,
+    meta: PropTypes.object
+  };
+
+  handleChange = e => {
+    const { input: { onChange, name } } = this.props;
+    //console.log('RenderInput: handleChange');
+    //console.log('name:', name);
+    let value = e.target.value;
+    //console.log('value:', value);
+
+    onChange(name, value);
+  };
+
+  render() {
+    const { input: { onChange, ...inputRest }, label, formItemLayout, meta: { touched, error } } = this.props;
+
+    let validateStatus = '';
+    if (touched && error) {
+      validateStatus = 'error';
+    }
+
+    let input = {
+      ...inputRest
+    };
+
+    return (
+      <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
+        <div>
+          <TextArea {...input} placeholder={label} autosize onChange={this.handleChange} />
+        </div>
+      </FormItem>
+    );
+  }
+}
diff --git a/packages/client/src/modules/common/components/web/ui-antd/styles/styles.less b/packages/client/src/modules/common/components/web/ui-antd/styles/styles.less
index cdb65d6d0a..1fc1d584d0 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/styles/styles.less
+++ b/packages/client/src/modules/common/components/web/ui-antd/styles/styles.less
@@ -67,4 +67,20 @@
 
 .editable-add-btn {
   margin-bottom: 8px;
+}
+
+.ant-advanced-search-form {
+  padding: 24px 24px 0 24px;
+  background: #fbfbfb;
+  border: 1px solid #d9d9d9;
+  border-radius: 6px;
+  margin-bottom: 24px;
+}
+
+.ant-advanced-search-form .ant-form-item {
+  display: flex;
+}
+
+.ant-advanced-search-form .ant-form-item-label {
+  overflow: visible;
 }
\ No newline at end of file
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderNumber.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderNumber.jsx
new file mode 100644
index 0000000000..48443b3e74
--- /dev/null
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderNumber.jsx
@@ -0,0 +1,32 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { FormGroup, Label, Input, FormFeedback } from 'reactstrap';
+
+const RenderNumber = ({ input, label, type, meta: { touched, error }, children }) => {
+  let valid = null;
+  if (touched && error) {
+    valid = false;
+  }
+
+  return (
+    <FormGroup>
+      {label && <Label>{label}</Label>}
+      <div>
+        <Input {...input} placeholder={label} type={type} valid={valid}>
+          {children}
+        </Input>
+        {touched && (error && <FormFeedback>{error}</FormFeedback>)}
+      </div>
+    </FormGroup>
+  );
+};
+
+RenderNumber.propTypes = {
+  input: PropTypes.object,
+  label: PropTypes.string,
+  type: PropTypes.string,
+  meta: PropTypes.object,
+  children: PropTypes.array
+};
+
+export default RenderNumber;
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderTextarea.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderTextarea.jsx
new file mode 100644
index 0000000000..ea521d0beb
--- /dev/null
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderTextarea.jsx
@@ -0,0 +1,32 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { FormGroup, Label, Input, FormFeedback } from 'reactstrap';
+
+const RenderTextarea = ({ input, label, type, meta: { touched, error }, children }) => {
+  let valid = null;
+  if (touched && error) {
+    valid = false;
+  }
+
+  return (
+    <FormGroup>
+      {label && <Label>{label}</Label>}
+      <div>
+        <Input {...input} placeholder={label} type={type} valid={valid}>
+          {children}
+        </Input>
+        {touched && (error && <FormFeedback>{error}</FormFeedback>)}
+      </div>
+    </FormGroup>
+  );
+};
+
+RenderTextarea.propTypes = {
+  input: PropTypes.object,
+  label: PropTypes.string,
+  type: PropTypes.string,
+  meta: PropTypes.object,
+  children: PropTypes.array
+};
+
+export default RenderTextarea;
diff --git a/packages/client/src/modules/common/util.jsx b/packages/client/src/modules/common/util.jsx
index 84faaffb0b..da686e3a52 100644
--- a/packages/client/src/modules/common/util.jsx
+++ b/packages/client/src/modules/common/util.jsx
@@ -15,6 +15,6 @@ export const createFormFields = schema => {
   return fields;
 };
 
-export const pickInputFields = (schema, values) => {
+export const pickInputFields = ({ schema, values }) => {
   return pick(values, schema.keys());
 };
diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index 248a3f3e6c..a6ebe90d57 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -12,6 +12,7 @@ import moment from 'moment';
 import DomainSchema from '@domain-schema/core';
 
 import Field from '../../utils/FieldAdapter';
+import { mapFormPropsToValues } from '../../utils/crud';
 import {
   RenderField,
   RenderSelect,
@@ -29,7 +30,7 @@ import {
 
 const dateFormat = 'YYYY-MM-DD';
 
-export const createColumnFields = (
+export const createColumnFields = ({
   schema,
   link,
   orderBy,
@@ -37,109 +38,121 @@ export const createColumnFields = (
   hendleUpdate,
   hendleDelete,
   onCellChange,
-  customTableColumns
-) => {
+  customFields = {}
+}) => {
   let columns = [];
+  // use customFields if definded otherwise use schema.keys()
+  const keys =
+    customFields.constructor === Object && Object.keys(customFields).length !== 0
+      ? Object.keys(customFields)
+      : schema.keys();
 
-  for (const key of schema.keys()) {
-    const value = schema.values[key];
-    const hasTypeOf = targetType =>
-      value.type === targetType || value.type.prototype instanceof targetType || value.type instanceof targetType;
-    //console.log(key);
-    //console.log(hasTypeOf(DomainSchema));
-    if (value.show !== false && (key !== 'id' || customTableColumns['id'])) {
-      if (value.type.isSchema) {
-        //console.log(value.type);
+  for (const key of keys) {
+    if (schema.values[key]) {
+      const value = schema.values[key];
+      const hasTypeOf = targetType =>
+        value.type === targetType || value.type.prototype instanceof targetType || value.type instanceof targetType;
+      //console.log(key);
+      //console.log(hasTypeOf(DomainSchema));
+      if (value.show !== false && (key !== 'id' || customFields['id'])) {
+        if (value.type.isSchema) {
+          //console.log(value.type);
 
-        let sortBy = 'name';
-        for (const remoteKey of value.type.keys()) {
-          const remoteValue = value.type.values[remoteKey];
-          if (remoteValue.sortBy) {
-            sortBy = remoteKey;
+          let sortBy = 'name';
+          for (const remoteKey of value.type.keys()) {
+            const remoteValue = value.type.values[remoteKey];
+            if (remoteValue.sortBy) {
+              sortBy = remoteKey;
+            }
           }
-        }
-        columns.push({
-          title: (
-            <a onClick={e => orderBy(e, key)} href="#">
-              {startCase(key)} {renderOrderByArrow(key)}
-            </a>
-          ),
-          dataIndex: key,
-          key: key,
-          width: 300,
-          render: (text, record) =>
-            customTableColumns[key] && customTableColumns[key]['render'] ? (
-              customTableColumns[key]['render'](text, record)
-            ) : (
+          columns.push({
+            title: (
+              <a onClick={e => orderBy(e, key)} href="#">
+                {startCase(key)} {renderOrderByArrow(key)}
+              </a>
+            ),
+            dataIndex: key,
+            key: key,
+            width: customFields[key] && customFields[key]['width'] ? customFields[key]['width'] : null,
+            render: (text, record) =>
+              customFields[key] && customFields[key]['render'] ? (
+                customFields[key]['render'](text, record)
+              ) : (
+                <EditableCell
+                  value={text}
+                  hasTypeOf={hasTypeOf}
+                  schema={value.type}
+                  record={record}
+                  render={
+                    customFields[key] && customFields[key]['render']
+                      ? customFields[key]['render']
+                      : text => (text && text[sortBy] ? text[sortBy] : '')
+                  }
+                  onChange={onCellChange(`${key}Id`, record.id, hendleUpdate)}
+                />
+              )
+          });
+        } else if (hasTypeOf(Boolean)) {
+          columns.push({
+            title: (
+              <a onClick={e => orderBy(e, key)} href="#">
+                {startCase(key)} {renderOrderByArrow(key)}
+              </a>
+            ),
+            dataIndex: key,
+            key: key,
+            width: customFields[key] && customFields[key]['width'] ? customFields[key]['width'] : null,
+            render: (text, record) => {
+              const data = {};
+              data[key] = !text;
+              return <Switch checked={text} onClick={() => hendleUpdate(data, record.id)} />;
+            }
+          });
+        } else if ((hasTypeOf(String) || hasTypeOf(Number) || hasTypeOf(Date)) && key !== 'id') {
+          columns.push({
+            title: (
+              <a onClick={e => orderBy(e, key)} href="#">
+                {startCase(key)} {renderOrderByArrow(key)}
+              </a>
+            ),
+            dataIndex: key,
+            key: key,
+            width: customFields[key] && customFields[key]['width'] ? customFields[key]['width'] : null,
+            render: (text, record) => (
               <EditableCell
                 value={text}
                 hasTypeOf={hasTypeOf}
-                schemaName={value.type.name}
-                record={record}
-                render={
-                  customTableColumns[key] && customTableColumns[key]['render']
-                    ? customTableColumns[key]['render']
-                    : text => text[sortBy]
-                }
-                onChange={onCellChange(`${key}Id`, record.id, hendleUpdate)}
+                render={customFields[key] && customFields[key]['render'] ? customFields[key]['render'] : text => text}
+                onChange={onCellChange(key, record.id, hendleUpdate)}
               />
             )
-        });
-      } else if (hasTypeOf(Boolean)) {
-        columns.push({
-          title: (
-            <a onClick={e => orderBy(e, key)} href="#">
-              {startCase(key)} {renderOrderByArrow(key)}
-            </a>
-          ),
-          dataIndex: key,
-          key: key,
-          width: 100,
-          render: (text, record) => {
-            const data = {};
-            data[key] = !text;
-            return <Switch checked={text} onClick={() => hendleUpdate(data, record.id)} />;
-          }
-        });
-      } else if ((hasTypeOf(String) || hasTypeOf(Number) || hasTypeOf(Date)) && key !== 'id') {
-        columns.push({
-          title: (
-            <a onClick={e => orderBy(e, key)} href="#">
-              {startCase(key)} {renderOrderByArrow(key)}
-            </a>
-          ),
-          dataIndex: key,
-          key: key,
-          render: (text, record) => (
-            <EditableCell
-              value={text}
-              hasTypeOf={hasTypeOf}
-              render={
-                customTableColumns[key] && customTableColumns[key]['render']
-                  ? customTableColumns[key]['render']
-                  : text => text
-              }
-              onChange={onCellChange(key, record.id, hendleUpdate)}
-            />
-          )
-        });
-      } else if (value.type.constructor !== Array) {
-        columns.push({
-          title: (
-            <a onClick={e => orderBy(e, key)} href="#">
-              {startCase(key)} {renderOrderByArrow(key)}
-            </a>
-          ),
-          dataIndex: key,
-          key: key,
-          render: (text, record) =>
-            customTableColumns[key] && customTableColumns[key]['render']
-              ? customTableColumns[key]['render'](text, record)
-              : customTableColumns[key] && customTableColumns[key]['render']
-                ? customTableColumns[key]['render'](text, record)
-                : text
-        });
+          });
+        } else if (value.type.constructor !== Array) {
+          columns.push({
+            title: (
+              <a onClick={e => orderBy(e, key)} href="#">
+                {startCase(key)} {renderOrderByArrow(key)}
+              </a>
+            ),
+            dataIndex: key,
+            key: key,
+            width: customFields[key] && customFields[key]['width'] ? customFields[key]['width'] : null,
+            render: (text, record) =>
+              customFields[key] && customFields[key]['render']
+                ? customFields[key]['render'](text, record)
+                : customFields[key] && customFields[key]['render'] ? customFields[key]['render'](text, record) : text
+          });
+        }
       }
+    } else {
+      columns.push({
+        title: startCase(key),
+        dataIndex: key,
+        key: key,
+        width: customFields[key] && customFields[key]['width'] ? customFields[key]['width'] : null,
+        render: (text, record) =>
+          customFields[key] && customFields[key]['render'] ? customFields[key]['render'](text, record) : null
+      });
     }
   }
 
@@ -147,6 +160,7 @@ export const createColumnFields = (
     title: 'Actions',
     key: 'actions',
     width: 150,
+    fixed: 'right',
     render: (text, record) => [
       <Link className="link" to={`/${link}/${record.id}`} key="edit">
         <Button color="primary" size="sm">
@@ -177,21 +191,7 @@ const tailFormItemLayout = {
   }
 };
 
-export const mapFormPropsToValues = (schema, formdata) => {
-  let fields = {};
-  for (const key of schema.keys()) {
-    const value = schema.values[key];
-    if (key !== 'id' && value.show !== false && value.type.constructor !== Array) {
-      fields[key] = formdata ? formdata[key] : '';
-    } else if (value.type.constructor === Array) {
-      fields[key] = formdata ? formdata[key] : [];
-    }
-  }
-
-  return fields;
-};
-
-export const createFormFields = (
+export const createFormFields = ({
   handleChange,
   setFieldValue,
   handleBlur,
@@ -200,103 +200,254 @@ export const createFormFields = (
   values = {},
   formItemLayout,
   prefix = '',
-  batch = false
-) => {
+  customFields = {},
+  formType = 'form'
+}) => {
   let fields = [];
+  // use customFields if definded otherwise use schema.keys()
+  const keys =
+    customFields.constructor === Object && Object.keys(customFields).length !== 0
+      ? Object.keys(customFields)
+      : schema.keys();
 
-  for (const key of schema.keys()) {
+  for (const key of keys) {
     const value = schema.values[key];
     const type = value.type.constructor === Array ? value.type[0] : value.type;
 
     const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
 
-    if (key !== 'id' && value.show !== false && value.type.constructor !== Array) {
-      //let validate = [];
-      //if (!value.optional && !batch) {
-      //  validate.push(required);
-      //}
+    if (formType === 'filter') {
+      if (key !== 'id' && value.show !== false && value.type.constructor !== Array) {
+        //let validate = [];
+        //if (!value.optional && !batch) {
+        //  validate.push(required);
+        //}
 
-      let component = RenderField;
-      const value = values ? values[key] : '';
-      let onChange = handleChange;
-      let onBlur = handleBlur;
-      let style = {};
+        let component = RenderField;
+        const value = values ? values[key] : '';
+        let style = {};
+        let inputType = 'text';
 
-      if (type.isSchema) {
-        component = RenderSelect;
-        onChange = setFieldValue;
-        onBlur = setFieldTouched;
-        if (batch) {
-          style = { width: 100 };
+        if (type.isSchema) {
+          component = RenderSelect;
+          if (formType !== 'form') {
+            style = { width: 100 };
+          }
+          fields.push(
+            <Col span={8} key={key}>
+              <Field
+                name={`${prefix}${key}`}
+                key={key}
+                component={component}
+                schema={type}
+                value={value}
+                type={inputType}
+                style={style}
+                label={startCase(key)}
+                //validate={validate}
+                formItemLayout={formItemLayout}
+                onChange={setFieldValue}
+                onBlur={setFieldTouched}
+                formType={formType}
+                hasTypeOf={hasTypeOf}
+              />
+            </Col>
+          );
+        } else if (hasTypeOf(Boolean)) {
+          component = RenderSwitch;
+          fields.push(
+            <Col span={8} key={key}>
+              <Field
+                name={`${prefix}${key}`}
+                key={key}
+                component={component}
+                schema={type}
+                value={value}
+                type={inputType}
+                style={style}
+                label={startCase(key)}
+                //validate={validate}
+                formItemLayout={formItemLayout}
+                onChange={setFieldValue}
+                onBlur={setFieldTouched}
+                formType={formType}
+                hasTypeOf={hasTypeOf}
+              />
+            </Col>
+          );
+        } else if (hasTypeOf(Date)) {
+          component = RenderDate;
+          fields.push(
+            <Col span={8} key={`${key}_lte`}>
+              <Field
+                name={`${prefix}${key}_lte`}
+                key={`${key}_lte`}
+                component={component}
+                schema={type}
+                value={values[`${key}_lte`] ? values[`${key}_lte`] : ''}
+                type={inputType}
+                style={style}
+                label={`From ${startCase(key)}`}
+                //validate={validate}
+                formItemLayout={formItemLayout}
+                onChange={setFieldValue}
+                onBlur={setFieldTouched}
+                formType={formType}
+                hasTypeOf={hasTypeOf}
+              />
+            </Col>
+          );
+          fields.push(
+            <Col span={8} key={`${key}_gte`}>
+              <Field
+                name={`${prefix}${key}_gte`}
+                key={`${key}_gte`}
+                component={component}
+                schema={type}
+                value={values[`${key}_gte`] ? values[`${key}_gte`] : ''}
+                type={inputType}
+                style={style}
+                label={`To ${startCase(key)}`}
+                //validate={validate}
+                formItemLayout={formItemLayout}
+                onChange={setFieldValue}
+                onBlur={setFieldTouched}
+                formType={formType}
+                hasTypeOf={hasTypeOf}
+              />
+            </Col>
+          );
+        } else if (hasTypeOf(Number)) {
+          inputType = 'number';
+          fields.push(
+            <Col span={8} key={key}>
+              <Field
+                name={`${prefix}${key}`}
+                key={key}
+                component={component}
+                schema={type}
+                value={value}
+                type={inputType}
+                style={style}
+                label={startCase(key)}
+                //validate={validate}
+                formItemLayout={formItemLayout}
+                onChange={setFieldValue}
+                onBlur={setFieldTouched}
+                formType={formType}
+                hasTypeOf={hasTypeOf}
+              />
+            </Col>
+          );
+        } else {
+          fields.push(
+            <Col span={8} key={key}>
+              <Field
+                name={`${prefix}${key}`}
+                key={key}
+                component={component}
+                schema={type}
+                value={value}
+                type={inputType}
+                style={style}
+                label={startCase(key)}
+                //validate={validate}
+                formItemLayout={formItemLayout}
+                onChange={setFieldValue}
+                onBlur={setFieldTouched}
+                formType={formType}
+                hasTypeOf={hasTypeOf}
+              />
+            </Col>
+          );
         }
-      } else if (hasTypeOf(Boolean)) {
-        component = RenderSwitch;
-        onChange = setFieldValue;
-        onBlur = setFieldTouched;
-      } else if (hasTypeOf(Date)) {
-        component = RenderDate;
-        onChange = setFieldValue;
-        onBlur = setFieldTouched;
       }
-
-      fields.push(
-        <Field
-          name={`${prefix}${key}`}
-          key={key}
-          component={component}
-          schemaName={type.name}
-          value={value}
-          type="text"
-          style={style}
-          label={startCase(key)}
-          //validate={validate}
-          formItemLayout={formItemLayout}
-          onChange={onChange}
-          onBlur={onBlur}
-        />
-      );
     } else {
-      if (value.type.constructor === Array && !batch) {
-        if (values[key]) {
-          fields.push(
-            <FieldArray
-              name={key}
-              key={key}
-              render={({ push, remove }) => {
-                return (
-                  <Row>
-                    <Col span={12} offset={6}>
-                      {values[key].map((field, index) => (
-                        <div key={index} className="field-array-form">
-                          {createFormFields(
-                            handleChange,
-                            setFieldValue,
-                            handleBlur,
-                            setFieldTouched,
-                            value.type[0],
-                            mapFormPropsToValues(value.type[0], field),
-                            formItemLayout,
-                            `${key}[${index}].`
-                          )}
-                          <FormItem {...tailFormItemLayout}>
-                            <Button color="primary" size="sm" onClick={() => remove(index)}>
-                              Delete
-                            </Button>
-                          </FormItem>
-                        </div>
-                      ))}
-                      <FormItem {...tailFormItemLayout}>
-                        {/*submitFailed && error && <span>{error}</span>*/}
-                        <Button color="dashed" onClick={() => push({})} style={{ width: '180px' }}>
-                          Add field
-                        </Button>
-                      </FormItem>
-                    </Col>
-                  </Row>
-                );
-              }}
-            />
-          );
+      if (key !== 'id' && value.show !== false && value.type.constructor !== Array) {
+        //let validate = [];
+        //if (!value.optional && !batch) {
+        //  validate.push(required);
+        //}
+
+        let component = RenderField;
+        const value = values ? values[key] : '';
+        let style = {};
+        let inputType = 'text';
+
+        if (type.isSchema) {
+          component = RenderSelect;
+          if (formType !== 'form') {
+            style = { width: 100 };
+          }
+        } else if (hasTypeOf(Boolean)) {
+          component = RenderSwitch;
+        } else if (hasTypeOf(Date)) {
+          component = RenderDate;
+        } else if (hasTypeOf(Number)) {
+          inputType = 'number';
+        }
+
+        fields.push(
+          <Field
+            name={`${prefix}${key}`}
+            key={key}
+            component={component}
+            schema={type}
+            value={value}
+            type={inputType}
+            style={style}
+            label={startCase(key)}
+            //validate={validate}
+            formItemLayout={formItemLayout}
+            onChange={setFieldValue}
+            onBlur={setFieldTouched}
+            formType={formType}
+            hasTypeOf={hasTypeOf}
+          />
+        );
+      } else {
+        if (value.type.constructor === Array && formType === 'form') {
+          if (values[key]) {
+            fields.push(
+              <FieldArray
+                name={key}
+                key={key}
+                render={({ push, remove }) => {
+                  return (
+                    <Row>
+                      <Col span={12} offset={6}>
+                        {values[key].map((field, index) => (
+                          <div key={index} className="field-array-form">
+                            {createFormFields({
+                              handleChange,
+                              setFieldValue,
+                              handleBlur,
+                              setFieldTouched,
+                              schema: value.type[0],
+                              values: mapFormPropsToValues({ schema: value.type[0], data: field }),
+                              formItemLayout: formItemLayout,
+                              prefix: `${key}[${index}].`
+                            })}
+                            <FormItem {...tailFormItemLayout}>
+                              <Button color="primary" size="sm" onClick={() => remove(index)}>
+                                Delete
+                              </Button>
+                            </FormItem>
+                          </div>
+                        ))}
+                        <FormItem {...tailFormItemLayout}>
+                          {/*submitFailed && error && <span>{error}</span>*/}
+                          <Button color="dashed" onClick={() => push({})} style={{ width: '180px' }}>
+                            Add field
+                          </Button>
+                        </FormItem>
+                      </Col>
+                    </Row>
+                  );
+                }}
+              />
+            );
+          }
         }
       }
     }
@@ -311,7 +462,7 @@ class EditableCell extends React.Component {
     record: PropTypes.object,
     render: PropTypes.func,
     hasTypeOf: PropTypes.func,
-    schemaName: PropTypes.string,
+    schema: PropTypes.object,
     onChange: PropTypes.func.isRequired
   };
 
@@ -336,6 +487,9 @@ class EditableCell extends React.Component {
     this.setState({ value: dateString });
   };
   handleSelectChange = ({ key, label }) => {
+    //console.log('EditableCell: handleSelectChange');
+    //console.log('key:', key);
+    //console.log('label:', label);
     this.setState({ value: { id: key, name: label } });
   };
   check = () => {
@@ -364,7 +518,7 @@ class EditableCell extends React.Component {
   };
   render() {
     const { value, record, searchText, dirty, editable } = this.state;
-    const { render, hasTypeOf, schemaName } = this.props;
+    const { render, hasTypeOf, schema } = this.props;
 
     let input = null;
     if (editable) {
@@ -388,10 +542,17 @@ class EditableCell extends React.Component {
         );
       } else if (hasTypeOf(DomainSchema)) {
         const Option = Select.Option;
-        const camelizeSchemaName = camelize(schemaName);
-        const pascalizeSchemaName = pascalize(schemaName);
-
-        let formatedValue = { key: value.id.toString(), label: value.name };
+        const camelizeSchemaName = camelize(schema.name);
+        const pascalizeSchemaName = pascalize(schema.name);
+        let column = 'name';
+        for (const remoteKey of schema.keys()) {
+          const remoteValue = schema.values[remoteKey];
+          if (remoteValue.sortBy) {
+            column = remoteKey;
+          }
+        }
+        let formatedValue = { key: value.id.toString(), label: value.name ? value.name : value[column] };
+        //console.log('formatedValue:', formatedValue);
         // eslint-disable-next-line import/no-dynamic-require
         const Query = require(`../${camelizeSchemaName}/containers/${pascalizeSchemaName}Query`)['default'];
 
@@ -402,7 +563,7 @@ class EditableCell extends React.Component {
                 const options = data.edges
                   ? data.edges.map(opt => (
                       <Option key={opt.id} value={opt.id.toString()}>
-                        {opt.name}
+                        {opt[column]}
                       </Option>
                     ))
                   : null;
@@ -422,7 +583,7 @@ class EditableCell extends React.Component {
                       if (!dirty) {
                         options.unshift(
                           <Option key={value.id} value={value.id.toString()}>
-                            {value.name}
+                            {value[column]}
                           </Option>
                         );
                       } else {
@@ -444,7 +605,7 @@ class EditableCell extends React.Component {
                       option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
                   };
                 }
-                return React.createElement(Select, props, options);
+                return <Select {...props}>{options}</Select>;
               } else {
                 return <Spin size="small" />;
               }
diff --git a/packages/client/src/utils/FieldAdapter.jsx b/packages/client/src/utils/FieldAdapter.jsx
index fb2839f4ae..83b5338ef3 100644
--- a/packages/client/src/utils/FieldAdapter.jsx
+++ b/packages/client/src/utils/FieldAdapter.jsx
@@ -15,7 +15,9 @@ export default class FieldAdapter extends Component {
     defaultValue: PropTypes.string,
     checked: PropTypes.bool,
     defaultChecked: PropTypes.bool,
-    disabled: PropTypes.bool
+    disabled: PropTypes.bool,
+    formType: PropTypes.string.isRequired,
+    hasTypeOf: PropTypes.func.isRequired
   };
 
   constructor(props, context) {
@@ -27,7 +29,19 @@ export default class FieldAdapter extends Component {
 
   render() {
     const { formik } = this.context;
-    const { component, name, value, defaultValue, checked, defaultChecked, onChange, onBlur, disabled } = this.props;
+    const {
+      component,
+      name,
+      value,
+      defaultValue,
+      checked,
+      defaultChecked,
+      onChange,
+      onBlur,
+      disabled,
+      formType,
+      hasTypeOf
+    } = this.props;
 
     const meta = {
       touched: formik.touched[name],
@@ -48,7 +62,9 @@ export default class FieldAdapter extends Component {
     return React.createElement(component, {
       ...this.props,
       input,
-      meta
+      meta,
+      formType,
+      hasTypeOf
     });
   }
 }
diff --git a/packages/client/src/utils/crud.js b/packages/client/src/utils/crud.js
index afa9717837..0d8532e757 100644
--- a/packages/client/src/utils/crud.js
+++ b/packages/client/src/utils/crud.js
@@ -1,11 +1,11 @@
 import { isEqual } from 'lodash';
 
-export const onSubmit = async (schema, values, updateEntry, createEntry, title, node = null) => {
+export const onSubmit = async ({ schema, values, updateEntry, createEntry, title, data = null }) => {
   let result = null;
-  const insertValues = pickInputFields(schema, values, node);
+  const insertValues = pickInputFields({ schema, values, data });
 
-  if (node) {
-    result = await updateEntry(insertValues, { id: node.id });
+  if (data) {
+    result = await updateEntry(insertValues, { id: data.id });
   } else {
     result = await createEntry(insertValues);
   }
@@ -19,56 +19,104 @@ export const onSubmit = async (schema, values, updateEntry, createEntry, title,
   }
 };
 
-export const pickInputFields = (schema, values, node = null) => {
+export const mapFormPropsToValues = ({ schema, data = null, formType = 'form' }) => {
+  let fields = {};
+  for (const key of schema.keys()) {
+    const value = schema.values[key];
+    const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
+    if (formType === 'filter') {
+      if (value.show !== false && value.type.constructor !== Array) {
+        if (hasTypeOf(Date)) {
+          fields[`${key}_lte`] = data ? data[key] : '';
+          fields[`${key}_gte`] = data ? data[key] : '';
+        } else {
+          fields[key] = data ? data[key] : '';
+        }
+      } else if (value.type.constructor === Array) {
+        fields[key] = data ? data[key] : [];
+      }
+    } else {
+      if (key !== 'id' && value.show !== false && value.type.constructor !== Array) {
+        fields[key] = data ? data[key] : '';
+      } else if (value.type.constructor === Array) {
+        fields[key] = data ? data[key] : [];
+      }
+    }
+  }
+
+  return fields;
+};
+
+export const pickInputFields = ({ schema, values, data = null, formType = 'form' }) => {
   let inputValues = {};
   //console.log('pickInputFields');
+  //console.log('formType:', formType);
   //console.log(values);
 
   for (const key of schema.keys()) {
-    if (key in values && values[key]) {
-      const value = schema.values[key];
-      if (value.type.isSchema) {
-        inputValues[`${key}Id`] = Number(values[key].id ? values[key].id : values[key]);
-      } else if (key !== 'id' && value.type.constructor !== Array) {
-        inputValues[key] = values[key];
-      } else if (value.type.constructor === Array) {
-        const keys1 = {};
-        const keys2 = {};
+    const value = schema.values[key];
+    const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
+    if (formType === 'filter') {
+      if (value.show !== false && value.type.constructor !== Array) {
+        if (value.type.isSchema && values[key]) {
+          inputValues[`${key}Id`] = Number(values[key].id ? values[key].id : values[key]);
+        } else if (hasTypeOf(Date)) {
+          if (values[`${key}_lte`]) {
+            inputValues[`${key}_lte`] = values[`${key}_lte`];
+          }
+          if (values[`${key}_gte`]) {
+            inputValues[`${key}_gte`] = values[`${key}_gte`];
+          }
+        } else {
+          if (key in values && values[key]) {
+            inputValues[key] = values[key];
+          }
+        }
+      }
+    } else {
+      if (key in values && values[key]) {
+        if (value.type.isSchema) {
+          inputValues[`${key}Id`] = Number(values[key].id ? values[key].id : values[key]);
+        } else if (key !== 'id' && value.type.constructor !== Array) {
+          inputValues[key] = values[key];
+        } else if (value.type.constructor === Array) {
+          const keys1 = {};
+          const keys2 = {};
 
-        let create = [];
-        let update = [];
-        let deleted = [];
+          let create = [];
+          let update = [];
+          let deleted = [];
 
-        node[key].forEach(item => {
-          keys1[item.id] = item;
-        });
+          data[key].forEach(item => {
+            keys1[item.id] = item;
+          });
 
-        values[key].forEach(item => {
-          keys2[item.id] = item;
-        });
+          values[key].forEach(item => {
+            keys2[item.id] = item;
+          });
 
-        node[key].forEach(item => {
-          const obj = keys2[item.id];
-          if (!obj) {
-            deleted.push({ id: item.id });
-          } else {
-            if (!isEqual(obj, item)) {
-              update.push({ where: { id: obj.id }, data: pickInputFields(value.type[0], obj) });
+          data[key].forEach(item => {
+            const obj = keys2[item.id];
+            if (!obj) {
+              deleted.push({ id: item.id });
+            } else {
+              if (!isEqual(obj, item)) {
+                update.push({ where: { id: obj.id }, data: pickInputFields({ schema: value.type[0], data: obj }) });
+              }
             }
-          }
-        });
-
-        values[key].forEach(item => {
-          if (!keys1[item.id]) {
-            create.push(pickInputFields(value.type[0], item));
-          }
-        });
+          });
 
-        //console.log('created: ', create);
-        //console.log('updated: ', update);
-        //console.log('deleted: ', deleted);
+          values[key].forEach(item => {
+            if (!keys1[item.id]) {
+              create.push(pickInputFields({ schema: value.type[0], data: item }));
+            }
+          });
+          //console.log('created: ', create);
+          //console.log('updated: ', update);
+          //console.log('deleted: ', deleted);
 
-        inputValues[key] = { create, update, delete: deleted };
+          inputValues[key] = { create, update, delete: deleted };
+        }
       }
     }
   }
diff --git a/packages/common/utils.js b/packages/common/utils.js
index 4dd90c847e..63c4c749f4 100644
--- a/packages/common/utils.js
+++ b/packages/common/utils.js
@@ -11,3 +11,11 @@ export const nestedOmit = (obj, iteratee, context) => {
 };
 
 export const removeTypename = obj => nestedOmit(obj, '__typename');
+
+export const removeEmpty = obj =>
+  Object.keys(obj)
+    .filter(key => obj[key] !== '')
+    .reduce((redObj, key) => {
+      redObj[key] = obj[key];
+      return redObj;
+    }, {});
diff --git a/packages/server/package.json b/packages/server/package.json
index a25ad57bdb..d957daafcb 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -52,6 +52,11 @@
   "author": "SysGears INC",
   "license": "MIT",
   "dependencies": {
+    "@domain-schema/core": "^0.0.30",
+    "@domain-schema/formik": "^0.0.30",
+    "@domain-schema/graphql": "^0.0.30",
+    "@domain-schema/knex": "^0.0.30",
+    "@domain-schema/validation": "^0.0.30",
     "apollo-cache-inmemory": "^1.1.4",
     "apollo-client": "^2.1.0",
     "apollo-engine": "^0.7.0",
@@ -71,11 +76,6 @@
     "bcryptjs": "^2.4.3",
     "body-parser": "^1.18.2",
     "cors": "^2.8.4",
-    "@domain-schema/graphql": "^0.0.30",
-    "@domain-schema/knex": "^0.0.30",
-    "@domain-schema/formik": "^0.0.30",
-    "@domain-schema/core": "^0.0.30",
-    "@domain-schema/validation": "^0.0.30",
     "dotenv": "^4.0.0",
     "error-stack-parser": "^2.0.1",
     "express": "^4.16.2",
diff --git a/packages/server/src/sql/crud.js b/packages/server/src/sql/crud.js
index 629ac9ff2b..3bceec718f 100644
--- a/packages/server/src/sql/crud.js
+++ b/packages/server/src/sql/crud.js
@@ -3,6 +3,7 @@ import uuidv4 from 'uuid';
 import { decamelize, decamelizeKeys, camelize, camelizeKeys, pascalize } from 'humps';
 import knexnest from 'knexnest';
 import parseFields from 'graphql-parse-fields';
+import moment from 'moment';
 
 import FieldError from '../../../common/FieldError';
 import knex from './connector';
@@ -10,6 +11,8 @@ import { selectBy, orderedFor } from './helpers';
 import selectAdapter from './select';
 import log from '../../../common/log';
 
+const dateFormat = 'YYYY-MM-DD';
+
 export function createWithIdGenAdapter(options) {
   const T = options.table;
   let idGen = uuidv4;
@@ -406,7 +409,7 @@ export function deleteRelationAdapter(options) {
 
 export default class Crud {
   getTableName() {
-    return decamelize(this.schema.__.name);
+    return decamelize(this.schema.__.tableName ? this.schema.__.tableName : this.schema.name);
   }
 
   getFullTableName() {
@@ -417,6 +420,21 @@ export default class Crud {
     return this.schema;
   }
 
+  normalizeFields(data) {
+    //console.log('normalizeFields: ', data);
+    for (const key of _.keys(data)) {
+      if (this.schema.values.hasOwnProperty(key)) {
+        const value = this.schema.values[key];
+        const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
+        if (hasTypeOf(Date)) {
+          data[key] = moment(data[key]).format('YYYY-MM-DD');
+        }
+      }
+    }
+    //console.log('normalizeFields: ', data);
+    return data;
+  }
+
   _getList({ limit, offset, orderBy, filter }, info) {
     const baseQuery = knex(`${this.getFullTableName()} as ${this.getTableName()}`);
     const select = selectBy(this.schema, info, false);
@@ -436,11 +454,14 @@ export default class Crud {
       if (orderBy.order) {
         order = orderBy.order;
       }
+      //console.log('orderBy, column:', column);
+      //console.log('orderBy, order:', order);
 
       for (const key of this.schema.keys()) {
         if (column === key) {
           const value = this.schema.values[key];
           if (value.type.isSchema) {
+            const tableName = decamelize(value.type.__.tableName ? value.type.__.tableName : value.type.name);
             let sortBy = 'name';
             for (const remoteKey of value.type.keys()) {
               const remoteValue = value.type.values[remoteKey];
@@ -448,22 +469,53 @@ export default class Crud {
                 sortBy = remoteKey;
               }
             }
-            column = `${this.getTableName()}.${sortBy}`;
+            column = `${tableName}.${sortBy}`;
           } else {
             column = `${this.getTableName()}.${decamelize(column)}`;
           }
         }
       }
-
+      //console.log('column:', column);
+      //console.log('order:', order);
       queryBuilder.orderBy(column, order);
     } else {
       queryBuilder.orderBy(`${this.getTableName()}.id`);
     }
 
     if (filter) {
+      //console.log('filter: ', filter);
+      const schema = this.schema;
+      const tableName = this.getTableName();
+      queryBuilder.where(function() {
+        for (const key of schema.keys()) {
+          const value = schema.values[key];
+          const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
+          //console.log('filter, key: ', key);
+          let filterKey = key;
+
+          if (value.type.isSchema) {
+            filterKey = `${key}Id`;
+          }
+
+          let filterValue = filter[filterKey];
+          if (hasTypeOf(Date)) {
+            if (filter[`${filterKey}_lte`] && filter[`${filterKey}_lte`] !== '') {
+              const filterValue_lte = moment(filter[`${filterKey}_lte`]).format(dateFormat);
+              this.andWhere(`${tableName}.${decamelize(filterKey)}`, '>=', `${filterValue_lte}`);
+            }
+            if (filter[`${filterKey}_gte`] && filter[`${filterKey}_gte`] !== '') {
+              const filterValue_gte = moment(filter[`${filterKey}_gte`]).format(dateFormat);
+              this.andWhere(`${tableName}.${decamelize(filterKey)}`, '<=', `${filterValue_gte}`);
+            }
+          } else {
+            if (_.has(filter, filterKey) && filter[filterKey] !== '') {
+              this.andWhere(`${tableName}.${decamelize(filterKey)}`, '=', `${filterValue}`);
+            }
+          }
+        }
+      });
+
       if (_.has(filter, 'searchText') && filter.searchText !== '') {
-        const schema = this.schema;
-        const tableName = this.getTableName();
         queryBuilder.where(function() {
           for (const key of schema.keys()) {
             const value = schema.values[key];
@@ -481,6 +533,8 @@ export default class Crud {
   async getPaginated(args, info) {
     const edges = await this._getList(args, parseFields(info).edges);
     const { count } = await this.getTotal();
+    //console.log('getPaginated, edges:', edges);
+    //console.log('getPaginated, count:', edges);
 
     return {
       edges,
@@ -516,7 +570,7 @@ export default class Crud {
 
   _create(data) {
     return knex(`${this.getFullTableName()}`)
-      .insert(decamelizeKeys(data))
+      .insert(decamelizeKeys(this.normalizeFields(data)))
       .returning('id');
   }
 
@@ -542,7 +596,7 @@ export default class Crud {
         nestedEntries.map(nested => {
           if (nested.data.create) {
             nested.data.create.map(async create => {
-              create[`${camelize(this.schema.__.name)}Id`] = id;
+              create[`${camelize(this.schema.name)}Id`] = id;
               await ctx[pascalize(nested.key)]._create(create);
             });
           }
@@ -557,7 +611,7 @@ export default class Crud {
 
   _update({ data, where }) {
     return knex(`${this.getFullTableName()}`)
-      .update(decamelizeKeys(data))
+      .update(decamelizeKeys(this.normalizeFields(data)))
       .where(where);
   }
 
@@ -667,7 +721,7 @@ ON t1.id = ? AND t2.id = ?
 
   _updateMany({ data, where: { id_in } }) {
     return knex(`${this.getFullTableName()}`)
-      .update(decamelizeKeys(data))
+      .update(decamelizeKeys(this.normalizeFields(data)))
       .whereIn('id', id_in);
   }
 
diff --git a/packages/server/src/sql/helpers.js b/packages/server/src/sql/helpers.js
index 000cd545c5..e4fb3bebef 100644
--- a/packages/server/src/sql/helpers.js
+++ b/packages/server/src/sql/helpers.js
@@ -29,6 +29,20 @@ export const orderedFor = (rows, collection, field, singleObject) => {
   });
 };
 
+export const orderedForArray = (rows, collection, field, arrayElement) => {
+  // return the rows ordered for the collection
+  const inGroupsOfField = groupBy(rows, field);
+  return collection.map(element => {
+    const elementArray = inGroupsOfField[element];
+    if (elementArray) {
+      return inGroupsOfField[element].map(elm => {
+        return elm[arrayElement];
+      });
+    }
+    return [];
+  });
+};
+
 const _getSelectFields = (fields, parentPath, domainSchema, selectItems, joinNames, single) => {
   for (const key of Object.keys(fields)) {
     if (key !== '__typename') {
@@ -39,7 +53,11 @@ const _getSelectFields = (fields, parentPath, domainSchema, selectItems, joinNam
         }
         const as = parentPath.length > 0 ? `${parentPath.join('_')}_${key}` : key;
         const arrayPrefix = single ? '' : '_';
-        selectItems.push(`${decamelize(domainSchema.__.name)}.${decamelize(key)} as ${arrayPrefix}${as}`);
+        selectItems.push(
+          `${decamelize(domainSchema.__.tableName ? domainSchema.__.tableName : domainSchema.name)}.${decamelize(
+            key
+          )} as ${arrayPrefix}${as}`
+        );
       } else {
         if (value.type.constructor === Array) {
           //console.log('Array');
@@ -48,7 +66,11 @@ const _getSelectFields = (fields, parentPath, domainSchema, selectItems, joinNam
           //console.log(value.type[0].name);
         } else {
           if (!value.type.__.transient) {
-            joinNames.push({ key: decamelize(key), name: decamelize(value.type.__.name) });
+            joinNames.push({
+              key: decamelize(key),
+              prefix: value.type.__.tablePrefix ? value.type.__.tablePrefix : '',
+              name: decamelize(value.type.__.tableName ? value.type.__.tableName : value.type.name)
+            });
           }
 
           parentPath.push(key);
@@ -71,12 +93,8 @@ export const selectBy = (schema, fields, single = false) => {
 
   return query => {
     // join table names
-    joinNames.map(({ key, name }) => {
-      query.leftJoin(
-        `${schema.__.tablePrefix}${name} as ${name}`,
-        `${name}.id`,
-        `${decamelize(schema.__.name)}.${key}_id`
-      );
+    joinNames.map(({ key, prefix, name }) => {
+      query.leftJoin(`${prefix}${name} as ${name}`, `${name}.id`, `${decamelize(schema.name)}.${key}_id`);
     });
 
     return query.select(selectItems);
diff --git a/tools/cli/module.js b/tools/cli/module.js
index a6d1735f7c..136f7a8bf6 100644
--- a/tools/cli/module.js
+++ b/tools/cli/module.js
@@ -205,32 +205,42 @@ function updateSchema(logger, module) {
       const file = `schema.graphql`;
 
       // regenerate input fields
-      let moduleData = `  node: ${Module}\n`;
+      //let moduleData = `  node: ${Module}\n`;
       let inputCreate = '';
       let inputUpdate = '';
+      let inputFilter = `  searchText: String\n`;
       let manyInput = '';
       for (const key of schema.keys()) {
         const value = schema.values[key];
+        const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
         if (value.type.isSchema) {
           let required = value.optional ? '' : '!';
           inputCreate += `  ${key}Id: Int${required}\n`;
           inputUpdate += `  ${key}Id: Int\n`;
+          inputFilter += `  ${key}Id: Int\n`;
           //moduleData += `  ${key}s(limit: Int, orderBy: OrderByInput): [${value.type.name}]\n`;
         } else if (value.type.constructor !== Array) {
           if (key !== 'id') {
             inputCreate += `  ${key}: ${generateField(value)}\n`;
             inputUpdate += `  ${key}: ${generateField(value, true)}\n`;
           }
+
+          if (hasTypeOf(Date)) {
+            inputFilter += `  ${key}_lte: ${generateField(value, true)}\n`;
+            inputFilter += `  ${key}_gte: ${generateField(value, true)}\n`;
+          } else {
+            inputFilter += `  ${key}: ${generateField(value, true)}\n`;
+          }
         } else if (value.type.constructor === Array) {
           inputCreate += `  ${key}: ${pascalize(key)}CreateManyInput\n`;
           inputUpdate += `  ${key}: ${pascalize(key)}UpdateManyInput\n`;
 
-          for (const remoteKey of value.type[0].keys()) {
+          /*for (const remoteKey of value.type[0].keys()) {
             const remoteValue = value.type[0].values[remoteKey];
             if (remoteValue.type.isSchema) {
               moduleData += `  ${remoteKey}s: [${pascalize(remoteKey)}]\n`;
             }
-          }
+          }*/
 
           manyInput += `
 
@@ -268,12 +278,12 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
         .to(file);
 
       // override ModuleData in schema.graphql file
-      let replaceModuleData = `type ${Module}Data {([^}])*\\n}`;
+      /*let replaceModuleData = `type ${Module}Data {([^}])*\\n}`;
       shell
         .ShellString(shell.cat(file).replace(RegExp(replaceModuleData, 'g'), `type ${Module}Data {\n${moduleData}}`))
-        .to(file);
+        .to(file);*/
 
-      // override CreateModuleInput in schema.graphql file
+      // override ModuleCreateInput in schema.graphql file
       const replaceCreate = `input ${Module}CreateInput {([^}])*\\n}`;
       shell
         .ShellString(
@@ -281,7 +291,7 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
         )
         .to(file);
 
-      // override UpdateModuleInput in schema.graphql file
+      // override ModuleUpdateInput in schema.graphql file
       const replaceUpdate = `input ${Module}UpdateInput {([^}])*\\n}`;
       shell
         .ShellString(
@@ -289,10 +299,19 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
         )
         .to(file);
 
+      // override ModuleFilterInput in schema.graphql file
+      const replaceFilter = `input ${Module}FilterInput {([^}])*\\n}`;
+      shell
+        .ShellString(
+          shell.cat(file).replace(RegExp(replaceFilter, 'g'), `input ${Module}FilterInput {\n${inputFilter}}`)
+        )
+        .to(file);
+
       logger.info(chalk.green(`✔ Schema in ${pathSchema}${file} successfully updated!`));
 
       const resolverFile = `resolvers.js`;
-      let replace = '';
+      let replace = `  ${schema.name}: {
+`;
       //moduleData = '';
       for (const key of schema.keys()) {
         const value = schema.values[key];
@@ -302,13 +321,11 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
     },
 `;*/
         } else if (value.type.constructor === Array) {
-          replace += `  ${schema.name}: {
-    ${key}: createBatchResolver((sources, args, ctx, info) => {
+          replace += `    ${key}: createBatchResolver((sources, args, ctx, info) => {
       return ctx.${schema.name}.getByIds(sources.map(({ id }) => id), '${camelize(schema.name)}', ctx.${
             value.type[0].name
           }, info);
-    })
-  },
+    }),
 `;
           /*
           for (const remoteKey of value.type[0].keys()) {
@@ -322,6 +339,8 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
           }*/
         }
       }
+      replace += `  },
+`;
       /*
       if (moduleData !== '') {
         moduleData = `${moduleData.replace(/,\s*$/, '')}
@@ -394,7 +413,7 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
               graphql += `      id\n`;
               graphql += `      ${remotecolumn}\n`;
               graphql += `    }\n`;
-            } else {
+            } else if (remoteValue.type.constructor !== Array) {
               graphql += `    ${remoteKey}\n`;
             }
           }
@@ -468,6 +487,123 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
     } else {
       logger.error(chalk.red(`✘ Module query path ${pathModuleQuery} not found!`));
     }*/
+
+    // get state client file
+    const pathStateClient = `${__dirname}/../../packages/client/src/modules/${module}/graphql/`;
+    if (fs.existsSync(pathStateClient)) {
+      const file = `${Module}State.client.graphql`;
+
+      // regenerate graphql fragment
+      let graphql = '';
+      for (const key of schema.keys()) {
+        const value = schema.values[key];
+        const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
+        if (value.type.isSchema) {
+          graphql += `    ${key}Id\n`;
+          /*} else if (value.type.constructor === Array) {
+            graphql += `  ${key} {\n`;
+            for (const remoteKey of value.type[0].keys()) {
+              const remoteValue = value.type[0].values[remoteKey];
+              if (remoteValue.type.isSchema) {
+                let remotecolumn = 'name';
+                for (const remoteKey of remoteValue.type.keys()) {
+                  const remoteValue1 = remoteValue.type.values[remoteKey];
+                  if (remoteValue1.sortBy) {
+                    remotecolumn = remoteKey;
+                  }
+                }
+                graphql += `    ${remoteKey} {\n`;
+                graphql += `      id\n`;
+                graphql += `      ${remotecolumn}\n`;
+                graphql += `    }\n`;
+              } else {
+                graphql += `    ${remoteKey}\n`;
+              }
+            }
+            graphql += `  }\n`;*/
+        } else {
+          if (hasTypeOf(Date)) {
+            graphql += `    ${key}_lte\n`;
+            graphql += `    ${key}_gte\n`;
+          } else {
+            graphql += `    ${key}\n`;
+          }
+        }
+      }
+      graphql += `    searchText
+  }\n`;
+
+      shell.cd(pathStateClient);
+      // override graphql fragment file
+      const replaceStateClient = `filter {(.|\n)*\n}\n`;
+      shell.ShellString(shell.cat(file).replace(RegExp(replaceStateClient, 'g'), `filter {\n${graphql}}\n`)).to(file);
+
+      logger.info(chalk.green(`✔ State Client in ${pathStateClient}${file} successfully updated!`));
+    } else {
+      logger.error(chalk.red(`✘ State Client path ${pathStateClient} not found!`));
+    }
+
+    // get state resolver file
+    const pathStateResolver = `${__dirname}/../../packages/client/src/modules/${module}/resolvers/`;
+    if (fs.existsSync(pathStateResolver)) {
+      const file = `index.js`;
+
+      // regenerate resolver defaults
+      let defaults = `const defaultFilters = {\n`;
+      for (const key of schema.keys()) {
+        const value = schema.values[key];
+        const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
+        if (value.type.isSchema) {
+          defaults += `  ${key}Id: '',\n`;
+          /*} else if (value.type.constructor === Array) {
+            graphql += `  ${key} {\n`;
+            for (const remoteKey of value.type[0].keys()) {
+              const remoteValue = value.type[0].values[remoteKey];
+              if (remoteValue.type.isSchema) {
+                let remotecolumn = 'name';
+                for (const remoteKey of remoteValue.type.keys()) {
+                  const remoteValue1 = remoteValue.type.values[remoteKey];
+                  if (remoteValue1.sortBy) {
+                    remotecolumn = remoteKey;
+                  }
+                }
+                graphql += `    ${remoteKey} {\n`;
+                graphql += `      id\n`;
+                graphql += `      ${remotecolumn}\n`;
+                graphql += `    }\n`;
+              } else {
+                graphql += `    ${remoteKey}\n`;
+              }
+            }
+            graphql += `  }\n`;*/
+        } else {
+          if (hasTypeOf(Date)) {
+            defaults += `  ${key}_lte: '',\n`;
+            defaults += `  ${key}_gte: '',\n`;
+          } else {
+            defaults += `  ${key}: '',\n`;
+          }
+        }
+      }
+
+      defaults += `  searchText: ''
+};\n`;
+
+      shell.cd(pathStateResolver);
+      // override state resolver file
+      const replaceStateResolverDefaults = `// filter data([^*]+)// end filter data`;
+      shell
+        .ShellString(
+          shell
+            .cat(file)
+            .replace(RegExp(replaceStateResolverDefaults, 'g'), `// filter data\n${defaults}// end filter data`)
+        )
+        .to(file);
+
+      logger.info(chalk.green(`✔ State Resolver in ${pathStateResolver}${file} successfully updated!`));
+    } else {
+      logger.error(chalk.red(`✘ State Resolver path ${pathStateResolver} not found!`));
+    }
   } else {
     logger.info(chalk.red(`✘ Module ${module} in path ${modulePath} not found!`));
   }
diff --git a/tools/templates/crud/client/components/Module.web.jsx b/tools/templates/crud/client/components/Module.web.jsx
index c9f06ad5e5..5a4984a788 100644
--- a/tools/templates/crud/client/components/Module.web.jsx
+++ b/tools/templates/crud/client/components/Module.web.jsx
@@ -31,9 +31,7 @@ export default class $Module$ extends React.PureComponent {
       <PageLayout>
         {this.renderMetaData(title)}
         <h2>{title}</h2>
-        <hr />
         <$Module$Filter />
-        <hr />
         <$Module$List link={link} />
       </PageLayout>
     );
diff --git a/tools/templates/crud/client/containers/ModuleFilter.jsx b/tools/templates/crud/client/containers/ModuleFilter.jsx
index 4f86378131..707e4fb468 100644
--- a/tools/templates/crud/client/containers/ModuleFilter.jsx
+++ b/tools/templates/crud/client/containers/ModuleFilter.jsx
@@ -3,13 +3,14 @@ import { graphql, compose } from 'react-apollo';
 
 import { removeTypename } from '../../../../../common/utils';
 import { FilterView } from '../../common/components/crud';
+import { $Module$Schema } from '../../../../../server/src/modules/$module$/schema';
 
 import $MODULE$_STATE_QUERY from '../graphql/$Module$StateQuery.client.graphql';
 import UPDATE_FILTER from '../graphql/UpdateFilter.client.graphql';
 
-class $Module$Filter extends React.PureComponent {
+class $Module$Filter extends React.Component {
   render() {
-    return <FilterView {...this.props} />;
+    return <FilterView {...this.props} schema={$Module$Schema} />;
   }
 }
 
@@ -21,8 +22,8 @@ export default compose(
   }),
   graphql(UPDATE_FILTER, {
     props: ({ mutate }) => ({
-      onSearchTextChange(searchText) {
-        mutate({ variables: { filter: { searchText } } });
+      onFilterChange(filter) {
+        mutate({ variables: { filter } });
       }
     })
   })
diff --git a/tools/templates/crud/client/containers/ModuleList.jsx b/tools/templates/crud/client/containers/ModuleList.jsx
index 4b809c88fa..acac907cd9 100644
--- a/tools/templates/crud/client/containers/ModuleList.jsx
+++ b/tools/templates/crud/client/containers/ModuleList.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { graphql, compose } from 'react-apollo';
 
-import { removeTypename } from '../../../../../common/utils';
+import { removeTypename, removeEmpty } from '../../../../../common/utils';
 import { ListView } from '../../common/components/crud';
 import { $Module$Schema } from '../../../../../server/src/modules/$module$/schema';
 
@@ -15,10 +15,8 @@ import DELETEMANY_$MODULE$S from '../graphql/DeleteMany$Module$s.graphql';
 import UPDATEMANY_$MODULE$S from '../graphql/UpdateMany$Module$s.graphql';
 
 class $Module$ extends React.Component {
-  customTableColumns = {};
-
   render() {
-    return <ListView {...this.props} customTableColumns={this.customTableColumns} schema={$Module$Schema} />;
+    return <ListView {...this.props} schema={$Module$Schema} />;
   }
 }
 
@@ -32,7 +30,7 @@ export default compose(
     options: ({ limit, orderBy, filter }) => {
       return {
         fetchPolicy: 'cache-and-network',
-        variables: { limit, orderBy, filter }
+        variables: { limit, orderBy, filter: removeEmpty(filter) }
       };
     },
     props: ({ data: { loading, $module$sConnection, refetch, error, fetchMore } }) => {
diff --git a/tools/templates/crud/client/graphql/ModuleState.client.graphql b/tools/templates/crud/client/graphql/ModuleState.client.graphql
index 3f90a1f774..6f653cfdab 100644
--- a/tools/templates/crud/client/graphql/ModuleState.client.graphql
+++ b/tools/templates/crud/client/graphql/ModuleState.client.graphql
@@ -5,6 +5,8 @@ fragment $Module$StateInfo on $Module$State {
     order
   }
   filter {
+    id
+    name
     searchText
   }
 }
diff --git a/tools/templates/crud/client/resolvers/index.js b/tools/templates/crud/client/resolvers/index.js
index 815db58b21..7fc264a26d 100644
--- a/tools/templates/crud/client/resolvers/index.js
+++ b/tools/templates/crud/client/resolvers/index.js
@@ -6,6 +6,14 @@ const TYPE_$MODULE$_STATE = '$Module$State';
 const TYPE_$MODULE$_STATE_FILTER = 'Filter$Module$Input';
 const TYPE_$MODULE$_STATE_ORDER_BY = 'OrderBy$Module$Input';
 
+// filter data
+const defaultFilters = {
+  id: '',
+  name: '',
+  searchText: ''
+};
+// end filter data
+
 const defaults = {
   $module$State: {
     limit: 25,
@@ -15,7 +23,7 @@ const defaults = {
       __typename: TYPE_$MODULE$_STATE_ORDER_BY
     },
     filter: {
-      searchText: '',
+      ...defaultFilters,
       __typename: TYPE_$MODULE$_STATE_FILTER
     },
     __typename: TYPE_$MODULE$_STATE
@@ -42,8 +50,15 @@ const resolvers = {
     },
     update$Module$Filter: (_, { filter }, { cache }) => {
       const { $module$State } = cache.readQuery({ query: $MODULE$_STATE_QUERY });
+
+      let mergeFilter = filter;
+      if (!filter.hasOwnProperty('searchText')) {
+        const { searchText, ...restFilters } = defaults.$module$State.filter;
+        mergeFilter = { ...restFilters, ...filter };
+      }
+
       const new$Module$State = update($module$State, {
-        filter: { $merge: filter }
+        filter: { $merge: mergeFilter }
       });
 
       cache.writeData({

From a45d91732442be8b6a04224ce8dd51ac184c3cd2 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 14 Mar 2018 13:54:25 +0100
Subject: [PATCH 108/327] update fieldAdapter

---
 packages/client/src/utils/FieldAdapter.jsx | 70 +++++++++++++++-------
 1 file changed, 47 insertions(+), 23 deletions(-)

diff --git a/packages/client/src/utils/FieldAdapter.jsx b/packages/client/src/utils/FieldAdapter.jsx
index 83b5338ef3..80fe67029f 100644
--- a/packages/client/src/utils/FieldAdapter.jsx
+++ b/packages/client/src/utils/FieldAdapter.jsx
@@ -1,4 +1,5 @@
 import React, { Component } from 'react';
+import { Platform } from 'react-native';
 import PropTypes from 'prop-types';
 
 export default class FieldAdapter extends Component {
@@ -8,16 +9,15 @@ export default class FieldAdapter extends Component {
 
   static propTypes = {
     component: PropTypes.func,
+    onChangeText: PropTypes.func,
     onChange: PropTypes.func,
     onBlur: PropTypes.func,
     name: PropTypes.string.isRequired,
-    value: PropTypes.oneOfType([PropTypes.bool, PropTypes.string, PropTypes.number, PropTypes.object]),
+    value: PropTypes.string,
     defaultValue: PropTypes.string,
     checked: PropTypes.bool,
     defaultChecked: PropTypes.bool,
-    disabled: PropTypes.bool,
-    formType: PropTypes.string.isRequired,
-    hasTypeOf: PropTypes.func.isRequired
+    disabled: PropTypes.bool
   };
 
   constructor(props, context) {
@@ -27,30 +27,53 @@ export default class FieldAdapter extends Component {
     }
   }
 
-  render() {
+  onChange = e => {
+    const { onChange } = this.props;
+    if (onChange) {
+      onChange(e.target.value, e);
+    } else {
+      this.context.formik.handleChange(e);
+    }
+  };
+
+  onBlur = e => {
+    const { onBlur, name } = this.props;
     const { formik } = this.context;
-    const {
-      component,
-      name,
-      value,
-      defaultValue,
-      checked,
-      defaultChecked,
-      onChange,
-      onBlur,
-      disabled,
-      formType,
-      hasTypeOf
-    } = this.props;
+    if (onBlur) {
+      onBlur(e);
+    } else {
+      if (Platform.OS === 'web') {
+        formik.handleBlur(e);
+      } else {
+        formik.setFieldTouched(name, true);
+      }
+    }
+  };
+
+  onChangeText = value => {
+    const { onChangeText, onChange, name } = this.props;
+    if (onChange && !onChangeText) {
+      onChange(value);
+    } else if (onChangeText) {
+      onChangeText(value);
+    } else {
+      this.context.formik.setFieldValue(name, value);
+    }
+  };
 
+  render() {
+    const { formik } = this.context;
+    const { component, name, defaultValue, defaultChecked, disabled } = this.props;
+    let { value, checked } = this.props;
+    value = value || '';
+    checked = checked || false;
     const meta = {
       touched: formik.touched[name],
       error: formik.errors[name]
     };
 
     const input = {
-      onChange,
-      onBlur,
+      onBlur: this.onBlur,
       name,
       value,
       checked,
@@ -59,12 +82,13 @@ export default class FieldAdapter extends Component {
       disabled
     };
 
+    const changeEventHandler = Platform.OS === 'web' ? 'onChange' : 'onChangeText';
+    input[changeEventHandler] = this[changeEventHandler];
+
     return React.createElement(component, {
       ...this.props,
       input,
-      meta,
-      formType,
-      hasTypeOf
+      meta
     });
   }
 }

From 27275f0f49db8ecfd969094b6affeaffff50d58c Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 14 Mar 2018 13:55:48 +0100
Subject: [PATCH 109/327] update renderField

---
 .../web/ui-antd/components/RenderField.jsx    | 89 ++++++-------------
 1 file changed, 26 insertions(+), 63 deletions(-)

diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderField.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderField.jsx
index 3059593344..29c791ec87 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderField.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderField.jsx
@@ -1,68 +1,31 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import DomainSchema from '@domain-schema/core';
+import Form from 'antd/lib/form';
+import Input from 'antd/lib/input';
 
-import { FormItem, Input } from './index';
+const FormItem = Form.Item;
 
-export default class RenderField extends React.Component {
-  static propTypes = {
-    input: PropTypes.object,
-    label: PropTypes.string,
-    type: PropTypes.string,
-    formItemLayout: PropTypes.object,
-    hasTypeOf: PropTypes.func.isRequired,
-    meta: PropTypes.object
-  };
-
-  handleChange = e => {
-    const { input: { onChange, name }, hasTypeOf } = this.props;
-    //console.log('RenderField: handleChange');
-    //console.log('name:', name);
-    let value = e.target.value;
-    //console.log('value:', value);
-    if (hasTypeOf(Number)) {
-      value = value !== '' ? parseFloat(value) : '';
-      //console.log('RenderField: hasTypeOf(Number) TRUE');
-    }
-
-    onChange(name, value);
-  };
-
-  render() {
-    const {
-      input: { onChange, ...inputRest },
-      label,
-      type,
-      formItemLayout,
-      hasTypeOf,
-      meta: { touched, error }
-    } = this.props;
-
-    let validateStatus = '';
-    if (touched && error) {
-      validateStatus = 'error';
-    }
-
-    let input = {
-      ...inputRest
-    };
-
-    if (hasTypeOf(DomainSchema.Float)) {
-      //console.log('RenderField: hasTypeOf(Float) TRUE');
-      input = {
-        step: '0.01',
-        ...inputRest
-      };
-    } else if (hasTypeOf(Number)) {
-      //console.log('RenderField: hasTypeOf(Number) TRUE');
-    }
-
-    return (
-      <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
-        <div>
-          <Input {...input} placeholder={label} type={type} onChange={this.handleChange} />
-        </div>
-      </FormItem>
-    );
+const RenderField = ({ input, label, type, meta: { touched, error }, placeholder }) => {
+  let validateStatus = '';
+  if (touched && error) {
+    validateStatus = 'error';
   }
-}
+
+  return (
+    <FormItem label={label} validateStatus={validateStatus} help={touched && error}>
+      <div>
+        <Input {...input} placeholder={label || placeholder} type={type} />
+      </div>
+    </FormItem>
+  );
+};
+
+RenderField.propTypes = {
+  input: PropTypes.object,
+  label: PropTypes.string,
+  placeholder: PropTypes.string,
+  type: PropTypes.string,
+  meta: PropTypes.object
+};
+
+export default RenderField;

From d35b64ccb3e8e721cd271ad3798cad7ed960d558 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 14 Mar 2018 14:06:53 +0100
Subject: [PATCH 110/327] update RenderSelect

---
 packages/client/.spinrc.js                    |   4 +-
 .../web/ui-antd/components/RenderSelect.jsx   | 168 +++---------------
 2 files changed, 29 insertions(+), 143 deletions(-)

diff --git a/packages/client/.spinrc.js b/packages/client/.spinrc.js
index 4b2677f938..d2289d1145 100644
--- a/packages/client/.spinrc.js
+++ b/packages/client/.spinrc.js
@@ -5,7 +5,7 @@ const config = {
     web: {
       entry: './src/index.tsx',
       stack: ['react-native-web', 'web'],
-      openBrowser: true,
+      openBrowser: false,
       defines: {
         __CLIENT__: true
       },
@@ -51,4 +51,4 @@ const extraDefines = {
 
 config.options.defines = Object.assign(config.options.defines, extraDefines);
 
-module.exports = config;
\ No newline at end of file
+module.exports = config;
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx
index b1ccb5e1b4..0bdb61f800 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx
@@ -1,147 +1,33 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import Form from 'antd/lib/form';
 import Select from 'antd/lib/select';
-import Spin from 'antd/lib/spin';
-import { pascalize, camelize } from 'humps';
 
-import { FormItem } from './index';
+const FormItem = Form.Item;
 
-const Option = Select.Option;
-
-export default class RenderSelect extends React.Component {
-  static propTypes = {
-    input: PropTypes.object,
-    label: PropTypes.string,
-    formItemLayout: PropTypes.object,
-    meta: PropTypes.object,
-    schema: PropTypes.object,
-    style: PropTypes.object,
-    formType: PropTypes.string.isRequired
-  };
-
-  state = {
-    searchText: '',
-    dirty: false
-  };
-
-  handleChange = value => {
-    const { input: { onChange, name } } = this.props;
-    //console.log('RenderSelect: handleChange');
-    //console.log('name:', name);
-    //console.log('value:', value);
-    onChange(name, value ? { id: value.key, name: value.label } : undefined);
-  };
-
-  search = value => {
-    const { dirty } = this.state;
-    //onsole.log('search:', value);
-    if ((value && value.length >= 1) || dirty) {
-      this.setState({ searchText: value, dirty: true });
-    }
-  };
-
-  render() {
-    const {
-      input: { value, onChange, ...inputRest },
-      label,
-      schema,
-      style,
-      formItemLayout,
-      meta: { touched, error },
-      formType
-    } = this.props;
-    const { searchText, dirty } = this.state;
-
-    let validateStatus = '';
-    if (touched && error) {
-      validateStatus = 'error';
-    }
-
-    const camelizeSchemaName = camelize(schema.name);
-    const pascalizeSchemaName = pascalize(schema.name);
-    let column = 'name';
-    for (const remoteKey of schema.keys()) {
-      const remoteValue = schema.values[remoteKey];
-      if (remoteValue.sortBy) {
-        column = remoteKey;
-      }
-    }
-    let formatedValue =
-      value && value != '' && value != undefined
-        ? { key: value.id.toString(), label: value.name ? value.name : value[column] }
-        : { key: '', label: '' };
-    //console.log('formatedValue:', formatedValue);
-
-    // eslint-disable-next-line import/no-dynamic-require
-    const Query = require(`../../../../../${camelizeSchemaName}/containers/${pascalizeSchemaName}Query`)['default'];
-    //console.log(`../../../../../${camelizeSchemaName}/containers/${pascalizeSchemaName}Query`);
-
-    let defaultStyle = { width: '100%' };
-    if (style) {
-      defaultStyle = style;
-    }
-    return (
-      <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={error}>
-        <div>
-          <Query limit={10} filter={{ searchText }}>
-            {({ loading, data }) => {
-              if (!loading || data) {
-                const options = data.edges
-                  ? data.edges.map(opt => (
-                      <Option key={opt.id} value={opt.id.toString()}>
-                        {opt[column]}
-                      </Option>
-                    ))
-                  : null;
-
-                let props = {
-                  allowClear: formType !== 'form' ? true : false,
-                  showSearch: true,
-                  labelInValue: true,
-                  dropdownMatchSelectWidth: false,
-                  style: defaultStyle,
-                  onChange: this.handleChange,
-                  ...inputRest,
-                  defaultValue: formatedValue
-                };
-
-                if (data.pageInfo.totalCount > 10) {
-                  if (data.edges && value && value != '' && value != undefined) {
-                    if (!data.edges.find(node => node.id === value.id)) {
-                      if (!dirty) {
-                        options.unshift(
-                          <Option key={value.id} value={value.id.toString()}>
-                            {value[column]}
-                          </Option>
-                        );
-                      } else {
-                        formatedValue = { key: data.edges[0].id.toString() };
-                      }
-                    }
-                  }
-
-                  props = {
-                    ...props,
-                    filterOption: false,
-                    defaultValue: formatedValue,
-                    onSearch: this.search
-                  };
-                } else {
-                  props = {
-                    ...props,
-                    optionFilterProp: 'children',
-                    filterOption: (input, option) =>
-                      option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
-                  };
-                }
-                return <Select {...props}>{options}</Select>;
-              } else {
-                return <Spin size="small" />;
-              }
-            }}
-          </Query>
-        </div>
-      </FormItem>
-    );
+const RenderField = ({ input, label, type, children, meta: { touched, error } }) => {
+  let validateStatus = '';
+  if (touched && error) {
+    validateStatus = 'error';
   }
-}
+
+  return (
+    <FormItem label={label} validateStatus={validateStatus} help={error}>
+      <div>
+        <Select {...input} type={type}>
+          {children}
+        </Select>
+      </div>
+    </FormItem>
+  );
+};
+
+RenderField.propTypes = {
+  input: PropTypes.object,
+  label: PropTypes.string,
+  type: PropTypes.string,
+  meta: PropTypes.object,
+  children: PropTypes.node
+};
+
+export default RenderField;

From ef01356178bb6fbf1f0c09dca9d90f22792bb970 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 14 Mar 2018 14:16:28 +0100
Subject: [PATCH 111/327] update RenderSelect

---
 .../components/web/ui-antd/components/RenderSelect.jsx      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx
index 0bdb61f800..f20ccd9f7b 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import Form from 'antd/lib/form';
-import Select from 'antd/lib/select';
+//import Select from 'antd/lib/select';
 
 const FormItem = Form.Item;
 
@@ -14,9 +14,9 @@ const RenderField = ({ input, label, type, children, meta: { touched, error } })
   return (
     <FormItem label={label} validateStatus={validateStatus} help={error}>
       <div>
-        <Select {...input} type={type}>
+        <select {...input} type={type}>
           {children}
-        </Select>
+        </select>
       </div>
     </FormItem>
   );

From 603d8e6a2e9e79874fd688d15295c3c331d0c78b Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 14 Mar 2018 14:46:33 +0100
Subject: [PATCH 112/327] update with latest crud

---
 .../web/ui-antd/components/RenderNumber.jsx   |  67 ++++++++
 .../ui-antd/components/RenderSelectQuery.jsx  | 147 ++++++++++++++++++
 .../web/ui-antd/components/RenderTextarea.jsx |   2 +-
 .../web/ui-antd/components/index.js           |   4 +
 .../ui-bootstrap/components/RenderNumber.jsx  |  32 ----
 .../components/RenderTextarea.jsx             |  32 ----
 .../client/src/modules/common/util.web.jsx    |  22 ++-
 7 files changed, 233 insertions(+), 73 deletions(-)
 create mode 100644 packages/client/src/modules/common/components/web/ui-antd/components/RenderNumber.jsx
 create mode 100644 packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
 delete mode 100644 packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderNumber.jsx
 delete mode 100644 packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderTextarea.jsx

diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderNumber.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderNumber.jsx
new file mode 100644
index 0000000000..c1d909bf9d
--- /dev/null
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderNumber.jsx
@@ -0,0 +1,67 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import DomainSchema from '@domain-schema/core';
+import InputNumber from 'antd/lib/input-number';
+
+import { FormItem } from './index';
+
+export default class RenderNumber extends React.Component {
+  static propTypes = {
+    input: PropTypes.object,
+    label: PropTypes.string,
+    type: PropTypes.string,
+    formItemLayout: PropTypes.object,
+    hasTypeOf: PropTypes.func.isRequired,
+    meta: PropTypes.object
+  };
+
+  handleChange = value => {
+    const { input: { onChange, name }, hasTypeOf } = this.props;
+    //console.log('RenderInput: handleChange');
+    //console.log('name:', name);
+    if (hasTypeOf(Number)) {
+      value = value !== '' ? parseFloat(value) : '';
+      //console.log('RenderInput: hasTypeOf(Number) TRUE');
+    }
+
+    onChange(name, value);
+  };
+
+  render() {
+    const {
+      input: { onChange, ...inputRest },
+      label,
+      type,
+      formItemLayout,
+      hasTypeOf,
+      meta: { touched, error }
+    } = this.props;
+
+    let validateStatus = '';
+    if (touched && error) {
+      validateStatus = 'error';
+    }
+
+    let input = {
+      ...inputRest
+    };
+
+    if (hasTypeOf(DomainSchema.Float)) {
+      //console.log('RenderNumber: hasTypeOf(Float) TRUE');
+      input = {
+        step: '0.01',
+        ...inputRest
+      };
+    } else if (hasTypeOf(Number)) {
+      //console.log('RenderNumber: hasTypeOf(Number) TRUE');
+    }
+
+    return (
+      <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
+        <div>
+          <InputNumber {...input} placeholder={label} type={type} onChange={this.handleChange} />
+        </div>
+      </FormItem>
+    );
+  }
+}
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
new file mode 100644
index 0000000000..844545846f
--- /dev/null
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
@@ -0,0 +1,147 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Select from 'antd/lib/select';
+import Spin from 'antd/lib/spin';
+import { pascalize, camelize } from 'humps';
+
+import { FormItem } from './index';
+
+const Option = Select.Option;
+
+export default class RenderSelectQuery extends React.Component {
+  static propTypes = {
+    input: PropTypes.object,
+    label: PropTypes.string,
+    formItemLayout: PropTypes.object,
+    meta: PropTypes.object,
+    schema: PropTypes.object,
+    style: PropTypes.object,
+    formType: PropTypes.string.isRequired
+  };
+
+  state = {
+    searchText: '',
+    dirty: false
+  };
+
+  handleChange = value => {
+    const { input: { onChange, name } } = this.props;
+    //console.log('RenderSelect: handleChange');
+    //console.log('name:', name);
+    //console.log('value:', value);
+    onChange(name, value ? { id: value.key, name: value.label } : undefined);
+  };
+
+  search = value => {
+    const { dirty } = this.state;
+    //onsole.log('search:', value);
+    if ((value && value.length >= 1) || dirty) {
+      this.setState({ searchText: value, dirty: true });
+    }
+  };
+
+  render() {
+    const {
+      input: { value, onChange, ...inputRest },
+      label,
+      schema,
+      style,
+      formItemLayout,
+      meta: { touched, error },
+      formType
+    } = this.props;
+    const { searchText, dirty } = this.state;
+
+    let validateStatus = '';
+    if (touched && error) {
+      validateStatus = 'error';
+    }
+
+    const camelizeSchemaName = camelize(schema.name);
+    const pascalizeSchemaName = pascalize(schema.name);
+    let column = 'name';
+    for (const remoteKey of schema.keys()) {
+      const remoteValue = schema.values[remoteKey];
+      if (remoteValue.sortBy) {
+        column = remoteKey;
+      }
+    }
+    let formatedValue =
+      value && value != '' && value != undefined
+        ? { key: value.id.toString(), label: value.name ? value.name : value[column] }
+        : { key: '', label: '' };
+    //console.log('formatedValue:', formatedValue);
+
+    // eslint-disable-next-line import/no-dynamic-require
+    const Query = require(`../../../../../${camelizeSchemaName}/containers/${pascalizeSchemaName}Query`)['default'];
+    //console.log(`../../../../../${camelizeSchemaName}/containers/${pascalizeSchemaName}Query`);
+
+    let defaultStyle = { width: '100%' };
+    if (style) {
+      defaultStyle = style;
+    }
+    return (
+      <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={error}>
+        <div>
+          <Query limit={10} filter={{ searchText }}>
+            {({ loading, data }) => {
+              if (!loading || data) {
+                const options = data.edges
+                  ? data.edges.map(opt => (
+                      <Option key={opt.id} value={opt.id.toString()}>
+                        {opt[column]}
+                      </Option>
+                    ))
+                  : null;
+
+                let props = {
+                  allowClear: formType !== 'form' ? true : false,
+                  showSearch: true,
+                  labelInValue: true,
+                  dropdownMatchSelectWidth: false,
+                  style: defaultStyle,
+                  onChange: this.handleChange,
+                  ...inputRest,
+                  defaultValue: formatedValue
+                };
+
+                if (data.pageInfo.totalCount > 10) {
+                  if (data.edges && value && value != '' && value != undefined) {
+                    if (!data.edges.find(node => node.id === value.id)) {
+                      if (!dirty) {
+                        options.unshift(
+                          <Option key={value.id} value={value.id.toString()}>
+                            {value[column]}
+                          </Option>
+                        );
+                      } else {
+                        formatedValue = { key: data.edges[0].id.toString() };
+                      }
+                    }
+                  }
+
+                  props = {
+                    ...props,
+                    filterOption: false,
+                    defaultValue: formatedValue,
+                    onSearch: this.search
+                  };
+                } else {
+                  props = {
+                    ...props,
+                    optionFilterProp: 'children',
+                    filterOption: (input, option) =>
+                      option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                  };
+                }
+                return <Select {...props}>{options}</Select>;
+              } else {
+                return <Spin size="small" />;
+              }
+            }}
+          </Query>
+        </div>
+      </FormItem>
+    );
+  }
+}
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderTextarea.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderTextarea.jsx
index 5d398f268c..655299943c 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderTextarea.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderTextarea.jsx
@@ -6,7 +6,7 @@ import { FormItem } from './index';
 
 const { TextArea } = Input;
 
-export default class RenderTextarea extends React.Component {
+export default class RenderTextArea extends React.Component {
   static propTypes = {
     input: PropTypes.object,
     label: PropTypes.string,
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/index.js b/packages/client/src/modules/common/components/web/ui-antd/components/index.js
index 4ae106e5d6..ed8c63f8cf 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/index.js
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/index.js
@@ -9,8 +9,12 @@ export { default as Switch } from './Switch';
 export { default as Select } from './Select';
 export { default as Option } from './Option';
 export { default as RenderField } from './RenderField';
+export { default as RenderInput } from './RenderInput';
+export { default as RenderNumber } from './RenderNumber';
+export { default as RenderTextArea } from './RenderTextArea';
 export { default as RenderDate } from './RenderDate';
 export { default as RenderSelect } from './RenderSelect';
+export { default as RenderSelectQuery } from './RenderSelectQuery';
 export { default as RenderCheckBox } from './RenderCheckBox';
 export { default as RenderSwitch } from './RenderSwitch';
 export { default as Alert } from './Alert';
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderNumber.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderNumber.jsx
deleted file mode 100644
index 48443b3e74..0000000000
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderNumber.jsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { FormGroup, Label, Input, FormFeedback } from 'reactstrap';
-
-const RenderNumber = ({ input, label, type, meta: { touched, error }, children }) => {
-  let valid = null;
-  if (touched && error) {
-    valid = false;
-  }
-
-  return (
-    <FormGroup>
-      {label && <Label>{label}</Label>}
-      <div>
-        <Input {...input} placeholder={label} type={type} valid={valid}>
-          {children}
-        </Input>
-        {touched && (error && <FormFeedback>{error}</FormFeedback>)}
-      </div>
-    </FormGroup>
-  );
-};
-
-RenderNumber.propTypes = {
-  input: PropTypes.object,
-  label: PropTypes.string,
-  type: PropTypes.string,
-  meta: PropTypes.object,
-  children: PropTypes.array
-};
-
-export default RenderNumber;
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderTextarea.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderTextarea.jsx
deleted file mode 100644
index ea521d0beb..0000000000
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderTextarea.jsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { FormGroup, Label, Input, FormFeedback } from 'reactstrap';
-
-const RenderTextarea = ({ input, label, type, meta: { touched, error }, children }) => {
-  let valid = null;
-  if (touched && error) {
-    valid = false;
-  }
-
-  return (
-    <FormGroup>
-      {label && <Label>{label}</Label>}
-      <div>
-        <Input {...input} placeholder={label} type={type} valid={valid}>
-          {children}
-        </Input>
-        {touched && (error && <FormFeedback>{error}</FormFeedback>)}
-      </div>
-    </FormGroup>
-  );
-};
-
-RenderTextarea.propTypes = {
-  input: PropTypes.object,
-  label: PropTypes.string,
-  type: PropTypes.string,
-  meta: PropTypes.object,
-  children: PropTypes.array
-};
-
-export default RenderTextarea;
diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index a6ebe90d57..e5ddd8e352 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -14,8 +14,10 @@ import DomainSchema from '@domain-schema/core';
 import Field from '../../utils/FieldAdapter';
 import { mapFormPropsToValues } from '../../utils/crud';
 import {
-  RenderField,
-  RenderSelect,
+  RenderInput,
+  RenderNumber,
+  RenderTextArea,
+  RenderSelectQuery,
   RenderDate,
   RenderSwitch,
   Button,
@@ -223,13 +225,13 @@ export const createFormFields = ({
         //  validate.push(required);
         //}
 
-        let component = RenderField;
+        let component = RenderInput;
         const value = values ? values[key] : '';
         let style = {};
         let inputType = 'text';
 
         if (type.isSchema) {
-          component = RenderSelect;
+          component = RenderSelectQuery;
           if (formType !== 'form') {
             style = { width: 100 };
           }
@@ -319,6 +321,7 @@ export const createFormFields = ({
           );
         } else if (hasTypeOf(Number)) {
           inputType = 'number';
+          component = RenderNumber;
           fields.push(
             <Col span={8} key={key}>
               <Field
@@ -369,13 +372,13 @@ export const createFormFields = ({
         //  validate.push(required);
         //}
 
-        let component = RenderField;
-        const value = values ? values[key] : '';
+        let component = RenderInput;
+        const fieldValue = values ? values[key] : '';
         let style = {};
         let inputType = 'text';
 
         if (type.isSchema) {
-          component = RenderSelect;
+          component = RenderSelectQuery;
           if (formType !== 'form') {
             style = { width: 100 };
           }
@@ -385,6 +388,9 @@ export const createFormFields = ({
           component = RenderDate;
         } else if (hasTypeOf(Number)) {
           inputType = 'number';
+          component = RenderNumber;
+        } else if (hasTypeOf(String) && value.fieldInput === 'textarea') {
+          component = RenderTextArea;
         }
 
         fields.push(
@@ -393,7 +399,7 @@ export const createFormFields = ({
             key={key}
             component={component}
             schema={type}
-            value={value}
+            value={fieldValue}
             type={inputType}
             style={style}
             label={startCase(key)}

From 33196425633556c2fe2792fb7ad48a51fa283166 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 29 Mar 2018 10:37:16 +0200
Subject: [PATCH 113/327] update with latest changes: auth, updated inputs, bug
 fixes

---
 config/subscription.js                        |   2 +-
 packages/client/package.json                  |   3 +-
 .../common/components/crud/FilterView.web.jsx |  21 ++-
 .../common/components/crud/FormView.web.jsx   |   4 +-
 .../common/components/crud/ListView.web.jsx   |  74 +++++----
 .../web/ui-antd/components/InputNumber.jsx    |  13 ++
 .../web/ui-antd/components/PageLayout.jsx     |   4 +-
 .../web/ui-antd/components/RenderDate.jsx     |  26 +++-
 .../web/ui-antd/components/RenderInput.jsx    |  18 +--
 .../web/ui-antd/components/RenderNumber.jsx   |  21 ++-
 .../components/RenderSelectCountry.jsx        |  88 +++++++++++
 .../ui-antd/components/RenderSelectQuery.jsx  |  24 ++-
 .../web/ui-antd/components/RenderSwitch.jsx   |  13 +-
 .../web/ui-antd/components/RenderTextarea.jsx |  18 +--
 .../web/ui-antd/components/SubMenu.jsx        |  18 +++
 .../web/ui-antd/components/index.js           |   3 +
 .../client/src/modules/common/util.web.jsx    | 144 ++++++++++++------
 .../modules/subscription/containers/Auth.js   |   4 +-
 .../src/modules/subscription/index.web.jsx    |   4 +-
 .../src/modules/user/containers/Auth.jsx      |  80 +++++++---
 .../client/src/modules/user/index.web.jsx     |  17 +--
 packages/client/src/utils/FieldAdapter.jsx    |   4 +-
 packages/client/src/utils/crud.js             |   7 +-
 packages/server/src/sql/crud.js               |  16 +-
 packages/server/src/sql/helpers.js            |   7 +-
 .../crud/client/components/Module.web.jsx     |   9 +-
 .../client/{index.jsx => index.native.jsx}    |   0
 tools/templates/crud/client/index.web.jsx     |  33 +++-
 tools/templates/crud/server/resolvers.js      |  37 ++---
 .../client/{index.jsx => index.native.jsx}    |   0
 yarn.lock                                     |  72 +++++----
 31 files changed, 535 insertions(+), 249 deletions(-)
 create mode 100644 packages/client/src/modules/common/components/web/ui-antd/components/InputNumber.jsx
 create mode 100644 packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectCountry.jsx
 create mode 100644 packages/client/src/modules/common/components/web/ui-antd/components/SubMenu.jsx
 rename tools/templates/crud/client/{index.jsx => index.native.jsx} (100%)
 rename tools/templates/module/client/{index.jsx => index.native.jsx} (100%)

diff --git a/config/subscription.js b/config/subscription.js
index 9f9096b174..ab4adcaed6 100644
--- a/config/subscription.js
+++ b/config/subscription.js
@@ -1,5 +1,5 @@
 export default {
-  enabled: true,
+  enabled: false,
   stripePublishableKey: '',
   stripeSecretKey: process.env.STRIPE_SECRET_KEY,
   stripeEndpointSecret: process.env.STRIPE_ENDPOINT_SECRET
diff --git a/packages/client/package.json b/packages/client/package.json
index ba903a650f..06ccb4bd6e 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -38,7 +38,7 @@
   "license": "MIT",
   "dependencies": {
     "@domain-schema/core": "^0.0.30",
-    "antd": "^3.2.0",
+    "antd": "^3.3.3",
     "apollo-cache-inmemory": "^1.1.4",
     "apollo-client": "^2.1.0",
     "apollo-fetch": "^0.7.0",
@@ -56,6 +56,7 @@
     "graphql": "^0.12.3",
     "graphql-auth": "^0.2.0",
     "graphql-iso-date": "^3.3.0",
+    "graphql-iso-enums": "^1.0.4",
     "graphql-tag": "^2.6.0",
     "history": "^4.7.2",
     "humps": "^2.0.1",
diff --git a/packages/client/src/modules/common/components/crud/FilterView.web.jsx b/packages/client/src/modules/common/components/crud/FilterView.web.jsx
index 0a7b3ff03f..c1c1bdf75c 100644
--- a/packages/client/src/modules/common/components/crud/FilterView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/FilterView.web.jsx
@@ -1,8 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Formik } from 'formik';
-
 import { DebounceInput } from 'react-debounce-input';
+
+import { hasRole } from '../../../user/containers/Auth';
 import { Form, FormItem, Input, Row, Col, Button, Icon } from '../web';
 import { createFormFields } from '../../util';
 import { mapFormPropsToValues, pickInputFields } from '../../../../utils/crud';
@@ -23,7 +24,9 @@ class FilterView extends React.PureComponent {
     schema: PropTypes.object.isRequired,
     searchText: PropTypes.string,
     onFilterChange: PropTypes.func.isRequired,
-    customFields: PropTypes.object
+    customFields: PropTypes.object,
+    currentUser: PropTypes.object,
+    currentUserLoading: PropTypes.bool
   };
 
   state = {
@@ -41,10 +44,15 @@ class FilterView extends React.PureComponent {
   };
 
   render() {
-    const { schema, onFilterChange, customFields } = this.props;
+    const { schema, onFilterChange, customFields, currentUser } = this.props;
     const { expand } = this.state;
 
-    if (customFields && customFields.constructor === Object && Object.keys(customFields).length === 0) {
+    const showFilter =
+      customFields === null
+        ? false
+        : customFields && customFields.role ? (hasRole(customFields.role, currentUser) ? true : false) : true;
+
+    if (!showFilter) {
       return null;
     }
 
@@ -61,7 +69,7 @@ class FilterView extends React.PureComponent {
           formikBag.resetForm();
           onFilterChange({});
         }}
-        render={({ values, setFieldValue, setFieldTouched, handleChange, handleBlur, handleSubmit, handleReset }) => (
+        render={({ values, handleChange, handleBlur, handleSubmit, handleReset }) => (
           <Form className="ant-advanced-search-form" onSubmit={handleSubmit}>
             <Row>
               <Col span={8}>
@@ -90,13 +98,12 @@ class FilterView extends React.PureComponent {
             <Row gutter={24} style={{ display: expand ? 'block' : 'none' }}>
               {createFormFields({
                 handleChange,
-                setFieldValue,
                 handleBlur,
-                setFieldTouched,
                 schema,
                 values,
                 formItemLayout,
                 prefix: '',
+                customFields,
                 formType: 'filter'
               })}
             </Row>
diff --git a/packages/client/src/modules/common/components/crud/FormView.web.jsx b/packages/client/src/modules/common/components/crud/FormView.web.jsx
index 40ce98aecf..7818627a84 100644
--- a/packages/client/src/modules/common/components/crud/FormView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/FormView.web.jsx
@@ -45,13 +45,11 @@ const FormView = ({ schema, updateEntry, createEntry, title, customFields, data
         //console.log('onSubmit, values:', pickInputFields({schema, values}));
         await onSubmit({ schema, values, updateEntry, createEntry, title, data: data ? data.node : null });
       }}
-      render={({ values, setFieldValue, setFieldTouched, handleChange, handleBlur, handleSubmit }) => (
+      render={({ values, handleChange, handleBlur, handleSubmit }) => (
         <Form name="post" onSubmit={handleSubmit}>
           {createFormFields({
             handleChange,
-            setFieldValue,
             handleBlur,
-            setFieldTouched,
             schema,
             values,
             formItemLayout,
diff --git a/packages/client/src/modules/common/components/crud/ListView.web.jsx b/packages/client/src/modules/common/components/crud/ListView.web.jsx
index eb7bbea903..53c0fe1c0e 100644
--- a/packages/client/src/modules/common/components/crud/ListView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/ListView.web.jsx
@@ -8,6 +8,7 @@ import HTML5Backend from 'react-dnd-html5-backend';
 import { Table, Button, Popconfirm, Row, Col, Form, FormItem } from '../web';
 import { createColumnFields, createFormFields } from '../../util';
 import { mapFormPropsToValues, pickInputFields } from '../../../../utils/crud';
+import { hasRole } from '../../../user/containers/Auth';
 
 function dragDirection(dragIndex, hoverIndex, initialClientOffset, clientOffset, sourceClientOffset) {
   const hoverMiddleY = (initialClientOffset.y - sourceClientOffset.y) / 2;
@@ -113,7 +114,10 @@ class ListView extends React.Component {
     customColumnFields: PropTypes.object,
     customColumnActions: PropTypes.object,
     customBatchFields: PropTypes.object,
-    tableScroll: PropTypes.object
+    customActions: PropTypes.object,
+    tableScroll: PropTypes.object,
+    currentUser: PropTypes.object,
+    currentUserLoading: PropTypes.bool
   };
 
   state = {
@@ -216,8 +220,10 @@ class ListView extends React.Component {
       loadMoreRows,
       schema,
       link,
+      currentUser,
       customColumnFields = {},
-      customColumnActions = {},
+      customColumnActions,
+      customActions,
       customBatchFields,
       updateManyEntries,
       tableScroll = null
@@ -225,20 +231,31 @@ class ListView extends React.Component {
     const { selectedRowKeys } = this.state;
     const hasSelected = selectedRowKeys.length > 0;
 
-    const rowSelection = {
-      selectedRowKeys,
-      onChange: selectedRowKeys => {
-        this.setState({ selectedRowKeys });
-      }
-    };
-
-    let showBatchFields = true;
-    if (customBatchFields && customBatchFields.constructor === Object && Object.keys(customBatchFields).length === 0) {
-      showBatchFields = false;
-    }
+    const showBatchFields =
+      customBatchFields === null
+        ? false
+        : customBatchFields && customBatchFields.role
+          ? hasRole(customBatchFields.role, currentUser) ? true : false
+          : true;
+
+    const showCustomActions =
+      customActions === null
+        ? false
+        : customActions && customActions.role ? (hasRole(customActions.role, currentUser) ? true : false) : true;
+
+    const rowSelection = showBatchFields
+      ? {
+          selectedRowKeys,
+          onChange: selectedRowKeys => {
+            this.setState({ selectedRowKeys });
+          }
+        }
+      : null;
 
     const title = () => {
-      return (
+      return showCustomActions && customActions && customActions.render ? (
+        customActions.render
+      ) : (
         <Link to={`/${link}/0`}>
           <Button color="primary">Add</Button>
         </Link>
@@ -262,15 +279,15 @@ class ListView extends React.Component {
               </div>
             )}
           </Col>
-          <Col span={2}>
-            <Popconfirm title="Sure to delete?" onConfirm={this.hendleDeleteMany}>
-              <Button color="primary" disabled={!hasSelected} loading={loading && !data}>
-                Delete
-              </Button>
-            </Popconfirm>
-          </Col>
-          {showBatchFields && (
-            <Col span={21}>
+          {showBatchFields && [
+            <Col span={2} key="batchDelete">
+              <Popconfirm title="Sure to delete?" onConfirm={this.hendleDeleteMany}>
+                <Button color="primary" disabled={!hasSelected} loading={loading && !data}>
+                  Delete
+                </Button>
+              </Popconfirm>
+            </Col>,
+            <Col span={21} key="batchUpdate">
               <Formik
                 initialValues={mapFormPropsToValues({ schema })}
                 onSubmit={async (values, { resetForm }) => {
@@ -286,13 +303,11 @@ class ListView extends React.Component {
                     resetForm();
                   }
                 }}
-                render={({ values, setFieldValue, setFieldTouched, handleChange, handleBlur, handleSubmit }) => (
+                render={({ values, handleChange, handleBlur, handleSubmit }) => (
                   <Form layout="inline" name="post" onSubmit={handleSubmit}>
                     {createFormFields({
                       handleChange,
-                      setFieldValue,
                       handleBlur,
-                      setFieldTouched,
                       schema,
                       values,
                       formItemLayout: {},
@@ -308,7 +323,7 @@ class ListView extends React.Component {
                 )}
               />
             </Col>
-          )}
+          ]}
         </Row>
       );
     };
@@ -316,6 +331,7 @@ class ListView extends React.Component {
     const columns = createColumnFields({
       schema,
       link,
+      currentUser,
       orderBy: this.orderBy,
       renderOrderByArrow: this.renderOrderByArrow,
       hendleUpdate: this.hendleUpdate,
@@ -328,11 +344,11 @@ class ListView extends React.Component {
     let tableProps = {
       dataSource: data ? data.edges : null,
       columns: columns,
-      agination: false,
+      pagination: false,
       size: 'small',
       rowSelection: rowSelection,
       loading: loading && !data,
-      title: title,
+      title: showCustomActions ? title : null,
       footer: footer
     };
 
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/InputNumber.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/InputNumber.jsx
new file mode 100644
index 0000000000..844f79efc4
--- /dev/null
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/InputNumber.jsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ADInputNumber from 'antd/lib/input-number';
+
+const InputNumber = ({ children, ...props }) => {
+  return <ADInputNumber {...props}>{children}</ADInputNumber>;
+};
+
+InputNumber.propTypes = {
+  children: PropTypes.node
+};
+
+export default InputNumber;
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/PageLayout.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/PageLayout.jsx
index 86207c0615..7b680c9011 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/PageLayout.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/PageLayout.jsx
@@ -48,7 +48,7 @@ class PageLayout extends React.Component {
             breakpoint="lg"
             collapsedWidth="0"
           >
-            <Menu onClick={this.handleClick} selectedKeys={[this.props.location.pathname]} mode="vertical" theme="dark">
+            <Menu onClick={this.handleClick} selectedKeys={[this.props.location.pathname]} mode="inline" theme="dark">
               <MenuItem key="/">
                 <NavLink to="/" className="nav-link">
                   {settings.app.name}
@@ -63,7 +63,7 @@ class PageLayout extends React.Component {
                 <Header style={{ padding: 0 }}>
                   <Row gutter={8}>
                     <Col span={14}>
-                      <Menu mode="horizontal" theme="dark" style={{ lineHeight: '64px' }}>
+                      <Menu mode="horizontal" theme="dark" selectable={false} style={{ lineHeight: '64px' }}>
                         <MenuItem key="trigger">
                           <Icon
                             className="trigger"
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderDate.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderDate.jsx
index 1ffb05fbb3..9208e728c1 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderDate.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderDate.jsx
@@ -9,6 +9,8 @@ const dateFormat = 'YYYY-MM-DD';
 export default class RenderDate extends React.Component {
   static propTypes = {
     input: PropTypes.object,
+    setFieldValue: PropTypes.func.isRequired,
+    setFieldTouched: PropTypes.func.isRequired,
     label: PropTypes.string,
     type: PropTypes.string,
     formItemLayout: PropTypes.object,
@@ -16,15 +18,25 @@ export default class RenderDate extends React.Component {
   };
 
   handleChange = (date, dateString) => {
-    const { input: { onChange, name } } = this.props;
+    const { input: { name }, setFieldValue } = this.props;
     //console.log('RenderDate: handleChange');
     //console.log('name:', name);
     //console.log('dateString:', dateString);
-    onChange(name, dateString);
+    setFieldValue(name, dateString);
+  };
+
+  handleBlur = () => {
+    const { input: { name }, setFieldTouched } = this.props;
+    setFieldTouched(name, true);
   };
 
   render() {
-    const { input: { value, onChange, ...inputRest }, label, formItemLayout, meta: { touched, error } } = this.props;
+    const {
+      input: { value, onChange, onBlur, ...inputRest },
+      label,
+      formItemLayout,
+      meta: { touched, error }
+    } = this.props;
 
     let validateStatus = '';
     if (touched && error) {
@@ -43,7 +55,13 @@ export default class RenderDate extends React.Component {
     return (
       <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
         <div>
-          <DatePicker value={formatedValue} format={dateFormat} onChange={this.handleChange} {...inputRest} />
+          <DatePicker
+            value={formatedValue}
+            format={dateFormat}
+            onChange={this.handleChange}
+            onBlur={this.handleBlur}
+            {...inputRest}
+          />
         </div>
       </FormItem>
     );
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderInput.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderInput.jsx
index bd43238ae1..fe717b840d 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderInput.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderInput.jsx
@@ -12,32 +12,18 @@ export default class RenderInput extends React.Component {
     meta: PropTypes.object
   };
 
-  handleChange = e => {
-    const { input: { onChange, name } } = this.props;
-    //console.log('RenderInput: handleChange');
-    //console.log('name:', name);
-    let value = e.target.value;
-    //console.log('value:', value);
-
-    onChange(name, value);
-  };
-
   render() {
-    const { input: { onChange, ...inputRest }, label, formItemLayout, meta: { touched, error } } = this.props;
+    const { input, label, formItemLayout, meta: { touched, error } } = this.props;
 
     let validateStatus = '';
     if (touched && error) {
       validateStatus = 'error';
     }
 
-    let input = {
-      ...inputRest
-    };
-
     return (
       <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
         <div>
-          <Input {...input} placeholder={label} type="text" onChange={this.handleChange} />
+          <Input {...input} placeholder={label} type="text" />
         </div>
       </FormItem>
     );
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderNumber.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderNumber.jsx
index c1d909bf9d..36b90af2e2 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderNumber.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderNumber.jsx
@@ -8,6 +8,8 @@ import { FormItem } from './index';
 export default class RenderNumber extends React.Component {
   static propTypes = {
     input: PropTypes.object,
+    setFieldValue: PropTypes.func.isRequired,
+    setFieldTouched: PropTypes.func.isRequired,
     label: PropTypes.string,
     type: PropTypes.string,
     formItemLayout: PropTypes.object,
@@ -16,7 +18,7 @@ export default class RenderNumber extends React.Component {
   };
 
   handleChange = value => {
-    const { input: { onChange, name }, hasTypeOf } = this.props;
+    const { input: { name }, setFieldValue, hasTypeOf } = this.props;
     //console.log('RenderInput: handleChange');
     //console.log('name:', name);
     if (hasTypeOf(Number)) {
@@ -24,12 +26,17 @@ export default class RenderNumber extends React.Component {
       //console.log('RenderInput: hasTypeOf(Number) TRUE');
     }
 
-    onChange(name, value);
+    setFieldValue(name, value);
+  };
+
+  handleBlur = () => {
+    const { input: { name }, setFieldTouched } = this.props;
+    setFieldTouched(name, true);
   };
 
   render() {
     const {
-      input: { onChange, ...inputRest },
+      input: { onChange, onBlur, ...inputRest },
       label,
       type,
       formItemLayout,
@@ -59,7 +66,13 @@ export default class RenderNumber extends React.Component {
     return (
       <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
         <div>
-          <InputNumber {...input} placeholder={label} type={type} onChange={this.handleChange} />
+          <InputNumber
+            {...input}
+            placeholder={label}
+            type={type}
+            onChange={this.handleChange}
+            onBlur={this.handleBlur}
+          />
         </div>
       </FormItem>
     );
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectCountry.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectCountry.jsx
new file mode 100644
index 0000000000..a052302f1c
--- /dev/null
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectCountry.jsx
@@ -0,0 +1,88 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { CODES as countries } from 'graphql-iso-enums/types/ISOTerritory';
+import Select from 'antd/lib/select';
+import { FormItem } from './index';
+
+const Option = Select.Option;
+
+export default class RenderSelectCountry extends React.Component {
+  static propTypes = {
+    input: PropTypes.object,
+    setFieldValue: PropTypes.func.isRequired,
+    setFieldTouched: PropTypes.func.isRequired,
+    label: PropTypes.string,
+    formItemLayout: PropTypes.object,
+    meta: PropTypes.object,
+    style: PropTypes.object,
+    formType: PropTypes.string.isRequired
+  };
+
+  handleChange = value => {
+    const { input: { name }, setFieldValue } = this.props;
+    setFieldValue(name, value);
+  };
+
+  handleBlur = () => {
+    const { input: { name }, setFieldTouched } = this.props;
+    setFieldTouched(name, true);
+  };
+
+  render() {
+    const {
+      input: { value, onChange, onBlur, ...inputRest },
+      label,
+      style,
+      formItemLayout,
+      meta: { touched, error },
+      formType
+    } = this.props;
+
+    let validateStatus = '';
+    if (touched && error) {
+      validateStatus = 'error';
+    }
+
+    const options = [];
+
+    Object.entries(countries).forEach(([key, value]) =>
+      options.push(
+        <Option key={key} value={key}>
+          {value}
+        </Option>
+      )
+    );
+
+    let defaultStyle = { width: '100%' };
+    if (style) {
+      defaultStyle = style;
+    }
+
+    let defaultValue = 'defaultValue';
+    if (formType === 'filter') {
+      defaultValue = 'value';
+    }
+
+    let props = {
+      allowClear: formType !== 'form' ? true : false,
+      showSearch: true,
+      //labelInValue: true,
+      dropdownMatchSelectWidth: false,
+      style: defaultStyle,
+      onChange: this.handleChange,
+      onBlur: this.handleBlur,
+      ...inputRest,
+      [defaultValue]: value,
+      optionFilterProp: 'children',
+      filterOption: (input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    };
+
+    return (
+      <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={error}>
+        <div>
+          <Select {...props}>{options}</Select>
+        </div>
+      </FormItem>
+    );
+  }
+}
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
index 844545846f..ac8b58bbf3 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
@@ -11,6 +11,8 @@ const Option = Select.Option;
 export default class RenderSelectQuery extends React.Component {
   static propTypes = {
     input: PropTypes.object,
+    setFieldValue: PropTypes.func.isRequired,
+    setFieldTouched: PropTypes.func.isRequired,
     label: PropTypes.string,
     formItemLayout: PropTypes.object,
     meta: PropTypes.object,
@@ -25,11 +27,16 @@ export default class RenderSelectQuery extends React.Component {
   };
 
   handleChange = value => {
-    const { input: { onChange, name } } = this.props;
+    const { input: { name }, setFieldValue } = this.props;
     //console.log('RenderSelect: handleChange');
     //console.log('name:', name);
     //console.log('value:', value);
-    onChange(name, value ? { id: value.key, name: value.label } : undefined);
+    setFieldValue(name, value ? { id: value.key, name: value.label } : undefined);
+  };
+
+  handleBlur = () => {
+    const { input: { name }, setFieldTouched } = this.props;
+    setFieldTouched(name, true);
   };
 
   search = value => {
@@ -42,7 +49,7 @@ export default class RenderSelectQuery extends React.Component {
 
   render() {
     const {
-      input: { value, onChange, ...inputRest },
+      input: { value, onChange, onBlur, ...inputRest },
       label,
       schema,
       style,
@@ -80,6 +87,12 @@ export default class RenderSelectQuery extends React.Component {
     if (style) {
       defaultStyle = style;
     }
+
+    let defaultValue = 'defaultValue';
+    if (formType === 'filter') {
+      defaultValue = 'value';
+    }
+
     return (
       <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={error}>
         <div>
@@ -101,8 +114,9 @@ export default class RenderSelectQuery extends React.Component {
                   dropdownMatchSelectWidth: false,
                   style: defaultStyle,
                   onChange: this.handleChange,
+                  onBlur: this.handleBlur,
                   ...inputRest,
-                  defaultValue: formatedValue
+                  [defaultValue]: formatedValue
                 };
 
                 if (data.pageInfo.totalCount > 10) {
@@ -123,7 +137,7 @@ export default class RenderSelectQuery extends React.Component {
                   props = {
                     ...props,
                     filterOption: false,
-                    defaultValue: formatedValue,
+                    [defaultValue]: formatedValue,
                     onSearch: this.search
                   };
                 } else {
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSwitch.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSwitch.jsx
index eb8a0cd559..79e77075ce 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSwitch.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSwitch.jsx
@@ -5,6 +5,8 @@ import { FormItem, Switch } from './index';
 export default class RenderSwitch extends React.Component {
   static propTypes = {
     input: PropTypes.object,
+    setFieldValue: PropTypes.func.isRequired,
+    setFieldTouched: PropTypes.func.isRequired,
     label: PropTypes.string,
     type: PropTypes.string,
     formItemLayout: PropTypes.object,
@@ -12,11 +14,16 @@ export default class RenderSwitch extends React.Component {
   };
 
   handleChange = value => {
-    const { input: { onChange, name } } = this.props;
+    const { input: { name }, setFieldValue } = this.props;
     //console.log('RenderSwitch: handleChange');
     //console.log('name:', name);
     //console.log('value:', value);
-    onChange(name, value);
+    setFieldValue(name, value);
+  };
+
+  handleBlur = () => {
+    const { input: { name }, setFieldTouched } = this.props;
+    setFieldTouched(name, true);
   };
 
   render() {
@@ -30,7 +37,7 @@ export default class RenderSwitch extends React.Component {
     return (
       <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
         <div>
-          <Switch defaultChecked={!!value} onChange={this.handleChange} />
+          <Switch defaultChecked={!!value} onChange={this.handleChange} onBlur={this.handleBlur} />
         </div>
       </FormItem>
     );
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderTextarea.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderTextarea.jsx
index 655299943c..7e4165c165 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderTextarea.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderTextarea.jsx
@@ -16,32 +16,18 @@ export default class RenderTextArea extends React.Component {
     meta: PropTypes.object
   };
 
-  handleChange = e => {
-    const { input: { onChange, name } } = this.props;
-    //console.log('RenderInput: handleChange');
-    //console.log('name:', name);
-    let value = e.target.value;
-    //console.log('value:', value);
-
-    onChange(name, value);
-  };
-
   render() {
-    const { input: { onChange, ...inputRest }, label, formItemLayout, meta: { touched, error } } = this.props;
+    const { input, label, formItemLayout, meta: { touched, error } } = this.props;
 
     let validateStatus = '';
     if (touched && error) {
       validateStatus = 'error';
     }
 
-    let input = {
-      ...inputRest
-    };
-
     return (
       <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
         <div>
-          <TextArea {...input} placeholder={label} autosize onChange={this.handleChange} />
+          <TextArea {...input} placeholder={label} autosize />
         </div>
       </FormItem>
     );
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/SubMenu.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/SubMenu.jsx
new file mode 100644
index 0000000000..56e27564e0
--- /dev/null
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/SubMenu.jsx
@@ -0,0 +1,18 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Menu from 'antd/lib/menu';
+
+const ADSubMenu = Menu.SubMenu;
+
+class SubMenu extends React.Component {
+  static propTypes = {
+    children: PropTypes.node
+  };
+
+  render() {
+    const { children, ...props } = this.props;
+    return <ADSubMenu {...props}>{children}</ADSubMenu>;
+  }
+}
+
+export default SubMenu;
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/index.js b/packages/client/src/modules/common/components/web/ui-antd/components/index.js
index ed8c63f8cf..a68891437b 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/index.js
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/index.js
@@ -2,9 +2,11 @@
 export { default as PageLayout } from './PageLayout';
 export { default as Button } from './Button';
 export { default as MenuItem } from './MenuItem';
+export { default as SubMenu } from './SubMenu';
 export { default as Form } from './Form';
 export { default as FormItem } from './FormItem';
 export { default as Input } from './Input';
+export { default as InputNumber } from './InputNumber';
 export { default as Switch } from './Switch';
 export { default as Select } from './Select';
 export { default as Option } from './Option';
@@ -14,6 +16,7 @@ export { default as RenderNumber } from './RenderNumber';
 export { default as RenderTextArea } from './RenderTextArea';
 export { default as RenderDate } from './RenderDate';
 export { default as RenderSelect } from './RenderSelect';
+export { default as RenderSelectCountry } from './RenderSelectCountry';
 export { default as RenderSelectQuery } from './RenderSelectQuery';
 export { default as RenderCheckBox } from './RenderCheckBox';
 export { default as RenderSwitch } from './RenderSwitch';
diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index e5ddd8e352..b9cd56558c 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -11,6 +11,7 @@ import Spin from 'antd/lib/spin';
 import moment from 'moment';
 import DomainSchema from '@domain-schema/core';
 
+import { hasRole } from '../user/containers/Auth';
 import Field from '../../utils/FieldAdapter';
 import { mapFormPropsToValues } from '../../utils/crud';
 import {
@@ -18,6 +19,7 @@ import {
   RenderNumber,
   RenderTextArea,
   RenderSelectQuery,
+  RenderSelectCountry,
   RenderDate,
   RenderSwitch,
   Button,
@@ -27,6 +29,7 @@ import {
   Row,
   Col,
   Input,
+  InputNumber,
   Icon
 } from './components/web';
 
@@ -35,12 +38,14 @@ const dateFormat = 'YYYY-MM-DD';
 export const createColumnFields = ({
   schema,
   link,
+  currentUser,
   orderBy,
   renderOrderByArrow,
   hendleUpdate,
   hendleDelete,
   onCellChange,
-  customFields = {}
+  customFields = {},
+  customActions
 }) => {
   let columns = [];
   // use customFields if definded otherwise use schema.keys()
@@ -50,13 +55,20 @@ export const createColumnFields = ({
       : schema.keys();
 
   for (const key of keys) {
+    //console.log('customFields, key: ', customFields[key]);
+    const role = customFields && customFields[key] && customFields[key].role ? customFields[key].role : false;
+    //console.log('customFields, role: ', role);
+    const hasRole =
+      currentUser && (!role || (Array.isArray(role) ? role : [role]).indexOf(currentUser.role) >= 0) ? true : false;
+    //console.log('customFields, hasRole: ', hasRole);
+
     if (schema.values[key]) {
       const value = schema.values[key];
       const hasTypeOf = targetType =>
         value.type === targetType || value.type.prototype instanceof targetType || value.type instanceof targetType;
       //console.log(key);
       //console.log(hasTypeOf(DomainSchema));
-      if (value.show !== false && (key !== 'id' || customFields['id'])) {
+      if (hasRole && value.show !== false && (key !== 'id' || customFields['id'])) {
         if (value.type.isSchema) {
           //console.log(value.type);
 
@@ -75,6 +87,7 @@ export const createColumnFields = ({
             ),
             dataIndex: key,
             key: key,
+            fixed: customFields[key] && customFields[key]['fixed'] ? customFields[key]['fixed'] : null,
             width: customFields[key] && customFields[key]['width'] ? customFields[key]['width'] : null,
             render: (text, record) =>
               customFields[key] && customFields[key]['render'] ? (
@@ -85,6 +98,8 @@ export const createColumnFields = ({
                   hasTypeOf={hasTypeOf}
                   schema={value.type}
                   record={record}
+                  role={customFields[key] && customFields[key]['editRole'] ? customFields[key]['editRole'] : null}
+                  currentUser={currentUser}
                   render={
                     customFields[key] && customFields[key]['render']
                       ? customFields[key]['render']
@@ -103,6 +118,7 @@ export const createColumnFields = ({
             ),
             dataIndex: key,
             key: key,
+            fixed: customFields[key] && customFields[key]['fixed'] ? customFields[key]['fixed'] : null,
             width: customFields[key] && customFields[key]['width'] ? customFields[key]['width'] : null,
             render: (text, record) => {
               const data = {};
@@ -119,11 +135,14 @@ export const createColumnFields = ({
             ),
             dataIndex: key,
             key: key,
+            fixed: customFields[key] && customFields[key]['fixed'] ? customFields[key]['fixed'] : null,
             width: customFields[key] && customFields[key]['width'] ? customFields[key]['width'] : null,
             render: (text, record) => (
               <EditableCell
                 value={text}
                 hasTypeOf={hasTypeOf}
+                role={customFields[key] && customFields[key]['editRole'] ? customFields[key]['editRole'] : null}
+                currentUser={currentUser}
                 render={customFields[key] && customFields[key]['render'] ? customFields[key]['render'] : text => text}
                 onChange={onCellChange(key, record.id, hendleUpdate)}
               />
@@ -138,6 +157,7 @@ export const createColumnFields = ({
             ),
             dataIndex: key,
             key: key,
+            fixed: customFields[key] && customFields[key]['fixed'] ? customFields[key]['fixed'] : null,
             width: customFields[key] && customFields[key]['width'] ? customFields[key]['width'] : null,
             render: (text, record) =>
               customFields[key] && customFields[key]['render']
@@ -147,35 +167,45 @@ export const createColumnFields = ({
         }
       }
     } else {
-      columns.push({
-        title: startCase(key),
-        dataIndex: key,
-        key: key,
-        width: customFields[key] && customFields[key]['width'] ? customFields[key]['width'] : null,
-        render: (text, record) =>
-          customFields[key] && customFields[key]['render'] ? customFields[key]['render'](text, record) : null
-      });
+      if (hasRole) {
+        columns.push({
+          title: startCase(key),
+          dataIndex: key,
+          key: key,
+          fixed: customFields[key] && customFields[key]['fixed'] ? customFields[key]['fixed'] : null,
+          width: customFields[key] && customFields[key]['width'] ? customFields[key]['width'] : null,
+          render: (text, record) =>
+            customFields[key] && customFields[key]['render'] ? customFields[key]['render'](text, record) : null
+        });
+      }
     }
   }
 
-  columns.push({
-    title: 'Actions',
-    key: 'actions',
-    width: 150,
-    fixed: 'right',
-    render: (text, record) => [
-      <Link className="link" to={`/${link}/${record.id}`} key="edit">
-        <Button color="primary" size="sm">
-          Edit
-        </Button>
-      </Link>,
-      <Popconfirm title="Sure to delete?" onConfirm={() => hendleDelete(record.id)} key="delete">
-        <Button color="primary" size="sm">
-          Delete
-        </Button>
-      </Popconfirm>
-    ]
-  });
+  const showColumnActions =
+    customActions === null
+      ? false
+      : customActions && customActions.role ? (hasRole(customActions.role, currentUser) ? true : false) : true;
+
+  if (showColumnActions) {
+    columns.push({
+      title: 'Actions',
+      key: 'actions',
+      width: 150,
+      fixed: 'right',
+      render: (text, record) => [
+        <Link className="link" to={`/${link}/${record.id}`} key="edit">
+          <Button color="primary" size="sm">
+            Edit
+          </Button>
+        </Link>,
+        <Popconfirm title="Sure to delete?" onConfirm={() => hendleDelete(record.id)} key="delete">
+          <Button color="primary" size="sm">
+            Delete
+          </Button>
+        </Popconfirm>
+      ]
+    });
+  }
 
   return columns;
 };
@@ -195,9 +225,7 @@ const tailFormItemLayout = {
 
 export const createFormFields = ({
   handleChange,
-  setFieldValue,
   handleBlur,
-  setFieldTouched,
   schema,
   values = {},
   formItemLayout,
@@ -219,7 +247,7 @@ export const createFormFields = ({
     const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
 
     if (formType === 'filter') {
-      if (key !== 'id' && value.show !== false && value.type.constructor !== Array) {
+      if (value.show !== false && value.type.constructor !== Array) {
         //let validate = [];
         //if (!value.optional && !batch) {
         //  validate.push(required);
@@ -248,8 +276,6 @@ export const createFormFields = ({
                 label={startCase(key)}
                 //validate={validate}
                 formItemLayout={formItemLayout}
-                onChange={setFieldValue}
-                onBlur={setFieldTouched}
                 formType={formType}
                 hasTypeOf={hasTypeOf}
               />
@@ -270,8 +296,6 @@ export const createFormFields = ({
                 label={startCase(key)}
                 //validate={validate}
                 formItemLayout={formItemLayout}
-                onChange={setFieldValue}
-                onBlur={setFieldTouched}
                 formType={formType}
                 hasTypeOf={hasTypeOf}
               />
@@ -292,8 +316,6 @@ export const createFormFields = ({
                 label={`From ${startCase(key)}`}
                 //validate={validate}
                 formItemLayout={formItemLayout}
-                onChange={setFieldValue}
-                onBlur={setFieldTouched}
                 formType={formType}
                 hasTypeOf={hasTypeOf}
               />
@@ -312,8 +334,6 @@ export const createFormFields = ({
                 label={`To ${startCase(key)}`}
                 //validate={validate}
                 formItemLayout={formItemLayout}
-                onChange={setFieldValue}
-                onBlur={setFieldTouched}
                 formType={formType}
                 hasTypeOf={hasTypeOf}
               />
@@ -335,8 +355,6 @@ export const createFormFields = ({
                 label={startCase(key)}
                 //validate={validate}
                 formItemLayout={formItemLayout}
-                onChange={setFieldValue}
-                onBlur={setFieldTouched}
                 formType={formType}
                 hasTypeOf={hasTypeOf}
               />
@@ -356,8 +374,6 @@ export const createFormFields = ({
                 label={startCase(key)}
                 //validate={validate}
                 formItemLayout={formItemLayout}
-                onChange={setFieldValue}
-                onBlur={setFieldTouched}
                 formType={formType}
                 hasTypeOf={hasTypeOf}
               />
@@ -391,6 +407,8 @@ export const createFormFields = ({
           component = RenderNumber;
         } else if (hasTypeOf(String) && value.fieldInput === 'textarea') {
           component = RenderTextArea;
+        } else if (hasTypeOf(String) && value.fieldInput === 'country') {
+          component = RenderSelectCountry;
         }
 
         fields.push(
@@ -405,8 +423,6 @@ export const createFormFields = ({
             label={startCase(key)}
             //validate={validate}
             formItemLayout={formItemLayout}
-            onChange={setFieldValue}
-            onBlur={setFieldTouched}
             formType={formType}
             hasTypeOf={hasTypeOf}
           />
@@ -426,9 +442,7 @@ export const createFormFields = ({
                           <div key={index} className="field-array-form">
                             {createFormFields({
                               handleChange,
-                              setFieldValue,
                               handleBlur,
-                              setFieldTouched,
                               schema: value.type[0],
                               values: mapFormPropsToValues({ schema: value.type[0], data: field }),
                               formItemLayout: formItemLayout,
@@ -466,6 +480,8 @@ class EditableCell extends React.Component {
   static propTypes = {
     value: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.object]),
     record: PropTypes.object,
+    role: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.string), PropTypes.string]),
+    currentUser: PropTypes.object,
     render: PropTypes.func,
     hasTypeOf: PropTypes.func,
     schema: PropTypes.object,
@@ -489,6 +505,9 @@ class EditableCell extends React.Component {
     const value = e.target.value;
     this.setState({ value });
   };
+  handleNumberChange = value => {
+    this.setState({ value });
+  };
   handleDateChange = (date, dateString) => {
     this.setState({ value: dateString });
   };
@@ -524,14 +543,39 @@ class EditableCell extends React.Component {
   };
   render() {
     const { value, record, searchText, dirty, editable } = this.state;
-    const { render, hasTypeOf, schema } = this.props;
+    const { render, hasTypeOf, schema, role, currentUser } = this.props;
+
+    if (role) {
+      //console.log('EditableCell, value:', value);
+      //console.log('EditableCell, role:', role);
+      //console.log('EditableCell, currentUser:', currentUser);
+
+      const hasRole =
+        currentUser && (!role || (Array.isArray(role) ? role : [role]).indexOf(currentUser.role) >= 0) ? true : false;
 
+      if (!hasRole) {
+        return render(value, record);
+      }
+    }
     let input = null;
     if (editable) {
       let formatedValue = value;
-      //console.log(value);
+      //console.log('value:', value);
       input = <Input value={formatedValue} onChange={this.handleChange} onPressEnter={this.check} />;
-      if (hasTypeOf(Date)) {
+      if (hasTypeOf(Number) || hasTypeOf(DomainSchema.Float)) {
+        let inputParms = {
+          value: formatedValue,
+          onChange: this.handleNumberChange,
+          onPressEnter: this.check
+        };
+        if (hasTypeOf(DomainSchema.Float)) {
+          inputParms = {
+            step: '0.01',
+            ...inputParms
+          };
+        }
+        input = <InputNumber {...inputParms} />;
+      } else if (hasTypeOf(Date)) {
         if (value !== null && value !== '') {
           formatedValue = moment(value, dateFormat);
         } else {
diff --git a/packages/client/src/modules/subscription/containers/Auth.js b/packages/client/src/modules/subscription/containers/Auth.js
index c99bdcc7f9..8d0e081d86 100644
--- a/packages/client/src/modules/subscription/containers/Auth.js
+++ b/packages/client/src/modules/subscription/containers/Auth.js
@@ -5,10 +5,10 @@ import { Redirect } from 'react-router-dom';
 
 import SUBSCRIPTION_QUERY from '../graphql/SubscriptionQuery.graphql';
 
-import { AuthNav, AuthRoute } from '../../user/containers/Auth';
+import { IfLoggedIn, AuthRoute } from '../../user/containers/Auth';
 
 const SubscriberNav = ({ loading, active, children, ...rest }) => {
-  return <AuthNav {...rest}>{loading || !active ? null : children}</AuthNav>;
+  return <IfLoggedIn {...rest}>{loading || !active ? null : children}</IfLoggedIn>;
 };
 
 SubscriberNav.propTypes = {
diff --git a/packages/client/src/modules/subscription/index.web.jsx b/packages/client/src/modules/subscription/index.web.jsx
index d21f576efc..aac8e12d4d 100644
--- a/packages/client/src/modules/subscription/index.web.jsx
+++ b/packages/client/src/modules/subscription/index.web.jsx
@@ -15,8 +15,8 @@ export default new Feature({
   route: settings.subscription.enabled
     ? [
         <Route exact path="/subscription" component={Subscription} />,
-        <SubscriberRoute exact scope="user" path="/subscribers-only" component={SubscribersOnly} />,
-        <SubscriberRoute exact scope="user" path="/update-card" component={UpdateCard} />
+        <SubscriberRoute exact role="user" path="/subscribers-only" component={SubscribersOnly} />,
+        <SubscriberRoute exact role="user" path="/update-card" component={UpdateCard} />
       ]
     : [],
   navItem: settings.subscription.enabled
diff --git a/packages/client/src/modules/user/containers/Auth.jsx b/packages/client/src/modules/user/containers/Auth.jsx
index bd4d0babad..fbbcc8dc1e 100644
--- a/packages/client/src/modules/user/containers/Auth.jsx
+++ b/packages/client/src/modules/user/containers/Auth.jsx
@@ -10,6 +10,7 @@ import CURRENT_USER_QUERY from '../graphql/CurrentUserQuery.graphql';
 import LOGOUT from '../graphql/Logout.graphql';
 
 const checkAuth = (cookies, scope) => {
+  //console.log('checkAuth, scope:', scope);
   let token = null;
   let refreshToken = null;
 
@@ -33,17 +34,19 @@ const checkAuth = (cookies, scope) => {
       return false;
     }
 
-    if (scope === 'admin') {
-      const { user: { role } } = decode(token);
-      if (scope !== role) {
-        return false;
-      }
-    }
+    /*
+    ? children
+    : elseComponent || null;*/
+
+    //if (scope === 'admin') {
+    const { user: { role } } = decode(token);
+    //if (scope !== role) {
+    return role && (!scope || (Array.isArray(scope) ? scope : [scope]).indexOf(role) >= 0);
+    //}
+    //}
   } catch (e) {
     return false;
   }
-
-  return true;
 };
 
 const profileName = cookies => {
@@ -68,12 +71,28 @@ const profileName = cookies => {
     return '';
   }
 };
-
-const AuthNav = withCookies(({ children, cookies, scope }) => {
-  return checkAuth(cookies, scope) ? children : null;
+/*
+class IfLoggedIn extends React.Component {
+  static propTypes = {
+    children: PropTypes.object
+  };
+  render() {
+    const { children, ...restProps } = this.props;
+    return React.cloneElement(children, {
+      ...restProps
+    });
+  }
+}
+*/
+const IfLoggedIn = withCookies(({ children, cookies, role, ...restProps }) => {
+  return checkAuth(cookies, role)
+    ? React.cloneElement(children, {
+        ...restProps
+      })
+    : null;
 });
 
-AuthNav.propTypes = {
+IfLoggedIn.propTypes = {
   children: PropTypes.object,
   cookies: PropTypes.instanceOf(Cookies)
 };
@@ -117,7 +136,7 @@ const AuthLoginWithApollo = withCookies(
                 window.localStorage.setItem('refreshToken', null);
 
                 if (history) {
-                  return history.push('/');
+                  return history.push('/login');
                 }
                 if (navigation) {
                   return navigation.goBack();
@@ -160,12 +179,12 @@ AuthLoggedIn.propTypes = {
   to: PropTypes.string
 };
 
-const AuthRoute = withCookies(({ component: Component, cookies, scope, ...rest }) => {
+const AuthRoute = withCookies(({ component: Component, cookies, role, ...rest }) => {
   return (
     <Route
       {...rest}
       render={props =>
-        checkAuth(cookies, scope) ? <Component {...props} {...rest} /> : <Redirect to={{ pathname: '/login' }} />
+        checkAuth(cookies, role) ? <Component {...props} {...rest} /> : <Redirect to={{ pathname: '/login' }} />
       }
     />
   );
@@ -176,13 +195,11 @@ AuthRoute.propTypes = {
   cookies: PropTypes.instanceOf(Cookies)
 };
 
-const AuthLoggedInRoute = withCookies(({ component: Component, cookies, redirect, scope, ...rest }) => {
+const AuthLoggedInRoute = withCookies(({ component: Component, cookies, redirect, role, ...rest }) => {
   return (
     <Route
       {...rest}
-      render={props =>
-        checkAuth(cookies, scope) ? <Redirect to={{ pathname: redirect }} /> : <Component {...props} />
-      }
+      render={props => (checkAuth(cookies, role) ? <Redirect to={{ pathname: redirect }} /> : <Component {...props} />)}
     />
   );
 });
@@ -191,10 +208,31 @@ AuthLoggedInRoute.propTypes = {
   component: PropTypes.func,
   cookies: PropTypes.instanceOf(Cookies),
   redirect: PropTypes.string,
-  scope: PropTypes.string
+  role: PropTypes.string
+};
+
+const withUser = Component => {
+  const WithUser = ({ ...props }) => <Component {...props} />;
+
+  WithUser.propTypes = {
+    currentUser: PropTypes.object,
+    currentUserLoading: PropTypes.bool.isRequired
+  };
+
+  return graphql(CURRENT_USER_QUERY, {
+    props({ data: { loading, currentUser, refetch } }) {
+      return { currentUserLoading: loading, currentUser, refetchCurrentUser: refetch };
+    }
+  })(WithUser);
+};
+
+const hasRole = (role, currentUser) => {
+  return currentUser && (!role || (Array.isArray(role) ? role : [role]).indexOf(currentUser.role) >= 0) ? true : false;
 };
 
-export { AuthNav };
+export { withUser };
+export { hasRole };
+export { IfLoggedIn };
 export { AuthLoggedIn };
 export { AuthLoginWithApollo as AuthLogin };
 export { AuthProfile };
diff --git a/packages/client/src/modules/user/index.web.jsx b/packages/client/src/modules/user/index.web.jsx
index ca8e9d4c2c..952204eadd 100644
--- a/packages/client/src/modules/user/index.web.jsx
+++ b/packages/client/src/modules/user/index.web.jsx
@@ -3,15 +3,13 @@ import { CookiesProvider } from 'react-cookie';
 import { NavLink } from 'react-router-dom';
 import { MenuItem } from '../../modules/common/components/web';
 import Profile from './containers/Profile';
-import Users from './components/Users';
-import UserEdit from './containers/UserEdit';
 import Register from './containers/Register';
 import Login from './containers/Login';
 import ForgotPassword from './containers/ForgotPassword';
 import ResetPassword from './containers/ResetPassword';
 import resolvers from './resolvers';
 
-import { AuthRoute, AuthLoggedInRoute, AuthNav, AuthLogin, AuthProfile } from './containers/Auth';
+import { AuthRoute, AuthLoggedInRoute, AuthLogin, AuthProfile } from './containers/Auth';
 
 import Feature from '../connector';
 
@@ -42,23 +40,12 @@ function connectionParam() {
 
 export default new Feature({
   route: [
-    <AuthRoute exact path="/profile" scope="user" component={Profile} />,
-    <AuthRoute exact path="/users" scope="admin" component={Users} />,
-    <AuthRoute exact path="/users/:id" component={UserEdit} />,
+    <AuthRoute exact path="/profile" role={['user', 'editor', 'admin']} component={Profile} />,
     <AuthLoggedInRoute exact path="/register" redirect="/profile" component={Register} />,
     <AuthLoggedInRoute exact path="/login" redirect="/profile" component={Login} />,
     <AuthLoggedInRoute exact path="/forgot-password" redirect="/profile" component={ForgotPassword} />,
     <AuthLoggedInRoute exact path="/reset-password/:token" redirect="/profile" component={ResetPassword} />
   ],
-  navItem: [
-    <MenuItem key="/users">
-      <AuthNav scope="admin">
-        <NavLink to="/users" className="nav-link" activeClassName="active">
-          Users
-        </NavLink>
-      </AuthNav>
-    </MenuItem>
-  ],
   navItemRight: [
     <MenuItem key="/profile">
       <AuthProfile />
diff --git a/packages/client/src/utils/FieldAdapter.jsx b/packages/client/src/utils/FieldAdapter.jsx
index 80fe67029f..0a0294ebe9 100644
--- a/packages/client/src/utils/FieldAdapter.jsx
+++ b/packages/client/src/utils/FieldAdapter.jsx
@@ -13,7 +13,7 @@ export default class FieldAdapter extends Component {
     onChange: PropTypes.func,
     onBlur: PropTypes.func,
     name: PropTypes.string.isRequired,
-    value: PropTypes.string,
+    value: PropTypes.oneOfType([PropTypes.bool, PropTypes.string, PropTypes.number, PropTypes.object]),
     defaultValue: PropTypes.string,
     checked: PropTypes.bool,
     defaultChecked: PropTypes.bool,
@@ -88,6 +88,8 @@ export default class FieldAdapter extends Component {
     return React.createElement(component, {
       ...this.props,
       input,
+      setFieldValue: formik.setFieldValue,
+      setFieldTouched: formik.setFieldTouched,
       meta
     });
   }
diff --git a/packages/client/src/utils/crud.js b/packages/client/src/utils/crud.js
index 0d8532e757..f5bba847df 100644
--- a/packages/client/src/utils/crud.js
+++ b/packages/client/src/utils/crud.js
@@ -101,14 +101,17 @@ export const pickInputFields = ({ schema, values, data = null, formType = 'form'
               deleted.push({ id: item.id });
             } else {
               if (!isEqual(obj, item)) {
-                update.push({ where: { id: obj.id }, data: pickInputFields({ schema: value.type[0], data: obj }) });
+                update.push({
+                  where: { id: obj.id },
+                  data: pickInputFields({ schema: value.type[0], values: obj, data: obj })
+                });
               }
             }
           });
 
           values[key].forEach(item => {
             if (!keys1[item.id]) {
-              create.push(pickInputFields({ schema: value.type[0], data: item }));
+              create.push(pickInputFields({ schema: value.type[0], values: item, data: item }));
             }
           });
           //console.log('created: ', create);
diff --git a/packages/server/src/sql/crud.js b/packages/server/src/sql/crud.js
index 3bceec718f..f81a6cd5d9 100644
--- a/packages/server/src/sql/crud.js
+++ b/packages/server/src/sql/crud.js
@@ -497,6 +497,8 @@ export default class Crud {
             filterKey = `${key}Id`;
           }
 
+          //console.log('filter, filterKey: ', filterKey);
+
           let filterValue = filter[filterKey];
           if (hasTypeOf(Date)) {
             if (filter[`${filterKey}_lte`] && filter[`${filterKey}_lte`] !== '') {
@@ -556,11 +558,17 @@ export default class Crud {
   }
 
   _get({ where }, info) {
-    const { id } = where;
-
     const baseQuery = knex(`${this.getFullTableName()} as ${this.getTableName()}`);
     const select = selectBy(this.schema, info, true);
-    return knexnest(select(baseQuery).where(`${this.getTableName()}.id`, '=', id));
+
+    const tableName = this.getTableName();
+    baseQuery.where(function() {
+      Object.keys(where).map(key => {
+        this.andWhere(`${tableName}.${decamelize(key)}`, '=', where[key]);
+      });
+    });
+
+    return knexnest(select(baseQuery));
   }
 
   async get(args, info) {
@@ -625,7 +633,7 @@ export default class Crud {
       for (const key of this.schema.keys()) {
         const value = this.schema.values[key];
         if (value.type.constructor === Array && args.data[key]) {
-          nestedEntries.push({ key, data: args.data[key] });
+          nestedEntries.push({ key: value.type[0].name, data: args.data[key] });
           delete args.data[key];
         }
       }
diff --git a/packages/server/src/sql/helpers.js b/packages/server/src/sql/helpers.js
index d60ca85e5c..5c2fd3831b 100644
--- a/packages/server/src/sql/helpers.js
+++ b/packages/server/src/sql/helpers.js
@@ -69,7 +69,8 @@ const _getSelectFields = (fields, parentPath, domainSchema, selectItems, joinNam
             joinNames.push({
               key: decamelize(key),
               prefix: value.type.__.tablePrefix ? value.type.__.tablePrefix : '',
-              name: decamelize(value.type.__.tableName ? value.type.__.tableName : value.type.name)
+              name: decamelize(value.type.__.tableName ? value.type.__.tableName : value.type.name),
+              schemaName: decamelize(domainSchema.name)
             });
           }
 
@@ -93,8 +94,8 @@ export const selectBy = (schema, fields, single = false) => {
 
   return query => {
     // join table names
-    joinNames.map(({ key, prefix, name }) => {
-      query.leftJoin(`${prefix}${name} as ${name}`, `${name}.id`, `${decamelize(schema.name)}.${key}_id`);
+    joinNames.map(({ key, prefix, name, schemaName }) => {
+      query.leftJoin(`${prefix}${name} as ${name}`, `${name}.id`, `${schemaName}.${key}_id`);
     });
 
     return query.select(selectItems);
diff --git a/tools/templates/crud/client/components/Module.web.jsx b/tools/templates/crud/client/components/Module.web.jsx
index 5a4984a788..ef88b4b4b0 100644
--- a/tools/templates/crud/client/components/Module.web.jsx
+++ b/tools/templates/crud/client/components/Module.web.jsx
@@ -9,8 +9,7 @@ import settings from '../../../../../../settings';
 
 export default class $Module$ extends React.PureComponent {
   static propTypes = {
-    title: PropTypes.string.isRequired,
-    link: PropTypes.string.isRequired
+    title: PropTypes.string.isRequired
   };
 
   renderMetaData = title => (
@@ -26,13 +25,13 @@ export default class $Module$ extends React.PureComponent {
   );
 
   render() {
-    const { title, link } = this.props;
+    const { title } = this.props;
     return (
       <PageLayout>
         {this.renderMetaData(title)}
         <h2>{title}</h2>
-        <$Module$Filter />
-        <$Module$List link={link} />
+        <$Module$Filter {...this.props} />
+        <$Module$List {...this.props} />
       </PageLayout>
     );
   }
diff --git a/tools/templates/crud/client/index.jsx b/tools/templates/crud/client/index.native.jsx
similarity index 100%
rename from tools/templates/crud/client/index.jsx
rename to tools/templates/crud/client/index.native.jsx
diff --git a/tools/templates/crud/client/index.web.jsx b/tools/templates/crud/client/index.web.jsx
index 927390aeb2..a58ea19fd1 100644
--- a/tools/templates/crud/client/index.web.jsx
+++ b/tools/templates/crud/client/index.web.jsx
@@ -1,23 +1,40 @@
 import React from 'react';
-import { Route, NavLink } from 'react-router-dom';
+import { NavLink } from 'react-router-dom';
 import { MenuItem } from '../../modules/common/components/web';
 import $Module$ from './components/$Module$';
 import $Module$Edit from './containers/$Module$Edit';
 import resolvers from './resolvers';
 
+import { AuthRoute, IfLoggedIn, withUser } from '../user/containers/Auth';
 import Feature from '../connector';
 
 export default new Feature({
   route: [
-    <Route exact path="/$module$" render={props => <$Module$ title="$MoDuLe$" link="$module$" {...props} />} />,
-    <Route exact path="/$module$/:id" render={props => <$Module$Edit title="$MoDuLe$" link="$module$" {...props} />} />
+    <AuthRoute
+      exact
+      path="/$module$"
+      component={withUser($Module$)}
+      role={['editor', 'admin']}
+      title="$MoDuLe$"
+      link="$module$"
+    />,
+    <AuthRoute
+      exact
+      path="/$module$/:id"
+      component={withUser($Module$Edit)}
+      role={['editor', 'admin']}
+      title="$MoDuLe$"
+      link="$module$"
+    />
   ],
   navItem: (
-    <MenuItem key="/$module$">
-      <NavLink to="/$module$" className="nav-link" activeClassName="active">
-        $MoDuLe$
-      </NavLink>
-    </MenuItem>
+    <IfLoggedIn role={['editor', 'admin']}>
+      <MenuItem key="/$module$">
+        <NavLink to="/$module$" className="nav-link" activeClassName="active">
+          $MoDuLe$
+        </NavLink>
+      </MenuItem>
+    </IfLoggedIn>
   ),
   resolver: resolvers
 });
diff --git a/tools/templates/crud/server/resolvers.js b/tools/templates/crud/server/resolvers.js
index 9d34a209c8..4777a0be71 100644
--- a/tools/templates/crud/server/resolvers.js
+++ b/tools/templates/crud/server/resolvers.js
@@ -1,40 +1,41 @@
+import withAuth from 'graphql-auth';
 // eslint-disable-next-line no-unused-vars
 import { createBatchResolver } from 'graphql-resolve-batch';
 
 // eslint-disable-next-line no-unused-vars
 export default pubsub => ({
   Query: {
-    $module$s: (parent, args, ctx, info) => {
+    $module$s: withAuth(['editor:view:all'], (parent, args, ctx, info) => {
       return ctx.$Module$.getList(args, info);
-    },
-    $module$sConnection: (parent, args, ctx, info) => {
+    }),
+    $module$sConnection: withAuth(['editor:view:all'], (parent, args, ctx, info) => {
       return ctx.$Module$.getPaginated(args, info);
-    },
-    $module$: (parent, args, ctx, info) => {
+    }),
+    $module$: withAuth(['editor:view'], (parent, args, ctx, info) => {
       return ctx.$Module$.get(args, info);
-    }
+    })
   },
   // schema batch resolvers
   // end schema batch resolvers
   Mutation: {
-    create$Module$: (parent, args, ctx, info) => {
+    create$Module$: withAuth(['editor:create'], (parent, args, ctx, info) => {
       return ctx.$Module$.create(args, ctx, info);
-    },
-    update$Module$: (parent, args, ctx, info) => {
+    }),
+    update$Module$: withAuth(['editor:update'], (parent, args, ctx, info) => {
       return ctx.$Module$.update(args, ctx, info);
-    },
-    delete$Module$: (parent, args, ctx, info) => {
+    }),
+    delete$Module$: withAuth(['editor:delete'], (parent, args, ctx, info) => {
       return ctx.$Module$.delete(args, info);
-    },
-    sort$Module$s: (parent, args, ctx) => {
+    }),
+    sort$Module$s: withAuth(['editor:update'], (parent, args, ctx) => {
       return ctx.$Module$.sort(args);
-    },
-    updateMany$Module$s: (parent, args, ctx) => {
+    }),
+    updateMany$Module$s: withAuth(['editor:update'], (parent, args, ctx) => {
       return ctx.$Module$.updateMany(args);
-    },
-    deleteMany$Module$s: (parent, args, ctx) => {
+    }),
+    deleteMany$Module$s: withAuth(['editor:delete'], (parent, args, ctx) => {
       return ctx.$Module$.deleteMany(args);
-    }
+    })
   },
   Subscription: {}
 });
diff --git a/tools/templates/module/client/index.jsx b/tools/templates/module/client/index.native.jsx
similarity index 100%
rename from tools/templates/module/client/index.jsx
rename to tools/templates/module/client/index.native.jsx
diff --git a/yarn.lock b/yarn.lock
index 3ca277e8b7..f16bd04461 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -473,9 +473,9 @@ antd-mobile@^2.1.2:
     rmc-tooltip "~1.0.0"
     rn-topview "^0.1.6"
 
-antd@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/antd/-/antd-3.2.0.tgz#83f2980f1e73a4147dce3d643c749bd8ba91d057"
+antd@^3.3.3:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/antd/-/antd-3.3.3.tgz#048a6550dffb355443d169226be05593c638e0cc"
   dependencies:
     array-tree-filter "^2.0.0"
     babel-runtime "6.x"
@@ -484,14 +484,14 @@ antd@^3.2.0:
     css-animation "^1.2.5"
     dom-closest "^0.2.0"
     enquire.js "^2.1.1"
-    lodash.debounce "^4.0.8"
+    lodash "^4.17.5"
     moment "^2.19.3"
     omit.js "^1.0.0"
     prop-types "^15.5.7"
     rc-animate "^2.4.1"
-    rc-calendar "~9.5.0"
+    rc-calendar "~9.6.0"
     rc-cascader "~0.12.0"
-    rc-checkbox "~2.1.1"
+    rc-checkbox "~2.1.5"
     rc-collapse "~1.8.0"
     rc-dialog "~7.1.0"
     rc-dropdown "~2.1.0"
@@ -500,7 +500,7 @@ antd@^3.2.0:
     rc-input-number "~4.0.0"
     rc-menu "~6.2.0"
     rc-notification "~3.0.0"
-    rc-pagination "~1.15.0"
+    rc-pagination "~1.16.0"
     rc-progress "~2.2.2"
     rc-rate "~2.4.0"
     rc-select "~7.7.0"
@@ -509,14 +509,14 @@ antd@^3.2.0:
     rc-switch "~1.6.0"
     rc-table "~6.1.0"
     rc-tabs "~9.2.0"
-    rc-time-picker "~3.2.1"
+    rc-time-picker "~3.3.0"
     rc-tooltip "~3.7.0"
-    rc-tree "~1.7.0"
+    rc-tree "~1.7.11"
     rc-tree-select "~1.12.0"
     rc-upload "~2.4.0"
     rc-util "^4.0.4"
     react-lazy-load "^3.0.12"
-    react-slick "~0.17.0"
+    react-slick "~0.21.0"
     shallowequal "^1.0.1"
     warning "~3.0.0"
 
@@ -5865,6 +5865,10 @@ graphql-iso-date@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/graphql-iso-date/-/graphql-iso-date-3.3.0.tgz#cbe434b41e035e806338121b1b2b509a0f72bb80"
 
+graphql-iso-enums@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/graphql-iso-enums/-/graphql-iso-enums-1.0.4.tgz#cfccdd4967501c5d43b8bcd65244c4d0d9187afc"
+
 graphql-parse-fields@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/graphql-parse-fields/-/graphql-parse-fields-1.2.0.tgz#c97119a91951b98dcbe656c46a203e966a720f28"
@@ -8022,6 +8026,10 @@ lodash@^3.10.1, lodash@^3.5.0, lodash@^3.7.0:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
+lodash@^4.17.5:
+  version "4.17.5"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
+
 lodash@~2.4.1:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-2.4.2.tgz#fadd834b9683073da179b3eae6d9c0d15053f73e"
@@ -10461,9 +10469,9 @@ rc-animate@2.x, rc-animate@^2.0.2, rc-animate@^2.3.0, rc-animate@^2.4.1:
     css-animation "^1.3.2"
     prop-types "15.x"
 
-rc-calendar@~9.5.0:
-  version "9.5.0"
-  resolved "https://registry.yarnpkg.com/rc-calendar/-/rc-calendar-9.5.0.tgz#83f3eca977d1c06765437bd7acd39a30890f6f07"
+rc-calendar@~9.6.0:
+  version "9.6.0"
+  resolved "https://registry.yarnpkg.com/rc-calendar/-/rc-calendar-9.6.0.tgz#666fbbbd4b5558e933e655a8033807bc6742b4b0"
   dependencies:
     babel-runtime "6.x"
     classnames "2.x"
@@ -10492,9 +10500,9 @@ rc-checkbox@~2.0.0:
     prop-types "15.x"
     rc-util "^4.0.4"
 
-rc-checkbox@~2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/rc-checkbox/-/rc-checkbox-2.1.2.tgz#8d7c5c69fde1598cabec34dd9b68f68dd934bc7b"
+rc-checkbox@~2.1.5:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/rc-checkbox/-/rc-checkbox-2.1.5.tgz#411858448c0ee2a797ef8544dac63bcaeef722ef"
   dependencies:
     babel-runtime "^6.23.0"
     classnames "2.x"
@@ -10626,9 +10634,9 @@ rc-notification@~3.0.0:
     rc-animate "2.x"
     rc-util "^4.0.4"
 
-rc-pagination@~1.15.0:
-  version "1.15.1"
-  resolved "https://registry.yarnpkg.com/rc-pagination/-/rc-pagination-1.15.1.tgz#fbf0f88f35d3b34e90bafc068b2bf03b5156ba5f"
+rc-pagination@~1.16.0:
+  version "1.16.2"
+  resolved "https://registry.yarnpkg.com/rc-pagination/-/rc-pagination-1.16.2.tgz#650df893ac1bc18ebd8112bca72d372b672be233"
   dependencies:
     babel-runtime "6.x"
     prop-types "^15.5.7"
@@ -10741,9 +10749,9 @@ rc-tabs@~9.2.0:
     rc-util "^4.0.4"
     warning "^3.0.0"
 
-rc-time-picker@~3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/rc-time-picker/-/rc-time-picker-3.2.1.tgz#e105fed32814bb95f37dbc60b49495cd787abfa2"
+rc-time-picker@~3.3.0:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/rc-time-picker/-/rc-time-picker-3.3.1.tgz#94f8bbd51e6b93de1f01e78064aef1e6d765b367"
   dependencies:
     babel-runtime "6.x"
     classnames "2.x"
@@ -10772,7 +10780,7 @@ rc-tree-select@~1.12.0:
     rc-trigger "^2.2.2"
     rc-util "^4.0.2"
 
-rc-tree@~1.7.0, rc-tree@~1.7.1:
+rc-tree@~1.7.1:
   version "1.7.10"
   resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-1.7.10.tgz#8d93d73fa3a91ebf6dde4ebaa98e750a9c8fe154"
   dependencies:
@@ -10783,6 +10791,17 @@ rc-tree@~1.7.0, rc-tree@~1.7.1:
     rc-util "^4.0.4"
     warning "^3.0.0"
 
+rc-tree@~1.7.11:
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-1.7.11.tgz#349de6383fc7d22bf4c13b0751794111022adddf"
+  dependencies:
+    babel-runtime "^6.23.0"
+    classnames "2.x"
+    prop-types "^15.5.8"
+    rc-animate "2.x"
+    rc-util "^4.0.4"
+    warning "^3.0.0"
+
 rc-trigger@^2.2.0, rc-trigger@^2.2.2, rc-trigger@^2.3.0:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/rc-trigger/-/rc-trigger-2.3.3.tgz#406c5ddea594aca71d067852f27d91a5f3a653b8"
@@ -11235,9 +11254,9 @@ react-side-effect@^1.1.0:
     exenv "^1.2.1"
     shallowequal "^1.0.1"
 
-react-slick@~0.17.0:
-  version "0.17.1"
-  resolved "https://registry.yarnpkg.com/react-slick/-/react-slick-0.17.1.tgz#64b6a23d3b3823047e6e705a3578301483da8748"
+react-slick@~0.21.0:
+  version "0.21.0"
+  resolved "https://registry.yarnpkg.com/react-slick/-/react-slick-0.21.0.tgz#677548bc6bcaf6916286d3682c8283feb26a2566"
   dependencies:
     can-use-dom "^0.1.0"
     classnames "^2.2.5"
@@ -11245,7 +11264,6 @@ react-slick@~0.17.0:
     enquire.js "^2.1.6"
     json2mq "^0.2.0"
     object-assign "^4.1.0"
-    opencollective "^1.0.3"
 
 react-stripe-elements@^1.2.1:
   version "1.4.1"

From 549f4374a10c0ee1ff63ef6885c09529487a6227 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 30 Mar 2018 08:19:06 +0200
Subject: [PATCH 114/327] remove textarea

---
 .../components/{RenderTextarea.jsx => RenderTextArea1.jsx}      | 0
 .../modules/common/components/web/ui-antd/components/index.js   | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename packages/client/src/modules/common/components/web/ui-antd/components/{RenderTextarea.jsx => RenderTextArea1.jsx} (100%)

diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderTextarea.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderTextArea1.jsx
similarity index 100%
rename from packages/client/src/modules/common/components/web/ui-antd/components/RenderTextarea.jsx
rename to packages/client/src/modules/common/components/web/ui-antd/components/RenderTextArea1.jsx
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/index.js b/packages/client/src/modules/common/components/web/ui-antd/components/index.js
index a68891437b..7fc7add047 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/index.js
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/index.js
@@ -13,7 +13,7 @@ export { default as Option } from './Option';
 export { default as RenderField } from './RenderField';
 export { default as RenderInput } from './RenderInput';
 export { default as RenderNumber } from './RenderNumber';
-export { default as RenderTextArea } from './RenderTextArea';
+export { default as RenderTextArea } from './RenderTextArea1';
 export { default as RenderDate } from './RenderDate';
 export { default as RenderSelect } from './RenderSelect';
 export { default as RenderSelectCountry } from './RenderSelectCountry';

From 9f6030f737735138ba0806c5b70cc59c18b4baca Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 30 Mar 2018 08:19:46 +0200
Subject: [PATCH 115/327] rename text area

---
 .../components/{RenderTextArea1.jsx => RenderTextArea.jsx}      | 0
 .../modules/common/components/web/ui-antd/components/index.js   | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename packages/client/src/modules/common/components/web/ui-antd/components/{RenderTextArea1.jsx => RenderTextArea.jsx} (100%)

diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderTextArea1.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderTextArea.jsx
similarity index 100%
rename from packages/client/src/modules/common/components/web/ui-antd/components/RenderTextArea1.jsx
rename to packages/client/src/modules/common/components/web/ui-antd/components/RenderTextArea.jsx
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/index.js b/packages/client/src/modules/common/components/web/ui-antd/components/index.js
index 7fc7add047..a68891437b 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/index.js
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/index.js
@@ -13,7 +13,7 @@ export { default as Option } from './Option';
 export { default as RenderField } from './RenderField';
 export { default as RenderInput } from './RenderInput';
 export { default as RenderNumber } from './RenderNumber';
-export { default as RenderTextArea } from './RenderTextArea1';
+export { default as RenderTextArea } from './RenderTextArea';
 export { default as RenderDate } from './RenderDate';
 export { default as RenderSelect } from './RenderSelect';
 export { default as RenderSelectCountry } from './RenderSelectCountry';

From 24c0d0ad46d5fba670371d5aa8b0f763782b7421 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 30 Mar 2018 09:25:32 +0200
Subject: [PATCH 116/327] no need to wrapp AuthRoute withUser anymore

---
 tools/templates/crud/client/index.web.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/templates/crud/client/index.web.jsx b/tools/templates/crud/client/index.web.jsx
index a58ea19fd1..5c2d935f56 100644
--- a/tools/templates/crud/client/index.web.jsx
+++ b/tools/templates/crud/client/index.web.jsx
@@ -5,7 +5,7 @@ import $Module$ from './components/$Module$';
 import $Module$Edit from './containers/$Module$Edit';
 import resolvers from './resolvers';
 
-import { AuthRoute, IfLoggedIn, withUser } from '../user/containers/Auth';
+import { AuthRoute, IfLoggedIn } from '../user/containers/Auth';
 import Feature from '../connector';
 
 export default new Feature({
@@ -13,7 +13,7 @@ export default new Feature({
     <AuthRoute
       exact
       path="/$module$"
-      component={withUser($Module$)}
+      component={$Module$}
       role={['editor', 'admin']}
       title="$MoDuLe$"
       link="$module$"
@@ -21,7 +21,7 @@ export default new Feature({
     <AuthRoute
       exact
       path="/$module$/:id"
-      component={withUser($Module$Edit)}
+      component={$Module$Edit}
       role={['editor', 'admin']}
       title="$MoDuLe$"
       link="$module$"

From 466727c86e3b0f84cee4cef608d31a0e4de8bc27 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 30 Mar 2018 11:02:54 +0200
Subject: [PATCH 117/327] merge fix

---
 .../web/ui-antd/components/NavBar.jsx         | 67 +++++++++++++++++++
 packages/server/src/modules/user/sql.js       |  1 +
 2 files changed, 68 insertions(+)
 create mode 100644 packages/client/src/modules/common/components/web/ui-antd/components/NavBar.jsx

diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/NavBar.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/NavBar.jsx
new file mode 100644
index 0000000000..34c78143e6
--- /dev/null
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/NavBar.jsx
@@ -0,0 +1,67 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { withRouter, NavLink } from 'react-router-dom';
+import Menu from 'antd/lib/menu';
+import Row from 'antd/lib/row';
+import Col from 'antd/lib/col';
+import MenuItem from './MenuItem';
+
+import modules from '../../../../../../modules';
+import settings from '../../../../../../../../../settings';
+
+class NavBar extends React.Component {
+  state = {
+    current: '/'
+  };
+
+  handleClick = e => {
+    this.setState({
+      current: e.key
+    });
+  };
+
+  render() {
+    return (
+      <Row gutter={8}>
+        <Col span={14}>
+          <Menu
+            onClick={this.handleClick}
+            selectedKeys={[this.props.location.pathname]}
+            mode="horizontal"
+            theme="dark"
+            style={{ lineHeight: '64px' }}
+          >
+            <MenuItem key="/">
+              <NavLink to="/" className="nav-link">
+                {settings.app.name}
+              </NavLink>
+            </MenuItem>
+            {modules.navItems}
+          </Menu>
+        </Col>
+        <Col span={10}>
+          <Menu
+            onClick={this.handleClick}
+            selectedKeys={[this.props.location.pathname]}
+            mode="horizontal"
+            theme="dark"
+            style={{ lineHeight: '64px', float: 'right' }}
+          >
+            {modules.navItemsRight}
+            {__DEV__ && (
+              <MenuItem>
+                <a href="/graphiql">GraphiQL</a>
+              </MenuItem>
+            )}
+          </Menu>
+        </Col>
+      </Row>
+    );
+  }
+}
+
+NavBar.propTypes = {
+  location: PropTypes.object.isRequired
+};
+
+export default withRouter(NavBar);
diff --git a/packages/server/src/modules/user/sql.js b/packages/server/src/modules/user/sql.js
index 45ebc082f8..5765c1c6f8 100644
--- a/packages/server/src/modules/user/sql.js
+++ b/packages/server/src/modules/user/sql.js
@@ -1,3 +1,4 @@
+// Helpers
 import { camelizeKeys, decamelizeKeys, decamelize } from 'humps';
 import { has } from 'lodash';
 import bcrypt from 'bcryptjs';

From 1ebc77f7e0b09931d2625ff8094141a4db2f581c Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 30 Mar 2018 11:38:28 +0200
Subject: [PATCH 118/327] fix ERROR in index.4470ce96e16878631b1d.js from
 UglifyJs

---
 packages/client/package.json                  |  10 +-
 .../components/RenderSelectCountry.jsx        |   4 +-
 packages/common/ISOCountries.js               | 248 ++++++++++++++++++
 yarn.lock                                     |   4 -
 4 files changed, 251 insertions(+), 15 deletions(-)
 create mode 100644 packages/common/ISOCountries.js

diff --git a/packages/client/package.json b/packages/client/package.json
index 0bf4e9cc51..ac3240991a 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -26,14 +26,7 @@
     "url": "https://github.com/sysgears/apollo-universal-starter-kit/issues"
   },
   "homepage": "https://github.com/sysgears/apollo-universal-starter-kit",
-  "keywords": [
-    "apollo",
-    "universal",
-    "starter",
-    "graphql",
-    "react",
-    "redux"
-  ],
+  "keywords": ["apollo", "universal", "starter", "graphql", "react", "redux"],
   "author": "SysGears INC",
   "license": "MIT",
   "dependencies": {
@@ -60,7 +53,6 @@
     "graphql": "^0.12.3",
     "graphql-auth": "^0.2.0",
     "graphql-iso-date": "^3.3.0",
-    "graphql-iso-enums": "^1.0.4",
     "graphql-tag": "^2.6.0",
     "history": "^4.7.2",
     "humps": "^2.0.1",
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectCountry.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectCountry.jsx
index a052302f1c..efb3519108 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectCountry.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectCountry.jsx
@@ -1,7 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { CODES as countries } from 'graphql-iso-enums/types/ISOTerritory';
 import Select from 'antd/lib/select';
+
+import countries from '../../../../../../../../common/ISOCountries';
 import { FormItem } from './index';
 
 const Option = Select.Option;
@@ -44,7 +45,6 @@ export default class RenderSelectCountry extends React.Component {
     }
 
     const options = [];
-
     Object.entries(countries).forEach(([key, value]) =>
       options.push(
         <Option key={key} value={key}>
diff --git a/packages/common/ISOCountries.js b/packages/common/ISOCountries.js
new file mode 100644
index 0000000000..c0c3c4a075
--- /dev/null
+++ b/packages/common/ISOCountries.js
@@ -0,0 +1,248 @@
+export default {
+  AF: 'Afghanistan',
+  AX: 'Åland Islands',
+  AL: 'Albania',
+  DZ: 'Algeria',
+  AD: 'Andorra',
+  AO: 'Angola',
+  AG: 'Antigua and Barbuda',
+  AR: 'Argentina',
+  AM: 'Armenia',
+  AU: 'Australia',
+  AT: 'Austria',
+  AZ: 'Azerbaijan',
+  BS: 'The Bahamas',
+  BH: 'Bahrain',
+  BD: 'Bangladesh',
+  BB: 'Barbados',
+  BY: 'Belarus',
+  BE: 'Belgium',
+  BZ: 'Belize',
+  BJ: 'Benin',
+  BT: 'Bhutan',
+  BO: 'Bolivia',
+  BA: 'Bosnia and Herzegovina',
+  BW: 'Botswana',
+  BR: 'Brazil',
+  BN: 'Brunei',
+  BG: 'Bulgaria',
+  BF: 'Burkina',
+  BI: 'Burundi',
+  KH: 'Cambodia',
+  CM: 'Cameroon',
+  CA: 'Canada',
+  CV: 'Cape Verde',
+  CF: 'The Central African Republic',
+  TD: 'Chad',
+  CL: 'Chile',
+  CN: 'China',
+  CO: 'Colombia',
+  KM: 'The Comoros',
+  CG: 'The Congo',
+  CD: 'The Democratic Republic of the Congo',
+  CR: 'Costa Rica',
+  CI: "Côte d'Ivoire",
+  HR: 'Croatia',
+  CU: 'Cuba',
+  CY: 'Cyprus',
+  CZ: 'The Czech Republic',
+  DK: 'Denmark',
+  DJ: 'Djibouti',
+  DM: 'Dominica',
+  DO: 'The Dominican Republic',
+  TL: 'Timor-Leste',
+  EC: 'Ecuador',
+  EG: 'Egypt',
+  SV: 'El Salvador',
+  GQ: 'Equatorial Guinea',
+  ER: 'Eritrea',
+  EE: 'Estonia',
+  ET: 'Ethiopia',
+  FJ: 'Fiji',
+  FI: 'Finland',
+  FR: 'France',
+  GA: 'Gabon',
+  GM: 'The Gambia',
+  GE: 'Georgia',
+  DE: 'Germany',
+  GH: 'Ghana',
+  GR: 'Greece',
+  GD: 'Grenada',
+  GT: 'Guatemala',
+  GG: 'Guernsey',
+  GN: 'Guinea',
+  GW: 'Guinea-Bissau',
+  GY: 'Guyana',
+  HT: 'Haiti',
+  VA: 'The Holy See',
+  HN: 'Honduras',
+  HU: 'Hungary',
+  IS: 'Iceland',
+  IN: 'India',
+  ID: 'Indonesia',
+  IR: 'Iran',
+  IQ: 'Iraq',
+  IE: 'Ireland',
+  IM: 'Isle of Man',
+  IL: 'Israel',
+  IT: 'Italy',
+  JM: 'Jamaica',
+  JP: 'Japan',
+  JE: 'Jersey',
+  JO: 'Jordan',
+  KZ: 'Kazakhstan',
+  KE: 'Kenya',
+  KI: 'Kiribati',
+  KP: "The Democratic People's Republic of Korea",
+  KR: 'The Republic of Korea',
+  KW: 'Kuwait',
+  KG: 'Kyrgyzstan',
+  LA: 'Laos',
+  LV: 'Latvia',
+  LB: 'Lebanon',
+  LS: 'Lesotho',
+  LR: 'Liberia',
+  LY: 'Libya',
+  LI: 'Liechtenstein',
+  LT: 'Lithuania',
+  LU: 'Luxembourg',
+  MG: 'Madagascar',
+  MW: 'Malawi',
+  MY: 'Malaysia',
+  MV: 'Maldives',
+  ML: 'Mali',
+  MT: 'Malta',
+  MH: 'The Marshall Islands',
+  MR: 'Mauritania',
+  MU: 'Mauritius',
+  MX: 'Mexico',
+  FM: 'Micronesia',
+  MD: 'Moldova',
+  MC: 'Monaco',
+  MN: 'Mongolia',
+  ME: 'Montenegro',
+  MA: 'Morocco',
+  MZ: 'Mozambique',
+  MM: 'Myanmar',
+  NA: 'Namibia',
+  NR: 'Nauru',
+  NP: 'Nepal',
+  NL: 'The Netherlands',
+  NZ: 'New Zealand',
+  NI: 'Nicaragua',
+  NE: 'The Niger',
+  NG: 'Nigeria',
+  NO: 'Norway',
+  OM: 'Oman',
+  PK: 'Pakistan',
+  PW: 'Palau',
+  PA: 'Panama',
+  PG: 'Papua New Guinea',
+  PY: 'Paraguay',
+  PE: 'Peru',
+  PH: 'The Philippines',
+  PL: 'Poland',
+  PT: 'Portugal',
+  QA: 'Qatar',
+  RO: 'Romania',
+  RU: 'Russia',
+  RW: 'Rwanda',
+  KN: 'Saint Kitts and Nevis',
+  LC: 'Saint Lucia',
+  VC: 'Saint Vincent and The Grenadines',
+  WS: 'Samoa',
+  SM: 'San Marino',
+  ST: 'Sao Tome and Principe',
+  SA: 'Saudi Arabia',
+  SN: 'Senegal',
+  RS: 'Serbia',
+  SC: 'Seychelles',
+  SL: 'Sierra Leone',
+  SG: 'Singapore',
+  SK: 'Slovakia',
+  SI: 'Slovenia',
+  SB: 'Solomon Islands',
+  SO: 'Somalia',
+  ZA: 'South Africa',
+  ES: 'Spain',
+  LK: 'Sri Lanka',
+  SD: 'The Sudan',
+  SR: 'Suriname',
+  SZ: 'Swaziland',
+  SE: 'Sweden',
+  CH: 'Switzerland',
+  SY: 'Syria',
+  TJ: 'Tajikistan',
+  TZ: 'Tanzania',
+  TH: 'Thailand',
+  MK: 'Macedonia',
+  TG: 'Togo',
+  TO: 'Tonga',
+  TT: 'Trinidad and Tobago',
+  TN: 'Tunisia',
+  TR: 'Turkey',
+  TM: 'Turkmenistan',
+  TV: 'Tuvalu',
+  UG: 'Uganda',
+  UA: 'Ukraine',
+  AE: 'The United Arab Emirates',
+  GB: 'The United Kingdom',
+  US: 'The United States',
+  UY: 'Uruguay',
+  UZ: 'Uzbekistan',
+  VU: 'Vanuatu',
+  VE: 'Venezuela',
+  VN: 'Viet Nam',
+  YE: 'Yemen',
+  ZM: 'Zambia',
+  ZW: 'Zimbabwe',
+  AS: 'American Samoa',
+  AI: 'Anguilla',
+  AQ: 'Antarctica',
+  AW: 'Aruba',
+  BM: 'Bermuda',
+  BV: 'Bouvet Island',
+  IO: 'The British Indian Ocean Territory',
+  KY: 'Cayman Islands',
+  CX: 'Christmas Island',
+  CC: 'Cocos Islands',
+  CK: 'Cook Islands',
+  FK: 'Falkland Islands',
+  FO: 'Faroe Islands',
+  GF: 'French Guiana',
+  PF: 'French Polynesia',
+  TF: 'The French Southern Territories',
+  GI: 'Gibraltar',
+  GL: 'Greenland',
+  GP: 'Guadeloupe',
+  GU: 'Guam',
+  HM: 'Heard Island and McDonald Islands',
+  HK: 'Hong Kong',
+  MO: 'Macao',
+  MQ: 'Martinique',
+  YT: 'Mayotte',
+  MS: 'Montserrat',
+  AN: 'Netherlands Antilles',
+  NC: 'New Caledonia',
+  NU: 'Niue',
+  NF: 'Norfolk Island',
+  MP: 'Northern Mariana Islands',
+  PS: 'The Occupied Palestinian Territory',
+  PN: 'Pitcairn',
+  PR: 'Puerto Rico',
+  RE: 'Réunion',
+  BL: 'Saint Barthélemy',
+  SH: 'Saint Helena',
+  MF: 'Saint Martin',
+  PM: 'Saint Pierre and Miquelon',
+  GS: 'South Georgia and The South Sandwich Islands',
+  SJ: 'Svalbard and Jan Mayen',
+  TW: 'Taiwan',
+  TK: 'Tokelau',
+  TC: 'Turks and Caicos Islands',
+  UM: 'United States Minor Outlying Islands',
+  VG: 'British Virgin Islands',
+  VI: 'US Virgin Islands',
+  WF: 'Wallis and Futuna',
+  EH: 'Western Sahara'
+};
diff --git a/yarn.lock b/yarn.lock
index 7d31781ef5..e3c3585b2e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5905,10 +5905,6 @@ graphql-iso-date@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/graphql-iso-date/-/graphql-iso-date-3.3.0.tgz#cbe434b41e035e806338121b1b2b509a0f72bb80"
 
-graphql-iso-enums@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/graphql-iso-enums/-/graphql-iso-enums-1.0.4.tgz#cfccdd4967501c5d43b8bcd65244c4d0d9187afc"
-
 graphql-parse-fields@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/graphql-parse-fields/-/graphql-parse-fields-1.2.0.tgz#c97119a91951b98dcbe656c46a203e966a720f28"

From 1535af120d152feed406a8ccfaa1e20514c77dbe Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 30 Mar 2018 11:44:28 +0200
Subject: [PATCH 119/327] remove NavBar

---
 .../web/ui-antd/components/NavBar.jsx         | 67 -------------------
 1 file changed, 67 deletions(-)
 delete mode 100644 packages/client/src/modules/common/components/web/ui-antd/components/NavBar.jsx

diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/NavBar.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/NavBar.jsx
deleted file mode 100644
index 34c78143e6..0000000000
--- a/packages/client/src/modules/common/components/web/ui-antd/components/NavBar.jsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { withRouter, NavLink } from 'react-router-dom';
-import Menu from 'antd/lib/menu';
-import Row from 'antd/lib/row';
-import Col from 'antd/lib/col';
-import MenuItem from './MenuItem';
-
-import modules from '../../../../../../modules';
-import settings from '../../../../../../../../../settings';
-
-class NavBar extends React.Component {
-  state = {
-    current: '/'
-  };
-
-  handleClick = e => {
-    this.setState({
-      current: e.key
-    });
-  };
-
-  render() {
-    return (
-      <Row gutter={8}>
-        <Col span={14}>
-          <Menu
-            onClick={this.handleClick}
-            selectedKeys={[this.props.location.pathname]}
-            mode="horizontal"
-            theme="dark"
-            style={{ lineHeight: '64px' }}
-          >
-            <MenuItem key="/">
-              <NavLink to="/" className="nav-link">
-                {settings.app.name}
-              </NavLink>
-            </MenuItem>
-            {modules.navItems}
-          </Menu>
-        </Col>
-        <Col span={10}>
-          <Menu
-            onClick={this.handleClick}
-            selectedKeys={[this.props.location.pathname]}
-            mode="horizontal"
-            theme="dark"
-            style={{ lineHeight: '64px', float: 'right' }}
-          >
-            {modules.navItemsRight}
-            {__DEV__ && (
-              <MenuItem>
-                <a href="/graphiql">GraphiQL</a>
-              </MenuItem>
-            )}
-          </Menu>
-        </Col>
-      </Row>
-    );
-  }
-}
-
-NavBar.propTypes = {
-  location: PropTypes.object.isRequired
-};
-
-export default withRouter(NavBar);

From f717b6c7f284129a5195ab7d378c8d9c6053f111 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Mon, 9 Apr 2018 09:07:49 +0200
Subject: [PATCH 120/327] update to latest crud

---
 packages/client/package.json                  |  3 +-
 .../common/components/crud/FormView.web.jsx   |  9 +---
 .../ui-antd/components/RenderSelectQuery.jsx  |  9 ++--
 .../components/web/ui-antd/styles/styles.less | 46 ++++++++++++++++++-
 packages/server/package.json                  |  2 +-
 5 files changed, 56 insertions(+), 13 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index ac3240991a..cec4d07e79 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -30,10 +30,11 @@
   "author": "SysGears INC",
   "license": "MIT",
   "dependencies": {
+    "@domain-schema/core": "^0.0.30",
+    "@domain-schema/validation": "^0.0.32",
     "@fortawesome/fontawesome": "^1.1.3",
     "@fortawesome/fontawesome-free-brands": "^5.0.6",
     "@fortawesome/react-fontawesome": "0.0.17",
-    "@domain-schema/core": "^0.0.30",
     "antd": "^3.3.3",
     "apollo-cache-inmemory": "^1.1.4",
     "apollo-client": "^2.1.0",
diff --git a/packages/client/src/modules/common/components/crud/FormView.web.jsx b/packages/client/src/modules/common/components/crud/FormView.web.jsx
index 7818627a84..81a1937c39 100644
--- a/packages/client/src/modules/common/components/crud/FormView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/FormView.web.jsx
@@ -1,11 +1,11 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Formik } from 'formik';
+import DomainValidation from '@domain-schema/validation';
 
 import { onSubmit, mapFormPropsToValues } from '../../../../utils/crud';
 import { createFormFields } from '../../util';
 import { Form, FormItem, Button } from '../web';
-//import { minLength, required, validateForm } from '../../../../../../common/validation';
 
 const tailFormItemLayout = {
   wrapperCol: {
@@ -31,16 +31,11 @@ const formItemLayout = {
   }
 };
 
-//const formSchema = {
-//  name: [required, minLength(3)]
-//};
-
-//const validate = values => validateForm(values, formSchema);
-
 const FormView = ({ schema, updateEntry, createEntry, title, customFields, data }) => {
   return (
     <Formik
       initialValues={mapFormPropsToValues({ schema, data: data ? data.node : null })}
+      validate={values => DomainValidation.validate(values, schema)}
       onSubmit={async values => {
         //console.log('onSubmit, values:', pickInputFields({schema, values}));
         await onSubmit({ schema, values, updateEntry, createEntry, title, data: data ? data.node : null });
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
index ac8b58bbf3..fdb3e84359 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
@@ -73,9 +73,12 @@ export default class RenderSelectQuery extends React.Component {
         column = remoteKey;
       }
     }
+
+    const toString = schema.__.__toString ? schema.__.__toString : opt => opt[column];
+
     let formatedValue =
       value && value != '' && value != undefined
-        ? { key: value.id.toString(), label: value.name ? value.name : value[column] }
+        ? { key: value.id.toString(), label: toString(value) }
         : { key: '', label: '' };
     //console.log('formatedValue:', formatedValue);
 
@@ -102,7 +105,7 @@ export default class RenderSelectQuery extends React.Component {
                 const options = data.edges
                   ? data.edges.map(opt => (
                       <Option key={opt.id} value={opt.id.toString()}>
-                        {opt[column]}
+                        {toString(opt)}
                       </Option>
                     ))
                   : null;
@@ -125,7 +128,7 @@ export default class RenderSelectQuery extends React.Component {
                       if (!dirty) {
                         options.unshift(
                           <Option key={value.id} value={value.id.toString()}>
-                            {value[column]}
+                            {toString(value)}
                           </Option>
                         );
                       } else {
diff --git a/packages/client/src/modules/common/components/web/ui-antd/styles/styles.less b/packages/client/src/modules/common/components/web/ui-antd/styles/styles.less
index 1fc1d584d0..8a5676dddc 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/styles/styles.less
+++ b/packages/client/src/modules/common/components/web/ui-antd/styles/styles.less
@@ -83,4 +83,48 @@
 
 .ant-advanced-search-form .ant-form-item-label {
   overflow: visible;
-}
\ No newline at end of file
+}
+.table-footer {
+  background: #fbfbfb;
+  font-weight: bold;
+}
+
+.login-bg {
+  background-image: url('../img/bg.jpg');
+  height: 100%;
+  background-position: center;
+  background-repeat: no-repeat;
+  background-size: cover;
+}
+
+.components-table-nested .ant-table-expanded-row > td:last-child {
+  padding: 0 48px 0 8px;
+}
+
+.components-table-nested .ant-table-expanded-row > td:last-child .ant-table-thead th {
+  border-bottom: 1px solid #e9e9e9;
+}
+
+.components-table-nested .ant-table-expanded-row > td:last-child .ant-table-thead th:first-child {
+  padding-left: 0;
+}
+
+.components-table-nested .ant-table-expanded-row > td:last-child .ant-table-row td:first-child {
+  padding-left: 0;
+}
+
+.components-table-nested .ant-table-expanded-row .ant-table-row:last-child td {
+  border: none;
+}
+
+.components-table-nested .ant-table-expanded-row .ant-table-thead > tr > th {
+  background: none;
+}
+
+.components-table-nested .table-operation a:not(:last-child) {
+  margin-right: 24px;
+}
+
+.components-table-nested .ant-table-expanded-row:hover > td {
+  background: #fbfbfb;
+}
diff --git a/packages/server/package.json b/packages/server/package.json
index ced682d9e3..1a3e7df51e 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -56,7 +56,7 @@
     "@domain-schema/formik": "^0.0.30",
     "@domain-schema/graphql": "^0.0.30",
     "@domain-schema/knex": "^0.0.30",
-    "@domain-schema/validation": "^0.0.30",
+    "@domain-schema/validation": "^0.0.32",
     "apollo-cache-inmemory": "^1.1.4",
     "apollo-client": "^2.1.0",
     "apollo-engine": "^0.7.0",

From 1ec4bffe4d013bbfa8a87296c56e314c289d75c3 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Mon, 9 Apr 2018 09:25:41 +0200
Subject: [PATCH 121/327] resolve conflicts

---
 .../common/components/web/ui-antd/styles/styles.less      | 8 --------
 yarn.lock                                                 | 6 +++---
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/packages/client/src/modules/common/components/web/ui-antd/styles/styles.less b/packages/client/src/modules/common/components/web/ui-antd/styles/styles.less
index 8a5676dddc..12112df44a 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/styles/styles.less
+++ b/packages/client/src/modules/common/components/web/ui-antd/styles/styles.less
@@ -89,14 +89,6 @@
   font-weight: bold;
 }
 
-.login-bg {
-  background-image: url('../img/bg.jpg');
-  height: 100%;
-  background-position: center;
-  background-repeat: no-repeat;
-  background-size: cover;
-}
-
 .components-table-nested .ant-table-expanded-row > td:last-child {
   padding: 0 48px 0 8px;
 }
diff --git a/yarn.lock b/yarn.lock
index cd857c84d0..6f812b9038 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -100,9 +100,9 @@
     debug "^3.1.0"
     humps "^2.0.1"
 
-"@domain-schema/validation@^0.0.30":
-  version "0.0.30"
-  resolved "https://registry.yarnpkg.com/@domain-schema/validation/-/validation-0.0.30.tgz#217a944f2f1c5887988fb7bcfa3dcf80790cec75"
+"@domain-schema/validation@^0.0.32":
+  version "0.0.32"
+  resolved "https://registry.yarnpkg.com/@domain-schema/validation/-/validation-0.0.32.tgz#3f452b6063d4764b0c369d13eadff0f69bf74a04"
   dependencies:
     debug "^3.1.0"
 

From 4a96425670c74c20fee6f51017e54ee0b43e90f3 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 12 Apr 2018 09:18:58 +0200
Subject: [PATCH 122/327] update to latest crud

---
 .../web/ui-antd/components/PageLayout.jsx     |  4 +-
 .../client/src/modules/common/util.web.jsx    | 40 +++++++++++--------
 packages/client/src/utils/crud.js             |  4 +-
 packages/common/utils.js                      |  8 ++++
 packages/server/src/sql/crud.js               | 18 +++++++++
 5 files changed, 54 insertions(+), 20 deletions(-)

diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/PageLayout.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/PageLayout.jsx
index 7b680c9011..70d3a43447 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/PageLayout.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/PageLayout.jsx
@@ -96,7 +96,9 @@ class PageLayout extends React.Component {
                 {children}
               </Content>
             </section>
-            <Footer style={{ textAlign: 'center' }}>&copy; 2017. {settings.app.name}.</Footer>
+            <Footer style={{ textAlign: 'center' }}>
+              &copy; {new Date().getFullYear()}. {settings.app.name}.
+            </Footer>
           </Layout>
         </Layout>
       </div>
diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index b9cd56558c..34fcae3493 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -26,7 +26,6 @@ import {
   Popconfirm,
   Switch,
   FormItem,
-  Row,
   Col,
   Input,
   InputNumber,
@@ -89,6 +88,7 @@ export const createColumnFields = ({
             key: key,
             fixed: customFields[key] && customFields[key]['fixed'] ? customFields[key]['fixed'] : null,
             width: customFields[key] && customFields[key]['width'] ? customFields[key]['width'] : null,
+            align: customFields[key] && customFields[key]['align'] ? customFields[key]['align'] : null,
             render: (text, record) =>
               customFields[key] && customFields[key]['render'] ? (
                 customFields[key]['render'](text, record)
@@ -120,6 +120,7 @@ export const createColumnFields = ({
             key: key,
             fixed: customFields[key] && customFields[key]['fixed'] ? customFields[key]['fixed'] : null,
             width: customFields[key] && customFields[key]['width'] ? customFields[key]['width'] : null,
+            align: customFields[key] && customFields[key]['align'] ? customFields[key]['align'] : null,
             render: (text, record) => {
               const data = {};
               data[key] = !text;
@@ -137,6 +138,7 @@ export const createColumnFields = ({
             key: key,
             fixed: customFields[key] && customFields[key]['fixed'] ? customFields[key]['fixed'] : null,
             width: customFields[key] && customFields[key]['width'] ? customFields[key]['width'] : null,
+            align: customFields[key] && customFields[key]['align'] ? customFields[key]['align'] : null,
             render: (text, record) => (
               <EditableCell
                 value={text}
@@ -159,6 +161,7 @@ export const createColumnFields = ({
             key: key,
             fixed: customFields[key] && customFields[key]['fixed'] ? customFields[key]['fixed'] : null,
             width: customFields[key] && customFields[key]['width'] ? customFields[key]['width'] : null,
+            align: customFields[key] && customFields[key]['align'] ? customFields[key]['align'] : null,
             render: (text, record) =>
               customFields[key] && customFields[key]['render']
                 ? customFields[key]['render'](text, record)
@@ -174,6 +177,7 @@ export const createColumnFields = ({
           key: key,
           fixed: customFields[key] && customFields[key]['fixed'] ? customFields[key]['fixed'] : null,
           width: customFields[key] && customFields[key]['width'] ? customFields[key]['width'] : null,
+          align: customFields[key] && customFields[key]['align'] ? customFields[key]['align'] : null,
           render: (text, record) =>
             customFields[key] && customFields[key]['render'] ? customFields[key]['render'](text, record) : null
         });
@@ -436,33 +440,35 @@ export const createFormFields = ({
                 key={key}
                 render={({ push, remove }) => {
                   return (
-                    <Row>
-                      <Col span={12} offset={6}>
-                        {values[key].map((field, index) => (
-                          <div key={index} className="field-array-form">
-                            {createFormFields({
-                              handleChange,
-                              handleBlur,
-                              schema: value.type[0],
-                              values: mapFormPropsToValues({ schema: value.type[0], data: field }),
-                              formItemLayout: formItemLayout,
-                              prefix: `${key}[${index}].`
-                            })}
+                    <FormItem {...formItemLayout} label={startCase(key)}>
+                      {values[key].map((field, index) => (
+                        <div key={index} className="field-array-form">
+                          {createFormFields({
+                            handleChange,
+                            handleBlur,
+                            schema: value.type[0],
+                            values: mapFormPropsToValues({ schema: value.type[0], data: field }),
+                            formItemLayout: formItemLayout,
+                            prefix: `${key}[${index}].`
+                          })}
+                          {!value.hasOne && (
                             <FormItem {...tailFormItemLayout}>
                               <Button color="primary" size="sm" onClick={() => remove(index)}>
                                 Delete
                               </Button>
                             </FormItem>
-                          </div>
-                        ))}
+                          )}
+                        </div>
+                      ))}
+                      {!value.hasOne && (
                         <FormItem {...tailFormItemLayout}>
                           {/*submitFailed && error && <span>{error}</span>*/}
                           <Button color="dashed" onClick={() => push({})} style={{ width: '180px' }}>
                             Add field
                           </Button>
                         </FormItem>
-                      </Col>
-                    </Row>
+                      )}
+                    </FormItem>
                   );
                 }}
               />
diff --git a/packages/client/src/utils/crud.js b/packages/client/src/utils/crud.js
index f5bba847df..d7f8b23a0f 100644
--- a/packages/client/src/utils/crud.js
+++ b/packages/client/src/utils/crud.js
@@ -1,4 +1,4 @@
-import { isEqual } from 'lodash';
+import { isEqual, has } from 'lodash';
 
 export const onSubmit = async ({ schema, values, updateEntry, createEntry, title, data = null }) => {
   let result = null;
@@ -74,7 +74,7 @@ export const pickInputFields = ({ schema, values, data = null, formType = 'form'
         }
       }
     } else {
-      if (key in values && values[key]) {
+      if (key in values && has(values, key)) {
         if (value.type.isSchema) {
           inputValues[`${key}Id`] = Number(values[key].id ? values[key].id : values[key]);
         } else if (key !== 'id' && value.type.constructor !== Array) {
diff --git a/packages/common/utils.js b/packages/common/utils.js
index 63c4c749f4..81ebb31900 100644
--- a/packages/common/utils.js
+++ b/packages/common/utils.js
@@ -19,3 +19,11 @@ export const removeEmpty = obj =>
       redObj[key] = obj[key];
       return redObj;
     }, {});
+
+export const add3Dots = (string, limit) => {
+  const dots = '...';
+  if (string.length > limit) {
+    string = string.substring(0, limit) + dots;
+  }
+  return string;
+};
diff --git a/packages/server/src/sql/crud.js b/packages/server/src/sql/crud.js
index f81a6cd5d9..8a68981453 100644
--- a/packages/server/src/sql/crud.js
+++ b/packages/server/src/sql/crud.js
@@ -509,6 +509,15 @@ export default class Crud {
               const filterValue_gte = moment(filter[`${filterKey}_gte`]).format(dateFormat);
               this.andWhere(`${tableName}.${decamelize(filterKey)}`, '<=', `${filterValue_gte}`);
             }
+          } else if (hasTypeOf(Boolean)) {
+            if (_.has(filter, filterKey) && filter[filterKey] !== '') {
+              if (filterValue === true) {
+                filterValue = 1;
+              } else {
+                filterValue = 0;
+              }
+              this.andWhere(`${tableName}.${decamelize(filterKey)}`, '=', `${filterValue}`);
+            }
           } else {
             if (_.has(filter, filterKey) && filter[filterKey] !== '') {
               this.andWhere(`${tableName}.${decamelize(filterKey)}`, '=', `${filterValue}`);
@@ -571,6 +580,15 @@ export default class Crud {
     return knexnest(select(baseQuery));
   }
 
+  _getMany({ where: { id_in } }, info) {
+    const baseQuery = knex(`${this.getFullTableName()} as ${this.getTableName()}`);
+    const select = selectBy(this.schema, info);
+
+    baseQuery.whereIn('id', [...id_in]);
+
+    return knexnest(select(baseQuery));
+  }
+
   async get(args, info) {
     const node = await this._get(args, parseFields(info).node);
     return { node };

From 2f00f9e38a61e57ce32b4222697377c98b576356 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 3 May 2018 09:26:29 +0200
Subject: [PATCH 123/327] is array and not schema

---
 tools/cli/module.js | 4 ++--
 yarn.lock           | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/cli/module.js b/tools/cli/module.js
index 136f7a8bf6..b8f0884664 100644
--- a/tools/cli/module.js
+++ b/tools/cli/module.js
@@ -231,7 +231,7 @@ function updateSchema(logger, module) {
           } else {
             inputFilter += `  ${key}: ${generateField(value, true)}\n`;
           }
-        } else if (value.type.constructor === Array) {
+        } else if (value.type.constructor === Array && value.type[0].isSchema) {
           inputCreate += `  ${key}: ${pascalize(key)}CreateManyInput\n`;
           inputUpdate += `  ${key}: ${pascalize(key)}UpdateManyInput\n`;
 
@@ -397,7 +397,7 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
           graphql += `    id\n`;
           graphql += `    ${column}\n`;
           graphql += `  }\n`;
-        } else if (value.type.constructor === Array) {
+        } else if (value.type.constructor === Array && value.type[0].isSchema) {
           graphql += `  ${key} {\n`;
           for (const remoteKey of value.type[0].keys()) {
             const remoteValue = value.type[0].values[remoteKey];
diff --git a/yarn.lock b/yarn.lock
index 495bc0b9a4..74de389687 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -757,9 +757,9 @@ apollo-link@^1.1.0, apollo-link@^1.2.1:
     apollo-utilities "^1.0.0"
     zen-observable-ts "^0.8.6"
 
-apollo-logger@0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/apollo-logger/-/apollo-logger-0.1.1.tgz#bda4245cd69dda2a04648e37b4b32e47b6112555"
+apollo-logger@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/apollo-logger/-/apollo-logger-0.2.0.tgz#34f3ac6ebef1dc9b0a5ee1e890188c30b241a2a2"
   dependencies:
     debug "^3.0.1"
 

From 99a278c635e417a6b760515c8ea9e9d99c7a35a1 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 10 May 2018 13:07:34 +0200
Subject: [PATCH 124/327] small fixes

---
 .../modules/common/components/crud/FilterView.web.jsx  |  6 +++++-
 .../src/modules/common/components/crud/FormView.jsx    |  4 ++--
 .../modules/common/components/crud/ListView.web.jsx    | 10 ++++++++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/packages/client/src/modules/common/components/crud/FilterView.web.jsx b/packages/client/src/modules/common/components/crud/FilterView.web.jsx
index c1c1bdf75c..f300f68c94 100644
--- a/packages/client/src/modules/common/components/crud/FilterView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/FilterView.web.jsx
@@ -50,7 +50,11 @@ class FilterView extends React.PureComponent {
     const showFilter =
       customFields === null
         ? false
-        : customFields && customFields.role ? (hasRole(customFields.role, currentUser) ? true : false) : true;
+        : customFields && customFields.role
+          ? hasRole(customFields.role, currentUser)
+            ? true
+            : false
+          : true;
 
     if (!showFilter) {
       return null;
diff --git a/packages/client/src/modules/common/components/crud/FormView.jsx b/packages/client/src/modules/common/components/crud/FormView.jsx
index 44389113d3..3d782869ea 100644
--- a/packages/client/src/modules/common/components/crud/FormView.jsx
+++ b/packages/client/src/modules/common/components/crud/FormView.jsx
@@ -4,7 +4,7 @@ import { Formik } from 'formik';
 
 import { onSubmit, mapFormPropsToValues } from '../../../../utils/crud';
 import { createFormFields } from '../../util';
-import { FormView, FormButton } from '../native';
+import { FormView, Button } from '../native';
 //import { minLength, required, validateForm } from '../../../../../../common/validation';
 
 //const formSchema = {
@@ -24,7 +24,7 @@ const Form = ({ schema, data: { node } }) => {
       render={({ handleChange, handleSubmit }) => (
         <FormView>
           {createFormFields({ handleChange, schema })}
-          <FormButton onPress={handleSubmit}>Save</FormButton>
+          <Button onPress={handleSubmit}>Save</Button>
         </FormView>
       )}
     />
diff --git a/packages/client/src/modules/common/components/crud/ListView.web.jsx b/packages/client/src/modules/common/components/crud/ListView.web.jsx
index 53c0fe1c0e..590c7ea1aa 100644
--- a/packages/client/src/modules/common/components/crud/ListView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/ListView.web.jsx
@@ -235,13 +235,19 @@ class ListView extends React.Component {
       customBatchFields === null
         ? false
         : customBatchFields && customBatchFields.role
-          ? hasRole(customBatchFields.role, currentUser) ? true : false
+          ? hasRole(customBatchFields.role, currentUser)
+            ? true
+            : false
           : true;
 
     const showCustomActions =
       customActions === null
         ? false
-        : customActions && customActions.role ? (hasRole(customActions.role, currentUser) ? true : false) : true;
+        : customActions && customActions.role
+          ? hasRole(customActions.role, currentUser)
+            ? true
+            : false
+          : true;
 
     const rowSelection = showBatchFields
       ? {

From 147b79dd1a1290c7c04073cce3370afa5a59e45c Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 11 May 2018 15:02:23 +0200
Subject: [PATCH 125/327] cleanup antd imports

---
 .../components/web/ui-antd/components/Icon.jsx     |  2 +-
 .../web/ui-antd/components/InputNumber.jsx         |  2 +-
 .../web/ui-antd/components/Popconfirm.jsx          |  2 +-
 .../web/ui-antd/components/RenderDate.jsx          | 12 +++++++++---
 .../web/ui-antd/components/RenderNumber.jsx        | 13 ++++++++++---
 .../web/ui-antd/components/RenderSelectCountry.jsx | 12 +++++++++---
 .../web/ui-antd/components/RenderSelectQuery.jsx   | 13 +++++++++----
 .../web/ui-antd/components/RenderTextArea.jsx      |  9 +++++++--
 .../components/web/ui-antd/components/SubMenu.jsx  |  2 +-
 .../components/web/ui-antd/components/Switch.jsx   |  2 +-
 packages/client/src/modules/common/util.web.jsx    | 14 +++++++++-----
 11 files changed, 58 insertions(+), 25 deletions(-)

diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/Icon.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/Icon.jsx
index 79f45655ea..c003d20354 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/Icon.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/Icon.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import ADIcon from 'antd/lib/icon';
+import { Icon as ADIcon } from 'antd';
 
 const Icon = ({ children, ...props }) => {
   return <ADIcon {...props}>{children}</ADIcon>;
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/InputNumber.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/InputNumber.jsx
index 844f79efc4..99482918ef 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/InputNumber.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/InputNumber.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import ADInputNumber from 'antd/lib/input-number';
+import { InputNumber as ADInputNumber } from 'antd';
 
 const InputNumber = ({ children, ...props }) => {
   return <ADInputNumber {...props}>{children}</ADInputNumber>;
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/Popconfirm.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/Popconfirm.jsx
index f24bf826cb..e2d9be04c6 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/Popconfirm.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/Popconfirm.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import ADPopconfirm from 'antd/lib/popconfirm';
+import { Popconfirm as ADPopconfirm } from 'antd';
 
 const Popconfirm = ({ children, ...props }) => {
   return <ADPopconfirm {...props}>{children}</ADPopconfirm>;
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderDate.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderDate.jsx
index 9208e728c1..5d75792113 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderDate.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderDate.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import DatePicker from 'antd/lib/date-picker';
+import { DatePicker } from 'antd';
 import moment from 'moment';
 import { FormItem } from './index';
 
@@ -18,7 +18,10 @@ export default class RenderDate extends React.Component {
   };
 
   handleChange = (date, dateString) => {
-    const { input: { name }, setFieldValue } = this.props;
+    const {
+      input: { name },
+      setFieldValue
+    } = this.props;
     //console.log('RenderDate: handleChange');
     //console.log('name:', name);
     //console.log('dateString:', dateString);
@@ -26,7 +29,10 @@ export default class RenderDate extends React.Component {
   };
 
   handleBlur = () => {
-    const { input: { name }, setFieldTouched } = this.props;
+    const {
+      input: { name },
+      setFieldTouched
+    } = this.props;
     setFieldTouched(name, true);
   };
 
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderNumber.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderNumber.jsx
index 36b90af2e2..162106cd49 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderNumber.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderNumber.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import DomainSchema from '@domain-schema/core';
-import InputNumber from 'antd/lib/input-number';
+import { InputNumber } from 'antd';
 
 import { FormItem } from './index';
 
@@ -18,7 +18,11 @@ export default class RenderNumber extends React.Component {
   };
 
   handleChange = value => {
-    const { input: { name }, setFieldValue, hasTypeOf } = this.props;
+    const {
+      input: { name },
+      setFieldValue,
+      hasTypeOf
+    } = this.props;
     //console.log('RenderInput: handleChange');
     //console.log('name:', name);
     if (hasTypeOf(Number)) {
@@ -30,7 +34,10 @@ export default class RenderNumber extends React.Component {
   };
 
   handleBlur = () => {
-    const { input: { name }, setFieldTouched } = this.props;
+    const {
+      input: { name },
+      setFieldTouched
+    } = this.props;
     setFieldTouched(name, true);
   };
 
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectCountry.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectCountry.jsx
index efb3519108..f53c1e500e 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectCountry.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectCountry.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import Select from 'antd/lib/select';
+import { Select } from 'antd';
 
 import countries from '../../../../../../../../common/ISOCountries';
 import { FormItem } from './index';
@@ -20,12 +20,18 @@ export default class RenderSelectCountry extends React.Component {
   };
 
   handleChange = value => {
-    const { input: { name }, setFieldValue } = this.props;
+    const {
+      input: { name },
+      setFieldValue
+    } = this.props;
     setFieldValue(name, value);
   };
 
   handleBlur = () => {
-    const { input: { name }, setFieldTouched } = this.props;
+    const {
+      input: { name },
+      setFieldTouched
+    } = this.props;
     setFieldTouched(name, true);
   };
 
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
index fdb3e84359..ab05468fed 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import Select from 'antd/lib/select';
-import Spin from 'antd/lib/spin';
+import { Select, Spin } from 'antd';
 import { pascalize, camelize } from 'humps';
 
 import { FormItem } from './index';
@@ -27,7 +26,10 @@ export default class RenderSelectQuery extends React.Component {
   };
 
   handleChange = value => {
-    const { input: { name }, setFieldValue } = this.props;
+    const {
+      input: { name },
+      setFieldValue
+    } = this.props;
     //console.log('RenderSelect: handleChange');
     //console.log('name:', name);
     //console.log('value:', value);
@@ -35,7 +37,10 @@ export default class RenderSelectQuery extends React.Component {
   };
 
   handleBlur = () => {
-    const { input: { name }, setFieldTouched } = this.props;
+    const {
+      input: { name },
+      setFieldTouched
+    } = this.props;
     setFieldTouched(name, true);
   };
 
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderTextArea.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderTextArea.jsx
index 7e4165c165..17ecfc0cf0 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderTextArea.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderTextArea.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import Input from 'antd/lib/input';
+import { Input } from 'antd';
 
 import { FormItem } from './index';
 
@@ -17,7 +17,12 @@ export default class RenderTextArea extends React.Component {
   };
 
   render() {
-    const { input, label, formItemLayout, meta: { touched, error } } = this.props;
+    const {
+      input,
+      label,
+      formItemLayout,
+      meta: { touched, error }
+    } = this.props;
 
     let validateStatus = '';
     if (touched && error) {
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/SubMenu.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/SubMenu.jsx
index 56e27564e0..413f7686fb 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/SubMenu.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/SubMenu.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import Menu from 'antd/lib/menu';
+import { Menu } from 'antd';
 
 const ADSubMenu = Menu.SubMenu;
 
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/Switch.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/Switch.jsx
index a9f891952d..4521fe5e8b 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/Switch.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/Switch.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import ADSwitch from 'antd/lib/switch';
+import { Switch as ADSwitch } from 'antd';
 
 const witch = ({ ...props }) => {
   return <ADSwitch {...props} />;
diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index 34fcae3493..fe67973099 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -5,9 +5,7 @@ import { startCase } from 'lodash';
 import { pascalize, camelize } from 'humps';
 import { Link } from 'react-router-dom';
 import { FieldArray } from 'formik';
-import Select from 'antd/lib/select';
-import DatePicker from 'antd/lib/date-picker';
-import Spin from 'antd/lib/spin';
+import { Select, DatePicker, Spin } from 'antd';
 import moment from 'moment';
 import DomainSchema from '@domain-schema/core';
 
@@ -165,7 +163,9 @@ export const createColumnFields = ({
             render: (text, record) =>
               customFields[key] && customFields[key]['render']
                 ? customFields[key]['render'](text, record)
-                : customFields[key] && customFields[key]['render'] ? customFields[key]['render'](text, record) : text
+                : customFields[key] && customFields[key]['render']
+                  ? customFields[key]['render'](text, record)
+                  : text
           });
         }
       }
@@ -188,7 +188,11 @@ export const createColumnFields = ({
   const showColumnActions =
     customActions === null
       ? false
-      : customActions && customActions.role ? (hasRole(customActions.role, currentUser) ? true : false) : true;
+      : customActions && customActions.role
+        ? hasRole(customActions.role, currentUser)
+          ? true
+          : false
+        : true;
 
   if (showColumnActions) {
     columns.push({

From 7f43356f56c637f716c8e22fd22b805c1ed74ac4 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 11 May 2018 16:18:08 +0200
Subject: [PATCH 126/327] small fixes

---
 packages/server/src/modules/user/scopes.js     | 3 ++-
 tools/templates/crud/database/seeds/_Module.js | 6 ++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/server/src/modules/user/scopes.js b/packages/server/src/modules/user/scopes.js
index f9f840334e..ac764b1571 100644
--- a/packages/server/src/modules/user/scopes.js
+++ b/packages/server/src/modules/user/scopes.js
@@ -1,4 +1,5 @@
 export default {
-  admin: ['user:*'],
+  admin: ['editor:*', 'user:*'],
+  editor: ['user:*'],
   user: ['user:view:self', 'user:update:self']
 };
diff --git a/tools/templates/crud/database/seeds/_Module.js b/tools/templates/crud/database/seeds/_Module.js
index 9747c2d0fb..72a4768df5 100644
--- a/tools/templates/crud/database/seeds/_Module.js
+++ b/tools/templates/crud/database/seeds/_Module.js
@@ -1,9 +1,7 @@
-import { truncateTables } from '../../sql/helpers';
+import { returnId, truncateTables } from '../../sql/helpers';
 
 export async function seed(knex, Promise) {
   await truncateTables(knex, Promise, ['$_module$']);
 
-  await knex('$_module$')
-    .returning('id')
-    .insert({ name: 'test' });
+  await returnId(knex('$_module$').insert({ name: 'test' }));
 }

From d7b67c0a2a1856b2b66bb414626c6e23d62b1c66 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 16 May 2018 15:32:01 +0200
Subject: [PATCH 127/327] make sort work for sqlite, sort dropdown by rank if
 exists, fix multi insert if new

---
 .../ui-antd/components/RenderSelectQuery.jsx  |  8 ++-
 packages/client/src/utils/crud.js             | 67 +++++++++++--------
 packages/server/src/sql/crud.js               | 30 +++++----
 3 files changed, 64 insertions(+), 41 deletions(-)

diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
index ab05468fed..e7cb41e814 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
@@ -72,11 +72,17 @@ export default class RenderSelectQuery extends React.Component {
     const camelizeSchemaName = camelize(schema.name);
     const pascalizeSchemaName = pascalize(schema.name);
     let column = 'name';
+    let orderBy = null;
     for (const remoteKey of schema.keys()) {
       const remoteValue = schema.values[remoteKey];
       if (remoteValue.sortBy) {
         column = remoteKey;
       }
+      if (remoteKey === 'rank') {
+        orderBy = {
+          column: 'rank'
+        };
+      }
     }
 
     const toString = schema.__.__toString ? schema.__.__toString : opt => opt[column];
@@ -104,7 +110,7 @@ export default class RenderSelectQuery extends React.Component {
     return (
       <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={error}>
         <div>
-          <Query limit={10} filter={{ searchText }}>
+          <Query limit={10} filter={{ searchText }} orderBy={orderBy}>
             {({ loading, data }) => {
               if (!loading || data) {
                 const options = data.edges
diff --git a/packages/client/src/utils/crud.js b/packages/client/src/utils/crud.js
index d7f8b23a0f..c3a15c5903 100644
--- a/packages/client/src/utils/crud.js
+++ b/packages/client/src/utils/crud.js
@@ -87,38 +87,51 @@ export const pickInputFields = ({ schema, values, data = null, formType = 'form'
           let update = [];
           let deleted = [];
 
-          data[key].forEach(item => {
-            keys1[item.id] = item;
-          });
-
-          values[key].forEach(item => {
-            keys2[item.id] = item;
-          });
-
-          data[key].forEach(item => {
-            const obj = keys2[item.id];
-            if (!obj) {
-              deleted.push({ id: item.id });
-            } else {
-              if (!isEqual(obj, item)) {
-                update.push({
-                  where: { id: obj.id },
-                  data: pickInputFields({ schema: value.type[0], values: obj, data: obj })
-                });
+          if (data && data.hasOwnProperty(key)) {
+            data[key].forEach(item => {
+              keys1[item.id] = item;
+            });
+          }
+
+          if (values && values.hasOwnProperty(key)) {
+            values[key].forEach(item => {
+              keys2[item.id] = item;
+            });
+          }
+
+          if (data && data.hasOwnProperty(key)) {
+            data[key].forEach(item => {
+              const obj = keys2[item.id];
+              if (!obj) {
+                deleted.push({ id: item.id });
+              } else {
+                if (!isEqual(obj, item)) {
+                  update.push({
+                    where: { id: obj.id },
+                    data: pickInputFields({ schema: value.type[0], values: obj, data: obj })
+                  });
+                }
+              }
+            });
+          }
+
+          if (values && values.hasOwnProperty(key)) {
+            values[key].forEach(item => {
+              if (!keys1[item.id]) {
+                create.push(pickInputFields({ schema: value.type[0], values: item, data: item }));
               }
-            }
-          });
-
-          values[key].forEach(item => {
-            if (!keys1[item.id]) {
-              create.push(pickInputFields({ schema: value.type[0], values: item, data: item }));
-            }
-          });
+            });
+          }
+
           //console.log('created: ', create);
           //console.log('updated: ', update);
           //console.log('deleted: ', deleted);
 
-          inputValues[key] = { create, update, delete: deleted };
+          if (data) {
+            inputValues[key] = { create, update, delete: deleted };
+          } else {
+            inputValues[key] = { create };
+          }
         }
       }
     }
diff --git a/packages/server/src/sql/crud.js b/packages/server/src/sql/crud.js
index 8a68981453..4d91f0d9be 100644
--- a/packages/server/src/sql/crud.js
+++ b/packages/server/src/sql/crud.js
@@ -580,7 +580,12 @@ export default class Crud {
     return knexnest(select(baseQuery));
   }
 
-  _getMany({ where: { id_in } }, info) {
+  _getMany(
+    {
+      where: { id_in }
+    },
+    info
+  ) {
     const baseQuery = knex(`${this.getFullTableName()} as ${this.getTableName()}`);
     const select = selectBy(this.schema, info);
 
@@ -612,6 +617,9 @@ export default class Crud {
         if (value.type.constructor === Array && data[key]) {
           nestedEntries.push({ key, data: data[key] });
           delete data[key];
+        } else if (key === 'rank') {
+          const total = await this.getTotal();
+          data[key] = total.count + 1;
         }
       }
 
@@ -717,14 +725,10 @@ export default class Crud {
   }
 
   _sort({ data }) {
-    return knex.raw(
-      `UPDATE ${this.getFullTableName()} t1
-JOIN ${this.getFullTableName()} t2
-ON t1.id = ? AND t2.id = ?
-  SET t1.rank = ?,
-  t2.rank = ? `,
-      data
-    );
+    return Promise.all([
+      this._update({ data: { rank: data[2] }, where: { id: data[0] } }),
+      this._update({ data: { rank: data[3] }, where: { id: data[1] } })
+    ]);
   }
 
   async sort(args) {
@@ -732,10 +736,10 @@ ON t1.id = ? AND t2.id = ?
       const e = new FieldError();
       e.throwIf();
 
-      const [sortCount] = await this._sort(args);
-
-      if (sortCount.affectedRows > 0) {
-        return { count: sortCount.affectedRows };
+      const sortCount = await this._sort(args);
+      const count = sortCount.reduce((total, num) => total + num);
+      if (count > 1) {
+        return { count };
       } else {
         e.setError('sort', 'Could not sort Node. Please try again later.');
         e.throwIf();

From 47812876a6c208e6230322d73be72d5b6667c910 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 17 May 2018 09:40:29 +0200
Subject: [PATCH 128/327] update domain-schema knex

---
 packages/server/package.json | 21 ++++-----------------
 yarn.lock                    |  6 +++---
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index e8994e8b99..3e8802e515 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -24,14 +24,8 @@
     "stripe:setup": "node src/server/modules/subscription/cli/stripeSetup"
   },
   "lint-staged": {
-    "*.{js,jsx,json}": [
-      "eslint --fix",
-      "git add"
-    ],
-    "*.graphql": [
-      "prettier --parser graphql --write",
-      "git add"
-    ]
+    "*.{js,jsx,json}": ["eslint --fix", "git add"],
+    "*.graphql": ["prettier --parser graphql --write", "git add"]
   },
   "repository": {
     "type": "git",
@@ -41,21 +35,14 @@
     "url": "https://github.com/sysgears/apollo-universal-starter-kit/issues"
   },
   "homepage": "https://github.com/sysgears/apollo-universal-starter-kit",
-  "keywords": [
-    "apollo",
-    "universal",
-    "starter",
-    "graphql",
-    "react",
-    "redux"
-  ],
+  "keywords": ["apollo", "universal", "starter", "graphql", "react", "redux"],
   "author": "SysGears INC",
   "license": "MIT",
   "dependencies": {
     "@domain-schema/core": "^0.0.30",
     "@domain-schema/formik": "^0.0.30",
     "@domain-schema/graphql": "^0.0.30",
-    "@domain-schema/knex": "^0.0.30",
+    "@domain-schema/knex": "^0.0.31",
     "@domain-schema/validation": "^0.0.32",
     "apollo-cache-inmemory": "^1.1.12",
     "apollo-cache-router": "^1.1.0",
diff --git a/yarn.lock b/yarn.lock
index 76c1a85773..62f3f919f4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -538,9 +538,9 @@
   dependencies:
     debug "^3.1.0"
 
-"@domain-schema/knex@^0.0.30":
-  version "0.0.30"
-  resolved "https://registry.yarnpkg.com/@domain-schema/knex/-/knex-0.0.30.tgz#ceea5d0b5a79a9b7fbf2bd64374252ef9279dcb9"
+"@domain-schema/knex@^0.0.31":
+  version "0.0.31"
+  resolved "https://registry.yarnpkg.com/@domain-schema/knex/-/knex-0.0.31.tgz#afbbb0705751745a781293217529a2f8269dcfbc"
   dependencies:
     debug "^3.1.0"
     humps "^2.0.1"

From 3b504e4dffd2320a8e4a26ad2aca071d2aa271ed Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 17 May 2018 11:42:54 +0200
Subject: [PATCH 129/327] small fixes

---
 packages/client/package.json                  |  2 +-
 .../client/src/modules/common/util.web.jsx    | 28 +++++++++++--------
 packages/mobile/package.json                  | 13 ++-------
 packages/server/package.json                  |  4 +--
 .../crud/client/containers/ModuleList.jsx     | 22 +++++++++++----
 yarn.lock                                     |  8 +++---
 6 files changed, 43 insertions(+), 34 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index 8b0537304a..70ececc976 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -53,7 +53,7 @@
     "filesize": "^3.5.11",
     "formik": "^0.11.10",
     "graphql": "0.13.0",
-    "graphql-iso-date": "^3.3.0",
+    "graphql-iso-date": "^3.5.0",
     "graphql-tag": "^2.6.0",
     "history": "^4.7.2",
     "humps": "^2.0.1",
diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index fe67973099..0f844888b7 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -1,7 +1,7 @@
 /* eslint-disable react/display-name */
 import React from 'react';
 import PropTypes from 'prop-types';
-import { startCase } from 'lodash';
+import { startCase, round } from 'lodash';
 import { pascalize, camelize } from 'humps';
 import { Link } from 'react-router-dom';
 import { FieldArray } from 'formik';
@@ -137,16 +137,22 @@ export const createColumnFields = ({
             fixed: customFields[key] && customFields[key]['fixed'] ? customFields[key]['fixed'] : null,
             width: customFields[key] && customFields[key]['width'] ? customFields[key]['width'] : null,
             align: customFields[key] && customFields[key]['align'] ? customFields[key]['align'] : null,
-            render: (text, record) => (
-              <EditableCell
-                value={text}
-                hasTypeOf={hasTypeOf}
-                role={customFields[key] && customFields[key]['editRole'] ? customFields[key]['editRole'] : null}
-                currentUser={currentUser}
-                render={customFields[key] && customFields[key]['render'] ? customFields[key]['render'] : text => text}
-                onChange={onCellChange(key, record.id, hendleUpdate)}
-              />
-            )
+            render: (text, record) => {
+              let formatedText = text => text;
+              if (value.fieldInput === 'price') {
+                formatedText = text => (text > 0 ? `${round(text, 2).toFixed(2)} €` : '');
+              }
+              return (
+                <EditableCell
+                  value={text}
+                  hasTypeOf={hasTypeOf}
+                  role={customFields[key] && customFields[key]['editRole'] ? customFields[key]['editRole'] : null}
+                  currentUser={currentUser}
+                  render={customFields[key] && customFields[key]['render'] ? customFields[key]['render'] : formatedText}
+                  onChange={onCellChange(key, record.id, hendleUpdate)}
+                />
+              );
+            }
           });
         } else if (value.type.constructor !== Array) {
           columns.push({
diff --git a/packages/mobile/package.json b/packages/mobile/package.json
index e227b3753d..cc25f5e718 100644
--- a/packages/mobile/package.json
+++ b/packages/mobile/package.json
@@ -29,14 +29,7 @@
     "url": "https://github.com/sysgears/apollo-universal-starter-kit/issues"
   },
   "homepage": "https://github.com/sysgears/apollo-universal-starter-kit",
-  "keywords": [
-    "apollo",
-    "universal",
-    "starter",
-    "graphql",
-    "react",
-    "redux"
-  ],
+  "keywords": ["apollo", "universal", "starter", "graphql", "react", "redux"],
   "author": "SysGears INC",
   "license": "MIT",
   "dependencies": {
@@ -55,7 +48,7 @@
     "extract-files": "^3.1.0",
     "filesize": "^3.5.11",
     "graphql": "0.13.0",
-    "graphql-iso-date": "^3.3.0",
+    "graphql-iso-date": "^3.5.0",
     "graphql-tag": "^2.6.0",
     "i18next": "^11.2.3",
     "immutability-helper": "^2.6.2",
@@ -164,4 +157,4 @@
   "peerDependencies": {
     "spinjs": "^0.4.0"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/server/package.json b/packages/server/package.json
index 3e8802e515..937500eb9a 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -42,7 +42,7 @@
     "@domain-schema/core": "^0.0.30",
     "@domain-schema/formik": "^0.0.30",
     "@domain-schema/graphql": "^0.0.30",
-    "@domain-schema/knex": "^0.0.31",
+    "@domain-schema/knex": "^0.0.33",
     "@domain-schema/validation": "^0.0.32",
     "apollo-cache-inmemory": "^1.1.12",
     "apollo-cache-router": "^1.1.0",
@@ -68,7 +68,7 @@
     "filesize": "^3.5.11",
     "graphql": "0.13.0",
     "graphql-auth": "0.2.2",
-    "graphql-iso-date": "^3.3.0",
+    "graphql-iso-date": "^3.5.0",
     "graphql-parse-fields": "^1.2.0",
     "graphql-resolve-batch": "^1.0.2",
     "graphql-subscriptions": "^0.5.5",
diff --git a/tools/templates/crud/client/containers/ModuleList.jsx b/tools/templates/crud/client/containers/ModuleList.jsx
index acac907cd9..e6d0c1e0ba 100644
--- a/tools/templates/crud/client/containers/ModuleList.jsx
+++ b/tools/templates/crud/client/containers/ModuleList.jsx
@@ -61,7 +61,9 @@ export default compose(
     props: ({ ownProps: { refetch }, mutate }) => ({
       updateEntry: async (data, where) => {
         try {
-          const { data: { update$Module$ } } = await mutate({
+          const {
+            data: { update$Module$ }
+          } = await mutate({
             variables: { data, where }
           });
 
@@ -80,7 +82,9 @@ export default compose(
     props: ({ ownProps: { refetch }, mutate }) => ({
       deleteEntry: async where => {
         try {
-          const { data: { delete$Module$ } } = await mutate({
+          const {
+            data: { delete$Module$ }
+          } = await mutate({
             variables: { where }
           });
 
@@ -99,7 +103,9 @@ export default compose(
     props: ({ ownProps: { refetch }, mutate }) => ({
       sortEntries: async data => {
         try {
-          const { data: { sort$Module$s } } = await mutate({
+          const {
+            data: { sort$Module$s }
+          } = await mutate({
             variables: { data }
           });
 
@@ -118,7 +124,9 @@ export default compose(
     props: ({ ownProps: { refetch }, mutate }) => ({
       deleteManyEntries: async where => {
         try {
-          const { data: { deleteMany$Module$s } } = await mutate({
+          const {
+            data: { deleteMany$Module$s }
+          } = await mutate({
             variables: { where }
           });
 
@@ -137,8 +145,10 @@ export default compose(
     props: ({ ownProps: { refetch }, mutate }) => ({
       updateManyEntries: async (data, where) => {
         try {
-          const { data: { updateMany$Module$s } } = await mutate({
-            variables: { data, where }
+          const {
+            data: { updateMany$Module$s }
+          } = await mutate({
+            variables: { data: removeEmpty(data), where }
           });
 
           if (updateMany$Module$s.errors) {
diff --git a/yarn.lock b/yarn.lock
index 62f3f919f4..2fe025cbf8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -538,9 +538,9 @@
   dependencies:
     debug "^3.1.0"
 
-"@domain-schema/knex@^0.0.31":
-  version "0.0.31"
-  resolved "https://registry.yarnpkg.com/@domain-schema/knex/-/knex-0.0.31.tgz#afbbb0705751745a781293217529a2f8269dcfbc"
+"@domain-schema/knex@^0.0.33":
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/@domain-schema/knex/-/knex-0.0.33.tgz#0b7c1d0d25697a73bd845f67ae87b3a18c3f8fd1"
   dependencies:
     debug "^3.1.0"
     humps "^2.0.1"
@@ -6289,7 +6289,7 @@ graphql-extensions@^0.0.x, graphql-extensions@~0.0.9:
     core-js "^2.5.3"
     source-map-support "^0.5.1"
 
-graphql-iso-date@^3.3.0:
+graphql-iso-date@^3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/graphql-iso-date/-/graphql-iso-date-3.5.0.tgz#55a1be0efa8d28c1453afd2eb5ce1d052189a513"
 

From b6eaa783ff1b2fa95c5f503c8a4dc522fa64e718 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 17 May 2018 12:09:46 +0200
Subject: [PATCH 130/327] update domain-schema validation

---
 packages/client/package.json | 2 +-
 packages/server/package.json | 2 +-
 yarn.lock                    | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index 70ececc976..f59367a605 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -31,7 +31,7 @@
   "license": "MIT",
   "dependencies": {
     "@domain-schema/core": "^0.0.30",
-    "@domain-schema/validation": "^0.0.32",
+    "@domain-schema/validation": "^0.0.33",
     "@fortawesome/fontawesome": "^1.1.3",
     "@fortawesome/fontawesome-free-brands": "^5.0.6",
     "@fortawesome/react-fontawesome": "0.0.18",
diff --git a/packages/server/package.json b/packages/server/package.json
index 937500eb9a..8cade3d778 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -43,7 +43,7 @@
     "@domain-schema/formik": "^0.0.30",
     "@domain-schema/graphql": "^0.0.30",
     "@domain-schema/knex": "^0.0.33",
-    "@domain-schema/validation": "^0.0.32",
+    "@domain-schema/validation": "^0.0.33",
     "apollo-cache-inmemory": "^1.1.12",
     "apollo-cache-router": "^1.1.0",
     "apollo-client": "^2.3.1",
diff --git a/yarn.lock b/yarn.lock
index 2fe025cbf8..08a7b793b3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -545,9 +545,9 @@
     debug "^3.1.0"
     humps "^2.0.1"
 
-"@domain-schema/validation@^0.0.32":
-  version "0.0.32"
-  resolved "https://registry.yarnpkg.com/@domain-schema/validation/-/validation-0.0.32.tgz#3f452b6063d4764b0c369d13eadff0f69bf74a04"
+"@domain-schema/validation@^0.0.33":
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/@domain-schema/validation/-/validation-0.0.33.tgz#f4e83e2abe249cea2f83762d01c065a3132f4a2f"
   dependencies:
     debug "^3.1.0"
 

From 4fe0167572c6f2d10c5cac4e8f35d37db301ab5a Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 17 May 2018 21:45:08 +0200
Subject: [PATCH 131/327] fix __toString and rank in table, fix removeEmpty if
 key is schema

---
 .../client/src/modules/common/util.web.jsx    | 20 +++++++++++++------
 packages/common/utils.js                      | 20 ++++++++++++++++---
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index 0f844888b7..7fc1e434df 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -69,13 +69,14 @@ export const createColumnFields = ({
         if (value.type.isSchema) {
           //console.log(value.type);
 
-          let sortBy = 'name';
+          let column = 'name';
           for (const remoteKey of value.type.keys()) {
             const remoteValue = value.type.values[remoteKey];
             if (remoteValue.sortBy) {
-              sortBy = remoteKey;
+              column = remoteKey;
             }
           }
+          const toString = value.type.__.__toString ? value.type.__.__toString : opt => opt[column];
           columns.push({
             title: (
               <a onClick={e => orderBy(e, key)} href="#">
@@ -101,7 +102,7 @@ export const createColumnFields = ({
                   render={
                     customFields[key] && customFields[key]['render']
                       ? customFields[key]['render']
-                      : text => (text && text[sortBy] ? text[sortBy] : '')
+                      : text => (text && text[column] ? toString(text) : '')
                   }
                   onChange={onCellChange(`${key}Id`, record.id, hendleUpdate)}
                 />
@@ -611,25 +612,32 @@ class EditableCell extends React.Component {
         const camelizeSchemaName = camelize(schema.name);
         const pascalizeSchemaName = pascalize(schema.name);
         let column = 'name';
+        let orderBy = null;
         for (const remoteKey of schema.keys()) {
           const remoteValue = schema.values[remoteKey];
           if (remoteValue.sortBy) {
             column = remoteKey;
           }
+          if (remoteKey === 'rank') {
+            orderBy = {
+              column: 'rank'
+            };
+          }
         }
+        const toString = schema.__.__toString ? schema.__.__toString : opt => opt[column];
         let formatedValue = { key: value.id.toString(), label: value.name ? value.name : value[column] };
         //console.log('formatedValue:', formatedValue);
         // eslint-disable-next-line import/no-dynamic-require
         const Query = require(`../${camelizeSchemaName}/containers/${pascalizeSchemaName}Query`)['default'];
 
         input = (
-          <Query limit={10} filter={{ searchText }}>
+          <Query limit={10} filter={{ searchText }} orderBy={orderBy}>
             {({ loading, data }) => {
               if (!loading || data) {
                 const options = data.edges
                   ? data.edges.map(opt => (
                       <Option key={opt.id} value={opt.id.toString()}>
-                        {opt[column]}
+                        {toString(opt)}
                       </Option>
                     ))
                   : null;
@@ -649,7 +657,7 @@ class EditableCell extends React.Component {
                       if (!dirty) {
                         options.unshift(
                           <Option key={value.id} value={value.id.toString()}>
-                            {value[column]}
+                            {toString(value)}
                           </Option>
                         );
                       } else {
diff --git a/packages/common/utils.js b/packages/common/utils.js
index ea254a2744..4711f8c689 100644
--- a/packages/common/utils.js
+++ b/packages/common/utils.js
@@ -31,13 +31,27 @@ export const traceMethodCalls = obj => {
   });
 };
 
-export const removeEmpty = obj =>
-  Object.keys(obj)
-    .filter(key => obj[key] !== '')
+const removeBySchema = (key, obj, schema) => {
+  if (schema === null) {
+    return obj[key] !== '';
+  } else {
+    const schemaKey = key.endsWith('Id') ? key.substring(0, key.length - 2) : key;
+    if (schema.values[schemaKey].type.isSchema) {
+      return obj[key] !== '' && obj[key] !== 0;
+    } else {
+      return obj[key] !== '';
+    }
+  }
+};
+
+export const removeEmpty = (obj, schema = null) => {
+  return Object.keys(obj)
+    .filter(key => removeBySchema(key, obj, schema))
     .reduce((redObj, key) => {
       redObj[key] = obj[key];
       return redObj;
     }, {});
+};
 
 export const add3Dots = (string, limit) => {
   const dots = '...';

From 3c9bc4e2941c079304d971dc274ada095b2097af Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 17 May 2018 22:21:33 +0200
Subject: [PATCH 132/327] switch user role to editor

---
 packages/server/src/database/seeds/002_user.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/database/seeds/002_user.js b/packages/server/src/database/seeds/002_user.js
index 2f77a6fc51..0f6d98a84b 100644
--- a/packages/server/src/database/seeds/002_user.js
+++ b/packages/server/src/database/seeds/002_user.js
@@ -16,7 +16,7 @@ export async function seed(knex, Promise) {
     username: 'user',
     email: 'user@example.com',
     password_hash: await bcrypt.hash('user1234', 12),
-    role: 'user',
+    role: 'editor',
     is_active: true
   });
 }

From 21b239b0ab9da6180cb2ab4edc360ea276f2396d Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 17 May 2018 22:39:56 +0200
Subject: [PATCH 133/327] fix scopes

---
 packages/server/src/modules/user/scopes.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/modules/user/scopes.js b/packages/server/src/modules/user/scopes.js
index ac764b1571..24c0ee1d4b 100644
--- a/packages/server/src/modules/user/scopes.js
+++ b/packages/server/src/modules/user/scopes.js
@@ -1,5 +1,5 @@
 export default {
-  admin: ['editor:*', 'user:*'],
-  editor: ['user:*'],
+  admin: ['admin:*', 'editor:*', 'user:*'],
+  editor: ['editor:*', 'user:*'],
   user: ['user:view:self', 'user:update:self']
 };

From 9fc1eb7abfd89b982af7da57b597c6379900f018 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 22 May 2018 10:26:09 +0200
Subject: [PATCH 134/327] fix for selecting item that is related to same table

---
 packages/server/src/sql/helpers.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/server/src/sql/helpers.js b/packages/server/src/sql/helpers.js
index a68e0ea482..87013f1a84 100644
--- a/packages/server/src/sql/helpers.js
+++ b/packages/server/src/sql/helpers.js
@@ -54,12 +54,10 @@ const _getSelectFields = (fields, parentPath, domainSchema, selectItems, joinNam
           continue;
         }
         const as = parentPath.length > 0 ? `${parentPath.join('_')}_${key}` : key;
+        const tableName = `${decamelize(domainSchema.__.tableName ? domainSchema.__.tableName : domainSchema.name)}`;
+        const fullTableName = parentPath.length > 0 ? `${parentPath.join('_')}_${tableName}` : tableName;
         const arrayPrefix = single ? '' : '_';
-        selectItems.push(
-          `${decamelize(domainSchema.__.tableName ? domainSchema.__.tableName : domainSchema.name)}.${decamelize(
-            key
-          )} as ${arrayPrefix}${as}`
-        );
+        selectItems.push(`${fullTableName}.${decamelize(key)} as ${arrayPrefix}${as}`);
       } else {
         if (value.type.constructor === Array) {
           //console.log('Array');
@@ -97,7 +95,7 @@ export const selectBy = (schema, fields, single = false) => {
   return query => {
     // join table names
     joinNames.map(({ key, prefix, name, schemaName }) => {
-      query.leftJoin(`${prefix}${name} as ${name}`, `${name}.id`, `${schemaName}.${key}_id`);
+      query.leftJoin(`${prefix}${name} as ${key}_${name}`, `${key}_${name}.id`, `${schemaName}.${key}_id`);
     });
 
     return query.select(selectItems);

From 3b4979469c57a93fea1d20f17d2312cf9b369023 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 22 May 2018 10:36:10 +0200
Subject: [PATCH 135/327] update packages for domain-schema

---
 packages/client/package.json | 2 +-
 packages/server/package.json | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index 593f7c7bd2..eb79afde78 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -30,7 +30,7 @@
   "author": "SysGears INC",
   "license": "MIT",
   "dependencies": {
-    "@domain-schema/core": "^0.0.30",
+    "@domain-schema/core": "^0.0.33",
     "@domain-schema/validation": "^0.0.33",
     "@fortawesome/fontawesome": "^1.1.3",
     "@fortawesome/fontawesome-free-brands": "^5.0.6",
diff --git a/packages/server/package.json b/packages/server/package.json
index 6de1ae976a..3fb4d73da2 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -39,10 +39,10 @@
   "author": "SysGears INC",
   "license": "MIT",
   "dependencies": {
-    "@domain-schema/core": "^0.0.30",
-    "@domain-schema/formik": "^0.0.30",
-    "@domain-schema/graphql": "^0.0.30",
-    "@domain-schema/knex": "^0.0.33",
+    "@domain-schema/core": "^0.0.33",
+    "@domain-schema/formik": "^0.0.33",
+    "@domain-schema/graphql": "^0.0.33",
+    "@domain-schema/knex": "^0.0.34",
     "@domain-schema/validation": "^0.0.33",
     "apollo-cache-inmemory": "^1.1.12",
     "apollo-cache-router": "^1.1.0",

From f27afc66cf486603435c7a6f4ee6ccac4d3e1efb Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 22 May 2018 10:44:31 +0200
Subject: [PATCH 136/327] run yarn

---
 yarn.lock | 53 ++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 38 insertions(+), 15 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index d192bff4fc..87c9a256f6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -548,27 +548,31 @@
     lodash "^4.17.5"
     to-fast-properties "^2.0.0"
 
-"@domain-schema/core@^0.0.30":
-  version "0.0.30"
-  resolved "https://registry.yarnpkg.com/@domain-schema/core/-/core-0.0.30.tgz#53ed07001ed364afef0852aad3683adfbfb89d94"
+"@domain-schema/core@^0.0.33":
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/@domain-schema/core/-/core-0.0.33.tgz#c84c9ad5e14eca488376525138c0fdaf1df3dce6"
   dependencies:
     debug "^3.1.0"
 
-"@domain-schema/formik@^0.0.30":
-  version "0.0.30"
-  resolved "https://registry.yarnpkg.com/@domain-schema/formik/-/formik-0.0.30.tgz#99d086f0c908a88554e350f4827e3bac34297db0"
+"@domain-schema/formik@^0.0.33":
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/@domain-schema/formik/-/formik-0.0.33.tgz#76d223f897d98cffef8930262c987a0c485e2a29"
   dependencies:
     debug "^3.1.0"
+    formik "^0.11.11"
+  optionalDependencies:
+    react-test-renderer "^16.2.0"
+    reactstrap "^6.0.1"
 
-"@domain-schema/graphql@^0.0.30":
-  version "0.0.30"
-  resolved "https://registry.yarnpkg.com/@domain-schema/graphql/-/graphql-0.0.30.tgz#27daaca798ffe889daac642c45ffa110b27a6429"
+"@domain-schema/graphql@^0.0.33":
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/@domain-schema/graphql/-/graphql-0.0.33.tgz#201d8cc5d21a9eba69f2eb8cb1fe44f012381cec"
   dependencies:
     debug "^3.1.0"
 
-"@domain-schema/knex@^0.0.33":
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/@domain-schema/knex/-/knex-0.0.33.tgz#0b7c1d0d25697a73bd845f67ae87b3a18c3f8fd1"
+"@domain-schema/knex@^0.0.34":
+  version "0.0.34"
+  resolved "https://registry.yarnpkg.com/@domain-schema/knex/-/knex-0.0.34.tgz#61019e9b3668c6274b7dd59684a2911f8386a19c"
   dependencies:
     debug "^3.1.0"
     humps "^2.0.1"
@@ -6002,7 +6006,7 @@ formidable@^1.1.1, formidable@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.2.1.tgz#70fb7ca0290ee6ff961090415f4b3df3d2082659"
 
-formik@^0.11.10:
+formik@^0.11.10, formik@^0.11.11:
   version "0.11.11"
   resolved "https://registry.yarnpkg.com/formik/-/formik-0.11.11.tgz#4b02838133c0196b1ef443aa973766cd097ec4a5"
   dependencies:
@@ -10265,7 +10269,7 @@ pool2@^1.1.0:
     hashmap "^2.0.1"
     simple-backoff "^1.0.0"
 
-popper.js@^1.12.9:
+popper.js@^1.12.9, popper.js@^1.14.1:
   version "1.14.3"
   resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.3.tgz#1438f98d046acf7b4d78cd502bf418ac64d4f095"
 
@@ -11687,6 +11691,13 @@ react-navigation@^2.0.0:
     react-navigation-deprecated-tab-navigator "1.2.0"
     react-navigation-tabs "0.2.0"
 
+react-popper@^0.10.4:
+  version "0.10.4"
+  resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-0.10.4.tgz#af2a415ea22291edd504678d7afda8a6ee3295aa"
+  dependencies:
+    popper.js "^1.14.1"
+    prop-types "^15.6.1"
+
 react-popper@^0.8.3:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-0.8.3.tgz#0f73333137c9fb0af6ec4074d2d0585a0a0461e1"
@@ -11803,7 +11814,7 @@ react-transform-hmr@^1.0.4:
     global "^4.3.0"
     react-proxy "^1.1.7"
 
-react-transition-group@^2.2.1, react-transition-group@^2.3.0-beta.0:
+react-transition-group@^2.2.1, react-transition-group@^2.3.0-beta.0, react-transition-group@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.3.1.tgz#31d611b33e143a5e0f2d94c348e026a0f3b474b6"
   dependencies:
@@ -11848,6 +11859,18 @@ reactstrap@^5.0.0-beta:
     react-popper "^0.8.3"
     react-transition-group "^2.2.1"
 
+reactstrap@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/reactstrap/-/reactstrap-6.0.1.tgz#944984ee8dc684c7dc09b8de9b722153a1ca7e95"
+  dependencies:
+    classnames "^2.2.3"
+    lodash.isfunction "^3.0.9"
+    lodash.isobject "^3.0.2"
+    lodash.tonumber "^4.0.3"
+    prop-types "^15.5.8"
+    react-popper "^0.10.4"
+    react-transition-group "^2.3.1"
+
 read-chunk@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/read-chunk/-/read-chunk-2.1.0.tgz#6a04c0928005ed9d42e1a6ac5600e19cbc7ff655"

From 25817942127e737dd070220de4918080d664e44b Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 22 May 2018 11:02:47 +0200
Subject: [PATCH 137/327] fix column as param

---
 packages/server/src/sql/helpers.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/server/src/sql/helpers.js b/packages/server/src/sql/helpers.js
index 87013f1a84..8577979e3b 100644
--- a/packages/server/src/sql/helpers.js
+++ b/packages/server/src/sql/helpers.js
@@ -45,7 +45,7 @@ export const orderedForArray = (rows, collection, field, arrayElement) => {
   });
 };
 
-const _getSelectFields = (fields, parentPath, domainSchema, selectItems, joinNames, single) => {
+const _getSelectFields = (fields, parentPath, parentKey, domainSchema, selectItems, joinNames, single) => {
   for (const key of Object.keys(fields)) {
     if (key !== '__typename') {
       const value = domainSchema.values[key];
@@ -55,9 +55,9 @@ const _getSelectFields = (fields, parentPath, domainSchema, selectItems, joinNam
         }
         const as = parentPath.length > 0 ? `${parentPath.join('_')}_${key}` : key;
         const tableName = `${decamelize(domainSchema.__.tableName ? domainSchema.__.tableName : domainSchema.name)}`;
-        const fullTableName = parentPath.length > 0 ? `${parentPath.join('_')}_${tableName}` : tableName;
+        const fullTableName = parentKey !== null && parentKey !== tableName ? `${parentKey}_${tableName}` : tableName;
         const arrayPrefix = single ? '' : '_';
-        selectItems.push(`${fullTableName}.${decamelize(key)} as ${arrayPrefix}${as}`);
+        selectItems.push(`${decamelize(fullTableName)}.${decamelize(key)} as ${arrayPrefix}${as}`);
       } else {
         if (value.type.constructor === Array) {
           //console.log('Array');
@@ -76,7 +76,7 @@ const _getSelectFields = (fields, parentPath, domainSchema, selectItems, joinNam
 
           parentPath.push(key);
 
-          _getSelectFields(fields[key], parentPath, value.type, selectItems, joinNames, single);
+          _getSelectFields(fields[key], parentPath, decamelize(key), value.type, selectItems, joinNames, single);
 
           parentPath.pop();
         }
@@ -90,12 +90,13 @@ export const selectBy = (schema, fields, single = false) => {
   const parentPath = [];
   const selectItems = [];
   const joinNames = [];
-  _getSelectFields(fields, parentPath, schema, selectItems, joinNames, single);
+  _getSelectFields(fields, parentPath, null, schema, selectItems, joinNames, single);
 
   return query => {
     // join table names
     joinNames.map(({ key, prefix, name, schemaName }) => {
-      query.leftJoin(`${prefix}${name} as ${key}_${name}`, `${key}_${name}.id`, `${schemaName}.${key}_id`);
+      const tableName = key !== null && key !== name ? `${key}_${name}` : name;
+      query.leftJoin(`${prefix}${name} as ${tableName}`, `${tableName}.id`, `${schemaName}.${key}_id`);
     });
 
     return query.select(selectItems);

From 158b55e5737e0a03e75e6e48d680c46c7ece7ad0 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 23 May 2018 14:09:34 +0200
Subject: [PATCH 138/327] Refactor ListView.web.jsx, to allow notifications on
 delete and update actions.

---
 .../common/components/crud/ListView.jsx       |  2 +-
 .../common/components/crud/ListView.web.jsx   | 32 +++++++++++----
 .../web/ui-antd/components/Alert.jsx          |  2 +-
 .../web/ui-antd/components/Form.jsx           |  3 +-
 .../web/ui-antd/components/Spin.jsx           | 13 ++++++
 .../web/ui-antd/components/index.js           |  1 +
 packages/client/src/modules/common/crud.js    | 41 +++++++++++++++++++
 .../crud/client/containers/ModuleList.jsx     | 41 +++----------------
 8 files changed, 88 insertions(+), 47 deletions(-)
 create mode 100644 packages/client/src/modules/common/components/web/ui-antd/components/Spin.jsx
 create mode 100644 packages/client/src/modules/common/crud.js

diff --git a/packages/client/src/modules/common/components/crud/ListView.jsx b/packages/client/src/modules/common/components/crud/ListView.jsx
index 647be348d4..2e46557c1e 100644
--- a/packages/client/src/modules/common/components/crud/ListView.jsx
+++ b/packages/client/src/modules/common/components/crud/ListView.jsx
@@ -23,7 +23,7 @@ class ListView extends React.PureComponent {
         onPress={() => navigation.navigate(nativeLink, { id })}
         right={{
           text: 'Delete',
-          onPress: () => deleteEntry(id)
+          onPress: () => deleteEntry({ where: id })
         }}
       >
         {name}
diff --git a/packages/client/src/modules/common/components/crud/ListView.web.jsx b/packages/client/src/modules/common/components/crud/ListView.web.jsx
index 590c7ea1aa..53341ca1ee 100644
--- a/packages/client/src/modules/common/components/crud/ListView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/ListView.web.jsx
@@ -5,7 +5,7 @@ import { Link } from 'react-router-dom';
 import { Formik } from 'formik';
 import { DragDropContext, DragSource, DropTarget } from 'react-dnd';
 import HTML5Backend from 'react-dnd-html5-backend';
-import { Table, Button, Popconfirm, Row, Col, Form, FormItem } from '../web';
+import { Table, Button, Popconfirm, Row, Col, Form, FormItem, Alert, Spin } from '../web';
 import { createColumnFields, createFormFields } from '../../util';
 import { mapFormPropsToValues, pickInputFields } from '../../../../utils/crud';
 import { hasRole } from '../../../user/containers/Auth';
@@ -122,7 +122,10 @@ class ListView extends React.Component {
 
   state = {
     selectedRowKeys: [],
-    loading: false
+    loading: false,
+    wait: false,
+    error: null,
+    success: null
   };
 
   components = {
@@ -163,14 +166,26 @@ class ListView extends React.Component {
     }
   };
 
-  hendleUpdate = (data, id) => {
+  hendleUpdate = async (data, id) => {
     const { updateEntry } = this.props;
-    updateEntry(data, { id });
+    this.setState({ wait: true, error: null, success: null });
+    const result = await updateEntry({ data, where: { id } });
+    if (result && result.error) {
+      this.setState({ wait: false, error: result.error, success: null });
+    } else {
+      this.setState({ wait: false, error: null, success: 'Successfully updated entry.' });
+    }
   };
 
-  hendleDelete = id => {
+  hendleDelete = async id => {
     const { deleteEntry } = this.props;
-    deleteEntry({ id });
+    this.setState({ wait: true, error: null, success: null });
+    const result = await deleteEntry({ where: { id } });
+    if (result && result.error) {
+      this.setState({ wait: false, error: result.error, success: null });
+    } else {
+      this.setState({ wait: false, error: null, success: 'Successfully deleted entry.' });
+    }
   };
 
   onCellChange = (key, id, updateEntry) => {
@@ -228,7 +243,7 @@ class ListView extends React.Component {
       updateManyEntries,
       tableScroll = null
     } = this.props;
-    const { selectedRowKeys } = this.state;
+    const { selectedRowKeys, wait, error, success } = this.state;
     const hasSelected = selectedRowKeys.length > 0;
 
     const showBatchFields =
@@ -379,6 +394,9 @@ class ListView extends React.Component {
 
     return (
       <div>
+        {wait && <Spin size="small" />}
+        {error && <Alert color="error" message={error} />}
+        {success && <Alert color="success" message={success} />}
         <Table {...tableProps} />
         {data && this.renderLoadMore(data, loadMoreRows)}
       </div>
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/Alert.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/Alert.jsx
index 535066856f..2121bc2795 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/Alert.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/Alert.jsx
@@ -8,7 +8,7 @@ const Alert = ({ children, color, ...props }) => {
 
 Alert.propTypes = {
   children: PropTypes.node,
-  color: PropTypes.String
+  color: PropTypes.string
 };
 
 export default Alert;
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/Form.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/Form.jsx
index 3c0b14a42c..c9c0f3bd07 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/Form.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/Form.jsx
@@ -7,8 +7,7 @@ const Form = ({ children, ...props }) => {
 };
 
 Form.propTypes = {
-  children: PropTypes.node,
-  type: PropTypes.string
+  children: PropTypes.node
 };
 
 export default Form;
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/Spin.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/Spin.jsx
new file mode 100644
index 0000000000..14451124c2
--- /dev/null
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/Spin.jsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Spin as ADSpin } from 'antd';
+
+const Form = ({ children, ...props }) => {
+  return <ADSpin {...props}>{children}</ADSpin>;
+};
+
+Form.propTypes = {
+  children: PropTypes.node
+};
+
+export default Form;
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/index.js b/packages/client/src/modules/common/components/web/ui-antd/components/index.js
index 9039cca109..989ab72ba9 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/index.js
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/index.js
@@ -21,6 +21,7 @@ export { default as RenderSelectQuery } from './RenderSelectQuery';
 export { default as RenderCheckBox } from './RenderCheckBox';
 export { default as RenderSwitch } from './RenderSwitch';
 export { default as Alert } from './Alert';
+export { default as Spin } from './Spin';
 export { default as Container } from './Container';
 export { default as Row } from './Row';
 export { default as Col } from './Col';
diff --git a/packages/client/src/modules/common/crud.js b/packages/client/src/modules/common/crud.js
new file mode 100644
index 0000000000..90b70f8660
--- /dev/null
+++ b/packages/client/src/modules/common/crud.js
@@ -0,0 +1,41 @@
+export const updateEntry = async ({ ownProps: { refetch }, mutate }, { data, where }, updateEntryName) => {
+  console.log('data:', data);
+  console.log('where:', where);
+  try {
+    const {
+      data: { [updateEntryName]: updateEntry }
+    } = await mutate({
+      variables: { data, where }
+    });
+
+    if (updateEntry.errors) {
+      return { errors: updateEntry.errors };
+    }
+
+    refetch();
+
+    return updateEntry;
+  } catch (e) {
+    console.log(e.graphQLErrors);
+  }
+};
+
+export const deleteEntry = async ({ ownProps: { refetch }, mutate }, { where }, deleteEntryName) => {
+  try {
+    const {
+      data: { [deleteEntryName]: deleteEntry }
+    } = await mutate({
+      variables: { where }
+    });
+
+    if (deleteEntry.errors) {
+      return { errors: deleteEntry.errors };
+    }
+
+    refetch();
+
+    return deleteEntry;
+  } catch (e) {
+    console.log(e.graphQLErrors);
+  }
+};
diff --git a/tools/templates/crud/client/containers/ModuleList.jsx b/tools/templates/crud/client/containers/ModuleList.jsx
index e6d0c1e0ba..6d1b4d0d8d 100644
--- a/tools/templates/crud/client/containers/ModuleList.jsx
+++ b/tools/templates/crud/client/containers/ModuleList.jsx
@@ -3,6 +3,7 @@ import { graphql, compose } from 'react-apollo';
 
 import { removeTypename, removeEmpty } from '../../../../../common/utils';
 import { ListView } from '../../common/components/crud';
+import { updateEntry, deleteEntry } from '../../common/crud';
 import { $Module$Schema } from '../../../../../server/src/modules/$module$/schema';
 
 import $MODULE$_STATE_QUERY from '../graphql/$Module$StateQuery.client.graphql';
@@ -58,45 +59,13 @@ export default compose(
     }
   }),
   graphql(UPDATE_$MODULE$, {
-    props: ({ ownProps: { refetch }, mutate }) => ({
-      updateEntry: async (data, where) => {
-        try {
-          const {
-            data: { update$Module$ }
-          } = await mutate({
-            variables: { data, where }
-          });
-
-          if (update$Module$.errors) {
-            return { errors: update$Module$.errors };
-          }
-
-          refetch();
-        } catch (e) {
-          console.log(e.graphQLErrors);
-        }
-      }
+    props: props => ({
+      updateEntry: args => updateEntry(props, args, 'update$Module$')
     })
   }),
   graphql(DELETE_$MODULE$, {
-    props: ({ ownProps: { refetch }, mutate }) => ({
-      deleteEntry: async where => {
-        try {
-          const {
-            data: { delete$Module$ }
-          } = await mutate({
-            variables: { where }
-          });
-
-          if (delete$Module$.errors) {
-            return { errors: delete$Module$.errors };
-          }
-
-          refetch();
-        } catch (e) {
-          console.log(e.graphQLErrors);
-        }
-      }
+    props: props => ({
+      deleteEntry: args => deleteEntry(props, args, 'delete$Module$')
     })
   }),
   graphql(SORT_$MODULE$S, {

From bae1bec419cb5f7cbe236d7f137c33dad0301b12 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 23 May 2018 15:20:56 +0200
Subject: [PATCH 139/327] add Role as enum

---
 packages/server/src/modules/user/schema.graphql | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/packages/server/src/modules/user/schema.graphql b/packages/server/src/modules/user/schema.graphql
index 8a7873dee9..6b5d464756 100644
--- a/packages/server/src/modules/user/schema.graphql
+++ b/packages/server/src/modules/user/schema.graphql
@@ -1,7 +1,15 @@
+enum Role {
+  admin
+  editor
+  user
+  distributor
+  producer
+}
+
 type User {
   id: Int!
   username: String!
-  role: String!
+  role: Role!
   isActive: Boolean
   email: String!
   profile: UserProfile
@@ -83,7 +91,7 @@ input FilterUserInput {
   # search by username or email
   searchText: String
   # filter by role
-  role: String
+  role: Role
   # filter by isActive
   isActive: Boolean
 }
@@ -126,7 +134,7 @@ input AddUserInput {
   username: String!
   email: String!
   password: String!
-  role: String!
+  role: Role!
   isActive: Boolean
   profile: ProfileInput
   auth: AuthInput
@@ -136,7 +144,7 @@ input AddUserInput {
 input EditUserInput {
   id: Int!
   username: String!
-  role: String!
+  role: Role!
   isActive: Boolean
   email: String!
   password: String

From 82b8a5e6f74b0cbc5a8be66692576fb0c1926773 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 24 May 2018 09:00:44 +0200
Subject: [PATCH 140/327] list: allow state changes comming from container

---
 .../common/components/crud/ListView.web.jsx   | 29 +++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/modules/common/components/crud/ListView.web.jsx b/packages/client/src/modules/common/components/crud/ListView.web.jsx
index 53341ca1ee..e503721308 100644
--- a/packages/client/src/modules/common/components/crud/ListView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/ListView.web.jsx
@@ -117,15 +117,40 @@ class ListView extends React.Component {
     customActions: PropTypes.object,
     tableScroll: PropTypes.object,
     currentUser: PropTypes.object,
-    currentUserLoading: PropTypes.bool
+    currentUserLoading: PropTypes.bool,
+    parentWait: PropTypes.bool,
+    parentError: PropTypes.string,
+    parentSuccess: PropTypes.string
   };
 
+  static getDerivedStateFromProps(nextProps, prevState) {
+    if (
+      prevState.lastParentWait !== nextProps.parentWait ||
+      prevState.lastParentError !== nextProps.parentError ||
+      prevState.lastParentSuccess !== nextProps.parentSuccess
+    ) {
+      return {
+        wait: nextProps.parentWait,
+        error: nextProps.parentError,
+        success: nextProps.parentSuccess,
+        lastParentWait: nextProps.parentWait,
+        lastParentError: nextProps.parentError,
+        lastParentSuccess: nextProps.parentSuccess
+      };
+    }
+
+    return null;
+  }
+
   state = {
     selectedRowKeys: [],
     loading: false,
     wait: false,
     error: null,
-    success: null
+    success: null,
+    lastParentWait: false,
+    lastParentError: null,
+    lastParentSuccess: null
   };
 
   components = {

From 8515aa900100ddcbb5e96c48f242aeea7c208ccd Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Wed, 6 Jun 2018 10:48:20 +0300
Subject: [PATCH 141/327] add column name converting to snake_case in
 search/filter where clause

---
 packages/server/src/sql/crud.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/sql/crud.js b/packages/server/src/sql/crud.js
index 4d91f0d9be..e4053eca19 100644
--- a/packages/server/src/sql/crud.js
+++ b/packages/server/src/sql/crud.js
@@ -531,7 +531,7 @@ export default class Crud {
           for (const key of schema.keys()) {
             const value = schema.values[key];
             if (value.searchText) {
-              this.orWhere(`${tableName}.${key}`, 'like', `%${filter.searchText}%`);
+              this.orWhere(`${tableName}.${decamelize(key)}`, 'like', `%${filter.searchText}%`);
             }
           }
         });

From bc3c589246d243d4bbb667441ce2fdca5cef2e03 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 6 Jun 2018 11:13:51 +0200
Subject: [PATCH 142/327] revert project specific changes

---
 packages/client/.spinrc.js                    |  2 +-
 .../modules/common/components/web/index.jsx   |  4 +-
 .../web/ui-antd/components/NavBar.jsx         | 65 +++++++++++++++++++
 packages/mobile/.spinrc.js                    |  8 +--
 packages/server/.spinrc.js                    |  2 +-
 5 files changed, 73 insertions(+), 8 deletions(-)
 create mode 100644 packages/client/src/modules/common/components/web/ui-antd/components/NavBar.jsx

diff --git a/packages/client/.spinrc.js b/packages/client/.spinrc.js
index c2eca2c858..df173a10b7 100644
--- a/packages/client/.spinrc.js
+++ b/packages/client/.spinrc.js
@@ -5,7 +5,7 @@ const config = {
     web: {
       entry: './src/index.tsx',
       stack: ['web'],
-      openBrowser: false,
+      openBrowser: true,
       dllExcludes: ['bootstrap'],
       defines: {
         __CLIENT__: true
diff --git a/packages/client/src/modules/common/components/web/index.jsx b/packages/client/src/modules/common/components/web/index.jsx
index 678081b661..eed0b865f2 100644
--- a/packages/client/src/modules/common/components/web/index.jsx
+++ b/packages/client/src/modules/common/components/web/index.jsx
@@ -1,4 +1,4 @@
-//export * from './ui-bootstrap';
-export * from './ui-antd';
+export * from './ui-bootstrap';
+//export * from './ui-antd';
 
 export { default as LayoutCenter } from './LayoutCenter';
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/NavBar.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/NavBar.jsx
new file mode 100644
index 0000000000..25a24797b7
--- /dev/null
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/NavBar.jsx
@@ -0,0 +1,65 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { withRouter, NavLink } from 'react-router-dom';
+import { Menu, Row, Col } from 'antd';
+import MenuItem from './MenuItem';
+
+import modules from '../../../../../../modules';
+import settings from '../../../../../../../../../settings';
+
+class NavBar extends React.Component {
+  state = {
+    current: '/'
+  };
+
+  handleClick = e => {
+    this.setState({
+      current: e.key
+    });
+  };
+
+  render() {
+    return (
+      <Row gutter={8}>
+        <Col span={14}>
+          <Menu
+            onClick={this.handleClick}
+            selectedKeys={[this.props.location.pathname]}
+            mode="horizontal"
+            theme="dark"
+            style={{ lineHeight: '64px' }}
+          >
+            <MenuItem key="/">
+              <NavLink to="/" className="nav-link">
+                {settings.app.name}
+              </NavLink>
+            </MenuItem>
+            {modules.navItems}
+          </Menu>
+        </Col>
+        <Col span={10}>
+          <Menu
+            onClick={this.handleClick}
+            selectedKeys={[this.props.location.pathname]}
+            mode="horizontal"
+            theme="dark"
+            style={{ lineHeight: '64px', float: 'right' }}
+          >
+            {modules.navItemsRight}
+            {__DEV__ && (
+              <MenuItem>
+                <a href="/graphiql">GraphiQL</a>
+              </MenuItem>
+            )}
+          </Menu>
+        </Col>
+      </Row>
+    );
+  }
+}
+
+NavBar.propTypes = {
+  location: PropTypes.object.isRequired
+};
+
+export default withRouter(NavBar);
diff --git a/packages/mobile/.spinrc.js b/packages/mobile/.spinrc.js
index b76b96939b..13fcea670d 100644
--- a/packages/mobile/.spinrc.js
+++ b/packages/mobile/.spinrc.js
@@ -45,10 +45,10 @@ const config = {
 };
 
 if (process.env.NODE_ENV === 'production') {
-  config.builders.android.enabled = false;
-  config.builders.ios.enabled = false;
-  //config.options.defines.__API_URL__ = '"https://apollo-universal-starter-kit.herokuapp.com/graphql"';
-  //config.options.defines.__WEBSITE_URL__ = '"https://apollo-universal-starter-kit.herokuapp.com"';
+  config.builders.android.enabled = true;
+  config.builders.ios.enabled = true;
+  config.options.defines.__API_URL__ = '"https://apollo-universal-starter-kit.herokuapp.com/graphql"';
+  config.options.defines.__WEBSITE_URL__ = '"https://apollo-universal-starter-kit.herokuapp.com"';
   // Generating source maps for production will slowdown compilation for roughly 25%
   config.options.sourceMap = false;
 }
diff --git a/packages/server/.spinrc.js b/packages/server/.spinrc.js
index c8032d4b0d..63b2d14e67 100644
--- a/packages/server/.spinrc.js
+++ b/packages/server/.spinrc.js
@@ -38,7 +38,7 @@ const config = {
 config.options.devProxy = config.options.ssr;
 
 if (process.env.NODE_ENV === 'production') {
-  //config.options.defines.__WEBSITE_URL__ = '"https://apollo-universal-starter-kit.herokuapp.com"';
+  config.options.defines.__WEBSITE_URL__ = '"https://apollo-universal-starter-kit.herokuapp.com"';
   // Generating source maps for production will slowdown compilation for roughly 25%
   config.options.sourceMap = false;
 }

From 7ed01b57f9893f036fb06324e319dd07761dcbe2 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Wed, 6 Jun 2018 13:11:04 +0300
Subject: [PATCH 143/327] fix export of web modules for crud

---
 .../src/modules/common/components/web/index.jsx    | 14 ++++++++++++++
 packages/client/src/modules/common/util.web.jsx    |  8 ++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/modules/common/components/web/index.jsx b/packages/client/src/modules/common/components/web/index.jsx
index eed0b865f2..0850131586 100644
--- a/packages/client/src/modules/common/components/web/index.jsx
+++ b/packages/client/src/modules/common/components/web/index.jsx
@@ -1,4 +1,18 @@
 export * from './ui-bootstrap';
 //export * from './ui-antd';
+export {
+  RenderInput,
+  RenderNumber,
+  RenderTextArea,
+  RenderSelectQuery,
+  RenderSelectCountry,
+  RenderDate,
+  RenderSwitch,
+  Popconfirm,
+  Switch,
+  InputNumber,
+  Icon,
+  Spin
+} from './ui-antd';
 
 export { default as LayoutCenter } from './LayoutCenter';
diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index 7fc1e434df..b44eb28960 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -20,14 +20,14 @@ import {
   RenderSelectCountry,
   RenderDate,
   RenderSwitch,
-  Button,
   Popconfirm,
   Switch,
+  InputNumber,
+  Icon,
+  Button,
   FormItem,
   Col,
-  Input,
-  InputNumber,
-  Icon
+  Input
 } from './components/web';
 
 const dateFormat = 'YYYY-MM-DD';

From ccb693565e1780aa5363fbe22db9db69194ad283 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Thu, 7 Jun 2018 15:52:28 +0300
Subject: [PATCH 144/327] add to crud template: nativeLink, auth check and
 change deprecated method stackNavigator, change data flow in ListView

---
 .../src/modules/common/components/crud/FilterView.jsx |  1 +
 .../src/modules/common/components/crud/ListView.jsx   |  4 ++--
 tools/templates/crud/client/index.native.jsx          | 11 +++++++----
 3 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 packages/client/src/modules/common/components/crud/FilterView.jsx

diff --git a/packages/client/src/modules/common/components/crud/FilterView.jsx b/packages/client/src/modules/common/components/crud/FilterView.jsx
new file mode 100644
index 0000000000..2d1ec23827
--- /dev/null
+++ b/packages/client/src/modules/common/components/crud/FilterView.jsx
@@ -0,0 +1 @@
+export default () => {};
diff --git a/packages/client/src/modules/common/components/crud/ListView.jsx b/packages/client/src/modules/common/components/crud/ListView.jsx
index 2e46557c1e..22e93895f5 100644
--- a/packages/client/src/modules/common/components/crud/ListView.jsx
+++ b/packages/client/src/modules/common/components/crud/ListView.jsx
@@ -14,7 +14,7 @@ class ListView extends React.PureComponent {
     nativeLink: PropTypes.string.isRequired
   };
 
-  keyExtractor = item => item.id;
+  keyExtractor = item => `${item.id}`;
 
   renderItem = ({ item: { id, name } }) => {
     const { deleteEntry, navigation, nativeLink } = this.props;
@@ -41,7 +41,7 @@ class ListView extends React.PureComponent {
         </View>
       );
     } else {
-      return <FlatList data={data} keyExtractor={this.keyExtractor} renderItem={this.renderItem} />;
+      return <FlatList data={data.edges} keyExtractor={this.keyExtractor} renderItem={this.renderItem} />;
     }
   }
 }
diff --git a/tools/templates/crud/client/index.native.jsx b/tools/templates/crud/client/index.native.jsx
index 3bcedfc8bf..af4dc7f977 100644
--- a/tools/templates/crud/client/index.native.jsx
+++ b/tools/templates/crud/client/index.native.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Button } from 'react-native';
-import { StackNavigator } from 'react-navigation';
+import { createStackNavigator } from 'react-navigation';
 import { Ionicons } from '@expo/vector-icons';
 import { createTabBarIconWrapper } from '../common/components/native';
 import $Module$List from './containers/$Module$List';
@@ -16,7 +16,7 @@ class $Module$ListScreen extends React.Component {
     headerRight: <Button title="Add" onPress={() => navigation.navigate('$Module$Edit', { id: 0 })} />
   });
   render() {
-    return <$Module$List navigation={this.props.navigation} title="$MoDuLe$" />;
+    return <$Module$List navigation={this.props.navigation} title="$MoDuLe$" nativeLink={"$MoDuLe$Edit"} />;
   }
 }
 
@@ -37,13 +37,13 @@ $Module$EditScreen.propTypes = {
   navigation: PropTypes.object
 };
 
-const $Module$Navigator = StackNavigator({
+const $Module$Navigator = createStackNavigator({
   $Module$List: { screen: $Module$ListScreen },
   $Module$Edit: { screen: $Module$EditScreen }
 });
 
 export default new Feature({
-  tabItem: {
+  drawerItem: {
     $Module$: {
       screen: $Module$Navigator,
       navigationOptions: {
@@ -51,6 +51,9 @@ export default new Feature({
           name: 'ios-browsers-outline',
           size: 30
         })
+      },
+      userInfo: {
+        showOnLogin: true
       }
     }
   },

From b38193c6ca87a328b7bd831001f422cd8cbf9599 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Thu, 7 Jun 2018 16:44:29 +0300
Subject: [PATCH 145/327] change data flow for editView, change data propType
 in ListView, remove redundant func argument in FormView

---
 .../client/src/modules/common/components/crud/EditView.jsx    | 4 ++--
 .../client/src/modules/common/components/crud/FormView.jsx    | 4 ++--
 .../client/src/modules/common/components/crud/ListView.jsx    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/client/src/modules/common/components/crud/EditView.jsx b/packages/client/src/modules/common/components/crud/EditView.jsx
index adfece7b4c..1da387bfc0 100644
--- a/packages/client/src/modules/common/components/crud/EditView.jsx
+++ b/packages/client/src/modules/common/components/crud/EditView.jsx
@@ -4,7 +4,7 @@ import { StyleSheet, Text, View } from 'react-native';
 
 import FormView from './FormView';
 
-const EditView = ({ loading, data, navigation }) => {
+const EditView = ({ loading, data, navigation, schema }) => {
   let dataObj = data;
 
   if (!dataObj && navigation.state) {
@@ -18,7 +18,7 @@ const EditView = ({ loading, data, navigation }) => {
       </View>
     );
   } else {
-    return <FormView initialValues={dataObj ? dataObj : {}} />;
+    return <FormView data={dataObj ? dataObj : {}} schema={schema} />;
   }
 };
 
diff --git a/packages/client/src/modules/common/components/crud/FormView.jsx b/packages/client/src/modules/common/components/crud/FormView.jsx
index 3d782869ea..fccef83180 100644
--- a/packages/client/src/modules/common/components/crud/FormView.jsx
+++ b/packages/client/src/modules/common/components/crud/FormView.jsx
@@ -21,9 +21,9 @@ const Form = ({ schema, data: { node } }) => {
         //console.log('onSubmit, values:', pickInputFields({schema, values}));
         await onSubmit({ schema, values });
       }}
-      render={({ handleChange, handleSubmit }) => (
+      render={({ handleSubmit }) => (
         <FormView>
-          {createFormFields({ handleChange, schema })}
+          {createFormFields({ schema })}
           <Button onPress={handleSubmit}>Save</Button>
         </FormView>
       )}
diff --git a/packages/client/src/modules/common/components/crud/ListView.jsx b/packages/client/src/modules/common/components/crud/ListView.jsx
index 22e93895f5..8bd606b321 100644
--- a/packages/client/src/modules/common/components/crud/ListView.jsx
+++ b/packages/client/src/modules/common/components/crud/ListView.jsx
@@ -6,7 +6,7 @@ import { SwipeAction } from '../native';
 class ListView extends React.PureComponent {
   static propTypes = {
     loading: PropTypes.bool.isRequired,
-    data: PropTypes.array,
+    data: PropTypes.object,
     orderBy: PropTypes.object,
     onOrderBy: PropTypes.func.isRequired,
     deleteEntry: PropTypes.func.isRequired,

From 1e4e4e7556cf00d889208e2a218fe90f3f7a8200 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Fri, 8 Jun 2018 16:36:27 +0300
Subject: [PATCH 146/327] fix add, edit, remove item of created by crud cli
 command, add polyfill for setting prototype in apolloClient on android

---
 .../modules/common/components/crud/EditView.jsx  |  6 ++++--
 .../modules/common/components/crud/FormView.jsx  | 16 ++++++++++------
 .../modules/common/components/crud/ListView.jsx  |  2 +-
 .../common/components/crud/ListView.web.jsx      |  6 +++---
 packages/client/src/modules/common/util.jsx      | 14 +++++++++++---
 packages/common/createApolloClient.js            |  8 ++++++++
 packages/server/package.json                     |  2 +-
 yarn.lock                                        |  6 ++++++
 8 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/packages/client/src/modules/common/components/crud/EditView.jsx b/packages/client/src/modules/common/components/crud/EditView.jsx
index 1da387bfc0..d930f33cf4 100644
--- a/packages/client/src/modules/common/components/crud/EditView.jsx
+++ b/packages/client/src/modules/common/components/crud/EditView.jsx
@@ -4,7 +4,7 @@ import { StyleSheet, Text, View } from 'react-native';
 
 import FormView from './FormView';
 
-const EditView = ({ loading, data, navigation, schema }) => {
+const EditView = ({ loading, data, navigation, schema, updateEntry, createEntry }) => {
   let dataObj = data;
 
   if (!dataObj && navigation.state) {
@@ -18,7 +18,9 @@ const EditView = ({ loading, data, navigation, schema }) => {
       </View>
     );
   } else {
-    return <FormView data={dataObj ? dataObj : {}} schema={schema} />;
+    return (
+      <FormView data={dataObj ? dataObj : {}} schema={schema} updateEntry={updateEntry} createEntry={createEntry} />
+    );
   }
 };
 
diff --git a/packages/client/src/modules/common/components/crud/FormView.jsx b/packages/client/src/modules/common/components/crud/FormView.jsx
index fccef83180..630bdb6460 100644
--- a/packages/client/src/modules/common/components/crud/FormView.jsx
+++ b/packages/client/src/modules/common/components/crud/FormView.jsx
@@ -13,17 +13,19 @@ import { FormView, Button } from '../native';
 
 //const validate = values => validateForm(values, formSchema);
 
-const Form = ({ schema, data: { node } }) => {
+const Form = ({ schema, data: { node }, updateEntry, createEntry }) => {
   return (
     <Formik
       initialValues={mapFormPropsToValues({ schema, data: node })}
       onSubmit={async values => {
-        //console.log('onSubmit, values:', pickInputFields({schema, values}));
-        await onSubmit({ schema, values });
+        let title = node && node.__typename ? node.__typename : 'Model',
+          data = node || null;
+
+        await onSubmit({ schema, values, updateEntry, createEntry, title, data });
       }}
-      render={({ handleSubmit }) => (
+      render={({ handleSubmit, values }) => (
         <FormView>
-          {createFormFields({ schema })}
+          {createFormFields(schema, values)}
           <Button onPress={handleSubmit}>Save</Button>
         </FormView>
       )}
@@ -33,7 +35,9 @@ const Form = ({ schema, data: { node } }) => {
 
 Form.propTypes = {
   schema: PropTypes.object.isRequired,
-  data: PropTypes.object
+  data: PropTypes.object,
+  updateEntry: PropTypes.func.isRequired,
+  createEntry: PropTypes.func.isRequired
 };
 
 export default Form;
diff --git a/packages/client/src/modules/common/components/crud/ListView.jsx b/packages/client/src/modules/common/components/crud/ListView.jsx
index 8bd606b321..68862fa0e3 100644
--- a/packages/client/src/modules/common/components/crud/ListView.jsx
+++ b/packages/client/src/modules/common/components/crud/ListView.jsx
@@ -23,7 +23,7 @@ class ListView extends React.PureComponent {
         onPress={() => navigation.navigate(nativeLink, { id })}
         right={{
           text: 'Delete',
-          onPress: () => deleteEntry({ where: id })
+          onPress: () => deleteEntry({ where: { id } })
         }}
       >
         {name}
diff --git a/packages/client/src/modules/common/components/crud/ListView.web.jsx b/packages/client/src/modules/common/components/crud/ListView.web.jsx
index e503721308..4f9ad9e526 100644
--- a/packages/client/src/modules/common/components/crud/ListView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/ListView.web.jsx
@@ -272,7 +272,7 @@ class ListView extends React.Component {
     const hasSelected = selectedRowKeys.length > 0;
 
     const showBatchFields =
-      customBatchFields === null
+      customBatchFields === null || typeof customBatchFields === 'undefined'
         ? false
         : customBatchFields && customBatchFields.role
           ? hasRole(customBatchFields.role, currentUser)
@@ -281,7 +281,7 @@ class ListView extends React.Component {
           : true;
 
     const showCustomActions =
-      customActions === null
+      customActions === null || typeof customActions === 'undefined'
         ? false
         : customActions && customActions.role
           ? hasRole(customActions.role, currentUser)
@@ -394,7 +394,7 @@ class ListView extends React.Component {
       size: 'small',
       rowSelection: rowSelection,
       loading: loading && !data,
-      title: showCustomActions ? title : null,
+      title: title,
       footer: footer
     };
 
diff --git a/packages/client/src/modules/common/util.jsx b/packages/client/src/modules/common/util.jsx
index da686e3a52..11630a6c86 100644
--- a/packages/client/src/modules/common/util.jsx
+++ b/packages/client/src/modules/common/util.jsx
@@ -3,12 +3,20 @@ import { pick, capitalize } from 'lodash';
 import Field from '../../utils/FieldAdapter';
 import { RenderField } from './components/native';
 
-export const createFormFields = schema => {
+export const createFormFields = (schema, values) => {
   let fields = [];
-
   for (const key of schema.keys()) {
     if (key !== 'id') {
-      fields.push(<Field name={key} key={key} component={RenderField} type="text" label={capitalize(key)} />);
+      fields.push(
+        <Field
+          name={key}
+          key={key}
+          value={values[key]}
+          component={RenderField}
+          type="text"
+          placeholder={capitalize(key)}
+        />
+      );
     }
   }
 
diff --git a/packages/common/createApolloClient.js b/packages/common/createApolloClient.js
index 24baba0079..b75da4bd0f 100644
--- a/packages/common/createApolloClient.js
+++ b/packages/common/createApolloClient.js
@@ -34,6 +34,14 @@ const createApolloClient = ({ apiUrl, createNetLink, links, connectionParams, cl
     }
   );
 
+  //polifill for apollo-client setting prototype on android platform
+  Object.setPrototypeOf =
+    Object.setPrototypeOf ||
+    function(obj, proto) {
+      obj.__proto__ = proto;
+      return obj;
+    };
+
   const queryLink = createNetLink
     ? createNetLink(apiUrl)
     : new BatchHttpLink({
diff --git a/packages/server/package.json b/packages/server/package.json
index 9aeb742d23..c5051489fc 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -39,7 +39,7 @@
   "author": "SysGears INC",
   "license": "MIT",
   "dependencies": {
-    "@domain-schema/core": "^0.0.33",
+    "@domain-schema/core": "^0.0.34",
     "@domain-schema/formik": "^0.0.33",
     "@domain-schema/graphql": "^0.0.33",
     "@domain-schema/knex": "^0.0.34",
diff --git a/yarn.lock b/yarn.lock
index 27a31b2d19..a3ffe66a9a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -554,6 +554,12 @@
   dependencies:
     debug "^3.1.0"
 
+"@domain-schema/core@^0.0.34":
+  version "0.0.34"
+  resolved "https://registry.yarnpkg.com/@domain-schema/core/-/core-0.0.34.tgz#5900ae4f0844cb8e7ffa91f5be32bd0417d96429"
+  dependencies:
+    debug "^3.1.0"
+
 "@domain-schema/formik@^0.0.33":
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/@domain-schema/formik/-/formik-0.0.33.tgz#76d223f897d98cffef8930262c987a0c485e2a29"

From a6f6762025ba445d6bf81c688f9b5ede9483ac3e Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Mon, 11 Jun 2018 14:42:52 +0300
Subject: [PATCH 147/327] fix crud templates import for web, fix action column
 and footer

---
 .../common/components/crud/FilterView.web.jsx |  2 +-
 .../common/components/crud/FormView.web.jsx   |  2 +-
 .../common/components/crud/ListView.web.jsx   | 41 ++++++++++++-------
 .../common/components/web/index-antd.jsx      |  1 +
 .../client/src/modules/common/util.web.jsx    | 41 ++++++++++++-------
 5 files changed, 55 insertions(+), 32 deletions(-)
 create mode 100644 packages/client/src/modules/common/components/web/index-antd.jsx

diff --git a/packages/client/src/modules/common/components/crud/FilterView.web.jsx b/packages/client/src/modules/common/components/crud/FilterView.web.jsx
index f300f68c94..85a21a3a59 100644
--- a/packages/client/src/modules/common/components/crud/FilterView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/FilterView.web.jsx
@@ -4,7 +4,7 @@ import { Formik } from 'formik';
 import { DebounceInput } from 'react-debounce-input';
 
 import { hasRole } from '../../../user/containers/Auth';
-import { Form, FormItem, Input, Row, Col, Button, Icon } from '../web';
+import { Form, FormItem, Input, Row, Col, Button, Icon } from '../web/index-antd';
 import { createFormFields } from '../../util';
 import { mapFormPropsToValues, pickInputFields } from '../../../../utils/crud';
 
diff --git a/packages/client/src/modules/common/components/crud/FormView.web.jsx b/packages/client/src/modules/common/components/crud/FormView.web.jsx
index 81a1937c39..bb7fc6e0a7 100644
--- a/packages/client/src/modules/common/components/crud/FormView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/FormView.web.jsx
@@ -5,7 +5,7 @@ import DomainValidation from '@domain-schema/validation';
 
 import { onSubmit, mapFormPropsToValues } from '../../../../utils/crud';
 import { createFormFields } from '../../util';
-import { Form, FormItem, Button } from '../web';
+import { Form, FormItem, Button } from '../web/index-antd';
 
 const tailFormItemLayout = {
   wrapperCol: {
diff --git a/packages/client/src/modules/common/components/crud/ListView.web.jsx b/packages/client/src/modules/common/components/crud/ListView.web.jsx
index 4f9ad9e526..45924ab157 100644
--- a/packages/client/src/modules/common/components/crud/ListView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/ListView.web.jsx
@@ -5,7 +5,7 @@ import { Link } from 'react-router-dom';
 import { Formik } from 'formik';
 import { DragDropContext, DragSource, DropTarget } from 'react-dnd';
 import HTML5Backend from 'react-dnd-html5-backend';
-import { Table, Button, Popconfirm, Row, Col, Form, FormItem, Alert, Spin } from '../web';
+import { Table, Button, Popconfirm, Row, Col, Form, FormItem, Alert, Spin } from '../web/index-antd';
 import { createColumnFields, createFormFields } from '../../util';
 import { mapFormPropsToValues, pickInputFields } from '../../../../utils/crud';
 import { hasRole } from '../../../user/containers/Auth';
@@ -120,7 +120,12 @@ class ListView extends React.Component {
     currentUserLoading: PropTypes.bool,
     parentWait: PropTypes.bool,
     parentError: PropTypes.string,
-    parentSuccess: PropTypes.string
+    parentSuccess: PropTypes.string,
+    tableHeaderColumnHeight: PropTypes.string
+  };
+
+  static defaultProps = {
+    tableHeaderColumnHeight: '38px'
   };
 
   static getDerivedStateFromProps(nextProps, prevState) {
@@ -266,27 +271,24 @@ class ListView extends React.Component {
       customActions,
       customBatchFields,
       updateManyEntries,
-      tableScroll = null
+      tableScroll = null,
+      tableHeaderColumnHeight
     } = this.props;
     const { selectedRowKeys, wait, error, success } = this.state;
     const hasSelected = selectedRowKeys.length > 0;
 
     const showBatchFields =
-      customBatchFields === null || typeof customBatchFields === 'undefined'
+      customBatchFields === null
         ? false
         : customBatchFields && customBatchFields.role
-          ? hasRole(customBatchFields.role, currentUser)
-            ? true
-            : false
+          ? !!hasRole(customBatchFields.role, currentUser)
           : true;
 
     const showCustomActions =
-      customActions === null || typeof customActions === 'undefined'
+      customActions === null
         ? false
         : customActions && customActions.role
-          ? hasRole(customActions.role, currentUser)
-            ? true
-            : false
+          ? !!hasRole(customActions.role, currentUser)
           : true;
 
     const rowSelection = showBatchFields
@@ -311,7 +313,7 @@ class ListView extends React.Component {
     const footer = () => {
       return (
         <Row>
-          <Col span={1}>
+          <Col span={2}>
             {data && (
               <div>
                 <div>
@@ -326,14 +328,14 @@ class ListView extends React.Component {
             )}
           </Col>
           {showBatchFields && [
-            <Col span={2} key="batchDelete">
+            <Col span={2} key="batchDelete" style={{ paddingTop: '3px' }}>
               <Popconfirm title="Sure to delete?" onConfirm={this.hendleDeleteMany}>
                 <Button color="primary" disabled={!hasSelected} loading={loading && !data}>
                   Delete
                 </Button>
               </Popconfirm>
             </Col>,
-            <Col span={21} key="batchUpdate">
+            <Col span={20} key="batchUpdate">
               <Formik
                 initialValues={mapFormPropsToValues({ schema })}
                 onSubmit={async (values, { resetForm }) => {
@@ -422,7 +424,16 @@ class ListView extends React.Component {
         {wait && <Spin size="small" />}
         {error && <Alert color="error" message={error} />}
         {success && <Alert color="success" message={success} />}
-        <Table {...tableProps} />
+        <Table
+          {...tableProps}
+          onHeaderRow={() => {
+            return {
+              style: {
+                height: tableHeaderColumnHeight
+              }
+            };
+          }}
+        />
         {data && this.renderLoadMore(data, loadMoreRows)}
       </div>
     );
diff --git a/packages/client/src/modules/common/components/web/index-antd.jsx b/packages/client/src/modules/common/components/web/index-antd.jsx
new file mode 100644
index 0000000000..4149b70860
--- /dev/null
+++ b/packages/client/src/modules/common/components/web/index-antd.jsx
@@ -0,0 +1 @@
+export * from './ui-antd';
diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index b44eb28960..cf67fc8f7d 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -28,7 +28,7 @@ import {
   FormItem,
   Col,
   Input
-} from './components/web';
+} from './components/web/index-antd';
 
 const dateFormat = 'YYYY-MM-DD';
 
@@ -42,7 +42,8 @@ export const createColumnFields = ({
   hendleDelete,
   onCellChange,
   customFields = {},
-  customActions
+  customActions,
+  tableActionColumnHeight = '48px'
 }) => {
   let columns = [];
   // use customFields if definded otherwise use schema.keys()
@@ -207,21 +208,31 @@ export const createColumnFields = ({
       key: 'actions',
       width: 150,
       fixed: 'right',
-      render: (text, record) => [
-        <Link className="link" to={`/${link}/${record.id}`} key="edit">
-          <Button color="primary" size="sm">
-            Edit
-          </Button>
-        </Link>,
-        <Popconfirm title="Sure to delete?" onConfirm={() => hendleDelete(record.id)} key="delete">
-          <Button color="primary" size="sm">
-            Delete
-          </Button>
-        </Popconfirm>
-      ]
+      render: (text, record) => {
+        return {
+          props: {
+            style: {
+              height: tableActionColumnHeight
+            }
+          },
+          children: (
+            <div>
+              <Link className="link" to={`/${link}/${record.id}`} key="edit">
+                <Button color="primary" size="sm">
+                  Edit
+                </Button>
+              </Link>
+              <Popconfirm title="Sure to delete?" onConfirm={() => hendleDelete(record.id)} key="delete">
+                <Button color="primary" size="sm">
+                  Delete
+                </Button>
+              </Popconfirm>
+            </div>
+          )
+        };
+      }
     });
   }
-
   return columns;
 };
 

From f0f6b4e63bb22c38cc485e19761dbb7e717881fb Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Tue, 12 Jun 2018 09:38:07 +0300
Subject: [PATCH 148/327] change import file for crud components

---
 .../src/modules/common/components/crud/FilterView.web.jsx       | 2 +-
 .../client/src/modules/common/components/crud/FormView.web.jsx  | 2 +-
 .../client/src/modules/common/components/crud/ListView.web.jsx  | 2 +-
 .../client/src/modules/common/components/web/index-antd.jsx     | 1 -
 packages/client/src/modules/common/util.web.jsx                 | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)
 delete mode 100644 packages/client/src/modules/common/components/web/index-antd.jsx

diff --git a/packages/client/src/modules/common/components/crud/FilterView.web.jsx b/packages/client/src/modules/common/components/crud/FilterView.web.jsx
index 85a21a3a59..92e404b5d1 100644
--- a/packages/client/src/modules/common/components/crud/FilterView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/FilterView.web.jsx
@@ -4,7 +4,7 @@ import { Formik } from 'formik';
 import { DebounceInput } from 'react-debounce-input';
 
 import { hasRole } from '../../../user/containers/Auth';
-import { Form, FormItem, Input, Row, Col, Button, Icon } from '../web/index-antd';
+import { Form, FormItem, Input, Row, Col, Button, Icon } from '../web/ui-antd/index';
 import { createFormFields } from '../../util';
 import { mapFormPropsToValues, pickInputFields } from '../../../../utils/crud';
 
diff --git a/packages/client/src/modules/common/components/crud/FormView.web.jsx b/packages/client/src/modules/common/components/crud/FormView.web.jsx
index bb7fc6e0a7..2c3caa7911 100644
--- a/packages/client/src/modules/common/components/crud/FormView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/FormView.web.jsx
@@ -5,7 +5,7 @@ import DomainValidation from '@domain-schema/validation';
 
 import { onSubmit, mapFormPropsToValues } from '../../../../utils/crud';
 import { createFormFields } from '../../util';
-import { Form, FormItem, Button } from '../web/index-antd';
+import { Form, FormItem, Button } from '../web/ui-antd/index';
 
 const tailFormItemLayout = {
   wrapperCol: {
diff --git a/packages/client/src/modules/common/components/crud/ListView.web.jsx b/packages/client/src/modules/common/components/crud/ListView.web.jsx
index 45924ab157..b417c356ba 100644
--- a/packages/client/src/modules/common/components/crud/ListView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/ListView.web.jsx
@@ -5,7 +5,7 @@ import { Link } from 'react-router-dom';
 import { Formik } from 'formik';
 import { DragDropContext, DragSource, DropTarget } from 'react-dnd';
 import HTML5Backend from 'react-dnd-html5-backend';
-import { Table, Button, Popconfirm, Row, Col, Form, FormItem, Alert, Spin } from '../web/index-antd';
+import { Table, Button, Popconfirm, Row, Col, Form, FormItem, Alert, Spin } from '../web/ui-antd/index';
 import { createColumnFields, createFormFields } from '../../util';
 import { mapFormPropsToValues, pickInputFields } from '../../../../utils/crud';
 import { hasRole } from '../../../user/containers/Auth';
diff --git a/packages/client/src/modules/common/components/web/index-antd.jsx b/packages/client/src/modules/common/components/web/index-antd.jsx
deleted file mode 100644
index 4149b70860..0000000000
--- a/packages/client/src/modules/common/components/web/index-antd.jsx
+++ /dev/null
@@ -1 +0,0 @@
-export * from './ui-antd';
diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index cf67fc8f7d..2110f761af 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -28,7 +28,7 @@ import {
   FormItem,
   Col,
   Input
-} from './components/web/index-antd';
+} from './components/web/ui-antd/index';
 
 const dateFormat = 'YYYY-MM-DD';
 

From 678f2d2b09d3fd66e52acce93d303f0a5b43796d Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Thu, 14 Jun 2018 11:41:17 +0300
Subject: [PATCH 149/327] Add missing bootsrap-ui components and styles

---
 packages/client/package.json                  |  13 +-
 .../common/components/crud/FilterView.web.jsx |  10 +-
 .../common/components/crud/FormView.web.jsx   |   2 +-
 .../common/components/crud/ListView.web.jsx   |  24 ++-
 .../modules/common/components/web/index.jsx   |  14 --
 .../web/ui-antd/components/DatePicker.jsx     |   7 +
 .../web/ui-antd/components/RenderDate.jsx     |   3 +-
 .../web/ui-antd/components/Select.jsx         |   3 +-
 .../web/ui-antd/components/index.js           |   1 +
 .../web/ui-bootstrap/components/Alert.jsx     |   8 +-
 .../web/ui-bootstrap/components/Button.jsx    |   5 +-
 .../ui-bootstrap/components/DatePicker.jsx    |  14 ++
 .../web/ui-bootstrap/components/FormItem.jsx  |   7 +-
 .../web/ui-bootstrap/components/Icon.jsx      |  13 ++
 .../web/ui-bootstrap/components/Input.jsx     |   5 +-
 .../ui-bootstrap/components/InputNumber.jsx   |  17 ++
 .../ui-bootstrap/components/Popconfirm.jsx    |  63 +++++++
 .../ui-bootstrap/components/RenderDate.jsx    |  74 ++++++++
 .../ui-bootstrap/components/RenderInput.jsx   |  36 ++++
 .../ui-bootstrap/components/RenderNumber.jsx  |  72 +++++++
 .../components/RenderSelectCountry.jsx        |  93 +++++++++
 .../components/RenderSelectQuery.jsx          | 176 ++++++++++++++++++
 .../ui-bootstrap/components/RenderSwitch.jsx  |  56 ++++++
 .../components/RenderTextArea.jsx             |  37 ++++
 .../web/ui-bootstrap/components/Spin.jsx      |  21 +++
 .../web/ui-bootstrap/components/Switch.jsx    |  12 ++
 .../web/ui-bootstrap/components/Table.jsx     |  13 +-
 .../web/ui-bootstrap/components/index.js      |  13 ++
 .../ui-bootstrap/styles/bootstrap-switch.scss |  52 ++++++
 .../web/ui-bootstrap/styles/datepicker.scss   |   1 +
 .../web/ui-bootstrap/styles/fontawesome.scss  |   3 +
 .../web/ui-bootstrap/styles/styles.scss       |  53 ++++++
 .../client/src/modules/common/util.web.jsx    |  67 ++++---
 yarn.lock                                     |  38 +++-
 34 files changed, 944 insertions(+), 82 deletions(-)
 create mode 100644 packages/client/src/modules/common/components/web/ui-antd/components/DatePicker.jsx
 create mode 100644 packages/client/src/modules/common/components/web/ui-bootstrap/components/DatePicker.jsx
 create mode 100644 packages/client/src/modules/common/components/web/ui-bootstrap/components/Icon.jsx
 create mode 100644 packages/client/src/modules/common/components/web/ui-bootstrap/components/InputNumber.jsx
 create mode 100644 packages/client/src/modules/common/components/web/ui-bootstrap/components/Popconfirm.jsx
 create mode 100644 packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderDate.jsx
 create mode 100644 packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderInput.jsx
 create mode 100644 packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderNumber.jsx
 create mode 100644 packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectCountry.jsx
 create mode 100644 packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx
 create mode 100644 packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSwitch.jsx
 create mode 100644 packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderTextArea.jsx
 create mode 100644 packages/client/src/modules/common/components/web/ui-bootstrap/components/Spin.jsx
 create mode 100644 packages/client/src/modules/common/components/web/ui-bootstrap/components/Switch.jsx
 create mode 100644 packages/client/src/modules/common/components/web/ui-bootstrap/styles/bootstrap-switch.scss
 create mode 100644 packages/client/src/modules/common/components/web/ui-bootstrap/styles/datepicker.scss
 create mode 100644 packages/client/src/modules/common/components/web/ui-bootstrap/styles/fontawesome.scss

diff --git a/packages/client/package.json b/packages/client/package.json
index eb79afde78..23c55d2304 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -26,14 +26,22 @@
     "url": "https://github.com/sysgears/apollo-universal-starter-kit/issues"
   },
   "homepage": "https://github.com/sysgears/apollo-universal-starter-kit",
-  "keywords": ["apollo", "universal", "starter", "graphql", "react", "redux"],
+  "keywords": [
+    "apollo",
+    "universal",
+    "starter",
+    "graphql",
+    "react",
+    "redux"
+  ],
   "author": "SysGears INC",
   "license": "MIT",
   "dependencies": {
     "@domain-schema/core": "^0.0.33",
     "@domain-schema/validation": "^0.0.33",
-    "@fortawesome/fontawesome": "^1.1.3",
+    "@fortawesome/fontawesome": "^1.1.8",
     "@fortawesome/fontawesome-free-brands": "^5.0.6",
+    "@fortawesome/fontawesome-free-webfonts": "^1.0.9",
     "@fortawesome/react-fontawesome": "0.0.18",
     "antd": "^3.3.3",
     "apollo-cache-inmemory": "^1.1.12",
@@ -69,6 +77,7 @@
     "react-apollo": "^2.1.4",
     "react-art": "^16.3.2",
     "react-cookie": "^2.1.2",
+    "react-datepicker": "^1.5.0",
     "react-debounce-input": "^3.1.0",
     "react-dnd": "^2.5.4",
     "react-dnd-html5-backend": "^2.5.4",
diff --git a/packages/client/src/modules/common/components/crud/FilterView.web.jsx b/packages/client/src/modules/common/components/crud/FilterView.web.jsx
index 92e404b5d1..f03a34b4f6 100644
--- a/packages/client/src/modules/common/components/crud/FilterView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/FilterView.web.jsx
@@ -4,7 +4,7 @@ import { Formik } from 'formik';
 import { DebounceInput } from 'react-debounce-input';
 
 import { hasRole } from '../../../user/containers/Auth';
-import { Form, FormItem, Input, Row, Col, Button, Icon } from '../web/ui-antd/index';
+import { Form, FormItem, Input, Row, Col, Button, Icon } from '../web';
 import { createFormFields } from '../../util';
 import { mapFormPropsToValues, pickInputFields } from '../../../../utils/crud';
 
@@ -74,7 +74,7 @@ class FilterView extends React.PureComponent {
           onFilterChange({});
         }}
         render={({ values, handleChange, handleBlur, handleSubmit, handleReset }) => (
-          <Form className="ant-advanced-search-form" onSubmit={handleSubmit}>
+          <Form className="ant-advanced-search-form bootstrap-advanced-search-form" onSubmit={handleSubmit}>
             <Row>
               <Col span={8}>
                 <FormItem label="Find" {...formItemLayout}>
@@ -95,7 +95,11 @@ class FilterView extends React.PureComponent {
                   Clear
                 </Button>
                 <a style={{ marginLeft: 8, fontSize: 12 }} onClick={this.toggle}>
-                  Advanced <Icon type={this.state.expand ? 'up' : 'down'} />
+                  Advanced{' '}
+                  <Icon
+                    type={this.state.expand ? 'up' : 'down'}
+                    className={this.state.expand ? 'fas fa-chevron-up' : 'fas fa-chevron-down'}
+                  />
                 </a>
               </Col>
             </Row>
diff --git a/packages/client/src/modules/common/components/crud/FormView.web.jsx b/packages/client/src/modules/common/components/crud/FormView.web.jsx
index 2c3caa7911..81a1937c39 100644
--- a/packages/client/src/modules/common/components/crud/FormView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/FormView.web.jsx
@@ -5,7 +5,7 @@ import DomainValidation from '@domain-schema/validation';
 
 import { onSubmit, mapFormPropsToValues } from '../../../../utils/crud';
 import { createFormFields } from '../../util';
-import { Form, FormItem, Button } from '../web/ui-antd/index';
+import { Form, FormItem, Button } from '../web';
 
 const tailFormItemLayout = {
   wrapperCol: {
diff --git a/packages/client/src/modules/common/components/crud/ListView.web.jsx b/packages/client/src/modules/common/components/crud/ListView.web.jsx
index b417c356ba..0db53a9a2c 100644
--- a/packages/client/src/modules/common/components/crud/ListView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/ListView.web.jsx
@@ -5,7 +5,7 @@ import { Link } from 'react-router-dom';
 import { Formik } from 'formik';
 import { DragDropContext, DragSource, DropTarget } from 'react-dnd';
 import HTML5Backend from 'react-dnd-html5-backend';
-import { Table, Button, Popconfirm, Row, Col, Form, FormItem, Alert, Spin } from '../web/ui-antd/index';
+import { Table, Button, Popconfirm, Row, Col, Form, FormItem, Alert, Spin } from '../web';
 import { createColumnFields, createFormFields } from '../../util';
 import { mapFormPropsToValues, pickInputFields } from '../../../../utils/crud';
 import { hasRole } from '../../../user/containers/Auth';
@@ -329,7 +329,7 @@ class ListView extends React.Component {
           </Col>
           {showBatchFields && [
             <Col span={2} key="batchDelete" style={{ paddingTop: '3px' }}>
-              <Popconfirm title="Sure to delete?" onConfirm={this.hendleDeleteMany}>
+              <Popconfirm title="Sure to delete?" onConfirm={this.hendleDeleteMany} target={'batch-delete-button'}>
                 <Button color="primary" disabled={!hasSelected} loading={loading && !data}>
                   Delete
                 </Button>
@@ -415,7 +415,14 @@ class ListView extends React.Component {
         onRow: (record, index) => ({
           index,
           moveRow: this.moveRow
-        })
+        }),
+        onHeaderRow: () => {
+          return {
+            style: {
+              height: tableHeaderColumnHeight
+            }
+          };
+        }
       };
     }
 
@@ -424,16 +431,7 @@ class ListView extends React.Component {
         {wait && <Spin size="small" />}
         {error && <Alert color="error" message={error} />}
         {success && <Alert color="success" message={success} />}
-        <Table
-          {...tableProps}
-          onHeaderRow={() => {
-            return {
-              style: {
-                height: tableHeaderColumnHeight
-              }
-            };
-          }}
-        />
+        <Table {...tableProps} />
         {data && this.renderLoadMore(data, loadMoreRows)}
       </div>
     );
diff --git a/packages/client/src/modules/common/components/web/index.jsx b/packages/client/src/modules/common/components/web/index.jsx
index 0850131586..eed0b865f2 100644
--- a/packages/client/src/modules/common/components/web/index.jsx
+++ b/packages/client/src/modules/common/components/web/index.jsx
@@ -1,18 +1,4 @@
 export * from './ui-bootstrap';
 //export * from './ui-antd';
-export {
-  RenderInput,
-  RenderNumber,
-  RenderTextArea,
-  RenderSelectQuery,
-  RenderSelectCountry,
-  RenderDate,
-  RenderSwitch,
-  Popconfirm,
-  Switch,
-  InputNumber,
-  Icon,
-  Spin
-} from './ui-antd';
 
 export { default as LayoutCenter } from './LayoutCenter';
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/DatePicker.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/DatePicker.jsx
new file mode 100644
index 0000000000..1b4c0f75a1
--- /dev/null
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/DatePicker.jsx
@@ -0,0 +1,7 @@
+import React from 'react';
+import { DatePicker as ADDatePicker } from 'antd';
+
+const DatePicker = props => {
+  return <ADDatePicker {...props} />;
+};
+export default DatePicker;
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderDate.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderDate.jsx
index 5d75792113..57d7edb5ce 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderDate.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderDate.jsx
@@ -1,8 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { DatePicker } from 'antd';
 import moment from 'moment';
-import { FormItem } from './index';
+import { FormItem, DatePicker } from './index';
 
 const dateFormat = 'YYYY-MM-DD';
 
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/Select.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/Select.jsx
index e3f7ba6055..0169f894e0 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/Select.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/Select.jsx
@@ -1,8 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import { Select as ADSelect } from 'antd';
 
 const Select = ({ children, ...props }) => {
-  return <select {...props}>{children}</select>;
+  return <ADSelect {...props}>{children}</ADSelect>;
 };
 
 Select.propTypes = {
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/index.js b/packages/client/src/modules/common/components/web/ui-antd/components/index.js
index 98633717fe..2f7f5d721e 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/index.js
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/index.js
@@ -37,3 +37,4 @@ export { default as Popconfirm } from './Popconfirm';
 export { default as Icon } from './Icon';
 export { default as LanguagePicker } from './LanguagePicker';
 export { default as Pagination } from './Pagination';
+export { default as DatePicker } from './DatePicker';
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/Alert.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/Alert.jsx
index a0bb065c76..3a98328bd7 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/Alert.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/Alert.jsx
@@ -2,20 +2,22 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Alert as RSAlert } from 'reactstrap';
 
-const Alert = ({ children, color, ...props }) => {
+const Alert = ({ children, color, message, ...props }) => {
   if (color === 'error') {
     color = 'danger';
   }
+
   return (
     <RSAlert {...props} color={color}>
-      {children}
+      {children ? children : message}
     </RSAlert>
   );
 };
 
 Alert.propTypes = {
   children: PropTypes.node,
-  color: PropTypes.string
+  color: PropTypes.string,
+  message: PropTypes.string
 };
 
 export default Alert;
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/Button.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/Button.jsx
index a9006dff50..5f60e82887 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/Button.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/Button.jsx
@@ -2,12 +2,13 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Button as RSButton } from 'reactstrap';
 
-const Button = ({ children, ...props }) => {
+const Button = ({ children, htmlType, ...props }) => {
   return <RSButton {...props}>{children}</RSButton>;
 };
 
 Button.propTypes = {
-  children: PropTypes.node
+  children: PropTypes.node,
+  htmlType: PropTypes.any
 };
 
 export default Button;
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/DatePicker.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/DatePicker.jsx
new file mode 100644
index 0000000000..0ec5e601bb
--- /dev/null
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/DatePicker.jsx
@@ -0,0 +1,14 @@
+import React from 'react';
+import ReactDatePicker from 'react-datepicker';
+import { Input } from 'reactstrap';
+import PropTypes from 'prop-types';
+
+const DatePicker = ({ value, ...props }) => {
+  return <ReactDatePicker {...props} selected={value} customInput={<Input />} />;
+};
+
+DatePicker.propTypes = {
+  value: PropTypes.object
+};
+
+export default DatePicker;
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/FormItem.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/FormItem.jsx
index f87dfbd8d5..eab62311f8 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/FormItem.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/FormItem.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { FormGroup, Label } from 'reactstrap';
 
-const FormItem = ({ children, label, ...props }) => {
+const FormItem = ({ children, labelCol, wrapperCol, validateStatus, label, ...props }) => {
   return (
     <FormGroup {...props}>
       {label && <Label size="md">{label}:&nbsp;</Label>}
@@ -13,7 +13,10 @@ const FormItem = ({ children, label, ...props }) => {
 
 FormItem.propTypes = {
   children: PropTypes.node,
-  label: PropTypes.string
+  label: PropTypes.string,
+  labelCol: PropTypes.any,
+  wrapperCol: PropTypes.any,
+  validateStatus: PropTypes.any
 };
 
 export default FormItem;
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/Icon.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/Icon.jsx
new file mode 100644
index 0000000000..123c95f820
--- /dev/null
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/Icon.jsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+const Icon = ({ children, type, ...props }) => {
+  return <i {...props}>{children}</i>;
+};
+
+Icon.propTypes = {
+  children: PropTypes.node,
+  type: PropTypes.any
+};
+
+export default Icon;
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/Input.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/Input.jsx
index e51b62b9f9..f68a4c83bc 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/Input.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/Input.jsx
@@ -2,12 +2,13 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Input as RSInput } from 'reactstrap';
 
-const Input = ({ children, ...props }) => {
+const Input = ({ children, onPressEnter, ...props }) => {
   return <RSInput {...props}>{children}</RSInput>;
 };
 
 Input.propTypes = {
-  children: PropTypes.node
+  children: PropTypes.node,
+  onPressEnter: PropTypes.func
 };
 
 export default Input;
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/InputNumber.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/InputNumber.jsx
new file mode 100644
index 0000000000..d688327d20
--- /dev/null
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/InputNumber.jsx
@@ -0,0 +1,17 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Input } from './index';
+
+const InputNumber = ({ children, ...props }) => {
+  return (
+    <Input type="number" {...props}>
+      {children}
+    </Input>
+  );
+};
+
+InputNumber.propTypes = {
+  children: PropTypes.node
+};
+
+export default InputNumber;
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/Popconfirm.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/Popconfirm.jsx
new file mode 100644
index 0000000000..2f683feb35
--- /dev/null
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/Popconfirm.jsx
@@ -0,0 +1,63 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Button, Popover, PopoverHeader, PopoverBody } from 'reactstrap';
+
+class Popconfirm extends React.Component {
+  static propTypes = {
+    children: PropTypes.node,
+    title: PropTypes.string.isRequired,
+    target: PropTypes.string.isRequired,
+    onConfirm: PropTypes.func.isRequired,
+    size: PropTypes.string,
+    color: PropTypes.string,
+    placement: PropTypes.string,
+    className: PropTypes.string
+  };
+
+  constructor(props) {
+    super(props);
+    this.toggle = this.toggle.bind(this);
+    this.onConfirm = this.onConfirm.bind(this);
+    this.state = {
+      isOpen: false
+    };
+  }
+
+  toggle() {
+    this.setState({
+      isOpen: !this.state.isOpen
+    });
+  }
+
+  onConfirm() {
+    this.props.onConfirm();
+  }
+
+  render() {
+    const { className = '', placement = 'left-start', color = null, size = 'sm', target, title, children } = this.props;
+    const buttonsStyle = {
+      marginLeft: '3px',
+      marginRight: '3px'
+    };
+    return (
+      <React.Fragment>
+        <div onClick={this.toggle} id={target} className={className}>
+          {children}
+        </div>
+        <Popover isOpen={this.state.isOpen} target={target} toggle={this.toggle} placement={placement}>
+          <PopoverHeader>{title}</PopoverHeader>
+          <PopoverBody>
+            <Button color={color ? color : 'secondary'} size={size} onClick={this.toggle} style={buttonsStyle}>
+              Cancel
+            </Button>
+            <Button color={color ? color : 'primary'} size={size} onClick={this.onConfirm} style={buttonsStyle}>
+              Ok
+            </Button>
+          </PopoverBody>
+        </Popover>
+      </React.Fragment>
+    );
+  }
+}
+
+export default Popconfirm;
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderDate.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderDate.jsx
new file mode 100644
index 0000000000..03ef7c235b
--- /dev/null
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderDate.jsx
@@ -0,0 +1,74 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import moment from 'moment';
+import { FormItem, DatePicker } from './index';
+
+const dateFormat = 'YYYY-MM-DD';
+
+export default class RenderDate extends React.Component {
+  static propTypes = {
+    input: PropTypes.object,
+    setFieldValue: PropTypes.func.isRequired,
+    setFieldTouched: PropTypes.func.isRequired,
+    label: PropTypes.string,
+    type: PropTypes.string,
+    formItemLayout: PropTypes.object,
+    meta: PropTypes.object
+  };
+
+  handleChange = date => {
+    const {
+      input: { name },
+      setFieldValue
+    } = this.props;
+    //console.log('RenderDate: handleChange');
+    //console.log('name:', name);
+    //console.log('dateString:', dateString);
+    setFieldValue(name, moment(date).format(dateFormat));
+  };
+
+  handleBlur = () => {
+    const {
+      input: { name },
+      setFieldTouched
+    } = this.props;
+    setFieldTouched(name, true);
+  };
+
+  render() {
+    const {
+      input: { value, onChange, onBlur, ...inputRest },
+      label,
+      formItemLayout,
+      meta: { touched, error }
+    } = this.props;
+
+    let validateStatus = '';
+    if (touched && error) {
+      validateStatus = 'error';
+    }
+
+    let formatedValue = value;
+    if (value !== null && value !== undefined && value !== '') {
+      formatedValue = moment(value, dateFormat);
+    } else {
+      formatedValue = null;
+    }
+    //console.log('value:', value);
+    //console.log('typeof value:', typeof value);
+    // console.log('formatedValue:', formatedValue);
+    return (
+      <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
+        <div>
+          <DatePicker
+            value={formatedValue}
+            dateFormat={dateFormat}
+            onChange={this.handleChange}
+            onBlur={this.handleBlur}
+            {...inputRest}
+          />
+        </div>
+      </FormItem>
+    );
+  }
+}
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderInput.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderInput.jsx
new file mode 100644
index 0000000000..fd97320bfb
--- /dev/null
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderInput.jsx
@@ -0,0 +1,36 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import { FormItem, Input } from './index';
+
+export default class RenderInput extends React.Component {
+  static propTypes = {
+    input: PropTypes.object,
+    label: PropTypes.string,
+    formItemLayout: PropTypes.object,
+    hasTypeOf: PropTypes.func.isRequired,
+    meta: PropTypes.object
+  };
+
+  render() {
+    const {
+      input,
+      label,
+      formItemLayout,
+      meta: { touched, error }
+    } = this.props;
+
+    let validateStatus = '';
+    if (touched && error) {
+      validateStatus = 'error';
+    }
+
+    return (
+      <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
+        <div>
+          <Input {...input} placeholder={label} type="text" />
+        </div>
+      </FormItem>
+    );
+  }
+}
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderNumber.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderNumber.jsx
new file mode 100644
index 0000000000..225a7a99da
--- /dev/null
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderNumber.jsx
@@ -0,0 +1,72 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import DomainSchema from '@domain-schema/core';
+
+import { FormItem, InputNumber } from './index';
+
+export default class RenderNumber extends React.Component {
+  static propTypes = {
+    input: PropTypes.object,
+    setFieldValue: PropTypes.func.isRequired,
+    setFieldTouched: PropTypes.func.isRequired,
+    label: PropTypes.string,
+    type: PropTypes.string,
+    formItemLayout: PropTypes.object,
+    hasTypeOf: PropTypes.func.isRequired,
+    meta: PropTypes.object
+  };
+
+  handleChange = e => {
+    const {
+      input: { name },
+      setFieldValue
+    } = this.props;
+
+    setFieldValue(name, e.target.value);
+  };
+
+  handleBlur = () => {
+    const {
+      input: { name },
+      setFieldTouched
+    } = this.props;
+    setFieldTouched(name, true);
+  };
+
+  render() {
+    const {
+      input: { onChange, onBlur, ...inputRest },
+      label,
+      formItemLayout,
+      hasTypeOf,
+      meta: { touched, error }
+    } = this.props;
+
+    let validateStatus = '';
+    if (touched && error) {
+      validateStatus = 'error';
+    }
+
+    let input = {
+      ...inputRest
+    };
+
+    if (hasTypeOf(DomainSchema.Float)) {
+      //console.log('RenderNumber: hasTypeOf(Float) TRUE');
+      input = {
+        //step: '0.01',
+        ...inputRest
+      };
+    } else if (hasTypeOf(Number)) {
+      //console.log('RenderNumber: hasTypeOf(Number) TRUE');
+    }
+
+    return (
+      <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
+        <div>
+          <InputNumber {...input} placeholder={label} onChange={this.handleChange} onBlur={this.handleBlur} />
+        </div>
+      </FormItem>
+    );
+  }
+}
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectCountry.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectCountry.jsx
new file mode 100644
index 0000000000..7ebe5120b6
--- /dev/null
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectCountry.jsx
@@ -0,0 +1,93 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import countries from '../../../../../../../../common/ISOCountries';
+import { FormItem, Input } from './index';
+
+export default class RenderSelectCountry extends React.Component {
+  static propTypes = {
+    input: PropTypes.object,
+    setFieldValue: PropTypes.func.isRequired,
+    setFieldTouched: PropTypes.func.isRequired,
+    label: PropTypes.string,
+    formItemLayout: PropTypes.object,
+    meta: PropTypes.object,
+    style: PropTypes.object,
+    formType: PropTypes.string.isRequired
+  };
+
+  handleChange = value => {
+    const {
+      input: { name },
+      setFieldValue
+    } = this.props;
+    setFieldValue(name, value);
+  };
+
+  handleBlur = () => {
+    const {
+      input: { name },
+      setFieldTouched
+    } = this.props;
+    setFieldTouched(name, true);
+  };
+
+  render() {
+    const {
+      input: { value, onChange, onBlur, ...inputRest },
+      label,
+      style,
+      formItemLayout,
+      meta: { touched, error },
+      formType
+    } = this.props;
+
+    let validateStatus = '';
+    if (touched && error) {
+      validateStatus = 'error';
+    }
+
+    const options = [];
+    Object.entries(countries).forEach(([key, value]) =>
+      options.push(
+        <option key={key} value={key}>
+          {value}
+        </option>
+      )
+    );
+
+    let defaultStyle = { width: '100%' };
+    if (style) {
+      defaultStyle = style;
+    }
+
+    let defaultValue = 'defaultValue';
+    if (formType === 'filter') {
+      defaultValue = 'value';
+    }
+
+    let props = {
+      allowClear: formType !== 'form' ? true : false,
+      showSearch: true,
+      //labelInValue: true,
+      dropdownMatchSelectWidth: false,
+      style: defaultStyle,
+      onChange: this.handleChange,
+      onBlur: this.handleBlur,
+      ...inputRest,
+      [defaultValue]: value,
+      optionFilterProp: 'children',
+      filterOption: (input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    };
+
+    return (
+      <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={error}>
+        <div>
+          <Input type="select" {...props}>
+            {options}
+          </Input>
+        </div>
+      </FormItem>
+    );
+  }
+}
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx
new file mode 100644
index 0000000000..bab5b41a8d
--- /dev/null
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx
@@ -0,0 +1,176 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { pascalize, camelize } from 'humps';
+
+import { FormItem, Input } from './index';
+
+export default class RenderSelectQuery extends React.Component {
+  static propTypes = {
+    input: PropTypes.object,
+    setFieldValue: PropTypes.func.isRequired,
+    setFieldTouched: PropTypes.func.isRequired,
+    label: PropTypes.string,
+    formItemLayout: PropTypes.object,
+    meta: PropTypes.object,
+    schema: PropTypes.object,
+    style: PropTypes.object,
+    formType: PropTypes.string.isRequired
+  };
+
+  state = {
+    searchText: '',
+    dirty: false
+  };
+
+  handleChange = value => {
+    const {
+      input: { name },
+      setFieldValue
+    } = this.props;
+    //console.log('RenderSelect: handleChange');
+    //console.log('name:', name);
+    //console.log('value:', value);
+    setFieldValue(name, value ? { id: value.key, name: value.label } : undefined);
+  };
+
+  handleBlur = () => {
+    const {
+      input: { name },
+      setFieldTouched
+    } = this.props;
+    setFieldTouched(name, true);
+  };
+
+  search = value => {
+    const { dirty } = this.state;
+    //onsole.log('search:', value);
+    if ((value && value.length >= 1) || dirty) {
+      this.setState({ searchText: value, dirty: true });
+    }
+  };
+
+  render() {
+    const {
+      input: { value, onChange, onBlur, ...inputRest },
+      label,
+      schema,
+      style,
+      formItemLayout,
+      meta: { touched, error },
+      formType
+    } = this.props;
+    const { searchText, dirty } = this.state;
+
+    let validateStatus = '';
+    if (touched && error) {
+      validateStatus = 'error';
+    }
+
+    const camelizeSchemaName = camelize(schema.name);
+    const pascalizeSchemaName = pascalize(schema.name);
+    let column = 'name';
+    let orderBy = null;
+    for (const remoteKey of schema.keys()) {
+      const remoteValue = schema.values[remoteKey];
+      if (remoteValue.sortBy) {
+        column = remoteKey;
+      }
+      if (remoteKey === 'rank') {
+        orderBy = {
+          column: 'rank'
+        };
+      }
+    }
+
+    const toString = schema.__.__toString ? schema.__.__toString : opt => opt[column];
+
+    let formatedValue =
+      value && value != '' && value != undefined
+        ? { key: value.id.toString(), label: toString(value) }
+        : { key: '', label: '' };
+    //console.log('formatedValue:', formatedValue);
+
+    // eslint-disable-next-line import/no-dynamic-require
+    const Query = require(`../../../../../${camelizeSchemaName}/containers/${pascalizeSchemaName}Query`)['default'];
+    //console.log(`../../../../../${camelizeSchemaName}/containers/${pascalizeSchemaName}Query`);
+
+    let defaultStyle = { width: '100%' };
+    if (style) {
+      defaultStyle = style;
+    }
+
+    let defaultValue = 'defaultValue';
+    if (formType === 'filter') {
+      defaultValue = 'value';
+    }
+
+    return (
+      <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={error}>
+        <div>
+          <Query limit={10} filter={{ searchText }} orderBy={orderBy}>
+            {({ loading, data }) => {
+              if (!loading || data) {
+                const options = data.edges
+                  ? data.edges.map(opt => (
+                      <option key={opt.id} value={opt.id.toString()}>
+                        {toString(opt)}
+                      </option>
+                    ))
+                  : null;
+
+                let props = {
+                  allowClear: formType !== 'form' ? true : false,
+                  showSearch: true,
+                  labelInValue: true,
+                  dropdownMatchSelectWidth: false,
+                  style: defaultStyle,
+                  onChange: this.handleChange,
+                  onBlur: this.handleBlur,
+                  ...inputRest,
+                  [defaultValue]: formatedValue
+                };
+
+                if (data.pageInfo.totalCount > 10) {
+                  if (data.edges && value && value != '' && value != undefined) {
+                    if (!data.edges.find(node => node.id === value.id)) {
+                      if (!dirty) {
+                        options.unshift(
+                          <option key={value.id} value={value.id.toString()}>
+                            {toString(value)}
+                          </option>
+                        );
+                      } else {
+                        formatedValue = { key: data.edges[0].id.toString() };
+                      }
+                    }
+                  }
+
+                  props = {
+                    ...props,
+                    filterOption: false,
+                    [defaultValue]: formatedValue,
+                    onSearch: this.search
+                  };
+                } else {
+                  props = {
+                    ...props,
+                    optionFilterProp: 'children',
+                    filterOption: (input, option) =>
+                      option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                  };
+                }
+                return (
+                  <Input type="select" {...props}>
+                    {options}
+                  </Input>
+                );
+              } else {
+                return <div>Loading...</div>;
+              }
+            }}
+          </Query>
+        </div>
+      </FormItem>
+    );
+  }
+}
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSwitch.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSwitch.jsx
new file mode 100644
index 0000000000..470b4902d1
--- /dev/null
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSwitch.jsx
@@ -0,0 +1,56 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { FormItem, Switch } from './index';
+
+export default class RenderSwitch extends React.Component {
+  static propTypes = {
+    input: PropTypes.object,
+    setFieldValue: PropTypes.func.isRequired,
+    setFieldTouched: PropTypes.func.isRequired,
+    label: PropTypes.string,
+    type: PropTypes.string,
+    formItemLayout: PropTypes.object,
+    meta: PropTypes.object
+  };
+
+  handleChange = e => {
+    const {
+      input: { name },
+      setFieldValue
+    } = this.props;
+    //console.log('RenderSwitch: handleChange');
+    //console.log('name:', name);
+
+    setFieldValue(name, e.target.checked);
+  };
+
+  handleBlur = () => {
+    const {
+      input: { name },
+      setFieldTouched
+    } = this.props;
+    setFieldTouched(name, true);
+  };
+
+  render() {
+    const {
+      input: { value },
+      label,
+      formItemLayout,
+      meta: { touched, error }
+    } = this.props;
+
+    let validateStatus = '';
+    if (touched && error) {
+      validateStatus = 'error';
+    }
+
+    return (
+      <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
+        <div>
+          <Switch checked={!!value} onChange={this.handleChange} onBlur={this.handleBlur} />
+        </div>
+      </FormItem>
+    );
+  }
+}
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderTextArea.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderTextArea.jsx
new file mode 100644
index 0000000000..81c2dd1eb9
--- /dev/null
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderTextArea.jsx
@@ -0,0 +1,37 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import { FormItem, Input } from './index';
+
+export default class RenderTextArea extends React.Component {
+  static propTypes = {
+    input: PropTypes.object,
+    label: PropTypes.string,
+    type: PropTypes.string,
+    formItemLayout: PropTypes.object,
+    hasTypeOf: PropTypes.func.isRequired,
+    meta: PropTypes.object
+  };
+
+  render() {
+    const {
+      input,
+      label,
+      formItemLayout,
+      meta: { touched, error }
+    } = this.props;
+
+    let validateStatus = '';
+    if (touched && error) {
+      validateStatus = 'error';
+    }
+
+    return (
+      <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
+        <div>
+          <Input {...input} type="textarea" placeholder={label} autosize />
+        </div>
+      </FormItem>
+    );
+  }
+}
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/Spin.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/Spin.jsx
new file mode 100644
index 0000000000..7bb6665886
--- /dev/null
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/Spin.jsx
@@ -0,0 +1,21 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+const Spin = ({ children, size, ...props }) => {
+  let spinnerSize = '';
+  if (size === 'small') {
+    spinnerSize = 'fa-sm';
+  }
+  return (
+    <i className={'fas fa-spinner fa-spin ' + spinnerSize} {...props}>
+      {children}
+    </i>
+  );
+};
+
+Spin.propTypes = {
+  children: PropTypes.node,
+  size: PropTypes.string
+};
+
+export default Spin;
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/Switch.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/Switch.jsx
new file mode 100644
index 0000000000..c3ea379ae8
--- /dev/null
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/Switch.jsx
@@ -0,0 +1,12 @@
+import React from 'react';
+
+const Switch = props => {
+  return (
+    <label className="bootstrap-switch">
+      <input type="checkbox" {...props} />
+      <span className="bootstrap-slider" />
+    </label>
+  );
+};
+
+export default Switch;
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/Table.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/Table.jsx
index 82e44d8374..6df8fa14bc 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/Table.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/Table.jsx
@@ -24,10 +24,15 @@ const renderData = (columns, entry) => {
   });
 };
 
-const Table = ({ dataSource, columns, pagination, loading, ...props }) => {
+const Table = ({ dataSource, columns, title, footer, onHeaderRow, rowSelection, pagination, loading, ...props }) => {
   return (
     <RSTable {...props}>
       <thead>
+        {title ? (
+          <tr>
+            <th colSpan={100}>{title()}</th>
+          </tr>
+        ) : null}
         <tr>{renderHead(columns)}</tr>
       </thead>
       <tbody>{dataSource && renderBody(columns, dataSource)}</tbody>
@@ -39,7 +44,11 @@ Table.propTypes = {
   dataSource: PropTypes.array,
   columns: PropTypes.array,
   pagination: PropTypes.bool,
-  loading: PropTypes.bool
+  loading: PropTypes.bool,
+  title: PropTypes.func,
+  footer: PropTypes.any,
+  onHeaderRow: PropTypes.any,
+  rowSelection: PropTypes.any
 };
 
 export default Table;
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/index.js b/packages/client/src/modules/common/components/web/ui-bootstrap/components/index.js
index e164badb1b..45b2c8dae0 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/index.js
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/index.js
@@ -24,3 +24,16 @@ export { default as ListGroup } from './ListGroup';
 export { default as ListItem } from './ListItem';
 export { default as LanguagePicker } from './LanguagePicker';
 export { default as Pagination } from './Pagination';
+export { default as Switch } from './Switch';
+export { default as InputNumber } from './InputNumber';
+export { default as RenderInput } from './RenderInput';
+export { default as RenderNumber } from './RenderNumber';
+export { default as RenderSelectQuery } from './RenderSelectQuery';
+export { default as RenderSwitch } from './RenderSwitch';
+export { default as RenderTextArea } from './RenderTextArea';
+export { default as DatePicker } from './DatePicker';
+export { default as RenderDate } from './RenderDate';
+export { default as Popconfirm } from './Popconfirm';
+export { default as Icon } from './Icon';
+export { default as Spin } from './Spin';
+export { default as RenderSelectCountry } from './RenderSelectCountry';
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/styles/bootstrap-switch.scss b/packages/client/src/modules/common/components/web/ui-bootstrap/styles/bootstrap-switch.scss
new file mode 100644
index 0000000000..8eb95a63ef
--- /dev/null
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/styles/bootstrap-switch.scss
@@ -0,0 +1,52 @@
+.bootstrap-switch {
+  position: relative;
+  display: inline-block;
+  width: 40px;
+  height: 24px;
+
+  .bootstrap-slider {
+    position: absolute;
+    cursor: pointer;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: #ccc;
+    -webkit-transition: .4s;
+    transition: .4s;
+    border-radius: 37px;
+  }
+
+  .bootstrap-slider:before {
+    position: absolute;
+    content: "";
+    height: 15px;
+    width: 15px;
+    left: 4px;
+    bottom: 5px;
+    background-color: white;
+    -webkit-transition: .4s;
+    transition: .4s;
+  }
+
+  input:checked + .bootstrap-slider {
+    background-color: #2196F3;
+  }
+
+  input:focus + .bootstrap-slider {
+    box-shadow: 0 0 1px #2196F3;
+  }
+
+  input:checked + .bootstrap-slider:before {
+    -webkit-transform: translateX(18px);
+    -ms-transform: translateX(18px);
+    transform: translateX(18px);
+  }
+
+  .bootstrap-slider:before {
+    border-radius: 50%;
+  }
+}
+
+.bootstrap-switch input {display:none;}
+
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/styles/datepicker.scss b/packages/client/src/modules/common/components/web/ui-bootstrap/styles/datepicker.scss
new file mode 100644
index 0000000000..81ec8473d8
--- /dev/null
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/styles/datepicker.scss
@@ -0,0 +1 @@
+@import '../../../../../../../../../node_modules/react-datepicker/src/stylesheets/datepicker';
\ No newline at end of file
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/styles/fontawesome.scss b/packages/client/src/modules/common/components/web/ui-bootstrap/styles/fontawesome.scss
new file mode 100644
index 0000000000..036c5ba1e0
--- /dev/null
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/styles/fontawesome.scss
@@ -0,0 +1,3 @@
+@import '../../../../../../../../../node_modules/@fortawesome/fontawesome-free-webfonts/scss/fontawesome.scss';
+$fa-font-path:  "../../../../../../../../../node_modules/@fortawesome/fontawesome-free-webfonts/webfonts";
+@import '../../../../../../../../../node_modules/@fortawesome/fontawesome-free-webfonts/scss/fa-solid.scss';
\ No newline at end of file
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/styles/styles.scss b/packages/client/src/modules/common/components/web/ui-bootstrap/styles/styles.scss
index 864603c42b..ad32989b5e 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/styles/styles.scss
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/styles/styles.scss
@@ -1,4 +1,7 @@
 @import 'bootstrap';
+@import "bootstrap-switch";
+@import "datepicker";
+@import 'fontawesome';
 
 #root {
   min-height: 100vh;
@@ -30,4 +33,54 @@
 .pagination-select {
   width: 30%;
   margin-bottom: 20px;
+}
+
+.editable-cell {
+  .editable-cell-text-wrapper, .editable-cell-input-wrapper {
+    & > div {
+      display: inline-block;
+    }
+    &:hover {
+      cursor: pointer;
+      color: #007bff;
+      .editable-cell-icon {
+        display: block;
+      }
+    }
+    .editable-cell-icon {
+      float: right;
+      color: lightgray;
+      display: none;
+      &:hover {
+        cursor: pointer;
+        color: #007bff;
+      }
+    }
+    .editable-cell-icon-check{
+      color: lightgray;
+      float: right;
+      position: relative;
+      top: 10px;
+      &:hover {
+        cursor: pointer;
+        color: #007bff;
+      }
+    }
+
+    .form-control{
+      display: inline-block;
+      width: 90%;
+    }
+  }
+}
+
+.bootstrap-advanced-search-form{
+  padding: 15px;
+  background-color: #d3d3d34a;
+  border-top: 1px solid #d3d3d3ba;
+}
+
+.bootstrap-cell-delete-button{
+  display: inline-block;
+  margin-left: 5px;
 }
\ No newline at end of file
diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index 2110f761af..76bcefd35a 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -5,7 +5,6 @@ import { startCase, round } from 'lodash';
 import { pascalize, camelize } from 'humps';
 import { Link } from 'react-router-dom';
 import { FieldArray } from 'formik';
-import { Select, DatePicker, Spin } from 'antd';
 import moment from 'moment';
 import DomainSchema from '@domain-schema/core';
 
@@ -27,8 +26,11 @@ import {
   Button,
   FormItem,
   Col,
-  Input
-} from './components/web/ui-antd/index';
+  Input,
+  DatePicker,
+  Spin,
+  Select
+} from './components/web';
 
 const dateFormat = 'YYYY-MM-DD';
 
@@ -42,8 +44,7 @@ export const createColumnFields = ({
   hendleDelete,
   onCellChange,
   customFields = {},
-  customActions,
-  tableActionColumnHeight = '48px'
+  customActions
 }) => {
   let columns = [];
   // use customFields if definded otherwise use schema.keys()
@@ -124,7 +125,7 @@ export const createColumnFields = ({
             render: (text, record) => {
               const data = {};
               data[key] = !text;
-              return <Switch checked={text} onClick={() => hendleUpdate(data, record.id)} />;
+              return <Switch checked={text} onClick={() => hendleUpdate(data, record.id)} onChange={() => {}} />;
             }
           });
         } else if ((hasTypeOf(String) || hasTypeOf(Number) || hasTypeOf(Date)) && key !== 'id') {
@@ -209,27 +210,26 @@ export const createColumnFields = ({
       width: 150,
       fixed: 'right',
       render: (text, record) => {
-        return {
-          props: {
-            style: {
-              height: tableActionColumnHeight
-            }
-          },
-          children: (
-            <div>
-              <Link className="link" to={`/${link}/${record.id}`} key="edit">
-                <Button color="primary" size="sm">
-                  Edit
-                </Button>
-              </Link>
-              <Popconfirm title="Sure to delete?" onConfirm={() => hendleDelete(record.id)} key="delete">
-                <Button color="primary" size="sm">
-                  Delete
-                </Button>
-              </Popconfirm>
-            </div>
-          )
-        };
+        return (
+          <div>
+            <Link className="link" to={`/${link}/${record.id}`} key="edit">
+              <Button color="primary" size="sm">
+                Edit
+              </Button>
+            </Link>
+            <Popconfirm
+              title="Sure to delete?"
+              onConfirm={() => hendleDelete(record.id)}
+              key="delete"
+              target={`delete-button-${record.id}`}
+              className={'bootstrap-cell-delete-button'}
+            >
+              <Button color="primary" size="sm">
+                Delete
+              </Button>
+            </Popconfirm>
+          </div>
+        );
       }
     });
   }
@@ -533,10 +533,17 @@ class EditableCell extends React.Component {
     const value = e.target.value;
     this.setState({ value });
   };
-  handleNumberChange = value => {
+  handleNumberChange = e => {
+    let value = e;
+    if (e.target) {
+      value = e.target.value;
+    }
     this.setState({ value });
   };
   handleDateChange = (date, dateString) => {
+    if (moment(date).isValid()) {
+      return this.setState({ value: moment(date).format(dateFormat) });
+    }
     this.setState({ value: dateString });
   };
   handleSelectChange = ({ key, label }) => {
@@ -704,12 +711,12 @@ class EditableCell extends React.Component {
         {editable ? (
           <div className="editable-cell-input-wrapper">
             {input}
-            <Icon type="check" className="editable-cell-icon-check" onClick={this.check} />
+            <Icon type="check" className="editable-cell-icon-check fas fa-check" onClick={this.check} />
           </div>
         ) : (
           <div className="editable-cell-text-wrapper">
             {render(value, record) || '\u00A0'}
-            <Icon type="edit" className="editable-cell-icon" onClick={this.edit} />
+            <Icon type="edit" className="editable-cell-icon fas fa-pencil-alt" onClick={this.edit} />
           </div>
         )}
       </div>
diff --git a/yarn.lock b/yarn.lock
index a3ffe66a9a..4c513796ba 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -735,21 +735,29 @@
     pouchdb-collections "^1.0.1"
     tiny-queue "^0.2.1"
 
-"@fortawesome/fontawesome-common-types@^0.1.3", "@fortawesome/fontawesome-common-types@^0.1.4":
+"@fortawesome/fontawesome-common-types@^0.1.4":
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.1.4.tgz#1fbc66f0223646f23c5550c2c12e341078e2c262"
 
+"@fortawesome/fontawesome-common-types@^0.1.7":
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.1.7.tgz#4336c4b06d0b5608ff1215464b66fcf9f4795284"
+
 "@fortawesome/fontawesome-free-brands@^5.0.6":
   version "5.0.10"
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free-brands/-/fontawesome-free-brands-5.0.10.tgz#37f007a2f548682c8bfb7086b7e03dc65758580a"
   dependencies:
     "@fortawesome/fontawesome-common-types" "^0.1.4"
 
-"@fortawesome/fontawesome@^1.1.3":
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome/-/fontawesome-1.1.5.tgz#c7cfafdd3364245626293cc670357f9fb8487170"
+"@fortawesome/fontawesome-free-webfonts@^1.0.9":
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free-webfonts/-/fontawesome-free-webfonts-1.0.9.tgz#72f2c10453422aba0d338fa6a9cb761b50ba24d5"
+
+"@fortawesome/fontawesome@^1.1.8":
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome/-/fontawesome-1.1.8.tgz#75fe66a60f95508160bb16bd781ad7d89b280f5b"
   dependencies:
-    "@fortawesome/fontawesome-common-types" "^0.1.3"
+    "@fortawesome/fontawesome-common-types" "^0.1.7"
 
 "@fortawesome/react-fontawesome@0.0.18":
   version "0.0.18"
@@ -11387,6 +11395,15 @@ react-cookie@^2.1.2:
     prop-types "^15.0.0"
     universal-cookie "^2.1.2"
 
+react-datepicker@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/react-datepicker/-/react-datepicker-1.5.0.tgz#7eacd9609313189c84a21bb7421486054939a4b2"
+  dependencies:
+    classnames "^2.2.5"
+    prop-types "^15.6.0"
+    react-onclickoutside "^6.7.1"
+    react-popper "^0.9.1"
+
 react-debounce-input@^3.1.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/react-debounce-input/-/react-debounce-input-3.2.0.tgz#6978c6061d898f549f40417fb0d2ebbecf50aaaa"
@@ -11789,6 +11806,10 @@ react-navigation@^2.0.0:
     react-navigation-deprecated-tab-navigator "1.2.0"
     react-navigation-tabs "0.2.0"
 
+react-onclickoutside@^6.7.1:
+  version "6.7.1"
+  resolved "https://registry.yarnpkg.com/react-onclickoutside/-/react-onclickoutside-6.7.1.tgz#6a5b5b8b4eae6b776259712c89c8a2b36b17be93"
+
 react-popper@^0.10.4:
   version "0.10.4"
   resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-0.10.4.tgz#af2a415ea22291edd504678d7afda8a6ee3295aa"
@@ -11803,6 +11824,13 @@ react-popper@^0.8.3:
     popper.js "^1.12.9"
     prop-types "^15.6.0"
 
+react-popper@^0.9.1:
+  version "0.9.5"
+  resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-0.9.5.tgz#02a24ef3eec33af9e54e8358ab70eb0e331edd05"
+  dependencies:
+    popper.js "^1.14.1"
+    prop-types "^15.6.1"
+
 react-prop-types-element-of-type@2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/react-prop-types-element-of-type/-/react-prop-types-element-of-type-2.2.0.tgz#bcc332d3903c2259cf68c28a81c4a663faba59ac"

From ffddcdac57cec0c72e674e3d7efdbec1c71b82d2 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Fri, 15 Jun 2018 16:08:15 +0300
Subject: [PATCH 150/327] fix select relation and delete item

---
 packages/client/package.json                  |   2 +-
 .../components/RenderCellSelectQuery.jsx      | 111 ++++++++++++++++++
 .../web/ui-antd/components/index.js           |   1 +
 .../ui-bootstrap/components/Popconfirm.jsx    |   6 +-
 .../components/RenderCellSelectQuery.jsx      |  86 ++++++++++++++
 .../components/RenderSelectQuery.jsx          | 102 +++++-----------
 .../web/ui-bootstrap/components/index.js      |   1 +
 .../client/src/modules/common/util.web.jsx    |  97 +++------------
 yarn.lock                                     |   6 -
 9 files changed, 247 insertions(+), 165 deletions(-)
 create mode 100644 packages/client/src/modules/common/components/web/ui-antd/components/RenderCellSelectQuery.jsx
 create mode 100644 packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderCellSelectQuery.jsx

diff --git a/packages/client/package.json b/packages/client/package.json
index 23c55d2304..6b5b199b45 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -37,7 +37,7 @@
   "author": "SysGears INC",
   "license": "MIT",
   "dependencies": {
-    "@domain-schema/core": "^0.0.33",
+    "@domain-schema/core": "^0.0.34",
     "@domain-schema/validation": "^0.0.33",
     "@fortawesome/fontawesome": "^1.1.8",
     "@fortawesome/fontawesome-free-brands": "^5.0.6",
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderCellSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderCellSelectQuery.jsx
new file mode 100644
index 0000000000..a9e12e9084
--- /dev/null
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderCellSelectQuery.jsx
@@ -0,0 +1,111 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Select, Spin } from 'antd';
+import { pascalize, camelize } from 'humps';
+
+const Option = Select.Option;
+export default class RenderCellSelectQuery extends React.Component {
+  static propTypes = {
+    schema: PropTypes.object,
+    value: PropTypes.object,
+    searchText: PropTypes.any,
+    handleOnChange: PropTypes.func.isRequired,
+    style: PropTypes.object,
+    dirty: PropTypes.any
+  };
+
+  handleChange = value => {
+    this.props.handleOnChange(value ? { key: value.key, label: value.label } : '');
+  };
+
+  render() {
+    const { value, schema, style, searchText, dirty } = this.props;
+
+    const camelizeSchemaName = camelize(schema.name);
+    const pascalizeSchemaName = pascalize(schema.name);
+    let column = 'name';
+    let orderBy = null;
+    for (const remoteKey of schema.keys()) {
+      const remoteValue = schema.values[remoteKey];
+      if (remoteValue.sortBy) {
+        column = remoteKey;
+      }
+      if (remoteKey === 'rank') {
+        orderBy = {
+          column: 'rank'
+        };
+      }
+    }
+
+    const toString = schema.__.__toString ? schema.__.__toString : opt => opt[column];
+
+    let formatedValue =
+      value && value != '' && value != undefined
+        ? { key: value.id.toString(), label: toString(value) }
+        : { key: '', label: '' };
+    // eslint-disable-next-line import/no-dynamic-require
+    const Query = require(`../../../../../${camelizeSchemaName}/containers/${pascalizeSchemaName}Query`)['default'];
+
+    let defaultStyle = { width: '100%' };
+    if (style) {
+      defaultStyle = style;
+    }
+    let defaultValue = 'value';
+    return (
+      <Query limit={10} filter={{ searchText }} orderBy={orderBy}>
+        {({ loading, data }) => {
+          if (!loading || data) {
+            const options = data.edges
+              ? data.edges.map(opt => (
+                  <Option key={opt.id} value={opt.id.toString()}>
+                    {toString(opt)}
+                  </Option>
+                ))
+              : null;
+
+            let props = {
+              showSearch: true,
+              labelInValue: true,
+              dropdownMatchSelectWidth: false,
+              style: defaultStyle,
+              onChange: this.handleChange,
+              [defaultValue]: formatedValue
+            };
+
+            if (data.pageInfo.totalCount > 10) {
+              if (data.edges && value && value != '' && value != undefined) {
+                if (!data.edges.find(node => node.id === value.id)) {
+                  if (!dirty) {
+                    options.unshift(
+                      <Option key={value.id} value={value.id.toString()}>
+                        {toString(value)}
+                      </Option>
+                    );
+                  } else {
+                    formatedValue = { key: data.edges[0].id.toString() };
+                  }
+                }
+              }
+
+              props = {
+                ...props,
+                filterOption: false,
+                [defaultValue]: formatedValue,
+                onSearch: this.search
+              };
+            } else {
+              props = {
+                ...props,
+                optionFilterProp: 'children',
+                filterOption: (input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+              };
+            }
+            return <Select {...props}>{options}</Select>;
+          } else {
+            return <Spin size="small" />;
+          }
+        }}
+      </Query>
+    );
+  }
+}
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/index.js b/packages/client/src/modules/common/components/web/ui-antd/components/index.js
index 2f7f5d721e..105374a4f3 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/index.js
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/index.js
@@ -38,3 +38,4 @@ export { default as Icon } from './Icon';
 export { default as LanguagePicker } from './LanguagePicker';
 export { default as Pagination } from './Pagination';
 export { default as DatePicker } from './DatePicker';
+export { default as RenderCellSelectQuery } from './RenderCellSelectQuery';
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/Popconfirm.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/Popconfirm.jsx
index 2f683feb35..81c85558b6 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/Popconfirm.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/Popconfirm.jsx
@@ -7,7 +7,9 @@ class Popconfirm extends React.Component {
     children: PropTypes.node,
     title: PropTypes.string.isRequired,
     target: PropTypes.string.isRequired,
-    onConfirm: PropTypes.func.isRequired,
+    onConfirmBootstrap: PropTypes.func.isRequired,
+    record: PropTypes.number.isRequired,
+    onConfirm: PropTypes.any,
     size: PropTypes.string,
     color: PropTypes.string,
     placement: PropTypes.string,
@@ -30,7 +32,7 @@ class Popconfirm extends React.Component {
   }
 
   onConfirm() {
-    this.props.onConfirm();
+    this.props.onConfirmBootstrap(this.props.record);
   }
 
   render() {
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderCellSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderCellSelectQuery.jsx
new file mode 100644
index 0000000000..cedc289563
--- /dev/null
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderCellSelectQuery.jsx
@@ -0,0 +1,86 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { pascalize, camelize } from 'humps';
+
+import { Select, Spin } from './index';
+
+export default class RenderCellSelectQuery extends React.Component {
+  static propTypes = {
+    schema: PropTypes.object,
+    value: PropTypes.object,
+    searchText: PropTypes.any,
+    handleOnChange: PropTypes.func.isRequired,
+    style: PropTypes.object,
+    dirty: PropTypes.any
+  };
+
+  constructor(props) {
+    super(props);
+    this.handleChange = this.handleChange.bind(this);
+  }
+
+  handleChange = (e, edges) => {
+    let selectedItem = edges && Array.isArray(edges) ? edges.find(item => item.id == e.target.value) : '';
+    this.props.handleOnChange(selectedItem ? { key: selectedItem.id, label: selectedItem.name } : '');
+  };
+
+  render() {
+    const { value, schema, searchText, style } = this.props;
+
+    const camelizeSchemaName = camelize(schema.name);
+    const pascalizeSchemaName = pascalize(schema.name);
+
+    let orderBy = null;
+    for (const remoteKey of schema.keys()) {
+      if (remoteKey === 'rank') {
+        orderBy = {
+          column: 'rank'
+        };
+      }
+    }
+
+    let formatedValue = value && value != '' && typeof value !== 'undefined' ? value.id : '';
+    // eslint-disable-next-line import/no-dynamic-require
+    const Query = require(`../../../../../${camelizeSchemaName}/containers/${pascalizeSchemaName}Query`)['default'];
+
+    let defaultStyle = { width: '80%' };
+    if (style) {
+      defaultStyle = style;
+    }
+
+    return (
+      <Query limit={10} filter={{ searchText }} orderBy={orderBy}>
+        {({ loading, data }) => {
+          if (!loading || data) {
+            let options = data.edges
+              ? data.edges.map(opt => (
+                  <option key={opt.id} value={opt.id.toString()} label={opt.name}>
+                    {opt.name}
+                  </option>
+                ))
+              : null;
+            if (!value && data.edges && data.edges.length > 0) {
+              options.unshift(
+                <option key="0" value="0">
+                  Select Item
+                </option>
+              );
+            }
+            let props = {
+              style: defaultStyle,
+              value: formatedValue,
+              onChange: e => this.handleChange(e, data.edges)
+            };
+            return (
+              <Select type="select" {...props}>
+                {options}
+              </Select>
+            );
+          } else {
+            return <Spin size="small" />;
+          }
+        }}
+      </Query>
+    );
+  }
+}
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx
index bab5b41a8d..2d88954dfc 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { pascalize, camelize } from 'humps';
 
-import { FormItem, Input } from './index';
+import { FormItem, Select } from './index';
 
 export default class RenderSelectQuery extends React.Component {
   static propTypes = {
@@ -14,23 +14,27 @@ export default class RenderSelectQuery extends React.Component {
     meta: PropTypes.object,
     schema: PropTypes.object,
     style: PropTypes.object,
-    formType: PropTypes.string.isRequired
+    formType: PropTypes.string
   };
 
+  constructor(props) {
+    super(props);
+    this.handleChange = this.handleChange.bind(this);
+  }
+
   state = {
     searchText: '',
     dirty: false
   };
 
-  handleChange = value => {
+  handleChange = (e, edges) => {
     const {
       input: { name },
       setFieldValue
     } = this.props;
-    //console.log('RenderSelect: handleChange');
-    //console.log('name:', name);
-    //console.log('value:', value);
-    setFieldValue(name, value ? { id: value.key, name: value.label } : undefined);
+    //console.log('edges:', edges);
+    let selectedItem = edges && Array.isArray(edges) ? edges.find(item => item.id == e.target.value) : '';
+    setFieldValue(name, selectedItem ? { id: selectedItem.id, name: selectedItem.name } : '');
   };
 
   handleBlur = () => {
@@ -43,7 +47,6 @@ export default class RenderSelectQuery extends React.Component {
 
   search = value => {
     const { dirty } = this.state;
-    //onsole.log('search:', value);
     if ((value && value.length >= 1) || dirty) {
       this.setState({ searchText: value, dirty: true });
     }
@@ -56,10 +59,9 @@ export default class RenderSelectQuery extends React.Component {
       schema,
       style,
       formItemLayout,
-      meta: { touched, error },
-      formType
+      meta: { touched, error }
     } = this.props;
-    const { searchText, dirty } = this.state;
+    const { searchText } = this.state;
 
     let validateStatus = '';
     if (touched && error) {
@@ -68,101 +70,55 @@ export default class RenderSelectQuery extends React.Component {
 
     const camelizeSchemaName = camelize(schema.name);
     const pascalizeSchemaName = pascalize(schema.name);
-    let column = 'name';
     let orderBy = null;
     for (const remoteKey of schema.keys()) {
-      const remoteValue = schema.values[remoteKey];
-      if (remoteValue.sortBy) {
-        column = remoteKey;
-      }
       if (remoteKey === 'rank') {
         orderBy = {
           column: 'rank'
         };
       }
     }
-
-    const toString = schema.__.__toString ? schema.__.__toString : opt => opt[column];
-
-    let formatedValue =
-      value && value != '' && value != undefined
-        ? { key: value.id.toString(), label: toString(value) }
-        : { key: '', label: '' };
-    //console.log('formatedValue:', formatedValue);
-
+    let formatedValue = value && value != '' && typeof value !== 'undefined' ? value.id : '';
     // eslint-disable-next-line import/no-dynamic-require
     const Query = require(`../../../../../${camelizeSchemaName}/containers/${pascalizeSchemaName}Query`)['default'];
-    //console.log(`../../../../../${camelizeSchemaName}/containers/${pascalizeSchemaName}Query`);
 
     let defaultStyle = { width: '100%' };
     if (style) {
       defaultStyle = style;
     }
 
-    let defaultValue = 'defaultValue';
-    if (formType === 'filter') {
-      defaultValue = 'value';
-    }
-
     return (
       <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={error}>
         <div>
           <Query limit={10} filter={{ searchText }} orderBy={orderBy}>
             {({ loading, data }) => {
               if (!loading || data) {
-                const options = data.edges
+                let options = data.edges
                   ? data.edges.map(opt => (
-                      <option key={opt.id} value={opt.id.toString()}>
-                        {toString(opt)}
+                      <option key={opt.id} value={opt.id.toString()} label={opt.name}>
+                        {opt.name}
                       </option>
                     ))
                   : null;
+                if (!value && data.edges && data.edges.length > 0) {
+                  options.unshift(
+                    <option key="0" value="0">
+                      Select Item
+                    </option>
+                  );
+                }
 
                 let props = {
-                  allowClear: formType !== 'form' ? true : false,
-                  showSearch: true,
-                  labelInValue: true,
-                  dropdownMatchSelectWidth: false,
                   style: defaultStyle,
-                  onChange: this.handleChange,
+                  value: formatedValue,
+                  onChange: e => this.handleChange(e, data.edges),
                   onBlur: this.handleBlur,
-                  ...inputRest,
-                  [defaultValue]: formatedValue
+                  ...inputRest
                 };
-
-                if (data.pageInfo.totalCount > 10) {
-                  if (data.edges && value && value != '' && value != undefined) {
-                    if (!data.edges.find(node => node.id === value.id)) {
-                      if (!dirty) {
-                        options.unshift(
-                          <option key={value.id} value={value.id.toString()}>
-                            {toString(value)}
-                          </option>
-                        );
-                      } else {
-                        formatedValue = { key: data.edges[0].id.toString() };
-                      }
-                    }
-                  }
-
-                  props = {
-                    ...props,
-                    filterOption: false,
-                    [defaultValue]: formatedValue,
-                    onSearch: this.search
-                  };
-                } else {
-                  props = {
-                    ...props,
-                    optionFilterProp: 'children',
-                    filterOption: (input, option) =>
-                      option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
-                  };
-                }
                 return (
-                  <Input type="select" {...props}>
+                  <Select type="select" {...props}>
                     {options}
-                  </Input>
+                  </Select>
                 );
               } else {
                 return <div>Loading...</div>;
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/index.js b/packages/client/src/modules/common/components/web/ui-bootstrap/components/index.js
index 45b2c8dae0..529dde32d8 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/index.js
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/index.js
@@ -37,3 +37,4 @@ export { default as Popconfirm } from './Popconfirm';
 export { default as Icon } from './Icon';
 export { default as Spin } from './Spin';
 export { default as RenderSelectCountry } from './RenderSelectCountry';
+export { default as RenderCellSelectQuery } from './RenderCellSelectQuery';
diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index 76bcefd35a..832fa6c9c6 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -2,7 +2,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { startCase, round } from 'lodash';
-import { pascalize, camelize } from 'humps';
 import { Link } from 'react-router-dom';
 import { FieldArray } from 'formik';
 import moment from 'moment';
@@ -28,8 +27,7 @@ import {
   Col,
   Input,
   DatePicker,
-  Spin,
-  Select
+  RenderCellSelectQuery
 } from './components/web';
 
 const dateFormat = 'YYYY-MM-DD';
@@ -220,6 +218,8 @@ export const createColumnFields = ({
             <Popconfirm
               title="Sure to delete?"
               onConfirm={() => hendleDelete(record.id)}
+              onConfirmBootstrap={hendleDelete}
+              record={record.id}
               key="delete"
               target={`delete-button-${record.id}`}
               className={'bootstrap-cell-delete-button'}
@@ -593,7 +593,17 @@ class EditableCell extends React.Component {
       }
     }
     let input = null;
-    if (editable) {
+    if (hasTypeOf(DomainSchema)) {
+      input = (
+        <RenderCellSelectQuery
+          searchText={searchText}
+          value={value}
+          schema={schema}
+          handleOnChange={this.handleSelectChange}
+          dirty={dirty}
+        />
+      );
+    } else if (editable) {
       let formatedValue = value;
       //console.log('value:', value);
       input = <Input value={formatedValue} onChange={this.handleChange} onPressEnter={this.check} />;
@@ -625,85 +635,6 @@ class EditableCell extends React.Component {
             onPressEnter={this.check}
           />
         );
-      } else if (hasTypeOf(DomainSchema)) {
-        const Option = Select.Option;
-        const camelizeSchemaName = camelize(schema.name);
-        const pascalizeSchemaName = pascalize(schema.name);
-        let column = 'name';
-        let orderBy = null;
-        for (const remoteKey of schema.keys()) {
-          const remoteValue = schema.values[remoteKey];
-          if (remoteValue.sortBy) {
-            column = remoteKey;
-          }
-          if (remoteKey === 'rank') {
-            orderBy = {
-              column: 'rank'
-            };
-          }
-        }
-        const toString = schema.__.__toString ? schema.__.__toString : opt => opt[column];
-        let formatedValue = { key: value.id.toString(), label: value.name ? value.name : value[column] };
-        //console.log('formatedValue:', formatedValue);
-        // eslint-disable-next-line import/no-dynamic-require
-        const Query = require(`../${camelizeSchemaName}/containers/${pascalizeSchemaName}Query`)['default'];
-
-        input = (
-          <Query limit={10} filter={{ searchText }} orderBy={orderBy}>
-            {({ loading, data }) => {
-              if (!loading || data) {
-                const options = data.edges
-                  ? data.edges.map(opt => (
-                      <Option key={opt.id} value={opt.id.toString()}>
-                        {toString(opt)}
-                      </Option>
-                    ))
-                  : null;
-
-                let props = {
-                  showSearch: true,
-                  labelInValue: true,
-                  dropdownMatchSelectWidth: false,
-                  style: { width: '100%' },
-                  onChange: this.handleSelectChange,
-                  defaultValue: formatedValue
-                };
-
-                if (data.pageInfo.totalCount > 10) {
-                  if (data.edges) {
-                    if (!data.edges.find(node => node.id === value.id)) {
-                      if (!dirty) {
-                        options.unshift(
-                          <Option key={value.id} value={value.id.toString()}>
-                            {toString(value)}
-                          </Option>
-                        );
-                      } else {
-                        formatedValue = { key: data.edges[0].id.toString() };
-                      }
-                    }
-                  }
-
-                  props = {
-                    ...props,
-                    filterOption: false,
-                    onSearch: this.search
-                  };
-                } else {
-                  props = {
-                    ...props,
-                    optionFilterProp: 'children',
-                    filterOption: (input, option) =>
-                      option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
-                  };
-                }
-                return <Select {...props}>{options}</Select>;
-              } else {
-                return <Spin size="small" />;
-              }
-            }}
-          </Query>
-        );
       }
     }
     return (
diff --git a/yarn.lock b/yarn.lock
index 4c513796ba..ea4b98d2db 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -548,12 +548,6 @@
     lodash "^4.17.5"
     to-fast-properties "^2.0.0"
 
-"@domain-schema/core@^0.0.33":
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/@domain-schema/core/-/core-0.0.33.tgz#c84c9ad5e14eca488376525138c0fdaf1df3dce6"
-  dependencies:
-    debug "^3.1.0"
-
 "@domain-schema/core@^0.0.34":
   version "0.0.34"
   resolved "https://registry.yarnpkg.com/@domain-schema/core/-/core-0.0.34.tgz#5900ae4f0844cb8e7ffa91f5be32bd0417d96429"

From 201ebaae6b6e580d77b40eee8ec2207536b8d3dd Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Fri, 15 Jun 2018 16:32:37 +0300
Subject: [PATCH 151/327] Fix bootsrap Popconfirm

---
 .../web/ui-bootstrap/components/Popconfirm.jsx        | 11 ++---------
 packages/client/src/modules/common/util.web.jsx       |  2 --
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/Popconfirm.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/Popconfirm.jsx
index 81c85558b6..c98c250df3 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/Popconfirm.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/Popconfirm.jsx
@@ -7,9 +7,7 @@ class Popconfirm extends React.Component {
     children: PropTypes.node,
     title: PropTypes.string.isRequired,
     target: PropTypes.string.isRequired,
-    onConfirmBootstrap: PropTypes.func.isRequired,
-    record: PropTypes.number.isRequired,
-    onConfirm: PropTypes.any,
+    onConfirm: PropTypes.func.isRequired,
     size: PropTypes.string,
     color: PropTypes.string,
     placement: PropTypes.string,
@@ -19,7 +17,6 @@ class Popconfirm extends React.Component {
   constructor(props) {
     super(props);
     this.toggle = this.toggle.bind(this);
-    this.onConfirm = this.onConfirm.bind(this);
     this.state = {
       isOpen: false
     };
@@ -31,10 +28,6 @@ class Popconfirm extends React.Component {
     });
   }
 
-  onConfirm() {
-    this.props.onConfirmBootstrap(this.props.record);
-  }
-
   render() {
     const { className = '', placement = 'left-start', color = null, size = 'sm', target, title, children } = this.props;
     const buttonsStyle = {
@@ -52,7 +45,7 @@ class Popconfirm extends React.Component {
             <Button color={color ? color : 'secondary'} size={size} onClick={this.toggle} style={buttonsStyle}>
               Cancel
             </Button>
-            <Button color={color ? color : 'primary'} size={size} onClick={this.onConfirm} style={buttonsStyle}>
+            <Button color={color ? color : 'primary'} size={size} onClick={this.props.onConfirm} style={buttonsStyle}>
               Ok
             </Button>
           </PopoverBody>
diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index 832fa6c9c6..1b4b81820a 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -218,8 +218,6 @@ export const createColumnFields = ({
             <Popconfirm
               title="Sure to delete?"
               onConfirm={() => hendleDelete(record.id)}
-              onConfirmBootstrap={hendleDelete}
-              record={record.id}
               key="delete"
               target={`delete-button-${record.id}`}
               className={'bootstrap-cell-delete-button'}

From 91483d9b6eaf6b0f3fb72c4e8afd3aeb9c8d7a00 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Mon, 18 Jun 2018 17:50:43 +0300
Subject: [PATCH 152/327] Fix graphql fragment generation

---
 tools/cli/module.js | 42 ++++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/tools/cli/module.js b/tools/cli/module.js
index b8f0884664..56088c2ee7 100644
--- a/tools/cli/module.js
+++ b/tools/cli/module.js
@@ -378,11 +378,11 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
     // get fragment file
     const pathFragment = `${__dirname}/../../packages/client/src/modules/${module}/graphql/`;
     if (fs.existsSync(pathFragment)) {
-      const file = `${Module}.graphql`;
+      const fragmentGraphqlFile = `${Module}.graphql`;
 
       // regenerate graphql fragment
       // TODO: refactor to generate this recursively
-      let graphql = '';
+      let fragmentGraphql = '';
       for (const key of schema.keys()) {
         const value = schema.values[key];
         if (value.type.isSchema) {
@@ -393,12 +393,12 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
               column = remoteKey;
             }
           }
-          graphql += `  ${key} {\n`;
-          graphql += `    id\n`;
-          graphql += `    ${column}\n`;
-          graphql += `  }\n`;
+          fragmentGraphql += `  ${key} {\n`;
+          fragmentGraphql += `    id\n`;
+          fragmentGraphql += `    ${column}\n`;
+          fragmentGraphql += `  }\n`;
         } else if (value.type.constructor === Array && value.type[0].isSchema) {
-          graphql += `  ${key} {\n`;
+          fragmentGraphql += `  ${key} {\n`;
           for (const remoteKey of value.type[0].keys()) {
             const remoteValue = value.type[0].values[remoteKey];
             if (remoteValue.type.isSchema) {
@@ -409,26 +409,32 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
                   remotecolumn = remoteKey;
                 }
               }
-              graphql += `    ${remoteKey} {\n`;
-              graphql += `      id\n`;
-              graphql += `      ${remotecolumn}\n`;
-              graphql += `    }\n`;
+              fragmentGraphql += `    ${remoteKey} {\n`;
+              fragmentGraphql += `      id\n`;
+              fragmentGraphql += `      ${remotecolumn}\n`;
+              fragmentGraphql += `    }\n`;
             } else if (remoteValue.type.constructor !== Array) {
-              graphql += `    ${remoteKey}\n`;
+              fragmentGraphql += `    ${remoteKey}\n`;
             }
           }
-          graphql += `  }\n`;
+          fragmentGraphql += `  }\n`;
         } else {
-          graphql += `  ${key}\n`;
+          fragmentGraphql += `  ${key}\n`;
         }
       }
 
       shell.cd(pathFragment);
       // override graphql fragment file
-      const replaceFragment = `${Module} {(.|\n)*\n}\n`;
-      shell.ShellString(shell.cat(file).replace(RegExp(replaceFragment, 'g'), `${Module} {\n${graphql}}\n`)).to(file);
-
-      logger.info(chalk.green(`✔ Fragment in ${pathFragment}${file} successfully updated!`));
+      const replaceFragment = `${Module} {(.|\n)*\n}`;
+      fragmentGraphql = shell
+        .cat(fragmentGraphqlFile)
+        .replace(RegExp(replaceFragment, 'g'), `${Module} {\n${fragmentGraphql}}`);
+      try {
+        fs.writeFileSync(pathFragment + fragmentGraphqlFile, fragmentGraphql);
+      } catch (err) {
+        logger.error(chalk.red(`✘ Failed to write a ${pathFragment}${fragmentGraphqlFile} file!`));
+      }
+      logger.info(chalk.green(`✔ Fragment in ${pathFragment}${fragmentGraphqlFile} successfully updated!`));
     } else {
       logger.error(chalk.red(`✘ Fragment path ${pathFragment} not found!`));
     }

From 995670eda6b91d3854b4fcf508139e2acc89f3aa Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Mon, 18 Jun 2018 18:12:38 +0300
Subject: [PATCH 153/327] Add proper message returning in module.js

---
 tools/cli/module.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/cli/module.js b/tools/cli/module.js
index 56088c2ee7..24f395bfdb 100644
--- a/tools/cli/module.js
+++ b/tools/cli/module.js
@@ -432,7 +432,7 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
       try {
         fs.writeFileSync(pathFragment + fragmentGraphqlFile, fragmentGraphql);
       } catch (err) {
-        logger.error(chalk.red(`✘ Failed to write a ${pathFragment}${fragmentGraphqlFile} file!`));
+        return logger.error(chalk.red(`✘ Failed to write a ${pathFragment}${fragmentGraphqlFile} file!`));
       }
       logger.info(chalk.green(`✔ Fragment in ${pathFragment}${fragmentGraphqlFile} successfully updated!`));
     } else {

From 579d3c645af48fa0975a12375c5493f8f7d048bf Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Tue, 19 Jun 2018 16:01:33 +0300
Subject: [PATCH 154/327] Change apollo-client version, delete polifill
 setPrototypeOf for android

---
 packages/client/package.json          |  2 +-
 packages/common/createApolloClient.js |  8 --------
 packages/mobile/package.json          |  2 +-
 packages/server/package.json          |  2 +-
 yarn.lock                             | 26 ++++++++++++++++++++++++++
 5 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index 6b5b199b45..158df5550f 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -46,7 +46,7 @@
     "antd": "^3.3.3",
     "apollo-cache-inmemory": "^1.1.12",
     "apollo-cache-router": "^1.1.0",
-    "apollo-client": "^2.3.1",
+    "apollo-client": "^2.3.4",
     "apollo-link": "^1.0.6",
     "apollo-link-batch-http": "1.2.2",
     "apollo-link-context": "^1.0.7",
diff --git a/packages/common/createApolloClient.js b/packages/common/createApolloClient.js
index b75da4bd0f..24baba0079 100644
--- a/packages/common/createApolloClient.js
+++ b/packages/common/createApolloClient.js
@@ -34,14 +34,6 @@ const createApolloClient = ({ apiUrl, createNetLink, links, connectionParams, cl
     }
   );
 
-  //polifill for apollo-client setting prototype on android platform
-  Object.setPrototypeOf =
-    Object.setPrototypeOf ||
-    function(obj, proto) {
-      obj.__proto__ = proto;
-      return obj;
-    };
-
   const queryLink = createNetLink
     ? createNetLink(apiUrl)
     : new BatchHttpLink({
diff --git a/packages/mobile/package.json b/packages/mobile/package.json
index b2d3b44213..ee9e9e9a83 100644
--- a/packages/mobile/package.json
+++ b/packages/mobile/package.json
@@ -37,7 +37,7 @@
     "antd-mobile": "^2.1.2",
     "apollo-cache-inmemory": "^1.1.12",
     "apollo-cache-router": "^1.1.0",
-    "apollo-client": "^2.3.1",
+    "apollo-client": "^2.3.4",
     "apollo-link": "^1.0.6",
     "apollo-link-batch-http": "1.2.2",
     "apollo-link-state": "^0.4.1",
diff --git a/packages/server/package.json b/packages/server/package.json
index c5051489fc..34ff52b2ca 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -46,7 +46,7 @@
     "@domain-schema/validation": "^0.0.33",
     "apollo-cache-inmemory": "^1.1.12",
     "apollo-cache-router": "^1.1.0",
-    "apollo-client": "^2.3.1",
+    "apollo-client": "^2.3.4",
     "apollo-engine": "^1.1.0",
     "apollo-link": "^1.0.6",
     "apollo-link-batch-http": "1.2.2",
diff --git a/yarn.lock b/yarn.lock
index ea4b98d2db..bb83fc16f9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1279,6 +1279,12 @@ apollo-cache-router@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/apollo-cache-router/-/apollo-cache-router-1.1.0.tgz#71d87a5973c5c40853cf46cfa6ea53ab952ccce7"
 
+apollo-cache@^1.1.11:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.1.11.tgz#998e31a4b278e2fbbbf36fef8fce39c08adc35ca"
+  dependencies:
+    apollo-utilities "^1.0.15"
+
 apollo-cache@^1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.1.7.tgz#5817018a2fbfc05a21ba319bd17a3e7538110cc5"
@@ -1305,6 +1311,20 @@ apollo-client@^2.3.1:
   optionalDependencies:
     "@types/async" "2.0.49"
 
+apollo-client@^2.3.4:
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.3.4.tgz#308fbfa95423f9bde6827376d9a85802fe93e28d"
+  dependencies:
+    "@types/zen-observable" "^0.5.3"
+    apollo-cache "^1.1.11"
+    apollo-link "^1.0.0"
+    apollo-link-dedup "^1.0.0"
+    apollo-utilities "^1.0.15"
+    symbol-observable "^1.0.2"
+    zen-observable "^0.8.0"
+  optionalDependencies:
+    "@types/async" "2.0.49"
+
 apollo-engine-binary-darwin@0.2018.4-86-gf35bdc892:
   version "0.2018.4-86-gf35bdc892"
   resolved "https://registry.yarnpkg.com/apollo-engine-binary-darwin/-/apollo-engine-binary-darwin-0.2018.4-86-gf35bdc892.tgz#f1e4ae4b72afdb298039d0230e38dab8774c8890"
@@ -1446,6 +1466,12 @@ apollo-utilities@^1.0.12:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.0.12.tgz#9e2b2a34cf89f3bf0d73a664effd8c1bb5d1b7f7"
 
+apollo-utilities@^1.0.15:
+  version "1.0.15"
+  resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.0.15.tgz#8f1ba6e4ed9b92cb0de2ce7c032315a768860aae"
+  dependencies:
+    fast-json-stable-stringify "^2.0.0"
+
 app-root-path@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.0.1.tgz#cd62dcf8e4fd5a417efc664d2e5b10653c651b46"

From 1b4d20bd2d6cbc7dbe8a73050f09e4da9db5f805 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Wed, 20 Jun 2018 17:40:20 +0300
Subject: [PATCH 155/327] Add commonGraphql generation, fix dynamic require in
 antd and bootstrap components

---
 .../common/components/web/commonGraphql.js    |  0
 .../components/RenderCellSelectQuery.jsx      |  8 +--
 .../ui-antd/components/RenderSelectQuery.jsx  | 15 ++---
 .../components/RenderCellSelectQuery.jsx      |  9 ++-
 .../components/RenderSelectQuery.jsx          |  9 ++-
 tools/cli/module.js                           | 67 +++++++++++++++++++
 6 files changed, 83 insertions(+), 25 deletions(-)
 create mode 100644 packages/client/src/modules/common/components/web/commonGraphql.js

diff --git a/packages/client/src/modules/common/components/web/commonGraphql.js b/packages/client/src/modules/common/components/web/commonGraphql.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderCellSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderCellSelectQuery.jsx
index a9e12e9084..e3e7edcff1 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderCellSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderCellSelectQuery.jsx
@@ -1,7 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Select, Spin } from 'antd';
-import { pascalize, camelize } from 'humps';
+import { pascalize } from 'humps';
+import schemaQueries from '../../commonGraphql';
 
 const Option = Select.Option;
 export default class RenderCellSelectQuery extends React.Component {
@@ -21,7 +22,6 @@ export default class RenderCellSelectQuery extends React.Component {
   render() {
     const { value, schema, style, searchText, dirty } = this.props;
 
-    const camelizeSchemaName = camelize(schema.name);
     const pascalizeSchemaName = pascalize(schema.name);
     let column = 'name';
     let orderBy = null;
@@ -43,8 +43,8 @@ export default class RenderCellSelectQuery extends React.Component {
       value && value != '' && value != undefined
         ? { key: value.id.toString(), label: toString(value) }
         : { key: '', label: '' };
-    // eslint-disable-next-line import/no-dynamic-require
-    const Query = require(`../../../../../${camelizeSchemaName}/containers/${pascalizeSchemaName}Query`)['default'];
+
+    const Query = schemaQueries[`${pascalizeSchemaName}Query`];
 
     let defaultStyle = { width: '100%' };
     if (style) {
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
index e7cb41e814..4810acd247 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Select, Spin } from 'antd';
-import { pascalize, camelize } from 'humps';
-
+import { pascalize } from 'humps';
 import { FormItem } from './index';
+import schemaQueries from '../../commonGraphql';
 
 const Option = Select.Option;
 
@@ -30,9 +30,7 @@ export default class RenderSelectQuery extends React.Component {
       input: { name },
       setFieldValue
     } = this.props;
-    //console.log('RenderSelect: handleChange');
-    //console.log('name:', name);
-    //console.log('value:', value);
+
     setFieldValue(name, value ? { id: value.key, name: value.label } : undefined);
   };
 
@@ -46,7 +44,6 @@ export default class RenderSelectQuery extends React.Component {
 
   search = value => {
     const { dirty } = this.state;
-    //onsole.log('search:', value);
     if ((value && value.length >= 1) || dirty) {
       this.setState({ searchText: value, dirty: true });
     }
@@ -69,7 +66,6 @@ export default class RenderSelectQuery extends React.Component {
       validateStatus = 'error';
     }
 
-    const camelizeSchemaName = camelize(schema.name);
     const pascalizeSchemaName = pascalize(schema.name);
     let column = 'name';
     let orderBy = null;
@@ -91,11 +87,8 @@ export default class RenderSelectQuery extends React.Component {
       value && value != '' && value != undefined
         ? { key: value.id.toString(), label: toString(value) }
         : { key: '', label: '' };
-    //console.log('formatedValue:', formatedValue);
 
-    // eslint-disable-next-line import/no-dynamic-require
-    const Query = require(`../../../../../${camelizeSchemaName}/containers/${pascalizeSchemaName}Query`)['default'];
-    //console.log(`../../../../../${camelizeSchemaName}/containers/${pascalizeSchemaName}Query`);
+    const Query = schemaQueries[`${pascalizeSchemaName}Query`];
 
     let defaultStyle = { width: '100%' };
     if (style) {
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderCellSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderCellSelectQuery.jsx
index cedc289563..abd8c69668 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderCellSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderCellSelectQuery.jsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { pascalize, camelize } from 'humps';
-
+import { pascalize } from 'humps';
 import { Select, Spin } from './index';
+import schemaQueries from '../../commonGraphql';
 
 export default class RenderCellSelectQuery extends React.Component {
   static propTypes = {
@@ -27,7 +27,6 @@ export default class RenderCellSelectQuery extends React.Component {
   render() {
     const { value, schema, searchText, style } = this.props;
 
-    const camelizeSchemaName = camelize(schema.name);
     const pascalizeSchemaName = pascalize(schema.name);
 
     let orderBy = null;
@@ -40,8 +39,8 @@ export default class RenderCellSelectQuery extends React.Component {
     }
 
     let formatedValue = value && value != '' && typeof value !== 'undefined' ? value.id : '';
-    // eslint-disable-next-line import/no-dynamic-require
-    const Query = require(`../../../../../${camelizeSchemaName}/containers/${pascalizeSchemaName}Query`)['default'];
+
+    const Query = schemaQueries[`${pascalizeSchemaName}Query`];
 
     let defaultStyle = { width: '80%' };
     if (style) {
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx
index 2d88954dfc..78854aeae2 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { pascalize, camelize } from 'humps';
-
+import { pascalize } from 'humps';
 import { FormItem, Select } from './index';
+import schemaQueries from '../../commonGraphql';
 
 export default class RenderSelectQuery extends React.Component {
   static propTypes = {
@@ -68,7 +68,6 @@ export default class RenderSelectQuery extends React.Component {
       validateStatus = 'error';
     }
 
-    const camelizeSchemaName = camelize(schema.name);
     const pascalizeSchemaName = pascalize(schema.name);
     let orderBy = null;
     for (const remoteKey of schema.keys()) {
@@ -79,8 +78,8 @@ export default class RenderSelectQuery extends React.Component {
       }
     }
     let formatedValue = value && value != '' && typeof value !== 'undefined' ? value.id : '';
-    // eslint-disable-next-line import/no-dynamic-require
-    const Query = require(`../../../../../${camelizeSchemaName}/containers/${pascalizeSchemaName}Query`)['default'];
+
+    const Query = schemaQueries[`${pascalizeSchemaName}Query`];
 
     let defaultStyle = { width: '100%' };
     if (style) {
diff --git a/tools/cli/module.js b/tools/cli/module.js
index 24f395bfdb..fc1320d9dc 100644
--- a/tools/cli/module.js
+++ b/tools/cli/module.js
@@ -63,6 +63,59 @@ function generateField(value, update = false) {
   return result;
 }
 
+/**
+ *
+ * @param module
+ * @param commonGraphqlPath
+ * @param moduleGraphqlContainer
+ */
+function generateCommonGraphqlFile(module, commonGraphqlPath, moduleGraphqlContainer) {
+  const importGraphqlContainer = `import ${moduleGraphqlContainer} from '../../../${module}/containers/${moduleGraphqlContainer}';\n`;
+  const exportGraphqlContainer = `\nexport default {\n  ${moduleGraphqlContainer}\n};\n`;
+
+  if (fs.existsSync(commonGraphqlPath)) {
+    const commonGraphqlData = fs.readFileSync(commonGraphqlPath);
+    const commonGraphql = commonGraphqlData.toString().trim();
+    if (commonGraphql.length > 1) {
+      const index = commonGraphql.lastIndexOf("';");
+      const computedIndex = index >= 0 ? index + 3 : false;
+      if (computedIndex) {
+        let computedCommonGraphql =
+          commonGraphql.slice(0, computedIndex) +
+          importGraphqlContainer +
+          commonGraphql.slice(computedIndex, commonGraphql.length);
+        computedCommonGraphql = computedCommonGraphql.replace(/(,|)\s};/g, `,\n  ${moduleGraphqlContainer}\n};`);
+        return fs.writeFileSync(commonGraphqlPath, computedCommonGraphql);
+      }
+    }
+  }
+  return fs.writeFileSync(commonGraphqlPath, importGraphqlContainer + exportGraphqlContainer);
+}
+
+/**
+ *
+ * @param module
+ * @param commonGraphqlPath
+ * @param moduleGraphqlContainer
+ */
+function deleteModuleFromCommonGraphqlFile(module, commonGraphqlPath, moduleGraphqlContainer) {
+  if (fs.existsSync(commonGraphqlPath)) {
+    const commonGraphqlData = fs.readFileSync(commonGraphqlPath);
+    const reg = `(\\n\\s\\s${moduleGraphqlContainer}(.|)|import ${moduleGraphqlContainer}.+;\\n+(?!ex))`;
+    const commonGraphql = commonGraphqlData.toString().replace(new RegExp(reg, 'g'), '');
+    fs.writeFileSync(commonGraphqlPath, commonGraphql);
+  }
+}
+
+/**
+ *
+ * @param logger
+ * @param templatePath
+ * @param module
+ * @param action
+ * @param tablePrefix
+ * @param location
+ */
 function copyFiles(logger, templatePath, module, action, tablePrefix, location) {
   logger.info(`Copying ${location} files…`);
 
@@ -95,6 +148,13 @@ function copyFiles(logger, templatePath, module, action, tablePrefix, location)
     // add module to Feature function
     shell.ShellString(shell.cat('index.js').replace(RegExp(re, 'g'), `Feature(${module}, ${match[1]})`)).to('index.js');
 
+    if (action === 'addcrud' && location === 'client') {
+      const commonGraphqlFile = 'commonGraphql.js';
+      const commonGraphqlPath = `${__dirname}/../../packages/${location}/src/modules/common/components/web/${commonGraphqlFile}`;
+      const graphqlQuery = `${Module}Query`;
+      generateCommonGraphqlFile(module, commonGraphqlPath, graphqlQuery);
+    }
+
     if (action === 'addcrud' && location === 'server') {
       console.log('copy database files');
       const destinationPath = `${__dirname}/../../packages/${location}/src/database`;
@@ -127,6 +187,8 @@ function deleteFiles(logger, templatePath, module, location) {
   const Module = pascalize(module);
 
   const modulePath = `${__dirname}/../../packages/${location}/src/modules/${module}`;
+  const commonGraphqlFile = 'commonGraphql.js';
+  const commonGraphqlPath = `${__dirname}/../../packages/${location}/src/modules/common/components/web/${commonGraphqlFile}`;
 
   if (fs.existsSync(modulePath)) {
     // remove module directory
@@ -184,6 +246,11 @@ function deleteFiles(logger, templatePath, module, location) {
   } else {
     logger.info(chalk.red(`✘ Module ${location} location for ${modulePath} not found!`));
   }
+
+  if (fs.existsSync(commonGraphqlPath)) {
+    const graphqlQuery = `${Module}Query`;
+    deleteModuleFromCommonGraphqlFile(module, commonGraphqlPath, graphqlQuery);
+  }
 }
 
 function updateSchema(logger, module) {

From 8fab6dcefa4d2e7a86e68075e7cdbe9697fb0ff8 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Thu, 21 Jun 2018 12:20:16 +0300
Subject: [PATCH 156/327] Refactor createColumnFields, add function
 createColumnField

---
 .../common/components/crud/ListView.web.jsx   |  19 +-
 .../client/src/modules/common/util.web.jsx    | 232 +++++++++---------
 2 files changed, 117 insertions(+), 134 deletions(-)

diff --git a/packages/client/src/modules/common/components/crud/ListView.web.jsx b/packages/client/src/modules/common/components/crud/ListView.web.jsx
index 0db53a9a2c..487e796d5f 100644
--- a/packages/client/src/modules/common/components/crud/ListView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/ListView.web.jsx
@@ -196,7 +196,7 @@ class ListView extends React.Component {
     }
   };
 
-  hendleUpdate = async (data, id) => {
+  handleUpdate = async (data, id) => {
     const { updateEntry } = this.props;
     this.setState({ wait: true, error: null, success: null });
     const result = await updateEntry({ data, where: { id } });
@@ -207,7 +207,7 @@ class ListView extends React.Component {
     }
   };
 
-  hendleDelete = async id => {
+  handleDelete = async id => {
     const { deleteEntry } = this.props;
     this.setState({ wait: true, error: null, success: null });
     const result = await deleteEntry({ where: { id } });
@@ -224,14 +224,14 @@ class ListView extends React.Component {
     };
   };
 
-  hendleDeleteMany = () => {
+  handleDeleteMany = () => {
     const { deleteManyEntries } = this.props;
     const { selectedRowKeys } = this.state;
     deleteManyEntries({ id_in: selectedRowKeys });
     this.setState({ selectedRowKeys: [] });
   };
 
-  hendleUpdateMany = values => {
+  handleUpdateMany = values => {
     const { updateManyEntries } = this.props;
     const { selectedRowKeys } = this.state;
     updateManyEntries(values, { id_in: selectedRowKeys });
@@ -329,7 +329,7 @@ class ListView extends React.Component {
           </Col>
           {showBatchFields && [
             <Col span={2} key="batchDelete" style={{ paddingTop: '3px' }}>
-              <Popconfirm title="Sure to delete?" onConfirm={this.hendleDeleteMany} target={'batch-delete-button'}>
+              <Popconfirm title="Sure to delete?" onConfirm={this.handleDeleteMany} target={'batch-delete-button'}>
                 <Button color="primary" disabled={!hasSelected} loading={loading && !data}>
                   Delete
                 </Button>
@@ -339,12 +339,7 @@ class ListView extends React.Component {
               <Formik
                 initialValues={mapFormPropsToValues({ schema })}
                 onSubmit={async (values, { resetForm }) => {
-                  //console.log('handleSubmit values:', values);
-
                   const insertValues = pickInputFields({ schema, values });
-                  //console.log('handleSubmit selectedRowKeys:', selectedRowKeys);
-                  //console.log('handleSubmit insertValues:', insertValues);
-
                   if (selectedRowKeys && Object.keys(insertValues).length > 0) {
                     await updateManyEntries(insertValues, { id_in: selectedRowKeys });
                     this.setState({ selectedRowKeys: [] });
@@ -382,8 +377,8 @@ class ListView extends React.Component {
       currentUser,
       orderBy: this.orderBy,
       renderOrderByArrow: this.renderOrderByArrow,
-      hendleUpdate: this.hendleUpdate,
-      hendleDelete: this.hendleDelete,
+      handleUpdate: this.handleUpdate,
+      handleDelete: this.handleDelete,
       onCellChange: this.onCellChange,
       customFields: customColumnFields,
       customActions: customColumnActions
diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index 1b4b81820a..f947f35057 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -38,37 +38,37 @@ export const createColumnFields = ({
   currentUser,
   orderBy,
   renderOrderByArrow,
-  hendleUpdate,
-  hendleDelete,
+  handleUpdate,
+  handleDelete,
   onCellChange,
   customFields = {},
   customActions
 }) => {
   let columns = [];
-  // use customFields if definded otherwise use schema.keys()
+
   const keys =
     customFields.constructor === Object && Object.keys(customFields).length !== 0
       ? Object.keys(customFields)
       : schema.keys();
 
   for (const key of keys) {
-    //console.log('customFields, key: ', customFields[key]);
     const role = customFields && customFields[key] && customFields[key].role ? customFields[key].role : false;
-    //console.log('customFields, role: ', role);
+
     const hasRole =
       currentUser && (!role || (Array.isArray(role) ? role : [role]).indexOf(currentUser.role) >= 0) ? true : false;
-    //console.log('customFields, hasRole: ', hasRole);
 
     if (schema.values[key]) {
       const value = schema.values[key];
       const hasTypeOf = targetType =>
         value.type === targetType || value.type.prototype instanceof targetType || value.type instanceof targetType;
-      //console.log(key);
-      //console.log(hasTypeOf(DomainSchema));
+      const title = (
+        <a onClick={e => orderBy(e, key)} href="#">
+          {startCase(key)} {renderOrderByArrow(key)}
+        </a>
+      );
+
       if (hasRole && value.show !== false && (key !== 'id' || customFields['id'])) {
         if (value.type.isSchema) {
-          //console.log(value.type);
-
           let column = 'name';
           for (const remoteKey of value.type.keys()) {
             const remoteValue = value.type.values[remoteKey];
@@ -77,117 +77,100 @@ export const createColumnFields = ({
             }
           }
           const toString = value.type.__.__toString ? value.type.__.__toString : opt => opt[column];
-          columns.push({
-            title: (
-              <a onClick={e => orderBy(e, key)} href="#">
-                {startCase(key)} {renderOrderByArrow(key)}
-              </a>
-            ),
-            dataIndex: key,
-            key: key,
-            fixed: customFields[key] && customFields[key]['fixed'] ? customFields[key]['fixed'] : null,
-            width: customFields[key] && customFields[key]['width'] ? customFields[key]['width'] : null,
-            align: customFields[key] && customFields[key]['align'] ? customFields[key]['align'] : null,
-            render: (text, record) =>
-              customFields[key] && customFields[key]['render'] ? (
-                customFields[key]['render'](text, record)
-              ) : (
-                <EditableCell
-                  value={text}
-                  hasTypeOf={hasTypeOf}
-                  schema={value.type}
-                  record={record}
-                  role={customFields[key] && customFields[key]['editRole'] ? customFields[key]['editRole'] : null}
-                  currentUser={currentUser}
-                  render={
-                    customFields[key] && customFields[key]['render']
-                      ? customFields[key]['render']
-                      : text => (text && text[column] ? toString(text) : '')
-                  }
-                  onChange={onCellChange(`${key}Id`, record.id, hendleUpdate)}
-                />
-              )
-          });
+
+          columns.push(
+            createColumnField(
+              key,
+              customFields,
+              (text, record) =>
+                customFields[key] && customFields[key]['render'] ? (
+                  customFields[key]['render'](text, record)
+                ) : (
+                  <EditableCell
+                    value={text}
+                    hasTypeOf={hasTypeOf}
+                    schema={value.type}
+                    record={record}
+                    role={customFields[key] && customFields[key]['editRole'] ? customFields[key]['editRole'] : null}
+                    currentUser={currentUser}
+                    render={
+                      customFields[key] && customFields[key]['render']
+                        ? customFields[key]['render']
+                        : text => (text && text[column] ? toString(text) : '')
+                    }
+                    onChange={onCellChange(`${key}Id`, record.id, handleUpdate)}
+                  />
+                ),
+              title
+            )
+          );
         } else if (hasTypeOf(Boolean)) {
-          columns.push({
-            title: (
-              <a onClick={e => orderBy(e, key)} href="#">
-                {startCase(key)} {renderOrderByArrow(key)}
-              </a>
-            ),
-            dataIndex: key,
-            key: key,
-            fixed: customFields[key] && customFields[key]['fixed'] ? customFields[key]['fixed'] : null,
-            width: customFields[key] && customFields[key]['width'] ? customFields[key]['width'] : null,
-            align: customFields[key] && customFields[key]['align'] ? customFields[key]['align'] : null,
-            render: (text, record) => {
-              const data = {};
-              data[key] = !text;
-              return <Switch checked={text} onClick={() => hendleUpdate(data, record.id)} onChange={() => {}} />;
-            }
-          });
+          columns.push(
+            createColumnField(
+              key,
+              customFields,
+              (text, record) => {
+                const data = {};
+                data[key] = !text;
+                return <Switch checked={text} onClick={() => handleUpdate(data, record.id)} onChange={() => {}} />;
+              },
+              title
+            )
+          );
         } else if ((hasTypeOf(String) || hasTypeOf(Number) || hasTypeOf(Date)) && key !== 'id') {
-          columns.push({
-            title: (
-              <a onClick={e => orderBy(e, key)} href="#">
-                {startCase(key)} {renderOrderByArrow(key)}
-              </a>
-            ),
-            dataIndex: key,
-            key: key,
-            fixed: customFields[key] && customFields[key]['fixed'] ? customFields[key]['fixed'] : null,
-            width: customFields[key] && customFields[key]['width'] ? customFields[key]['width'] : null,
-            align: customFields[key] && customFields[key]['align'] ? customFields[key]['align'] : null,
-            render: (text, record) => {
-              let formatedText = text => text;
-              if (value.fieldInput === 'price') {
-                formatedText = text => (text > 0 ? `${round(text, 2).toFixed(2)} €` : '');
-              }
-              return (
-                <EditableCell
-                  value={text}
-                  hasTypeOf={hasTypeOf}
-                  role={customFields[key] && customFields[key]['editRole'] ? customFields[key]['editRole'] : null}
-                  currentUser={currentUser}
-                  render={customFields[key] && customFields[key]['render'] ? customFields[key]['render'] : formatedText}
-                  onChange={onCellChange(key, record.id, hendleUpdate)}
-                />
-              );
-            }
-          });
+          columns.push(
+            createColumnField(
+              key,
+              customFields,
+              (text, record) => {
+                let formatedText = text => text;
+                if (value.fieldInput === 'price') {
+                  formatedText = text => (text > 0 ? `${round(text, 2).toFixed(2)} €` : '');
+                }
+                return (
+                  <EditableCell
+                    value={text}
+                    hasTypeOf={hasTypeOf}
+                    role={customFields[key] && customFields[key]['editRole'] ? customFields[key]['editRole'] : null}
+                    currentUser={currentUser}
+                    render={
+                      customFields[key] && customFields[key]['render'] ? customFields[key]['render'] : formatedText
+                    }
+                    onChange={onCellChange(key, record.id, handleUpdate)}
+                  />
+                );
+              },
+              title
+            )
+          );
         } else if (value.type.constructor !== Array) {
-          columns.push({
-            title: (
-              <a onClick={e => orderBy(e, key)} href="#">
-                {startCase(key)} {renderOrderByArrow(key)}
-              </a>
-            ),
-            dataIndex: key,
-            key: key,
-            fixed: customFields[key] && customFields[key]['fixed'] ? customFields[key]['fixed'] : null,
-            width: customFields[key] && customFields[key]['width'] ? customFields[key]['width'] : null,
-            align: customFields[key] && customFields[key]['align'] ? customFields[key]['align'] : null,
-            render: (text, record) =>
-              customFields[key] && customFields[key]['render']
-                ? customFields[key]['render'](text, record)
-                : customFields[key] && customFields[key]['render']
+          columns.push(
+            createColumnField(
+              key,
+              customFields,
+              (text, record) => {
+                return customFields[key] && customFields[key]['render']
                   ? customFields[key]['render'](text, record)
-                  : text
-          });
+                  : customFields[key] && customFields[key]['render']
+                    ? customFields[key]['render'](text, record)
+                    : text;
+              },
+              title
+            )
+          );
         }
       }
     } else {
       if (hasRole) {
-        columns.push({
-          title: startCase(key),
-          dataIndex: key,
-          key: key,
-          fixed: customFields[key] && customFields[key]['fixed'] ? customFields[key]['fixed'] : null,
-          width: customFields[key] && customFields[key]['width'] ? customFields[key]['width'] : null,
-          align: customFields[key] && customFields[key]['align'] ? customFields[key]['align'] : null,
-          render: (text, record) =>
-            customFields[key] && customFields[key]['render'] ? customFields[key]['render'](text, record) : null
-        });
+        columns.push(
+          createColumnField(
+            key,
+            customFields,
+            (text, record) =>
+              customFields[key] && customFields[key]['render'] ? customFields[key]['render'](text, record) : null,
+            startCase(key)
+          )
+        );
       }
     }
   }
@@ -196,9 +179,7 @@ export const createColumnFields = ({
     customActions === null
       ? false
       : customActions && customActions.role
-        ? hasRole(customActions.role, currentUser)
-          ? true
-          : false
+        ? !!hasRole(customActions.role, currentUser)
         : true;
 
   if (showColumnActions) {
@@ -217,7 +198,7 @@ export const createColumnFields = ({
             </Link>
             <Popconfirm
               title="Sure to delete?"
-              onConfirm={() => hendleDelete(record.id)}
+              onConfirm={() => handleDelete(record.id)}
               key="delete"
               target={`delete-button-${record.id}`}
               className={'bootstrap-cell-delete-button'}
@@ -234,6 +215,18 @@ export const createColumnFields = ({
   return columns;
 };
 
+const createColumnField = (key, customFields, render, title) => {
+  return {
+    title: title,
+    dataIndex: key,
+    key: key,
+    fixed: customFields[key] && customFields[key]['fixed'] ? customFields[key]['fixed'] : null,
+    width: customFields[key] && customFields[key]['width'] ? customFields[key]['width'] : null,
+    align: customFields[key] && customFields[key]['align'] ? customFields[key]['align'] : null,
+    render: render
+  };
+};
+
 const tailFormItemLayout = {
   wrapperCol: {
     xs: {
@@ -407,11 +400,6 @@ export const createFormFields = ({
       }
     } else {
       if (key !== 'id' && value.show !== false && value.type.constructor !== Array) {
-        //let validate = [];
-        //if (!value.optional && !batch) {
-        //  validate.push(required);
-        //}
-
         let component = RenderInput;
         const fieldValue = values ? values[key] : '';
         let style = {};

From 5a2f0b389d11163b21db66f193c7807f4e0e3568 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Fri, 22 Jun 2018 10:06:31 +0300
Subject: [PATCH 157/327] Add validation for table footer form

---
 .../client/src/modules/common/components/crud/ListView.web.jsx  | 2 ++
 .../components/web/ui-antd/components/RenderSelectQuery.jsx     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/modules/common/components/crud/ListView.web.jsx b/packages/client/src/modules/common/components/crud/ListView.web.jsx
index 487e796d5f..c42da323ce 100644
--- a/packages/client/src/modules/common/components/crud/ListView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/ListView.web.jsx
@@ -1,6 +1,7 @@
 /* eslint-disable react/display-name */
 import React from 'react';
 import PropTypes from 'prop-types';
+import DomainValidation from '@domain-schema/validation';
 import { Link } from 'react-router-dom';
 import { Formik } from 'formik';
 import { DragDropContext, DragSource, DropTarget } from 'react-dnd';
@@ -338,6 +339,7 @@ class ListView extends React.Component {
             <Col span={20} key="batchUpdate">
               <Formik
                 initialValues={mapFormPropsToValues({ schema })}
+                validate={values => DomainValidation.validate(values, schema)}
                 onSubmit={async (values, { resetForm }) => {
                   const insertValues = pickInputFields({ schema, values });
                   if (selectedRowKeys && Object.keys(insertValues).length > 0) {
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
index 4810acd247..a775acae24 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
@@ -96,7 +96,7 @@ export default class RenderSelectQuery extends React.Component {
     }
 
     let defaultValue = 'defaultValue';
-    if (formType === 'filter') {
+    if (formType === 'filter' || formType === 'batch') {
       defaultValue = 'value';
     }
 

From 343f86acd3ffdc5f01344cf053e7978ba81f7779 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Fri, 22 Jun 2018 12:54:33 +0300
Subject: [PATCH 158/327] Refactor createFormField function, add
 createFormField and createFormFieldsArray functions

---
 .../client/src/modules/common/util.web.jsx    | 368 +++++++-----------
 1 file changed, 147 insertions(+), 221 deletions(-)

diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index f947f35057..c1c5736c7a 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -227,19 +227,6 @@ const createColumnField = (key, customFields, render, title) => {
   };
 };
 
-const tailFormItemLayout = {
-  wrapperCol: {
-    xs: {
-      span: 24,
-      offset: 0
-    },
-    sm: {
-      span: 16,
-      offset: 6
-    }
-  }
-};
-
 export const createFormFields = ({
   handleChange,
   handleBlur,
@@ -260,234 +247,173 @@ export const createFormFields = ({
   for (const key of keys) {
     const value = schema.values[key];
     const type = value.type.constructor === Array ? value.type[0] : value.type;
-
     const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
 
-    if (formType === 'filter') {
-      if (value.show !== false && value.type.constructor !== Array) {
-        //let validate = [];
-        //if (!value.optional && !batch) {
-        //  validate.push(required);
-        //}
-
-        let component = RenderInput;
-        const value = values ? values[key] : '';
-        let style = {};
-        let inputType = 'text';
-
-        if (type.isSchema) {
-          component = RenderSelectQuery;
-          if (formType !== 'form') {
-            style = { width: 100 };
-          }
-          fields.push(
-            <Col span={8} key={key}>
-              <Field
-                name={`${prefix}${key}`}
-                key={key}
-                component={component}
-                schema={type}
-                value={value}
-                type={inputType}
-                style={style}
-                label={startCase(key)}
-                //validate={validate}
-                formItemLayout={formItemLayout}
-                formType={formType}
-                hasTypeOf={hasTypeOf}
-              />
-            </Col>
-          );
-        } else if (hasTypeOf(Boolean)) {
-          component = RenderSwitch;
-          fields.push(
-            <Col span={8} key={key}>
-              <Field
-                name={`${prefix}${key}`}
-                key={key}
-                component={component}
-                schema={type}
-                value={value}
-                type={inputType}
-                style={style}
-                label={startCase(key)}
-                //validate={validate}
-                formItemLayout={formItemLayout}
-                formType={formType}
-                hasTypeOf={hasTypeOf}
-              />
-            </Col>
-          );
-        } else if (hasTypeOf(Date)) {
-          component = RenderDate;
-          fields.push(
-            <Col span={8} key={`${key}_lte`}>
-              <Field
-                name={`${prefix}${key}_lte`}
-                key={`${key}_lte`}
-                component={component}
-                schema={type}
-                value={values[`${key}_lte`] ? values[`${key}_lte`] : ''}
-                type={inputType}
-                style={style}
-                label={`From ${startCase(key)}`}
-                //validate={validate}
-                formItemLayout={formItemLayout}
-                formType={formType}
-                hasTypeOf={hasTypeOf}
-              />
-            </Col>
-          );
-          fields.push(
-            <Col span={8} key={`${key}_gte`}>
-              <Field
-                name={`${prefix}${key}_gte`}
-                key={`${key}_gte`}
-                component={component}
-                schema={type}
-                value={values[`${key}_gte`] ? values[`${key}_gte`] : ''}
-                type={inputType}
-                style={style}
-                label={`To ${startCase(key)}`}
-                //validate={validate}
-                formItemLayout={formItemLayout}
-                formType={formType}
-                hasTypeOf={hasTypeOf}
-              />
-            </Col>
-          );
-        } else if (hasTypeOf(Number)) {
-          inputType = 'number';
-          component = RenderNumber;
-          fields.push(
-            <Col span={8} key={key}>
-              <Field
-                name={`${prefix}${key}`}
-                key={key}
-                component={component}
-                schema={type}
-                value={value}
-                type={inputType}
-                style={style}
-                label={startCase(key)}
-                //validate={validate}
-                formItemLayout={formItemLayout}
-                formType={formType}
-                hasTypeOf={hasTypeOf}
-              />
-            </Col>
-          );
+    if (value.show !== false && value.type.constructor !== Array) {
+      let formField = createFormField(key, type, values, formItemLayout, formType, hasTypeOf, prefix);
+      if (formField) {
+        if (Array.isArray(formField)) {
+          formField.forEach(field => fields.push(field));
         } else {
-          fields.push(
-            <Col span={8} key={key}>
-              <Field
-                name={`${prefix}${key}`}
-                key={key}
-                component={component}
-                schema={type}
-                value={value}
-                type={inputType}
-                style={style}
-                label={startCase(key)}
-                //validate={validate}
-                formItemLayout={formItemLayout}
-                formType={formType}
-                hasTypeOf={hasTypeOf}
-              />
-            </Col>
-          );
+          fields.push(formField);
         }
       }
     } else {
-      if (key !== 'id' && value.show !== false && value.type.constructor !== Array) {
-        let component = RenderInput;
-        const fieldValue = values ? values[key] : '';
-        let style = {};
-        let inputType = 'text';
-
-        if (type.isSchema) {
-          component = RenderSelectQuery;
-          if (formType !== 'form') {
-            style = { width: 100 };
-          }
-        } else if (hasTypeOf(Boolean)) {
-          component = RenderSwitch;
-        } else if (hasTypeOf(Date)) {
-          component = RenderDate;
-        } else if (hasTypeOf(Number)) {
-          inputType = 'number';
-          component = RenderNumber;
-        } else if (hasTypeOf(String) && value.fieldInput === 'textarea') {
-          component = RenderTextArea;
-        } else if (hasTypeOf(String) && value.fieldInput === 'country') {
-          component = RenderSelectCountry;
+      if (value.type.constructor === Array && formType === 'form') {
+        if (values[key]) {
+          fields.push(createFormFieldsArray(key, values, value, type, handleChange, handleBlur, formItemLayout));
         }
+      }
+    }
+  }
+
+  return fields;
+};
+
+const createFormField = (key, type, values, formItemLayout, formType, hasTypeOf, prefix) => {
+  let component = RenderInput;
+  const value = values ? values[key] : '';
+  let style = {};
+  let dateFields = [];
+  let inputType = 'text';
+
+  if (key === 'id' && formType !== 'filter') {
+    return false;
+  }
 
-        fields.push(
+  if (type.isSchema) {
+    component = RenderSelectQuery;
+    if (formType !== 'form') {
+      style = { width: 100 };
+    }
+  } else if (hasTypeOf(Boolean)) {
+    component = RenderSwitch;
+  } else if (hasTypeOf(Date)) {
+    component = RenderDate;
+    if (formType === 'filter') {
+      dateFields.push(
+        <Col span={8} key={`${key}_lte`}>
           <Field
-            name={`${prefix}${key}`}
-            key={key}
+            name={`${prefix}${key}_lte`}
+            key={`${key}_lte`}
             component={component}
             schema={type}
-            value={fieldValue}
+            value={values[`${key}_lte`] ? values[`${key}_lte`] : ''}
             type={inputType}
             style={style}
-            label={startCase(key)}
-            //validate={validate}
+            label={`From ${startCase(key)}`}
             formItemLayout={formItemLayout}
             formType={formType}
             hasTypeOf={hasTypeOf}
           />
-        );
-      } else {
-        if (value.type.constructor === Array && formType === 'form') {
-          if (values[key]) {
-            fields.push(
-              <FieldArray
-                name={key}
-                key={key}
-                render={({ push, remove }) => {
-                  return (
-                    <FormItem {...formItemLayout} label={startCase(key)}>
-                      {values[key].map((field, index) => (
-                        <div key={index} className="field-array-form">
-                          {createFormFields({
-                            handleChange,
-                            handleBlur,
-                            schema: value.type[0],
-                            values: mapFormPropsToValues({ schema: value.type[0], data: field }),
-                            formItemLayout: formItemLayout,
-                            prefix: `${key}[${index}].`
-                          })}
-                          {!value.hasOne && (
-                            <FormItem {...tailFormItemLayout}>
-                              <Button color="primary" size="sm" onClick={() => remove(index)}>
-                                Delete
-                              </Button>
-                            </FormItem>
-                          )}
-                        </div>
-                      ))}
-                      {!value.hasOne && (
-                        <FormItem {...tailFormItemLayout}>
-                          {/*submitFailed && error && <span>{error}</span>*/}
-                          <Button color="dashed" onClick={() => push({})} style={{ width: '180px' }}>
-                            Add field
-                          </Button>
-                        </FormItem>
-                      )}
-                    </FormItem>
-                  );
-                }}
-              />
-            );
-          }
-        }
-      }
+        </Col>
+      );
+      dateFields.push(
+        <Col span={8} key={`${key}_gte`}>
+          <Field
+            name={`${prefix}${key}_gte`}
+            key={`${key}_gte`}
+            component={component}
+            schema={type}
+            value={values[`${key}_gte`] ? values[`${key}_gte`] : ''}
+            type={inputType}
+            style={style}
+            label={`To ${startCase(key)}`}
+            formItemLayout={formItemLayout}
+            formType={formType}
+            hasTypeOf={hasTypeOf}
+          />
+        </Col>
+      );
     }
+  } else if (hasTypeOf(Number)) {
+    inputType = 'number';
+    component = RenderNumber;
+  } else if (hasTypeOf(String) && value.fieldInput === 'textarea' && formType !== 'filter') {
+    component = RenderTextArea;
+  } else if (hasTypeOf(String) && value.fieldInput === 'country' && formType !== 'filter') {
+    component = RenderSelectCountry;
   }
 
-  return fields;
+  let field = (
+    <Field
+      name={`${prefix}${key}`}
+      key={key}
+      component={component}
+      schema={type}
+      value={value}
+      type={inputType}
+      style={style}
+      label={startCase(key)}
+      formItemLayout={formItemLayout}
+      formType={formType}
+      hasTypeOf={hasTypeOf}
+    />
+  );
+
+  return dateFields.length === 2 ? (
+    dateFields
+  ) : formType === 'filter' ? (
+    <Col span={8} key={key}>
+      {field}
+    </Col>
+  ) : (
+    field
+  );
+};
+
+const tailFormItemLayout = {
+  wrapperCol: {
+    xs: {
+      span: 24,
+      offset: 0
+    },
+    sm: {
+      span: 16,
+      offset: 6
+    }
+  }
+};
+
+const createFormFieldsArray = (key, values, value, type, handleChange, handleBlur, formItemLayout) => {
+  return (
+    <FieldArray
+      name={key}
+      key={key}
+      render={({ push, remove }) => {
+        return (
+          <FormItem {...formItemLayout} label={startCase(key)}>
+            {values[key].map((field, index) => (
+              <div key={index} className="field-array-form">
+                {createFormFields({
+                  handleChange,
+                  handleBlur,
+                  schema: type,
+                  values: mapFormPropsToValues({ schema: type, data: field }),
+                  formItemLayout: formItemLayout,
+                  prefix: `${key}[${index}].`
+                })}
+                {!value.hasOne && (
+                  <FormItem {...tailFormItemLayout}>
+                    <Button color="primary" size="sm" onClick={() => remove(index)}>
+                      Delete
+                    </Button>
+                  </FormItem>
+                )}
+              </div>
+            ))}
+            {!value.hasOne && (
+              <FormItem {...tailFormItemLayout}>
+                <Button color="dashed" onClick={() => push({})} style={{ width: '180px' }}>
+                  Add field
+                </Button>
+              </FormItem>
+            )}
+          </FormItem>
+        );
+      }}
+    />
+  );
 };
 
 class EditableCell extends React.Component {

From 99e801609e74cc4198cd2a6446decb5333a7daf0 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Fri, 22 Jun 2018 13:21:23 +0300
Subject: [PATCH 159/327] Fix RenderNumber component

---
 .../web/ui-antd/components/RenderNumber.jsx   | 24 +++++--------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderNumber.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderNumber.jsx
index 162106cd49..1ea0ad14c1 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderNumber.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderNumber.jsx
@@ -23,14 +23,12 @@ export default class RenderNumber extends React.Component {
       setFieldValue,
       hasTypeOf
     } = this.props;
-    //console.log('RenderInput: handleChange');
-    //console.log('name:', name);
+
+    let computedValue = value;
     if (hasTypeOf(Number)) {
-      value = value !== '' ? parseFloat(value) : '';
-      //console.log('RenderInput: hasTypeOf(Number) TRUE');
+      computedValue = value !== '' ? parseFloat(value) : '';
     }
-
-    setFieldValue(name, value);
+    setFieldValue(name, computedValue);
   };
 
   handleBlur = () => {
@@ -45,7 +43,6 @@ export default class RenderNumber extends React.Component {
     const {
       input: { onChange, onBlur, ...inputRest },
       label,
-      type,
       formItemLayout,
       hasTypeOf,
       meta: { touched, error }
@@ -61,25 +58,16 @@ export default class RenderNumber extends React.Component {
     };
 
     if (hasTypeOf(DomainSchema.Float)) {
-      //console.log('RenderNumber: hasTypeOf(Float) TRUE');
       input = {
-        step: '0.01',
+        step: '0.1',
         ...inputRest
       };
-    } else if (hasTypeOf(Number)) {
-      //console.log('RenderNumber: hasTypeOf(Number) TRUE');
     }
 
     return (
       <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
         <div>
-          <InputNumber
-            {...input}
-            placeholder={label}
-            type={type}
-            onChange={this.handleChange}
-            onBlur={this.handleBlur}
-          />
+          <InputNumber {...input} placeholder={label} onChange={this.handleChange} onBlur={this.handleBlur} />
         </div>
       </FormItem>
     );

From 36b34fb85fe8b76ca8bd84c865267baa6b0a4b17 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Fri, 22 Jun 2018 14:51:53 +0300
Subject: [PATCH 160/327] Refactor EditableCell and some ui components

---
 .../web/ui-antd/components/RenderDate.jsx     |  7 +------
 .../components/RenderSelectCountry.jsx        |  1 -
 .../web/ui-antd/components/RenderSwitch.jsx   | 20 +++++++++++++------
 .../ui-bootstrap/components/RenderDate.jsx    |  7 +------
 .../ui-bootstrap/components/RenderNumber.jsx  | 19 +-----------------
 .../components/RenderSelectQuery.jsx          |  1 -
 .../ui-bootstrap/components/RenderSwitch.jsx  |  3 ---
 .../client/src/modules/common/util.web.jsx    | 14 +------------
 8 files changed, 18 insertions(+), 54 deletions(-)

diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderDate.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderDate.jsx
index 57d7edb5ce..7777dd8891 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderDate.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderDate.jsx
@@ -21,9 +21,6 @@ export default class RenderDate extends React.Component {
       input: { name },
       setFieldValue
     } = this.props;
-    //console.log('RenderDate: handleChange');
-    //console.log('name:', name);
-    //console.log('dateString:', dateString);
     setFieldValue(name, dateString);
   };
 
@@ -54,9 +51,7 @@ export default class RenderDate extends React.Component {
     } else {
       formatedValue = null;
     }
-    //console.log('value:', value);
-    //console.log('typeof value:', typeof value);
-    //console.log('formatedValue:', formatedValue);
+
     return (
       <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
         <div>
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectCountry.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectCountry.jsx
index f53c1e500e..65c1944566 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectCountry.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectCountry.jsx
@@ -72,7 +72,6 @@ export default class RenderSelectCountry extends React.Component {
     let props = {
       allowClear: formType !== 'form' ? true : false,
       showSearch: true,
-      //labelInValue: true,
       dropdownMatchSelectWidth: false,
       style: defaultStyle,
       onChange: this.handleChange,
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSwitch.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSwitch.jsx
index 79e77075ce..4af90e6718 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSwitch.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSwitch.jsx
@@ -14,20 +14,28 @@ export default class RenderSwitch extends React.Component {
   };
 
   handleChange = value => {
-    const { input: { name }, setFieldValue } = this.props;
-    //console.log('RenderSwitch: handleChange');
-    //console.log('name:', name);
-    //console.log('value:', value);
+    const {
+      input: { name },
+      setFieldValue
+    } = this.props;
     setFieldValue(name, value);
   };
 
   handleBlur = () => {
-    const { input: { name }, setFieldTouched } = this.props;
+    const {
+      input: { name },
+      setFieldTouched
+    } = this.props;
     setFieldTouched(name, true);
   };
 
   render() {
-    const { input: { value }, label, formItemLayout, meta: { touched, error } } = this.props;
+    const {
+      input: { value },
+      label,
+      formItemLayout,
+      meta: { touched, error }
+    } = this.props;
 
     let validateStatus = '';
     if (touched && error) {
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderDate.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderDate.jsx
index 03ef7c235b..b37ed487c9 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderDate.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderDate.jsx
@@ -21,9 +21,6 @@ export default class RenderDate extends React.Component {
       input: { name },
       setFieldValue
     } = this.props;
-    //console.log('RenderDate: handleChange');
-    //console.log('name:', name);
-    //console.log('dateString:', dateString);
     setFieldValue(name, moment(date).format(dateFormat));
   };
 
@@ -54,9 +51,7 @@ export default class RenderDate extends React.Component {
     } else {
       formatedValue = null;
     }
-    //console.log('value:', value);
-    //console.log('typeof value:', typeof value);
-    // console.log('formatedValue:', formatedValue);
+
     return (
       <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
         <div>
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderNumber.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderNumber.jsx
index 225a7a99da..36e92440cc 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderNumber.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderNumber.jsx
@@ -1,6 +1,5 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import DomainSchema from '@domain-schema/core';
 
 import { FormItem, InputNumber } from './index';
 
@@ -21,7 +20,6 @@ export default class RenderNumber extends React.Component {
       input: { name },
       setFieldValue
     } = this.props;
-
     setFieldValue(name, e.target.value);
   };
 
@@ -38,7 +36,6 @@ export default class RenderNumber extends React.Component {
       input: { onChange, onBlur, ...inputRest },
       label,
       formItemLayout,
-      hasTypeOf,
       meta: { touched, error }
     } = this.props;
 
@@ -47,24 +44,10 @@ export default class RenderNumber extends React.Component {
       validateStatus = 'error';
     }
 
-    let input = {
-      ...inputRest
-    };
-
-    if (hasTypeOf(DomainSchema.Float)) {
-      //console.log('RenderNumber: hasTypeOf(Float) TRUE');
-      input = {
-        //step: '0.01',
-        ...inputRest
-      };
-    } else if (hasTypeOf(Number)) {
-      //console.log('RenderNumber: hasTypeOf(Number) TRUE');
-    }
-
     return (
       <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
         <div>
-          <InputNumber {...input} placeholder={label} onChange={this.handleChange} onBlur={this.handleBlur} />
+          <InputNumber {...inputRest} placeholder={label} onChange={this.handleChange} onBlur={this.handleBlur} />
         </div>
       </FormItem>
     );
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx
index 78854aeae2..f7f27d7412 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx
@@ -32,7 +32,6 @@ export default class RenderSelectQuery extends React.Component {
       input: { name },
       setFieldValue
     } = this.props;
-    //console.log('edges:', edges);
     let selectedItem = edges && Array.isArray(edges) ? edges.find(item => item.id == e.target.value) : '';
     setFieldValue(name, selectedItem ? { id: selectedItem.id, name: selectedItem.name } : '');
   };
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSwitch.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSwitch.jsx
index 470b4902d1..1ee3f66587 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSwitch.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSwitch.jsx
@@ -18,9 +18,6 @@ export default class RenderSwitch extends React.Component {
       input: { name },
       setFieldValue
     } = this.props;
-    //console.log('RenderSwitch: handleChange');
-    //console.log('name:', name);
-
     setFieldValue(name, e.target.checked);
   };
 
diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index c1c5736c7a..f376468f61 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -436,7 +436,6 @@ class EditableCell extends React.Component {
   };
   componentWillReceiveProps(nextProps) {
     const { value } = this.props;
-
     if (nextProps.value !== value) {
       this.setState({ value: nextProps.value });
     }
@@ -459,9 +458,6 @@ class EditableCell extends React.Component {
     this.setState({ value: dateString });
   };
   handleSelectChange = ({ key, label }) => {
-    //console.log('EditableCell: handleSelectChange');
-    //console.log('key:', key);
-    //console.log('label:', label);
     this.setState({ value: { id: key, name: label } });
   };
   check = () => {
@@ -470,17 +466,14 @@ class EditableCell extends React.Component {
     this.setState({ editable: false });
     if (this.props.onChange) {
       if (hasTypeOf(DomainSchema)) {
-        //console.log('check:', this.state.value);
         this.props.onChange(this.state.value.id);
       } else {
-        //console.log('check:', this.state.value);
         this.props.onChange(this.state.value);
       }
     }
   };
   search = value => {
     const { dirty } = this.state;
-    //console.log('search:', value);
     if ((value && value.length >= 2) || dirty) {
       this.setState({ searchText: value, dirty: true });
     }
@@ -493,10 +486,6 @@ class EditableCell extends React.Component {
     const { render, hasTypeOf, schema, role, currentUser } = this.props;
 
     if (role) {
-      //console.log('EditableCell, value:', value);
-      //console.log('EditableCell, role:', role);
-      //console.log('EditableCell, currentUser:', currentUser);
-
       const hasRole =
         currentUser && (!role || (Array.isArray(role) ? role : [role]).indexOf(currentUser.role) >= 0) ? true : false;
 
@@ -517,7 +506,6 @@ class EditableCell extends React.Component {
       );
     } else if (editable) {
       let formatedValue = value;
-      //console.log('value:', value);
       input = <Input value={formatedValue} onChange={this.handleChange} onPressEnter={this.check} />;
       if (hasTypeOf(Number) || hasTypeOf(DomainSchema.Float)) {
         let inputParms = {
@@ -527,7 +515,7 @@ class EditableCell extends React.Component {
         };
         if (hasTypeOf(DomainSchema.Float)) {
           inputParms = {
-            step: '0.01',
+            step: '0.1',
             ...inputParms
           };
         }

From 801d82e49c657ab4df115a75492535ab4cd44640 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Fri, 22 Jun 2018 15:33:05 +0300
Subject: [PATCH 161/327] Refactor FilterView component

---
 .../src/modules/common/components/crud/FilterView.web.jsx  | 7 +------
 packages/client/src/modules/common/util.web.jsx            | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/packages/client/src/modules/common/components/crud/FilterView.web.jsx b/packages/client/src/modules/common/components/crud/FilterView.web.jsx
index f03a34b4f6..c432adb6f7 100644
--- a/packages/client/src/modules/common/components/crud/FilterView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/FilterView.web.jsx
@@ -51,9 +51,7 @@ class FilterView extends React.PureComponent {
       customFields === null
         ? false
         : customFields && customFields.role
-          ? hasRole(customFields.role, currentUser)
-            ? true
-            : false
+          ? !!hasRole(customFields.role, currentUser)
           : true;
 
     if (!showFilter) {
@@ -64,12 +62,9 @@ class FilterView extends React.PureComponent {
       <Formik
         initialValues={mapFormPropsToValues({ schema, formType: 'filter' })}
         onSubmit={values => {
-          //console.log('onSubmit, values:', values);
-          //console.log('onSubmit, pickInputFields values:', pickInputFields({ schema, values, formType: 'filter' }));
           onFilterChange(pickInputFields({ schema, values, formType: 'filter' }));
         }}
         onReset={(values, formikBag) => {
-          //console.log('onReset, formikBag:', formikBag);
           formikBag.resetForm();
           onFilterChange({});
         }}
diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index f376468f61..f08e41a679 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -283,7 +283,7 @@ const createFormField = (key, type, values, formItemLayout, formType, hasTypeOf,
 
   if (type.isSchema) {
     component = RenderSelectQuery;
-    if (formType !== 'form') {
+    if (formType === 'batch') {
       style = { width: 100 };
     }
   } else if (hasTypeOf(Boolean)) {

From 6cbda0a937ae697429197db3f35d6463cfd88b12 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Fri, 22 Jun 2018 15:46:24 +0300
Subject: [PATCH 162/327] Refactor FormView component

---
 .../client/src/modules/common/components/crud/FormView.web.jsx  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/client/src/modules/common/components/crud/FormView.web.jsx b/packages/client/src/modules/common/components/crud/FormView.web.jsx
index 81a1937c39..f3f10d5e99 100644
--- a/packages/client/src/modules/common/components/crud/FormView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/FormView.web.jsx
@@ -37,7 +37,6 @@ const FormView = ({ schema, updateEntry, createEntry, title, customFields, data
       initialValues={mapFormPropsToValues({ schema, data: data ? data.node : null })}
       validate={values => DomainValidation.validate(values, schema)}
       onSubmit={async values => {
-        //console.log('onSubmit, values:', pickInputFields({schema, values}));
         await onSubmit({ schema, values, updateEntry, createEntry, title, data: data ? data.node : null });
       }}
       render={({ values, handleChange, handleBlur, handleSubmit }) => (
@@ -50,7 +49,6 @@ const FormView = ({ schema, updateEntry, createEntry, title, customFields, data
             formItemLayout,
             customFields
           })}
-          {/*errors && <Alert color="error">{errors}</Alert>*/}
           <FormItem {...tailFormItemLayout}>
             <Button color="primary" type="submit">
               Save

From 38208d4d0e83ce176cc408defbfd22e2a64c24e1 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Fri, 22 Jun 2018 17:07:01 +0300
Subject: [PATCH 163/327] Refactor module.js, devide into modules and change
 path

---
 tools/cli/commands/addModule.js    |  81 ++++++
 tools/cli/commands/deleteModule.js |  87 ++++++
 tools/cli/commands/updateSchema.js | 444 +++++++++++++++++++++++++++++
 tools/cli/helpers/util.js          | 126 ++++++++
 4 files changed, 738 insertions(+)
 create mode 100644 tools/cli/commands/addModule.js
 create mode 100644 tools/cli/commands/deleteModule.js
 create mode 100644 tools/cli/commands/updateSchema.js
 create mode 100644 tools/cli/helpers/util.js

diff --git a/tools/cli/commands/addModule.js b/tools/cli/commands/addModule.js
new file mode 100644
index 0000000000..433296415a
--- /dev/null
+++ b/tools/cli/commands/addModule.js
@@ -0,0 +1,81 @@
+const shell = require('shelljs');
+const fs = require('fs');
+const chalk = require('chalk');
+const { pascalize } = require('humps');
+const { renameFiles, generateCommonGraphqlFile } = require('../helpers/util');
+
+/**
+ *
+ * @param logger
+ * @param templatePath
+ * @param module
+ * @param action
+ * @param tablePrefix
+ * @param location
+ */
+function addModule(logger, templatePath, module, action, tablePrefix, location) {
+  logger.info(`Copying ${location} files…`);
+
+  // pascalize
+  const Module = pascalize(module);
+
+  // create new module directory
+  const startPath = `${__dirname}/../../..`;
+  const mkdir = shell.mkdir(`${startPath}/packages/${location}/src/modules/${module}`);
+
+  // continue only if directory does not jet exist
+  if (mkdir.code === 0) {
+    const destinationPath = `${startPath}/packages/${location}/src/modules/${module}`;
+    renameFiles(destinationPath, templatePath, module, location);
+
+    logger.info(chalk.green(`✔ The ${location} files have been copied!`));
+
+    shell.cd('..');
+    // get module input data
+    const path = `${startPath}/packages/${location}/src/modules/index.js`;
+    let data = fs.readFileSync(path);
+
+    // extract Feature modules
+    const re = /Feature\(([^()]+)\)/g;
+    const match = re.exec(data);
+
+    // prepend import module
+    const prepend = `import ${module} from './${module}';\n`;
+    fs.writeFileSync(path, prepend + data);
+
+    // add module to Feature function
+    shell.ShellString(shell.cat('index.js').replace(RegExp(re, 'g'), `Feature(${module}, ${match[1]})`)).to('index.js');
+
+    if (action === 'addcrud' && location === 'client') {
+      const commonGraphqlFile = 'commonGraphql.js';
+      const commonGraphqlPath = `${startPath}/packages/${location}/src/modules/common/components/web/${commonGraphqlFile}`;
+      const graphqlQuery = `${Module}Query`;
+      generateCommonGraphqlFile(module, commonGraphqlPath, graphqlQuery);
+    }
+
+    if (action === 'addcrud' && location === 'server') {
+      console.log('copy database files');
+      const destinationPath = `${startPath}/packages/${location}/src/database`;
+      renameFiles(destinationPath, templatePath, module, 'database');
+
+      const timestamp = new Date().getTime();
+      shell.cd(`${startPath}/packages/${location}/src/database/migrations`);
+      shell.mv(`_${Module}.js`, `${timestamp}_${Module}.js`);
+      shell.cd(`${startPath}/packages/${location}/src/database/seeds`);
+      shell.mv(`_${Module}.js`, `${timestamp}_${Module}.js`);
+
+      logger.info(chalk.green(`✔ The database files have been copied!`));
+
+      if (tablePrefix !== '') {
+        shell.cd(`${startPath}/packages/${location}/src/modules/${module}`);
+        shell.sed('-i', /this.prefix = '';/g, `this.prefix = '${tablePrefix}';`, 'sql.js');
+
+        logger.info(chalk.green(`✔ Inserted db table prefix!`));
+      }
+    }
+
+    logger.info(chalk.green(`✔ Module for ${location} successfully created!`));
+  }
+}
+
+module.exports = addModule;
diff --git a/tools/cli/commands/deleteModule.js b/tools/cli/commands/deleteModule.js
new file mode 100644
index 0000000000..6b122463a6
--- /dev/null
+++ b/tools/cli/commands/deleteModule.js
@@ -0,0 +1,87 @@
+const shell = require('shelljs');
+const fs = require('fs');
+const chalk = require('chalk');
+const { pascalize } = require('humps');
+const { deleteModuleFromCommonGraphqlFile } = require('../helpers/util');
+
+/**
+ *
+ * @param logger
+ * @param templatePath
+ * @param module
+ * @param location
+ */
+function deleteModule(logger, templatePath, module, location) {
+  logger.info(`Deleting ${location} files…`);
+
+  // pascalize
+  const Module = pascalize(module);
+  const startPath = `${__dirname}/../../..`;
+  const modulePath = `${startPath}/packages/${location}/src/modules/${module}`;
+  const commonGraphqlFile = 'commonGraphql.js';
+  const commonGraphqlPath = `${startPath}/packages/${location}/src/modules/common/components/web/${commonGraphqlFile}`;
+
+  if (fs.existsSync(modulePath)) {
+    // remove module directory
+    shell.rm('-rf', modulePath);
+
+    // change to destination directory
+    shell.cd(`${startPath}/packages/${location}/src/modules/`);
+
+    // get module input data
+    const path = `${startPath}/packages/${location}/src/modules/index.js`;
+    let data = fs.readFileSync(path);
+
+    // extract Feature modules
+    const re = /Feature\(([^()]+)\)/g;
+    const match = re.exec(data);
+    const modules = match[1].split(',').filter(featureModule => featureModule.trim() !== module);
+
+    // remove import module line
+    const lines = data
+      .toString()
+      .split('\n')
+      .filter(line => line.match(`import ${module} from './${module}';`) === null);
+    fs.writeFileSync(path, lines.join('\n'));
+
+    // remove module from Feature function
+    //shell.sed('-i', re, `Feature(${modules.toString().trim()})`, 'index.js');
+    shell
+      .ShellString(shell.cat('index.js').replace(RegExp(re, 'g'), `Feature(${modules.toString().trim()})`))
+      .to('index.js');
+
+    if (location === 'server') {
+      // change to database migrations directory
+      shell.cd(`${startPath}/packages/${location}/src/database/migrations`);
+      // check if any migrations files for this module exist
+      if (shell.find('.').filter(file => file.search(`_${Module}.js`) > -1).length > 0) {
+        let okMigrations = shell.rm(`*_${Module}.js`);
+        if (okMigrations) {
+          logger.info(chalk.green(`✔ Database migrations files successfully deleted!`));
+        }
+      }
+
+      // change to database seeds directory
+      shell.cd(`${startPath}/packages/${location}/src/database/seeds`);
+      // check if any seed files for this module exist
+      if (shell.find('.').filter(file => file.search(`_${Module}.js`) > -1).length > 0) {
+        let okSeeds = shell.rm(`*_${Module}.js`);
+        if (okSeeds) {
+          logger.info(chalk.green(`✔ Database seed files successfully deleted!`));
+        }
+      }
+    }
+
+    // continue only if directory does not jet exist
+    logger.info(chalk.green(`✔ Module for ${location} successfully deleted!`));
+  } else {
+    logger.info(chalk.red(`✘ Module ${location} location for ${modulePath} not found!`));
+  }
+
+  if (fs.existsSync(commonGraphqlPath)) {
+    const graphqlQuery = `${Module}Query`;
+    deleteModuleFromCommonGraphqlFile(module, commonGraphqlPath, graphqlQuery);
+  }
+}
+
+module.exports = deleteModule;
diff --git a/tools/cli/commands/updateSchema.js b/tools/cli/commands/updateSchema.js
new file mode 100644
index 0000000000..db6d0f26a5
--- /dev/null
+++ b/tools/cli/commands/updateSchema.js
@@ -0,0 +1,444 @@
+const shell = require('shelljs');
+const fs = require('fs');
+const chalk = require('chalk');
+const GraphQLGenerator = require('@domain-schema/graphql').default;
+const { pascalize, camelize } = require('humps');
+const { generateField } = require('../helpers/util');
+
+/**
+ *
+ * @param logger
+ * @param module
+ * @returns {*|void}
+ */
+function updateSchema(logger, module) {
+  logger.info(`Updating ${module} Schema…`);
+
+  // pascalize
+  const Module = pascalize(module);
+
+  const startPath = `${__dirname}/../../..`;
+  const modulePath = `${startPath}/packages/server/src/modules/${module}`;
+
+  if (fs.existsSync(modulePath)) {
+    // get module schema
+    // eslint-disable-next-line import/no-dynamic-require
+    const schema = require(`${modulePath}/schema`)[`${Module}Schema`];
+
+    // get schema file
+    const pathSchema = `${startPath}/packages/server/src/modules/${module}/`;
+    if (fs.existsSync(pathSchema)) {
+      const file = `schema.graphql`;
+
+      // regenerate input fields
+      //let moduleData = `  node: ${Module}\n`;
+      let inputCreate = '';
+      let inputUpdate = '';
+      let inputFilter = `  searchText: String\n`;
+      let manyInput = '';
+      for (const key of schema.keys()) {
+        const value = schema.values[key];
+        const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
+        if (value.type.isSchema) {
+          let required = value.optional ? '' : '!';
+          inputCreate += `  ${key}Id: Int${required}\n`;
+          inputUpdate += `  ${key}Id: Int\n`;
+          inputFilter += `  ${key}Id: Int\n`;
+          //moduleData += `  ${key}s(limit: Int, orderBy: OrderByInput): [${value.type.name}]\n`;
+        } else if (value.type.constructor !== Array) {
+          if (key !== 'id') {
+            inputCreate += `  ${key}: ${generateField(value)}\n`;
+            inputUpdate += `  ${key}: ${generateField(value, true)}\n`;
+          }
+
+          if (hasTypeOf(Date)) {
+            inputFilter += `  ${key}_lte: ${generateField(value, true)}\n`;
+            inputFilter += `  ${key}_gte: ${generateField(value, true)}\n`;
+          } else {
+            inputFilter += `  ${key}: ${generateField(value, true)}\n`;
+          }
+        } else if (value.type.constructor === Array && value.type[0].isSchema) {
+          inputCreate += `  ${key}: ${pascalize(key)}CreateManyInput\n`;
+          inputUpdate += `  ${key}: ${pascalize(key)}UpdateManyInput\n`;
+
+          /*for (const remoteKey of value.type[0].keys()) {
+            const remoteValue = value.type[0].values[remoteKey];
+            if (remoteValue.type.isSchema) {
+              moduleData += `  ${remoteKey}s: [${pascalize(remoteKey)}]\n`;
+            }
+          }*/
+
+          manyInput += `
+
+input ${pascalize(key)}CreateManyInput {
+  create: [${pascalize(value.type[0].name)}CreateInput!]
+}
+
+input ${pascalize(key)}UpdateManyInput {
+  create: [${pascalize(value.type[0].name)}CreateInput!]
+  delete: [${pascalize(value.type[0].name)}WhereUniqueInput!]
+  update: [${pascalize(value.type[0].name)}UpdateWhereInput!]
+}
+
+input ${pascalize(value.type[0].name)}UpdateWhereInput {
+  where: ${pascalize(value.type[0].name)}WhereUniqueInput!
+  data: ${pascalize(value.type[0].name)}UpdateInput!
+}`;
+        }
+      }
+
+      shell.cd(pathSchema);
+      // override Module type in schema.graphql file
+      const replaceType = `### schema type definitions([^()]+)### end schema type definitions`;
+      shell
+        .ShellString(
+          shell
+            .cat(file)
+            .replace(
+              RegExp(replaceType, 'g'),
+              `### schema type definitions\n${new GraphQLGenerator().generateTypes(
+                schema
+              )}${manyInput}\n\n### end schema type definitions`
+            )
+        )
+        .to(file);
+
+      // override ModuleData in schema.graphql file
+      /*let replaceModuleData = `type ${Module}Data {([^}])*\\n}`;
+      shell
+        .ShellString(shell.cat(file).replace(RegExp(replaceModuleData, 'g'), `type ${Module}Data {\n${moduleData}}`))
+        .to(file);*/
+
+      // override ModuleCreateInput in schema.graphql file
+      const replaceCreate = `input ${Module}CreateInput {([^}])*\\n}`;
+      shell
+        .ShellString(
+          shell.cat(file).replace(RegExp(replaceCreate, 'g'), `input ${Module}CreateInput {\n${inputCreate}}`)
+        )
+        .to(file);
+
+      // override ModuleUpdateInput in schema.graphql file
+      const replaceUpdate = `input ${Module}UpdateInput {([^}])*\\n}`;
+      shell
+        .ShellString(
+          shell.cat(file).replace(RegExp(replaceUpdate, 'g'), `input ${Module}UpdateInput {\n${inputUpdate}}`)
+        )
+        .to(file);
+
+      // override ModuleFilterInput in schema.graphql file
+      const replaceFilter = `input ${Module}FilterInput {([^}])*\\n}`;
+      shell
+        .ShellString(
+          shell.cat(file).replace(RegExp(replaceFilter, 'g'), `input ${Module}FilterInput {\n${inputFilter}}`)
+        )
+        .to(file);
+
+      logger.info(chalk.green(`✔ Schema in ${pathSchema}${file} successfully updated!`));
+
+      const resolverFile = `resolvers.js`;
+      let replace = `  ${schema.name}: {
+`;
+      //moduleData = '';
+      for (const key of schema.keys()) {
+        const value = schema.values[key];
+        if (value.type.isSchema) {
+          /*moduleData += `    ${key}s(obj, args, ctx, info) {
+      return ctx.${value.type.name}.getList(args, info);
+    },
+`;*/
+        } else if (value.type.constructor === Array) {
+          replace += `    ${key}: createBatchResolver((sources, args, ctx, info) => {
+      return ctx.${schema.name}.getByIds(sources.map(({ id }) => id), '${camelize(schema.name)}', ctx.${
+            value.type[0].name
+          }, info);
+    }),
+`;
+          /*
+          for (const remoteKey of value.type[0].keys()) {
+            const remoteValue = value.type[0].values[remoteKey];
+            if (remoteValue.type.isSchema) {
+              moduleData += `    ${remoteKey}s(obj, args, ctx, info) {
+      return ctx.${remoteValue.type.name}.getList(args, info);
+    },
+`;
+            }
+          }*/
+        }
+      }
+      replace += `  },
+`;
+      /*
+      if (moduleData !== '') {
+        moduleData = `${moduleData.replace(/,\s*$/, '')}
+`;
+      }
+
+      // override batch resolvers in resolvers.js file
+      replaceModuleData = `// related data([^*]+)// end related data`;
+      shell
+        .ShellString(
+          shell
+            .cat(resolverFile)
+            .replace(RegExp(replaceModuleData, 'g'), `// related data\n${moduleData}    // end related data`)
+        )
+        .to(resolverFile);*/
+
+      // override batch resolvers in resolvers.js file
+      const replaceBatchResolvers = `// schema batch resolvers([^*]+)// end schema batch resolvers`;
+      shell
+        .ShellString(
+          shell
+            .cat(resolverFile)
+            .replace(
+              RegExp(replaceBatchResolvers, 'g'),
+              `// schema batch resolvers\n${replace}  // end schema batch resolvers`
+            )
+        )
+        .to(resolverFile);
+
+      logger.info(chalk.green(`✔ Resolver in ${pathSchema}${resolverFile} successfully updated!`));
+    } else {
+      logger.error(chalk.red(`✘ Schema path ${pathSchema} not found!`));
+    }
+
+    // get fragment file
+    const pathFragment = `${startPath}/packages/client/src/modules/${module}/graphql/`;
+    if (fs.existsSync(pathFragment)) {
+      const fragmentGraphqlFile = `${Module}.graphql`;
+
+      // regenerate graphql fragment
+      // TODO: refactor to generate this recursively
+      let fragmentGraphql = '';
+      for (const key of schema.keys()) {
+        const value = schema.values[key];
+        if (value.type.isSchema) {
+          let column = 'name';
+          for (const remoteKey of value.type.keys()) {
+            const remoteValue = value.type.values[remoteKey];
+            if (remoteValue.sortBy) {
+              column = remoteKey;
+            }
+          }
+          fragmentGraphql += `  ${key} {\n`;
+          fragmentGraphql += `    id\n`;
+          fragmentGraphql += `    ${column}\n`;
+          fragmentGraphql += `  }\n`;
+        } else if (value.type.constructor === Array && value.type[0].isSchema) {
+          fragmentGraphql += `  ${key} {\n`;
+          for (const remoteKey of value.type[0].keys()) {
+            const remoteValue = value.type[0].values[remoteKey];
+            if (remoteValue.type.isSchema) {
+              let remotecolumn = 'name';
+              for (const remoteKey of remoteValue.type.keys()) {
+                const remoteValue1 = remoteValue.type.values[remoteKey];
+                if (remoteValue1.sortBy) {
+                  remotecolumn = remoteKey;
+                }
+              }
+              fragmentGraphql += `    ${remoteKey} {\n`;
+              fragmentGraphql += `      id\n`;
+              fragmentGraphql += `      ${remotecolumn}\n`;
+              fragmentGraphql += `    }\n`;
+            } else if (remoteValue.type.constructor !== Array) {
+              fragmentGraphql += `    ${remoteKey}\n`;
+            }
+          }
+          fragmentGraphql += `  }\n`;
+        } else {
+          fragmentGraphql += `  ${key}\n`;
+        }
+      }
+
+      shell.cd(pathFragment);
+      // override graphql fragment file
+      const replaceFragment = `${Module} {(.|\n)*\n}`;
+      fragmentGraphql = shell
+        .cat(fragmentGraphqlFile)
+        .replace(RegExp(replaceFragment, 'g'), `${Module} {\n${fragmentGraphql}}`);
+      try {
+        fs.writeFileSync(pathFragment + fragmentGraphqlFile, fragmentGraphql);
+      } catch (err) {
+        return logger.error(chalk.red(`✘ Failed to write a ${pathFragment}${fragmentGraphqlFile} file!`));
+      }
+      logger.info(chalk.green(`✔ Fragment in ${pathFragment}${fragmentGraphqlFile} successfully updated!`));
+    } else {
+      logger.error(chalk.red(`✘ Fragment path ${pathFragment} not found!`));
+    }
+    /*
+    // get module query file
+    const pathModuleQuery = `${__dirname}/../../packages/client/src/modules/${module}/graphql/`;
+    if (fs.existsSync(pathModuleQuery)) {
+      const file = `${Module}Query.graphql`;
+
+      // regenerate graphql module query
+      let graphql = '';
+      for (const key of schema.keys()) {
+        const value = schema.values[key];
+        if (value.type.isSchema) {
+          let column = 'name';
+          for (const remoteKey of value.type.keys()) {
+            const remoteValue = value.type.values[remoteKey];
+            if (remoteValue.sortBy) {
+              column = remoteKey;
+            }
+          }
+          graphql += `    ${key}s {\n`;
+          graphql += `      id\n`;
+          graphql += `      ${column}\n`;
+          graphql += `    }\n`;
+        } else if (value.type.constructor === Array) {
+          for (const remoteKey of value.type[0].keys()) {
+            const remoteValue = value.type[0].values[remoteKey];
+            if (remoteValue.type.isSchema) {
+              let remotecolumn = 'name';
+              for (const remoteKey of remoteValue.type.keys()) {
+                const remoteValue1 = remoteValue.type.values[remoteKey];
+                if (remoteValue1.sortBy) {
+                  remotecolumn = remoteKey;
+                }
+              }
+              graphql += `    ${remoteKey}s {\n`;
+              graphql += `      id\n`;
+              graphql += `      ${remotecolumn}\n`;
+              graphql += `    }\n`;
+            }
+          }
+        }
+      }
+
+      shell.cd(pathModuleQuery);
+      // override graphql module query file
+      const replaceFragment = `### form data([^()]+)### end form data`;
+      shell
+        .ShellString(
+          shell.cat(file).replace(RegExp(replaceFragment, 'g'), `### form data\n${graphql}    ### end form data`)
+        )
+        .to(file);
+
+      logger.info(chalk.green(`✔ Module query in ${pathModuleQuery}${file} successfully updated!`));
+    } else {
+      logger.error(chalk.red(`✘ Module query path ${pathModuleQuery} not found!`));
+    }*/
+
+    // get state client file
+    const pathStateClient = `${startPath}/packages/client/src/modules/${module}/graphql/`;
+    if (fs.existsSync(pathStateClient)) {
+      const file = `${Module}State.client.graphql`;
+
+      // regenerate graphql fragment
+      let graphql = '';
+      for (const key of schema.keys()) {
+        const value = schema.values[key];
+        const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
+        if (value.type.isSchema) {
+          graphql += `    ${key}Id\n`;
+          /*} else if (value.type.constructor === Array) {
+            graphql += `  ${key} {\n`;
+            for (const remoteKey of value.type[0].keys()) {
+              const remoteValue = value.type[0].values[remoteKey];
+              if (remoteValue.type.isSchema) {
+                let remotecolumn = 'name';
+                for (const remoteKey of remoteValue.type.keys()) {
+                  const remoteValue1 = remoteValue.type.values[remoteKey];
+                  if (remoteValue1.sortBy) {
+                    remotecolumn = remoteKey;
+                  }
+                }
+                graphql += `    ${remoteKey} {\n`;
+                graphql += `      id\n`;
+                graphql += `      ${remotecolumn}\n`;
+                graphql += `    }\n`;
+              } else {
+                graphql += `    ${remoteKey}\n`;
+              }
+            }
+            graphql += `  }\n`;*/
+        } else {
+          if (hasTypeOf(Date)) {
+            graphql += `    ${key}_lte\n`;
+            graphql += `    ${key}_gte\n`;
+          } else {
+            graphql += `    ${key}\n`;
+          }
+        }
+      }
+      graphql += `    searchText
+  }\n`;
+
+      shell.cd(pathStateClient);
+      // override graphql fragment file
+      const replaceStateClient = `filter {(.|\n)*\n}\n`;
+      shell.ShellString(shell.cat(file).replace(RegExp(replaceStateClient, 'g'), `filter {\n${graphql}}\n`)).to(file);
+
+      logger.info(chalk.green(`✔ State Client in ${pathStateClient}${file} successfully updated!`));
+    } else {
+      logger.error(chalk.red(`✘ State Client path ${pathStateClient} not found!`));
+    }
+
+    // get state resolver file
+    const pathStateResolver = `${startPath}/packages/client/src/modules/${module}/resolvers/`;
+    if (fs.existsSync(pathStateResolver)) {
+      const file = `index.js`;
+
+      // regenerate resolver defaults
+      let defaults = `const defaultFilters = {\n`;
+      for (const key of schema.keys()) {
+        const value = schema.values[key];
+        const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
+        if (value.type.isSchema) {
+          defaults += `  ${key}Id: '',\n`;
+          /*} else if (value.type.constructor === Array) {
+            graphql += `  ${key} {\n`;
+            for (const remoteKey of value.type[0].keys()) {
+              const remoteValue = value.type[0].values[remoteKey];
+              if (remoteValue.type.isSchema) {
+                let remotecolumn = 'name';
+                for (const remoteKey of remoteValue.type.keys()) {
+                  const remoteValue1 = remoteValue.type.values[remoteKey];
+                  if (remoteValue1.sortBy) {
+                    remotecolumn = remoteKey;
+                  }
+                }
+                graphql += `    ${remoteKey} {\n`;
+                graphql += `      id\n`;
+                graphql += `      ${remotecolumn}\n`;
+                graphql += `    }\n`;
+              } else {
+                graphql += `    ${remoteKey}\n`;
+              }
+            }
+            graphql += `  }\n`;*/
+        } else {
+          if (hasTypeOf(Date)) {
+            defaults += `  ${key}_lte: '',\n`;
+            defaults += `  ${key}_gte: '',\n`;
+          } else {
+            defaults += `  ${key}: '',\n`;
+          }
+        }
+      }
+
+      defaults += `  searchText: ''
+};\n`;
+
+      shell.cd(pathStateResolver);
+      // override state resolver file
+      const replaceStateResolverDefaults = `// filter data([^*]+)// end filter data`;
+      shell
+        .ShellString(
+          shell
+            .cat(file)
+            .replace(RegExp(replaceStateResolverDefaults, 'g'), `// filter data\n${defaults}// end filter data`)
+        )
+        .to(file);
+
+      logger.info(chalk.green(`✔ State Resolver in ${pathStateResolver}${file} successfully updated!`));
+    } else {
+      logger.error(chalk.red(`✘ State Resolver path ${pathStateResolver} not found!`));
+    }
+  } else {
+    logger.info(chalk.red(`✘ Module ${module} in path ${modulePath} not found!`));
+  }
+}
+
+module.exports = updateSchema;
diff --git a/tools/cli/helpers/util.js b/tools/cli/helpers/util.js
new file mode 100644
index 0000000000..4f5ac71b7c
--- /dev/null
+++ b/tools/cli/helpers/util.js
@@ -0,0 +1,126 @@
+const shell = require('shelljs');
+const fs = require('fs');
+const DomainSchema = require('@domain-schema/core').default;
+const { pascalize, decamelize } = require('humps');
+const { startCase } = require('lodash');
+
+/**
+ *
+ * @param destinationPath
+ * @param templatePath
+ * @param module
+ * @param location
+ */
+function renameFiles(destinationPath, templatePath, module, location) {
+  // pascalize
+  const Module = pascalize(module);
+
+  shell.cp('-R', `${templatePath}/${location}/*`, destinationPath);
+
+  // change to destination directory
+  shell.cd(destinationPath);
+
+  // rename files
+  shell.ls('-Rl', '.').forEach(entry => {
+    if (entry.isFile()) {
+      const moduleFile = entry.name.replace('Module', Module);
+      shell.mv(entry.name, moduleFile);
+    }
+  });
+
+  // replace module names
+  shell.ls('-Rl', '.').forEach(entry => {
+    if (entry.isFile()) {
+      shell.sed('-i', /\$module\$/g, module, entry.name);
+      shell.sed('-i', /\$_module\$/g, decamelize(module), entry.name);
+      shell.sed('-i', /\$Module\$/g, Module, entry.name);
+      shell.sed('-i', /\$MoDuLe\$/g, startCase(Module), entry.name);
+      shell.sed('-i', /\$MODULE\$/g, module.toUpperCase(), entry.name);
+    }
+  });
+}
+
+/**
+ *
+ * @param value
+ * @param update
+ * @returns {string}
+ */
+function generateField(value, update = false) {
+  let result = '';
+  const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
+  if (hasTypeOf(Boolean)) {
+    result += 'Boolean';
+  } else if (hasTypeOf(DomainSchema.ID)) {
+    result += 'ID';
+  } else if (hasTypeOf(DomainSchema.Int)) {
+    result += 'Int';
+  } else if (hasTypeOf(DomainSchema.Float)) {
+    result += 'Float';
+  } else if (hasTypeOf(String)) {
+    result += 'String';
+  } else if (hasTypeOf(Date)) {
+    result += 'Date';
+  } else if (hasTypeOf(DomainSchema.DateTime)) {
+    result += 'DateTime';
+  } else if (hasTypeOf(DomainSchema.Time)) {
+    result += 'Time';
+  }
+
+  if (!update && !value.optional) {
+    result += '!';
+  }
+
+  return result;
+}
+
+/**
+ *
+ * @param module
+ * @param commonGraphqlPath
+ * @param moduleGraphqlContainer
+ */
+function generateCommonGraphqlFile(module, commonGraphqlPath, moduleGraphqlContainer) {
+  const importGraphqlContainer = `import ${moduleGraphqlContainer} from '../../../${module}/containers/${moduleGraphqlContainer}';\n`;
+  const exportGraphqlContainer = `\nexport default {\n  ${moduleGraphqlContainer}\n};\n`;
+
+  if (fs.existsSync(commonGraphqlPath)) {
+    const commonGraphqlData = fs.readFileSync(commonGraphqlPath);
+    const commonGraphql = commonGraphqlData.toString().trim();
+    if (commonGraphql.length > 1) {
+      const index = commonGraphql.lastIndexOf("';");
+      const computedIndex = index >= 0 ? index + 3 : false;
+      if (computedIndex) {
+        let computedCommonGraphql =
+          commonGraphql.slice(0, computedIndex) +
+          importGraphqlContainer +
+          commonGraphql.slice(computedIndex, commonGraphql.length);
+        computedCommonGraphql = computedCommonGraphql.replace(/(,|)\s};/g, `,\n  ${moduleGraphqlContainer}\n};`);
+        return fs.writeFileSync(commonGraphqlPath, computedCommonGraphql);
+      }
+    }
+  }
+  return fs.writeFileSync(commonGraphqlPath, importGraphqlContainer + exportGraphqlContainer);
+}
+
+/**
+ *
+ * @param module
+ * @param commonGraphqlPath
+ * @param moduleGraphqlContainer
+ */
+function deleteModuleFromCommonGraphqlFile(module, commonGraphqlPath, moduleGraphqlContainer) {
+  if (fs.existsSync(commonGraphqlPath)) {
+    const commonGraphqlData = fs.readFileSync(commonGraphqlPath);
+    const reg = `(\\n\\s\\s${moduleGraphqlContainer}(.|)|import ${moduleGraphqlContainer}.+;\\n+(?!ex))`;
+    const commonGraphql = commonGraphqlData.toString().replace(new RegExp(reg, 'g'), '');
+    fs.writeFileSync(commonGraphqlPath, commonGraphql);
+  }
+}
+
+module.exports = {
+  renameFiles,
+  generateField,
+  generateCommonGraphqlFile,
+  deleteModuleFromCommonGraphqlFile
+};

From 2e61a6c0f1e9bc465efd44698d2963a1868e5e5a Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Fri, 22 Jun 2018 18:12:40 +0300
Subject: [PATCH 164/327] Change module.js

---
 tools/cli/module.js | 692 +-------------------------------------------
 1 file changed, 7 insertions(+), 685 deletions(-)

diff --git a/tools/cli/module.js b/tools/cli/module.js
index fc1320d9dc..fd0164b9cf 100644
--- a/tools/cli/module.js
+++ b/tools/cli/module.js
@@ -1,686 +1,8 @@
-const shell = require('shelljs');
 const fs = require('fs');
 const chalk = require('chalk');
-const DomainSchema = require('@domain-schema/core').default;
-const GraphQLGenerator = require('@domain-schema/graphql').default;
-const { pascalize, camelize, decamelize } = require('humps');
-const { startCase } = require('lodash');
-
-function renameFiles(destinationPath, templatePath, module, location) {
-  // pascalize
-  const Module = pascalize(module);
-
-  shell.cp('-R', `${templatePath}/${location}/*`, destinationPath);
-
-  // change to destination directory
-  shell.cd(destinationPath);
-
-  // rename files
-  shell.ls('-Rl', '.').forEach(entry => {
-    if (entry.isFile()) {
-      const moduleFile = entry.name.replace('Module', Module);
-      shell.mv(entry.name, moduleFile);
-    }
-  });
-
-  // replace module names
-  shell.ls('-Rl', '.').forEach(entry => {
-    if (entry.isFile()) {
-      shell.sed('-i', /\$module\$/g, module, entry.name);
-      shell.sed('-i', /\$_module\$/g, decamelize(module), entry.name);
-      shell.sed('-i', /\$Module\$/g, Module, entry.name);
-      shell.sed('-i', /\$MoDuLe\$/g, startCase(Module), entry.name);
-      shell.sed('-i', /\$MODULE\$/g, module.toUpperCase(), entry.name);
-    }
-  });
-}
-
-function generateField(value, update = false) {
-  let result = '';
-  const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
-  if (hasTypeOf(Boolean)) {
-    result += 'Boolean';
-  } else if (hasTypeOf(DomainSchema.ID)) {
-    result += 'ID';
-  } else if (hasTypeOf(DomainSchema.Int)) {
-    result += 'Int';
-  } else if (hasTypeOf(DomainSchema.Float)) {
-    result += 'Float';
-  } else if (hasTypeOf(String)) {
-    result += 'String';
-  } else if (hasTypeOf(Date)) {
-    result += 'Date';
-  } else if (hasTypeOf(DomainSchema.DateTime)) {
-    result += 'DateTime';
-  } else if (hasTypeOf(DomainSchema.Time)) {
-    result += 'Time';
-  }
-
-  if (!update && !value.optional) {
-    result += '!';
-  }
-
-  return result;
-}
-
-/**
- *
- * @param module
- * @param commonGraphqlPath
- * @param moduleGraphqlContainer
- */
-function generateCommonGraphqlFile(module, commonGraphqlPath, moduleGraphqlContainer) {
-  const importGraphqlContainer = `import ${moduleGraphqlContainer} from '../../../${module}/containers/${moduleGraphqlContainer}';\n`;
-  const exportGraphqlContainer = `\nexport default {\n  ${moduleGraphqlContainer}\n};\n`;
-
-  if (fs.existsSync(commonGraphqlPath)) {
-    const commonGraphqlData = fs.readFileSync(commonGraphqlPath);
-    const commonGraphql = commonGraphqlData.toString().trim();
-    if (commonGraphql.length > 1) {
-      const index = commonGraphql.lastIndexOf("';");
-      const computedIndex = index >= 0 ? index + 3 : false;
-      if (computedIndex) {
-        let computedCommonGraphql =
-          commonGraphql.slice(0, computedIndex) +
-          importGraphqlContainer +
-          commonGraphql.slice(computedIndex, commonGraphql.length);
-        computedCommonGraphql = computedCommonGraphql.replace(/(,|)\s};/g, `,\n  ${moduleGraphqlContainer}\n};`);
-        return fs.writeFileSync(commonGraphqlPath, computedCommonGraphql);
-      }
-    }
-  }
-  return fs.writeFileSync(commonGraphqlPath, importGraphqlContainer + exportGraphqlContainer);
-}
-
-/**
- *
- * @param module
- * @param commonGraphqlPath
- * @param moduleGraphqlContainer
- */
-function deleteModuleFromCommonGraphqlFile(module, commonGraphqlPath, moduleGraphqlContainer) {
-  if (fs.existsSync(commonGraphqlPath)) {
-    const commonGraphqlData = fs.readFileSync(commonGraphqlPath);
-    const reg = `(\\n\\s\\s${moduleGraphqlContainer}(.|)|import ${moduleGraphqlContainer}.+;\\n+(?!ex))`;
-    const commonGraphql = commonGraphqlData.toString().replace(new RegExp(reg, 'g'), '');
-    fs.writeFileSync(commonGraphqlPath, commonGraphql);
-  }
-}
-
-/**
- *
- * @param logger
- * @param templatePath
- * @param module
- * @param action
- * @param tablePrefix
- * @param location
- */
-function copyFiles(logger, templatePath, module, action, tablePrefix, location) {
-  logger.info(`Copying ${location} files…`);
-
-  // pascalize
-  const Module = pascalize(module);
-
-  // create new module directory
-  const mkdir = shell.mkdir(`${__dirname}/../../packages/${location}/src/modules/${module}`);
-
-  // continue only if directory does not jet exist
-  if (mkdir.code === 0) {
-    const destinationPath = `${__dirname}/../../packages/${location}/src/modules/${module}`;
-    renameFiles(destinationPath, templatePath, module, location);
-
-    logger.info(chalk.green(`✔ The ${location} files have been copied!`));
-
-    shell.cd('..');
-    // get module input data
-    const path = `${__dirname}/../../packages/${location}/src/modules/index.js`;
-    let data = fs.readFileSync(path);
-
-    // extract Feature modules
-    const re = /Feature\(([^()]+)\)/g;
-    const match = re.exec(data);
-
-    // prepend import module
-    const prepend = `import ${module} from './${module}';\n`;
-    fs.writeFileSync(path, prepend + data);
-
-    // add module to Feature function
-    shell.ShellString(shell.cat('index.js').replace(RegExp(re, 'g'), `Feature(${module}, ${match[1]})`)).to('index.js');
-
-    if (action === 'addcrud' && location === 'client') {
-      const commonGraphqlFile = 'commonGraphql.js';
-      const commonGraphqlPath = `${__dirname}/../../packages/${location}/src/modules/common/components/web/${commonGraphqlFile}`;
-      const graphqlQuery = `${Module}Query`;
-      generateCommonGraphqlFile(module, commonGraphqlPath, graphqlQuery);
-    }
-
-    if (action === 'addcrud' && location === 'server') {
-      console.log('copy database files');
-      const destinationPath = `${__dirname}/../../packages/${location}/src/database`;
-      renameFiles(destinationPath, templatePath, module, 'database');
-
-      const timestamp = new Date().getTime();
-      shell.cd(`${__dirname}/../../packages/${location}/src/database/migrations`);
-      shell.mv(`_${Module}.js`, `${timestamp}_${Module}.js`);
-      shell.cd(`${__dirname}/../../packages/${location}/src/database/seeds`);
-      shell.mv(`_${Module}.js`, `${timestamp}_${Module}.js`);
-
-      logger.info(chalk.green(`✔ The database files have been copied!`));
-
-      if (tablePrefix !== '') {
-        shell.cd(`${__dirname}/../../packages/${location}/src/modules/${module}`);
-        shell.sed('-i', /this.prefix = '';/g, `this.prefix = '${tablePrefix}';`, 'sql.js');
-
-        logger.info(chalk.green(`✔ Inserted db table prefix!`));
-      }
-    }
-
-    logger.info(chalk.green(`✔ Module for ${location} successfully created!`));
-  }
-}
-
-function deleteFiles(logger, templatePath, module, location) {
-  logger.info(`Deleting ${location} files…`);
-
-  // pascalize
-  const Module = pascalize(module);
-
-  const modulePath = `${__dirname}/../../packages/${location}/src/modules/${module}`;
-  const commonGraphqlFile = 'commonGraphql.js';
-  const commonGraphqlPath = `${__dirname}/../../packages/${location}/src/modules/common/components/web/${commonGraphqlFile}`;
-
-  if (fs.existsSync(modulePath)) {
-    // remove module directory
-    shell.rm('-rf', modulePath);
-
-    // change to destination directory
-    shell.cd(`${__dirname}/../../packages/${location}/src/modules/`);
-
-    // get module input data
-    const path = `${__dirname}/../../packages/${location}/src/modules/index.js`;
-    let data = fs.readFileSync(path);
-
-    // extract Feature modules
-    const re = /Feature\(([^()]+)\)/g;
-    const match = re.exec(data);
-    const modules = match[1].split(',').filter(featureModule => featureModule.trim() !== module);
-
-    // remove import module line
-    const lines = data
-      .toString()
-      .split('\n')
-      .filter(line => line.match(`import ${module} from './${module}';`) === null);
-    fs.writeFileSync(path, lines.join('\n'));
-
-    // remove module from Feature function
-    //shell.sed('-i', re, `Feature(${modules.toString().trim()})`, 'index.js');
-    shell
-      .ShellString(shell.cat('index.js').replace(RegExp(re, 'g'), `Feature(${modules.toString().trim()})`))
-      .to('index.js');
-
-    if (location === 'server') {
-      // change to database migrations directory
-      shell.cd(`${__dirname}/../../packages/${location}/src/database/migrations`);
-      // check if any migrations files for this module exist
-      if (shell.find('.').filter(file => file.search(`_${Module}.js`) > -1).length > 0) {
-        let okMigrations = shell.rm(`*_${Module}.js`);
-        if (okMigrations) {
-          logger.info(chalk.green(`✔ Database migrations files successfully deleted!`));
-        }
-      }
-
-      // change to database seeds directory
-      shell.cd(`${__dirname}/../../packages/${location}/src/database/seeds`);
-      // check if any seed files for this module exist
-      if (shell.find('.').filter(file => file.search(`_${Module}.js`) > -1).length > 0) {
-        let okSeeds = shell.rm(`*_${Module}.js`);
-        if (okSeeds) {
-          logger.info(chalk.green(`✔ Database seed files successfully deleted!`));
-        }
-      }
-    }
-
-    // continue only if directory does not jet exist
-    logger.info(chalk.green(`✔ Module for ${location} successfully deleted!`));
-  } else {
-    logger.info(chalk.red(`✘ Module ${location} location for ${modulePath} not found!`));
-  }
-
-  if (fs.existsSync(commonGraphqlPath)) {
-    const graphqlQuery = `${Module}Query`;
-    deleteModuleFromCommonGraphqlFile(module, commonGraphqlPath, graphqlQuery);
-  }
-}
-
-function updateSchema(logger, module) {
-  logger.info(`Updating ${module} Schema…`);
-
-  // pascalize
-  const Module = pascalize(module);
-
-  const modulePath = `${__dirname}/../../packages/server/src/modules/${module}`;
-
-  if (fs.existsSync(modulePath)) {
-    // get module schema
-    // eslint-disable-next-line import/no-dynamic-require
-    const schema = require(`${modulePath}/schema`)[`${Module}Schema`];
-
-    // get schema file
-    const pathSchema = `${__dirname}/../../packages/server/src/modules/${module}/`;
-    if (fs.existsSync(pathSchema)) {
-      const file = `schema.graphql`;
-
-      // regenerate input fields
-      //let moduleData = `  node: ${Module}\n`;
-      let inputCreate = '';
-      let inputUpdate = '';
-      let inputFilter = `  searchText: String\n`;
-      let manyInput = '';
-      for (const key of schema.keys()) {
-        const value = schema.values[key];
-        const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
-        if (value.type.isSchema) {
-          let required = value.optional ? '' : '!';
-          inputCreate += `  ${key}Id: Int${required}\n`;
-          inputUpdate += `  ${key}Id: Int\n`;
-          inputFilter += `  ${key}Id: Int\n`;
-          //moduleData += `  ${key}s(limit: Int, orderBy: OrderByInput): [${value.type.name}]\n`;
-        } else if (value.type.constructor !== Array) {
-          if (key !== 'id') {
-            inputCreate += `  ${key}: ${generateField(value)}\n`;
-            inputUpdate += `  ${key}: ${generateField(value, true)}\n`;
-          }
-
-          if (hasTypeOf(Date)) {
-            inputFilter += `  ${key}_lte: ${generateField(value, true)}\n`;
-            inputFilter += `  ${key}_gte: ${generateField(value, true)}\n`;
-          } else {
-            inputFilter += `  ${key}: ${generateField(value, true)}\n`;
-          }
-        } else if (value.type.constructor === Array && value.type[0].isSchema) {
-          inputCreate += `  ${key}: ${pascalize(key)}CreateManyInput\n`;
-          inputUpdate += `  ${key}: ${pascalize(key)}UpdateManyInput\n`;
-
-          /*for (const remoteKey of value.type[0].keys()) {
-            const remoteValue = value.type[0].values[remoteKey];
-            if (remoteValue.type.isSchema) {
-              moduleData += `  ${remoteKey}s: [${pascalize(remoteKey)}]\n`;
-            }
-          }*/
-
-          manyInput += `
-
-input ${pascalize(key)}CreateManyInput {
-  create: [${pascalize(value.type[0].name)}CreateInput!]
-}
-
-input ${pascalize(key)}UpdateManyInput {
-  create: [${pascalize(value.type[0].name)}CreateInput!]
-  delete: [${pascalize(value.type[0].name)}WhereUniqueInput!]
-  update: [${pascalize(value.type[0].name)}UpdateWhereInput!]
-}
-
-input ${pascalize(value.type[0].name)}UpdateWhereInput {
-  where: ${pascalize(value.type[0].name)}WhereUniqueInput!
-  data: ${pascalize(value.type[0].name)}UpdateInput!
-}`;
-        }
-      }
-
-      shell.cd(pathSchema);
-      // override Module type in schema.graphql file
-      const replaceType = `### schema type definitions([^()]+)### end schema type definitions`;
-      shell
-        .ShellString(
-          shell
-            .cat(file)
-            .replace(
-              RegExp(replaceType, 'g'),
-              `### schema type definitions\n${new GraphQLGenerator().generateTypes(
-                schema
-              )}${manyInput}\n\n### end schema type definitions`
-            )
-        )
-        .to(file);
-
-      // override ModuleData in schema.graphql file
-      /*let replaceModuleData = `type ${Module}Data {([^}])*\\n}`;
-      shell
-        .ShellString(shell.cat(file).replace(RegExp(replaceModuleData, 'g'), `type ${Module}Data {\n${moduleData}}`))
-        .to(file);*/
-
-      // override ModuleCreateInput in schema.graphql file
-      const replaceCreate = `input ${Module}CreateInput {([^}])*\\n}`;
-      shell
-        .ShellString(
-          shell.cat(file).replace(RegExp(replaceCreate, 'g'), `input ${Module}CreateInput {\n${inputCreate}}`)
-        )
-        .to(file);
-
-      // override ModuleUpdateInput in schema.graphql file
-      const replaceUpdate = `input ${Module}UpdateInput {([^}])*\\n}`;
-      shell
-        .ShellString(
-          shell.cat(file).replace(RegExp(replaceUpdate, 'g'), `input ${Module}UpdateInput {\n${inputUpdate}}`)
-        )
-        .to(file);
-
-      // override ModuleFilterInput in schema.graphql file
-      const replaceFilter = `input ${Module}FilterInput {([^}])*\\n}`;
-      shell
-        .ShellString(
-          shell.cat(file).replace(RegExp(replaceFilter, 'g'), `input ${Module}FilterInput {\n${inputFilter}}`)
-        )
-        .to(file);
-
-      logger.info(chalk.green(`✔ Schema in ${pathSchema}${file} successfully updated!`));
-
-      const resolverFile = `resolvers.js`;
-      let replace = `  ${schema.name}: {
-`;
-      //moduleData = '';
-      for (const key of schema.keys()) {
-        const value = schema.values[key];
-        if (value.type.isSchema) {
-          /*moduleData += `    ${key}s(obj, args, ctx, info) {
-      return ctx.${value.type.name}.getList(args, info);
-    },
-`;*/
-        } else if (value.type.constructor === Array) {
-          replace += `    ${key}: createBatchResolver((sources, args, ctx, info) => {
-      return ctx.${schema.name}.getByIds(sources.map(({ id }) => id), '${camelize(schema.name)}', ctx.${
-            value.type[0].name
-          }, info);
-    }),
-`;
-          /*
-          for (const remoteKey of value.type[0].keys()) {
-            const remoteValue = value.type[0].values[remoteKey];
-            if (remoteValue.type.isSchema) {
-              moduleData += `    ${remoteKey}s(obj, args, ctx, info) {
-      return ctx.${remoteValue.type.name}.getList(args, info);
-    },
-`;
-            }
-          }*/
-        }
-      }
-      replace += `  },
-`;
-      /*
-      if (moduleData !== '') {
-        moduleData = `${moduleData.replace(/,\s*$/, '')}
-`;
-      }
-
-      // override batch resolvers in resolvers.js file
-      replaceModuleData = `// related data([^*]+)// end related data`;
-      shell
-        .ShellString(
-          shell
-            .cat(resolverFile)
-            .replace(RegExp(replaceModuleData, 'g'), `// related data\n${moduleData}    // end related data`)
-        )
-        .to(resolverFile);*/
-
-      // override batch resolvers in resolvers.js file
-      const replaceBatchResolvers = `// schema batch resolvers([^*]+)// end schema batch resolvers`;
-      shell
-        .ShellString(
-          shell
-            .cat(resolverFile)
-            .replace(
-              RegExp(replaceBatchResolvers, 'g'),
-              `// schema batch resolvers\n${replace}  // end schema batch resolvers`
-            )
-        )
-        .to(resolverFile);
-
-      logger.info(chalk.green(`✔ Resolver in ${pathSchema}${resolverFile} successfully updated!`));
-    } else {
-      logger.error(chalk.red(`✘ Schema path ${pathSchema} not found!`));
-    }
-
-    // get fragment file
-    const pathFragment = `${__dirname}/../../packages/client/src/modules/${module}/graphql/`;
-    if (fs.existsSync(pathFragment)) {
-      const fragmentGraphqlFile = `${Module}.graphql`;
-
-      // regenerate graphql fragment
-      // TODO: refactor to generate this recursively
-      let fragmentGraphql = '';
-      for (const key of schema.keys()) {
-        const value = schema.values[key];
-        if (value.type.isSchema) {
-          let column = 'name';
-          for (const remoteKey of value.type.keys()) {
-            const remoteValue = value.type.values[remoteKey];
-            if (remoteValue.sortBy) {
-              column = remoteKey;
-            }
-          }
-          fragmentGraphql += `  ${key} {\n`;
-          fragmentGraphql += `    id\n`;
-          fragmentGraphql += `    ${column}\n`;
-          fragmentGraphql += `  }\n`;
-        } else if (value.type.constructor === Array && value.type[0].isSchema) {
-          fragmentGraphql += `  ${key} {\n`;
-          for (const remoteKey of value.type[0].keys()) {
-            const remoteValue = value.type[0].values[remoteKey];
-            if (remoteValue.type.isSchema) {
-              let remotecolumn = 'name';
-              for (const remoteKey of remoteValue.type.keys()) {
-                const remoteValue1 = remoteValue.type.values[remoteKey];
-                if (remoteValue1.sortBy) {
-                  remotecolumn = remoteKey;
-                }
-              }
-              fragmentGraphql += `    ${remoteKey} {\n`;
-              fragmentGraphql += `      id\n`;
-              fragmentGraphql += `      ${remotecolumn}\n`;
-              fragmentGraphql += `    }\n`;
-            } else if (remoteValue.type.constructor !== Array) {
-              fragmentGraphql += `    ${remoteKey}\n`;
-            }
-          }
-          fragmentGraphql += `  }\n`;
-        } else {
-          fragmentGraphql += `  ${key}\n`;
-        }
-      }
-
-      shell.cd(pathFragment);
-      // override graphql fragment file
-      const replaceFragment = `${Module} {(.|\n)*\n}`;
-      fragmentGraphql = shell
-        .cat(fragmentGraphqlFile)
-        .replace(RegExp(replaceFragment, 'g'), `${Module} {\n${fragmentGraphql}}`);
-      try {
-        fs.writeFileSync(pathFragment + fragmentGraphqlFile, fragmentGraphql);
-      } catch (err) {
-        return logger.error(chalk.red(`✘ Failed to write a ${pathFragment}${fragmentGraphqlFile} file!`));
-      }
-      logger.info(chalk.green(`✔ Fragment in ${pathFragment}${fragmentGraphqlFile} successfully updated!`));
-    } else {
-      logger.error(chalk.red(`✘ Fragment path ${pathFragment} not found!`));
-    }
-    /*
-    // get module query file
-    const pathModuleQuery = `${__dirname}/../../packages/client/src/modules/${module}/graphql/`;
-    if (fs.existsSync(pathModuleQuery)) {
-      const file = `${Module}Query.graphql`;
-
-      // regenerate graphql module query
-      let graphql = '';
-      for (const key of schema.keys()) {
-        const value = schema.values[key];
-        if (value.type.isSchema) {
-          let column = 'name';
-          for (const remoteKey of value.type.keys()) {
-            const remoteValue = value.type.values[remoteKey];
-            if (remoteValue.sortBy) {
-              column = remoteKey;
-            }
-          }
-          graphql += `    ${key}s {\n`;
-          graphql += `      id\n`;
-          graphql += `      ${column}\n`;
-          graphql += `    }\n`;
-        } else if (value.type.constructor === Array) {
-          for (const remoteKey of value.type[0].keys()) {
-            const remoteValue = value.type[0].values[remoteKey];
-            if (remoteValue.type.isSchema) {
-              let remotecolumn = 'name';
-              for (const remoteKey of remoteValue.type.keys()) {
-                const remoteValue1 = remoteValue.type.values[remoteKey];
-                if (remoteValue1.sortBy) {
-                  remotecolumn = remoteKey;
-                }
-              }
-              graphql += `    ${remoteKey}s {\n`;
-              graphql += `      id\n`;
-              graphql += `      ${remotecolumn}\n`;
-              graphql += `    }\n`;
-            }
-          }
-        }
-      }
-
-      shell.cd(pathModuleQuery);
-      // override graphql module query file
-      const replaceFragment = `### form data([^()]+)### end form data`;
-      shell
-        .ShellString(
-          shell.cat(file).replace(RegExp(replaceFragment, 'g'), `### form data\n${graphql}    ### end form data`)
-        )
-        .to(file);
-
-      logger.info(chalk.green(`✔ Module query in ${pathModuleQuery}${file} successfully updated!`));
-    } else {
-      logger.error(chalk.red(`✘ Module query path ${pathModuleQuery} not found!`));
-    }*/
-
-    // get state client file
-    const pathStateClient = `${__dirname}/../../packages/client/src/modules/${module}/graphql/`;
-    if (fs.existsSync(pathStateClient)) {
-      const file = `${Module}State.client.graphql`;
-
-      // regenerate graphql fragment
-      let graphql = '';
-      for (const key of schema.keys()) {
-        const value = schema.values[key];
-        const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
-        if (value.type.isSchema) {
-          graphql += `    ${key}Id\n`;
-          /*} else if (value.type.constructor === Array) {
-            graphql += `  ${key} {\n`;
-            for (const remoteKey of value.type[0].keys()) {
-              const remoteValue = value.type[0].values[remoteKey];
-              if (remoteValue.type.isSchema) {
-                let remotecolumn = 'name';
-                for (const remoteKey of remoteValue.type.keys()) {
-                  const remoteValue1 = remoteValue.type.values[remoteKey];
-                  if (remoteValue1.sortBy) {
-                    remotecolumn = remoteKey;
-                  }
-                }
-                graphql += `    ${remoteKey} {\n`;
-                graphql += `      id\n`;
-                graphql += `      ${remotecolumn}\n`;
-                graphql += `    }\n`;
-              } else {
-                graphql += `    ${remoteKey}\n`;
-              }
-            }
-            graphql += `  }\n`;*/
-        } else {
-          if (hasTypeOf(Date)) {
-            graphql += `    ${key}_lte\n`;
-            graphql += `    ${key}_gte\n`;
-          } else {
-            graphql += `    ${key}\n`;
-          }
-        }
-      }
-      graphql += `    searchText
-  }\n`;
-
-      shell.cd(pathStateClient);
-      // override graphql fragment file
-      const replaceStateClient = `filter {(.|\n)*\n}\n`;
-      shell.ShellString(shell.cat(file).replace(RegExp(replaceStateClient, 'g'), `filter {\n${graphql}}\n`)).to(file);
-
-      logger.info(chalk.green(`✔ State Client in ${pathStateClient}${file} successfully updated!`));
-    } else {
-      logger.error(chalk.red(`✘ State Client path ${pathStateClient} not found!`));
-    }
-
-    // get state resolver file
-    const pathStateResolver = `${__dirname}/../../packages/client/src/modules/${module}/resolvers/`;
-    if (fs.existsSync(pathStateResolver)) {
-      const file = `index.js`;
-
-      // regenerate resolver defaults
-      let defaults = `const defaultFilters = {\n`;
-      for (const key of schema.keys()) {
-        const value = schema.values[key];
-        const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
-        if (value.type.isSchema) {
-          defaults += `  ${key}Id: '',\n`;
-          /*} else if (value.type.constructor === Array) {
-            graphql += `  ${key} {\n`;
-            for (const remoteKey of value.type[0].keys()) {
-              const remoteValue = value.type[0].values[remoteKey];
-              if (remoteValue.type.isSchema) {
-                let remotecolumn = 'name';
-                for (const remoteKey of remoteValue.type.keys()) {
-                  const remoteValue1 = remoteValue.type.values[remoteKey];
-                  if (remoteValue1.sortBy) {
-                    remotecolumn = remoteKey;
-                  }
-                }
-                graphql += `    ${remoteKey} {\n`;
-                graphql += `      id\n`;
-                graphql += `      ${remotecolumn}\n`;
-                graphql += `    }\n`;
-              } else {
-                graphql += `    ${remoteKey}\n`;
-              }
-            }
-            graphql += `  }\n`;*/
-        } else {
-          if (hasTypeOf(Date)) {
-            defaults += `  ${key}_lte: '',\n`;
-            defaults += `  ${key}_gte: '',\n`;
-          } else {
-            defaults += `  ${key}: '',\n`;
-          }
-        }
-      }
-
-      defaults += `  searchText: ''
-};\n`;
-
-      shell.cd(pathStateResolver);
-      // override state resolver file
-      const replaceStateResolverDefaults = `// filter data([^*]+)// end filter data`;
-      shell
-        .ShellString(
-          shell
-            .cat(file)
-            .replace(RegExp(replaceStateResolverDefaults, 'g'), `// filter data\n${defaults}// end filter data`)
-        )
-        .to(file);
-
-      logger.info(chalk.green(`✔ State Resolver in ${pathStateResolver}${file} successfully updated!`));
-    } else {
-      logger.error(chalk.red(`✘ State Resolver path ${pathStateResolver} not found!`));
-    }
-  } else {
-    logger.info(chalk.red(`✘ Module ${module} in path ${modulePath} not found!`));
-  }
-}
+const addModule = require('./commands/addModule');
+const deleteModule = require('./commands/deleteModule');
+const updateSchema = require('./commands/updateSchema');
 
 module.exports = (action, args, options, logger) => {
   const module = args.module;
@@ -706,18 +28,18 @@ module.exports = (action, args, options, logger) => {
   // client
   if (location === 'client' || location === 'both') {
     if (action === 'addmodule' || action === 'addcrud') {
-      copyFiles(logger, templatePath, module, action, tablePrefix, 'client');
+      addModule(logger, templatePath, module, action, tablePrefix, 'client');
     } else if (action === 'deletemodule') {
-      deleteFiles(logger, templatePath, module, 'client');
+      deleteModule(logger, templatePath, module, 'client');
     }
   }
 
   // server
   if (location === 'server' || location === 'both') {
     if (action === 'addmodule' || action === 'addcrud') {
-      copyFiles(logger, templatePath, module, action, tablePrefix, 'server');
+      addModule(logger, templatePath, module, action, tablePrefix, 'server');
     } else if (action === 'deletemodule') {
-      deleteFiles(logger, templatePath, module, 'server');
+      deleteModule(logger, templatePath, module, 'server');
     }
   }
 

From 5f7a0ee73e634a2e68d6af58ac7eaff56800b2a7 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Mon, 25 Jun 2018 16:13:29 +0300
Subject: [PATCH 165/327] Change validation for select inputs, add domainSchema
 error computing function

---
 .../common/components/crud/FormView.web.jsx   |  6 ++++-
 .../common/components/crud/ListView.web.jsx   |  6 ++++-
 .../components/RenderCellSelectQuery.jsx      |  6 ++---
 .../ui-antd/components/RenderSelectQuery.jsx  | 23 ++++++++++++-------
 .../components/RenderCellSelectQuery.jsx      |  2 +-
 .../components/RenderSelectQuery.jsx          |  4 ++--
 .../client/src/modules/common/util.web.jsx    |  8 +++++--
 packages/common/validation.js                 | 12 ++++++++++
 packages/server/package.json                  |  2 +-
 yarn.lock                                     |  6 ++---
 10 files changed, 53 insertions(+), 22 deletions(-)

diff --git a/packages/client/src/modules/common/components/crud/FormView.web.jsx b/packages/client/src/modules/common/components/crud/FormView.web.jsx
index f3f10d5e99..4bcdcbea4d 100644
--- a/packages/client/src/modules/common/components/crud/FormView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/FormView.web.jsx
@@ -6,6 +6,7 @@ import DomainValidation from '@domain-schema/validation';
 import { onSubmit, mapFormPropsToValues } from '../../../../utils/crud';
 import { createFormFields } from '../../util';
 import { Form, FormItem, Button } from '../web';
+import { computeDomainValidationErrors } from '../../../../../../common/validation';
 
 const tailFormItemLayout = {
   wrapperCol: {
@@ -35,7 +36,10 @@ const FormView = ({ schema, updateEntry, createEntry, title, customFields, data
   return (
     <Formik
       initialValues={mapFormPropsToValues({ schema, data: data ? data.node : null })}
-      validate={values => DomainValidation.validate(values, schema)}
+      validate={values => {
+        let rawErrors = DomainValidation.validate(values, schema);
+        return computeDomainValidationErrors(rawErrors);
+      }}
       onSubmit={async values => {
         await onSubmit({ schema, values, updateEntry, createEntry, title, data: data ? data.node : null });
       }}
diff --git a/packages/client/src/modules/common/components/crud/ListView.web.jsx b/packages/client/src/modules/common/components/crud/ListView.web.jsx
index c42da323ce..02c9a2a10c 100644
--- a/packages/client/src/modules/common/components/crud/ListView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/ListView.web.jsx
@@ -10,6 +10,7 @@ import { Table, Button, Popconfirm, Row, Col, Form, FormItem, Alert, Spin } from
 import { createColumnFields, createFormFields } from '../../util';
 import { mapFormPropsToValues, pickInputFields } from '../../../../utils/crud';
 import { hasRole } from '../../../user/containers/Auth';
+import { computeDomainValidationErrors } from '../../../../../../common/validation';
 
 function dragDirection(dragIndex, hoverIndex, initialClientOffset, clientOffset, sourceClientOffset) {
   const hoverMiddleY = (initialClientOffset.y - sourceClientOffset.y) / 2;
@@ -339,7 +340,10 @@ class ListView extends React.Component {
             <Col span={20} key="batchUpdate">
               <Formik
                 initialValues={mapFormPropsToValues({ schema })}
-                validate={values => DomainValidation.validate(values, schema)}
+                validate={values => {
+                  let rawErrors = DomainValidation.validate(values, schema);
+                  return computeDomainValidationErrors(rawErrors);
+                }}
                 onSubmit={async (values, { resetForm }) => {
                   const insertValues = pickInputFields({ schema, values });
                   if (selectedRowKeys && Object.keys(insertValues).length > 0) {
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderCellSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderCellSelectQuery.jsx
index e3e7edcff1..49e170e879 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderCellSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderCellSelectQuery.jsx
@@ -15,8 +15,8 @@ export default class RenderCellSelectQuery extends React.Component {
     dirty: PropTypes.any
   };
 
-  handleChange = value => {
-    this.props.handleOnChange(value ? { key: value.key, label: value.label } : '');
+  handleChange = (value, data) => {
+    this.props.handleOnChange(value, data);
   };
 
   render() {
@@ -68,7 +68,7 @@ export default class RenderCellSelectQuery extends React.Component {
               labelInValue: true,
               dropdownMatchSelectWidth: false,
               style: defaultStyle,
-              onChange: this.handleChange,
+              onChange: value => this.handleChange(value, data.edges ? data.edges : null),
               [defaultValue]: formatedValue
             };
 
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
index a775acae24..cbe86c98e2 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
@@ -25,13 +25,18 @@ export default class RenderSelectQuery extends React.Component {
     dirty: false
   };
 
-  handleChange = value => {
+  handleChange = (value, edges) => {
     const {
       input: { name },
       setFieldValue
     } = this.props;
 
-    setFieldValue(name, value ? { id: value.key, name: value.label } : undefined);
+    let selectedValue = '';
+    if (edges && Array.isArray(edges) && edges.length > 0 && value) {
+      selectedValue = edges.find(item => item.id === Number(value.key));
+    }
+
+    setFieldValue(name, selectedValue);
   };
 
   handleBlur = () => {
@@ -107,11 +112,13 @@ export default class RenderSelectQuery extends React.Component {
             {({ loading, data }) => {
               if (!loading || data) {
                 const options = data.edges
-                  ? data.edges.map(opt => (
-                      <Option key={opt.id} value={opt.id.toString()}>
-                        {toString(opt)}
-                      </Option>
-                    ))
+                  ? data.edges.map(opt => {
+                      return (
+                        <Option key={opt.id} value={opt.id.toString()}>
+                          {toString(opt)}
+                        </Option>
+                      );
+                    })
                   : null;
 
                 let props = {
@@ -120,7 +127,7 @@ export default class RenderSelectQuery extends React.Component {
                   labelInValue: true,
                   dropdownMatchSelectWidth: false,
                   style: defaultStyle,
-                  onChange: this.handleChange,
+                  onChange: value => this.handleChange(value, data.edges ? data.edges : null),
                   onBlur: this.handleBlur,
                   ...inputRest,
                   [defaultValue]: formatedValue
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderCellSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderCellSelectQuery.jsx
index abd8c69668..76dd05d887 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderCellSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderCellSelectQuery.jsx
@@ -21,7 +21,7 @@ export default class RenderCellSelectQuery extends React.Component {
 
   handleChange = (e, edges) => {
     let selectedItem = edges && Array.isArray(edges) ? edges.find(item => item.id == e.target.value) : '';
-    this.props.handleOnChange(selectedItem ? { key: selectedItem.id, label: selectedItem.name } : '');
+    this.props.handleOnChange(selectedItem ? selectedItem : '');
   };
 
   render() {
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx
index f7f27d7412..e144fbbae7 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx
@@ -33,7 +33,7 @@ export default class RenderSelectQuery extends React.Component {
       setFieldValue
     } = this.props;
     let selectedItem = edges && Array.isArray(edges) ? edges.find(item => item.id == e.target.value) : '';
-    setFieldValue(name, selectedItem ? { id: selectedItem.id, name: selectedItem.name } : '');
+    setFieldValue(name, selectedItem ? selectedItem : '');
   };
 
   handleBlur = () => {
@@ -109,7 +109,7 @@ export default class RenderSelectQuery extends React.Component {
                 let props = {
                   style: defaultStyle,
                   value: formatedValue,
-                  onChange: e => this.handleChange(e, data.edges),
+                  onChange: e => this.handleChange(e, data.edges ? data.edges : null),
                   onBlur: this.handleBlur,
                   ...inputRest
                 };
diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index f08e41a679..88d3122022 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -457,8 +457,12 @@ class EditableCell extends React.Component {
     }
     this.setState({ value: dateString });
   };
-  handleSelectChange = ({ key, label }) => {
-    this.setState({ value: { id: key, name: label } });
+  handleSelectChange = (value, edges) => {
+    let selectedValue = '';
+    if (edges && Array.isArray(edges) && edges.length > 0 && value) {
+      selectedValue = edges.find(item => item.id === Number(value.key));
+    }
+    this.setState({ value: selectedValue });
   };
   check = () => {
     const { hasTypeOf } = this.props;
diff --git a/packages/common/validation.js b/packages/common/validation.js
index c4f991d7f0..8b93cb4ac1 100644
--- a/packages/common/validation.js
+++ b/packages/common/validation.js
@@ -57,3 +57,15 @@ export const validateForm = (formValues, formSchema) => {
 
   return validateFormInner(formValues, formSchema, errors);
 };
+
+export const computeDomainValidationErrors = rawErrors => {
+  let computedErrors = {};
+  for (let errorField in rawErrors) {
+    if (rawErrors.hasOwnProperty(errorField) && rawErrors[errorField] === Object(rawErrors[errorField])) {
+      computedErrors[errorField] = 'Required';
+    } else {
+      computedErrors[errorField] = rawErrors[errorField];
+    }
+  }
+  return computedErrors;
+};
diff --git a/packages/server/package.json b/packages/server/package.json
index 34ff52b2ca..8faa2805ad 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -42,7 +42,7 @@
     "@domain-schema/core": "^0.0.34",
     "@domain-schema/formik": "^0.0.33",
     "@domain-schema/graphql": "^0.0.33",
-    "@domain-schema/knex": "^0.0.34",
+    "@domain-schema/knex": "^0.0.35",
     "@domain-schema/validation": "^0.0.33",
     "apollo-cache-inmemory": "^1.1.12",
     "apollo-cache-router": "^1.1.0",
diff --git a/yarn.lock b/yarn.lock
index bb83fc16f9..cb82268ac3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -570,9 +570,9 @@
   dependencies:
     debug "^3.1.0"
 
-"@domain-schema/knex@^0.0.34":
-  version "0.0.34"
-  resolved "https://registry.yarnpkg.com/@domain-schema/knex/-/knex-0.0.34.tgz#61019e9b3668c6274b7dd59684a2911f8386a19c"
+"@domain-schema/knex@^0.0.35":
+  version "0.0.35"
+  resolved "https://registry.yarnpkg.com/@domain-schema/knex/-/knex-0.0.35.tgz#3ea8fb1fdf57e9c9334843ed8bfa3b4e9e1f03c4"
   dependencies:
     debug "^3.1.0"
     humps "^2.0.1"

From 2a069f73e5cf01b5fb7ab861757b56c508e28205 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Fri, 29 Jun 2018 09:31:19 +0300
Subject: [PATCH 166/327] Change computeDomainValidationErrors function

---
 packages/common/validation.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/common/validation.js b/packages/common/validation.js
index 8b93cb4ac1..d1c2cc16a1 100644
--- a/packages/common/validation.js
+++ b/packages/common/validation.js
@@ -64,7 +64,11 @@ export const computeDomainValidationErrors = rawErrors => {
     if (rawErrors.hasOwnProperty(errorField) && rawErrors[errorField] === Object(rawErrors[errorField])) {
       computedErrors[errorField] = 'Required';
     } else {
-      computedErrors[errorField] = rawErrors[errorField];
+      if (Array.isArray(rawErrors[errorField]) && rawErrors[errorField].length > 0) {
+        computedErrors[errorField] = rawErrors[errorField][0];
+      } else {
+        computedErrors[errorField] = rawErrors[errorField];
+      }
     }
   }
   return computedErrors;

From 5924be4674894c9a52056de08e84bd904204f2f3 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Fri, 29 Jun 2018 09:40:26 +0300
Subject: [PATCH 167/327] Fix table unknown onRow props warning

---
 .../web/ui-bootstrap/components/Table.jsx        | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/Table.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/Table.jsx
index 6df8fa14bc..c7c4bee2a0 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/Table.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/Table.jsx
@@ -24,7 +24,18 @@ const renderData = (columns, entry) => {
   });
 };
 
-const Table = ({ dataSource, columns, title, footer, onHeaderRow, rowSelection, pagination, loading, ...props }) => {
+const Table = ({
+  dataSource,
+  columns,
+  title,
+  footer,
+  onHeaderRow,
+  rowSelection,
+  pagination,
+  loading,
+  onRow,
+  ...props
+}) => {
   return (
     <RSTable {...props}>
       <thead>
@@ -48,7 +59,8 @@ Table.propTypes = {
   title: PropTypes.func,
   footer: PropTypes.any,
   onHeaderRow: PropTypes.any,
-  rowSelection: PropTypes.any
+  rowSelection: PropTypes.any,
+  onRow: PropTypes.any
 };
 
 export default Table;

From 875b9232c135135257ed7124c3e2879fae5928a5 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Fri, 29 Jun 2018 10:03:06 +0300
Subject: [PATCH 168/327] Fix CellSelectInput for bootstrap

---
 .../web/ui-bootstrap/components/RenderCellSelectQuery.jsx     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderCellSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderCellSelectQuery.jsx
index 76dd05d887..f04633a6ae 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderCellSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderCellSelectQuery.jsx
@@ -20,8 +20,8 @@ export default class RenderCellSelectQuery extends React.Component {
   }
 
   handleChange = (e, edges) => {
-    let selectedItem = edges && Array.isArray(edges) ? edges.find(item => item.id == e.target.value) : '';
-    this.props.handleOnChange(selectedItem ? selectedItem : '');
+    let value = { key: e.target.value };
+    this.props.handleOnChange(value, edges);
   };
 
   render() {

From 3d281f155ace4faddf42c1b238ca1c56001d75de Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Fri, 29 Jun 2018 16:32:39 +0300
Subject: [PATCH 169/327] Update domain validation version

---
 packages/client/package.json | 2 +-
 packages/server/package.json | 2 +-
 yarn.lock                    | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index 158df5550f..4a36fc009c 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -38,7 +38,7 @@
   "license": "MIT",
   "dependencies": {
     "@domain-schema/core": "^0.0.34",
-    "@domain-schema/validation": "^0.0.33",
+    "@domain-schema/validation": "^0.0.34",
     "@fortawesome/fontawesome": "^1.1.8",
     "@fortawesome/fontawesome-free-brands": "^5.0.6",
     "@fortawesome/fontawesome-free-webfonts": "^1.0.9",
diff --git a/packages/server/package.json b/packages/server/package.json
index 8faa2805ad..5929fe7b90 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -43,7 +43,7 @@
     "@domain-schema/formik": "^0.0.33",
     "@domain-schema/graphql": "^0.0.33",
     "@domain-schema/knex": "^0.0.35",
-    "@domain-schema/validation": "^0.0.33",
+    "@domain-schema/validation": "^0.0.34",
     "apollo-cache-inmemory": "^1.1.12",
     "apollo-cache-router": "^1.1.0",
     "apollo-client": "^2.3.4",
diff --git a/yarn.lock b/yarn.lock
index cb82268ac3..bdcad535ac 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -577,11 +577,12 @@
     debug "^3.1.0"
     humps "^2.0.1"
 
-"@domain-schema/validation@^0.0.33":
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/@domain-schema/validation/-/validation-0.0.33.tgz#f4e83e2abe249cea2f83762d01c065a3132f4a2f"
+"@domain-schema/validation@^0.0.34":
+  version "0.0.34"
+  resolved "https://registry.yarnpkg.com/@domain-schema/validation/-/validation-0.0.34.tgz#f10f4b810911c989490d269df315296bdbe0cfc2"
   dependencies:
     debug "^3.1.0"
+    humps "^2.0.1"
 
 "@expo/bunyan@^1.8.10":
   version "1.8.10"

From 305cc6206e0e958ef0f0f25da0b196e20c45ed7e Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Fri, 29 Jun 2018 17:48:53 +0300
Subject: [PATCH 170/327] Add Switch, InputNumber field for native form

---
 .../common/components/crud/FormView.jsx       |  4 +-
 packages/client/src/modules/common/util.jsx   | 39 +++++++++++++++++--
 2 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/packages/client/src/modules/common/components/crud/FormView.jsx b/packages/client/src/modules/common/components/crud/FormView.jsx
index 630bdb6460..ee525f6258 100644
--- a/packages/client/src/modules/common/components/crud/FormView.jsx
+++ b/packages/client/src/modules/common/components/crud/FormView.jsx
@@ -23,9 +23,9 @@ const Form = ({ schema, data: { node }, updateEntry, createEntry }) => {
 
         await onSubmit({ schema, values, updateEntry, createEntry, title, data });
       }}
-      render={({ handleSubmit, values }) => (
+      render={({ handleSubmit, values, setFieldValue }) => (
         <FormView>
-          {createFormFields(schema, values)}
+          {createFormFields(schema, values, setFieldValue)}
           <Button onPress={handleSubmit}>Save</Button>
         </FormView>
       )}
diff --git a/packages/client/src/modules/common/util.jsx b/packages/client/src/modules/common/util.jsx
index 11630a6c86..3e69191262 100644
--- a/packages/client/src/modules/common/util.jsx
+++ b/packages/client/src/modules/common/util.jsx
@@ -1,19 +1,50 @@
 import React from 'react';
 import { pick, capitalize } from 'lodash';
 import Field from '../../utils/FieldAdapter';
-import { RenderField } from './components/native';
+import { RenderField, RenderSwitch } from './components/native';
 
-export const createFormFields = (schema, values) => {
+export const createFormFields = (schema, values, setFieldValue) => {
   let fields = [];
   for (const key of schema.keys()) {
-    if (key !== 'id') {
+    const value = Array.isArray(schema.values[key]) ? schema.values[key][0] : schema.values[key];
+    const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
+    if (key === 'id') {
+      continue;
+    }
+    if (hasTypeOf(Boolean)) {
       fields.push(
         <Field
+          label={capitalize(key)}
+          name={key}
+          key={key}
+          value={values[key]}
+          component={RenderSwitch}
+          placeholder={capitalize(key)}
+          onValueChange={val => setFieldValue(key, val)}
+        />
+      );
+    } else if (hasTypeOf(String)) {
+      fields.push(
+        <Field
+          label={capitalize(key)}
           name={key}
           key={key}
           value={values[key]}
-          component={RenderField}
           type="text"
+          component={RenderField}
+          placeholder={capitalize(key)}
+        />
+      );
+    } else if (hasTypeOf(Number)) {
+      fields.push(
+        <Field
+          keyboardType="numeric"
+          label={capitalize(key)}
+          name={key}
+          key={key}
+          value={`${values[key]}`}
+          type="number"
+          component={RenderField}
           placeholder={capitalize(key)}
         />
       );

From c52933d942894a2662d2f22a7ea3e035b453165a Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Mon, 2 Jul 2018 10:09:19 +0300
Subject: [PATCH 171/327] Move commonGraphql file generation place

---
 .../src/modules/common/{components/web => }/commonGraphql.js    | 0
 .../components/web/ui-antd/components/RenderCellSelectQuery.jsx | 2 +-
 .../components/web/ui-antd/components/RenderSelectQuery.jsx     | 2 +-
 .../web/ui-bootstrap/components/RenderCellSelectQuery.jsx       | 2 +-
 .../web/ui-bootstrap/components/RenderSelectQuery.jsx           | 2 +-
 tools/cli/commands/addModule.js                                 | 2 +-
 tools/cli/commands/deleteModule.js                              | 2 +-
 tools/cli/helpers/util.js                                       | 2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename packages/client/src/modules/common/{components/web => }/commonGraphql.js (100%)

diff --git a/packages/client/src/modules/common/components/web/commonGraphql.js b/packages/client/src/modules/common/commonGraphql.js
similarity index 100%
rename from packages/client/src/modules/common/components/web/commonGraphql.js
rename to packages/client/src/modules/common/commonGraphql.js
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderCellSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderCellSelectQuery.jsx
index 49e170e879..70aaab07f9 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderCellSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderCellSelectQuery.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Select, Spin } from 'antd';
 import { pascalize } from 'humps';
-import schemaQueries from '../../commonGraphql';
+import schemaQueries from '../../../../commonGraphql';
 
 const Option = Select.Option;
 export default class RenderCellSelectQuery extends React.Component {
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
index cbe86c98e2..a9b6ccd0c9 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { Select, Spin } from 'antd';
 import { pascalize } from 'humps';
 import { FormItem } from './index';
-import schemaQueries from '../../commonGraphql';
+import schemaQueries from '../../../../commonGraphql';
 
 const Option = Select.Option;
 
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderCellSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderCellSelectQuery.jsx
index f04633a6ae..bfc93a2b72 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderCellSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderCellSelectQuery.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { pascalize } from 'humps';
 import { Select, Spin } from './index';
-import schemaQueries from '../../commonGraphql';
+import schemaQueries from '../../../../commonGraphql';
 
 export default class RenderCellSelectQuery extends React.Component {
   static propTypes = {
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx
index e144fbbae7..ba25a7e55c 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { pascalize } from 'humps';
 import { FormItem, Select } from './index';
-import schemaQueries from '../../commonGraphql';
+import schemaQueries from '../../../../commonGraphql';
 
 export default class RenderSelectQuery extends React.Component {
   static propTypes = {
diff --git a/tools/cli/commands/addModule.js b/tools/cli/commands/addModule.js
index 433296415a..a87fb4f161 100644
--- a/tools/cli/commands/addModule.js
+++ b/tools/cli/commands/addModule.js
@@ -48,7 +48,7 @@ function addModule(logger, templatePath, module, action, tablePrefix, location)
 
     if (action === 'addcrud' && location === 'client') {
       const commonGraphqlFile = 'commonGraphql.js';
-      const commonGraphqlPath = `${startPath}/packages/${location}/src/modules/common/components/web/${commonGraphqlFile}`;
+      const commonGraphqlPath = `${startPath}/packages/${location}/src/modules/common/${commonGraphqlFile}`;
       const graphqlQuery = `${Module}Query`;
       generateCommonGraphqlFile(module, commonGraphqlPath, graphqlQuery);
     }
diff --git a/tools/cli/commands/deleteModule.js b/tools/cli/commands/deleteModule.js
index 6b122463a6..759ba6a810 100644
--- a/tools/cli/commands/deleteModule.js
+++ b/tools/cli/commands/deleteModule.js
@@ -19,7 +19,7 @@ function deleteModule(logger, templatePath, module, location) {
   const startPath = `${__dirname}/../../..`;
   const modulePath = `${startPath}/packages/${location}/src/modules/${module}`;
   const commonGraphqlFile = 'commonGraphql.js';
-  const commonGraphqlPath = `${startPath}/packages/${location}/src/modules/common/components/web/${commonGraphqlFile}`;
+  const commonGraphqlPath = `${startPath}/packages/${location}/src/modules/common/${commonGraphqlFile}`;
 
   if (fs.existsSync(modulePath)) {
     // remove module directory
diff --git a/tools/cli/helpers/util.js b/tools/cli/helpers/util.js
index 4f5ac71b7c..29b80cf1e6 100644
--- a/tools/cli/helpers/util.js
+++ b/tools/cli/helpers/util.js
@@ -81,7 +81,7 @@ function generateField(value, update = false) {
  * @param moduleGraphqlContainer
  */
 function generateCommonGraphqlFile(module, commonGraphqlPath, moduleGraphqlContainer) {
-  const importGraphqlContainer = `import ${moduleGraphqlContainer} from '../../../${module}/containers/${moduleGraphqlContainer}';\n`;
+  const importGraphqlContainer = `import ${moduleGraphqlContainer} from '../${module}/containers/${moduleGraphqlContainer}';\n`;
   const exportGraphqlContainer = `\nexport default {\n  ${moduleGraphqlContainer}\n};\n`;
 
   if (fs.existsSync(commonGraphqlPath)) {

From 1f503df58d349d7504dedf5feec4a9dcee021978 Mon Sep 17 00:00:00 2001
From: Dmytro Tverdoklib <nepal-tda@outlook.com>
Date: Mon, 2 Jul 2018 16:17:01 +0300
Subject: [PATCH 172/327] Refactor generating graphql fragment

---
 tools/cli/commands/updateSchema.js | 56 ++++++++++--------------------
 1 file changed, 18 insertions(+), 38 deletions(-)

diff --git a/tools/cli/commands/updateSchema.js b/tools/cli/commands/updateSchema.js
index db6d0f26a5..fef1f67066 100644
--- a/tools/cli/commands/updateSchema.js
+++ b/tools/cli/commands/updateSchema.js
@@ -207,46 +207,9 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
       const fragmentGraphqlFile = `${Module}.graphql`;
 
       // regenerate graphql fragment
-      // TODO: refactor to generate this recursively
       let fragmentGraphql = '';
       for (const key of schema.keys()) {
-        const value = schema.values[key];
-        if (value.type.isSchema) {
-          let column = 'name';
-          for (const remoteKey of value.type.keys()) {
-            const remoteValue = value.type.values[remoteKey];
-            if (remoteValue.sortBy) {
-              column = remoteKey;
-            }
-          }
-          fragmentGraphql += `  ${key} {\n`;
-          fragmentGraphql += `    id\n`;
-          fragmentGraphql += `    ${column}\n`;
-          fragmentGraphql += `  }\n`;
-        } else if (value.type.constructor === Array && value.type[0].isSchema) {
-          fragmentGraphql += `  ${key} {\n`;
-          for (const remoteKey of value.type[0].keys()) {
-            const remoteValue = value.type[0].values[remoteKey];
-            if (remoteValue.type.isSchema) {
-              let remotecolumn = 'name';
-              for (const remoteKey of remoteValue.type.keys()) {
-                const remoteValue1 = remoteValue.type.values[remoteKey];
-                if (remoteValue1.sortBy) {
-                  remotecolumn = remoteKey;
-                }
-              }
-              fragmentGraphql += `    ${remoteKey} {\n`;
-              fragmentGraphql += `      id\n`;
-              fragmentGraphql += `      ${remotecolumn}\n`;
-              fragmentGraphql += `    }\n`;
-            } else if (remoteValue.type.constructor !== Array) {
-              fragmentGraphql += `    ${remoteKey}\n`;
-            }
-          }
-          fragmentGraphql += `  }\n`;
-        } else {
-          fragmentGraphql += `  ${key}\n`;
-        }
+        fragmentGraphql += regenerateGraphqlFragment(schema.values[key], key);
       }
 
       shell.cd(pathFragment);
@@ -441,4 +404,21 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
   }
 }
 
+const regenerateGraphqlFragment = (value, key) => {
+  if (value.type.isSchema) {
+    let column = 'name';
+    for (const remoteKey of value.type.keys()) {
+      const remoteValue = value.type.values[remoteKey];
+      if (remoteValue.sortBy) {
+        column = remoteKey;
+      }
+    }
+    return `  ${key} {\n    id\n    ${column}\n  }\n`;
+  } else if (value.type.constructor === Array && value.type[0].isSchema) {
+    return regenerateGraphqlFragment(value, key) + `  }\n`;
+  } else {
+    return `  ${key}\n`;
+  }
+};
+
 module.exports = updateSchema;

From 21fbf1531edf6962dcb773c661e1ce102d38106c Mon Sep 17 00:00:00 2001
From: Dmytro Tverdoklib <nepal-tda@outlook.com>
Date: Tue, 3 Jul 2018 12:34:09 +0300
Subject: [PATCH 173/327] Rename commonGraphql file and fix all imports
 according to the new fileName

---
 .../components/RenderCellSelectQuery.jsx      |  2 +-
 .../ui-antd/components/RenderSelectQuery.jsx  |  2 +-
 .../components/RenderCellSelectQuery.jsx      |  2 +-
 .../components/RenderSelectQuery.jsx          |  2 +-
 ...ommonGraphql.js => generatedContainers.js} |  0
 packages/mobile/.spinrc.js                    |  2 +-
 tools/cli/commands/addModule.js               |  8 ++--
 tools/cli/commands/deleteModule.js            | 10 ++---
 tools/cli/helpers/util.js                     | 45 ++++++++++---------
 9 files changed, 38 insertions(+), 35 deletions(-)
 rename packages/client/src/modules/common/{commonGraphql.js => generatedContainers.js} (100%)

diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderCellSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderCellSelectQuery.jsx
index 70aaab07f9..c68bfee595 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderCellSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderCellSelectQuery.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Select, Spin } from 'antd';
 import { pascalize } from 'humps';
-import schemaQueries from '../../../../commonGraphql';
+import schemaQueries from '../../../../generatedContainers';
 
 const Option = Select.Option;
 export default class RenderCellSelectQuery extends React.Component {
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
index a9b6ccd0c9..dc1d846f09 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { Select, Spin } from 'antd';
 import { pascalize } from 'humps';
 import { FormItem } from './index';
-import schemaQueries from '../../../../commonGraphql';
+import schemaQueries from '../../../../generatedContainers';
 
 const Option = Select.Option;
 
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderCellSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderCellSelectQuery.jsx
index bfc93a2b72..8f04ae9cac 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderCellSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderCellSelectQuery.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { pascalize } from 'humps';
 import { Select, Spin } from './index';
-import schemaQueries from '../../../../commonGraphql';
+import schemaQueries from '../../../../generatedContainers';
 
 export default class RenderCellSelectQuery extends React.Component {
   static propTypes = {
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx
index ba25a7e55c..1ae1f3c869 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { pascalize } from 'humps';
 import { FormItem, Select } from './index';
-import schemaQueries from '../../../../commonGraphql';
+import schemaQueries from '../../../../generatedContainers';
 
 export default class RenderSelectQuery extends React.Component {
   static propTypes = {
diff --git a/packages/client/src/modules/common/commonGraphql.js b/packages/client/src/modules/common/generatedContainers.js
similarity index 100%
rename from packages/client/src/modules/common/commonGraphql.js
rename to packages/client/src/modules/common/generatedContainers.js
diff --git a/packages/mobile/.spinrc.js b/packages/mobile/.spinrc.js
index 13fcea670d..2aa749494b 100644
--- a/packages/mobile/.spinrc.js
+++ b/packages/mobile/.spinrc.js
@@ -10,7 +10,7 @@ const config = {
       defines: {
         __CLIENT__: true
       },
-      enabled: false
+      enabled: true
     },
     ios: {
       entry: './src/index.ts',
diff --git a/tools/cli/commands/addModule.js b/tools/cli/commands/addModule.js
index a87fb4f161..7801c009a3 100644
--- a/tools/cli/commands/addModule.js
+++ b/tools/cli/commands/addModule.js
@@ -2,7 +2,7 @@ const shell = require('shelljs');
 const fs = require('fs');
 const chalk = require('chalk');
 const { pascalize } = require('humps');
-const { renameFiles, generateCommonGraphqlFile } = require('../helpers/util');
+const { renameFiles, createGeneratedContainersFile } = require('../helpers/util');
 
 /**
  *
@@ -47,10 +47,10 @@ function addModule(logger, templatePath, module, action, tablePrefix, location)
     shell.ShellString(shell.cat('index.js').replace(RegExp(re, 'g'), `Feature(${module}, ${match[1]})`)).to('index.js');
 
     if (action === 'addcrud' && location === 'client') {
-      const commonGraphqlFile = 'commonGraphql.js';
-      const commonGraphqlPath = `${startPath}/packages/${location}/src/modules/common/${commonGraphqlFile}`;
+      const generatedContainerFile = 'generatedContainers.js';
+      const generatedContainerPath = `${startPath}/packages/${location}/src/modules/common/${generatedContainerFile}`;
       const graphqlQuery = `${Module}Query`;
-      generateCommonGraphqlFile(module, commonGraphqlPath, graphqlQuery);
+      createGeneratedContainersFile(module, generatedContainerPath, graphqlQuery);
     }
 
     if (action === 'addcrud' && location === 'server') {
diff --git a/tools/cli/commands/deleteModule.js b/tools/cli/commands/deleteModule.js
index 759ba6a810..2d3adb2eb2 100644
--- a/tools/cli/commands/deleteModule.js
+++ b/tools/cli/commands/deleteModule.js
@@ -2,7 +2,7 @@ const shell = require('shelljs');
 const fs = require('fs');
 const chalk = require('chalk');
 const { pascalize } = require('humps');
-const { deleteModuleFromCommonGraphqlFile } = require('../helpers/util');
+const { deleteModuleFromGeneratedContainersFile } = require('../helpers/util');
 
 /**
  *
@@ -18,8 +18,8 @@ function deleteModule(logger, templatePath, module, location) {
   const Module = pascalize(module);
   const startPath = `${__dirname}/../../..`;
   const modulePath = `${startPath}/packages/${location}/src/modules/${module}`;
-  const commonGraphqlFile = 'commonGraphql.js';
-  const commonGraphqlPath = `${startPath}/packages/${location}/src/modules/common/${commonGraphqlFile}`;
+  const generatedContainerFile = 'generatedContainers.js';
+  const generatedContainerPath = `${startPath}/packages/${location}/src/modules/common/${generatedContainerFile}`;
 
   if (fs.existsSync(modulePath)) {
     // remove module directory
@@ -78,9 +78,9 @@ function deleteModule(logger, templatePath, module, location) {
     logger.info(chalk.red(`✘ Module ${location} location for ${modulePath} not found!`));
   }
 
-  if (fs.existsSync(commonGraphqlPath)) {
+  if (fs.existsSync(generatedContainerPath)) {
     const graphqlQuery = `${Module}Query`;
-    deleteModuleFromCommonGraphqlFile(module, commonGraphqlPath, graphqlQuery);
+    deleteModuleFromGeneratedContainersFile(module, generatedContainerPath, graphqlQuery);
   }
 }
 
diff --git a/tools/cli/helpers/util.js b/tools/cli/helpers/util.js
index 29b80cf1e6..0412f9666a 100644
--- a/tools/cli/helpers/util.js
+++ b/tools/cli/helpers/util.js
@@ -77,50 +77,53 @@ function generateField(value, update = false) {
 /**
  *
  * @param module
- * @param commonGraphqlPath
+ * @param generatedContainerPath
  * @param moduleGraphqlContainer
  */
-function generateCommonGraphqlFile(module, commonGraphqlPath, moduleGraphqlContainer) {
+function createGeneratedContainersFile(module, generatedContainerPath, moduleGraphqlContainer) {
   const importGraphqlContainer = `import ${moduleGraphqlContainer} from '../${module}/containers/${moduleGraphqlContainer}';\n`;
   const exportGraphqlContainer = `\nexport default {\n  ${moduleGraphqlContainer}\n};\n`;
 
-  if (fs.existsSync(commonGraphqlPath)) {
-    const commonGraphqlData = fs.readFileSync(commonGraphqlPath);
-    const commonGraphql = commonGraphqlData.toString().trim();
-    if (commonGraphql.length > 1) {
-      const index = commonGraphql.lastIndexOf("';");
+  if (fs.existsSync(generatedContainerPath)) {
+    const generatedContainerData = fs.readFileSync(generatedContainerPath);
+    const generatedContainer = generatedContainerData.toString().trim();
+    if (generatedContainer.length > 1) {
+      const index = generatedContainer.lastIndexOf("';");
       const computedIndex = index >= 0 ? index + 3 : false;
       if (computedIndex) {
-        let computedCommonGraphql =
-          commonGraphql.slice(0, computedIndex) +
+        let computedGeneratedContainer =
+          generatedContainer.slice(0, computedIndex) +
           importGraphqlContainer +
-          commonGraphql.slice(computedIndex, commonGraphql.length);
-        computedCommonGraphql = computedCommonGraphql.replace(/(,|)\s};/g, `,\n  ${moduleGraphqlContainer}\n};`);
-        return fs.writeFileSync(commonGraphqlPath, computedCommonGraphql);
+          generatedContainer.slice(computedIndex, generatedContainer.length);
+        computedGeneratedContainer = computedGeneratedContainer.replace(
+          /(,|)\s};/g,
+          `,\n  ${moduleGraphqlContainer}\n};`
+        );
+        return fs.writeFileSync(generatedContainerPath, computedGeneratedContainer);
       }
     }
   }
-  return fs.writeFileSync(commonGraphqlPath, importGraphqlContainer + exportGraphqlContainer);
+  return fs.writeFileSync(generatedContainerPath, importGraphqlContainer + exportGraphqlContainer);
 }
 
 /**
  *
  * @param module
- * @param commonGraphqlPath
+ * @param generatedContainerPath
  * @param moduleGraphqlContainer
  */
-function deleteModuleFromCommonGraphqlFile(module, commonGraphqlPath, moduleGraphqlContainer) {
-  if (fs.existsSync(commonGraphqlPath)) {
-    const commonGraphqlData = fs.readFileSync(commonGraphqlPath);
+function deleteModuleFromGeneratedContainersFile(module, generatedContainerPath, moduleGraphqlContainer) {
+  if (fs.existsSync(generatedContainerPath)) {
+    const generatedContainerData = fs.readFileSync(generatedContainerPath);
     const reg = `(\\n\\s\\s${moduleGraphqlContainer}(.|)|import ${moduleGraphqlContainer}.+;\\n+(?!ex))`;
-    const commonGraphql = commonGraphqlData.toString().replace(new RegExp(reg, 'g'), '');
-    fs.writeFileSync(commonGraphqlPath, commonGraphql);
+    const generatedContainer = generatedContainerData.toString().replace(new RegExp(reg, 'g'), '');
+    fs.writeFileSync(generatedContainerPath, generatedContainer);
   }
 }
 
 module.exports = {
   renameFiles,
   generateField,
-  generateCommonGraphqlFile,
-  deleteModuleFromCommonGraphqlFile
+  createGeneratedContainersFile,
+  deleteModuleFromGeneratedContainersFile
 };

From c2033531d61f870920a3d9e1eec8f1d1d12aadaf Mon Sep 17 00:00:00 2001
From: Dmytro Tverdoklib <nepal-tda@outlook.com>
Date: Tue, 3 Jul 2018 14:22:06 +0300
Subject: [PATCH 174/327] Return back default values

---
 packages/mobile/.spinrc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/mobile/.spinrc.js b/packages/mobile/.spinrc.js
index 2aa749494b..13fcea670d 100644
--- a/packages/mobile/.spinrc.js
+++ b/packages/mobile/.spinrc.js
@@ -10,7 +10,7 @@ const config = {
       defines: {
         __CLIENT__: true
       },
-      enabled: true
+      enabled: false
     },
     ios: {
       entry: './src/index.ts',

From 4c0de4d763265417b11db0f0cb5e2da6a095909a Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Tue, 3 Jul 2018 13:21:49 +0300
Subject: [PATCH 175/327] Add and change native components for Form fields

---
 .../components/RenderSelect.jsx               | 20 ++---
 .../components/RenderSelectQuery.jsx          | 79 +++++++++++++++++++
 .../components/RenderSwitch.jsx               | 11 +--
 .../ui-native-base/components/Select.jsx      |  6 +-
 .../ui-native-base/components/index.jsx       |  1 +
 .../native/ui-native-base/styles/Select.js    |  7 ++
 packages/client/src/modules/common/util.jsx   | 39 ++++++---
 7 files changed, 137 insertions(+), 26 deletions(-)
 create mode 100644 packages/client/src/modules/common/components/native/ui-native-base/components/RenderSelectQuery.jsx

diff --git a/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSelect.jsx b/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSelect.jsx
index f9a2f9b488..148f6a672a 100644
--- a/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSelect.jsx
+++ b/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSelect.jsx
@@ -4,26 +4,27 @@ import { Platform, StyleSheet, View, Text } from 'react-native';
 import Select from './Select';
 import RenderSelectStyles from '../styles/RenderSelect';
 
-const RenderSelect = ({ style, label, ...props }) => {
+const RenderSelect = ({ renderSelectStyles, label, ...props }) => {
   const selectProps = {
     iconName: 'caret-down',
     icon: true,
     iconSize: 20,
     ...props
   };
+  const computedStyles = renderSelectStyles ? renderSelectStyles : styles;
   return (
-    <View style={styles.container}>
+    <View style={computedStyles.container}>
       {Platform.OS === 'ios' ? (
-        <View style={styles.itemContainer}>
-          {label && <Text style={styles.itemTitle}>{label}</Text>}
-          <View style={styles.itemAction}>
+        <View style={computedStyles.itemContainer}>
+          {label && <Text style={computedStyles.itemTitle}>{label}</Text>}
+          <View style={computedStyles.itemAction}>
             <Select {...selectProps} />
           </View>
         </View>
       ) : (
-        <View style={styles.itemContainer}>
-          {label && <Text style={styles.itemTitle}>{label}</Text>}
-          <View style={styles.itemAction}>
+        <View style={computedStyles.itemContainer}>
+          {label && <Text style={computedStyles.itemTitle}>{label}</Text>}
+          <View style={computedStyles.itemAction}>
             <Select {...props} />
           </View>
         </View>
@@ -34,7 +35,8 @@ const RenderSelect = ({ style, label, ...props }) => {
 
 RenderSelect.propTypes = {
   style: PropTypes.number,
-  label: PropTypes.string
+  label: PropTypes.string,
+  renderSelectStyles: PropTypes.object
 };
 
 const styles = StyleSheet.create(RenderSelectStyles);
diff --git a/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSelectQuery.jsx b/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSelectQuery.jsx
new file mode 100644
index 0000000000..873bb03926
--- /dev/null
+++ b/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSelectQuery.jsx
@@ -0,0 +1,79 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { pascalize } from 'humps';
+import { View } from 'react-native';
+import { RenderSelect } from './index';
+import schemaQueries from '../../../../commonGraphql';
+
+const handleSelect = (selectedValue, edges, onChangeValue) => {
+  let selectedItem = edges && Array.isArray(edges) ? edges.find(item => item.value == selectedValue) : '';
+  onChangeValue(selectedItem ? { id: selectedItem.value } : '');
+};
+
+const RenderSelectQuery = ({
+  input: { value: inputValue, onChange, onBlur, defaultValue, ...inputRest },
+  label,
+  schema,
+  customStyles,
+  onChange: onChangeValue,
+  value,
+  ...props
+}) => {
+  const pascalizeSchemaName = pascalize(schema.name);
+
+  const formatedValue = value && value != '' && typeof value !== 'undefined' ? value.id : '';
+
+  const Query = schemaQueries[`${pascalizeSchemaName}Query`];
+
+  let defaultStyle = {
+    container: {},
+    itemContainer: {},
+    itemTitle: {},
+    itemAction: {
+      flexDirection: 'column',
+      flex: 2,
+      justifyContent: 'center',
+      alignItems: 'flex-end'
+    }
+  };
+  if (customStyles) {
+    defaultStyle = customStyles;
+  }
+
+  return (
+    <Query limit={10}>
+      {({ loading, data }) => {
+        if (!loading || data) {
+          let computedData = data.edges
+            ? data.edges.map(item => {
+                return { label: item.name, value: item.id };
+              })
+            : null;
+          let computedProps = {
+            renderSelectStyles: defaultStyle,
+            value: formatedValue,
+            data: computedData,
+            onChange: selectedValue => handleSelect(selectedValue, computedData, onChangeValue),
+            ...inputRest,
+            ...props
+          };
+          return <RenderSelect {...computedProps} />;
+        } else {
+          return <View />;
+        }
+      }}
+    </Query>
+  );
+};
+
+RenderSelectQuery.propTypes = {
+  input: PropTypes.object,
+  label: PropTypes.string,
+  schema: PropTypes.object,
+  customStyles: PropTypes.object,
+  formType: PropTypes.string,
+  onChange: PropTypes.func.required,
+  value: PropTypes.any
+};
+
+export default RenderSelectQuery;
diff --git a/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSwitch.jsx b/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSwitch.jsx
index 2c6369936c..1277b2a546 100644
--- a/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSwitch.jsx
+++ b/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSwitch.jsx
@@ -4,11 +4,11 @@ import { Text, StyleSheet, View } from 'react-native';
 import Switch from './Switch';
 import RenderSwitchStyles from '../styles/RenderSwitch';
 
-const RenderSwitch = ({ label, ...props }) => {
+const RenderSwitch = ({ style, label, ...props }) => {
   return (
-    <View style={styles.itemContainer}>
-      <Text style={styles.itemTitle}>{label}</Text>
-      <View style={styles.itemAction}>
+    <View style={[style.itemContainer, styles.itemContainer]}>
+      <Text style={[style.itemTitle, styles.itemTitle]}>{label}</Text>
+      <View style={[style.itemAction, styles.itemAction]}>
         <Switch {...props} />
       </View>
     </View>
@@ -16,7 +16,8 @@ const RenderSwitch = ({ label, ...props }) => {
 };
 
 RenderSwitch.propTypes = {
-  label: PropTypes.string
+  label: PropTypes.string,
+  style: PropTypes.object
 };
 
 const styles = StyleSheet.create(RenderSwitchStyles);
diff --git a/packages/client/src/modules/common/components/native/ui-native-base/components/Select.jsx b/packages/client/src/modules/common/components/native/ui-native-base/components/Select.jsx
index a0fae26ff4..c41fa01e48 100644
--- a/packages/client/src/modules/common/components/native/ui-native-base/components/Select.jsx
+++ b/packages/client/src/modules/common/components/native/ui-native-base/components/Select.jsx
@@ -21,7 +21,7 @@ const Select = ({
   ...props
 }) => {
   return Platform.OS === 'ios' ? (
-    <Item style={{ flex: 1 }}>
+    <Item style={styles.selectItemIos}>
       {icon && (
         <FontAwesome name={iconName || 'filter'} size={iconSize || 20} style={{ color: `${iconColor || '#000'}` }} />
       )}
@@ -38,7 +38,7 @@ const Select = ({
       </Picker>
     </Item>
   ) : (
-    <Item>
+    <Item style={styles.selectItemAndroid}>
       <Picker
         style={[styles.androidPickerWrapper, style]}
         onValueChange={onValueChange || onChange}
@@ -57,7 +57,7 @@ Select.propTypes = {
   data: PropTypes.array.isRequired,
   onValueChange: PropTypes.func,
   onChange: PropTypes.func,
-  value: PropTypes.string,
+  value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
   selectedValue: PropTypes.string,
   placeholder: PropTypes.string,
   icon: PropTypes.bool,
diff --git a/packages/client/src/modules/common/components/native/ui-native-base/components/index.jsx b/packages/client/src/modules/common/components/native/ui-native-base/components/index.jsx
index b3a6fe4c77..9f9b01cfe9 100644
--- a/packages/client/src/modules/common/components/native/ui-native-base/components/index.jsx
+++ b/packages/client/src/modules/common/components/native/ui-native-base/components/index.jsx
@@ -23,3 +23,4 @@ export { default as IconButton } from './IconButton';
 export { default as LanguagePicker } from './LanguagePicker';
 export { default as Root } from './Root';
 export { default as Pagination } from './Pagination';
+export { default as RenderSelectQuery } from './RenderSelectQuery';
diff --git a/packages/client/src/modules/common/components/native/ui-native-base/styles/Select.js b/packages/client/src/modules/common/components/native/ui-native-base/styles/Select.js
index b1251d8736..08685b4cd1 100644
--- a/packages/client/src/modules/common/components/native/ui-native-base/styles/Select.js
+++ b/packages/client/src/modules/common/components/native/ui-native-base/styles/Select.js
@@ -1,6 +1,13 @@
 const SelectStyles = {
   androidPickerWrapper: {
     flex: 1
+  },
+  selectItemAndroid: {
+    paddingLeft: 10,
+    paddingRight: 10
+  },
+  selectItemIos: {
+    flex: 1
   }
 };
 
diff --git a/packages/client/src/modules/common/util.jsx b/packages/client/src/modules/common/util.jsx
index 3e69191262..b4022f4e16 100644
--- a/packages/client/src/modules/common/util.jsx
+++ b/packages/client/src/modules/common/util.jsx
@@ -1,37 +1,45 @@
 import React from 'react';
 import { pick, capitalize } from 'lodash';
 import Field from '../../utils/FieldAdapter';
-import { RenderField, RenderSwitch } from './components/native';
+import { RenderField, RenderSwitch, RenderSelectQuery } from './components/native';
 
 export const createFormFields = (schema, values, setFieldValue) => {
   let fields = [];
   for (const key of schema.keys()) {
-    const value = Array.isArray(schema.values[key]) ? schema.values[key][0] : schema.values[key];
-    const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
+    const value = schema.values[key];
+    const type = Array.isArray(value.type) ? value.type[0] : value.type;
+    const hasTypeOf = targetType => type === targetType || type.prototype instanceof targetType;
+    const inputStyle = { fontSize: 16 };
+    const switchStyle = {
+      itemTitle: {
+        fontSize: 16
+      }
+    };
     if (key === 'id') {
       continue;
     }
-    if (hasTypeOf(Boolean)) {
+    if (type.isSchema) {
       fields.push(
         <Field
+          schema={type}
           label={capitalize(key)}
           name={key}
           key={key}
           value={values[key]}
-          component={RenderSwitch}
+          component={RenderSelectQuery}
           placeholder={capitalize(key)}
-          onValueChange={val => setFieldValue(key, val)}
+          onChange={selectedValue => setFieldValue(key, selectedValue)}
         />
       );
     } else if (hasTypeOf(String)) {
       fields.push(
         <Field
-          label={capitalize(key)}
           name={key}
           key={key}
           value={values[key]}
-          type="text"
           component={RenderField}
+          type="text"
+          style={inputStyle}
           placeholder={capitalize(key)}
         />
       );
@@ -39,13 +47,26 @@ export const createFormFields = (schema, values, setFieldValue) => {
       fields.push(
         <Field
           keyboardType="numeric"
-          label={capitalize(key)}
           name={key}
           key={key}
           value={`${values[key]}`}
           type="number"
           component={RenderField}
+          style={inputStyle}
+          placeholder={capitalize(key)}
+        />
+      );
+    } else if (hasTypeOf(Boolean)) {
+      fields.push(
+        <Field
+          label={capitalize(key)}
+          name={key}
+          key={key}
+          value={values[key]}
+          component={RenderSwitch}
           placeholder={capitalize(key)}
+          onChange={selectedValue => setFieldValue(key, selectedValue)}
+          style={switchStyle}
         />
       );
     }

From 5061b4dfd6036be2374a45804d6f683435f12188 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Tue, 3 Jul 2018 13:56:43 +0300
Subject: [PATCH 176/327] Change native componets style flow and add polyfill
 for setPrototypeOf function

---
 .../ui-native-base/components/RenderSelect.jsx   | 16 ++++++++--------
 .../components/RenderSelectQuery.jsx             |  6 ++++--
 .../ui-native-base/components/RenderSwitch.jsx   |  6 +++---
 packages/client/src/modules/common/util.jsx      |  2 +-
 packages/common/createApolloClient.js            |  7 +++++++
 5 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSelect.jsx b/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSelect.jsx
index 148f6a672a..7cb35140ea 100644
--- a/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSelect.jsx
+++ b/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSelect.jsx
@@ -11,20 +11,20 @@ const RenderSelect = ({ renderSelectStyles, label, ...props }) => {
     iconSize: 20,
     ...props
   };
-  const computedStyles = renderSelectStyles ? renderSelectStyles : styles;
+
   return (
-    <View style={computedStyles.container}>
+    <View style={[styles.container, renderSelectStyles.container]}>
       {Platform.OS === 'ios' ? (
-        <View style={computedStyles.itemContainer}>
-          {label && <Text style={computedStyles.itemTitle}>{label}</Text>}
-          <View style={computedStyles.itemAction}>
+        <View style={[styles.itemContainer, renderSelectStyles.itemContainer]}>
+          {label && <Text style={[styles.itemTitle, renderSelectStyles.itemTitle]}>{label}</Text>}
+          <View style={[styles.itemAction, renderSelectStyles.itemAction]}>
             <Select {...selectProps} />
           </View>
         </View>
       ) : (
-        <View style={computedStyles.itemContainer}>
-          {label && <Text style={computedStyles.itemTitle}>{label}</Text>}
-          <View style={computedStyles.itemAction}>
+        <View style={[styles.itemContainer, renderSelectStyles.itemContainer]}>
+          {label && <Text style={[styles.itemTitle, renderSelectStyles.itemTitle]}>{label}</Text>}
+          <View style={[styles.itemAction, renderSelectStyles.itemAction]}>
             <Select {...props} />
           </View>
         </View>
diff --git a/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSelectQuery.jsx b/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSelectQuery.jsx
index 873bb03926..777aa6f45a 100644
--- a/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSelectQuery.jsx
@@ -26,7 +26,9 @@ const RenderSelectQuery = ({
   const Query = schemaQueries[`${pascalizeSchemaName}Query`];
 
   let defaultStyle = {
-    container: {},
+    container: {
+      paddingLeft: 0
+    },
     itemContainer: {},
     itemTitle: {},
     itemAction: {
@@ -72,7 +74,7 @@ RenderSelectQuery.propTypes = {
   schema: PropTypes.object,
   customStyles: PropTypes.object,
   formType: PropTypes.string,
-  onChange: PropTypes.func.required,
+  onChange: PropTypes.any,
   value: PropTypes.any
 };
 
diff --git a/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSwitch.jsx b/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSwitch.jsx
index 1277b2a546..b4fc95c8b8 100644
--- a/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSwitch.jsx
+++ b/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSwitch.jsx
@@ -6,9 +6,9 @@ import RenderSwitchStyles from '../styles/RenderSwitch';
 
 const RenderSwitch = ({ style, label, ...props }) => {
   return (
-    <View style={[style.itemContainer, styles.itemContainer]}>
-      <Text style={[style.itemTitle, styles.itemTitle]}>{label}</Text>
-      <View style={[style.itemAction, styles.itemAction]}>
+    <View style={[styles.itemContainer, style.itemContainer]}>
+      <Text style={[styles.itemTitle, style.itemTitle]}>{label}</Text>
+      <View style={[styles.itemAction, style.itemAction]}>
         <Switch {...props} />
       </View>
     </View>
diff --git a/packages/client/src/modules/common/util.jsx b/packages/client/src/modules/common/util.jsx
index b4022f4e16..4345786c2c 100644
--- a/packages/client/src/modules/common/util.jsx
+++ b/packages/client/src/modules/common/util.jsx
@@ -62,7 +62,7 @@ export const createFormFields = (schema, values, setFieldValue) => {
           label={capitalize(key)}
           name={key}
           key={key}
-          value={values[key]}
+          value={!!values[key]}
           component={RenderSwitch}
           placeholder={capitalize(key)}
           onChange={selectedValue => setFieldValue(key, selectedValue)}
diff --git a/packages/common/createApolloClient.js b/packages/common/createApolloClient.js
index 24baba0079..8ab6ca47eb 100644
--- a/packages/common/createApolloClient.js
+++ b/packages/common/createApolloClient.js
@@ -34,6 +34,13 @@ const createApolloClient = ({ apiUrl, createNetLink, links, connectionParams, cl
     }
   );
 
+  Object.setPrototypeOf =
+    Object.setPrototypeOf ||
+    function(obj, proto) {
+      obj.__proto__ = proto;
+      return obj;
+    };
+
   const queryLink = createNetLink
     ? createNetLink(apiUrl)
     : new BatchHttpLink({

From 213b9eb9baf0b8b26b00e52eac09860a4c706194 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Tue, 3 Jul 2018 14:36:30 +0300
Subject: [PATCH 177/327] Fix import in native RenderSelectQuery

---
 .../native/ui-native-base/components/RenderSelectQuery.jsx      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSelectQuery.jsx b/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSelectQuery.jsx
index 777aa6f45a..7074086f0b 100644
--- a/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSelectQuery.jsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { pascalize } from 'humps';
 import { View } from 'react-native';
 import { RenderSelect } from './index';
-import schemaQueries from '../../../../commonGraphql';
+import schemaQueries from '../../../../generatedContainers';
 
 const handleSelect = (selectedValue, edges, onChangeValue) => {
   let selectedItem = edges && Array.isArray(edges) ? edges.find(item => item.value == selectedValue) : '';

From 4c422449e4d4a43893ca54e6123623d3e457b42c Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Tue, 3 Jul 2018 17:10:57 +0300
Subject: [PATCH 178/327] Add Android Datepicker for date type field

---
 .../components/RenderDatepicker.jsx           | 54 +++++++++++++++++++
 .../ui-native-base/components/index.jsx       |  1 +
 packages/client/src/modules/common/util.jsx   | 24 ++++++---
 3 files changed, 73 insertions(+), 6 deletions(-)
 create mode 100644 packages/client/src/modules/common/components/native/ui-native-base/components/RenderDatepicker.jsx

diff --git a/packages/client/src/modules/common/components/native/ui-native-base/components/RenderDatepicker.jsx b/packages/client/src/modules/common/components/native/ui-native-base/components/RenderDatepicker.jsx
new file mode 100644
index 0000000000..d8dc0f1e51
--- /dev/null
+++ b/packages/client/src/modules/common/components/native/ui-native-base/components/RenderDatepicker.jsx
@@ -0,0 +1,54 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { View, TouchableOpacity, DatePickerAndroid, StyleSheet } from 'react-native';
+import { Input, Item } from 'native-base';
+import InputItemStyles from '../styles/InputItem';
+
+class RenderDatepicker extends React.Component {
+  constructor() {
+    super();
+    this.openDatePicker = this.openDatePicker.bind(this);
+  }
+
+  async openDatePicker() {
+    try {
+      const datepickerResult = await DatePickerAndroid.open({
+        date: this.props.value ? new Date(this.props.value) : new Date()
+      });
+
+      if (datepickerResult.action === DatePickerAndroid.dateSetAction) {
+        let validMonth = datepickerResult.month + 1;
+        let month = validMonth > 9 ? validMonth : '0' + validMonth;
+        let day = datepickerResult.day > 9 ? datepickerResult.day : '0' + datepickerResult.day;
+        this.props.onChange(`${datepickerResult.year}-${month}-${day}`);
+      }
+    } catch ({ code, message }) {
+      console.warn('Cannot open date picker', message);
+    }
+  }
+
+  render() {
+    let { value, style, placeholder } = this.props;
+
+    return (
+      <View>
+        <TouchableOpacity onPress={this.openDatePicker}>
+          <Item style={[styles.item, style.item]}>
+            <Input editable={false} value={value} placeholder={placeholder} />
+          </Item>
+        </TouchableOpacity>
+      </View>
+    );
+  }
+}
+
+const styles = StyleSheet.create(InputItemStyles);
+
+RenderDatepicker.propTypes = {
+  onChange: PropTypes.func,
+  value: PropTypes.string,
+  style: PropTypes.object,
+  placeholder: PropTypes.string
+};
+
+export default RenderDatepicker;
diff --git a/packages/client/src/modules/common/components/native/ui-native-base/components/index.jsx b/packages/client/src/modules/common/components/native/ui-native-base/components/index.jsx
index 9f9b01cfe9..425d1b9416 100644
--- a/packages/client/src/modules/common/components/native/ui-native-base/components/index.jsx
+++ b/packages/client/src/modules/common/components/native/ui-native-base/components/index.jsx
@@ -24,3 +24,4 @@ export { default as LanguagePicker } from './LanguagePicker';
 export { default as Root } from './Root';
 export { default as Pagination } from './Pagination';
 export { default as RenderSelectQuery } from './RenderSelectQuery';
+export { default as RenderDatepicker } from './RenderDatepicker';
diff --git a/packages/client/src/modules/common/util.jsx b/packages/client/src/modules/common/util.jsx
index 4345786c2c..3cf6063e60 100644
--- a/packages/client/src/modules/common/util.jsx
+++ b/packages/client/src/modules/common/util.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
-import { pick, capitalize } from 'lodash';
+import { pick, capitalize, startCase } from 'lodash';
 import Field from '../../utils/FieldAdapter';
-import { RenderField, RenderSwitch, RenderSelectQuery } from './components/native';
+import { RenderField, RenderSwitch, RenderSelectQuery, RenderDatepicker } from './components/native';
 
 export const createFormFields = (schema, values, setFieldValue) => {
   let fields = [];
@@ -27,7 +27,7 @@ export const createFormFields = (schema, values, setFieldValue) => {
           key={key}
           value={values[key]}
           component={RenderSelectQuery}
-          placeholder={capitalize(key)}
+          placeholder={startCase(key)}
           onChange={selectedValue => setFieldValue(key, selectedValue)}
         />
       );
@@ -40,7 +40,7 @@ export const createFormFields = (schema, values, setFieldValue) => {
           component={RenderField}
           type="text"
           style={inputStyle}
-          placeholder={capitalize(key)}
+          placeholder={startCase(key)}
         />
       );
     } else if (hasTypeOf(Number)) {
@@ -53,7 +53,7 @@ export const createFormFields = (schema, values, setFieldValue) => {
           type="number"
           component={RenderField}
           style={inputStyle}
-          placeholder={capitalize(key)}
+          placeholder={startCase(key)}
         />
       );
     } else if (hasTypeOf(Boolean)) {
@@ -64,11 +64,23 @@ export const createFormFields = (schema, values, setFieldValue) => {
           key={key}
           value={!!values[key]}
           component={RenderSwitch}
-          placeholder={capitalize(key)}
+          placeholder={startCase(key)}
           onChange={selectedValue => setFieldValue(key, selectedValue)}
           style={switchStyle}
         />
       );
+    } else if (hasTypeOf(Date)) {
+      fields.push(
+        <Field
+          name={key}
+          key={key}
+          value={values[key]}
+          component={RenderDatepicker}
+          style={inputStyle}
+          onChange={selectedValue => setFieldValue(key, selectedValue)}
+          placeholder={startCase(key)}
+        />
+      );
     }
   }
 

From 0c2e3a0ae6286690ee387e7f25865063e1f7b2e2 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Tue, 3 Jul 2018 17:50:52 +0300
Subject: [PATCH 179/327] Add default option for native Select component

---
 .../components/RenderSelectQuery.jsx          | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSelectQuery.jsx b/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSelectQuery.jsx
index 7074086f0b..cd07852e24 100644
--- a/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSelectQuery.jsx
@@ -11,7 +11,7 @@ const handleSelect = (selectedValue, edges, onChangeValue) => {
 };
 
 const RenderSelectQuery = ({
-  input: { value: inputValue, onChange, onBlur, defaultValue, ...inputRest },
+  input: { name },
   label,
   schema,
   customStyles,
@@ -20,9 +20,8 @@ const RenderSelectQuery = ({
   ...props
 }) => {
   const pascalizeSchemaName = pascalize(schema.name);
-
-  const formatedValue = value && value != '' && typeof value !== 'undefined' ? value.id : '';
-
+  const formatedValue = value && value != '' && typeof value !== 'undefined' ? value.id : '0';
+  const defaultOption = { label: 'Select Item', value: '0' };
   const Query = schemaQueries[`${pascalizeSchemaName}Query`];
 
   let defaultStyle = {
@@ -46,17 +45,22 @@ const RenderSelectQuery = ({
     <Query limit={10}>
       {({ loading, data }) => {
         if (!loading || data) {
-          let computedData = data.edges
-            ? data.edges.map(item => {
-                return { label: item.name, value: item.id };
-              })
-            : null;
+          let computedData = null;
+          if (Array.isArray(data.edges) && data.edges.length > 0) {
+            computedData = data.edges.map(item => {
+              return { label: item.name, value: item.id };
+            });
+            if (!value) {
+              computedData.push(defaultOption);
+            }
+          }
+
           let computedProps = {
             renderSelectStyles: defaultStyle,
             value: formatedValue,
             data: computedData,
+            name,
             onChange: selectedValue => handleSelect(selectedValue, computedData, onChangeValue),
-            ...inputRest,
             ...props
           };
           return <RenderSelect {...computedProps} />;

From 9b5ee340a07047d20256283f2ad45c23c1d9a659 Mon Sep 17 00:00:00 2001
From: oem <nepal-tda@outlook.com>
Date: Wed, 4 Jul 2018 12:44:25 +0300
Subject: [PATCH 180/327] Refactor functions createGeneratedContainersFile,
 deleteModuleFromGeneratedContainersFile

---
 tools/cli/commands/addModule.js    | 10 +++++--
 tools/cli/commands/deleteModule.js |  4 +--
 tools/cli/helpers/util.js          | 48 +++++++++++++-----------------
 3 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/tools/cli/commands/addModule.js b/tools/cli/commands/addModule.js
index 7801c009a3..cb6ae5f674 100644
--- a/tools/cli/commands/addModule.js
+++ b/tools/cli/commands/addModule.js
@@ -2,7 +2,7 @@ const shell = require('shelljs');
 const fs = require('fs');
 const chalk = require('chalk');
 const { pascalize } = require('humps');
-const { renameFiles, createGeneratedContainersFile } = require('../helpers/util');
+const { renameFiles, updateFileWithExports } = require('../helpers/util');
 
 /**
  *
@@ -48,9 +48,13 @@ function addModule(logger, templatePath, module, action, tablePrefix, location)
 
     if (action === 'addcrud' && location === 'client') {
       const generatedContainerFile = 'generatedContainers.js';
-      const generatedContainerPath = `${startPath}/packages/${location}/src/modules/common/${generatedContainerFile}`;
       const graphqlQuery = `${Module}Query`;
-      createGeneratedContainersFile(module, generatedContainerPath, graphqlQuery);
+      const options = {
+        pathToFileWithExports: `${startPath}/packages/${location}/src/modules/common/${generatedContainerFile}`,
+        exportName: graphqlQuery,
+        importString: `import ${graphqlQuery} from '../${module}/containers/${graphqlQuery}';\n`
+      };
+      updateFileWithExports(options);
     }
 
     if (action === 'addcrud' && location === 'server') {
diff --git a/tools/cli/commands/deleteModule.js b/tools/cli/commands/deleteModule.js
index 2d3adb2eb2..6e07535af4 100644
--- a/tools/cli/commands/deleteModule.js
+++ b/tools/cli/commands/deleteModule.js
@@ -2,7 +2,7 @@ const shell = require('shelljs');
 const fs = require('fs');
 const chalk = require('chalk');
 const { pascalize } = require('humps');
-const { deleteModuleFromGeneratedContainersFile } = require('../helpers/util');
+const { deleteFromFileWithExports } = require('../helpers/util');
 
 /**
  *
@@ -80,7 +80,7 @@ function deleteModule(logger, templatePath, module, location) {
 
   if (fs.existsSync(generatedContainerPath)) {
     const graphqlQuery = `${Module}Query`;
-    deleteModuleFromGeneratedContainersFile(module, generatedContainerPath, graphqlQuery);
+    deleteFromFileWithExports(generatedContainerPath, graphqlQuery);
   }
 }
 
diff --git a/tools/cli/helpers/util.js b/tools/cli/helpers/util.js
index 0412f9666a..a098a1159d 100644
--- a/tools/cli/helpers/util.js
+++ b/tools/cli/helpers/util.js
@@ -76,16 +76,15 @@ function generateField(value, update = false) {
 
 /**
  *
- * @param module
- * @param generatedContainerPath
- * @param moduleGraphqlContainer
+ * @param pathToFileWithExports
+ * @param exportName
+ * @param importString
  */
-function createGeneratedContainersFile(module, generatedContainerPath, moduleGraphqlContainer) {
-  const importGraphqlContainer = `import ${moduleGraphqlContainer} from '../${module}/containers/${moduleGraphqlContainer}';\n`;
-  const exportGraphqlContainer = `\nexport default {\n  ${moduleGraphqlContainer}\n};\n`;
+function updateFileWithExports({ pathToFileWithExports, exportName, importString }) {
+  const exportGraphqlContainer = `\nexport default {\n  ${exportName}\n};\n`;
 
-  if (fs.existsSync(generatedContainerPath)) {
-    const generatedContainerData = fs.readFileSync(generatedContainerPath);
+  if (fs.existsSync(pathToFileWithExports)) {
+    const generatedContainerData = fs.readFileSync(pathToFileWithExports);
     const generatedContainer = generatedContainerData.toString().trim();
     if (generatedContainer.length > 1) {
       const index = generatedContainer.lastIndexOf("';");
@@ -93,37 +92,32 @@ function createGeneratedContainersFile(module, generatedContainerPath, moduleGra
       if (computedIndex) {
         let computedGeneratedContainer =
           generatedContainer.slice(0, computedIndex) +
-          importGraphqlContainer +
+          importString +
           generatedContainer.slice(computedIndex, generatedContainer.length);
-        computedGeneratedContainer = computedGeneratedContainer.replace(
-          /(,|)\s};/g,
-          `,\n  ${moduleGraphqlContainer}\n};`
-        );
-        return fs.writeFileSync(generatedContainerPath, computedGeneratedContainer);
+        computedGeneratedContainer = computedGeneratedContainer.replace(/(,|)\s};/g, `,\n  ${exportName}\n};`);
+        return fs.writeFileSync(pathToFileWithExports, computedGeneratedContainer);
       }
     }
   }
-  return fs.writeFileSync(generatedContainerPath, importGraphqlContainer + exportGraphqlContainer);
+  return fs.writeFileSync(pathToFileWithExports, importString + exportGraphqlContainer);
 }
 
 /**
  *
- * @param module
- * @param generatedContainerPath
- * @param moduleGraphqlContainer
+ * @param pathToFileWithExports
+ * @param exportName
  */
-function deleteModuleFromGeneratedContainersFile(module, generatedContainerPath, moduleGraphqlContainer) {
-  if (fs.existsSync(generatedContainerPath)) {
-    const generatedContainerData = fs.readFileSync(generatedContainerPath);
-    const reg = `(\\n\\s\\s${moduleGraphqlContainer}(.|)|import ${moduleGraphqlContainer}.+;\\n+(?!ex))`;
-    const generatedContainer = generatedContainerData.toString().replace(new RegExp(reg, 'g'), '');
-    fs.writeFileSync(generatedContainerPath, generatedContainer);
+function deleteFromFileWithExports(pathToFileWithExports, exportName) {
+  if (fs.existsSync(pathToFileWithExports)) {
+    const generatedElementData = fs.readFileSync(pathToFileWithExports);
+    const reg = `(\\n\\s\\s${exportName}(.|)|import ${exportName}.+;\\n+(?!ex))`;
+    const generatedElement = generatedElementData.toString().replace(new RegExp(reg, 'g'), '');
+    fs.writeFileSync(pathToFileWithExports, generatedElement);
   }
 }
-
 module.exports = {
   renameFiles,
   generateField,
-  createGeneratedContainersFile,
-  deleteModuleFromGeneratedContainersFile
+  updateFileWithExports,
+  deleteFromFileWithExports
 };

From 37055489ae58e67ee13515a829a7b6e745494948 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Wed, 4 Jul 2018 13:40:12 +0300
Subject: [PATCH 181/327] Add DatePicker for IOS and Android, change styles for
 native select input

---
 ...erDatepicker.jsx => DatePickerAndroid.jsx} | 35 ++++++----
 .../components/DatePickerIOS.jsx              | 68 +++++++++++++++++++
 .../components/RenderDatePicker.jsx           | 10 +++
 .../components/RenderSelectQuery.jsx          | 15 ++--
 .../ui-native-base/components/index.jsx       |  2 +-
 .../ui-native-base/styles/DatePicker.js       | 15 ++++
 packages/client/src/modules/common/util.jsx   |  4 +-
 7 files changed, 125 insertions(+), 24 deletions(-)
 rename packages/client/src/modules/common/components/native/ui-native-base/components/{RenderDatepicker.jsx => DatePickerAndroid.jsx} (53%)
 create mode 100644 packages/client/src/modules/common/components/native/ui-native-base/components/DatePickerIOS.jsx
 create mode 100644 packages/client/src/modules/common/components/native/ui-native-base/components/RenderDatePicker.jsx
 create mode 100644 packages/client/src/modules/common/components/native/ui-native-base/styles/DatePicker.js

diff --git a/packages/client/src/modules/common/components/native/ui-native-base/components/RenderDatepicker.jsx b/packages/client/src/modules/common/components/native/ui-native-base/components/DatePickerAndroid.jsx
similarity index 53%
rename from packages/client/src/modules/common/components/native/ui-native-base/components/RenderDatepicker.jsx
rename to packages/client/src/modules/common/components/native/ui-native-base/components/DatePickerAndroid.jsx
index d8dc0f1e51..b6e5f93b9f 100644
--- a/packages/client/src/modules/common/components/native/ui-native-base/components/RenderDatepicker.jsx
+++ b/packages/client/src/modules/common/components/native/ui-native-base/components/DatePickerAndroid.jsx
@@ -1,22 +1,28 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { View, TouchableOpacity, DatePickerAndroid, StyleSheet } from 'react-native';
-import { Input, Item } from 'native-base';
-import InputItemStyles from '../styles/InputItem';
+import { View, TouchableOpacity, StyleSheet, DatePickerAndroid as DatePickerAndroidNative, Text } from 'react-native';
+import DatePickerStyles from '../styles/DatePicker';
 
-class RenderDatepicker extends React.Component {
+class DatePickerAndroid extends React.Component {
   constructor() {
     super();
     this.openDatePicker = this.openDatePicker.bind(this);
   }
 
+  static propTypes = {
+    onChange: PropTypes.func,
+    value: PropTypes.string,
+    style: PropTypes.object,
+    placeholder: PropTypes.string
+  };
+
   async openDatePicker() {
     try {
-      const datepickerResult = await DatePickerAndroid.open({
+      const datepickerResult = await DatePickerAndroidNative.open({
         date: this.props.value ? new Date(this.props.value) : new Date()
       });
 
-      if (datepickerResult.action === DatePickerAndroid.dateSetAction) {
+      if (datepickerResult.action === DatePickerAndroidNative.dateSetAction) {
         let validMonth = datepickerResult.month + 1;
         let month = validMonth > 9 ? validMonth : '0' + validMonth;
         let day = datepickerResult.day > 9 ? datepickerResult.day : '0' + datepickerResult.day;
@@ -29,26 +35,25 @@ class RenderDatepicker extends React.Component {
 
   render() {
     let { value, style, placeholder } = this.props;
-
     return (
-      <View>
+      <View style={[styles.container, style.container]}>
         <TouchableOpacity onPress={this.openDatePicker}>
-          <Item style={[styles.item, style.item]}>
-            <Input editable={false} value={value} placeholder={placeholder} />
-          </Item>
+          <View style={[styles.item, style.item]}>
+            <Text style={[styles.input, style.input]}>{value ? value : placeholder}</Text>
+          </View>
         </TouchableOpacity>
       </View>
     );
   }
 }
 
-const styles = StyleSheet.create(InputItemStyles);
-
-RenderDatepicker.propTypes = {
+DatePickerAndroid.propsTypes = {
   onChange: PropTypes.func,
   value: PropTypes.string,
   style: PropTypes.object,
   placeholder: PropTypes.string
 };
 
-export default RenderDatepicker;
+const styles = StyleSheet.create(DatePickerStyles);
+
+export default DatePickerAndroid;
diff --git a/packages/client/src/modules/common/components/native/ui-native-base/components/DatePickerIOS.jsx b/packages/client/src/modules/common/components/native/ui-native-base/components/DatePickerIOS.jsx
new file mode 100644
index 0000000000..9eaa518b90
--- /dev/null
+++ b/packages/client/src/modules/common/components/native/ui-native-base/components/DatePickerIOS.jsx
@@ -0,0 +1,68 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { View, TouchableOpacity, StyleSheet, DatePickerIOS as DatePickerIOSNative, Text } from 'react-native';
+import DatePickerStyles from '../styles/DatePicker';
+
+class DatePickerIOS extends React.Component {
+  constructor() {
+    super();
+    this.setDate = this.setDate.bind(this);
+    this.toggleDatePicker = this.toggleDatePicker.bind(this);
+    this.state = {
+      showDatePicker: false
+    };
+  }
+
+  static propTypes = {
+    onChange: PropTypes.func,
+    value: PropTypes.string,
+    style: PropTypes.object,
+    placeholder: PropTypes.string
+  };
+
+  setDate(newDate) {
+    if (!(newDate instanceof Date)) {
+      return false;
+    }
+    let validMonth = newDate.getMonth() + 1;
+    let month = validMonth > 9 ? validMonth : '0' + validMonth;
+    let day = newDate.getDate();
+    if (day < 10) {
+      day = '0' + day;
+    }
+    this.props.onChange(`${newDate.getFullYear()}-${month}-${day}`);
+  }
+
+  toggleDatePicker() {
+    if (this.state.showDatePicker) {
+      return this.setState({ showDatePicker: false });
+    }
+    this.setState({ showDatePicker: true });
+  }
+
+  render() {
+    let { value, style, placeholder } = this.props;
+    let datePicker = <View />;
+    if (this.state.showDatePicker) {
+      datePicker = (
+        <View>
+          <DatePickerIOSNative date={value ? new Date(value) : new Date()} onDateChange={this.setDate} mode="date" />
+        </View>
+      );
+    }
+    return (
+      <View style={[styles.container, style.container]}>
+        <TouchableOpacity onPress={this.toggleDatePicker}>
+          <View style={[styles.item, style.item]}>
+            <Text style={[styles.input, style.input]}>{value ? value : placeholder}</Text>
+          </View>
+        </TouchableOpacity>
+        {datePicker}
+      </View>
+    );
+  }
+}
+
+const styles = StyleSheet.create(DatePickerStyles);
+
+export default DatePickerIOS;
diff --git a/packages/client/src/modules/common/components/native/ui-native-base/components/RenderDatePicker.jsx b/packages/client/src/modules/common/components/native/ui-native-base/components/RenderDatePicker.jsx
new file mode 100644
index 0000000000..8f396bde52
--- /dev/null
+++ b/packages/client/src/modules/common/components/native/ui-native-base/components/RenderDatePicker.jsx
@@ -0,0 +1,10 @@
+import React from 'react';
+import { Platform } from 'react-native';
+import DatePickerIOS from './DatePickerIOS';
+import DatePickerAndroid from './DatePickerAndroid';
+
+const RenderDatePicker = ({ ...props }) => {
+  return Platform.OS === 'ios' ? <DatePickerIOS {...props} /> : <DatePickerAndroid {...props} />;
+};
+
+export default RenderDatePicker;
diff --git a/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSelectQuery.jsx b/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSelectQuery.jsx
index cd07852e24..a74a060558 100644
--- a/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSelectQuery.jsx
@@ -26,15 +26,18 @@ const RenderSelectQuery = ({
 
   let defaultStyle = {
     container: {
-      paddingLeft: 0
+      paddingLeft: 0,
+      flex: 1
+    },
+    itemContainer: {
+      flex: 1
     },
-    itemContainer: {},
     itemTitle: {},
     itemAction: {
-      flexDirection: 'column',
-      flex: 2,
-      justifyContent: 'center',
-      alignItems: 'flex-end'
+      flexDirection: 'row',
+      flex: 1,
+      justifyContent: 'flex-end',
+      alignItems: 'center'
     }
   };
   if (customStyles) {
diff --git a/packages/client/src/modules/common/components/native/ui-native-base/components/index.jsx b/packages/client/src/modules/common/components/native/ui-native-base/components/index.jsx
index 425d1b9416..040923fe73 100644
--- a/packages/client/src/modules/common/components/native/ui-native-base/components/index.jsx
+++ b/packages/client/src/modules/common/components/native/ui-native-base/components/index.jsx
@@ -24,4 +24,4 @@ export { default as LanguagePicker } from './LanguagePicker';
 export { default as Root } from './Root';
 export { default as Pagination } from './Pagination';
 export { default as RenderSelectQuery } from './RenderSelectQuery';
-export { default as RenderDatepicker } from './RenderDatepicker';
+export { default as RenderDatePicker } from './RenderDatePicker';
diff --git a/packages/client/src/modules/common/components/native/ui-native-base/styles/DatePicker.js b/packages/client/src/modules/common/components/native/ui-native-base/styles/DatePicker.js
new file mode 100644
index 0000000000..70a438f789
--- /dev/null
+++ b/packages/client/src/modules/common/components/native/ui-native-base/styles/DatePicker.js
@@ -0,0 +1,15 @@
+const datePickerStyles = {
+  container: {},
+  item: {
+    paddingLeft: 15,
+    paddingTop: 15,
+    paddingBottom: 15,
+    borderBottomWidth: 1,
+    borderBottomColor: '#c9cccc'
+  },
+  input: {
+    fontSize: 16
+  }
+};
+
+export default datePickerStyles;
diff --git a/packages/client/src/modules/common/util.jsx b/packages/client/src/modules/common/util.jsx
index 3cf6063e60..1121f29a47 100644
--- a/packages/client/src/modules/common/util.jsx
+++ b/packages/client/src/modules/common/util.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { pick, capitalize, startCase } from 'lodash';
 import Field from '../../utils/FieldAdapter';
-import { RenderField, RenderSwitch, RenderSelectQuery, RenderDatepicker } from './components/native';
+import { RenderField, RenderSwitch, RenderSelectQuery, RenderDatePicker } from './components/native';
 
 export const createFormFields = (schema, values, setFieldValue) => {
   let fields = [];
@@ -75,7 +75,7 @@ export const createFormFields = (schema, values, setFieldValue) => {
           name={key}
           key={key}
           value={values[key]}
-          component={RenderDatepicker}
+          component={RenderDatePicker}
           style={inputStyle}
           onChange={selectedValue => setFieldValue(key, selectedValue)}
           placeholder={startCase(key)}

From 8ef4f3435763046853863eb950dc7118fffcd1a1 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Wed, 4 Jul 2018 14:22:59 +0300
Subject: [PATCH 182/327] Add bottom border for switch field

---
 packages/client/src/modules/common/util.jsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/client/src/modules/common/util.jsx b/packages/client/src/modules/common/util.jsx
index 1121f29a47..4717bdeebf 100644
--- a/packages/client/src/modules/common/util.jsx
+++ b/packages/client/src/modules/common/util.jsx
@@ -11,6 +11,10 @@ export const createFormFields = (schema, values, setFieldValue) => {
     const hasTypeOf = targetType => type === targetType || type.prototype instanceof targetType;
     const inputStyle = { fontSize: 16 };
     const switchStyle = {
+      itemContainer: {
+        borderBottomWidth: 1,
+        borderBottomColor: '#c9cccc'
+      },
       itemTitle: {
         fontSize: 16
       }

From 3a75922ac10767b72a4658169a6a61cb5729f1f8 Mon Sep 17 00:00:00 2001
From: oem <nepal-tda@outlook.com>
Date: Wed, 4 Jul 2018 14:34:29 +0300
Subject: [PATCH 183/327] Update generatedSchemas.js after creating new module

---
 .../client/src/modules/common/generatedContainers.js     | 1 +
 tools/cli/commands/addModule.js                          | 9 +++++++++
 tools/cli/commands/deleteModule.js                       | 6 ++++++
 3 files changed, 16 insertions(+)

diff --git a/packages/client/src/modules/common/generatedContainers.js b/packages/client/src/modules/common/generatedContainers.js
index e69de29bb2..ff8b4c5632 100644
--- a/packages/client/src/modules/common/generatedContainers.js
+++ b/packages/client/src/modules/common/generatedContainers.js
@@ -0,0 +1 @@
+export default {};
diff --git a/tools/cli/commands/addModule.js b/tools/cli/commands/addModule.js
index cb6ae5f674..de25d0a718 100644
--- a/tools/cli/commands/addModule.js
+++ b/tools/cli/commands/addModule.js
@@ -76,6 +76,15 @@ function addModule(logger, templatePath, module, action, tablePrefix, location)
 
         logger.info(chalk.green(`✔ Inserted db table prefix!`));
       }
+
+      const generatedSchemasFile = 'generatedSchemas.js';
+      const schema = `${Module}Schema`;
+      const options = {
+        pathToFileWithExports: `${startPath}/packages/${location}/src/modules/common/${generatedSchemasFile}`,
+        exportName: schema,
+        importString: `import { ${schema} } from '../${module}/schema';\n`
+      };
+      updateFileWithExports(options);
     }
 
     logger.info(chalk.green(`✔ Module for ${location} successfully created!`));
diff --git a/tools/cli/commands/deleteModule.js b/tools/cli/commands/deleteModule.js
index 6e07535af4..6481be85d2 100644
--- a/tools/cli/commands/deleteModule.js
+++ b/tools/cli/commands/deleteModule.js
@@ -20,6 +20,8 @@ function deleteModule(logger, templatePath, module, location) {
   const modulePath = `${startPath}/packages/${location}/src/modules/${module}`;
   const generatedContainerFile = 'generatedContainers.js';
   const generatedContainerPath = `${startPath}/packages/${location}/src/modules/common/${generatedContainerFile}`;
+  const generatedSchemasFile = 'generatedSchemas.js';
+  const generatedSchemaPath = `${startPath}/packages/${location}/src/modules/common/${generatedSchemasFile}`;
 
   if (fs.existsSync(modulePath)) {
     // remove module directory
@@ -82,6 +84,10 @@ function deleteModule(logger, templatePath, module, location) {
     const graphqlQuery = `${Module}Query`;
     deleteFromFileWithExports(generatedContainerPath, graphqlQuery);
   }
+  if (fs.existsSync(generatedSchemaPath)) {
+    const schema = `${Module}Schema`;
+    deleteFromFileWithExports(generatedSchemaPath, schema);
+  }
 }
 
 module.exports = deleteModule;

From 3d01b4f998f398147c311eed2c9ba0bba57b56e4 Mon Sep 17 00:00:00 2001
From: oem <nepal-tda@outlook.com>
Date: Wed, 4 Jul 2018 14:46:54 +0300
Subject: [PATCH 184/327] Add ability to delete strings with non default
 exports

---
 tools/cli/helpers/util.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/cli/helpers/util.js b/tools/cli/helpers/util.js
index a098a1159d..3eb91784d9 100644
--- a/tools/cli/helpers/util.js
+++ b/tools/cli/helpers/util.js
@@ -110,7 +110,7 @@ function updateFileWithExports({ pathToFileWithExports, exportName, importString
 function deleteFromFileWithExports(pathToFileWithExports, exportName) {
   if (fs.existsSync(pathToFileWithExports)) {
     const generatedElementData = fs.readFileSync(pathToFileWithExports);
-    const reg = `(\\n\\s\\s${exportName}(.|)|import ${exportName}.+;\\n+(?!ex))`;
+    const reg = `(\\n\\s\\s${exportName}(.|)|import (${exportName}|{ ${exportName} }).+;\\n+(?!ex))`;
     const generatedElement = generatedElementData.toString().replace(new RegExp(reg, 'g'), '');
     fs.writeFileSync(pathToFileWithExports, generatedElement);
   }

From 24aa83acc1023ebf040690bf0d726d4cef02edec Mon Sep 17 00:00:00 2001
From: oem <nepal-tda@outlook.com>
Date: Wed, 4 Jul 2018 15:02:59 +0300
Subject: [PATCH 185/327] Replace dynamic import schema

---
 tools/cli/commands/updateSchema.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/cli/commands/updateSchema.js b/tools/cli/commands/updateSchema.js
index fef1f67066..938cf0c9bc 100644
--- a/tools/cli/commands/updateSchema.js
+++ b/tools/cli/commands/updateSchema.js
@@ -4,6 +4,7 @@ const chalk = require('chalk');
 const GraphQLGenerator = require('@domain-schema/graphql').default;
 const { pascalize, camelize } = require('humps');
 const { generateField } = require('../helpers/util');
+const schemas = require('../../../packages/server/src/modules/common/generatedSchemas');
 
 /**
  *
@@ -22,8 +23,7 @@ function updateSchema(logger, module) {
 
   if (fs.existsSync(modulePath)) {
     // get module schema
-    // eslint-disable-next-line import/no-dynamic-require
-    const schema = require(`${modulePath}/schema`)[`${Module}Schema`];
+    const schema = schemas.default[`${Module}Schema`];
 
     // get schema file
     const pathSchema = `${startPath}/packages/server/src/modules/${module}/`;

From 0672d7914278c8a48fcc2c36470ff4a80f86a1f6 Mon Sep 17 00:00:00 2001
From: oem <nepal-tda@outlook.com>
Date: Wed, 4 Jul 2018 15:07:25 +0300
Subject: [PATCH 186/327] Delete unused code

---
 tools/cli/commands/updateSchema.js | 143 +----------------------------
 1 file changed, 1 insertion(+), 142 deletions(-)

diff --git a/tools/cli/commands/updateSchema.js b/tools/cli/commands/updateSchema.js
index 938cf0c9bc..ad8d4324e7 100644
--- a/tools/cli/commands/updateSchema.js
+++ b/tools/cli/commands/updateSchema.js
@@ -61,13 +61,6 @@ function updateSchema(logger, module) {
           inputCreate += `  ${key}: ${pascalize(key)}CreateManyInput\n`;
           inputUpdate += `  ${key}: ${pascalize(key)}UpdateManyInput\n`;
 
-          /*for (const remoteKey of value.type[0].keys()) {
-            const remoteValue = value.type[0].values[remoteKey];
-            if (remoteValue.type.isSchema) {
-              moduleData += `  ${remoteKey}s: [${pascalize(remoteKey)}]\n`;
-            }
-          }*/
-
           manyInput += `
 
 input ${pascalize(key)}CreateManyInput {
@@ -103,12 +96,6 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
         )
         .to(file);
 
-      // override ModuleData in schema.graphql file
-      /*let replaceModuleData = `type ${Module}Data {([^}])*\\n}`;
-      shell
-        .ShellString(shell.cat(file).replace(RegExp(replaceModuleData, 'g'), `type ${Module}Data {\n${moduleData}}`))
-        .to(file);*/
-
       // override ModuleCreateInput in schema.graphql file
       const replaceCreate = `input ${Module}CreateInput {([^}])*\\n}`;
       shell
@@ -138,50 +125,19 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
       const resolverFile = `resolvers.js`;
       let replace = `  ${schema.name}: {
 `;
-      //moduleData = '';
       for (const key of schema.keys()) {
         const value = schema.values[key];
-        if (value.type.isSchema) {
-          /*moduleData += `    ${key}s(obj, args, ctx, info) {
-      return ctx.${value.type.name}.getList(args, info);
-    },
-`;*/
-        } else if (value.type.constructor === Array) {
+        if (value.type.constructor === Array) {
           replace += `    ${key}: createBatchResolver((sources, args, ctx, info) => {
       return ctx.${schema.name}.getByIds(sources.map(({ id }) => id), '${camelize(schema.name)}', ctx.${
             value.type[0].name
           }, info);
     }),
 `;
-          /*
-          for (const remoteKey of value.type[0].keys()) {
-            const remoteValue = value.type[0].values[remoteKey];
-            if (remoteValue.type.isSchema) {
-              moduleData += `    ${remoteKey}s(obj, args, ctx, info) {
-      return ctx.${remoteValue.type.name}.getList(args, info);
-    },
-`;
-            }
-          }*/
         }
       }
       replace += `  },
 `;
-      /*
-      if (moduleData !== '') {
-        moduleData = `${moduleData.replace(/,\s*$/, '')}
-`;
-      }
-
-      // override batch resolvers in resolvers.js file
-      replaceModuleData = `// related data([^*]+)// end related data`;
-      shell
-        .ShellString(
-          shell
-            .cat(resolverFile)
-            .replace(RegExp(replaceModuleData, 'g'), `// related data\n${moduleData}    // end related data`)
-        )
-        .to(resolverFile);*/
 
       // override batch resolvers in resolvers.js file
       const replaceBatchResolvers = `// schema batch resolvers([^*]+)// end schema batch resolvers`;
@@ -227,61 +183,6 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
     } else {
       logger.error(chalk.red(`✘ Fragment path ${pathFragment} not found!`));
     }
-    /*
-    // get module query file
-    const pathModuleQuery = `${__dirname}/../../packages/client/src/modules/${module}/graphql/`;
-    if (fs.existsSync(pathModuleQuery)) {
-      const file = `${Module}Query.graphql`;
-
-      // regenerate graphql module query
-      let graphql = '';
-      for (const key of schema.keys()) {
-        const value = schema.values[key];
-        if (value.type.isSchema) {
-          let column = 'name';
-          for (const remoteKey of value.type.keys()) {
-            const remoteValue = value.type.values[remoteKey];
-            if (remoteValue.sortBy) {
-              column = remoteKey;
-            }
-          }
-          graphql += `    ${key}s {\n`;
-          graphql += `      id\n`;
-          graphql += `      ${column}\n`;
-          graphql += `    }\n`;
-        } else if (value.type.constructor === Array) {
-          for (const remoteKey of value.type[0].keys()) {
-            const remoteValue = value.type[0].values[remoteKey];
-            if (remoteValue.type.isSchema) {
-              let remotecolumn = 'name';
-              for (const remoteKey of remoteValue.type.keys()) {
-                const remoteValue1 = remoteValue.type.values[remoteKey];
-                if (remoteValue1.sortBy) {
-                  remotecolumn = remoteKey;
-                }
-              }
-              graphql += `    ${remoteKey}s {\n`;
-              graphql += `      id\n`;
-              graphql += `      ${remotecolumn}\n`;
-              graphql += `    }\n`;
-            }
-          }
-        }
-      }
-
-      shell.cd(pathModuleQuery);
-      // override graphql module query file
-      const replaceFragment = `### form data([^()]+)### end form data`;
-      shell
-        .ShellString(
-          shell.cat(file).replace(RegExp(replaceFragment, 'g'), `### form data\n${graphql}    ### end form data`)
-        )
-        .to(file);
-
-      logger.info(chalk.green(`✔ Module query in ${pathModuleQuery}${file} successfully updated!`));
-    } else {
-      logger.error(chalk.red(`✘ Module query path ${pathModuleQuery} not found!`));
-    }*/
 
     // get state client file
     const pathStateClient = `${startPath}/packages/client/src/modules/${module}/graphql/`;
@@ -295,27 +196,6 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
         const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
         if (value.type.isSchema) {
           graphql += `    ${key}Id\n`;
-          /*} else if (value.type.constructor === Array) {
-            graphql += `  ${key} {\n`;
-            for (const remoteKey of value.type[0].keys()) {
-              const remoteValue = value.type[0].values[remoteKey];
-              if (remoteValue.type.isSchema) {
-                let remotecolumn = 'name';
-                for (const remoteKey of remoteValue.type.keys()) {
-                  const remoteValue1 = remoteValue.type.values[remoteKey];
-                  if (remoteValue1.sortBy) {
-                    remotecolumn = remoteKey;
-                  }
-                }
-                graphql += `    ${remoteKey} {\n`;
-                graphql += `      id\n`;
-                graphql += `      ${remotecolumn}\n`;
-                graphql += `    }\n`;
-              } else {
-                graphql += `    ${remoteKey}\n`;
-              }
-            }
-            graphql += `  }\n`;*/
         } else {
           if (hasTypeOf(Date)) {
             graphql += `    ${key}_lte\n`;
@@ -350,27 +230,6 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
         const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
         if (value.type.isSchema) {
           defaults += `  ${key}Id: '',\n`;
-          /*} else if (value.type.constructor === Array) {
-            graphql += `  ${key} {\n`;
-            for (const remoteKey of value.type[0].keys()) {
-              const remoteValue = value.type[0].values[remoteKey];
-              if (remoteValue.type.isSchema) {
-                let remotecolumn = 'name';
-                for (const remoteKey of remoteValue.type.keys()) {
-                  const remoteValue1 = remoteValue.type.values[remoteKey];
-                  if (remoteValue1.sortBy) {
-                    remotecolumn = remoteKey;
-                  }
-                }
-                graphql += `    ${remoteKey} {\n`;
-                graphql += `      id\n`;
-                graphql += `      ${remotecolumn}\n`;
-                graphql += `    }\n`;
-              } else {
-                graphql += `    ${remoteKey}\n`;
-              }
-            }
-            graphql += `  }\n`;*/
         } else {
           if (hasTypeOf(Date)) {
             defaults += `  ${key}_lte: '',\n`;

From 78ffc6039383d50f295a932489d369333e0fa268 Mon Sep 17 00:00:00 2001
From: oem <nepal-tda@outlook.com>
Date: Wed, 4 Jul 2018 15:13:29 +0300
Subject: [PATCH 187/327] Order dependencies

---
 tools/cli/commands/updateSchema.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/cli/commands/updateSchema.js b/tools/cli/commands/updateSchema.js
index ad8d4324e7..b4da68fa71 100644
--- a/tools/cli/commands/updateSchema.js
+++ b/tools/cli/commands/updateSchema.js
@@ -3,6 +3,7 @@ const fs = require('fs');
 const chalk = require('chalk');
 const GraphQLGenerator = require('@domain-schema/graphql').default;
 const { pascalize, camelize } = require('humps');
+
 const { generateField } = require('../helpers/util');
 const schemas = require('../../../packages/server/src/modules/common/generatedSchemas');
 
@@ -31,7 +32,6 @@ function updateSchema(logger, module) {
       const file = `schema.graphql`;
 
       // regenerate input fields
-      //let moduleData = `  node: ${Module}\n`;
       let inputCreate = '';
       let inputUpdate = '';
       let inputFilter = `  searchText: String\n`;
@@ -44,7 +44,6 @@ function updateSchema(logger, module) {
           inputCreate += `  ${key}Id: Int${required}\n`;
           inputUpdate += `  ${key}Id: Int\n`;
           inputFilter += `  ${key}Id: Int\n`;
-          //moduleData += `  ${key}s(limit: Int, orderBy: OrderByInput): [${value.type.name}]\n`;
         } else if (value.type.constructor !== Array) {
           if (key !== 'id') {
             inputCreate += `  ${key}: ${generateField(value)}\n`;

From fbac9a3149114e6afd517ca125be876bd9cd8f66 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Wed, 4 Jul 2018 15:39:00 +0300
Subject: [PATCH 188/327] Fix domainValidator on client

---
 .../src/modules/common/components/crud/FormView.web.jsx      | 5 +++--
 .../src/modules/common/components/crud/ListView.web.jsx      | 5 +++--
 packages/client/src/utils/crud.js                            | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/client/src/modules/common/components/crud/FormView.web.jsx b/packages/client/src/modules/common/components/crud/FormView.web.jsx
index 4bcdcbea4d..8043a137c2 100644
--- a/packages/client/src/modules/common/components/crud/FormView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/FormView.web.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Formik } from 'formik';
-import DomainValidation from '@domain-schema/validation';
+import DomainValidator from '@domain-schema/validation';
 
 import { onSubmit, mapFormPropsToValues } from '../../../../utils/crud';
 import { createFormFields } from '../../util';
@@ -33,11 +33,12 @@ const formItemLayout = {
 };
 
 const FormView = ({ schema, updateEntry, createEntry, title, customFields, data }) => {
+  const domainValidator = new DomainValidator();
   return (
     <Formik
       initialValues={mapFormPropsToValues({ schema, data: data ? data.node : null })}
       validate={values => {
-        let rawErrors = DomainValidation.validate(values, schema);
+        let rawErrors = domainValidator.validate(schema, values);
         return computeDomainValidationErrors(rawErrors);
       }}
       onSubmit={async values => {
diff --git a/packages/client/src/modules/common/components/crud/ListView.web.jsx b/packages/client/src/modules/common/components/crud/ListView.web.jsx
index 02c9a2a10c..8b1434ac86 100644
--- a/packages/client/src/modules/common/components/crud/ListView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/ListView.web.jsx
@@ -1,7 +1,7 @@
 /* eslint-disable react/display-name */
 import React from 'react';
 import PropTypes from 'prop-types';
-import DomainValidation from '@domain-schema/validation';
+import DomainValidator from '@domain-schema/validation';
 import { Link } from 'react-router-dom';
 import { Formik } from 'formik';
 import { DragDropContext, DragSource, DropTarget } from 'react-dnd';
@@ -313,6 +313,7 @@ class ListView extends React.Component {
     };
 
     const footer = () => {
+      const domainValidator = new DomainValidator();
       return (
         <Row>
           <Col span={2}>
@@ -341,7 +342,7 @@ class ListView extends React.Component {
               <Formik
                 initialValues={mapFormPropsToValues({ schema })}
                 validate={values => {
-                  let rawErrors = DomainValidation.validate(values, schema);
+                  let rawErrors = domainValidator.validate(schema, values);
                   return computeDomainValidationErrors(rawErrors);
                 }}
                 onSubmit={async (values, { resetForm }) => {
diff --git a/packages/client/src/utils/crud.js b/packages/client/src/utils/crud.js
index c3a15c5903..1704ad09ff 100644
--- a/packages/client/src/utils/crud.js
+++ b/packages/client/src/utils/crud.js
@@ -36,7 +36,7 @@ export const mapFormPropsToValues = ({ schema, data = null, formType = 'form' })
         fields[key] = data ? data[key] : [];
       }
     } else {
-      if (key !== 'id' && value.show !== false && value.type.constructor !== Array) {
+      if (value.show !== false && value.type.constructor !== Array) {
         fields[key] = data ? data[key] : '';
       } else if (value.type.constructor === Array) {
         fields[key] = data ? data[key] : [];

From 240cfdaf8f1321956000095acc3af3eec48d1cec Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Wed, 4 Jul 2018 15:54:57 +0300
Subject: [PATCH 189/327] Place constructor after propTypes in Datepickers

---
 .../components/DatePickerAndroid.jsx               | 10 +++++-----
 .../ui-native-base/components/DatePickerIOS.jsx    | 14 +++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/client/src/modules/common/components/native/ui-native-base/components/DatePickerAndroid.jsx b/packages/client/src/modules/common/components/native/ui-native-base/components/DatePickerAndroid.jsx
index b6e5f93b9f..410d857989 100644
--- a/packages/client/src/modules/common/components/native/ui-native-base/components/DatePickerAndroid.jsx
+++ b/packages/client/src/modules/common/components/native/ui-native-base/components/DatePickerAndroid.jsx
@@ -4,11 +4,6 @@ import { View, TouchableOpacity, StyleSheet, DatePickerAndroid as DatePickerAndr
 import DatePickerStyles from '../styles/DatePicker';
 
 class DatePickerAndroid extends React.Component {
-  constructor() {
-    super();
-    this.openDatePicker = this.openDatePicker.bind(this);
-  }
-
   static propTypes = {
     onChange: PropTypes.func,
     value: PropTypes.string,
@@ -16,6 +11,11 @@ class DatePickerAndroid extends React.Component {
     placeholder: PropTypes.string
   };
 
+  constructor() {
+    super();
+    this.openDatePicker = this.openDatePicker.bind(this);
+  }
+
   async openDatePicker() {
     try {
       const datepickerResult = await DatePickerAndroidNative.open({
diff --git a/packages/client/src/modules/common/components/native/ui-native-base/components/DatePickerIOS.jsx b/packages/client/src/modules/common/components/native/ui-native-base/components/DatePickerIOS.jsx
index 9eaa518b90..f323f78faf 100644
--- a/packages/client/src/modules/common/components/native/ui-native-base/components/DatePickerIOS.jsx
+++ b/packages/client/src/modules/common/components/native/ui-native-base/components/DatePickerIOS.jsx
@@ -4,6 +4,13 @@ import { View, TouchableOpacity, StyleSheet, DatePickerIOS as DatePickerIOSNativ
 import DatePickerStyles from '../styles/DatePicker';
 
 class DatePickerIOS extends React.Component {
+  static propTypes = {
+    onChange: PropTypes.func,
+    value: PropTypes.string,
+    style: PropTypes.object,
+    placeholder: PropTypes.string
+  };
+
   constructor() {
     super();
     this.setDate = this.setDate.bind(this);
@@ -13,13 +20,6 @@ class DatePickerIOS extends React.Component {
     };
   }
 
-  static propTypes = {
-    onChange: PropTypes.func,
-    value: PropTypes.string,
-    style: PropTypes.object,
-    placeholder: PropTypes.string
-  };
-
   setDate(newDate) {
     if (!(newDate instanceof Date)) {
       return false;

From 689d137d9dd4071285531acfeb9c28a4241b248f Mon Sep 17 00:00:00 2001
From: oem <nepal-tda@outlook.com>
Date: Wed, 4 Jul 2018 16:00:40 +0300
Subject: [PATCH 190/327] Add generetedSchemas file

---
 packages/server/src/modules/common/generatedSchemas.js | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 packages/server/src/modules/common/generatedSchemas.js

diff --git a/packages/server/src/modules/common/generatedSchemas.js b/packages/server/src/modules/common/generatedSchemas.js
new file mode 100644
index 0000000000..ff8b4c5632
--- /dev/null
+++ b/packages/server/src/modules/common/generatedSchemas.js
@@ -0,0 +1 @@
+export default {};

From 25f2dd88a361f203ccc296f9841dc88c3f711a57 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 5 Jul 2018 16:16:12 +0200
Subject: [PATCH 191/327] fix pagination - wip

---
 .../common/components/crud/ListView.web.jsx   | 33 ++++++++++++-------
 packages/server/src/sql/crud.js               | 13 ++++----
 .../crud/client/containers/ModuleList.jsx     | 14 +++++---
 3 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/packages/client/src/modules/common/components/crud/ListView.web.jsx b/packages/client/src/modules/common/components/crud/ListView.web.jsx
index 8b1434ac86..04383bbb67 100644
--- a/packages/client/src/modules/common/components/crud/ListView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/ListView.web.jsx
@@ -6,7 +6,7 @@ import { Link } from 'react-router-dom';
 import { Formik } from 'formik';
 import { DragDropContext, DragSource, DropTarget } from 'react-dnd';
 import HTML5Backend from 'react-dnd-html5-backend';
-import { Table, Button, Popconfirm, Row, Col, Form, FormItem, Alert, Spin } from '../web';
+import { Table, Button, Popconfirm, Row, Col, Form, FormItem, Alert, Spin, Pagination } from '../web';
 import { createColumnFields, createFormFields } from '../../util';
 import { mapFormPropsToValues, pickInputFields } from '../../../../utils/crud';
 import { hasRole } from '../../../user/containers/Auth';
@@ -110,7 +110,7 @@ class ListView extends React.Component {
     onOrderBy: PropTypes.func.isRequired,
     deleteManyEntries: PropTypes.func.isRequired,
     updateManyEntries: PropTypes.func.isRequired,
-    loadMoreRows: PropTypes.func.isRequired,
+    loadData: PropTypes.func.isRequired,
     schema: PropTypes.object.isRequired,
     link: PropTypes.string.isRequired,
     customColumnFields: PropTypes.object,
@@ -174,13 +174,17 @@ class ListView extends React.Component {
     sortEntries([dragRow.id, dragReplace.id, dragReplace.rank, dragRow.rank]);
   };
 
-  renderLoadMore = (data, loadMoreRows) => {
-    if (data.pageInfo.hasNextPage) {
-      return (
-        <Button id="load-more" color="primary" onClick={loadMoreRows}>
-          Load more ...
-        </Button>
-      );
+  handlePageChange = (pagination, pageNumber) => {
+    const {
+      data: {
+        pageInfo: { endCursor }
+      },
+      loadData
+    } = this.props;
+    if (pagination === 'relay') {
+      loadData(endCursor + 1, 'add');
+    } else {
+      loadData((pageNumber - 1) * 10, 'replace');
     }
   };
 
@@ -264,7 +268,6 @@ class ListView extends React.Component {
     const {
       loading,
       data,
-      loadMoreRows,
       schema,
       link,
       currentUser,
@@ -434,7 +437,15 @@ class ListView extends React.Component {
         {error && <Alert color="error" message={error} />}
         {success && <Alert color="success" message={success} />}
         <Table {...tableProps} />
-        {data && this.renderLoadMore(data, loadMoreRows)}
+        <Pagination
+          itemsPerPage={data.edges.length}
+          handlePageChange={this.handlePageChange}
+          hasNextPage={data.pageInfo.hasNextPage}
+          pagination={'relay'}
+          total={data.totalCount}
+          loadMoreText={'Load more ...'}
+          defaultPageSize={10}
+        />
       </div>
     );
   }
diff --git a/packages/server/src/sql/crud.js b/packages/server/src/sql/crud.js
index e4053eca19..20aa44c762 100644
--- a/packages/server/src/sql/crud.js
+++ b/packages/server/src/sql/crud.js
@@ -543,15 +543,16 @@ export default class Crud {
 
   async getPaginated(args, info) {
     const edges = await this._getList(args, parseFields(info).edges);
-    const { count } = await this.getTotal();
+    const { totalCount } = await this.getTotal();
+    const hasNextPage = totalCount > args.offset + args.limit;
     //console.log('getPaginated, edges:', edges);
     //console.log('getPaginated, count:', edges);
 
     return {
       edges,
       pageInfo: {
-        totalCount: count,
-        hasNextPage: edges && edges.length === args.limit
+        totalCount,
+        hasNextPage
       }
     };
   }
@@ -562,7 +563,7 @@ export default class Crud {
 
   getTotal() {
     return knex(`${this.getFullTableName()}`)
-      .countDistinct('id as count')
+      .countDistinct('id as totalCount')
       .first();
   }
 
@@ -618,8 +619,8 @@ export default class Crud {
           nestedEntries.push({ key, data: data[key] });
           delete data[key];
         } else if (key === 'rank') {
-          const total = await this.getTotal();
-          data[key] = total.count + 1;
+          const { totalCount } = await this.getTotal();
+          data[key] = totalCount + 1;
         }
       }
 
diff --git a/tools/templates/crud/client/containers/ModuleList.jsx b/tools/templates/crud/client/containers/ModuleList.jsx
index 6d1b4d0d8d..6d75e3585b 100644
--- a/tools/templates/crud/client/containers/ModuleList.jsx
+++ b/tools/templates/crud/client/containers/ModuleList.jsx
@@ -31,22 +31,26 @@ export default compose(
     options: ({ limit, orderBy, filter }) => {
       return {
         fetchPolicy: 'cache-and-network',
-        variables: { limit, orderBy, filter: removeEmpty(filter) }
+        variables: { limit, offset: 0, orderBy, filter: removeEmpty(filter) }
       };
     },
     props: ({ data: { loading, $module$sConnection, refetch, error, fetchMore } }) => {
-      const loadMoreRows = () => {
+      const loadData = (offset, dataDelivery) => {
         return fetchMore({
           variables: {
-            offset: $module$sConnection.edges.length
+            offset
           },
           updateQuery: (previousResult, { fetchMoreResult }) => {
+            const totalCount = fetchMoreResult.$module$sConnection.totalCount;
             const newEdges = fetchMoreResult.$module$sConnection.edges;
             const pageInfo = fetchMoreResult.$module$sConnection.pageInfo;
+            const displayedEdges =
+              dataDelivery === 'add' ? [...previousResult.$module$sConnection.edges, ...newEdges] : newEdges;
 
             return {
               $module$sConnection: {
-                edges: [...previousResult.$module$sConnection.edges, ...newEdges],
+                totalCount,
+                edges: displayedEdges,
                 pageInfo,
                 __typename: '$Module$sConnection'
               }
@@ -55,7 +59,7 @@ export default compose(
         });
       };
       if (error) throw new Error(error);
-      return { loading, data: $module$sConnection, loadMoreRows, refetch, errors: error ? error.graphQLErrors : null };
+      return { loading, data: $module$sConnection, loadData, refetch, errors: error ? error.graphQLErrors : null };
     }
   }),
   graphql(UPDATE_$MODULE$, {

From 306c59503e1203f47879a361af945771e78f388e Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Thu, 5 Jul 2018 11:08:21 +0300
Subject: [PATCH 192/327] Add validate function for mobile formik component

---
 .../modules/common/components/crud/FormView.jsx    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/client/src/modules/common/components/crud/FormView.jsx b/packages/client/src/modules/common/components/crud/FormView.jsx
index ee525f6258..86305e8d71 100644
--- a/packages/client/src/modules/common/components/crud/FormView.jsx
+++ b/packages/client/src/modules/common/components/crud/FormView.jsx
@@ -1,22 +1,22 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Formik } from 'formik';
+import DomainValidator from '@domain-schema/validation';
 
 import { onSubmit, mapFormPropsToValues } from '../../../../utils/crud';
 import { createFormFields } from '../../util';
 import { FormView, Button } from '../native';
-//import { minLength, required, validateForm } from '../../../../../../common/validation';
-
-//const formSchema = {
-//  name: [required, minLength(3)]
-//};
-
-//const validate = values => validateForm(values, formSchema);
+import { computeDomainValidationErrors } from '../../../../../../common/validation';
 
 const Form = ({ schema, data: { node }, updateEntry, createEntry }) => {
+  const domainValidator = new DomainValidator();
   return (
     <Formik
       initialValues={mapFormPropsToValues({ schema, data: node })}
+      validate={values => {
+        let rawErrors = domainValidator.validate(schema, values);
+        return computeDomainValidationErrors(rawErrors);
+      }}
       onSubmit={async values => {
         let title = node && node.__typename ? node.__typename : 'Model',
           data = node || null;

From 28a5228a9bde5b78c3f0be15e015669bd6ab6057 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Thu, 5 Jul 2018 17:05:02 +0300
Subject: [PATCH 193/327] Add validation of domain-schema for mobile and add
 error displaying for mobile

---
 .../common/components/crud/FormView.jsx       |  4 +-
 .../common/components/native/RenderField.jsx  |  4 +-
 .../components/RenderSelectQuery.jsx          | 37 ++++++++++++++-----
 .../ui-native-base/components/Select.jsx      |  8 ++--
 packages/client/src/modules/common/util.jsx   | 15 +++++++-
 packages/common/validation.js                 | 17 ++++++++-
 6 files changed, 66 insertions(+), 19 deletions(-)

diff --git a/packages/client/src/modules/common/components/crud/FormView.jsx b/packages/client/src/modules/common/components/crud/FormView.jsx
index 86305e8d71..9d24f306ee 100644
--- a/packages/client/src/modules/common/components/crud/FormView.jsx
+++ b/packages/client/src/modules/common/components/crud/FormView.jsx
@@ -23,9 +23,9 @@ const Form = ({ schema, data: { node }, updateEntry, createEntry }) => {
 
         await onSubmit({ schema, values, updateEntry, createEntry, title, data });
       }}
-      render={({ handleSubmit, values, setFieldValue }) => (
+      render={({ handleSubmit, values, setFieldValue, setFieldTouched }) => (
         <FormView>
-          {createFormFields(schema, values, setFieldValue)}
+          {createFormFields(schema, values, setFieldValue, setFieldTouched)}
           <Button onPress={handleSubmit}>Save</Button>
         </FormView>
       )}
diff --git a/packages/client/src/modules/common/components/native/RenderField.jsx b/packages/client/src/modules/common/components/native/RenderField.jsx
index d702d44df3..3124d2372f 100644
--- a/packages/client/src/modules/common/components/native/RenderField.jsx
+++ b/packages/client/src/modules/common/components/native/RenderField.jsx
@@ -23,7 +23,9 @@ RenderField.propTypes = {
   input: PropTypes.object,
   label: PropTypes.string,
   type: PropTypes.string,
-  meta: PropTypes.object
+  meta: PropTypes.object,
+  touched: PropTypes.any,
+  error: PropTypes.string
 };
 
 export default RenderField;
diff --git a/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSelectQuery.jsx b/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSelectQuery.jsx
index a74a060558..2dfed01b16 100644
--- a/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSelectQuery.jsx
@@ -1,21 +1,23 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { pascalize } from 'humps';
-import { View } from 'react-native';
+import { View, Text, StyleSheet } from 'react-native';
 import { RenderSelect } from './index';
 import schemaQueries from '../../../../generatedContainers';
+import InputItemStyles from '../styles/InputItem';
 
-const handleSelect = (selectedValue, edges, onChangeValue) => {
+const handleSelect = (selectedValue, edges, onChange) => {
   let selectedItem = edges && Array.isArray(edges) ? edges.find(item => item.value == selectedValue) : '';
-  onChangeValue(selectedItem ? { id: selectedItem.value } : '');
+  onChange(selectedItem ? selectedItem : '');
 };
 
 const RenderSelectQuery = ({
   input: { name },
+  meta: { error },
   label,
   schema,
   customStyles,
-  onChange: onChangeValue,
+  onChange,
   value,
   ...props
 }) => {
@@ -40,6 +42,7 @@ const RenderSelectQuery = ({
       alignItems: 'center'
     }
   };
+
   if (customStyles) {
     defaultStyle = customStyles;
   }
@@ -51,22 +54,32 @@ const RenderSelectQuery = ({
           let computedData = null;
           if (Array.isArray(data.edges) && data.edges.length > 0) {
             computedData = data.edges.map(item => {
-              return { label: item.name, value: item.id };
+              return { ...item, label: item.name, value: item.id };
             });
-            if (!value) {
+            if (formatedValue) {
               computedData.push(defaultOption);
             }
           }
 
           let computedProps = {
+            ...props,
             renderSelectStyles: defaultStyle,
             value: formatedValue,
             data: computedData,
             name,
-            onChange: selectedValue => handleSelect(selectedValue, computedData, onChangeValue),
-            ...props
+            error,
+            onChange: selectedValue => handleSelect(selectedValue, computedData, onChange)
           };
-          return <RenderSelect {...computedProps} />;
+          return (
+            <View>
+              <RenderSelect {...computedProps} />
+              {!!error && (
+                <View>
+                  <Text style={styles.errorText}>{error}</Text>
+                </View>
+              )}
+            </View>
+          );
         } else {
           return <View />;
         }
@@ -75,6 +88,8 @@ const RenderSelectQuery = ({
   );
 };
 
+const styles = StyleSheet.create(InputItemStyles);
+
 RenderSelectQuery.propTypes = {
   input: PropTypes.object,
   label: PropTypes.string,
@@ -82,7 +97,9 @@ RenderSelectQuery.propTypes = {
   customStyles: PropTypes.object,
   formType: PropTypes.string,
   onChange: PropTypes.any,
-  value: PropTypes.any
+  value: PropTypes.any,
+  meta: PropTypes.object,
+  error: PropTypes.string
 };
 
 export default RenderSelectQuery;
diff --git a/packages/client/src/modules/common/components/native/ui-native-base/components/Select.jsx b/packages/client/src/modules/common/components/native/ui-native-base/components/Select.jsx
index c41fa01e48..13dd85b1e1 100644
--- a/packages/client/src/modules/common/components/native/ui-native-base/components/Select.jsx
+++ b/packages/client/src/modules/common/components/native/ui-native-base/components/Select.jsx
@@ -18,10 +18,11 @@ const Select = ({
   style,
   itemStyle,
   placeholder = '...',
+  error,
   ...props
 }) => {
   return Platform.OS === 'ios' ? (
-    <Item style={styles.selectItemIos}>
+    <Item style={styles.selectItemIos} error={!!error}>
       {icon && (
         <FontAwesome name={iconName || 'filter'} size={iconSize || 20} style={{ color: `${iconColor || '#000'}` }} />
       )}
@@ -38,7 +39,7 @@ const Select = ({
       </Picker>
     </Item>
   ) : (
-    <Item style={styles.selectItemAndroid}>
+    <Item style={styles.selectItemAndroid} error={!!error}>
       <Picker
         style={[styles.androidPickerWrapper, style]}
         onValueChange={onValueChange || onChange}
@@ -65,7 +66,8 @@ Select.propTypes = {
   iconColor: PropTypes.string,
   iconSize: PropTypes.number,
   style: PropTypes.oneOfType([PropTypes.object, PropTypes.number]),
-  itemStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.number])
+  itemStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.number]),
+  error: PropTypes.string
 };
 
 const styles = StyleSheet.create(SelectStyles);
diff --git a/packages/client/src/modules/common/util.jsx b/packages/client/src/modules/common/util.jsx
index 4717bdeebf..11a4da24fb 100644
--- a/packages/client/src/modules/common/util.jsx
+++ b/packages/client/src/modules/common/util.jsx
@@ -3,7 +3,7 @@ import { pick, capitalize, startCase } from 'lodash';
 import Field from '../../utils/FieldAdapter';
 import { RenderField, RenderSwitch, RenderSelectQuery, RenderDatePicker } from './components/native';
 
-export const createFormFields = (schema, values, setFieldValue) => {
+export const createFormFields = (schema, values, setFieldValue, setFieldTouched) => {
   let fields = [];
   for (const key of schema.keys()) {
     const value = schema.values[key];
@@ -32,7 +32,10 @@ export const createFormFields = (schema, values, setFieldValue) => {
           value={values[key]}
           component={RenderSelectQuery}
           placeholder={startCase(key)}
-          onChange={selectedValue => setFieldValue(key, selectedValue)}
+          onChange={selectedValue => {
+            setFieldValue(key, selectedValue);
+            setFieldTouched(key, true);
+          }}
         />
       );
     } else if (hasTypeOf(String)) {
@@ -44,6 +47,10 @@ export const createFormFields = (schema, values, setFieldValue) => {
           component={RenderField}
           type="text"
           style={inputStyle}
+          onChange={selectedValue => {
+            setFieldValue(key, selectedValue);
+            setFieldTouched(key, true);
+          }}
           placeholder={startCase(key)}
         />
       );
@@ -57,6 +64,10 @@ export const createFormFields = (schema, values, setFieldValue) => {
           type="number"
           component={RenderField}
           style={inputStyle}
+          onChange={selectedValue => {
+            setFieldValue(key, selectedValue);
+            setFieldTouched(key, true);
+          }}
           placeholder={startCase(key)}
         />
       );
diff --git a/packages/common/validation.js b/packages/common/validation.js
index d1c2cc16a1..e63734b747 100644
--- a/packages/common/validation.js
+++ b/packages/common/validation.js
@@ -1,3 +1,4 @@
+import { startCase } from 'lodash';
 // Validations
 
 // Non empty validation
@@ -62,7 +63,18 @@ export const computeDomainValidationErrors = rawErrors => {
   let computedErrors = {};
   for (let errorField in rawErrors) {
     if (rawErrors.hasOwnProperty(errorField) && rawErrors[errorField] === Object(rawErrors[errorField])) {
-      computedErrors[errorField] = 'Required';
+      computedErrors[errorField] = 'Required ';
+      let nestedErrors = [];
+      nestedErrors.push(startCase(errorField));
+      for (let nestedErrorField in rawErrors[errorField]) {
+        if (
+          rawErrors[errorField].hasOwnProperty(nestedErrorField) &&
+          rawErrors[errorField][nestedErrorField] === Object(rawErrors[errorField][nestedErrorField])
+        ) {
+          nestedErrors.push(startCase(nestedErrorField));
+        }
+      }
+      computedErrors[errorField] += nestedErrors.join(', ');
     } else {
       if (Array.isArray(rawErrors[errorField]) && rawErrors[errorField].length > 0) {
         computedErrors[errorField] = rawErrors[errorField][0];
@@ -71,5 +83,8 @@ export const computeDomainValidationErrors = rawErrors => {
       }
     }
   }
+  if (computedErrors.id) {
+    delete computedErrors.id;
+  }
   return computedErrors;
 };

From 36ea7905c304767f43a44db78bd50ba8aea3d618 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Thu, 5 Jul 2018 17:41:43 +0300
Subject: [PATCH 194/327] Comment validate in native formik to wait for
 domain-schema/validation fresh version

---
 .../src/modules/common/components/crud/FormView.jsx    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/client/src/modules/common/components/crud/FormView.jsx b/packages/client/src/modules/common/components/crud/FormView.jsx
index 9d24f306ee..92a9dc0123 100644
--- a/packages/client/src/modules/common/components/crud/FormView.jsx
+++ b/packages/client/src/modules/common/components/crud/FormView.jsx
@@ -1,22 +1,22 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Formik } from 'formik';
-import DomainValidator from '@domain-schema/validation';
+//import DomainValidator from '@domain-schema/validation';
 
 import { onSubmit, mapFormPropsToValues } from '../../../../utils/crud';
 import { createFormFields } from '../../util';
 import { FormView, Button } from '../native';
-import { computeDomainValidationErrors } from '../../../../../../common/validation';
+//import { computeDomainValidationErrors } from '../../../../../../common/validation';
 
 const Form = ({ schema, data: { node }, updateEntry, createEntry }) => {
-  const domainValidator = new DomainValidator();
+  // const domainValidator = new DomainValidator();
   return (
     <Formik
       initialValues={mapFormPropsToValues({ schema, data: node })}
-      validate={values => {
+      /*      validate={values => {
         let rawErrors = domainValidator.validate(schema, values);
         return computeDomainValidationErrors(rawErrors);
-      }}
+      }}*/
       onSubmit={async values => {
         let title = node && node.__typename ? node.__typename : 'Model',
           data = node || null;

From 1d611f06ca0782ebb7b55dbdd4e6c290c96584f2 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 6 Jul 2018 15:05:38 +0200
Subject: [PATCH 195/327] Revert "fix pagination - wip"

This reverts commit 25f2dd88a361f203ccc296f9841dc88c3f711a57.
---
 .../common/components/crud/ListView.web.jsx   | 33 +++++++------------
 packages/server/src/sql/crud.js               | 13 ++++----
 .../crud/client/containers/ModuleList.jsx     | 14 +++-----
 3 files changed, 22 insertions(+), 38 deletions(-)

diff --git a/packages/client/src/modules/common/components/crud/ListView.web.jsx b/packages/client/src/modules/common/components/crud/ListView.web.jsx
index 04383bbb67..8b1434ac86 100644
--- a/packages/client/src/modules/common/components/crud/ListView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/ListView.web.jsx
@@ -6,7 +6,7 @@ import { Link } from 'react-router-dom';
 import { Formik } from 'formik';
 import { DragDropContext, DragSource, DropTarget } from 'react-dnd';
 import HTML5Backend from 'react-dnd-html5-backend';
-import { Table, Button, Popconfirm, Row, Col, Form, FormItem, Alert, Spin, Pagination } from '../web';
+import { Table, Button, Popconfirm, Row, Col, Form, FormItem, Alert, Spin } from '../web';
 import { createColumnFields, createFormFields } from '../../util';
 import { mapFormPropsToValues, pickInputFields } from '../../../../utils/crud';
 import { hasRole } from '../../../user/containers/Auth';
@@ -110,7 +110,7 @@ class ListView extends React.Component {
     onOrderBy: PropTypes.func.isRequired,
     deleteManyEntries: PropTypes.func.isRequired,
     updateManyEntries: PropTypes.func.isRequired,
-    loadData: PropTypes.func.isRequired,
+    loadMoreRows: PropTypes.func.isRequired,
     schema: PropTypes.object.isRequired,
     link: PropTypes.string.isRequired,
     customColumnFields: PropTypes.object,
@@ -174,17 +174,13 @@ class ListView extends React.Component {
     sortEntries([dragRow.id, dragReplace.id, dragReplace.rank, dragRow.rank]);
   };
 
-  handlePageChange = (pagination, pageNumber) => {
-    const {
-      data: {
-        pageInfo: { endCursor }
-      },
-      loadData
-    } = this.props;
-    if (pagination === 'relay') {
-      loadData(endCursor + 1, 'add');
-    } else {
-      loadData((pageNumber - 1) * 10, 'replace');
+  renderLoadMore = (data, loadMoreRows) => {
+    if (data.pageInfo.hasNextPage) {
+      return (
+        <Button id="load-more" color="primary" onClick={loadMoreRows}>
+          Load more ...
+        </Button>
+      );
     }
   };
 
@@ -268,6 +264,7 @@ class ListView extends React.Component {
     const {
       loading,
       data,
+      loadMoreRows,
       schema,
       link,
       currentUser,
@@ -437,15 +434,7 @@ class ListView extends React.Component {
         {error && <Alert color="error" message={error} />}
         {success && <Alert color="success" message={success} />}
         <Table {...tableProps} />
-        <Pagination
-          itemsPerPage={data.edges.length}
-          handlePageChange={this.handlePageChange}
-          hasNextPage={data.pageInfo.hasNextPage}
-          pagination={'relay'}
-          total={data.totalCount}
-          loadMoreText={'Load more ...'}
-          defaultPageSize={10}
-        />
+        {data && this.renderLoadMore(data, loadMoreRows)}
       </div>
     );
   }
diff --git a/packages/server/src/sql/crud.js b/packages/server/src/sql/crud.js
index 20aa44c762..e4053eca19 100644
--- a/packages/server/src/sql/crud.js
+++ b/packages/server/src/sql/crud.js
@@ -543,16 +543,15 @@ export default class Crud {
 
   async getPaginated(args, info) {
     const edges = await this._getList(args, parseFields(info).edges);
-    const { totalCount } = await this.getTotal();
-    const hasNextPage = totalCount > args.offset + args.limit;
+    const { count } = await this.getTotal();
     //console.log('getPaginated, edges:', edges);
     //console.log('getPaginated, count:', edges);
 
     return {
       edges,
       pageInfo: {
-        totalCount,
-        hasNextPage
+        totalCount: count,
+        hasNextPage: edges && edges.length === args.limit
       }
     };
   }
@@ -563,7 +562,7 @@ export default class Crud {
 
   getTotal() {
     return knex(`${this.getFullTableName()}`)
-      .countDistinct('id as totalCount')
+      .countDistinct('id as count')
       .first();
   }
 
@@ -619,8 +618,8 @@ export default class Crud {
           nestedEntries.push({ key, data: data[key] });
           delete data[key];
         } else if (key === 'rank') {
-          const { totalCount } = await this.getTotal();
-          data[key] = totalCount + 1;
+          const total = await this.getTotal();
+          data[key] = total.count + 1;
         }
       }
 
diff --git a/tools/templates/crud/client/containers/ModuleList.jsx b/tools/templates/crud/client/containers/ModuleList.jsx
index 6d75e3585b..6d1b4d0d8d 100644
--- a/tools/templates/crud/client/containers/ModuleList.jsx
+++ b/tools/templates/crud/client/containers/ModuleList.jsx
@@ -31,26 +31,22 @@ export default compose(
     options: ({ limit, orderBy, filter }) => {
       return {
         fetchPolicy: 'cache-and-network',
-        variables: { limit, offset: 0, orderBy, filter: removeEmpty(filter) }
+        variables: { limit, orderBy, filter: removeEmpty(filter) }
       };
     },
     props: ({ data: { loading, $module$sConnection, refetch, error, fetchMore } }) => {
-      const loadData = (offset, dataDelivery) => {
+      const loadMoreRows = () => {
         return fetchMore({
           variables: {
-            offset
+            offset: $module$sConnection.edges.length
           },
           updateQuery: (previousResult, { fetchMoreResult }) => {
-            const totalCount = fetchMoreResult.$module$sConnection.totalCount;
             const newEdges = fetchMoreResult.$module$sConnection.edges;
             const pageInfo = fetchMoreResult.$module$sConnection.pageInfo;
-            const displayedEdges =
-              dataDelivery === 'add' ? [...previousResult.$module$sConnection.edges, ...newEdges] : newEdges;
 
             return {
               $module$sConnection: {
-                totalCount,
-                edges: displayedEdges,
+                edges: [...previousResult.$module$sConnection.edges, ...newEdges],
                 pageInfo,
                 __typename: '$Module$sConnection'
               }
@@ -59,7 +55,7 @@ export default compose(
         });
       };
       if (error) throw new Error(error);
-      return { loading, data: $module$sConnection, loadData, refetch, errors: error ? error.graphQLErrors : null };
+      return { loading, data: $module$sConnection, loadMoreRows, refetch, errors: error ? error.graphQLErrors : null };
     }
   }),
   graphql(UPDATE_$MODULE$, {

From 192d0018d6518f385e20df8eb740c8d8041c64a6 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Fri, 6 Jul 2018 16:02:55 +0300
Subject: [PATCH 196/327] Updated version apollo-client for common, deleted
 polyfill

---
 packages/common/createApolloClient.js |  7 -------
 packages/common/package.json          |  2 +-
 yarn.lock                             | 24 ------------------------
 3 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/packages/common/createApolloClient.js b/packages/common/createApolloClient.js
index 8ab6ca47eb..24baba0079 100644
--- a/packages/common/createApolloClient.js
+++ b/packages/common/createApolloClient.js
@@ -34,13 +34,6 @@ const createApolloClient = ({ apiUrl, createNetLink, links, connectionParams, cl
     }
   );
 
-  Object.setPrototypeOf =
-    Object.setPrototypeOf ||
-    function(obj, proto) {
-      obj.__proto__ = proto;
-      return obj;
-    };
-
   const queryLink = createNetLink
     ? createNetLink(apiUrl)
     : new BatchHttpLink({
diff --git a/packages/common/package.json b/packages/common/package.json
index cad3e148c0..ac4c02e8e0 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "apollo-cache-inmemory": "^1.1.12",
     "apollo-cache-router": "^1.1.0",
-    "apollo-client": "^2.3.1",
+    "apollo-client": "^2.3.4",
     "apollo-link": "^1.0.6",
     "apollo-link-batch-http": "1.2.2",
     "apollo-link-state": "^0.4.1",
diff --git a/yarn.lock b/yarn.lock
index bdcad535ac..6ba0f7700b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1292,26 +1292,6 @@ apollo-cache@^1.1.7:
   dependencies:
     apollo-utilities "^1.0.11"
 
-apollo-cache@^1.1.8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.1.8.tgz#b078d33dec876d52b5a81a325d3c254d4e362d3c"
-  dependencies:
-    apollo-utilities "^1.0.12"
-
-apollo-client@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.3.1.tgz#64b204779b7e8b21f901529527a9a9c973eb7fd4"
-  dependencies:
-    "@types/zen-observable" "^0.5.3"
-    apollo-cache "^1.1.8"
-    apollo-link "^1.0.0"
-    apollo-link-dedup "^1.0.0"
-    apollo-utilities "^1.0.12"
-    symbol-observable "^1.0.2"
-    zen-observable "^0.8.0"
-  optionalDependencies:
-    "@types/async" "2.0.49"
-
 apollo-client@^2.3.4:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.3.4.tgz#308fbfa95423f9bde6827376d9a85802fe93e28d"
@@ -1463,10 +1443,6 @@ apollo-utilities@^1.0.0, apollo-utilities@^1.0.1, apollo-utilities@^1.0.11, apol
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.0.11.tgz#cd36bfa6e5c04eea2caf0c204a0f38a0ad550802"
 
-apollo-utilities@^1.0.12:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.0.12.tgz#9e2b2a34cf89f3bf0d73a664effd8c1bb5d1b7f7"
-
 apollo-utilities@^1.0.15:
   version "1.0.15"
   resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.0.15.tgz#8f1ba6e4ed9b92cb0de2ce7c032315a768860aae"

From 98e2e1322cbfa0a2317abd2e5306dbda9c509d9d Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Fri, 6 Jul 2018 16:04:21 +0300
Subject: [PATCH 197/327] Update domain-schema/validation version

---
 packages/client/package.json | 2 +-
 packages/server/package.json | 2 +-
 yarn.lock                    | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index 4a36fc009c..cc15e6a066 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -38,7 +38,7 @@
   "license": "MIT",
   "dependencies": {
     "@domain-schema/core": "^0.0.34",
-    "@domain-schema/validation": "^0.0.34",
+    "@domain-schema/validation": "^0.0.35",
     "@fortawesome/fontawesome": "^1.1.8",
     "@fortawesome/fontawesome-free-brands": "^5.0.6",
     "@fortawesome/fontawesome-free-webfonts": "^1.0.9",
diff --git a/packages/server/package.json b/packages/server/package.json
index 5929fe7b90..f856809351 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -43,7 +43,7 @@
     "@domain-schema/formik": "^0.0.33",
     "@domain-schema/graphql": "^0.0.33",
     "@domain-schema/knex": "^0.0.35",
-    "@domain-schema/validation": "^0.0.34",
+    "@domain-schema/validation": "^0.0.35",
     "apollo-cache-inmemory": "^1.1.12",
     "apollo-cache-router": "^1.1.0",
     "apollo-client": "^2.3.4",
diff --git a/yarn.lock b/yarn.lock
index 6ba0f7700b..2908fec746 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -577,9 +577,9 @@
     debug "^3.1.0"
     humps "^2.0.1"
 
-"@domain-schema/validation@^0.0.34":
-  version "0.0.34"
-  resolved "https://registry.yarnpkg.com/@domain-schema/validation/-/validation-0.0.34.tgz#f10f4b810911c989490d269df315296bdbe0cfc2"
+"@domain-schema/validation@^0.0.35":
+  version "0.0.35"
+  resolved "https://registry.yarnpkg.com/@domain-schema/validation/-/validation-0.0.35.tgz#a636c046784a2703304eab88c237d504340deac1"
   dependencies:
     debug "^3.1.0"
     humps "^2.0.1"

From eda8cb202c9d5f8364b6b33fb579df3b9e4c2d93 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Fri, 6 Jul 2018 17:40:57 +0300
Subject: [PATCH 198/327] Add errors displaying for bootstrap fields, fix
 bootsrap datepicker

---
 .../ui-bootstrap/components/RenderDate.jsx    |  7 ++++++-
 .../ui-bootstrap/components/RenderNumber.jsx  | 19 ++++++++++++++-----
 .../components/RenderSelectQuery.jsx          | 16 +++++++++++++---
 .../components/RenderTextArea.jsx             | 11 ++++++-----
 .../client/src/modules/common/util.web.jsx    |  4 ++--
 5 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderDate.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderDate.jsx
index b37ed487c9..35d85a4bcc 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderDate.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderDate.jsx
@@ -21,7 +21,12 @@ export default class RenderDate extends React.Component {
       input: { name },
       setFieldValue
     } = this.props;
-    setFieldValue(name, moment(date).format(dateFormat));
+
+    let computedDate = moment(date);
+    if (computedDate.isValid()) {
+      return setFieldValue(name, computedDate.format(dateFormat));
+    }
+    setFieldValue(name, moment().format(dateFormat));
   };
 
   handleBlur = () => {
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderNumber.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderNumber.jsx
index 36e92440cc..8e673b059a 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderNumber.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderNumber.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-
+import { FormFeedback } from 'reactstrap';
 import { FormItem, InputNumber } from './index';
 
 export default class RenderNumber extends React.Component {
@@ -9,6 +9,7 @@ export default class RenderNumber extends React.Component {
     setFieldValue: PropTypes.func.isRequired,
     setFieldTouched: PropTypes.func.isRequired,
     label: PropTypes.string,
+    placeholder: PropTypes.string,
     type: PropTypes.string,
     formItemLayout: PropTypes.object,
     hasTypeOf: PropTypes.func.isRequired,
@@ -36,18 +37,26 @@ export default class RenderNumber extends React.Component {
       input: { onChange, onBlur, ...inputRest },
       label,
       formItemLayout,
+      placeholder,
       meta: { touched, error }
     } = this.props;
 
-    let validateStatus = '';
+    let valid = true;
     if (touched && error) {
-      validateStatus = 'error';
+      valid = false;
     }
 
     return (
-      <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
+      <FormItem label={label} {...formItemLayout}>
         <div>
-          <InputNumber {...inputRest} placeholder={label} onChange={this.handleChange} onBlur={this.handleBlur} />
+          <InputNumber
+            {...inputRest}
+            placeholder={label || placeholder}
+            onChange={this.handleChange}
+            onBlur={this.handleBlur}
+            invalid={!valid}
+          />
+          {touched && (error && <FormFeedback>{error}</FormFeedback>)}
         </div>
       </FormItem>
     );
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx
index 1ae1f3c869..11ba02128b 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { pascalize } from 'humps';
+import { FormFeedback } from 'reactstrap';
 import { FormItem, Select } from './index';
 import schemaQueries from '../../../../generatedContainers';
 
@@ -85,6 +86,11 @@ export default class RenderSelectQuery extends React.Component {
       defaultStyle = style;
     }
 
+    let valid = true;
+    if (touched && error) {
+      valid = false;
+    }
+
     return (
       <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={error}>
         <div>
@@ -111,12 +117,16 @@ export default class RenderSelectQuery extends React.Component {
                   value: formatedValue,
                   onChange: e => this.handleChange(e, data.edges ? data.edges : null),
                   onBlur: this.handleBlur,
+                  invalid: !valid,
                   ...inputRest
                 };
                 return (
-                  <Select type="select" {...props}>
-                    {options}
-                  </Select>
+                  <div>
+                    <Select type="select" {...props}>
+                      {options}
+                    </Select>
+                    {error && (error && <FormFeedback>{error}</FormFeedback>)}
+                  </div>
                 );
               } else {
                 return <div>Loading...</div>;
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderTextArea.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderTextArea.jsx
index 81c2dd1eb9..50903b6326 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderTextArea.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderTextArea.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-
+import { FormFeedback } from 'reactstrap';
 import { FormItem, Input } from './index';
 
 export default class RenderTextArea extends React.Component {
@@ -21,16 +21,17 @@ export default class RenderTextArea extends React.Component {
       meta: { touched, error }
     } = this.props;
 
-    let validateStatus = '';
+    let valid = true;
     if (touched && error) {
-      validateStatus = 'error';
+      valid = false;
     }
 
     return (
-      <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
+      <FormItem label={label} {...formItemLayout}>
         <div>
-          <Input {...input} type="textarea" placeholder={label} autosize />
+          <Input {...input} type="textarea" placeholder={label} invalid={!valid} autosize />
         </div>
+        {touched && (error && <FormFeedback>{error}</FormFeedback>)}
       </FormItem>
     );
   }
diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index 88d3122022..650d2417c5 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -11,7 +11,7 @@ import { hasRole } from '../user/containers/Auth';
 import Field from '../../utils/FieldAdapter';
 import { mapFormPropsToValues } from '../../utils/crud';
 import {
-  RenderInput,
+  RenderField,
   RenderNumber,
   RenderTextArea,
   RenderSelectQuery,
@@ -271,7 +271,7 @@ export const createFormFields = ({
 };
 
 const createFormField = (key, type, values, formItemLayout, formType, hasTypeOf, prefix) => {
-  let component = RenderInput;
+  let component = RenderField;
   const value = values ? values[key] : '';
   let style = {};
   let dateFields = [];

From b379e611cf8f9f34d9a5faa4c70904b3bd01b5ea Mon Sep 17 00:00:00 2001
From: Dmytro Tverdoklib <nepal-tda@outlook.com>
Date: Tue, 3 Jul 2018 17:06:14 +0300
Subject: [PATCH 199/327] Refactor functions createGeneratedContainersFile,
 deleteModuleFromGeneratedContainersFile

---
 tools/cli/commands/deleteModule.js | 6 ------
 tools/cli/helpers/util.js          | 3 ++-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/tools/cli/commands/deleteModule.js b/tools/cli/commands/deleteModule.js
index 6481be85d2..6e07535af4 100644
--- a/tools/cli/commands/deleteModule.js
+++ b/tools/cli/commands/deleteModule.js
@@ -20,8 +20,6 @@ function deleteModule(logger, templatePath, module, location) {
   const modulePath = `${startPath}/packages/${location}/src/modules/${module}`;
   const generatedContainerFile = 'generatedContainers.js';
   const generatedContainerPath = `${startPath}/packages/${location}/src/modules/common/${generatedContainerFile}`;
-  const generatedSchemasFile = 'generatedSchemas.js';
-  const generatedSchemaPath = `${startPath}/packages/${location}/src/modules/common/${generatedSchemasFile}`;
 
   if (fs.existsSync(modulePath)) {
     // remove module directory
@@ -84,10 +82,6 @@ function deleteModule(logger, templatePath, module, location) {
     const graphqlQuery = `${Module}Query`;
     deleteFromFileWithExports(generatedContainerPath, graphqlQuery);
   }
-  if (fs.existsSync(generatedSchemaPath)) {
-    const schema = `${Module}Schema`;
-    deleteFromFileWithExports(generatedSchemaPath, schema);
-  }
 }
 
 module.exports = deleteModule;
diff --git a/tools/cli/helpers/util.js b/tools/cli/helpers/util.js
index 3eb91784d9..a84960ee7b 100644
--- a/tools/cli/helpers/util.js
+++ b/tools/cli/helpers/util.js
@@ -110,11 +110,12 @@ function updateFileWithExports({ pathToFileWithExports, exportName, importString
 function deleteFromFileWithExports(pathToFileWithExports, exportName) {
   if (fs.existsSync(pathToFileWithExports)) {
     const generatedElementData = fs.readFileSync(pathToFileWithExports);
-    const reg = `(\\n\\s\\s${exportName}(.|)|import (${exportName}|{ ${exportName} }).+;\\n+(?!ex))`;
+    const reg = `(\\n\\s\\s${exportName}(.|)|import ${exportName}.+;\\n+(?!ex))`;
     const generatedElement = generatedElementData.toString().replace(new RegExp(reg, 'g'), '');
     fs.writeFileSync(pathToFileWithExports, generatedElement);
   }
 }
+
 module.exports = {
   renameFiles,
   generateField,

From 631c5226d2fe7ad1a7cfc6e94ed71d827ffa8c6e Mon Sep 17 00:00:00 2001
From: Dmytro Tverdoklib <nepal-tda@outlook.com>
Date: Fri, 6 Jul 2018 17:55:24 +0300
Subject: [PATCH 200/327] Fix logic in the regenerateGraphqlFragment function

---
 tools/cli/commands/updateSchema.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/tools/cli/commands/updateSchema.js b/tools/cli/commands/updateSchema.js
index b4da68fa71..199453fc52 100644
--- a/tools/cli/commands/updateSchema.js
+++ b/tools/cli/commands/updateSchema.js
@@ -262,7 +262,7 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
   }
 }
 
-const regenerateGraphqlFragment = (value, key) => {
+const regenerateGraphqlFragment = (value, key, spaces = '') => {
   if (value.type.isSchema) {
     let column = 'name';
     for (const remoteKey of value.type.keys()) {
@@ -271,9 +271,18 @@ const regenerateGraphqlFragment = (value, key) => {
         column = remoteKey;
       }
     }
-    return `  ${key} {\n    id\n    ${column}\n  }\n`;
+    return `  ${key} {\n    ${spaces}id\n    ${spaces}${column}\n  ${spaces}}\n`;
   } else if (value.type.constructor === Array && value.type[0].isSchema) {
-    return regenerateGraphqlFragment(value, key) + `  }\n`;
+    let str = `  ${key} {\n`;
+    for (const remoteKey of value.type[0].keys()) {
+      const remoteValue = value.type[0].values[remoteKey];
+      if (remoteValue.type.isSchema) {
+        str += `  ${regenerateGraphqlFragment(remoteValue, remoteKey, '  ')}`;
+      } else if (remoteValue.type.constructor !== Array) {
+        str += `    ${remoteKey}\n`;
+      }
+    }
+    return str + `  }\n`;
   } else {
     return `  ${key}\n`;
   }

From 73e2a5c9a109500e6d171a55d7b2cbb56979d424 Mon Sep 17 00:00:00 2001
From: Dmytro Tverdoklib <nepal-tda@outlook.com>
Date: Thu, 12 Jul 2018 10:13:01 +0300
Subject: [PATCH 201/327] Add subscription on adding item to the crud cli
 templates

---
 .../crud/client/containers/ModuleList.jsx     | 71 ++++++++++++++++++-
 .../graphql/ModulesSubscription.graphql       | 10 +++
 tools/templates/crud/server/resolvers.js      | 21 +++++-
 tools/templates/crud/server/schema.graphql    |  9 +++
 4 files changed, 106 insertions(+), 5 deletions(-)
 create mode 100644 tools/templates/crud/client/graphql/ModulesSubscription.graphql

diff --git a/tools/templates/crud/client/containers/ModuleList.jsx b/tools/templates/crud/client/containers/ModuleList.jsx
index 6d1b4d0d8d..dea6881f4d 100644
--- a/tools/templates/crud/client/containers/ModuleList.jsx
+++ b/tools/templates/crud/client/containers/ModuleList.jsx
@@ -1,5 +1,7 @@
 import React from 'react';
 import { graphql, compose } from 'react-apollo';
+import update from 'immutability-helper';
+import PropTypes from 'prop-types';
 
 import { removeTypename, removeEmpty } from '../../../../../common/utils';
 import { ListView } from '../../common/components/crud';
@@ -14,8 +16,73 @@ import DELETE_$MODULE$ from '../graphql/Delete$Module$.graphql';
 import SORT_$MODULE$S from '../graphql/Sort$Module$s.graphql';
 import DELETEMANY_$MODULE$S from '../graphql/DeleteMany$Module$s.graphql';
 import UPDATEMANY_$MODULE$S from '../graphql/UpdateMany$Module$s.graphql';
+import $MODULE$S_SUBSCRIPTION from '../graphql/$Module$sSubscription.graphql';
+
+function Add$Module$(prev, node) {
+  return update(prev, {
+    $module$sConnection: {
+      totalCount: {
+        $set: prev.$module$sConnection.totalCount + 1
+      },
+      edges: {
+        $set: [...prev.$module$sConnection.edges, node]
+      }
+    }
+  });
+}
 
 class $Module$ extends React.Component {
+  static propTypes = {
+    subscribeToMore: PropTypes.func.isRequired
+  };
+
+  constructor(props) {
+    super(props);
+    this.subscription = null;
+  }
+
+  componentDidMount() {
+    this.init$Module$ListSubscription();
+  }
+
+  componentWillUnmount() {
+    if (this.subscription) {
+      // unsubscribe
+      this.subscription();
+      this.subscription = null;
+    }
+  }
+
+  init$Module$ListSubscription() {
+    if (!this.subscription) {
+      this.subscribeTo$Module$sList();
+    }
+  }
+
+  subscribeTo$Module$sList = () => {
+    const { subscribeToMore } = this.props;
+
+    this.subscription = subscribeToMore({
+      document: $MODULE$S_SUBSCRIPTION,
+      updateQuery: (
+        prev,
+        {
+          subscriptionData: {
+            data: {
+              $module$sUpdated: { mutation, node }
+            }
+          }
+        }
+      ) => {
+        let newResult = prev;
+
+        if (mutation === 'CREATED') {
+          newResult = Add$Module$(prev, node);
+        }
+        return newResult;
+      }
+    });
+  };
   render() {
     return <ListView {...this.props} schema={$Module$Schema} />;
   }
@@ -34,7 +101,7 @@ export default compose(
         variables: { limit, orderBy, filter: removeEmpty(filter) }
       };
     },
-    props: ({ data: { loading, $module$sConnection, refetch, error, fetchMore } }) => {
+    props: ({ data: { loading, $module$sConnection, refetch, error, fetchMore, subscribeToMore } }) => {
       const loadMoreRows = () => {
         return fetchMore({
           variables: {
@@ -55,7 +122,7 @@ export default compose(
         });
       };
       if (error) throw new Error(error);
-      return { loading, data: $module$sConnection, loadMoreRows, refetch, errors: error ? error.graphQLErrors : null };
+      return { loading, data: $module$sConnection, loadMoreRows, refetch, subscribeToMore, errors: error ? error.graphQLErrors : null };
     }
   }),
   graphql(UPDATE_$MODULE$, {
diff --git a/tools/templates/crud/client/graphql/ModulesSubscription.graphql b/tools/templates/crud/client/graphql/ModulesSubscription.graphql
new file mode 100644
index 0000000000..5aad2587ff
--- /dev/null
+++ b/tools/templates/crud/client/graphql/ModulesSubscription.graphql
@@ -0,0 +1,10 @@
+#import "./$Module$.graphql"
+
+subscription on$Module$sUpdated {
+    $module$sUpdated {
+        mutation
+        node {
+            ...$Module$Info
+        }
+    }
+}
\ No newline at end of file
diff --git a/tools/templates/crud/server/resolvers.js b/tools/templates/crud/server/resolvers.js
index 4777a0be71..8e59110484 100644
--- a/tools/templates/crud/server/resolvers.js
+++ b/tools/templates/crud/server/resolvers.js
@@ -2,6 +2,8 @@ import withAuth from 'graphql-auth';
 // eslint-disable-next-line no-unused-vars
 import { createBatchResolver } from 'graphql-resolve-batch';
 
+const $MODULE$S_SUBSCRIPTION = '$module$s_subscription';
+
 // eslint-disable-next-line no-unused-vars
 export default pubsub => ({
   Query: {
@@ -18,8 +20,17 @@ export default pubsub => ({
   // schema batch resolvers
   // end schema batch resolvers
   Mutation: {
-    create$Module$: withAuth(['editor:create'], (parent, args, ctx, info) => {
-      return ctx.$Module$.create(args, ctx, info);
+    create$Module$: withAuth(['editor:create'], async (parent, args, ctx, info) => {
+      const $module$ = await ctx.$Module$.create(args, ctx, info);
+
+      pubsub.publish($MODULE$S_SUBSCRIPTION, {
+        $module$sUpdated: {
+          mutation: 'CREATED',
+          node: $module$.node
+        }
+      });
+
+      return $module$;
     }),
     update$Module$: withAuth(['editor:update'], (parent, args, ctx, info) => {
       return ctx.$Module$.update(args, ctx, info);
@@ -37,5 +48,9 @@ export default pubsub => ({
       return ctx.$Module$.deleteMany(args);
     })
   },
-  Subscription: {}
+  Subscription: {
+    $module$sUpdated: {
+      subscribe: () => pubsub.asyncIterator($MODULE$S_SUBSCRIPTION)
+    }
+  }
 });
diff --git a/tools/templates/crud/server/schema.graphql b/tools/templates/crud/server/schema.graphql
index 053c74781b..0092024f18 100644
--- a/tools/templates/crud/server/schema.graphql
+++ b/tools/templates/crud/server/schema.graphql
@@ -53,3 +53,12 @@ extend type Mutation {
   updateMany$Module$s(data: $Module$UpdateInput!, where: $Module$WhereInput!): BatchPayload!
   deleteMany$Module$s(where: $Module$WhereInput!): BatchPayload!
 }
+
+extend type Subscription {
+  $module$sUpdated: Update$Module$Payload
+}
+
+type Update$Module$Payload {
+  mutation: String!
+  node: $Module$!
+}

From fdf593f968336580c1d0b3ec087c0ca375bc958d Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Thu, 12 Jul 2018 16:44:29 +0300
Subject: [PATCH 202/327] Refactor RenderDate component bootstrap

---
 .../web/ui-bootstrap/components/RenderDate.jsx   | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderDate.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderDate.jsx
index 35d85a4bcc..dadd4cc1b2 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderDate.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderDate.jsx
@@ -45,23 +45,13 @@ export default class RenderDate extends React.Component {
       meta: { touched, error }
     } = this.props;
 
-    let validateStatus = '';
-    if (touched && error) {
-      validateStatus = 'error';
-    }
-
-    let formatedValue = value;
-    if (value !== null && value !== undefined && value !== '') {
-      formatedValue = moment(value, dateFormat);
-    } else {
-      formatedValue = null;
-    }
+    let formattedValue = value ? moment(value, dateFormat) : moment();
 
     return (
-      <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
+      <FormItem label={label} {...formItemLayout} help={touched && error}>
         <div>
           <DatePicker
-            value={formatedValue}
+            value={formattedValue}
             dateFormat={dateFormat}
             onChange={this.handleChange}
             onBlur={this.handleBlur}

From caf91af733e0538ac4ddc55a7fd318b15f793289 Mon Sep 17 00:00:00 2001
From: Dmytro Tverdoklib <nepal-tda@outlook.com>
Date: Mon, 16 Jul 2018 10:02:47 +0300
Subject: [PATCH 203/327] Add logic for rollback migration to the deleteModule

---
 tools/cli/commands/deleteModule.js | 95 ++++++++++++++++++++++--------
 1 file changed, 71 insertions(+), 24 deletions(-)

diff --git a/tools/cli/commands/deleteModule.js b/tools/cli/commands/deleteModule.js
index 6e07535af4..957ca4cb92 100644
--- a/tools/cli/commands/deleteModule.js
+++ b/tools/cli/commands/deleteModule.js
@@ -2,8 +2,9 @@ const shell = require('shelljs');
 const fs = require('fs');
 const chalk = require('chalk');
 const { pascalize } = require('humps');
-const { deleteFromFileWithExports } = require('../helpers/util');
+const readline = require('readline');
 
+const { deleteFromFileWithExports } = require('../helpers/util');
 /**
  *
  * @param logger
@@ -11,7 +12,7 @@ const { deleteFromFileWithExports } = require('../helpers/util');
  * @param module
  * @param location
  */
-function deleteModule(logger, templatePath, module, location) {
+async function deleteModule(logger, templatePath, module, location) {
   logger.info(`Deleting ${location} files…`);
 
   // pascalize
@@ -20,8 +21,72 @@ function deleteModule(logger, templatePath, module, location) {
   const modulePath = `${startPath}/packages/${location}/src/modules/${module}`;
   const generatedContainerFile = 'generatedContainers.js';
   const generatedContainerPath = `${startPath}/packages/${location}/src/modules/common/${generatedContainerFile}`;
+  const generatedSchemasFile = 'generatedSchemas.js';
+  const generatedSchemaPath = `${startPath}/packages/${location}/src/modules/common/${generatedSchemasFile}`;
+  let userAnswer;
 
   if (fs.existsSync(modulePath)) {
+    if (location === 'server') {
+      // get list of migrations
+      const migrationNames = shell.find(`${startPath}/packages/${location}/src/database/migrations/`);
+
+      // open server directory
+      shell.cd(`${startPath}/packages/server`);
+
+      const isLastCreated = !!(migrationNames && migrationNames[migrationNames.length - 1].match(`_${Module}.js`));
+      const isExecuted = shell.exec('yarn knex-migrate list', { silent: true }).includes(`_${Module}.js`);
+
+      if (isLastCreated && isExecuted) {
+        // open server directory
+        shell.cd(`${startPath}/packages/server`);
+        // rollback migration
+        shell.exec('yarn knex-migrate down');
+        logger.info(chalk.green(`✔ Rollback migration was successfully!`));
+      } else if (isExecuted) {
+        const rl = readline.createInterface({
+          input: process.stdin,
+          output: process.stdout
+        });
+
+        const askQuestion = () => {
+          return new Promise(resolve => {
+            rl.question(`The table ${module} won't be deleted. Do you want continue y/n?\n`, answer => {
+              rl.close(answer);
+              resolve(answer);
+            });
+          });
+        };
+
+        do {
+          userAnswer = await askQuestion();
+        } while (userAnswer !== 'y' && userAnswer !== 'n');
+      }
+
+      if (userAnswer === 'n') {
+        return;
+      }
+
+      // change to database migrations directory
+      shell.cd(`${startPath}/packages/${location}/src/database/migrations`);
+      // check if any migrations files for this module existed
+      if (shell.find('.').filter(file => file.search(`_${Module}.js`) > -1).length > 0) {
+        let okMigrations = shell.rm(`*_${Module}.js`);
+        if (okMigrations) {
+          logger.info(chalk.green(`✔ Database migrations files successfully deleted!`));
+        }
+      }
+
+      // change to database seeds directory
+      shell.cd(`${startPath}/packages/${location}/src/database/seeds`);
+      // check if any seed files for this module exist
+      if (shell.find('.').filter(file => file.search(`_${Module}.js`) > -1).length > 0) {
+        let okSeeds = shell.rm(`*_${Module}.js`);
+        if (okSeeds) {
+          logger.info(chalk.green(`✔ Database seed files successfully deleted!`));
+        }
+      }
+    }
+
     // remove module directory
     shell.rm('-rf', modulePath);
 
@@ -50,28 +115,6 @@ function deleteModule(logger, templatePath, module, location) {
       .ShellString(shell.cat('index.js').replace(RegExp(re, 'g'), `Feature(${modules.toString().trim()})`))
       .to('index.js');
 
-    if (location === 'server') {
-      // change to database migrations directory
-      shell.cd(`${startPath}/packages/${location}/src/database/migrations`);
-      // check if any migrations files for this module exist
-      if (shell.find('.').filter(file => file.search(`_${Module}.js`) > -1).length > 0) {
-        let okMigrations = shell.rm(`*_${Module}.js`);
-        if (okMigrations) {
-          logger.info(chalk.green(`✔ Database migrations files successfully deleted!`));
-        }
-      }
-
-      // change to database seeds directory
-      shell.cd(`${startPath}/packages/${location}/src/database/seeds`);
-      // check if any seed files for this module exist
-      if (shell.find('.').filter(file => file.search(`_${Module}.js`) > -1).length > 0) {
-        let okSeeds = shell.rm(`*_${Module}.js`);
-        if (okSeeds) {
-          logger.info(chalk.green(`✔ Database seed files successfully deleted!`));
-        }
-      }
-    }
-
     // continue only if directory does not jet exist
     logger.info(chalk.green(`✔ Module for ${location} successfully deleted!`));
   } else {
@@ -82,6 +125,10 @@ function deleteModule(logger, templatePath, module, location) {
     const graphqlQuery = `${Module}Query`;
     deleteFromFileWithExports(generatedContainerPath, graphqlQuery);
   }
+  if (fs.existsSync(generatedSchemaPath)) {
+    const schema = `${Module}Schema`;
+    deleteFromFileWithExports(generatedSchemaPath, schema);
+  }
 }
 
 module.exports = deleteModule;

From 6109ccefc86af21c2680d409dd4f083f461e3969 Mon Sep 17 00:00:00 2001
From: Dmytro Tverdoklib <nepal-tda@outlook.com>
Date: Mon, 16 Jul 2018 10:24:44 +0300
Subject: [PATCH 204/327] Add knex-migrate dependency

---
 packages/server/package.json |  1 +
 yarn.lock                    | 47 +++++++++++++++++++++++++++++++++---
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index f856809351..579e95c91b 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -78,6 +78,7 @@
     "isomorphic-fetch": "^2.2.1",
     "jsonwebtoken": "^8.1.0",
     "knex": "^0.14.2",
+    "knex-migrate": "^1.6.1",
     "knexnest": "^0.4.1",
     "lerna": "^2.5.1",
     "lint-staged": "^7.0.4",
diff --git a/yarn.lock b/yarn.lock
index 2908fec746..1761a59dea 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3042,7 +3042,7 @@ bluebird@^2.10.2, bluebird@^2.9.24:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
 
-bluebird@^3.4.7, bluebird@^3.5.1:
+bluebird@^3.4.1, bluebird@^3.4.6, bluebird@^3.4.7, bluebird@^3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
 
@@ -8026,6 +8026,20 @@ klaw@^1.0.0:
   optionalDependencies:
     graceful-fs "^4.1.9"
 
+knex-migrate@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/knex-migrate/-/knex-migrate-1.6.1.tgz#e5a6245c18fa6f32b863f51e0b84ebf3e55d22bf"
+  dependencies:
+    bluebird "^3.4.6"
+    core-js "^2.5.3"
+    invariant "^2.2.1"
+    lodash "^4.16.4"
+    minimist "^1.2.0"
+    prettyjson "^1.1.3"
+    regenerator-runtime "^0.11.1"
+    req-from "^1.0.1"
+    umzug "^2.1.0"
+
 knex@0.8.6:
   version "0.8.6"
   resolved "https://registry.yarnpkg.com/knex/-/knex-0.8.6.tgz#20f2f4a6cf98fa755b5cee9aa9fabae531af056a"
@@ -8611,7 +8625,7 @@ lodash@4.17.5:
   version "4.17.5"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
 
-"lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.10.1, lodash@^4.11.1, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.14.1, lodash@^4.16.5, lodash@^4.16.6, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.6.1, lodash@~4.17.4:
+"lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.10.1, lodash@^4.11.1, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.14.1, lodash@^4.16.4, lodash@^4.16.5, lodash@^4.16.6, lodash@^4.17.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.6.1, lodash@~4.17.4:
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
 
@@ -10729,7 +10743,7 @@ pretty-format@^4.2.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-4.3.1.tgz#530be5c42b3c05b36414a7a2a4337aa80acd0e8d"
 
-prettyjson@^1.2.1:
+prettyjson@^1.1.3, prettyjson@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/prettyjson/-/prettyjson-1.2.1.tgz#fcffab41d19cab4dfae5e575e64246619b12d289"
   dependencies:
@@ -12317,6 +12331,12 @@ replace-string@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/replace-string/-/replace-string-1.1.0.tgz#87062117f823fe5800c306bacb2cfa359b935fea"
 
+req-from@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/req-from/-/req-from-1.0.1.tgz#bf81da5147947d32d13b947dc12a58ad4587350e"
+  dependencies:
+    resolve-from "^2.0.0"
+
 request-promise-core@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.1.tgz#3eee00b2c5aa83239cfb04c5700da36f81cd08b6"
@@ -12488,6 +12508,10 @@ resolve-from@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
 
+resolve-from@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57"
+
 resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
@@ -12522,6 +12546,12 @@ resolve@1.1.7, resolve@~1.1.0:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
+resolve@^1.0.0:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
+  dependencies:
+    path-parse "^1.0.5"
+
 resolve@^1.1.6, resolve@^1.1.7, resolve@^1.2.0, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.6.0:
   version "1.7.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3"
@@ -14160,6 +14190,15 @@ ultron@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
 
+umzug@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/umzug/-/umzug-2.1.0.tgz#c49dd71c7c26d082a9c9d3592dc6dc92cf867761"
+  dependencies:
+    babel-runtime "^6.23.0"
+    bluebird "^3.4.1"
+    lodash "^4.17.0"
+    resolve "^1.0.0"
+
 unc-path-regex@^0.1.0, unc-path-regex@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
@@ -14245,7 +14284,7 @@ unzip-response@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
 
-upath@^1.0.0, upath@^1.1.0:
+upath@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
 

From 14f3827b4ca4dd89cd32796cbe14a171d2e5f851 Mon Sep 17 00:00:00 2001
From: Dmytro Tverdoklib <nepal-tda@outlook.com>
Date: Mon, 16 Jul 2018 10:26:12 +0300
Subject: [PATCH 205/327] Fix regular expression in the
 deleteFromFileWithExports function

---
 tools/cli/helpers/util.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/cli/helpers/util.js b/tools/cli/helpers/util.js
index a84960ee7b..4d3d78372c 100644
--- a/tools/cli/helpers/util.js
+++ b/tools/cli/helpers/util.js
@@ -110,7 +110,7 @@ function updateFileWithExports({ pathToFileWithExports, exportName, importString
 function deleteFromFileWithExports(pathToFileWithExports, exportName) {
   if (fs.existsSync(pathToFileWithExports)) {
     const generatedElementData = fs.readFileSync(pathToFileWithExports);
-    const reg = `(\\n\\s\\s${exportName}(.|)|import ${exportName}.+;\\n+(?!ex))`;
+    const reg = `(\\n\\s\\s${exportName}(.|)|import (${exportName}|{ ${exportName} }).+;\\n+(?!ex))`;
     const generatedElement = generatedElementData.toString().replace(new RegExp(reg, 'g'), '');
     fs.writeFileSync(pathToFileWithExports, generatedElement);
   }

From 5e6ab3ee3450dfd9fed0e98d440dca5c3bb18a31 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Sun, 15 Jul 2018 22:48:54 +0300
Subject: [PATCH 206/327] Refactor bootstrap and antd components according to
 code review

---
 .../components/RenderCellSelectQuery.jsx      | 141 +++++++-------
 .../web/ui-antd/components/RenderField.jsx    |   7 +-
 .../ui-antd/components/RenderSelectQuery.jsx  | 175 +++++++-----------
 .../components/RenderCellSelectQuery.jsx      |  98 +++++-----
 .../components/RenderSelectQuery.jsx          | 144 ++++++--------
 .../client/src/modules/common/util.web.jsx    |   7 +-
 6 files changed, 244 insertions(+), 328 deletions(-)

diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderCellSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderCellSelectQuery.jsx
index c68bfee595..4333f4d82e 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderCellSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderCellSelectQuery.jsx
@@ -5,105 +5,94 @@ import { pascalize } from 'humps';
 import schemaQueries from '../../../../generatedContainers';
 
 const Option = Select.Option;
+const LIMIT = 10;
+
 export default class RenderCellSelectQuery extends React.Component {
   static propTypes = {
     schema: PropTypes.object,
     value: PropTypes.object,
     searchText: PropTypes.any,
     handleOnChange: PropTypes.func.isRequired,
+    handleSearch: PropTypes.func.isRequired,
     style: PropTypes.object,
     dirty: PropTypes.any
   };
 
-  handleChange = (value, data) => {
+  handleChange = data => value => {
+    console.log('valuevaluevaluevalue', value);
     this.props.handleOnChange(value, data);
   };
 
-  render() {
-    const { value, schema, style, searchText, dirty } = this.props;
-
-    const pascalizeSchemaName = pascalize(schema.name);
-    let column = 'name';
-    let orderBy = null;
-    for (const remoteKey of schema.keys()) {
-      const remoteValue = schema.values[remoteKey];
-      if (remoteValue.sortBy) {
-        column = remoteKey;
-      }
-      if (remoteKey === 'rank') {
-        orderBy = {
-          column: 'rank'
-        };
-      }
-    }
+  handleSearch = () => value => this.props.handleSearch(value);
 
+  render() {
+    const { value, schema, style = { width: '100%' }, searchText, dirty } = this.props;
+    const column = schema.keys().find(key => !!schema.values[key].sortBy) || 'name';
+    const orderBy = () => {
+      const foundOrderBy = schema.keys().find(key => !!schema.values[key].orderBy);
+      return foundOrderBy ? { column: foundOrderBy } : null;
+    };
     const toString = schema.__.__toString ? schema.__.__toString : opt => opt[column];
+    const formattedValue = value ? { key: `${value.id}`, label: toString(value) } : { key: '', label: '' };
+    const Query = schemaQueries[`${pascalize(schema.name)}Query`];
 
-    let formatedValue =
-      value && value != '' && value != undefined
-        ? { key: value.id.toString(), label: toString(value) }
-        : { key: '', label: '' };
-
-    const Query = schemaQueries[`${pascalizeSchemaName}Query`];
-
-    let defaultStyle = { width: '100%' };
-    if (style) {
-      defaultStyle = style;
-    }
-    let defaultValue = 'value';
     return (
-      <Query limit={10} filter={{ searchText }} orderBy={orderBy}>
+      <Query limit={LIMIT} filter={{ searchText }} orderBy={orderBy()}>
         {({ loading, data }) => {
-          if (!loading || data) {
-            const options = data.edges
-              ? data.edges.map(opt => (
-                  <Option key={opt.id} value={opt.id.toString()}>
-                    {toString(opt)}
+          if (loading || !data) {
+            return <Spin size="small" />;
+          }
+          const {
+            edges,
+            pageInfo: { totalCount }
+          } = data;
+          const isEdgesNotIncludeValue = value && edges && !edges.find(({ id }) => id === value.id);
+          const renderOptions = () => {
+            const defaultOption = formattedValue
+              ? []
+              : [
+                  <Option key="0" value="0">
+                    Select {pascalize(schema.name)}
                   </Option>
-                ))
-              : null;
+                ];
+            return edges
+              ? edges.reduce((acc, opt) => {
+                  acc.push(
+                    <Option key={opt.id} value={`${opt.id}`}>
+                      {toString(opt)}
+                    </Option>
+                  );
+                  return acc;
+                }, defaultOption)
+              : defaultOption;
+          };
 
-            let props = {
-              showSearch: true,
-              labelInValue: true,
-              dropdownMatchSelectWidth: false,
-              style: defaultStyle,
-              onChange: value => this.handleChange(value, data.edges ? data.edges : null),
-              [defaultValue]: formatedValue
+          const getSearchProps = () => {
+            return {
+              filterOption: false,
+              onSearch: this.handleSearch(),
+              value: isEdgesNotIncludeValue && dirty ? { key: `${edges[0].id}` } : formattedValue
             };
+          };
 
-            if (data.pageInfo.totalCount > 10) {
-              if (data.edges && value && value != '' && value != undefined) {
-                if (!data.edges.find(node => node.id === value.id)) {
-                  if (!dirty) {
-                    options.unshift(
-                      <Option key={value.id} value={value.id.toString()}>
-                        {toString(value)}
-                      </Option>
-                    );
-                  } else {
-                    formatedValue = { key: data.edges[0].id.toString() };
-                  }
-                }
-              }
+          const getChildrenProps = () => {
+            return {
+              optionFilterProp: 'children',
+              filterOption: (input, { props: { children } }) => children.toLowerCase().includes(input.toLowerCase()),
+              value: formattedValue
+            };
+          };
 
-              props = {
-                ...props,
-                filterOption: false,
-                [defaultValue]: formatedValue,
-                onSearch: this.search
-              };
-            } else {
-              props = {
-                ...props,
-                optionFilterProp: 'children',
-                filterOption: (input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
-              };
-            }
-            return <Select {...props}>{options}</Select>;
-          } else {
-            return <Spin size="small" />;
-          }
+          const basicProps = {
+            showSearch: true,
+            labelInValue: true,
+            dropdownMatchSelectWidth: false,
+            style,
+            onChange: this.handleChange(edges || null)
+          };
+          const filterProps = totalCount > LIMIT ? getSearchProps() : getChildrenProps();
+          const props = { ...basicProps, ...filterProps };
+          return <Select {...props}>{renderOptions()}</Select>;
         }}
       </Query>
     );
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderField.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderField.jsx
index ff97963354..8e0845f1f8 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderField.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderField.jsx
@@ -4,14 +4,14 @@ import { Form, Input } from 'antd';
 
 const FormItem = Form.Item;
 
-const RenderField = ({ input, label, type, meta: { touched, error }, placeholder }) => {
+const RenderField = ({ input, label, type, formItemLayout, meta: { touched, error }, placeholder }) => {
   let validateStatus = '';
   if (touched && error) {
     validateStatus = 'error';
   }
 
   return (
-    <FormItem label={label} validateStatus={validateStatus} help={touched && error}>
+    <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
       <div>
         <Input {...input} placeholder={label || placeholder} type={type} />
       </div>
@@ -24,7 +24,8 @@ RenderField.propTypes = {
   label: PropTypes.string,
   placeholder: PropTypes.string,
   type: PropTypes.string,
-  meta: PropTypes.object
+  meta: PropTypes.object,
+  formItemLayout: PropTypes.object
 };
 
 export default RenderField;
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
index dc1d846f09..6621087d0f 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
@@ -6,6 +6,7 @@ import { FormItem } from './index';
 import schemaQueries from '../../../../generatedContainers';
 
 const Option = Select.Option;
+const LIMIT = 10;
 
 export default class RenderSelectQuery extends React.Component {
   static propTypes = {
@@ -17,7 +18,8 @@ export default class RenderSelectQuery extends React.Component {
     meta: PropTypes.object,
     schema: PropTypes.object,
     style: PropTypes.object,
-    formType: PropTypes.string.isRequired
+    formType: PropTypes.string.isRequired,
+    value: PropTypes.any
   };
 
   state = {
@@ -25,18 +27,13 @@ export default class RenderSelectQuery extends React.Component {
     dirty: false
   };
 
-  handleChange = (value, edges) => {
+  handleChange = edges => value => {
     const {
       input: { name },
       setFieldValue
     } = this.props;
 
-    let selectedValue = '';
-    if (edges && Array.isArray(edges) && edges.length > 0 && value) {
-      selectedValue = edges.find(item => item.id === Number(value.key));
-    }
-
-    setFieldValue(name, selectedValue);
+    setFieldValue(name, edges.find(item => item.id === parseInt(value.key)) || '');
   };
 
   handleBlur = () => {
@@ -56,116 +53,86 @@ export default class RenderSelectQuery extends React.Component {
 
   render() {
     const {
-      input: { value, onChange, onBlur, ...inputRest },
-      label,
+      value,
       schema,
-      style,
+      style = { width: '80%' },
       formItemLayout,
       meta: { touched, error },
-      formType
+      formType,
+      label
     } = this.props;
     const { searchText, dirty } = this.state;
-
-    let validateStatus = '';
-    if (touched && error) {
-      validateStatus = 'error';
-    }
-
-    const pascalizeSchemaName = pascalize(schema.name);
-    let column = 'name';
-    let orderBy = null;
-    for (const remoteKey of schema.keys()) {
-      const remoteValue = schema.values[remoteKey];
-      if (remoteValue.sortBy) {
-        column = remoteKey;
-      }
-      if (remoteKey === 'rank') {
-        orderBy = {
-          column: 'rank'
-        };
-      }
-    }
-
+    const column = schema.keys().find(key => !!schema.values[key].sortBy) || 'name';
+    const orderBy = () => {
+      const foundOrderBy = schema.keys().find(key => !!schema.values[key].orderBy);
+      return foundOrderBy ? { column: foundOrderBy } : null;
+    };
     const toString = schema.__.__toString ? schema.__.__toString : opt => opt[column];
-
-    let formatedValue =
-      value && value != '' && value != undefined
-        ? { key: value.id.toString(), label: toString(value) }
-        : { key: '', label: '' };
-
-    const Query = schemaQueries[`${pascalizeSchemaName}Query`];
-
-    let defaultStyle = { width: '100%' };
-    if (style) {
-      defaultStyle = style;
-    }
-
-    let defaultValue = 'defaultValue';
-    if (formType === 'filter' || formType === 'batch') {
-      defaultValue = 'value';
-    }
+    const formattedValue = value ? { key: `${value.id}`, label: toString(value) } : { key: '', label: '' };
+    const Query = schemaQueries[`${pascalize(schema.name)}Query`];
 
     return (
-      <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={error}>
+      <FormItem label={label} {...formItemLayout} validateStatus={touched && error ? 'error' : ''} help={error}>
         <div>
-          <Query limit={10} filter={{ searchText }} orderBy={orderBy}>
+          <Query limit={10} filter={{ searchText }} orderBy={orderBy()}>
             {({ loading, data }) => {
-              if (!loading || data) {
-                const options = data.edges
-                  ? data.edges.map(opt => {
-                      return (
-                        <Option key={opt.id} value={opt.id.toString()}>
+              if (loading || !data) {
+                return <Spin size="small" />;
+              }
+              const {
+                edges,
+                pageInfo: { totalCount }
+              } = data;
+              const isEdgesNotIncludeValue = value && edges && !edges.find(({ id }) => id === value.id);
+              const renderOptions = () => {
+                const defaultOption = formattedValue
+                  ? []
+                  : [
+                      <Option key="0" value="0">
+                        Select {pascalize(schema.name)}
+                      </Option>
+                    ];
+                return edges
+                  ? edges.reduce((acc, opt) => {
+                      acc.push(
+                        <Option key={opt.id} value={`${opt.id}`}>
                           {toString(opt)}
                         </Option>
                       );
-                    })
-                  : null;
-
-                let props = {
-                  allowClear: formType !== 'form' ? true : false,
-                  showSearch: true,
-                  labelInValue: true,
-                  dropdownMatchSelectWidth: false,
-                  style: defaultStyle,
-                  onChange: value => this.handleChange(value, data.edges ? data.edges : null),
-                  onBlur: this.handleBlur,
-                  ...inputRest,
-                  [defaultValue]: formatedValue
+                      return acc;
+                    }, defaultOption)
+                  : defaultOption;
+              };
+
+              const getSearchProps = () => {
+                return {
+                  filterOption: false,
+                  onSearch: this.search,
+                  value: isEdgesNotIncludeValue && dirty ? { key: `${edges[0].id}` } : formattedValue
                 };
-
-                if (data.pageInfo.totalCount > 10) {
-                  if (data.edges && value && value != '' && value != undefined) {
-                    if (!data.edges.find(node => node.id === value.id)) {
-                      if (!dirty) {
-                        options.unshift(
-                          <Option key={value.id} value={value.id.toString()}>
-                            {toString(value)}
-                          </Option>
-                        );
-                      } else {
-                        formatedValue = { key: data.edges[0].id.toString() };
-                      }
-                    }
-                  }
-
-                  props = {
-                    ...props,
-                    filterOption: false,
-                    [defaultValue]: formatedValue,
-                    onSearch: this.search
-                  };
-                } else {
-                  props = {
-                    ...props,
-                    optionFilterProp: 'children',
-                    filterOption: (input, option) =>
-                      option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
-                  };
-                }
-                return <Select {...props}>{options}</Select>;
-              } else {
-                return <Spin size="small" />;
-              }
+              };
+
+              const getChildrenProps = () => {
+                return {
+                  optionFilterProp: 'children',
+                  filterOption: (input, { props: { children } }) =>
+                    children.toLowerCase().includes(input.toLowerCase()),
+                  value: formattedValue
+                };
+              };
+
+              const basicProps = {
+                allowClear: formType !== 'form',
+                showSearch: true,
+                labelInValue: true,
+                dropdownMatchSelectWidth: false,
+                style,
+                onChange: this.handleChange(edges || null),
+                onBlur: this.handleBlur
+              };
+              const filterProps = totalCount > LIMIT ? getSearchProps() : getChildrenProps();
+              const props = { ...basicProps, ...filterProps };
+              return <Select {...props}>{renderOptions()}</Select>;
             }}
           </Query>
         </div>
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderCellSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderCellSelectQuery.jsx
index 8f04ae9cac..32a0d86ff8 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderCellSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderCellSelectQuery.jsx
@@ -4,80 +4,70 @@ import { pascalize } from 'humps';
 import { Select, Spin } from './index';
 import schemaQueries from '../../../../generatedContainers';
 
+const LIMIT = 10;
+
 export default class RenderCellSelectQuery extends React.Component {
   static propTypes = {
     schema: PropTypes.object,
     value: PropTypes.object,
-    searchText: PropTypes.any,
     handleOnChange: PropTypes.func.isRequired,
+    handleSearch: PropTypes.any,
     style: PropTypes.object,
     dirty: PropTypes.any
   };
 
-  constructor(props) {
-    super(props);
-    this.handleChange = this.handleChange.bind(this);
-  }
-
   handleChange = (e, edges) => {
     let value = { key: e.target.value };
     this.props.handleOnChange(value, edges);
   };
 
   render() {
-    const { value, schema, searchText, style } = this.props;
-
-    const pascalizeSchemaName = pascalize(schema.name);
-
-    let orderBy = null;
-    for (const remoteKey of schema.keys()) {
-      if (remoteKey === 'rank') {
-        orderBy = {
-          column: 'rank'
-        };
-      }
-    }
-
-    let formatedValue = value && value != '' && typeof value !== 'undefined' ? value.id : '';
-
-    const Query = schemaQueries[`${pascalizeSchemaName}Query`];
-
-    let defaultStyle = { width: '80%' };
-    if (style) {
-      defaultStyle = style;
-    }
+    const { value, schema, style = { width: '80%' } } = this.props;
+    const column = schema.keys().find(key => !!schema.values[key].sortBy) || 'name';
+    const orderBy = () => {
+      const foundOrderBy = schema.keys().find(key => !!schema.values[key].orderBy);
+      return foundOrderBy ? { column: foundOrderBy } : null;
+    };
+    const toString = schema.__.__toString ? schema.__.__toString : opt => opt[column];
+    const formattedValue = value ? value.id : '';
+    const Query = schemaQueries[`${pascalize(schema.name)}Query`];
 
     return (
-      <Query limit={10} filter={{ searchText }} orderBy={orderBy}>
+      <Query limit={LIMIT} orderBy={orderBy()}>
         {({ loading, data }) => {
-          if (!loading || data) {
-            let options = data.edges
-              ? data.edges.map(opt => (
-                  <option key={opt.id} value={opt.id.toString()} label={opt.name}>
-                    {opt.name}
-                  </option>
-                ))
-              : null;
-            if (!value && data.edges && data.edges.length > 0) {
-              options.unshift(
-                <option key="0" value="0">
-                  Select Item
-                </option>
-              );
-            }
-            let props = {
-              style: defaultStyle,
-              value: formatedValue,
-              onChange: e => this.handleChange(e, data.edges)
-            };
-            return (
-              <Select type="select" {...props}>
-                {options}
-              </Select>
-            );
-          } else {
+          if (loading || !data) {
             return <Spin size="small" />;
           }
+          const { edges } = data;
+          const renderOptions = () => {
+            const defaultOption = formattedValue
+              ? []
+              : [
+                  <option key="0" value="0">
+                    Select {pascalize(schema.name)}
+                  </option>
+                ];
+            return edges
+              ? edges.reduce((acc, opt) => {
+                  acc.push(
+                    <option key={opt.id} value={`${opt.id}`}>
+                      {toString(opt)}
+                    </option>
+                  );
+                  return acc;
+                }, defaultOption)
+              : defaultOption;
+          };
+          let props = {
+            style,
+            value: formattedValue,
+            onChange: e => this.handleChange(e, data.edges)
+          };
+          return (
+            <Select type="select" {...props}>
+              {renderOptions()}
+            </Select>
+          );
         }}
       </Query>
     );
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx
index 11ba02128b..7fd0e45be0 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx
@@ -2,9 +2,11 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { pascalize } from 'humps';
 import { FormFeedback } from 'reactstrap';
-import { FormItem, Select } from './index';
+import { FormItem, Select, Spin } from './index';
 import schemaQueries from '../../../../generatedContainers';
 
+const LIMIT = 10;
+
 export default class RenderSelectQuery extends React.Component {
   static propTypes = {
     input: PropTypes.object,
@@ -15,7 +17,8 @@ export default class RenderSelectQuery extends React.Component {
     meta: PropTypes.object,
     schema: PropTypes.object,
     style: PropTypes.object,
-    formType: PropTypes.string
+    formType: PropTypes.string,
+    value: PropTypes.any
   };
 
   constructor(props) {
@@ -23,18 +26,12 @@ export default class RenderSelectQuery extends React.Component {
     this.handleChange = this.handleChange.bind(this);
   }
 
-  state = {
-    searchText: '',
-    dirty: false
-  };
-
   handleChange = (e, edges) => {
     const {
       input: { name },
       setFieldValue
     } = this.props;
-    let selectedItem = edges && Array.isArray(edges) ? edges.find(item => item.id == e.target.value) : '';
-    setFieldValue(name, selectedItem ? selectedItem : '');
+    setFieldValue(name, edges.find(item => item.id === parseInt(e.target.value)) || '');
   };
 
   handleBlur = () => {
@@ -45,92 +42,67 @@ export default class RenderSelectQuery extends React.Component {
     setFieldTouched(name, true);
   };
 
-  search = value => {
-    const { dirty } = this.state;
-    if ((value && value.length >= 1) || dirty) {
-      this.setState({ searchText: value, dirty: true });
-    }
-  };
-
   render() {
     const {
-      input: { value, onChange, onBlur, ...inputRest },
-      label,
+      value,
       schema,
-      style,
-      formItemLayout,
-      meta: { touched, error }
+      style = { width: '100%' },
+      meta: { touched, error },
+      label
     } = this.props;
-    const { searchText } = this.state;
-
-    let validateStatus = '';
-    if (touched && error) {
-      validateStatus = 'error';
-    }
-
-    const pascalizeSchemaName = pascalize(schema.name);
-    let orderBy = null;
-    for (const remoteKey of schema.keys()) {
-      if (remoteKey === 'rank') {
-        orderBy = {
-          column: 'rank'
-        };
-      }
-    }
-    let formatedValue = value && value != '' && typeof value !== 'undefined' ? value.id : '';
-
-    const Query = schemaQueries[`${pascalizeSchemaName}Query`];
-
-    let defaultStyle = { width: '100%' };
-    if (style) {
-      defaultStyle = style;
-    }
-
-    let valid = true;
-    if (touched && error) {
-      valid = false;
-    }
+    const column = schema.keys().find(key => !!schema.values[key].sortBy) || 'name';
+    const toString = schema.__.__toString ? schema.__.__toString : opt => opt[column];
+    const orderBy = () => {
+      const foundOrderBy = schema.keys().find(key => !!schema.values[key].orderBy);
+      return foundOrderBy ? { column: foundOrderBy } : null;
+    };
+    const formattedValue = value ? value.id : '';
+    const Query = schemaQueries[`${pascalize(schema.name)}Query`];
 
     return (
-      <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={error}>
+      <FormItem label={label}>
         <div>
-          <Query limit={10} filter={{ searchText }} orderBy={orderBy}>
+          <Query limit={LIMIT} orderBy={orderBy()}>
             {({ loading, data }) => {
-              if (!loading || data) {
-                let options = data.edges
-                  ? data.edges.map(opt => (
-                      <option key={opt.id} value={opt.id.toString()} label={opt.name}>
-                        {opt.name}
-                      </option>
-                    ))
-                  : null;
-                if (!value && data.edges && data.edges.length > 0) {
-                  options.unshift(
-                    <option key="0" value="0">
-                      Select Item
-                    </option>
-                  );
-                }
-
-                let props = {
-                  style: defaultStyle,
-                  value: formatedValue,
-                  onChange: e => this.handleChange(e, data.edges ? data.edges : null),
-                  onBlur: this.handleBlur,
-                  invalid: !valid,
-                  ...inputRest
-                };
-                return (
-                  <div>
-                    <Select type="select" {...props}>
-                      {options}
-                    </Select>
-                    {error && (error && <FormFeedback>{error}</FormFeedback>)}
-                  </div>
-                );
-              } else {
-                return <div>Loading...</div>;
+              if (loading || !data) {
+                return <Spin size="small" />;
               }
+              console.log('orderBy', orderBy);
+              const { edges } = data;
+              const renderOptions = () => {
+                const defaultOption = formattedValue
+                  ? []
+                  : [
+                      <option key="0" value="0">
+                        Select {pascalize(schema.name)}
+                      </option>
+                    ];
+                return edges
+                  ? edges.reduce((acc, opt) => {
+                      acc.push(
+                        <option key={opt.id} value={`${opt.id}`}>
+                          {toString(opt)}
+                        </option>
+                      );
+                      return acc;
+                    }, defaultOption)
+                  : defaultOption;
+              };
+              const props = {
+                style,
+                value: formattedValue,
+                onChange: e => this.handleChange(e, edges || null),
+                onBlur: this.handleBlur,
+                invalid: !!(touched && error)
+              };
+              return (
+                <div>
+                  <Select type="select" {...props}>
+                    {renderOptions()}
+                  </Select>
+                  {error && <FormFeedback>{error}</FormFeedback>}
+                </div>
+              );
             }}
           </Query>
         </div>
diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index 650d2417c5..265409bba3 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -458,11 +458,7 @@ class EditableCell extends React.Component {
     this.setState({ value: dateString });
   };
   handleSelectChange = (value, edges) => {
-    let selectedValue = '';
-    if (edges && Array.isArray(edges) && edges.length > 0 && value) {
-      selectedValue = edges.find(item => item.id === Number(value.key));
-    }
-    this.setState({ value: selectedValue });
+    this.setState({ value: edges.find(item => item.id === parseInt(value.key)) || '' });
   };
   check = () => {
     const { hasTypeOf } = this.props;
@@ -505,6 +501,7 @@ class EditableCell extends React.Component {
           value={value}
           schema={schema}
           handleOnChange={this.handleSelectChange}
+          handleSearch={this.search}
           dirty={dirty}
         />
       );

From 96e3625329d7fa5be3f8fc2348db55b846cf2a3d Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Mon, 16 Jul 2018 11:01:54 +0300
Subject: [PATCH 207/327] Change bootstrap renderSelect components

---
 .../web/ui-bootstrap/components/RenderCellSelectQuery.jsx    | 4 ++--
 .../web/ui-bootstrap/components/RenderSelectQuery.jsx        | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderCellSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderCellSelectQuery.jsx
index 32a0d86ff8..7b81ce76b4 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderCellSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderCellSelectQuery.jsx
@@ -16,7 +16,7 @@ export default class RenderCellSelectQuery extends React.Component {
     dirty: PropTypes.any
   };
 
-  handleChange = (e, edges) => {
+  handleChange = edges => e => {
     let value = { key: e.target.value };
     this.props.handleOnChange(value, edges);
   };
@@ -61,7 +61,7 @@ export default class RenderCellSelectQuery extends React.Component {
           let props = {
             style,
             value: formattedValue,
-            onChange: e => this.handleChange(e, data.edges)
+            onChange: this.handleChange(edges || null)
           };
           return (
             <Select type="select" {...props}>
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx
index 7fd0e45be0..8c822f5d49 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx
@@ -26,7 +26,7 @@ export default class RenderSelectQuery extends React.Component {
     this.handleChange = this.handleChange.bind(this);
   }
 
-  handleChange = (e, edges) => {
+  handleChange = edges => e => {
     const {
       input: { name },
       setFieldValue
@@ -67,7 +67,6 @@ export default class RenderSelectQuery extends React.Component {
               if (loading || !data) {
                 return <Spin size="small" />;
               }
-              console.log('orderBy', orderBy);
               const { edges } = data;
               const renderOptions = () => {
                 const defaultOption = formattedValue
@@ -91,7 +90,7 @@ export default class RenderSelectQuery extends React.Component {
               const props = {
                 style,
                 value: formattedValue,
-                onChange: e => this.handleChange(e, edges || null),
+                onChange: this.handleChange(edges || null),
                 onBlur: this.handleBlur,
                 invalid: !!(touched && error)
               };

From f8e1d153a0abc1f449ea21c125eeeb42bde06c52 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Tue, 17 Jul 2018 11:56:03 +0300
Subject: [PATCH 208/327] Tiny changes for bootstrap renderSelect components

---
 .../web/ui-bootstrap/components/RenderCellSelectQuery.jsx  | 2 +-
 .../web/ui-bootstrap/components/RenderSelectQuery.jsx      | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderCellSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderCellSelectQuery.jsx
index 7b81ce76b4..86aa335bcf 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderCellSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderCellSelectQuery.jsx
@@ -29,7 +29,7 @@ export default class RenderCellSelectQuery extends React.Component {
       return foundOrderBy ? { column: foundOrderBy } : null;
     };
     const toString = schema.__.__toString ? schema.__.__toString : opt => opt[column];
-    const formattedValue = value ? value.id : '';
+    const formattedValue = value ? value.id : '0';
     const Query = schemaQueries[`${pascalize(schema.name)}Query`];
 
     return (
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx
index 8c822f5d49..e31c753d0e 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx
@@ -21,11 +21,6 @@ export default class RenderSelectQuery extends React.Component {
     value: PropTypes.any
   };
 
-  constructor(props) {
-    super(props);
-    this.handleChange = this.handleChange.bind(this);
-  }
-
   handleChange = edges => e => {
     const {
       input: { name },
@@ -56,7 +51,7 @@ export default class RenderSelectQuery extends React.Component {
       const foundOrderBy = schema.keys().find(key => !!schema.values[key].orderBy);
       return foundOrderBy ? { column: foundOrderBy } : null;
     };
-    const formattedValue = value ? value.id : '';
+    const formattedValue = value ? value.id : '0';
     const Query = schemaQueries[`${pascalize(schema.name)}Query`];
 
     return (

From 1114decd6efa072d40283f0f0336e0ada46620a4 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Thu, 19 Jul 2018 16:14:52 +0300
Subject: [PATCH 209/327] Fix renderSelect default option

---
 .../ui-antd/components/RenderSelectQuery.jsx  | 22 +++++++++----------
 .../components/RenderSelectQuery.jsx          | 22 +++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
index 6621087d0f..3b0b769f70 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
@@ -18,8 +18,7 @@ export default class RenderSelectQuery extends React.Component {
     meta: PropTypes.object,
     schema: PropTypes.object,
     style: PropTypes.object,
-    formType: PropTypes.string.isRequired,
-    value: PropTypes.any
+    formType: PropTypes.string.isRequired
   };
 
   state = {
@@ -53,7 +52,7 @@ export default class RenderSelectQuery extends React.Component {
 
   render() {
     const {
-      value,
+      input: { value },
       schema,
       style = { width: '80%' },
       formItemLayout,
@@ -68,7 +67,7 @@ export default class RenderSelectQuery extends React.Component {
       return foundOrderBy ? { column: foundOrderBy } : null;
     };
     const toString = schema.__.__toString ? schema.__.__toString : opt => opt[column];
-    const formattedValue = value ? { key: `${value.id}`, label: toString(value) } : { key: '', label: '' };
+    const formattedValue = value ? { key: `${value.id}`, label: toString(value) } : { key: '0', label: '' };
     const Query = schemaQueries[`${pascalize(schema.name)}Query`];
 
     return (
@@ -85,13 +84,14 @@ export default class RenderSelectQuery extends React.Component {
               } = data;
               const isEdgesNotIncludeValue = value && edges && !edges.find(({ id }) => id === value.id);
               const renderOptions = () => {
-                const defaultOption = formattedValue
-                  ? []
-                  : [
-                      <Option key="0" value="0">
-                        Select {pascalize(schema.name)}
-                      </Option>
-                    ];
+                const defaultOption =
+                  parseInt(formattedValue.key) === 0
+                    ? [
+                        <Option key="0" value="0">
+                          Select {pascalize(schema.name)}
+                        </Option>
+                      ]
+                    : [];
                 return edges
                   ? edges.reduce((acc, opt) => {
                       acc.push(
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx
index e31c753d0e..ad2ce2dec9 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectQuery.jsx
@@ -17,8 +17,7 @@ export default class RenderSelectQuery extends React.Component {
     meta: PropTypes.object,
     schema: PropTypes.object,
     style: PropTypes.object,
-    formType: PropTypes.string,
-    value: PropTypes.any
+    formType: PropTypes.string
   };
 
   handleChange = edges => e => {
@@ -39,7 +38,7 @@ export default class RenderSelectQuery extends React.Component {
 
   render() {
     const {
-      value,
+      input: { value },
       schema,
       style = { width: '100%' },
       meta: { touched, error },
@@ -51,7 +50,7 @@ export default class RenderSelectQuery extends React.Component {
       const foundOrderBy = schema.keys().find(key => !!schema.values[key].orderBy);
       return foundOrderBy ? { column: foundOrderBy } : null;
     };
-    const formattedValue = value ? value.id : '0';
+    const formattedValue = value ? value.id : 0;
     const Query = schemaQueries[`${pascalize(schema.name)}Query`];
 
     return (
@@ -64,13 +63,14 @@ export default class RenderSelectQuery extends React.Component {
               }
               const { edges } = data;
               const renderOptions = () => {
-                const defaultOption = formattedValue
-                  ? []
-                  : [
-                      <option key="0" value="0">
-                        Select {pascalize(schema.name)}
-                      </option>
-                    ];
+                const defaultOption =
+                  formattedValue === 0
+                    ? [
+                        <option key="0" value="0">
+                          Select {pascalize(schema.name)}
+                        </option>
+                      ]
+                    : [];
                 return edges
                   ? edges.reduce((acc, opt) => {
                       acc.push(

From 0cd622829279c167bbef8d1a94b3c9b2ce7a0e1a Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Fri, 20 Jul 2018 13:22:16 +0300
Subject: [PATCH 210/327] Refactor antd-ui RenderNumber

---
 .../web/ui-antd/components/RenderNumber.jsx   | 35 +++++++++----------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderNumber.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderNumber.jsx
index 1ea0ad14c1..1c78f3c3f6 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderNumber.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderNumber.jsx
@@ -13,7 +13,7 @@ export default class RenderNumber extends React.Component {
     label: PropTypes.string,
     type: PropTypes.string,
     formItemLayout: PropTypes.object,
-    hasTypeOf: PropTypes.func.isRequired,
+    hasTypeOf: PropTypes.func,
     meta: PropTypes.object
   };
 
@@ -24,11 +24,7 @@ export default class RenderNumber extends React.Component {
       hasTypeOf
     } = this.props;
 
-    let computedValue = value;
-    if (hasTypeOf(Number)) {
-      computedValue = value !== '' ? parseFloat(value) : '';
-    }
-    setFieldValue(name, computedValue);
+    setFieldValue(name, hasTypeOf && hasTypeOf(DomainSchema.Int) ? parseInt(value) || '' : value);
   };
 
   handleBlur = () => {
@@ -48,26 +44,27 @@ export default class RenderNumber extends React.Component {
       meta: { touched, error }
     } = this.props;
 
-    let validateStatus = '';
-    if (touched && error) {
-      validateStatus = 'error';
-    }
-
-    let input = {
+    const input = {
+      onChange: this.handleChange,
+      onBlur: this.handleBlur,
       ...inputRest
     };
 
-    if (hasTypeOf(DomainSchema.Float)) {
-      input = {
-        step: '0.1',
-        ...inputRest
-      };
+    if (hasTypeOf && hasTypeOf(DomainSchema.Int)) {
+      input.step = '1';
+    } else if (hasTypeOf && hasTypeOf(DomainSchema.Float)) {
+      input.step = '0.1';
     }
 
     return (
-      <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
+      <FormItem
+        label={label}
+        {...formItemLayout}
+        validateStatus={touched && error ? 'error' : ''}
+        help={touched && error}
+      >
         <div>
-          <InputNumber {...input} placeholder={label} onChange={this.handleChange} onBlur={this.handleBlur} />
+          <InputNumber {...input} placeholder={label} />
         </div>
       </FormItem>
     );

From d82529773a30082594e37db3949622b656d4c752 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Fri, 20 Jul 2018 15:39:13 +0300
Subject: [PATCH 211/327] Refactor RenderDate, RenderSwitch, RenderField
 antd-ui componets, removed redundant RenderInput component

---
 .../web/ui-antd/components/RenderDate.jsx     | 21 +++++------
 .../web/ui-antd/components/RenderField.jsx    | 12 +++----
 .../web/ui-antd/components/RenderInput.jsx    | 31 ----------------
 .../web/ui-antd/components/RenderSwitch.jsx   | 12 +++----
 .../web/ui-antd/components/index.js           |  1 -
 .../ui-bootstrap/components/RenderInput.jsx   | 36 -------------------
 .../web/ui-bootstrap/components/index.js      |  1 -
 7 files changed, 20 insertions(+), 94 deletions(-)
 delete mode 100644 packages/client/src/modules/common/components/web/ui-antd/components/RenderInput.jsx
 delete mode 100644 packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderInput.jsx

diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderDate.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderDate.jsx
index 7777dd8891..72b630ee47 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderDate.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderDate.jsx
@@ -40,23 +40,18 @@ export default class RenderDate extends React.Component {
       meta: { touched, error }
     } = this.props;
 
-    let validateStatus = '';
-    if (touched && error) {
-      validateStatus = 'error';
-    }
-
-    let formatedValue = value;
-    if (value !== null && value !== undefined && value !== '') {
-      formatedValue = moment(value, dateFormat);
-    } else {
-      formatedValue = null;
-    }
+    const formattedValue = value ? moment(value, dateFormat) : null;
 
     return (
-      <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
+      <FormItem
+        label={label}
+        {...formItemLayout}
+        validateStatus={touched && error ? 'error' : ''}
+        help={touched && error}
+      >
         <div>
           <DatePicker
-            value={formatedValue}
+            value={formattedValue}
             format={dateFormat}
             onChange={this.handleChange}
             onBlur={this.handleBlur}
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderField.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderField.jsx
index 8e0845f1f8..6c71b4d5bb 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderField.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderField.jsx
@@ -5,13 +5,13 @@ import { Form, Input } from 'antd';
 const FormItem = Form.Item;
 
 const RenderField = ({ input, label, type, formItemLayout, meta: { touched, error }, placeholder }) => {
-  let validateStatus = '';
-  if (touched && error) {
-    validateStatus = 'error';
-  }
-
   return (
-    <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
+    <FormItem
+      label={label}
+      {...formItemLayout}
+      validateStatus={touched && error ? 'error' : ''}
+      help={touched && error}
+    >
       <div>
         <Input {...input} placeholder={label || placeholder} type={type} />
       </div>
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderInput.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderInput.jsx
deleted file mode 100644
index fe717b840d..0000000000
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderInput.jsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-import { FormItem, Input } from './index';
-
-export default class RenderInput extends React.Component {
-  static propTypes = {
-    input: PropTypes.object,
-    label: PropTypes.string,
-    formItemLayout: PropTypes.object,
-    hasTypeOf: PropTypes.func.isRequired,
-    meta: PropTypes.object
-  };
-
-  render() {
-    const { input, label, formItemLayout, meta: { touched, error } } = this.props;
-
-    let validateStatus = '';
-    if (touched && error) {
-      validateStatus = 'error';
-    }
-
-    return (
-      <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
-        <div>
-          <Input {...input} placeholder={label} type="text" />
-        </div>
-      </FormItem>
-    );
-  }
-}
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSwitch.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSwitch.jsx
index 4af90e6718..c781768a9d 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSwitch.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSwitch.jsx
@@ -37,13 +37,13 @@ export default class RenderSwitch extends React.Component {
       meta: { touched, error }
     } = this.props;
 
-    let validateStatus = '';
-    if (touched && error) {
-      validateStatus = 'error';
-    }
-
     return (
-      <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
+      <FormItem
+        label={label}
+        {...formItemLayout}
+        validateStatus={touched && error ? 'error' : ''}
+        help={touched && error}
+      >
         <div>
           <Switch defaultChecked={!!value} onChange={this.handleChange} onBlur={this.handleBlur} />
         </div>
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/index.js b/packages/client/src/modules/common/components/web/ui-antd/components/index.js
index 105374a4f3..b0ed9a9df6 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/index.js
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/index.js
@@ -11,7 +11,6 @@ export { default as Switch } from './Switch';
 export { default as Select } from './Select';
 export { default as Option } from './Option';
 export { default as RenderField } from './RenderField';
-export { default as RenderInput } from './RenderInput';
 export { default as RenderNumber } from './RenderNumber';
 export { default as RenderTextArea } from './RenderTextArea';
 export { default as RenderDate } from './RenderDate';
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderInput.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderInput.jsx
deleted file mode 100644
index fd97320bfb..0000000000
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderInput.jsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-import { FormItem, Input } from './index';
-
-export default class RenderInput extends React.Component {
-  static propTypes = {
-    input: PropTypes.object,
-    label: PropTypes.string,
-    formItemLayout: PropTypes.object,
-    hasTypeOf: PropTypes.func.isRequired,
-    meta: PropTypes.object
-  };
-
-  render() {
-    const {
-      input,
-      label,
-      formItemLayout,
-      meta: { touched, error }
-    } = this.props;
-
-    let validateStatus = '';
-    if (touched && error) {
-      validateStatus = 'error';
-    }
-
-    return (
-      <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
-        <div>
-          <Input {...input} placeholder={label} type="text" />
-        </div>
-      </FormItem>
-    );
-  }
-}
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/index.js b/packages/client/src/modules/common/components/web/ui-bootstrap/components/index.js
index 529dde32d8..c461de83ae 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/index.js
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/index.js
@@ -26,7 +26,6 @@ export { default as LanguagePicker } from './LanguagePicker';
 export { default as Pagination } from './Pagination';
 export { default as Switch } from './Switch';
 export { default as InputNumber } from './InputNumber';
-export { default as RenderInput } from './RenderInput';
 export { default as RenderNumber } from './RenderNumber';
 export { default as RenderSelectQuery } from './RenderSelectQuery';
 export { default as RenderSwitch } from './RenderSwitch';

From f9b2cfd4b127523d4fea0e8b48888409ecace8c9 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Mon, 23 Jul 2018 10:09:10 +0300
Subject: [PATCH 212/327] Refactor antd and bootsrap components. Remove
 redundant handleBlur function in components

---
 .../web/ui-antd/components/RenderNumber.jsx   | 11 +------
 .../web/ui-antd/components/RenderSelect.jsx   |  7 +----
 .../web/ui-antd/components/RenderSwitch.jsx   | 10 +-----
 .../web/ui-antd/components/RenderTextArea.jsx | 12 +++----
 .../ui-bootstrap/components/RenderDate.jsx    | 20 ++----------
 .../ui-bootstrap/components/RenderNumber.jsx  | 31 ++-----------------
 .../ui-bootstrap/components/RenderSwitch.jsx  | 10 +-----
 7 files changed, 15 insertions(+), 86 deletions(-)

diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderNumber.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderNumber.jsx
index 1c78f3c3f6..0a7a472d5b 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderNumber.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderNumber.jsx
@@ -27,17 +27,9 @@ export default class RenderNumber extends React.Component {
     setFieldValue(name, hasTypeOf && hasTypeOf(DomainSchema.Int) ? parseInt(value) || '' : value);
   };
 
-  handleBlur = () => {
-    const {
-      input: { name },
-      setFieldTouched
-    } = this.props;
-    setFieldTouched(name, true);
-  };
-
   render() {
     const {
-      input: { onChange, onBlur, ...inputRest },
+      input: { onChange, ...inputRest },
       label,
       formItemLayout,
       hasTypeOf,
@@ -46,7 +38,6 @@ export default class RenderNumber extends React.Component {
 
     const input = {
       onChange: this.handleChange,
-      onBlur: this.handleBlur,
       ...inputRest
     };
 
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx
index b54502f2e8..426fcf258d 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx
@@ -5,13 +5,8 @@ import { Form } from 'antd';
 const FormItem = Form.Item;
 
 const RenderField = ({ input, label, type, children, meta: { touched, error } }) => {
-  let validateStatus = '';
-  if (touched && error) {
-    validateStatus = 'error';
-  }
-
   return (
-    <FormItem label={label} validateStatus={validateStatus} help={error}>
+    <FormItem label={label} validateStatus={touched && error ? 'error' : ''} help={error}>
       <div>
         <select {...input} type={type}>
           {children}
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSwitch.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSwitch.jsx
index c781768a9d..679ddb4f26 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSwitch.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSwitch.jsx
@@ -21,14 +21,6 @@ export default class RenderSwitch extends React.Component {
     setFieldValue(name, value);
   };
 
-  handleBlur = () => {
-    const {
-      input: { name },
-      setFieldTouched
-    } = this.props;
-    setFieldTouched(name, true);
-  };
-
   render() {
     const {
       input: { value },
@@ -45,7 +37,7 @@ export default class RenderSwitch extends React.Component {
         help={touched && error}
       >
         <div>
-          <Switch defaultChecked={!!value} onChange={this.handleChange} onBlur={this.handleBlur} />
+          <Switch defaultChecked={!!value} onChange={this.handleChange} />
         </div>
       </FormItem>
     );
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderTextArea.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderTextArea.jsx
index 17ecfc0cf0..78a9c3b237 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderTextArea.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderTextArea.jsx
@@ -24,13 +24,13 @@ export default class RenderTextArea extends React.Component {
       meta: { touched, error }
     } = this.props;
 
-    let validateStatus = '';
-    if (touched && error) {
-      validateStatus = 'error';
-    }
-
     return (
-      <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
+      <FormItem
+        label={label}
+        {...formItemLayout}
+        validateStatus={touched && error ? 'error' : ''}
+        help={touched && error}
+      >
         <div>
           <TextArea {...input} placeholder={label} autosize />
         </div>
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderDate.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderDate.jsx
index dadd4cc1b2..63fc866596 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderDate.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderDate.jsx
@@ -29,34 +29,20 @@ export default class RenderDate extends React.Component {
     setFieldValue(name, moment().format(dateFormat));
   };
 
-  handleBlur = () => {
-    const {
-      input: { name },
-      setFieldTouched
-    } = this.props;
-    setFieldTouched(name, true);
-  };
-
   render() {
     const {
-      input: { value, onChange, onBlur, ...inputRest },
+      input: { value, onChange, ...inputRest },
       label,
       formItemLayout,
       meta: { touched, error }
     } = this.props;
 
-    let formattedValue = value ? moment(value, dateFormat) : moment();
+    let formattedValue = value ? moment(value, dateFormat) : null;
 
     return (
       <FormItem label={label} {...formItemLayout} help={touched && error}>
         <div>
-          <DatePicker
-            value={formattedValue}
-            dateFormat={dateFormat}
-            onChange={this.handleChange}
-            onBlur={this.handleBlur}
-            {...inputRest}
-          />
+          <DatePicker value={formattedValue} dateFormat={dateFormat} onChange={this.handleChange} {...inputRest} />
         </div>
       </FormItem>
     );
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderNumber.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderNumber.jsx
index 8e673b059a..9ffce52ee2 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderNumber.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderNumber.jsx
@@ -16,46 +16,19 @@ export default class RenderNumber extends React.Component {
     meta: PropTypes.object
   };
 
-  handleChange = e => {
-    const {
-      input: { name },
-      setFieldValue
-    } = this.props;
-    setFieldValue(name, e.target.value);
-  };
-
-  handleBlur = () => {
-    const {
-      input: { name },
-      setFieldTouched
-    } = this.props;
-    setFieldTouched(name, true);
-  };
-
   render() {
     const {
-      input: { onChange, onBlur, ...inputRest },
+      input,
       label,
       formItemLayout,
       placeholder,
       meta: { touched, error }
     } = this.props;
 
-    let valid = true;
-    if (touched && error) {
-      valid = false;
-    }
-
     return (
       <FormItem label={label} {...formItemLayout}>
         <div>
-          <InputNumber
-            {...inputRest}
-            placeholder={label || placeholder}
-            onChange={this.handleChange}
-            onBlur={this.handleBlur}
-            invalid={!valid}
-          />
+          <InputNumber {...input} placeholder={label || placeholder} invalid={touched && error} />
           {touched && (error && <FormFeedback>{error}</FormFeedback>)}
         </div>
       </FormItem>
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSwitch.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSwitch.jsx
index 1ee3f66587..ed0e16d2aa 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSwitch.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSwitch.jsx
@@ -21,14 +21,6 @@ export default class RenderSwitch extends React.Component {
     setFieldValue(name, e.target.checked);
   };
 
-  handleBlur = () => {
-    const {
-      input: { name },
-      setFieldTouched
-    } = this.props;
-    setFieldTouched(name, true);
-  };
-
   render() {
     const {
       input: { value },
@@ -45,7 +37,7 @@ export default class RenderSwitch extends React.Component {
     return (
       <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
         <div>
-          <Switch checked={!!value} onChange={this.handleChange} onBlur={this.handleBlur} />
+          <Switch checked={!!value} onChange={this.handleChange} />
         </div>
       </FormItem>
     );

From dfb12db64cc1a5cbdb026edda0b964cc7a1c0bac Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Mon, 23 Jul 2018 12:26:50 +0300
Subject: [PATCH 213/327] Replace formik on  domain-schema/formik in FormView.
 Fix render number input bootsrap. Increase versions

---
 packages/client/package.json                  |  3 +-
 .../common/components/crud/FormView.web.jsx   | 74 +++++--------------
 .../common/components/crud/ListView.web.jsx   |  3 +-
 .../ui-bootstrap/components/RenderNumber.jsx  |  4 +-
 packages/server/package.json                  |  4 +-
 yarn.lock                                     | 13 ++--
 6 files changed, 33 insertions(+), 68 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index cc15e6a066..582b1a34ec 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -38,7 +38,8 @@
   "license": "MIT",
   "dependencies": {
     "@domain-schema/core": "^0.0.34",
-    "@domain-schema/validation": "^0.0.35",
+    "@domain-schema/validation": "^0.0.36",
+    "@domain-schema/formik": "^0.0.34",
     "@fortawesome/fontawesome": "^1.1.8",
     "@fortawesome/fontawesome-free-brands": "^5.0.6",
     "@fortawesome/fontawesome-free-webfonts": "^1.0.9",
diff --git a/packages/client/src/modules/common/components/crud/FormView.web.jsx b/packages/client/src/modules/common/components/crud/FormView.web.jsx
index 8043a137c2..d233e59fe3 100644
--- a/packages/client/src/modules/common/components/crud/FormView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/FormView.web.jsx
@@ -1,66 +1,31 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Formik } from 'formik';
-import DomainValidator from '@domain-schema/validation';
+import { DomainSchemaFormik } from '@domain-schema/formik';
+import { onSubmit } from '../../../../utils/crud';
+import { Form, Button, RenderField, RenderSwitch, RenderSelectQuery, RenderDate, RenderNumber } from '../web';
 
-import { onSubmit, mapFormPropsToValues } from '../../../../utils/crud';
-import { createFormFields } from '../../util';
-import { Form, FormItem, Button } from '../web';
-import { computeDomainValidationErrors } from '../../../../../../common/validation';
+const FormView = ({ schema, updateEntry, createEntry, title, data }) => {
+  const schemaFormik = new DomainSchemaFormik(schema);
+  schemaFormik.setFormComponents({
+    input: RenderField,
+    checkbox: RenderSwitch,
+    number: RenderNumber,
+    date: RenderDate,
+    select: RenderSelectQuery,
+    button: Button,
+    form: Form
+  });
+  const Formik = schemaFormik.generateForm({
+    label: 'Submit',
+    disableOnInvalid: false
+  });
 
-const tailFormItemLayout = {
-  wrapperCol: {
-    xs: {
-      span: 24,
-      offset: 0
-    },
-    sm: {
-      span: 16,
-      offset: 6
-    }
-  }
-};
-
-const formItemLayout = {
-  labelCol: {
-    xs: { span: 24 },
-    sm: { span: 6 }
-  },
-  wrapperCol: {
-    xs: { span: 24 },
-    sm: { span: 12 }
-  }
-};
-
-const FormView = ({ schema, updateEntry, createEntry, title, customFields, data }) => {
-  const domainValidator = new DomainValidator();
   return (
     <Formik
-      initialValues={mapFormPropsToValues({ schema, data: data ? data.node : null })}
-      validate={values => {
-        let rawErrors = domainValidator.validate(schema, values);
-        return computeDomainValidationErrors(rawErrors);
-      }}
+      values={data ? data.node : null}
       onSubmit={async values => {
         await onSubmit({ schema, values, updateEntry, createEntry, title, data: data ? data.node : null });
       }}
-      render={({ values, handleChange, handleBlur, handleSubmit }) => (
-        <Form name="post" onSubmit={handleSubmit}>
-          {createFormFields({
-            handleChange,
-            handleBlur,
-            schema,
-            values,
-            formItemLayout,
-            customFields
-          })}
-          <FormItem {...tailFormItemLayout}>
-            <Button color="primary" type="submit">
-              Save
-            </Button>
-          </FormItem>
-        </Form>
-      )}
     />
   );
 };
@@ -70,7 +35,6 @@ FormView.propTypes = {
   schema: PropTypes.object.isRequired,
   createEntry: PropTypes.func.isRequired,
   title: PropTypes.string.isRequired,
-  customFields: PropTypes.object,
   data: PropTypes.object
 };
 
diff --git a/packages/client/src/modules/common/components/crud/ListView.web.jsx b/packages/client/src/modules/common/components/crud/ListView.web.jsx
index 8b1434ac86..44cbc294b6 100644
--- a/packages/client/src/modules/common/components/crud/ListView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/ListView.web.jsx
@@ -313,7 +313,6 @@ class ListView extends React.Component {
     };
 
     const footer = () => {
-      const domainValidator = new DomainValidator();
       return (
         <Row>
           <Col span={2}>
@@ -342,7 +341,7 @@ class ListView extends React.Component {
               <Formik
                 initialValues={mapFormPropsToValues({ schema })}
                 validate={values => {
-                  let rawErrors = domainValidator.validate(schema, values);
+                  let rawErrors = DomainValidator.validate(schema, values);
                   return computeDomainValidationErrors(rawErrors);
                 }}
                 onSubmit={async (values, { resetForm }) => {
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderNumber.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderNumber.jsx
index 9ffce52ee2..204513a9ee 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderNumber.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderNumber.jsx
@@ -12,7 +12,7 @@ export default class RenderNumber extends React.Component {
     placeholder: PropTypes.string,
     type: PropTypes.string,
     formItemLayout: PropTypes.object,
-    hasTypeOf: PropTypes.func.isRequired,
+    hasTypeOf: PropTypes.func,
     meta: PropTypes.object
   };
 
@@ -28,7 +28,7 @@ export default class RenderNumber extends React.Component {
     return (
       <FormItem label={label} {...formItemLayout}>
         <div>
-          <InputNumber {...input} placeholder={label || placeholder} invalid={touched && error} />
+          <InputNumber {...input} placeholder={label || placeholder} invalid={!!(touched && error)} />
           {touched && (error && <FormFeedback>{error}</FormFeedback>)}
         </div>
       </FormItem>
diff --git a/packages/server/package.json b/packages/server/package.json
index 579e95c91b..8a4c022db2 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -40,10 +40,10 @@
   "license": "MIT",
   "dependencies": {
     "@domain-schema/core": "^0.0.34",
-    "@domain-schema/formik": "^0.0.33",
+    "@domain-schema/formik": "^0.0.34",
     "@domain-schema/graphql": "^0.0.33",
     "@domain-schema/knex": "^0.0.35",
-    "@domain-schema/validation": "^0.0.35",
+    "@domain-schema/validation": "^0.0.36",
     "apollo-cache-inmemory": "^1.1.12",
     "apollo-cache-router": "^1.1.0",
     "apollo-client": "^2.3.4",
diff --git a/yarn.lock b/yarn.lock
index 1761a59dea..44b8f3c0d2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -554,12 +554,13 @@
   dependencies:
     debug "^3.1.0"
 
-"@domain-schema/formik@^0.0.33":
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/@domain-schema/formik/-/formik-0.0.33.tgz#76d223f897d98cffef8930262c987a0c485e2a29"
+"@domain-schema/formik@^0.0.34":
+  version "0.0.34"
+  resolved "https://registry.yarnpkg.com/@domain-schema/formik/-/formik-0.0.34.tgz#a5023113c5540def45aba2bfb1d5fb0b1c2ce461"
   dependencies:
     debug "^3.1.0"
     formik "^0.11.11"
+    humps "^2.0.1"
   optionalDependencies:
     react-test-renderer "^16.2.0"
     reactstrap "^6.0.1"
@@ -577,9 +578,9 @@
     debug "^3.1.0"
     humps "^2.0.1"
 
-"@domain-schema/validation@^0.0.35":
-  version "0.0.35"
-  resolved "https://registry.yarnpkg.com/@domain-schema/validation/-/validation-0.0.35.tgz#a636c046784a2703304eab88c237d504340deac1"
+"@domain-schema/validation@^0.0.36":
+  version "0.0.36"
+  resolved "https://registry.yarnpkg.com/@domain-schema/validation/-/validation-0.0.36.tgz#b4740e577e4c745710fb4388e857ee62f70e33ea"
   dependencies:
     debug "^3.1.0"
     humps "^2.0.1"

From fe52b2f0651c7525d57bd9f49d44d2b02c2cdbf5 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Mon, 23 Jul 2018 13:09:39 +0300
Subject: [PATCH 214/327] Add generate Formik function

---
 .../common/components/crud/FormView.web.jsx   | 19 ++------------
 .../common/components/crud/ListView.web.jsx   |  2 +-
 .../src/modules/common/generateFormik.js      | 25 +++++++++++++++++++
 3 files changed, 28 insertions(+), 18 deletions(-)
 create mode 100644 packages/client/src/modules/common/generateFormik.js

diff --git a/packages/client/src/modules/common/components/crud/FormView.web.jsx b/packages/client/src/modules/common/components/crud/FormView.web.jsx
index d233e59fe3..6e5f38ec21 100644
--- a/packages/client/src/modules/common/components/crud/FormView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/FormView.web.jsx
@@ -1,25 +1,10 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { DomainSchemaFormik } from '@domain-schema/formik';
 import { onSubmit } from '../../../../utils/crud';
-import { Form, Button, RenderField, RenderSwitch, RenderSelectQuery, RenderDate, RenderNumber } from '../web';
+import generateFormik from '../../generateFormik';
 
 const FormView = ({ schema, updateEntry, createEntry, title, data }) => {
-  const schemaFormik = new DomainSchemaFormik(schema);
-  schemaFormik.setFormComponents({
-    input: RenderField,
-    checkbox: RenderSwitch,
-    number: RenderNumber,
-    date: RenderDate,
-    select: RenderSelectQuery,
-    button: Button,
-    form: Form
-  });
-  const Formik = schemaFormik.generateForm({
-    label: 'Submit',
-    disableOnInvalid: false
-  });
-
+  const Formik = generateFormik(schema);
   return (
     <Formik
       values={data ? data.node : null}
diff --git a/packages/client/src/modules/common/components/crud/ListView.web.jsx b/packages/client/src/modules/common/components/crud/ListView.web.jsx
index 44cbc294b6..8b6a81e3d8 100644
--- a/packages/client/src/modules/common/components/crud/ListView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/ListView.web.jsx
@@ -341,7 +341,7 @@ class ListView extends React.Component {
               <Formik
                 initialValues={mapFormPropsToValues({ schema })}
                 validate={values => {
-                  let rawErrors = DomainValidator.validate(schema, values);
+                  const rawErrors = DomainValidator.validate(schema, values);
                   return computeDomainValidationErrors(rawErrors);
                 }}
                 onSubmit={async (values, { resetForm }) => {
diff --git a/packages/client/src/modules/common/generateFormik.js b/packages/client/src/modules/common/generateFormik.js
new file mode 100644
index 0000000000..46b26f831d
--- /dev/null
+++ b/packages/client/src/modules/common/generateFormik.js
@@ -0,0 +1,25 @@
+import { DomainSchemaFormik } from '@domain-schema/formik/lib/index';
+import { Button, RenderField, RenderNumber, Form, RenderDate, RenderSelectQuery, RenderSwitch } from './components/web';
+
+export default (schema, components = {}, buttonsConfig = {}, fieldsStyles = {}) => {
+  const schemaFormik = new DomainSchemaFormik(schema);
+  schemaFormik.setFormComponents({
+    input: RenderField,
+    checkbox: RenderSwitch,
+    number: RenderNumber,
+    date: RenderDate,
+    select: RenderSelectQuery,
+    button: Button,
+    form: Form,
+    ...components
+  });
+  const generateFormParams = {
+    ...(Object.keys(buttonsConfig).length !== 0 && buttonsConfig.constructor === Object
+      ? buttonsConfig
+      : {
+          label: 'Submit'
+        }),
+    ...(Object.keys(fieldsStyles).length !== 0 && fieldsStyles.constructor === Object ? fieldsStyles : {})
+  };
+  return schemaFormik.generateForm(...generateFormParams);
+};

From 6c0b4d540412e652da2833fadede3724be951013 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Mon, 23 Jul 2018 14:05:46 +0200
Subject: [PATCH 215/327] Fix pagiantion: wrong __typename being generated

---
 tools/templates/crud/client/containers/ModuleList.jsx | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tools/templates/crud/client/containers/ModuleList.jsx b/tools/templates/crud/client/containers/ModuleList.jsx
index dea6881f4d..bfcdf1c53f 100644
--- a/tools/templates/crud/client/containers/ModuleList.jsx
+++ b/tools/templates/crud/client/containers/ModuleList.jsx
@@ -115,14 +115,21 @@ export default compose(
               $module$sConnection: {
                 edges: [...previousResult.$module$sConnection.edges, ...newEdges],
                 pageInfo,
-                __typename: '$Module$sConnection'
+                __typename: '$Module$Connection'
               }
             };
           }
         });
       };
       if (error) throw new Error(error);
-      return { loading, data: $module$sConnection, loadMoreRows, refetch, subscribeToMore, errors: error ? error.graphQLErrors : null };
+      return {
+        loading,
+        data: $module$sConnection,
+        loadMoreRows,
+        refetch,
+        subscribeToMore,
+        errors: error ? error.graphQLErrors : null
+      };
     }
   }),
   graphql(UPDATE_$MODULE$, {

From ca84bde5f29644ea24ed23350195dc69ca6b962e Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Mon, 23 Jul 2018 16:16:15 +0300
Subject: [PATCH 216/327] Add cli-crud core functionality

---
 .prettierignore                               |   2 +
 .../src/modules/common/generatedSchemas.js    |   0
 tools/cli.js                                  |  18 +-
 tools/cli/commands/addModule.js               |  94 ++++++
 tools/cli/commands/deleteModule.js            | 134 ++++++++
 tools/cli/commands/updateSchema.js            | 291 ++++++++++++++++++
 tools/cli/helpers/util.js                     | 124 ++++++++
 tools/cli/module.js                           | 145 ++-------
 .../crud/client/components/Module.jsx         |  37 +++
 .../crud/client/components/Module.web.jsx     |  38 +++
 .../crud/client/containers/Module.spec.js     |  17 +
 .../crud/client/containers/ModuleEdit.jsx     |  87 ++++++
 .../crud/client/containers/ModuleFilter.jsx   |  34 ++
 .../crud/client/containers/ModuleList.jsx     | 215 +++++++++++++
 .../crud/client/containers/ModuleQuery.jsx    |  27 ++
 .../crud/client/graphql/CreateModule.graphql  |  13 +
 .../client/graphql/DeleteManyModules.graphql  |   9 +
 .../crud/client/graphql/DeleteModule.graphql  |  11 +
 .../crud/client/graphql/Module.graphql        |   4 +
 .../crud/client/graphql/ModuleQuery.graphql   |   9 +
 .../client/graphql/ModuleState.client.graphql |  12 +
 .../graphql/ModuleStateQuery.client.graphql   |   7 +
 .../crud/client/graphql/ModulesQuery.graphql  |  13 +
 .../graphql/ModulesSubscription.graphql       |  10 +
 .../crud/client/graphql/SortModules.graphql   |   9 +
 .../graphql/UpdateFilter.client.graphql       |   5 +
 .../client/graphql/UpdateManyModules.graphql  |   9 +
 .../crud/client/graphql/UpdateModule.graphql  |  13 +
 .../graphql/UpdateOrderBy.client.graphql      |   5 +
 tools/templates/crud/client/index.native.jsx  |  61 ++++
 tools/templates/crud/client/index.web.jsx     |  40 +++
 .../templates/crud/client/resolvers/index.js  |  79 +++++
 .../crud/database/migrations/_Module.js       |   7 +
 .../templates/crud/database/seeds/_Module.js  |   7 +
 .../{module => crud}/server/Module.spec.js    |   0
 tools/templates/crud/server/index.js          |  10 +
 tools/templates/crud/server/resolvers.js      |  56 ++++
 tools/templates/crud/server/schema.graphql    |  64 ++++
 tools/templates/crud/server/schema.js         |  12 +
 tools/templates/crud/server/sql.js            |   9 +
 .../client/components/ModuleView.web.jsx      |   2 +-
 .../module/client/containers/Module.jsx       |   6 +-
 .../module/client/graphql/ModuleQuery.graphql |   1 -
 .../client/{index.jsx => index.native.jsx}    |   0
 tools/templates/module/client/index.web.jsx   |   2 +-
 tools/templates/module/server/index.js        |   9 +-
 tools/templates/module/server/resolvers.js    |   6 -
 tools/templates/module/server/schema.graphql  |   5 -
 48 files changed, 1626 insertions(+), 142 deletions(-)
 create mode 100644 .prettierignore
 create mode 100644 packages/server/src/modules/common/generatedSchemas.js
 create mode 100644 tools/cli/commands/addModule.js
 create mode 100644 tools/cli/commands/deleteModule.js
 create mode 100644 tools/cli/commands/updateSchema.js
 create mode 100644 tools/cli/helpers/util.js
 create mode 100644 tools/templates/crud/client/components/Module.jsx
 create mode 100644 tools/templates/crud/client/components/Module.web.jsx
 create mode 100644 tools/templates/crud/client/containers/Module.spec.js
 create mode 100644 tools/templates/crud/client/containers/ModuleEdit.jsx
 create mode 100644 tools/templates/crud/client/containers/ModuleFilter.jsx
 create mode 100644 tools/templates/crud/client/containers/ModuleList.jsx
 create mode 100644 tools/templates/crud/client/containers/ModuleQuery.jsx
 create mode 100644 tools/templates/crud/client/graphql/CreateModule.graphql
 create mode 100644 tools/templates/crud/client/graphql/DeleteManyModules.graphql
 create mode 100644 tools/templates/crud/client/graphql/DeleteModule.graphql
 create mode 100644 tools/templates/crud/client/graphql/Module.graphql
 create mode 100644 tools/templates/crud/client/graphql/ModuleQuery.graphql
 create mode 100644 tools/templates/crud/client/graphql/ModuleState.client.graphql
 create mode 100644 tools/templates/crud/client/graphql/ModuleStateQuery.client.graphql
 create mode 100644 tools/templates/crud/client/graphql/ModulesQuery.graphql
 create mode 100644 tools/templates/crud/client/graphql/ModulesSubscription.graphql
 create mode 100644 tools/templates/crud/client/graphql/SortModules.graphql
 create mode 100644 tools/templates/crud/client/graphql/UpdateFilter.client.graphql
 create mode 100644 tools/templates/crud/client/graphql/UpdateManyModules.graphql
 create mode 100644 tools/templates/crud/client/graphql/UpdateModule.graphql
 create mode 100644 tools/templates/crud/client/graphql/UpdateOrderBy.client.graphql
 create mode 100644 tools/templates/crud/client/index.native.jsx
 create mode 100644 tools/templates/crud/client/index.web.jsx
 create mode 100644 tools/templates/crud/client/resolvers/index.js
 create mode 100644 tools/templates/crud/database/migrations/_Module.js
 create mode 100644 tools/templates/crud/database/seeds/_Module.js
 rename tools/templates/{module => crud}/server/Module.spec.js (100%)
 create mode 100644 tools/templates/crud/server/index.js
 create mode 100644 tools/templates/crud/server/resolvers.js
 create mode 100644 tools/templates/crud/server/schema.graphql
 create mode 100644 tools/templates/crud/server/schema.js
 create mode 100644 tools/templates/crud/server/sql.js
 delete mode 100644 tools/templates/module/client/graphql/ModuleQuery.graphql
 rename tools/templates/module/client/{index.jsx => index.native.jsx} (100%)
 delete mode 100644 tools/templates/module/server/resolvers.js
 delete mode 100644 tools/templates/module/server/schema.graphql

diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 0000000000..6eae774147
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1,2 @@
+**/tools/templates/crud/client/graphql/*
+**/tools/templates/crud/server/*.graphql
\ No newline at end of file
diff --git a/packages/server/src/modules/common/generatedSchemas.js b/packages/server/src/modules/common/generatedSchemas.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tools/cli.js b/tools/cli.js
index 1a535a90d3..f54b027841 100644
--- a/tools/cli.js
+++ b/tools/cli.js
@@ -1,3 +1,6 @@
+require('babel-register')({ presets: ['env'], plugins: ['transform-class-properties'] });
+require('babel-polyfill');
+
 const prog = require('caporal');
 const moduleCmd = require('./cli/module');
 
@@ -12,6 +15,16 @@ prog
     'both'
   )
   .action((args, options, logger) => moduleCmd('addmodule', args, options, logger))
+  .command('addcrud', 'Create a new Module with CRUD')
+  .argument('<module>', 'Module name')
+  .argument(
+    '[location]',
+    'Where should new module be created. [both, server, client]',
+    ['both', 'server', 'client'],
+    'both'
+  )
+  .argument('[tablePrefix]', 'DB table prefix.')
+  .action((args, options, logger) => moduleCmd('addcrud', args, options, logger))
   .command('deletemodule', 'Delete a Module')
   .argument('<module>', 'Module name')
   .argument(
@@ -20,6 +33,9 @@ prog
     ['both', 'server', 'client'],
     'both'
   )
-  .action((args, options, logger) => moduleCmd('deletemodule', args, options, logger));
+  .action((args, options, logger) => moduleCmd('deletemodule', args, options, logger))
+  .command('updateschema', 'Update Module Schema')
+  .argument('<module>', 'Module name')
+  .action((args, options, logger) => moduleCmd('updateschema', args, options, logger));
 
 prog.parse(process.argv);
diff --git a/tools/cli/commands/addModule.js b/tools/cli/commands/addModule.js
new file mode 100644
index 0000000000..de25d0a718
--- /dev/null
+++ b/tools/cli/commands/addModule.js
@@ -0,0 +1,94 @@
+const shell = require('shelljs');
+const fs = require('fs');
+const chalk = require('chalk');
+const { pascalize } = require('humps');
+const { renameFiles, updateFileWithExports } = require('../helpers/util');
+
+/**
+ *
+ * @param logger
+ * @param templatePath
+ * @param module
+ * @param action
+ * @param tablePrefix
+ * @param location
+ */
+function addModule(logger, templatePath, module, action, tablePrefix, location) {
+  logger.info(`Copying ${location} files…`);
+
+  // pascalize
+  const Module = pascalize(module);
+
+  // create new module directory
+  const startPath = `${__dirname}/../../..`;
+  const mkdir = shell.mkdir(`${startPath}/packages/${location}/src/modules/${module}`);
+
+  // continue only if directory does not jet exist
+  if (mkdir.code === 0) {
+    const destinationPath = `${startPath}/packages/${location}/src/modules/${module}`;
+    renameFiles(destinationPath, templatePath, module, location);
+
+    logger.info(chalk.green(`✔ The ${location} files have been copied!`));
+
+    shell.cd('..');
+    // get module input data
+    const path = `${startPath}/packages/${location}/src/modules/index.js`;
+    let data = fs.readFileSync(path);
+
+    // extract Feature modules
+    const re = /Feature\(([^()]+)\)/g;
+    const match = re.exec(data);
+
+    // prepend import module
+    const prepend = `import ${module} from './${module}';\n`;
+    fs.writeFileSync(path, prepend + data);
+
+    // add module to Feature function
+    shell.ShellString(shell.cat('index.js').replace(RegExp(re, 'g'), `Feature(${module}, ${match[1]})`)).to('index.js');
+
+    if (action === 'addcrud' && location === 'client') {
+      const generatedContainerFile = 'generatedContainers.js';
+      const graphqlQuery = `${Module}Query`;
+      const options = {
+        pathToFileWithExports: `${startPath}/packages/${location}/src/modules/common/${generatedContainerFile}`,
+        exportName: graphqlQuery,
+        importString: `import ${graphqlQuery} from '../${module}/containers/${graphqlQuery}';\n`
+      };
+      updateFileWithExports(options);
+    }
+
+    if (action === 'addcrud' && location === 'server') {
+      console.log('copy database files');
+      const destinationPath = `${startPath}/packages/${location}/src/database`;
+      renameFiles(destinationPath, templatePath, module, 'database');
+
+      const timestamp = new Date().getTime();
+      shell.cd(`${startPath}/packages/${location}/src/database/migrations`);
+      shell.mv(`_${Module}.js`, `${timestamp}_${Module}.js`);
+      shell.cd(`${startPath}/packages/${location}/src/database/seeds`);
+      shell.mv(`_${Module}.js`, `${timestamp}_${Module}.js`);
+
+      logger.info(chalk.green(`✔ The database files have been copied!`));
+
+      if (tablePrefix !== '') {
+        shell.cd(`${startPath}/packages/${location}/src/modules/${module}`);
+        shell.sed('-i', /this.prefix = '';/g, `this.prefix = '${tablePrefix}';`, 'sql.js');
+
+        logger.info(chalk.green(`✔ Inserted db table prefix!`));
+      }
+
+      const generatedSchemasFile = 'generatedSchemas.js';
+      const schema = `${Module}Schema`;
+      const options = {
+        pathToFileWithExports: `${startPath}/packages/${location}/src/modules/common/${generatedSchemasFile}`,
+        exportName: schema,
+        importString: `import { ${schema} } from '../${module}/schema';\n`
+      };
+      updateFileWithExports(options);
+    }
+
+    logger.info(chalk.green(`✔ Module for ${location} successfully created!`));
+  }
+}
+
+module.exports = addModule;
diff --git a/tools/cli/commands/deleteModule.js b/tools/cli/commands/deleteModule.js
new file mode 100644
index 0000000000..957ca4cb92
--- /dev/null
+++ b/tools/cli/commands/deleteModule.js
@@ -0,0 +1,134 @@
+const shell = require('shelljs');
+const fs = require('fs');
+const chalk = require('chalk');
+const { pascalize } = require('humps');
+const readline = require('readline');
+
+const { deleteFromFileWithExports } = require('../helpers/util');
+/**
+ *
+ * @param logger
+ * @param templatePath
+ * @param module
+ * @param location
+ */
+async function deleteModule(logger, templatePath, module, location) {
+  logger.info(`Deleting ${location} files…`);
+
+  // pascalize
+  const Module = pascalize(module);
+  const startPath = `${__dirname}/../../..`;
+  const modulePath = `${startPath}/packages/${location}/src/modules/${module}`;
+  const generatedContainerFile = 'generatedContainers.js';
+  const generatedContainerPath = `${startPath}/packages/${location}/src/modules/common/${generatedContainerFile}`;
+  const generatedSchemasFile = 'generatedSchemas.js';
+  const generatedSchemaPath = `${startPath}/packages/${location}/src/modules/common/${generatedSchemasFile}`;
+  let userAnswer;
+
+  if (fs.existsSync(modulePath)) {
+    if (location === 'server') {
+      // get list of migrations
+      const migrationNames = shell.find(`${startPath}/packages/${location}/src/database/migrations/`);
+
+      // open server directory
+      shell.cd(`${startPath}/packages/server`);
+
+      const isLastCreated = !!(migrationNames && migrationNames[migrationNames.length - 1].match(`_${Module}.js`));
+      const isExecuted = shell.exec('yarn knex-migrate list', { silent: true }).includes(`_${Module}.js`);
+
+      if (isLastCreated && isExecuted) {
+        // open server directory
+        shell.cd(`${startPath}/packages/server`);
+        // rollback migration
+        shell.exec('yarn knex-migrate down');
+        logger.info(chalk.green(`✔ Rollback migration was successfully!`));
+      } else if (isExecuted) {
+        const rl = readline.createInterface({
+          input: process.stdin,
+          output: process.stdout
+        });
+
+        const askQuestion = () => {
+          return new Promise(resolve => {
+            rl.question(`The table ${module} won't be deleted. Do you want continue y/n?\n`, answer => {
+              rl.close(answer);
+              resolve(answer);
+            });
+          });
+        };
+
+        do {
+          userAnswer = await askQuestion();
+        } while (userAnswer !== 'y' && userAnswer !== 'n');
+      }
+
+      if (userAnswer === 'n') {
+        return;
+      }
+
+      // change to database migrations directory
+      shell.cd(`${startPath}/packages/${location}/src/database/migrations`);
+      // check if any migrations files for this module existed
+      if (shell.find('.').filter(file => file.search(`_${Module}.js`) > -1).length > 0) {
+        let okMigrations = shell.rm(`*_${Module}.js`);
+        if (okMigrations) {
+          logger.info(chalk.green(`✔ Database migrations files successfully deleted!`));
+        }
+      }
+
+      // change to database seeds directory
+      shell.cd(`${startPath}/packages/${location}/src/database/seeds`);
+      // check if any seed files for this module exist
+      if (shell.find('.').filter(file => file.search(`_${Module}.js`) > -1).length > 0) {
+        let okSeeds = shell.rm(`*_${Module}.js`);
+        if (okSeeds) {
+          logger.info(chalk.green(`✔ Database seed files successfully deleted!`));
+        }
+      }
+    }
+
+    // remove module directory
+    shell.rm('-rf', modulePath);
+
+    // change to destination directory
+    shell.cd(`${startPath}/packages/${location}/src/modules/`);
+
+    // get module input data
+    const path = `${startPath}/packages/${location}/src/modules/index.js`;
+    let data = fs.readFileSync(path);
+
+    // extract Feature modules
+    const re = /Feature\(([^()]+)\)/g;
+    const match = re.exec(data);
+    const modules = match[1].split(',').filter(featureModule => featureModule.trim() !== module);
+
+    // remove import module line
+    const lines = data
+      .toString()
+      .split('\n')
+      .filter(line => line.match(`import ${module} from './${module}';`) === null);
+    fs.writeFileSync(path, lines.join('\n'));
+
+    // remove module from Feature function
+    //shell.sed('-i', re, `Feature(${modules.toString().trim()})`, 'index.js');
+    shell
+      .ShellString(shell.cat('index.js').replace(RegExp(re, 'g'), `Feature(${modules.toString().trim()})`))
+      .to('index.js');
+
+    // continue only if directory does not jet exist
+    logger.info(chalk.green(`✔ Module for ${location} successfully deleted!`));
+  } else {
+    logger.info(chalk.red(`✘ Module ${location} location for ${modulePath} not found!`));
+  }
+
+  if (fs.existsSync(generatedContainerPath)) {
+    const graphqlQuery = `${Module}Query`;
+    deleteFromFileWithExports(generatedContainerPath, graphqlQuery);
+  }
+  if (fs.existsSync(generatedSchemaPath)) {
+    const schema = `${Module}Schema`;
+    deleteFromFileWithExports(generatedSchemaPath, schema);
+  }
+}
+
+module.exports = deleteModule;
diff --git a/tools/cli/commands/updateSchema.js b/tools/cli/commands/updateSchema.js
new file mode 100644
index 0000000000..199453fc52
--- /dev/null
+++ b/tools/cli/commands/updateSchema.js
@@ -0,0 +1,291 @@
+const shell = require('shelljs');
+const fs = require('fs');
+const chalk = require('chalk');
+const GraphQLGenerator = require('@domain-schema/graphql').default;
+const { pascalize, camelize } = require('humps');
+
+const { generateField } = require('../helpers/util');
+const schemas = require('../../../packages/server/src/modules/common/generatedSchemas');
+
+/**
+ *
+ * @param logger
+ * @param module
+ * @returns {*|void}
+ */
+function updateSchema(logger, module) {
+  logger.info(`Updating ${module} Schema…`);
+
+  // pascalize
+  const Module = pascalize(module);
+
+  const startPath = `${__dirname}/../../..`;
+  const modulePath = `${startPath}/packages/server/src/modules/${module}`;
+
+  if (fs.existsSync(modulePath)) {
+    // get module schema
+    const schema = schemas.default[`${Module}Schema`];
+
+    // get schema file
+    const pathSchema = `${startPath}/packages/server/src/modules/${module}/`;
+    if (fs.existsSync(pathSchema)) {
+      const file = `schema.graphql`;
+
+      // regenerate input fields
+      let inputCreate = '';
+      let inputUpdate = '';
+      let inputFilter = `  searchText: String\n`;
+      let manyInput = '';
+      for (const key of schema.keys()) {
+        const value = schema.values[key];
+        const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
+        if (value.type.isSchema) {
+          let required = value.optional ? '' : '!';
+          inputCreate += `  ${key}Id: Int${required}\n`;
+          inputUpdate += `  ${key}Id: Int\n`;
+          inputFilter += `  ${key}Id: Int\n`;
+        } else if (value.type.constructor !== Array) {
+          if (key !== 'id') {
+            inputCreate += `  ${key}: ${generateField(value)}\n`;
+            inputUpdate += `  ${key}: ${generateField(value, true)}\n`;
+          }
+
+          if (hasTypeOf(Date)) {
+            inputFilter += `  ${key}_lte: ${generateField(value, true)}\n`;
+            inputFilter += `  ${key}_gte: ${generateField(value, true)}\n`;
+          } else {
+            inputFilter += `  ${key}: ${generateField(value, true)}\n`;
+          }
+        } else if (value.type.constructor === Array && value.type[0].isSchema) {
+          inputCreate += `  ${key}: ${pascalize(key)}CreateManyInput\n`;
+          inputUpdate += `  ${key}: ${pascalize(key)}UpdateManyInput\n`;
+
+          manyInput += `
+
+input ${pascalize(key)}CreateManyInput {
+  create: [${pascalize(value.type[0].name)}CreateInput!]
+}
+
+input ${pascalize(key)}UpdateManyInput {
+  create: [${pascalize(value.type[0].name)}CreateInput!]
+  delete: [${pascalize(value.type[0].name)}WhereUniqueInput!]
+  update: [${pascalize(value.type[0].name)}UpdateWhereInput!]
+}
+
+input ${pascalize(value.type[0].name)}UpdateWhereInput {
+  where: ${pascalize(value.type[0].name)}WhereUniqueInput!
+  data: ${pascalize(value.type[0].name)}UpdateInput!
+}`;
+        }
+      }
+
+      shell.cd(pathSchema);
+      // override Module type in schema.graphql file
+      const replaceType = `### schema type definitions([^()]+)### end schema type definitions`;
+      shell
+        .ShellString(
+          shell
+            .cat(file)
+            .replace(
+              RegExp(replaceType, 'g'),
+              `### schema type definitions\n${new GraphQLGenerator().generateTypes(
+                schema
+              )}${manyInput}\n\n### end schema type definitions`
+            )
+        )
+        .to(file);
+
+      // override ModuleCreateInput in schema.graphql file
+      const replaceCreate = `input ${Module}CreateInput {([^}])*\\n}`;
+      shell
+        .ShellString(
+          shell.cat(file).replace(RegExp(replaceCreate, 'g'), `input ${Module}CreateInput {\n${inputCreate}}`)
+        )
+        .to(file);
+
+      // override ModuleUpdateInput in schema.graphql file
+      const replaceUpdate = `input ${Module}UpdateInput {([^}])*\\n}`;
+      shell
+        .ShellString(
+          shell.cat(file).replace(RegExp(replaceUpdate, 'g'), `input ${Module}UpdateInput {\n${inputUpdate}}`)
+        )
+        .to(file);
+
+      // override ModuleFilterInput in schema.graphql file
+      const replaceFilter = `input ${Module}FilterInput {([^}])*\\n}`;
+      shell
+        .ShellString(
+          shell.cat(file).replace(RegExp(replaceFilter, 'g'), `input ${Module}FilterInput {\n${inputFilter}}`)
+        )
+        .to(file);
+
+      logger.info(chalk.green(`✔ Schema in ${pathSchema}${file} successfully updated!`));
+
+      const resolverFile = `resolvers.js`;
+      let replace = `  ${schema.name}: {
+`;
+      for (const key of schema.keys()) {
+        const value = schema.values[key];
+        if (value.type.constructor === Array) {
+          replace += `    ${key}: createBatchResolver((sources, args, ctx, info) => {
+      return ctx.${schema.name}.getByIds(sources.map(({ id }) => id), '${camelize(schema.name)}', ctx.${
+            value.type[0].name
+          }, info);
+    }),
+`;
+        }
+      }
+      replace += `  },
+`;
+
+      // override batch resolvers in resolvers.js file
+      const replaceBatchResolvers = `// schema batch resolvers([^*]+)// end schema batch resolvers`;
+      shell
+        .ShellString(
+          shell
+            .cat(resolverFile)
+            .replace(
+              RegExp(replaceBatchResolvers, 'g'),
+              `// schema batch resolvers\n${replace}  // end schema batch resolvers`
+            )
+        )
+        .to(resolverFile);
+
+      logger.info(chalk.green(`✔ Resolver in ${pathSchema}${resolverFile} successfully updated!`));
+    } else {
+      logger.error(chalk.red(`✘ Schema path ${pathSchema} not found!`));
+    }
+
+    // get fragment file
+    const pathFragment = `${startPath}/packages/client/src/modules/${module}/graphql/`;
+    if (fs.existsSync(pathFragment)) {
+      const fragmentGraphqlFile = `${Module}.graphql`;
+
+      // regenerate graphql fragment
+      let fragmentGraphql = '';
+      for (const key of schema.keys()) {
+        fragmentGraphql += regenerateGraphqlFragment(schema.values[key], key);
+      }
+
+      shell.cd(pathFragment);
+      // override graphql fragment file
+      const replaceFragment = `${Module} {(.|\n)*\n}`;
+      fragmentGraphql = shell
+        .cat(fragmentGraphqlFile)
+        .replace(RegExp(replaceFragment, 'g'), `${Module} {\n${fragmentGraphql}}`);
+      try {
+        fs.writeFileSync(pathFragment + fragmentGraphqlFile, fragmentGraphql);
+      } catch (err) {
+        return logger.error(chalk.red(`✘ Failed to write a ${pathFragment}${fragmentGraphqlFile} file!`));
+      }
+      logger.info(chalk.green(`✔ Fragment in ${pathFragment}${fragmentGraphqlFile} successfully updated!`));
+    } else {
+      logger.error(chalk.red(`✘ Fragment path ${pathFragment} not found!`));
+    }
+
+    // get state client file
+    const pathStateClient = `${startPath}/packages/client/src/modules/${module}/graphql/`;
+    if (fs.existsSync(pathStateClient)) {
+      const file = `${Module}State.client.graphql`;
+
+      // regenerate graphql fragment
+      let graphql = '';
+      for (const key of schema.keys()) {
+        const value = schema.values[key];
+        const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
+        if (value.type.isSchema) {
+          graphql += `    ${key}Id\n`;
+        } else {
+          if (hasTypeOf(Date)) {
+            graphql += `    ${key}_lte\n`;
+            graphql += `    ${key}_gte\n`;
+          } else {
+            graphql += `    ${key}\n`;
+          }
+        }
+      }
+      graphql += `    searchText
+  }\n`;
+
+      shell.cd(pathStateClient);
+      // override graphql fragment file
+      const replaceStateClient = `filter {(.|\n)*\n}\n`;
+      shell.ShellString(shell.cat(file).replace(RegExp(replaceStateClient, 'g'), `filter {\n${graphql}}\n`)).to(file);
+
+      logger.info(chalk.green(`✔ State Client in ${pathStateClient}${file} successfully updated!`));
+    } else {
+      logger.error(chalk.red(`✘ State Client path ${pathStateClient} not found!`));
+    }
+
+    // get state resolver file
+    const pathStateResolver = `${startPath}/packages/client/src/modules/${module}/resolvers/`;
+    if (fs.existsSync(pathStateResolver)) {
+      const file = `index.js`;
+
+      // regenerate resolver defaults
+      let defaults = `const defaultFilters = {\n`;
+      for (const key of schema.keys()) {
+        const value = schema.values[key];
+        const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
+        if (value.type.isSchema) {
+          defaults += `  ${key}Id: '',\n`;
+        } else {
+          if (hasTypeOf(Date)) {
+            defaults += `  ${key}_lte: '',\n`;
+            defaults += `  ${key}_gte: '',\n`;
+          } else {
+            defaults += `  ${key}: '',\n`;
+          }
+        }
+      }
+
+      defaults += `  searchText: ''
+};\n`;
+
+      shell.cd(pathStateResolver);
+      // override state resolver file
+      const replaceStateResolverDefaults = `// filter data([^*]+)// end filter data`;
+      shell
+        .ShellString(
+          shell
+            .cat(file)
+            .replace(RegExp(replaceStateResolverDefaults, 'g'), `// filter data\n${defaults}// end filter data`)
+        )
+        .to(file);
+
+      logger.info(chalk.green(`✔ State Resolver in ${pathStateResolver}${file} successfully updated!`));
+    } else {
+      logger.error(chalk.red(`✘ State Resolver path ${pathStateResolver} not found!`));
+    }
+  } else {
+    logger.info(chalk.red(`✘ Module ${module} in path ${modulePath} not found!`));
+  }
+}
+
+const regenerateGraphqlFragment = (value, key, spaces = '') => {
+  if (value.type.isSchema) {
+    let column = 'name';
+    for (const remoteKey of value.type.keys()) {
+      const remoteValue = value.type.values[remoteKey];
+      if (remoteValue.sortBy) {
+        column = remoteKey;
+      }
+    }
+    return `  ${key} {\n    ${spaces}id\n    ${spaces}${column}\n  ${spaces}}\n`;
+  } else if (value.type.constructor === Array && value.type[0].isSchema) {
+    let str = `  ${key} {\n`;
+    for (const remoteKey of value.type[0].keys()) {
+      const remoteValue = value.type[0].values[remoteKey];
+      if (remoteValue.type.isSchema) {
+        str += `  ${regenerateGraphqlFragment(remoteValue, remoteKey, '  ')}`;
+      } else if (remoteValue.type.constructor !== Array) {
+        str += `    ${remoteKey}\n`;
+      }
+    }
+    return str + `  }\n`;
+  } else {
+    return `  ${key}\n`;
+  }
+};
+
+module.exports = updateSchema;
diff --git a/tools/cli/helpers/util.js b/tools/cli/helpers/util.js
new file mode 100644
index 0000000000..4d3d78372c
--- /dev/null
+++ b/tools/cli/helpers/util.js
@@ -0,0 +1,124 @@
+const shell = require('shelljs');
+const fs = require('fs');
+const DomainSchema = require('@domain-schema/core').default;
+const { pascalize, decamelize } = require('humps');
+const { startCase } = require('lodash');
+
+/**
+ *
+ * @param destinationPath
+ * @param templatePath
+ * @param module
+ * @param location
+ */
+function renameFiles(destinationPath, templatePath, module, location) {
+  // pascalize
+  const Module = pascalize(module);
+
+  shell.cp('-R', `${templatePath}/${location}/*`, destinationPath);
+
+  // change to destination directory
+  shell.cd(destinationPath);
+
+  // rename files
+  shell.ls('-Rl', '.').forEach(entry => {
+    if (entry.isFile()) {
+      const moduleFile = entry.name.replace('Module', Module);
+      shell.mv(entry.name, moduleFile);
+    }
+  });
+
+  // replace module names
+  shell.ls('-Rl', '.').forEach(entry => {
+    if (entry.isFile()) {
+      shell.sed('-i', /\$module\$/g, module, entry.name);
+      shell.sed('-i', /\$_module\$/g, decamelize(module), entry.name);
+      shell.sed('-i', /\$Module\$/g, Module, entry.name);
+      shell.sed('-i', /\$MoDuLe\$/g, startCase(Module), entry.name);
+      shell.sed('-i', /\$MODULE\$/g, module.toUpperCase(), entry.name);
+    }
+  });
+}
+
+/**
+ *
+ * @param value
+ * @param update
+ * @returns {string}
+ */
+function generateField(value, update = false) {
+  let result = '';
+  const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
+  if (hasTypeOf(Boolean)) {
+    result += 'Boolean';
+  } else if (hasTypeOf(DomainSchema.ID)) {
+    result += 'ID';
+  } else if (hasTypeOf(DomainSchema.Int)) {
+    result += 'Int';
+  } else if (hasTypeOf(DomainSchema.Float)) {
+    result += 'Float';
+  } else if (hasTypeOf(String)) {
+    result += 'String';
+  } else if (hasTypeOf(Date)) {
+    result += 'Date';
+  } else if (hasTypeOf(DomainSchema.DateTime)) {
+    result += 'DateTime';
+  } else if (hasTypeOf(DomainSchema.Time)) {
+    result += 'Time';
+  }
+
+  if (!update && !value.optional) {
+    result += '!';
+  }
+
+  return result;
+}
+
+/**
+ *
+ * @param pathToFileWithExports
+ * @param exportName
+ * @param importString
+ */
+function updateFileWithExports({ pathToFileWithExports, exportName, importString }) {
+  const exportGraphqlContainer = `\nexport default {\n  ${exportName}\n};\n`;
+
+  if (fs.existsSync(pathToFileWithExports)) {
+    const generatedContainerData = fs.readFileSync(pathToFileWithExports);
+    const generatedContainer = generatedContainerData.toString().trim();
+    if (generatedContainer.length > 1) {
+      const index = generatedContainer.lastIndexOf("';");
+      const computedIndex = index >= 0 ? index + 3 : false;
+      if (computedIndex) {
+        let computedGeneratedContainer =
+          generatedContainer.slice(0, computedIndex) +
+          importString +
+          generatedContainer.slice(computedIndex, generatedContainer.length);
+        computedGeneratedContainer = computedGeneratedContainer.replace(/(,|)\s};/g, `,\n  ${exportName}\n};`);
+        return fs.writeFileSync(pathToFileWithExports, computedGeneratedContainer);
+      }
+    }
+  }
+  return fs.writeFileSync(pathToFileWithExports, importString + exportGraphqlContainer);
+}
+
+/**
+ *
+ * @param pathToFileWithExports
+ * @param exportName
+ */
+function deleteFromFileWithExports(pathToFileWithExports, exportName) {
+  if (fs.existsSync(pathToFileWithExports)) {
+    const generatedElementData = fs.readFileSync(pathToFileWithExports);
+    const reg = `(\\n\\s\\s${exportName}(.|)|import (${exportName}|{ ${exportName} }).+;\\n+(?!ex))`;
+    const generatedElement = generatedElementData.toString().replace(new RegExp(reg, 'g'), '');
+    fs.writeFileSync(pathToFileWithExports, generatedElement);
+  }
+}
+
+module.exports = {
+  renameFiles,
+  generateField,
+  updateFileWithExports,
+  deleteFromFileWithExports
+};
diff --git a/tools/cli/module.js b/tools/cli/module.js
index e062ae5a5a..fd0164b9cf 100644
--- a/tools/cli/module.js
+++ b/tools/cli/module.js
@@ -1,133 +1,50 @@
-const shell = require('shelljs');
 const fs = require('fs');
+const chalk = require('chalk');
+const addModule = require('./commands/addModule');
+const deleteModule = require('./commands/deleteModule');
+const updateSchema = require('./commands/updateSchema');
 
-String.prototype.toCamelCase = function() {
-  return this.replace(/^([A-Z])|\s(\w)/g, function(match, p1, p2) {
-    if (p2) return p2.toUpperCase();
-    return p1.toLowerCase();
-  });
-};
-
-String.prototype.capitalize = function() {
-  return this.charAt(0).toUpperCase() + this.slice(1);
-};
-
-function copyFiles(logger, templatePath, module, location) {
-  logger.info(`Copying ${location} files…`);
-
-  // create new module directory
-  const mkdir = shell.mkdir(`${__dirname}/../../packages/${location}/src/modules/${module}`);
-
-  // continue only if directory does not jet exist
-  if (mkdir.code === 0) {
-    const destinationPath = `${__dirname}/../../packages/${location}/src/modules/${module}`;
-    shell.cp('-R', `${templatePath}/${location}/*`, destinationPath);
-
-    logger.info(`✔ The ${location} files have been copied!`);
-
-    // change to destination directory
-    shell.cd(destinationPath);
-
-    // rename files
-    shell.ls('-Rl', '.').forEach(entry => {
-      if (entry.isFile()) {
-        const moduleFile = entry.name.replace('Module', module.capitalize());
-        shell.mv(entry.name, moduleFile);
-      }
-    });
-
-    // replace module names
-    shell.ls('-Rl', '.').forEach(entry => {
-      if (entry.isFile()) {
-        shell.sed('-i', /\$module\$/g, module, entry.name);
-        shell.sed('-i', /\$Module\$/g, module.toCamelCase().capitalize(), entry.name);
-      }
-    });
-
-    shell.cd('..');
-    // get module input data
-    const path = `${__dirname}/../../packages/${location}/src/modules/index.js`;
-    let data = fs.readFileSync(path);
-
-    // extract Feature modules
-    const re = /Feature\(([^()]+)\)/g;
-    const match = re.exec(data);
-
-    // prepend import module
-    const prepend = `import ${module} from './${module}';\n`;
-    fs.writeFileSync(path, prepend + data);
-
-    // add module to Feature function
-    shell.sed('-i', re, `Feature(${module}, ${match[1]})`, 'index.js');
-
-    logger.info(`✔ Module for ${location} successfully created!`);
+module.exports = (action, args, options, logger) => {
+  const module = args.module;
+  let location = 'both';
+  if (args.location) {
+    location = args.location;
   }
-}
-
-function deleteFiles(logger, templatePath, module, location) {
-  logger.info(`Deleting ${location} files…`);
-
-  const modulePath = `${__dirname}/../../packages/${location}/src/modules/${module}`;
-
-  if (fs.existsSync(modulePath)) {
-    // create new module directory
-    shell.rm('-rf', modulePath);
-
-    // change to destination directory
-    shell.cd(`${__dirname}/../../packages/${location}/src/modules/`);
-
-    // add module to Feature function
-    //let ok = shell.sed('-i', `import ${module} from '.\/${module}';`, '', 'index.js');
-
-    // get module input data
-    const path = `${__dirname}/../../packages/${location}/src/modules/index.js`;
-    let data = fs.readFileSync(path);
-
-    // extract Feature modules
-    const re = /Feature\(([^()]+)\)/g;
-    const match = re.exec(data);
-    const modules = match[1].split(',').filter(featureModule => featureModule.trim() !== module);
-
-    // remove import module line
-    const lines = data
-      .toString()
-      .split('\n')
-      .filter(line => line.match(`import ${module} from './${module}';`) === null);
-    fs.writeFileSync(path, lines.join('\n'));
-
-    // remove module from Feature function
-    shell.sed('-i', re, `Feature(${modules.toString().trim()})`, 'index.js');
-
-    // continue only if directory does not jet exist
-    logger.info(`✔ Module for ${location} successfully deleted!`);
-  } else {
-    logger.info(`✔ Module ${location} location for ${modulePath} wasn't found!`);
+  let tablePrefix = '';
+  if (args.tablePrefix) {
+    tablePrefix = args.tablePrefix;
+  }
+  console.log(tablePrefix);
+  let templatePath = `${__dirname}/../templates/module`;
+  if (action === 'addcrud') {
+    templatePath = `${__dirname}/../templates/crud`;
   }
-}
-
-module.exports = (action, args, options, logger) => {
-  const templatePath = `${__dirname}/../templates/module`;
 
   if (!fs.existsSync(templatePath)) {
-    logger.error(`The requested location for ${args.location} wasn't found.`);
+    logger.error(chalk.red(`The requested location for ${location} not found.`));
     process.exit(1);
   }
 
   // client
-  if (args.location === 'client' || args.location === 'both') {
-    if (action === 'addmodule') {
-      copyFiles(logger, templatePath, args.module, 'client');
+  if (location === 'client' || location === 'both') {
+    if (action === 'addmodule' || action === 'addcrud') {
+      addModule(logger, templatePath, module, action, tablePrefix, 'client');
     } else if (action === 'deletemodule') {
-      deleteFiles(logger, templatePath, args.module, 'client');
+      deleteModule(logger, templatePath, module, 'client');
     }
   }
 
   // server
-  if (args.location === 'server' || args.location === 'both') {
-    if (action === 'addmodule') {
-      copyFiles(logger, templatePath, args.module, 'server');
+  if (location === 'server' || location === 'both') {
+    if (action === 'addmodule' || action === 'addcrud') {
+      addModule(logger, templatePath, module, action, tablePrefix, 'server');
     } else if (action === 'deletemodule') {
-      deleteFiles(logger, templatePath, args.module, 'server');
+      deleteModule(logger, templatePath, module, 'server');
     }
   }
+
+  // update schema
+  if (action === 'updateschema') {
+    updateSchema(logger, module);
+  }
 };
diff --git a/tools/templates/crud/client/components/Module.jsx b/tools/templates/crud/client/components/Module.jsx
new file mode 100644
index 0000000000..59b72c186e
--- /dev/null
+++ b/tools/templates/crud/client/components/Module.jsx
@@ -0,0 +1,37 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { StyleSheet, Text, View } from 'react-native';
+
+export default class $Module$ extends React.Component {
+  static propTypes = {
+    title: PropTypes.string.isRequired
+  };
+
+  render() {
+    const { title } = this.props;
+    return (
+      <View style={styles.container}>
+        <View style={styles.element}>
+          <Text style={styles.box}>Hello {title}!</Text>
+        </View>
+      </View>
+    );
+  }
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    backgroundColor: '#fff',
+    alignItems: 'center',
+    justifyContent: 'center'
+  },
+  element: {
+    paddingTop: 30
+  },
+  box: {
+    textAlign: 'center',
+    marginLeft: 15,
+    marginRight: 15
+  }
+});
diff --git a/tools/templates/crud/client/components/Module.web.jsx b/tools/templates/crud/client/components/Module.web.jsx
new file mode 100644
index 0000000000..ef88b4b4b0
--- /dev/null
+++ b/tools/templates/crud/client/components/Module.web.jsx
@@ -0,0 +1,38 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Helmet from 'react-helmet';
+import { PageLayout } from '../../common/components/web';
+
+import $Module$Filter from '../containers/$Module$Filter';
+import $Module$List from '../containers/$Module$List';
+import settings from '../../../../../../settings';
+
+export default class $Module$ extends React.PureComponent {
+  static propTypes = {
+    title: PropTypes.string.isRequired
+  };
+
+  renderMetaData = title => (
+    <Helmet
+      title={`${settings.app.name} - ${title}`}
+      meta={[
+        {
+          name: 'description',
+          content: `${settings.app.name} - ${title} page`
+        }
+      ]}
+    />
+  );
+
+  render() {
+    const { title } = this.props;
+    return (
+      <PageLayout>
+        {this.renderMetaData(title)}
+        <h2>{title}</h2>
+        <$Module$Filter {...this.props} />
+        <$Module$List {...this.props} />
+      </PageLayout>
+    );
+  }
+}
diff --git a/tools/templates/crud/client/containers/Module.spec.js b/tools/templates/crud/client/containers/Module.spec.js
new file mode 100644
index 0000000000..ac34fe5ce1
--- /dev/null
+++ b/tools/templates/crud/client/containers/Module.spec.js
@@ -0,0 +1,17 @@
+import { expect } from 'chai';
+import { step } from 'mocha-steps';
+import Renderer from '../../../testHelpers/Renderer';
+import Routes from '../../../app/Routes';
+
+describe('$Module$ UI works', () => {
+  const renderer = new Renderer({});
+  let app;
+  let content;
+
+  step('$Module$ page renders on mount', () => {
+    app = renderer.mount(Routes);
+    renderer.history.push('/$module$');
+    content = app.find('#content');
+    expect(content).to.not.be.empty;
+  });
+});
diff --git a/tools/templates/crud/client/containers/ModuleEdit.jsx b/tools/templates/crud/client/containers/ModuleEdit.jsx
new file mode 100644
index 0000000000..c45b7b3ecd
--- /dev/null
+++ b/tools/templates/crud/client/containers/ModuleEdit.jsx
@@ -0,0 +1,87 @@
+import React from 'react';
+import { graphql, compose } from 'react-apollo';
+
+import { EditView } from '../../common/components/crud';
+import { $Module$Schema } from '../../../../../server/src/modules/$module$/schema';
+import $MODULE$_QUERY from '../graphql/$Module$Query.graphql';
+import CREATE_$MODULE$ from '../graphql/Create$Module$.graphql';
+import UPDATE_$MODULE$ from '../graphql/Update$Module$.graphql';
+
+class $Module$Edit extends React.Component {
+  render() {
+    return <EditView {...this.props} schema={$Module$Schema} />;
+  }
+}
+
+export default compose(
+  graphql($MODULE$_QUERY, {
+    options: props => {
+      let id = 0;
+      if (props.match) {
+        id = props.match.params.id;
+      } else if (props.navigation) {
+        id = props.navigation.state.params.id;
+      }
+
+      return {
+        fetchPolicy: 'cache-and-network',
+        variables: { where: { id } }
+      };
+    },
+    props({ data: { loading, $module$ } }) {
+      return { loading, data: $module$ };
+    }
+  }),
+  graphql(CREATE_$MODULE$, {
+    props: ({ ownProps: { history, navigation }, mutate }) => ({
+      createEntry: async data => {
+        try {
+          const {
+            data: { create$Module$ }
+          } = await mutate({
+            variables: { data }
+          });
+
+          if (create$Module$.errors) {
+            return { errors: create$Module$.errors };
+          }
+
+          if (history) {
+            return history.push('/$module$');
+          }
+          if (navigation) {
+            return navigation.goBack();
+          }
+        } catch (e) {
+          console.log(e.graphQLErrors);
+        }
+      }
+    })
+  }),
+  graphql(UPDATE_$MODULE$, {
+    props: ({ ownProps: { history, navigation }, mutate }) => ({
+      updateEntry: async (data, where) => {
+        try {
+          const {
+            data: { update$Module$ }
+          } = await mutate({
+            variables: { data, where }
+          });
+
+          if (update$Module$.errors) {
+            return { errors: update$Module$.errors };
+          }
+
+          if (history) {
+            return history.push('/$module$');
+          }
+          if (navigation) {
+            return navigation.goBack();
+          }
+        } catch (e) {
+          console.log(e.graphQLErrors);
+        }
+      }
+    })
+  })
+)($Module$Edit);
diff --git a/tools/templates/crud/client/containers/ModuleFilter.jsx b/tools/templates/crud/client/containers/ModuleFilter.jsx
new file mode 100644
index 0000000000..457b546f59
--- /dev/null
+++ b/tools/templates/crud/client/containers/ModuleFilter.jsx
@@ -0,0 +1,34 @@
+import React from 'react';
+import { graphql, compose } from 'react-apollo';
+
+import { removeTypename } from '../../../../../common/utils';
+import { FilterView } from '../../common/components/crud';
+import { $Module$Schema } from '../../../../../server/src/modules/$module$/schema';
+
+import $MODULE$_STATE_QUERY from '../graphql/$Module$StateQuery.client.graphql';
+import UPDATE_FILTER from '../graphql/UpdateFilter.client.graphql';
+
+class $Module$Filter extends React.Component {
+  render() {
+    return <FilterView {...this.props} schema={$Module$Schema} />;
+  }
+}
+
+export default compose(
+  graphql($MODULE$_STATE_QUERY, {
+    props({
+      data: {
+        $module$State: { filter }
+      }
+    }) {
+      return removeTypename(filter);
+    }
+  }),
+  graphql(UPDATE_FILTER, {
+    props: ({ mutate }) => ({
+      onFilterChange(filter) {
+        mutate({ variables: { filter } });
+      }
+    })
+  })
+)($Module$Filter);
diff --git a/tools/templates/crud/client/containers/ModuleList.jsx b/tools/templates/crud/client/containers/ModuleList.jsx
new file mode 100644
index 0000000000..0a71141909
--- /dev/null
+++ b/tools/templates/crud/client/containers/ModuleList.jsx
@@ -0,0 +1,215 @@
+import React from 'react';
+import { graphql, compose } from 'react-apollo';
+import update from 'immutability-helper';
+import PropTypes from 'prop-types';
+
+import { removeTypename, removeEmpty } from '../../../../../common/utils';
+import { ListView } from '../../common/components/crud';
+import { updateEntry, deleteEntry } from '../../common/crud';
+import { $Module$Schema } from '../../../../../server/src/modules/$module$/schema';
+
+import $MODULE$_STATE_QUERY from '../graphql/$Module$StateQuery.client.graphql';
+import UPDATE_ORDER_BY from '../graphql/UpdateOrderBy.client.graphql';
+import $MODULE$S_QUERY from '../graphql/$Module$sQuery.graphql';
+import UPDATE_$MODULE$ from '../graphql/Update$Module$.graphql';
+import DELETE_$MODULE$ from '../graphql/Delete$Module$.graphql';
+import SORT_$MODULE$S from '../graphql/Sort$Module$s.graphql';
+import DELETEMANY_$MODULE$S from '../graphql/DeleteMany$Module$s.graphql';
+import UPDATEMANY_$MODULE$S from '../graphql/UpdateMany$Module$s.graphql';
+import $MODULE$S_SUBSCRIPTION from '../graphql/$Module$sSubscription.graphql';
+
+function Add$Module$(prev, node) {
+  return update(prev, {
+    $module$sConnection: {
+      totalCount: {
+        $set: prev.$module$sConnection.totalCount + 1
+      },
+      edges: {
+        $set: [...prev.$module$sConnection.edges, node]
+      }
+    }
+  });
+}
+
+class $Module$ extends React.Component {
+  static propTypes = {
+    subscribeToMore: PropTypes.func.isRequired
+  };
+
+  constructor(props) {
+    super(props);
+    this.subscription = null;
+  }
+
+  componentDidMount() {
+    this.init$Module$ListSubscription();
+  }
+
+  componentWillUnmount() {
+    if (this.subscription) {
+      // unsubscribe
+      this.subscription();
+      this.subscription = null;
+    }
+  }
+
+  init$Module$ListSubscription() {
+    if (!this.subscription) {
+      this.subscribeTo$Module$sList();
+    }
+  }
+
+  subscribeTo$Module$sList = () => {
+    const { subscribeToMore } = this.props;
+
+    this.subscription = subscribeToMore({
+      document: $MODULE$S_SUBSCRIPTION,
+      updateQuery: (
+        prev,
+        {
+          subscriptionData: {
+            data: {
+              $module$sUpdated: { mutation, node }
+            }
+          }
+        }
+      ) => {
+        let newResult = prev;
+
+        if (mutation === 'CREATED') {
+          newResult = Add$Module$(prev, node);
+        }
+        return newResult;
+      }
+    });
+  };
+  render() {
+    return <ListView {...this.props} schema={$Module$Schema} />;
+  }
+}
+
+export default compose(
+  graphql($MODULE$_STATE_QUERY, {
+    props({ data: { $module$State } }) {
+      return removeTypename($module$State);
+    }
+  }),
+  graphql($MODULE$S_QUERY, {
+    options: ({ limit, orderBy, filter }) => {
+      return {
+        fetchPolicy: 'cache-and-network',
+        variables: { limit, orderBy, filter: removeEmpty(filter) }
+      };
+    },
+    props: ({ data: { loading, $module$sConnection, refetch, error, fetchMore, subscribeToMore } }) => {
+      const loadMoreRows = () => {
+        return fetchMore({
+          variables: {
+            offset: $module$sConnection.edges.length
+          },
+          updateQuery: (previousResult, { fetchMoreResult }) => {
+            const newEdges = fetchMoreResult.$module$sConnection.edges;
+            const pageInfo = fetchMoreResult.$module$sConnection.pageInfo;
+
+            return {
+              $module$sConnection: {
+                edges: [...previousResult.$module$sConnection.edges, ...newEdges],
+                pageInfo,
+                __typename: '$Module$sConnection'
+              }
+            };
+          }
+        });
+      };
+      if (error) throw new Error(error);
+      return {
+        loading,
+        data: $module$sConnection,
+        loadMoreRows,
+        refetch,
+        subscribeToMore,
+        errors: error ? error.graphQLErrors : null
+      };
+    }
+  }),
+  graphql(UPDATE_$MODULE$, {
+    props: props => ({
+      updateEntry: args => updateEntry(props, args, 'update$Module$')
+    })
+  }),
+  graphql(DELETE_$MODULE$, {
+    props: props => ({
+      deleteEntry: args => deleteEntry(props, args, 'delete$Module$')
+    })
+  }),
+  graphql(SORT_$MODULE$S, {
+    props: ({ ownProps: { refetch }, mutate }) => ({
+      sortEntries: async data => {
+        try {
+          const {
+            data: { sort$Module$s }
+          } = await mutate({
+            variables: { data }
+          });
+
+          if (sort$Module$s.errors) {
+            return { errors: sort$Module$s.errors };
+          }
+
+          refetch();
+        } catch (e) {
+          console.log(e.graphQLErrors);
+        }
+      }
+    })
+  }),
+  graphql(DELETEMANY_$MODULE$S, {
+    props: ({ ownProps: { refetch }, mutate }) => ({
+      deleteManyEntries: async where => {
+        try {
+          const {
+            data: { deleteMany$Module$s }
+          } = await mutate({
+            variables: { where }
+          });
+
+          if (deleteMany$Module$s.errors) {
+            return { errors: deleteMany$Module$s.errors };
+          }
+
+          refetch();
+        } catch (e) {
+          console.log(e.graphQLErrors);
+        }
+      }
+    })
+  }),
+  graphql(UPDATEMANY_$MODULE$S, {
+    props: ({ ownProps: { refetch }, mutate }) => ({
+      updateManyEntries: async (data, where) => {
+        try {
+          const {
+            data: { updateMany$Module$s }
+          } = await mutate({
+            variables: { data: removeEmpty(data), where }
+          });
+
+          if (updateMany$Module$s.errors) {
+            return { errors: updateMany$Module$s.errors };
+          }
+
+          refetch();
+        } catch (e) {
+          console.log(e.graphQLErrors);
+        }
+      }
+    })
+  }),
+  graphql(UPDATE_ORDER_BY, {
+    props: ({ mutate }) => ({
+      onOrderBy: orderBy => {
+        mutate({ variables: { orderBy } });
+      }
+    })
+  })
+)($Module$);
diff --git a/tools/templates/crud/client/containers/ModuleQuery.jsx b/tools/templates/crud/client/containers/ModuleQuery.jsx
new file mode 100644
index 0000000000..9d0a5f7f94
--- /dev/null
+++ b/tools/templates/crud/client/containers/ModuleQuery.jsx
@@ -0,0 +1,27 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { graphql } from 'react-apollo';
+
+import $MODULE$S_QUERY from '../graphql/$Module$sQuery.graphql';
+
+class $Module$sQuery extends React.Component {
+  static propTypes = {
+    children: PropTypes.func.isRequired,
+    loading: PropTypes.bool.isRequired,
+    data: PropTypes.object,
+    errors: PropTypes.object
+  };
+
+  render() {
+    const { loading, data, errors } = this.props;
+    return this.props.children({ loading, data, errors });
+  }
+}
+
+export default graphql($MODULE$S_QUERY, {
+  options: ({ limit, orderBy, filter }) => ({ variables: { limit, orderBy, filter } }),
+  props: ({ data: { loading, $module$sConnection, error } }) => {
+    if (error) throw new Error(error);
+    return { loading, data: $module$sConnection, errors: error ? error.graphQLErrors : null };
+  }
+})($Module$sQuery);
diff --git a/tools/templates/crud/client/graphql/CreateModule.graphql b/tools/templates/crud/client/graphql/CreateModule.graphql
new file mode 100644
index 0000000000..27f604e763
--- /dev/null
+++ b/tools/templates/crud/client/graphql/CreateModule.graphql
@@ -0,0 +1,13 @@
+#import "./$Module$.graphql"
+
+mutation create$Module$($data: $Module$CreateInput!) {
+  create$Module$(data: $data) {
+    node {
+      ...$Module$Info
+    }
+    errors {
+      field
+      message
+    }
+  }
+}
diff --git a/tools/templates/crud/client/graphql/DeleteManyModules.graphql b/tools/templates/crud/client/graphql/DeleteManyModules.graphql
new file mode 100644
index 0000000000..70a9836a66
--- /dev/null
+++ b/tools/templates/crud/client/graphql/DeleteManyModules.graphql
@@ -0,0 +1,9 @@
+mutation deleteMany$Module$s($where: $Module$WhereInput!) {
+  deleteMany$Module$s(where: $where) {
+    count
+    errors {
+      field
+      message
+    }
+  }
+}
diff --git a/tools/templates/crud/client/graphql/DeleteModule.graphql b/tools/templates/crud/client/graphql/DeleteModule.graphql
new file mode 100644
index 0000000000..316dd1ff23
--- /dev/null
+++ b/tools/templates/crud/client/graphql/DeleteModule.graphql
@@ -0,0 +1,11 @@
+mutation delete$Module$($where: $Module$WhereUniqueInput!) {
+  delete$Module$(where: $where) {
+    node {
+      id
+    }
+    errors {
+      field
+      message
+    }
+  }
+}
diff --git a/tools/templates/crud/client/graphql/Module.graphql b/tools/templates/crud/client/graphql/Module.graphql
new file mode 100644
index 0000000000..a6d63fad05
--- /dev/null
+++ b/tools/templates/crud/client/graphql/Module.graphql
@@ -0,0 +1,4 @@
+fragment $Module$Info on $Module$ {
+  id
+  name
+}
\ No newline at end of file
diff --git a/tools/templates/crud/client/graphql/ModuleQuery.graphql b/tools/templates/crud/client/graphql/ModuleQuery.graphql
new file mode 100644
index 0000000000..76df5c5591
--- /dev/null
+++ b/tools/templates/crud/client/graphql/ModuleQuery.graphql
@@ -0,0 +1,9 @@
+#import "./$Module$.graphql"
+
+query $module$($where: $Module$WhereUniqueInput!) {
+  $module$(where: $where) {
+    node {
+      ...$Module$Info
+    }
+  }
+}
diff --git a/tools/templates/crud/client/graphql/ModuleState.client.graphql b/tools/templates/crud/client/graphql/ModuleState.client.graphql
new file mode 100644
index 0000000000..6f653cfdab
--- /dev/null
+++ b/tools/templates/crud/client/graphql/ModuleState.client.graphql
@@ -0,0 +1,12 @@
+fragment $Module$StateInfo on $Module$State {
+  limit
+  orderBy {
+    column
+    order
+  }
+  filter {
+    id
+    name
+    searchText
+  }
+}
diff --git a/tools/templates/crud/client/graphql/ModuleStateQuery.client.graphql b/tools/templates/crud/client/graphql/ModuleStateQuery.client.graphql
new file mode 100644
index 0000000000..9bebe879a5
--- /dev/null
+++ b/tools/templates/crud/client/graphql/ModuleStateQuery.client.graphql
@@ -0,0 +1,7 @@
+#import "./$Module$State.client.graphql"
+
+query $Module$State {
+  $module$State @client {
+    ...$Module$StateInfo
+  }
+}
diff --git a/tools/templates/crud/client/graphql/ModulesQuery.graphql b/tools/templates/crud/client/graphql/ModulesQuery.graphql
new file mode 100644
index 0000000000..327959f1ee
--- /dev/null
+++ b/tools/templates/crud/client/graphql/ModulesQuery.graphql
@@ -0,0 +1,13 @@
+#import "./$Module$.graphql"
+
+query $module$sConnection($limit: Int, $offset: Int, $orderBy: OrderByInput, $filter: $Module$FilterInput) {
+  $module$sConnection(limit: $limit, offset: $offset, orderBy: $orderBy, filter: $filter) {
+    pageInfo {
+      totalCount
+      hasNextPage
+    }
+    edges {
+      ...$Module$Info
+    }
+  }
+}
diff --git a/tools/templates/crud/client/graphql/ModulesSubscription.graphql b/tools/templates/crud/client/graphql/ModulesSubscription.graphql
new file mode 100644
index 0000000000..5aad2587ff
--- /dev/null
+++ b/tools/templates/crud/client/graphql/ModulesSubscription.graphql
@@ -0,0 +1,10 @@
+#import "./$Module$.graphql"
+
+subscription on$Module$sUpdated {
+    $module$sUpdated {
+        mutation
+        node {
+            ...$Module$Info
+        }
+    }
+}
\ No newline at end of file
diff --git a/tools/templates/crud/client/graphql/SortModules.graphql b/tools/templates/crud/client/graphql/SortModules.graphql
new file mode 100644
index 0000000000..c9b29dc597
--- /dev/null
+++ b/tools/templates/crud/client/graphql/SortModules.graphql
@@ -0,0 +1,9 @@
+mutation sort$Module$s($data: [Int!]) {
+  sort$Module$s(data: $data) {
+    count
+    errors {
+      field
+      message
+    }
+  }
+}
diff --git a/tools/templates/crud/client/graphql/UpdateFilter.client.graphql b/tools/templates/crud/client/graphql/UpdateFilter.client.graphql
new file mode 100644
index 0000000000..b63db8bcc5
--- /dev/null
+++ b/tools/templates/crud/client/graphql/UpdateFilter.client.graphql
@@ -0,0 +1,5 @@
+#import "./$Module$State.client.graphql"
+
+mutation update$Module$Filter($filter: Filter$Module$Input!) {
+  update$Module$Filter(filter: $filter) @client
+}
diff --git a/tools/templates/crud/client/graphql/UpdateManyModules.graphql b/tools/templates/crud/client/graphql/UpdateManyModules.graphql
new file mode 100644
index 0000000000..a388ee6ab4
--- /dev/null
+++ b/tools/templates/crud/client/graphql/UpdateManyModules.graphql
@@ -0,0 +1,9 @@
+mutation updateMany$Module$s($data: $Module$UpdateInput!, $where: $Module$WhereInput!) {
+  updateMany$Module$s(data: $data, where: $where) {
+    count
+    errors {
+      field
+      message
+    }
+  }
+}
diff --git a/tools/templates/crud/client/graphql/UpdateModule.graphql b/tools/templates/crud/client/graphql/UpdateModule.graphql
new file mode 100644
index 0000000000..57da8097fb
--- /dev/null
+++ b/tools/templates/crud/client/graphql/UpdateModule.graphql
@@ -0,0 +1,13 @@
+#import "./$Module$.graphql"
+
+mutation update$Module$($data: $Module$UpdateInput!, $where: $Module$WhereUniqueInput!) {
+  update$Module$(data: $data, where: $where) {
+    node {
+      ...$Module$Info
+    }
+    errors {
+      field
+      message
+    }
+  }
+}
diff --git a/tools/templates/crud/client/graphql/UpdateOrderBy.client.graphql b/tools/templates/crud/client/graphql/UpdateOrderBy.client.graphql
new file mode 100644
index 0000000000..b55d1dd827
--- /dev/null
+++ b/tools/templates/crud/client/graphql/UpdateOrderBy.client.graphql
@@ -0,0 +1,5 @@
+#import "./$Module$State.client.graphql"
+
+mutation update$Module$OrderBy($orderBy: OrderBy$Module$Input!) {
+  update$Module$OrderBy(orderBy: $orderBy) @client
+}
diff --git a/tools/templates/crud/client/index.native.jsx b/tools/templates/crud/client/index.native.jsx
new file mode 100644
index 0000000000..974fa8310a
--- /dev/null
+++ b/tools/templates/crud/client/index.native.jsx
@@ -0,0 +1,61 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Button } from 'react-native';
+import { createStackNavigator } from 'react-navigation';
+import { Ionicons } from '@expo/vector-icons';
+import { createTabBarIconWrapper } from '../common/components/native';
+import $Module$List from './containers/$Module$List';
+import $Module$Edit from './containers/$Module$Edit';
+import resolvers from './resolvers';
+
+import Feature from '../connector';
+
+class $Module$ListScreen extends React.Component {
+  static navigationOptions = ({ navigation }) => ({
+    title: '$Module$ list',
+    headerRight: <Button title="Add" onPress={() => navigation.navigate('$Module$Edit', { id: 0 })} />
+  });
+  render() {
+    return <$Module$List navigation={this.props.navigation} title="$MoDuLe$" nativeLink={'$MoDuLe$Edit'} />;
+  }
+}
+
+$Module$ListScreen.propTypes = {
+  navigation: PropTypes.object
+};
+
+class $Module$EditScreen extends React.Component {
+  static navigationOptions = ({ navigation }) => ({
+    title: `${navigation.state.params.id === 0 ? 'Create' : 'Edit'} $MoDuLe$`
+  });
+  render() {
+    return <$Module$Edit navigation={this.props.navigation} title="$MoDuLe$" />;
+  }
+}
+
+$Module$EditScreen.propTypes = {
+  navigation: PropTypes.object
+};
+
+const $Module$Navigator = createStackNavigator({
+  $Module$List: { screen: $Module$ListScreen },
+  $Module$Edit: { screen: $Module$EditScreen }
+});
+
+export default new Feature({
+  drawerItem: {
+    $Module$: {
+      screen: $Module$Navigator,
+      navigationOptions: {
+        tabBarIcon: createTabBarIconWrapper(Ionicons, {
+          name: 'ios-browsers-outline',
+          size: 30
+        })
+      },
+      userInfo: {
+        showOnLogin: true
+      }
+    }
+  },
+  resolver: resolvers
+});
diff --git a/tools/templates/crud/client/index.web.jsx b/tools/templates/crud/client/index.web.jsx
new file mode 100644
index 0000000000..5c2d935f56
--- /dev/null
+++ b/tools/templates/crud/client/index.web.jsx
@@ -0,0 +1,40 @@
+import React from 'react';
+import { NavLink } from 'react-router-dom';
+import { MenuItem } from '../../modules/common/components/web';
+import $Module$ from './components/$Module$';
+import $Module$Edit from './containers/$Module$Edit';
+import resolvers from './resolvers';
+
+import { AuthRoute, IfLoggedIn } from '../user/containers/Auth';
+import Feature from '../connector';
+
+export default new Feature({
+  route: [
+    <AuthRoute
+      exact
+      path="/$module$"
+      component={$Module$}
+      role={['editor', 'admin']}
+      title="$MoDuLe$"
+      link="$module$"
+    />,
+    <AuthRoute
+      exact
+      path="/$module$/:id"
+      component={$Module$Edit}
+      role={['editor', 'admin']}
+      title="$MoDuLe$"
+      link="$module$"
+    />
+  ],
+  navItem: (
+    <IfLoggedIn role={['editor', 'admin']}>
+      <MenuItem key="/$module$">
+        <NavLink to="/$module$" className="nav-link" activeClassName="active">
+          $MoDuLe$
+        </NavLink>
+      </MenuItem>
+    </IfLoggedIn>
+  ),
+  resolver: resolvers
+});
diff --git a/tools/templates/crud/client/resolvers/index.js b/tools/templates/crud/client/resolvers/index.js
new file mode 100644
index 0000000000..7fc264a26d
--- /dev/null
+++ b/tools/templates/crud/client/resolvers/index.js
@@ -0,0 +1,79 @@
+import update from 'immutability-helper';
+
+import $MODULE$_STATE_QUERY from '../graphql/$Module$StateQuery.client.graphql';
+
+const TYPE_$MODULE$_STATE = '$Module$State';
+const TYPE_$MODULE$_STATE_FILTER = 'Filter$Module$Input';
+const TYPE_$MODULE$_STATE_ORDER_BY = 'OrderBy$Module$Input';
+
+// filter data
+const defaultFilters = {
+  id: '',
+  name: '',
+  searchText: ''
+};
+// end filter data
+
+const defaults = {
+  $module$State: {
+    limit: 25,
+    orderBy: {
+      column: '',
+      order: '',
+      __typename: TYPE_$MODULE$_STATE_ORDER_BY
+    },
+    filter: {
+      ...defaultFilters,
+      __typename: TYPE_$MODULE$_STATE_FILTER
+    },
+    __typename: TYPE_$MODULE$_STATE
+  }
+};
+
+const resolvers = {
+  Mutation: {
+    update$Module$OrderBy: (_, { orderBy }, { cache }) => {
+      const { $module$State } = cache.readQuery({ query: $MODULE$_STATE_QUERY });
+
+      const new$Module$State = update($module$State, {
+        orderBy: { $merge: orderBy }
+      });
+
+      cache.writeData({
+        data: {
+          $module$State: new$Module$State,
+          __type: TYPE_$MODULE$_STATE
+        }
+      });
+
+      return null;
+    },
+    update$Module$Filter: (_, { filter }, { cache }) => {
+      const { $module$State } = cache.readQuery({ query: $MODULE$_STATE_QUERY });
+
+      let mergeFilter = filter;
+      if (!filter.hasOwnProperty('searchText')) {
+        const { searchText, ...restFilters } = defaults.$module$State.filter;
+        mergeFilter = { ...restFilters, ...filter };
+      }
+
+      const new$Module$State = update($module$State, {
+        filter: { $merge: mergeFilter }
+      });
+
+      cache.writeData({
+        data: {
+          $module$State: new$Module$State,
+          __type: TYPE_$MODULE$_STATE
+        }
+      });
+
+      return null;
+    }
+  }
+};
+
+export default {
+  defaults,
+  resolvers
+};
diff --git a/tools/templates/crud/database/migrations/_Module.js b/tools/templates/crud/database/migrations/_Module.js
new file mode 100644
index 0000000000..e88e86f020
--- /dev/null
+++ b/tools/templates/crud/database/migrations/_Module.js
@@ -0,0 +1,7 @@
+import KnexGenerator from '@domain-schema/knex';
+
+import { $Module$Schema } from '../../modules/$module$/schema';
+
+exports.up = knex => new KnexGenerator(knex).createTables($Module$Schema);
+
+exports.down = knex => new KnexGenerator(knex).dropTables($Module$Schema);
diff --git a/tools/templates/crud/database/seeds/_Module.js b/tools/templates/crud/database/seeds/_Module.js
new file mode 100644
index 0000000000..72a4768df5
--- /dev/null
+++ b/tools/templates/crud/database/seeds/_Module.js
@@ -0,0 +1,7 @@
+import { returnId, truncateTables } from '../../sql/helpers';
+
+export async function seed(knex, Promise) {
+  await truncateTables(knex, Promise, ['$_module$']);
+
+  await returnId(knex('$_module$').insert({ name: 'test' }));
+}
diff --git a/tools/templates/module/server/Module.spec.js b/tools/templates/crud/server/Module.spec.js
similarity index 100%
rename from tools/templates/module/server/Module.spec.js
rename to tools/templates/crud/server/Module.spec.js
diff --git a/tools/templates/crud/server/index.js b/tools/templates/crud/server/index.js
new file mode 100644
index 0000000000..cb4b4c8964
--- /dev/null
+++ b/tools/templates/crud/server/index.js
@@ -0,0 +1,10 @@
+import $Module$ from './sql';
+import schema from './schema.graphql';
+import createResolvers from './resolvers';
+import Feature from '../connector';
+
+export default new Feature({
+  schema: schema,
+  createResolversFunc: createResolvers,
+  createContextFunc: () => ({ $Module$: new $Module$() })
+});
diff --git a/tools/templates/crud/server/resolvers.js b/tools/templates/crud/server/resolvers.js
new file mode 100644
index 0000000000..8e59110484
--- /dev/null
+++ b/tools/templates/crud/server/resolvers.js
@@ -0,0 +1,56 @@
+import withAuth from 'graphql-auth';
+// eslint-disable-next-line no-unused-vars
+import { createBatchResolver } from 'graphql-resolve-batch';
+
+const $MODULE$S_SUBSCRIPTION = '$module$s_subscription';
+
+// eslint-disable-next-line no-unused-vars
+export default pubsub => ({
+  Query: {
+    $module$s: withAuth(['editor:view:all'], (parent, args, ctx, info) => {
+      return ctx.$Module$.getList(args, info);
+    }),
+    $module$sConnection: withAuth(['editor:view:all'], (parent, args, ctx, info) => {
+      return ctx.$Module$.getPaginated(args, info);
+    }),
+    $module$: withAuth(['editor:view'], (parent, args, ctx, info) => {
+      return ctx.$Module$.get(args, info);
+    })
+  },
+  // schema batch resolvers
+  // end schema batch resolvers
+  Mutation: {
+    create$Module$: withAuth(['editor:create'], async (parent, args, ctx, info) => {
+      const $module$ = await ctx.$Module$.create(args, ctx, info);
+
+      pubsub.publish($MODULE$S_SUBSCRIPTION, {
+        $module$sUpdated: {
+          mutation: 'CREATED',
+          node: $module$.node
+        }
+      });
+
+      return $module$;
+    }),
+    update$Module$: withAuth(['editor:update'], (parent, args, ctx, info) => {
+      return ctx.$Module$.update(args, ctx, info);
+    }),
+    delete$Module$: withAuth(['editor:delete'], (parent, args, ctx, info) => {
+      return ctx.$Module$.delete(args, info);
+    }),
+    sort$Module$s: withAuth(['editor:update'], (parent, args, ctx) => {
+      return ctx.$Module$.sort(args);
+    }),
+    updateMany$Module$s: withAuth(['editor:update'], (parent, args, ctx) => {
+      return ctx.$Module$.updateMany(args);
+    }),
+    deleteMany$Module$s: withAuth(['editor:delete'], (parent, args, ctx) => {
+      return ctx.$Module$.deleteMany(args);
+    })
+  },
+  Subscription: {
+    $module$sUpdated: {
+      subscribe: () => pubsub.asyncIterator($MODULE$S_SUBSCRIPTION)
+    }
+  }
+});
diff --git a/tools/templates/crud/server/schema.graphql b/tools/templates/crud/server/schema.graphql
new file mode 100644
index 0000000000..0092024f18
--- /dev/null
+++ b/tools/templates/crud/server/schema.graphql
@@ -0,0 +1,64 @@
+### schema type definitions
+type $Module$ {
+  id: Int!
+  name: String!
+}
+### end schema type definitions
+
+type $Module$Connection {
+  pageInfo: PageInfo
+  edges: [$Module$]
+}
+
+type $Module$Data {
+  node: $Module$
+}
+
+type $Module$Payload {
+  node: $Module$
+  errors: [FieldError!]
+}
+
+input $Module$FilterInput {
+  searchText: String
+}
+
+input $Module$CreateInput {
+  name: String!
+}
+
+input $Module$UpdateInput {
+  name: String
+}
+
+input $Module$WhereUniqueInput {
+  id: Int!
+}
+
+input $Module$WhereInput {
+  id_in: [Int!]
+}
+
+extend type Query {
+  $module$s(limit: Int, offset: Int, orderBy: OrderByInput, filter: $Module$FilterInput): [$Module$]
+  $module$sConnection(limit: Int, offset: Int, orderBy: OrderByInput, filter: $Module$FilterInput): $Module$Connection!
+  $module$(where: $Module$WhereUniqueInput!): $Module$Data
+}
+
+extend type Mutation {
+  create$Module$(data: $Module$CreateInput!): $Module$Payload!
+  update$Module$(data: $Module$UpdateInput!, where: $Module$WhereUniqueInput!): $Module$Payload!
+  delete$Module$(where: $Module$WhereUniqueInput!): $Module$Payload!
+  sort$Module$s(data: [Int!]): BatchPayload!
+  updateMany$Module$s(data: $Module$UpdateInput!, where: $Module$WhereInput!): BatchPayload!
+  deleteMany$Module$s(where: $Module$WhereInput!): BatchPayload!
+}
+
+extend type Subscription {
+  $module$sUpdated: Update$Module$Payload
+}
+
+type Update$Module$Payload {
+  mutation: String!
+  node: $Module$!
+}
diff --git a/tools/templates/crud/server/schema.js b/tools/templates/crud/server/schema.js
new file mode 100644
index 0000000000..f5e22eed34
--- /dev/null
+++ b/tools/templates/crud/server/schema.js
@@ -0,0 +1,12 @@
+import DomainSchema, { Schema } from '@domain-schema/core';
+
+export class $Module$ extends Schema {
+  __ = { name: '$Module$', tablePrefix: '' };
+  id = DomainSchema.Int;
+  name = {
+    type: String,
+    searchText: true
+  };
+}
+
+export const $Module$Schema = new DomainSchema($Module$);
diff --git a/tools/templates/crud/server/sql.js b/tools/templates/crud/server/sql.js
new file mode 100644
index 0000000000..051c8e5e3d
--- /dev/null
+++ b/tools/templates/crud/server/sql.js
@@ -0,0 +1,9 @@
+import { $Module$Schema } from './schema';
+import Crud from '../../sql/crud';
+
+export default class $Module$ extends Crud {
+  constructor() {
+    super();
+    this.schema = $Module$Schema;
+  }
+}
diff --git a/tools/templates/module/client/components/ModuleView.web.jsx b/tools/templates/module/client/components/ModuleView.web.jsx
index 49bca7ba8b..0f3c1bfe3e 100644
--- a/tools/templates/module/client/components/ModuleView.web.jsx
+++ b/tools/templates/module/client/components/ModuleView.web.jsx
@@ -18,7 +18,7 @@ const $Module$View = () => {
   return (
     <PageLayout>
       {renderMetaData()}
-      <div className="text-center mt-4 mb-4">
+      <div className="text-center">
         <p>Hello $Module$!</p>
       </div>
     </PageLayout>
diff --git a/tools/templates/module/client/containers/Module.jsx b/tools/templates/module/client/containers/Module.jsx
index 59510a61c5..2eb0c5d34e 100644
--- a/tools/templates/module/client/containers/Module.jsx
+++ b/tools/templates/module/client/containers/Module.jsx
@@ -1,6 +1,4 @@
-/*eslint-disable no-unused-vars*/
 import React from 'react';
-import { graphql, compose } from 'react-apollo';
 
 import $Module$View from '../components/$Module$View';
 
@@ -10,6 +8,4 @@ class $Module$ extends React.Component {
   }
 }
 
-const $Module$WithApollo = compose()($Module$);
-
-export default $Module$WithApollo;
+export default $Module$;
diff --git a/tools/templates/module/client/graphql/ModuleQuery.graphql b/tools/templates/module/client/graphql/ModuleQuery.graphql
deleted file mode 100644
index f16c43a24b..0000000000
--- a/tools/templates/module/client/graphql/ModuleQuery.graphql
+++ /dev/null
@@ -1 +0,0 @@
-# GraphQL queries
diff --git a/tools/templates/module/client/index.jsx b/tools/templates/module/client/index.native.jsx
similarity index 100%
rename from tools/templates/module/client/index.jsx
rename to tools/templates/module/client/index.native.jsx
diff --git a/tools/templates/module/client/index.web.jsx b/tools/templates/module/client/index.web.jsx
index ba6a70cd43..497368990e 100644
--- a/tools/templates/module/client/index.web.jsx
+++ b/tools/templates/module/client/index.web.jsx
@@ -9,7 +9,7 @@ import Feature from '../connector';
 export default new Feature({
   route: <Route exact path="/$module$" component={$Module$} />,
   navItem: (
-    <MenuItem key="$module$">
+    <MenuItem key="/$module$">
       <NavLink to="/$module$" className="nav-link" activeClassName="active">
         $Module$
       </NavLink>
diff --git a/tools/templates/module/server/index.js b/tools/templates/module/server/index.js
index e739d3033e..eec5baca53 100644
--- a/tools/templates/module/server/index.js
+++ b/tools/templates/module/server/index.js
@@ -1,10 +1,3 @@
-import $Module$ from './sql';
-import schema from './schema.graphql';
-import createResolvers from './resolvers';
 import Feature from '../connector';
 
-export default new Feature({
-  schema,
-  createResolversFunc: createResolvers,
-  createContextFunc: () => ({ $Module$: new $Module$() })
-});
+export default new Feature({});
diff --git a/tools/templates/module/server/resolvers.js b/tools/templates/module/server/resolvers.js
deleted file mode 100644
index 13582f9182..0000000000
--- a/tools/templates/module/server/resolvers.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/*eslint-disable no-unused-vars*/
-export default pubsub => ({
-  Query: {},
-  Mutation: {},
-  Subscription: {}
-});
diff --git a/tools/templates/module/server/schema.graphql b/tools/templates/module/server/schema.graphql
deleted file mode 100644
index b224b3517b..0000000000
--- a/tools/templates/module/server/schema.graphql
+++ /dev/null
@@ -1,5 +0,0 @@
-extend type Query {}
-
-extend type Mutation {}
-
-extend type Subscription {}

From fe7cd96a4bdebc03b6d35701e4a6711b66188b81 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Mon, 23 Jul 2018 16:27:16 +0300
Subject: [PATCH 217/327] Add generated containers file

---
 packages/client/src/modules/common/generatedContainers.js | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 packages/client/src/modules/common/generatedContainers.js

diff --git a/packages/client/src/modules/common/generatedContainers.js b/packages/client/src/modules/common/generatedContainers.js
new file mode 100644
index 0000000000..ff8b4c5632
--- /dev/null
+++ b/packages/client/src/modules/common/generatedContainers.js
@@ -0,0 +1 @@
+export default {};

From b9a5fade006b1316b1c834452c0dcd7b904996d9 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Mon, 23 Jul 2018 17:22:20 +0300
Subject: [PATCH 218/327] Add domain-schema dependencies

---
 packages/server/package.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/server/package.json b/packages/server/package.json
index 318c559ba9..c05e7f27eb 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -52,6 +52,8 @@
   "author": "SysGears INC",
   "license": "MIT",
   "dependencies": {
+    "@domain-schema/core": "^0.0.34",
+    "@domain-schema/graphql": "^0.0.33",
     "apollo-cache-inmemory": "^1.1.12",
     "apollo-cache-router": "^1.1.2",
     "apollo-client": "^2.3.1",

From a7a7630df1554a37ce6d24e08fee73f7767db2a2 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Mon, 23 Jul 2018 14:05:46 +0200
Subject: [PATCH 219/327] Fix pagiantion: wrong __typename being generated

---
 tools/templates/crud/client/containers/ModuleList.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/templates/crud/client/containers/ModuleList.jsx b/tools/templates/crud/client/containers/ModuleList.jsx
index 0a71141909..bfcdf1c53f 100644
--- a/tools/templates/crud/client/containers/ModuleList.jsx
+++ b/tools/templates/crud/client/containers/ModuleList.jsx
@@ -115,7 +115,7 @@ export default compose(
               $module$sConnection: {
                 edges: [...previousResult.$module$sConnection.edges, ...newEdges],
                 pageInfo,
-                __typename: '$Module$sConnection'
+                __typename: '$Module$Connection'
               }
             };
           }

From a380e0c7a3978f789e39cc673769f267a6966f63 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Tue, 24 Jul 2018 12:36:14 +0300
Subject: [PATCH 220/327] Create commandInvoker, split addCrud and addModule

---
 tools/cli.js                    | 15 +++---
 tools/cli/CommandInvoker.js     | 45 ++++++++++++++++
 tools/cli/commands/addCrud.js   | 67 ++++++++++++++++++++++++
 tools/cli/commands/addModule.js | 92 +++++++++------------------------
 tools/cli/module.js             | 50 ------------------
 5 files changed, 144 insertions(+), 125 deletions(-)
 create mode 100644 tools/cli/CommandInvoker.js
 create mode 100644 tools/cli/commands/addCrud.js
 delete mode 100644 tools/cli/module.js

diff --git a/tools/cli.js b/tools/cli.js
index f54b027841..1f6167f724 100644
--- a/tools/cli.js
+++ b/tools/cli.js
@@ -1,8 +1,10 @@
 require('babel-register')({ presets: ['env'], plugins: ['transform-class-properties'] });
 require('babel-polyfill');
+const CommandInvoker = require('./cli/CommandInvoker');
 
 const prog = require('caporal');
-const moduleCmd = require('./cli/module');
+
+const commandInvoker = new CommandInvoker();
 
 prog
   .version('1.0.0')
@@ -14,7 +16,7 @@ prog
     ['both', 'server', 'client'],
     'both'
   )
-  .action((args, options, logger) => moduleCmd('addmodule', args, options, logger))
+  .action((args, options, logger) => commandInvoker.runAddModule(args, options, logger))
   .command('addcrud', 'Create a new Module with CRUD')
   .argument('<module>', 'Module name')
   .argument(
@@ -24,8 +26,8 @@ prog
     'both'
   )
   .argument('[tablePrefix]', 'DB table prefix.')
-  .action((args, options, logger) => moduleCmd('addcrud', args, options, logger))
-  .command('deletemodule', 'Delete a Module')
+  .action((args, options, logger) => commandInvoker.runAddCrud(args, options, logger));
+/*  .command('deletemodule', 'Delete a Module')
   .argument('<module>', 'Module name')
   .argument(
     '[location]',
@@ -33,9 +35,6 @@ prog
     ['both', 'server', 'client'],
     'both'
   )
-  .action((args, options, logger) => moduleCmd('deletemodule', args, options, logger))
-  .command('updateschema', 'Update Module Schema')
-  .argument('<module>', 'Module name')
-  .action((args, options, logger) => moduleCmd('updateschema', args, options, logger));
+  .action((args, options, logger) => moduleCmd('deletemodule', args, options, logger));*/
 
 prog.parse(process.argv);
diff --git a/tools/cli/CommandInvoker.js b/tools/cli/CommandInvoker.js
new file mode 100644
index 0000000000..7868b5a6da
--- /dev/null
+++ b/tools/cli/CommandInvoker.js
@@ -0,0 +1,45 @@
+const addModuleCommand = require('./commands/addModule');
+const addCrudCommand = require('./commands/addCrud');
+
+class CommandInvoker {
+  static get moduleTemplatePath() {
+    return `${__dirname}/../templates/module`;
+  }
+
+  static get crudTemplatePath() {
+    return `${__dirname}/../templates/crud`;
+  }
+
+  constructor(addModule = addModuleCommand, addCrud = addCrudCommand) {
+    this.addModule = addModule;
+    this.addCrud = addCrud;
+  }
+
+  runAddCrud(args, options, logger) {
+    const { module, location = 'both', tablePrefix = '' } = args;
+    // client
+    if (location === 'client' || location === 'both') {
+      this.addCrud(logger, CommandInvoker.crudTemplatePath, module, tablePrefix, 'client');
+    }
+
+    // server
+    if (location === 'server' || location === 'both') {
+      this.addCrud(logger, CommandInvoker.crudTemplatePath, module, tablePrefix, 'server');
+    }
+  }
+
+  runAddModule(args, options, logger) {
+    const { module, location = 'both' } = args;
+    // client
+    if (location === 'client' || location === 'both') {
+      this.addModule(logger, CommandInvoker.moduleTemplatePath, module, 'client');
+    }
+
+    // server
+    if (location === 'server' || location === 'both') {
+      this.addModule(logger, CommandInvoker.moduleTemplatePath, module, 'server');
+    }
+  }
+}
+
+module.exports = CommandInvoker;
diff --git a/tools/cli/commands/addCrud.js b/tools/cli/commands/addCrud.js
new file mode 100644
index 0000000000..7efa3d36f9
--- /dev/null
+++ b/tools/cli/commands/addCrud.js
@@ -0,0 +1,67 @@
+const shell = require('shelljs');
+const chalk = require('chalk');
+const { pascalize } = require('humps');
+const { renameFiles, updateFileWithExports } = require('../helpers/util');
+const { addModule } = require('./addModule');
+
+/**
+ *
+ * @param logger
+ * @param templatePath
+ * @param module
+ * @param tablePrefix
+ * @param location
+ */
+function addCrud(logger, templatePath, module, tablePrefix, location) {
+  logger.info(`Copying ${location} files…`);
+
+  const Module = pascalize(module);
+  const startPath = `${__dirname}/../../..`;
+
+  addModule(logger, templatePath, module, location, false);
+
+  /*    if (action === 'addcrud' && location === 'client') {
+      const generatedContainerFile = 'generatedContainers.js';
+      const graphqlQuery = `${Module}Query`;
+      const options = {
+        pathToFileWithExports: `${startPath}/packages/${location}/src/modules/common/${generatedContainerFile}`,
+        exportName: graphqlQuery,
+        importString: `import ${graphqlQuery} from '../${module}/containers/${graphqlQuery}';\n`
+      };
+      updateFileWithExports(options);
+    }*/
+
+  if (location === 'server') {
+    console.log('copy database files');
+    const destinationPath = `${startPath}/packages/${location}/src/database`;
+    renameFiles(destinationPath, templatePath, module, 'database');
+
+    const timestamp = new Date().getTime();
+    shell.cd(`${startPath}/packages/${location}/src/database/migrations`);
+    shell.mv(`_${Module}.js`, `${timestamp}_${Module}.js`);
+    shell.cd(`${startPath}/packages/${location}/src/database/seeds`);
+    shell.mv(`_${Module}.js`, `${timestamp}_${Module}.js`);
+
+    logger.info(chalk.green(`✔ The database files have been copied!`));
+
+    if (tablePrefix !== '') {
+      shell.cd(`${startPath}/packages/${location}/src/modules/${module}`);
+      shell.sed('-i', /this.prefix = '';/g, `this.prefix = '${tablePrefix}';`, 'sql.js');
+
+      logger.info(chalk.green(`✔ Inserted db table prefix!`));
+    }
+
+    const generatedSchemasFile = 'generatedSchemas.js';
+    const schema = `${Module}Schema`;
+    const options = {
+      pathToFileWithExports: `${startPath}/packages/${location}/src/modules/common/${generatedSchemasFile}`,
+      exportName: schema,
+      importString: `import { ${schema} } from '../${module}/schema';\n`
+    };
+    updateFileWithExports(options);
+  }
+
+  logger.info(chalk.green(`✔ Module for ${location} successfully created!`));
+}
+
+module.exports = addCrud;
diff --git a/tools/cli/commands/addModule.js b/tools/cli/commands/addModule.js
index de25d0a718..9e15d2d065 100644
--- a/tools/cli/commands/addModule.js
+++ b/tools/cli/commands/addModule.js
@@ -1,92 +1,50 @@
 const shell = require('shelljs');
 const fs = require('fs');
 const chalk = require('chalk');
-const { pascalize } = require('humps');
-const { renameFiles, updateFileWithExports } = require('../helpers/util');
+const { renameFiles } = require('../helpers/util');
 
 /**
- *
+ * +
  * @param logger
  * @param templatePath
  * @param module
- * @param action
- * @param tablePrefix
  * @param location
+ * @param finished
  */
-function addModule(logger, templatePath, module, action, tablePrefix, location) {
+function addModule(logger, templatePath, module, location, finished = true) {
   logger.info(`Copying ${location} files…`);
 
-  // pascalize
-  const Module = pascalize(module);
-
   // create new module directory
   const startPath = `${__dirname}/../../..`;
-  const mkdir = shell.mkdir(`${startPath}/packages/${location}/src/modules/${module}`);
+  const newModule = shell.mkdir(`${startPath}/packages/${location}/src/modules/${module}`);
 
   // continue only if directory does not jet exist
-  if (mkdir.code === 0) {
-    const destinationPath = `${startPath}/packages/${location}/src/modules/${module}`;
-    renameFiles(destinationPath, templatePath, module, location);
-
-    logger.info(chalk.green(`✔ The ${location} files have been copied!`));
-
-    shell.cd('..');
-    // get module input data
-    const path = `${startPath}/packages/${location}/src/modules/index.js`;
-    let data = fs.readFileSync(path);
-
-    // extract Feature modules
-    const re = /Feature\(([^()]+)\)/g;
-    const match = re.exec(data);
-
-    // prepend import module
-    const prepend = `import ${module} from './${module}';\n`;
-    fs.writeFileSync(path, prepend + data);
-
-    // add module to Feature function
-    shell.ShellString(shell.cat('index.js').replace(RegExp(re, 'g'), `Feature(${module}, ${match[1]})`)).to('index.js');
-
-    if (action === 'addcrud' && location === 'client') {
-      const generatedContainerFile = 'generatedContainers.js';
-      const graphqlQuery = `${Module}Query`;
-      const options = {
-        pathToFileWithExports: `${startPath}/packages/${location}/src/modules/common/${generatedContainerFile}`,
-        exportName: graphqlQuery,
-        importString: `import ${graphqlQuery} from '../${module}/containers/${graphqlQuery}';\n`
-      };
-      updateFileWithExports(options);
-    }
-
-    if (action === 'addcrud' && location === 'server') {
-      console.log('copy database files');
-      const destinationPath = `${startPath}/packages/${location}/src/database`;
-      renameFiles(destinationPath, templatePath, module, 'database');
+  if (newModule.code !== 0) {
+    logger.error(chalk.red(`The ${module} directory is already exists.`));
+    process.exit(1);
+  }
+  const destinationPath = `${startPath}/packages/${location}/src/modules/${module}`;
+  renameFiles(destinationPath, templatePath, module, location);
 
-      const timestamp = new Date().getTime();
-      shell.cd(`${startPath}/packages/${location}/src/database/migrations`);
-      shell.mv(`_${Module}.js`, `${timestamp}_${Module}.js`);
-      shell.cd(`${startPath}/packages/${location}/src/database/seeds`);
-      shell.mv(`_${Module}.js`, `${timestamp}_${Module}.js`);
+  logger.info(chalk.green(`✔ The ${location} files have been copied!`));
 
-      logger.info(chalk.green(`✔ The database files have been copied!`));
+  shell.cd('..');
+  // get module input data
+  const path = `${startPath}/packages/${location}/src/modules/index.js`;
+  let data = fs.readFileSync(path);
 
-      if (tablePrefix !== '') {
-        shell.cd(`${startPath}/packages/${location}/src/modules/${module}`);
-        shell.sed('-i', /this.prefix = '';/g, `this.prefix = '${tablePrefix}';`, 'sql.js');
+  // extract Feature modules
+  const re = /Feature\(([^()]+)\)/g;
+  const match = re.exec(data);
 
-        logger.info(chalk.green(`✔ Inserted db table prefix!`));
-      }
+  // prepend import module
+  const prepend = `import ${module} from './${module}';\n`;
+  fs.writeFileSync(path, prepend + data);
 
-      const generatedSchemasFile = 'generatedSchemas.js';
-      const schema = `${Module}Schema`;
-      const options = {
-        pathToFileWithExports: `${startPath}/packages/${location}/src/modules/common/${generatedSchemasFile}`,
-        exportName: schema,
-        importString: `import { ${schema} } from '../${module}/schema';\n`
-      };
-      updateFileWithExports(options);
-    }
+  // add module to Feature function
+  shell.ShellString(shell.cat('index.js').replace(RegExp(re, 'g'), `Feature(${module}, ${match[1]})`)).to('index.js');
 
+  if (finished) {
     logger.info(chalk.green(`✔ Module for ${location} successfully created!`));
   }
 }
diff --git a/tools/cli/module.js b/tools/cli/module.js
deleted file mode 100644
index fd0164b9cf..0000000000
--- a/tools/cli/module.js
+++ /dev/null
@@ -1,50 +0,0 @@
-const fs = require('fs');
-const chalk = require('chalk');
-const addModule = require('./commands/addModule');
-const deleteModule = require('./commands/deleteModule');
-const updateSchema = require('./commands/updateSchema');
-
-module.exports = (action, args, options, logger) => {
-  const module = args.module;
-  let location = 'both';
-  if (args.location) {
-    location = args.location;
-  }
-  let tablePrefix = '';
-  if (args.tablePrefix) {
-    tablePrefix = args.tablePrefix;
-  }
-  console.log(tablePrefix);
-  let templatePath = `${__dirname}/../templates/module`;
-  if (action === 'addcrud') {
-    templatePath = `${__dirname}/../templates/crud`;
-  }
-
-  if (!fs.existsSync(templatePath)) {
-    logger.error(chalk.red(`The requested location for ${location} not found.`));
-    process.exit(1);
-  }
-
-  // client
-  if (location === 'client' || location === 'both') {
-    if (action === 'addmodule' || action === 'addcrud') {
-      addModule(logger, templatePath, module, action, tablePrefix, 'client');
-    } else if (action === 'deletemodule') {
-      deleteModule(logger, templatePath, module, 'client');
-    }
-  }
-
-  // server
-  if (location === 'server' || location === 'both') {
-    if (action === 'addmodule' || action === 'addcrud') {
-      addModule(logger, templatePath, module, action, tablePrefix, 'server');
-    } else if (action === 'deletemodule') {
-      deleteModule(logger, templatePath, module, 'server');
-    }
-  }
-
-  // update schema
-  if (action === 'updateschema') {
-    updateSchema(logger, module);
-  }
-};

From 5921d22a883b090f4e7ec2dbc507bf1e00cd6a34 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Wed, 25 Jul 2018 11:05:28 +0300
Subject: [PATCH 221/327] Add runCommand to CommandInvoker and change require
 in addCrud

---
 tools/cli/CommandInvoker.js   | 31 +++++++++++++------------------
 tools/cli/commands/addCrud.js |  2 +-
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/tools/cli/CommandInvoker.js b/tools/cli/CommandInvoker.js
index 7868b5a6da..fcd79d176a 100644
--- a/tools/cli/CommandInvoker.js
+++ b/tools/cli/CommandInvoker.js
@@ -10,6 +10,17 @@ class CommandInvoker {
     return `${__dirname}/../templates/crud`;
   }
 
+  static runCommand(func, location, ...args) {
+    // client
+    if (location === 'client' || location === 'both') {
+      func(...args, 'client');
+    }
+    // server
+    if (location === 'server' || location === 'both') {
+      func(...args, 'server');
+    }
+  }
+
   constructor(addModule = addModuleCommand, addCrud = addCrudCommand) {
     this.addModule = addModule;
     this.addCrud = addCrud;
@@ -17,28 +28,12 @@ class CommandInvoker {
 
   runAddCrud(args, options, logger) {
     const { module, location = 'both', tablePrefix = '' } = args;
-    // client
-    if (location === 'client' || location === 'both') {
-      this.addCrud(logger, CommandInvoker.crudTemplatePath, module, tablePrefix, 'client');
-    }
-
-    // server
-    if (location === 'server' || location === 'both') {
-      this.addCrud(logger, CommandInvoker.crudTemplatePath, module, tablePrefix, 'server');
-    }
+    CommandInvoker.runCommand(this.addCrud, location, logger, CommandInvoker.crudTemplatePath, module, tablePrefix);
   }
 
   runAddModule(args, options, logger) {
     const { module, location = 'both' } = args;
-    // client
-    if (location === 'client' || location === 'both') {
-      this.addModule(logger, CommandInvoker.moduleTemplatePath, module, 'client');
-    }
-
-    // server
-    if (location === 'server' || location === 'both') {
-      this.addModule(logger, CommandInvoker.moduleTemplatePath, module, 'server');
-    }
+    CommandInvoker.runCommand(this.addModule, location, logger, CommandInvoker.moduleTemplatePath, module);
   }
 }
 
diff --git a/tools/cli/commands/addCrud.js b/tools/cli/commands/addCrud.js
index 7efa3d36f9..618cebf4fc 100644
--- a/tools/cli/commands/addCrud.js
+++ b/tools/cli/commands/addCrud.js
@@ -2,7 +2,7 @@ const shell = require('shelljs');
 const chalk = require('chalk');
 const { pascalize } = require('humps');
 const { renameFiles, updateFileWithExports } = require('../helpers/util');
-const { addModule } = require('./addModule');
+const addModule = require('./addModule');
 
 /**
  *

From dc7f9edc9c3801a879dfb0f28fa0c4b15dd861ec Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Wed, 25 Jul 2018 11:54:07 +0300
Subject: [PATCH 222/327] Update addModule index.js file changing, get rid of
 client module creating for addCrud

---
 tools/cli/CommandInvoker.js                   |   4 +-
 tools/cli/commands/addCrud.js                 |  24 +-
 tools/cli/commands/addModule.js               |  21 +-
 tools/cli/commands/updateSchema.js            | 291 ------------------
 .../crud/client/components/Module.jsx         |  37 ---
 .../crud/client/components/Module.web.jsx     |  38 ---
 .../crud/client/containers/Module.spec.js     |  17 -
 .../crud/client/containers/ModuleEdit.jsx     |  87 ------
 .../crud/client/containers/ModuleFilter.jsx   |  34 --
 .../crud/client/containers/ModuleList.jsx     | 215 -------------
 .../crud/client/containers/ModuleQuery.jsx    |  27 --
 .../crud/client/graphql/CreateModule.graphql  |  13 -
 .../client/graphql/DeleteManyModules.graphql  |   9 -
 .../crud/client/graphql/DeleteModule.graphql  |  11 -
 .../crud/client/graphql/Module.graphql        |   4 -
 .../crud/client/graphql/ModuleQuery.graphql   |   9 -
 .../client/graphql/ModuleState.client.graphql |  12 -
 .../graphql/ModuleStateQuery.client.graphql   |   7 -
 .../crud/client/graphql/ModulesQuery.graphql  |  13 -
 .../graphql/ModulesSubscription.graphql       |  10 -
 .../crud/client/graphql/SortModules.graphql   |   9 -
 .../graphql/UpdateFilter.client.graphql       |   5 -
 .../client/graphql/UpdateManyModules.graphql  |   9 -
 .../crud/client/graphql/UpdateModule.graphql  |  13 -
 .../graphql/UpdateOrderBy.client.graphql      |   5 -
 tools/templates/crud/client/index.native.jsx  |  61 ----
 tools/templates/crud/client/index.web.jsx     |  40 ---
 .../templates/crud/client/resolvers/index.js  |  79 -----
 28 files changed, 14 insertions(+), 1090 deletions(-)
 delete mode 100644 tools/cli/commands/updateSchema.js
 delete mode 100644 tools/templates/crud/client/components/Module.jsx
 delete mode 100644 tools/templates/crud/client/components/Module.web.jsx
 delete mode 100644 tools/templates/crud/client/containers/Module.spec.js
 delete mode 100644 tools/templates/crud/client/containers/ModuleEdit.jsx
 delete mode 100644 tools/templates/crud/client/containers/ModuleFilter.jsx
 delete mode 100644 tools/templates/crud/client/containers/ModuleList.jsx
 delete mode 100644 tools/templates/crud/client/containers/ModuleQuery.jsx
 delete mode 100644 tools/templates/crud/client/graphql/CreateModule.graphql
 delete mode 100644 tools/templates/crud/client/graphql/DeleteManyModules.graphql
 delete mode 100644 tools/templates/crud/client/graphql/DeleteModule.graphql
 delete mode 100644 tools/templates/crud/client/graphql/Module.graphql
 delete mode 100644 tools/templates/crud/client/graphql/ModuleQuery.graphql
 delete mode 100644 tools/templates/crud/client/graphql/ModuleState.client.graphql
 delete mode 100644 tools/templates/crud/client/graphql/ModuleStateQuery.client.graphql
 delete mode 100644 tools/templates/crud/client/graphql/ModulesQuery.graphql
 delete mode 100644 tools/templates/crud/client/graphql/ModulesSubscription.graphql
 delete mode 100644 tools/templates/crud/client/graphql/SortModules.graphql
 delete mode 100644 tools/templates/crud/client/graphql/UpdateFilter.client.graphql
 delete mode 100644 tools/templates/crud/client/graphql/UpdateManyModules.graphql
 delete mode 100644 tools/templates/crud/client/graphql/UpdateModule.graphql
 delete mode 100644 tools/templates/crud/client/graphql/UpdateOrderBy.client.graphql
 delete mode 100644 tools/templates/crud/client/index.native.jsx
 delete mode 100644 tools/templates/crud/client/index.web.jsx
 delete mode 100644 tools/templates/crud/client/resolvers/index.js

diff --git a/tools/cli/CommandInvoker.js b/tools/cli/CommandInvoker.js
index fcd79d176a..cde94b3621 100644
--- a/tools/cli/CommandInvoker.js
+++ b/tools/cli/CommandInvoker.js
@@ -27,8 +27,8 @@ class CommandInvoker {
   }
 
   runAddCrud(args, options, logger) {
-    const { module, location = 'both', tablePrefix = '' } = args;
-    CommandInvoker.runCommand(this.addCrud, location, logger, CommandInvoker.crudTemplatePath, module, tablePrefix);
+    const { module, tablePrefix = '' } = args;
+    CommandInvoker.runCommand(this.addCrud, 'server', logger, CommandInvoker.crudTemplatePath, module, tablePrefix);
   }
 
   runAddModule(args, options, logger) {
diff --git a/tools/cli/commands/addCrud.js b/tools/cli/commands/addCrud.js
index 618cebf4fc..2412c2910b 100644
--- a/tools/cli/commands/addCrud.js
+++ b/tools/cli/commands/addCrud.js
@@ -1,7 +1,7 @@
 const shell = require('shelljs');
 const chalk = require('chalk');
 const { pascalize } = require('humps');
-const { renameFiles, updateFileWithExports } = require('../helpers/util');
+const { renameFiles } = require('../helpers/util');
 const addModule = require('./addModule');
 
 /**
@@ -20,19 +20,8 @@ function addCrud(logger, templatePath, module, tablePrefix, location) {
 
   addModule(logger, templatePath, module, location, false);
 
-  /*    if (action === 'addcrud' && location === 'client') {
-      const generatedContainerFile = 'generatedContainers.js';
-      const graphqlQuery = `${Module}Query`;
-      const options = {
-        pathToFileWithExports: `${startPath}/packages/${location}/src/modules/common/${generatedContainerFile}`,
-        exportName: graphqlQuery,
-        importString: `import ${graphqlQuery} from '../${module}/containers/${graphqlQuery}';\n`
-      };
-      updateFileWithExports(options);
-    }*/
-
   if (location === 'server') {
-    console.log('copy database files');
+    logger.info('Copying database files...');
     const destinationPath = `${startPath}/packages/${location}/src/database`;
     renameFiles(destinationPath, templatePath, module, 'database');
 
@@ -50,15 +39,6 @@ function addCrud(logger, templatePath, module, tablePrefix, location) {
 
       logger.info(chalk.green(`✔ Inserted db table prefix!`));
     }
-
-    const generatedSchemasFile = 'generatedSchemas.js';
-    const schema = `${Module}Schema`;
-    const options = {
-      pathToFileWithExports: `${startPath}/packages/${location}/src/modules/common/${generatedSchemasFile}`,
-      exportName: schema,
-      importString: `import { ${schema} } from '../${module}/schema';\n`
-    };
-    updateFileWithExports(options);
   }
 
   logger.info(chalk.green(`✔ Module for ${location} successfully created!`));
diff --git a/tools/cli/commands/addModule.js b/tools/cli/commands/addModule.js
index 9e15d2d065..3149fda613 100644
--- a/tools/cli/commands/addModule.js
+++ b/tools/cli/commands/addModule.js
@@ -16,33 +16,32 @@ function addModule(logger, templatePath, module, location, finished = true) {
 
   // create new module directory
   const startPath = `${__dirname}/../../..`;
-  const newModule = shell.mkdir(`${startPath}/packages/${location}/src/modules/${module}`);
+  const modulePath = `${startPath}/packages/${location}/src/modules/${module}`;
+  const newModule = shell.mkdir(modulePath);
 
   // continue only if directory does not jet exist
   if (newModule.code !== 0) {
     logger.error(chalk.red(`The ${module} directory is already exists.`));
     process.exit(1);
   }
-  const destinationPath = `${startPath}/packages/${location}/src/modules/${module}`;
-  renameFiles(destinationPath, templatePath, module, location);
+  // copy templates to destination folder
+  renameFiles(modulePath, templatePath, module, location);
 
   logger.info(chalk.green(`✔ The ${location} files have been copied!`));
 
-  shell.cd('..');
   // get module input data
-  const path = `${startPath}/packages/${location}/src/modules/index.js`;
-  let data = fs.readFileSync(path);
+  const indexPath = `${startPath}/packages/${location}/src/modules/index.js`;
+  let data = fs.readFileSync(indexPath);
 
   // extract Feature modules
-  const re = /Feature\(([^()]+)\)/g;
-  const match = re.exec(data);
+  const featureRegExp = /Feature\(([^()]+)\)/g;
+  const match = featureRegExp.exec(data);
 
   // prepend import module
-  const prepend = `import ${module} from './${module}';\n`;
-  fs.writeFileSync(path, prepend + data);
+  data = `import ${module} from './${module}';\n` + data;
 
   // add module to Feature function
-  shell.ShellString(shell.cat('index.js').replace(RegExp(re, 'g'), `Feature(${module}, ${match[1]})`)).to('index.js');
+  shell.ShellString(data.replace(RegExp(featureRegExp, 'g'), `Feature(${module}, ${match[1]})`)).to(indexPath);
 
   if (finished) {
     logger.info(chalk.green(`✔ Module for ${location} successfully created!`));
diff --git a/tools/cli/commands/updateSchema.js b/tools/cli/commands/updateSchema.js
deleted file mode 100644
index 199453fc52..0000000000
--- a/tools/cli/commands/updateSchema.js
+++ /dev/null
@@ -1,291 +0,0 @@
-const shell = require('shelljs');
-const fs = require('fs');
-const chalk = require('chalk');
-const GraphQLGenerator = require('@domain-schema/graphql').default;
-const { pascalize, camelize } = require('humps');
-
-const { generateField } = require('../helpers/util');
-const schemas = require('../../../packages/server/src/modules/common/generatedSchemas');
-
-/**
- *
- * @param logger
- * @param module
- * @returns {*|void}
- */
-function updateSchema(logger, module) {
-  logger.info(`Updating ${module} Schema…`);
-
-  // pascalize
-  const Module = pascalize(module);
-
-  const startPath = `${__dirname}/../../..`;
-  const modulePath = `${startPath}/packages/server/src/modules/${module}`;
-
-  if (fs.existsSync(modulePath)) {
-    // get module schema
-    const schema = schemas.default[`${Module}Schema`];
-
-    // get schema file
-    const pathSchema = `${startPath}/packages/server/src/modules/${module}/`;
-    if (fs.existsSync(pathSchema)) {
-      const file = `schema.graphql`;
-
-      // regenerate input fields
-      let inputCreate = '';
-      let inputUpdate = '';
-      let inputFilter = `  searchText: String\n`;
-      let manyInput = '';
-      for (const key of schema.keys()) {
-        const value = schema.values[key];
-        const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
-        if (value.type.isSchema) {
-          let required = value.optional ? '' : '!';
-          inputCreate += `  ${key}Id: Int${required}\n`;
-          inputUpdate += `  ${key}Id: Int\n`;
-          inputFilter += `  ${key}Id: Int\n`;
-        } else if (value.type.constructor !== Array) {
-          if (key !== 'id') {
-            inputCreate += `  ${key}: ${generateField(value)}\n`;
-            inputUpdate += `  ${key}: ${generateField(value, true)}\n`;
-          }
-
-          if (hasTypeOf(Date)) {
-            inputFilter += `  ${key}_lte: ${generateField(value, true)}\n`;
-            inputFilter += `  ${key}_gte: ${generateField(value, true)}\n`;
-          } else {
-            inputFilter += `  ${key}: ${generateField(value, true)}\n`;
-          }
-        } else if (value.type.constructor === Array && value.type[0].isSchema) {
-          inputCreate += `  ${key}: ${pascalize(key)}CreateManyInput\n`;
-          inputUpdate += `  ${key}: ${pascalize(key)}UpdateManyInput\n`;
-
-          manyInput += `
-
-input ${pascalize(key)}CreateManyInput {
-  create: [${pascalize(value.type[0].name)}CreateInput!]
-}
-
-input ${pascalize(key)}UpdateManyInput {
-  create: [${pascalize(value.type[0].name)}CreateInput!]
-  delete: [${pascalize(value.type[0].name)}WhereUniqueInput!]
-  update: [${pascalize(value.type[0].name)}UpdateWhereInput!]
-}
-
-input ${pascalize(value.type[0].name)}UpdateWhereInput {
-  where: ${pascalize(value.type[0].name)}WhereUniqueInput!
-  data: ${pascalize(value.type[0].name)}UpdateInput!
-}`;
-        }
-      }
-
-      shell.cd(pathSchema);
-      // override Module type in schema.graphql file
-      const replaceType = `### schema type definitions([^()]+)### end schema type definitions`;
-      shell
-        .ShellString(
-          shell
-            .cat(file)
-            .replace(
-              RegExp(replaceType, 'g'),
-              `### schema type definitions\n${new GraphQLGenerator().generateTypes(
-                schema
-              )}${manyInput}\n\n### end schema type definitions`
-            )
-        )
-        .to(file);
-
-      // override ModuleCreateInput in schema.graphql file
-      const replaceCreate = `input ${Module}CreateInput {([^}])*\\n}`;
-      shell
-        .ShellString(
-          shell.cat(file).replace(RegExp(replaceCreate, 'g'), `input ${Module}CreateInput {\n${inputCreate}}`)
-        )
-        .to(file);
-
-      // override ModuleUpdateInput in schema.graphql file
-      const replaceUpdate = `input ${Module}UpdateInput {([^}])*\\n}`;
-      shell
-        .ShellString(
-          shell.cat(file).replace(RegExp(replaceUpdate, 'g'), `input ${Module}UpdateInput {\n${inputUpdate}}`)
-        )
-        .to(file);
-
-      // override ModuleFilterInput in schema.graphql file
-      const replaceFilter = `input ${Module}FilterInput {([^}])*\\n}`;
-      shell
-        .ShellString(
-          shell.cat(file).replace(RegExp(replaceFilter, 'g'), `input ${Module}FilterInput {\n${inputFilter}}`)
-        )
-        .to(file);
-
-      logger.info(chalk.green(`✔ Schema in ${pathSchema}${file} successfully updated!`));
-
-      const resolverFile = `resolvers.js`;
-      let replace = `  ${schema.name}: {
-`;
-      for (const key of schema.keys()) {
-        const value = schema.values[key];
-        if (value.type.constructor === Array) {
-          replace += `    ${key}: createBatchResolver((sources, args, ctx, info) => {
-      return ctx.${schema.name}.getByIds(sources.map(({ id }) => id), '${camelize(schema.name)}', ctx.${
-            value.type[0].name
-          }, info);
-    }),
-`;
-        }
-      }
-      replace += `  },
-`;
-
-      // override batch resolvers in resolvers.js file
-      const replaceBatchResolvers = `// schema batch resolvers([^*]+)// end schema batch resolvers`;
-      shell
-        .ShellString(
-          shell
-            .cat(resolverFile)
-            .replace(
-              RegExp(replaceBatchResolvers, 'g'),
-              `// schema batch resolvers\n${replace}  // end schema batch resolvers`
-            )
-        )
-        .to(resolverFile);
-
-      logger.info(chalk.green(`✔ Resolver in ${pathSchema}${resolverFile} successfully updated!`));
-    } else {
-      logger.error(chalk.red(`✘ Schema path ${pathSchema} not found!`));
-    }
-
-    // get fragment file
-    const pathFragment = `${startPath}/packages/client/src/modules/${module}/graphql/`;
-    if (fs.existsSync(pathFragment)) {
-      const fragmentGraphqlFile = `${Module}.graphql`;
-
-      // regenerate graphql fragment
-      let fragmentGraphql = '';
-      for (const key of schema.keys()) {
-        fragmentGraphql += regenerateGraphqlFragment(schema.values[key], key);
-      }
-
-      shell.cd(pathFragment);
-      // override graphql fragment file
-      const replaceFragment = `${Module} {(.|\n)*\n}`;
-      fragmentGraphql = shell
-        .cat(fragmentGraphqlFile)
-        .replace(RegExp(replaceFragment, 'g'), `${Module} {\n${fragmentGraphql}}`);
-      try {
-        fs.writeFileSync(pathFragment + fragmentGraphqlFile, fragmentGraphql);
-      } catch (err) {
-        return logger.error(chalk.red(`✘ Failed to write a ${pathFragment}${fragmentGraphqlFile} file!`));
-      }
-      logger.info(chalk.green(`✔ Fragment in ${pathFragment}${fragmentGraphqlFile} successfully updated!`));
-    } else {
-      logger.error(chalk.red(`✘ Fragment path ${pathFragment} not found!`));
-    }
-
-    // get state client file
-    const pathStateClient = `${startPath}/packages/client/src/modules/${module}/graphql/`;
-    if (fs.existsSync(pathStateClient)) {
-      const file = `${Module}State.client.graphql`;
-
-      // regenerate graphql fragment
-      let graphql = '';
-      for (const key of schema.keys()) {
-        const value = schema.values[key];
-        const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
-        if (value.type.isSchema) {
-          graphql += `    ${key}Id\n`;
-        } else {
-          if (hasTypeOf(Date)) {
-            graphql += `    ${key}_lte\n`;
-            graphql += `    ${key}_gte\n`;
-          } else {
-            graphql += `    ${key}\n`;
-          }
-        }
-      }
-      graphql += `    searchText
-  }\n`;
-
-      shell.cd(pathStateClient);
-      // override graphql fragment file
-      const replaceStateClient = `filter {(.|\n)*\n}\n`;
-      shell.ShellString(shell.cat(file).replace(RegExp(replaceStateClient, 'g'), `filter {\n${graphql}}\n`)).to(file);
-
-      logger.info(chalk.green(`✔ State Client in ${pathStateClient}${file} successfully updated!`));
-    } else {
-      logger.error(chalk.red(`✘ State Client path ${pathStateClient} not found!`));
-    }
-
-    // get state resolver file
-    const pathStateResolver = `${startPath}/packages/client/src/modules/${module}/resolvers/`;
-    if (fs.existsSync(pathStateResolver)) {
-      const file = `index.js`;
-
-      // regenerate resolver defaults
-      let defaults = `const defaultFilters = {\n`;
-      for (const key of schema.keys()) {
-        const value = schema.values[key];
-        const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
-        if (value.type.isSchema) {
-          defaults += `  ${key}Id: '',\n`;
-        } else {
-          if (hasTypeOf(Date)) {
-            defaults += `  ${key}_lte: '',\n`;
-            defaults += `  ${key}_gte: '',\n`;
-          } else {
-            defaults += `  ${key}: '',\n`;
-          }
-        }
-      }
-
-      defaults += `  searchText: ''
-};\n`;
-
-      shell.cd(pathStateResolver);
-      // override state resolver file
-      const replaceStateResolverDefaults = `// filter data([^*]+)// end filter data`;
-      shell
-        .ShellString(
-          shell
-            .cat(file)
-            .replace(RegExp(replaceStateResolverDefaults, 'g'), `// filter data\n${defaults}// end filter data`)
-        )
-        .to(file);
-
-      logger.info(chalk.green(`✔ State Resolver in ${pathStateResolver}${file} successfully updated!`));
-    } else {
-      logger.error(chalk.red(`✘ State Resolver path ${pathStateResolver} not found!`));
-    }
-  } else {
-    logger.info(chalk.red(`✘ Module ${module} in path ${modulePath} not found!`));
-  }
-}
-
-const regenerateGraphqlFragment = (value, key, spaces = '') => {
-  if (value.type.isSchema) {
-    let column = 'name';
-    for (const remoteKey of value.type.keys()) {
-      const remoteValue = value.type.values[remoteKey];
-      if (remoteValue.sortBy) {
-        column = remoteKey;
-      }
-    }
-    return `  ${key} {\n    ${spaces}id\n    ${spaces}${column}\n  ${spaces}}\n`;
-  } else if (value.type.constructor === Array && value.type[0].isSchema) {
-    let str = `  ${key} {\n`;
-    for (const remoteKey of value.type[0].keys()) {
-      const remoteValue = value.type[0].values[remoteKey];
-      if (remoteValue.type.isSchema) {
-        str += `  ${regenerateGraphqlFragment(remoteValue, remoteKey, '  ')}`;
-      } else if (remoteValue.type.constructor !== Array) {
-        str += `    ${remoteKey}\n`;
-      }
-    }
-    return str + `  }\n`;
-  } else {
-    return `  ${key}\n`;
-  }
-};
-
-module.exports = updateSchema;
diff --git a/tools/templates/crud/client/components/Module.jsx b/tools/templates/crud/client/components/Module.jsx
deleted file mode 100644
index 59b72c186e..0000000000
--- a/tools/templates/crud/client/components/Module.jsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { StyleSheet, Text, View } from 'react-native';
-
-export default class $Module$ extends React.Component {
-  static propTypes = {
-    title: PropTypes.string.isRequired
-  };
-
-  render() {
-    const { title } = this.props;
-    return (
-      <View style={styles.container}>
-        <View style={styles.element}>
-          <Text style={styles.box}>Hello {title}!</Text>
-        </View>
-      </View>
-    );
-  }
-}
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    backgroundColor: '#fff',
-    alignItems: 'center',
-    justifyContent: 'center'
-  },
-  element: {
-    paddingTop: 30
-  },
-  box: {
-    textAlign: 'center',
-    marginLeft: 15,
-    marginRight: 15
-  }
-});
diff --git a/tools/templates/crud/client/components/Module.web.jsx b/tools/templates/crud/client/components/Module.web.jsx
deleted file mode 100644
index ef88b4b4b0..0000000000
--- a/tools/templates/crud/client/components/Module.web.jsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import Helmet from 'react-helmet';
-import { PageLayout } from '../../common/components/web';
-
-import $Module$Filter from '../containers/$Module$Filter';
-import $Module$List from '../containers/$Module$List';
-import settings from '../../../../../../settings';
-
-export default class $Module$ extends React.PureComponent {
-  static propTypes = {
-    title: PropTypes.string.isRequired
-  };
-
-  renderMetaData = title => (
-    <Helmet
-      title={`${settings.app.name} - ${title}`}
-      meta={[
-        {
-          name: 'description',
-          content: `${settings.app.name} - ${title} page`
-        }
-      ]}
-    />
-  );
-
-  render() {
-    const { title } = this.props;
-    return (
-      <PageLayout>
-        {this.renderMetaData(title)}
-        <h2>{title}</h2>
-        <$Module$Filter {...this.props} />
-        <$Module$List {...this.props} />
-      </PageLayout>
-    );
-  }
-}
diff --git a/tools/templates/crud/client/containers/Module.spec.js b/tools/templates/crud/client/containers/Module.spec.js
deleted file mode 100644
index ac34fe5ce1..0000000000
--- a/tools/templates/crud/client/containers/Module.spec.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { expect } from 'chai';
-import { step } from 'mocha-steps';
-import Renderer from '../../../testHelpers/Renderer';
-import Routes from '../../../app/Routes';
-
-describe('$Module$ UI works', () => {
-  const renderer = new Renderer({});
-  let app;
-  let content;
-
-  step('$Module$ page renders on mount', () => {
-    app = renderer.mount(Routes);
-    renderer.history.push('/$module$');
-    content = app.find('#content');
-    expect(content).to.not.be.empty;
-  });
-});
diff --git a/tools/templates/crud/client/containers/ModuleEdit.jsx b/tools/templates/crud/client/containers/ModuleEdit.jsx
deleted file mode 100644
index c45b7b3ecd..0000000000
--- a/tools/templates/crud/client/containers/ModuleEdit.jsx
+++ /dev/null
@@ -1,87 +0,0 @@
-import React from 'react';
-import { graphql, compose } from 'react-apollo';
-
-import { EditView } from '../../common/components/crud';
-import { $Module$Schema } from '../../../../../server/src/modules/$module$/schema';
-import $MODULE$_QUERY from '../graphql/$Module$Query.graphql';
-import CREATE_$MODULE$ from '../graphql/Create$Module$.graphql';
-import UPDATE_$MODULE$ from '../graphql/Update$Module$.graphql';
-
-class $Module$Edit extends React.Component {
-  render() {
-    return <EditView {...this.props} schema={$Module$Schema} />;
-  }
-}
-
-export default compose(
-  graphql($MODULE$_QUERY, {
-    options: props => {
-      let id = 0;
-      if (props.match) {
-        id = props.match.params.id;
-      } else if (props.navigation) {
-        id = props.navigation.state.params.id;
-      }
-
-      return {
-        fetchPolicy: 'cache-and-network',
-        variables: { where: { id } }
-      };
-    },
-    props({ data: { loading, $module$ } }) {
-      return { loading, data: $module$ };
-    }
-  }),
-  graphql(CREATE_$MODULE$, {
-    props: ({ ownProps: { history, navigation }, mutate }) => ({
-      createEntry: async data => {
-        try {
-          const {
-            data: { create$Module$ }
-          } = await mutate({
-            variables: { data }
-          });
-
-          if (create$Module$.errors) {
-            return { errors: create$Module$.errors };
-          }
-
-          if (history) {
-            return history.push('/$module$');
-          }
-          if (navigation) {
-            return navigation.goBack();
-          }
-        } catch (e) {
-          console.log(e.graphQLErrors);
-        }
-      }
-    })
-  }),
-  graphql(UPDATE_$MODULE$, {
-    props: ({ ownProps: { history, navigation }, mutate }) => ({
-      updateEntry: async (data, where) => {
-        try {
-          const {
-            data: { update$Module$ }
-          } = await mutate({
-            variables: { data, where }
-          });
-
-          if (update$Module$.errors) {
-            return { errors: update$Module$.errors };
-          }
-
-          if (history) {
-            return history.push('/$module$');
-          }
-          if (navigation) {
-            return navigation.goBack();
-          }
-        } catch (e) {
-          console.log(e.graphQLErrors);
-        }
-      }
-    })
-  })
-)($Module$Edit);
diff --git a/tools/templates/crud/client/containers/ModuleFilter.jsx b/tools/templates/crud/client/containers/ModuleFilter.jsx
deleted file mode 100644
index 457b546f59..0000000000
--- a/tools/templates/crud/client/containers/ModuleFilter.jsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import React from 'react';
-import { graphql, compose } from 'react-apollo';
-
-import { removeTypename } from '../../../../../common/utils';
-import { FilterView } from '../../common/components/crud';
-import { $Module$Schema } from '../../../../../server/src/modules/$module$/schema';
-
-import $MODULE$_STATE_QUERY from '../graphql/$Module$StateQuery.client.graphql';
-import UPDATE_FILTER from '../graphql/UpdateFilter.client.graphql';
-
-class $Module$Filter extends React.Component {
-  render() {
-    return <FilterView {...this.props} schema={$Module$Schema} />;
-  }
-}
-
-export default compose(
-  graphql($MODULE$_STATE_QUERY, {
-    props({
-      data: {
-        $module$State: { filter }
-      }
-    }) {
-      return removeTypename(filter);
-    }
-  }),
-  graphql(UPDATE_FILTER, {
-    props: ({ mutate }) => ({
-      onFilterChange(filter) {
-        mutate({ variables: { filter } });
-      }
-    })
-  })
-)($Module$Filter);
diff --git a/tools/templates/crud/client/containers/ModuleList.jsx b/tools/templates/crud/client/containers/ModuleList.jsx
deleted file mode 100644
index bfcdf1c53f..0000000000
--- a/tools/templates/crud/client/containers/ModuleList.jsx
+++ /dev/null
@@ -1,215 +0,0 @@
-import React from 'react';
-import { graphql, compose } from 'react-apollo';
-import update from 'immutability-helper';
-import PropTypes from 'prop-types';
-
-import { removeTypename, removeEmpty } from '../../../../../common/utils';
-import { ListView } from '../../common/components/crud';
-import { updateEntry, deleteEntry } from '../../common/crud';
-import { $Module$Schema } from '../../../../../server/src/modules/$module$/schema';
-
-import $MODULE$_STATE_QUERY from '../graphql/$Module$StateQuery.client.graphql';
-import UPDATE_ORDER_BY from '../graphql/UpdateOrderBy.client.graphql';
-import $MODULE$S_QUERY from '../graphql/$Module$sQuery.graphql';
-import UPDATE_$MODULE$ from '../graphql/Update$Module$.graphql';
-import DELETE_$MODULE$ from '../graphql/Delete$Module$.graphql';
-import SORT_$MODULE$S from '../graphql/Sort$Module$s.graphql';
-import DELETEMANY_$MODULE$S from '../graphql/DeleteMany$Module$s.graphql';
-import UPDATEMANY_$MODULE$S from '../graphql/UpdateMany$Module$s.graphql';
-import $MODULE$S_SUBSCRIPTION from '../graphql/$Module$sSubscription.graphql';
-
-function Add$Module$(prev, node) {
-  return update(prev, {
-    $module$sConnection: {
-      totalCount: {
-        $set: prev.$module$sConnection.totalCount + 1
-      },
-      edges: {
-        $set: [...prev.$module$sConnection.edges, node]
-      }
-    }
-  });
-}
-
-class $Module$ extends React.Component {
-  static propTypes = {
-    subscribeToMore: PropTypes.func.isRequired
-  };
-
-  constructor(props) {
-    super(props);
-    this.subscription = null;
-  }
-
-  componentDidMount() {
-    this.init$Module$ListSubscription();
-  }
-
-  componentWillUnmount() {
-    if (this.subscription) {
-      // unsubscribe
-      this.subscription();
-      this.subscription = null;
-    }
-  }
-
-  init$Module$ListSubscription() {
-    if (!this.subscription) {
-      this.subscribeTo$Module$sList();
-    }
-  }
-
-  subscribeTo$Module$sList = () => {
-    const { subscribeToMore } = this.props;
-
-    this.subscription = subscribeToMore({
-      document: $MODULE$S_SUBSCRIPTION,
-      updateQuery: (
-        prev,
-        {
-          subscriptionData: {
-            data: {
-              $module$sUpdated: { mutation, node }
-            }
-          }
-        }
-      ) => {
-        let newResult = prev;
-
-        if (mutation === 'CREATED') {
-          newResult = Add$Module$(prev, node);
-        }
-        return newResult;
-      }
-    });
-  };
-  render() {
-    return <ListView {...this.props} schema={$Module$Schema} />;
-  }
-}
-
-export default compose(
-  graphql($MODULE$_STATE_QUERY, {
-    props({ data: { $module$State } }) {
-      return removeTypename($module$State);
-    }
-  }),
-  graphql($MODULE$S_QUERY, {
-    options: ({ limit, orderBy, filter }) => {
-      return {
-        fetchPolicy: 'cache-and-network',
-        variables: { limit, orderBy, filter: removeEmpty(filter) }
-      };
-    },
-    props: ({ data: { loading, $module$sConnection, refetch, error, fetchMore, subscribeToMore } }) => {
-      const loadMoreRows = () => {
-        return fetchMore({
-          variables: {
-            offset: $module$sConnection.edges.length
-          },
-          updateQuery: (previousResult, { fetchMoreResult }) => {
-            const newEdges = fetchMoreResult.$module$sConnection.edges;
-            const pageInfo = fetchMoreResult.$module$sConnection.pageInfo;
-
-            return {
-              $module$sConnection: {
-                edges: [...previousResult.$module$sConnection.edges, ...newEdges],
-                pageInfo,
-                __typename: '$Module$Connection'
-              }
-            };
-          }
-        });
-      };
-      if (error) throw new Error(error);
-      return {
-        loading,
-        data: $module$sConnection,
-        loadMoreRows,
-        refetch,
-        subscribeToMore,
-        errors: error ? error.graphQLErrors : null
-      };
-    }
-  }),
-  graphql(UPDATE_$MODULE$, {
-    props: props => ({
-      updateEntry: args => updateEntry(props, args, 'update$Module$')
-    })
-  }),
-  graphql(DELETE_$MODULE$, {
-    props: props => ({
-      deleteEntry: args => deleteEntry(props, args, 'delete$Module$')
-    })
-  }),
-  graphql(SORT_$MODULE$S, {
-    props: ({ ownProps: { refetch }, mutate }) => ({
-      sortEntries: async data => {
-        try {
-          const {
-            data: { sort$Module$s }
-          } = await mutate({
-            variables: { data }
-          });
-
-          if (sort$Module$s.errors) {
-            return { errors: sort$Module$s.errors };
-          }
-
-          refetch();
-        } catch (e) {
-          console.log(e.graphQLErrors);
-        }
-      }
-    })
-  }),
-  graphql(DELETEMANY_$MODULE$S, {
-    props: ({ ownProps: { refetch }, mutate }) => ({
-      deleteManyEntries: async where => {
-        try {
-          const {
-            data: { deleteMany$Module$s }
-          } = await mutate({
-            variables: { where }
-          });
-
-          if (deleteMany$Module$s.errors) {
-            return { errors: deleteMany$Module$s.errors };
-          }
-
-          refetch();
-        } catch (e) {
-          console.log(e.graphQLErrors);
-        }
-      }
-    })
-  }),
-  graphql(UPDATEMANY_$MODULE$S, {
-    props: ({ ownProps: { refetch }, mutate }) => ({
-      updateManyEntries: async (data, where) => {
-        try {
-          const {
-            data: { updateMany$Module$s }
-          } = await mutate({
-            variables: { data: removeEmpty(data), where }
-          });
-
-          if (updateMany$Module$s.errors) {
-            return { errors: updateMany$Module$s.errors };
-          }
-
-          refetch();
-        } catch (e) {
-          console.log(e.graphQLErrors);
-        }
-      }
-    })
-  }),
-  graphql(UPDATE_ORDER_BY, {
-    props: ({ mutate }) => ({
-      onOrderBy: orderBy => {
-        mutate({ variables: { orderBy } });
-      }
-    })
-  })
-)($Module$);
diff --git a/tools/templates/crud/client/containers/ModuleQuery.jsx b/tools/templates/crud/client/containers/ModuleQuery.jsx
deleted file mode 100644
index 9d0a5f7f94..0000000000
--- a/tools/templates/crud/client/containers/ModuleQuery.jsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { graphql } from 'react-apollo';
-
-import $MODULE$S_QUERY from '../graphql/$Module$sQuery.graphql';
-
-class $Module$sQuery extends React.Component {
-  static propTypes = {
-    children: PropTypes.func.isRequired,
-    loading: PropTypes.bool.isRequired,
-    data: PropTypes.object,
-    errors: PropTypes.object
-  };
-
-  render() {
-    const { loading, data, errors } = this.props;
-    return this.props.children({ loading, data, errors });
-  }
-}
-
-export default graphql($MODULE$S_QUERY, {
-  options: ({ limit, orderBy, filter }) => ({ variables: { limit, orderBy, filter } }),
-  props: ({ data: { loading, $module$sConnection, error } }) => {
-    if (error) throw new Error(error);
-    return { loading, data: $module$sConnection, errors: error ? error.graphQLErrors : null };
-  }
-})($Module$sQuery);
diff --git a/tools/templates/crud/client/graphql/CreateModule.graphql b/tools/templates/crud/client/graphql/CreateModule.graphql
deleted file mode 100644
index 27f604e763..0000000000
--- a/tools/templates/crud/client/graphql/CreateModule.graphql
+++ /dev/null
@@ -1,13 +0,0 @@
-#import "./$Module$.graphql"
-
-mutation create$Module$($data: $Module$CreateInput!) {
-  create$Module$(data: $data) {
-    node {
-      ...$Module$Info
-    }
-    errors {
-      field
-      message
-    }
-  }
-}
diff --git a/tools/templates/crud/client/graphql/DeleteManyModules.graphql b/tools/templates/crud/client/graphql/DeleteManyModules.graphql
deleted file mode 100644
index 70a9836a66..0000000000
--- a/tools/templates/crud/client/graphql/DeleteManyModules.graphql
+++ /dev/null
@@ -1,9 +0,0 @@
-mutation deleteMany$Module$s($where: $Module$WhereInput!) {
-  deleteMany$Module$s(where: $where) {
-    count
-    errors {
-      field
-      message
-    }
-  }
-}
diff --git a/tools/templates/crud/client/graphql/DeleteModule.graphql b/tools/templates/crud/client/graphql/DeleteModule.graphql
deleted file mode 100644
index 316dd1ff23..0000000000
--- a/tools/templates/crud/client/graphql/DeleteModule.graphql
+++ /dev/null
@@ -1,11 +0,0 @@
-mutation delete$Module$($where: $Module$WhereUniqueInput!) {
-  delete$Module$(where: $where) {
-    node {
-      id
-    }
-    errors {
-      field
-      message
-    }
-  }
-}
diff --git a/tools/templates/crud/client/graphql/Module.graphql b/tools/templates/crud/client/graphql/Module.graphql
deleted file mode 100644
index a6d63fad05..0000000000
--- a/tools/templates/crud/client/graphql/Module.graphql
+++ /dev/null
@@ -1,4 +0,0 @@
-fragment $Module$Info on $Module$ {
-  id
-  name
-}
\ No newline at end of file
diff --git a/tools/templates/crud/client/graphql/ModuleQuery.graphql b/tools/templates/crud/client/graphql/ModuleQuery.graphql
deleted file mode 100644
index 76df5c5591..0000000000
--- a/tools/templates/crud/client/graphql/ModuleQuery.graphql
+++ /dev/null
@@ -1,9 +0,0 @@
-#import "./$Module$.graphql"
-
-query $module$($where: $Module$WhereUniqueInput!) {
-  $module$(where: $where) {
-    node {
-      ...$Module$Info
-    }
-  }
-}
diff --git a/tools/templates/crud/client/graphql/ModuleState.client.graphql b/tools/templates/crud/client/graphql/ModuleState.client.graphql
deleted file mode 100644
index 6f653cfdab..0000000000
--- a/tools/templates/crud/client/graphql/ModuleState.client.graphql
+++ /dev/null
@@ -1,12 +0,0 @@
-fragment $Module$StateInfo on $Module$State {
-  limit
-  orderBy {
-    column
-    order
-  }
-  filter {
-    id
-    name
-    searchText
-  }
-}
diff --git a/tools/templates/crud/client/graphql/ModuleStateQuery.client.graphql b/tools/templates/crud/client/graphql/ModuleStateQuery.client.graphql
deleted file mode 100644
index 9bebe879a5..0000000000
--- a/tools/templates/crud/client/graphql/ModuleStateQuery.client.graphql
+++ /dev/null
@@ -1,7 +0,0 @@
-#import "./$Module$State.client.graphql"
-
-query $Module$State {
-  $module$State @client {
-    ...$Module$StateInfo
-  }
-}
diff --git a/tools/templates/crud/client/graphql/ModulesQuery.graphql b/tools/templates/crud/client/graphql/ModulesQuery.graphql
deleted file mode 100644
index 327959f1ee..0000000000
--- a/tools/templates/crud/client/graphql/ModulesQuery.graphql
+++ /dev/null
@@ -1,13 +0,0 @@
-#import "./$Module$.graphql"
-
-query $module$sConnection($limit: Int, $offset: Int, $orderBy: OrderByInput, $filter: $Module$FilterInput) {
-  $module$sConnection(limit: $limit, offset: $offset, orderBy: $orderBy, filter: $filter) {
-    pageInfo {
-      totalCount
-      hasNextPage
-    }
-    edges {
-      ...$Module$Info
-    }
-  }
-}
diff --git a/tools/templates/crud/client/graphql/ModulesSubscription.graphql b/tools/templates/crud/client/graphql/ModulesSubscription.graphql
deleted file mode 100644
index 5aad2587ff..0000000000
--- a/tools/templates/crud/client/graphql/ModulesSubscription.graphql
+++ /dev/null
@@ -1,10 +0,0 @@
-#import "./$Module$.graphql"
-
-subscription on$Module$sUpdated {
-    $module$sUpdated {
-        mutation
-        node {
-            ...$Module$Info
-        }
-    }
-}
\ No newline at end of file
diff --git a/tools/templates/crud/client/graphql/SortModules.graphql b/tools/templates/crud/client/graphql/SortModules.graphql
deleted file mode 100644
index c9b29dc597..0000000000
--- a/tools/templates/crud/client/graphql/SortModules.graphql
+++ /dev/null
@@ -1,9 +0,0 @@
-mutation sort$Module$s($data: [Int!]) {
-  sort$Module$s(data: $data) {
-    count
-    errors {
-      field
-      message
-    }
-  }
-}
diff --git a/tools/templates/crud/client/graphql/UpdateFilter.client.graphql b/tools/templates/crud/client/graphql/UpdateFilter.client.graphql
deleted file mode 100644
index b63db8bcc5..0000000000
--- a/tools/templates/crud/client/graphql/UpdateFilter.client.graphql
+++ /dev/null
@@ -1,5 +0,0 @@
-#import "./$Module$State.client.graphql"
-
-mutation update$Module$Filter($filter: Filter$Module$Input!) {
-  update$Module$Filter(filter: $filter) @client
-}
diff --git a/tools/templates/crud/client/graphql/UpdateManyModules.graphql b/tools/templates/crud/client/graphql/UpdateManyModules.graphql
deleted file mode 100644
index a388ee6ab4..0000000000
--- a/tools/templates/crud/client/graphql/UpdateManyModules.graphql
+++ /dev/null
@@ -1,9 +0,0 @@
-mutation updateMany$Module$s($data: $Module$UpdateInput!, $where: $Module$WhereInput!) {
-  updateMany$Module$s(data: $data, where: $where) {
-    count
-    errors {
-      field
-      message
-    }
-  }
-}
diff --git a/tools/templates/crud/client/graphql/UpdateModule.graphql b/tools/templates/crud/client/graphql/UpdateModule.graphql
deleted file mode 100644
index 57da8097fb..0000000000
--- a/tools/templates/crud/client/graphql/UpdateModule.graphql
+++ /dev/null
@@ -1,13 +0,0 @@
-#import "./$Module$.graphql"
-
-mutation update$Module$($data: $Module$UpdateInput!, $where: $Module$WhereUniqueInput!) {
-  update$Module$(data: $data, where: $where) {
-    node {
-      ...$Module$Info
-    }
-    errors {
-      field
-      message
-    }
-  }
-}
diff --git a/tools/templates/crud/client/graphql/UpdateOrderBy.client.graphql b/tools/templates/crud/client/graphql/UpdateOrderBy.client.graphql
deleted file mode 100644
index b55d1dd827..0000000000
--- a/tools/templates/crud/client/graphql/UpdateOrderBy.client.graphql
+++ /dev/null
@@ -1,5 +0,0 @@
-#import "./$Module$State.client.graphql"
-
-mutation update$Module$OrderBy($orderBy: OrderBy$Module$Input!) {
-  update$Module$OrderBy(orderBy: $orderBy) @client
-}
diff --git a/tools/templates/crud/client/index.native.jsx b/tools/templates/crud/client/index.native.jsx
deleted file mode 100644
index 974fa8310a..0000000000
--- a/tools/templates/crud/client/index.native.jsx
+++ /dev/null
@@ -1,61 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { Button } from 'react-native';
-import { createStackNavigator } from 'react-navigation';
-import { Ionicons } from '@expo/vector-icons';
-import { createTabBarIconWrapper } from '../common/components/native';
-import $Module$List from './containers/$Module$List';
-import $Module$Edit from './containers/$Module$Edit';
-import resolvers from './resolvers';
-
-import Feature from '../connector';
-
-class $Module$ListScreen extends React.Component {
-  static navigationOptions = ({ navigation }) => ({
-    title: '$Module$ list',
-    headerRight: <Button title="Add" onPress={() => navigation.navigate('$Module$Edit', { id: 0 })} />
-  });
-  render() {
-    return <$Module$List navigation={this.props.navigation} title="$MoDuLe$" nativeLink={'$MoDuLe$Edit'} />;
-  }
-}
-
-$Module$ListScreen.propTypes = {
-  navigation: PropTypes.object
-};
-
-class $Module$EditScreen extends React.Component {
-  static navigationOptions = ({ navigation }) => ({
-    title: `${navigation.state.params.id === 0 ? 'Create' : 'Edit'} $MoDuLe$`
-  });
-  render() {
-    return <$Module$Edit navigation={this.props.navigation} title="$MoDuLe$" />;
-  }
-}
-
-$Module$EditScreen.propTypes = {
-  navigation: PropTypes.object
-};
-
-const $Module$Navigator = createStackNavigator({
-  $Module$List: { screen: $Module$ListScreen },
-  $Module$Edit: { screen: $Module$EditScreen }
-});
-
-export default new Feature({
-  drawerItem: {
-    $Module$: {
-      screen: $Module$Navigator,
-      navigationOptions: {
-        tabBarIcon: createTabBarIconWrapper(Ionicons, {
-          name: 'ios-browsers-outline',
-          size: 30
-        })
-      },
-      userInfo: {
-        showOnLogin: true
-      }
-    }
-  },
-  resolver: resolvers
-});
diff --git a/tools/templates/crud/client/index.web.jsx b/tools/templates/crud/client/index.web.jsx
deleted file mode 100644
index 5c2d935f56..0000000000
--- a/tools/templates/crud/client/index.web.jsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import React from 'react';
-import { NavLink } from 'react-router-dom';
-import { MenuItem } from '../../modules/common/components/web';
-import $Module$ from './components/$Module$';
-import $Module$Edit from './containers/$Module$Edit';
-import resolvers from './resolvers';
-
-import { AuthRoute, IfLoggedIn } from '../user/containers/Auth';
-import Feature from '../connector';
-
-export default new Feature({
-  route: [
-    <AuthRoute
-      exact
-      path="/$module$"
-      component={$Module$}
-      role={['editor', 'admin']}
-      title="$MoDuLe$"
-      link="$module$"
-    />,
-    <AuthRoute
-      exact
-      path="/$module$/:id"
-      component={$Module$Edit}
-      role={['editor', 'admin']}
-      title="$MoDuLe$"
-      link="$module$"
-    />
-  ],
-  navItem: (
-    <IfLoggedIn role={['editor', 'admin']}>
-      <MenuItem key="/$module$">
-        <NavLink to="/$module$" className="nav-link" activeClassName="active">
-          $MoDuLe$
-        </NavLink>
-      </MenuItem>
-    </IfLoggedIn>
-  ),
-  resolver: resolvers
-});
diff --git a/tools/templates/crud/client/resolvers/index.js b/tools/templates/crud/client/resolvers/index.js
deleted file mode 100644
index 7fc264a26d..0000000000
--- a/tools/templates/crud/client/resolvers/index.js
+++ /dev/null
@@ -1,79 +0,0 @@
-import update from 'immutability-helper';
-
-import $MODULE$_STATE_QUERY from '../graphql/$Module$StateQuery.client.graphql';
-
-const TYPE_$MODULE$_STATE = '$Module$State';
-const TYPE_$MODULE$_STATE_FILTER = 'Filter$Module$Input';
-const TYPE_$MODULE$_STATE_ORDER_BY = 'OrderBy$Module$Input';
-
-// filter data
-const defaultFilters = {
-  id: '',
-  name: '',
-  searchText: ''
-};
-// end filter data
-
-const defaults = {
-  $module$State: {
-    limit: 25,
-    orderBy: {
-      column: '',
-      order: '',
-      __typename: TYPE_$MODULE$_STATE_ORDER_BY
-    },
-    filter: {
-      ...defaultFilters,
-      __typename: TYPE_$MODULE$_STATE_FILTER
-    },
-    __typename: TYPE_$MODULE$_STATE
-  }
-};
-
-const resolvers = {
-  Mutation: {
-    update$Module$OrderBy: (_, { orderBy }, { cache }) => {
-      const { $module$State } = cache.readQuery({ query: $MODULE$_STATE_QUERY });
-
-      const new$Module$State = update($module$State, {
-        orderBy: { $merge: orderBy }
-      });
-
-      cache.writeData({
-        data: {
-          $module$State: new$Module$State,
-          __type: TYPE_$MODULE$_STATE
-        }
-      });
-
-      return null;
-    },
-    update$Module$Filter: (_, { filter }, { cache }) => {
-      const { $module$State } = cache.readQuery({ query: $MODULE$_STATE_QUERY });
-
-      let mergeFilter = filter;
-      if (!filter.hasOwnProperty('searchText')) {
-        const { searchText, ...restFilters } = defaults.$module$State.filter;
-        mergeFilter = { ...restFilters, ...filter };
-      }
-
-      const new$Module$State = update($module$State, {
-        filter: { $merge: mergeFilter }
-      });
-
-      cache.writeData({
-        data: {
-          $module$State: new$Module$State,
-          __type: TYPE_$MODULE$_STATE
-        }
-      });
-
-      return null;
-    }
-  }
-};
-
-export default {
-  defaults,
-  resolvers
-};

From 88c7731b9b4f838e5102b09bc19c5717975765f6 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Wed, 25 Jul 2018 12:45:27 +0300
Subject: [PATCH 223/327] Refactor addModule. Reduce read and write file
 operations

---
 tools/cli/commands/addModule.js | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/tools/cli/commands/addModule.js b/tools/cli/commands/addModule.js
index 3149fda613..69fb3652ef 100644
--- a/tools/cli/commands/addModule.js
+++ b/tools/cli/commands/addModule.js
@@ -4,7 +4,7 @@ const chalk = require('chalk');
 const { renameFiles } = require('../helpers/util');
 
 /**
- * +
+ * Add module in client or server and add new module to feature initialization
  * @param logger
  * @param templatePath
  * @param module
@@ -22,7 +22,7 @@ function addModule(logger, templatePath, module, location, finished = true) {
   // continue only if directory does not jet exist
   if (newModule.code !== 0) {
     logger.error(chalk.red(`The ${module} directory is already exists.`));
-    process.exit(1);
+    process.exit();
   }
   // copy templates to destination folder
   renameFiles(modulePath, templatePath, module, location);
@@ -31,17 +31,21 @@ function addModule(logger, templatePath, module, location, finished = true) {
 
   // get module input data
   const indexPath = `${startPath}/packages/${location}/src/modules/index.js`;
-  let data = fs.readFileSync(indexPath);
+  let indexContent;
+  try {
+    // prepend import module
+    indexContent = `import ${module} from './${module}';\n` + fs.readFileSync(indexPath);
+  } catch (e) {
+    logger.error(chalk.red(`Failed to read /packages/${location}/src/modules/index.js file`));
+    process.exit();
+  }
 
   // extract Feature modules
   const featureRegExp = /Feature\(([^()]+)\)/g;
-  const match = featureRegExp.exec(data);
-
-  // prepend import module
-  data = `import ${module} from './${module}';\n` + data;
+  const [, features] = featureRegExp.exec(indexContent) || ['', ''];
 
   // add module to Feature function
-  shell.ShellString(data.replace(RegExp(featureRegExp, 'g'), `Feature(${module}, ${match[1]})`)).to(indexPath);
+  shell.ShellString(indexContent.replace(RegExp(featureRegExp, 'g'), `Feature(${module}, ${features})`)).to(indexPath);
 
   if (finished) {
     logger.info(chalk.green(`✔ Module for ${location} successfully created!`));

From dc427aea7cc79e3ee7d72781fa14cc841ec28449 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Wed, 25 Jul 2018 16:37:43 +0300
Subject: [PATCH 224/327] Fix tablePrefix generating. Divide renameFiles
 function

---
 package.json                       |   2 +-
 tools/cli/CommandInvoker.js        |   1 +
 tools/cli/commands/addCrud.js      |  22 +++----
 tools/cli/commands/addModule.js    |  13 ++--
 tools/cli/commands/deleteModule.js |  10 ++-
 tools/cli/helpers/util.js          | 102 ++++-------------------------
 6 files changed, 37 insertions(+), 113 deletions(-)

diff --git a/package.json b/package.json
index 155315a89b..64a2fb979a 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "exp-publish": "lerna run --scope=mobile exp-publish --stream",
     "watch": "spin watch",
     "heroku-postbuild": "lerna run heroku-postbuild --stream",
-    "cli": "node tools/cli",
+    "cli": "node $NODE_DEBUG_OPTION tools/cli",
     "precommit": "lint-staged",
     "postinstall": "opencollective postinstall"
   },
diff --git a/tools/cli/CommandInvoker.js b/tools/cli/CommandInvoker.js
index cde94b3621..37bd0db8d9 100644
--- a/tools/cli/CommandInvoker.js
+++ b/tools/cli/CommandInvoker.js
@@ -28,6 +28,7 @@ class CommandInvoker {
 
   runAddCrud(args, options, logger) {
     const { module, tablePrefix = '' } = args;
+    // server - is only available location for addCrud, client in development
     CommandInvoker.runCommand(this.addCrud, 'server', logger, CommandInvoker.crudTemplatePath, module, tablePrefix);
   }
 
diff --git a/tools/cli/commands/addCrud.js b/tools/cli/commands/addCrud.js
index 2412c2910b..f04f6b9450 100644
--- a/tools/cli/commands/addCrud.js
+++ b/tools/cli/commands/addCrud.js
@@ -1,11 +1,11 @@
 const shell = require('shelljs');
 const chalk = require('chalk');
 const { pascalize } = require('humps');
-const { renameFiles } = require('../helpers/util');
+const { copyFiles, renameFiles } = require('../helpers/util');
 const addModule = require('./addModule');
 
 /**
- *
+ * Add CRUD module command
  * @param logger
  * @param templatePath
  * @param module
@@ -13,19 +13,19 @@ const addModule = require('./addModule');
  * @param location
  */
 function addCrud(logger, templatePath, module, tablePrefix, location) {
-  logger.info(`Copying ${location} files…`);
-
-  const Module = pascalize(module);
-  const startPath = `${__dirname}/../../..`;
-
   addModule(logger, templatePath, module, location, false);
 
   if (location === 'server') {
+    const Module = pascalize(module);
+    const startPath = `${__dirname}/../../..`;
+    const databasePath = `${startPath}/packages/${location}/src/database`;
     logger.info('Copying database files...');
-    const destinationPath = `${startPath}/packages/${location}/src/database`;
-    renameFiles(destinationPath, templatePath, module, 'database');
 
+    //copy and rename templates in destination directory
+    copyFiles(databasePath, templatePath, 'database');
+    renameFiles(databasePath, module);
     const timestamp = new Date().getTime();
+    // rename migrations and seeds
     shell.cd(`${startPath}/packages/${location}/src/database/migrations`);
     shell.mv(`_${Module}.js`, `${timestamp}_${Module}.js`);
     shell.cd(`${startPath}/packages/${location}/src/database/seeds`);
@@ -33,9 +33,9 @@ function addCrud(logger, templatePath, module, tablePrefix, location) {
 
     logger.info(chalk.green(`✔ The database files have been copied!`));
 
-    if (tablePrefix !== '') {
+    if (tablePrefix) {
       shell.cd(`${startPath}/packages/${location}/src/modules/${module}`);
-      shell.sed('-i', /this.prefix = '';/g, `this.prefix = '${tablePrefix}';`, 'sql.js');
+      shell.sed('-i', /tablePrefix: ''/g, `tablePrefix: '${tablePrefix}'`, 'schema.js');
 
       logger.info(chalk.green(`✔ Inserted db table prefix!`));
     }
diff --git a/tools/cli/commands/addModule.js b/tools/cli/commands/addModule.js
index 69fb3652ef..4f3352b1dd 100644
--- a/tools/cli/commands/addModule.js
+++ b/tools/cli/commands/addModule.js
@@ -1,10 +1,10 @@
 const shell = require('shelljs');
 const fs = require('fs');
 const chalk = require('chalk');
-const { renameFiles } = require('../helpers/util');
+const { copyFiles, renameFiles } = require('../helpers/util');
 
 /**
- * Add module in client or server and add new module to feature initialization
+ * Add module in client or server and add new module to the Feature connector
  * @param logger
  * @param templatePath
  * @param module
@@ -24,12 +24,13 @@ function addModule(logger, templatePath, module, location, finished = true) {
     logger.error(chalk.red(`The ${module} directory is already exists.`));
     process.exit();
   }
-  // copy templates to destination folder
-  renameFiles(modulePath, templatePath, module, location);
+  //copy and rename templates in destination directory
+  copyFiles(modulePath, templatePath, 'database');
+  renameFiles(modulePath, module);
 
   logger.info(chalk.green(`✔ The ${location} files have been copied!`));
 
-  // get module input data
+  // get modules index data
   const indexPath = `${startPath}/packages/${location}/src/modules/index.js`;
   let indexContent;
   try {
@@ -44,7 +45,7 @@ function addModule(logger, templatePath, module, location, finished = true) {
   const featureRegExp = /Feature\(([^()]+)\)/g;
   const [, features] = featureRegExp.exec(indexContent) || ['', ''];
 
-  // add module to Feature function
+  // add module to Feature connector
   shell.ShellString(indexContent.replace(RegExp(featureRegExp, 'g'), `Feature(${module}, ${features})`)).to(indexPath);
 
   if (finished) {
diff --git a/tools/cli/commands/deleteModule.js b/tools/cli/commands/deleteModule.js
index 957ca4cb92..fddcf12d5e 100644
--- a/tools/cli/commands/deleteModule.js
+++ b/tools/cli/commands/deleteModule.js
@@ -3,8 +3,6 @@ const fs = require('fs');
 const chalk = require('chalk');
 const { pascalize } = require('humps');
 const readline = require('readline');
-
-const { deleteFromFileWithExports } = require('../helpers/util');
 /**
  *
  * @param logger
@@ -19,10 +17,10 @@ async function deleteModule(logger, templatePath, module, location) {
   const Module = pascalize(module);
   const startPath = `${__dirname}/../../..`;
   const modulePath = `${startPath}/packages/${location}/src/modules/${module}`;
-  const generatedContainerFile = 'generatedContainers.js';
+  /*  const generatedContainerFile = 'generatedContainers.js';
   const generatedContainerPath = `${startPath}/packages/${location}/src/modules/common/${generatedContainerFile}`;
   const generatedSchemasFile = 'generatedSchemas.js';
-  const generatedSchemaPath = `${startPath}/packages/${location}/src/modules/common/${generatedSchemasFile}`;
+  const generatedSchemaPath = `${startPath}/packages/${location}/src/modules/common/${generatedSchemasFile}`;*/
   let userAnswer;
 
   if (fs.existsSync(modulePath)) {
@@ -121,14 +119,14 @@ async function deleteModule(logger, templatePath, module, location) {
     logger.info(chalk.red(`✘ Module ${location} location for ${modulePath} not found!`));
   }
 
-  if (fs.existsSync(generatedContainerPath)) {
+  /*  if (fs.existsSync(generatedContainerPath)) {
     const graphqlQuery = `${Module}Query`;
     deleteFromFileWithExports(generatedContainerPath, graphqlQuery);
   }
   if (fs.existsSync(generatedSchemaPath)) {
     const schema = `${Module}Schema`;
     deleteFromFileWithExports(generatedSchemaPath, schema);
-  }
+  }*/
 }
 
 module.exports = deleteModule;
diff --git a/tools/cli/helpers/util.js b/tools/cli/helpers/util.js
index 4d3d78372c..00dfb07cb5 100644
--- a/tools/cli/helpers/util.js
+++ b/tools/cli/helpers/util.js
@@ -1,21 +1,24 @@
 const shell = require('shelljs');
-const fs = require('fs');
-const DomainSchema = require('@domain-schema/core').default;
 const { pascalize, decamelize } = require('humps');
 const { startCase } = require('lodash');
 
 /**
- *
+ * Copy templates to the destination directory
  * @param destinationPath
  * @param templatePath
- * @param module
  * @param location
  */
-function renameFiles(destinationPath, templatePath, module, location) {
-  // pascalize
-  const Module = pascalize(module);
-
+function copyFiles(destinationPath, templatePath, location) {
   shell.cp('-R', `${templatePath}/${location}/*`, destinationPath);
+}
+
+/**
+ * Rename templates in the destination directory
+ * @param destinationPath
+ * @param module
+ */
+function renameFiles(destinationPath, module) {
+  const Module = pascalize(module);
 
   // change to destination directory
   shell.cd(destinationPath);
@@ -23,8 +26,7 @@ function renameFiles(destinationPath, templatePath, module, location) {
   // rename files
   shell.ls('-Rl', '.').forEach(entry => {
     if (entry.isFile()) {
-      const moduleFile = entry.name.replace('Module', Module);
-      shell.mv(entry.name, moduleFile);
+      shell.mv(entry.name, entry.name.replace('Module', Module));
     }
   });
 
@@ -40,85 +42,7 @@ function renameFiles(destinationPath, templatePath, module, location) {
   });
 }
 
-/**
- *
- * @param value
- * @param update
- * @returns {string}
- */
-function generateField(value, update = false) {
-  let result = '';
-  const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
-  if (hasTypeOf(Boolean)) {
-    result += 'Boolean';
-  } else if (hasTypeOf(DomainSchema.ID)) {
-    result += 'ID';
-  } else if (hasTypeOf(DomainSchema.Int)) {
-    result += 'Int';
-  } else if (hasTypeOf(DomainSchema.Float)) {
-    result += 'Float';
-  } else if (hasTypeOf(String)) {
-    result += 'String';
-  } else if (hasTypeOf(Date)) {
-    result += 'Date';
-  } else if (hasTypeOf(DomainSchema.DateTime)) {
-    result += 'DateTime';
-  } else if (hasTypeOf(DomainSchema.Time)) {
-    result += 'Time';
-  }
-
-  if (!update && !value.optional) {
-    result += '!';
-  }
-
-  return result;
-}
-
-/**
- *
- * @param pathToFileWithExports
- * @param exportName
- * @param importString
- */
-function updateFileWithExports({ pathToFileWithExports, exportName, importString }) {
-  const exportGraphqlContainer = `\nexport default {\n  ${exportName}\n};\n`;
-
-  if (fs.existsSync(pathToFileWithExports)) {
-    const generatedContainerData = fs.readFileSync(pathToFileWithExports);
-    const generatedContainer = generatedContainerData.toString().trim();
-    if (generatedContainer.length > 1) {
-      const index = generatedContainer.lastIndexOf("';");
-      const computedIndex = index >= 0 ? index + 3 : false;
-      if (computedIndex) {
-        let computedGeneratedContainer =
-          generatedContainer.slice(0, computedIndex) +
-          importString +
-          generatedContainer.slice(computedIndex, generatedContainer.length);
-        computedGeneratedContainer = computedGeneratedContainer.replace(/(,|)\s};/g, `,\n  ${exportName}\n};`);
-        return fs.writeFileSync(pathToFileWithExports, computedGeneratedContainer);
-      }
-    }
-  }
-  return fs.writeFileSync(pathToFileWithExports, importString + exportGraphqlContainer);
-}
-
-/**
- *
- * @param pathToFileWithExports
- * @param exportName
- */
-function deleteFromFileWithExports(pathToFileWithExports, exportName) {
-  if (fs.existsSync(pathToFileWithExports)) {
-    const generatedElementData = fs.readFileSync(pathToFileWithExports);
-    const reg = `(\\n\\s\\s${exportName}(.|)|import (${exportName}|{ ${exportName} }).+;\\n+(?!ex))`;
-    const generatedElement = generatedElementData.toString().replace(new RegExp(reg, 'g'), '');
-    fs.writeFileSync(pathToFileWithExports, generatedElement);
-  }
-}
-
 module.exports = {
   renameFiles,
-  generateField,
-  updateFileWithExports,
-  deleteFromFileWithExports
+  copyFiles
 };

From c5ee744b5344a7d769a10a72c1d688a63366ac1b Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Wed, 25 Jul 2018 17:27:44 +0300
Subject: [PATCH 225/327] Init delete module command

---
 tools/cli.js                       |  11 ++--
 tools/cli/CommandInvoker.js        |  11 ++--
 tools/cli/commands/deleteModule.js | 102 +++++++----------------------
 3 files changed, 37 insertions(+), 87 deletions(-)

diff --git a/tools/cli.js b/tools/cli.js
index 1f6167f724..cb522f96f8 100644
--- a/tools/cli.js
+++ b/tools/cli.js
@@ -1,10 +1,13 @@
 require('babel-register')({ presets: ['env'], plugins: ['transform-class-properties'] });
 require('babel-polyfill');
+const addModuleCommand = require('./cli/commands/addModule');
+const addCrudCommand = require('./cli/commands/addCrud');
+const deleteModuleCommand = require('./cli/commands/deleteModule');
 const CommandInvoker = require('./cli/CommandInvoker');
 
 const prog = require('caporal');
 
-const commandInvoker = new CommandInvoker();
+const commandInvoker = new CommandInvoker(addModuleCommand, addCrudCommand, deleteModuleCommand);
 
 prog
   .version('1.0.0')
@@ -26,8 +29,8 @@ prog
     'both'
   )
   .argument('[tablePrefix]', 'DB table prefix.')
-  .action((args, options, logger) => commandInvoker.runAddCrud(args, options, logger));
-/*  .command('deletemodule', 'Delete a Module')
+  .action((args, options, logger) => commandInvoker.runAddCrud(args, options, logger))
+  .command('deletemodule', 'Delete a Module')
   .argument('<module>', 'Module name')
   .argument(
     '[location]',
@@ -35,6 +38,6 @@ prog
     ['both', 'server', 'client'],
     'both'
   )
-  .action((args, options, logger) => moduleCmd('deletemodule', args, options, logger));*/
+  .action((args, options, logger) => commandInvoker.runDeleteModule(args, options, logger));
 
 prog.parse(process.argv);
diff --git a/tools/cli/CommandInvoker.js b/tools/cli/CommandInvoker.js
index 37bd0db8d9..db5a59aad8 100644
--- a/tools/cli/CommandInvoker.js
+++ b/tools/cli/CommandInvoker.js
@@ -1,6 +1,3 @@
-const addModuleCommand = require('./commands/addModule');
-const addCrudCommand = require('./commands/addCrud');
-
 class CommandInvoker {
   static get moduleTemplatePath() {
     return `${__dirname}/../templates/module`;
@@ -21,9 +18,10 @@ class CommandInvoker {
     }
   }
 
-  constructor(addModule = addModuleCommand, addCrud = addCrudCommand) {
+  constructor(addModule, addCrud, deleteModule) {
     this.addModule = addModule;
     this.addCrud = addCrud;
+    this.deleteModule = deleteModule;
   }
 
   runAddCrud(args, options, logger) {
@@ -36,6 +34,11 @@ class CommandInvoker {
     const { module, location = 'both' } = args;
     CommandInvoker.runCommand(this.addModule, location, logger, CommandInvoker.moduleTemplatePath, module);
   }
+
+  runDeleteModule(args, options, logger) {
+    const { module, location = 'both' } = args;
+    CommandInvoker.runCommand(this.deleteModule, location, logger, module);
+  }
 }
 
 module.exports = CommandInvoker;
diff --git a/tools/cli/commands/deleteModule.js b/tools/cli/commands/deleteModule.js
index fddcf12d5e..6915642672 100644
--- a/tools/cli/commands/deleteModule.js
+++ b/tools/cli/commands/deleteModule.js
@@ -2,89 +2,20 @@ const shell = require('shelljs');
 const fs = require('fs');
 const chalk = require('chalk');
 const { pascalize } = require('humps');
-const readline = require('readline');
 /**
  *
  * @param logger
- * @param templatePath
  * @param module
  * @param location
  */
-async function deleteModule(logger, templatePath, module, location) {
+function deleteModule(logger, module, location) {
   logger.info(`Deleting ${location} files…`);
 
-  // pascalize
   const Module = pascalize(module);
   const startPath = `${__dirname}/../../..`;
   const modulePath = `${startPath}/packages/${location}/src/modules/${module}`;
-  /*  const generatedContainerFile = 'generatedContainers.js';
-  const generatedContainerPath = `${startPath}/packages/${location}/src/modules/common/${generatedContainerFile}`;
-  const generatedSchemasFile = 'generatedSchemas.js';
-  const generatedSchemaPath = `${startPath}/packages/${location}/src/modules/common/${generatedSchemasFile}`;*/
-  let userAnswer;
 
   if (fs.existsSync(modulePath)) {
-    if (location === 'server') {
-      // get list of migrations
-      const migrationNames = shell.find(`${startPath}/packages/${location}/src/database/migrations/`);
-
-      // open server directory
-      shell.cd(`${startPath}/packages/server`);
-
-      const isLastCreated = !!(migrationNames && migrationNames[migrationNames.length - 1].match(`_${Module}.js`));
-      const isExecuted = shell.exec('yarn knex-migrate list', { silent: true }).includes(`_${Module}.js`);
-
-      if (isLastCreated && isExecuted) {
-        // open server directory
-        shell.cd(`${startPath}/packages/server`);
-        // rollback migration
-        shell.exec('yarn knex-migrate down');
-        logger.info(chalk.green(`✔ Rollback migration was successfully!`));
-      } else if (isExecuted) {
-        const rl = readline.createInterface({
-          input: process.stdin,
-          output: process.stdout
-        });
-
-        const askQuestion = () => {
-          return new Promise(resolve => {
-            rl.question(`The table ${module} won't be deleted. Do you want continue y/n?\n`, answer => {
-              rl.close(answer);
-              resolve(answer);
-            });
-          });
-        };
-
-        do {
-          userAnswer = await askQuestion();
-        } while (userAnswer !== 'y' && userAnswer !== 'n');
-      }
-
-      if (userAnswer === 'n') {
-        return;
-      }
-
-      // change to database migrations directory
-      shell.cd(`${startPath}/packages/${location}/src/database/migrations`);
-      // check if any migrations files for this module existed
-      if (shell.find('.').filter(file => file.search(`_${Module}.js`) > -1).length > 0) {
-        let okMigrations = shell.rm(`*_${Module}.js`);
-        if (okMigrations) {
-          logger.info(chalk.green(`✔ Database migrations files successfully deleted!`));
-        }
-      }
-
-      // change to database seeds directory
-      shell.cd(`${startPath}/packages/${location}/src/database/seeds`);
-      // check if any seed files for this module exist
-      if (shell.find('.').filter(file => file.search(`_${Module}.js`) > -1).length > 0) {
-        let okSeeds = shell.rm(`*_${Module}.js`);
-        if (okSeeds) {
-          logger.info(chalk.green(`✔ Database seed files successfully deleted!`));
-        }
-      }
-    }
-
     // remove module directory
     shell.rm('-rf', modulePath);
 
@@ -113,20 +44,33 @@ async function deleteModule(logger, templatePath, module, location) {
       .ShellString(shell.cat('index.js').replace(RegExp(re, 'g'), `Feature(${modules.toString().trim()})`))
       .to('index.js');
 
+    if (location === 'server') {
+      // change to database migrations directory
+      shell.cd(`${startPath}/packages/${location}/src/database/migrations`);
+      // check if any migrations files for this module exist
+      if (shell.find('.').filter(file => file.search(`_${Module}.js`) > -1).length > 0) {
+        let okMigrations = shell.rm(`*_${Module}.js`);
+        if (okMigrations) {
+          logger.info(chalk.green(`✔ Database migrations files successfully deleted!`));
+        }
+      }
+
+      // change to database seeds directory
+      shell.cd(`${startPath}/packages/${location}/src/database/seeds`);
+      // check if any seed files for this module exist
+      if (shell.find('.').filter(file => file.search(`_${Module}.js`) > -1).length > 0) {
+        let okSeeds = shell.rm(`*_${Module}.js`);
+        if (okSeeds) {
+          logger.info(chalk.green(`✔ Database seed files successfully deleted!`));
+        }
+      }
+    }
+
     // continue only if directory does not jet exist
     logger.info(chalk.green(`✔ Module for ${location} successfully deleted!`));
   } else {
     logger.info(chalk.red(`✘ Module ${location} location for ${modulePath} not found!`));
   }
-
-  /*  if (fs.existsSync(generatedContainerPath)) {
-    const graphqlQuery = `${Module}Query`;
-    deleteFromFileWithExports(generatedContainerPath, graphqlQuery);
-  }
-  if (fs.existsSync(generatedSchemaPath)) {
-    const schema = `${Module}Schema`;
-    deleteFromFileWithExports(generatedSchemaPath, schema);
-  }*/
 }
 
 module.exports = deleteModule;

From a59142518bea9fcfaeff24cc308f1b2eb6bf02b0 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Thu, 26 Jul 2018 11:34:18 +0300
Subject: [PATCH 226/327] Refactor deleteModule. Reduce read and write file
 operations and add checks

---
 tools/cli/commands/addModule.js    |  8 ++++---
 tools/cli/commands/deleteModule.js | 36 +++++++++++++++++-------------
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/tools/cli/commands/addModule.js b/tools/cli/commands/addModule.js
index 4f3352b1dd..ddffa031d1 100644
--- a/tools/cli/commands/addModule.js
+++ b/tools/cli/commands/addModule.js
@@ -25,7 +25,7 @@ function addModule(logger, templatePath, module, location, finished = true) {
     process.exit();
   }
   //copy and rename templates in destination directory
-  copyFiles(modulePath, templatePath, 'database');
+  copyFiles(modulePath, templatePath, location);
   renameFiles(modulePath, module);
 
   logger.info(chalk.green(`✔ The ${location} files have been copied!`));
@@ -43,10 +43,12 @@ function addModule(logger, templatePath, module, location, finished = true) {
 
   // extract Feature modules
   const featureRegExp = /Feature\(([^()]+)\)/g;
-  const [, features] = featureRegExp.exec(indexContent) || ['', ''];
+  const [, featureModules] = featureRegExp.exec(indexContent) || ['', ''];
 
   // add module to Feature connector
-  shell.ShellString(indexContent.replace(RegExp(featureRegExp, 'g'), `Feature(${module}, ${features})`)).to(indexPath);
+  shell
+    .ShellString(indexContent.replace(RegExp(featureRegExp, 'g'), `Feature(${module}, ${featureModules})`))
+    .to(indexPath);
 
   if (finished) {
     logger.info(chalk.green(`✔ Module for ${location} successfully created!`));
diff --git a/tools/cli/commands/deleteModule.js b/tools/cli/commands/deleteModule.js
index 6915642672..b2f1d78b45 100644
--- a/tools/cli/commands/deleteModule.js
+++ b/tools/cli/commands/deleteModule.js
@@ -22,27 +22,31 @@ function deleteModule(logger, module, location) {
     // change to destination directory
     shell.cd(`${startPath}/packages/${location}/src/modules/`);
 
-    // get module input data
-    const path = `${startPath}/packages/${location}/src/modules/index.js`;
-    let data = fs.readFileSync(path);
+    // get modules index data
+    const indexPath = `${startPath}/packages/${location}/src/modules/index.js`;
+    let indexContent;
+    try {
+      indexContent = fs.readFileSync(indexPath);
+    } catch (e) {
+      logger.error(chalk.red(`Failed to read /packages/${location}/src/modules/index.js file`));
+      process.exit();
+    }
 
     // extract Feature modules
-    const re = /Feature\(([^()]+)\)/g;
-    const match = re.exec(data);
-    const modules = match[1].split(',').filter(featureModule => featureModule.trim() !== module);
+    const featureRegExp = /Feature\(([^()]+)\)/g;
+    const [, featureModules] = featureRegExp.exec(indexContent) || ['', ''];
+    const featureModulesWithoutDeleted = featureModules
+      .split(',')
+      .filter(featureModule => featureModule.trim() !== module);
 
-    // remove import module line
-    const lines = data
+    const contentWithoutDeletedModule = indexContent
       .toString()
-      .split('\n')
-      .filter(line => line.match(`import ${module} from './${module}';`) === null);
-    fs.writeFileSync(path, lines.join('\n'));
+      // replace features modules on features without deleted module
+      .replace(featureRegExp, `Feature(${featureModulesWithoutDeleted.toString().trim()})`)
+      // remove import module
+      .replace(RegExp(`import ${module} from './${module}';\n`, 'g'), '');
 
-    // remove module from Feature function
-    //shell.sed('-i', re, `Feature(${modules.toString().trim()})`, 'index.js');
-    shell
-      .ShellString(shell.cat('index.js').replace(RegExp(re, 'g'), `Feature(${modules.toString().trim()})`))
-      .to('index.js');
+    fs.writeFileSync(indexPath, contentWithoutDeletedModule);
 
     if (location === 'server') {
       // change to database migrations directory

From 4798deb55fbcf09dfb5614fb531c1ccf07ca76ff Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Thu, 26 Jul 2018 12:35:26 +0300
Subject: [PATCH 227/327] Add domain-schema/knex dependency

---
 packages/server/package.json |  1 +
 yarn.lock                    | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/packages/server/package.json b/packages/server/package.json
index c05e7f27eb..4bb6b6395e 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -54,6 +54,7 @@
   "dependencies": {
     "@domain-schema/core": "^0.0.34",
     "@domain-schema/graphql": "^0.0.33",
+    "@domain-schema/knex": "^0.0.35",
     "apollo-cache-inmemory": "^1.1.12",
     "apollo-cache-router": "^1.1.2",
     "apollo-client": "^2.3.1",
diff --git a/yarn.lock b/yarn.lock
index 67deed49da..783b1086e5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -575,6 +575,25 @@
     lodash "^4.17.5"
     to-fast-properties "^2.0.0"
 
+"@domain-schema/core@^0.0.34":
+  version "0.0.34"
+  resolved "https://registry.yarnpkg.com/@domain-schema/core/-/core-0.0.34.tgz#5900ae4f0844cb8e7ffa91f5be32bd0417d96429"
+  dependencies:
+    debug "^3.1.0"
+
+"@domain-schema/graphql@^0.0.33":
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/@domain-schema/graphql/-/graphql-0.0.33.tgz#201d8cc5d21a9eba69f2eb8cb1fe44f012381cec"
+  dependencies:
+    debug "^3.1.0"
+
+"@domain-schema/knex@^0.0.35":
+  version "0.0.35"
+  resolved "https://registry.yarnpkg.com/@domain-schema/knex/-/knex-0.0.35.tgz#3ea8fb1fdf57e9c9334843ed8bfa3b4e9e1f03c4"
+  dependencies:
+    debug "^3.1.0"
+    humps "^2.0.1"
+
 "@expo/bunyan@^1.8.10":
   version "1.8.10"
   resolved "https://registry.yarnpkg.com/@expo/bunyan/-/bunyan-1.8.10.tgz#7d19354a6bce85aae5fea0e973569d3f0142533e"

From 577e2b6ae6fc49493ccf582c91412350536bfc38 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Thu, 26 Jul 2018 17:02:10 +0300
Subject: [PATCH 228/327] Add reading index file no matter what extension it
 has

---
 tools/cli/commands/addModule.js    | 6 ++++--
 tools/cli/commands/deleteModule.js | 7 +++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/tools/cli/commands/addModule.js b/tools/cli/commands/addModule.js
index ddffa031d1..6f319499e1 100644
--- a/tools/cli/commands/addModule.js
+++ b/tools/cli/commands/addModule.js
@@ -30,8 +30,10 @@ function addModule(logger, templatePath, module, location, finished = true) {
 
   logger.info(chalk.green(`✔ The ${location} files have been copied!`));
 
-  // get modules index data
-  const indexPath = `${startPath}/packages/${location}/src/modules/index.js`;
+  // get index file path
+  const modulesPath = `${startPath}/packages/${location}/src/modules/`;
+  const indexFullFileName = fs.readdirSync(modulesPath).find(name => name.search(/index/) >= 0);
+  const indexPath = modulesPath + indexFullFileName;
   let indexContent;
   try {
     // prepend import module
diff --git a/tools/cli/commands/deleteModule.js b/tools/cli/commands/deleteModule.js
index b2f1d78b45..3643aa4515 100644
--- a/tools/cli/commands/deleteModule.js
+++ b/tools/cli/commands/deleteModule.js
@@ -22,8 +22,11 @@ function deleteModule(logger, module, location) {
     // change to destination directory
     shell.cd(`${startPath}/packages/${location}/src/modules/`);
 
-    // get modules index data
-    const indexPath = `${startPath}/packages/${location}/src/modules/index.js`;
+    // get index file path
+    const modulesPath = `${startPath}/packages/${location}/src/modules/`;
+    const indexFullFileName = fs.readdirSync(modulesPath).find(name => name.search(/index/) >= 0);
+    const indexPath = modulesPath + indexFullFileName;
+
     let indexContent;
     try {
       indexContent = fs.readFileSync(indexPath);

From c9d5087ed15d87c2bcfad4b9bd11032e59f7b878 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Fri, 27 Jul 2018 11:25:37 +0300
Subject: [PATCH 229/327] Add absent types to graphql template

---
 tools/templates/crud/server/schema.graphql | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/tools/templates/crud/server/schema.graphql b/tools/templates/crud/server/schema.graphql
index 0092024f18..ac634ce0bc 100644
--- a/tools/templates/crud/server/schema.graphql
+++ b/tools/templates/crud/server/schema.graphql
@@ -19,6 +19,21 @@ type $Module$Payload {
   errors: [FieldError!]
 }
 
+type PageInfo {
+  totalCount: Int
+  hasNextPage: Boolean
+}
+
+type BatchPayload {
+  count: Int
+  errors: [FieldError!]
+}
+
+input OrderByInput {
+  column: String
+  order: String
+}
+
 input $Module$FilterInput {
   searchText: String
 }

From 2a6d4ad2a9d0f4525136f32991691795a67b0661 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Fri, 27 Jul 2018 11:49:57 +0300
Subject: [PATCH 230/327] Fix babel class compilation issue, after running
 migrate command

---
 packages/server/knexfile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/knexfile.js b/packages/server/knexfile.js
index eb0f52b771..78f79ffa35 100644
--- a/packages/server/knexfile.js
+++ b/packages/server/knexfile.js
@@ -1,6 +1,6 @@
 /* eslint import/no-extraneous-dependencies: 0 */
 require('dotenv/config');
-require('babel-register')({ presets: ['env'] });
+require('babel-register')({ presets: ['env'], plugins: ['transform-class-properties'] });
 require('babel-polyfill');
 const config = require('./knexdata');
 

From ec74a4ba6d439a4ce0173451c12f52ced1949613 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Fri, 27 Jul 2018 12:41:25 +0300
Subject: [PATCH 231/327] Add -m option for deletemodule command to delete
 migration and seeds

---
 tools/cli.js                                      | 10 +++-------
 tools/cli/CommandInvoker.js                       |  2 +-
 tools/cli/commands/subCommands/addMigration.js    |  0
 tools/cli/commands/subCommands/deleteMigration.js |  0
 4 files changed, 4 insertions(+), 8 deletions(-)
 create mode 100644 tools/cli/commands/subCommands/addMigration.js
 create mode 100644 tools/cli/commands/subCommands/deleteMigration.js

diff --git a/tools/cli.js b/tools/cli.js
index cb522f96f8..125623f44e 100644
--- a/tools/cli.js
+++ b/tools/cli.js
@@ -24,7 +24,7 @@ prog
   .argument('<module>', 'Module name')
   .argument(
     '[location]',
-    'Where should new module be created. [both, server, client]',
+    'Where should CRUD module be created. [both, server, client]',
     ['both', 'server', 'client'],
     'both'
   )
@@ -32,12 +32,8 @@ prog
   .action((args, options, logger) => commandInvoker.runAddCrud(args, options, logger))
   .command('deletemodule', 'Delete a Module')
   .argument('<module>', 'Module name')
-  .argument(
-    '[location]',
-    'Where should new module be created. [both, server, client]',
-    ['both', 'server', 'client'],
-    'both'
-  )
+  .argument('[location]', 'Where should we delete module. [both, server, client]', ['both', 'server', 'client'], 'both')
+  .option('-m', 'Delete migration and seeds')
   .action((args, options, logger) => commandInvoker.runDeleteModule(args, options, logger));
 
 prog.parse(process.argv);
diff --git a/tools/cli/CommandInvoker.js b/tools/cli/CommandInvoker.js
index db5a59aad8..7992515e0b 100644
--- a/tools/cli/CommandInvoker.js
+++ b/tools/cli/CommandInvoker.js
@@ -37,7 +37,7 @@ class CommandInvoker {
 
   runDeleteModule(args, options, logger) {
     const { module, location = 'both' } = args;
-    CommandInvoker.runCommand(this.deleteModule, location, logger, module);
+    CommandInvoker.runCommand(this.deleteModule, location, logger, module, options);
   }
 }
 
diff --git a/tools/cli/commands/subCommands/addMigration.js b/tools/cli/commands/subCommands/addMigration.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tools/cli/commands/subCommands/deleteMigration.js b/tools/cli/commands/subCommands/deleteMigration.js
new file mode 100644
index 0000000000..e69de29bb2

From efe807bfbd49179dd2223f695fce0a90caa01175 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Fri, 27 Jul 2018 13:13:58 +0300
Subject: [PATCH 232/327] Add sub command deleteMigrations. Add config for
 repeated paths

---
 tools/cli/commands/deleteModule.js            | 34 ++++--------------
 .../commands/subCommands/deleteMigration.js   |  0
 .../commands/subCommands/deleteMigrations.js  | 35 +++++++++++++++++++
 tools/cli/config.js                           |  7 ++++
 4 files changed, 49 insertions(+), 27 deletions(-)
 delete mode 100644 tools/cli/commands/subCommands/deleteMigration.js
 create mode 100644 tools/cli/commands/subCommands/deleteMigrations.js
 create mode 100644 tools/cli/config.js

diff --git a/tools/cli/commands/deleteModule.js b/tools/cli/commands/deleteModule.js
index 3643aa4515..213963adef 100644
--- a/tools/cli/commands/deleteModule.js
+++ b/tools/cli/commands/deleteModule.js
@@ -1,17 +1,16 @@
 const shell = require('shelljs');
 const fs = require('fs');
 const chalk = require('chalk');
-const { pascalize } = require('humps');
+const deleteMigrations = require('./subCommands/deleteMigrations');
 /**
- *
+ * Delete module
  * @param logger
  * @param module
  * @param location
+ * @param options
  */
-function deleteModule(logger, module, location) {
+function deleteModule(logger, module, location, options) {
   logger.info(`Deleting ${location} files…`);
-
-  const Module = pascalize(module);
   const startPath = `${__dirname}/../../..`;
   const modulePath = `${startPath}/packages/${location}/src/modules/${module}`;
 
@@ -51,29 +50,10 @@ function deleteModule(logger, module, location) {
 
     fs.writeFileSync(indexPath, contentWithoutDeletedModule);
 
-    if (location === 'server') {
-      // change to database migrations directory
-      shell.cd(`${startPath}/packages/${location}/src/database/migrations`);
-      // check if any migrations files for this module exist
-      if (shell.find('.').filter(file => file.search(`_${Module}.js`) > -1).length > 0) {
-        let okMigrations = shell.rm(`*_${Module}.js`);
-        if (okMigrations) {
-          logger.info(chalk.green(`✔ Database migrations files successfully deleted!`));
-        }
-      }
-
-      // change to database seeds directory
-      shell.cd(`${startPath}/packages/${location}/src/database/seeds`);
-      // check if any seed files for this module exist
-      if (shell.find('.').filter(file => file.search(`_${Module}.js`) > -1).length > 0) {
-        let okSeeds = shell.rm(`*_${Module}.js`);
-        if (okSeeds) {
-          logger.info(chalk.green(`✔ Database seed files successfully deleted!`));
-        }
-      }
+    // delete migration and seed if server location and option -m specified
+    if (location === 'server' && options.m) {
+      deleteMigrations(logger, module);
     }
-
-    // continue only if directory does not jet exist
     logger.info(chalk.green(`✔ Module for ${location} successfully deleted!`));
   } else {
     logger.info(chalk.red(`✘ Module ${location} location for ${modulePath} not found!`));
diff --git a/tools/cli/commands/subCommands/deleteMigration.js b/tools/cli/commands/subCommands/deleteMigration.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tools/cli/commands/subCommands/deleteMigrations.js b/tools/cli/commands/subCommands/deleteMigrations.js
new file mode 100644
index 0000000000..f171a53535
--- /dev/null
+++ b/tools/cli/commands/subCommands/deleteMigrations.js
@@ -0,0 +1,35 @@
+const shell = require('shelljs');
+const chalk = require('chalk');
+const { pascalize } = require('humps');
+const { migrationsDir, seedsDir } = require('../../config');
+
+/**
+ * Delete migrations and seeds
+ * @param logger
+ * @param module
+ */
+function deleteMigrations(logger, module) {
+  const Module = pascalize(module);
+  const startPath = `${__dirname}/../../../..`;
+  // change to database migrations directory
+  shell.cd(`${startPath}${migrationsDir}`);
+  // check if any migrations files for this module exist
+  if (shell.find('.').find(file => file.search(`_${Module}.js`) > -1)) {
+    const okMigrations = shell.rm(`*_${Module}.js`);
+    if (okMigrations) {
+      logger.info(chalk.green(`✔ Database migrations files successfully deleted!`));
+    }
+  }
+
+  // change to database seeds directory
+  shell.cd(`${startPath}${seedsDir}`);
+  // check if any seed files for this module exist
+  if (shell.find('.').find(file => file.search(`_${Module}.js`) > -1)) {
+    const okSeeds = shell.rm(`*_${Module}.js`);
+    if (okSeeds) {
+      logger.info(chalk.green(`✔ Database seed files successfully deleted!`));
+    }
+  }
+}
+
+module.exports = deleteMigrations;
diff --git a/tools/cli/config.js b/tools/cli/config.js
new file mode 100644
index 0000000000..93210ee0b4
--- /dev/null
+++ b/tools/cli/config.js
@@ -0,0 +1,7 @@
+const migrationsDir = '/packages/server/src/database/migrations';
+const seedsDir = '/packages/server/src/database/seeds';
+
+exports.modules = {
+  migrationsDir,
+  seedsDir
+};

From 6f37efd22430b16f87a4f4ac1c9adf0438df0f5f Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Fri, 27 Jul 2018 15:58:38 +0300
Subject: [PATCH 233/327] Add sub command add migration. Replace hardcoded
 paths on paths from config

---
 tools/cli/CommandInvoker.js                   | 15 ++++------
 tools/cli/commands/addCrud.js                 | 25 ++++------------
 tools/cli/commands/addModule.js               |  9 +++---
 tools/cli/commands/deleteModule.js            | 13 ++++----
 .../cli/commands/subCommands/addMigration.js  | 30 +++++++++++++++++++
 .../commands/subCommands/deleteMigrations.js  |  8 ++---
 tools/cli/config.js                           | 22 ++++++++++----
 tools/cli/helpers/util.js                     | 16 +++++++++-
 8 files changed, 88 insertions(+), 50 deletions(-)

diff --git a/tools/cli/CommandInvoker.js b/tools/cli/CommandInvoker.js
index 7992515e0b..bd1dcd089c 100644
--- a/tools/cli/CommandInvoker.js
+++ b/tools/cli/CommandInvoker.js
@@ -1,12 +1,6 @@
-class CommandInvoker {
-  static get moduleTemplatePath() {
-    return `${__dirname}/../templates/module`;
-  }
-
-  static get crudTemplatePath() {
-    return `${__dirname}/../templates/crud`;
-  }
+const { CRUD_TEMPLATES, MODULE_TEMPLATES } = require('./config');
 
+class CommandInvoker {
   static runCommand(func, location, ...args) {
     // client
     if (location === 'client' || location === 'both') {
@@ -27,12 +21,13 @@ class CommandInvoker {
   runAddCrud(args, options, logger) {
     const { module, tablePrefix = '' } = args;
     // server - is only available location for addCrud, client in development
-    CommandInvoker.runCommand(this.addCrud, 'server', logger, CommandInvoker.crudTemplatePath, module, tablePrefix);
+    console.log('crud', CRUD_TEMPLATES);
+    CommandInvoker.runCommand(this.addCrud, 'server', logger, CRUD_TEMPLATES, module, tablePrefix);
   }
 
   runAddModule(args, options, logger) {
     const { module, location = 'both' } = args;
-    CommandInvoker.runCommand(this.addModule, location, logger, CommandInvoker.moduleTemplatePath, module);
+    CommandInvoker.runCommand(this.addModule, location, logger, MODULE_TEMPLATES, module);
   }
 
   runDeleteModule(args, options, logger) {
diff --git a/tools/cli/commands/addCrud.js b/tools/cli/commands/addCrud.js
index f04f6b9450..dd66d8afaa 100644
--- a/tools/cli/commands/addCrud.js
+++ b/tools/cli/commands/addCrud.js
@@ -1,8 +1,8 @@
 const shell = require('shelljs');
 const chalk = require('chalk');
-const { pascalize } = require('humps');
-const { copyFiles, renameFiles } = require('../helpers/util');
 const addModule = require('./addModule');
+const addMigration = require('./subCommands/addMigration');
+const { computeModulesPath } = require('../helpers/util');
 
 /**
  * Add CRUD module command
@@ -13,28 +13,15 @@ const addModule = require('./addModule');
  * @param location
  */
 function addCrud(logger, templatePath, module, tablePrefix, location) {
+  // add module in server, client
   addModule(logger, templatePath, module, location, false);
 
   if (location === 'server') {
-    const Module = pascalize(module);
-    const startPath = `${__dirname}/../../..`;
-    const databasePath = `${startPath}/packages/${location}/src/database`;
-    logger.info('Copying database files...');
-
-    //copy and rename templates in destination directory
-    copyFiles(databasePath, templatePath, 'database');
-    renameFiles(databasePath, module);
-    const timestamp = new Date().getTime();
-    // rename migrations and seeds
-    shell.cd(`${startPath}/packages/${location}/src/database/migrations`);
-    shell.mv(`_${Module}.js`, `${timestamp}_${Module}.js`);
-    shell.cd(`${startPath}/packages/${location}/src/database/seeds`);
-    shell.mv(`_${Module}.js`, `${timestamp}_${Module}.js`);
-
-    logger.info(chalk.green(`✔ The database files have been copied!`));
+    // add module migration and seed
+    addMigration(logger, templatePath, module);
 
     if (tablePrefix) {
-      shell.cd(`${startPath}/packages/${location}/src/modules/${module}`);
+      shell.cd(computeModulesPath(location, module));
       shell.sed('-i', /tablePrefix: ''/g, `tablePrefix: '${tablePrefix}'`, 'schema.js');
 
       logger.info(chalk.green(`✔ Inserted db table prefix!`));
diff --git a/tools/cli/commands/addModule.js b/tools/cli/commands/addModule.js
index 6f319499e1..5ebcab0663 100644
--- a/tools/cli/commands/addModule.js
+++ b/tools/cli/commands/addModule.js
@@ -1,7 +1,7 @@
 const shell = require('shelljs');
 const fs = require('fs');
 const chalk = require('chalk');
-const { copyFiles, renameFiles } = require('../helpers/util');
+const { copyFiles, renameFiles, computeModulesPath } = require('../helpers/util');
 
 /**
  * Add module in client or server and add new module to the Feature connector
@@ -15,8 +15,7 @@ function addModule(logger, templatePath, module, location, finished = true) {
   logger.info(`Copying ${location} files…`);
 
   // create new module directory
-  const startPath = `${__dirname}/../../..`;
-  const modulePath = `${startPath}/packages/${location}/src/modules/${module}`;
+  const modulePath = computeModulesPath(location, module);
   const newModule = shell.mkdir(modulePath);
 
   // continue only if directory does not jet exist
@@ -31,7 +30,7 @@ function addModule(logger, templatePath, module, location, finished = true) {
   logger.info(chalk.green(`✔ The ${location} files have been copied!`));
 
   // get index file path
-  const modulesPath = `${startPath}/packages/${location}/src/modules/`;
+  const modulesPath = computeModulesPath(location);
   const indexFullFileName = fs.readdirSync(modulesPath).find(name => name.search(/index/) >= 0);
   const indexPath = modulesPath + indexFullFileName;
   let indexContent;
@@ -39,7 +38,7 @@ function addModule(logger, templatePath, module, location, finished = true) {
     // prepend import module
     indexContent = `import ${module} from './${module}';\n` + fs.readFileSync(indexPath);
   } catch (e) {
-    logger.error(chalk.red(`Failed to read /packages/${location}/src/modules/index.js file`));
+    logger.error(chalk.red(`Failed to read ${indexPath} file`));
     process.exit();
   }
 
diff --git a/tools/cli/commands/deleteModule.js b/tools/cli/commands/deleteModule.js
index 213963adef..e2e19d6a1d 100644
--- a/tools/cli/commands/deleteModule.js
+++ b/tools/cli/commands/deleteModule.js
@@ -2,27 +2,28 @@ const shell = require('shelljs');
 const fs = require('fs');
 const chalk = require('chalk');
 const deleteMigrations = require('./subCommands/deleteMigrations');
+const { computeModulesPath } = require('../helpers/util');
 /**
  * Delete module
  * @param logger
  * @param module
- * @param location
  * @param options
+ * @param location
  */
-function deleteModule(logger, module, location, options) {
+function deleteModule(logger, module, options, location) {
   logger.info(`Deleting ${location} files…`);
-  const startPath = `${__dirname}/../../..`;
-  const modulePath = `${startPath}/packages/${location}/src/modules/${module}`;
+  const modulePath = computeModulesPath(location, module);
 
   if (fs.existsSync(modulePath)) {
     // remove module directory
     shell.rm('-rf', modulePath);
 
+    const modulesPath = computeModulesPath(location);
     // change to destination directory
-    shell.cd(`${startPath}/packages/${location}/src/modules/`);
+    shell.cd(modulesPath);
 
     // get index file path
-    const modulesPath = `${startPath}/packages/${location}/src/modules/`;
+
     const indexFullFileName = fs.readdirSync(modulesPath).find(name => name.search(/index/) >= 0);
     const indexPath = modulesPath + indexFullFileName;
 
diff --git a/tools/cli/commands/subCommands/addMigration.js b/tools/cli/commands/subCommands/addMigration.js
index e69de29bb2..19f977f6cf 100644
--- a/tools/cli/commands/subCommands/addMigration.js
+++ b/tools/cli/commands/subCommands/addMigration.js
@@ -0,0 +1,30 @@
+const shell = require('shelljs');
+const chalk = require('chalk');
+const { pascalize } = require('humps');
+const { copyFiles, renameFiles } = require('../../helpers/util');
+const { DATABASE_DIR, MIGRATIONS_DIR, SEEDS_DIR } = require('../../config');
+
+/**
+ * Create migration and seed for module
+ * @param logger
+ * @param module
+ * @param templatePath
+ */
+function addMigration(logger, templatePath, module) {
+  const Module = pascalize(module);
+  logger.info('Copying database files...');
+
+  //copy and rename templates in destination directory
+  copyFiles(DATABASE_DIR, templatePath, 'database');
+  renameFiles(DATABASE_DIR, module);
+  const timestamp = new Date().getTime();
+  // rename migrations and seeds
+  shell.cd(MIGRATIONS_DIR);
+  shell.mv(`_${Module}.js`, `${timestamp}_${Module}.js`);
+  shell.cd(SEEDS_DIR);
+  shell.mv(`_${Module}.js`, `${timestamp}_${Module}.js`);
+
+  logger.info(chalk.green(`✔ The database files have been copied!`));
+}
+
+module.exports = addMigration;
diff --git a/tools/cli/commands/subCommands/deleteMigrations.js b/tools/cli/commands/subCommands/deleteMigrations.js
index f171a53535..b97086e559 100644
--- a/tools/cli/commands/subCommands/deleteMigrations.js
+++ b/tools/cli/commands/subCommands/deleteMigrations.js
@@ -1,10 +1,10 @@
 const shell = require('shelljs');
 const chalk = require('chalk');
 const { pascalize } = require('humps');
-const { migrationsDir, seedsDir } = require('../../config');
+const { MIGRATIONS_DIR, SEEDS_DIR } = require('../../config');
 
 /**
- * Delete migrations and seeds
+ * Delete module migrations and seeds
  * @param logger
  * @param module
  */
@@ -12,7 +12,7 @@ function deleteMigrations(logger, module) {
   const Module = pascalize(module);
   const startPath = `${__dirname}/../../../..`;
   // change to database migrations directory
-  shell.cd(`${startPath}${migrationsDir}`);
+  shell.cd(`${startPath}${MIGRATIONS_DIR}`);
   // check if any migrations files for this module exist
   if (shell.find('.').find(file => file.search(`_${Module}.js`) > -1)) {
     const okMigrations = shell.rm(`*_${Module}.js`);
@@ -22,7 +22,7 @@ function deleteMigrations(logger, module) {
   }
 
   // change to database seeds directory
-  shell.cd(`${startPath}${seedsDir}`);
+  shell.cd(`${startPath}${SEEDS_DIR}`);
   // check if any seed files for this module exist
   if (shell.find('.').find(file => file.search(`_${Module}.js`) > -1)) {
     const okSeeds = shell.rm(`*_${Module}.js`);
diff --git a/tools/cli/config.js b/tools/cli/config.js
index 93210ee0b4..8d822a9d16 100644
--- a/tools/cli/config.js
+++ b/tools/cli/config.js
@@ -1,7 +1,19 @@
-const migrationsDir = '/packages/server/src/database/migrations';
-const seedsDir = '/packages/server/src/database/seeds';
+const path = require('path');
 
-exports.modules = {
-  migrationsDir,
-  seedsDir
+const BASE_PATH = path.resolve(`${__dirname}'/../..`);
+const DATABASE_DIR = `${BASE_PATH}/packages/server/src/database`;
+const MIGRATIONS_DIR = `${DATABASE_DIR}/migrations`;
+const SEEDS_DIR = `${DATABASE_DIR}/seeds`;
+const TEMPLATES_DIR = `${BASE_PATH}/tools/templates`;
+const MODULE_TEMPLATES = `${TEMPLATES_DIR}/module`;
+const CRUD_TEMPLATES = `${TEMPLATES_DIR}/crud`;
+
+module.exports = {
+  BASE_PATH,
+  DATABASE_DIR,
+  MIGRATIONS_DIR,
+  SEEDS_DIR,
+  TEMPLATES_DIR,
+  MODULE_TEMPLATES,
+  CRUD_TEMPLATES
 };
diff --git a/tools/cli/helpers/util.js b/tools/cli/helpers/util.js
index 00dfb07cb5..6bae0f273d 100644
--- a/tools/cli/helpers/util.js
+++ b/tools/cli/helpers/util.js
@@ -1,6 +1,7 @@
 const shell = require('shelljs');
 const { pascalize, decamelize } = require('humps');
 const { startCase } = require('lodash');
+const { BASE_PATH } = require('../config');
 
 /**
  * Copy templates to the destination directory
@@ -9,6 +10,8 @@ const { startCase } = require('lodash');
  * @param location
  */
 function copyFiles(destinationPath, templatePath, location) {
+  console.log('templatePath', templatePath);
+  console.log('destinationPath', destinationPath);
   shell.cp('-R', `${templatePath}/${location}/*`, destinationPath);
 }
 
@@ -42,7 +45,18 @@ function renameFiles(destinationPath, module) {
   });
 }
 
+/**
+ * Computing modules path
+ * @param location
+ * @param module
+ * @returns {string}
+ */
+function computeModulesPath(location, module = '') {
+  return `${BASE_PATH}/packages/${location}/src/modules/${module}`;
+}
+
 module.exports = {
   renameFiles,
-  copyFiles
+  copyFiles,
+  computeModulesPath
 };

From 91cb2356eb17fb63333254fc30e6d9ebe7b24f95 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Fri, 27 Jul 2018 16:08:39 +0300
Subject: [PATCH 234/327] Replace paths in deleteMigrations function. Delete
 console.logs. Rename variables. Change comments

---
 tools/cli/CommandInvoker.js                        | 1 -
 tools/cli/commands/addCrud.js                      | 8 ++++----
 tools/cli/commands/addModule.js                    | 6 +++---
 tools/cli/commands/subCommands/addMigration.js     | 6 +++---
 tools/cli/commands/subCommands/deleteMigrations.js | 5 ++---
 tools/cli/helpers/util.js                          | 4 +---
 6 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/tools/cli/CommandInvoker.js b/tools/cli/CommandInvoker.js
index bd1dcd089c..6a1ac9c200 100644
--- a/tools/cli/CommandInvoker.js
+++ b/tools/cli/CommandInvoker.js
@@ -21,7 +21,6 @@ class CommandInvoker {
   runAddCrud(args, options, logger) {
     const { module, tablePrefix = '' } = args;
     // server - is only available location for addCrud, client in development
-    console.log('crud', CRUD_TEMPLATES);
     CommandInvoker.runCommand(this.addCrud, 'server', logger, CRUD_TEMPLATES, module, tablePrefix);
   }
 
diff --git a/tools/cli/commands/addCrud.js b/tools/cli/commands/addCrud.js
index dd66d8afaa..7ef2651439 100644
--- a/tools/cli/commands/addCrud.js
+++ b/tools/cli/commands/addCrud.js
@@ -7,18 +7,18 @@ const { computeModulesPath } = require('../helpers/util');
 /**
  * Add CRUD module command
  * @param logger
- * @param templatePath
+ * @param templatesPath
  * @param module
  * @param tablePrefix
  * @param location
  */
-function addCrud(logger, templatePath, module, tablePrefix, location) {
+function addCrud(logger, templatesPath, module, tablePrefix, location) {
   // add module in server, client
-  addModule(logger, templatePath, module, location, false);
+  addModule(logger, templatesPath, module, location, false);
 
   if (location === 'server') {
     // add module migration and seed
-    addMigration(logger, templatePath, module);
+    addMigration(logger, templatesPath, module);
 
     if (tablePrefix) {
       shell.cd(computeModulesPath(location, module));
diff --git a/tools/cli/commands/addModule.js b/tools/cli/commands/addModule.js
index 5ebcab0663..983f19bdd3 100644
--- a/tools/cli/commands/addModule.js
+++ b/tools/cli/commands/addModule.js
@@ -6,12 +6,12 @@ const { copyFiles, renameFiles, computeModulesPath } = require('../helpers/util'
 /**
  * Add module in client or server and add new module to the Feature connector
  * @param logger
- * @param templatePath
+ * @param templatesPath
  * @param module
  * @param location
  * @param finished
  */
-function addModule(logger, templatePath, module, location, finished = true) {
+function addModule(logger, templatesPath, module, location, finished = true) {
   logger.info(`Copying ${location} files…`);
 
   // create new module directory
@@ -24,7 +24,7 @@ function addModule(logger, templatePath, module, location, finished = true) {
     process.exit();
   }
   //copy and rename templates in destination directory
-  copyFiles(modulePath, templatePath, location);
+  copyFiles(modulePath, templatesPath, location);
   renameFiles(modulePath, module);
 
   logger.info(chalk.green(`✔ The ${location} files have been copied!`));
diff --git a/tools/cli/commands/subCommands/addMigration.js b/tools/cli/commands/subCommands/addMigration.js
index 19f977f6cf..3aaf766cdb 100644
--- a/tools/cli/commands/subCommands/addMigration.js
+++ b/tools/cli/commands/subCommands/addMigration.js
@@ -8,14 +8,14 @@ const { DATABASE_DIR, MIGRATIONS_DIR, SEEDS_DIR } = require('../../config');
  * Create migration and seed for module
  * @param logger
  * @param module
- * @param templatePath
+ * @param templatesPath
  */
-function addMigration(logger, templatePath, module) {
+function addMigration(logger, templatesPath, module) {
   const Module = pascalize(module);
   logger.info('Copying database files...');
 
   //copy and rename templates in destination directory
-  copyFiles(DATABASE_DIR, templatePath, 'database');
+  copyFiles(DATABASE_DIR, templatesPath, 'database');
   renameFiles(DATABASE_DIR, module);
   const timestamp = new Date().getTime();
   // rename migrations and seeds
diff --git a/tools/cli/commands/subCommands/deleteMigrations.js b/tools/cli/commands/subCommands/deleteMigrations.js
index b97086e559..d279b6eb96 100644
--- a/tools/cli/commands/subCommands/deleteMigrations.js
+++ b/tools/cli/commands/subCommands/deleteMigrations.js
@@ -10,9 +10,8 @@ const { MIGRATIONS_DIR, SEEDS_DIR } = require('../../config');
  */
 function deleteMigrations(logger, module) {
   const Module = pascalize(module);
-  const startPath = `${__dirname}/../../../..`;
   // change to database migrations directory
-  shell.cd(`${startPath}${MIGRATIONS_DIR}`);
+  shell.cd(MIGRATIONS_DIR);
   // check if any migrations files for this module exist
   if (shell.find('.').find(file => file.search(`_${Module}.js`) > -1)) {
     const okMigrations = shell.rm(`*_${Module}.js`);
@@ -22,7 +21,7 @@ function deleteMigrations(logger, module) {
   }
 
   // change to database seeds directory
-  shell.cd(`${startPath}${SEEDS_DIR}`);
+  shell.cd(SEEDS_DIR);
   // check if any seed files for this module exist
   if (shell.find('.').find(file => file.search(`_${Module}.js`) > -1)) {
     const okSeeds = shell.rm(`*_${Module}.js`);
diff --git a/tools/cli/helpers/util.js b/tools/cli/helpers/util.js
index 6bae0f273d..bce3e697fc 100644
--- a/tools/cli/helpers/util.js
+++ b/tools/cli/helpers/util.js
@@ -10,8 +10,6 @@ const { BASE_PATH } = require('../config');
  * @param location
  */
 function copyFiles(destinationPath, templatePath, location) {
-  console.log('templatePath', templatePath);
-  console.log('destinationPath', destinationPath);
   shell.cp('-R', `${templatePath}/${location}/*`, destinationPath);
 }
 
@@ -46,7 +44,7 @@ function renameFiles(destinationPath, module) {
 }
 
 /**
- * Computing modules path
+ * Get computed module or modules path
  * @param location
  * @param module
  * @returns {string}

From 91852237fc3f7d6272e70d4ce0d85e1429d8f518 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Fri, 27 Jul 2018 16:41:51 +0300
Subject: [PATCH 235/327] Delete unnecessary files. Make small changes to
 addCrud and deleteModule functions

---
 package.json                                              | 2 +-
 packages/client/src/modules/common/generatedContainers.js | 1 -
 packages/server/src/modules/common/generatedSchemas.js    | 0
 tools/cli/commands/addCrud.js                             | 2 +-
 tools/cli/commands/deleteModule.js                        | 7 ++-----
 tools/cli/helpers/util.js                                 | 8 ++++----
 6 files changed, 8 insertions(+), 12 deletions(-)
 delete mode 100644 packages/client/src/modules/common/generatedContainers.js
 delete mode 100644 packages/server/src/modules/common/generatedSchemas.js

diff --git a/package.json b/package.json
index 64a2fb979a..155315a89b 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "exp-publish": "lerna run --scope=mobile exp-publish --stream",
     "watch": "spin watch",
     "heroku-postbuild": "lerna run heroku-postbuild --stream",
-    "cli": "node $NODE_DEBUG_OPTION tools/cli",
+    "cli": "node tools/cli",
     "precommit": "lint-staged",
     "postinstall": "opencollective postinstall"
   },
diff --git a/packages/client/src/modules/common/generatedContainers.js b/packages/client/src/modules/common/generatedContainers.js
deleted file mode 100644
index ff8b4c5632..0000000000
--- a/packages/client/src/modules/common/generatedContainers.js
+++ /dev/null
@@ -1 +0,0 @@
-export default {};
diff --git a/packages/server/src/modules/common/generatedSchemas.js b/packages/server/src/modules/common/generatedSchemas.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tools/cli/commands/addCrud.js b/tools/cli/commands/addCrud.js
index 7ef2651439..83f29b8d44 100644
--- a/tools/cli/commands/addCrud.js
+++ b/tools/cli/commands/addCrud.js
@@ -17,7 +17,7 @@ function addCrud(logger, templatesPath, module, tablePrefix, location) {
   addModule(logger, templatesPath, module, location, false);
 
   if (location === 'server') {
-    // add module migration and seed
+    // add migration and seed for new module
     addMigration(logger, templatesPath, module);
 
     if (tablePrefix) {
diff --git a/tools/cli/commands/deleteModule.js b/tools/cli/commands/deleteModule.js
index e2e19d6a1d..b2304cabba 100644
--- a/tools/cli/commands/deleteModule.js
+++ b/tools/cli/commands/deleteModule.js
@@ -19,11 +19,8 @@ function deleteModule(logger, module, options, location) {
     shell.rm('-rf', modulePath);
 
     const modulesPath = computeModulesPath(location);
-    // change to destination directory
-    shell.cd(modulesPath);
 
     // get index file path
-
     const indexFullFileName = fs.readdirSync(modulesPath).find(name => name.search(/index/) >= 0);
     const indexPath = modulesPath + indexFullFileName;
 
@@ -31,7 +28,7 @@ function deleteModule(logger, module, options, location) {
     try {
       indexContent = fs.readFileSync(indexPath);
     } catch (e) {
-      logger.error(chalk.red(`Failed to read /packages/${location}/src/modules/index.js file`));
+      logger.error(chalk.red(`Failed to read ${indexPath} file`));
       process.exit();
     }
 
@@ -51,7 +48,7 @@ function deleteModule(logger, module, options, location) {
 
     fs.writeFileSync(indexPath, contentWithoutDeletedModule);
 
-    // delete migration and seed if server location and option -m specified
+    // delete migrations and seeds if server location and option -m specified
     if (location === 'server' && options.m) {
       deleteMigrations(logger, module);
     }
diff --git a/tools/cli/helpers/util.js b/tools/cli/helpers/util.js
index bce3e697fc..81555ae008 100644
--- a/tools/cli/helpers/util.js
+++ b/tools/cli/helpers/util.js
@@ -6,11 +6,11 @@ const { BASE_PATH } = require('../config');
 /**
  * Copy templates to the destination directory
  * @param destinationPath
- * @param templatePath
+ * @param templatesPath
  * @param location
  */
-function copyFiles(destinationPath, templatePath, location) {
-  shell.cp('-R', `${templatePath}/${location}/*`, destinationPath);
+function copyFiles(destinationPath, templatesPath, location) {
+  shell.cp('-R', `${templatesPath}/${location}/*`, destinationPath);
 }
 
 /**
@@ -44,7 +44,7 @@ function renameFiles(destinationPath, module) {
 }
 
 /**
- * Get computed module or modules path
+ * Get computed module or modules dir path
  * @param location
  * @param module
  * @returns {string}

From 02067b97b81e2ed3b1bfcf3fba1db5c85333f598 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Mon, 30 Jul 2018 09:47:50 +0300
Subject: [PATCH 236/327] Fix base path

---
 tools/cli/config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/cli/config.js b/tools/cli/config.js
index 8d822a9d16..194c098865 100644
--- a/tools/cli/config.js
+++ b/tools/cli/config.js
@@ -1,6 +1,6 @@
 const path = require('path');
 
-const BASE_PATH = path.resolve(`${__dirname}'/../..`);
+const BASE_PATH = path.resolve(`${__dirname}/../..`);
 const DATABASE_DIR = `${BASE_PATH}/packages/server/src/database`;
 const MIGRATIONS_DIR = `${DATABASE_DIR}/migrations`;
 const SEEDS_DIR = `${DATABASE_DIR}/seeds`;

From 2f501e6e48fe17d70428fad13cb3fe50d47f74d8 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Tue, 31 Jul 2018 11:39:49 +0300
Subject: [PATCH 237/327] Add new dependencies

---
 packages/server/package.json |  5 +++-
 yarn.lock                    | 45 ++++++++++++++++++++++++++++++++++--
 2 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 4bb6b6395e..2a45f97f7f 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -84,12 +84,14 @@
     "graphql-subscriptions": "^0.5.5",
     "graphql-tag": "^2.6.0",
     "graphql-tools": "^2.13.0",
+    "graphql-parse-fields":"^1.2.0",
     "humps": "^2.0.1",
     "i18next": "^11.3.3",
     "i18next-express-middleware": "^1.1.1",
     "isomorphic-fetch": "^2.2.1",
     "jsonwebtoken": "^8.1.0",
     "knex": "^0.14.2",
+    "knexnest":"^1.0.0",
     "lerna": "^2.5.1",
     "lint-staged": "^7.0.4",
     "lodash": "^4.17.4",
@@ -129,7 +131,8 @@
     "tslint-config-prettier": "^1.5.0",
     "typescript": "^2.7.2",
     "universal-cookie-express": "^2.2.0",
-    "uuid": "^3.2.1"
+    "uuid": "^3.2.1",
+    "moment":"^2.22.2"
   },
   "devDependencies": {
     "@alienfast/i18next-loader": "^1.0.15",
diff --git a/yarn.lock b/yarn.lock
index 783b1086e5..14e6d1a9fa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3464,6 +3464,12 @@ caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
 
+cast-array@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cast-array/-/cast-array-1.0.1.tgz#264ef1129e5888bc48cac40fe914e9f69b8d189d"
+  dependencies:
+    isarray "0.0.1"
+
 center-align@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
@@ -6351,6 +6357,12 @@ graphql-iso-date@^3.3.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/graphql-iso-date/-/graphql-iso-date-3.5.0.tgz#55a1be0efa8d28c1453afd2eb5ce1d052189a513"
 
+graphql-parse-fields@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/graphql-parse-fields/-/graphql-parse-fields-1.2.0.tgz#c97119a91951b98dcbe656c46a203e966a720f28"
+  dependencies:
+    cast-array "^1.0.1"
+
 graphql-resolve-batch@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/graphql-resolve-batch/-/graphql-resolve-batch-1.0.2.tgz#ab069df8ab3410a0188701ed9fa8e382bbb8d6a5"
@@ -7928,7 +7940,7 @@ klaw@^1.0.0:
   optionalDependencies:
     graceful-fs "^4.1.9"
 
-knex@^0.14.2:
+knex@^0.14.2, knex@^0.14.6:
   version "0.14.6"
   resolved "https://registry.yarnpkg.com/knex/-/knex-0.14.6.tgz#ad57c4ef8fa1b51ebc8c37c2c9b483f6fb34e41e"
   dependencies:
@@ -7951,6 +7963,13 @@ knex@^0.14.2:
     uuid "^3.2.1"
     v8flags "^3.0.2"
 
+knexnest@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/knexnest/-/knexnest-1.0.0.tgz#b8840d13c2692bdd5fa3d5de67a456283d538fce"
+  dependencies:
+    knex "^0.14.6"
+    nesthydrationjs "^1.0.5"
+
 lazy-cache@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
@@ -8311,6 +8330,10 @@ lodash.isarray@^3.0.0:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
 
+lodash.isarray@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-4.0.0.tgz#2aca496b28c4ca6d726715313590c02e6ea34403"
+
 lodash.isboolean@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
@@ -8355,6 +8378,10 @@ lodash.keys@^3.0.0, lodash.keys@^3.1.2:
     lodash.isarguments "^3.0.0"
     lodash.isarray "^3.0.0"
 
+lodash.keys@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-4.2.0.tgz#a08602ac12e4fb83f91fc1fb7a360a4d9ba35205"
+
 lodash.map@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3"
@@ -8436,6 +8463,10 @@ lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
 
+lodash.values@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.values/-/lodash.values-4.3.0.tgz#a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347"
+
 lodash.zipobject@^4.1.3:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/lodash.zipobject/-/lodash.zipobject-4.1.3.tgz#b399f5aba8ff62a746f6979bf20b214f964dbef8"
@@ -9068,7 +9099,7 @@ modify-values@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
 
-moment@2.x, moment@2.x.x, moment@^2.10.6, moment@^2.19.3, moment@^2.6.0:
+moment@2.x, moment@2.x.x, moment@^2.10.6, moment@^2.19.3, moment@^2.22.2, moment@^2.6.0:
   version "2.22.2"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
 
@@ -9222,6 +9253,16 @@ neo-async@^2.5.0:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.1.tgz#acb909e327b1e87ec9ef15f41b8a269512ad41ee"
 
+nesthydrationjs@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/nesthydrationjs/-/nesthydrationjs-1.0.5.tgz#89fe5be87055184461de5a550475ac515491f921"
+  dependencies:
+    lodash.isarray "^4.0.0"
+    lodash.isfunction "^3.0.9"
+    lodash.isplainobject "^4.0.6"
+    lodash.keys "^4.2.0"
+    lodash.values "^4.3.0"
+
 next-tick@1, next-tick@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"

From 6364aa7246262bc746d2d35a7b34f3506445934b Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Tue, 31 Jul 2018 11:53:42 +0300
Subject: [PATCH 238/327] Add crud and helpers from cli-crud

---
 packages/server/src/sql/crud.js    | 410 ++++++++++++++++++++++++++++-
 packages/server/src/sql/helpers.js |  73 +++++
 2 files changed, 478 insertions(+), 5 deletions(-)

diff --git a/packages/server/src/sql/crud.js b/packages/server/src/sql/crud.js
index b1ada7bcf2..e4053eca19 100644
--- a/packages/server/src/sql/crud.js
+++ b/packages/server/src/sql/crud.js
@@ -1,15 +1,18 @@
 import _ from 'lodash';
 import uuidv4 from 'uuid';
-import { camelize, decamelizeKeys, camelizeKeys } from 'humps';
+import { decamelize, decamelizeKeys, camelize, camelizeKeys, pascalize } from 'humps';
+import knexnest from 'knexnest';
+import parseFields from 'graphql-parse-fields';
+import moment from 'moment';
 
+import FieldError from '../../../common/FieldError';
 import knex from './connector';
-
-import { orderedFor } from './helpers';
-
+import { selectBy, orderedFor } from './helpers';
 import selectAdapter from './select';
-
 import log from '../../../common/log';
 
+const dateFormat = 'YYYY-MM-DD';
+
 export function createWithIdGenAdapter(options) {
   const T = options.table;
   let idGen = uuidv4;
@@ -403,3 +406,400 @@ export function deleteRelationAdapter(options) {
     }
   };
 }
+
+export default class Crud {
+  getTableName() {
+    return decamelize(this.schema.__.tableName ? this.schema.__.tableName : this.schema.name);
+  }
+
+  getFullTableName() {
+    return `${this.schema.__.tablePrefix}${this.getTableName()}`;
+  }
+
+  getSchema() {
+    return this.schema;
+  }
+
+  normalizeFields(data) {
+    //console.log('normalizeFields: ', data);
+    for (const key of _.keys(data)) {
+      if (this.schema.values.hasOwnProperty(key)) {
+        const value = this.schema.values[key];
+        const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
+        if (hasTypeOf(Date)) {
+          data[key] = moment(data[key]).format('YYYY-MM-DD');
+        }
+      }
+    }
+    //console.log('normalizeFields: ', data);
+    return data;
+  }
+
+  _getList({ limit, offset, orderBy, filter }, info) {
+    const baseQuery = knex(`${this.getFullTableName()} as ${this.getTableName()}`);
+    const select = selectBy(this.schema, info, false);
+    const queryBuilder = select(baseQuery);
+
+    if (limit) {
+      queryBuilder.limit(limit);
+    }
+
+    if (offset) {
+      queryBuilder.offset(offset);
+    }
+
+    if (orderBy && orderBy.column) {
+      let column = orderBy.column;
+      let order = 'asc';
+      if (orderBy.order) {
+        order = orderBy.order;
+      }
+      //console.log('orderBy, column:', column);
+      //console.log('orderBy, order:', order);
+
+      for (const key of this.schema.keys()) {
+        if (column === key) {
+          const value = this.schema.values[key];
+          if (value.type.isSchema) {
+            const tableName = decamelize(value.type.__.tableName ? value.type.__.tableName : value.type.name);
+            let sortBy = 'name';
+            for (const remoteKey of value.type.keys()) {
+              const remoteValue = value.type.values[remoteKey];
+              if (remoteValue.sortBy) {
+                sortBy = remoteKey;
+              }
+            }
+            column = `${tableName}.${sortBy}`;
+          } else {
+            column = `${this.getTableName()}.${decamelize(column)}`;
+          }
+        }
+      }
+      //console.log('column:', column);
+      //console.log('order:', order);
+      queryBuilder.orderBy(column, order);
+    } else {
+      queryBuilder.orderBy(`${this.getTableName()}.id`);
+    }
+
+    if (filter) {
+      //console.log('filter: ', filter);
+      const schema = this.schema;
+      const tableName = this.getTableName();
+      queryBuilder.where(function() {
+        for (const key of schema.keys()) {
+          const value = schema.values[key];
+          const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
+          //console.log('filter, key: ', key);
+          let filterKey = key;
+
+          if (value.type.isSchema) {
+            filterKey = `${key}Id`;
+          }
+
+          //console.log('filter, filterKey: ', filterKey);
+
+          let filterValue = filter[filterKey];
+          if (hasTypeOf(Date)) {
+            if (filter[`${filterKey}_lte`] && filter[`${filterKey}_lte`] !== '') {
+              const filterValue_lte = moment(filter[`${filterKey}_lte`]).format(dateFormat);
+              this.andWhere(`${tableName}.${decamelize(filterKey)}`, '>=', `${filterValue_lte}`);
+            }
+            if (filter[`${filterKey}_gte`] && filter[`${filterKey}_gte`] !== '') {
+              const filterValue_gte = moment(filter[`${filterKey}_gte`]).format(dateFormat);
+              this.andWhere(`${tableName}.${decamelize(filterKey)}`, '<=', `${filterValue_gte}`);
+            }
+          } else if (hasTypeOf(Boolean)) {
+            if (_.has(filter, filterKey) && filter[filterKey] !== '') {
+              if (filterValue === true) {
+                filterValue = 1;
+              } else {
+                filterValue = 0;
+              }
+              this.andWhere(`${tableName}.${decamelize(filterKey)}`, '=', `${filterValue}`);
+            }
+          } else {
+            if (_.has(filter, filterKey) && filter[filterKey] !== '') {
+              this.andWhere(`${tableName}.${decamelize(filterKey)}`, '=', `${filterValue}`);
+            }
+          }
+        }
+      });
+
+      if (_.has(filter, 'searchText') && filter.searchText !== '') {
+        queryBuilder.where(function() {
+          for (const key of schema.keys()) {
+            const value = schema.values[key];
+            if (value.searchText) {
+              this.orWhere(`${tableName}.${decamelize(key)}`, 'like', `%${filter.searchText}%`);
+            }
+          }
+        });
+      }
+    }
+
+    return knexnest(queryBuilder);
+  }
+
+  async getPaginated(args, info) {
+    const edges = await this._getList(args, parseFields(info).edges);
+    const { count } = await this.getTotal();
+    //console.log('getPaginated, edges:', edges);
+    //console.log('getPaginated, count:', edges);
+
+    return {
+      edges,
+      pageInfo: {
+        totalCount: count,
+        hasNextPage: edges && edges.length === args.limit
+      }
+    };
+  }
+
+  getList(args, info) {
+    return this._getList(args, parseFields(info));
+  }
+
+  getTotal() {
+    return knex(`${this.getFullTableName()}`)
+      .countDistinct('id as count')
+      .first();
+  }
+
+  _get({ where }, info) {
+    const baseQuery = knex(`${this.getFullTableName()} as ${this.getTableName()}`);
+    const select = selectBy(this.schema, info, true);
+
+    const tableName = this.getTableName();
+    baseQuery.where(function() {
+      Object.keys(where).map(key => {
+        this.andWhere(`${tableName}.${decamelize(key)}`, '=', where[key]);
+      });
+    });
+
+    return knexnest(select(baseQuery));
+  }
+
+  _getMany(
+    {
+      where: { id_in }
+    },
+    info
+  ) {
+    const baseQuery = knex(`${this.getFullTableName()} as ${this.getTableName()}`);
+    const select = selectBy(this.schema, info);
+
+    baseQuery.whereIn('id', [...id_in]);
+
+    return knexnest(select(baseQuery));
+  }
+
+  async get(args, info) {
+    const node = await this._get(args, parseFields(info).node);
+    return { node };
+  }
+
+  _create(data) {
+    return knex(`${this.getFullTableName()}`)
+      .insert(decamelizeKeys(this.normalizeFields(data)))
+      .returning('id');
+  }
+
+  async create({ data }, ctx, info) {
+    try {
+      const e = new FieldError();
+      e.throwIf();
+
+      // extract nested entries from data
+      let nestedEntries = [];
+      for (const key of this.schema.keys()) {
+        const value = this.schema.values[key];
+        if (value.type.constructor === Array && data[key]) {
+          nestedEntries.push({ key, data: data[key] });
+          delete data[key];
+        } else if (key === 'rank') {
+          const total = await this.getTotal();
+          data[key] = total.count + 1;
+        }
+      }
+
+      const [id] = await this._create(data);
+
+      // create nested entries
+      if (nestedEntries.length > 0) {
+        nestedEntries.map(nested => {
+          if (nested.data.create) {
+            nested.data.create.map(async create => {
+              create[`${camelize(this.schema.name)}Id`] = id;
+              await ctx[pascalize(nested.key)]._create(create);
+            });
+          }
+        });
+      }
+
+      return await this.get({ where: { id } }, info);
+    } catch (e) {
+      return { errors: e };
+    }
+  }
+
+  _update({ data, where }) {
+    return knex(`${this.getFullTableName()}`)
+      .update(decamelizeKeys(this.normalizeFields(data)))
+      .where(where);
+  }
+
+  async update(args, ctx, info) {
+    try {
+      const e = new FieldError();
+      e.throwIf();
+
+      // extract nested entries from data
+      let nestedEntries = [];
+      for (const key of this.schema.keys()) {
+        const value = this.schema.values[key];
+        if (value.type.constructor === Array && args.data[key]) {
+          nestedEntries.push({ key: value.type[0].name, data: args.data[key] });
+          delete args.data[key];
+        }
+      }
+
+      await this._update(args);
+
+      // create, update, delete nested entries
+      if (nestedEntries.length > 0) {
+        nestedEntries.map(nested => {
+          if (nested.data.create) {
+            nested.data.create.map(async create => {
+              create[`${this.getTableName()}Id`] = args.where.id;
+              await ctx[pascalize(nested.key)]._create(create);
+            });
+          }
+          if (nested.data.update) {
+            nested.data.update.map(async update => {
+              await ctx[pascalize(nested.key)]._update(update);
+            });
+          }
+          if (nested.data.delete) {
+            nested.data.delete.map(async where => {
+              await ctx[pascalize(nested.key)]._delete({ where });
+            });
+          }
+        });
+      }
+
+      return await this.get(args, info);
+    } catch (e) {
+      return { errors: e };
+    }
+  }
+
+  _delete({ where }) {
+    return knex(`${this.getFullTableName()}`)
+      .where(where)
+      .del();
+  }
+
+  async delete(args, info) {
+    try {
+      const e = new FieldError();
+
+      const node = await this.get(args, info);
+
+      if (!node) {
+        e.setError('delete', 'Node does not exist.');
+        e.throwIf();
+      }
+
+      const isDeleted = await this._delete(args);
+
+      if (isDeleted) {
+        return node;
+      } else {
+        e.setError('delete', 'Could not delete Node. Please try again later.');
+        e.throwIf();
+      }
+    } catch (e) {
+      return { errors: e };
+    }
+  }
+
+  _sort({ data }) {
+    return Promise.all([
+      this._update({ data: { rank: data[2] }, where: { id: data[0] } }),
+      this._update({ data: { rank: data[3] }, where: { id: data[1] } })
+    ]);
+  }
+
+  async sort(args) {
+    try {
+      const e = new FieldError();
+      e.throwIf();
+
+      const sortCount = await this._sort(args);
+      const count = sortCount.reduce((total, num) => total + num);
+      if (count > 1) {
+        return { count };
+      } else {
+        e.setError('sort', 'Could not sort Node. Please try again later.');
+        e.throwIf();
+      }
+    } catch (e) {
+      return { errors: e };
+    }
+  }
+
+  _updateMany({ data, where: { id_in } }) {
+    return knex(`${this.getFullTableName()}`)
+      .update(decamelizeKeys(this.normalizeFields(data)))
+      .whereIn('id', id_in);
+  }
+
+  async updateMany(args) {
+    try {
+      const e = new FieldError();
+      const updateCount = await this._updateMany(args);
+
+      if (updateCount > 0) {
+        return { count: updateCount };
+      } else {
+        e.setError('update', 'Could not update any of selected Node. Please try again later.');
+        e.throwIf();
+      }
+    } catch (e) {
+      return { errors: e };
+    }
+  }
+
+  _deleteMany({ where: { id_in } }) {
+    return knex(`${this.getFullTableName()}`)
+      .whereIn('id', id_in)
+      .del();
+  }
+
+  async deleteMany(args) {
+    try {
+      const e = new FieldError();
+
+      const deleteCount = await this._deleteMany(args);
+
+      if (deleteCount > 0) {
+        return { count: deleteCount };
+      } else {
+        e.setError('delete', 'Could not delete any of selected Node. Please try again later.');
+        e.throwIf();
+      }
+    } catch (e) {
+      return { errors: e };
+    }
+  }
+
+  async getByIds(ids, by, Obj, info) {
+    info = parseFields(info);
+    info[`${by}Id`] = true;
+    const baseQuery = knex(`${Obj.getFullTableName()} as ${Obj.getTableName()}`);
+    const select = selectBy(Obj.getSchema(), info, false);
+    const res = await knexnest(select(baseQuery).whereIn(`${Obj.getTableName()}.${decamelize(by)}_id`, ids));
+    return orderedFor(res, ids, `${by}Id`, false);
+  }
+}
diff --git a/packages/server/src/sql/helpers.js b/packages/server/src/sql/helpers.js
index 53a8699275..8577979e3b 100644
--- a/packages/server/src/sql/helpers.js
+++ b/packages/server/src/sql/helpers.js
@@ -1,4 +1,5 @@
 import { groupBy } from 'lodash';
+import { decamelize } from 'humps';
 import settings from '../../../../settings';
 
 export const returnId = knexTable => (settings.db.dbType === 'sqlite' ? knexTable : knexTable.returning('id'));
@@ -29,3 +30,75 @@ export const orderedFor = (rows, collection, field, singleObject) => {
     return singleObject ? {} : [];
   });
 };
+
+export const orderedForArray = (rows, collection, field, arrayElement) => {
+  // return the rows ordered for the collection
+  const inGroupsOfField = groupBy(rows, field);
+  return collection.map(element => {
+    const elementArray = inGroupsOfField[element];
+    if (elementArray) {
+      return inGroupsOfField[element].map(elm => {
+        return elm[arrayElement];
+      });
+    }
+    return [];
+  });
+};
+
+const _getSelectFields = (fields, parentPath, parentKey, domainSchema, selectItems, joinNames, single) => {
+  for (const key of Object.keys(fields)) {
+    if (key !== '__typename') {
+      const value = domainSchema.values[key];
+      if (fields[key] === true) {
+        if (value && value.transient) {
+          continue;
+        }
+        const as = parentPath.length > 0 ? `${parentPath.join('_')}_${key}` : key;
+        const tableName = `${decamelize(domainSchema.__.tableName ? domainSchema.__.tableName : domainSchema.name)}`;
+        const fullTableName = parentKey !== null && parentKey !== tableName ? `${parentKey}_${tableName}` : tableName;
+        const arrayPrefix = single ? '' : '_';
+        selectItems.push(`${decamelize(fullTableName)}.${decamelize(key)} as ${arrayPrefix}${as}`);
+      } else {
+        if (value.type.constructor === Array) {
+          //console.log('Array');
+          //console.log(key);
+          //console.log(fields[key]);
+          //console.log(value.type[0].name);
+        } else {
+          if (!value.type.__.transient) {
+            joinNames.push({
+              key: decamelize(key),
+              prefix: value.type.__.tablePrefix ? value.type.__.tablePrefix : '',
+              name: decamelize(value.type.__.tableName ? value.type.__.tableName : value.type.name),
+              schemaName: decamelize(domainSchema.name)
+            });
+          }
+
+          parentPath.push(key);
+
+          _getSelectFields(fields[key], parentPath, decamelize(key), value.type, selectItems, joinNames, single);
+
+          parentPath.pop();
+        }
+      }
+    }
+  }
+};
+
+export const selectBy = (schema, fields, single = false) => {
+  // select fields
+  const parentPath = [];
+  const selectItems = [];
+  const joinNames = [];
+  _getSelectFields(fields, parentPath, null, schema, selectItems, joinNames, single);
+
+  return query => {
+    // join table names
+    joinNames.map(({ key, prefix, name, schemaName }) => {
+      const tableName = key !== null && key !== name ? `${key}_${name}` : name;
+      query.leftJoin(`${prefix}${name} as ${tableName}`, `${tableName}.id`, `${schemaName}.${key}_id`);
+    });
+
+    return query.select(selectItems);
+  };
+};

From 9d9af2ba9ce836891105115909a8f9e4798b9f42 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Tue, 31 Jul 2018 11:56:23 +0300
Subject: [PATCH 239/327] Refactor selectBy and getSelectFields functions

---
 packages/server/src/sql/helpers.js | 123 +++++++++++++++++++----------
 1 file changed, 81 insertions(+), 42 deletions(-)

diff --git a/packages/server/src/sql/helpers.js b/packages/server/src/sql/helpers.js
index 8577979e3b..e70cafdb68 100644
--- a/packages/server/src/sql/helpers.js
+++ b/packages/server/src/sql/helpers.js
@@ -1,4 +1,4 @@
-import { groupBy } from 'lodash';
+import { groupBy, findIndex } from 'lodash';
 import { decamelize } from 'humps';
 import settings from '../../../../settings';
 
@@ -45,58 +45,97 @@ export const orderedForArray = (rows, collection, field, arrayElement) => {
   });
 };
 
-const _getSelectFields = (fields, parentPath, parentKey, domainSchema, selectItems, joinNames, single) => {
-  for (const key of Object.keys(fields)) {
-    if (key !== '__typename') {
-      const value = domainSchema.values[key];
-      if (fields[key] === true) {
-        if (value && value.transient) {
-          continue;
-        }
-        const as = parentPath.length > 0 ? `${parentPath.join('_')}_${key}` : key;
-        const tableName = `${decamelize(domainSchema.__.tableName ? domainSchema.__.tableName : domainSchema.name)}`;
-        const fullTableName = parentKey !== null && parentKey !== tableName ? `${parentKey}_${tableName}` : tableName;
-        const arrayPrefix = single ? '' : '_';
-        selectItems.push(`${decamelize(fullTableName)}.${decamelize(key)} as ${arrayPrefix}${as}`);
-      } else {
-        if (value.type.constructor === Array) {
-          //console.log('Array');
-          //console.log(key);
-          //console.log(fields[key]);
-          //console.log(value.type[0].name);
-        } else {
-          if (!value.type.__.transient) {
-            joinNames.push({
-              key: decamelize(key),
-              prefix: value.type.__.tablePrefix ? value.type.__.tablePrefix : '',
-              name: decamelize(value.type.__.tableName ? value.type.__.tableName : value.type.name),
-              schemaName: decamelize(domainSchema.name)
-            });
-          }
-
-          parentPath.push(key);
-
-          _getSelectFields(fields[key], parentPath, decamelize(key), value.type, selectItems, joinNames, single);
-
-          parentPath.pop();
-        }
+/**
+ * Collecting selects and joins
+ * @param graphqlFields
+ * @param domainSchema
+ * @param selectItems
+ * @param joinNames
+ * @param single
+ * @param parentField
+ * @private
+ */
+const _getSelectFields = (graphqlFields, domainSchema, selectItems, joinNames, single, parentField = '') => {
+  for (const fieldName of Object.keys(graphqlFields)) {
+    if (fieldName === '__typename') {
+      continue;
+    }
+    const value = domainSchema.values[fieldName];
+    if (graphqlFields[fieldName] === true) {
+      if (value && value.transient) {
+        continue;
+      }
+      selectItems.push(_getSelectField(fieldName, parentField, domainSchema, single));
+    } else {
+      if (Array.isArray(value.type) || findIndex(joinNames, { fieldName: decamelize(fieldName) }) > -1) {
+        continue;
+      }
+      if (!value.type.__.transient) {
+        joinNames.push(_getJoinEntity(fieldName, value, domainSchema));
       }
+      _getSelectFields(graphqlFields[fieldName], value.type, selectItems, joinNames, single, fieldName);
     }
   }
 };
 
+/**
+ * Computing select field
+ * @param fieldName
+ * @param parentField
+ * @param domainSchema
+ * @param single
+ * @returns {string}
+ * @private
+ */
+const _getSelectField = (fieldName, parentField, domainSchema, single) => {
+  const alias = parentField.length > 0 ? `${parentField}_${fieldName}` : fieldName;
+  const tableName = `${decamelize(domainSchema.__.tableName ? domainSchema.__.tableName : domainSchema.name)}`;
+  // returning object would be array or no
+  const arrayPrefix = single ? '' : '_';
+  return `${tableName}.${decamelize(fieldName)} as ${arrayPrefix}${alias}`;
+};
+
+/**
+ * Computing join entity object
+ * @param fieldName
+ * @param value
+ * @param domainSchema
+ * @returns {{fieldName: *, prefix: string, baseTableName: *, foreignTableName: *}}
+ * @private
+ */
+const _getJoinEntity = (fieldName, value, domainSchema) => {
+  return {
+    fieldName: decamelize(fieldName),
+    prefix: value.type.__.tablePrefix ? value.type.__.tablePrefix : '',
+    baseTableName: decamelize(domainSchema.name),
+    foreignTableName: decamelize(value.type.__.tableName ? value.type.__.tableName : value.type.name)
+  };
+};
+
+/**
+ * Computing query with selects and joins
+ * @param schema
+ * @param fields
+ * @param single
+ * @returns {function(*): *}
+ */
 export const selectBy = (schema, fields, single = false) => {
-  // select fields
-  const parentPath = [];
+  // select fields and joins
   const selectItems = [];
   const joinNames = [];
-  _getSelectFields(fields, parentPath, null, schema, selectItems, joinNames, single);
+  _getSelectFields(fields, schema, selectItems, joinNames, single);
 
   return query => {
     // join table names
-    joinNames.map(({ key, prefix, name, schemaName }) => {
-      const tableName = key !== null && key !== name ? `${key}_${name}` : name;
-      query.leftJoin(`${prefix}${name} as ${tableName}`, `${tableName}.id`, `${schemaName}.${key}_id`);
+    joinNames.map(({ fieldName, prefix, baseTableName, foreignTableName }) => {
+      // if fieldName (schema key) diff with table name than make proper table alias
+      const tableNameAlias =
+        fieldName !== null && fieldName !== foreignTableName ? `${fieldName}_${foreignTableName}` : foreignTableName;
+      query.leftJoin(
+        `${prefix}${foreignTableName} as ${tableNameAlias}`,
+        `${tableNameAlias}.id`,
+        `${baseTableName}.${fieldName}_id`
+      );
     });
 
     return query.select(selectItems);

From f77ccb86c90976e4a680dfd23af9f8fcc7780f76 Mon Sep 17 00:00:00 2001
From: Oleksandr Samofan <samofan77@gmail.com>
Date: Tue, 31 Jul 2018 18:35:36 +0300
Subject: [PATCH 240/327] Refactor getList ordering and filtering,
 getPaginated, getTotal functions

---
 packages/server/src/sql/crud.js | 137 +++++++++++++++-----------------
 1 file changed, 62 insertions(+), 75 deletions(-)

diff --git a/packages/server/src/sql/crud.js b/packages/server/src/sql/crud.js
index e4053eca19..13ae88de8d 100644
--- a/packages/server/src/sql/crud.js
+++ b/packages/server/src/sql/crud.js
@@ -420,6 +420,10 @@ export default class Crud {
     return this.schema;
   }
 
+  getBaseQuery() {
+    return knex(`${this.getFullTableName()} as ${this.getTableName()}`);
+  }
+
   normalizeFields(data) {
     //console.log('normalizeFields: ', data);
     for (const key of _.keys(data)) {
@@ -436,9 +440,9 @@ export default class Crud {
   }
 
   _getList({ limit, offset, orderBy, filter }, info) {
-    const baseQuery = knex(`${this.getFullTableName()} as ${this.getTableName()}`);
     const select = selectBy(this.schema, info, false);
-    const queryBuilder = select(baseQuery);
+    const queryBuilder = select(this.getBaseQuery());
+    const tableName = this.getFullTableName();
 
     if (limit) {
       queryBuilder.limit(limit);
@@ -450,102 +454,85 @@ export default class Crud {
 
     if (orderBy && orderBy.column) {
       let column = orderBy.column;
-      let order = 'asc';
-      if (orderBy.order) {
-        order = orderBy.order;
-      }
-      //console.log('orderBy, column:', column);
-      //console.log('orderBy, order:', order);
+      const order = orderBy.order ? orderBy.order : 'asc';
 
       for (const key of this.schema.keys()) {
-        if (column === key) {
-          const value = this.schema.values[key];
-          if (value.type.isSchema) {
-            const tableName = decamelize(value.type.__.tableName ? value.type.__.tableName : value.type.name);
-            let sortBy = 'name';
-            for (const remoteKey of value.type.keys()) {
-              const remoteValue = value.type.values[remoteKey];
-              if (remoteValue.sortBy) {
-                sortBy = remoteKey;
-              }
-            }
-            column = `${tableName}.${sortBy}`;
-          } else {
-            column = `${this.getTableName()}.${decamelize(column)}`;
-          }
+        if (column !== key) {
+          continue;
+        }
+        const value = this.schema.values[key];
+        if (value.type.isSchema) {
+          const tableName = decamelize(value.type.__.tableName ? value.type.__.tableName : value.type.name);
+          const foundValue = value.type.keys().find(key => {
+            return value.type.values[key].sortBy;
+          });
+          column = `${tableName}.${foundValue ? foundValue.sortBy : 'name'}`;
+        } else {
+          column = `${this.getFullTableName()}.${decamelize(column)}`;
         }
       }
-      //console.log('column:', column);
-      //console.log('order:', order);
       queryBuilder.orderBy(column, order);
     } else {
-      queryBuilder.orderBy(`${this.getTableName()}.id`);
+      queryBuilder.orderBy(`${this.getFullTableName()}.id`);
     }
 
-    if (filter) {
-      //console.log('filter: ', filter);
-      const schema = this.schema;
-      const tableName = this.getTableName();
-      queryBuilder.where(function() {
-        for (const key of schema.keys()) {
-          const value = schema.values[key];
-          const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
-          //console.log('filter, key: ', key);
-          let filterKey = key;
-
-          if (value.type.isSchema) {
-            filterKey = `${key}Id`;
-          }
+    if (!_.isEmpty(filter)) {
+      const addFilterWhere = this.schemaIterator((filterKey, value, isSchema, _this, tableName, filter) => {
+        const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
 
-          //console.log('filter, filterKey: ', filterKey);
-
-          let filterValue = filter[filterKey];
-          if (hasTypeOf(Date)) {
-            if (filter[`${filterKey}_lte`] && filter[`${filterKey}_lte`] !== '') {
-              const filterValue_lte = moment(filter[`${filterKey}_lte`]).format(dateFormat);
-              this.andWhere(`${tableName}.${decamelize(filterKey)}`, '>=', `${filterValue_lte}`);
-            }
-            if (filter[`${filterKey}_gte`] && filter[`${filterKey}_gte`] !== '') {
-              const filterValue_gte = moment(filter[`${filterKey}_gte`]).format(dateFormat);
-              this.andWhere(`${tableName}.${decamelize(filterKey)}`, '<=', `${filterValue_gte}`);
-            }
-          } else if (hasTypeOf(Boolean)) {
-            if (_.has(filter, filterKey) && filter[filterKey] !== '') {
-              if (filterValue === true) {
-                filterValue = 1;
-              } else {
-                filterValue = 0;
-              }
-              this.andWhere(`${tableName}.${decamelize(filterKey)}`, '=', `${filterValue}`);
-            }
-          } else {
-            if (_.has(filter, filterKey) && filter[filterKey] !== '') {
-              this.andWhere(`${tableName}.${decamelize(filterKey)}`, '=', `${filterValue}`);
-            }
+        if (hasTypeOf(Date)) {
+          if (filter[`${filterKey}_lte`]) {
+            const filterValue_lte = moment(filter[`${filterKey}_lte`]).format(dateFormat);
+            _this.andWhere(`${tableName}.${decamelize(filterKey)}`, '>=', `${filterValue_lte}`);
+          }
+          if (filter[`${filterKey}_gte`]) {
+            const filterValue_gte = moment(filter[`${filterKey}_gte`]).format(dateFormat);
+            _this.andWhere(`${tableName}.${decamelize(filterKey)}`, '<=', `${filterValue_gte}`);
+          }
+        } else if (hasTypeOf(Boolean)) {
+          if (filter[filterKey]) {
+            _this.andWhere(`${tableName}.${decamelize(filterKey)}`, '=', `${+filter[filterKey]}`);
+          }
+        } else {
+          const filterValue = isSchema ? filter[`${filterKey}Id`] : filter[filterKey];
+          const tableColumn = isSchema ? `${decamelize(filterKey)}_id` : decamelize(filterKey);
+          if (filterValue) {
+            _this.andWhere(`${tableName}.${tableColumn}`, '=', `${filterValue}`);
           }
         }
       });
 
-      if (_.has(filter, 'searchText') && filter.searchText !== '') {
-        queryBuilder.where(function() {
-          for (const key of schema.keys()) {
-            const value = schema.values[key];
-            if (value.searchText) {
-              this.orWhere(`${tableName}.${decamelize(key)}`, 'like', `%${filter.searchText}%`);
-            }
+      queryBuilder.where(function() {
+        addFilterWhere(this, tableName, filter);
+      });
+      if (filter.searchText) {
+        const addSearchTextWhere = this.schemaIterator((key, value, isSchema, _this, tableName, filter) => {
+          if (value.searchText) {
+            _this.where(`${tableName}.${decamelize(key)}`, 'like', `%${filter.searchText}%`);
           }
         });
+        queryBuilder.orWhere(function() {
+          addSearchTextWhere(this, tableName, filter);
+        });
       }
     }
 
     return knexnest(queryBuilder);
   }
 
+  schemaIterator = fn => {
+    return (...args) => {
+      for (const key of this.schema.keys()) {
+        const value = this.schema.values[key];
+        const isSchema = value.type.isSchema;
+        fn(key, value, isSchema, ...args);
+      }
+    };
+  };
+
   async getPaginated(args, info) {
     const edges = await this._getList(args, parseFields(info).edges);
     const { count } = await this.getTotal();
-    //console.log('getPaginated, edges:', edges);
-    //console.log('getPaginated, count:', edges);
 
     return {
       edges,
@@ -561,7 +548,7 @@ export default class Crud {
   }
 
   getTotal() {
-    return knex(`${this.getFullTableName()}`)
+    return knex(this.getFullTableName())
       .countDistinct('id as count')
       .first();
   }

From ee04e557ebec7909c40e1d4d15328d5d30d2f5e2 Mon Sep 17 00:00:00 2001
From: Mykyta Lyzhov <lyzhovnik@gmail.com>
Date: Mon, 10 Sep 2018 16:33:32 +0300
Subject: [PATCH 241/327] Resolve version conflicts in yarn.lock for shelljs
 lib Fixes: #846

---
 package.json                 |  3 +-
 packages/server/package.json |  1 -
 yarn.lock                    | 64 ++++++++++++++++++++++++++++++++++--
 3 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 0b243f2fde..a35c445803 100644
--- a/package.json
+++ b/package.json
@@ -135,7 +135,8 @@
     "webpack-merge": "^4.1.4",
     "webpack-node-externals": "^1.7.2",
     "webpack-sources": "^1.1.0",
-    "webpack-virtual-modules": "^0.1.10"
+    "webpack-virtual-modules": "^0.1.10",
+    "shelljs": "^0.8.1"
   },
   "optionalDependencies": {
     "dotenv": "^6.0.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index c0ea3df294..077bdeb16c 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -115,7 +115,6 @@
     "react-stripe-elements": "^1.2.1",
     "redux": "^4.0.0",
     "serialize-javascript": "^1.4.0",
-    "shelljs": "^0.8.1",
     "shortid": "^2.2.8",
     "source-map-support": "^0.5.0",
     "sourcemapped-stacktrace": "^1.1.8",
diff --git a/yarn.lock b/yarn.lock
index 4a8d3c3e86..ac4c2cbe1c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -619,6 +619,25 @@
     lodash "^4.17.10"
     to-fast-properties "^2.0.0"
 
+"@domain-schema/core@^0.0.34":
+  version "0.0.34"
+  resolved "https://registry.yarnpkg.com/@domain-schema/core/-/core-0.0.34.tgz#5900ae4f0844cb8e7ffa91f5be32bd0417d96429"
+  dependencies:
+    debug "^3.1.0"
+
+"@domain-schema/graphql@^0.0.33":
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/@domain-schema/graphql/-/graphql-0.0.33.tgz#201d8cc5d21a9eba69f2eb8cb1fe44f012381cec"
+  dependencies:
+    debug "^3.1.0"
+
+"@domain-schema/knex@^0.0.35":
+  version "0.0.35"
+  resolved "https://registry.yarnpkg.com/@domain-schema/knex/-/knex-0.0.35.tgz#3ea8fb1fdf57e9c9334843ed8bfa3b4e9e1f03c4"
+  dependencies:
+    debug "^3.1.0"
+    humps "^2.0.1"
+
 "@expo/bunyan@^1.8.10":
   version "1.8.10"
   resolved "https://registry.yarnpkg.com/@expo/bunyan/-/bunyan-1.8.10.tgz#7d19354a6bce85aae5fea0e973569d3f0142533e"
@@ -3759,6 +3778,12 @@ caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
 
+cast-array@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cast-array/-/cast-array-1.0.1.tgz#264ef1129e5888bc48cac40fe914e9f69b8d189d"
+  dependencies:
+    isarray "0.0.1"
+
 center-align@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
@@ -6658,6 +6683,12 @@ graphql-iso-date@^3.3.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/graphql-iso-date/-/graphql-iso-date-3.5.0.tgz#55a1be0efa8d28c1453afd2eb5ce1d052189a513"
 
+graphql-parse-fields@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/graphql-parse-fields/-/graphql-parse-fields-1.2.0.tgz#c97119a91951b98dcbe656c46a203e966a720f28"
+  dependencies:
+    cast-array "^1.0.1"
+
 graphql-resolve-batch@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/graphql-resolve-batch/-/graphql-resolve-batch-1.0.2.tgz#ab069df8ab3410a0188701ed9fa8e382bbb8d6a5"
@@ -8510,7 +8541,7 @@ kleur@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-2.0.2.tgz#b704f4944d95e255d038f0cb05fb8a602c55a300"
 
-knex@^0.14.2:
+knex@^0.14.2, knex@^0.14.6:
   version "0.14.6"
   resolved "https://registry.yarnpkg.com/knex/-/knex-0.14.6.tgz#ad57c4ef8fa1b51ebc8c37c2c9b483f6fb34e41e"
   dependencies:
@@ -8533,6 +8564,13 @@ knex@^0.14.2:
     uuid "^3.2.1"
     v8flags "^3.0.2"
 
+knexnest@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/knexnest/-/knexnest-1.0.0.tgz#b8840d13c2692bdd5fa3d5de67a456283d538fce"
+  dependencies:
+    knex "^0.14.6"
+    nesthydrationjs "^1.0.5"
+
 lazy-cache@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
@@ -8870,6 +8908,10 @@ lodash.isarray@^3.0.0:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
 
+lodash.isarray@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-4.0.0.tgz#2aca496b28c4ca6d726715313590c02e6ea34403"
+
 lodash.isboolean@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
@@ -8910,6 +8952,10 @@ lodash.keys@^3.0.0, lodash.keys@^3.1.2:
     lodash.isarguments "^3.0.0"
     lodash.isarray "^3.0.0"
 
+lodash.keys@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-4.2.0.tgz#a08602ac12e4fb83f91fc1fb7a360a4d9ba35205"
+
 lodash.map@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3"
@@ -8999,6 +9045,10 @@ lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
 
+lodash.values@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.values/-/lodash.values-4.3.0.tgz#a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347"
+
 lodash.zipobject@^4.1.3:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/lodash.zipobject/-/lodash.zipobject-4.1.3.tgz#b399f5aba8ff62a746f6979bf20b214f964dbef8"
@@ -9632,7 +9682,7 @@ modify-values@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
 
-moment@2.x, moment@2.x.x, moment@^2.10.6, moment@^2.19.3, moment@^2.6.0:
+moment@2.x, moment@2.x.x, moment@^2.10.6, moment@^2.19.3, moment@^2.22.2, moment@^2.6.0:
   version "2.22.2"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
 
@@ -9803,6 +9853,16 @@ neo-async@^2.5.0:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.2.tgz#489105ce7bc54e709d736b195f82135048c50fcc"
 
+nesthydrationjs@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/nesthydrationjs/-/nesthydrationjs-1.0.5.tgz#89fe5be87055184461de5a550475ac515491f921"
+  dependencies:
+    lodash.isarray "^4.0.0"
+    lodash.isfunction "^3.0.9"
+    lodash.isplainobject "^4.0.6"
+    lodash.keys "^4.2.0"
+    lodash.values "^4.3.0"
+
 next-tick@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"

From 2d404c6c0a154125ea9d0daf20e50be1cfc50905 Mon Sep 17 00:00:00 2001
From: Mykyta Lyzhov <lyzhovnik@gmail.com>
Date: Mon, 10 Sep 2018 18:02:25 +0300
Subject: [PATCH 242/327] Update cli templates to the latest structure

---
 .../server/{ => __tests__}/Module.spec.js     | 12 ++++---
 tools/templates/crud/server/schema.js         | 15 +++++----
 .../module/client/__tests__/Module.spec.js    | 18 ++++++++++
 .../module/client/containers/Module.spec.js   | 17 ----------
 .../templates/module/client/index.native.jsx  | 33 +++++++++++--------
 tools/templates/module/client/index.web.jsx   |  4 +--
 .../templates/module/client/reducers/index.js |  8 -----
 7 files changed, 55 insertions(+), 52 deletions(-)
 rename tools/templates/crud/server/{ => __tests__}/Module.spec.js (58%)
 create mode 100644 tools/templates/module/client/__tests__/Module.spec.js
 delete mode 100644 tools/templates/module/client/containers/Module.spec.js
 delete mode 100644 tools/templates/module/client/reducers/index.js

diff --git a/tools/templates/crud/server/Module.spec.js b/tools/templates/crud/server/__tests__/Module.spec.js
similarity index 58%
rename from tools/templates/crud/server/Module.spec.js
rename to tools/templates/crud/server/__tests__/Module.spec.js
index 25c9d6f2ab..1274af0922 100644
--- a/tools/templates/crud/server/Module.spec.js
+++ b/tools/templates/crud/server/__tests__/Module.spec.js
@@ -1,7 +1,7 @@
 /*eslint-disable no-unused-vars*/
 import chai from 'chai';
 import { step } from 'mocha-steps';
-import { getServer, getApollo } from '../../testHelpers/integrationSetup';
+import { getServer, getApollo } from '../../../testHelpers/integrationSetup';
 
 describe('$Module$ API works', () => {
   let server, apollo;
@@ -14,10 +14,12 @@ describe('$Module$ API works', () => {
   step('Has GraphQL Playground endpoint', () => {
     return chai
       .request(server)
-      .get('/gplayground')
-      .end((err, res) => {
-        res.status.should.be(200);
-        res.body.should.be('{}');
+      .keepOpen()
+      .get('/graphql')
+      .set('Accept', 'text/html')
+      .then(res => {
+        res.should.have.status(200);
+        res.body.should.be.eql({});
       });
   });
 });
diff --git a/tools/templates/crud/server/schema.js b/tools/templates/crud/server/schema.js
index f5e22eed34..2d8f2f9471 100644
--- a/tools/templates/crud/server/schema.js
+++ b/tools/templates/crud/server/schema.js
@@ -1,12 +1,15 @@
 import DomainSchema, { Schema } from '@domain-schema/core';
 
 export class $Module$ extends Schema {
-  __ = { name: '$Module$', tablePrefix: '' };
-  id = DomainSchema.Int;
-  name = {
-    type: String,
-    searchText: true
-  };
+  constructor() {
+    super();
+    this.__ = { name: '$Module$', tablePrefix: '' };
+    this.id = DomainSchema.Int;
+    this.name = {
+      type: String,
+      searchText: true
+    };
+  }
 }
 
 export const $Module$Schema = new DomainSchema($Module$);
diff --git a/tools/templates/module/client/__tests__/Module.spec.js b/tools/templates/module/client/__tests__/Module.spec.js
new file mode 100644
index 0000000000..d72e92771a
--- /dev/null
+++ b/tools/templates/module/client/__tests__/Module.spec.js
@@ -0,0 +1,18 @@
+import { expect } from 'chai';
+import { step } from 'mocha-steps';
+
+import Renderer from '../../../testHelpers/Renderer';
+import { updateContent } from '../../../testHelpers/testUtils';
+
+describe('TodoList UI works', () => {
+  const renderer = new Renderer({});
+  let app;
+  let content;
+
+  step('TodoList page renders on mount', () => {
+    app = renderer.mount();
+    renderer.history.push('/todoList');
+    content = updateContent(app.container);
+    expect(content).to.not.be.empty;
+  });
+});
\ No newline at end of file
diff --git a/tools/templates/module/client/containers/Module.spec.js b/tools/templates/module/client/containers/Module.spec.js
deleted file mode 100644
index 29ebdb682e..0000000000
--- a/tools/templates/module/client/containers/Module.spec.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { expect } from 'chai';
-import { step } from 'mocha-steps';
-import Renderer from '../../../../client/testHelpers/Renderer';
-import Routes from '../../../../client/app/Routes';
-
-describe('$Module$ UI works', () => {
-  const renderer = new Renderer({});
-  let app;
-  let content;
-
-  step('$Module$ page renders on mount', () => {
-    app = renderer.mount(Routes);
-    renderer.history.push('/$module$');
-    content = app.find('#content');
-    expect(content).to.not.be.empty;
-  });
-});
diff --git a/tools/templates/module/client/index.native.jsx b/tools/templates/module/client/index.native.jsx
index e61b873a24..8457243fad 100644
--- a/tools/templates/module/client/index.native.jsx
+++ b/tools/templates/module/client/index.native.jsx
@@ -1,21 +1,28 @@
-import { Ionicons } from '@expo/vector-icons';
-import { createTabBarIconWrapper } from '../common/components/native';
-import $Module$ from './containers/$Module$';
-import reducers from './reducers';
+import React from 'react';
+import { createStackNavigator } from 'react-navigation';
 
+import { IconButton } from '../common/components/native';
+import $Module$ from './containers/$Module$';
 import Feature from '../connector';
 
 export default new Feature({
-  tabItem: {
+  drawerItem: {
     $Module$: {
-      screen: $Module$,
+      screen: createStackNavigator({
+        $Module$: {
+          screen: $Module$,
+          navigationOptions: ({ navigation }) => ({
+            headerTitle: `$Module$`,
+            headerLeft: (
+              <IconButton iconName="menu" iconSize={32} iconColor="#0275d8" onPress={() => navigation.openDrawer()} />
+            ),
+            headerStyle: { backgroundColor: '#fff' }
+          })
+        }
+      }),
       navigationOptions: {
-        tabBarIcon: createTabBarIconWrapper(Ionicons, {
-          name: 'ios-browsers-outline',
-          size: 30
-        })
+        drawerLabel: `$Module$`
       }
     }
-  },
-  reducer: { $module$: reducers }
-});
+  }
+});
\ No newline at end of file
diff --git a/tools/templates/module/client/index.web.jsx b/tools/templates/module/client/index.web.jsx
index 497368990e..0d88e37bfa 100644
--- a/tools/templates/module/client/index.web.jsx
+++ b/tools/templates/module/client/index.web.jsx
@@ -2,7 +2,6 @@ import React from 'react';
 import { Route, NavLink } from 'react-router-dom';
 import { MenuItem } from '../../modules/common/components/web';
 import $Module$ from './containers/$Module$';
-import reducers from './reducers';
 
 import Feature from '../connector';
 
@@ -14,6 +13,5 @@ export default new Feature({
         $Module$
       </NavLink>
     </MenuItem>
-  ),
-  reducer: { $module$: reducers }
+  )
 });
diff --git a/tools/templates/module/client/reducers/index.js b/tools/templates/module/client/reducers/index.js
deleted file mode 100644
index 6c6ee75a42..0000000000
--- a/tools/templates/module/client/reducers/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-const defaultState = {};
-
-export default function(state = defaultState, action) {
-  switch (action.type) {
-    default:
-      return state;
-  }
-}

From ab545f26958206f6274707bda656506f44fa0f93 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 13 Sep 2018 14:13:48 +0200
Subject: [PATCH 243/327] cli: fix addmodule, deletemodule

---
 tools/cli.js                       |   4 +-
 tools/cli/commands/addModule.js    | 107 ++++++++--------------
 tools/cli/commands/deleteModule.js | 137 +++++++----------------------
 tools/cli/helpers/util.js          |  48 +++++++---
 4 files changed, 103 insertions(+), 193 deletions(-)

diff --git a/tools/cli.js b/tools/cli.js
index 9e5d3c2018..eccbf9f902 100644
--- a/tools/cli.js
+++ b/tools/cli.js
@@ -23,12 +23,13 @@ prog
     'both'
   )
   .action((args, options, logger) => commandInvoker.runAddModule(args, options, logger))
+  //.action((args, options, logger) => moduleCmd('addmodule', args, options, logger))
   // Delete module
   .command('deletemodule', 'Delete a Module')
   .argument('<moduleName>', 'Module name')
   .argument('[location]', 'Where should we delete module. [both, server, client]', ['both', 'server', 'client'], 'both')
   .action((args, options, logger) => commandInvoker.runDeleteModule(args, options, logger))
-  .action((args, options, logger) => moduleCmd('addmodule', args, options, logger))
+  //.action((args, options, logger) => moduleCmd('deletemodule', args, options, logger))
   // Add crud
   .command('addcrud', 'Create a new Module with CRUD')
   .argument('<module>', 'Module name')
@@ -40,7 +41,6 @@ prog
   )
   .argument('[tablePrefix]', 'DB table prefix.')
   .action((args, options, logger) => moduleCmd('addcrud', args, options, logger))
-  .action((args, options, logger) => moduleCmd('deletemodule', args, options, logger))
   // Update schema
   .command('updateschema', 'Update Module Schema')
   .argument('<module>', 'Module name')
diff --git a/tools/cli/commands/addModule.js b/tools/cli/commands/addModule.js
index de25d0a718..de703b1ffc 100644
--- a/tools/cli/commands/addModule.js
+++ b/tools/cli/commands/addModule.js
@@ -1,92 +1,59 @@
 const shell = require('shelljs');
 const fs = require('fs');
 const chalk = require('chalk');
-const { pascalize } = require('humps');
-const { renameFiles, updateFileWithExports } = require('../helpers/util');
+const { copyFiles, renameFiles, computeModulesPath } = require('../helpers/util');
 
 /**
+ * Adds module in client or server and adds a new module to the Feature connector.
  *
- * @param logger
- * @param templatePath
- * @param module
- * @param action
- * @param tablePrefix
- * @param location
+ * @param logger - The Logger.
+ * @param templatesPath - The path to the templates for a new module.
+ * @param moduleName - The name of a new module.
+ * @param location - The location for a new module [client|server|both].
+ * @param finished - The flag about the end of the generating process.
  */
-function addModule(logger, templatePath, module, action, tablePrefix, location) {
+function addModule(logger, templatesPath, moduleName, location, finished = true) {
   logger.info(`Copying ${location} files…`);
 
-  // pascalize
-  const Module = pascalize(module);
-
   // create new module directory
-  const startPath = `${__dirname}/../../..`;
-  const mkdir = shell.mkdir(`${startPath}/packages/${location}/src/modules/${module}`);
+  const destinationPath = computeModulesPath(location, moduleName);
+  const newModule = shell.mkdir(destinationPath);
 
   // continue only if directory does not jet exist
-  if (mkdir.code === 0) {
-    const destinationPath = `${startPath}/packages/${location}/src/modules/${module}`;
-    renameFiles(destinationPath, templatePath, module, location);
-
-    logger.info(chalk.green(`✔ The ${location} files have been copied!`));
+  if (newModule.code !== 0) {
+    logger.error(chalk.red(`The ${moduleName} directory is already exists.`));
+    process.exit();
+  }
+  //copy and rename templates in destination directory
+  copyFiles(destinationPath, templatesPath, location);
+  renameFiles(destinationPath, moduleName);
 
-    shell.cd('..');
-    // get module input data
-    const path = `${startPath}/packages/${location}/src/modules/index.js`;
-    let data = fs.readFileSync(path);
+  logger.info(chalk.green(`✔ The ${location} files have been copied!`));
 
-    // extract Feature modules
-    const re = /Feature\(([^()]+)\)/g;
-    const match = re.exec(data);
+  // get index file path
+  const modulesPath = computeModulesPath(location);
+  const indexFullFileName = fs.readdirSync(modulesPath).find(name => name.search(/index/) >= 0);
+  const indexPath = modulesPath + indexFullFileName;
+  let indexContent;
 
+  try {
     // prepend import module
-    const prepend = `import ${module} from './${module}';\n`;
-    fs.writeFileSync(path, prepend + data);
-
-    // add module to Feature function
-    shell.ShellString(shell.cat('index.js').replace(RegExp(re, 'g'), `Feature(${module}, ${match[1]})`)).to('index.js');
-
-    if (action === 'addcrud' && location === 'client') {
-      const generatedContainerFile = 'generatedContainers.js';
-      const graphqlQuery = `${Module}Query`;
-      const options = {
-        pathToFileWithExports: `${startPath}/packages/${location}/src/modules/common/${generatedContainerFile}`,
-        exportName: graphqlQuery,
-        importString: `import ${graphqlQuery} from '../${module}/containers/${graphqlQuery}';\n`
-      };
-      updateFileWithExports(options);
-    }
-
-    if (action === 'addcrud' && location === 'server') {
-      console.log('copy database files');
-      const destinationPath = `${startPath}/packages/${location}/src/database`;
-      renameFiles(destinationPath, templatePath, module, 'database');
-
-      const timestamp = new Date().getTime();
-      shell.cd(`${startPath}/packages/${location}/src/database/migrations`);
-      shell.mv(`_${Module}.js`, `${timestamp}_${Module}.js`);
-      shell.cd(`${startPath}/packages/${location}/src/database/seeds`);
-      shell.mv(`_${Module}.js`, `${timestamp}_${Module}.js`);
-
-      logger.info(chalk.green(`✔ The database files have been copied!`));
-
-      if (tablePrefix !== '') {
-        shell.cd(`${startPath}/packages/${location}/src/modules/${module}`);
-        shell.sed('-i', /this.prefix = '';/g, `this.prefix = '${tablePrefix}';`, 'sql.js');
+    indexContent = `import ${moduleName} from './${moduleName}';\n` + fs.readFileSync(indexPath);
+  } catch (e) {
+    logger.error(chalk.red(`Failed to read ${indexPath} file`));
+    process.exit();
+  }
 
-        logger.info(chalk.green(`✔ Inserted db table prefix!`));
-      }
+  // extract Feature modules
+  const featureRegExp = /Feature\(([^()]+)\)/g;
+  const [, featureModules] = featureRegExp.exec(indexContent) || ['', ''];
 
-      const generatedSchemasFile = 'generatedSchemas.js';
-      const schema = `${Module}Schema`;
-      const options = {
-        pathToFileWithExports: `${startPath}/packages/${location}/src/modules/common/${generatedSchemasFile}`,
-        exportName: schema,
-        importString: `import { ${schema} } from '../${module}/schema';\n`
-      };
-      updateFileWithExports(options);
-    }
+  // add module to Feature connector
+  shell
+    .ShellString(indexContent.replace(RegExp(featureRegExp, 'g'), `Feature(${moduleName}, ${featureModules})`))
+    .to(indexPath);
 
+  if (finished) {
     logger.info(chalk.green(`✔ Module for ${location} successfully created!`));
   }
 }
diff --git a/tools/cli/commands/deleteModule.js b/tools/cli/commands/deleteModule.js
index 957ca4cb92..fd7999e808 100644
--- a/tools/cli/commands/deleteModule.js
+++ b/tools/cli/commands/deleteModule.js
@@ -1,134 +1,57 @@
 const shell = require('shelljs');
 const fs = require('fs');
 const chalk = require('chalk');
-const { pascalize } = require('humps');
-const readline = require('readline');
+const { computeModulesPath } = require('../helpers/util');
 
-const { deleteFromFileWithExports } = require('../helpers/util');
 /**
+ * Removes the module from client, server or both locations and removes the module from the Feature connector.
  *
- * @param logger
- * @param templatePath
- * @param module
- * @param location
+ * @param logger - The Logger.
+ * @param moduleName - The name of a new module.
+ * @param location - The location for a new module [client|server|both].
  */
-async function deleteModule(logger, templatePath, module, location) {
+function deleteModule(logger, moduleName, location) {
   logger.info(`Deleting ${location} files…`);
-
-  // pascalize
-  const Module = pascalize(module);
-  const startPath = `${__dirname}/../../..`;
-  const modulePath = `${startPath}/packages/${location}/src/modules/${module}`;
-  const generatedContainerFile = 'generatedContainers.js';
-  const generatedContainerPath = `${startPath}/packages/${location}/src/modules/common/${generatedContainerFile}`;
-  const generatedSchemasFile = 'generatedSchemas.js';
-  const generatedSchemaPath = `${startPath}/packages/${location}/src/modules/common/${generatedSchemasFile}`;
-  let userAnswer;
+  const modulePath = computeModulesPath(location, moduleName);
 
   if (fs.existsSync(modulePath)) {
-    if (location === 'server') {
-      // get list of migrations
-      const migrationNames = shell.find(`${startPath}/packages/${location}/src/database/migrations/`);
-
-      // open server directory
-      shell.cd(`${startPath}/packages/server`);
-
-      const isLastCreated = !!(migrationNames && migrationNames[migrationNames.length - 1].match(`_${Module}.js`));
-      const isExecuted = shell.exec('yarn knex-migrate list', { silent: true }).includes(`_${Module}.js`);
-
-      if (isLastCreated && isExecuted) {
-        // open server directory
-        shell.cd(`${startPath}/packages/server`);
-        // rollback migration
-        shell.exec('yarn knex-migrate down');
-        logger.info(chalk.green(`✔ Rollback migration was successfully!`));
-      } else if (isExecuted) {
-        const rl = readline.createInterface({
-          input: process.stdin,
-          output: process.stdout
-        });
-
-        const askQuestion = () => {
-          return new Promise(resolve => {
-            rl.question(`The table ${module} won't be deleted. Do you want continue y/n?\n`, answer => {
-              rl.close(answer);
-              resolve(answer);
-            });
-          });
-        };
-
-        do {
-          userAnswer = await askQuestion();
-        } while (userAnswer !== 'y' && userAnswer !== 'n');
-      }
-
-      if (userAnswer === 'n') {
-        return;
-      }
-
-      // change to database migrations directory
-      shell.cd(`${startPath}/packages/${location}/src/database/migrations`);
-      // check if any migrations files for this module existed
-      if (shell.find('.').filter(file => file.search(`_${Module}.js`) > -1).length > 0) {
-        let okMigrations = shell.rm(`*_${Module}.js`);
-        if (okMigrations) {
-          logger.info(chalk.green(`✔ Database migrations files successfully deleted!`));
-        }
-      }
-
-      // change to database seeds directory
-      shell.cd(`${startPath}/packages/${location}/src/database/seeds`);
-      // check if any seed files for this module exist
-      if (shell.find('.').filter(file => file.search(`_${Module}.js`) > -1).length > 0) {
-        let okSeeds = shell.rm(`*_${Module}.js`);
-        if (okSeeds) {
-          logger.info(chalk.green(`✔ Database seed files successfully deleted!`));
-        }
-      }
-    }
-
     // remove module directory
     shell.rm('-rf', modulePath);
 
-    // change to destination directory
-    shell.cd(`${startPath}/packages/${location}/src/modules/`);
+    const modulesPath = computeModulesPath(location);
+
+    // get index file path
+    const indexFullFileName = fs.readdirSync(modulesPath).find(name => name.search(/index/) >= 0);
+    const indexPath = modulesPath + indexFullFileName;
+    let indexContent;
 
-    // get module input data
-    const path = `${startPath}/packages/${location}/src/modules/index.js`;
-    let data = fs.readFileSync(path);
+    try {
+      indexContent = fs.readFileSync(indexPath);
+    } catch (e) {
+      logger.error(chalk.red(`Failed to read ${indexPath} file`));
+      process.exit();
+    }
 
     // extract Feature modules
-    const re = /Feature\(([^()]+)\)/g;
-    const match = re.exec(data);
-    const modules = match[1].split(',').filter(featureModule => featureModule.trim() !== module);
+    const featureRegExp = /Feature\(([^()]+)\)/g;
+    const [, featureModules] = featureRegExp.exec(indexContent) || ['', ''];
+    const featureModulesWithoutDeleted = featureModules
+      .split(',')
+      .filter(featureModule => featureModule.trim() !== moduleName);
 
-    // remove import module line
-    const lines = data
+    const contentWithoutDeletedModule = indexContent
       .toString()
-      .split('\n')
-      .filter(line => line.match(`import ${module} from './${module}';`) === null);
-    fs.writeFileSync(path, lines.join('\n'));
+      // replace features modules on features without deleted module
+      .replace(featureRegExp, `Feature(${featureModulesWithoutDeleted.toString().trim()})`)
+      // remove import module
+      .replace(RegExp(`import ${moduleName} from './${moduleName}';\n`, 'g'), '');
 
-    // remove module from Feature function
-    //shell.sed('-i', re, `Feature(${modules.toString().trim()})`, 'index.js');
-    shell
-      .ShellString(shell.cat('index.js').replace(RegExp(re, 'g'), `Feature(${modules.toString().trim()})`))
-      .to('index.js');
+    fs.writeFileSync(indexPath, contentWithoutDeletedModule);
 
-    // continue only if directory does not jet exist
     logger.info(chalk.green(`✔ Module for ${location} successfully deleted!`));
   } else {
     logger.info(chalk.red(`✘ Module ${location} location for ${modulePath} not found!`));
   }
-
-  if (fs.existsSync(generatedContainerPath)) {
-    const graphqlQuery = `${Module}Query`;
-    deleteFromFileWithExports(generatedContainerPath, graphqlQuery);
-  }
-  if (fs.existsSync(generatedSchemaPath)) {
-    const schema = `${Module}Schema`;
-    deleteFromFileWithExports(generatedSchemaPath, schema);
-  }
 }
 
 module.exports = deleteModule;
diff --git a/tools/cli/helpers/util.js b/tools/cli/helpers/util.js
index 4d3d78372c..8d1641658c 100644
--- a/tools/cli/helpers/util.js
+++ b/tools/cli/helpers/util.js
@@ -3,19 +3,27 @@ const fs = require('fs');
 const DomainSchema = require('@domain-schema/core').default;
 const { pascalize, decamelize } = require('humps');
 const { startCase } = require('lodash');
+const { BASE_PATH } = require('../config');
 
 /**
+ * Copies the templates to the destination directory.
  *
- * @param destinationPath
- * @param templatePath
- * @param module
- * @param location
+ * @param destinationPath - The destination path for a new module.
+ * @param templatesPath - The path to the templates for a new module.
+ * @param location - The location for a new module [client|server|both].
  */
-function renameFiles(destinationPath, templatePath, module, location) {
-  // pascalize
-  const Module = pascalize(module);
+function copyFiles(destinationPath, templatesPath, location) {
+  shell.cp('-R', `${templatesPath}/${location}/*`, destinationPath);
+}
 
-  shell.cp('-R', `${templatePath}/${location}/*`, destinationPath);
+/**
+ * Renames the templates in the destination directory.
+ *
+ * @param destinationPath - The destination path of a new module.
+ * @param moduleName - The name of a new module.
+ */
+function renameFiles(destinationPath, moduleName) {
+  const Module = pascalize(moduleName);
 
   // change to destination directory
   shell.cd(destinationPath);
@@ -23,23 +31,33 @@ function renameFiles(destinationPath, templatePath, module, location) {
   // rename files
   shell.ls('-Rl', '.').forEach(entry => {
     if (entry.isFile()) {
-      const moduleFile = entry.name.replace('Module', Module);
-      shell.mv(entry.name, moduleFile);
+      shell.mv(entry.name, entry.name.replace('Module', Module));
     }
   });
 
   // replace module names
   shell.ls('-Rl', '.').forEach(entry => {
     if (entry.isFile()) {
-      shell.sed('-i', /\$module\$/g, module, entry.name);
-      shell.sed('-i', /\$_module\$/g, decamelize(module), entry.name);
+      shell.sed('-i', /\$module\$/g, moduleName, entry.name);
+      shell.sed('-i', /\$_module\$/g, decamelize(moduleName), entry.name);
       shell.sed('-i', /\$Module\$/g, Module, entry.name);
-      shell.sed('-i', /\$MoDuLe\$/g, startCase(Module), entry.name);
-      shell.sed('-i', /\$MODULE\$/g, module.toUpperCase(), entry.name);
+      shell.sed('-i', /\$MoDuLe\$/g, startCase(moduleName), entry.name);
+      shell.sed('-i', /\$MODULE\$/g, moduleName.toUpperCase(), entry.name);
     }
   });
 }
 
+/**
+ * Gets the computed path of the module or modules dir path.
+ *
+ * @param location - The location for a new module [client|server|both].
+ * @param moduleName - The name of a new module.
+ * @returns {string} - Return the computed path
+ */
+function computeModulesPath(location, moduleName = '') {
+  return `${BASE_PATH}/packages/${location}/src/modules/${moduleName}`;
+}
+
 /**
  *
  * @param value
@@ -117,7 +135,9 @@ function deleteFromFileWithExports(pathToFileWithExports, exportName) {
 }
 
 module.exports = {
+  copyFiles,
   renameFiles,
+  computeModulesPath,
   generateField,
   updateFileWithExports,
   deleteFromFileWithExports

From 97bef036ee148a4e5a91732c5fbac9f034bfb101 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 18 Sep 2018 10:50:04 +0200
Subject: [PATCH 244/327] merge crud commands into new cli

---
 tools/cli.js                       | 16 +++---
 tools/cli/CommandInvoker.js        | 27 +++++++--
 tools/cli/commands/addCrud.js      | 67 ++++++++++++++++++++++
 tools/cli/commands/addModule.js    |  4 +-
 tools/cli/commands/deleteModule.js | 91 ++++++++++++++++++++++++++++--
 tools/cli/commands/updateSchema.js | 24 ++++----
 tools/cli/config.js                |  4 +-
 tools/cli/module.js                | 50 ----------------
 8 files changed, 200 insertions(+), 83 deletions(-)
 create mode 100644 tools/cli/commands/addCrud.js
 delete mode 100644 tools/cli/module.js

diff --git a/tools/cli.js b/tools/cli.js
index eccbf9f902..fbbfaeedc8 100644
--- a/tools/cli.js
+++ b/tools/cli.js
@@ -4,11 +4,11 @@ const prog = require('caporal');
 
 const addModuleCommand = require('./cli/commands/addModule');
 const deleteModuleCommand = require('./cli/commands/deleteModule');
+const addCrudCommand = require('./cli/commands/addCrud');
+const updateSchemaCommand = require('./cli/commands/updateSchema');
 const CommandInvoker = require('./cli/CommandInvoker');
 
-const commandInvoker = new CommandInvoker(addModuleCommand, deleteModuleCommand);
-
-const moduleCmd = require('./cli/module');
+const commandInvoker = new CommandInvoker(addModuleCommand, deleteModuleCommand, addCrudCommand, updateSchemaCommand);
 
 prog
   .version('1.0.0')
@@ -23,16 +23,14 @@ prog
     'both'
   )
   .action((args, options, logger) => commandInvoker.runAddModule(args, options, logger))
-  //.action((args, options, logger) => moduleCmd('addmodule', args, options, logger))
   // Delete module
   .command('deletemodule', 'Delete a Module')
   .argument('<moduleName>', 'Module name')
   .argument('[location]', 'Where should we delete module. [both, server, client]', ['both', 'server', 'client'], 'both')
   .action((args, options, logger) => commandInvoker.runDeleteModule(args, options, logger))
-  //.action((args, options, logger) => moduleCmd('deletemodule', args, options, logger))
   // Add crud
   .command('addcrud', 'Create a new Module with CRUD')
-  .argument('<module>', 'Module name')
+  .argument('<moduleName>', 'Module name')
   .argument(
     '[location]',
     'Where should new module be created. [both, server, client]',
@@ -40,10 +38,10 @@ prog
     'both'
   )
   .argument('[tablePrefix]', 'DB table prefix.')
-  .action((args, options, logger) => moduleCmd('addcrud', args, options, logger))
+  .action((args, options, logger) => commandInvoker.runAddCrud(args, options, logger))
   // Update schema
   .command('updateschema', 'Update Module Schema')
-  .argument('<module>', 'Module name')
-  .action((args, options, logger) => moduleCmd('updateschema', args, options, logger));
+  .argument('<moduleName>', 'Module name')
+  .action((args, options, logger) => commandInvoker.runUpdateSchema(args, options, logger));
 
 prog.parse(process.argv);
diff --git a/tools/cli/CommandInvoker.js b/tools/cli/CommandInvoker.js
index 7443d61249..18521bd7b8 100644
--- a/tools/cli/CommandInvoker.js
+++ b/tools/cli/CommandInvoker.js
@@ -1,4 +1,4 @@
-const { MODULE_TEMPLATES } = require('./config');
+const { MODULE_TEMPLATES, CRUD_TEMPLATES } = require('./config');
 
 /**
  * Class CommandInvoker. Takes all CLI operations and calls certain CLI operation depends of variables.
@@ -11,9 +11,11 @@ class CommandInvoker {
    * @param addModule - The function for creating a new module.
    * @param deleteModule - The function for deleting existing module.
    */
-  constructor(addModule, deleteModule) {
+  constructor(addModule, deleteModule, addCrud, updateSchema) {
     this.addModule = addModule;
     this.deleteModule = deleteModule;
+    this.addCrud = addCrud;
+    this.updateSchema = updateSchema;
   }
 
   /**
@@ -26,11 +28,11 @@ class CommandInvoker {
   static runCommand(func, location, ...args) {
     // client
     if (location === 'client' || location === 'both') {
-      func(...args, 'client');
+      func('client', ...args);
     }
     // server
     if (location === 'server' || location === 'both') {
-      func(...args, 'server');
+      func('server', ...args);
     }
   }
 
@@ -42,6 +44,15 @@ class CommandInvoker {
     CommandInvoker.runCommand(this.addModule, location, logger, MODULE_TEMPLATES, moduleName);
   }
 
+  /**
+   * Runs operation (function) for creating a new CRUD module.
+   */
+  runAddCrud(args, options, logger) {
+    const { moduleName, tablePrefix, location = 'both' } = args;
+    CommandInvoker.runCommand(this.addModule, location, logger, CRUD_TEMPLATES, moduleName, false);
+    CommandInvoker.runCommand(this.addCrud, location, logger, CRUD_TEMPLATES, moduleName, tablePrefix);
+  }
+
   /**
    * Runs operation (function) for deleting existing module.
    */
@@ -49,6 +60,14 @@ class CommandInvoker {
     const { moduleName, location = 'both' } = args;
     CommandInvoker.runCommand(this.deleteModule, location, logger, moduleName);
   }
+
+  /**
+   * Runs operation (function) for updating existing module schema.
+   */
+  runUpdateSchema(args, options, logger) {
+    const { moduleName, location = 'both' } = args;
+    CommandInvoker.runCommand(this.updateSchema, location, logger, moduleName);
+  }
 }
 
 module.exports = CommandInvoker;
diff --git a/tools/cli/commands/addCrud.js b/tools/cli/commands/addCrud.js
new file mode 100644
index 0000000000..08c32f2a2e
--- /dev/null
+++ b/tools/cli/commands/addCrud.js
@@ -0,0 +1,67 @@
+const shell = require('shelljs');
+const chalk = require('chalk');
+const { pascalize } = require('humps');
+const { copyFiles, renameFiles, updateFileWithExports } = require('../helpers/util');
+const { BASE_PATH } = require('../config');
+
+/**
+ * Adds module in client or server and adds a new module to the Feature connector.
+ *
+ * @param location - The location for a new module [client|server|both].
+ * @param logger - The Logger.
+ * @param templatesPath - The path to the templates for a new module.
+ * @param moduleName - The name of a new module.
+ * @param finished - The flag about the end of the generating process.
+ */
+function addCrud(location, logger, templatesPath, moduleName, tablePrefix, finished = true) {
+  // pascalize
+  const Module = pascalize(moduleName);
+
+  if (location === 'client') {
+    const generatedContainerFile = 'generatedContainers.js';
+    const graphqlQuery = `${Module}Query`;
+    const options = {
+      pathToFileWithExports: `${BASE_PATH}/packages/${location}/src/modules/common/${generatedContainerFile}`,
+      exportName: graphqlQuery,
+      importString: `import ${graphqlQuery} from '../${moduleName}/containers/${graphqlQuery}';\n`
+    };
+    updateFileWithExports(options);
+  }
+
+  if (location === 'server') {
+    logger.info('Copying database files…');
+    const destinationPath = `${BASE_PATH}/packages/${location}/src/database`;
+    copyFiles(destinationPath, templatesPath, 'database');
+    renameFiles(destinationPath, moduleName);
+
+    const timestamp = new Date().getTime();
+    shell.cd(`${BASE_PATH}/packages/${location}/src/database/migrations`);
+    shell.mv(`_${Module}.js`, `${timestamp}_${Module}.js`);
+    shell.cd(`${BASE_PATH}/packages/${location}/src/database/seeds`);
+    shell.mv(`_${Module}.js`, `${timestamp}_${Module}.js`);
+
+    logger.info(chalk.green(`✔ The database files have been copied!`));
+
+    if (tablePrefix !== '') {
+      shell.cd(`${BASE_PATH}/packages/${location}/src/modules/${moduleName}`);
+      shell.sed('-i', /this.prefix = '';/g, `this.prefix = '${tablePrefix}';`, 'sql.js');
+
+      logger.info(chalk.green(`✔ Inserted db table prefix!`));
+    }
+
+    const generatedSchemasFile = 'generatedSchemas.js';
+    const schema = `${Module}Schema`;
+    const options = {
+      pathToFileWithExports: `${BASE_PATH}/packages/${location}/src/modules/common/${generatedSchemasFile}`,
+      exportName: schema,
+      importString: `import { ${schema} } from '../${moduleName}/schema';\n`
+    };
+    updateFileWithExports(options);
+  }
+
+  if (finished) {
+    logger.info(chalk.green(`✔ Module for ${location} successfully created!`));
+  }
+}
+
+module.exports = addCrud;
diff --git a/tools/cli/commands/addModule.js b/tools/cli/commands/addModule.js
index de703b1ffc..7da270bf99 100644
--- a/tools/cli/commands/addModule.js
+++ b/tools/cli/commands/addModule.js
@@ -6,13 +6,13 @@ const { copyFiles, renameFiles, computeModulesPath } = require('../helpers/util'
 /**
  * Adds module in client or server and adds a new module to the Feature connector.
  *
+ * @param location - The location for a new module [client|server|both].
  * @param logger - The Logger.
  * @param templatesPath - The path to the templates for a new module.
  * @param moduleName - The name of a new module.
- * @param location - The location for a new module [client|server|both].
  * @param finished - The flag about the end of the generating process.
  */
-function addModule(logger, templatesPath, moduleName, location, finished = true) {
+function addModule(location, logger, templatesPath, moduleName, finished = true) {
   logger.info(`Copying ${location} files…`);
 
   // create new module directory
diff --git a/tools/cli/commands/deleteModule.js b/tools/cli/commands/deleteModule.js
index fd7999e808..a39126c893 100644
--- a/tools/cli/commands/deleteModule.js
+++ b/tools/cli/commands/deleteModule.js
@@ -1,25 +1,97 @@
 const shell = require('shelljs');
 const fs = require('fs');
 const chalk = require('chalk');
-const { computeModulesPath } = require('../helpers/util');
+const { pascalize } = require('humps');
+const readline = require('readline');
+const { computeModulesPath, deleteFromFileWithExports } = require('../helpers/util');
+const { BASE_PATH } = require('../config');
 
 /**
  * Removes the module from client, server or both locations and removes the module from the Feature connector.
  *
+ * @param location - The location for a new module [client|server|both].
  * @param logger - The Logger.
  * @param moduleName - The name of a new module.
- * @param location - The location for a new module [client|server|both].
  */
-function deleteModule(logger, moduleName, location) {
+async function deleteModule(location, logger, moduleName) {
   logger.info(`Deleting ${location} files…`);
+
+  // pascalize
+  const Module = pascalize(moduleName);
   const modulePath = computeModulesPath(location, moduleName);
+  const modulesPath = computeModulesPath(location);
+  const moduleCommonPath = `${modulesPath}/common`;
+  const generatedContainerFile = 'generatedContainers.js';
+  const generatedContainerPath = `${moduleCommonPath}/${generatedContainerFile}`;
+  const generatedSchemasFile = 'generatedSchemas.js';
+  const generatedSchemaPath = `${moduleCommonPath}/${generatedSchemasFile}`;
+  let userAnswer;
 
   if (fs.existsSync(modulePath)) {
+    if (location === 'server') {
+      // get list of migrations
+      const migrationNames = shell.find(`${BASE_PATH}/packages/server/src/database/migrations/`);
+
+      // open server directory
+      shell.cd(`${BASE_PATH}/packages/server`);
+
+      const isLastCreated = !!(migrationNames && migrationNames[migrationNames.length - 1].match(`_${Module}.js`));
+      const isExecuted = shell.exec('yarn knex-migrate list', { silent: true }).includes(`_${Module}.js`);
+
+      if (isLastCreated && isExecuted) {
+        // open server directory
+        shell.cd(`${BASE_PATH}/packages/server`);
+        // rollback migration
+        shell.exec('yarn knex-migrate down');
+        logger.info(chalk.green(`✔ Rollback migration was successfully!`));
+      } else if (isExecuted) {
+        const rl = readline.createInterface({
+          input: process.stdin,
+          output: process.stdout
+        });
+
+        const askQuestion = () => {
+          return new Promise(resolve => {
+            rl.question(`The table ${moduleName} won't be deleted. Do you want continue y/n?\n`, answer => {
+              rl.close(answer);
+              resolve(answer);
+            });
+          });
+        };
+
+        do {
+          userAnswer = await askQuestion();
+        } while (userAnswer !== 'y' && userAnswer !== 'n');
+      }
+
+      if (userAnswer === 'n') {
+        return;
+      }
+
+      // change to database migrations directory
+      shell.cd(`${BASE_PATH}/packages/server/src/database/migrations`);
+      // check if any migrations files for this module existed
+      if (shell.find('.').filter(file => file.search(`_${Module}.js`) > -1).length > 0) {
+        let okMigrations = shell.rm(`*_${Module}.js`);
+        if (okMigrations) {
+          logger.info(chalk.green(`✔ Database migrations files successfully deleted!`));
+        }
+      }
+
+      // change to database seeds directory
+      shell.cd(`${BASE_PATH}/packages/server/src/database/seeds`);
+      // check if any seed files for this module exist
+      if (shell.find('.').filter(file => file.search(`_${Module}.js`) > -1).length > 0) {
+        let okSeeds = shell.rm(`*_${Module}.js`);
+        if (okSeeds) {
+          logger.info(chalk.green(`✔ Database seed files successfully deleted!`));
+        }
+      }
+    }
+
     // remove module directory
     shell.rm('-rf', modulePath);
 
-    const modulesPath = computeModulesPath(location);
-
     // get index file path
     const indexFullFileName = fs.readdirSync(modulesPath).find(name => name.search(/index/) >= 0);
     const indexPath = modulesPath + indexFullFileName;
@@ -52,6 +124,15 @@ function deleteModule(logger, moduleName, location) {
   } else {
     logger.info(chalk.red(`✘ Module ${location} location for ${modulePath} not found!`));
   }
+
+  if (fs.existsSync(generatedContainerPath)) {
+    const graphqlQuery = `${Module}Query`;
+    deleteFromFileWithExports(generatedContainerPath, graphqlQuery);
+  }
+  if (fs.existsSync(generatedSchemaPath)) {
+    const schema = `${Module}Schema`;
+    deleteFromFileWithExports(generatedSchemaPath, schema);
+  }
 }
 
 module.exports = deleteModule;
diff --git a/tools/cli/commands/updateSchema.js b/tools/cli/commands/updateSchema.js
index 199453fc52..a034207080 100644
--- a/tools/cli/commands/updateSchema.js
+++ b/tools/cli/commands/updateSchema.js
@@ -4,30 +4,30 @@ const chalk = require('chalk');
 const GraphQLGenerator = require('@domain-schema/graphql').default;
 const { pascalize, camelize } = require('humps');
 
+const { BASE_PATH } = require('../config');
 const { generateField } = require('../helpers/util');
 const schemas = require('../../../packages/server/src/modules/common/generatedSchemas');
 
 /**
  *
  * @param logger
- * @param module
+ * @param moduleName
  * @returns {*|void}
  */
-function updateSchema(logger, module) {
-  logger.info(`Updating ${module} Schema…`);
+function updateModule(location, logger, moduleName) {
+  logger.info(`Updating ${moduleName} Schema…`);
 
   // pascalize
-  const Module = pascalize(module);
+  const Module = pascalize(moduleName);
 
-  const startPath = `${__dirname}/../../..`;
-  const modulePath = `${startPath}/packages/server/src/modules/${module}`;
+  const modulePath = `${BASE_PATH}/packages/server/src/modules/${moduleName}`;
 
   if (fs.existsSync(modulePath)) {
     // get module schema
     const schema = schemas.default[`${Module}Schema`];
 
     // get schema file
-    const pathSchema = `${startPath}/packages/server/src/modules/${module}/`;
+    const pathSchema = `${BASE_PATH}/packages/server/src/modules/${moduleName}/`;
     if (fs.existsSync(pathSchema)) {
       const file = `schema.graphql`;
 
@@ -157,7 +157,7 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
     }
 
     // get fragment file
-    const pathFragment = `${startPath}/packages/client/src/modules/${module}/graphql/`;
+    const pathFragment = `${BASE_PATH}/packages/client/src/modules/${moduleName}/graphql/`;
     if (fs.existsSync(pathFragment)) {
       const fragmentGraphqlFile = `${Module}.graphql`;
 
@@ -184,7 +184,7 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
     }
 
     // get state client file
-    const pathStateClient = `${startPath}/packages/client/src/modules/${module}/graphql/`;
+    const pathStateClient = `${BASE_PATH}/packages/client/src/modules/${moduleName}/graphql/`;
     if (fs.existsSync(pathStateClient)) {
       const file = `${Module}State.client.graphql`;
 
@@ -218,7 +218,7 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
     }
 
     // get state resolver file
-    const pathStateResolver = `${startPath}/packages/client/src/modules/${module}/resolvers/`;
+    const pathStateResolver = `${BASE_PATH}/packages/client/src/modules/${moduleName}/resolvers/`;
     if (fs.existsSync(pathStateResolver)) {
       const file = `index.js`;
 
@@ -258,7 +258,7 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
       logger.error(chalk.red(`✘ State Resolver path ${pathStateResolver} not found!`));
     }
   } else {
-    logger.info(chalk.red(`✘ Module ${module} in path ${modulePath} not found!`));
+    logger.info(chalk.red(`✘ Module ${moduleName} in path ${modulePath} not found!`));
   }
 }
 
@@ -288,4 +288,4 @@ const regenerateGraphqlFragment = (value, key, spaces = '') => {
   }
 };
 
-module.exports = updateSchema;
+module.exports = updateModule;
diff --git a/tools/cli/config.js b/tools/cli/config.js
index cc8408efec..fddf230745 100644
--- a/tools/cli/config.js
+++ b/tools/cli/config.js
@@ -3,9 +3,11 @@ const path = require('path');
 const BASE_PATH = path.resolve(`${__dirname}/../..`);
 const TEMPLATES_DIR = `${BASE_PATH}/tools/templates`;
 const MODULE_TEMPLATES = `${TEMPLATES_DIR}/module`;
+const CRUD_TEMPLATES = `${TEMPLATES_DIR}/crud`;
 
 module.exports = {
   BASE_PATH,
   TEMPLATES_DIR,
-  MODULE_TEMPLATES
+  MODULE_TEMPLATES,
+  CRUD_TEMPLATES
 };
diff --git a/tools/cli/module.js b/tools/cli/module.js
deleted file mode 100644
index fd0164b9cf..0000000000
--- a/tools/cli/module.js
+++ /dev/null
@@ -1,50 +0,0 @@
-const fs = require('fs');
-const chalk = require('chalk');
-const addModule = require('./commands/addModule');
-const deleteModule = require('./commands/deleteModule');
-const updateSchema = require('./commands/updateSchema');
-
-module.exports = (action, args, options, logger) => {
-  const module = args.module;
-  let location = 'both';
-  if (args.location) {
-    location = args.location;
-  }
-  let tablePrefix = '';
-  if (args.tablePrefix) {
-    tablePrefix = args.tablePrefix;
-  }
-  console.log(tablePrefix);
-  let templatePath = `${__dirname}/../templates/module`;
-  if (action === 'addcrud') {
-    templatePath = `${__dirname}/../templates/crud`;
-  }
-
-  if (!fs.existsSync(templatePath)) {
-    logger.error(chalk.red(`The requested location for ${location} not found.`));
-    process.exit(1);
-  }
-
-  // client
-  if (location === 'client' || location === 'both') {
-    if (action === 'addmodule' || action === 'addcrud') {
-      addModule(logger, templatePath, module, action, tablePrefix, 'client');
-    } else if (action === 'deletemodule') {
-      deleteModule(logger, templatePath, module, 'client');
-    }
-  }
-
-  // server
-  if (location === 'server' || location === 'both') {
-    if (action === 'addmodule' || action === 'addcrud') {
-      addModule(logger, templatePath, module, action, tablePrefix, 'server');
-    } else if (action === 'deletemodule') {
-      deleteModule(logger, templatePath, module, 'server');
-    }
-  }
-
-  // update schema
-  if (action === 'updateschema') {
-    updateSchema(logger, module);
-  }
-};

From 7ed626ba5d521ac37f40053ac741a599b785b5c2 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 19 Sep 2018 09:34:16 +0200
Subject: [PATCH 245/327] =?UTF-8?q?schema=20-=20noIdSuffix:=20allow=20no?=
 =?UTF-8?q?=20=E2=80=98id=E2=80=99=20suffix=20in=20related=20fields?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/server/src/sql/helpers.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/server/src/sql/helpers.js b/packages/server/src/sql/helpers.js
index e70cafdb68..766a97dc60 100644
--- a/packages/server/src/sql/helpers.js
+++ b/packages/server/src/sql/helpers.js
@@ -100,13 +100,14 @@ const _getSelectField = (fieldName, parentField, domainSchema, single) => {
  * @param fieldName
  * @param value
  * @param domainSchema
- * @returns {{fieldName: *, prefix: string, baseTableName: *, foreignTableName: *}}
+ * @returns {{fieldName: *, prefix: string, suffix: string, baseTableName: *, foreignTableName: *}}
  * @private
  */
 const _getJoinEntity = (fieldName, value, domainSchema) => {
   return {
     fieldName: decamelize(fieldName),
     prefix: value.type.__.tablePrefix ? value.type.__.tablePrefix : '',
+    suffix: value.noIdSuffix ? '' : '_id',
     baseTableName: decamelize(domainSchema.name),
     foreignTableName: decamelize(value.type.__.tableName ? value.type.__.tableName : value.type.name)
   };
@@ -127,14 +128,14 @@ export const selectBy = (schema, fields, single = false) => {
 
   return query => {
     // join table names
-    joinNames.map(({ fieldName, prefix, baseTableName, foreignTableName }) => {
+    joinNames.map(({ fieldName, prefix, suffix, baseTableName, foreignTableName }) => {
       // if fieldName (schema key) diff with table name than make proper table alias
       const tableNameAlias =
         fieldName !== null && fieldName !== foreignTableName ? `${fieldName}_${foreignTableName}` : foreignTableName;
       query.leftJoin(
         `${prefix}${foreignTableName} as ${tableNameAlias}`,
         `${tableNameAlias}.id`,
-        `${baseTableName}.${fieldName}_id`
+        `${baseTableName}.${fieldName}${suffix}`
       );
     });
 

From 89a1a6b63eabb3a4635de15e4168c7dbb9207c41 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 19 Sep 2018 09:55:10 +0200
Subject: [PATCH 246/327] crud: fix get total if filter applied

---
 packages/server/src/sql/crud.js | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/packages/server/src/sql/crud.js b/packages/server/src/sql/crud.js
index 13ae88de8d..3bb4f2f703 100644
--- a/packages/server/src/sql/crud.js
+++ b/packages/server/src/sql/crud.js
@@ -442,7 +442,6 @@ export default class Crud {
   _getList({ limit, offset, orderBy, filter }, info) {
     const select = selectBy(this.schema, info, false);
     const queryBuilder = select(this.getBaseQuery());
-    const tableName = this.getFullTableName();
 
     if (limit) {
       queryBuilder.limit(limit);
@@ -476,6 +475,14 @@ export default class Crud {
       queryBuilder.orderBy(`${this.getFullTableName()}.id`);
     }
 
+    this._filter(filter, queryBuilder);
+
+    return knexnest(queryBuilder);
+  }
+
+  _filter(filter, queryBuilder) {
+    const tableName = this.getFullTableName();
+
     if (!_.isEmpty(filter)) {
       const addFilterWhere = this.schemaIterator((filterKey, value, isSchema, _this, tableName, filter) => {
         const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
@@ -516,8 +523,6 @@ export default class Crud {
         });
       }
     }
-
-    return knexnest(queryBuilder);
   }
 
   schemaIterator = fn => {
@@ -532,7 +537,7 @@ export default class Crud {
 
   async getPaginated(args, info) {
     const edges = await this._getList(args, parseFields(info).edges);
-    const { count } = await this.getTotal();
+    const { count } = await this.getTotal(args);
 
     return {
       edges,
@@ -547,10 +552,14 @@ export default class Crud {
     return this._getList(args, parseFields(info));
   }
 
-  getTotal() {
-    return knex(this.getFullTableName())
+  getTotal({ filter }) {
+    const queryBuilder = knex(this.getFullTableName())
       .countDistinct('id as count')
       .first();
+
+    this._filter(filter, queryBuilder);
+
+    return queryBuilder;
   }
 
   _get({ where }, info) {

From 05e58d6baddec02f78d9bfb4c10f8e8c171bc719 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 19 Sep 2018 11:40:13 +0200
Subject: [PATCH 247/327] navigation: Rename from GPlayground to GraphiQL

---
 .../common/components/web/ui-antd/components/PageLayout.jsx     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/PageLayout.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/PageLayout.jsx
index 3092d33c0c..297b229144 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/PageLayout.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/PageLayout.jsx
@@ -81,7 +81,7 @@ class PageLayout extends React.Component {
                     {modules.navItemsRight}
                     {__DEV__ && (
                       <MenuItem>
-                        <a href="/graphql">GPlayground</a>
+                        <a href="/graphiql">GraphiQL</a>
                       </MenuItem>
                     )}
                   </Menu>

From a282129df87372b81cd833bfc9d92f40915e70c9 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 19 Sep 2018 14:03:29 +0200
Subject: [PATCH 248/327] fix elsint error

---
 packages/client/src/modules/common/util.web.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index 265409bba3..0c42cb151d 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -434,7 +434,7 @@ class EditableCell extends React.Component {
     dirty: false,
     editable: false
   };
-  componentWillReceiveProps(nextProps) {
+  UNSAFE_componentWillReceiveProps(nextProps) {
     const { value } = this.props;
     if (nextProps.value !== value) {
       this.setState({ value: nextProps.value });

From cba8afffacd100cb94917d8daff6c7b2039d49c4 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 19 Sep 2018 14:06:47 +0200
Subject: [PATCH 249/327] fix crud generation

---
 tools/cli/commands/updateSchema.js         | 16 +++++++++++-----
 tools/templates/crud/server/schema.graphql |  3 +++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/tools/cli/commands/updateSchema.js b/tools/cli/commands/updateSchema.js
index 28dd31376b..f7f5b37a0a 100644
--- a/tools/cli/commands/updateSchema.js
+++ b/tools/cli/commands/updateSchema.js
@@ -42,9 +42,10 @@ function updateModule(logger, moduleName, location) {
         const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
         if (value.type.isSchema) {
           let required = value.optional ? '' : '!';
-          inputCreate += `  ${key}Id: Int${required}\n`;
-          inputUpdate += `  ${key}Id: Int\n`;
-          inputFilter += `  ${key}Id: Int\n`;
+          const id = value.noIdSuffix ? '' : 'Id';
+          inputCreate += `  ${key}${id}: Int${required}\n`;
+          inputUpdate += `  ${key}${id}: Int\n`;
+          inputFilter += `  ${key}${id}: Int\n`;
         } else if (value.type.constructor !== Array) {
           if (key !== 'id') {
             inputCreate += `  ${key}: ${generateField(value)}\n`;
@@ -123,11 +124,13 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
       logger.info(chalk.green(`✔ Schema in ${pathSchema}${file} successfully updated!`));
 
       const resolverFile = `resolvers.js`;
+      let hasBatchResolvers = false;
       let replace = `  ${schema.name}: {
 `;
       for (const key of schema.keys()) {
         const value = schema.values[key];
         if (value.type.constructor === Array) {
+          hasBatchResolvers = true;
           replace += `    ${key}: createBatchResolver((sources, args, ctx, info) => {
       return ctx.${schema.name}.getByIds(sources.map(({ id }) => id), '${camelize(schema.name)}', ctx.${
             value.type[0].name
@@ -138,6 +141,7 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
       }
       replace += `  },
 `;
+      replace = hasBatchResolvers ? replace : '';
 
       // override batch resolvers in resolvers.js file
       const replaceBatchResolvers = `// schema batch resolvers([^*]+)// end schema batch resolvers`;
@@ -195,7 +199,8 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
         const value = schema.values[key];
         const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
         if (value.type.isSchema) {
-          graphql += `    ${key}Id\n`;
+          const id = value.noIdSuffix ? '' : 'Id';
+          graphql += `    ${key}${id}\n`;
         } else {
           if (hasTypeOf(Date)) {
             graphql += `    ${key}_lte\n`;
@@ -229,7 +234,8 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
         const value = schema.values[key];
         const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
         if (value.type.isSchema) {
-          defaults += `  ${key}Id: '',\n`;
+          const id = value.noIdSuffix ? '' : 'Id';
+          defaults += `  ${key}${id}: '',\n`;
         } else {
           if (hasTypeOf(Date)) {
             defaults += `  ${key}_lte: '',\n`;
diff --git a/tools/templates/crud/server/schema.graphql b/tools/templates/crud/server/schema.graphql
index 0092024f18..6da4694b11 100644
--- a/tools/templates/crud/server/schema.graphql
+++ b/tools/templates/crud/server/schema.graphql
@@ -3,6 +3,7 @@ type $Module$ {
   id: Int!
   name: String!
 }
+
 ### end schema type definitions
 
 type $Module$Connection {
@@ -21,6 +22,8 @@ type $Module$Payload {
 
 input $Module$FilterInput {
   searchText: String
+  id: Int
+  name: String
 }
 
 input $Module$CreateInput {

From a6496d88b754d1cd4d233f648acbc1b56bf6f2da Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 19 Sep 2018 15:40:28 +0200
Subject: [PATCH 250/327] remame files to .ts if possible

---
 .../crud/server/__tests__/{Module.spec.js => Module.spec.ts} | 5 +++--
 tools/templates/crud/server/{index.js => index.ts}           | 2 +-
 tools/templates/crud/server/{schema.js => schema.ts}         | 2 ++
 tools/templates/crud/server/{sql.js => sql.ts}               | 1 +
 4 files changed, 7 insertions(+), 3 deletions(-)
 rename tools/templates/crud/server/__tests__/{Module.spec.js => Module.spec.ts} (89%)
 rename tools/templates/crud/server/{index.js => index.ts} (93%)
 rename tools/templates/crud/server/{schema.js => schema.ts} (89%)
 rename tools/templates/crud/server/{sql.js => sql.ts} (89%)

diff --git a/tools/templates/crud/server/__tests__/Module.spec.js b/tools/templates/crud/server/__tests__/Module.spec.ts
similarity index 89%
rename from tools/templates/crud/server/__tests__/Module.spec.js
rename to tools/templates/crud/server/__tests__/Module.spec.ts
index 1274af0922..1b8f5b154e 100644
--- a/tools/templates/crud/server/__tests__/Module.spec.js
+++ b/tools/templates/crud/server/__tests__/Module.spec.ts
@@ -4,7 +4,8 @@ import { step } from 'mocha-steps';
 import { getServer, getApollo } from '../../../testHelpers/integrationSetup';
 
 describe('$Module$ API works', () => {
-  let server, apollo;
+  let server: any;
+  let apollo: any;
 
   before(() => {
     server = getServer();
@@ -15,7 +16,7 @@ describe('$Module$ API works', () => {
     return chai
       .request(server)
       .keepOpen()
-      .get('/graphql')
+      .get('/graphiql')
       .set('Accept', 'text/html')
       .then(res => {
         res.should.have.status(200);
diff --git a/tools/templates/crud/server/index.js b/tools/templates/crud/server/index.ts
similarity index 93%
rename from tools/templates/crud/server/index.js
rename to tools/templates/crud/server/index.ts
index cb4b4c8964..e739d3033e 100644
--- a/tools/templates/crud/server/index.js
+++ b/tools/templates/crud/server/index.ts
@@ -4,7 +4,7 @@ import createResolvers from './resolvers';
 import Feature from '../connector';
 
 export default new Feature({
-  schema: schema,
+  schema,
   createResolversFunc: createResolvers,
   createContextFunc: () => ({ $Module$: new $Module$() })
 });
diff --git a/tools/templates/crud/server/schema.js b/tools/templates/crud/server/schema.ts
similarity index 89%
rename from tools/templates/crud/server/schema.js
rename to tools/templates/crud/server/schema.ts
index 2d8f2f9471..556274de45 100644
--- a/tools/templates/crud/server/schema.js
+++ b/tools/templates/crud/server/schema.ts
@@ -1,6 +1,8 @@
 import DomainSchema, { Schema } from '@domain-schema/core';
 
 export class $Module$ extends Schema {
+  public id: any;
+  public name: object;
   constructor() {
     super();
     this.__ = { name: '$Module$', tablePrefix: '' };
diff --git a/tools/templates/crud/server/sql.js b/tools/templates/crud/server/sql.ts
similarity index 89%
rename from tools/templates/crud/server/sql.js
rename to tools/templates/crud/server/sql.ts
index 051c8e5e3d..754e0af3cc 100644
--- a/tools/templates/crud/server/sql.js
+++ b/tools/templates/crud/server/sql.ts
@@ -2,6 +2,7 @@ import { $Module$Schema } from './schema';
 import Crud from '../../sql/crud';
 
 export default class $Module$ extends Crud {
+  public schema: any;
   constructor() {
     super();
     this.schema = $Module$Schema;

From cd8e2f401ff5ad4a0c30f54dcfe24beae9e0377b Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 20 Sep 2018 09:55:39 +0200
Subject: [PATCH 251/327] runPrettier on generated containers and schemas

---
 tools/cli/commands/deleteModule.js | 19 ++++++++++---------
 tools/cli/helpers/util.js          |  8 ++++++--
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/tools/cli/commands/deleteModule.js b/tools/cli/commands/deleteModule.js
index aaaa3fab53..39758cb346 100644
--- a/tools/cli/commands/deleteModule.js
+++ b/tools/cli/commands/deleteModule.js
@@ -64,19 +64,20 @@ function deleteModule(logger, moduleName, options, location) {
     if (location === 'server' && options.m) {
       deleteMigrations(logger, moduleName);
     }
+
+    if (fs.existsSync(generatedContainerPath)) {
+      const graphqlQuery = `${Module}Query`;
+      deleteFromFileWithExports(generatedContainerPath, graphqlQuery);
+    }
+    if (fs.existsSync(generatedSchemaPath)) {
+      const schema = `${Module}Schema`;
+      deleteFromFileWithExports(generatedSchemaPath, schema);
+    }
+
     logger.info(chalk.green(`✔ Module for ${location} successfully deleted!`));
   } else {
     logger.info(chalk.red(`✘ Module ${location} location for ${modulePath} not found!`));
   }
-
-  if (fs.existsSync(generatedContainerPath)) {
-    const graphqlQuery = `${Module}Query`;
-    deleteFromFileWithExports(generatedContainerPath, graphqlQuery);
-  }
-  if (fs.existsSync(generatedSchemaPath)) {
-    const schema = `${Module}Schema`;
-    deleteFromFileWithExports(generatedSchemaPath, schema);
-  }
 }
 
 module.exports = deleteModule;
diff --git a/tools/cli/helpers/util.js b/tools/cli/helpers/util.js
index 1fbeb84bc5..a09baa717b 100644
--- a/tools/cli/helpers/util.js
+++ b/tools/cli/helpers/util.js
@@ -124,11 +124,13 @@ function updateFileWithExports({ pathToFileWithExports, exportName, importString
           importString +
           generatedContainer.slice(computedIndex, generatedContainer.length);
         computedGeneratedContainer = computedGeneratedContainer.replace(/(,|)\s};/g, `,\n  ${exportName}\n};`);
-        return fs.writeFileSync(pathToFileWithExports, computedGeneratedContainer);
+        fs.writeFileSync(pathToFileWithExports, computedGeneratedContainer);
       }
     }
+  } else {
+    fs.writeFileSync(pathToFileWithExports, importString + exportGraphqlContainer);
   }
-  return fs.writeFileSync(pathToFileWithExports, importString + exportGraphqlContainer);
+  runPrittier(pathToFileWithExports);
 }
 
 /**
@@ -142,6 +144,8 @@ function deleteFromFileWithExports(pathToFileWithExports, exportName) {
     const reg = `(\\n\\s\\s${exportName}(.|)|import (${exportName}|{ ${exportName} }).+;\\n+(?!ex))`;
     const generatedElement = generatedElementData.toString().replace(new RegExp(reg, 'g'), '');
     fs.writeFileSync(pathToFileWithExports, generatedElement);
+
+    runPrittier(pathToFileWithExports);
   }
 }
 

From a2e7332afc0d2409e166c1f67437fd16837996bd Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 25 Sep 2018 13:17:43 +0200
Subject: [PATCH 252/327] fix crud refactoring regressions + small fixes

---
 packages/server/src/sql/crud.js    | 12 ++++++------
 packages/server/src/sql/helpers.js | 29 ++++++++++++++++++++++-------
 tools/cli/commands/addCrud.js      | 11 ++++++-----
 tools/cli/helpers/util.js          |  2 +-
 4 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/packages/server/src/sql/crud.js b/packages/server/src/sql/crud.js
index 3bb4f2f703..2c335fc7e3 100644
--- a/packages/server/src/sql/crud.js
+++ b/packages/server/src/sql/crud.js
@@ -467,12 +467,12 @@ export default class Crud {
           });
           column = `${tableName}.${foundValue ? foundValue.sortBy : 'name'}`;
         } else {
-          column = `${this.getFullTableName()}.${decamelize(column)}`;
+          column = `${this.getTableName()}.${decamelize(column)}`;
         }
       }
       queryBuilder.orderBy(column, order);
     } else {
-      queryBuilder.orderBy(`${this.getFullTableName()}.id`);
+      queryBuilder.orderBy(`${this.getTableName()}.id`);
     }
 
     this._filter(filter, queryBuilder);
@@ -481,7 +481,7 @@ export default class Crud {
   }
 
   _filter(filter, queryBuilder) {
-    const tableName = this.getFullTableName();
+    const tableName = this.getTableName();
 
     if (!_.isEmpty(filter)) {
       const addFilterWhere = this.schemaIterator((filterKey, value, isSchema, _this, tableName, filter) => {
@@ -515,10 +515,10 @@ export default class Crud {
       if (filter.searchText) {
         const addSearchTextWhere = this.schemaIterator((key, value, isSchema, _this, tableName, filter) => {
           if (value.searchText) {
-            _this.where(`${tableName}.${decamelize(key)}`, 'like', `%${filter.searchText}%`);
+            _this.orWhere(`${tableName}.${decamelize(key)}`, 'like', `%${filter.searchText}%`);
           }
         });
-        queryBuilder.orWhere(function() {
+        queryBuilder.where(function() {
           addSearchTextWhere(this, tableName, filter);
         });
       }
@@ -553,7 +553,7 @@ export default class Crud {
   }
 
   getTotal({ filter }) {
-    const queryBuilder = knex(this.getFullTableName())
+    const queryBuilder = knex(`${this.getFullTableName()} as ${this.getTableName()}`)
       .countDistinct('id as count')
       .first();
 
diff --git a/packages/server/src/sql/helpers.js b/packages/server/src/sql/helpers.js
index 766a97dc60..8a00e87af4 100644
--- a/packages/server/src/sql/helpers.js
+++ b/packages/server/src/sql/helpers.js
@@ -55,7 +55,7 @@ export const orderedForArray = (rows, collection, field, arrayElement) => {
  * @param parentField
  * @private
  */
-const _getSelectFields = (graphqlFields, domainSchema, selectItems, joinNames, single, parentField = '') => {
+const _getSelectFields = (graphqlFields, domainSchema, selectItems, joinNames, single, parentKey, parentPath) => {
   for (const fieldName of Object.keys(graphqlFields)) {
     if (fieldName === '__typename') {
       continue;
@@ -65,7 +65,7 @@ const _getSelectFields = (graphqlFields, domainSchema, selectItems, joinNames, s
       if (value && value.transient) {
         continue;
       }
-      selectItems.push(_getSelectField(fieldName, parentField, domainSchema, single));
+      selectItems.push(_getSelectField(fieldName, parentPath, domainSchema, single, parentKey));
     } else {
       if (Array.isArray(value.type) || findIndex(joinNames, { fieldName: decamelize(fieldName) }) > -1) {
         continue;
@@ -73,7 +73,20 @@ const _getSelectFields = (graphqlFields, domainSchema, selectItems, joinNames, s
       if (!value.type.__.transient) {
         joinNames.push(_getJoinEntity(fieldName, value, domainSchema));
       }
-      _getSelectFields(graphqlFields[fieldName], value.type, selectItems, joinNames, single, fieldName);
+
+      parentPath.push(fieldName);
+
+      _getSelectFields(
+        graphqlFields[fieldName],
+        value.type,
+        selectItems,
+        joinNames,
+        single,
+        decamelize(fieldName),
+        parentPath
+      );
+
+      parentPath.pop();
     }
   }
 };
@@ -87,12 +100,13 @@ const _getSelectFields = (graphqlFields, domainSchema, selectItems, joinNames, s
  * @returns {string}
  * @private
  */
-const _getSelectField = (fieldName, parentField, domainSchema, single) => {
-  const alias = parentField.length > 0 ? `${parentField}_${fieldName}` : fieldName;
+const _getSelectField = (fieldName, parentPath, domainSchema, single, parentKey) => {
+  const alias = parentPath.length > 0 ? `${parentPath.join('_')}_${fieldName}` : fieldName;
   const tableName = `${decamelize(domainSchema.__.tableName ? domainSchema.__.tableName : domainSchema.name)}`;
+  const fullTableName = parentKey !== null && parentKey !== tableName ? `${parentKey}_${tableName}` : tableName;
   // returning object would be array or no
   const arrayPrefix = single ? '' : '_';
-  return `${tableName}.${decamelize(fieldName)} as ${arrayPrefix}${alias}`;
+  return `${fullTableName}.${decamelize(fieldName)} as ${arrayPrefix}${alias}`;
 };
 
 /**
@@ -122,9 +136,10 @@ const _getJoinEntity = (fieldName, value, domainSchema) => {
  */
 export const selectBy = (schema, fields, single = false) => {
   // select fields and joins
+  const parentPath = [];
   const selectItems = [];
   const joinNames = [];
-  _getSelectFields(fields, schema, selectItems, joinNames, single);
+  _getSelectFields(fields, schema, selectItems, joinNames, single, null, parentPath);
 
   return query => {
     // join table names
diff --git a/tools/cli/commands/addCrud.js b/tools/cli/commands/addCrud.js
index 354bb7e2c1..f926510288 100644
--- a/tools/cli/commands/addCrud.js
+++ b/tools/cli/commands/addCrud.js
@@ -5,12 +5,13 @@ const addMigration = require('./subCommands/addMigration');
 const { computeModulesPath } = require('../helpers/util');
 
 /**
- * Add CRUD module command
- * @param logger
- * @param templatesPath
- * @param module
+ * Adds CRUD module in server and adds a new module to the Feature connector.
+ *
+ * @param logger - The Logger.
+ * @param templatesPath - The path to the templates for a new module.
+ * @param moduleName - The name of a new module.
  * @param tablePrefix
- * @param location
+ * @param location - The location for a new module [client|server|both].
  */
 function addCrud(logger, templatesPath, moduleName, tablePrefix, location) {
   // add module in server, client
diff --git a/tools/cli/helpers/util.js b/tools/cli/helpers/util.js
index e5c00891ac..d6fa773b05 100644
--- a/tools/cli/helpers/util.js
+++ b/tools/cli/helpers/util.js
@@ -69,8 +69,8 @@ function runPrettier(pathToFile) {
 }
 
 module.exports = {
-  renameFiles,
   copyFiles,
+  renameFiles,
   computeModulesPath,
   runPrettier
 };

From 40a1bd0c8c01a6848e0d8a4c4e7f33867b1586db Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 25 Sep 2018 13:21:30 +0200
Subject: [PATCH 253/327] fix crud refactoring regressions + small fixes

---
 packages/client/src/modules/common/util.web.jsx | 10 +++++-----
 tools/cli/commands/addCrud.js                   |  4 +++-
 tools/cli/helpers/util.js                       |  6 ++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index 0c42cb151d..5df8cc2c88 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -45,7 +45,7 @@ export const createColumnFields = ({
   customActions
 }) => {
   let columns = [];
-
+  // use customFields if definded otherwise use schema.keys()
   const keys =
     customFields.constructor === Object && Object.keys(customFields).length !== 0
       ? Object.keys(customFields)
@@ -250,7 +250,7 @@ export const createFormFields = ({
     const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
 
     if (value.show !== false && value.type.constructor !== Array) {
-      let formField = createFormField(key, type, values, formItemLayout, formType, hasTypeOf, prefix);
+      let formField = createFormField(schema, key, type, values, formItemLayout, formType, hasTypeOf, prefix);
       if (formField) {
         if (Array.isArray(formField)) {
           formField.forEach(field => fields.push(field));
@@ -270,7 +270,7 @@ export const createFormFields = ({
   return fields;
 };
 
-const createFormField = (key, type, values, formItemLayout, formType, hasTypeOf, prefix) => {
+const createFormField = (schema, key, type, values, formItemLayout, formType, hasTypeOf, prefix) => {
   let component = RenderField;
   const value = values ? values[key] : '';
   let style = {};
@@ -329,9 +329,9 @@ const createFormField = (key, type, values, formItemLayout, formType, hasTypeOf,
   } else if (hasTypeOf(Number)) {
     inputType = 'number';
     component = RenderNumber;
-  } else if (hasTypeOf(String) && value.fieldInput === 'textarea' && formType !== 'filter') {
+  } else if (hasTypeOf(String) && schema.values[key].fieldInput === 'textarea' && formType !== 'filter') {
     component = RenderTextArea;
-  } else if (hasTypeOf(String) && value.fieldInput === 'country' && formType !== 'filter') {
+  } else if (hasTypeOf(String) && schema.values[key].fieldInput === 'country' && formType !== 'filter') {
     component = RenderSelectCountry;
   }
 
diff --git a/tools/cli/commands/addCrud.js b/tools/cli/commands/addCrud.js
index 37053283b5..4d34086852 100644
--- a/tools/cli/commands/addCrud.js
+++ b/tools/cli/commands/addCrud.js
@@ -3,7 +3,7 @@ const chalk = require('chalk');
 const { pascalize } = require('humps');
 const addModule = require('./addModule');
 const addMigration = require('./subCommands/addMigration');
-const { computeModulesPath, updateFileWithExports } = require('../helpers/util');
+const { computeModulesPath, updateFileWithExports, runPrettier } = require('../helpers/util');
 const { BASE_PATH } = require('../config');
 
 /**
@@ -31,6 +31,7 @@ function addCrud(logger, templatesPath, moduleName, tablePrefix, location) {
       importString: `import ${graphqlQuery} from '../${moduleName}/containers/${graphqlQuery}';\n`
     };
     updateFileWithExports(options);
+    runPrettier(options.pathToFileWithExports);
   }
 
   if (location === 'server') {
@@ -52,6 +53,7 @@ function addCrud(logger, templatesPath, moduleName, tablePrefix, location) {
       importString: `import { ${schema} } from '../${moduleName}/schema';\n`
     };
     updateFileWithExports(options);
+    runPrettier(options.pathToFileWithExports);
   }
 
   logger.info(chalk.green(`✔ Module for ${location} successfully created!`));
diff --git a/tools/cli/helpers/util.js b/tools/cli/helpers/util.js
index bc0f3732aa..746f06d70a 100644
--- a/tools/cli/helpers/util.js
+++ b/tools/cli/helpers/util.js
@@ -124,13 +124,11 @@ function updateFileWithExports({ pathToFileWithExports, exportName, importString
           importString +
           generatedContainer.slice(computedIndex, generatedContainer.length);
         computedGeneratedContainer = computedGeneratedContainer.replace(/(,|)\s};/g, `,\n  ${exportName}\n};`);
-        fs.writeFileSync(pathToFileWithExports, computedGeneratedContainer);
+        return fs.writeFileSync(pathToFileWithExports, computedGeneratedContainer);
       }
     }
-  } else {
-    fs.writeFileSync(pathToFileWithExports, importString + exportGraphqlContainer);
+    return fs.writeFileSync(pathToFileWithExports, importString + exportGraphqlContainer);
   }
-  runPrettier(pathToFileWithExports);
 }
 
 /**

From 004daa22e1db538cb270aa32200b01f6c43aadf0 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 26 Sep 2018 10:32:02 +0200
Subject: [PATCH 254/327] add render select filter boolean

---
 .../components/RenderSelectFilterBoolean.jsx  |  78 +++
 .../web/ui-antd/components/index.js           |   1 +
 packages/client/src/modules/common/crud.js    |  22 +
 .../client/src/modules/common/util.web.jsx    |   7 +-
 .../templates/crud/client/resolvers/index.js  |  11 +-
 yarn.lock                                     | 460 +++++++++++++++---
 6 files changed, 511 insertions(+), 68 deletions(-)
 create mode 100644 packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectFilterBoolean.jsx

diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectFilterBoolean.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectFilterBoolean.jsx
new file mode 100644
index 0000000000..61206b5b1b
--- /dev/null
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectFilterBoolean.jsx
@@ -0,0 +1,78 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Form, Select } from 'antd';
+
+const FormItem = Form.Item;
+const Option = Select.Option;
+
+export default class RenderSelectFilterBoolean extends React.Component {
+  static propTypes = {
+    input: PropTypes.object,
+    setFieldValue: PropTypes.func.isRequired,
+    setFieldTouched: PropTypes.func.isRequired,
+    label: PropTypes.string,
+    type: PropTypes.string,
+    style: PropTypes.object,
+    formItemLayout: PropTypes.object,
+    meta: PropTypes.object,
+    children: PropTypes.node
+  };
+
+  handleChange = value => {
+    const {
+      input: { name },
+      setFieldValue
+    } = this.props;
+    setFieldValue(name, value);
+  };
+
+  handleBlur = () => {
+    const {
+      input: { name },
+      setFieldTouched
+    } = this.props;
+    setFieldTouched(name, true);
+  };
+
+  render() {
+    const {
+      input: { value, onChange, onBlur, ...inputRest },
+      label,
+      style,
+      formItemLayout,
+      meta: { touched, error }
+    } = this.props;
+
+    let validateStatus = '';
+    if (touched && error) {
+      validateStatus = 'error';
+    }
+
+    let defaultStyle = { width: '100%' };
+    if (style) {
+      defaultStyle = style;
+    }
+
+    console.log('value:', value);
+
+    let props = {
+      style: defaultStyle,
+      name: inputRest.name,
+      onChange: this.handleChange,
+      onBlur: this.handleBlur,
+      value: value
+    };
+
+    return (
+      <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={error}>
+        <div>
+          <Select {...props}>
+            <Option value="">All</Option>
+            <Option value="true">Yes</Option>
+            <Option value="false">No</Option>
+          </Select>
+        </div>
+      </FormItem>
+    );
+  }
+}
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/index.js b/packages/client/src/modules/common/components/web/ui-antd/components/index.js
index b0ed9a9df6..631b6fe883 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/index.js
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/index.js
@@ -17,6 +17,7 @@ export { default as RenderDate } from './RenderDate';
 export { default as RenderSelect } from './RenderSelect';
 export { default as RenderSelectCountry } from './RenderSelectCountry';
 export { default as RenderSelectQuery } from './RenderSelectQuery';
+export { default as RenderSelectFilterBoolean } from './RenderSelectFilterBoolean';
 export { default as RenderCheckBox } from './RenderCheckBox';
 export { default as RenderSwitch } from './RenderSwitch';
 export { default as Alert } from './Alert';
diff --git a/packages/client/src/modules/common/crud.js b/packages/client/src/modules/common/crud.js
index 90b70f8660..f338cfd17f 100644
--- a/packages/client/src/modules/common/crud.js
+++ b/packages/client/src/modules/common/crud.js
@@ -39,3 +39,25 @@ export const deleteEntry = async ({ ownProps: { refetch }, mutate }, { where },
     console.log(e.graphQLErrors);
   }
 };
+
+export const mergeFilter = (filter, defaults, schema) => {
+  let mergeFilter = filter;
+  if (!filter.hasOwnProperty('searchText')) {
+    const { searchText, ...restFilters } = defaults.testModuleState.filter;
+    mergeFilter = { ...restFilters, ...filter };
+  }
+
+  for (const key of schema.keys()) {
+    const value = schema.values[key];
+    const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
+    if (hasTypeOf(Boolean)) {
+      if (mergeFilter[key] === 'true') {
+        mergeFilter[key] = true;
+      } else if (filter[key] === 'false') {
+        mergeFilter[key] = false;
+      }
+    }
+  }
+
+  return mergeFilter;
+};
diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index 5df8cc2c88..853b6ce87a 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -16,6 +16,7 @@ import {
   RenderTextArea,
   RenderSelectQuery,
   RenderSelectCountry,
+  RenderSelectFilterBoolean,
   RenderDate,
   RenderSwitch,
   Popconfirm,
@@ -287,7 +288,11 @@ const createFormField = (schema, key, type, values, formItemLayout, formType, ha
       style = { width: 100 };
     }
   } else if (hasTypeOf(Boolean)) {
-    component = RenderSwitch;
+    if (formType === 'filter') {
+      component = RenderSelectFilterBoolean;
+    } else {
+      component = RenderSwitch;
+    }
   } else if (hasTypeOf(Date)) {
     component = RenderDate;
     if (formType === 'filter') {
diff --git a/tools/templates/crud/client/resolvers/index.js b/tools/templates/crud/client/resolvers/index.js
index 7fc264a26d..06d5e6ada8 100644
--- a/tools/templates/crud/client/resolvers/index.js
+++ b/tools/templates/crud/client/resolvers/index.js
@@ -1,5 +1,7 @@
 import update from 'immutability-helper';
 
+import { mergeFilter } from '../../common/crud';
+import { $Module$Schema } from '../../../../../server/src/modules/$module$/schema';
 import $MODULE$_STATE_QUERY from '../graphql/$Module$StateQuery.client.graphql';
 
 const TYPE_$MODULE$_STATE = '$Module$State';
@@ -50,15 +52,8 @@ const resolvers = {
     },
     update$Module$Filter: (_, { filter }, { cache }) => {
       const { $module$State } = cache.readQuery({ query: $MODULE$_STATE_QUERY });
-
-      let mergeFilter = filter;
-      if (!filter.hasOwnProperty('searchText')) {
-        const { searchText, ...restFilters } = defaults.$module$State.filter;
-        mergeFilter = { ...restFilters, ...filter };
-      }
-
       const new$Module$State = update($module$State, {
-        filter: { $merge: mergeFilter }
+        filter: { $merge: mergeFilter(filter, defaults, $Module$Schema) }
       });
 
       cache.writeData({
diff --git a/yarn.lock b/yarn.lock
index 58d39ce128..19f3ae2d33 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -549,6 +549,17 @@
   dependencies:
     debug "^3.1.0"
 
+"@domain-schema/formik@^0.0.34":
+  version "0.0.34"
+  resolved "https://registry.yarnpkg.com/@domain-schema/formik/-/formik-0.0.34.tgz#a5023113c5540def45aba2bfb1d5fb0b1c2ce461"
+  dependencies:
+    debug "^3.1.0"
+    formik "^0.11.11"
+    humps "^2.0.1"
+  optionalDependencies:
+    react-test-renderer "^16.2.0"
+    reactstrap "^6.0.1"
+
 "@domain-schema/graphql@^0.0.33":
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/@domain-schema/graphql/-/graphql-0.0.33.tgz#201d8cc5d21a9eba69f2eb8cb1fe44f012381cec"
@@ -562,6 +573,13 @@
     debug "^3.1.0"
     humps "^2.0.1"
 
+"@domain-schema/validation@^0.0.36":
+  version "0.0.36"
+  resolved "https://registry.yarnpkg.com/@domain-schema/validation/-/validation-0.0.36.tgz#b4740e577e4c745710fb4388e857ee62f70e33ea"
+  dependencies:
+    debug "^3.1.0"
+    humps "^2.0.1"
+
 "@expo/bunyan@^1.8.10":
   version "1.8.10"
   resolved "https://registry.yarnpkg.com/@expo/bunyan/-/bunyan-1.8.10.tgz#7d19354a6bce85aae5fea0e973569d3f0142533e"
@@ -718,7 +736,11 @@
   dependencies:
     "@fortawesome/fontawesome-common-types" "^0.1.7"
 
-"@fortawesome/fontawesome@^1.1.3":
+"@fortawesome/fontawesome-free-webfonts@^1.0.9":
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free-webfonts/-/fontawesome-free-webfonts-1.0.9.tgz#72f2c10453422aba0d338fa6a9cb761b50ba24d5"
+
+"@fortawesome/fontawesome@^1.1.8":
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome/-/fontawesome-1.1.8.tgz#75fe66a60f95508160bb16bd781ad7d89b280f5b"
   dependencies:
@@ -1339,7 +1361,7 @@
     component-type "^1.2.1"
     join-component "^1.1.0"
 
-"@types/accepts@^1.3.5":
+"@types/accepts@*", "@types/accepts@^1.3.5":
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/@types/accepts/-/accepts-1.3.5.tgz#c34bec115cfc746e04fe5a059df4ce7e7b391575"
   dependencies:
@@ -1360,6 +1382,13 @@
     "@types/connect" "*"
     "@types/node" "*"
 
+"@types/bunyan@*":
+  version "1.8.4"
+  resolved "https://registry.yarnpkg.com/@types/bunyan/-/bunyan-1.8.4.tgz#69c11adc7b50538d45fb68d9ae39d062b9432f38"
+  dependencies:
+    "@types/events" "*"
+    "@types/node" "*"
+
 "@types/chai-http@^3.0.5":
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/@types/chai-http/-/chai-http-3.0.5.tgz#a56d1113f50309b96905935aab45dd2496ea558e"
@@ -1372,7 +1401,7 @@
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.1.4.tgz#5ca073b330d90b4066d6ce18f60d57f2084ce8ca"
 
-"@types/connect@*":
+"@types/connect@*", "@types/connect@^3.4.31":
   version "3.4.32"
   resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.32.tgz#aa0e9616b9435ccad02bc52b5b454ffc2c70ba28"
   dependencies:
@@ -1382,6 +1411,15 @@
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/@types/cookiejar/-/cookiejar-2.1.0.tgz#4b7daf2c51696cfc70b942c11690528229d1a1ce"
 
+"@types/cookies@*":
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/@types/cookies/-/cookies-0.7.1.tgz#f9f204bd6767d389eea3b87609e30c090c77a540"
+  dependencies:
+    "@types/connect" "*"
+    "@types/express" "*"
+    "@types/keygrip" "*"
+    "@types/node" "*"
+
 "@types/cors@^2.8.4":
   version "2.8.4"
   resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.4.tgz#50991a759a29c0b89492751008c6af7a7c8267b0"
@@ -1400,7 +1438,7 @@
     "@types/node" "*"
     "@types/range-parser" "*"
 
-"@types/express@*", "@types/express@4.16.0":
+"@types/express@*", "@types/express@4.16.0", "@types/express@^4.0.36":
   version "4.16.0"
   resolved "https://registry.yarnpkg.com/@types/express/-/express-4.16.0.tgz#6d8bc42ccaa6f35cf29a2b7c3333cb47b5a32a19"
   dependencies:
@@ -1440,6 +1478,10 @@
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.0.tgz#2fac51050c68f7d6f96c5aafc631132522f4aa3f"
 
+"@types/http-assert@*":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@types/http-assert/-/http-assert-1.3.0.tgz#5e932606153da28e1d04f9043f4912cf61fd55dd"
+
 "@types/i18next-express-middleware@^0.0.33":
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/@types/i18next-express-middleware/-/i18next-express-middleware-0.0.33.tgz#1c5625f123eaae126de3b43626ef9a04bc6ad482"
@@ -1455,6 +1497,10 @@
   version "23.3.1"
   resolved "https://registry.yarnpkg.com/@types/jest/-/jest-23.3.1.tgz#a4319aedb071d478e6f407d1c4578ec8156829cf"
 
+"@types/keygrip@*":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@types/keygrip/-/keygrip-1.0.1.tgz#ff540462d2fb4d0a88441ceaf27d287b01c3d878"
+
 "@types/knex@^0.14.20":
   version "0.14.23"
   resolved "https://registry.yarnpkg.com/@types/knex/-/knex-0.14.23.tgz#8145977f96bc8014ec17c22d8aa0a1e0cc86934b"
@@ -1463,6 +1509,34 @@
     "@types/events" "*"
     "@types/node" "*"
 
+"@types/koa-bodyparser@^4.2.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@types/koa-bodyparser/-/koa-bodyparser-4.2.0.tgz#04febc567f3d3dd40e3d1a0e095cdf7b07c4d7ce"
+  dependencies:
+    "@types/koa" "*"
+
+"@types/koa-compose@*":
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/@types/koa-compose/-/koa-compose-3.2.2.tgz#dc106e000bbf92a3ac900f756df47344887ee847"
+
+"@types/koa-router@^7.0.27":
+  version "7.0.32"
+  resolved "https://registry.yarnpkg.com/@types/koa-router/-/koa-router-7.0.32.tgz#a2d8adc65ad3d58aeb94d056650920c085817697"
+  dependencies:
+    "@types/koa" "*"
+
+"@types/koa@*", "@types/koa@^2.0.39":
+  version "2.0.46"
+  resolved "https://registry.yarnpkg.com/@types/koa/-/koa-2.0.46.tgz#24bc3cd405d10fcde81f876cd8285b44d4ddc3e9"
+  dependencies:
+    "@types/accepts" "*"
+    "@types/cookies" "*"
+    "@types/events" "*"
+    "@types/http-assert" "*"
+    "@types/keygrip" "*"
+    "@types/koa-compose" "*"
+    "@types/node" "*"
+
 "@types/lodash@^4.14.112":
   version "4.14.116"
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.116.tgz#5ccf215653e3e8c786a58390751033a9adca0eb9"
@@ -1577,6 +1651,14 @@
     "@types/prop-types" "*"
     csstype "^2.2.0"
 
+"@types/restify@^5.0.7":
+  version "5.0.9"
+  resolved "https://registry.yarnpkg.com/@types/restify/-/restify-5.0.9.tgz#95bf30b0fd7b92329a695bbd60feae019f3e31fd"
+  dependencies:
+    "@types/bunyan" "*"
+    "@types/node" "*"
+    "@types/spdy" "*"
+
 "@types/serialize-javascript@^1.3.2":
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/@types/serialize-javascript/-/serialize-javascript-1.3.2.tgz#fba3efd1c28806921d4fba56709494e4511048d6"
@@ -1592,6 +1674,12 @@
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/shortid/-/shortid-0.0.29.tgz#8093ee0416a6e2bf2aa6338109114b3fbffa0e9b"
 
+"@types/spdy@*":
+  version "3.4.4"
+  resolved "https://registry.yarnpkg.com/@types/spdy/-/spdy-3.4.4.tgz#3282fd4ad8c4603aa49f7017dd520a08a345b2bc"
+  dependencies:
+    "@types/node" "*"
+
 "@types/superagent@*", "@types/superagent@^3.8.3":
   version "3.8.4"
   resolved "https://registry.yarnpkg.com/@types/superagent/-/superagent-3.8.4.tgz#24a5973c7d1a9c024b4bbda742a79267c33fb86a"
@@ -2097,21 +2185,27 @@ apollo-cache-router@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/apollo-cache-router/-/apollo-cache-router-1.1.6.tgz#32a7bcd975825e0a1150bd0603a779aa9bd24227"
 
-apollo-cache@1.1.16, apollo-cache@^1.1.16:
+apollo-cache@1.1.17:
+  version "1.1.17"
+  resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.1.17.tgz#1fcca8423125223723b97fd72808be91a1a76490"
+  dependencies:
+    apollo-utilities "^1.0.21"
+
+apollo-cache@^1.1.16:
   version "1.1.16"
   resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.1.16.tgz#0c7460ee8eff1898462979143b4e922aaba73cf8"
   dependencies:
     apollo-utilities "^1.0.20"
 
-apollo-client@^2.3.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.4.1.tgz#d2ebaac1831fa170f7d0070bb9d581cccb5f64e3"
+apollo-client@^2.3.4:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.4.2.tgz#d2f044d8740723bf98a6d8d8b9684ee8c36150e6"
   dependencies:
     "@types/zen-observable" "^0.8.0"
-    apollo-cache "1.1.16"
+    apollo-cache "1.1.17"
     apollo-link "^1.0.0"
     apollo-link-dedup "^1.0.0"
-    apollo-utilities "1.0.20"
+    apollo-utilities "1.0.21"
     symbol-observable "^1.0.2"
     zen-observable "^0.8.0"
   optionalDependencies:
@@ -2124,6 +2218,18 @@ apollo-datasource@0.1.2:
     apollo-server-caching "0.1.2"
     apollo-server-env "2.0.2"
 
+apollo-engine-binary-darwin@0.2018.6-20-gc0e4bb519:
+  version "0.2018.6-20-gc0e4bb519"
+  resolved "https://registry.yarnpkg.com/apollo-engine-binary-darwin/-/apollo-engine-binary-darwin-0.2018.6-20-gc0e4bb519.tgz#1458cf9af9adff1248730b9e7ea3408a778ff20e"
+
+apollo-engine-binary-linux@0.2018.6-20-gc0e4bb519:
+  version "0.2018.6-20-gc0e4bb519"
+  resolved "https://registry.yarnpkg.com/apollo-engine-binary-linux/-/apollo-engine-binary-linux-0.2018.6-20-gc0e4bb519.tgz#0f61d7e7888a58d8723516d1dc44d4c8a6688df2"
+
+apollo-engine-binary-windows@0.2018.6-20-gc0e4bb519:
+  version "0.2018.6-20-gc0e4bb519"
+  resolved "https://registry.yarnpkg.com/apollo-engine-binary-windows/-/apollo-engine-binary-windows-0.2018.6-20-gc0e4bb519.tgz#288c718a730f2a1f8bb0aae9fff3e6da23c1f00f"
+
 apollo-engine-reporting-protobuf@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.0.1.tgz#cd394f0f769c6f97d8621c4a7839095c84efcdb0"
@@ -2140,6 +2246,21 @@ apollo-engine-reporting@0.0.2:
     graphql-extensions "0.1.2"
     lodash "^4.17.10"
 
+apollo-engine@^1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/apollo-engine/-/apollo-engine-1.1.2.tgz#ef8465fe5234b3bfe034b7e96d37bc441b72a9cb"
+  dependencies:
+    "@types/connect" "^3.4.31"
+    "@types/express" "^4.0.36"
+    "@types/koa" "^2.0.39"
+    "@types/koa-bodyparser" "^4.2.0"
+    "@types/koa-router" "^7.0.27"
+    "@types/restify" "^5.0.7"
+  optionalDependencies:
+    apollo-engine-binary-darwin "0.2018.6-20-gc0e4bb519"
+    apollo-engine-binary-linux "0.2018.6-20-gc0e4bb519"
+    apollo-engine-binary-windows "0.2018.6-20-gc0e4bb519"
+
 apollo-link-batch-http@1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/apollo-link-batch-http/-/apollo-link-batch-http-1.2.2.tgz#4dc98e16dca063cc66db3311cc71a855a4bac9c9"
@@ -2281,7 +2402,14 @@ apollo-upload-client@^8.0.0:
     apollo-link-http-common "^0.2.4"
     extract-files "^3.1.0"
 
-apollo-utilities@1.0.20, apollo-utilities@^1.0.0, apollo-utilities@^1.0.1, apollo-utilities@^1.0.11, apollo-utilities@^1.0.20, apollo-utilities@^1.0.3, apollo-utilities@^1.0.8:
+apollo-utilities@1.0.21, apollo-utilities@^1.0.21:
+  version "1.0.21"
+  resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.0.21.tgz#cb8b5779fe275850b16046ff8373f4af2de90765"
+  dependencies:
+    fast-json-stable-stringify "^2.0.0"
+    fclone "^1.0.11"
+
+apollo-utilities@^1.0.0, apollo-utilities@^1.0.1, apollo-utilities@^1.0.11, apollo-utilities@^1.0.20, apollo-utilities@^1.0.3, apollo-utilities@^1.0.8:
   version "1.0.20"
   resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.0.20.tgz#b14318686cb67838279fb5f009cca0ec97a4d140"
   dependencies:
@@ -2451,7 +2579,7 @@ art@^0.10.0, art@^0.10.1:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/art/-/art-0.10.3.tgz#b01d84a968ccce6208df55a733838c96caeeaea2"
 
-asap@^2.0.0, asap@~2.0.3:
+asap@^2.0.0, asap@^2.0.6, asap@~2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
 
@@ -3821,10 +3949,14 @@ block-stream@*:
   dependencies:
     inherits "~2.0.0"
 
-bluebird@^2.10.2:
+bluebird@^2.10.2, bluebird@^2.9.24:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
 
+bluebird@^3.4.1, bluebird@^3.4.6:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.2.tgz#1be0908e054a751754549c270489c1505d4ab15a"
+
 bluebird@^3.4.7, bluebird@^3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
@@ -3852,7 +3984,7 @@ body-parser@1.18.2:
     raw-body "2.3.2"
     type-is "~1.6.15"
 
-body-parser@^1.15.2, body-parser@^1.18.3:
+body-parser@^1.15.2, body-parser@^1.18.2, body-parser@^1.18.3:
   version "1.18.3"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.3.tgz#5b292198ffdd553b3a0f20ded0592b956955c8b4"
   dependencies:
@@ -3904,7 +4036,7 @@ bplist-parser@0.1.1:
   dependencies:
     big-integer "^1.6.7"
 
-brace-expansion@^1.1.7:
+brace-expansion@^1.0.0, brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
   dependencies:
@@ -4647,6 +4779,10 @@ commander@2.17.x, commander@^2.11.0, commander@^2.12.1, commander@^2.14.1, comma
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
 
+commander@^2.2.0:
+  version "2.18.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.18.0.tgz#2bf063ddee7c7891176981a2cc798e5754bc6970"
+
 commander@~2.13.0:
   version "2.13.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
@@ -5291,7 +5427,7 @@ dateformat@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
 
-debug@2, debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.2, debug@^2.6.6, debug@^2.6.8, debug@^2.6.9:
+debug@2, debug@2.6.9, debug@^2.1.2, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.2, debug@^2.6.6, debug@^2.6.8, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   dependencies:
@@ -5548,10 +5684,23 @@ dir-glob@^2.0.0:
     arrify "^1.0.1"
     path-type "^3.0.0"
 
+disposables@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/disposables/-/disposables-1.0.2.tgz#36c6a674475f55a2d6913567a601444e487b4b6e"
+
 dlv@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.2.tgz#270f6737b30d25b6657a7e962c784403f85137e5"
 
+dnd-core@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/dnd-core/-/dnd-core-2.6.0.tgz#12bad66d58742c6e5f7cf2943fb6859440f809c4"
+  dependencies:
+    asap "^2.0.6"
+    invariant "^2.0.0"
+    lodash "^4.2.0"
+    redux "^3.7.1"
+
 dns-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
@@ -5693,6 +5842,10 @@ dotenv@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.0.0.tgz#24e37c041741c5f4b25324958ebbc34bca965935"
 
+double-ended-queue@^2.1.0-0:
+  version "2.1.0-0"
+  resolved "https://registry.yarnpkg.com/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz#103d3527fd31528f40188130c841efdd78264e5c"
+
 draft-js@^0.10.0, draft-js@~0.10.0:
   version "0.10.5"
   resolved "https://registry.yarnpkg.com/draft-js/-/draft-js-0.10.5.tgz#bfa9beb018fe0533dbb08d6675c371a6b08fa742"
@@ -6431,6 +6584,10 @@ extend@^3.0.0, extend@~3.0.0, extend@~3.0.1, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
 
+extend@~2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-2.0.2.tgz#1b74985400171b85554894459c978de6ef453ab7"
+
 external-editor@^1.1.0:
   version "1.1.1"
   resolved "http://registry.npmjs.org/external-editor/-/external-editor-1.1.1.tgz#12d7b0db850f7ff7e7081baf4005700060c4600b"
@@ -6599,6 +6756,10 @@ fbjs@^0.8.0, fbjs@^0.8.14, fbjs@^0.8.15, fbjs@^0.8.16, fbjs@^0.8.4, fbjs@^0.8.5,
     setimmediate "^1.0.5"
     ua-parser-js "^0.7.18"
 
+fclone@^1.0.11:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/fclone/-/fclone-1.0.11.tgz#10e85da38bfea7fc599341c296ee1d77266ee640"
+
 fd-slicer@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"
@@ -6753,6 +6914,12 @@ findup-sync@^2.0.0:
     micromatch "^3.0.4"
     resolve-dir "^1.0.1"
 
+findup-sync@~0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.2.1.tgz#e0a90a450075c49466ee513732057514b81e878c"
+  dependencies:
+    glob "~4.3.0"
+
 fined@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fined/-/fined-1.1.0.tgz#b37dc844b76a2f5e7081e884f7c0ae344f153476"
@@ -6767,6 +6934,10 @@ flagged-respawn@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.0.tgz#4e79ae9b2eb38bf86b3bb56bf3e0a56aa5fcabd7"
 
+flagged-respawn@~0.3.0:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-0.3.2.tgz#ff191eddcd7088a675b2610fffc976be9b8074b5"
+
 flat-cache@^1.2.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.0.tgz#d3030b32b38154f4e3b7e9c709f490f7ef97c481"
@@ -6855,6 +7026,16 @@ formidable@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.2.1.tgz#70fb7ca0290ee6ff961090415f4b3df3d2082659"
 
+formik@^0.11.11:
+  version "0.11.11"
+  resolved "http://registry.npmjs.org/formik/-/formik-0.11.11.tgz#4b02838133c0196b1ef443aa973766cd097ec4a5"
+  dependencies:
+    lodash.clonedeep "^4.5.0"
+    lodash.isequal "4.5.0"
+    lodash.topath "4.5.2"
+    prop-types "^15.5.10"
+    warning "^3.0.0"
+
 formik@^1.0.2:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/formik/-/formik-1.1.1.tgz#078e6b7ff09d040ad63a30058e1ce8f1c0ad59cb"
@@ -7190,6 +7371,15 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@~4.3.0:
+  version "4.3.5"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-4.3.5.tgz#80fbb08ca540f238acce5d11d1e9bc41e75173d3"
+  dependencies:
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^2.0.1"
+    once "^1.3.0"
+
 global-modules@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
@@ -7315,9 +7505,9 @@ graphql-extensions@0.1.2:
   dependencies:
     apollo-server-env "2.0.2"
 
-graphql-iso-date@^3.3.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/graphql-iso-date/-/graphql-iso-date-3.5.0.tgz#55a1be0efa8d28c1453afd2eb5ce1d052189a513"
+graphql-iso-date@^3.5.0:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/graphql-iso-date/-/graphql-iso-date-3.6.1.tgz#bd2d0dc886e0f954cbbbc496bbf1d480b57ffa96"
 
 graphql-parse-fields@^1.2.0:
   version "1.2.0"
@@ -7502,6 +7692,10 @@ hasha@^2.2.0:
     is-stream "^1.0.1"
     pinkie-promise "^2.0.0"
 
+hashmap@^2.0.1:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/hashmap/-/hashmap-2.3.0.tgz#b13fb65da7c8ba5e3db8fc1b8c5ba1d0049daf22"
+
 haul@^1.0.0-rc.7:
   version "1.0.0-rc.7"
   resolved "https://registry.yarnpkg.com/haul/-/haul-1.0.0-rc.7.tgz#22c57c1a0d8a7a924e1ea80f08273607b8344f63"
@@ -7617,7 +7811,7 @@ hoist-non-react-statics@^1.0.5:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb"
 
-hoist-non-react-statics@^2.2.0, hoist-non-react-statics@^2.2.1, hoist-non-react-statics@^2.2.2, hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0, hoist-non-react-statics@^2.5.5:
+hoist-non-react-statics@^2.1.0, hoist-non-react-statics@^2.2.0, hoist-non-react-statics@^2.2.1, hoist-non-react-statics@^2.2.2, hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0, hoist-non-react-statics@^2.5.5:
   version "2.5.5"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
 
@@ -8090,6 +8284,10 @@ internal-ip@^3.0.1:
     default-gateway "^2.6.0"
     ipaddr.js "^1.5.2"
 
+interpret@^0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-0.5.2.tgz#377833b04b5ea693ff0d533380e3dda0c0381be0"
+
 interpret@^1.0.0, interpret@^1.0.1, interpret@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
@@ -8104,7 +8302,7 @@ invariant@2.2.1:
   dependencies:
     loose-envify "^1.0.0"
 
-invariant@^2.0.0, invariant@^2.2.0, invariant@^2.2.1, invariant@^2.2.2, invariant@^2.2.4:
+invariant@^2.0.0, invariant@^2.1.0, invariant@^2.2.0, invariant@^2.2.1, invariant@^2.2.2, invariant@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
   dependencies:
@@ -9253,7 +9451,40 @@ kleur@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-2.0.2.tgz#b704f4944d95e255d038f0cb05fb8a602c55a300"
 
-knex@^0.14.2, knex@^0.14.6:
+knex-migrate@^1.6.1:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/knex-migrate/-/knex-migrate-1.7.0.tgz#613857264fb428ee6a7bec128345771bd7d70aa7"
+  dependencies:
+    bluebird "^3.4.6"
+    core-js "^2.5.3"
+    invariant "^2.2.1"
+    lodash "^4.16.4"
+    minimist "^1.2.0"
+    prettyjson "^1.1.3"
+    regenerator-runtime "^0.11.1"
+    req-from "^1.0.1"
+    umzug "^2.1.0"
+
+knex@0.8.6:
+  version "0.8.6"
+  resolved "http://registry.npmjs.org/knex/-/knex-0.8.6.tgz#20f2f4a6cf98fa755b5cee9aa9fabae531af056a"
+  dependencies:
+    bluebird "^2.9.24"
+    chalk "^1.0.0"
+    commander "^2.2.0"
+    debug "^2.1.3"
+    inherits "~2.0.1"
+    interpret "^0.5.2"
+    liftoff "~2.0.0"
+    lodash "^3.7.0"
+    minimist "~1.1.0"
+    mkdirp "^0.5.0"
+    pool2 "^1.1.0"
+    readable-stream "^1.1.12"
+    tildify "~1.0.0"
+    v8flags "^2.0.2"
+
+knex@^0.14.2:
   version "0.14.6"
   resolved "https://registry.yarnpkg.com/knex/-/knex-0.14.6.tgz#ad57c4ef8fa1b51ebc8c37c2c9b483f6fb34e41e"
   dependencies:
@@ -9276,12 +9507,12 @@ knex@^0.14.2, knex@^0.14.6:
     uuid "^3.2.1"
     v8flags "^3.0.2"
 
-knexnest@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/knexnest/-/knexnest-1.0.0.tgz#b8840d13c2692bdd5fa3d5de67a456283d538fce"
+knexnest@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/knexnest/-/knexnest-0.4.1.tgz#f91184a575ea1e360af425cab61790bb1471141c"
   dependencies:
-    knex "^0.14.6"
-    nesthydrationjs "^1.0.5"
+    knex "0.8.6"
+    nesthydrationjs "0.3.0"
 
 lazy-cache@^1.0.3:
   version "1.0.4"
@@ -9425,6 +9656,16 @@ liftoff@2.5.0:
     rechoir "^0.6.2"
     resolve "^1.1.7"
 
+liftoff@~2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.0.3.tgz#fbab25362a506ac28a3db0c55cde9562fbd70456"
+  dependencies:
+    extend "~2.0.0"
+    findup-sync "~0.2.0"
+    flagged-respawn "~0.3.0"
+    minimist "~1.1.0"
+    resolve "~1.1.0"
+
 lint-staged@^7.0.4, lint-staged@^7.1.2:
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-7.2.2.tgz#0983d55d497f19f36d11ff2c8242b2f56cc2dd05"
@@ -9657,14 +9898,14 @@ lodash.isarray@^3.0.0:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
 
-lodash.isarray@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-4.0.0.tgz#2aca496b28c4ca6d726715313590c02e6ea34403"
-
 lodash.isboolean@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
 
+lodash.isequal@4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
+
 lodash.isfunction@^3.0.8, lodash.isfunction@^3.0.9:
   version "3.0.9"
   resolved "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz#06de25df4db327ac931981d1bdb067e5af68d051"
@@ -9701,10 +9942,6 @@ lodash.keys@^3.0.0, lodash.keys@^3.1.2:
     lodash.isarguments "^3.0.0"
     lodash.isarray "^3.0.0"
 
-lodash.keys@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-4.2.0.tgz#a08602ac12e4fb83f91fc1fb7a360a4d9ba35205"
-
 lodash.map@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3"
@@ -9794,14 +10031,14 @@ lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
 
-lodash.values@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/lodash.values/-/lodash.values-4.3.0.tgz#a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347"
-
 lodash.zipobject@^4.1.3:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/lodash.zipobject/-/lodash.zipobject-4.1.3.tgz#b399f5aba8ff62a746f6979bf20b214f964dbef8"
 
+lodash@4.13.1:
+  version "4.13.1"
+  resolved "http://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz#83e4b10913f48496d4d16fec4a560af2ee744b68"
+
 lodash@4.16.2:
   version "4.16.2"
   resolved "http://registry.npmjs.org/lodash/-/lodash-4.16.2.tgz#3e626db827048a699281a8a125226326cfc0e652"
@@ -9810,10 +10047,14 @@ lodash@4.17.10, lodash@4.x, "lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.10.1, lo
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
 
-lodash@^3.10.1, lodash@^3.5.0:
+lodash@^3.10.1, lodash@^3.5.0, lodash@^3.7.0:
   version "3.10.1"
   resolved "http://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
+lodash@^4.16.4, lodash@^4.17.0, lodash@^4.2.0:
+  version "4.17.11"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
+
 log-symbols@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
@@ -10352,6 +10593,12 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   dependencies:
     brace-expansion "^1.1.7"
 
+minimatch@^2.0.1:
+  version "2.0.10"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"
+  dependencies:
+    brace-expansion "^1.0.0"
+
 minimist-options@^3.0.1:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954"
@@ -10375,6 +10622,10 @@ minimist@~0.0.1:
   version "0.0.10"
   resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
 
+minimist@~1.1.0:
+  version "1.1.3"
+  resolved "http://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz#3bedfd91a92d39016fcfaa1c681e8faa1a1efda8"
+
 minipass@^2.2.1, minipass@^2.3.3:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.4.tgz#4768d7605ed6194d6d576169b9e12ef71e9d9957"
@@ -10484,7 +10735,7 @@ modify-values@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
 
-moment@2.x, moment@^2.10.6, moment@^2.19.3, moment@^2.22.2, moment@^2.6.0:
+moment@2.x, moment@^2.10.6, moment@^2.19.3, moment@^2.20.1, moment@^2.6.0:
   version "2.22.2"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
 
@@ -10664,15 +10915,11 @@ neo-async@^2.5.0:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.2.tgz#489105ce7bc54e709d736b195f82135048c50fcc"
 
-nesthydrationjs@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/nesthydrationjs/-/nesthydrationjs-1.0.5.tgz#89fe5be87055184461de5a550475ac515491f921"
+nesthydrationjs@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/nesthydrationjs/-/nesthydrationjs-0.3.0.tgz#418c33cce77682f46a3988ce3347a0cd41e2ead1"
   dependencies:
-    lodash.isarray "^4.0.0"
-    lodash.isfunction "^3.0.9"
-    lodash.isplainobject "^4.0.6"
-    lodash.keys "^4.2.0"
-    lodash.values "^4.3.0"
+    lodash "4.13.1"
 
 next-tick@^1.0.0:
   version "1.0.0"
@@ -11786,7 +12033,16 @@ pn@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
 
-popper.js@^1.12.9:
+pool2@^1.1.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/pool2/-/pool2-1.4.1.tgz#32fbd4f6a37764599002faeab8a0494a2a76a2d0"
+  dependencies:
+    debug "^2.1.3"
+    double-ended-queue "^2.1.0-0"
+    hashmap "^2.0.1"
+    simple-backoff "^1.0.0"
+
+popper.js@^1.12.9, popper.js@^1.14.1:
   version "1.14.4"
   resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.4.tgz#8eec1d8ff02a5a3a152dd43414a15c7b79fd69b6"
 
@@ -11935,7 +12191,7 @@ pretty-format@^4.2.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-4.3.1.tgz#530be5c42b3c05b36414a7a2a4337aa80acd0e8d"
 
-prettyjson@^1.2.1:
+prettyjson@^1.1.3, prettyjson@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/prettyjson/-/prettyjson-1.2.1.tgz#fcffab41d19cab4dfae5e575e64246619b12d289"
   dependencies:
@@ -12661,6 +12917,15 @@ react-cookie@^2.2.0:
     prop-types "^15.0.0"
     universal-cookie "^2.2.0"
 
+react-datepicker@^1.5.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/react-datepicker/-/react-datepicker-1.6.0.tgz#6b7a87e949f3bbd94872554be6a0119bd908a987"
+  dependencies:
+    classnames "^2.2.5"
+    prop-types "^15.6.0"
+    react-onclickoutside "^6.7.1"
+    react-popper "^0.9.1"
+
 react-debounce-input@^3.1.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/react-debounce-input/-/react-debounce-input-3.2.0.tgz#6978c6061d898f549f40417fb0d2ebbecf50aaaa"
@@ -12687,6 +12952,23 @@ react-display-name@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/react-display-name/-/react-display-name-0.2.0.tgz#0e1f7086e45a32d07764df35ed32ff16f1259790"
 
+react-dnd-html5-backend@^2.5.4:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/react-dnd-html5-backend/-/react-dnd-html5-backend-2.6.0.tgz#590cd1cca78441bb274edd571fef4c0b16ddcf8e"
+  dependencies:
+    lodash "^4.2.0"
+
+react-dnd@^2.5.4:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/react-dnd/-/react-dnd-2.6.0.tgz#7fa25676cf827d58a891293e3c1ab59da002545a"
+  dependencies:
+    disposables "^1.0.1"
+    dnd-core "^2.6.0"
+    hoist-non-react-statics "^2.1.0"
+    invariant "^2.1.0"
+    lodash "^4.2.0"
+    prop-types "^15.5.10"
+
 react-dom@^16.2.0:
   version "16.4.2"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.4.2.tgz#4afed569689f2c561d2b8da0b819669c38a0bda4"
@@ -13067,6 +13349,17 @@ react-navigation@^2.0.0:
     react-navigation-stack "0.2.3"
     react-navigation-tabs "0.6.0"
 
+react-onclickoutside@^6.7.1:
+  version "6.7.1"
+  resolved "https://registry.yarnpkg.com/react-onclickoutside/-/react-onclickoutside-6.7.1.tgz#6a5b5b8b4eae6b776259712c89c8a2b36b17be93"
+
+react-popper@^0.10.4:
+  version "0.10.4"
+  resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-0.10.4.tgz#af2a415ea22291edd504678d7afda8a6ee3295aa"
+  dependencies:
+    popper.js "^1.14.1"
+    prop-types "^15.6.1"
+
 react-popper@^0.8.3:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-0.8.3.tgz#0f73333137c9fb0af6ec4074d2d0585a0a0461e1"
@@ -13074,6 +13367,13 @@ react-popper@^0.8.3:
     popper.js "^1.12.9"
     prop-types "^15.6.0"
 
+react-popper@^0.9.1:
+  version "0.9.5"
+  resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-0.9.5.tgz#02a24ef3eec33af9e54e8358ab70eb0e331edd05"
+  dependencies:
+    popper.js "^1.14.1"
+    prop-types "^15.6.1"
+
 react-prop-types-element-of-type@2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/react-prop-types-element-of-type/-/react-prop-types-element-of-type-2.2.0.tgz#bcc332d3903c2259cf68c28a81c4a663faba59ac"
@@ -13192,7 +13492,7 @@ react-transform-hmr@^1.0.4:
     global "^4.3.0"
     react-proxy "^1.1.7"
 
-react-transition-group@^2.2.1, react-transition-group@^2.3.0-beta.0:
+react-transition-group@^2.2.1, react-transition-group@^2.3.0-beta.0, react-transition-group@^2.3.1:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.4.0.tgz#1d9391fabfd82e016f26fabd1eec329dbd922b5a"
   dependencies:
@@ -13238,6 +13538,19 @@ reactstrap@^5.0.0-beta:
     react-popper "^0.8.3"
     react-transition-group "^2.2.1"
 
+reactstrap@^6.0.1:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/reactstrap/-/reactstrap-6.4.0.tgz#891252a284710180cd3d746dd236ee61d28a1c66"
+  dependencies:
+    classnames "^2.2.3"
+    lodash.isfunction "^3.0.9"
+    lodash.isobject "^3.0.2"
+    lodash.tonumber "^4.0.3"
+    prop-types "^15.5.8"
+    react-lifecycles-compat "^3.0.4"
+    react-popper "^0.10.4"
+    react-transition-group "^2.3.1"
+
 read-chunk@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/read-chunk/-/read-chunk-2.1.0.tgz#6a04c0928005ed9d42e1a6ac5600e19cbc7ff655"
@@ -13353,7 +13666,7 @@ readable-stream@1.1:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@1.1.x:
+readable-stream@1.1.x, readable-stream@^1.1.12:
   version "1.1.14"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
   dependencies:
@@ -13431,7 +13744,7 @@ redux-logger@^2.7.4:
   dependencies:
     deep-diff "0.3.4"
 
-redux@^3.6.0:
+redux@^3.6.0, redux@^3.7.1:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/redux/-/redux-3.7.2.tgz#06b73123215901d25d065be342eb026bc1c8537b"
   dependencies:
@@ -13455,7 +13768,7 @@ regenerator-runtime@^0.10.0, regenerator-runtime@^0.10.5:
   version "0.10.5"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
 
-regenerator-runtime@^0.11.0:
+regenerator-runtime@^0.11.0, regenerator-runtime@^0.11.1:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
 
@@ -13581,6 +13894,12 @@ replace-string@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/replace-string/-/replace-string-1.1.0.tgz#87062117f823fe5800c306bacb2cfa359b935fea"
 
+req-from@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/req-from/-/req-from-1.0.1.tgz#bf81da5147947d32d13b947dc12a58ad4587350e"
+  dependencies:
+    resolve-from "^2.0.0"
+
 request-progress@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-2.0.1.tgz#5d36bb57961c673aa5b788dbc8141fdf23b44e08"
@@ -13726,6 +14045,10 @@ resolve-from@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
 
+resolve-from@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57"
+
 resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
@@ -13756,11 +14079,11 @@ resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
 
-resolve@1.1.7:
+resolve@1.1.7, resolve@~1.1.0:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
-resolve@^1.1.6, resolve@^1.1.7, resolve@^1.2.0, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.6.0:
+resolve@^1.0.0, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.2.0, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.6.0:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
   dependencies:
@@ -14211,6 +14534,10 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
 
+simple-backoff@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/simple-backoff/-/simple-backoff-1.1.0.tgz#b30dff4bc34a4f3e50e321641d9630e2a506f554"
+
 simple-plist@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/simple-plist/-/simple-plist-0.2.1.tgz#71766db352326928cf3a807242ba762322636723"
@@ -15031,6 +15358,12 @@ tildify@1.2.0:
   dependencies:
     os-homedir "^1.0.0"
 
+tildify@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/tildify/-/tildify-1.0.0.tgz#2a021db5e8fbde0a8f8b4df37adaa8fb1d39d7dd"
+  dependencies:
+    user-home "^1.0.0"
+
 time-stamp@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
@@ -15324,6 +15657,15 @@ umask@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d"
 
+umzug@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/umzug/-/umzug-2.1.0.tgz#c49dd71c7c26d082a9c9d3592dc6dc92cf867761"
+  dependencies:
+    babel-runtime "^6.23.0"
+    bluebird "^3.4.1"
+    lodash "^4.17.0"
+    resolve "^1.0.0"
+
 unc-path-regex@^0.1.0, unc-path-regex@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
@@ -15458,7 +15800,7 @@ use@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
 
-user-home@^1.1.1:
+user-home@^1.0.0, user-home@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190"
 
@@ -15517,7 +15859,7 @@ uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0, uuid@^3.2.1, uuid@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
 
-v8flags@^2.1.1:
+v8flags@^2.0.2, v8flags@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4"
   dependencies:

From e1dc2e52da0a49d5454d6788bae5affd823193bf Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 26 Sep 2018 10:46:11 +0200
Subject: [PATCH 255/327] fix filter by boolean

---
 packages/server/src/sql/crud.js                      | 2 +-
 tools/templates/crud/server/{schema.ts => schema.js} | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)
 rename tools/templates/crud/server/{schema.ts => schema.js} (89%)

diff --git a/packages/server/src/sql/crud.js b/packages/server/src/sql/crud.js
index 2c335fc7e3..10ba0550c7 100644
--- a/packages/server/src/sql/crud.js
+++ b/packages/server/src/sql/crud.js
@@ -497,7 +497,7 @@ export default class Crud {
             _this.andWhere(`${tableName}.${decamelize(filterKey)}`, '<=', `${filterValue_gte}`);
           }
         } else if (hasTypeOf(Boolean)) {
-          if (filter[filterKey]) {
+          if (_.has(filter, filterKey)) {
             _this.andWhere(`${tableName}.${decamelize(filterKey)}`, '=', `${+filter[filterKey]}`);
           }
         } else {
diff --git a/tools/templates/crud/server/schema.ts b/tools/templates/crud/server/schema.js
similarity index 89%
rename from tools/templates/crud/server/schema.ts
rename to tools/templates/crud/server/schema.js
index 556274de45..2d8f2f9471 100644
--- a/tools/templates/crud/server/schema.ts
+++ b/tools/templates/crud/server/schema.js
@@ -1,8 +1,6 @@
 import DomainSchema, { Schema } from '@domain-schema/core';
 
 export class $Module$ extends Schema {
-  public id: any;
-  public name: object;
   constructor() {
     super();
     this.__ = { name: '$Module$', tablePrefix: '' };

From ad8ebdf507a34ae56c8f54c11f8e6bd1295b0452 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 26 Sep 2018 11:45:23 +0200
Subject: [PATCH 256/327] fix merge problems

---
 .../modules/common/components/web/ui-antd/components/Col.jsx  | 4 ++--
 .../common/components/web/ui-antd/components/PageLayout.jsx   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/Col.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/Col.jsx
index 32d04e5d3f..b224305466 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/Col.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/Col.jsx
@@ -2,9 +2,9 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Col as ADCol } from 'antd';
 
-const Col = ({ children, xs, md = 12, ...props }) => {
+const Col = ({ children, xs, ...props }) => {
   return (
-    <ADCol span={(xs * 2).toString()} md={md * 2} {...props}>
+    <ADCol span={(xs * 2).toString()} {...props}>
       {children}
     </ADCol>
   );
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/PageLayout.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/PageLayout.jsx
index 297b229144..6431bbd138 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/PageLayout.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/PageLayout.jsx
@@ -58,7 +58,7 @@ class PageLayout extends React.Component {
         <Layout>
           {navBar !== false && (
             <Header style={{ padding: 0 }}>
-              <Row gutter={8}>
+              <Row gutter={0}>
                 <Col span={14}>
                   <Menu mode="horizontal" theme="dark" selectable={false} style={{ lineHeight: '64px' }}>
                     <MenuItem key="trigger">

From 9301efdf887f623a562d4f8c12a791804b0daa3b Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 26 Sep 2018 11:51:06 +0200
Subject: [PATCH 257/327] create bootstrap render select filter boolean

---
 .../components/RenderSelectFilterBoolean.jsx  | 75 +++++++++++++++++++
 .../web/ui-bootstrap/components/index.js      |  1 +
 2 files changed, 76 insertions(+)
 create mode 100644 packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectFilterBoolean.jsx

diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectFilterBoolean.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectFilterBoolean.jsx
new file mode 100644
index 0000000000..520f265d1d
--- /dev/null
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectFilterBoolean.jsx
@@ -0,0 +1,75 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { FormItem, Select, Option } from './index';
+
+export default class RenderSelectFilterBoolean extends React.Component {
+  static propTypes = {
+    input: PropTypes.object,
+    setFieldValue: PropTypes.func.isRequired,
+    setFieldTouched: PropTypes.func.isRequired,
+    label: PropTypes.string,
+    type: PropTypes.string,
+    style: PropTypes.object,
+    formItemLayout: PropTypes.object,
+    meta: PropTypes.object,
+    children: PropTypes.node
+  };
+
+  handleChange = value => {
+    const {
+      input: { name },
+      setFieldValue
+    } = this.props;
+    setFieldValue(name, value);
+  };
+
+  handleBlur = () => {
+    const {
+      input: { name },
+      setFieldTouched
+    } = this.props;
+    setFieldTouched(name, true);
+  };
+
+  render() {
+    const {
+      input: { value, onChange, onBlur, ...inputRest },
+      label,
+      style,
+      formItemLayout,
+      meta: { touched, error }
+    } = this.props;
+
+    let validateStatus = '';
+    if (touched && error) {
+      validateStatus = 'error';
+    }
+
+    let defaultStyle = { width: '100%' };
+    if (style) {
+      defaultStyle = style;
+    }
+
+    console.log('value:', value);
+
+    let props = {
+      style: defaultStyle,
+      name: inputRest.name,
+      onChange: this.handleChange,
+      onBlur: this.handleBlur,
+      value: value
+    };
+
+    return (
+      <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={error}>
+        <div>
+          <Select {...props}>
+            <Option value="">All</Option>
+            <Option value="true">Yes</Option>
+            <Option value="false">No</Option>
+          </Select>
+        </div>
+      </FormItem>
+    );
+  }
+}
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/index.js b/packages/client/src/modules/common/components/web/ui-bootstrap/components/index.js
index c461de83ae..c0e6ffeb20 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/index.js
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/index.js
@@ -28,6 +28,7 @@ export { default as Switch } from './Switch';
 export { default as InputNumber } from './InputNumber';
 export { default as RenderNumber } from './RenderNumber';
 export { default as RenderSelectQuery } from './RenderSelectQuery';
+export { default as RenderSelectFilterBoolean } from './RenderSelectFilterBoolean';
 export { default as RenderSwitch } from './RenderSwitch';
 export { default as RenderTextArea } from './RenderTextArea';
 export { default as DatePicker } from './DatePicker';

From 7962cc0eef3f9d68e3b5462d52d4dc4a4f717c4e Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 27 Sep 2018 15:13:21 +0200
Subject: [PATCH 258/327] convert resolvers to ts

---
 .../server/{resolvers.js => resolvers.ts}     | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)
 rename tools/templates/crud/server/{resolvers.js => resolvers.ts} (52%)

diff --git a/tools/templates/crud/server/resolvers.js b/tools/templates/crud/server/resolvers.ts
similarity index 52%
rename from tools/templates/crud/server/resolvers.js
rename to tools/templates/crud/server/resolvers.ts
index 8e59110484..868c5af33e 100644
--- a/tools/templates/crud/server/resolvers.js
+++ b/tools/templates/crud/server/resolvers.ts
@@ -1,26 +1,26 @@
 import withAuth from 'graphql-auth';
-// eslint-disable-next-line no-unused-vars
+
+// tslint:disable:no-unused-variable
 import { createBatchResolver } from 'graphql-resolve-batch';
 
 const $MODULE$S_SUBSCRIPTION = '$module$s_subscription';
 
-// eslint-disable-next-line no-unused-vars
-export default pubsub => ({
+export default (pubsub: any) => ({
   Query: {
-    $module$s: withAuth(['editor:view:all'], (parent, args, ctx, info) => {
+    $module$s: withAuth(['editor:view:all'], (parent: any, args: any, ctx: any, info: any) => {
       return ctx.$Module$.getList(args, info);
     }),
-    $module$sConnection: withAuth(['editor:view:all'], (parent, args, ctx, info) => {
+    $module$sConnection: withAuth(['editor:view:all'], (parent: any, args: any, ctx: any, info: any) => {
       return ctx.$Module$.getPaginated(args, info);
     }),
-    $module$: withAuth(['editor:view'], (parent, args, ctx, info) => {
+    $module$: withAuth(['editor:view'], (parent: any, args: any, ctx: any, info: any) => {
       return ctx.$Module$.get(args, info);
     })
   },
   // schema batch resolvers
   // end schema batch resolvers
   Mutation: {
-    create$Module$: withAuth(['editor:create'], async (parent, args, ctx, info) => {
+    create$Module$: withAuth(['editor:create'], async (parent: any, args: any, ctx: any, info: any) => {
       const $module$ = await ctx.$Module$.create(args, ctx, info);
 
       pubsub.publish($MODULE$S_SUBSCRIPTION, {
@@ -32,19 +32,19 @@ export default pubsub => ({
 
       return $module$;
     }),
-    update$Module$: withAuth(['editor:update'], (parent, args, ctx, info) => {
+    update$Module$: withAuth(['editor:update'], (parent: any, args: any, ctx: any, info: any) => {
       return ctx.$Module$.update(args, ctx, info);
     }),
-    delete$Module$: withAuth(['editor:delete'], (parent, args, ctx, info) => {
+    delete$Module$: withAuth(['editor:delete'], (parent: any, args: any, ctx: any, info: any) => {
       return ctx.$Module$.delete(args, info);
     }),
-    sort$Module$s: withAuth(['editor:update'], (parent, args, ctx) => {
+    sort$Module$s: withAuth(['editor:update'], (parent: any, args: any, ctx: any) => {
       return ctx.$Module$.sort(args);
     }),
-    updateMany$Module$s: withAuth(['editor:update'], (parent, args, ctx) => {
+    updateMany$Module$s: withAuth(['editor:update'], (parent: any, args: any, ctx: any) => {
       return ctx.$Module$.updateMany(args);
     }),
-    deleteMany$Module$s: withAuth(['editor:delete'], (parent, args, ctx) => {
+    deleteMany$Module$s: withAuth(['editor:delete'], (parent: any, args: any, ctx: any) => {
       return ctx.$Module$.deleteMany(args);
     })
   },

From 05b8d4e88f03aea0067e197a6138f5136a1eccf7 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 28 Sep 2018 11:47:39 +0200
Subject: [PATCH 259/327] move client crud helper functions

---
 packages/client/src/modules/common/crud.js    | 63 -------------------
 packages/client/src/utils/crud.js             | 62 ++++++++++++++++++
 .../crud/client/containers/ModuleList.jsx     |  2 +-
 .../templates/crud/client/resolvers/index.js  |  2 +-
 4 files changed, 64 insertions(+), 65 deletions(-)
 delete mode 100644 packages/client/src/modules/common/crud.js

diff --git a/packages/client/src/modules/common/crud.js b/packages/client/src/modules/common/crud.js
deleted file mode 100644
index f338cfd17f..0000000000
--- a/packages/client/src/modules/common/crud.js
+++ /dev/null
@@ -1,63 +0,0 @@
-export const updateEntry = async ({ ownProps: { refetch }, mutate }, { data, where }, updateEntryName) => {
-  console.log('data:', data);
-  console.log('where:', where);
-  try {
-    const {
-      data: { [updateEntryName]: updateEntry }
-    } = await mutate({
-      variables: { data, where }
-    });
-
-    if (updateEntry.errors) {
-      return { errors: updateEntry.errors };
-    }
-
-    refetch();
-
-    return updateEntry;
-  } catch (e) {
-    console.log(e.graphQLErrors);
-  }
-};
-
-export const deleteEntry = async ({ ownProps: { refetch }, mutate }, { where }, deleteEntryName) => {
-  try {
-    const {
-      data: { [deleteEntryName]: deleteEntry }
-    } = await mutate({
-      variables: { where }
-    });
-
-    if (deleteEntry.errors) {
-      return { errors: deleteEntry.errors };
-    }
-
-    refetch();
-
-    return deleteEntry;
-  } catch (e) {
-    console.log(e.graphQLErrors);
-  }
-};
-
-export const mergeFilter = (filter, defaults, schema) => {
-  let mergeFilter = filter;
-  if (!filter.hasOwnProperty('searchText')) {
-    const { searchText, ...restFilters } = defaults.testModuleState.filter;
-    mergeFilter = { ...restFilters, ...filter };
-  }
-
-  for (const key of schema.keys()) {
-    const value = schema.values[key];
-    const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
-    if (hasTypeOf(Boolean)) {
-      if (mergeFilter[key] === 'true') {
-        mergeFilter[key] = true;
-      } else if (filter[key] === 'false') {
-        mergeFilter[key] = false;
-      }
-    }
-  }
-
-  return mergeFilter;
-};
diff --git a/packages/client/src/utils/crud.js b/packages/client/src/utils/crud.js
index 1704ad09ff..9e286333af 100644
--- a/packages/client/src/utils/crud.js
+++ b/packages/client/src/utils/crud.js
@@ -141,3 +141,65 @@ export const pickInputFields = ({ schema, values, data = null, formType = 'form'
 
   return inputValues;
 };
+
+export const updateEntry = async ({ ownProps: { refetch }, mutate }, { data, where }, updateEntryName) => {
+  try {
+    const {
+      data: { [updateEntryName]: updateEntry }
+    } = await mutate({
+      variables: { data, where }
+    });
+
+    if (updateEntry.errors) {
+      return { errors: updateEntry.errors };
+    }
+
+    refetch();
+
+    return updateEntry;
+  } catch (e) {
+    console.log(e.graphQLErrors);
+  }
+};
+
+export const deleteEntry = async ({ ownProps: { refetch }, mutate }, { where }, deleteEntryName) => {
+  try {
+    const {
+      data: { [deleteEntryName]: deleteEntry }
+    } = await mutate({
+      variables: { where }
+    });
+
+    if (deleteEntry.errors) {
+      return { errors: deleteEntry.errors };
+    }
+
+    refetch();
+
+    return deleteEntry;
+  } catch (e) {
+    console.log(e.graphQLErrors);
+  }
+};
+
+export const mergeFilter = (filter, defaults, schema) => {
+  let mergeFilter = filter;
+  if (!filter.hasOwnProperty('searchText')) {
+    const { searchText, ...restFilters } = defaults.testModuleState.filter;
+    mergeFilter = { ...restFilters, ...filter };
+  }
+
+  for (const key of schema.keys()) {
+    const value = schema.values[key];
+    const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
+    if (hasTypeOf(Boolean)) {
+      if (mergeFilter[key] === 'true') {
+        mergeFilter[key] = true;
+      } else if (filter[key] === 'false') {
+        mergeFilter[key] = false;
+      }
+    }
+  }
+
+  return mergeFilter;
+};
diff --git a/tools/templates/crud/client/containers/ModuleList.jsx b/tools/templates/crud/client/containers/ModuleList.jsx
index bfcdf1c53f..d77f49f030 100644
--- a/tools/templates/crud/client/containers/ModuleList.jsx
+++ b/tools/templates/crud/client/containers/ModuleList.jsx
@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
 
 import { removeTypename, removeEmpty } from '../../../../../common/utils';
 import { ListView } from '../../common/components/crud';
-import { updateEntry, deleteEntry } from '../../common/crud';
+import { updateEntry, deleteEntry } from '../../../utils/crud';
 import { $Module$Schema } from '../../../../../server/src/modules/$module$/schema';
 
 import $MODULE$_STATE_QUERY from '../graphql/$Module$StateQuery.client.graphql';
diff --git a/tools/templates/crud/client/resolvers/index.js b/tools/templates/crud/client/resolvers/index.js
index 06d5e6ada8..c0a71b67e5 100644
--- a/tools/templates/crud/client/resolvers/index.js
+++ b/tools/templates/crud/client/resolvers/index.js
@@ -1,6 +1,6 @@
 import update from 'immutability-helper';
 
-import { mergeFilter } from '../../common/crud';
+import { mergeFilter } from '../../../utils/crud';
 import { $Module$Schema } from '../../../../../server/src/modules/$module$/schema';
 import $MODULE$_STATE_QUERY from '../graphql/$Module$StateQuery.client.graphql';
 

From 3a1c57d9bccc3875ecf447e01b878838f3faebcf Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 28 Sep 2018 14:06:50 +0200
Subject: [PATCH 260/327] remove eslint disable

---
 tools/templates/crud/server/__tests__/Module.spec.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/templates/crud/server/__tests__/Module.spec.ts b/tools/templates/crud/server/__tests__/Module.spec.ts
index 1b8f5b154e..56ef220e6b 100644
--- a/tools/templates/crud/server/__tests__/Module.spec.ts
+++ b/tools/templates/crud/server/__tests__/Module.spec.ts
@@ -1,4 +1,3 @@
-/*eslint-disable no-unused-vars*/
 import chai from 'chai';
 import { step } from 'mocha-steps';
 import { getServer, getApollo } from '../../../testHelpers/integrationSetup';

From 8b53f15dd2e5554922215879f2fb02fbdfdb2e92 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 28 Sep 2018 14:08:19 +0200
Subject: [PATCH 261/327] fix merge conflict

---
 tools/templates/crud/server/Module.spec.js | 23 ----------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 tools/templates/crud/server/Module.spec.js

diff --git a/tools/templates/crud/server/Module.spec.js b/tools/templates/crud/server/Module.spec.js
deleted file mode 100644
index 223aad95c8..0000000000
--- a/tools/templates/crud/server/Module.spec.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/*eslint-disable no-unused-vars*/
-import chai from 'chai';
-import { step } from 'mocha-steps';
-import { getServer, getApollo } from '../../testHelpers/integrationSetup';
-
-describe('$Module$ API works', () => {
-  let server, apollo;
-
-  before(() => {
-    server = getServer();
-    apollo = getApollo();
-  });
-
-  step('Has GraphiQL endpoint', () => {
-    return chai
-      .request(server)
-      .get('/graphiql')
-      .end((err, res) => {
-        res.status.should.be(200);
-        res.body.should.be('{}');
-      });
-  });
-});

From ff266632a7adc5f4b8b1f9e7af1097d0a6ab40c9 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 28 Sep 2018 14:50:02 +0200
Subject: [PATCH 262/327] fix boolean filter

---
 packages/client/src/utils/crud.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/client/src/utils/crud.js b/packages/client/src/utils/crud.js
index 9e286333af..2d6fb2d6b7 100644
--- a/packages/client/src/utils/crud.js
+++ b/packages/client/src/utils/crud.js
@@ -67,6 +67,14 @@ export const pickInputFields = ({ schema, values, data = null, formType = 'form'
           if (values[`${key}_gte`]) {
             inputValues[`${key}_gte`] = values[`${key}_gte`];
           }
+        } else if (hasTypeOf(Boolean)) {
+          if (values[key] === 'true') {
+            inputValues[key] = true;
+          } else if (values[key] === 'false') {
+            inputValues[key] = false;
+          } else {
+            inputValues[key] = '';
+          }
         } else {
           if (key in values && values[key]) {
             inputValues[key] = values[key];

From cef33011c7216c1d0a4334eb728f3ff292cd35de Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 9 Oct 2018 14:21:35 +0200
Subject: [PATCH 263/327] fix sortable funcionality

---
 packages/server/src/sql/crud.js | 116 +++++++++++++++++++++++++++-----
 1 file changed, 98 insertions(+), 18 deletions(-)

diff --git a/packages/server/src/sql/crud.js b/packages/server/src/sql/crud.js
index 10ba0550c7..3dd69d3f6b 100644
--- a/packages/server/src/sql/crud.js
+++ b/packages/server/src/sql/crud.js
@@ -416,6 +416,20 @@ export default class Crud {
     return `${this.schema.__.tablePrefix}${this.getTableName()}`;
   }
 
+  isSortable() {
+    if (this.schema.__.sortable) {
+      return true;
+    }
+    return false;
+  }
+
+  sortableField() {
+    if (this.schema.__.sortable) {
+      return this.schema.__.sortable;
+    }
+    return null;
+  }
+
   getSchema() {
     return this.schema;
   }
@@ -552,13 +566,14 @@ export default class Crud {
     return this._getList(args, parseFields(info));
   }
 
-  getTotal({ filter }) {
+  getTotal(args = {}) {
     const queryBuilder = knex(`${this.getFullTableName()} as ${this.getTableName()}`)
       .countDistinct('id as count')
       .first();
 
-    this._filter(filter, queryBuilder);
-
+    if (args.filter) {
+      this._filter(args.filter, queryBuilder);
+    }
     return queryBuilder;
   }
 
@@ -596,7 +611,8 @@ export default class Crud {
   }
 
   _create(data) {
-    return knex(`${this.getFullTableName()}`)
+    console.log('_create:', data);
+    return knex(this.getFullTableName())
       .insert(decamelizeKeys(this.normalizeFields(data)))
       .returning('id');
   }
@@ -613,12 +629,14 @@ export default class Crud {
         if (value.type.constructor === Array && data[key]) {
           nestedEntries.push({ key, data: data[key] });
           delete data[key];
-        } else if (key === 'rank') {
-          const total = await this.getTotal();
-          data[key] = total.count + 1;
         }
       }
 
+      if (this.isSortable()) {
+        const total = await this.getTotal();
+        data[this.sortableField()] = total.count + 1;
+      }
+
       const [id] = await this._create(data);
 
       // create nested entries
@@ -640,7 +658,7 @@ export default class Crud {
   }
 
   _update({ data, where }) {
-    return knex(`${this.getFullTableName()}`)
+    return knex(this.getFullTableName())
       .update(decamelizeKeys(this.normalizeFields(data)))
       .where(where);
   }
@@ -691,7 +709,7 @@ export default class Crud {
   }
 
   _delete({ where }) {
-    return knex(`${this.getFullTableName()}`)
+    return knex(this.getFullTableName())
       .where(where)
       .del();
   }
@@ -706,6 +724,16 @@ export default class Crud {
         e.setError('delete', 'Node does not exist.');
         e.throwIf();
       }
+      if (this.isSortable()) {
+        const object = await knex(this.getFullTableName())
+          .select(`${this.sortableField()} as rank`)
+          .where(args.where)
+          .first();
+
+        await knex(this.getFullTableName())
+          .decrement(this.sortableField(), 1)
+          .where(this.sortableField(), '>', object.rank);
+      }
 
       const isDeleted = await this._delete(args);
 
@@ -720,11 +748,50 @@ export default class Crud {
     }
   }
 
-  _sort({ data }) {
-    return Promise.all([
-      this._update({ data: { rank: data[2] }, where: { id: data[0] } }),
-      this._update({ data: { rank: data[3] }, where: { id: data[1] } })
-    ]);
+  async _sort({ data }) {
+    // console.log('_sort, data:', data);
+    const oldId = data[0];
+    // const newId = data[1];
+
+    const oldPosition = data[3];
+    const newPosition = data[2];
+
+    if (oldPosition === newPosition) {
+      return 0;
+    }
+
+    const fullTableName = this.getFullTableName();
+    const sortableField = this.sortableField();
+    const total = await this.getTotal();
+    return knex.transaction(async function(trx) {
+      try {
+        // Move the object away
+        await knex(fullTableName)
+          .update({ [sortableField]: total.count + 1 })
+          .where({ id: oldId })
+          .transacting(trx);
+        // Shift the objects between the old and the new position
+        const baseQuery = knex(fullTableName);
+        if (oldPosition < newPosition) {
+          baseQuery.decrement(sortableField, 1);
+        } else {
+          baseQuery.increment(sortableField, 1);
+        }
+        let count = await baseQuery
+          .whereBetween(sortableField, [Math.min(oldPosition, newPosition), Math.max(oldPosition, newPosition)])
+          .transacting(trx);
+        // Move the object back in
+        count += await knex(fullTableName)
+          .update({ [sortableField]: newPosition })
+          .where({ id: oldId })
+          .transacting(trx);
+        await trx.commit;
+        return count;
+      } catch (e) {
+        trx.rollback;
+        return 0;
+      }
+    });
   }
 
   async sort(args) {
@@ -732,8 +799,7 @@ export default class Crud {
       const e = new FieldError();
       e.throwIf();
 
-      const sortCount = await this._sort(args);
-      const count = sortCount.reduce((total, num) => total + num);
+      const count = await this._sort(args);
       if (count > 1) {
         return { count };
       } else {
@@ -746,7 +812,7 @@ export default class Crud {
   }
 
   _updateMany({ data, where: { id_in } }) {
-    return knex(`${this.getFullTableName()}`)
+    return knex(this.getFullTableName())
       .update(decamelizeKeys(this.normalizeFields(data)))
       .whereIn('id', id_in);
   }
@@ -768,7 +834,7 @@ export default class Crud {
   }
 
   _deleteMany({ where: { id_in } }) {
-    return knex(`${this.getFullTableName()}`)
+    return knex(this.getFullTableName())
       .whereIn('id', id_in)
       .del();
   }
@@ -777,6 +843,20 @@ export default class Crud {
     try {
       const e = new FieldError();
 
+      if (this.isSortable()) {
+        // for every deleted object decrease rank acordingly
+        for (const id of args.where.id_in) {
+          const object = await knex(this.getFullTableName())
+            .select(`${this.sortableField()} as rank`)
+            .where({ id })
+            .first();
+
+          await knex(this.getFullTableName())
+            .decrement(this.sortableField(), 1)
+            .where(this.sortableField(), '>', object.rank);
+        }
+      }
+
       const deleteCount = await this._deleteMany(args);
 
       if (deleteCount > 0) {

From 13e91372e5c5b07c138f8ff276e7304f97236081 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 9 Oct 2018 14:35:26 +0200
Subject: [PATCH 264/327] fix edit form

---
 packages/client/package.json                  |  2 +-
 .../common/components/crud/FormView.web.jsx   | 61 +++++++++++++++++--
 packages/server/package.json                  |  4 +-
 tools/cli/commands/updateSchema.js            |  2 +-
 yarn.lock                                     |  7 +--
 5 files changed, 63 insertions(+), 13 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index c33b1ac021..b3060b7abf 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -40,7 +40,7 @@
   "license": "MIT",
   "dependencies": {
     "@domain-schema/core": "^0.0.34",
-    "@domain-schema/validation": "^0.0.36",
+    "@domain-schema/validation": "^0.0.33",
     "@domain-schema/formik": "^0.0.34",
     "@fortawesome/fontawesome": "^1.1.8",
     "@fortawesome/fontawesome-free-brands": "^5.0.6",
diff --git a/packages/client/src/modules/common/components/crud/FormView.web.jsx b/packages/client/src/modules/common/components/crud/FormView.web.jsx
index 6e5f38ec21..918239b6c5 100644
--- a/packages/client/src/modules/common/components/crud/FormView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/FormView.web.jsx
@@ -1,16 +1,66 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { onSubmit } from '../../../../utils/crud';
-import generateFormik from '../../generateFormik';
+import { Formik } from 'formik';
+import DomainValidation from '@domain-schema/validation';
 
-const FormView = ({ schema, updateEntry, createEntry, title, data }) => {
-  const Formik = generateFormik(schema);
+import { onSubmit, mapFormPropsToValues } from '../../../../utils/crud';
+import { createFormFields } from '../../util';
+import { Form, FormItem, Button } from '../web';
+
+const tailFormItemLayout = {
+  wrapperCol: {
+    xs: {
+      span: 24,
+      offset: 0
+    },
+    sm: {
+      span: 16,
+      offset: 6
+    }
+  }
+};
+
+const formItemLayout = {
+  labelCol: {
+    xs: { span: 24 },
+    sm: { span: 6 }
+  },
+  wrapperCol: {
+    xs: { span: 24 },
+    sm: { span: 12 }
+  }
+};
+
+const FormView = ({ schema, updateEntry, createEntry, title, customFields, data }) => {
   return (
     <Formik
-      values={data ? data.node : null}
+      initialValues={mapFormPropsToValues({ schema, data: data ? data.node : null })}
+      validate={values => {
+        console.log('validate, values:', values);
+        DomainValidation.validate(values, schema);
+      }}
       onSubmit={async values => {
+        console.log('onSubmit, values:', values);
         await onSubmit({ schema, values, updateEntry, createEntry, title, data: data ? data.node : null });
       }}
+      render={({ values, handleChange, handleBlur, handleSubmit }) => (
+        <Form name="post" onSubmit={handleSubmit}>
+          {createFormFields({
+            handleChange,
+            handleBlur,
+            schema,
+            values,
+            formItemLayout,
+            customFields
+          })}
+          {/*errors && <Alert color="error">{errors}</Alert>*/}
+          <FormItem {...tailFormItemLayout}>
+            <Button color="primary" type="submit">
+              Save
+            </Button>
+          </FormItem>
+        </Form>
+      )}
     />
   );
 };
@@ -20,6 +70,7 @@ FormView.propTypes = {
   schema: PropTypes.object.isRequired,
   createEntry: PropTypes.func.isRequired,
   title: PropTypes.string.isRequired,
+  customFields: PropTypes.object,
   data: PropTypes.object
 };
 
diff --git a/packages/server/package.json b/packages/server/package.json
index 9b6347692c..a4a083f679 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -56,7 +56,7 @@
     "@domain-schema/formik": "^0.0.34",
     "@domain-schema/graphql": "^0.0.33",
     "@domain-schema/knex": "^0.0.35",
-    "@domain-schema/validation": "^0.0.36",
+    "@domain-schema/validation": "^0.0.33",
     "apollo-cache-inmemory": "1.2.9",
     "apollo-cache-router": "^1.1.6",
     "apollo-client": "^2.3.4",
@@ -99,7 +99,7 @@
     "lint-staged": "^7.0.4",
     "lodash": "^4.17.4",
     "minilog": "^3.1.0",
-    "moment":"^2.22.2",
+    "moment": "^2.22.2",
     "mysql2": "^1.5.1",
     "nodemailer": "^4.4.1",
     "passport": "^0.4.0",
diff --git a/tools/cli/commands/updateSchema.js b/tools/cli/commands/updateSchema.js
index f7f5b37a0a..461c709a99 100644
--- a/tools/cli/commands/updateSchema.js
+++ b/tools/cli/commands/updateSchema.js
@@ -123,7 +123,7 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
 
       logger.info(chalk.green(`✔ Schema in ${pathSchema}${file} successfully updated!`));
 
-      const resolverFile = `resolvers.js`;
+      const resolverFile = `resolvers.ts`;
       let hasBatchResolvers = false;
       let replace = `  ${schema.name}: {
 `;
diff --git a/yarn.lock b/yarn.lock
index aa8e47ecfa..2c92711a62 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -504,12 +504,11 @@
     debug "^3.1.0"
     humps "^2.0.1"
 
-"@domain-schema/validation@^0.0.36":
-  version "0.0.36"
-  resolved "https://registry.yarnpkg.com/@domain-schema/validation/-/validation-0.0.36.tgz#b4740e577e4c745710fb4388e857ee62f70e33ea"
+"@domain-schema/validation@^0.0.33":
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/@domain-schema/validation/-/validation-0.0.33.tgz#f4e83e2abe249cea2f83762d01c065a3132f4a2f"
   dependencies:
     debug "^3.1.0"
-    humps "^2.0.1"
 
 "@expo/bunyan@^1.8.10":
   version "1.8.10"

From 0e65010f5f5c1579d806be414e1d1e5e970c8647 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 10 Oct 2018 15:47:43 +0200
Subject: [PATCH 265/327] update packages, fix cli crud templates

---
 packages/client/package.json                  |  2 +-
 packages/common/package.json                  |  2 +-
 packages/mobile/package.json                  |  2 +-
 packages/server/package.json                  | 10 +--
 .../crud/server/__tests__/Module.spec.ts      |  2 +-
 tools/templates/crud/server/index.ts          | 10 +--
 yarn.lock                                     | 62 ++++++++++++++++++-
 7 files changed, 73 insertions(+), 17 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index 6ff07b7185..a96584ef5c 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -45,7 +45,7 @@
     "antd": "^3.10.0",
     "apollo-cache-inmemory": "1.2.9",
     "apollo-cache-router": "^1.1.6",
-    "apollo-client": "^2.3.1",
+    "apollo-client": "^2.3.4",
     "apollo-link": "^1.0.6",
     "apollo-link-batch-http": "1.2.2",
     "apollo-link-context": "^1.0.7",
diff --git a/packages/common/package.json b/packages/common/package.json
index 54705adddc..c97360e039 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "apollo-cache-inmemory": "1.2.9",
     "apollo-cache-router": "^1.1.6",
-    "apollo-client": "^2.3.1",
+    "apollo-client": "^2.3.4",
     "apollo-link": "^1.0.6",
     "apollo-link-batch-http": "1.2.2",
     "apollo-link-state": "^0.4.1",
diff --git a/packages/mobile/package.json b/packages/mobile/package.json
index e7d14ed331..b82b2e837e 100644
--- a/packages/mobile/package.json
+++ b/packages/mobile/package.json
@@ -46,7 +46,7 @@
     "antd-mobile-rn": "^2.2.1",
     "apollo-cache-inmemory": "1.2.9",
     "apollo-cache-router": "^1.1.6",
-    "apollo-client": "^2.3.1",
+    "apollo-client": "^2.3.4",
     "apollo-link": "^1.0.6",
     "apollo-link-batch-http": "1.2.2",
     "apollo-link-state": "^0.4.1",
diff --git a/packages/server/package.json b/packages/server/package.json
index 1a58829182..51fae5d952 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -57,7 +57,7 @@
     "@domain-schema/knex": "^0.0.35",
     "apollo-cache-inmemory": "1.2.9",
     "apollo-cache-router": "^1.1.6",
-    "apollo-client": "^2.3.1",
+    "apollo-client": "^2.3.4",
     "apollo-link": "^1.0.6",
     "apollo-link-batch-http": "1.2.2",
     "apollo-link-schema": "^1.0.2",
@@ -83,18 +83,19 @@
     "graphql-subscriptions": "^0.5.5",
     "graphql-tag": "^2.6.0",
     "graphql-tools": "^2.13.0",
-    "graphql-parse-fields":"^1.2.0",
+    "graphql-parse-fields": "^1.2.0",
     "humps": "^2.0.1",
     "i18next": "^11.3.3",
     "i18next-express-middleware": "^1.1.1",
     "isomorphic-fetch": "^2.2.1",
     "jsonwebtoken": "^8.1.0",
     "knex": "^0.14.2",
-    "knexnest":"^1.0.0",
+    "knexnest": "^1.0.0",
     "lerna": "^2.5.1",
     "lint-staged": "^7.0.4",
     "lodash": "^4.17.4",
     "minilog": "^3.1.0",
+    "moment": "^2.22.2",
     "mysql2": "^1.5.1",
     "nodemailer": "^4.4.1",
     "passport": "^0.4.0",
@@ -129,8 +130,7 @@
     "tslint-config-prettier": "^1.5.0",
     "typescript": "^2.7.2",
     "universal-cookie-express": "^2.2.0",
-    "uuid": "^3.2.1",
-    "moment":"^2.22.2"
+    "uuid": "^3.2.1"
   },
   "devDependencies": {
     "@alienfast/i18next-loader": "^1.0.15",
diff --git a/tools/templates/crud/server/__tests__/Module.spec.ts b/tools/templates/crud/server/__tests__/Module.spec.ts
index 56ef220e6b..beb44d4115 100644
--- a/tools/templates/crud/server/__tests__/Module.spec.ts
+++ b/tools/templates/crud/server/__tests__/Module.spec.ts
@@ -11,7 +11,7 @@ describe('$Module$ API works', () => {
     apollo = getApollo();
   });
 
-  step('Has GraphQL Playground endpoint', () => {
+  step('Has GraphiQL endpoint', () => {
     return chai
       .request(server)
       .keepOpen()
diff --git a/tools/templates/crud/server/index.ts b/tools/templates/crud/server/index.ts
index e739d3033e..cc8f63a76e 100644
--- a/tools/templates/crud/server/index.ts
+++ b/tools/templates/crud/server/index.ts
@@ -1,10 +1,10 @@
 import $Module$ from './sql';
 import schema from './schema.graphql';
 import createResolvers from './resolvers';
-import Feature from '../connector';
+import ServerModule from '../ServerModule';
 
-export default new Feature({
-  schema,
-  createResolversFunc: createResolvers,
-  createContextFunc: () => ({ $Module$: new $Module$() })
+export default new ServerModule({
+  schema: [schema],
+  createResolversFunc: [createResolvers],
+  createContextFunc: [() => ({ $Module$: new $Module$() })]
 });
diff --git a/yarn.lock b/yarn.lock
index 41d3df367b..55df9e0e6c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -474,6 +474,25 @@
     lodash "^4.17.10"
     to-fast-properties "^2.0.0"
 
+"@domain-schema/core@^0.0.34":
+  version "0.0.34"
+  resolved "https://registry.yarnpkg.com/@domain-schema/core/-/core-0.0.34.tgz#5900ae4f0844cb8e7ffa91f5be32bd0417d96429"
+  dependencies:
+    debug "^3.1.0"
+
+"@domain-schema/graphql@^0.0.33":
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/@domain-schema/graphql/-/graphql-0.0.33.tgz#201d8cc5d21a9eba69f2eb8cb1fe44f012381cec"
+  dependencies:
+    debug "^3.1.0"
+
+"@domain-schema/knex@^0.0.35":
+  version "0.0.35"
+  resolved "https://registry.yarnpkg.com/@domain-schema/knex/-/knex-0.0.35.tgz#3ea8fb1fdf57e9c9334843ed8bfa3b4e9e1f03c4"
+  dependencies:
+    debug "^3.1.0"
+    humps "^2.0.1"
+
 "@expo/bunyan@^1.8.10":
   version "1.8.10"
   resolved "https://registry.yarnpkg.com/@expo/bunyan/-/bunyan-1.8.10.tgz#7d19354a6bce85aae5fea0e973569d3f0142533e"
@@ -2077,7 +2096,7 @@ apollo-cache@1.1.17, apollo-cache@^1.1.16:
   dependencies:
     apollo-utilities "^1.0.21"
 
-apollo-client@^2.3.1:
+apollo-client@^2.3.4:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.4.2.tgz#d2f044d8740723bf98a6d8d8b9684ee8c36150e6"
   dependencies:
@@ -4247,6 +4266,12 @@ caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
 
+cast-array@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cast-array/-/cast-array-1.0.1.tgz#264ef1129e5888bc48cac40fe914e9f69b8d189d"
+  dependencies:
+    isarray "0.0.1"
+
 chai-http@^4.0.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/chai-http/-/chai-http-4.2.0.tgz#25dc0c0cf9560802f069092ca834a81f04c673bc"
@@ -7256,6 +7281,12 @@ graphql-iso-date@^3.3.0:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/graphql-iso-date/-/graphql-iso-date-3.6.1.tgz#bd2d0dc886e0f954cbbbc496bbf1d480b57ffa96"
 
+graphql-parse-fields@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/graphql-parse-fields/-/graphql-parse-fields-1.2.0.tgz#c97119a91951b98dcbe656c46a203e966a720f28"
+  dependencies:
+    cast-array "^1.0.1"
+
 graphql-resolve-batch@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/graphql-resolve-batch/-/graphql-resolve-batch-1.0.2.tgz#ab069df8ab3410a0188701ed9fa8e382bbb8d6a5"
@@ -9156,7 +9187,7 @@ kleur@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-2.0.2.tgz#b704f4944d95e255d038f0cb05fb8a602c55a300"
 
-knex@^0.14.2:
+knex@^0.14.2, knex@^0.14.6:
   version "0.14.6"
   resolved "https://registry.yarnpkg.com/knex/-/knex-0.14.6.tgz#ad57c4ef8fa1b51ebc8c37c2c9b483f6fb34e41e"
   dependencies:
@@ -9179,6 +9210,13 @@ knex@^0.14.2:
     uuid "^3.2.1"
     v8flags "^3.0.2"
 
+knexnest@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/knexnest/-/knexnest-1.0.0.tgz#b8840d13c2692bdd5fa3d5de67a456283d538fce"
+  dependencies:
+    knex "^0.14.6"
+    nesthydrationjs "^1.0.5"
+
 lcid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
@@ -9557,6 +9595,10 @@ lodash.isarray@^3.0.0:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
 
+lodash.isarray@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-4.0.0.tgz#2aca496b28c4ca6d726715313590c02e6ea34403"
+
 lodash.isboolean@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
@@ -9597,6 +9639,10 @@ lodash.keys@^3.0.0, lodash.keys@^3.1.2:
     lodash.isarguments "^3.0.0"
     lodash.isarray "^3.0.0"
 
+lodash.keys@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-4.2.0.tgz#a08602ac12e4fb83f91fc1fb7a360a4d9ba35205"
+
 lodash.map@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3"
@@ -10372,7 +10418,7 @@ modify-values@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
 
-moment@2.x, moment@^2.10.6, moment@^2.19.3, moment@^2.6.0:
+moment@2.x, moment@^2.10.6, moment@^2.19.3, moment@^2.22.2, moment@^2.6.0:
   version "2.22.2"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
 
@@ -10552,6 +10598,16 @@ neo-async@^2.5.0:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.2.tgz#489105ce7bc54e709d736b195f82135048c50fcc"
 
+nesthydrationjs@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/nesthydrationjs/-/nesthydrationjs-1.0.5.tgz#89fe5be87055184461de5a550475ac515491f921"
+  dependencies:
+    lodash.isarray "^4.0.0"
+    lodash.isfunction "^3.0.9"
+    lodash.isplainobject "^4.0.6"
+    lodash.keys "^4.2.0"
+    lodash.values "^4.3.0"
+
 next-tick@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"

From fcb7f8ab3c549489a1b47c9e37d5b83a5d390020 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 11 Oct 2018 09:40:03 +0200
Subject: [PATCH 266/327] resolve merge conflicts

---
 .../common/components/crud/FormView.jsx       | 11 +++---
 .../common/components/crud/FormView.web.jsx   |  2 --
 .../common/components/crud/ListView.web.jsx   |  6 ++--
 tools/templates/crud/client/index.native.jsx  | 35 ++++++++++---------
 tools/templates/crud/client/index.web.jsx     | 10 +++---
 5 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/packages/client/src/modules/common/components/crud/FormView.jsx b/packages/client/src/modules/common/components/crud/FormView.jsx
index 92a9dc0123..5a304b064e 100644
--- a/packages/client/src/modules/common/components/crud/FormView.jsx
+++ b/packages/client/src/modules/common/components/crud/FormView.jsx
@@ -1,22 +1,19 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Formik } from 'formik';
-//import DomainValidator from '@domain-schema/validation';
+import DomainValidation from '@domain-schema/validation';
 
 import { onSubmit, mapFormPropsToValues } from '../../../../utils/crud';
 import { createFormFields } from '../../util';
 import { FormView, Button } from '../native';
-//import { computeDomainValidationErrors } from '../../../../../../common/validation';
 
 const Form = ({ schema, data: { node }, updateEntry, createEntry }) => {
-  // const domainValidator = new DomainValidator();
   return (
     <Formik
       initialValues={mapFormPropsToValues({ schema, data: node })}
-      /*      validate={values => {
-        let rawErrors = domainValidator.validate(schema, values);
-        return computeDomainValidationErrors(rawErrors);
-      }}*/
+      validate={values => {
+        DomainValidation.validate(values, schema);
+      }}
       onSubmit={async values => {
         let title = node && node.__typename ? node.__typename : 'Model',
           data = node || null;
diff --git a/packages/client/src/modules/common/components/crud/FormView.web.jsx b/packages/client/src/modules/common/components/crud/FormView.web.jsx
index 918239b6c5..1ea0397af1 100644
--- a/packages/client/src/modules/common/components/crud/FormView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/FormView.web.jsx
@@ -36,11 +36,9 @@ const FormView = ({ schema, updateEntry, createEntry, title, customFields, data
     <Formik
       initialValues={mapFormPropsToValues({ schema, data: data ? data.node : null })}
       validate={values => {
-        console.log('validate, values:', values);
         DomainValidation.validate(values, schema);
       }}
       onSubmit={async values => {
-        console.log('onSubmit, values:', values);
         await onSubmit({ schema, values, updateEntry, createEntry, title, data: data ? data.node : null });
       }}
       render={({ values, handleChange, handleBlur, handleSubmit }) => (
diff --git a/packages/client/src/modules/common/components/crud/ListView.web.jsx b/packages/client/src/modules/common/components/crud/ListView.web.jsx
index 8b6a81e3d8..c2da607c55 100644
--- a/packages/client/src/modules/common/components/crud/ListView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/ListView.web.jsx
@@ -1,7 +1,7 @@
 /* eslint-disable react/display-name */
 import React from 'react';
 import PropTypes from 'prop-types';
-import DomainValidator from '@domain-schema/validation';
+import DomainValidation from '@domain-schema/validation';
 import { Link } from 'react-router-dom';
 import { Formik } from 'formik';
 import { DragDropContext, DragSource, DropTarget } from 'react-dnd';
@@ -10,7 +10,6 @@ import { Table, Button, Popconfirm, Row, Col, Form, FormItem, Alert, Spin } from
 import { createColumnFields, createFormFields } from '../../util';
 import { mapFormPropsToValues, pickInputFields } from '../../../../utils/crud';
 import { hasRole } from '../../../user/containers/Auth';
-import { computeDomainValidationErrors } from '../../../../../../common/validation';
 
 function dragDirection(dragIndex, hoverIndex, initialClientOffset, clientOffset, sourceClientOffset) {
   const hoverMiddleY = (initialClientOffset.y - sourceClientOffset.y) / 2;
@@ -341,8 +340,7 @@ class ListView extends React.Component {
               <Formik
                 initialValues={mapFormPropsToValues({ schema })}
                 validate={values => {
-                  const rawErrors = DomainValidator.validate(schema, values);
-                  return computeDomainValidationErrors(rawErrors);
+                  DomainValidation.validate(values, schema);
                 }}
                 onSubmit={async (values, { resetForm }) => {
                   const insertValues = pickInputFields({ schema, values });
diff --git a/tools/templates/crud/client/index.native.jsx b/tools/templates/crud/client/index.native.jsx
index af4dc7f977..dd2018f907 100644
--- a/tools/templates/crud/client/index.native.jsx
+++ b/tools/templates/crud/client/index.native.jsx
@@ -7,8 +7,7 @@ import { createTabBarIconWrapper } from '../common/components/native';
 import $Module$List from './containers/$Module$List';
 import $Module$Edit from './containers/$Module$Edit';
 import resolvers from './resolvers';
-
-import Feature from '../connector';
+import ClientModule from '../ClientModule.native';
 
 class $Module$ListScreen extends React.Component {
   static navigationOptions = ({ navigation }) => ({
@@ -16,7 +15,7 @@ class $Module$ListScreen extends React.Component {
     headerRight: <Button title="Add" onPress={() => navigation.navigate('$Module$Edit', { id: 0 })} />
   });
   render() {
-    return <$Module$List navigation={this.props.navigation} title="$MoDuLe$" nativeLink={"$MoDuLe$Edit"} />;
+    return <$Module$List navigation={this.props.navigation} title="$MoDuLe$" nativeLink={'$MoDuLe$Edit'} />;
   }
 }
 
@@ -42,20 +41,22 @@ const $Module$Navigator = createStackNavigator({
   $Module$Edit: { screen: $Module$EditScreen }
 });
 
-export default new Feature({
-  drawerItem: {
-    $Module$: {
-      screen: $Module$Navigator,
-      navigationOptions: {
-        tabBarIcon: createTabBarIconWrapper(Ionicons, {
-          name: 'ios-browsers-outline',
-          size: 30
-        })
-      },
-      userInfo: {
-        showOnLogin: true
+export default new ClientModule({
+  drawerItem: [
+    {
+      $Module$: {
+        screen: $Module$Navigator,
+        navigationOptions: {
+          tabBarIcon: createTabBarIconWrapper(Ionicons, {
+            name: 'ios-browsers-outline',
+            size: 30
+          })
+        },
+        userInfo: {
+          showOnLogin: true
+        }
       }
     }
-  },
-  resolver: resolvers
+  ],
+  resolver: [resolvers]
 });
diff --git a/tools/templates/crud/client/index.web.jsx b/tools/templates/crud/client/index.web.jsx
index 5c2d935f56..e84a05d364 100644
--- a/tools/templates/crud/client/index.web.jsx
+++ b/tools/templates/crud/client/index.web.jsx
@@ -6,9 +6,9 @@ import $Module$Edit from './containers/$Module$Edit';
 import resolvers from './resolvers';
 
 import { AuthRoute, IfLoggedIn } from '../user/containers/Auth';
-import Feature from '../connector';
+import ClientModule from '../ClientModule';
 
-export default new Feature({
+export default new ClientModule({
   route: [
     <AuthRoute
       exact
@@ -27,7 +27,7 @@ export default new Feature({
       link="$module$"
     />
   ],
-  navItem: (
+  navItem: [
     <IfLoggedIn role={['editor', 'admin']}>
       <MenuItem key="/$module$">
         <NavLink to="/$module$" className="nav-link" activeClassName="active">
@@ -35,6 +35,6 @@ export default new Feature({
         </NavLink>
       </MenuItem>
     </IfLoggedIn>
-  ),
-  resolver: resolvers
+  ],
+  resolver: [resolvers]
 });

From 115b39e421cbc422c2d7028295ef65522cc01166 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 12 Oct 2018 14:05:28 +0200
Subject: [PATCH 267/327] fix merge conflicts

---
 .../components/RenderSelect.jsx               |  20 ++-
 .../components/RenderSwitch.jsx               |  11 +-
 .../web/ui-antd/components/Form.jsx           |   3 +-
 .../web/ui-antd/components/RenderField.jsx    |  12 +-
 .../web/ui-antd/components/RenderSelect.jsx   |   7 +-
 .../web/ui-bootstrap/components/Alert.jsx     |   8 +-
 .../web/ui-bootstrap/components/Table.jsx     |  29 +---
 packages/server/package.json                  |   2 +-
 yarn.lock                                     | 149 ++++--------------
 9 files changed, 65 insertions(+), 176 deletions(-)

diff --git a/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSelect.jsx b/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSelect.jsx
index 7cb35140ea..f9a2f9b488 100644
--- a/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSelect.jsx
+++ b/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSelect.jsx
@@ -4,27 +4,26 @@ import { Platform, StyleSheet, View, Text } from 'react-native';
 import Select from './Select';
 import RenderSelectStyles from '../styles/RenderSelect';
 
-const RenderSelect = ({ renderSelectStyles, label, ...props }) => {
+const RenderSelect = ({ style, label, ...props }) => {
   const selectProps = {
     iconName: 'caret-down',
     icon: true,
     iconSize: 20,
     ...props
   };
-
   return (
-    <View style={[styles.container, renderSelectStyles.container]}>
+    <View style={styles.container}>
       {Platform.OS === 'ios' ? (
-        <View style={[styles.itemContainer, renderSelectStyles.itemContainer]}>
-          {label && <Text style={[styles.itemTitle, renderSelectStyles.itemTitle]}>{label}</Text>}
-          <View style={[styles.itemAction, renderSelectStyles.itemAction]}>
+        <View style={styles.itemContainer}>
+          {label && <Text style={styles.itemTitle}>{label}</Text>}
+          <View style={styles.itemAction}>
             <Select {...selectProps} />
           </View>
         </View>
       ) : (
-        <View style={[styles.itemContainer, renderSelectStyles.itemContainer]}>
-          {label && <Text style={[styles.itemTitle, renderSelectStyles.itemTitle]}>{label}</Text>}
-          <View style={[styles.itemAction, renderSelectStyles.itemAction]}>
+        <View style={styles.itemContainer}>
+          {label && <Text style={styles.itemTitle}>{label}</Text>}
+          <View style={styles.itemAction}>
             <Select {...props} />
           </View>
         </View>
@@ -35,8 +34,7 @@ const RenderSelect = ({ renderSelectStyles, label, ...props }) => {
 
 RenderSelect.propTypes = {
   style: PropTypes.number,
-  label: PropTypes.string,
-  renderSelectStyles: PropTypes.object
+  label: PropTypes.string
 };
 
 const styles = StyleSheet.create(RenderSelectStyles);
diff --git a/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSwitch.jsx b/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSwitch.jsx
index b4fc95c8b8..2c6369936c 100644
--- a/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSwitch.jsx
+++ b/packages/client/src/modules/common/components/native/ui-native-base/components/RenderSwitch.jsx
@@ -4,11 +4,11 @@ import { Text, StyleSheet, View } from 'react-native';
 import Switch from './Switch';
 import RenderSwitchStyles from '../styles/RenderSwitch';
 
-const RenderSwitch = ({ style, label, ...props }) => {
+const RenderSwitch = ({ label, ...props }) => {
   return (
-    <View style={[styles.itemContainer, style.itemContainer]}>
-      <Text style={[styles.itemTitle, style.itemTitle]}>{label}</Text>
-      <View style={[styles.itemAction, style.itemAction]}>
+    <View style={styles.itemContainer}>
+      <Text style={styles.itemTitle}>{label}</Text>
+      <View style={styles.itemAction}>
         <Switch {...props} />
       </View>
     </View>
@@ -16,8 +16,7 @@ const RenderSwitch = ({ style, label, ...props }) => {
 };
 
 RenderSwitch.propTypes = {
-  label: PropTypes.string,
-  style: PropTypes.object
+  label: PropTypes.string
 };
 
 const styles = StyleSheet.create(RenderSwitchStyles);
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/Form.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/Form.jsx
index c9c0f3bd07..3c0b14a42c 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/Form.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/Form.jsx
@@ -7,7 +7,8 @@ const Form = ({ children, ...props }) => {
 };
 
 Form.propTypes = {
-  children: PropTypes.node
+  children: PropTypes.node,
+  type: PropTypes.string
 };
 
 export default Form;
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderField.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderField.jsx
index 6c71b4d5bb..8e0845f1f8 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderField.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderField.jsx
@@ -5,13 +5,13 @@ import { Form, Input } from 'antd';
 const FormItem = Form.Item;
 
 const RenderField = ({ input, label, type, formItemLayout, meta: { touched, error }, placeholder }) => {
+  let validateStatus = '';
+  if (touched && error) {
+    validateStatus = 'error';
+  }
+
   return (
-    <FormItem
-      label={label}
-      {...formItemLayout}
-      validateStatus={touched && error ? 'error' : ''}
-      help={touched && error}
-    >
+    <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
       <div>
         <Input {...input} placeholder={label || placeholder} type={type} />
       </div>
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx
index 426fcf258d..b54502f2e8 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelect.jsx
@@ -5,8 +5,13 @@ import { Form } from 'antd';
 const FormItem = Form.Item;
 
 const RenderField = ({ input, label, type, children, meta: { touched, error } }) => {
+  let validateStatus = '';
+  if (touched && error) {
+    validateStatus = 'error';
+  }
+
   return (
-    <FormItem label={label} validateStatus={touched && error ? 'error' : ''} help={error}>
+    <FormItem label={label} validateStatus={validateStatus} help={error}>
       <div>
         <select {...input} type={type}>
           {children}
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/Alert.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/Alert.jsx
index 3a98328bd7..a0bb065c76 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/Alert.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/Alert.jsx
@@ -2,22 +2,20 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Alert as RSAlert } from 'reactstrap';
 
-const Alert = ({ children, color, message, ...props }) => {
+const Alert = ({ children, color, ...props }) => {
   if (color === 'error') {
     color = 'danger';
   }
-
   return (
     <RSAlert {...props} color={color}>
-      {children ? children : message}
+      {children}
     </RSAlert>
   );
 };
 
 Alert.propTypes = {
   children: PropTypes.node,
-  color: PropTypes.string,
-  message: PropTypes.string
+  color: PropTypes.string
 };
 
 export default Alert;
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/Table.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/Table.jsx
index c7c4bee2a0..4cb4e0f62f 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/Table.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/Table.jsx
@@ -24,43 +24,20 @@ const renderData = (columns, entry) => {
   });
 };
 
-const Table = ({
-  dataSource,
-  columns,
-  title,
-  footer,
-  onHeaderRow,
-  rowSelection,
-  pagination,
-  loading,
-  onRow,
-  ...props
-}) => {
+const Table = ({ dataSource, columns, ...props }) => {
   return (
     <RSTable {...props}>
       <thead>
-        {title ? (
-          <tr>
-            <th colSpan={100}>{title()}</th>
-          </tr>
-        ) : null}
         <tr>{renderHead(columns)}</tr>
       </thead>
-      <tbody>{dataSource && renderBody(columns, dataSource)}</tbody>
+      <tbody>{renderBody(columns, dataSource)}</tbody>
     </RSTable>
   );
 };
 
 Table.propTypes = {
   dataSource: PropTypes.array,
-  columns: PropTypes.array,
-  pagination: PropTypes.bool,
-  loading: PropTypes.bool,
-  title: PropTypes.func,
-  footer: PropTypes.any,
-  onHeaderRow: PropTypes.any,
-  rowSelection: PropTypes.any,
-  onRow: PropTypes.any
+  columns: PropTypes.array
 };
 
 export default Table;
diff --git a/packages/server/package.json b/packages/server/package.json
index a4a083f679..9f3f04355f 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -94,7 +94,7 @@
     "jsonwebtoken": "^8.1.0",
     "knex": "^0.14.2",
     "knex-migrate": "^1.6.1",
-    "knexnest": "^0.4.1",
+    "knexnest": "^1.0.0",
     "lerna": "^2.5.1",
     "lint-staged": "^7.0.4",
     "lodash": "^4.17.4",
diff --git a/yarn.lock b/yarn.lock
index fa6a992971..fc0358a25a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3827,7 +3827,7 @@ block-stream@*:
   dependencies:
     inherits "~2.0.0"
 
-bluebird@^2.10.2, bluebird@^2.9.24:
+bluebird@^2.10.2:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
 
@@ -3904,7 +3904,7 @@ bplist-parser@0.1.1:
   dependencies:
     big-integer "^1.6.7"
 
-brace-expansion@^1.0.0, brace-expansion@^1.1.7:
+brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
   dependencies:
@@ -4653,10 +4653,6 @@ commander@^2.11.0, commander@^2.12.1, commander@^2.14.1, commander@^2.15.1, comm
   version "2.18.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.18.0.tgz#2bf063ddee7c7891176981a2cc798e5754bc6970"
 
-commander@^2.2.0:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
-
 commander@~2.13.0:
   version "2.13.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
@@ -5274,7 +5270,7 @@ dateformat@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
 
-debug@2, debug@2.6.9, debug@^2.1.2, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.2, debug@^2.6.6, debug@^2.6.8, debug@^2.6.9:
+debug@2, debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.2, debug@^2.6.6, debug@^2.6.8, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   dependencies:
@@ -5695,10 +5691,6 @@ dotenv@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.0.0.tgz#24e37c041741c5f4b25324958ebbc34bca965935"
 
-double-ended-queue@^2.1.0-0:
-  version "2.1.0-0"
-  resolved "https://registry.yarnpkg.com/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz#103d3527fd31528f40188130c841efdd78264e5c"
-
 draft-js@^0.10.0, draft-js@~0.10.0:
   version "0.10.5"
   resolved "https://registry.yarnpkg.com/draft-js/-/draft-js-0.10.5.tgz#bfa9beb018fe0533dbb08d6675c371a6b08fa742"
@@ -6444,10 +6436,6 @@ extend@^3.0.0, extend@~3.0.1, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
 
-extend@~2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-2.0.2.tgz#1b74985400171b85554894459c978de6ef453ab7"
-
 external-editor@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-1.1.1.tgz#12d7b0db850f7ff7e7081baf4005700060c4600b"
@@ -6791,12 +6779,6 @@ findup-sync@^2.0.0:
     micromatch "^3.0.4"
     resolve-dir "^1.0.1"
 
-findup-sync@~0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.2.1.tgz#e0a90a450075c49466ee513732057514b81e878c"
-  dependencies:
-    glob "~4.3.0"
-
 fined@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fined/-/fined-1.1.0.tgz#b37dc844b76a2f5e7081e884f7c0ae344f153476"
@@ -6811,10 +6793,6 @@ flagged-respawn@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.0.tgz#4e79ae9b2eb38bf86b3bb56bf3e0a56aa5fcabd7"
 
-flagged-respawn@~0.3.0:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-0.3.2.tgz#ff191eddcd7088a675b2610fffc976be9b8074b5"
-
 flat-cache@^1.2.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.0.tgz#d3030b32b38154f4e3b7e9c709f490f7ef97c481"
@@ -7218,15 +7196,6 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@~4.3.0:
-  version "4.3.5"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-4.3.5.tgz#80fbb08ca540f238acce5d11d1e9bc41e75173d3"
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^2.0.1"
-    once "^1.3.0"
-
 global-modules@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
@@ -7532,10 +7501,6 @@ hasha@^2.2.0:
     is-stream "^1.0.1"
     pinkie-promise "^2.0.0"
 
-hashmap@^2.0.1:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/hashmap/-/hashmap-2.3.0.tgz#b13fb65da7c8ba5e3db8fc1b8c5ba1d0049daf22"
-
 haul@^1.0.0-rc.7:
   version "1.0.0-rc.7"
   resolved "https://registry.yarnpkg.com/haul/-/haul-1.0.0-rc.7.tgz#22c57c1a0d8a7a924e1ea80f08273607b8344f63"
@@ -8116,10 +8081,6 @@ internal-ip@^3.0.1:
     default-gateway "^2.6.0"
     ipaddr.js "^1.5.2"
 
-interpret@^0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-0.5.2.tgz#377833b04b5ea693ff0d533380e3dda0c0381be0"
-
 interpret@^1.0.0, interpret@^1.0.1, interpret@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
@@ -9284,26 +9245,7 @@ knex-migrate@^1.6.1:
     req-from "^1.0.1"
     umzug "^2.1.0"
 
-knex@0.8.6:
-  version "0.8.6"
-  resolved "http://registry.npmjs.org/knex/-/knex-0.8.6.tgz#20f2f4a6cf98fa755b5cee9aa9fabae531af056a"
-  dependencies:
-    bluebird "^2.9.24"
-    chalk "^1.0.0"
-    commander "^2.2.0"
-    debug "^2.1.3"
-    inherits "~2.0.1"
-    interpret "^0.5.2"
-    liftoff "~2.0.0"
-    lodash "^3.7.0"
-    minimist "~1.1.0"
-    mkdirp "^0.5.0"
-    pool2 "^1.1.0"
-    readable-stream "^1.1.12"
-    tildify "~1.0.0"
-    v8flags "^2.0.2"
-
-knex@^0.14.2:
+knex@^0.14.2, knex@^0.14.6:
   version "0.14.6"
   resolved "https://registry.yarnpkg.com/knex/-/knex-0.14.6.tgz#ad57c4ef8fa1b51ebc8c37c2c9b483f6fb34e41e"
   dependencies:
@@ -9326,12 +9268,12 @@ knex@^0.14.2:
     uuid "^3.2.1"
     v8flags "^3.0.2"
 
-knexnest@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/knexnest/-/knexnest-0.4.1.tgz#f91184a575ea1e360af425cab61790bb1471141c"
+knexnest@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/knexnest/-/knexnest-1.0.0.tgz#b8840d13c2692bdd5fa3d5de67a456283d538fce"
   dependencies:
-    knex "0.8.6"
-    nesthydrationjs "0.3.0"
+    knex "^0.14.6"
+    nesthydrationjs "^1.0.5"
 
 lcid@^1.0.0:
   version "1.0.0"
@@ -9471,16 +9413,6 @@ liftoff@2.5.0:
     rechoir "^0.6.2"
     resolve "^1.1.7"
 
-liftoff@~2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.0.3.tgz#fbab25362a506ac28a3db0c55cde9562fbd70456"
-  dependencies:
-    extend "~2.0.0"
-    findup-sync "~0.2.0"
-    flagged-respawn "~0.3.0"
-    minimist "~1.1.0"
-    resolve "~1.1.0"
-
 lint-staged@^7.0.4, lint-staged@^7.1.2:
   version "7.3.0"
   resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-7.3.0.tgz#90ff33e5ca61ed3dbac35b6f6502dbefdc0db58d"
@@ -9721,6 +9653,10 @@ lodash.isarray@^3.0.0:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
 
+lodash.isarray@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-4.0.0.tgz#2aca496b28c4ca6d726715313590c02e6ea34403"
+
 lodash.isboolean@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
@@ -9765,6 +9701,10 @@ lodash.keys@^3.0.0, lodash.keys@^3.1.2:
     lodash.isarguments "^3.0.0"
     lodash.isarray "^3.0.0"
 
+lodash.keys@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-4.2.0.tgz#a08602ac12e4fb83f91fc1fb7a360a4d9ba35205"
+
 lodash.map@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3"
@@ -9862,14 +9802,10 @@ lodash.zipobject@^4.1.3:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/lodash.zipobject/-/lodash.zipobject-4.1.3.tgz#b399f5aba8ff62a746f6979bf20b214f964dbef8"
 
-lodash@3.10.1, lodash@^3.10.1, lodash@^3.5.0, lodash@^3.7.0:
+lodash@3.10.1, lodash@^3.10.1, lodash@^3.5.0:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
-lodash@4.13.1:
-  version "4.13.1"
-  resolved "http://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz#83e4b10913f48496d4d16fec4a560af2ee744b68"
-
 lodash@4.16.2:
   version "4.16.2"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.16.2.tgz#3e626db827048a699281a8a125226326cfc0e652"
@@ -10412,12 +10348,6 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^2.0.1:
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"
-  dependencies:
-    brace-expansion "^1.0.0"
-
 minimist-options@^3.0.1:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954"
@@ -10441,10 +10371,6 @@ minimist@~0.0.1:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
 
-minimist@~1.1.0:
-  version "1.1.3"
-  resolved "http://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz#3bedfd91a92d39016fcfaa1c681e8faa1a1efda8"
-
 minipass@^2.2.1, minipass@^2.3.3:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.4.tgz#4768d7605ed6194d6d576169b9e12ef71e9d9957"
@@ -10734,11 +10660,15 @@ neo-async@^2.5.0:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.2.tgz#489105ce7bc54e709d736b195f82135048c50fcc"
 
-nesthydrationjs@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/nesthydrationjs/-/nesthydrationjs-0.3.0.tgz#418c33cce77682f46a3988ce3347a0cd41e2ead1"
+nesthydrationjs@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/nesthydrationjs/-/nesthydrationjs-1.0.5.tgz#89fe5be87055184461de5a550475ac515491f921"
   dependencies:
-    lodash "4.13.1"
+    lodash.isarray "^4.0.0"
+    lodash.isfunction "^3.0.9"
+    lodash.isplainobject "^4.0.6"
+    lodash.keys "^4.2.0"
+    lodash.values "^4.3.0"
 
 next-tick@^1.0.0:
   version "1.0.0"
@@ -11824,15 +11754,6 @@ pn@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
 
-pool2@^1.1.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/pool2/-/pool2-1.4.1.tgz#32fbd4f6a37764599002faeab8a0494a2a76a2d0"
-  dependencies:
-    debug "^2.1.3"
-    double-ended-queue "^2.1.0-0"
-    hashmap "^2.0.1"
-    simple-backoff "^1.0.0"
-
 popper.js@^1.12.9, popper.js@^1.14.1:
   version "1.14.4"
   resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.4.tgz#8eec1d8ff02a5a3a152dd43414a15c7b79fd69b6"
@@ -13474,7 +13395,7 @@ readable-stream@1.1:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@1.1.x, readable-stream@^1.1.12:
+readable-stream@1.1.x:
   version "1.1.14"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
   dependencies:
@@ -13859,7 +13780,7 @@ resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
 
-resolve@1.1.7, resolve@~1.1.0:
+resolve@1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
@@ -14314,10 +14235,6 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
 
-simple-backoff@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/simple-backoff/-/simple-backoff-1.1.0.tgz#b30dff4bc34a4f3e50e321641d9630e2a506f554"
-
 simple-plist@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/simple-plist/-/simple-plist-0.2.1.tgz#71766db352326928cf3a807242ba762322636723"
@@ -15106,12 +15023,6 @@ tildify@1.2.0:
   dependencies:
     os-homedir "^1.0.0"
 
-tildify@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/tildify/-/tildify-1.0.0.tgz#2a021db5e8fbde0a8f8b4df37adaa8fb1d39d7dd"
-  dependencies:
-    user-home "^1.0.0"
-
 time-stamp@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
@@ -15528,7 +15439,7 @@ use@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
 
-user-home@^1.0.0, user-home@^1.1.1:
+user-home@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190"
 
@@ -15583,7 +15494,7 @@ uuid@^2.0.1:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
 
-v8flags@^2.0.2, v8flags@^2.1.1:
+v8flags@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4"
   dependencies:

From bb54498ce25816d471c1afe4484989ac326074e9 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 12 Oct 2018 14:08:24 +0200
Subject: [PATCH 268/327] fix merge conflicts

---
 packages/client/package.json                                  | 4 ++--
 .../common/components/web/ui-antd/components/Alert.jsx        | 2 +-
 packages/mobile/package.json                                  | 2 +-
 packages/server/package.json                                  | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index a96584ef5c..2f79802a1b 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -39,7 +39,7 @@
   "author": "SysGears INC",
   "license": "MIT",
   "dependencies": {
-    "@fortawesome/fontawesome": "^1.1.3",
+    "@fortawesome/fontawesome": "^1.1.8",
     "@fortawesome/fontawesome-free-brands": "^5.0.6",
     "@fortawesome/react-fontawesome": "0.0.18",
     "antd": "^3.10.0",
@@ -60,7 +60,7 @@
     "filesize": "^3.5.11",
     "formik": "^1.0.2",
     "graphql": "^0.13.0",
-    "graphql-iso-date": "^3.3.0",
+    "graphql-iso-date": "^3.5.0",
     "graphql-tag": "^2.6.0",
     "history": "^4.7.2",
     "i18next": "^11.2.3",
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/Alert.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/Alert.jsx
index 535066856f..2121bc2795 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/Alert.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/Alert.jsx
@@ -8,7 +8,7 @@ const Alert = ({ children, color, ...props }) => {
 
 Alert.propTypes = {
   children: PropTypes.node,
-  color: PropTypes.String
+  color: PropTypes.string
 };
 
 export default Alert;
diff --git a/packages/mobile/package.json b/packages/mobile/package.json
index b82b2e837e..52edd43113 100644
--- a/packages/mobile/package.json
+++ b/packages/mobile/package.json
@@ -57,7 +57,7 @@
     "extract-files": "^3.1.0",
     "filesize": "^3.5.11",
     "graphql": "^0.13.0",
-    "graphql-iso-date": "^3.3.0",
+    "graphql-iso-date": "^3.5.0",
     "graphql-tag": "^2.6.0",
     "i18next": "^11.2.3",
     "immutability-helper": "^2.6.2",
diff --git a/packages/server/package.json b/packages/server/package.json
index 51fae5d952..2a248e851b 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -78,12 +78,12 @@
     "fractal-objects": "^0.9.2",
     "graphql": "^0.13.0",
     "graphql-auth": "0.2.2",
-    "graphql-iso-date": "^3.3.0",
+    "graphql-iso-date": "^3.5.0",
+    "graphql-parse-fields": "^1.2.0",
     "graphql-resolve-batch": "^1.0.2",
     "graphql-subscriptions": "^0.5.5",
     "graphql-tag": "^2.6.0",
     "graphql-tools": "^2.13.0",
-    "graphql-parse-fields": "^1.2.0",
     "humps": "^2.0.1",
     "i18next": "^11.3.3",
     "i18next-express-middleware": "^1.1.1",

From 583941aca66bf38d9f38f2e5b8afff5621b2a3bb Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Mon, 15 Oct 2018 15:48:41 +0200
Subject: [PATCH 269/327] small fixes

---
 packages/server/src/sql/crud.js    | 1 -
 tools/cli/commands/updateSchema.js | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/server/src/sql/crud.js b/packages/server/src/sql/crud.js
index 3dd69d3f6b..008d88ea06 100644
--- a/packages/server/src/sql/crud.js
+++ b/packages/server/src/sql/crud.js
@@ -611,7 +611,6 @@ export default class Crud {
   }
 
   _create(data) {
-    console.log('_create:', data);
     return knex(this.getFullTableName())
       .insert(decamelizeKeys(this.normalizeFields(data)))
       .returning('id');
diff --git a/tools/cli/commands/updateSchema.js b/tools/cli/commands/updateSchema.js
index 461c709a99..29b8bd3ef2 100644
--- a/tools/cli/commands/updateSchema.js
+++ b/tools/cli/commands/updateSchema.js
@@ -143,7 +143,7 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
 `;
       replace = hasBatchResolvers ? replace : '';
 
-      // override batch resolvers in resolvers.js file
+      // override batch resolvers in resolvers.ts file
       const replaceBatchResolvers = `// schema batch resolvers([^*]+)// end schema batch resolvers`;
       shell
         .ShellString(

From 24fcd59f3ddb9d14d0de0464b82d649a47865701 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 16 Oct 2018 11:52:16 +0200
Subject: [PATCH 270/327] remove console logs

---
 .../web/ui-antd/components/RenderSelectFilterBoolean.jsx        | 2 --
 .../web/ui-bootstrap/components/RenderSelectFilterBoolean.jsx   | 2 --
 2 files changed, 4 deletions(-)

diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectFilterBoolean.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectFilterBoolean.jsx
index 61206b5b1b..19cf3e0656 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectFilterBoolean.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectFilterBoolean.jsx
@@ -53,8 +53,6 @@ export default class RenderSelectFilterBoolean extends React.Component {
       defaultStyle = style;
     }
 
-    console.log('value:', value);
-
     let props = {
       style: defaultStyle,
       name: inputRest.name,
diff --git a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectFilterBoolean.jsx b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectFilterBoolean.jsx
index 520f265d1d..86e3578714 100644
--- a/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectFilterBoolean.jsx
+++ b/packages/client/src/modules/common/components/web/ui-bootstrap/components/RenderSelectFilterBoolean.jsx
@@ -50,8 +50,6 @@ export default class RenderSelectFilterBoolean extends React.Component {
       defaultStyle = style;
     }
 
-    console.log('value:', value);
-
     let props = {
       style: defaultStyle,
       name: inputRest.name,

From ee72a245fd8f7d1876b1217cc9ce7875d763c0ea Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 18 Oct 2018 09:29:06 +0200
Subject: [PATCH 271/327] crud: add in and contains to filters, small fixes,
 add editor scope, fix admin scope

---
 packages/server/src/modules/user/scopes.js          |  3 ++-
 packages/server/src/sql/crud.js                     | 13 ++++++++++++-
 .../templates/crud/server/__tests__/Module.spec.ts  |  4 +---
 tools/templates/crud/server/resolvers.ts            |  2 +-
 tools/templates/crud/server/schema.graphql          |  6 ++++++
 5 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/packages/server/src/modules/user/scopes.js b/packages/server/src/modules/user/scopes.js
index fc642a0cf2..cff971241d 100644
--- a/packages/server/src/modules/user/scopes.js
+++ b/packages/server/src/modules/user/scopes.js
@@ -1,4 +1,5 @@
 export default {
-  admin: ['user:*'],
+  admin: ['user:*', 'editor:*', 'admin:*'],
+  editor: ['user:*', 'editor:*'],
   user: ['user:view:self', 'user:update:self', 'stripe:*']
 };
diff --git a/packages/server/src/sql/crud.js b/packages/server/src/sql/crud.js
index 3dd69d3f6b..7934cb48ab 100644
--- a/packages/server/src/sql/crud.js
+++ b/packages/server/src/sql/crud.js
@@ -515,11 +515,22 @@ export default class Crud {
             _this.andWhere(`${tableName}.${decamelize(filterKey)}`, '=', `${+filter[filterKey]}`);
           }
         } else {
-          const filterValue = isSchema ? filter[`${filterKey}Id`] : filter[filterKey];
           const tableColumn = isSchema ? `${decamelize(filterKey)}_id` : decamelize(filterKey);
+
+          const filterValue = isSchema ? filter[`${filterKey}Id`] : filter[filterKey];
           if (filterValue) {
             _this.andWhere(`${tableName}.${tableColumn}`, '=', `${filterValue}`);
           }
+
+          const filterValueIn = isSchema ? filter[`${filterKey}Id_in`] : filter[`${filterKey}_in`];
+          if (filterValueIn) {
+            _this.orWhereIn(`${tableName}.${tableColumn}`, filterValueIn);
+          }
+
+          const filterValueContains = isSchema ? filter[`${filterKey}Id_contains`] : filter[`${filterKey}_contains`];
+          if (filterValueContains) {
+            _this.andWhere(`${tableName}.${tableColumn}`, 'like', `%${filterValueContains}%`);
+          }
         }
       });
 
diff --git a/tools/templates/crud/server/__tests__/Module.spec.ts b/tools/templates/crud/server/__tests__/Module.spec.ts
index beb44d4115..6c5a4269e0 100644
--- a/tools/templates/crud/server/__tests__/Module.spec.ts
+++ b/tools/templates/crud/server/__tests__/Module.spec.ts
@@ -1,14 +1,12 @@
 import chai from 'chai';
 import { step } from 'mocha-steps';
-import { getServer, getApollo } from '../../../testHelpers/integrationSetup';
+import { getServer } from '../../../testHelpers/integrationSetup';
 
 describe('$Module$ API works', () => {
   let server: any;
-  let apollo: any;
 
   before(() => {
     server = getServer();
-    apollo = getApollo();
   });
 
   step('Has GraphiQL endpoint', () => {
diff --git a/tools/templates/crud/server/resolvers.ts b/tools/templates/crud/server/resolvers.ts
index 868c5af33e..452879d39a 100644
--- a/tools/templates/crud/server/resolvers.ts
+++ b/tools/templates/crud/server/resolvers.ts
@@ -1,6 +1,6 @@
 import withAuth from 'graphql-auth';
 
-// tslint:disable:no-unused-variable
+// @ts-ignore
 import { createBatchResolver } from 'graphql-resolve-batch';
 
 const $MODULE$S_SUBSCRIPTION = '$module$s_subscription';
diff --git a/tools/templates/crud/server/schema.graphql b/tools/templates/crud/server/schema.graphql
index ac634ce0bc..44e5fc4f42 100644
--- a/tools/templates/crud/server/schema.graphql
+++ b/tools/templates/crud/server/schema.graphql
@@ -36,6 +36,12 @@ input OrderByInput {
 
 input $Module$FilterInput {
   searchText: String
+  id: Int
+  id_in: [Int!]
+  id_contains: Int
+  name: String
+  name_in: [String!]
+  name_contains: String
 }
 
 input $Module$CreateInput {

From 4a4423d93faecbe4196d6e1aafe93511acc9476b Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 18 Oct 2018 13:36:27 +0200
Subject: [PATCH 272/327] changes scope order

---
 packages/server/src/modules/user/scopes.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/modules/user/scopes.js b/packages/server/src/modules/user/scopes.js
index cff971241d..e3cc840ad8 100644
--- a/packages/server/src/modules/user/scopes.js
+++ b/packages/server/src/modules/user/scopes.js
@@ -1,5 +1,5 @@
 export default {
-  admin: ['user:*', 'editor:*', 'admin:*'],
-  editor: ['user:*', 'editor:*'],
+  admin: ['admin:*', 'editor:*', 'user:*'],
+  editor: ['editor:*', 'user:*'],
   user: ['user:view:self', 'user:update:self', 'stripe:*']
 };

From 0d5084ca01c1a3710ec5439ac2e7795761133d03 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 18 Oct 2018 14:49:53 +0200
Subject: [PATCH 273/327] filter by string: contains

---
 .../client/src/modules/common/util.web.jsx    | 10 +++++--
 packages/client/src/utils/crud.js             |  6 ++++
 tools/cli/commands/updateSchema.js            | 29 +++++++++++++------
 .../client/graphql/ModuleState.client.graphql |  4 +--
 .../templates/crud/client/resolvers/index.js  |  4 +--
 5 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index 853b6ce87a..386e810c0c 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -273,10 +273,11 @@ export const createFormFields = ({
 
 const createFormField = (schema, key, type, values, formItemLayout, formType, hasTypeOf, prefix) => {
   let component = RenderField;
-  const value = values ? values[key] : '';
+  let value = values ? values[key] : '';
   let style = {};
   let dateFields = [];
   let inputType = 'text';
+  let inputKey = key;
 
   if (key === 'id' && formType !== 'filter') {
     return false;
@@ -334,6 +335,9 @@ const createFormField = (schema, key, type, values, formItemLayout, formType, ha
   } else if (hasTypeOf(Number)) {
     inputType = 'number';
     component = RenderNumber;
+  } else if (hasTypeOf(String) && formType === 'filter') {
+    inputKey = `${key}_contains`;
+    value = values ? values[`${key}_contains`] : '';
   } else if (hasTypeOf(String) && schema.values[key].fieldInput === 'textarea' && formType !== 'filter') {
     component = RenderTextArea;
   } else if (hasTypeOf(String) && schema.values[key].fieldInput === 'country' && formType !== 'filter') {
@@ -342,8 +346,8 @@ const createFormField = (schema, key, type, values, formItemLayout, formType, ha
 
   let field = (
     <Field
-      name={`${prefix}${key}`}
-      key={key}
+      name={`${prefix}${inputKey}`}
+      key={inputKey}
       component={component}
       schema={type}
       value={value}
diff --git a/packages/client/src/utils/crud.js b/packages/client/src/utils/crud.js
index 2d6fb2d6b7..9aa6161744 100644
--- a/packages/client/src/utils/crud.js
+++ b/packages/client/src/utils/crud.js
@@ -29,6 +29,8 @@ export const mapFormPropsToValues = ({ schema, data = null, formType = 'form' })
         if (hasTypeOf(Date)) {
           fields[`${key}_lte`] = data ? data[key] : '';
           fields[`${key}_gte`] = data ? data[key] : '';
+        } else if (hasTypeOf(String)) {
+          fields[`${key}_contains`] = data ? data[key] : '';
         } else {
           fields[key] = data ? data[key] : '';
         }
@@ -75,6 +77,10 @@ export const pickInputFields = ({ schema, values, data = null, formType = 'form'
           } else {
             inputValues[key] = '';
           }
+        } else if (hasTypeOf(String)) {
+          if (values[`${key}_contains`]) {
+            inputValues[`${key}_contains`] = values[`${key}_contains`];
+          }
         } else {
           if (key in values && values[key]) {
             inputValues[key] = values[key];
diff --git a/tools/cli/commands/updateSchema.js b/tools/cli/commands/updateSchema.js
index 29b8bd3ef2..d5bfe1aa05 100644
--- a/tools/cli/commands/updateSchema.js
+++ b/tools/cli/commands/updateSchema.js
@@ -5,7 +5,7 @@ const GraphQLGenerator = require('@domain-schema/graphql').default;
 const { pascalize, camelize } = require('humps');
 
 const { BASE_PATH } = require('../config');
-const { generateField } = require('../helpers/util');
+const { generateField, runPrettier } = require('../helpers/util');
 const schemas = require('../../../packages/server/src/modules/common/generatedSchemas');
 
 /**
@@ -46,6 +46,8 @@ function updateModule(logger, moduleName, location) {
           inputCreate += `  ${key}${id}: Int${required}\n`;
           inputUpdate += `  ${key}${id}: Int\n`;
           inputFilter += `  ${key}${id}: Int\n`;
+          inputFilter += `  ${key}${id}_in: [Int!]\n`;
+          inputFilter += `  ${key}${id}_contains: Int\n`;
         } else if (value.type.constructor !== Array) {
           if (key !== 'id') {
             inputCreate += `  ${key}: ${generateField(value)}\n`;
@@ -55,6 +57,10 @@ function updateModule(logger, moduleName, location) {
           if (hasTypeOf(Date)) {
             inputFilter += `  ${key}_lte: ${generateField(value, true)}\n`;
             inputFilter += `  ${key}_gte: ${generateField(value, true)}\n`;
+          } else if (hasTypeOf(String)) {
+            inputFilter += `  ${key}: ${generateField(value, true)}\n`;
+            inputFilter += `  ${key}_in: [${generateField(value, true)}!]\n`;
+            inputFilter += `  ${key}_contains: ${generateField(value, true)}\n`;
           } else {
             inputFilter += `  ${key}: ${generateField(value, true)}\n`;
           }
@@ -194,7 +200,7 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
       const file = `${Module}State.client.graphql`;
 
       // regenerate graphql fragment
-      let graphql = '';
+      let graphql = '    searchText,\n';
       for (const key of schema.keys()) {
         const value = schema.values[key];
         const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
@@ -205,12 +211,14 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
           if (hasTypeOf(Date)) {
             graphql += `    ${key}_lte\n`;
             graphql += `    ${key}_gte\n`;
+          } else if (hasTypeOf(String)) {
+            graphql += `    ${key}_contains\n`;
           } else {
             graphql += `    ${key}\n`;
           }
         }
       }
-      graphql += `    searchText
+      graphql += `
   }\n`;
 
       shell.cd(pathStateClient);
@@ -230,24 +238,26 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
 
       // regenerate resolver defaults
       let defaults = `const defaultFilters = {\n`;
+      defaults += `searchText: '',\n`;
       for (const key of schema.keys()) {
         const value = schema.values[key];
         const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
         if (value.type.isSchema) {
           const id = value.noIdSuffix ? '' : 'Id';
-          defaults += `  ${key}${id}: '',\n`;
+          defaults += `${key}${id}: '',\n`;
         } else {
           if (hasTypeOf(Date)) {
-            defaults += `  ${key}_lte: '',\n`;
-            defaults += `  ${key}_gte: '',\n`;
+            defaults += `${key}_lte: '',\n`;
+            defaults += `${key}_gte: '',\n`;
+          } else if (hasTypeOf(String)) {
+            defaults += `${key}_contains: '',\n`;
           } else {
-            defaults += `  ${key}: '',\n`;
+            defaults += `${key}: '',\n`;
           }
         }
       }
 
-      defaults += `  searchText: ''
-};\n`;
+      defaults += `};`;
 
       shell.cd(pathStateResolver);
       // override state resolver file
@@ -259,6 +269,7 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
             .replace(RegExp(replaceStateResolverDefaults, 'g'), `// filter data\n${defaults}// end filter data`)
         )
         .to(file);
+      runPrettier(file);
 
       logger.info(chalk.green(`✔ State Resolver in ${pathStateResolver}${file} successfully updated!`));
     } else {
diff --git a/tools/templates/crud/client/graphql/ModuleState.client.graphql b/tools/templates/crud/client/graphql/ModuleState.client.graphql
index 6f653cfdab..aecda98a88 100644
--- a/tools/templates/crud/client/graphql/ModuleState.client.graphql
+++ b/tools/templates/crud/client/graphql/ModuleState.client.graphql
@@ -5,8 +5,8 @@ fragment $Module$StateInfo on $Module$State {
     order
   }
   filter {
-    id
-    name
     searchText
+    id
+    name_contains
   }
 }
diff --git a/tools/templates/crud/client/resolvers/index.js b/tools/templates/crud/client/resolvers/index.js
index c0a71b67e5..ef01279968 100644
--- a/tools/templates/crud/client/resolvers/index.js
+++ b/tools/templates/crud/client/resolvers/index.js
@@ -10,9 +10,9 @@ const TYPE_$MODULE$_STATE_ORDER_BY = 'OrderBy$Module$Input';
 
 // filter data
 const defaultFilters = {
+  searchText: '',
   id: '',
-  name: '',
-  searchText: ''
+  name_contains: ''
 };
 // end filter data
 

From b6c2b3b84ca139c2671e7b2ba72fa6fa09768c31 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 23 Oct 2018 07:10:49 +0200
Subject: [PATCH 274/327] sql crud: fix where in

---
 packages/server/src/sql/crud.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/sql/crud.js b/packages/server/src/sql/crud.js
index 7934cb48ab..fc3288e136 100644
--- a/packages/server/src/sql/crud.js
+++ b/packages/server/src/sql/crud.js
@@ -524,7 +524,7 @@ export default class Crud {
 
           const filterValueIn = isSchema ? filter[`${filterKey}Id_in`] : filter[`${filterKey}_in`];
           if (filterValueIn) {
-            _this.orWhereIn(`${tableName}.${tableColumn}`, filterValueIn);
+            _this.andWhereIn(`${tableName}.${tableColumn}`, filterValueIn);
           }
 
           const filterValueContains = isSchema ? filter[`${filterKey}Id_contains`] : filter[`${filterKey}_contains`];

From a24a631f56a8568d35a8cd6d66f373395b34a41a Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 23 Oct 2018 07:21:10 +0200
Subject: [PATCH 275/327] update validation, small fixes

---
 packages/client/package.json                             | 2 +-
 .../src/modules/common/components/crud/FormView.jsx      | 4 ++--
 .../src/modules/common/components/crud/FormView.web.jsx  | 4 ++--
 .../src/modules/common/components/crud/ListView.web.jsx  | 7 ++++---
 packages/client/src/utils/crud.js                        | 2 +-
 packages/server/package.json                             | 2 +-
 yarn.lock                                                | 9 +++++----
 7 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index 4a90a0029f..1c438f65bd 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -40,7 +40,7 @@
   "license": "MIT",
   "dependencies": {
     "@domain-schema/core": "^0.0.34",
-    "@domain-schema/validation": "^0.0.33",
+    "@domain-schema/validation": "^0.0.36",
     "@domain-schema/formik": "^0.0.34",
     "@fortawesome/fontawesome": "^1.1.8",
     "@fortawesome/fontawesome-free-brands": "^5.0.6",
diff --git a/packages/client/src/modules/common/components/crud/FormView.jsx b/packages/client/src/modules/common/components/crud/FormView.jsx
index 5a304b064e..567bcdaa47 100644
--- a/packages/client/src/modules/common/components/crud/FormView.jsx
+++ b/packages/client/src/modules/common/components/crud/FormView.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Formik } from 'formik';
-import DomainValidation from '@domain-schema/validation';
+import DomainValidator from '@domain-schema/validation';
 
 import { onSubmit, mapFormPropsToValues } from '../../../../utils/crud';
 import { createFormFields } from '../../util';
@@ -12,7 +12,7 @@ const Form = ({ schema, data: { node }, updateEntry, createEntry }) => {
     <Formik
       initialValues={mapFormPropsToValues({ schema, data: node })}
       validate={values => {
-        DomainValidation.validate(values, schema);
+        DomainValidator.validate(schema, values);
       }}
       onSubmit={async values => {
         let title = node && node.__typename ? node.__typename : 'Model',
diff --git a/packages/client/src/modules/common/components/crud/FormView.web.jsx b/packages/client/src/modules/common/components/crud/FormView.web.jsx
index 1ea0397af1..5c9978662e 100644
--- a/packages/client/src/modules/common/components/crud/FormView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/FormView.web.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Formik } from 'formik';
-import DomainValidation from '@domain-schema/validation';
+import DomainValidator from '@domain-schema/validation';
 
 import { onSubmit, mapFormPropsToValues } from '../../../../utils/crud';
 import { createFormFields } from '../../util';
@@ -36,7 +36,7 @@ const FormView = ({ schema, updateEntry, createEntry, title, customFields, data
     <Formik
       initialValues={mapFormPropsToValues({ schema, data: data ? data.node : null })}
       validate={values => {
-        DomainValidation.validate(values, schema);
+        DomainValidator.validate(schema, values);
       }}
       onSubmit={async values => {
         await onSubmit({ schema, values, updateEntry, createEntry, title, data: data ? data.node : null });
diff --git a/packages/client/src/modules/common/components/crud/ListView.web.jsx b/packages/client/src/modules/common/components/crud/ListView.web.jsx
index c2da607c55..41a9e2c60a 100644
--- a/packages/client/src/modules/common/components/crud/ListView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/ListView.web.jsx
@@ -1,7 +1,7 @@
 /* eslint-disable react/display-name */
 import React from 'react';
 import PropTypes from 'prop-types';
-import DomainValidation from '@domain-schema/validation';
+import DomainValidator from '@domain-schema/validation';
 import { Link } from 'react-router-dom';
 import { Formik } from 'formik';
 import { DragDropContext, DragSource, DropTarget } from 'react-dnd';
@@ -340,7 +340,7 @@ class ListView extends React.Component {
               <Formik
                 initialValues={mapFormPropsToValues({ schema })}
                 validate={values => {
-                  DomainValidation.validate(values, schema);
+                  DomainValidator.validate(schema, values);
                 }}
                 onSubmit={async (values, { resetForm }) => {
                   const insertValues = pickInputFields({ schema, values });
@@ -359,7 +359,8 @@ class ListView extends React.Component {
                       values,
                       formItemLayout: {},
                       prefix: '',
-                      formType: 'batch'
+                      formType: 'batch',
+                      customFields: customBatchFields
                     })}
                     <FormItem>
                       <Button color="primary" type="submit" disabled={!hasSelected} loading={loading && !data}>
diff --git a/packages/client/src/utils/crud.js b/packages/client/src/utils/crud.js
index 9aa6161744..a069b9bc0c 100644
--- a/packages/client/src/utils/crud.js
+++ b/packages/client/src/utils/crud.js
@@ -199,7 +199,7 @@ export const deleteEntry = async ({ ownProps: { refetch }, mutate }, { where },
 export const mergeFilter = (filter, defaults, schema) => {
   let mergeFilter = filter;
   if (!filter.hasOwnProperty('searchText')) {
-    const { searchText, ...restFilters } = defaults.testModuleState.filter;
+    const { searchText, ...restFilters } = defaults;
     mergeFilter = { ...restFilters, ...filter };
   }
 
diff --git a/packages/server/package.json b/packages/server/package.json
index 36f94a2a90..7abe4954cc 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -56,7 +56,7 @@
     "@domain-schema/formik": "^0.0.34",
     "@domain-schema/graphql": "^0.0.33",
     "@domain-schema/knex": "^0.0.35",
-    "@domain-schema/validation": "^0.0.33",
+    "@domain-schema/validation": "^0.0.36",
     "apollo-cache-inmemory": "1.2.9",
     "apollo-cache-router": "^1.1.6",
     "apollo-client": "^2.3.4",
diff --git a/yarn.lock b/yarn.lock
index 0f73eaab58..9055d866eb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -572,12 +572,13 @@
     debug "^3.1.0"
     humps "^2.0.1"
 
-"@domain-schema/validation@^0.0.33":
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/@domain-schema/validation/-/validation-0.0.33.tgz#f4e83e2abe249cea2f83762d01c065a3132f4a2f"
-  integrity sha512-F4AeaIZwrkGuLxaRsZ6kbO7uNghWScChHragtXaSisGBMf5LZxWHNApYC4SyKIyNOu90I1lHP52fIK4IiIEfzA==
+"@domain-schema/validation@^0.0.36":
+  version "0.0.36"
+  resolved "https://registry.yarnpkg.com/@domain-schema/validation/-/validation-0.0.36.tgz#b4740e577e4c745710fb4388e857ee62f70e33ea"
+  integrity sha512-dAfqH/yFbmecfEccRt2FK/jx3XvfpcfwNPUBQaVAFXD/urSTLAPG5DmML68qpYs+9ms9p412U/IN3CyiLmUGcw==
   dependencies:
     debug "^3.1.0"
+    humps "^2.0.1"
 
 "@expo/bunyan@3.0.2":
   version "3.0.2"

From 2dc8f76e5ad0048d1218ed0f225b96ac252842ed Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 23 Oct 2018 07:23:50 +0200
Subject: [PATCH 276/327] sql crud: fix where in

---
 packages/server/src/sql/crud.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/sql/crud.js b/packages/server/src/sql/crud.js
index fc3288e136..73b58a2c07 100644
--- a/packages/server/src/sql/crud.js
+++ b/packages/server/src/sql/crud.js
@@ -524,7 +524,7 @@ export default class Crud {
 
           const filterValueIn = isSchema ? filter[`${filterKey}Id_in`] : filter[`${filterKey}_in`];
           if (filterValueIn) {
-            _this.andWhereIn(`${tableName}.${tableColumn}`, filterValueIn);
+            _this.whereIn(`${tableName}.${tableColumn}`, filterValueIn);
           }
 
           const filterValueContains = isSchema ? filter[`${filterKey}Id_contains`] : filter[`${filterKey}_contains`];

From a7d05a077467a43329873df6648b66cd58ee17bc Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 23 Oct 2018 07:34:06 +0200
Subject: [PATCH 277/327] antd: fix render select query

---
 .../ui-antd/components/RenderSelectQuery.jsx  | 112 +++++++++---------
 1 file changed, 58 insertions(+), 54 deletions(-)

diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
index 3b0b769f70..6931f26fbc 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
@@ -32,7 +32,9 @@ export default class RenderSelectQuery extends React.Component {
       setFieldValue
     } = this.props;
 
-    setFieldValue(name, edges.find(item => item.id === parseInt(value.key)) || '');
+    const key = value && value.key ? parseInt(value.key) : '';
+
+    setFieldValue(name, edges.find(item => item.id === key) || '');
   };
 
   handleBlur = () => {
@@ -75,64 +77,66 @@ export default class RenderSelectQuery extends React.Component {
         <div>
           <Query limit={10} filter={{ searchText }} orderBy={orderBy()}>
             {({ loading, data }) => {
-              if (loading || !data) {
-                return <Spin size="small" />;
-              }
-              const {
-                edges,
-                pageInfo: { totalCount }
-              } = data;
-              const isEdgesNotIncludeValue = value && edges && !edges.find(({ id }) => id === value.id);
-              const renderOptions = () => {
-                const defaultOption =
-                  parseInt(formattedValue.key) === 0
-                    ? [
-                        <Option key="0" value="0">
-                          Select {pascalize(schema.name)}
-                        </Option>
-                      ]
-                    : [];
-                return edges
-                  ? edges.reduce((acc, opt) => {
-                      acc.push(
-                        <Option key={opt.id} value={`${opt.id}`}>
-                          {toString(opt)}
-                        </Option>
-                      );
-                      return acc;
-                    }, defaultOption)
-                  : defaultOption;
-              };
+              if (!loading || data) {
+                const {
+                  edges,
+                  pageInfo: { totalCount }
+                } = data;
+                const isEdgesNotIncludeValue = value && edges && !edges.find(({ id }) => id === value.id);
+                const renderOptions = () => {
+                  const defaultValue = `Select ${pascalize(schema.name)}`;
+                  const defaultOption =
+                    parseInt(formattedValue.key) === 0
+                      ? [
+                          <Option key="0" value="0">
+                            {defaultValue}
+                          </Option>
+                        ]
+                      : [];
+                  return edges
+                    ? edges.reduce((acc, opt) => {
+                        acc.push(
+                          <Option key={opt.id} value={`${opt.id}`}>
+                            {toString(opt)}
+                          </Option>
+                        );
+                        return acc;
+                      }, defaultOption)
+                    : defaultOption;
+                };
 
-              const getSearchProps = () => {
-                return {
-                  filterOption: false,
-                  onSearch: this.search,
-                  value: isEdgesNotIncludeValue && dirty ? { key: `${edges[0].id}` } : formattedValue
+                const getSearchProps = () => {
+                  return {
+                    filterOption: false,
+                    value: isEdgesNotIncludeValue && dirty ? { key: `${edges[0].id}` } : formattedValue
+                  };
                 };
-              };
 
-              const getChildrenProps = () => {
-                return {
-                  optionFilterProp: 'children',
-                  filterOption: (input, { props: { children } }) =>
-                    children.toLowerCase().includes(input.toLowerCase()),
-                  value: formattedValue
+                const getChildrenProps = () => {
+                  return {
+                    optionFilterProp: 'children',
+                    filterOption: (input, { props: { children } }) =>
+                      children.toLowerCase().includes(input.toLowerCase()),
+                    value: formattedValue
+                  };
                 };
-              };
 
-              const basicProps = {
-                allowClear: formType !== 'form',
-                showSearch: true,
-                labelInValue: true,
-                dropdownMatchSelectWidth: false,
-                style,
-                onChange: this.handleChange(edges || null),
-                onBlur: this.handleBlur
-              };
-              const filterProps = totalCount > LIMIT ? getSearchProps() : getChildrenProps();
-              const props = { ...basicProps, ...filterProps };
-              return <Select {...props}>{renderOptions()}</Select>;
+                const basicProps = {
+                  allowClear: formType !== 'form',
+                  showSearch: true,
+                  labelInValue: true,
+                  dropdownMatchSelectWidth: false,
+                  style,
+                  onSearch: this.search,
+                  onChange: this.handleChange(edges || null),
+                  onBlur: this.handleBlur
+                };
+                const filterProps = totalCount > LIMIT ? getSearchProps() : getChildrenProps();
+                const props = { ...basicProps, ...filterProps };
+                return <Select {...props}>{renderOptions()}</Select>;
+              } else {
+                return <Spin size="small" />;
+              }
             }}
           </Query>
         </div>

From adba505a4d034091aeebb6d4d704cf1c5f796985 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 23 Oct 2018 09:22:09 +0200
Subject: [PATCH 278/327] fix removeEmpty missing schema var

---
 tools/templates/crud/client/containers/ModuleList.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/templates/crud/client/containers/ModuleList.jsx b/tools/templates/crud/client/containers/ModuleList.jsx
index d77f49f030..ce0f457deb 100644
--- a/tools/templates/crud/client/containers/ModuleList.jsx
+++ b/tools/templates/crud/client/containers/ModuleList.jsx
@@ -191,7 +191,7 @@ export default compose(
           const {
             data: { updateMany$Module$s }
           } = await mutate({
-            variables: { data: removeEmpty(data), where }
+            variables: { data: removeEmpty(data, $Module$Schema), where }
           });
 
           if (updateMany$Module$s.errors) {

From de3beda6382b54ec98e8eb0b3d650d236321f09c Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 26 Oct 2018 09:41:44 +0200
Subject: [PATCH 279/327] small fix

---
 .../src/modules/common/components/crud/FilterView.web.jsx  | 7 ++++---
 .../src/modules/common/components/crud/ListView.web.jsx    | 3 +--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/client/src/modules/common/components/crud/FilterView.web.jsx b/packages/client/src/modules/common/components/crud/FilterView.web.jsx
index c432adb6f7..afe05ce252 100644
--- a/packages/client/src/modules/common/components/crud/FilterView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/FilterView.web.jsx
@@ -26,7 +26,8 @@ class FilterView extends React.PureComponent {
     onFilterChange: PropTypes.func.isRequired,
     customFields: PropTypes.object,
     currentUser: PropTypes.object,
-    currentUserLoading: PropTypes.bool
+    currentUserLoading: PropTypes.bool,
+    data: PropTypes.object
   };
 
   state = {
@@ -44,7 +45,7 @@ class FilterView extends React.PureComponent {
   };
 
   render() {
-    const { schema, onFilterChange, customFields, currentUser } = this.props;
+    const { schema, onFilterChange, customFields, currentUser, data } = this.props;
     const { expand } = this.state;
 
     const showFilter =
@@ -60,7 +61,7 @@ class FilterView extends React.PureComponent {
 
     return (
       <Formik
-        initialValues={mapFormPropsToValues({ schema, formType: 'filter' })}
+        initialValues={mapFormPropsToValues({ schema, formType: 'filter', data: data ? data : null })}
         onSubmit={values => {
           onFilterChange(pickInputFields({ schema, values, formType: 'filter' }));
         }}
diff --git a/packages/client/src/modules/common/components/crud/ListView.web.jsx b/packages/client/src/modules/common/components/crud/ListView.web.jsx
index 41a9e2c60a..e29f0992e1 100644
--- a/packages/client/src/modules/common/components/crud/ListView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/ListView.web.jsx
@@ -359,8 +359,7 @@ class ListView extends React.Component {
                       values,
                       formItemLayout: {},
                       prefix: '',
-                      formType: 'batch',
-                      customFields: customBatchFields
+                      formType: 'batch'
                     })}
                     <FormItem>
                       <Button color="primary" type="submit" disabled={!hasSelected} loading={loading && !data}>

From 8e439427c32b182b011df8a422580a9383418a02 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 26 Oct 2018 15:29:43 +0200
Subject: [PATCH 280/327] add updateMany funconality for one to one relations,
 add updateschema cli for server module

---
 packages/server/src/api/rootSchema.graphql    |  15 ++
 .../src/modules/common/generatedSchemas.js    |   1 +
 packages/server/src/sql/crud.js               |  35 +++-
 tools/cli.js                                  |   9 +-
 tools/cli/CommandInvoker.js                   |  11 +-
 tools/cli/commands/addCrud.js                 |  17 +-
 tools/cli/commands/deleteModule.js            |  22 ++-
 tools/cli/commands/updateSchema.js            | 174 ++++++++++++++++++
 tools/cli/helpers/util.js                     |  84 ++++++++-
 tools/templates/crud/server/schema.graphql    |  16 +-
 10 files changed, 359 insertions(+), 25 deletions(-)
 create mode 100644 packages/server/src/modules/common/generatedSchemas.js
 create mode 100644 tools/cli/commands/updateSchema.js

diff --git a/packages/server/src/api/rootSchema.graphql b/packages/server/src/api/rootSchema.graphql
index 71d9551662..5533e213a6 100644
--- a/packages/server/src/api/rootSchema.graphql
+++ b/packages/server/src/api/rootSchema.graphql
@@ -3,6 +3,21 @@ type FieldError {
   message: String!
 }
 
+type PageInfo {
+  totalCount: Int
+  hasNextPage: Boolean
+}
+
+type BatchPayload {
+  count: Int
+  errors: [FieldError!]
+}
+
+input OrderByInput {
+  column: String
+  order: String
+}
+
 type Query {
   dummy: Int
 }
diff --git a/packages/server/src/modules/common/generatedSchemas.js b/packages/server/src/modules/common/generatedSchemas.js
new file mode 100644
index 0000000000..ff8b4c5632
--- /dev/null
+++ b/packages/server/src/modules/common/generatedSchemas.js
@@ -0,0 +1 @@
+export default {};
diff --git a/packages/server/src/sql/crud.js b/packages/server/src/sql/crud.js
index 73b58a2c07..8bbab7c9c7 100644
--- a/packages/server/src/sql/crud.js
+++ b/packages/server/src/sql/crud.js
@@ -622,7 +622,6 @@ export default class Crud {
   }
 
   _create(data) {
-    console.log('_create:', data);
     return knex(this.getFullTableName())
       .insert(decamelizeKeys(this.normalizeFields(data)))
       .returning('id');
@@ -823,9 +822,36 @@ export default class Crud {
   }
 
   _updateMany({ data, where: { id_in } }) {
-    return knex(this.getFullTableName())
-      .update(decamelizeKeys(this.normalizeFields(data)))
-      .whereIn('id', id_in);
+    const query = this.getBaseQuery();
+    let normalizedData = {};
+    for (const key of Object.keys(data)) {
+      const value = this.schema.values[key];
+      // add fields from one to one relation
+      if (value.type.constructor === Array && value.hasOne) {
+        const type = value.type[0];
+        const fieldName = decamelize(key);
+        const prefix = type.__.tablePrefix ? type.__.tablePrefix : '';
+        const suffix = value.noIdSuffix ? '' : '_id';
+        const foreignTableName = decamelize(type.__.tableName ? type.__.tableName : type.name);
+        query.leftJoin(
+          `${prefix}${foreignTableName} as ${fieldName}`,
+          `${fieldName}.id`,
+          `${fieldName}.${this.getTableName()}${suffix}`
+        );
+
+        for (const nestedKey of Object.keys(data[key].update[0].data)) {
+          const schemaKey = nestedKey.endsWith('Id') ? nestedKey.substring(0, nestedKey.length - 2) : nestedKey;
+          if (type.values[schemaKey].type.constructor !== Array) {
+            normalizedData[`${fieldName}.${nestedKey}`] = data[key].update[0].data[nestedKey];
+          }
+        }
+      } else {
+        normalizedData[`${this.getTableName()}.${key}`] = data[key];
+      }
+    }
+
+    normalizedData = decamelizeKeys(this.normalizeFields(normalizedData));
+    return query.update(normalizedData).whereIn(`${this.getTableName()}.id`, id_in);
   }
 
   async updateMany(args) {
@@ -840,6 +866,7 @@ export default class Crud {
         e.throwIf();
       }
     } catch (e) {
+      log.error(`Error in ${this.getFullTableName()}.updateMany()`, e);
       return { errors: e };
     }
   }
diff --git a/tools/cli.js b/tools/cli.js
index 7406f723fc..f43ac2cfbf 100644
--- a/tools/cli.js
+++ b/tools/cli.js
@@ -3,11 +3,12 @@ require('babel-polyfill');
 const addModuleCommand = require('./cli/commands/addModule');
 const addCrudCommand = require('./cli/commands/addCrud');
 const deleteModuleCommand = require('./cli/commands/deleteModule');
+const updateSchemaCommand = require('./cli/commands/updateSchema');
 const CommandInvoker = require('./cli/CommandInvoker');
 
 const prog = require('caporal');
 
-const commandInvoker = new CommandInvoker(addModuleCommand, addCrudCommand, deleteModuleCommand);
+const commandInvoker = new CommandInvoker(addModuleCommand, addCrudCommand, deleteModuleCommand, updateSchemaCommand);
 
 prog
   .version('1.0.0')
@@ -38,6 +39,10 @@ prog
   .argument('<moduleName>', 'Module name')
   .argument('[location]', 'Where should we delete module. [both, server, client]', ['both', 'server', 'client'], 'both')
   .option('-m', 'Delete migration and seeds')
-  .action((args, options, logger) => commandInvoker.runDeleteModule(args, options, logger));
+  .action((args, options, logger) => commandInvoker.runDeleteModule(args, options, logger))
+  // Update schema
+  .command('updateschema', 'Update Module Schema')
+  .argument('<moduleName>', 'Module name')
+  .action((args, options, logger) => commandInvoker.runUpdateSchema(args, options, logger));
 
 prog.parse(process.argv);
diff --git a/tools/cli/CommandInvoker.js b/tools/cli/CommandInvoker.js
index 3c5127b00f..09a2f29d35 100644
--- a/tools/cli/CommandInvoker.js
+++ b/tools/cli/CommandInvoker.js
@@ -11,10 +11,11 @@ class CommandInvoker {
    * @param addModule - The function for creating a new module.
    * @param deleteModule - The function for deleting existing module.
    */
-  constructor(addModule, addCrud, deleteModule) {
+  constructor(addModule, addCrud, deleteModule, updateSchema) {
     this.addModule = addModule;
     this.addCrud = addCrud;
     this.deleteModule = deleteModule;
+    this.updateSchema = updateSchema;
   }
 
   /**
@@ -59,6 +60,14 @@ class CommandInvoker {
     const { moduleName, location = 'both' } = args;
     CommandInvoker.runCommand(this.deleteModule, location, logger, moduleName, options);
   }
+
+  /**
+   * Runs operation (function) for updating existing module schema.
+   */
+  runUpdateSchema(args, options, logger) {
+    const { moduleName, location = 'both' } = args;
+    CommandInvoker.runCommand(this.updateSchema, location, logger, moduleName);
+  }
 }
 
 module.exports = CommandInvoker;
diff --git a/tools/cli/commands/addCrud.js b/tools/cli/commands/addCrud.js
index f926510288..8627f3147a 100644
--- a/tools/cli/commands/addCrud.js
+++ b/tools/cli/commands/addCrud.js
@@ -1,8 +1,10 @@
 const shell = require('shelljs');
 const chalk = require('chalk');
+const { pascalize } = require('humps');
 const addModule = require('./addModule');
 const addMigration = require('./subCommands/addMigration');
-const { computeModulesPath } = require('../helpers/util');
+const { computeModulesPath, updateFileWithExports, runPrettier } = require('../helpers/util');
+const { BASE_PATH } = require('../config');
 
 /**
  * Adds CRUD module in server and adds a new module to the Feature connector.
@@ -17,6 +19,9 @@ function addCrud(logger, templatesPath, moduleName, tablePrefix, location) {
   // add module in server, client
   addModule(logger, templatesPath, moduleName, location, false);
 
+  // pascalize
+  const Module = pascalize(moduleName);
+
   if (location === 'server') {
     // add migration and seed for new module
     addMigration(logger, templatesPath, moduleName);
@@ -27,6 +32,16 @@ function addCrud(logger, templatesPath, moduleName, tablePrefix, location) {
 
       logger.info(chalk.green(`✔ Inserted db table prefix!`));
     }
+
+    const generatedSchemasFile = 'generatedSchemas.js';
+    const schema = `${Module}Schema`;
+    const options = {
+      pathToFileWithExports: `${BASE_PATH}/packages/${location}/src/modules/common/${generatedSchemasFile}`,
+      exportName: schema,
+      importString: `import { ${schema} } from '../${moduleName}/schema';\n`
+    };
+    updateFileWithExports(options);
+    runPrettier(options.pathToFileWithExports);
   }
 
   logger.info(chalk.green(`✔ Module for ${location} successfully created!`));
diff --git a/tools/cli/commands/deleteModule.js b/tools/cli/commands/deleteModule.js
index 9816d2331b..6314bbb04b 100644
--- a/tools/cli/commands/deleteModule.js
+++ b/tools/cli/commands/deleteModule.js
@@ -1,8 +1,9 @@
 const shell = require('shelljs');
 const fs = require('fs');
 const chalk = require('chalk');
+const { pascalize } = require('humps');
 const deleteMigrations = require('./subCommands/deleteMigrations');
-const { computeModulesPath, runPrettier } = require('../helpers/util');
+const { computeModulesPath, runPrettier, deleteFromFileWithExports } = require('../helpers/util');
 
 /**
  * Removes the module from client, server or both locations and removes the module from the module list.
@@ -13,7 +14,16 @@ const { computeModulesPath, runPrettier } = require('../helpers/util');
  */
 function deleteModule(logger, moduleName, options, location) {
   logger.info(`Deleting ${location} files…`);
+
+  // pascalize
+  const Module = pascalize(moduleName);
   const modulePath = computeModulesPath(location, moduleName);
+  const modulesPath = computeModulesPath(location);
+  const moduleCommonPath = `${modulesPath}/common`;
+  const generatedContainerFile = 'generatedContainers.js';
+  const generatedContainerPath = `${moduleCommonPath}/${generatedContainerFile}`;
+  const generatedSchemasFile = 'generatedSchemas.js';
+  const generatedSchemaPath = `${moduleCommonPath}/${generatedSchemasFile}`;
 
   if (fs.existsSync(modulePath)) {
     // remove module directory
@@ -52,6 +62,16 @@ function deleteModule(logger, moduleName, options, location) {
     if (location === 'server' && options.m) {
       deleteMigrations(logger, moduleName);
     }
+
+    if (fs.existsSync(generatedContainerPath)) {
+      const graphqlQuery = `${Module}Query`;
+      deleteFromFileWithExports(generatedContainerPath, graphqlQuery);
+    }
+    if (fs.existsSync(generatedSchemaPath)) {
+      const schema = `${Module}Schema`;
+      deleteFromFileWithExports(generatedSchemaPath, schema);
+    }
+
     logger.info(chalk.green(`✔ Module for ${location} successfully deleted!`));
   } else {
     logger.info(chalk.red(`✘ Module ${location} location for ${modulePath} not found!`));
diff --git a/tools/cli/commands/updateSchema.js b/tools/cli/commands/updateSchema.js
new file mode 100644
index 0000000000..244c50fc91
--- /dev/null
+++ b/tools/cli/commands/updateSchema.js
@@ -0,0 +1,174 @@
+const shell = require('shelljs');
+const fs = require('fs');
+const chalk = require('chalk');
+const GraphQLGenerator = require('@domain-schema/graphql').default;
+const { pascalize, camelize } = require('humps');
+
+const { BASE_PATH } = require('../config');
+const { generateField } = require('../helpers/util');
+const schemas = require('../../../packages/server/src/modules/common/generatedSchemas');
+
+/**
+ *
+ * @param logger
+ * @param moduleName
+ * @returns {*|void}
+ */
+function updateModule(logger, moduleName, location) {
+  logger.info(`Updating ${moduleName} Schema…`);
+  console.log('location:', location);
+
+  // pascalize
+  const Module = pascalize(moduleName);
+
+  const modulePath = `${BASE_PATH}/packages/server/src/modules/${moduleName}`;
+
+  if (fs.existsSync(modulePath)) {
+    // get module schema
+    const schema = schemas.default[`${Module}Schema`];
+
+    // get schema file
+    const pathSchema = `${BASE_PATH}/packages/server/src/modules/${moduleName}/`;
+    if (fs.existsSync(pathSchema)) {
+      const file = `schema.graphql`;
+
+      // regenerate input fields
+      let inputCreate = '';
+      let inputUpdate = '';
+      let inputFilter = `  searchText: String\n`;
+      let manyInput = '';
+      for (const key of schema.keys()) {
+        const value = schema.values[key];
+        const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
+        if (value.type.isSchema) {
+          let required = value.optional ? '' : '!';
+          const id = value.noIdSuffix ? '' : 'Id';
+          inputCreate += `  ${key}${id}: Int${required}\n`;
+          inputUpdate += `  ${key}${id}: Int\n`;
+          inputFilter += `  ${key}${id}: Int\n`;
+          inputFilter += `  ${key}${id}_in: [Int!]\n`;
+          inputFilter += `  ${key}${id}_contains: Int\n`;
+        } else if (value.type.constructor !== Array) {
+          if (key !== 'id') {
+            inputCreate += `  ${key}: ${generateField(value)}\n`;
+            inputUpdate += `  ${key}: ${generateField(value, true)}\n`;
+          }
+
+          if (hasTypeOf(Date)) {
+            inputFilter += `  ${key}_lte: ${generateField(value, true)}\n`;
+            inputFilter += `  ${key}_gte: ${generateField(value, true)}\n`;
+          } else if (hasTypeOf(String)) {
+            inputFilter += `  ${key}: ${generateField(value, true)}\n`;
+            inputFilter += `  ${key}_in: [${generateField(value, true)}!]\n`;
+            inputFilter += `  ${key}_contains: ${generateField(value, true)}\n`;
+          } else {
+            inputFilter += `  ${key}: ${generateField(value, true)}\n`;
+          }
+        } else if (value.type.constructor === Array && value.type[0].isSchema) {
+          inputCreate += `  ${key}: ${pascalize(key)}CreateManyInput\n`;
+          inputUpdate += `  ${key}: ${pascalize(key)}UpdateManyInput\n`;
+
+          manyInput += `
+
+input ${pascalize(key)}CreateManyInput {
+  create: [${pascalize(value.type[0].name)}CreateInput!]
+}
+
+input ${pascalize(key)}UpdateManyInput {
+  create: [${pascalize(value.type[0].name)}CreateInput!]
+  delete: [${pascalize(value.type[0].name)}WhereUniqueInput!]
+  update: [${pascalize(value.type[0].name)}UpdateWhereInput!]
+}
+
+input ${pascalize(value.type[0].name)}UpdateWhereInput {
+  where: ${pascalize(value.type[0].name)}WhereUniqueInput!
+  data: ${pascalize(value.type[0].name)}UpdateInput!
+}`;
+        }
+      }
+
+      shell.cd(pathSchema);
+      // override Module type in schema.graphql file
+      const replaceType = `### schema type definitions([^()]+)### end schema type definitions`;
+      shell
+        .ShellString(
+          shell
+            .cat(file)
+            .replace(
+              RegExp(replaceType, 'g'),
+              `### schema type definitions\n${new GraphQLGenerator().generateTypes(
+                schema
+              )}${manyInput}\n\n### end schema type definitions`
+            )
+        )
+        .to(file);
+
+      // override ModuleCreateInput in schema.graphql file
+      const replaceCreate = `input ${Module}CreateInput {([^}])*\\n}`;
+      shell
+        .ShellString(
+          shell.cat(file).replace(RegExp(replaceCreate, 'g'), `input ${Module}CreateInput {\n${inputCreate}}`)
+        )
+        .to(file);
+
+      // override ModuleUpdateInput in schema.graphql file
+      const replaceUpdate = `input ${Module}UpdateInput {([^}])*\\n}`;
+      shell
+        .ShellString(
+          shell.cat(file).replace(RegExp(replaceUpdate, 'g'), `input ${Module}UpdateInput {\n${inputUpdate}}`)
+        )
+        .to(file);
+
+      // override ModuleFilterInput in schema.graphql file
+      const replaceFilter = `input ${Module}FilterInput {([^}])*\\n}`;
+      shell
+        .ShellString(
+          shell.cat(file).replace(RegExp(replaceFilter, 'g'), `input ${Module}FilterInput {\n${inputFilter}}`)
+        )
+        .to(file);
+
+      logger.info(chalk.green(`✔ Schema in ${pathSchema}${file} successfully updated!`));
+
+      const resolverFile = `resolvers.ts`;
+      let hasBatchResolvers = false;
+      let replace = `  ${schema.name}: {
+`;
+      for (const key of schema.keys()) {
+        const value = schema.values[key];
+        if (value.type.constructor === Array) {
+          hasBatchResolvers = true;
+          replace += `    ${key}: createBatchResolver((sources, args, ctx, info) => {
+      return ctx.${schema.name}.getByIds(sources.map(({ id }) => id), '${camelize(schema.name)}', ctx.${
+            value.type[0].name
+          }, info);
+    }),
+`;
+        }
+      }
+      replace += `  },
+`;
+      replace = hasBatchResolvers ? replace : '';
+
+      // override batch resolvers in resolvers.ts file
+      const replaceBatchResolvers = `// schema batch resolvers([^*]+)// end schema batch resolvers`;
+      shell
+        .ShellString(
+          shell
+            .cat(resolverFile)
+            .replace(
+              RegExp(replaceBatchResolvers, 'g'),
+              `// schema batch resolvers\n${replace}  // end schema batch resolvers`
+            )
+        )
+        .to(resolverFile);
+
+      logger.info(chalk.green(`✔ Resolver in ${pathSchema}${resolverFile} successfully updated!`));
+    } else {
+      logger.error(chalk.red(`✘ Schema path ${pathSchema} not found!`));
+    }
+  } else {
+    logger.info(chalk.red(`✘ Module ${moduleName} in path ${modulePath} not found!`));
+  }
+}
+
+module.exports = updateModule;
diff --git a/tools/cli/helpers/util.js b/tools/cli/helpers/util.js
index d6fa773b05..746f06d70a 100644
--- a/tools/cli/helpers/util.js
+++ b/tools/cli/helpers/util.js
@@ -1,5 +1,6 @@
 const shell = require('shelljs');
 const fs = require('fs');
+const DomainSchema = require('@domain-schema/core').default;
 const { pascalize, decamelize } = require('humps');
 const { startCase } = require('lodash');
 const { BASE_PATH } = require('../config');
@@ -68,9 +69,90 @@ function runPrettier(pathToFile) {
   }
 }
 
+/**
+ *
+ * @param value
+ * @param update
+ * @returns {string}
+ */
+function generateField(value, update = false) {
+  let result = '';
+  const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
+  if (hasTypeOf(Boolean)) {
+    result += 'Boolean';
+  } else if (hasTypeOf(DomainSchema.ID)) {
+    result += 'ID';
+  } else if (hasTypeOf(DomainSchema.Int)) {
+    result += 'Int';
+  } else if (hasTypeOf(DomainSchema.Float)) {
+    result += 'Float';
+  } else if (hasTypeOf(String)) {
+    result += 'String';
+  } else if (hasTypeOf(Date)) {
+    result += 'Date';
+  } else if (hasTypeOf(DomainSchema.DateTime)) {
+    result += 'DateTime';
+  } else if (hasTypeOf(DomainSchema.Time)) {
+    result += 'Time';
+  }
+
+  if (!update && !value.optional) {
+    result += '!';
+  }
+
+  return result;
+}
+
+/**
+ *
+ * @param pathToFileWithExports
+ * @param exportName
+ * @param importString
+ */
+function updateFileWithExports({ pathToFileWithExports, exportName, importString }) {
+  const exportGraphqlContainer = `\nexport default {\n  ${exportName}\n};\n`;
+
+  if (fs.existsSync(pathToFileWithExports)) {
+    const generatedContainerData = fs.readFileSync(pathToFileWithExports);
+    const generatedContainer = generatedContainerData.toString().trim();
+    if (generatedContainer.length > 1) {
+      const index = generatedContainer.lastIndexOf("';");
+      const computedIndex = index >= 0 ? index + 3 : false;
+      if (computedIndex) {
+        let computedGeneratedContainer =
+          generatedContainer.slice(0, computedIndex) +
+          importString +
+          generatedContainer.slice(computedIndex, generatedContainer.length);
+        computedGeneratedContainer = computedGeneratedContainer.replace(/(,|)\s};/g, `,\n  ${exportName}\n};`);
+        return fs.writeFileSync(pathToFileWithExports, computedGeneratedContainer);
+      }
+    }
+    return fs.writeFileSync(pathToFileWithExports, importString + exportGraphqlContainer);
+  }
+}
+
+/**
+ *
+ * @param pathToFileWithExports
+ * @param exportName
+ */
+function deleteFromFileWithExports(pathToFileWithExports, exportName) {
+  if (fs.existsSync(pathToFileWithExports)) {
+    const generatedElementData = fs.readFileSync(pathToFileWithExports);
+    const reg = `(\\n\\s\\s${exportName}(.|)|import (${exportName}|{ ${exportName} }).+;\\n+(?!ex))`;
+    const generatedElement = generatedElementData.toString().replace(new RegExp(reg, 'g'), '');
+    fs.writeFileSync(pathToFileWithExports, generatedElement);
+
+    runPrettier(pathToFileWithExports);
+  }
+}
+
 module.exports = {
   copyFiles,
   renameFiles,
   computeModulesPath,
-  runPrettier
+  runPrettier,
+  generateField,
+  updateFileWithExports,
+  deleteFromFileWithExports
 };
diff --git a/tools/templates/crud/server/schema.graphql b/tools/templates/crud/server/schema.graphql
index 44e5fc4f42..700b778c11 100644
--- a/tools/templates/crud/server/schema.graphql
+++ b/tools/templates/crud/server/schema.graphql
@@ -3,6 +3,7 @@ type $Module$ {
   id: Int!
   name: String!
 }
+
 ### end schema type definitions
 
 type $Module$Connection {
@@ -19,21 +20,6 @@ type $Module$Payload {
   errors: [FieldError!]
 }
 
-type PageInfo {
-  totalCount: Int
-  hasNextPage: Boolean
-}
-
-type BatchPayload {
-  count: Int
-  errors: [FieldError!]
-}
-
-input OrderByInput {
-  column: String
-  order: String
-}
-
 input $Module$FilterInput {
   searchText: String
   id: Int

From b0b4eb036653854aba6bef8befba8e6b9cb5e2b7 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Mon, 29 Oct 2018 07:49:43 +0100
Subject: [PATCH 281/327] list view: show one-to-one fields in batch update

---
 .../common/components/crud/ListView.web.jsx   | 13 ++--
 .../ui-antd/components/RenderSelectQuery.jsx  |  8 ++-
 .../client/src/modules/common/util.web.jsx    | 62 +++++++++++++------
 packages/client/src/utils/crud.js             | 37 +++++++----
 packages/client/typings/typings.d.ts          |  3 +
 packages/common/utils.js                      | 17 ++++-
 6 files changed, 100 insertions(+), 40 deletions(-)

diff --git a/packages/client/src/modules/common/components/crud/ListView.web.jsx b/packages/client/src/modules/common/components/crud/ListView.web.jsx
index e29f0992e1..46f52421c8 100644
--- a/packages/client/src/modules/common/components/crud/ListView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/ListView.web.jsx
@@ -114,6 +114,7 @@ class ListView extends React.Component {
     link: PropTypes.string.isRequired,
     customColumnFields: PropTypes.object,
     customColumnActions: PropTypes.object,
+    customBatchActions: PropTypes.object,
     customBatchFields: PropTypes.object,
     customActions: PropTypes.object,
     tableScroll: PropTypes.object,
@@ -270,6 +271,7 @@ class ListView extends React.Component {
       customColumnFields = {},
       customColumnActions,
       customActions,
+      customBatchActions,
       customBatchFields,
       updateManyEntries,
       tableScroll = null,
@@ -281,8 +283,8 @@ class ListView extends React.Component {
     const showBatchFields =
       customBatchFields === null
         ? false
-        : customBatchFields && customBatchFields.role
-          ? !!hasRole(customBatchFields.role, currentUser)
+        : customBatchActions && customBatchActions.role
+          ? !!hasRole(customBatchActions.role, currentUser)
           : true;
 
     const showCustomActions =
@@ -338,12 +340,12 @@ class ListView extends React.Component {
             </Col>,
             <Col span={20} key="batchUpdate">
               <Formik
-                initialValues={mapFormPropsToValues({ schema })}
+                initialValues={mapFormPropsToValues({ schema, formType: 'batch' })}
                 validate={values => {
                   DomainValidator.validate(schema, values);
                 }}
                 onSubmit={async (values, { resetForm }) => {
-                  const insertValues = pickInputFields({ schema, values });
+                  const insertValues = pickInputFields({ schema, values, formType: 'batch' });
                   if (selectedRowKeys && Object.keys(insertValues).length > 0) {
                     await updateManyEntries(insertValues, { id_in: selectedRowKeys });
                     this.setState({ selectedRowKeys: [] });
@@ -359,7 +361,8 @@ class ListView extends React.Component {
                       values,
                       formItemLayout: {},
                       prefix: '',
-                      formType: 'batch'
+                      formType: 'batch',
+                      customFields: customBatchFields
                     })}
                     <FormItem>
                       <Button color="primary" type="submit" disabled={!hasSelected} loading={loading && !data}>
diff --git a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
index 6931f26fbc..c61c5b9796 100644
--- a/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
+++ b/packages/client/src/modules/common/components/web/ui-antd/components/RenderSelectQuery.jsx
@@ -18,7 +18,8 @@ export default class RenderSelectQuery extends React.Component {
     meta: PropTypes.object,
     schema: PropTypes.object,
     style: PropTypes.object,
-    formType: PropTypes.string.isRequired
+    formType: PropTypes.string.isRequired,
+    optional: PropTypes.bool
   };
 
   state = {
@@ -60,7 +61,8 @@ export default class RenderSelectQuery extends React.Component {
       formItemLayout,
       meta: { touched, error },
       formType,
-      label
+      label,
+      optional
     } = this.props;
     const { searchText, dirty } = this.state;
     const column = schema.keys().find(key => !!schema.values[key].sortBy) || 'name';
@@ -122,7 +124,7 @@ export default class RenderSelectQuery extends React.Component {
                 };
 
                 const basicProps = {
-                  allowClear: formType !== 'form',
+                  allowClear: formType !== 'form' ? true : optional,
                   showSearch: true,
                   labelInValue: true,
                   dropdownMatchSelectWidth: false,
diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index 386e810c0c..d790eb29ee 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -260,9 +260,17 @@ export const createFormFields = ({
         }
       }
     } else {
-      if (value.type.constructor === Array && formType === 'form') {
-        if (values[key]) {
-          fields.push(createFormFieldsArray(key, values, value, type, handleChange, handleBlur, formItemLayout));
+      if (value.type.constructor === Array) {
+        if (formType === 'form') {
+          if (values[key]) {
+            fields.push(
+              createFormFieldsArray(key, values, value, type, handleChange, handleBlur, formItemLayout, formType)
+            );
+          }
+        } else if (formType === 'batch' && value.hasOne) {
+          fields.push(
+            createFormFieldsArray(key, values, value, type, handleChange, handleBlur, formItemLayout, formType)
+          );
         }
       }
     }
@@ -278,6 +286,7 @@ const createFormField = (schema, key, type, values, formItemLayout, formType, ha
   let dateFields = [];
   let inputType = 'text';
   let inputKey = key;
+  const optional = schema.values[key].optional;
 
   if (key === 'id' && formType !== 'filter') {
     return false;
@@ -311,6 +320,7 @@ const createFormField = (schema, key, type, values, formItemLayout, formType, ha
             formItemLayout={formItemLayout}
             formType={formType}
             hasTypeOf={hasTypeOf}
+            optional={optional}
           />
         </Col>
       );
@@ -328,6 +338,7 @@ const createFormField = (schema, key, type, values, formItemLayout, formType, ha
             formItemLayout={formItemLayout}
             formType={formType}
             hasTypeOf={hasTypeOf}
+            optional={optional}
           />
         </Col>
       );
@@ -357,6 +368,7 @@ const createFormField = (schema, key, type, values, formItemLayout, formType, ha
       formItemLayout={formItemLayout}
       formType={formType}
       hasTypeOf={hasTypeOf}
+      optional={optional}
     />
   );
 
@@ -384,7 +396,16 @@ const tailFormItemLayout = {
   }
 };
 
-const createFormFieldsArray = (key, values, value, type, handleChange, handleBlur, formItemLayout) => {
+const createFormFieldsArray = (
+  key,
+  values,
+  value,
+  type,
+  handleChange,
+  handleBlur,
+  formItemLayout,
+  formType = 'form'
+) => {
   return (
     <FieldArray
       name={key}
@@ -400,24 +421,27 @@ const createFormFieldsArray = (key, values, value, type, handleChange, handleBlu
                   schema: type,
                   values: mapFormPropsToValues({ schema: type, data: field }),
                   formItemLayout: formItemLayout,
-                  prefix: `${key}[${index}].`
+                  prefix: `${key}[${index}].`,
+                  formType
                 })}
-                {!value.hasOne && (
-                  <FormItem {...tailFormItemLayout}>
-                    <Button color="primary" size="sm" onClick={() => remove(index)}>
-                      Delete
-                    </Button>
-                  </FormItem>
-                )}
+                {!value.hasOne &&
+                  formType !== 'batch' && (
+                    <FormItem {...tailFormItemLayout}>
+                      <Button color="primary" size="sm" onClick={() => remove(index)}>
+                        Delete
+                      </Button>
+                    </FormItem>
+                  )}
               </div>
             ))}
-            {!value.hasOne && (
-              <FormItem {...tailFormItemLayout}>
-                <Button color="dashed" onClick={() => push({})} style={{ width: '180px' }}>
-                  Add field
-                </Button>
-              </FormItem>
-            )}
+            {!value.hasOne &&
+              formType !== 'batch' && (
+                <FormItem {...tailFormItemLayout}>
+                  <Button color="dashed" onClick={() => push({})} style={{ width: '180px' }}>
+                    Add field
+                  </Button>
+                </FormItem>
+              )}
           </FormItem>
         );
       }}
diff --git a/packages/client/src/utils/crud.js b/packages/client/src/utils/crud.js
index a069b9bc0c..0223381ada 100644
--- a/packages/client/src/utils/crud.js
+++ b/packages/client/src/utils/crud.js
@@ -38,10 +38,12 @@ export const mapFormPropsToValues = ({ schema, data = null, formType = 'form' })
         fields[key] = data ? data[key] : [];
       }
     } else {
-      if (value.show !== false && value.type.constructor !== Array) {
-        fields[key] = data ? data[key] : '';
-      } else if (value.type.constructor === Array) {
-        fields[key] = data ? data[key] : [];
+      if (value.show !== false) {
+        if (value.type.constructor === Array && value.type[0].isSchema) {
+          fields[key] = data ? data[key] : [mapFormPropsToValues({ schema: value.type[0], formType })];
+        } else {
+          fields[key] = data ? data[key] : '';
+        }
       }
     }
   }
@@ -90,7 +92,7 @@ export const pickInputFields = ({ schema, values, data = null, formType = 'form'
     } else {
       if (key in values && has(values, key)) {
         if (value.type.isSchema) {
-          inputValues[`${key}Id`] = Number(values[key].id ? values[key].id : values[key]);
+          inputValues[`${key}Id`] = values[key] ? Number(values[key].id ? values[key].id : values[key]) : null;
         } else if (key !== 'id' && value.type.constructor !== Array) {
           inputValues[key] = values[key];
         } else if (value.type.constructor === Array) {
@@ -122,7 +124,7 @@ export const pickInputFields = ({ schema, values, data = null, formType = 'form'
                 if (!isEqual(obj, item)) {
                   update.push({
                     where: { id: obj.id },
-                    data: pickInputFields({ schema: value.type[0], values: obj, data: obj })
+                    data: pickInputFields({ schema: value.type[0], values: obj, data: obj, formType })
                   });
                 }
               }
@@ -130,18 +132,29 @@ export const pickInputFields = ({ schema, values, data = null, formType = 'form'
           }
 
           if (values && values.hasOwnProperty(key)) {
-            values[key].forEach(item => {
-              if (!keys1[item.id]) {
-                create.push(pickInputFields({ schema: value.type[0], values: item, data: item }));
-              }
-            });
+            if (formType === 'batch') {
+              values[key].forEach(item => {
+                if (!keys1[item.id]) {
+                  update.push({
+                    where: { id: 0 },
+                    data: pickInputFields({ schema: value.type[0], values: item, data: item, formType })
+                  });
+                }
+              });
+            } else {
+              values[key].forEach(item => {
+                if (!keys1[item.id]) {
+                  create.push(pickInputFields({ schema: value.type[0], values: item, data: item, formType }));
+                }
+              });
+            }
           }
 
           //console.log('created: ', create);
           //console.log('updated: ', update);
           //console.log('deleted: ', deleted);
 
-          if (data) {
+          if (data || formType === 'batch') {
             inputValues[key] = { create, update, delete: deleted };
           } else {
             inputValues[key] = { create };
diff --git a/packages/client/typings/typings.d.ts b/packages/client/typings/typings.d.ts
index b259290b0e..172c6f589f 100644
--- a/packages/client/typings/typings.d.ts
+++ b/packages/client/typings/typings.d.ts
@@ -1,5 +1,6 @@
 declare var __TEST__: boolean;
 declare var __SERVER__: boolean;
+declare var __SERVER_PORT__: number;
 declare var __CLIENT__: boolean;
 declare var __SSR__: boolean;
 declare var __API_URL__: string;
@@ -13,3 +14,5 @@ interface Window {
 // packages without types
 declare module 'react-native-credit-card-input';
 declare module 'sourcemapped-stacktrace';
+declare module 'stripe-local';
+declare module 'universal-cookie-express';
diff --git a/packages/common/utils.js b/packages/common/utils.js
index 6bb599a6c9..3fbabbe007 100644
--- a/packages/common/utils.js
+++ b/packages/common/utils.js
@@ -61,7 +61,22 @@ export const removeEmpty = (obj, schema = null) => {
   return Object.keys(obj)
     .filter(key => removeBySchema(key, obj, schema))
     .reduce((redObj, key) => {
-      redObj[key] = obj[key];
+      if (schema && schema.values[key] && schema.values[key].type.constructor === Array) {
+        if (obj[key].create && obj[key].create.length > 0) {
+          let tmpObj = obj[key];
+          tmpObj.create[0] = removeEmpty(obj[key].create[0], schema.values[key].type[0]);
+          redObj[key] = tmpObj;
+        } else if (obj[key].update && obj[key].update.length > 0) {
+          let tmpObj = obj[key];
+          tmpObj.update[0].data = removeEmpty(obj[key].update[0].data, schema.values[key].type[0]);
+          redObj[key] = tmpObj;
+        } else {
+          redObj[key] = obj[key];
+        }
+      } else {
+        redObj[key] = obj[key];
+      }
+
       return redObj;
     }, {});
 };

From 4d423703f3d255acb566c62f776862f53dda8a4a Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Mon, 29 Oct 2018 08:37:43 +0100
Subject: [PATCH 282/327] small fix

---
 packages/server/src/sql/crud.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/server/src/sql/crud.js b/packages/server/src/sql/crud.js
index 8bbab7c9c7..1a22721b19 100644
--- a/packages/server/src/sql/crud.js
+++ b/packages/server/src/sql/crud.js
@@ -825,7 +825,8 @@ export default class Crud {
     const query = this.getBaseQuery();
     let normalizedData = {};
     for (const key of Object.keys(data)) {
-      const value = this.schema.values[key];
+      const schemaKey = key.endsWith('Id') ? key.substring(0, key.length - 2) : key;
+      const value = this.schema.values[schemaKey];
       // add fields from one to one relation
       if (value.type.constructor === Array && value.hasOne) {
         const type = value.type[0];
@@ -840,8 +841,8 @@ export default class Crud {
         );
 
         for (const nestedKey of Object.keys(data[key].update[0].data)) {
-          const schemaKey = nestedKey.endsWith('Id') ? nestedKey.substring(0, nestedKey.length - 2) : nestedKey;
-          if (type.values[schemaKey].type.constructor !== Array) {
+          const nestedSchemaKey = nestedKey.endsWith('Id') ? nestedKey.substring(0, nestedKey.length - 2) : nestedKey;
+          if (type.values[nestedSchemaKey].type.constructor !== Array) {
             normalizedData[`${fieldName}.${nestedKey}`] = data[key].update[0].data[nestedKey];
           }
         }

From 17c2ad5497d34d17bb9e06d80f395cc73bdd5a4b Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Mon, 29 Oct 2018 08:38:13 +0100
Subject: [PATCH 283/327] small fix

---
 packages/common/utils.js        | 2 +-
 packages/server/src/sql/crud.js | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/common/utils.js b/packages/common/utils.js
index 3fbabbe007..080a3ccf88 100644
--- a/packages/common/utils.js
+++ b/packages/common/utils.js
@@ -50,7 +50,7 @@ const removeBySchema = (key, obj, schema) => {
   } else {
     const schemaKey = key.endsWith('Id') ? key.substring(0, key.length - 2) : key;
     if (schema.values[schemaKey].type.isSchema) {
-      return obj[key] !== '' && obj[key] !== 0;
+      return obj[key] !== '' && obj[key] !== null;
     } else {
       return obj[key] !== '';
     }
diff --git a/packages/server/src/sql/crud.js b/packages/server/src/sql/crud.js
index 8bbab7c9c7..1a22721b19 100644
--- a/packages/server/src/sql/crud.js
+++ b/packages/server/src/sql/crud.js
@@ -825,7 +825,8 @@ export default class Crud {
     const query = this.getBaseQuery();
     let normalizedData = {};
     for (const key of Object.keys(data)) {
-      const value = this.schema.values[key];
+      const schemaKey = key.endsWith('Id') ? key.substring(0, key.length - 2) : key;
+      const value = this.schema.values[schemaKey];
       // add fields from one to one relation
       if (value.type.constructor === Array && value.hasOne) {
         const type = value.type[0];
@@ -840,8 +841,8 @@ export default class Crud {
         );
 
         for (const nestedKey of Object.keys(data[key].update[0].data)) {
-          const schemaKey = nestedKey.endsWith('Id') ? nestedKey.substring(0, nestedKey.length - 2) : nestedKey;
-          if (type.values[schemaKey].type.constructor !== Array) {
+          const nestedSchemaKey = nestedKey.endsWith('Id') ? nestedKey.substring(0, nestedKey.length - 2) : nestedKey;
+          if (type.values[nestedSchemaKey].type.constructor !== Array) {
             normalizedData[`${fieldName}.${nestedKey}`] = data[key].update[0].data[nestedKey];
           }
         }

From 77ac977261cfa2ad1e7cbd6688b50de893aa88cd Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 9 Nov 2018 09:22:15 +0100
Subject: [PATCH 284/327] update yarn lock

---
 yarn.lock | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 67 insertions(+), 2 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 9950d6fe88..5acbaf3b21 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -966,6 +966,28 @@
     lodash "^4.17.10"
     to-fast-properties "^2.0.0"
 
+"@domain-schema/core@^0.0.34":
+  version "0.0.34"
+  resolved "https://registry.yarnpkg.com/@domain-schema/core/-/core-0.0.34.tgz#5900ae4f0844cb8e7ffa91f5be32bd0417d96429"
+  integrity sha512-XpYSDStMKxMtRQ81DHwNTjN7psCoPp+1PBMEfG4vsroyUVn7zV8K0wGb9AszJaPvdqhIuVQZiWUS04ukCf1Yxw==
+  dependencies:
+    debug "^3.1.0"
+
+"@domain-schema/graphql@^0.0.33":
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/@domain-schema/graphql/-/graphql-0.0.33.tgz#201d8cc5d21a9eba69f2eb8cb1fe44f012381cec"
+  integrity sha512-s81kImrjdwzzXU/nRBdNnw4ujqSAToKApUYUTaDF92vfesWsvmEFKhkYLC9L0tFx2XyAQrMmh+w5zG7lZkBBow==
+  dependencies:
+    debug "^3.1.0"
+
+"@domain-schema/knex@^0.0.35":
+  version "0.0.35"
+  resolved "https://registry.yarnpkg.com/@domain-schema/knex/-/knex-0.0.35.tgz#3ea8fb1fdf57e9c9334843ed8bfa3b4e9e1f03c4"
+  integrity sha512-Qd3Q4MGiSJh7XxodMSTFBSHy0PzoB9DXrvLstsNe0Enn5mi6sYEZ08HYzVgvtdbh6zvpqSARs6aZeWmZgEeydQ==
+  dependencies:
+    debug "^3.1.0"
+    humps "^2.0.1"
+
 "@expo/bunyan@3.0.2":
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/@expo/bunyan/-/bunyan-3.0.2.tgz#775680bd479a8b79ada4a5676936a58eef1579c9"
@@ -5061,6 +5083,13 @@ caseless@~0.12.0:
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
+cast-array@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cast-array/-/cast-array-1.0.1.tgz#264ef1129e5888bc48cac40fe914e9f69b8d189d"
+  integrity sha1-Jk7xEp5YiLxIysQP6RTp9puNGJ0=
+  dependencies:
+    isarray "0.0.1"
+
 chai-http@^4.0.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/chai-http/-/chai-http-4.2.0.tgz#25dc0c0cf9560802f069092ca834a81f04c673bc"
@@ -8820,6 +8849,13 @@ graphql-iso-date@^3.5.0:
   resolved "https://registry.yarnpkg.com/graphql-iso-date/-/graphql-iso-date-3.6.1.tgz#bd2d0dc886e0f954cbbbc496bbf1d480b57ffa96"
   integrity sha512-AwFGIuYMJQXOEAgRlJlFL4H1ncFM8n8XmoVDTNypNOZyQ8LFDG2ppMFlsS862BSTCDcSUfHp8PD3/uJhv7t59Q==
 
+graphql-parse-fields@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/graphql-parse-fields/-/graphql-parse-fields-1.2.0.tgz#c97119a91951b98dcbe656c46a203e966a720f28"
+  integrity sha1-yXEZqRlRuY3L5lbEaiA+lmpyDyg=
+  dependencies:
+    cast-array "^1.0.1"
+
 graphql-resolve-batch@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/graphql-resolve-batch/-/graphql-resolve-batch-1.0.2.tgz#ab069df8ab3410a0188701ed9fa8e382bbb8d6a5"
@@ -10985,7 +11021,7 @@ kleur@^2.0.1:
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-2.0.2.tgz#b704f4944d95e255d038f0cb05fb8a602c55a300"
   integrity sha512-77XF9iTllATmG9lSlIv0qdQ2BQ/h9t0bJllHlbvsQ0zUWfU7Yi0S8L5JXzPZgkefIiajLmBJJ4BsMJmqcf7oxQ==
 
-knex@^0.14.2:
+knex@^0.14.2, knex@^0.14.6:
   version "0.14.6"
   resolved "https://registry.yarnpkg.com/knex/-/knex-0.14.6.tgz#ad57c4ef8fa1b51ebc8c37c2c9b483f6fb34e41e"
   integrity sha512-A+iP8oSSmEF3JbSMfUGuJveqduDMEgyS5E/dO0ycVzAT4EE5askfunk7+37+hPqC951vnbFK/fIiNDaJIjVW0w==
@@ -11009,6 +11045,14 @@ knex@^0.14.2:
     uuid "^3.2.1"
     v8flags "^3.0.2"
 
+knexnest@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/knexnest/-/knexnest-1.0.0.tgz#b8840d13c2692bdd5fa3d5de67a456283d538fce"
+  integrity sha512-pClYHQu04G7yFBCRdwWxG/OPUAw/GR/A1Soqqb/JtcM2TADunt490HFA9+5nx1nC+MnnAIaCVgeAt0yiqBt0Kg==
+  dependencies:
+    knex "^0.14.6"
+    nesthydrationjs "^1.0.5"
+
 lcid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
@@ -11435,6 +11479,11 @@ lodash.isarray@^3.0.0:
   resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
   integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=
 
+lodash.isarray@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-4.0.0.tgz#2aca496b28c4ca6d726715313590c02e6ea34403"
+  integrity sha1-KspJayjEym1yZxUxNZDALm6jRAM=
+
 lodash.isboolean@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
@@ -11489,6 +11538,11 @@ lodash.keys@^3.0.0, lodash.keys@^3.1.2:
     lodash.isarguments "^3.0.0"
     lodash.isarray "^3.0.0"
 
+lodash.keys@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-4.2.0.tgz#a08602ac12e4fb83f91fc1fb7a360a4d9ba35205"
+  integrity sha1-oIYCrBLk+4P5H8H7ejYKTZujUgU=
+
 lodash.map@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3"
@@ -12484,7 +12538,7 @@ modify-values@^1.0.0:
   resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
   integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==
 
-moment@2.x, moment@^2.10.6, moment@^2.19.3, moment@^2.6.0:
+moment@2.x, moment@^2.10.6, moment@^2.19.3, moment@^2.22.2, moment@^2.6.0:
   version "2.22.2"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
   integrity sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=
@@ -12704,6 +12758,17 @@ neo-async@^2.5.0:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.2.tgz#489105ce7bc54e709d736b195f82135048c50fcc"
   integrity sha512-vdqTKI9GBIYcAEbFAcpKPErKINfPF5zIuz3/niBfq8WUZjpT2tytLlFVrBgWdOtqI4uaA/Rb6No0hux39XXDuw==
 
+nesthydrationjs@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/nesthydrationjs/-/nesthydrationjs-1.0.5.tgz#89fe5be87055184461de5a550475ac515491f921"
+  integrity sha512-LnqhV0LfczSX5LTp3UP1QIIyP8iEd0tn5ckslsPsnnbFxHWU25VXmR4cj/Ast/4MuEEYC8hxjrTQSHaZYwmBDQ==
+  dependencies:
+    lodash.isarray "^4.0.0"
+    lodash.isfunction "^3.0.9"
+    lodash.isplainobject "^4.0.6"
+    lodash.keys "^4.2.0"
+    lodash.values "^4.3.0"
+
 next-tick@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"

From cb66c599ac29badcdbcc89a9f11866addef1cfc3 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 9 Nov 2018 11:07:27 +0100
Subject: [PATCH 285/327] add rowClassName to crud ListVew

---
 packages/client/package.json                  |  1 +
 .../common/components/crud/ListView.web.jsx   |  9 +++++
 yarn.lock                                     | 35 ++++++++++++++++---
 3 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index d1a496c73f..b257b6c695 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -81,6 +81,7 @@
     "react-cookie": "^2.2.0",
     "react-datepicker": "^1.5.0",
     "react-debounce-input": "^3.1.0",
+    "react-dnd": "^2.5.4",
     "react-dnd-html5-backend": "^2.5.4",
     "react-dom": "16.5.0",
     "react-dropzone": "^4.2.3",
diff --git a/packages/client/src/modules/common/components/crud/ListView.web.jsx b/packages/client/src/modules/common/components/crud/ListView.web.jsx
index 46f52421c8..c55cd02b15 100644
--- a/packages/client/src/modules/common/components/crud/ListView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/ListView.web.jsx
@@ -118,6 +118,7 @@ class ListView extends React.Component {
     customBatchFields: PropTypes.object,
     customActions: PropTypes.object,
     tableScroll: PropTypes.object,
+    rowClassName: PropTypes.func,
     currentUser: PropTypes.object,
     currentUserLoading: PropTypes.bool,
     parentWait: PropTypes.bool,
@@ -275,6 +276,7 @@ class ListView extends React.Component {
       customBatchFields,
       updateManyEntries,
       tableScroll = null,
+      rowClassName = null,
       tableHeaderColumnHeight
     } = this.props;
     const { selectedRowKeys, wait, error, success } = this.state;
@@ -409,6 +411,13 @@ class ListView extends React.Component {
       };
     }
 
+    if (rowClassName) {
+      tableProps = {
+        ...tableProps,
+        rowClassName
+      };
+    }
+
     // only include this props if table includes rank, taht is used for sorting
     if (schema.keys().includes('rank')) {
       tableProps = {
diff --git a/yarn.lock b/yarn.lock
index 1529d55158..dd2f0b7717 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3477,7 +3477,7 @@ art@^0.10.0, art@^0.10.1:
   resolved "https://registry.yarnpkg.com/art/-/art-0.10.3.tgz#b01d84a968ccce6208df55a733838c96caeeaea2"
   integrity sha512-HXwbdofRTiJT6qZX/FnchtldzJjS3vkLJxQilc3Xj+ma2MXjY4UAyQ0ls1XZYVnDvVIBiFZbC6QsvtW86TD6tQ==
 
-asap@^2.0.0, asap@~2.0.3:
+asap@^2.0.0, asap@^2.0.6, asap@~2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
   integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
@@ -6550,11 +6550,26 @@ dir-glob@^2.0.0:
     arrify "^1.0.1"
     path-type "^3.0.0"
 
+disposables@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/disposables/-/disposables-1.0.2.tgz#36c6a674475f55a2d6913567a601444e487b4b6e"
+  integrity sha1-NsamdEdfVaLWkTVnpgFETkh7S24=
+
 dlv@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.2.tgz#270f6737b30d25b6657a7e962c784403f85137e5"
   integrity sha512-xxD4VSH67GbRvSGUrckvha94RD7hjgOH7rqGxiytLpkaeMvixOHFZTGFK6EkIm3T761OVHT8ABHmGkq9gXgu6Q==
 
+dnd-core@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/dnd-core/-/dnd-core-2.6.0.tgz#12bad66d58742c6e5f7cf2943fb6859440f809c4"
+  integrity sha1-ErrWbVh0LG5ffPKUP7aFlED4CcQ=
+  dependencies:
+    asap "^2.0.6"
+    invariant "^2.0.0"
+    lodash "^4.2.0"
+    redux "^3.7.1"
+
 dns-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
@@ -9222,7 +9237,7 @@ hoist-non-react-statics@^1.0.5:
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb"
   integrity sha1-qkSM8JhtVcxAdzsXF0t90GbLfPs=
 
-hoist-non-react-statics@^2.2.0, hoist-non-react-statics@^2.2.1, hoist-non-react-statics@^2.2.2, hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0, hoist-non-react-statics@^2.5.5:
+hoist-non-react-statics@^2.1.0, hoist-non-react-statics@^2.2.0, hoist-non-react-statics@^2.2.1, hoist-non-react-statics@^2.2.2, hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0, hoist-non-react-statics@^2.5.5:
   version "2.5.5"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
   integrity sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==
@@ -9788,7 +9803,7 @@ intersperse@^1.0.0:
   resolved "https://registry.yarnpkg.com/intersperse/-/intersperse-1.0.0.tgz#f2561fb1cfef9f5277cc3347a22886b4351a5181"
   integrity sha1-8lYfsc/vn1J3zDNHoiiGtDUaUYE=
 
-invariant@^2.0.0, invariant@^2.2.0, invariant@^2.2.1, invariant@^2.2.2, invariant@^2.2.4:
+invariant@^2.0.0, invariant@^2.1.0, invariant@^2.2.0, invariant@^2.2.1, invariant@^2.2.2, invariant@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
   integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
@@ -15162,6 +15177,18 @@ react-dnd-html5-backend@^2.5.4:
   dependencies:
     lodash "^4.2.0"
 
+react-dnd@^2.5.4:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/react-dnd/-/react-dnd-2.6.0.tgz#7fa25676cf827d58a891293e3c1ab59da002545a"
+  integrity sha1-f6JWds+CfViokSk+PBq1naACVFo=
+  dependencies:
+    disposables "^1.0.1"
+    dnd-core "^2.6.0"
+    hoist-non-react-statics "^2.1.0"
+    invariant "^2.1.0"
+    lodash "^4.2.0"
+    prop-types "^15.5.10"
+
 react-dom@16.5.0:
   version "16.5.0"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.5.0.tgz#57704e5718669374b182a17ea79a6d24922cb27d"
@@ -16145,7 +16172,7 @@ redux-logger@^2.7.4:
     loose-envify "^1.1.0"
     symbol-observable "^1.2.0"
 
-redux@^3.6.0:
+redux@^3.6.0, redux@^3.7.1:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/redux/-/redux-3.7.2.tgz#06b73123215901d25d065be342eb026bc1c8537b"
   integrity sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A==

From 794f299c82643c1e8f80fc387c903f89b9915d86 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 15 Nov 2018 10:03:06 +0100
Subject: [PATCH 286/327] fix update schema

---
 tools/cli/commands/updateSchema.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tools/cli/commands/updateSchema.js b/tools/cli/commands/updateSchema.js
index d5bfe1aa05..24a54bbaac 100644
--- a/tools/cli/commands/updateSchema.js
+++ b/tools/cli/commands/updateSchema.js
@@ -57,7 +57,7 @@ function updateModule(logger, moduleName, location) {
           if (hasTypeOf(Date)) {
             inputFilter += `  ${key}_lte: ${generateField(value, true)}\n`;
             inputFilter += `  ${key}_gte: ${generateField(value, true)}\n`;
-          } else if (hasTypeOf(String)) {
+          } else if (key === 'id' || hasTypeOf(String)) {
             inputFilter += `  ${key}: ${generateField(value, true)}\n`;
             inputFilter += `  ${key}_in: [${generateField(value, true)}!]\n`;
             inputFilter += `  ${key}_contains: ${generateField(value, true)}\n`;
@@ -200,7 +200,7 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
       const file = `${Module}State.client.graphql`;
 
       // regenerate graphql fragment
-      let graphql = '    searchText,\n';
+      let graphql = '    searchText\n';
       for (const key of schema.keys()) {
         const value = schema.values[key];
         const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
@@ -218,8 +218,7 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
           }
         }
       }
-      graphql += `
-  }\n`;
+      graphql += `  }\n`;
 
       shell.cd(pathStateClient);
       // override graphql fragment file
@@ -266,7 +265,7 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
         .ShellString(
           shell
             .cat(file)
-            .replace(RegExp(replaceStateResolverDefaults, 'g'), `// filter data\n${defaults}// end filter data`)
+            .replace(RegExp(replaceStateResolverDefaults, 'g'), `// filter data\n${defaults}\n// end filter data`)
         )
         .to(file);
       runPrettier(file);

From 5ea4e8c7d7bb172705ee59eb70211f5566762a2a Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 16 Nov 2018 14:48:11 +0100
Subject: [PATCH 287/327] crud: update to latest

---
 .../server/src/modules/user/schema.graphql    |  12 +-
 packages/server/src/sql/crud.js               | 160 +++++++++++++-----
 tools/cli/CommandInvoker.js                   |   2 +-
 tools/cli/commands/updateSchema.js            |   2 +-
 4 files changed, 124 insertions(+), 52 deletions(-)

diff --git a/packages/server/src/modules/user/schema.graphql b/packages/server/src/modules/user/schema.graphql
index 8a7873dee9..8993f33dfa 100644
--- a/packages/server/src/modules/user/schema.graphql
+++ b/packages/server/src/modules/user/schema.graphql
@@ -1,7 +1,13 @@
+enum Role {
+  admin
+  editor
+  user
+}
+
 type User {
   id: Int!
   username: String!
-  role: String!
+  role: Role!
   isActive: Boolean
   email: String!
   profile: UserProfile
@@ -126,7 +132,7 @@ input AddUserInput {
   username: String!
   email: String!
   password: String!
-  role: String!
+  role: Role!
   isActive: Boolean
   profile: ProfileInput
   auth: AuthInput
@@ -136,7 +142,7 @@ input AddUserInput {
 input EditUserInput {
   id: Int!
   username: String!
-  role: String!
+  role: Role!
   isActive: Boolean
   email: String!
   password: String
diff --git a/packages/server/src/sql/crud.js b/packages/server/src/sql/crud.js
index 1a22721b19..189e741227 100644
--- a/packages/server/src/sql/crud.js
+++ b/packages/server/src/sql/crud.js
@@ -667,7 +667,39 @@ export default class Crud {
     }
   }
 
-  _update({ data, where }) {
+  _update({ data, where }, ctx) {
+    // extract nested entries from data
+    let nestedEntries = [];
+    for (const key of this.schema.keys()) {
+      const value = this.schema.values[key];
+      if (value.type.constructor === Array && data[key]) {
+        nestedEntries.push({ key: value.type[0].name, data: data[key] });
+        delete data[key];
+      }
+    }
+
+    // create, update, delete nested entries
+    if (nestedEntries.length > 0) {
+      nestedEntries.map(nested => {
+        if (nested.data.create) {
+          nested.data.create.map(async create => {
+            create[`${this.getTableName()}Id`] = where.id;
+            await ctx[pascalize(nested.key)]._create(create);
+          });
+        }
+        if (nested.data.update) {
+          nested.data.update.map(async update => {
+            await ctx[pascalize(nested.key)]._update(update, ctx);
+          });
+        }
+        if (nested.data.delete) {
+          nested.data.delete.map(async where => {
+            await ctx[pascalize(nested.key)]._delete({ where });
+          });
+        }
+      });
+    }
+
     return knex(this.getFullTableName())
       .update(decamelizeKeys(this.normalizeFields(data)))
       .where(where);
@@ -678,39 +710,7 @@ export default class Crud {
       const e = new FieldError();
       e.throwIf();
 
-      // extract nested entries from data
-      let nestedEntries = [];
-      for (const key of this.schema.keys()) {
-        const value = this.schema.values[key];
-        if (value.type.constructor === Array && args.data[key]) {
-          nestedEntries.push({ key: value.type[0].name, data: args.data[key] });
-          delete args.data[key];
-        }
-      }
-
-      await this._update(args);
-
-      // create, update, delete nested entries
-      if (nestedEntries.length > 0) {
-        nestedEntries.map(nested => {
-          if (nested.data.create) {
-            nested.data.create.map(async create => {
-              create[`${this.getTableName()}Id`] = args.where.id;
-              await ctx[pascalize(nested.key)]._create(create);
-            });
-          }
-          if (nested.data.update) {
-            nested.data.update.map(async update => {
-              await ctx[pascalize(nested.key)]._update(update);
-            });
-          }
-          if (nested.data.delete) {
-            nested.data.delete.map(async where => {
-              await ctx[pascalize(nested.key)]._delete({ where });
-            });
-          }
-        });
-      }
+      await this._update(args, ctx);
 
       return await this.get(args, info);
     } catch (e) {
@@ -821,38 +821,103 @@ export default class Crud {
     }
   }
 
-  _updateMany({ data, where: { id_in } }) {
-    const query = this.getBaseQuery();
+  async _updateMany({ data, where: { id_in } }) {
+    // console.log('_updateMany:', data);
     let normalizedData = {};
     for (const key of Object.keys(data)) {
       const schemaKey = key.endsWith('Id') ? key.substring(0, key.length - 2) : key;
       const value = this.schema.values[schemaKey];
       // add fields from one to one relation
       if (value.type.constructor === Array && value.hasOne) {
+        let normalizedNestedData = {};
         const type = value.type[0];
         const fieldName = decamelize(key);
         const prefix = type.__.tablePrefix ? type.__.tablePrefix : '';
         const suffix = value.noIdSuffix ? '' : '_id';
         const foreignTableName = decamelize(type.__.tableName ? type.__.tableName : type.name);
-        query.leftJoin(
-          `${prefix}${foreignTableName} as ${fieldName}`,
-          `${fieldName}.id`,
-          `${fieldName}.${this.getTableName()}${suffix}`
-        );
+
+        // get ids of one to one entity
+        const ids = await knex
+          .select('id')
+          .from(`${prefix}${foreignTableName}`)
+          .whereIn(`${this.getTableName()}${suffix}`, id_in)
+          .reduce((array, value) => {
+            array.push(value.id);
+            return array;
+          }, []);
+        // console.log('ids:', ids);
 
         for (const nestedKey of Object.keys(data[key].update[0].data)) {
           const nestedSchemaKey = nestedKey.endsWith('Id') ? nestedKey.substring(0, nestedKey.length - 2) : nestedKey;
           if (type.values[nestedSchemaKey].type.constructor !== Array) {
-            normalizedData[`${fieldName}.${nestedKey}`] = data[key].update[0].data[nestedKey];
+            normalizedNestedData[nestedKey] = data[key].update[0].data[nestedKey];
+          } else {
+            // add new entries for many to many properties
+            if (Object.keys(data[key].update[0].data[nestedKey].update[0].data).length > 0) {
+              const nestedType = type.values[nestedSchemaKey].type[0];
+
+              // console.log('nestedKey:', nestedKey);
+              // console.log('type:', nestedType.name);
+              // console.log('tableName:', nestedType.__.tableName);
+
+              const nestedTableName = `${nestedType.__.tablePrefix}${decamelize(
+                nestedType.__.tableName ? nestedType.__.tableName : nestedType.name
+              )}`;
+
+              // get related field
+              let nestedChildId = null;
+              let nestedChildValue = null;
+              for (const nestedChildKey of Object.keys(data[key].update[0].data[nestedKey].update[0].data)) {
+                if (nestedChildKey.endsWith('Id')) {
+                  nestedChildId = decamelize(nestedChildKey);
+                  nestedChildValue = data[key].update[0].data[nestedKey].update[0].data[nestedChildKey];
+                }
+              }
+
+              if (nestedChildId) {
+                // console.log('nestedTableName:', nestedTableName);
+                // console.log('nestedChildId:', nestedChildId);
+                // console.log('nestedChildValue:', nestedChildValue);
+                // console.log('field name:', `${fieldName}${suffix}`);
+                // console.log('ids:', ids);
+                // delete all existing records for this property
+                await knex(nestedTableName)
+                  .whereIn(`${fieldName}${suffix}`, ids)
+                  .andWhere(nestedChildId, '=', nestedChildValue)
+                  .del();
+
+                // insert new entries for all selected records
+                for (const id of ids) {
+                  let insertFields = decamelizeKeys(data[key].update[0].data[nestedKey].update[0].data);
+                  insertFields[`${fieldName}${suffix}`] = id;
+                  // console.log('insertFields:', insertFields);
+                  await knex(nestedTableName).insert(insertFields);
+                }
+              }
+            }
           }
         }
+
+        if (Object.keys(normalizedNestedData).length > 0) {
+          normalizedNestedData = decamelizeKeys(this.normalizeFields(normalizedNestedData));
+          // console.log('normalizedNestedData:', normalizedNestedData);
+          return knex(`${prefix}${foreignTableName}`)
+            .update(normalizedNestedData)
+            .whereIn('id', ids);
+        }
       } else {
         normalizedData[`${this.getTableName()}.${key}`] = data[key];
       }
     }
 
-    normalizedData = decamelizeKeys(this.normalizeFields(normalizedData));
-    return query.update(normalizedData).whereIn(`${this.getTableName()}.id`, id_in);
+    if (Object.keys(normalizedData).length > 0) {
+      normalizedData = decamelizeKeys(this.normalizeFields(normalizedData));
+      return this.getBaseQuery()
+        .update(normalizedData)
+        .whereIn(`${this.getTableName()}.id`, id_in);
+    } else {
+      return 1;
+    }
   }
 
   async updateMany(args) {
@@ -911,10 +976,11 @@ export default class Crud {
 
   async getByIds(ids, by, Obj, info) {
     info = parseFields(info);
-    info[`${by}Id`] = true;
+    const remoteId = by !== 'id' ? `${by}Id` : by;
+    info[remoteId] = true;
     const baseQuery = knex(`${Obj.getFullTableName()} as ${Obj.getTableName()}`);
     const select = selectBy(Obj.getSchema(), info, false);
-    const res = await knexnest(select(baseQuery).whereIn(`${Obj.getTableName()}.${decamelize(by)}_id`, ids));
-    return orderedFor(res, ids, `${by}Id`, false);
+    const res = await knexnest(select(baseQuery).whereIn(`${Obj.getTableName()}.${decamelize(remoteId)}`, ids));
+    return orderedFor(res, ids, remoteId, false);
   }
 }
diff --git a/tools/cli/CommandInvoker.js b/tools/cli/CommandInvoker.js
index 09a2f29d35..b36492fa72 100644
--- a/tools/cli/CommandInvoker.js
+++ b/tools/cli/CommandInvoker.js
@@ -1,4 +1,4 @@
-const { CRUD_TEMPLATES, MODULE_TEMPLATES } = require('./config');
+const { MODULE_TEMPLATES, CRUD_TEMPLATES } = require('./config');
 
 /**
  * Class CommandInvoker. Takes all CLI operations and calls certain CLI operation depends of variables.
diff --git a/tools/cli/commands/updateSchema.js b/tools/cli/commands/updateSchema.js
index 244c50fc91..4d6712a456 100644
--- a/tools/cli/commands/updateSchema.js
+++ b/tools/cli/commands/updateSchema.js
@@ -57,7 +57,7 @@ function updateModule(logger, moduleName, location) {
           if (hasTypeOf(Date)) {
             inputFilter += `  ${key}_lte: ${generateField(value, true)}\n`;
             inputFilter += `  ${key}_gte: ${generateField(value, true)}\n`;
-          } else if (hasTypeOf(String)) {
+          } else if (key === 'id' || hasTypeOf(String)) {
             inputFilter += `  ${key}: ${generateField(value, true)}\n`;
             inputFilter += `  ${key}_in: [${generateField(value, true)}!]\n`;
             inputFilter += `  ${key}_contains: ${generateField(value, true)}\n`;

From cd1b504b3e14298260f4b3c2b843b650d8f25cc0 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 16 Nov 2018 14:53:52 +0100
Subject: [PATCH 288/327] crud: update to latest

---
 .../client/src/modules/common/util.web.jsx    | 30 ++++++++++++-------
 packages/client/src/utils/crud.js             |  9 ++++--
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/packages/client/src/modules/common/util.web.jsx b/packages/client/src/modules/common/util.web.jsx
index d790eb29ee..9e18566a7f 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/packages/client/src/modules/common/util.web.jsx
@@ -55,8 +55,7 @@ export const createColumnFields = ({
   for (const key of keys) {
     const role = customFields && customFields[key] && customFields[key].role ? customFields[key].role : false;
 
-    const hasRole =
-      currentUser && (!role || (Array.isArray(role) ? role : [role]).indexOf(currentUser.role) >= 0) ? true : false;
+    const customFieldsHasRole = hasRole(role, currentUser);
 
     if (schema.values[key]) {
       const value = schema.values[key];
@@ -68,7 +67,7 @@ export const createColumnFields = ({
         </a>
       );
 
-      if (hasRole && value.show !== false && (key !== 'id' || customFields['id'])) {
+      if (customFieldsHasRole && value.show !== false && (key !== 'id' || customFields['id'])) {
         if (value.type.isSchema) {
           let column = 'name';
           for (const remoteKey of value.type.keys()) {
@@ -162,7 +161,7 @@ export const createColumnFields = ({
         }
       }
     } else {
-      if (hasRole) {
+      if (customFieldsHasRole) {
         columns.push(
           createColumnField(
             key,
@@ -264,12 +263,22 @@ export const createFormFields = ({
         if (formType === 'form') {
           if (values[key]) {
             fields.push(
-              createFormFieldsArray(key, values, value, type, handleChange, handleBlur, formItemLayout, formType)
+              createFormFieldsArray(
+                key,
+                values,
+                value,
+                type,
+                handleChange,
+                handleBlur,
+                formItemLayout,
+                prefix,
+                formType
+              )
             );
           }
-        } else if (formType === 'batch' && value.hasOne) {
+        } else if (formType === 'batch') {
           fields.push(
-            createFormFieldsArray(key, values, value, type, handleChange, handleBlur, formItemLayout, formType)
+            createFormFieldsArray(key, values, value, type, handleChange, handleBlur, formItemLayout, prefix, formType)
           );
         }
       }
@@ -404,12 +413,13 @@ const createFormFieldsArray = (
   handleChange,
   handleBlur,
   formItemLayout,
+  prefix = '',
   formType = 'form'
 ) => {
   return (
     <FieldArray
-      name={key}
-      key={key}
+      name={`${prefix}${key}`}
+      key={`${prefix}${key}`}
       render={({ push, remove }) => {
         return (
           <FormItem {...formItemLayout} label={startCase(key)}>
@@ -421,7 +431,7 @@ const createFormFieldsArray = (
                   schema: type,
                   values: mapFormPropsToValues({ schema: type, data: field }),
                   formItemLayout: formItemLayout,
-                  prefix: `${key}[${index}].`,
+                  prefix: `${prefix}${key}[${index}].`,
                   formType
                 })}
                 {!value.hasOne &&
diff --git a/packages/client/src/utils/crud.js b/packages/client/src/utils/crud.js
index 0223381ada..287e695b15 100644
--- a/packages/client/src/utils/crud.js
+++ b/packages/client/src/utils/crud.js
@@ -55,7 +55,8 @@ export const pickInputFields = ({ schema, values, data = null, formType = 'form'
   let inputValues = {};
   //console.log('pickInputFields');
   //console.log('formType:', formType);
-  //console.log(values);
+  // console.log('values:', values);
+  // console.log('data:', data);
 
   for (const key of schema.keys()) {
     const value = schema.values[key];
@@ -122,9 +123,10 @@ export const pickInputFields = ({ schema, values, data = null, formType = 'form'
                 deleted.push({ id: item.id });
               } else {
                 if (!isEqual(obj, item)) {
+                  const dataObj = keys1[item.id];
                   update.push({
                     where: { id: obj.id },
-                    data: pickInputFields({ schema: value.type[0], values: obj, data: obj, formType })
+                    data: pickInputFields({ schema: value.type[0], values: obj, data: dataObj, formType })
                   });
                 }
               }
@@ -135,9 +137,10 @@ export const pickInputFields = ({ schema, values, data = null, formType = 'form'
             if (formType === 'batch') {
               values[key].forEach(item => {
                 if (!keys1[item.id]) {
+                  const dataObj = keys1[item.id];
                   update.push({
                     where: { id: 0 },
-                    data: pickInputFields({ schema: value.type[0], values: item, data: item, formType })
+                    data: pickInputFields({ schema: value.type[0], values: item, data: dataObj, formType })
                   });
                 }
               });

From a5bec935c2dbde57625eb41bf4f06b8b85856e2b Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Mon, 19 Nov 2018 09:58:48 +0100
Subject: [PATCH 289/327] load next 25, 50, 100, all, change limit

---
 .../common/components/crud/ListView.web.jsx   | 26 ++++++++++++++++---
 .../crud/client/containers/ModuleList.jsx     | 11 +++++++-
 .../client/graphql/UpdateLimit.client.graphql |  5 ++++
 .../templates/crud/client/resolvers/index.js  | 16 ++++++++++++
 4 files changed, 53 insertions(+), 5 deletions(-)
 create mode 100644 tools/templates/crud/client/graphql/UpdateLimit.client.graphql

diff --git a/packages/client/src/modules/common/components/crud/ListView.web.jsx b/packages/client/src/modules/common/components/crud/ListView.web.jsx
index c55cd02b15..7b2b1273a9 100644
--- a/packages/client/src/modules/common/components/crud/ListView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/ListView.web.jsx
@@ -176,11 +176,29 @@ class ListView extends React.Component {
   };
 
   renderLoadMore = (data, loadMoreRows) => {
-    if (data.pageInfo.hasNextPage) {
+    const leftToLoad = data.pageInfo.totalCount - data.edges.length;
+    if (data.pageInfo.hasNextPage && leftToLoad > 0) {
       return (
-        <Button id="load-more" color="primary" onClick={loadMoreRows}>
-          Load more ...
-        </Button>
+        <span>
+          {leftToLoad > 25 && (
+            <Button id="load-more" color="primary" onClick={() => loadMoreRows(25)}>
+              Load next 25
+            </Button>
+          )}
+          {leftToLoad > 50 && (
+            <Button id="load-more" color="primary" style={{ marginLeft: '5px' }} onClick={() => loadMoreRows(50)}>
+              Load next 50
+            </Button>
+          )}
+          {leftToLoad > 100 && (
+            <Button id="load-more" color="primary" style={{ marginLeft: '5px' }} onClick={() => loadMoreRows(100)}>
+              Load next 100
+            </Button>
+          )}
+          <Button id="load-more" color="primary" style={{ marginLeft: '5px' }} onClick={() => loadMoreRows(leftToLoad)}>
+            Load all ({leftToLoad})
+          </Button>
+        </span>
       );
     }
   };
diff --git a/tools/templates/crud/client/containers/ModuleList.jsx b/tools/templates/crud/client/containers/ModuleList.jsx
index ce0f457deb..bf562b765f 100644
--- a/tools/templates/crud/client/containers/ModuleList.jsx
+++ b/tools/templates/crud/client/containers/ModuleList.jsx
@@ -9,6 +9,7 @@ import { updateEntry, deleteEntry } from '../../../utils/crud';
 import { $Module$Schema } from '../../../../../server/src/modules/$module$/schema';
 
 import $MODULE$_STATE_QUERY from '../graphql/$Module$StateQuery.client.graphql';
+import UPDATE_LIMIT from '../graphql/UpdateLimit.client.graphql';
 import UPDATE_ORDER_BY from '../graphql/UpdateOrderBy.client.graphql';
 import $MODULE$S_QUERY from '../graphql/$Module$sQuery.graphql';
 import UPDATE_$MODULE$ from '../graphql/Update$Module$.graphql';
@@ -102,9 +103,10 @@ export default compose(
       };
     },
     props: ({ data: { loading, $module$sConnection, refetch, error, fetchMore, subscribeToMore } }) => {
-      const loadMoreRows = () => {
+      const loadMoreRows = limit => {
         return fetchMore({
           variables: {
+            limit,
             offset: $module$sConnection.edges.length
           },
           updateQuery: (previousResult, { fetchMoreResult }) => {
@@ -205,6 +207,13 @@ export default compose(
       }
     })
   }),
+  graphql(UPDATE_LIMIT, {
+    props: ({ mutate }) => ({
+      onLimit: limit => {
+        mutate({ variables: { limit } });
+      }
+    })
+  }),
   graphql(UPDATE_ORDER_BY, {
     props: ({ mutate }) => ({
       onOrderBy: orderBy => {
diff --git a/tools/templates/crud/client/graphql/UpdateLimit.client.graphql b/tools/templates/crud/client/graphql/UpdateLimit.client.graphql
new file mode 100644
index 0000000000..91ad8bef0b
--- /dev/null
+++ b/tools/templates/crud/client/graphql/UpdateLimit.client.graphql
@@ -0,0 +1,5 @@
+#import "./$Module$State.client.graphql"
+
+mutation update$Module$Limit($limit: Int!) {
+  update$Module$Limit(limit: $limit) @client
+}
diff --git a/tools/templates/crud/client/resolvers/index.js b/tools/templates/crud/client/resolvers/index.js
index ef01279968..c9f457eecf 100644
--- a/tools/templates/crud/client/resolvers/index.js
+++ b/tools/templates/crud/client/resolvers/index.js
@@ -34,6 +34,22 @@ const defaults = {
 
 const resolvers = {
   Mutation: {
+    update$Module$Limit: (_, { limit }, { cache }) => {
+      const { $module$State } = cache.readQuery({ query: $MODULE$_STATE_QUERY });
+
+      const new$Module$State = update($module$State, {
+        limit: { $set: limit }
+      });
+
+      cache.writeData({
+        data: {
+          $module$State: new$Module$State,
+          __type: TYPE_$MODULE$_STATE
+        }
+      });
+
+      return null;
+    },
     update$Module$OrderBy: (_, { orderBy }, { cache }) => {
       const { $module$State } = cache.readQuery({ query: $MODULE$_STATE_QUERY });
 

From 976facbaf51d7ed2cad9cc3b14a9a024fc8563ed Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Mon, 19 Nov 2018 10:17:27 +0100
Subject: [PATCH 290/327] small fix

---
 .../client/src/modules/common/components/crud/ListView.web.jsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/modules/common/components/crud/ListView.web.jsx b/packages/client/src/modules/common/components/crud/ListView.web.jsx
index 7b2b1273a9..33e4adecdd 100644
--- a/packages/client/src/modules/common/components/crud/ListView.web.jsx
+++ b/packages/client/src/modules/common/components/crud/ListView.web.jsx
@@ -176,7 +176,7 @@ class ListView extends React.Component {
   };
 
   renderLoadMore = (data, loadMoreRows) => {
-    const leftToLoad = data.pageInfo.totalCount - data.edges.length;
+    const leftToLoad = data.edges ? data.pageInfo.totalCount - data.edges.length : data.pageInfo.totalCount;
     if (data.pageInfo.hasNextPage && leftToLoad > 0) {
       return (
         <span>

From 2fb927727ab5d24bf973d02b3c46504afb6d7fbd Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 22 Nov 2018 15:36:16 +0100
Subject: [PATCH 291/327] update to latest cli-crud

---
 packages/server/src/sql/crud.js    | 120 ++++++++++++++++++-----------
 tools/cli/commands/updateSchema.js |   8 +-
 2 files changed, 80 insertions(+), 48 deletions(-)

diff --git a/packages/server/src/sql/crud.js b/packages/server/src/sql/crud.js
index 189e741227..7f9d8013af 100644
--- a/packages/server/src/sql/crud.js
+++ b/packages/server/src/sql/crud.js
@@ -489,73 +489,103 @@ export default class Crud {
       queryBuilder.orderBy(`${this.getTableName()}.id`);
     }
 
-    this._filter(filter, queryBuilder);
+    this._filter(filter, this.schema, queryBuilder, this.getTableName());
 
     return knexnest(queryBuilder);
   }
 
-  _filter(filter, queryBuilder) {
-    const tableName = this.getTableName();
-
+  _filter(filter, schema, queryBuilder, tableName) {
     if (!_.isEmpty(filter)) {
-      const addFilterWhere = this.schemaIterator((filterKey, value, isSchema, _this, tableName, filter) => {
-        const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
+      const addFilterWhere = this.schemaIterator(
+        (filterKey, value, isSchema, isArray, _this, tableName, schema, filter) => {
+          const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
+          if (hasTypeOf(Date)) {
+            if (filter[`${filterKey}_lte`]) {
+              const filterValue_lte = moment(filter[`${filterKey}_lte`]).format(dateFormat);
+              _this.andWhere(`${tableName}.${decamelize(filterKey)}`, '>=', `${filterValue_lte}`);
+            }
+            if (filter[`${filterKey}_gte`]) {
+              const filterValue_gte = moment(filter[`${filterKey}_gte`]).format(dateFormat);
+              _this.andWhere(`${tableName}.${decamelize(filterKey)}`, '<=', `${filterValue_gte}`);
+            }
+          } else if (hasTypeOf(Boolean)) {
+            if (_.has(filter, filterKey)) {
+              _this.andWhere(`${tableName}.${decamelize(filterKey)}`, '=', `${+filter[filterKey]}`);
+            }
+          } else if (isArray) {
+            // do nothing
+          } else {
+            const tableColumn = isSchema ? `${decamelize(filterKey)}_id` : decamelize(filterKey);
 
-        if (hasTypeOf(Date)) {
-          if (filter[`${filterKey}_lte`]) {
-            const filterValue_lte = moment(filter[`${filterKey}_lte`]).format(dateFormat);
-            _this.andWhere(`${tableName}.${decamelize(filterKey)}`, '>=', `${filterValue_lte}`);
-          }
-          if (filter[`${filterKey}_gte`]) {
-            const filterValue_gte = moment(filter[`${filterKey}_gte`]).format(dateFormat);
-            _this.andWhere(`${tableName}.${decamelize(filterKey)}`, '<=', `${filterValue_gte}`);
-          }
-        } else if (hasTypeOf(Boolean)) {
-          if (_.has(filter, filterKey)) {
-            _this.andWhere(`${tableName}.${decamelize(filterKey)}`, '=', `${+filter[filterKey]}`);
-          }
-        } else {
-          const tableColumn = isSchema ? `${decamelize(filterKey)}_id` : decamelize(filterKey);
+            const filterValue = isSchema ? filter[`${filterKey}Id`] : filter[filterKey];
+            if (filterValue) {
+              _this.andWhere(`${tableName}.${tableColumn}`, '=', `${filterValue}`);
+            }
 
-          const filterValue = isSchema ? filter[`${filterKey}Id`] : filter[filterKey];
-          if (filterValue) {
-            _this.andWhere(`${tableName}.${tableColumn}`, '=', `${filterValue}`);
-          }
+            const filterValueIn = isSchema ? filter[`${filterKey}Id_in`] : filter[`${filterKey}_in`];
+            if (filterValueIn) {
+              _this.whereIn(`${tableName}.${tableColumn}`, filterValueIn);
+            }
 
-          const filterValueIn = isSchema ? filter[`${filterKey}Id_in`] : filter[`${filterKey}_in`];
-          if (filterValueIn) {
-            _this.whereIn(`${tableName}.${tableColumn}`, filterValueIn);
-          }
+            const filterValueContains = isSchema ? filter[`${filterKey}Id_contains`] : filter[`${filterKey}_contains`];
+            if (filterValueContains) {
+              _this.andWhere(`${tableName}.${tableColumn}`, 'like', `%${filterValueContains}%`);
+            }
 
-          const filterValueContains = isSchema ? filter[`${filterKey}Id_contains`] : filter[`${filterKey}_contains`];
-          if (filterValueContains) {
-            _this.andWhere(`${tableName}.${tableColumn}`, 'like', `%${filterValueContains}%`);
+            const filterValueGt = isSchema ? filter[`${filterKey}Id_gt`] : filter[`${filterKey}_gt`];
+            if (_.isString(filterValueGt) || _.isNumber(filterValueGt)) {
+              _this.andWhere(`${tableName}.${tableColumn}`, '>', filterValueGt);
+            }
           }
         }
-      });
+      );
+
+      for (const key of schema.keys()) {
+        const value = schema.values[key];
+        const isArray = value.type.constructor === Array;
+        if (isArray && filter[key]) {
+          const type = value.type[0];
+          const fieldName = decamelize(key);
+          const prefix = type.__.tablePrefix ? type.__.tablePrefix : '';
+          const foreignTableName = decamelize(type.__.tableName ? type.__.tableName : type.name);
+          const baseTableName = decamelize(schema.name);
+          const suffix = value.noIdSuffix ? '' : '_id';
+
+          queryBuilder.leftJoin(
+            `${prefix}${foreignTableName} as ${fieldName}`,
+            `${baseTableName}.id`,
+            `${fieldName}.${baseTableName}${suffix}`
+          );
+
+          this._filter(filter[key], value.type[0], queryBuilder, fieldName);
+        }
+      }
 
       queryBuilder.where(function() {
-        addFilterWhere(this, tableName, filter);
+        addFilterWhere(this, tableName, schema, filter);
       });
       if (filter.searchText) {
-        const addSearchTextWhere = this.schemaIterator((key, value, isSchema, _this, tableName, filter) => {
-          if (value.searchText) {
-            _this.orWhere(`${tableName}.${decamelize(key)}`, 'like', `%${filter.searchText}%`);
+        const addSearchTextWhere = this.schemaIterator(
+          (key, value, isSchema, isArray, _this, tableName, schema, filter) => {
+            if (value.searchText) {
+              _this.orWhere(`${tableName}.${decamelize(key)}`, 'like', `%${filter.searchText}%`);
+            }
           }
-        });
+        );
         queryBuilder.where(function() {
-          addSearchTextWhere(this, tableName, filter);
+          addSearchTextWhere(this, tableName, schema, filter);
         });
       }
     }
   }
 
   schemaIterator = fn => {
-    return (...args) => {
-      for (const key of this.schema.keys()) {
-        const value = this.schema.values[key];
+    return (_this, tableName, schema, filter) => {
+      for (const key of schema.keys()) {
+        const value = schema.values[key];
         const isSchema = value.type.isSchema;
-        fn(key, value, isSchema, ...args);
+        const isArray = value.type.constructor === Array;
+        fn(key, value, isSchema, isArray, _this, tableName, schema, filter);
       }
     };
   };
@@ -579,11 +609,11 @@ export default class Crud {
 
   getTotal(args = {}) {
     const queryBuilder = knex(`${this.getFullTableName()} as ${this.getTableName()}`)
-      .countDistinct('id as count')
+      .countDistinct(`${this.getTableName()}.id as count`)
       .first();
 
     if (args.filter) {
-      this._filter(args.filter, queryBuilder);
+      this._filter(args.filter, this.schema, queryBuilder, this.getTableName());
     }
     return queryBuilder;
   }
diff --git a/tools/cli/commands/updateSchema.js b/tools/cli/commands/updateSchema.js
index 4d6712a456..0a55558fbd 100644
--- a/tools/cli/commands/updateSchema.js
+++ b/tools/cli/commands/updateSchema.js
@@ -5,7 +5,7 @@ const GraphQLGenerator = require('@domain-schema/graphql').default;
 const { pascalize, camelize } = require('humps');
 
 const { BASE_PATH } = require('../config');
-const { generateField } = require('../helpers/util');
+const { generateField, runPrettier } = require('../helpers/util');
 const schemas = require('../../../packages/server/src/modules/common/generatedSchemas');
 
 /**
@@ -67,7 +67,7 @@ function updateModule(logger, moduleName, location) {
         } else if (value.type.constructor === Array && value.type[0].isSchema) {
           inputCreate += `  ${key}: ${pascalize(key)}CreateManyInput\n`;
           inputUpdate += `  ${key}: ${pascalize(key)}UpdateManyInput\n`;
-
+          inputFilter += `  ${key}: ${pascalize(value.type[0].name)}FilterInput\n`;
           manyInput += `
 
 input ${pascalize(key)}CreateManyInput {
@@ -137,8 +137,9 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
         const value = schema.values[key];
         if (value.type.constructor === Array) {
           hasBatchResolvers = true;
+          const remoteField = value.remoteField ? camelize(value.remoteField) : camelize(schema.name);
           replace += `    ${key}: createBatchResolver((sources, args, ctx, info) => {
-      return ctx.${schema.name}.getByIds(sources.map(({ id }) => id), '${camelize(schema.name)}', ctx.${
+      return ctx.${schema.name}.getByIds(sources.map(({ id }) => id), '${remoteField}', ctx.${
             value.type[0].name
           }, info);
     }),
@@ -161,6 +162,7 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
             )
         )
         .to(resolverFile);
+      runPrettier(resolverFile);
 
       logger.info(chalk.green(`✔ Resolver in ${pathSchema}${resolverFile} successfully updated!`));
     } else {

From 25a5a5802f80189206597700cb87d483636c96c4 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 23 Nov 2018 11:37:13 +0100
Subject: [PATCH 292/327] Add package name to `package.json`

---
 tools/cli/commands/addModule.js    | 30 +++++++++++++++++++++++++++++-
 tools/cli/commands/deleteModule.js | 24 +++++++++++++++++++++++-
 tools/cli/helpers/util.js          | 11 +++++++++++
 3 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/tools/cli/commands/addModule.js b/tools/cli/commands/addModule.js
index 1f5e4ad9b5..c3723e4cf7 100644
--- a/tools/cli/commands/addModule.js
+++ b/tools/cli/commands/addModule.js
@@ -1,7 +1,8 @@
 const shell = require('shelljs');
 const fs = require('fs');
 const chalk = require('chalk');
-const { copyFiles, renameFiles, computeModulesPath, runPrettier } = require('../helpers/util');
+const { decamelize } = require('humps');
+const { copyFiles, renameFiles, computeModulesPath, computePackagePath, runPrettier } = require('../helpers/util');
 
 /**
  * Adds application module to client or server code and adds it to the module list.
@@ -56,6 +57,33 @@ function addModule(logger, templatesPath, moduleName, options, location, finishe
     .to(indexPath);
   runPrettier(indexPath);
 
+  // get package content
+  const packagePath = computePackagePath(location);
+  const packageContent = `` + fs.readFileSync(packagePath);
+
+  // extract dependencies
+  const dependenciesRegExp = /"dependencies":\s\{([^()]+)\},\n\s+"devDependencies"/g;
+  const [, dependencies] = dependenciesRegExp.exec(packageContent) || ['', ''];
+
+  // insert package and sort
+  const dependenciesSorted = dependencies.split(',');
+  dependenciesSorted.push(
+    `\n    "@module/${decamelize(moduleName, {
+      separator: '-'
+    })}-${location}": "^1.0.0"`
+  );
+  dependenciesSorted.sort();
+
+  // add module to package list
+  shell
+    .ShellString(
+      packageContent.replace(
+        RegExp(dependenciesRegExp, 'g'),
+        `"dependencies": {${dependenciesSorted}},\n  "devDependencies"`
+      )
+    )
+    .to(packagePath);
+
   if (finished) {
     logger.info(chalk.green(`✔ Module for ${location} successfully created!`));
   }
diff --git a/tools/cli/commands/deleteModule.js b/tools/cli/commands/deleteModule.js
index c96bbbd0f8..5ffc1c47bc 100644
--- a/tools/cli/commands/deleteModule.js
+++ b/tools/cli/commands/deleteModule.js
@@ -1,7 +1,8 @@
 const shell = require('shelljs');
 const fs = require('fs');
 const chalk = require('chalk');
-const { computeModulesPath, computeRootModulesPath, runPrettier } = require('../helpers/util');
+const { decamelize } = require('humps');
+const { computeModulesPath, computeRootModulesPath, computePackagePath, runPrettier } = require('../helpers/util');
 
 /**
  * Removes the module from client, server or both locations and removes the module from the module list.
@@ -56,6 +57,27 @@ function deleteModule(logger, moduleName, options, location) {
     fs.writeFileSync(indexPath, contentWithoutDeletedModule);
     runPrettier(indexPath);
 
+    // get package content
+    const packagePath = computePackagePath(location);
+    const packageContent = `` + fs.readFileSync(packagePath);
+
+    // extract dependencies
+    const dependenciesRegExp = /"dependencies":\s\{([^()]+)\},\n\s+"devDependencies"/g;
+    const [, dependencies] = dependenciesRegExp.exec(packageContent) || ['', ''];
+    const dependenciesWithoutDeleted = dependencies
+      .split(',')
+      .filter(pkg => pkg.indexOf(decamelize(moduleName, { separator: '-' })) < 0);
+
+    // add module to package list
+    shell
+      .ShellString(
+        packageContent.replace(
+          RegExp(dependenciesRegExp, 'g'),
+          `"dependencies": {${dependenciesWithoutDeleted}},\n  "devDependencies"`
+        )
+      )
+      .to(packagePath);
+
     logger.info(chalk.green(`✔ Module for ${location} successfully deleted!`));
   } else {
     logger.info(chalk.red(`✘ Module ${location} location for ${modulePath} not found!`));
diff --git a/tools/cli/helpers/util.js b/tools/cli/helpers/util.js
index 7dfd291f89..0e56370de0 100644
--- a/tools/cli/helpers/util.js
+++ b/tools/cli/helpers/util.js
@@ -70,6 +70,16 @@ function computeRootModulesPath(moduleName) {
   return `${BASE_PATH}/modules/${moduleName}`;
 }
 
+/**
+ * Gets the computed package path of the module.
+ *
+ * @param moduleName - The name of a new module.
+ * @returns {string} - Return the computed path
+ */
+function computePackagePath(location) {
+  return `${BASE_PATH}/packages/${location.split('-')[0]}/package.json`;
+}
+
 /**
  * Run prettier on file that was changed.
  *
@@ -86,5 +96,6 @@ module.exports = {
   copyFiles,
   computeModulesPath,
   computeRootModulesPath,
+  computePackagePath,
   runPrettier
 };

From b09c06a162a454777543843ec9ab273c12a8fa75 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 23 Nov 2018 11:42:26 +0100
Subject: [PATCH 293/327] fix comments

---
 tools/cli/commands/deleteModule.js | 2 +-
 tools/cli/helpers/util.js          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/cli/commands/deleteModule.js b/tools/cli/commands/deleteModule.js
index 5ffc1c47bc..f76bed423d 100644
--- a/tools/cli/commands/deleteModule.js
+++ b/tools/cli/commands/deleteModule.js
@@ -68,7 +68,7 @@ function deleteModule(logger, moduleName, options, location) {
       .split(',')
       .filter(pkg => pkg.indexOf(decamelize(moduleName, { separator: '-' })) < 0);
 
-    // add module to package list
+    // remove module from package list
     shell
       .ShellString(
         packageContent.replace(
diff --git a/tools/cli/helpers/util.js b/tools/cli/helpers/util.js
index 0e56370de0..a716bb23e8 100644
--- a/tools/cli/helpers/util.js
+++ b/tools/cli/helpers/util.js
@@ -71,7 +71,7 @@ function computeRootModulesPath(moduleName) {
 }
 
 /**
- * Gets the computed package path of the module.
+ * Gets the computed package path for the module.
  *
  * @param moduleName - The name of a new module.
  * @returns {string} - Return the computed path

From d8fd47e25406125103ed48b001e482ae154f3af4 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 23 Nov 2018 13:45:56 +0100
Subject: [PATCH 294/327] update addcrud

---
 .prettierignore                               |  4 +--
 tools/cli/CommandInvoker.js                   |  2 +-
 tools/cli/commands/addCrud.js                 |  4 +--
 tools/cli/commands/addModule.js               |  6 +++-
 tools/cli/helpers/util.js                     |  2 +-
 .../crud/server-ts/__tests__/Module.spec.ts   | 29 +++++++++++++++++++
 .../crud/{server => server-ts}/index.ts       |  5 ++--
 tools/templates/crud/server-ts/package.json   |  5 ++++
 .../crud/{server => server-ts}/resolvers.ts   |  0
 .../crud/{server => server-ts}/schema.graphql |  0
 .../crud/{server => server-ts}/schema.js      |  0
 .../crud/{server => server-ts}/sql.ts         |  2 +-
 .../crud/server/__tests__/Module.spec.ts      | 23 ---------------
 13 files changed, 49 insertions(+), 33 deletions(-)
 create mode 100644 tools/templates/crud/server-ts/__tests__/Module.spec.ts
 rename tools/templates/crud/{server => server-ts}/index.ts (83%)
 create mode 100644 tools/templates/crud/server-ts/package.json
 rename tools/templates/crud/{server => server-ts}/resolvers.ts (100%)
 rename tools/templates/crud/{server => server-ts}/schema.graphql (100%)
 rename tools/templates/crud/{server => server-ts}/schema.js (100%)
 rename tools/templates/crud/{server => server-ts}/sql.ts (75%)
 delete mode 100644 tools/templates/crud/server/__tests__/Module.spec.ts

diff --git a/.prettierignore b/.prettierignore
index 6eae774147..df6f38ae13 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,2 +1,2 @@
-**/tools/templates/crud/client/graphql/*
-**/tools/templates/crud/server/*.graphql
\ No newline at end of file
+**/tools/templates/crud/client-react/graphql/*
+**/tools/templates/crud/server-ts/*.graphql
\ No newline at end of file
diff --git a/tools/cli/CommandInvoker.js b/tools/cli/CommandInvoker.js
index c6f020999c..51f7af6bcf 100644
--- a/tools/cli/CommandInvoker.js
+++ b/tools/cli/CommandInvoker.js
@@ -57,7 +57,7 @@ class CommandInvoker {
   runAddCrud(args, options, logger) {
     const { moduleName, tablePrefix = '' } = args;
     // server - is only available location for addCrud, client in development
-    CommandInvoker.runCommand(this.addCrud, 'server', logger, CRUD_TEMPLATES, moduleName, tablePrefix);
+    CommandInvoker.runCommand(this.addCrud, options, 'server', logger, CRUD_TEMPLATES, moduleName, tablePrefix);
   }
 
   /**
diff --git a/tools/cli/commands/addCrud.js b/tools/cli/commands/addCrud.js
index 8627f3147a..ccef18f291 100644
--- a/tools/cli/commands/addCrud.js
+++ b/tools/cli/commands/addCrud.js
@@ -15,9 +15,9 @@ const { BASE_PATH } = require('../config');
  * @param tablePrefix
  * @param location - The location for a new module [client|server|both].
  */
-function addCrud(logger, templatesPath, moduleName, tablePrefix, location) {
+function addCrud(logger, templatesPath, moduleName, tablePrefix, options, location) {
   // add module in server, client
-  addModule(logger, templatesPath, moduleName, location, false);
+  addModule(logger, templatesPath, moduleName, options, location, false);
 
   // pascalize
   const Module = pascalize(moduleName);
diff --git a/tools/cli/commands/addModule.js b/tools/cli/commands/addModule.js
index c3723e4cf7..48e35666cc 100644
--- a/tools/cli/commands/addModule.js
+++ b/tools/cli/commands/addModule.js
@@ -40,7 +40,11 @@ function addModule(logger, templatesPath, moduleName, options, location, finishe
 
   try {
     // prepend import module
-    const importFrom = options.old ? `./${moduleName}` : `@module/${moduleName}-${location}`;
+    const importFrom = options.old
+      ? `./${moduleName}`
+      : `@module/${decamelize(moduleName, {
+          separator: '-'
+        })}-${location}`;
     indexContent = `import ${moduleName} from '${importFrom}';\n` + fs.readFileSync(indexPath);
   } catch (e) {
     logger.error(chalk.red(`Failed to read ${indexPath} file`));
diff --git a/tools/cli/helpers/util.js b/tools/cli/helpers/util.js
index 49197faedf..94379a49dc 100644
--- a/tools/cli/helpers/util.js
+++ b/tools/cli/helpers/util.js
@@ -56,7 +56,7 @@ function renameFiles(destinationPath, moduleName) {
  * @returns {string} - Return the computed path
  */
 function computeModulesPath(location, options, moduleName = '') {
-  return options.old || moduleName === ''
+  return moduleName === '' || options.old
     ? `${BASE_PATH}/packages/${location.split('-')[0]}/src/modules/${moduleName}`
     : `${BASE_PATH}/modules/${moduleName}/${location}`;
 }
diff --git a/tools/templates/crud/server-ts/__tests__/Module.spec.ts b/tools/templates/crud/server-ts/__tests__/Module.spec.ts
new file mode 100644
index 0000000000..c913532ea0
--- /dev/null
+++ b/tools/templates/crud/server-ts/__tests__/Module.spec.ts
@@ -0,0 +1,29 @@
+import { expect } from 'chai';
+import { ApolloClient } from 'apollo-client';
+import { step } from 'mocha-steps';
+import gql from 'graphql-tag';
+
+import { getApollo } from '../../../../packages/server/src/testHelpers/integrationSetup';
+
+const INTROSPECTION_QUERY = gql`
+  query introspectionQuery {
+    __schema {
+      types {
+        name
+      }
+    }
+  }
+`;
+
+describe('$Module$ API works', () => {
+  let apollo: ApolloClient<any>;
+
+  before(() => {
+    apollo = getApollo();
+  });
+
+  step('Should send a query to the GraphQL back end', async () => {
+    const result = await apollo.query({ query: INTROSPECTION_QUERY });
+    expect(result.data).to.have.property('__schema');
+  });
+});
diff --git a/tools/templates/crud/server/index.ts b/tools/templates/crud/server-ts/index.ts
similarity index 83%
rename from tools/templates/crud/server/index.ts
rename to tools/templates/crud/server-ts/index.ts
index cc8f63a76e..add044e1be 100644
--- a/tools/templates/crud/server/index.ts
+++ b/tools/templates/crud/server-ts/index.ts
@@ -1,7 +1,8 @@
-import $Module$ from './sql';
+import ServerModule from '@module/module-server-ts';
+
 import schema from './schema.graphql';
 import createResolvers from './resolvers';
-import ServerModule from '../ServerModule';
+import $Module$ from './sql';
 
 export default new ServerModule({
   schema: [schema],
diff --git a/tools/templates/crud/server-ts/package.json b/tools/templates/crud/server-ts/package.json
new file mode 100644
index 0000000000..c719b95b88
--- /dev/null
+++ b/tools/templates/crud/server-ts/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "@module/$-module$-server-ts",
+  "version": "1.0.0",
+  "private": true
+}
diff --git a/tools/templates/crud/server/resolvers.ts b/tools/templates/crud/server-ts/resolvers.ts
similarity index 100%
rename from tools/templates/crud/server/resolvers.ts
rename to tools/templates/crud/server-ts/resolvers.ts
diff --git a/tools/templates/crud/server/schema.graphql b/tools/templates/crud/server-ts/schema.graphql
similarity index 100%
rename from tools/templates/crud/server/schema.graphql
rename to tools/templates/crud/server-ts/schema.graphql
diff --git a/tools/templates/crud/server/schema.js b/tools/templates/crud/server-ts/schema.js
similarity index 100%
rename from tools/templates/crud/server/schema.js
rename to tools/templates/crud/server-ts/schema.js
diff --git a/tools/templates/crud/server/sql.ts b/tools/templates/crud/server-ts/sql.ts
similarity index 75%
rename from tools/templates/crud/server/sql.ts
rename to tools/templates/crud/server-ts/sql.ts
index 754e0af3cc..2381abf250 100644
--- a/tools/templates/crud/server/sql.ts
+++ b/tools/templates/crud/server-ts/sql.ts
@@ -1,5 +1,5 @@
 import { $Module$Schema } from './schema';
-import Crud from '../../sql/crud';
+import Crud from '../../../packages/server/src/sql/crud';
 
 export default class $Module$ extends Crud {
   public schema: any;
diff --git a/tools/templates/crud/server/__tests__/Module.spec.ts b/tools/templates/crud/server/__tests__/Module.spec.ts
deleted file mode 100644
index 6c5a4269e0..0000000000
--- a/tools/templates/crud/server/__tests__/Module.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import chai from 'chai';
-import { step } from 'mocha-steps';
-import { getServer } from '../../../testHelpers/integrationSetup';
-
-describe('$Module$ API works', () => {
-  let server: any;
-
-  before(() => {
-    server = getServer();
-  });
-
-  step('Has GraphiQL endpoint', () => {
-    return chai
-      .request(server)
-      .keepOpen()
-      .get('/graphiql')
-      .set('Accept', 'text/html')
-      .then(res => {
-        res.should.have.status(200);
-        res.body.should.be.eql({});
-      });
-  });
-});

From 8f3f22411e7aee8ffd6fd404afe2b0a05b499427 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 12 Dec 2018 10:09:41 +0100
Subject: [PATCH 295/327] small fixes

---
 tools/cli/commands/addCrud.js      | 2 +-
 tools/cli/commands/deleteModule.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/cli/commands/addCrud.js b/tools/cli/commands/addCrud.js
index ccef18f291..56b2735221 100644
--- a/tools/cli/commands/addCrud.js
+++ b/tools/cli/commands/addCrud.js
@@ -22,7 +22,7 @@ function addCrud(logger, templatesPath, moduleName, tablePrefix, options, locati
   // pascalize
   const Module = pascalize(moduleName);
 
-  if (location === 'server') {
+  if (location === 'server-ts') {
     // add migration and seed for new module
     addMigration(logger, templatesPath, moduleName);
 
diff --git a/tools/cli/commands/deleteModule.js b/tools/cli/commands/deleteModule.js
index 65c9c28600..35fa3b0a63 100644
--- a/tools/cli/commands/deleteModule.js
+++ b/tools/cli/commands/deleteModule.js
@@ -27,7 +27,7 @@ function deleteModule(logger, moduleName, options, location) {
   // pascalize
   const Module = pascalize(moduleName);
   const modulePath = computeModulesPath(location, options, moduleName);
-  const modulesPath = computeModulesPath(location);
+  const modulesPath = computeModulesPath(location, options);
   const moduleCommonPath = `${modulesPath}/common`;
   const generatedContainerFile = 'generatedContainers.js';
   const generatedContainerPath = `${moduleCommonPath}/${generatedContainerFile}`;
@@ -102,7 +102,7 @@ function deleteModule(logger, moduleName, options, location) {
       removeSymlink(location, moduleName);
 
       // delete migrations and seeds if server location and option -m specified
-      if (location === 'server' && options.m) {
+      if (location === 'server-ts' && options.m) {
         deleteMigrations(logger, moduleName);
       }
 

From d0e02afa7bd862e03c1923d3cdf93b369c6ef3b3 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 30 Jan 2019 11:31:13 +0100
Subject: [PATCH 296/327] reorder package file

---
 packages/server/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 1c0e32a60e..551344dd6f 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -72,8 +72,8 @@
     "apollo-link-state": "^0.4.1",
     "apollo-link-ws": "^1.0.3",
     "apollo-logger": "^0.3.0",
-    "apollo-server-express": "^2.0.0",
     "apollo-server-errors": "^2.2.0",
+    "apollo-server-express": "^2.0.0",
     "apollo-server-module-graphiql": "1.3.4",
     "bcryptjs": "^2.4.3",
     "body-parser": "^1.18.3",

From 7d2f6dea84c9928f1c52448590207bb0b0a11566 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 30 Jan 2019 15:29:23 +0100
Subject: [PATCH 297/327] addCrud wip

---
 modules/database/server-ts/sql/crud.js        |  2 +-
 modules/database/server-ts/sql/index.ts       |  1 +
 tools/cli/commands/addCrud.js                 | 28 +++++++++------
 tools/cli/commands/addModule.js               |  4 +--
 tools/cli/helpers/util.js                     |  5 +--
 .../client-react/__tests__/Module.spec.ts     | 21 +++++++++++
 .../components/ModuleView.native.tsx          | 36 +++++++++++++++++++
 .../client-react/components/ModuleView.tsx    | 29 +++++++++++++++
 .../crud/client-react/containers/Module.tsx   | 16 +++++++++
 .../client-react/graphql/ModuleQuery.graphql  |  6 ++++
 .../crud/client-react/index.native.tsx        | 36 +++++++++++++++++++
 tools/templates/crud/client-react/index.tsx   | 25 +++++++++++++
 .../client-react/locales/en/translations.json |  6 ++++
 .../crud/client-react/locales/index.js        |  5 +++
 .../client-react/locales/ru/translations.json |  6 ++++
 .../templates/crud/client-react/package.json  |  5 +++
 .../crud/server-ts/__tests__/Module.spec.ts   |  2 +-
 tools/templates/crud/server-ts/index.ts       |  2 +-
 .../migrations/_Module.js                     |  2 +-
 tools/templates/crud/server-ts/package.json   |  2 +-
 .../templates/crud/server-ts/seeds/.eslintrc  |  5 +++
 .../{database => server-ts}/seeds/_Module.js  |  2 +-
 tools/templates/crud/server-ts/sql.ts         |  2 +-
 23 files changed, 226 insertions(+), 22 deletions(-)
 create mode 100644 tools/templates/crud/client-react/__tests__/Module.spec.ts
 create mode 100644 tools/templates/crud/client-react/components/ModuleView.native.tsx
 create mode 100644 tools/templates/crud/client-react/components/ModuleView.tsx
 create mode 100644 tools/templates/crud/client-react/containers/Module.tsx
 create mode 100644 tools/templates/crud/client-react/graphql/ModuleQuery.graphql
 create mode 100644 tools/templates/crud/client-react/index.native.tsx
 create mode 100644 tools/templates/crud/client-react/index.tsx
 create mode 100644 tools/templates/crud/client-react/locales/en/translations.json
 create mode 100644 tools/templates/crud/client-react/locales/index.js
 create mode 100644 tools/templates/crud/client-react/locales/ru/translations.json
 create mode 100644 tools/templates/crud/client-react/package.json
 rename tools/templates/crud/{database => server-ts}/migrations/_Module.js (75%)
 create mode 100644 tools/templates/crud/server-ts/seeds/.eslintrc
 rename tools/templates/crud/{database => server-ts}/seeds/_Module.js (69%)

diff --git a/modules/database/server-ts/sql/crud.js b/modules/database/server-ts/sql/crud.js
index ce36babb9f..4f2590cf53 100644
--- a/modules/database/server-ts/sql/crud.js
+++ b/modules/database/server-ts/sql/crud.js
@@ -407,7 +407,7 @@ export function deleteRelationAdapter(options) {
   };
 }
 
-export default class Crud {
+export class Crud {
   getTableName() {
     return decamelize(this.schema.__.tableName ? this.schema.__.tableName : this.schema.name);
   }
diff --git a/modules/database/server-ts/sql/index.ts b/modules/database/server-ts/sql/index.ts
index 797cc2df05..b3ff47c0ad 100644
--- a/modules/database/server-ts/sql/index.ts
+++ b/modules/database/server-ts/sql/index.ts
@@ -2,3 +2,4 @@ export { default as knex } from './connector';
 export { default as populateTestDb } from './populateTestDb';
 export { default as createTransaction } from './createTransaction';
 export * from './helpers';
+export * from './crud';
diff --git a/tools/cli/commands/addCrud.js b/tools/cli/commands/addCrud.js
index 56b2735221..792de7f173 100644
--- a/tools/cli/commands/addCrud.js
+++ b/tools/cli/commands/addCrud.js
@@ -1,10 +1,10 @@
-const shell = require('shelljs');
+//const shell = require('shelljs');
 const chalk = require('chalk');
 const { pascalize } = require('humps');
 const addModule = require('./addModule');
-const addMigration = require('./subCommands/addMigration');
-const { computeModulesPath, updateFileWithExports, runPrettier } = require('../helpers/util');
-const { BASE_PATH } = require('../config');
+//const addMigration = require('./subCommands/addMigration');
+//const { computeModulesPath, updateFileWithExports, runPrettier } = require('../helpers/util');
+//const { BASE_PATH } = require('../config');
 
 /**
  * Adds CRUD module in server and adds a new module to the Feature connector.
@@ -15,17 +15,23 @@ const { BASE_PATH } = require('../config');
  * @param tablePrefix
  * @param location - The location for a new module [client|server|both].
  */
-function addCrud(logger, templatesPath, moduleName, tablePrefix, options, location) {
+function addCrud({ logger, packageName, moduleName, old }) {
+  //function addCrud(logger, templatesPath, moduleName, tablePrefix, options, location) {
+  console.log('packageName:', packageName);
+  console.log('moduleName:', moduleName);
+  console.log('old:', old);
+
   // add module in server, client
-  addModule(logger, templatesPath, moduleName, options, location, false);
+  addModule({ logger, packageName, moduleName, old, crud: true });
 
   // pascalize
   const Module = pascalize(moduleName);
 
-  if (location === 'server-ts') {
+  if (packageName === 'server') {
+    console.log('Module:', Module);
     // add migration and seed for new module
-    addMigration(logger, templatesPath, moduleName);
-
+    //addMigration(logger, templatesPath, moduleName);
+    /*
     if (tablePrefix) {
       shell.cd(computeModulesPath(location, moduleName));
       shell.sed('-i', /tablePrefix: ''/g, `tablePrefix: '${tablePrefix}'`, 'schema.js');
@@ -41,10 +47,10 @@ function addCrud(logger, templatesPath, moduleName, tablePrefix, options, locati
       importString: `import { ${schema} } from '../${moduleName}/schema';\n`
     };
     updateFileWithExports(options);
-    runPrettier(options.pathToFileWithExports);
+    runPrettier(options.pathToFileWithExports);*/
   }
 
-  logger.info(chalk.green(`✔ Module for ${location} successfully created!`));
+  logger.info(chalk.green(`✔ Module for ${packageName} successfully created!`));
 }
 
 module.exports = addCrud;
diff --git a/tools/cli/commands/addModule.js b/tools/cli/commands/addModule.js
index 29808e58e5..a92bd407f1 100644
--- a/tools/cli/commands/addModule.js
+++ b/tools/cli/commands/addModule.js
@@ -21,9 +21,9 @@ const {
  * @param templatesPath - The path to the templates for a new module
  * @param moduleName - The name of a new module
  */
-function addModule({ logger, packageName, moduleName, old }) {
+function addModule({ logger, packageName, moduleName, old, crud = false }) {
   const modulePackageName = getModulePackageName(packageName, old);
-  const templatesPath = getTemplatesPath(old);
+  const templatesPath = getTemplatesPath(crud, old);
   const params = { logger, packageName, moduleName, modulePackageName, templatesPath, old };
 
   copyTemplates(params);
diff --git a/tools/cli/helpers/util.js b/tools/cli/helpers/util.js
index e384fdef9f..aef6ba0d3c 100644
--- a/tools/cli/helpers/util.js
+++ b/tools/cli/helpers/util.js
@@ -3,7 +3,7 @@ const fs = require('fs');
 const DomainSchema = require('@domain-schema/core').default;
 const { pascalize, decamelize } = require('humps');
 const { startCase } = require('lodash');
-const { MODULE_TEMPLATES, MODULE_TEMPLATES_OLD, BASE_PATH } = require('../config');
+const { MODULE_TEMPLATES, MODULE_TEMPLATES_OLD, CRUD_TEMPLATES, BASE_PATH } = require('../config');
 
 /**
  * Provides a package name for the particular module based on the command option --old .
@@ -19,10 +19,11 @@ const getModulePackageName = (packageName, old) => {
 /**
  * Provides a path to the module templates.
  *
+ * @param crud - The flag that describes if the command invoked for crud template structure or not
  * @param old - The flag that describes if the command invoked for a new structure or not
  * @returns {string} - path to the templates
  */
-const getTemplatesPath = old => (old ? MODULE_TEMPLATES_OLD : MODULE_TEMPLATES);
+const getTemplatesPath = (crud, old) => (crud ? CRUD_TEMPLATES : old ? MODULE_TEMPLATES_OLD : MODULE_TEMPLATES);
 
 /**
  * Copies the templates to the destination directory.
diff --git a/tools/templates/crud/client-react/__tests__/Module.spec.ts b/tools/templates/crud/client-react/__tests__/Module.spec.ts
new file mode 100644
index 0000000000..cb749ef11f
--- /dev/null
+++ b/tools/templates/crud/client-react/__tests__/Module.spec.ts
@@ -0,0 +1,21 @@
+import { expect } from 'chai';
+import { step } from 'mocha-steps';
+
+import Renderer from '../../../../packages/client/src/testHelpers/Renderer';
+import { updateContent } from '../../../../packages/client/src/testHelpers/testUtils';
+
+describe('$Module$ UI works', () => {
+  const renderer = new Renderer({});
+  const app = renderer.mount();
+  renderer.history.push('/$Module$');
+  const content = updateContent(app.container);
+
+  step('$Module$ page renders on mount', () => {
+    // tslint:disable:no-unused-expression
+    expect(content).to.not.be.empty;
+  });
+
+  step('$Module$ page has title', async () => {
+    expect(content.textContent).to.include('Hello, This is the $Module$ module');
+  });
+});
diff --git a/tools/templates/crud/client-react/components/ModuleView.native.tsx b/tools/templates/crud/client-react/components/ModuleView.native.tsx
new file mode 100644
index 0000000000..22ca9cd123
--- /dev/null
+++ b/tools/templates/crud/client-react/components/ModuleView.native.tsx
@@ -0,0 +1,36 @@
+import React from 'react';
+import { StyleSheet, Text, View } from 'react-native';
+import { TranslateFunction } from '@gqlapp/i18n-client-react';
+
+interface $Module$ViewProps {
+  t: TranslateFunction;
+}
+
+const $Module$View = ({ t }: $Module$ViewProps) => {
+  return (
+    <View style={styles.container}>
+      <View style={styles.element}>
+        <Text style={styles.box}>{t('welcomeText')}</Text>
+      </View>
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    backgroundColor: '#fff',
+    alignItems: 'center',
+    justifyContent: 'center'
+  },
+  element: {
+    paddingTop: 30
+  },
+  box: {
+    textAlign: 'center',
+    marginLeft: 15,
+    marginRight: 15
+  }
+});
+
+export default $Module$View;
diff --git a/tools/templates/crud/client-react/components/ModuleView.tsx b/tools/templates/crud/client-react/components/ModuleView.tsx
new file mode 100644
index 0000000000..8c232948e0
--- /dev/null
+++ b/tools/templates/crud/client-react/components/ModuleView.tsx
@@ -0,0 +1,29 @@
+import React from 'react';
+import Helmet from 'react-helmet';
+import { PageLayout } from '@gqlapp/look-client-react';
+import { TranslateFunction } from '@gqlapp/i18n-client-react';
+import settings from '../../../../settings';
+
+interface $Module$ViewProps {
+  t: TranslateFunction;
+}
+
+const renderMetaData = (t: TranslateFunction) => (
+  <Helmet
+    title={`${settings.app.name} - ${t('title')}`}
+    meta={[{ name: 'description', content: `${settings.app.name} - ${t('meta')}` }]}
+  />
+);
+
+const $Module$View = ({ t }: $Module$ViewProps) => {
+  return (
+    <PageLayout>
+      {renderMetaData(t)}
+      <div className="text-center">
+        <p>{t('welcomeText')}</p>
+      </div>
+    </PageLayout>
+  );
+};
+
+export default $Module$View;
diff --git a/tools/templates/crud/client-react/containers/Module.tsx b/tools/templates/crud/client-react/containers/Module.tsx
new file mode 100644
index 0000000000..b4cab4027b
--- /dev/null
+++ b/tools/templates/crud/client-react/containers/Module.tsx
@@ -0,0 +1,16 @@
+import React from 'react';
+
+import { translate, TranslateFunction } from '@gqlapp/i18n-client-react';
+import $Module$View from '../components/$Module$View';
+
+interface $Module$Props {
+  t: TranslateFunction;
+}
+
+class $Module$ extends React.Component<$Module$Props> {
+  public render() {
+    return <$Module$View {...this.props} />;
+  }
+}
+
+export default translate('$module$')($Module$);
diff --git a/tools/templates/crud/client-react/graphql/ModuleQuery.graphql b/tools/templates/crud/client-react/graphql/ModuleQuery.graphql
new file mode 100644
index 0000000000..f9c5113153
--- /dev/null
+++ b/tools/templates/crud/client-react/graphql/ModuleQuery.graphql
@@ -0,0 +1,6 @@
+# GraphQL queries
+query queryNameQuery {
+  queryName {
+    typename
+  }
+}
diff --git a/tools/templates/crud/client-react/index.native.tsx b/tools/templates/crud/client-react/index.native.tsx
new file mode 100644
index 0000000000..13c4fa03b4
--- /dev/null
+++ b/tools/templates/crud/client-react/index.native.tsx
@@ -0,0 +1,36 @@
+import React from 'react';
+import { createStackNavigator } from 'react-navigation';
+
+import { translate } from '@gqlapp/i18n-client-react';
+import ClientModule from '@gqlapp/module-client-react-native';
+
+import { HeaderTitle, IconButton } from '../../../packages/client/src/modules/common/components/native';
+import $Module$ from './containers/$Module$';
+import resources from './locales';
+
+const HeaderTitleWithI18n = translate('$module$')(HeaderTitle);
+
+export default new ClientModule({
+  drawerItem: [
+    {
+      $Module$: {
+        screen: createStackNavigator({
+          $Module$: {
+            screen: $Module$,
+            navigationOptions: ({ navigation }: any) => ({
+              headerTitle: <HeaderTitleWithI18n style="subTitle" />,
+              headerLeft: (
+                <IconButton iconName="menu" iconSize={32} iconColor="#0275d8" onPress={() => navigation.openDrawer()} />
+              ),
+              headerStyle: { backgroundColor: '#fff' }
+            })
+          }
+        }),
+        navigationOptions: {
+          drawerLabel: <HeaderTitleWithI18n />
+        }
+      }
+    }
+  ],
+  localization: [{ ns: '$module$', resources }]
+});
diff --git a/tools/templates/crud/client-react/index.tsx b/tools/templates/crud/client-react/index.tsx
new file mode 100644
index 0000000000..bb5cdfb98a
--- /dev/null
+++ b/tools/templates/crud/client-react/index.tsx
@@ -0,0 +1,25 @@
+import React from 'react';
+
+import ClientModule from '@gqlapp/module-client-react';
+import { translate, TranslateFunction } from '@gqlapp/i18n-client-react';
+
+import { Route, NavLink } from 'react-router-dom';
+import { MenuItem } from '@gqlapp/look-client-react';
+import $Module$ from './containers/$Module$';
+import resources from './locales';
+
+const NavLinkWithI18n = translate('$module$')(({ t }: { t: TranslateFunction }) => (
+  <NavLink to="/$module$" className="nav-link" activeClassName="active">
+    {t('$module$:navLink')}
+  </NavLink>
+));
+
+export default new ClientModule({
+  route: [<Route exact path="/$module$" component={$Module$} />],
+  navItem: [
+    <MenuItem key="/$module$">
+      <NavLinkWithI18n />
+    </MenuItem>
+  ],
+  localization: [{ ns: '$module$', resources }]
+});
diff --git a/tools/templates/crud/client-react/locales/en/translations.json b/tools/templates/crud/client-react/locales/en/translations.json
new file mode 100644
index 0000000000..8131aae904
--- /dev/null
+++ b/tools/templates/crud/client-react/locales/en/translations.json
@@ -0,0 +1,6 @@
+{
+  "navLink": "$Module$ nav link",
+  "title": "$Module$ module",
+  "meta": "$Module$ example",
+  "welcomeText": "Hello, This is the $Module$ module"
+}
\ No newline at end of file
diff --git a/tools/templates/crud/client-react/locales/index.js b/tools/templates/crud/client-react/locales/index.js
new file mode 100644
index 0000000000..9abc2aac88
--- /dev/null
+++ b/tools/templates/crud/client-react/locales/index.js
@@ -0,0 +1,5 @@
+/* 
+* The index.js can be empty, it's just needed to point the loader to the root directory of the locales.
+* https://github.com/alienfast/i18next-loader#option-2-use-with-import-syntax
+*/
+export default {};
\ No newline at end of file
diff --git a/tools/templates/crud/client-react/locales/ru/translations.json b/tools/templates/crud/client-react/locales/ru/translations.json
new file mode 100644
index 0000000000..1bace811f7
--- /dev/null
+++ b/tools/templates/crud/client-react/locales/ru/translations.json
@@ -0,0 +1,6 @@
+{
+  "navLink": "$Module$ ссылка",
+  "title": "$Module$ модуль",
+  "meta": "$Module$ пример",
+  "welcomeText": "Привет, это $Module$ модуль"
+}
\ No newline at end of file
diff --git a/tools/templates/crud/client-react/package.json b/tools/templates/crud/client-react/package.json
new file mode 100644
index 0000000000..0a162b9c24
--- /dev/null
+++ b/tools/templates/crud/client-react/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "@gqlapp/$-module$-client-react",
+  "version": "1.0.0",
+  "private": true
+}
diff --git a/tools/templates/crud/server-ts/__tests__/Module.spec.ts b/tools/templates/crud/server-ts/__tests__/Module.spec.ts
index c913532ea0..79504308a1 100644
--- a/tools/templates/crud/server-ts/__tests__/Module.spec.ts
+++ b/tools/templates/crud/server-ts/__tests__/Module.spec.ts
@@ -3,7 +3,7 @@ import { ApolloClient } from 'apollo-client';
 import { step } from 'mocha-steps';
 import gql from 'graphql-tag';
 
-import { getApollo } from '../../../../packages/server/src/testHelpers/integrationSetup';
+import { getApollo } from '@gqlapp/testing-server-ts';
 
 const INTROSPECTION_QUERY = gql`
   query introspectionQuery {
diff --git a/tools/templates/crud/server-ts/index.ts b/tools/templates/crud/server-ts/index.ts
index add044e1be..278f423cc7 100644
--- a/tools/templates/crud/server-ts/index.ts
+++ b/tools/templates/crud/server-ts/index.ts
@@ -1,4 +1,4 @@
-import ServerModule from '@module/module-server-ts';
+import ServerModule from '@gqlapp/module-server-ts';
 
 import schema from './schema.graphql';
 import createResolvers from './resolvers';
diff --git a/tools/templates/crud/database/migrations/_Module.js b/tools/templates/crud/server-ts/migrations/_Module.js
similarity index 75%
rename from tools/templates/crud/database/migrations/_Module.js
rename to tools/templates/crud/server-ts/migrations/_Module.js
index e88e86f020..0ffd69a56d 100644
--- a/tools/templates/crud/database/migrations/_Module.js
+++ b/tools/templates/crud/server-ts/migrations/_Module.js
@@ -1,6 +1,6 @@
 import KnexGenerator from '@domain-schema/knex';
 
-import { $Module$Schema } from '../../modules/$module$/schema';
+import { $Module$Schema } from '../schema';
 
 exports.up = knex => new KnexGenerator(knex).createTables($Module$Schema);
 
diff --git a/tools/templates/crud/server-ts/package.json b/tools/templates/crud/server-ts/package.json
index c719b95b88..8dc16993cf 100644
--- a/tools/templates/crud/server-ts/package.json
+++ b/tools/templates/crud/server-ts/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@module/$-module$-server-ts",
+  "name": "@gqlapp/$-module$-server-ts",
   "version": "1.0.0",
   "private": true
 }
diff --git a/tools/templates/crud/server-ts/seeds/.eslintrc b/tools/templates/crud/server-ts/seeds/.eslintrc
new file mode 100644
index 0000000000..712a899471
--- /dev/null
+++ b/tools/templates/crud/server-ts/seeds/.eslintrc
@@ -0,0 +1,5 @@
+{
+  "rules": {
+    "import/prefer-default-export": 0
+  }
+}
\ No newline at end of file
diff --git a/tools/templates/crud/database/seeds/_Module.js b/tools/templates/crud/server-ts/seeds/_Module.js
similarity index 69%
rename from tools/templates/crud/database/seeds/_Module.js
rename to tools/templates/crud/server-ts/seeds/_Module.js
index 72a4768df5..c30c461693 100644
--- a/tools/templates/crud/database/seeds/_Module.js
+++ b/tools/templates/crud/server-ts/seeds/_Module.js
@@ -1,4 +1,4 @@
-import { returnId, truncateTables } from '../../sql/helpers';
+import { returnId, truncateTables } from '@gqlapp/database-server-ts';
 
 export async function seed(knex, Promise) {
   await truncateTables(knex, Promise, ['$_module$']);
diff --git a/tools/templates/crud/server-ts/sql.ts b/tools/templates/crud/server-ts/sql.ts
index 2381abf250..5e1f697e78 100644
--- a/tools/templates/crud/server-ts/sql.ts
+++ b/tools/templates/crud/server-ts/sql.ts
@@ -1,5 +1,5 @@
 import { $Module$Schema } from './schema';
-import Crud from '../../../packages/server/src/sql/crud';
+import { Crud } from '@gqlapp/database-server-ts';
 
 export default class $Module$ extends Crud {
   public schema: any;

From fc3d05e17581c9bdc63ee7e23e0df76c6a0cf2b8 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 31 Jan 2019 08:53:31 +0100
Subject: [PATCH 298/327] remove log and replace with console.log for now, to
 fix __DEV__ not being defined error

---
 modules/database/server-ts/sql/crud.js   | 36 +++++++++++++-----------
 modules/database/server-ts/sql/select.js |  4 +--
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/modules/database/server-ts/sql/crud.js b/modules/database/server-ts/sql/crud.js
index 4f2590cf53..c19f407248 100644
--- a/modules/database/server-ts/sql/crud.js
+++ b/modules/database/server-ts/sql/crud.js
@@ -1,7 +1,6 @@
 import _ from 'lodash';
 import uuidv4 from 'uuid';
 import { decamelize, decamelizeKeys, camelize, camelizeKeys, pascalize } from 'humps';
-import { log } from '@gqlapp/core-common';
 import knexnest from 'knexnest';
 import parseFields from 'graphql-parse-fields';
 import moment from 'moment';
@@ -41,7 +40,7 @@ export function createWithIdGenAdapter(options) {
       await builder;
       return values.id;
     } catch (e) {
-      log.error(`Error in ${T}.create()`, e);
+      console.error(`Error in ${T}.create()`, e);
       throw e;
     }
   };
@@ -67,7 +66,7 @@ export function createWithIdAdapter(options) {
       await builder;
       return values[idField];
     } catch (e) {
-      log.error(`Error in ${T}.createWithId()`, e);
+      console.error(`Error in ${T}.createWithId()`, e);
       throw e;
     }
   };
@@ -85,7 +84,7 @@ export function createWithoutIdAdapter(options) {
 
       return builder;
     } catch (e) {
-      log.error(`Error in ${T}.createWithId()`, e);
+      console.error(`Error in ${T}.createWithId()`, e);
       throw e;
     }
   };
@@ -103,7 +102,7 @@ export function getAllAdapter(options) {
       ret = camelizeKeys(ret);
       return ret;
     } catch (e) {
-      log.error(`Error in ${options.name}`, e);
+      console.error(`Error in ${options.name}`, e);
       throw e;
     }
   };
@@ -133,7 +132,7 @@ export function getByIdAdapter(options) {
       ret = camelizeKeys(ret[0]);
       return ret;
     } catch (e) {
-      log.error(`Error in ${options.name}`, e);
+      console.error(`Error in ${options.name}`, e);
       throw e;
     }
   };
@@ -160,7 +159,7 @@ export function listAdapter(options) {
       ret = camelizeKeys(ret);
       return ret;
     } catch (e) {
-      log.error(`Error in ${options.name}`, e);
+      console.error(`Error in ${options.name}`, e);
       throw e;
     }
   };
@@ -196,7 +195,7 @@ export function pagingAdapter(options) {
         pages: Math.trunc(ret.count / args.limit) + (ret.count % args.limit === 0 ? 0 : 1)
       };
     } catch (e) {
-      log.error(`Error in ${options.name}`, e);
+      console.error(`Error in ${options.name}`, e);
       throw e;
     }
   };
@@ -227,7 +226,7 @@ export function updateAdapter(options) {
 
       return builder;
     } catch (e) {
-      log.error(`Error in ${T}.update()`, e);
+      console.error(`Error in ${T}.update()`, e);
       throw e;
     }
   };
@@ -252,7 +251,7 @@ export function updateMultiConditionAdapter(options) {
 
       return builder;
     } catch (e) {
-      log.error(`Error in ${T}.updateMultiCondition()`, e);
+      console.error(`Error in ${T}.updateMultiCondition()`, e);
       throw e;
     }
   };
@@ -279,7 +278,7 @@ export function deleteAdapter(options) {
 
       return builder;
     } catch (e) {
-      log.error(`Error in ${T}.delete()`, e);
+      console.error(`Error in ${T}.delete()`, e);
       throw e;
     }
   };
@@ -299,7 +298,7 @@ export function deleteMultiConditionAdapter(options) {
 
       return builder;
     } catch (e) {
-      log.error(`Error in ${T}.deleteMultiCondition()`, e);
+      console.error(`Error in ${T}.deleteMultiCondition()`, e);
       throw e;
     }
   };
@@ -332,7 +331,10 @@ export function getManyRelationAdapter(options) {
       ret = orderedFor(ret, args.ids, camelize(options.collectionField), false);
       return ret;
     } catch (e) {
-      log.error(`Error in ${options.table}.getManyRelationAdapter(${options.elemField},${options.collectionField})`, e);
+      console.error(
+        `Error in ${options.table}.getManyRelationAdapter(${options.elemField},${options.collectionField})`,
+        e
+      );
       throw e;
     }
   };
@@ -353,7 +355,7 @@ export function createRelationAdapter(options) {
 
       return await builder;
     } catch (e) {
-      log.error(`Error in ${table}.createRelationAdapter(${elemField},${collectionField})`, e);
+      console.error(`Error in ${table}.createRelationAdapter(${elemField},${collectionField})`, e);
       throw e;
     }
   };
@@ -377,7 +379,7 @@ export function updateRelationAdapter(options) {
 
       return builder;
     } catch (e) {
-      log.error(`Error in ${table}.updateRelationAdapter(${elemField},${collectionField})`, e);
+      console.error(`Error in ${table}.updateRelationAdapter(${elemField},${collectionField})`, e);
       throw e;
     }
   };
@@ -401,7 +403,7 @@ export function deleteRelationAdapter(options) {
 
       return builder;
     } catch (e) {
-      log.error(`Error in ${table}.deleteRelationAdapter(${elemField},${collectionField})`, e);
+      console.error(`Error in ${table}.deleteRelationAdapter(${elemField},${collectionField})`, e);
       throw e;
     }
   };
@@ -962,7 +964,7 @@ export class Crud {
         e.throwIf();
       }
     } catch (e) {
-      log.error(`Error in ${this.getFullTableName()}.updateMany()`, e);
+      console.error(`Error in ${this.getFullTableName()}.updateMany()`, e);
       return { errors: e };
     }
   }
diff --git a/modules/database/server-ts/sql/select.js b/modules/database/server-ts/sql/select.js
index e7df780758..43d5d0277c 100644
--- a/modules/database/server-ts/sql/select.js
+++ b/modules/database/server-ts/sql/select.js
@@ -1,5 +1,3 @@
-import { log } from '@gqlapp/core-common';
-
 import knex from './connector';
 
 import paging from './paging';
@@ -129,7 +127,7 @@ export default function selectAdapter(options) {
       }
       return rows;
     } catch (e) {
-      log.error(`Error in ${opts.name}.selectAdapter()`, e);
+      console.error(`Error in ${opts.name}.selectAdapter()`, e);
       throw e;
     }
   };

From 29a25530f5d7872c2bf35b8d4642ac6554c4d652 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 31 Jan 2019 11:58:07 +0100
Subject: [PATCH 299/327] fix cli addCrud, and updateSchema

---
 .../server-ts}/common/generatedSchemas.js     |  0
 tools/cli.js                                  |  1 -
 tools/cli/CommandInvoker.js                   |  2 +-
 tools/cli/commands/addCrud.js                 | 31 ++++++------
 tools/cli/commands/deleteModule.js            | 17 ++++---
 .../cli/commands/subCommands/addMigration.js  | 30 ------------
 .../commands/subCommands/deleteMigrations.js  | 34 --------------
 tools/cli/commands/updateSchema.js            | 47 +++++++++----------
 tools/cli/helpers/util.js                     | 27 +++++++++--
 .../migrations/{_Module.js => T_Module.js}    |  0
 .../seeds/{_Module.js => T_Module.js}         |  0
 11 files changed, 72 insertions(+), 117 deletions(-)
 rename {packages/server/src/modules => modules/core/server-ts}/common/generatedSchemas.js (100%)
 delete mode 100644 tools/cli/commands/subCommands/addMigration.js
 delete mode 100644 tools/cli/commands/subCommands/deleteMigrations.js
 rename tools/templates/crud/server-ts/migrations/{_Module.js => T_Module.js} (100%)
 rename tools/templates/crud/server-ts/seeds/{_Module.js => T_Module.js} (100%)

diff --git a/packages/server/src/modules/common/generatedSchemas.js b/modules/core/server-ts/common/generatedSchemas.js
similarity index 100%
rename from packages/server/src/modules/common/generatedSchemas.js
rename to modules/core/server-ts/common/generatedSchemas.js
diff --git a/tools/cli.js b/tools/cli.js
index 4b6ac5b1e7..8e55eee7cc 100644
--- a/tools/cli.js
+++ b/tools/cli.js
@@ -40,7 +40,6 @@ prog
   .argument('<moduleName>', 'Module name')
   .argument('[location]', 'Where should we delete module. [both, server, client]', ['both', 'server', 'client'], 'both')
   .option('-o, --old', 'Old Structure')
-  .option('-m', 'Delete migration and seeds')
   .action((args, options, logger) => commandInvoker.runDeleteModule(args, options, logger))
   // Update schema
   .command('updateschema', 'Update Module Schema')
diff --git a/tools/cli/CommandInvoker.js b/tools/cli/CommandInvoker.js
index f5d941f545..329af2e130 100644
--- a/tools/cli/CommandInvoker.js
+++ b/tools/cli/CommandInvoker.js
@@ -59,7 +59,7 @@ class CommandInvoker {
    * Runs operation (function) for updating existing module schema.
    */
   runUpdateSchema(args, options, logger) {
-    runOperation(this.updateSchema, args, logger);
+    runOperation(this.updateSchema, args, options, logger);
   }
 }
 
diff --git a/tools/cli/commands/addCrud.js b/tools/cli/commands/addCrud.js
index 792de7f173..59b959aa4d 100644
--- a/tools/cli/commands/addCrud.js
+++ b/tools/cli/commands/addCrud.js
@@ -1,22 +1,22 @@
-//const shell = require('shelljs');
 const chalk = require('chalk');
-const { pascalize } = require('humps');
+const { pascalize, decamelize } = require('humps');
 const addModule = require('./addModule');
-//const addMigration = require('./subCommands/addMigration');
-//const { computeModulesPath, updateFileWithExports, runPrettier } = require('../helpers/util');
-//const { BASE_PATH } = require('../config');
+const {
+  getModulePackageName,
+  computeGeneratedSchemasPath,
+  updateFileWithExports,
+  runPrettier
+} = require('../helpers/util');
 
 /**
  * Adds CRUD module in server and adds a new module to the Feature connector.
  *
  * @param logger - The Logger.
- * @param templatesPath - The path to the templates for a new module.
  * @param moduleName - The name of a new module.
  * @param tablePrefix
- * @param location - The location for a new module [client|server|both].
+ * @param packageName - The location for a new module [client|server|both].
  */
 function addCrud({ logger, packageName, moduleName, old }) {
-  //function addCrud(logger, templatesPath, moduleName, tablePrefix, options, location) {
   console.log('packageName:', packageName);
   console.log('moduleName:', moduleName);
   console.log('old:', old);
@@ -26,28 +26,27 @@ function addCrud({ logger, packageName, moduleName, old }) {
 
   // pascalize
   const Module = pascalize(moduleName);
+  const modulePackageName = getModulePackageName(packageName, old);
 
   if (packageName === 'server') {
-    console.log('Module:', Module);
-    // add migration and seed for new module
-    //addMigration(logger, templatesPath, moduleName);
     /*
     if (tablePrefix) {
       shell.cd(computeModulesPath(location, moduleName));
       shell.sed('-i', /tablePrefix: ''/g, `tablePrefix: '${tablePrefix}'`, 'schema.js');
 
       logger.info(chalk.green(`✔ Inserted db table prefix!`));
-    }
+    }*/
 
-    const generatedSchemasFile = 'generatedSchemas.js';
     const schema = `${Module}Schema`;
     const options = {
-      pathToFileWithExports: `${BASE_PATH}/packages/${location}/src/modules/common/${generatedSchemasFile}`,
+      pathToFileWithExports: computeGeneratedSchemasPath(packageName, old),
       exportName: schema,
-      importString: `import { ${schema} } from '../${moduleName}/schema';\n`
+      importString: `import { ${schema} } from '@gqlapp/${decamelize(moduleName, {
+        separator: '-'
+      })}-${modulePackageName}/schema';\n`
     };
     updateFileWithExports(options);
-    runPrettier(options.pathToFileWithExports);*/
+    runPrettier(options.pathToFileWithExports);
   }
 
   logger.info(chalk.green(`✔ Module for ${packageName} successfully created!`));
diff --git a/tools/cli/commands/deleteModule.js b/tools/cli/commands/deleteModule.js
index 168feb05b6..679a76261e 100644
--- a/tools/cli/commands/deleteModule.js
+++ b/tools/cli/commands/deleteModule.js
@@ -1,6 +1,7 @@
 const shell = require('shelljs');
 const fs = require('fs');
 const chalk = require('chalk');
+const { pascalize } = require('humps');
 const {
   getModulePackageName,
   computeModulePath,
@@ -8,6 +9,8 @@ const {
   computeRootModulesPath,
   computePackagePath,
   computeModulePackageName,
+  computeGeneratedSchemasPath,
+  deleteFromFileWithExports,
   removeSymlink,
   runPrettier
 } = require('../helpers/util');
@@ -120,20 +123,20 @@ function removeDependency({ moduleName, packageName, modulePackageName, old }) {
 
   removeSymlink(moduleName, modulePackageName);
 
+  const Module = pascalize(moduleName);
+  //const modulesPath = computeModulesPath(location);
+  //const moduleCommonPath = `${modulesPath}/common`;
+  //const generatedSchemaPath = `${moduleCommonPath}/${generatedSchemasFile}`;
   /*
-  // delete migrations and seeds if server location and option -m specified
-  if (location === 'server-ts' && options.m) {
-    deleteMigrations(logger, moduleName);
-  }
-
   if (fs.existsSync(generatedContainerPath)) {
     const graphqlQuery = `${Module}Query`;
     deleteFromFileWithExports(generatedContainerPath, graphqlQuery);
-  }
+  }*/
+  const generatedSchemaPath = computeGeneratedSchemasPath(packageName, old);
   if (fs.existsSync(generatedSchemaPath)) {
     const schema = `${Module}Schema`;
     deleteFromFileWithExports(generatedSchemaPath, schema);
-  }*/
+  }
 }
 
 module.exports = deleteModule;
diff --git a/tools/cli/commands/subCommands/addMigration.js b/tools/cli/commands/subCommands/addMigration.js
deleted file mode 100644
index 3aaf766cdb..0000000000
--- a/tools/cli/commands/subCommands/addMigration.js
+++ /dev/null
@@ -1,30 +0,0 @@
-const shell = require('shelljs');
-const chalk = require('chalk');
-const { pascalize } = require('humps');
-const { copyFiles, renameFiles } = require('../../helpers/util');
-const { DATABASE_DIR, MIGRATIONS_DIR, SEEDS_DIR } = require('../../config');
-
-/**
- * Create migration and seed for module
- * @param logger
- * @param module
- * @param templatesPath
- */
-function addMigration(logger, templatesPath, module) {
-  const Module = pascalize(module);
-  logger.info('Copying database files...');
-
-  //copy and rename templates in destination directory
-  copyFiles(DATABASE_DIR, templatesPath, 'database');
-  renameFiles(DATABASE_DIR, module);
-  const timestamp = new Date().getTime();
-  // rename migrations and seeds
-  shell.cd(MIGRATIONS_DIR);
-  shell.mv(`_${Module}.js`, `${timestamp}_${Module}.js`);
-  shell.cd(SEEDS_DIR);
-  shell.mv(`_${Module}.js`, `${timestamp}_${Module}.js`);
-
-  logger.info(chalk.green(`✔ The database files have been copied!`));
-}
-
-module.exports = addMigration;
diff --git a/tools/cli/commands/subCommands/deleteMigrations.js b/tools/cli/commands/subCommands/deleteMigrations.js
deleted file mode 100644
index d279b6eb96..0000000000
--- a/tools/cli/commands/subCommands/deleteMigrations.js
+++ /dev/null
@@ -1,34 +0,0 @@
-const shell = require('shelljs');
-const chalk = require('chalk');
-const { pascalize } = require('humps');
-const { MIGRATIONS_DIR, SEEDS_DIR } = require('../../config');
-
-/**
- * Delete module migrations and seeds
- * @param logger
- * @param module
- */
-function deleteMigrations(logger, module) {
-  const Module = pascalize(module);
-  // change to database migrations directory
-  shell.cd(MIGRATIONS_DIR);
-  // check if any migrations files for this module exist
-  if (shell.find('.').find(file => file.search(`_${Module}.js`) > -1)) {
-    const okMigrations = shell.rm(`*_${Module}.js`);
-    if (okMigrations) {
-      logger.info(chalk.green(`✔ Database migrations files successfully deleted!`));
-    }
-  }
-
-  // change to database seeds directory
-  shell.cd(SEEDS_DIR);
-  // check if any seed files for this module exist
-  if (shell.find('.').find(file => file.search(`_${Module}.js`) > -1)) {
-    const okSeeds = shell.rm(`*_${Module}.js`);
-    if (okSeeds) {
-      logger.info(chalk.green(`✔ Database seed files successfully deleted!`));
-    }
-  }
-}
-
-module.exports = deleteMigrations;
diff --git a/tools/cli/commands/updateSchema.js b/tools/cli/commands/updateSchema.js
index 0a55558fbd..3c5f196cb2 100644
--- a/tools/cli/commands/updateSchema.js
+++ b/tools/cli/commands/updateSchema.js
@@ -4,32 +4,31 @@ const chalk = require('chalk');
 const GraphQLGenerator = require('@domain-schema/graphql').default;
 const { pascalize, camelize } = require('humps');
 
-const { BASE_PATH } = require('../config');
-const { generateField, runPrettier } = require('../helpers/util');
-const schemas = require('../../../packages/server/src/modules/common/generatedSchemas');
+const { getModulePackageName, computeModulePath, generateField, runPrettier } = require('../helpers/util');
+const schemas = require('../../../modules/core/server-ts/common/generatedSchemas');
 
 /**
+ * Update module schema.
  *
- * @param logger
- * @param moduleName
- * @returns {*|void}
+ * @param logger - The Logger.
+ * @param moduleName - The name of a new module.
+ * @param packageName - The location for a new module [client|server|both].
  */
-function updateModule(logger, moduleName, location) {
-  logger.info(`Updating ${moduleName} Schema…`);
-  console.log('location:', location);
+function updateModule({ logger, packageName, moduleName, old }) {
+  if (packageName === 'server') {
+    logger.info(`Updating ${moduleName} Schema…`);
 
-  // pascalize
-  const Module = pascalize(moduleName);
+    // pascalize
+    const Module = pascalize(moduleName);
+    //const modulePath = `${BASE_PATH}/packages/server/src/modules/${moduleName}`;
+    const modulePackageName = getModulePackageName(packageName, old);
+    const destinationPath = computeModulePath(modulePackageName, old, moduleName);
 
-  const modulePath = `${BASE_PATH}/packages/server/src/modules/${moduleName}`;
+    if (fs.existsSync(destinationPath)) {
+      // get module schema
+      const schema = schemas.default[`${Module}Schema`];
 
-  if (fs.existsSync(modulePath)) {
-    // get module schema
-    const schema = schemas.default[`${Module}Schema`];
-
-    // get schema file
-    const pathSchema = `${BASE_PATH}/packages/server/src/modules/${moduleName}/`;
-    if (fs.existsSync(pathSchema)) {
+      // schema file
       const file = `schema.graphql`;
 
       // regenerate input fields
@@ -87,7 +86,7 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
         }
       }
 
-      shell.cd(pathSchema);
+      shell.cd(destinationPath);
       // override Module type in schema.graphql file
       const replaceType = `### schema type definitions([^()]+)### end schema type definitions`;
       shell
@@ -127,7 +126,7 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
         )
         .to(file);
 
-      logger.info(chalk.green(`✔ Schema in ${pathSchema}${file} successfully updated!`));
+      logger.info(chalk.green(`✔ Schema in ${destinationPath}${file} successfully updated!`));
 
       const resolverFile = `resolvers.ts`;
       let hasBatchResolvers = false;
@@ -164,12 +163,10 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
         .to(resolverFile);
       runPrettier(resolverFile);
 
-      logger.info(chalk.green(`✔ Resolver in ${pathSchema}${resolverFile} successfully updated!`));
+      logger.info(chalk.green(`✔ Resolver in ${destinationPath}${resolverFile} successfully updated!`));
     } else {
-      logger.error(chalk.red(`✘ Schema path ${pathSchema} not found!`));
+      logger.info(chalk.red(`✘ Module ${moduleName} in path ${destinationPath} not found!`));
     }
-  } else {
-    logger.info(chalk.red(`✘ Module ${moduleName} in path ${modulePath} not found!`));
   }
 }
 
diff --git a/tools/cli/helpers/util.js b/tools/cli/helpers/util.js
index aef6ba0d3c..96d02eab76 100644
--- a/tools/cli/helpers/util.js
+++ b/tools/cli/helpers/util.js
@@ -49,6 +49,12 @@ function renameFiles(destinationPath, moduleName) {
   shell.cd(destinationPath);
 
   // rename files
+  const timestamp = new Date().getTime();
+  shell.ls('-Rl', '.').forEach(entry => {
+    if (entry.isFile()) {
+      shell.mv(entry.name, entry.name.replace('T_Module', `${timestamp}_Module`));
+    }
+  });
   shell.ls('-Rl', '.').forEach(entry => {
     if (entry.isFile()) {
       shell.mv(entry.name, entry.name.replace('Module', Module));
@@ -124,7 +130,7 @@ function computeRootModulesPath(moduleName) {
  * @returns {string} - Return the computed path
  */
 function computeModulePackageName(moduleName, packageName, old) {
-  return old ? `./${moduleName}` : `@gqlapp/${decamelize(moduleName)}-${packageName}`;
+  return old ? `./${moduleName}` : `@gqlapp/${decamelize(moduleName, { separator: '-' })}-${packageName}`;
 }
 
 /**
@@ -137,6 +143,18 @@ function computePackagePath(packageName) {
   return `${BASE_PATH}/packages/${packageName}/package.json`;
 }
 
+/**
+ * Gets the computed path for generated schemas.
+ *
+ * @param packageName - The application package ([client|server])
+ * @param old - The flag that describes if the command invoked for a new structure or not
+ * @returns {string} - Return the computed path
+ */
+function computeGeneratedSchemasPath(packageName, old) {
+  const modulePackageName = getModulePackageName(packageName, old);
+  return `${BASE_PATH}/modules/core/${modulePackageName}/common/generatedSchemas.js`;
+}
+
 /**
  * Adds a symlink.
  *
@@ -146,7 +164,7 @@ function computePackagePath(packageName) {
 function addSymlink(packageName, modulePackageName) {
   fs.symlinkSync(
     `${BASE_PATH}/modules/${packageName}/${modulePackageName}`,
-    `${BASE_PATH}/node_modules/@gqlapp/${decamelize(packageName)}-${modulePackageName}`
+    `${BASE_PATH}/node_modules/@gqlapp/${decamelize(packageName, { separator: '-' })}-${modulePackageName}`
   );
 }
 
@@ -157,7 +175,9 @@ function addSymlink(packageName, modulePackageName) {
  * @param modulePackageName - The name of the package of a new module ([client-react|server-ts] etc.)
  */
 function removeSymlink(packageName, modulePackageName) {
-  fs.unlinkSync(`${BASE_PATH}/node_modules/@gqlapp/${decamelize(packageName)}-${modulePackageName}`);
+  fs.unlinkSync(
+    `${BASE_PATH}/node_modules/@gqlapp/${decamelize(packageName, { separator: '-' })}-${modulePackageName}`
+  );
 }
 
 /**
@@ -260,6 +280,7 @@ module.exports = {
   computeRootModulesPath,
   computePackagePath,
   computeModulePackageName,
+  computeGeneratedSchemasPath,
   addSymlink,
   removeSymlink,
   runPrettier,
diff --git a/tools/templates/crud/server-ts/migrations/_Module.js b/tools/templates/crud/server-ts/migrations/T_Module.js
similarity index 100%
rename from tools/templates/crud/server-ts/migrations/_Module.js
rename to tools/templates/crud/server-ts/migrations/T_Module.js
diff --git a/tools/templates/crud/server-ts/seeds/_Module.js b/tools/templates/crud/server-ts/seeds/T_Module.js
similarity index 100%
rename from tools/templates/crud/server-ts/seeds/_Module.js
rename to tools/templates/crud/server-ts/seeds/T_Module.js

From 7453699e5f69af4c0c8314aa0c29638dd7e908a1 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 1 Feb 2019 08:49:30 +0100
Subject: [PATCH 300/327] small cleanup

---
 modules/core/common/log.ts               |  2 +-
 modules/core/common/net.ts               | 10 ++++---
 modules/database/server-ts/sql/crud.js   | 36 +++++++++++-------------
 modules/database/server-ts/sql/select.js |  4 ++-
 modules/favicon/common/index.js          |  2 +-
 tools/cli.js                             |  1 -
 tools/cli/commands/addCrud.js            | 11 ++------
 tools/cli/commands/deleteModule.js       | 11 ++------
 tools/cli/config.js                      |  6 ----
 tools/cli/helpers/util.js                |  7 +++--
 10 files changed, 36 insertions(+), 54 deletions(-)

diff --git a/modules/core/common/log.ts b/modules/core/common/log.ts
index 4b28bb4881..18cc19cbef 100644
--- a/modules/core/common/log.ts
+++ b/modules/core/common/log.ts
@@ -9,7 +9,7 @@ const log = minilog(loggerName);
 (log as any).suggest.defaultResult = false;
 (log as any).suggest.clear().allow(loggerName, settings.app.logging.level);
 
-if (__DEV__ && __SERVER__) {
+if (typeof __DEV__ !== 'undefined' && typeof __SERVER__ !== 'undefined') {
   const consoleLog = global.console.log;
   global.console.log = (...args: any[]) => {
     if (args.length === 1 && typeof args[0] === 'string' && args[0].match(/^\[(HMR|WDS)\]/)) {
diff --git a/modules/core/common/net.ts b/modules/core/common/net.ts
index 3e0ad84f9d..fe1821947c 100644
--- a/modules/core/common/net.ts
+++ b/modules/core/common/net.ts
@@ -1,17 +1,19 @@
 import url from 'url';
 import { PLATFORM } from './utils';
 
+const apiUrlDefine = typeof __API_URL__ !== 'undefined' ? __API_URL__ : '/graphql';
+
 export const serverPort =
   PLATFORM === 'server' && (process.env.PORT || (typeof __SERVER_PORT__ !== 'undefined' ? __SERVER_PORT__ : 8080));
-export const isApiExternal = !!url.parse(__API_URL__).protocol;
+export const isApiExternal = !!url.parse(apiUrlDefine).protocol;
 
 const clientApiUrl =
   !isApiExternal && PLATFORM !== 'server'
     ? `${window.location.protocol}//${window.location.hostname}${
         __DEV__ ? ':8080' : window.location.port ? ':' + window.location.port : ''
-      }${__API_URL__}`
-    : __API_URL__;
+      }${apiUrlDefine}`
+    : apiUrlDefine;
 
-const serverApiUrl = !isApiExternal ? `http://localhost:${serverPort}${__API_URL__}` : __API_URL__;
+const serverApiUrl = !isApiExternal ? `http://localhost:${serverPort}${apiUrlDefine}` : apiUrlDefine;
 
 export const apiUrl = PLATFORM === 'server' ? serverApiUrl : clientApiUrl;
diff --git a/modules/database/server-ts/sql/crud.js b/modules/database/server-ts/sql/crud.js
index c19f407248..5573218af6 100644
--- a/modules/database/server-ts/sql/crud.js
+++ b/modules/database/server-ts/sql/crud.js
@@ -1,11 +1,12 @@
 import _ from 'lodash';
 import uuidv4 from 'uuid';
 import { decamelize, decamelizeKeys, camelize, camelizeKeys, pascalize } from 'humps';
+import { log } from '@gqlapp/core-common';
 import knexnest from 'knexnest';
 import parseFields from 'graphql-parse-fields';
 import moment from 'moment';
-
 import { FieldError } from '@gqlapp/validation-common-react';
+
 import knex from './connector';
 import { selectBy, orderedFor } from './helpers';
 import selectAdapter from './select';
@@ -40,7 +41,7 @@ export function createWithIdGenAdapter(options) {
       await builder;
       return values.id;
     } catch (e) {
-      console.error(`Error in ${T}.create()`, e);
+      log.error(`Error in ${T}.create()`, e);
       throw e;
     }
   };
@@ -66,7 +67,7 @@ export function createWithIdAdapter(options) {
       await builder;
       return values[idField];
     } catch (e) {
-      console.error(`Error in ${T}.createWithId()`, e);
+      log.error(`Error in ${T}.createWithId()`, e);
       throw e;
     }
   };
@@ -84,7 +85,7 @@ export function createWithoutIdAdapter(options) {
 
       return builder;
     } catch (e) {
-      console.error(`Error in ${T}.createWithId()`, e);
+      log.error(`Error in ${T}.createWithId()`, e);
       throw e;
     }
   };
@@ -102,7 +103,7 @@ export function getAllAdapter(options) {
       ret = camelizeKeys(ret);
       return ret;
     } catch (e) {
-      console.error(`Error in ${options.name}`, e);
+      log.error(`Error in ${options.name}`, e);
       throw e;
     }
   };
@@ -132,7 +133,7 @@ export function getByIdAdapter(options) {
       ret = camelizeKeys(ret[0]);
       return ret;
     } catch (e) {
-      console.error(`Error in ${options.name}`, e);
+      log.error(`Error in ${options.name}`, e);
       throw e;
     }
   };
@@ -159,7 +160,7 @@ export function listAdapter(options) {
       ret = camelizeKeys(ret);
       return ret;
     } catch (e) {
-      console.error(`Error in ${options.name}`, e);
+      log.error(`Error in ${options.name}`, e);
       throw e;
     }
   };
@@ -195,7 +196,7 @@ export function pagingAdapter(options) {
         pages: Math.trunc(ret.count / args.limit) + (ret.count % args.limit === 0 ? 0 : 1)
       };
     } catch (e) {
-      console.error(`Error in ${options.name}`, e);
+      log.error(`Error in ${options.name}`, e);
       throw e;
     }
   };
@@ -226,7 +227,7 @@ export function updateAdapter(options) {
 
       return builder;
     } catch (e) {
-      console.error(`Error in ${T}.update()`, e);
+      log.error(`Error in ${T}.update()`, e);
       throw e;
     }
   };
@@ -251,7 +252,7 @@ export function updateMultiConditionAdapter(options) {
 
       return builder;
     } catch (e) {
-      console.error(`Error in ${T}.updateMultiCondition()`, e);
+      log.error(`Error in ${T}.updateMultiCondition()`, e);
       throw e;
     }
   };
@@ -278,7 +279,7 @@ export function deleteAdapter(options) {
 
       return builder;
     } catch (e) {
-      console.error(`Error in ${T}.delete()`, e);
+      log.error(`Error in ${T}.delete()`, e);
       throw e;
     }
   };
@@ -298,7 +299,7 @@ export function deleteMultiConditionAdapter(options) {
 
       return builder;
     } catch (e) {
-      console.error(`Error in ${T}.deleteMultiCondition()`, e);
+      log.error(`Error in ${T}.deleteMultiCondition()`, e);
       throw e;
     }
   };
@@ -331,10 +332,7 @@ export function getManyRelationAdapter(options) {
       ret = orderedFor(ret, args.ids, camelize(options.collectionField), false);
       return ret;
     } catch (e) {
-      console.error(
-        `Error in ${options.table}.getManyRelationAdapter(${options.elemField},${options.collectionField})`,
-        e
-      );
+      log.error(`Error in ${options.table}.getManyRelationAdapter(${options.elemField},${options.collectionField})`, e);
       throw e;
     }
   };
@@ -355,7 +353,7 @@ export function createRelationAdapter(options) {
 
       return await builder;
     } catch (e) {
-      console.error(`Error in ${table}.createRelationAdapter(${elemField},${collectionField})`, e);
+      log.error(`Error in ${table}.createRelationAdapter(${elemField},${collectionField})`, e);
       throw e;
     }
   };
@@ -379,7 +377,7 @@ export function updateRelationAdapter(options) {
 
       return builder;
     } catch (e) {
-      console.error(`Error in ${table}.updateRelationAdapter(${elemField},${collectionField})`, e);
+      log.error(`Error in ${table}.updateRelationAdapter(${elemField},${collectionField})`, e);
       throw e;
     }
   };
@@ -403,7 +401,7 @@ export function deleteRelationAdapter(options) {
 
       return builder;
     } catch (e) {
-      console.error(`Error in ${table}.deleteRelationAdapter(${elemField},${collectionField})`, e);
+      log.error(`Error in ${table}.deleteRelationAdapter(${elemField},${collectionField})`, e);
       throw e;
     }
   };
diff --git a/modules/database/server-ts/sql/select.js b/modules/database/server-ts/sql/select.js
index 43d5d0277c..e7df780758 100644
--- a/modules/database/server-ts/sql/select.js
+++ b/modules/database/server-ts/sql/select.js
@@ -1,3 +1,5 @@
+import { log } from '@gqlapp/core-common';
+
 import knex from './connector';
 
 import paging from './paging';
@@ -127,7 +129,7 @@ export default function selectAdapter(options) {
       }
       return rows;
     } catch (e) {
-      console.error(`Error in ${opts.name}.selectAdapter()`, e);
+      log.error(`Error in ${opts.name}.selectAdapter()`, e);
       throw e;
     }
   };
diff --git a/modules/favicon/common/index.js b/modules/favicon/common/index.js
index 038d91cdd0..45db39dc83 100644
--- a/modules/favicon/common/index.js
+++ b/modules/favicon/common/index.js
@@ -1,5 +1,5 @@
-require('!file-loader?name=[name].[ext]!./assets/favicon.ico'); // eslint-disable-line
 // Favicon.ico should not be hashed, since some browsers expect it to be exactly on /favicon.ico URL
+require('!file-loader?name=[name].[ext]!./assets/favicon.ico'); // eslint-disable-line
 
 // Require all files from assets dir recursively addding them into assets.json
 let req = require.context('!file-loader?name=[hash].[ext]!./assets', true, /.*/);
diff --git a/tools/cli.js b/tools/cli.js
index 8e55eee7cc..cebda06a93 100644
--- a/tools/cli.js
+++ b/tools/cli.js
@@ -33,7 +33,6 @@ prog
     ['both', 'server', 'client'],
     'both'
   )
-  .argument('[tablePrefix]', 'DB table prefix.')
   .action((args, options, logger) => commandInvoker.runAddCrud(args, options, logger))
   // Delete module
   .command('deletemodule', 'Delete a Module')
diff --git a/tools/cli/commands/addCrud.js b/tools/cli/commands/addCrud.js
index 59b959aa4d..766de82826 100644
--- a/tools/cli/commands/addCrud.js
+++ b/tools/cli/commands/addCrud.js
@@ -29,17 +29,10 @@ function addCrud({ logger, packageName, moduleName, old }) {
   const modulePackageName = getModulePackageName(packageName, old);
 
   if (packageName === 'server') {
-    /*
-    if (tablePrefix) {
-      shell.cd(computeModulesPath(location, moduleName));
-      shell.sed('-i', /tablePrefix: ''/g, `tablePrefix: '${tablePrefix}'`, 'schema.js');
-
-      logger.info(chalk.green(`✔ Inserted db table prefix!`));
-    }*/
-
     const schema = `${Module}Schema`;
+    const fileName = 'generatedSchemas.js';
     const options = {
-      pathToFileWithExports: computeGeneratedSchemasPath(packageName, old),
+      pathToFileWithExports: computeGeneratedSchemasPath(packageName, fileName, old),
       exportName: schema,
       importString: `import { ${schema} } from '@gqlapp/${decamelize(moduleName, {
         separator: '-'
diff --git a/tools/cli/commands/deleteModule.js b/tools/cli/commands/deleteModule.js
index 679a76261e..5884d73882 100644
--- a/tools/cli/commands/deleteModule.js
+++ b/tools/cli/commands/deleteModule.js
@@ -124,15 +124,8 @@ function removeDependency({ moduleName, packageName, modulePackageName, old }) {
   removeSymlink(moduleName, modulePackageName);
 
   const Module = pascalize(moduleName);
-  //const modulesPath = computeModulesPath(location);
-  //const moduleCommonPath = `${modulesPath}/common`;
-  //const generatedSchemaPath = `${moduleCommonPath}/${generatedSchemasFile}`;
-  /*
-  if (fs.existsSync(generatedContainerPath)) {
-    const graphqlQuery = `${Module}Query`;
-    deleteFromFileWithExports(generatedContainerPath, graphqlQuery);
-  }*/
-  const generatedSchemaPath = computeGeneratedSchemasPath(packageName, old);
+  const fileName = 'generatedSchemas.js';
+  const generatedSchemaPath = computeGeneratedSchemasPath(packageName, fileName, old);
   if (fs.existsSync(generatedSchemaPath)) {
     const schema = `${Module}Schema`;
     deleteFromFileWithExports(generatedSchemaPath, schema);
diff --git a/tools/cli/config.js b/tools/cli/config.js
index 6236937cca..f420c2d8d3 100644
--- a/tools/cli/config.js
+++ b/tools/cli/config.js
@@ -1,9 +1,6 @@
 const path = require('path');
 
 const BASE_PATH = path.resolve(`${__dirname}/../..`);
-const DATABASE_DIR = `${BASE_PATH}/packages/server/src/database`;
-const MIGRATIONS_DIR = `${DATABASE_DIR}/migrations`;
-const SEEDS_DIR = `${DATABASE_DIR}/seeds`;
 const TEMPLATES_DIR = `${BASE_PATH}/tools/templates`;
 const MODULE_TEMPLATES = `${TEMPLATES_DIR}/module`;
 const MODULE_TEMPLATES_OLD = `${TEMPLATES_DIR}/module_old`;
@@ -11,9 +8,6 @@ const CRUD_TEMPLATES = `${TEMPLATES_DIR}/crud`;
 
 module.exports = {
   BASE_PATH,
-  DATABASE_DIR,
-  MIGRATIONS_DIR,
-  SEEDS_DIR,
   TEMPLATES_DIR,
   MODULE_TEMPLATES,
   MODULE_TEMPLATES_OLD,
diff --git a/tools/cli/helpers/util.js b/tools/cli/helpers/util.js
index 96d02eab76..029867f33c 100644
--- a/tools/cli/helpers/util.js
+++ b/tools/cli/helpers/util.js
@@ -144,15 +144,16 @@ function computePackagePath(packageName) {
 }
 
 /**
- * Gets the computed path for generated schemas.
+ * Gets the computed path for generated module list.
  *
  * @param packageName - The application package ([client|server])
+ * @param fileName - File name of generated module
  * @param old - The flag that describes if the command invoked for a new structure or not
  * @returns {string} - Return the computed path
  */
-function computeGeneratedSchemasPath(packageName, old) {
+function computeGeneratedSchemasPath(packageName, fileName, old) {
   const modulePackageName = getModulePackageName(packageName, old);
-  return `${BASE_PATH}/modules/core/${modulePackageName}/common/generatedSchemas.js`;
+  return `${BASE_PATH}/modules/core/${modulePackageName}/common/${fileName}`;
 }
 
 /**

From 8f1f15752bded15d9a1c25739938febf321c1487 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 1 Feb 2019 10:45:47 +0100
Subject: [PATCH 301/327] small fixes

---
 modules/look/client-react/ui-antd/components/index.js | 2 +-
 tools/cli/commands/addCrud.js                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/look/client-react/ui-antd/components/index.js b/modules/look/client-react/ui-antd/components/index.js
index cf836e4a46..55b18ea6e3 100644
--- a/modules/look/client-react/ui-antd/components/index.js
+++ b/modules/look/client-react/ui-antd/components/index.js
@@ -39,4 +39,4 @@ export { default as Icon } from './Icon';
 export { default as Spin } from './Spin';
 export { default as RenderSelectCountry } from './RenderSelectCountry';
 export { default as RenderCellSelectQuery } from './RenderCellSelectQuery';
-export { onAppCreate } from './NavBar';
+export { onAppCreate } from './PageLayout';
diff --git a/tools/cli/commands/addCrud.js b/tools/cli/commands/addCrud.js
index 10b68da1f6..07a1cd8efc 100644
--- a/tools/cli/commands/addCrud.js
+++ b/tools/cli/commands/addCrud.js
@@ -29,7 +29,7 @@ function addCrud({ logger, packageName, moduleName, old }) {
   const modulePackageName = getModulePackageName(packageName, old);
 
   const exportName = packageName === 'server' ? `${Module}Schema` : `${Module}Query`;
-  const fileName = packageName === 'server' ? 'generatedSchemas.js' : 'generatedSchemas.js';
+  const fileName = packageName === 'server' ? 'generatedSchemas.js' : 'generatedContainers.js';
   const importString =
     packageName === 'server'
       ? `import { ${exportName} } from '@gqlapp/${decamelize(moduleName, {

From 7d64bb040594f0455b1fca7da3ee10061d9e878a Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 1 Feb 2019 11:01:37 +0100
Subject: [PATCH 302/327] cli: small fixes

---
 packages/client/package.json       | 2 +-
 tools/cli/commands/addCrud.js      | 4 +++-
 tools/cli/commands/deleteModule.js | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index b22d61e4fc..2c3e227133 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -40,8 +40,8 @@
   "license": "MIT",
   "dependencies": {
     "@domain-schema/core": "^0.0.34",
-    "@domain-schema/validation": "^0.0.36",
     "@domain-schema/formik": "^0.0.34",
+    "@domain-schema/validation": "^0.0.36",
     "@fortawesome/fontawesome": "^1.1.8",
     "@fortawesome/fontawesome-free-brands": "^5.0.6",
     "@fortawesome/fontawesome-free-webfonts": "^1.0.9",
diff --git a/tools/cli/commands/addCrud.js b/tools/cli/commands/addCrud.js
index 07a1cd8efc..58a318fdf6 100644
--- a/tools/cli/commands/addCrud.js
+++ b/tools/cli/commands/addCrud.js
@@ -35,7 +35,9 @@ function addCrud({ logger, packageName, moduleName, old }) {
       ? `import { ${exportName} } from '@gqlapp/${decamelize(moduleName, {
           separator: '-'
         })}-${modulePackageName}/schema';\n`
-      : `import ${exportName} from '../${moduleName}/containers/${exportName}';\n`;
+      : `import ${exportName} from '@gqlapp/${decamelize(moduleName, {
+          separator: '-'
+        })}-${modulePackageName}/containers/${exportName}';\n`;
 
   const options = {
     pathToFileWithExports: computeGeneratedSchemasPath(packageName, fileName, old),
diff --git a/tools/cli/commands/deleteModule.js b/tools/cli/commands/deleteModule.js
index 5884d73882..e406723a83 100644
--- a/tools/cli/commands/deleteModule.js
+++ b/tools/cli/commands/deleteModule.js
@@ -124,11 +124,11 @@ function removeDependency({ moduleName, packageName, modulePackageName, old }) {
   removeSymlink(moduleName, modulePackageName);
 
   const Module = pascalize(moduleName);
-  const fileName = 'generatedSchemas.js';
+  const fileName = packageName === 'server' ? 'generatedSchemas.js' : 'generatedContainers.js';
   const generatedSchemaPath = computeGeneratedSchemasPath(packageName, fileName, old);
   if (fs.existsSync(generatedSchemaPath)) {
-    const schema = `${Module}Schema`;
-    deleteFromFileWithExports(generatedSchemaPath, schema);
+    const moduleName = packageName === 'server' ? `${Module}Schema` : `${Module}Query`;
+    deleteFromFileWithExports(generatedSchemaPath, moduleName);
   }
 }
 

From 9a3518e069b2e51bbb739bada6b9be5831fdc255 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 1 Feb 2019 11:44:44 +0100
Subject: [PATCH 303/327] update client template paths for crud

---
 .../core/client-react}/crud.js                |  0
 modules/core/client-react/index.tsx           |  1 +
 .../components/Module.jsx                     |  0
 .../components/Module.web.jsx                 |  4 +--
 .../components/ModuleView.native.tsx          | 36 -------------------
 .../client-react/components/ModuleView.tsx    | 29 ---------------
 .../crud/client-react/containers/Module.tsx   | 16 ---------
 .../containers/ModuleEdit.jsx                 | 12 ++++---
 .../containers/ModuleFilter.jsx               | 12 ++++---
 .../containers/ModuleList.jsx                 |  8 ++---
 .../containers/ModuleQuery.jsx                |  0
 .../graphql/CreateModule.graphql              |  0
 .../graphql/DeleteManyModules.graphql         |  0
 .../graphql/DeleteModule.graphql              |  0
 .../graphql/Module.graphql                    |  0
 .../client-react/graphql/ModuleQuery.graphql  | 11 +++---
 .../graphql/ModuleState.client.graphql        |  0
 .../graphql/ModuleStateQuery.client.graphql   |  0
 .../graphql/ModulesQuery.graphql              |  0
 .../graphql/ModulesSubscription.graphql       |  0
 .../graphql/SortModules.graphql               |  0
 .../graphql/UpdateFilter.client.graphql       |  0
 .../graphql/UpdateLimit.client.graphql        |  0
 .../graphql/UpdateManyModules.graphql         |  0
 .../graphql/UpdateModule.graphql              |  0
 .../graphql/UpdateOrderBy.client.graphql      |  0
 .../{client => client-react}/index.native.jsx |  5 +--
 .../crud/client-react/index.native.tsx        | 36 -------------------
 tools/templates/crud/client-react/index.tsx   | 25 -------------
 .../{client => client-react}/index.web.jsx    |  8 ++---
 .../client-react/locales/en/translations.json |  6 ----
 .../crud/client-react/locales/index.js        |  5 ---
 .../client-react/locales/ru/translations.json |  6 ----
 .../templates/crud/client-react/package.json  |  5 ---
 .../resolvers/index.js                        |  4 +--
 .../crud/client/containers/Module.spec.js     | 17 ---------
 .../crud/client/graphql/ModuleQuery.graphql   |  9 -----
 37 files changed, 39 insertions(+), 216 deletions(-)
 rename {packages/client/src/utils => modules/core/client-react}/crud.js (100%)
 rename tools/templates/crud/{client => client-react}/components/Module.jsx (100%)
 rename tools/templates/crud/{client => client-react}/components/Module.web.jsx (88%)
 delete mode 100644 tools/templates/crud/client-react/components/ModuleView.native.tsx
 delete mode 100644 tools/templates/crud/client-react/components/ModuleView.tsx
 delete mode 100644 tools/templates/crud/client-react/containers/Module.tsx
 rename tools/templates/crud/{client => client-react}/containers/ModuleEdit.jsx (87%)
 rename tools/templates/crud/{client => client-react}/containers/ModuleFilter.jsx (71%)
 rename tools/templates/crud/{client => client-react}/containers/ModuleList.jsx (95%)
 rename tools/templates/crud/{client => client-react}/containers/ModuleQuery.jsx (100%)
 rename tools/templates/crud/{client => client-react}/graphql/CreateModule.graphql (100%)
 rename tools/templates/crud/{client => client-react}/graphql/DeleteManyModules.graphql (100%)
 rename tools/templates/crud/{client => client-react}/graphql/DeleteModule.graphql (100%)
 rename tools/templates/crud/{client => client-react}/graphql/Module.graphql (100%)
 rename tools/templates/crud/{client => client-react}/graphql/ModuleState.client.graphql (100%)
 rename tools/templates/crud/{client => client-react}/graphql/ModuleStateQuery.client.graphql (100%)
 rename tools/templates/crud/{client => client-react}/graphql/ModulesQuery.graphql (100%)
 rename tools/templates/crud/{client => client-react}/graphql/ModulesSubscription.graphql (100%)
 rename tools/templates/crud/{client => client-react}/graphql/SortModules.graphql (100%)
 rename tools/templates/crud/{client => client-react}/graphql/UpdateFilter.client.graphql (100%)
 rename tools/templates/crud/{client => client-react}/graphql/UpdateLimit.client.graphql (100%)
 rename tools/templates/crud/{client => client-react}/graphql/UpdateManyModules.graphql (100%)
 rename tools/templates/crud/{client => client-react}/graphql/UpdateModule.graphql (100%)
 rename tools/templates/crud/{client => client-react}/graphql/UpdateOrderBy.client.graphql (100%)
 rename tools/templates/crud/{client => client-react}/index.native.jsx (92%)
 delete mode 100644 tools/templates/crud/client-react/index.native.tsx
 delete mode 100644 tools/templates/crud/client-react/index.tsx
 rename tools/templates/crud/{client => client-react}/index.web.jsx (83%)
 delete mode 100644 tools/templates/crud/client-react/locales/en/translations.json
 delete mode 100644 tools/templates/crud/client-react/locales/index.js
 delete mode 100644 tools/templates/crud/client-react/locales/ru/translations.json
 delete mode 100644 tools/templates/crud/client-react/package.json
 rename tools/templates/crud/{client => client-react}/resolvers/index.js (93%)
 delete mode 100644 tools/templates/crud/client/containers/Module.spec.js
 delete mode 100644 tools/templates/crud/client/graphql/ModuleQuery.graphql

diff --git a/packages/client/src/utils/crud.js b/modules/core/client-react/crud.js
similarity index 100%
rename from packages/client/src/utils/crud.js
rename to modules/core/client-react/crud.js
diff --git a/modules/core/client-react/index.tsx b/modules/core/client-react/index.tsx
index 1bac8043e7..a7e8bcfc2e 100644
--- a/modules/core/client-react/index.tsx
+++ b/modules/core/client-react/index.tsx
@@ -1,5 +1,6 @@
 import { PLATFORM } from '@gqlapp/core-common';
 export { default as clientOnly } from './clientOnly';
 export { default as schemaQueries } from './common/generatedContainers';
+export * from './crud';
 
 export default (__CLIENT__ && PLATFORM === 'web' ? require('./app').default : {});
diff --git a/tools/templates/crud/client/components/Module.jsx b/tools/templates/crud/client-react/components/Module.jsx
similarity index 100%
rename from tools/templates/crud/client/components/Module.jsx
rename to tools/templates/crud/client-react/components/Module.jsx
diff --git a/tools/templates/crud/client/components/Module.web.jsx b/tools/templates/crud/client-react/components/Module.web.jsx
similarity index 88%
rename from tools/templates/crud/client/components/Module.web.jsx
rename to tools/templates/crud/client-react/components/Module.web.jsx
index ef88b4b4b0..e35d58c05e 100644
--- a/tools/templates/crud/client/components/Module.web.jsx
+++ b/tools/templates/crud/client-react/components/Module.web.jsx
@@ -1,11 +1,11 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import Helmet from 'react-helmet';
-import { PageLayout } from '../../common/components/web';
+import { PageLayout } from '@gqlapp/look-client-react';
 
 import $Module$Filter from '../containers/$Module$Filter';
 import $Module$List from '../containers/$Module$List';
-import settings from '../../../../../../settings';
+import settings from '../../../../settings';
 
 export default class $Module$ extends React.PureComponent {
   static propTypes = {
diff --git a/tools/templates/crud/client-react/components/ModuleView.native.tsx b/tools/templates/crud/client-react/components/ModuleView.native.tsx
deleted file mode 100644
index 22ca9cd123..0000000000
--- a/tools/templates/crud/client-react/components/ModuleView.native.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import React from 'react';
-import { StyleSheet, Text, View } from 'react-native';
-import { TranslateFunction } from '@gqlapp/i18n-client-react';
-
-interface $Module$ViewProps {
-  t: TranslateFunction;
-}
-
-const $Module$View = ({ t }: $Module$ViewProps) => {
-  return (
-    <View style={styles.container}>
-      <View style={styles.element}>
-        <Text style={styles.box}>{t('welcomeText')}</Text>
-      </View>
-    </View>
-  );
-};
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    backgroundColor: '#fff',
-    alignItems: 'center',
-    justifyContent: 'center'
-  },
-  element: {
-    paddingTop: 30
-  },
-  box: {
-    textAlign: 'center',
-    marginLeft: 15,
-    marginRight: 15
-  }
-});
-
-export default $Module$View;
diff --git a/tools/templates/crud/client-react/components/ModuleView.tsx b/tools/templates/crud/client-react/components/ModuleView.tsx
deleted file mode 100644
index 8c232948e0..0000000000
--- a/tools/templates/crud/client-react/components/ModuleView.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import React from 'react';
-import Helmet from 'react-helmet';
-import { PageLayout } from '@gqlapp/look-client-react';
-import { TranslateFunction } from '@gqlapp/i18n-client-react';
-import settings from '../../../../settings';
-
-interface $Module$ViewProps {
-  t: TranslateFunction;
-}
-
-const renderMetaData = (t: TranslateFunction) => (
-  <Helmet
-    title={`${settings.app.name} - ${t('title')}`}
-    meta={[{ name: 'description', content: `${settings.app.name} - ${t('meta')}` }]}
-  />
-);
-
-const $Module$View = ({ t }: $Module$ViewProps) => {
-  return (
-    <PageLayout>
-      {renderMetaData(t)}
-      <div className="text-center">
-        <p>{t('welcomeText')}</p>
-      </div>
-    </PageLayout>
-  );
-};
-
-export default $Module$View;
diff --git a/tools/templates/crud/client-react/containers/Module.tsx b/tools/templates/crud/client-react/containers/Module.tsx
deleted file mode 100644
index b4cab4027b..0000000000
--- a/tools/templates/crud/client-react/containers/Module.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import React from 'react';
-
-import { translate, TranslateFunction } from '@gqlapp/i18n-client-react';
-import $Module$View from '../components/$Module$View';
-
-interface $Module$Props {
-  t: TranslateFunction;
-}
-
-class $Module$ extends React.Component<$Module$Props> {
-  public render() {
-    return <$Module$View {...this.props} />;
-  }
-}
-
-export default translate('$module$')($Module$);
diff --git a/tools/templates/crud/client/containers/ModuleEdit.jsx b/tools/templates/crud/client-react/containers/ModuleEdit.jsx
similarity index 87%
rename from tools/templates/crud/client/containers/ModuleEdit.jsx
rename to tools/templates/crud/client-react/containers/ModuleEdit.jsx
index da0aa60059..4818006a5e 100644
--- a/tools/templates/crud/client/containers/ModuleEdit.jsx
+++ b/tools/templates/crud/client-react/containers/ModuleEdit.jsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import { graphql, compose } from 'react-apollo';
 
-import { EditView } from '../../common/components/crud';
-import { $Module$Schema } from '../../../../../server/src/modules/$module$/schema';
+import { EditView } from '@gqlapp/look-client-react';
+import { $Module$Schema } from '../../server-ts/schema';
 import $MODULE$_QUERY from '../graphql/$Module$Query.graphql';
 import CREATE_$MODULE$ from '../graphql/Create$Module$.graphql';
 import UPDATE_$MODULE$ from '../graphql/Update$Module$.graphql';
@@ -36,7 +36,9 @@ export default compose(
     props: ({ ownProps: { history, navigation }, mutate }) => ({
       createEntry: async data => {
         try {
-          const { data: { create$Module$ } } = await mutate({
+          const {
+            data: { create$Module$ }
+          } = await mutate({
             variables: { data }
           });
 
@@ -60,7 +62,9 @@ export default compose(
     props: ({ ownProps: { history, navigation }, mutate }) => ({
       updateEntry: async (data, where) => {
         try {
-          const { data: { update$Module$ } } = await mutate({
+          const {
+            data: { update$Module$ }
+          } = await mutate({
             variables: { data, where }
           });
 
diff --git a/tools/templates/crud/client/containers/ModuleFilter.jsx b/tools/templates/crud/client-react/containers/ModuleFilter.jsx
similarity index 71%
rename from tools/templates/crud/client/containers/ModuleFilter.jsx
rename to tools/templates/crud/client-react/containers/ModuleFilter.jsx
index 707e4fb468..990dc47db0 100644
--- a/tools/templates/crud/client/containers/ModuleFilter.jsx
+++ b/tools/templates/crud/client-react/containers/ModuleFilter.jsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import { graphql, compose } from 'react-apollo';
+import { FilterView } from '@gqlapp/look-client-react';
+import { removeTypename } from '@gqlapp/core-common';
 
-import { removeTypename } from '../../../../../common/utils';
-import { FilterView } from '../../common/components/crud';
-import { $Module$Schema } from '../../../../../server/src/modules/$module$/schema';
+import { $Module$Schema } from '../../server-ts/schema';
 
 import $MODULE$_STATE_QUERY from '../graphql/$Module$StateQuery.client.graphql';
 import UPDATE_FILTER from '../graphql/UpdateFilter.client.graphql';
@@ -16,7 +16,11 @@ class $Module$Filter extends React.Component {
 
 export default compose(
   graphql($MODULE$_STATE_QUERY, {
-    props({ data: { $module$State: { filter } } }) {
+    props({
+      data: {
+        $module$State: { filter }
+      }
+    }) {
       return removeTypename(filter);
     }
   }),
diff --git a/tools/templates/crud/client/containers/ModuleList.jsx b/tools/templates/crud/client-react/containers/ModuleList.jsx
similarity index 95%
rename from tools/templates/crud/client/containers/ModuleList.jsx
rename to tools/templates/crud/client-react/containers/ModuleList.jsx
index bf562b765f..4986f57f70 100644
--- a/tools/templates/crud/client/containers/ModuleList.jsx
+++ b/tools/templates/crud/client-react/containers/ModuleList.jsx
@@ -2,11 +2,11 @@ import React from 'react';
 import { graphql, compose } from 'react-apollo';
 import update from 'immutability-helper';
 import PropTypes from 'prop-types';
+import { ListView } from '@gqlapp/look-client-react';
+import { removeTypename, removeEmpty } from '@gqlapp/core-common';
+import { updateEntry, deleteEntry } from '@gqlapp/core-client-react';
 
-import { removeTypename, removeEmpty } from '../../../../../common/utils';
-import { ListView } from '../../common/components/crud';
-import { updateEntry, deleteEntry } from '../../../utils/crud';
-import { $Module$Schema } from '../../../../../server/src/modules/$module$/schema';
+import { $Module$Schema } from '../../server-ts/schema';
 
 import $MODULE$_STATE_QUERY from '../graphql/$Module$StateQuery.client.graphql';
 import UPDATE_LIMIT from '../graphql/UpdateLimit.client.graphql';
diff --git a/tools/templates/crud/client/containers/ModuleQuery.jsx b/tools/templates/crud/client-react/containers/ModuleQuery.jsx
similarity index 100%
rename from tools/templates/crud/client/containers/ModuleQuery.jsx
rename to tools/templates/crud/client-react/containers/ModuleQuery.jsx
diff --git a/tools/templates/crud/client/graphql/CreateModule.graphql b/tools/templates/crud/client-react/graphql/CreateModule.graphql
similarity index 100%
rename from tools/templates/crud/client/graphql/CreateModule.graphql
rename to tools/templates/crud/client-react/graphql/CreateModule.graphql
diff --git a/tools/templates/crud/client/graphql/DeleteManyModules.graphql b/tools/templates/crud/client-react/graphql/DeleteManyModules.graphql
similarity index 100%
rename from tools/templates/crud/client/graphql/DeleteManyModules.graphql
rename to tools/templates/crud/client-react/graphql/DeleteManyModules.graphql
diff --git a/tools/templates/crud/client/graphql/DeleteModule.graphql b/tools/templates/crud/client-react/graphql/DeleteModule.graphql
similarity index 100%
rename from tools/templates/crud/client/graphql/DeleteModule.graphql
rename to tools/templates/crud/client-react/graphql/DeleteModule.graphql
diff --git a/tools/templates/crud/client/graphql/Module.graphql b/tools/templates/crud/client-react/graphql/Module.graphql
similarity index 100%
rename from tools/templates/crud/client/graphql/Module.graphql
rename to tools/templates/crud/client-react/graphql/Module.graphql
diff --git a/tools/templates/crud/client-react/graphql/ModuleQuery.graphql b/tools/templates/crud/client-react/graphql/ModuleQuery.graphql
index f9c5113153..76df5c5591 100644
--- a/tools/templates/crud/client-react/graphql/ModuleQuery.graphql
+++ b/tools/templates/crud/client-react/graphql/ModuleQuery.graphql
@@ -1,6 +1,9 @@
-# GraphQL queries
-query queryNameQuery {
-  queryName {
-    typename
+#import "./$Module$.graphql"
+
+query $module$($where: $Module$WhereUniqueInput!) {
+  $module$(where: $where) {
+    node {
+      ...$Module$Info
+    }
   }
 }
diff --git a/tools/templates/crud/client/graphql/ModuleState.client.graphql b/tools/templates/crud/client-react/graphql/ModuleState.client.graphql
similarity index 100%
rename from tools/templates/crud/client/graphql/ModuleState.client.graphql
rename to tools/templates/crud/client-react/graphql/ModuleState.client.graphql
diff --git a/tools/templates/crud/client/graphql/ModuleStateQuery.client.graphql b/tools/templates/crud/client-react/graphql/ModuleStateQuery.client.graphql
similarity index 100%
rename from tools/templates/crud/client/graphql/ModuleStateQuery.client.graphql
rename to tools/templates/crud/client-react/graphql/ModuleStateQuery.client.graphql
diff --git a/tools/templates/crud/client/graphql/ModulesQuery.graphql b/tools/templates/crud/client-react/graphql/ModulesQuery.graphql
similarity index 100%
rename from tools/templates/crud/client/graphql/ModulesQuery.graphql
rename to tools/templates/crud/client-react/graphql/ModulesQuery.graphql
diff --git a/tools/templates/crud/client/graphql/ModulesSubscription.graphql b/tools/templates/crud/client-react/graphql/ModulesSubscription.graphql
similarity index 100%
rename from tools/templates/crud/client/graphql/ModulesSubscription.graphql
rename to tools/templates/crud/client-react/graphql/ModulesSubscription.graphql
diff --git a/tools/templates/crud/client/graphql/SortModules.graphql b/tools/templates/crud/client-react/graphql/SortModules.graphql
similarity index 100%
rename from tools/templates/crud/client/graphql/SortModules.graphql
rename to tools/templates/crud/client-react/graphql/SortModules.graphql
diff --git a/tools/templates/crud/client/graphql/UpdateFilter.client.graphql b/tools/templates/crud/client-react/graphql/UpdateFilter.client.graphql
similarity index 100%
rename from tools/templates/crud/client/graphql/UpdateFilter.client.graphql
rename to tools/templates/crud/client-react/graphql/UpdateFilter.client.graphql
diff --git a/tools/templates/crud/client/graphql/UpdateLimit.client.graphql b/tools/templates/crud/client-react/graphql/UpdateLimit.client.graphql
similarity index 100%
rename from tools/templates/crud/client/graphql/UpdateLimit.client.graphql
rename to tools/templates/crud/client-react/graphql/UpdateLimit.client.graphql
diff --git a/tools/templates/crud/client/graphql/UpdateManyModules.graphql b/tools/templates/crud/client-react/graphql/UpdateManyModules.graphql
similarity index 100%
rename from tools/templates/crud/client/graphql/UpdateManyModules.graphql
rename to tools/templates/crud/client-react/graphql/UpdateManyModules.graphql
diff --git a/tools/templates/crud/client/graphql/UpdateModule.graphql b/tools/templates/crud/client-react/graphql/UpdateModule.graphql
similarity index 100%
rename from tools/templates/crud/client/graphql/UpdateModule.graphql
rename to tools/templates/crud/client-react/graphql/UpdateModule.graphql
diff --git a/tools/templates/crud/client/graphql/UpdateOrderBy.client.graphql b/tools/templates/crud/client-react/graphql/UpdateOrderBy.client.graphql
similarity index 100%
rename from tools/templates/crud/client/graphql/UpdateOrderBy.client.graphql
rename to tools/templates/crud/client-react/graphql/UpdateOrderBy.client.graphql
diff --git a/tools/templates/crud/client/index.native.jsx b/tools/templates/crud/client-react/index.native.jsx
similarity index 92%
rename from tools/templates/crud/client/index.native.jsx
rename to tools/templates/crud/client-react/index.native.jsx
index dd2018f907..eae965e2a2 100644
--- a/tools/templates/crud/client/index.native.jsx
+++ b/tools/templates/crud/client-react/index.native.jsx
@@ -1,13 +1,14 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import ClientModule from '@gqlapp/module-client-react-native';
 import { Button } from 'react-native';
 import { createStackNavigator } from 'react-navigation';
 import { Ionicons } from '@expo/vector-icons';
-import { createTabBarIconWrapper } from '../common/components/native';
+import { createTabBarIconWrapper } from '@gqlapp/look-client-react';
+
 import $Module$List from './containers/$Module$List';
 import $Module$Edit from './containers/$Module$Edit';
 import resolvers from './resolvers';
-import ClientModule from '../ClientModule.native';
 
 class $Module$ListScreen extends React.Component {
   static navigationOptions = ({ navigation }) => ({
diff --git a/tools/templates/crud/client-react/index.native.tsx b/tools/templates/crud/client-react/index.native.tsx
deleted file mode 100644
index 13c4fa03b4..0000000000
--- a/tools/templates/crud/client-react/index.native.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import React from 'react';
-import { createStackNavigator } from 'react-navigation';
-
-import { translate } from '@gqlapp/i18n-client-react';
-import ClientModule from '@gqlapp/module-client-react-native';
-
-import { HeaderTitle, IconButton } from '../../../packages/client/src/modules/common/components/native';
-import $Module$ from './containers/$Module$';
-import resources from './locales';
-
-const HeaderTitleWithI18n = translate('$module$')(HeaderTitle);
-
-export default new ClientModule({
-  drawerItem: [
-    {
-      $Module$: {
-        screen: createStackNavigator({
-          $Module$: {
-            screen: $Module$,
-            navigationOptions: ({ navigation }: any) => ({
-              headerTitle: <HeaderTitleWithI18n style="subTitle" />,
-              headerLeft: (
-                <IconButton iconName="menu" iconSize={32} iconColor="#0275d8" onPress={() => navigation.openDrawer()} />
-              ),
-              headerStyle: { backgroundColor: '#fff' }
-            })
-          }
-        }),
-        navigationOptions: {
-          drawerLabel: <HeaderTitleWithI18n />
-        }
-      }
-    }
-  ],
-  localization: [{ ns: '$module$', resources }]
-});
diff --git a/tools/templates/crud/client-react/index.tsx b/tools/templates/crud/client-react/index.tsx
deleted file mode 100644
index bb5cdfb98a..0000000000
--- a/tools/templates/crud/client-react/index.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import React from 'react';
-
-import ClientModule from '@gqlapp/module-client-react';
-import { translate, TranslateFunction } from '@gqlapp/i18n-client-react';
-
-import { Route, NavLink } from 'react-router-dom';
-import { MenuItem } from '@gqlapp/look-client-react';
-import $Module$ from './containers/$Module$';
-import resources from './locales';
-
-const NavLinkWithI18n = translate('$module$')(({ t }: { t: TranslateFunction }) => (
-  <NavLink to="/$module$" className="nav-link" activeClassName="active">
-    {t('$module$:navLink')}
-  </NavLink>
-));
-
-export default new ClientModule({
-  route: [<Route exact path="/$module$" component={$Module$} />],
-  navItem: [
-    <MenuItem key="/$module$">
-      <NavLinkWithI18n />
-    </MenuItem>
-  ],
-  localization: [{ ns: '$module$', resources }]
-});
diff --git a/tools/templates/crud/client/index.web.jsx b/tools/templates/crud/client-react/index.web.jsx
similarity index 83%
rename from tools/templates/crud/client/index.web.jsx
rename to tools/templates/crud/client-react/index.web.jsx
index e84a05d364..712541700f 100644
--- a/tools/templates/crud/client/index.web.jsx
+++ b/tools/templates/crud/client-react/index.web.jsx
@@ -1,13 +1,13 @@
 import React from 'react';
+import ClientModule from '@gqlapp/module-client-react';
 import { NavLink } from 'react-router-dom';
-import { MenuItem } from '../../modules/common/components/web';
+import { MenuItem } from '@gqlapp/look-client-react';
+import { AuthRoute, IfLoggedIn } from '@gqlapp/user-client-react';
+
 import $Module$ from './components/$Module$';
 import $Module$Edit from './containers/$Module$Edit';
 import resolvers from './resolvers';
 
-import { AuthRoute, IfLoggedIn } from '../user/containers/Auth';
-import ClientModule from '../ClientModule';
-
 export default new ClientModule({
   route: [
     <AuthRoute
diff --git a/tools/templates/crud/client-react/locales/en/translations.json b/tools/templates/crud/client-react/locales/en/translations.json
deleted file mode 100644
index 8131aae904..0000000000
--- a/tools/templates/crud/client-react/locales/en/translations.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "navLink": "$Module$ nav link",
-  "title": "$Module$ module",
-  "meta": "$Module$ example",
-  "welcomeText": "Hello, This is the $Module$ module"
-}
\ No newline at end of file
diff --git a/tools/templates/crud/client-react/locales/index.js b/tools/templates/crud/client-react/locales/index.js
deleted file mode 100644
index 9abc2aac88..0000000000
--- a/tools/templates/crud/client-react/locales/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/* 
-* The index.js can be empty, it's just needed to point the loader to the root directory of the locales.
-* https://github.com/alienfast/i18next-loader#option-2-use-with-import-syntax
-*/
-export default {};
\ No newline at end of file
diff --git a/tools/templates/crud/client-react/locales/ru/translations.json b/tools/templates/crud/client-react/locales/ru/translations.json
deleted file mode 100644
index 1bace811f7..0000000000
--- a/tools/templates/crud/client-react/locales/ru/translations.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "navLink": "$Module$ ссылка",
-  "title": "$Module$ модуль",
-  "meta": "$Module$ пример",
-  "welcomeText": "Привет, это $Module$ модуль"
-}
\ No newline at end of file
diff --git a/tools/templates/crud/client-react/package.json b/tools/templates/crud/client-react/package.json
deleted file mode 100644
index 0a162b9c24..0000000000
--- a/tools/templates/crud/client-react/package.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "name": "@gqlapp/$-module$-client-react",
-  "version": "1.0.0",
-  "private": true
-}
diff --git a/tools/templates/crud/client/resolvers/index.js b/tools/templates/crud/client-react/resolvers/index.js
similarity index 93%
rename from tools/templates/crud/client/resolvers/index.js
rename to tools/templates/crud/client-react/resolvers/index.js
index c9f457eecf..9176800735 100644
--- a/tools/templates/crud/client/resolvers/index.js
+++ b/tools/templates/crud/client-react/resolvers/index.js
@@ -1,7 +1,7 @@
 import update from 'immutability-helper';
+import { mergeFilter } from '@gqlapp/core-client-react';
 
-import { mergeFilter } from '../../../utils/crud';
-import { $Module$Schema } from '../../../../../server/src/modules/$module$/schema';
+import { $Module$Schema } from '../../server-ts/schema';
 import $MODULE$_STATE_QUERY from '../graphql/$Module$StateQuery.client.graphql';
 
 const TYPE_$MODULE$_STATE = '$Module$State';
diff --git a/tools/templates/crud/client/containers/Module.spec.js b/tools/templates/crud/client/containers/Module.spec.js
deleted file mode 100644
index ac34fe5ce1..0000000000
--- a/tools/templates/crud/client/containers/Module.spec.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { expect } from 'chai';
-import { step } from 'mocha-steps';
-import Renderer from '../../../testHelpers/Renderer';
-import Routes from '../../../app/Routes';
-
-describe('$Module$ UI works', () => {
-  const renderer = new Renderer({});
-  let app;
-  let content;
-
-  step('$Module$ page renders on mount', () => {
-    app = renderer.mount(Routes);
-    renderer.history.push('/$module$');
-    content = app.find('#content');
-    expect(content).to.not.be.empty;
-  });
-});
diff --git a/tools/templates/crud/client/graphql/ModuleQuery.graphql b/tools/templates/crud/client/graphql/ModuleQuery.graphql
deleted file mode 100644
index 76df5c5591..0000000000
--- a/tools/templates/crud/client/graphql/ModuleQuery.graphql
+++ /dev/null
@@ -1,9 +0,0 @@
-#import "./$Module$.graphql"
-
-query $module$($where: $Module$WhereUniqueInput!) {
-  $module$(where: $where) {
-    node {
-      ...$Module$Info
-    }
-  }
-}

From 886b40c9edf145477a4deac3d814c49e1f7f82c8 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Mon, 4 Feb 2019 14:11:10 +0100
Subject: [PATCH 304/327] move crud libs to modules, wip

---
 .../look/client-react}/crud/EditView.jsx      |  0
 .../look/client-react}/crud/EditView.web.jsx  |  4 +-
 .../look/client-react}/crud/FilterView.jsx    |  0
 .../client-react}/crud/FilterView.web.jsx     | 11 ++---
 .../look/client-react}/crud/FormView.jsx      |  5 +-
 .../look/client-react}/crud/FormView.web.jsx  |  5 +-
 .../look/client-react}/crud/ListView.jsx      |  2 +-
 .../look/client-react}/crud/ListView.web.jsx  | 28 +++++++----
 .../look/client-react}/crud/index.jsx         |  0
 .../look/client-react}/util.jsx               |  4 +-
 .../look/client-react}/util.web.jsx           | 47 +++++++++----------
 .../client-react/__tests__/Module.spec.ts     | 21 ---------
 .../templates/crud/client-react/package.json  |  5 ++
 13 files changed, 62 insertions(+), 70 deletions(-)
 rename {packages/client/src/modules/common/components => modules/look/client-react}/crud/EditView.jsx (100%)
 rename {packages/client/src/modules/common/components => modules/look/client-react}/crud/EditView.web.jsx (92%)
 rename {packages/client/src/modules/common/components => modules/look/client-react}/crud/FilterView.jsx (100%)
 rename {packages/client/src/modules/common/components => modules/look/client-react}/crud/FilterView.web.jsx (90%)
 rename {packages/client/src/modules/common/components => modules/look/client-react}/crud/FormView.jsx (86%)
 rename {packages/client/src/modules/common/components => modules/look/client-react}/crud/FormView.web.jsx (91%)
 rename {packages/client/src/modules/common/components => modules/look/client-react}/crud/ListView.jsx (95%)
 rename {packages/client/src/modules/common/components => modules/look/client-react}/crud/ListView.web.jsx (96%)
 rename {packages/client/src/modules/common/components => modules/look/client-react}/crud/index.jsx (100%)
 rename {packages/client/src/modules/common => modules/look/client-react}/util.jsx (96%)
 rename {packages/client/src/modules/common => modules/look/client-react}/util.web.jsx (94%)
 delete mode 100644 tools/templates/crud/client-react/__tests__/Module.spec.ts
 create mode 100644 tools/templates/crud/client-react/package.json

diff --git a/packages/client/src/modules/common/components/crud/EditView.jsx b/modules/look/client-react/crud/EditView.jsx
similarity index 100%
rename from packages/client/src/modules/common/components/crud/EditView.jsx
rename to modules/look/client-react/crud/EditView.jsx
diff --git a/packages/client/src/modules/common/components/crud/EditView.web.jsx b/modules/look/client-react/crud/EditView.web.jsx
similarity index 92%
rename from packages/client/src/modules/common/components/crud/EditView.web.jsx
rename to modules/look/client-react/crud/EditView.web.jsx
index ff17ebc919..6277b5af9d 100644
--- a/packages/client/src/modules/common/components/crud/EditView.web.jsx
+++ b/modules/look/client-react/crud/EditView.web.jsx
@@ -3,9 +3,9 @@ import PropTypes from 'prop-types';
 import Helmet from 'react-helmet';
 import { Link } from 'react-router-dom';
 
-import { PageLayout } from '../web';
+import { PageLayout } from '@gqlapp/look-client-react';
 import FormView from './FormView';
-import settings from '../../../../../../../settings';
+import settings from '../../../../settings';
 
 class EditView extends React.PureComponent {
   static propTypes = {
diff --git a/packages/client/src/modules/common/components/crud/FilterView.jsx b/modules/look/client-react/crud/FilterView.jsx
similarity index 100%
rename from packages/client/src/modules/common/components/crud/FilterView.jsx
rename to modules/look/client-react/crud/FilterView.jsx
diff --git a/packages/client/src/modules/common/components/crud/FilterView.web.jsx b/modules/look/client-react/crud/FilterView.web.jsx
similarity index 90%
rename from packages/client/src/modules/common/components/crud/FilterView.web.jsx
rename to modules/look/client-react/crud/FilterView.web.jsx
index afe05ce252..d9d91b1d3a 100644
--- a/packages/client/src/modules/common/components/crud/FilterView.web.jsx
+++ b/modules/look/client-react/crud/FilterView.web.jsx
@@ -2,11 +2,10 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Formik } from 'formik';
 import { DebounceInput } from 'react-debounce-input';
+import { Form, FormItem, Input, Row, Col, Button, Icon, createFormFields } from '@gqlapp/look-client-react';
+import { mapFormPropsToValues, pickInputFields } from '@gqlapp/core-client-react';
 
-import { hasRole } from '../../../user/containers/Auth';
-import { Form, FormItem, Input, Row, Col, Button, Icon } from '../web';
-import { createFormFields } from '../../util';
-import { mapFormPropsToValues, pickInputFields } from '../../../../utils/crud';
+const { hasRole } = require('@gqlapp/user-client-react');
 
 const formItemLayout = {
   labelCol: {
@@ -52,8 +51,8 @@ class FilterView extends React.PureComponent {
       customFields === null
         ? false
         : customFields && customFields.role
-          ? !!hasRole(customFields.role, currentUser)
-          : true;
+        ? !!hasRole(customFields.role, currentUser)
+        : true;
 
     if (!showFilter) {
       return null;
diff --git a/packages/client/src/modules/common/components/crud/FormView.jsx b/modules/look/client-react/crud/FormView.jsx
similarity index 86%
rename from packages/client/src/modules/common/components/crud/FormView.jsx
rename to modules/look/client-react/crud/FormView.jsx
index 567bcdaa47..c6a57ba949 100644
--- a/packages/client/src/modules/common/components/crud/FormView.jsx
+++ b/modules/look/client-react/crud/FormView.jsx
@@ -3,9 +3,8 @@ import PropTypes from 'prop-types';
 import { Formik } from 'formik';
 import DomainValidator from '@domain-schema/validation';
 
-import { onSubmit, mapFormPropsToValues } from '../../../../utils/crud';
-import { createFormFields } from '../../util';
-import { FormView, Button } from '../native';
+import { createFormFields, onSubmit, mapFormPropsToValues } from '@gqlapp/core-client-react';
+import { FormView, Button } from '@gqlapp/look-client-react-native';
 
 const Form = ({ schema, data: { node }, updateEntry, createEntry }) => {
   return (
diff --git a/packages/client/src/modules/common/components/crud/FormView.web.jsx b/modules/look/client-react/crud/FormView.web.jsx
similarity index 91%
rename from packages/client/src/modules/common/components/crud/FormView.web.jsx
rename to modules/look/client-react/crud/FormView.web.jsx
index 5c9978662e..3f8b970259 100644
--- a/packages/client/src/modules/common/components/crud/FormView.web.jsx
+++ b/modules/look/client-react/crud/FormView.web.jsx
@@ -3,9 +3,8 @@ import PropTypes from 'prop-types';
 import { Formik } from 'formik';
 import DomainValidator from '@domain-schema/validation';
 
-import { onSubmit, mapFormPropsToValues } from '../../../../utils/crud';
-import { createFormFields } from '../../util';
-import { Form, FormItem, Button } from '../web';
+import { Form, FormItem, Button, createFormFields } from '@gqlapp/look-client-react';
+import { onSubmit, mapFormPropsToValues } from '@gqlapp/core-client-react';
 
 const tailFormItemLayout = {
   wrapperCol: {
diff --git a/packages/client/src/modules/common/components/crud/ListView.jsx b/modules/look/client-react/crud/ListView.jsx
similarity index 95%
rename from packages/client/src/modules/common/components/crud/ListView.jsx
rename to modules/look/client-react/crud/ListView.jsx
index 68862fa0e3..495f0169ae 100644
--- a/packages/client/src/modules/common/components/crud/ListView.jsx
+++ b/modules/look/client-react/crud/ListView.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { StyleSheet, FlatList, Text, View } from 'react-native';
-import { SwipeAction } from '../native';
+import { SwipeAction } from '@gqlapp/look-client-react-native';
 
 class ListView extends React.PureComponent {
   static propTypes = {
diff --git a/packages/client/src/modules/common/components/crud/ListView.web.jsx b/modules/look/client-react/crud/ListView.web.jsx
similarity index 96%
rename from packages/client/src/modules/common/components/crud/ListView.web.jsx
rename to modules/look/client-react/crud/ListView.web.jsx
index 33e4adecdd..97a8c6dbdc 100644
--- a/packages/client/src/modules/common/components/crud/ListView.web.jsx
+++ b/modules/look/client-react/crud/ListView.web.jsx
@@ -6,10 +6,22 @@ import { Link } from 'react-router-dom';
 import { Formik } from 'formik';
 import { DragDropContext, DragSource, DropTarget } from 'react-dnd';
 import HTML5Backend from 'react-dnd-html5-backend';
-import { Table, Button, Popconfirm, Row, Col, Form, FormItem, Alert, Spin } from '../web';
-import { createColumnFields, createFormFields } from '../../util';
-import { mapFormPropsToValues, pickInputFields } from '../../../../utils/crud';
-import { hasRole } from '../../../user/containers/Auth';
+import {
+  Table,
+  Button,
+  Popconfirm,
+  Row,
+  Col,
+  Form,
+  FormItem,
+  Alert,
+  Spin,
+  createColumnFields,
+  createFormFields
+} from '@gqlapp/look-client-react';
+import { mapFormPropsToValues, pickInputFields } from '@gqlapp/core-client-react';
+
+const { hasRole } = require('@gqlapp/user-client-react');
 
 function dragDirection(dragIndex, hoverIndex, initialClientOffset, clientOffset, sourceClientOffset) {
   const hoverMiddleY = (initialClientOffset.y - sourceClientOffset.y) / 2;
@@ -304,15 +316,15 @@ class ListView extends React.Component {
       customBatchFields === null
         ? false
         : customBatchActions && customBatchActions.role
-          ? !!hasRole(customBatchActions.role, currentUser)
-          : true;
+        ? !!hasRole(customBatchActions.role, currentUser)
+        : true;
 
     const showCustomActions =
       customActions === null
         ? false
         : customActions && customActions.role
-          ? !!hasRole(customActions.role, currentUser)
-          : true;
+        ? !!hasRole(customActions.role, currentUser)
+        : true;
 
     const rowSelection = showBatchFields
       ? {
diff --git a/packages/client/src/modules/common/components/crud/index.jsx b/modules/look/client-react/crud/index.jsx
similarity index 100%
rename from packages/client/src/modules/common/components/crud/index.jsx
rename to modules/look/client-react/crud/index.jsx
diff --git a/packages/client/src/modules/common/util.jsx b/modules/look/client-react/util.jsx
similarity index 96%
rename from packages/client/src/modules/common/util.jsx
rename to modules/look/client-react/util.jsx
index 11a4da24fb..0230090495 100644
--- a/packages/client/src/modules/common/util.jsx
+++ b/modules/look/client-react/util.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { pick, capitalize, startCase } from 'lodash';
-import Field from '../../utils/FieldAdapter';
-import { RenderField, RenderSwitch, RenderSelectQuery, RenderDatePicker } from './components/native';
+import { RenderField, RenderSwitch, RenderSelectQuery, RenderDatePicker } from '@gqlapp/look-client-react';
+import { FieldAdapter as Field } from '@gqlapp/forms-client-react';
 
 export const createFormFields = (schema, values, setFieldValue, setFieldTouched) => {
   let fields = [];
diff --git a/packages/client/src/modules/common/util.web.jsx b/modules/look/client-react/util.web.jsx
similarity index 94%
rename from packages/client/src/modules/common/util.web.jsx
rename to modules/look/client-react/util.web.jsx
index 9e18566a7f..a020d9dc30 100644
--- a/packages/client/src/modules/common/util.web.jsx
+++ b/modules/look/client-react/util.web.jsx
@@ -6,10 +6,9 @@ import { Link } from 'react-router-dom';
 import { FieldArray } from 'formik';
 import moment from 'moment';
 import DomainSchema from '@domain-schema/core';
+import { mapFormPropsToValues } from '@gqlapp/core-client-react';
+import { FieldAdapter as Field } from '@gqlapp/forms-client-react';
 
-import { hasRole } from '../user/containers/Auth';
-import Field from '../../utils/FieldAdapter';
-import { mapFormPropsToValues } from '../../utils/crud';
 import {
   RenderField,
   RenderNumber,
@@ -29,7 +28,9 @@ import {
   Input,
   DatePicker,
   RenderCellSelectQuery
-} from './components/web';
+} from '@gqlapp/look-client-react';
+
+const { hasRole } = require('@gqlapp/user-client-react');
 
 const dateFormat = 'YYYY-MM-DD';
 
@@ -152,8 +153,8 @@ export const createColumnFields = ({
                 return customFields[key] && customFields[key]['render']
                   ? customFields[key]['render'](text, record)
                   : customFields[key] && customFields[key]['render']
-                    ? customFields[key]['render'](text, record)
-                    : text;
+                  ? customFields[key]['render'](text, record)
+                  : text;
               },
               title
             )
@@ -179,8 +180,8 @@ export const createColumnFields = ({
     customActions === null
       ? false
       : customActions && customActions.role
-        ? !!hasRole(customActions.role, currentUser)
-        : true;
+      ? !!hasRole(customActions.role, currentUser)
+      : true;
 
   if (showColumnActions) {
     columns.push({
@@ -434,24 +435,22 @@ const createFormFieldsArray = (
                   prefix: `${prefix}${key}[${index}].`,
                   formType
                 })}
-                {!value.hasOne &&
-                  formType !== 'batch' && (
-                    <FormItem {...tailFormItemLayout}>
-                      <Button color="primary" size="sm" onClick={() => remove(index)}>
-                        Delete
-                      </Button>
-                    </FormItem>
-                  )}
+                {!value.hasOne && formType !== 'batch' && (
+                  <FormItem {...tailFormItemLayout}>
+                    <Button color="primary" size="sm" onClick={() => remove(index)}>
+                      Delete
+                    </Button>
+                  </FormItem>
+                )}
               </div>
             ))}
-            {!value.hasOne &&
-              formType !== 'batch' && (
-                <FormItem {...tailFormItemLayout}>
-                  <Button color="dashed" onClick={() => push({})} style={{ width: '180px' }}>
-                    Add field
-                  </Button>
-                </FormItem>
-              )}
+            {!value.hasOne && formType !== 'batch' && (
+              <FormItem {...tailFormItemLayout}>
+                <Button color="dashed" onClick={() => push({})} style={{ width: '180px' }}>
+                  Add field
+                </Button>
+              </FormItem>
+            )}
           </FormItem>
         );
       }}
diff --git a/tools/templates/crud/client-react/__tests__/Module.spec.ts b/tools/templates/crud/client-react/__tests__/Module.spec.ts
deleted file mode 100644
index cb749ef11f..0000000000
--- a/tools/templates/crud/client-react/__tests__/Module.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { expect } from 'chai';
-import { step } from 'mocha-steps';
-
-import Renderer from '../../../../packages/client/src/testHelpers/Renderer';
-import { updateContent } from '../../../../packages/client/src/testHelpers/testUtils';
-
-describe('$Module$ UI works', () => {
-  const renderer = new Renderer({});
-  const app = renderer.mount();
-  renderer.history.push('/$Module$');
-  const content = updateContent(app.container);
-
-  step('$Module$ page renders on mount', () => {
-    // tslint:disable:no-unused-expression
-    expect(content).to.not.be.empty;
-  });
-
-  step('$Module$ page has title', async () => {
-    expect(content.textContent).to.include('Hello, This is the $Module$ module');
-  });
-});
diff --git a/tools/templates/crud/client-react/package.json b/tools/templates/crud/client-react/package.json
new file mode 100644
index 0000000000..0a162b9c24
--- /dev/null
+++ b/tools/templates/crud/client-react/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "@gqlapp/$-module$-client-react",
+  "version": "1.0.0",
+  "private": true
+}

From da8f0f6a9582355140bb21724d41a04eb14e2b3c Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 5 Feb 2019 08:56:06 +0100
Subject: [PATCH 305/327] crud common components move to new structure, wip

---
 .../client-react/crud/EditView.jsx              |  0
 .../client-react/crud/EditView.web.jsx          |  0
 .../client-react/crud/FilterView.jsx            |  0
 .../client-react/crud/FilterView.web.jsx        |  5 +++--
 .../client-react/crud/FormView.jsx              |  0
 .../client-react/crud/FormView.web.jsx          |  5 +++--
 .../client-react/crud/ListView.jsx              |  0
 .../client-react/crud/ListView.web.jsx          | 17 +++--------------
 .../{look => core}/client-react/crud/index.jsx  |  0
 .../{common => }/generatedContainers.js         |  0
 modules/core/client-react/index.tsx             |  5 +++--
 modules/{look => core}/client-react/util.jsx    |  0
 .../{look => core}/client-react/util.web.jsx    |  2 +-
 modules/core/{client-react => common}/crud.js   |  0
 modules/core/common/index.ts                    |  1 +
 .../server-ts/{common => }/generatedSchemas.js  |  0
 .../ui-bootstrap/components/index.js            |  4 ++--
 17 files changed, 16 insertions(+), 23 deletions(-)
 rename modules/{look => core}/client-react/crud/EditView.jsx (100%)
 rename modules/{look => core}/client-react/crud/EditView.web.jsx (100%)
 rename modules/{look => core}/client-react/crud/FilterView.jsx (100%)
 rename modules/{look => core}/client-react/crud/FilterView.web.jsx (95%)
 rename modules/{look => core}/client-react/crud/FormView.jsx (100%)
 rename modules/{look => core}/client-react/crud/FormView.web.jsx (89%)
 rename modules/{look => core}/client-react/crud/ListView.jsx (100%)
 rename modules/{look => core}/client-react/crud/ListView.web.jsx (98%)
 rename modules/{look => core}/client-react/crud/index.jsx (100%)
 rename modules/core/client-react/{common => }/generatedContainers.js (100%)
 rename modules/{look => core}/client-react/util.jsx (100%)
 rename modules/{look => core}/client-react/util.web.jsx (99%)
 rename modules/core/{client-react => common}/crud.js (100%)
 rename modules/core/server-ts/{common => }/generatedSchemas.js (100%)

diff --git a/modules/look/client-react/crud/EditView.jsx b/modules/core/client-react/crud/EditView.jsx
similarity index 100%
rename from modules/look/client-react/crud/EditView.jsx
rename to modules/core/client-react/crud/EditView.jsx
diff --git a/modules/look/client-react/crud/EditView.web.jsx b/modules/core/client-react/crud/EditView.web.jsx
similarity index 100%
rename from modules/look/client-react/crud/EditView.web.jsx
rename to modules/core/client-react/crud/EditView.web.jsx
diff --git a/modules/look/client-react/crud/FilterView.jsx b/modules/core/client-react/crud/FilterView.jsx
similarity index 100%
rename from modules/look/client-react/crud/FilterView.jsx
rename to modules/core/client-react/crud/FilterView.jsx
diff --git a/modules/look/client-react/crud/FilterView.web.jsx b/modules/core/client-react/crud/FilterView.web.jsx
similarity index 95%
rename from modules/look/client-react/crud/FilterView.web.jsx
rename to modules/core/client-react/crud/FilterView.web.jsx
index d9d91b1d3a..7ea6d98956 100644
--- a/modules/look/client-react/crud/FilterView.web.jsx
+++ b/modules/core/client-react/crud/FilterView.web.jsx
@@ -2,8 +2,9 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Formik } from 'formik';
 import { DebounceInput } from 'react-debounce-input';
-import { Form, FormItem, Input, Row, Col, Button, Icon, createFormFields } from '@gqlapp/look-client-react';
-import { mapFormPropsToValues, pickInputFields } from '@gqlapp/core-client-react';
+import { Form, FormItem, Input, Row, Col, Button, Icon } from '@gqlapp/look-client-react';
+import { createFormFields } from '@gqlapp/core-client-react';
+import { mapFormPropsToValues, pickInputFields } from '@gqlapp/core-common';
 
 const { hasRole } = require('@gqlapp/user-client-react');
 
diff --git a/modules/look/client-react/crud/FormView.jsx b/modules/core/client-react/crud/FormView.jsx
similarity index 100%
rename from modules/look/client-react/crud/FormView.jsx
rename to modules/core/client-react/crud/FormView.jsx
diff --git a/modules/look/client-react/crud/FormView.web.jsx b/modules/core/client-react/crud/FormView.web.jsx
similarity index 89%
rename from modules/look/client-react/crud/FormView.web.jsx
rename to modules/core/client-react/crud/FormView.web.jsx
index 3f8b970259..1847bb31b0 100644
--- a/modules/look/client-react/crud/FormView.web.jsx
+++ b/modules/core/client-react/crud/FormView.web.jsx
@@ -3,8 +3,9 @@ import PropTypes from 'prop-types';
 import { Formik } from 'formik';
 import DomainValidator from '@domain-schema/validation';
 
-import { Form, FormItem, Button, createFormFields } from '@gqlapp/look-client-react';
-import { onSubmit, mapFormPropsToValues } from '@gqlapp/core-client-react';
+import { Form, FormItem, Button } from '@gqlapp/look-client-react';
+import { createFormFields } from '@gqlapp/core-client-react';
+import { onSubmit, mapFormPropsToValues } from '@gqlapp/core-common';
 
 const tailFormItemLayout = {
   wrapperCol: {
diff --git a/modules/look/client-react/crud/ListView.jsx b/modules/core/client-react/crud/ListView.jsx
similarity index 100%
rename from modules/look/client-react/crud/ListView.jsx
rename to modules/core/client-react/crud/ListView.jsx
diff --git a/modules/look/client-react/crud/ListView.web.jsx b/modules/core/client-react/crud/ListView.web.jsx
similarity index 98%
rename from modules/look/client-react/crud/ListView.web.jsx
rename to modules/core/client-react/crud/ListView.web.jsx
index 97a8c6dbdc..43a3ce97ce 100644
--- a/modules/look/client-react/crud/ListView.web.jsx
+++ b/modules/core/client-react/crud/ListView.web.jsx
@@ -6,20 +6,9 @@ import { Link } from 'react-router-dom';
 import { Formik } from 'formik';
 import { DragDropContext, DragSource, DropTarget } from 'react-dnd';
 import HTML5Backend from 'react-dnd-html5-backend';
-import {
-  Table,
-  Button,
-  Popconfirm,
-  Row,
-  Col,
-  Form,
-  FormItem,
-  Alert,
-  Spin,
-  createColumnFields,
-  createFormFields
-} from '@gqlapp/look-client-react';
-import { mapFormPropsToValues, pickInputFields } from '@gqlapp/core-client-react';
+import { Table, Button, Popconfirm, Row, Col, Form, FormItem, Alert, Spin } from '@gqlapp/look-client-react';
+import { createColumnFields, createFormFields } from '@gqlapp/core-client-react';
+import { mapFormPropsToValues, pickInputFields } from '@gqlapp/core-common';
 
 const { hasRole } = require('@gqlapp/user-client-react');
 
diff --git a/modules/look/client-react/crud/index.jsx b/modules/core/client-react/crud/index.jsx
similarity index 100%
rename from modules/look/client-react/crud/index.jsx
rename to modules/core/client-react/crud/index.jsx
diff --git a/modules/core/client-react/common/generatedContainers.js b/modules/core/client-react/generatedContainers.js
similarity index 100%
rename from modules/core/client-react/common/generatedContainers.js
rename to modules/core/client-react/generatedContainers.js
diff --git a/modules/core/client-react/index.tsx b/modules/core/client-react/index.tsx
index a7e8bcfc2e..1fb0adb98a 100644
--- a/modules/core/client-react/index.tsx
+++ b/modules/core/client-react/index.tsx
@@ -1,6 +1,7 @@
 import { PLATFORM } from '@gqlapp/core-common';
 export { default as clientOnly } from './clientOnly';
-export { default as schemaQueries } from './common/generatedContainers';
-export * from './crud';
+export { default as schemaQueries } from './generatedContainers';
+// export * from './util';
+// export * from './crud';
 
 export default (__CLIENT__ && PLATFORM === 'web' ? require('./app').default : {});
diff --git a/modules/look/client-react/util.jsx b/modules/core/client-react/util.jsx
similarity index 100%
rename from modules/look/client-react/util.jsx
rename to modules/core/client-react/util.jsx
diff --git a/modules/look/client-react/util.web.jsx b/modules/core/client-react/util.web.jsx
similarity index 99%
rename from modules/look/client-react/util.web.jsx
rename to modules/core/client-react/util.web.jsx
index a020d9dc30..63b8e26936 100644
--- a/modules/look/client-react/util.web.jsx
+++ b/modules/core/client-react/util.web.jsx
@@ -6,7 +6,7 @@ import { Link } from 'react-router-dom';
 import { FieldArray } from 'formik';
 import moment from 'moment';
 import DomainSchema from '@domain-schema/core';
-import { mapFormPropsToValues } from '@gqlapp/core-client-react';
+import { mapFormPropsToValues } from '@gqlapp/core-common';
 import { FieldAdapter as Field } from '@gqlapp/forms-client-react';
 
 import {
diff --git a/modules/core/client-react/crud.js b/modules/core/common/crud.js
similarity index 100%
rename from modules/core/client-react/crud.js
rename to modules/core/common/crud.js
diff --git a/modules/core/common/index.ts b/modules/core/common/index.ts
index 4ac0839025..dbe0caa6a2 100644
--- a/modules/core/common/index.ts
+++ b/modules/core/common/index.ts
@@ -7,3 +7,4 @@ export { default as createReduxStore } from './createReduxStore';
 export { default as countries } from './ISOCountries';
 export * from './createReduxStore';
 export * from './utils';
+export * from './crud';
diff --git a/modules/core/server-ts/common/generatedSchemas.js b/modules/core/server-ts/generatedSchemas.js
similarity index 100%
rename from modules/core/server-ts/common/generatedSchemas.js
rename to modules/core/server-ts/generatedSchemas.js
diff --git a/modules/look/client-react/ui-bootstrap/components/index.js b/modules/look/client-react/ui-bootstrap/components/index.js
index de7fe41754..5187619bc5 100644
--- a/modules/look/client-react/ui-bootstrap/components/index.js
+++ b/modules/look/client-react/ui-bootstrap/components/index.js
@@ -15,7 +15,7 @@ export { default as RenderTextArea } from './RenderTextArea';
 export { default as RenderDate } from './RenderDate';
 export { default as RenderSelect } from './RenderSelect';
 export { default as RenderSelectCountry } from './RenderSelectCountry';
-export { default as RenderSelectQuery } from './RenderSelectQuery';
+//export { default as RenderSelectQuery } from './RenderSelectQuery';
 export { default as RenderSelectFilterBoolean } from './RenderSelectFilterBoolean';
 export { default as RenderCheckBox } from './RenderCheckBox';
 export { default as RenderSwitch } from './RenderSwitch';
@@ -37,5 +37,5 @@ export { default as Icon } from './Icon';
 export { default as LanguagePicker } from './LanguagePicker';
 export { default as Pagination } from './Pagination';
 export { default as DatePicker } from './DatePicker';
-export { default as RenderCellSelectQuery } from './RenderCellSelectQuery';
+//export { default as RenderCellSelectQuery } from './RenderCellSelectQuery';
 export { onAppCreate } from './NavBar';

From c6c53d81fb8e0c9c09416a36808bd77f6b6679d3 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 5 Feb 2019 10:56:15 +0100
Subject: [PATCH 306/327] move generatedSchemas

---
 modules/core/server-ts/{common => }/generatedSchemas.js | 0
 modules/core/server-ts/index.ts                         | 2 ++
 tools/cli/commands/updateSchema.js                      | 2 +-
 tools/cli/helpers/util.js                               | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)
 rename modules/core/server-ts/{common => }/generatedSchemas.js (100%)

diff --git a/modules/core/server-ts/common/generatedSchemas.js b/modules/core/server-ts/generatedSchemas.js
similarity index 100%
rename from modules/core/server-ts/common/generatedSchemas.js
rename to modules/core/server-ts/generatedSchemas.js
diff --git a/modules/core/server-ts/index.ts b/modules/core/server-ts/index.ts
index c62a8e5bfb..a11128ef00 100644
--- a/modules/core/server-ts/index.ts
+++ b/modules/core/server-ts/index.ts
@@ -4,6 +4,8 @@ import { createServer } from './entry';
 
 export { serverPromise } from './entry';
 
+export { default as schemas } from './generatedSchemas';
+
 export default new ServerModule({
   onAppCreate: [createServer]
 });
diff --git a/tools/cli/commands/updateSchema.js b/tools/cli/commands/updateSchema.js
index 3c5f196cb2..714b37db80 100644
--- a/tools/cli/commands/updateSchema.js
+++ b/tools/cli/commands/updateSchema.js
@@ -5,7 +5,7 @@ const GraphQLGenerator = require('@domain-schema/graphql').default;
 const { pascalize, camelize } = require('humps');
 
 const { getModulePackageName, computeModulePath, generateField, runPrettier } = require('../helpers/util');
-const schemas = require('../../../modules/core/server-ts/common/generatedSchemas');
+const schemas = require('../../../modules/core/server-ts/generatedSchemas');
 
 /**
  * Update module schema.
diff --git a/tools/cli/helpers/util.js b/tools/cli/helpers/util.js
index 029867f33c..c0d5e0d723 100644
--- a/tools/cli/helpers/util.js
+++ b/tools/cli/helpers/util.js
@@ -153,7 +153,7 @@ function computePackagePath(packageName) {
  */
 function computeGeneratedSchemasPath(packageName, fileName, old) {
   const modulePackageName = getModulePackageName(packageName, old);
-  return `${BASE_PATH}/modules/core/${modulePackageName}/common/${fileName}`;
+  return `${BASE_PATH}/modules/core/${modulePackageName}/${fileName}`;
 }
 
 /**

From 5b4c4de20b0cdaef5cdc6457c26801d4a5143e06 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 5 Feb 2019 11:11:41 +0100
Subject: [PATCH 307/327] fix link problems

---
 modules/core/client-react/index.tsx           |  5 +--
 .../client-react/generatedContainers.js       |  0
 .../components/RenderCellSelectQuery.jsx      |  3 +-
 .../ui-antd/components/RenderSelectQuery.jsx  |  3 +-
 .../components/RenderCellSelectQuery.jsx      |  2 +-
 .../components/RenderSelectQuery.jsx          |  2 +-
 .../ui-bootstrap/components/index.js          |  4 +-
 .../ui-bootstrap/components/index.js.orig     | 45 -------------------
 tools/cli/helpers/util.js                     |  2 +-
 9 files changed, 11 insertions(+), 55 deletions(-)
 rename modules/{core => look}/client-react/generatedContainers.js (100%)
 delete mode 100644 modules/look/client-react/ui-bootstrap/components/index.js.orig

diff --git a/modules/core/client-react/index.tsx b/modules/core/client-react/index.tsx
index 1fb0adb98a..b325320cfb 100644
--- a/modules/core/client-react/index.tsx
+++ b/modules/core/client-react/index.tsx
@@ -1,7 +1,6 @@
 import { PLATFORM } from '@gqlapp/core-common';
 export { default as clientOnly } from './clientOnly';
-export { default as schemaQueries } from './generatedContainers';
-// export * from './util';
-// export * from './crud';
+export * from './util';
+export * from './crud';
 
 export default (__CLIENT__ && PLATFORM === 'web' ? require('./app').default : {});
diff --git a/modules/core/client-react/generatedContainers.js b/modules/look/client-react/generatedContainers.js
similarity index 100%
rename from modules/core/client-react/generatedContainers.js
rename to modules/look/client-react/generatedContainers.js
diff --git a/modules/look/client-react/ui-antd/components/RenderCellSelectQuery.jsx b/modules/look/client-react/ui-antd/components/RenderCellSelectQuery.jsx
index e94565c5b8..f660b132f8 100644
--- a/modules/look/client-react/ui-antd/components/RenderCellSelectQuery.jsx
+++ b/modules/look/client-react/ui-antd/components/RenderCellSelectQuery.jsx
@@ -2,7 +2,8 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Select, Spin } from 'antd';
 import { pascalize } from 'humps';
-import { schemaQueries } from '@gqlapp/core-client-react';
+
+import schemaQueries from '../../generatedContainers';
 
 const Option = Select.Option;
 const LIMIT = 10;
diff --git a/modules/look/client-react/ui-antd/components/RenderSelectQuery.jsx b/modules/look/client-react/ui-antd/components/RenderSelectQuery.jsx
index 8f77e22c33..68dd7ce90e 100644
--- a/modules/look/client-react/ui-antd/components/RenderSelectQuery.jsx
+++ b/modules/look/client-react/ui-antd/components/RenderSelectQuery.jsx
@@ -2,8 +2,9 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Select, Spin } from 'antd';
 import { pascalize } from 'humps';
-import { schemaQueries } from '@gqlapp/core-client-react';
+
 import { FormItem } from './index';
+import schemaQueries from '../../generatedContainers';
 
 const Option = Select.Option;
 const LIMIT = 10;
diff --git a/modules/look/client-react/ui-bootstrap/components/RenderCellSelectQuery.jsx b/modules/look/client-react/ui-bootstrap/components/RenderCellSelectQuery.jsx
index 690ea10701..bf6d68731e 100644
--- a/modules/look/client-react/ui-bootstrap/components/RenderCellSelectQuery.jsx
+++ b/modules/look/client-react/ui-bootstrap/components/RenderCellSelectQuery.jsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { pascalize } from 'humps';
-import { schemaQueries } from '@gqlapp/core-client-react';
 import { Select, Spin } from './index';
+import schemaQueries from '../../generatedContainers';
 
 const LIMIT = 10;
 
diff --git a/modules/look/client-react/ui-bootstrap/components/RenderSelectQuery.jsx b/modules/look/client-react/ui-bootstrap/components/RenderSelectQuery.jsx
index 359fcb3f01..f34b83b86a 100644
--- a/modules/look/client-react/ui-bootstrap/components/RenderSelectQuery.jsx
+++ b/modules/look/client-react/ui-bootstrap/components/RenderSelectQuery.jsx
@@ -2,8 +2,8 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { pascalize } from 'humps';
 import { FormFeedback } from 'reactstrap';
-import { schemaQueries } from '@gqlapp/core-client-react';
 import { FormItem, Select, Spin } from './index';
+import schemaQueries from '../../generatedContainers';
 
 const LIMIT = 10;
 
diff --git a/modules/look/client-react/ui-bootstrap/components/index.js b/modules/look/client-react/ui-bootstrap/components/index.js
index 5187619bc5..de7fe41754 100644
--- a/modules/look/client-react/ui-bootstrap/components/index.js
+++ b/modules/look/client-react/ui-bootstrap/components/index.js
@@ -15,7 +15,7 @@ export { default as RenderTextArea } from './RenderTextArea';
 export { default as RenderDate } from './RenderDate';
 export { default as RenderSelect } from './RenderSelect';
 export { default as RenderSelectCountry } from './RenderSelectCountry';
-//export { default as RenderSelectQuery } from './RenderSelectQuery';
+export { default as RenderSelectQuery } from './RenderSelectQuery';
 export { default as RenderSelectFilterBoolean } from './RenderSelectFilterBoolean';
 export { default as RenderCheckBox } from './RenderCheckBox';
 export { default as RenderSwitch } from './RenderSwitch';
@@ -37,5 +37,5 @@ export { default as Icon } from './Icon';
 export { default as LanguagePicker } from './LanguagePicker';
 export { default as Pagination } from './Pagination';
 export { default as DatePicker } from './DatePicker';
-//export { default as RenderCellSelectQuery } from './RenderCellSelectQuery';
+export { default as RenderCellSelectQuery } from './RenderCellSelectQuery';
 export { onAppCreate } from './NavBar';
diff --git a/modules/look/client-react/ui-bootstrap/components/index.js.orig b/modules/look/client-react/ui-bootstrap/components/index.js.orig
deleted file mode 100644
index 230b9f9f1f..0000000000
--- a/modules/look/client-react/ui-bootstrap/components/index.js.orig
+++ /dev/null
@@ -1,45 +0,0 @@
-// eslint-disable-next-line import/prefer-default-export
-export { default as PageLayout } from './PageLayout';
-export { default as Button } from './Button';
-export { default as MenuItem } from './MenuItem';
-export { default as SubMenu } from './SubMenu';
-export { default as Form } from './Form';
-export { default as FormItem } from './FormItem';
-export { default as Input } from './Input';
-export { default as InputNumber } from './InputNumber';
-export { default as Switch } from './Switch';
-export { default as Select } from './Select';
-export { default as Option } from './Option';
-export { default as RenderField } from './RenderField';
-export { default as RenderNumber } from './RenderNumber';
-export { default as RenderTextArea } from './RenderTextArea';
-export { default as RenderDate } from './RenderDate';
-export { default as RenderSelect } from './RenderSelect';
-export { default as RenderSelectCountry } from './RenderSelectCountry';
-export { default as RenderSelectQuery } from './RenderSelectQuery';
-export { default as RenderSelectFilterBoolean } from './RenderSelectFilterBoolean';
-export { default as RenderCheckBox } from './RenderCheckBox';
-export { default as RenderSwitch } from './RenderSwitch';
-export { default as Alert } from './Alert';
-export { default as Spin } from './Spin';
-export { default as Container } from './Container';
-export { default as Row } from './Row';
-export { default as Col } from './Col';
-export { default as Label } from './Label';
-export { default as Card } from './Card';
-export { default as CardGroup } from './CardGroup';
-export { default as CardTitle } from './CardTitle';
-export { default as CardText } from './CardText';
-export { default as Table } from './Table';
-export { default as ListGroup } from './ListGroup';
-export { default as ListItem } from './ListItem';
-export { default as Popconfirm } from './Popconfirm';
-export { default as Icon } from './Icon';
-export { default as LanguagePicker } from './LanguagePicker';
-export { default as Pagination } from './Pagination';
-<<<<<<< HEAD:packages/client/src/modules/common/components/web/ui-antd/components/index.js
-export { default as DatePicker } from './DatePicker';
-export { default as RenderCellSelectQuery } from './RenderCellSelectQuery';
-=======
-export { onAppCreate } from './NavBar';
->>>>>>> add-delete-crud-cli-server-database:modules/look/client-react/ui-bootstrap/components/index.js
diff --git a/tools/cli/helpers/util.js b/tools/cli/helpers/util.js
index c0d5e0d723..5b606a2ce5 100644
--- a/tools/cli/helpers/util.js
+++ b/tools/cli/helpers/util.js
@@ -153,7 +153,7 @@ function computePackagePath(packageName) {
  */
 function computeGeneratedSchemasPath(packageName, fileName, old) {
   const modulePackageName = getModulePackageName(packageName, old);
-  return `${BASE_PATH}/modules/core/${modulePackageName}/${fileName}`;
+  return `${BASE_PATH}/modules/${packageName === 'server' ? 'core' : 'look'}/${modulePackageName}/${fileName}`;
 }
 
 /**

From 422d8a9dc52f7285d5334a9233d27a12d452ab3c Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 5 Feb 2019 11:25:39 +0100
Subject: [PATCH 308/327] fix links

---
 .../templates/crud/client-react/containers/ModuleEdit.jsx  | 4 ++--
 .../crud/client-react/containers/ModuleFilter.jsx          | 4 ++--
 .../templates/crud/client-react/containers/ModuleList.jsx  | 7 +++----
 tools/templates/crud/client-react/resolvers/index.js       | 4 ++--
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/tools/templates/crud/client-react/containers/ModuleEdit.jsx b/tools/templates/crud/client-react/containers/ModuleEdit.jsx
index 4818006a5e..e2d2974ade 100644
--- a/tools/templates/crud/client-react/containers/ModuleEdit.jsx
+++ b/tools/templates/crud/client-react/containers/ModuleEdit.jsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import { graphql, compose } from 'react-apollo';
 
-import { EditView } from '@gqlapp/look-client-react';
-import { $Module$Schema } from '../../server-ts/schema';
+import { EditView } from '@gqlapp/core-client-react';
+import { $Module$Schema } from '@gqlapp/$-module-ts/schema';
 import $MODULE$_QUERY from '../graphql/$Module$Query.graphql';
 import CREATE_$MODULE$ from '../graphql/Create$Module$.graphql';
 import UPDATE_$MODULE$ from '../graphql/Update$Module$.graphql';
diff --git a/tools/templates/crud/client-react/containers/ModuleFilter.jsx b/tools/templates/crud/client-react/containers/ModuleFilter.jsx
index 990dc47db0..8078f5f519 100644
--- a/tools/templates/crud/client-react/containers/ModuleFilter.jsx
+++ b/tools/templates/crud/client-react/containers/ModuleFilter.jsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import { graphql, compose } from 'react-apollo';
-import { FilterView } from '@gqlapp/look-client-react';
+import { FilterView } from '@gqlapp/core-client-react';
 import { removeTypename } from '@gqlapp/core-common';
 
-import { $Module$Schema } from '../../server-ts/schema';
+import { $Module$Schema } from '@gqlapp/$-module-ts/schema';
 
 import $MODULE$_STATE_QUERY from '../graphql/$Module$StateQuery.client.graphql';
 import UPDATE_FILTER from '../graphql/UpdateFilter.client.graphql';
diff --git a/tools/templates/crud/client-react/containers/ModuleList.jsx b/tools/templates/crud/client-react/containers/ModuleList.jsx
index 4986f57f70..639f369bd6 100644
--- a/tools/templates/crud/client-react/containers/ModuleList.jsx
+++ b/tools/templates/crud/client-react/containers/ModuleList.jsx
@@ -2,11 +2,10 @@ import React from 'react';
 import { graphql, compose } from 'react-apollo';
 import update from 'immutability-helper';
 import PropTypes from 'prop-types';
-import { ListView } from '@gqlapp/look-client-react';
-import { removeTypename, removeEmpty } from '@gqlapp/core-common';
-import { updateEntry, deleteEntry } from '@gqlapp/core-client-react';
+import { ListView } from '@gqlapp/core-client-react';
+import { removeTypename, removeEmpty, updateEntry, deleteEntry } from '@gqlapp/core-common';
 
-import { $Module$Schema } from '../../server-ts/schema';
+import { $Module$Schema } from '@gqlapp/$-module-ts/schema';
 
 import $MODULE$_STATE_QUERY from '../graphql/$Module$StateQuery.client.graphql';
 import UPDATE_LIMIT from '../graphql/UpdateLimit.client.graphql';
diff --git a/tools/templates/crud/client-react/resolvers/index.js b/tools/templates/crud/client-react/resolvers/index.js
index 9176800735..9cfd29a1d8 100644
--- a/tools/templates/crud/client-react/resolvers/index.js
+++ b/tools/templates/crud/client-react/resolvers/index.js
@@ -1,7 +1,7 @@
 import update from 'immutability-helper';
-import { mergeFilter } from '@gqlapp/core-client-react';
+import { mergeFilter } from '@gqlapp/core-common';
 
-import { $Module$Schema } from '../../server-ts/schema';
+import { $Module$Schema } from '@gqlapp/$-module-ts/schema';
 import $MODULE$_STATE_QUERY from '../graphql/$Module$StateQuery.client.graphql';
 
 const TYPE_$MODULE$_STATE = '$Module$State';

From d6804a05cb106dde7bfed16cf9431356877314d7 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 5 Feb 2019 12:43:37 +0100
Subject: [PATCH 309/327] fix links

---
 .../client-react/containers/ModuleEdit.jsx    |  2 +-
 .../client-react/containers/ModuleFilter.jsx  |  2 +-
 .../client-react/containers/ModuleList.jsx    |  2 +-
 .../crud/client-react/index.native.jsx        | 63 -------------------
 .../crud/client-react/index.native.tsx        | 36 +++++++++++
 .../client-react/{index.web.jsx => index.tsx} |  3 +-
 .../crud/client-react/resolvers/index.js      |  2 +-
 7 files changed, 42 insertions(+), 68 deletions(-)
 delete mode 100644 tools/templates/crud/client-react/index.native.jsx
 create mode 100644 tools/templates/crud/client-react/index.native.tsx
 rename tools/templates/crud/client-react/{index.web.jsx => index.tsx} (93%)

diff --git a/tools/templates/crud/client-react/containers/ModuleEdit.jsx b/tools/templates/crud/client-react/containers/ModuleEdit.jsx
index e2d2974ade..2c076ab54b 100644
--- a/tools/templates/crud/client-react/containers/ModuleEdit.jsx
+++ b/tools/templates/crud/client-react/containers/ModuleEdit.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { graphql, compose } from 'react-apollo';
 
 import { EditView } from '@gqlapp/core-client-react';
-import { $Module$Schema } from '@gqlapp/$-module-ts/schema';
+import { $Module$Schema } from '@gqlapp/$-module$-server-ts/schema';
 import $MODULE$_QUERY from '../graphql/$Module$Query.graphql';
 import CREATE_$MODULE$ from '../graphql/Create$Module$.graphql';
 import UPDATE_$MODULE$ from '../graphql/Update$Module$.graphql';
diff --git a/tools/templates/crud/client-react/containers/ModuleFilter.jsx b/tools/templates/crud/client-react/containers/ModuleFilter.jsx
index 8078f5f519..4508564a30 100644
--- a/tools/templates/crud/client-react/containers/ModuleFilter.jsx
+++ b/tools/templates/crud/client-react/containers/ModuleFilter.jsx
@@ -3,7 +3,7 @@ import { graphql, compose } from 'react-apollo';
 import { FilterView } from '@gqlapp/core-client-react';
 import { removeTypename } from '@gqlapp/core-common';
 
-import { $Module$Schema } from '@gqlapp/$-module-ts/schema';
+import { $Module$Schema } from '@gqlapp/$-module$-server-ts/schema';
 
 import $MODULE$_STATE_QUERY from '../graphql/$Module$StateQuery.client.graphql';
 import UPDATE_FILTER from '../graphql/UpdateFilter.client.graphql';
diff --git a/tools/templates/crud/client-react/containers/ModuleList.jsx b/tools/templates/crud/client-react/containers/ModuleList.jsx
index 639f369bd6..7fb9af7fbc 100644
--- a/tools/templates/crud/client-react/containers/ModuleList.jsx
+++ b/tools/templates/crud/client-react/containers/ModuleList.jsx
@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
 import { ListView } from '@gqlapp/core-client-react';
 import { removeTypename, removeEmpty, updateEntry, deleteEntry } from '@gqlapp/core-common';
 
-import { $Module$Schema } from '@gqlapp/$-module-ts/schema';
+import { $Module$Schema } from '@gqlapp/$-module$-server-ts/schema';
 
 import $MODULE$_STATE_QUERY from '../graphql/$Module$StateQuery.client.graphql';
 import UPDATE_LIMIT from '../graphql/UpdateLimit.client.graphql';
diff --git a/tools/templates/crud/client-react/index.native.jsx b/tools/templates/crud/client-react/index.native.jsx
deleted file mode 100644
index eae965e2a2..0000000000
--- a/tools/templates/crud/client-react/index.native.jsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import ClientModule from '@gqlapp/module-client-react-native';
-import { Button } from 'react-native';
-import { createStackNavigator } from 'react-navigation';
-import { Ionicons } from '@expo/vector-icons';
-import { createTabBarIconWrapper } from '@gqlapp/look-client-react';
-
-import $Module$List from './containers/$Module$List';
-import $Module$Edit from './containers/$Module$Edit';
-import resolvers from './resolvers';
-
-class $Module$ListScreen extends React.Component {
-  static navigationOptions = ({ navigation }) => ({
-    title: '$Module$ list',
-    headerRight: <Button title="Add" onPress={() => navigation.navigate('$Module$Edit', { id: 0 })} />
-  });
-  render() {
-    return <$Module$List navigation={this.props.navigation} title="$MoDuLe$" nativeLink={'$MoDuLe$Edit'} />;
-  }
-}
-
-$Module$ListScreen.propTypes = {
-  navigation: PropTypes.object
-};
-
-class $Module$EditScreen extends React.Component {
-  static navigationOptions = ({ navigation }) => ({
-    title: `${navigation.state.params.id === 0 ? 'Create' : 'Edit'} $MoDuLe$`
-  });
-  render() {
-    return <$Module$Edit navigation={this.props.navigation} title="$MoDuLe$" />;
-  }
-}
-
-$Module$EditScreen.propTypes = {
-  navigation: PropTypes.object
-};
-
-const $Module$Navigator = createStackNavigator({
-  $Module$List: { screen: $Module$ListScreen },
-  $Module$Edit: { screen: $Module$EditScreen }
-});
-
-export default new ClientModule({
-  drawerItem: [
-    {
-      $Module$: {
-        screen: $Module$Navigator,
-        navigationOptions: {
-          tabBarIcon: createTabBarIconWrapper(Ionicons, {
-            name: 'ios-browsers-outline',
-            size: 30
-          })
-        },
-        userInfo: {
-          showOnLogin: true
-        }
-      }
-    }
-  ],
-  resolver: [resolvers]
-});
diff --git a/tools/templates/crud/client-react/index.native.tsx b/tools/templates/crud/client-react/index.native.tsx
new file mode 100644
index 0000000000..13c4fa03b4
--- /dev/null
+++ b/tools/templates/crud/client-react/index.native.tsx
@@ -0,0 +1,36 @@
+import React from 'react';
+import { createStackNavigator } from 'react-navigation';
+
+import { translate } from '@gqlapp/i18n-client-react';
+import ClientModule from '@gqlapp/module-client-react-native';
+
+import { HeaderTitle, IconButton } from '../../../packages/client/src/modules/common/components/native';
+import $Module$ from './containers/$Module$';
+import resources from './locales';
+
+const HeaderTitleWithI18n = translate('$module$')(HeaderTitle);
+
+export default new ClientModule({
+  drawerItem: [
+    {
+      $Module$: {
+        screen: createStackNavigator({
+          $Module$: {
+            screen: $Module$,
+            navigationOptions: ({ navigation }: any) => ({
+              headerTitle: <HeaderTitleWithI18n style="subTitle" />,
+              headerLeft: (
+                <IconButton iconName="menu" iconSize={32} iconColor="#0275d8" onPress={() => navigation.openDrawer()} />
+              ),
+              headerStyle: { backgroundColor: '#fff' }
+            })
+          }
+        }),
+        navigationOptions: {
+          drawerLabel: <HeaderTitleWithI18n />
+        }
+      }
+    }
+  ],
+  localization: [{ ns: '$module$', resources }]
+});
diff --git a/tools/templates/crud/client-react/index.web.jsx b/tools/templates/crud/client-react/index.tsx
similarity index 93%
rename from tools/templates/crud/client-react/index.web.jsx
rename to tools/templates/crud/client-react/index.tsx
index 712541700f..df02889c5d 100644
--- a/tools/templates/crud/client-react/index.web.jsx
+++ b/tools/templates/crud/client-react/index.tsx
@@ -2,12 +2,13 @@ import React from 'react';
 import ClientModule from '@gqlapp/module-client-react';
 import { NavLink } from 'react-router-dom';
 import { MenuItem } from '@gqlapp/look-client-react';
-import { AuthRoute, IfLoggedIn } from '@gqlapp/user-client-react';
 
 import $Module$ from './components/$Module$';
 import $Module$Edit from './containers/$Module$Edit';
 import resolvers from './resolvers';
 
+const { AuthRoute, IfLoggedIn } = require('@gqlapp/user-client-react');
+
 export default new ClientModule({
   route: [
     <AuthRoute
diff --git a/tools/templates/crud/client-react/resolvers/index.js b/tools/templates/crud/client-react/resolvers/index.js
index 9cfd29a1d8..7e85c3a701 100644
--- a/tools/templates/crud/client-react/resolvers/index.js
+++ b/tools/templates/crud/client-react/resolvers/index.js
@@ -1,7 +1,7 @@
 import update from 'immutability-helper';
 import { mergeFilter } from '@gqlapp/core-common';
 
-import { $Module$Schema } from '@gqlapp/$-module-ts/schema';
+import { $Module$Schema } from '@gqlapp/$-module$-server-ts/schema';
 import $MODULE$_STATE_QUERY from '../graphql/$Module$StateQuery.client.graphql';
 
 const TYPE_$MODULE$_STATE = '$Module$State';

From 9de07fd2808c91cb971ccacecf9821ee656c0486 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 5 Feb 2019 14:11:11 +0100
Subject: [PATCH 310/327] merge crud funcionality

---
 modules/core/client-react/util.web.jsx        | 78 ++++++++-----------
 modules/core/common/crud.js                   | 69 ++++++++++------
 .../ui-antd/components/Collapse.jsx           | 13 ++++
 .../client-react/ui-antd/components/Panel.jsx | 15 ++++
 .../client-react/ui-antd/components/index.js  | 26 ++++---
 packages/client/package.json                  |  3 +-
 yarn.lock                                     | 63 ++++++++-------
 7 files changed, 157 insertions(+), 110 deletions(-)
 create mode 100644 modules/look/client-react/ui-antd/components/Collapse.jsx
 create mode 100644 modules/look/client-react/ui-antd/components/Panel.jsx

diff --git a/modules/core/client-react/util.web.jsx b/modules/core/client-react/util.web.jsx
index 63b8e26936..be53e8d7a7 100644
--- a/modules/core/client-react/util.web.jsx
+++ b/modules/core/client-react/util.web.jsx
@@ -24,7 +24,7 @@ import {
   Icon,
   Button,
   FormItem,
-  Col,
+  //Col,
   Input,
   DatePicker,
   RenderCellSelectQuery
@@ -277,7 +277,7 @@ export const createFormFields = ({
               )
             );
           }
-        } else if (formType === 'batch') {
+        } else {
           fields.push(
             createFormFieldsArray(key, values, value, type, handleChange, handleBlur, formItemLayout, prefix, formType)
           );
@@ -317,40 +317,36 @@ const createFormField = (schema, key, type, values, formItemLayout, formType, ha
     component = RenderDate;
     if (formType === 'filter') {
       dateFields.push(
-        <Col span={8} key={`${key}_lte`}>
-          <Field
-            name={`${prefix}${key}_lte`}
-            key={`${key}_lte`}
-            component={component}
-            schema={type}
-            value={values[`${key}_lte`] ? values[`${key}_lte`] : ''}
-            type={inputType}
-            style={style}
-            label={`From ${startCase(key)}`}
-            formItemLayout={formItemLayout}
-            formType={formType}
-            hasTypeOf={hasTypeOf}
-            optional={optional}
-          />
-        </Col>
+        <Field
+          name={`${prefix}${key}_lte`}
+          key={`${key}_lte`}
+          component={component}
+          schema={type}
+          value={values[`${key}_lte`] ? values[`${key}_lte`] : ''}
+          type={inputType}
+          style={style}
+          label={`From ${startCase(key)}`}
+          formItemLayout={formItemLayout}
+          formType={formType}
+          hasTypeOf={hasTypeOf}
+          optional={optional}
+        />
       );
       dateFields.push(
-        <Col span={8} key={`${key}_gte`}>
-          <Field
-            name={`${prefix}${key}_gte`}
-            key={`${key}_gte`}
-            component={component}
-            schema={type}
-            value={values[`${key}_gte`] ? values[`${key}_gte`] : ''}
-            type={inputType}
-            style={style}
-            label={`To ${startCase(key)}`}
-            formItemLayout={formItemLayout}
-            formType={formType}
-            hasTypeOf={hasTypeOf}
-            optional={optional}
-          />
-        </Col>
+        <Field
+          name={`${prefix}${key}_gte`}
+          key={`${key}_gte`}
+          component={component}
+          schema={type}
+          value={values[`${key}_gte`] ? values[`${key}_gte`] : ''}
+          type={inputType}
+          style={style}
+          label={`To ${startCase(key)}`}
+          formItemLayout={formItemLayout}
+          formType={formType}
+          hasTypeOf={hasTypeOf}
+          optional={optional}
+        />
       );
     }
   } else if (hasTypeOf(Number)) {
@@ -382,15 +378,7 @@ const createFormField = (schema, key, type, values, formItemLayout, formType, ha
     />
   );
 
-  return dateFields.length === 2 ? (
-    dateFields
-  ) : formType === 'filter' ? (
-    <Col span={8} key={key}>
-      {field}
-    </Col>
-  ) : (
-    field
-  );
+  return dateFields.length === 2 ? dateFields : formType === 'filter' ? field : field;
 };
 
 const tailFormItemLayout = {
@@ -435,7 +423,7 @@ const createFormFieldsArray = (
                   prefix: `${prefix}${key}[${index}].`,
                   formType
                 })}
-                {!value.hasOne && formType !== 'batch' && (
+                {!value.hasOne && formType === 'form' && (
                   <FormItem {...tailFormItemLayout}>
                     <Button color="primary" size="sm" onClick={() => remove(index)}>
                       Delete
@@ -444,7 +432,7 @@ const createFormFieldsArray = (
                 )}
               </div>
             ))}
-            {!value.hasOne && formType !== 'batch' && (
+            {!value.hasOne && formType === 'form' && (
               <FormItem {...tailFormItemLayout}>
                 <Button color="dashed" onClick={() => push({})} style={{ width: '180px' }}>
                   Add field
diff --git a/modules/core/common/crud.js b/modules/core/common/crud.js
index 287e695b15..91473252ed 100644
--- a/modules/core/common/crud.js
+++ b/modules/core/common/crud.js
@@ -1,4 +1,5 @@
 import { isEqual, has } from 'lodash';
+import { flatten } from 'flat';
 
 export const onSubmit = async ({ schema, values, updateEntry, createEntry, title, data = null }) => {
   let result = null;
@@ -35,7 +36,7 @@ export const mapFormPropsToValues = ({ schema, data = null, formType = 'form' })
           fields[key] = data ? data[key] : '';
         }
       } else if (value.type.constructor === Array) {
-        fields[key] = data ? data[key] : [];
+        fields[key] = data ? data[key] : [mapFormPropsToValues({ schema: value.type[0], formType })];
       }
     } else {
       if (value.show !== false) {
@@ -62,31 +63,39 @@ export const pickInputFields = ({ schema, values, data = null, formType = 'form'
     const value = schema.values[key];
     const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
     if (formType === 'filter') {
-      if (value.show !== false && value.type.constructor !== Array) {
-        if (value.type.isSchema && values[key]) {
-          inputValues[`${key}Id`] = Number(values[key].id ? values[key].id : values[key]);
-        } else if (hasTypeOf(Date)) {
-          if (values[`${key}_lte`]) {
-            inputValues[`${key}_lte`] = values[`${key}_lte`];
-          }
-          if (values[`${key}_gte`]) {
-            inputValues[`${key}_gte`] = values[`${key}_gte`];
-          }
-        } else if (hasTypeOf(Boolean)) {
-          if (values[key] === 'true') {
-            inputValues[key] = true;
-          } else if (values[key] === 'false') {
-            inputValues[key] = false;
+      if (value.show !== false) {
+        if (value.type.constructor !== Array) {
+          if (value.type.isSchema && values[key]) {
+            inputValues[`${key}Id`] = Number(values[key].id ? values[key].id : values[key]);
+          } else if (hasTypeOf(Date)) {
+            if (values[`${key}_lte`]) {
+              inputValues[`${key}_lte`] = values[`${key}_lte`];
+            }
+            if (values[`${key}_gte`]) {
+              inputValues[`${key}_gte`] = values[`${key}_gte`];
+            }
+          } else if (hasTypeOf(Boolean)) {
+            if (values[key] === 'true') {
+              inputValues[key] = true;
+            } else if (values[key] === 'false') {
+              inputValues[key] = false;
+            } else {
+              inputValues[key] = '';
+            }
+          } else if (hasTypeOf(String)) {
+            if (values[`${key}_contains`]) {
+              inputValues[`${key}_contains`] = values[`${key}_contains`];
+            }
           } else {
-            inputValues[key] = '';
-          }
-        } else if (hasTypeOf(String)) {
-          if (values[`${key}_contains`]) {
-            inputValues[`${key}_contains`] = values[`${key}_contains`];
+            if (key in values && values[key]) {
+              inputValues[key] = values[key];
+            }
           }
-        } else {
-          if (key in values && values[key]) {
-            inputValues[key] = values[key];
+        } else if (value.type.constructor === Array) {
+          if (values && values[key] && values.hasOwnProperty(key)) {
+            values[key].forEach(item => {
+              inputValues[key] = pickInputFields({ schema: value.type[0], values: item, data: null, formType });
+            });
           }
         }
       }
@@ -231,5 +240,17 @@ export const mergeFilter = (filter, defaults, schema) => {
     }
   }
 
+  // flatten objects with __ delimiter, because apollo state does not allow nested data
+  mergeFilter = flatten(mergeFilter, {
+    delimiter: '__',
+    overwrite: true
+  });
+  // remove all empty objects
+  Object.keys(mergeFilter).map(item => {
+    if (typeof mergeFilter[item] === 'object') {
+      delete mergeFilter[item];
+    }
+  });
+
   return mergeFilter;
 };
diff --git a/modules/look/client-react/ui-antd/components/Collapse.jsx b/modules/look/client-react/ui-antd/components/Collapse.jsx
new file mode 100644
index 0000000000..becb4670bd
--- /dev/null
+++ b/modules/look/client-react/ui-antd/components/Collapse.jsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Collapse as ADCollapse } from 'antd';
+
+const Collapse = ({ children, ...props }) => {
+  return <ADCollapse {...props}>{children}</ADCollapse>;
+};
+
+Collapse.propTypes = {
+  children: PropTypes.node
+};
+
+export default Collapse;
diff --git a/modules/look/client-react/ui-antd/components/Panel.jsx b/modules/look/client-react/ui-antd/components/Panel.jsx
new file mode 100644
index 0000000000..3d19da81e0
--- /dev/null
+++ b/modules/look/client-react/ui-antd/components/Panel.jsx
@@ -0,0 +1,15 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Collapse } from 'antd';
+
+const ADPanel = Collapse.Panel;
+
+const Panel = ({ children, ...props }) => {
+  return <ADPanel {...props}>{children}</ADPanel>;
+};
+
+Panel.propTypes = {
+  children: PropTypes.node
+};
+
+export default Panel;
diff --git a/modules/look/client-react/ui-antd/components/index.js b/modules/look/client-react/ui-antd/components/index.js
index 55b18ea6e3..44c7708866 100644
--- a/modules/look/client-react/ui-antd/components/index.js
+++ b/modules/look/client-react/ui-antd/components/index.js
@@ -6,12 +6,22 @@ export { default as SubMenu } from './SubMenu';
 export { default as Form } from './Form';
 export { default as FormItem } from './FormItem';
 export { default as Input } from './Input';
+export { default as InputNumber } from './InputNumber';
+export { default as Switch } from './Switch';
 export { default as Select } from './Select';
 export { default as Option } from './Option';
 export { default as RenderField } from './RenderField';
+export { default as RenderNumber } from './RenderNumber';
+export { default as RenderTextArea } from './RenderTextArea';
+export { default as RenderDate } from './RenderDate';
 export { default as RenderSelect } from './RenderSelect';
+export { default as RenderSelectCountry } from './RenderSelectCountry';
+export { default as RenderSelectQuery } from './RenderSelectQuery';
+export { default as RenderSelectFilterBoolean } from './RenderSelectFilterBoolean';
 export { default as RenderCheckBox } from './RenderCheckBox';
+export { default as RenderSwitch } from './RenderSwitch';
 export { default as Alert } from './Alert';
+export { default as Spin } from './Spin';
 export { default as Container } from './Container';
 export { default as Row } from './Row';
 export { default as Col } from './Col';
@@ -23,20 +33,12 @@ export { default as CardText } from './CardText';
 export { default as Table } from './Table';
 export { default as ListGroup } from './ListGroup';
 export { default as ListItem } from './ListItem';
+export { default as Popconfirm } from './Popconfirm';
+export { default as Icon } from './Icon';
 export { default as LanguagePicker } from './LanguagePicker';
 export { default as Pagination } from './Pagination';
-export { default as Switch } from './Switch';
-export { default as InputNumber } from './InputNumber';
-export { default as RenderNumber } from './RenderNumber';
-export { default as RenderSelectQuery } from './RenderSelectQuery';
-export { default as RenderSelectFilterBoolean } from './RenderSelectFilterBoolean';
-export { default as RenderSwitch } from './RenderSwitch';
-export { default as RenderTextArea } from './RenderTextArea';
 export { default as DatePicker } from './DatePicker';
-export { default as RenderDate } from './RenderDate';
-export { default as Popconfirm } from './Popconfirm';
-export { default as Icon } from './Icon';
-export { default as Spin } from './Spin';
-export { default as RenderSelectCountry } from './RenderSelectCountry';
 export { default as RenderCellSelectQuery } from './RenderCellSelectQuery';
+export { default as Collapse } from './Collapse';
+export { default as Panel } from './Panel';
 export { onAppCreate } from './PageLayout';
diff --git a/packages/client/package.json b/packages/client/package.json
index 2c3e227133..c64095e4ca 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -57,7 +57,7 @@
     "@gqlapp/payments-client-react": "^0.1.0",
     "@gqlapp/reports-client-react": "^0.1.0",
     "@gqlapp/validation-common-react": "^0.1.0",
-    "antd": "^3.10.0",
+    "antd": "^3.10.4",
     "apollo-cache-inmemory": "1.4.2",
     "apollo-cache-router": "^1.1.6",
     "apollo-client": "^2.4.7",
@@ -73,6 +73,7 @@
     "error-stack-parser": "^2.0.1",
     "extract-files": "^3.1.0",
     "filesize": "^3.5.11",
+    "flat": "^4.1.0",
     "formik": "^1.3.1",
     "graphql": "^0.13.0",
     "graphql-iso-date": "^3.5.0",
diff --git a/yarn.lock b/yarn.lock
index c67dfd3756..10b79817ca 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2992,10 +2992,10 @@ antd-mobile-rn@^2.2.1:
     rn-topview "^0.1.6"
     utility-types "^2.1.0"
 
-antd@^3.10.0:
-  version "3.12.4"
-  resolved "https://registry.npmjs.org/antd/-/antd-3.12.4.tgz#b5d07cfe275006fc01aefe8b333445e874ec857e"
-  integrity sha512-EyDbHgkCA9Whhq3QFzEksXrj9YJ5TVeUZY8U9dN0LG56VxmoNgtaTakLuDU4V2C4GFphLpzIWAcRJTWDFxHUbw==
+antd@^3.10.4:
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/antd/-/antd-3.13.1.tgz#6bffb1771b4ff8497ca9c3623761289a8ecbcf05"
+  integrity sha512-71tFyGsSlQXW/j4aweL7nPwNmOL9QPvyV8zyU7YppG0oItrv787nGLPq3LeQwD+g+Jrxkhypm4V04SLYCPIhQg==
   dependencies:
     "@ant-design/icons" "~1.1.16"
     "@ant-design/icons-react" "~1.1.2"
@@ -3008,7 +3008,7 @@ antd@^3.10.0:
     dom-closest "^0.2.0"
     enquire.js "^2.1.6"
     lodash "^4.17.11"
-    moment "^2.22.2"
+    moment "^2.24.0"
     omit.js "^1.0.0"
     prop-types "^15.6.2"
     raf "^3.4.0"
@@ -3026,15 +3026,15 @@ antd@^3.10.0:
     rc-menu "~7.4.12"
     rc-notification "~3.3.0"
     rc-pagination "~1.17.7"
-    rc-progress "~2.2.6"
+    rc-progress "~2.3.0"
     rc-rate "~2.5.0"
     rc-select "^8.6.7"
     rc-slider "~8.6.3"
     rc-steps "~3.3.0"
-    rc-switch "~1.8.0"
+    rc-switch "~1.9.0"
     rc-table "~6.4.0"
-    rc-tabs "~9.5.2"
-    rc-time-picker "~3.5.0"
+    rc-tabs "~9.6.0"
+    rc-time-picker "~3.6.1"
     rc-tooltip "~3.7.3"
     rc-tree "~1.14.6"
     rc-tree-select "~2.5.0"
@@ -8937,6 +8937,13 @@ flat-cache@^1.2.1:
     rimraf "~2.6.2"
     write "^0.2.1"
 
+flat@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/flat/-/flat-4.1.0.tgz#090bec8b05e39cba309747f1d588f04dbaf98db2"
+  integrity sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==
+  dependencies:
+    is-buffer "~2.0.3"
+
 flush-write-stream@^1.0.0:
   version "1.0.3"
   resolved "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd"
@@ -10680,7 +10687,7 @@ is-buffer@^1.1.5, is-buffer@~1.1.1:
   resolved "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
-is-buffer@^2.0.2:
+is-buffer@^2.0.2, is-buffer@~2.0.3:
   version "2.0.3"
   resolved "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725"
   integrity sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==
@@ -13642,7 +13649,7 @@ moment-timezone@^0.5.23:
   dependencies:
     moment ">= 2.9.0"
 
-moment@2.x, "moment@>= 2.9.0", moment@^2.10.6, moment@^2.19.0, moment@^2.20.1, moment@^2.22.2, moment@^2.6.0:
+moment@2.x, "moment@>= 2.9.0", moment@^2.10.6, moment@^2.19.0, moment@^2.20.1, moment@^2.22.2, moment@^2.24.0, moment@^2.6.0:
   version "2.24.0"
   resolved "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
   integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
@@ -16074,10 +16081,10 @@ rc-pagination@~1.17.7:
     prop-types "^15.5.7"
     react-lifecycles-compat "^3.0.4"
 
-rc-progress@~2.2.6:
-  version "2.2.7"
-  resolved "https://registry.npmjs.org/rc-progress/-/rc-progress-2.2.7.tgz#e650928c83f54da876f39b957a680afa01b490f8"
-  integrity sha512-uLHHpQO4/yFa/AX6Uw2dJFUIfAkfI6430h0a1XJX/A0Ja0wmuwjEa03biuKfKwwqz2skFiAaXco1GlgaJK9mKA==
+rc-progress@~2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/rc-progress/-/rc-progress-2.3.0.tgz#cfbd07ff9026c450100980de209a92650e24f313"
+  integrity sha512-hYBKFSsNgD7jsF8j+ZC1J8y5UIC2X/ktCYI/OQhQNSX6mGV1IXnUCjAd9gbLmzmpChPvKyymRNfckScUNiTpFQ==
   dependencies:
     babel-runtime "6.x"
     prop-types "^15.5.8"
@@ -16143,14 +16150,14 @@ rc-swipeout@~2.0.0:
     rc-gesture "~0.0.22"
     react-native-swipeout "^2.2.2"
 
-rc-switch@~1.8.0:
-  version "1.8.0"
-  resolved "https://registry.npmjs.org/rc-switch/-/rc-switch-1.8.0.tgz#cff32fd04c406d8c0c0397e69bc36350a333e236"
-  integrity sha512-n4H+K2XJCqGwVQKwWOjbxl1kpdov0PVE9DGhzs/S20gk65s/nAOkpdO9tBD7IM/20KRNTBh0fEWkEedByrqh6w==
+rc-switch@~1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/rc-switch/-/rc-switch-1.9.0.tgz#ab2b878f2713c681358a453391976c9b95b290f7"
+  integrity sha512-Isas+egaK6qSk64jaEw4GgPStY4umYDbT7ZY93bZF1Af+b/JEsKsJdNOU2qG3WI0Z6tXo2DDq0kJCv8Yhu0zww==
   dependencies:
-    babel-runtime "^6.23.0"
     classnames "^2.2.1"
     prop-types "^15.5.6"
+    react-lifecycles-compat "^3.0.4"
 
 rc-table@~6.4.0:
   version "6.4.3"
@@ -16168,10 +16175,10 @@ rc-table@~6.4.0:
     shallowequal "^1.0.2"
     warning "^3.0.0"
 
-rc-tabs@~9.5.2:
-  version "9.5.8"
-  resolved "https://registry.npmjs.org/rc-tabs/-/rc-tabs-9.5.8.tgz#c097e48999f704b5710307ca95db8bdfdf53c6a7"
-  integrity sha512-fvkM5FLa0Kq9jz7YNE72T9WeMEbF264FIhqRnKyvmKtaam2lI81qxbofMEfBGhNxcv1whWlZStHj9b1Wi3Q24w==
+rc-tabs@~9.6.0:
+  version "9.6.0"
+  resolved "https://registry.yarnpkg.com/rc-tabs/-/rc-tabs-9.6.0.tgz#b212a85f58384897b09f52dd3ee6701fff7fccd5"
+  integrity sha512-Ql1p23rR41I8gJf0EZPA0VTxw4kVfw1rfnufBFvqhq3wkfvojxg6EgDK9I6h7qbUMc1KyDrhRYUzKrDshJ06Bg==
   dependencies:
     babel-runtime "6.x"
     classnames "2.x"
@@ -16183,10 +16190,10 @@ rc-tabs@~9.5.2:
     rc-util "^4.0.4"
     warning "^3.0.0"
 
-rc-time-picker@~3.5.0:
-  version "3.5.0"
-  resolved "https://registry.npmjs.org/rc-time-picker/-/rc-time-picker-3.5.0.tgz#bbe8d50a677eff1cd65cb645cb0fc29f83b91c35"
-  integrity sha512-swJyFZgR3P4UgFix5DP0fQQPKHP7WYEKlzbAWXd72TmFV80VCxmR+l0OWyCOjZgXfo9VJ/mEDzUnMSjP8/xyrg==
+rc-time-picker@~3.6.1:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/rc-time-picker/-/rc-time-picker-3.6.2.tgz#fd7133390353c6cd29ec09aa6c9711ab59228f1c"
+  integrity sha512-SyGEVXO0ImeG2mz+7fkVmDoVM0+OrX6uYGpKYijNr/lAah7c5p310ZR6fVrblXOl4TpqVnfWR67RMJ3twAyM7w==
   dependencies:
     classnames "2.x"
     moment "2.x"

From e4bd9dec135544832afc752b63313bf476cdd5ca Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 7 Feb 2019 13:09:22 +0100
Subject: [PATCH 311/327] merge latest

---
 .../ui-antd/components/index.js.orig          | 44 -------------------
 tools/cli/commands/updateSchema.js            | 33 +++++++++++---
 .../client-react/locales/en/translations.json |  3 ++
 .../crud/client-react/locales/index.js        |  5 +++
 4 files changed, 34 insertions(+), 51 deletions(-)
 delete mode 100644 modules/look/client-react/ui-antd/components/index.js.orig
 create mode 100644 tools/templates/crud/client-react/locales/en/translations.json
 create mode 100644 tools/templates/crud/client-react/locales/index.js

diff --git a/modules/look/client-react/ui-antd/components/index.js.orig b/modules/look/client-react/ui-antd/components/index.js.orig
deleted file mode 100644
index b7dcaeaa06..0000000000
--- a/modules/look/client-react/ui-antd/components/index.js.orig
+++ /dev/null
@@ -1,44 +0,0 @@
-// eslint-disable-next-line import/prefer-default-export
-export { default as PageLayout } from './PageLayout';
-export { default as Button } from './Button';
-export { default as MenuItem } from './MenuItem';
-export { default as Form } from './Form';
-export { default as FormItem } from './FormItem';
-export { default as Input } from './Input';
-export { default as Select } from './Select';
-export { default as Option } from './Option';
-export { default as RenderField } from './RenderField';
-export { default as RenderSelect } from './RenderSelect';
-export { default as RenderCheckBox } from './RenderCheckBox';
-export { default as Alert } from './Alert';
-export { default as Container } from './Container';
-export { default as Row } from './Row';
-export { default as Col } from './Col';
-export { default as Label } from './Label';
-export { default as Card } from './Card';
-export { default as CardGroup } from './CardGroup';
-export { default as CardTitle } from './CardTitle';
-export { default as CardText } from './CardText';
-export { default as Table } from './Table';
-export { default as ListGroup } from './ListGroup';
-export { default as ListItem } from './ListItem';
-export { default as LanguagePicker } from './LanguagePicker';
-export { default as Pagination } from './Pagination';
-<<<<<<< HEAD:packages/client/src/modules/common/components/web/ui-bootstrap/components/index.js
-export { default as Switch } from './Switch';
-export { default as InputNumber } from './InputNumber';
-export { default as RenderNumber } from './RenderNumber';
-export { default as RenderSelectQuery } from './RenderSelectQuery';
-export { default as RenderSelectFilterBoolean } from './RenderSelectFilterBoolean';
-export { default as RenderSwitch } from './RenderSwitch';
-export { default as RenderTextArea } from './RenderTextArea';
-export { default as DatePicker } from './DatePicker';
-export { default as RenderDate } from './RenderDate';
-export { default as Popconfirm } from './Popconfirm';
-export { default as Icon } from './Icon';
-export { default as Spin } from './Spin';
-export { default as RenderSelectCountry } from './RenderSelectCountry';
-export { default as RenderCellSelectQuery } from './RenderCellSelectQuery';
-=======
-export { onAppCreate } from './NavBar';
->>>>>>> add-delete-crud-cli-server-database:modules/look/client-react/ui-antd/components/index.js
diff --git a/tools/cli/commands/updateSchema.js b/tools/cli/commands/updateSchema.js
index 9aa36ab02b..98542cf49c 100644
--- a/tools/cli/commands/updateSchema.js
+++ b/tools/cli/commands/updateSchema.js
@@ -2,6 +2,7 @@ const shell = require('shelljs');
 const fs = require('fs');
 const chalk = require('chalk');
 const GraphQLGenerator = require('@domain-schema/graphql').default;
+const DomainSchema = require('@domain-schema/core').default;
 const { pascalize, camelize } = require('humps');
 
 const { getModulePackageName, computeModulePath, generateField, runPrettier } = require('../helpers/util');
@@ -60,20 +61,26 @@ function updateModule({ logger, packageName, moduleName, old }) {
             inputFilter += `  ${key}: ${generateField(value, true)}\n`;
             inputFilter += `  ${key}_in: [${generateField(value, true)}!]\n`;
             inputFilter += `  ${key}_contains: ${generateField(value, true)}\n`;
+          } else if (hasTypeOf(DomainSchema.Int)) {
+            inputFilter += `  ${key}: ${generateField(value, true)}\n`;
+            inputFilter += `  ${key}_lt: ${generateField(value, true)}\n`;
+            inputFilter += `  ${key}_lte: ${generateField(value, true)}\n`;
+            inputFilter += `  ${key}_gt: ${generateField(value, true)}\n`;
+            inputFilter += `  ${key}_gte: ${generateField(value, true)}\n`;
           } else {
             inputFilter += `  ${key}: ${generateField(value, true)}\n`;
           }
         } else if (value.type.constructor === Array && value.type[0].isSchema) {
-          inputCreate += `  ${key}: ${pascalize(key)}CreateManyInput\n`;
-          inputUpdate += `  ${key}: ${pascalize(key)}UpdateManyInput\n`;
+          inputCreate += `  ${key}: ${pascalize(value.type[0].name)}CreateManyInput\n`;
+          inputUpdate += `  ${key}: ${pascalize(value.type[0].name)}UpdateManyInput\n`;
           inputFilter += `  ${key}: ${pascalize(value.type[0].name)}FilterInput\n`;
           manyInput += `
 
-input ${pascalize(key)}CreateManyInput {
+input ${pascalize(value.type[0].name)}CreateManyInput {
   create: [${pascalize(value.type[0].name)}CreateInput!]
 }
 
-input ${pascalize(key)}UpdateManyInput {
+input ${pascalize(value.type[0].name)}UpdateManyInput {
   create: [${pascalize(value.type[0].name)}CreateInput!]
   delete: [${pascalize(value.type[0].name)}WhereUniqueInput!]
   update: [${pascalize(value.type[0].name)}UpdateWhereInput!]
@@ -126,7 +133,7 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
         )
         .to(file);
 
-      logger.info(chalk.green(`✔ Schema in ${destinationPath}${file} successfully updated!`));
+      logger.info(chalk.green(`✔ Schema in ${destinationPath}/${file} successfully updated!`));
 
       const resolverFile = `resolvers.ts`;
       let hasBatchResolvers = false;
@@ -163,7 +170,7 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
         .to(resolverFile);
       runPrettier(resolverFile);
 
-      logger.info(chalk.green(`✔ Resolver in ${destinationPath}${resolverFile} successfully updated!`));
+      logger.info(chalk.green(`✔ Resolver in ${destinationPath}/${resolverFile} successfully updated!`));
     }
 
     if (packageName === 'client') {
@@ -216,6 +223,12 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
               graphql += `    ${key}_gte\n`;
             } else if (hasTypeOf(String)) {
               graphql += `    ${key}_contains\n`;
+            } else if (hasTypeOf(DomainSchema.Int)) {
+              graphql += `    ${key}\n`;
+              graphql += `    ${key}_lt\n`;
+              graphql += `    ${key}_lte\n`;
+              graphql += `    ${key}_gt\n`;
+              graphql += `    ${key}_gte\n`;
             } else {
               graphql += `    ${key}\n`;
             }
@@ -253,6 +266,12 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
               defaults += `${key}_gte: '',\n`;
             } else if (hasTypeOf(String)) {
               defaults += `${key}_contains: '',\n`;
+            } else if (hasTypeOf(DomainSchema.Int)) {
+              defaults += `    ${key}\n`;
+              defaults += `    ${key}_lt\n`;
+              defaults += `    ${key}_lte\n`;
+              defaults += `    ${key}_gt\n`;
+              defaults += `    ${key}_gte\n`;
             } else {
               defaults += `${key}: '',\n`;
             }
@@ -273,7 +292,7 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
           .to(file);
         runPrettier(file);
 
-        logger.info(chalk.green(`✔ State Resolver in ${pathStateResolver}${file} successfully updated!`));
+        logger.info(chalk.green(`✔ State Resolver in ${pathStateResolver}/${file} successfully updated!`));
       } else {
         logger.error(chalk.red(`✘ State Resolver path ${pathStateResolver} not found!`));
       }
diff --git a/tools/templates/crud/client-react/locales/en/translations.json b/tools/templates/crud/client-react/locales/en/translations.json
new file mode 100644
index 0000000000..5ec4193d86
--- /dev/null
+++ b/tools/templates/crud/client-react/locales/en/translations.json
@@ -0,0 +1,3 @@
+{
+  "navLink": "Link"
+}
diff --git a/tools/templates/crud/client-react/locales/index.js b/tools/templates/crud/client-react/locales/index.js
new file mode 100644
index 0000000000..9abc2aac88
--- /dev/null
+++ b/tools/templates/crud/client-react/locales/index.js
@@ -0,0 +1,5 @@
+/* 
+* The index.js can be empty, it's just needed to point the loader to the root directory of the locales.
+* https://github.com/alienfast/i18next-loader#option-2-use-with-import-syntax
+*/
+export default {};
\ No newline at end of file

From 9b83085a434a3f1d30bacf17badd1c2ab5bc844b Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 7 Feb 2019 13:59:57 +0100
Subject: [PATCH 312/327] crud templates: update

---
 .../templates/crud/client-react/index.native.tsx  |  4 ++--
 tools/templates/crud/client-react/index.tsx       | 15 +++++++++++----
 .../client-react/locales/en/translations.json     |  2 +-
 .../module/client-react/index.native.tsx          |  2 +-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/tools/templates/crud/client-react/index.native.tsx b/tools/templates/crud/client-react/index.native.tsx
index 13c4fa03b4..e85b803823 100644
--- a/tools/templates/crud/client-react/index.native.tsx
+++ b/tools/templates/crud/client-react/index.native.tsx
@@ -4,8 +4,8 @@ import { createStackNavigator } from 'react-navigation';
 import { translate } from '@gqlapp/i18n-client-react';
 import ClientModule from '@gqlapp/module-client-react-native';
 
-import { HeaderTitle, IconButton } from '../../../packages/client/src/modules/common/components/native';
-import $Module$ from './containers/$Module$';
+import { HeaderTitle, IconButton } from '@gqlapp/look-client-react-native';
+import $Module$ from './containers/$Module$List';
 import resources from './locales';
 
 const HeaderTitleWithI18n = translate('$module$')(HeaderTitle);
diff --git a/tools/templates/crud/client-react/index.tsx b/tools/templates/crud/client-react/index.tsx
index df02889c5d..4345437983 100644
--- a/tools/templates/crud/client-react/index.tsx
+++ b/tools/templates/crud/client-react/index.tsx
@@ -1,14 +1,22 @@
 import React from 'react';
 import ClientModule from '@gqlapp/module-client-react';
+import { translate, TranslateFunction } from '@gqlapp/i18n-client-react';
 import { NavLink } from 'react-router-dom';
 import { MenuItem } from '@gqlapp/look-client-react';
 
 import $Module$ from './components/$Module$';
 import $Module$Edit from './containers/$Module$Edit';
 import resolvers from './resolvers';
+import resources from './locales';
 
 const { AuthRoute, IfLoggedIn } = require('@gqlapp/user-client-react');
 
+const NavLinkWithI18n = translate('$module$')(({ t }: { t: TranslateFunction }) => (
+  <NavLink to="/$module$" className="nav-link" activeClassName="active">
+    {t('$module$:navLink')}
+  </NavLink>
+));
+
 export default new ClientModule({
   route: [
     <AuthRoute
@@ -31,11 +39,10 @@ export default new ClientModule({
   navItem: [
     <IfLoggedIn role={['editor', 'admin']}>
       <MenuItem key="/$module$">
-        <NavLink to="/$module$" className="nav-link" activeClassName="active">
-          $MoDuLe$
-        </NavLink>
+        <NavLinkWithI18n />
       </MenuItem>
     </IfLoggedIn>
   ],
-  resolver: [resolvers]
+  resolver: [resolvers],
+  localization: [{ ns: '$module$', resources }]
 });
diff --git a/tools/templates/crud/client-react/locales/en/translations.json b/tools/templates/crud/client-react/locales/en/translations.json
index 5ec4193d86..f76c33d2ce 100644
--- a/tools/templates/crud/client-react/locales/en/translations.json
+++ b/tools/templates/crud/client-react/locales/en/translations.json
@@ -1,3 +1,3 @@
 {
-  "navLink": "Link"
+  "navLink": "$MoDuLe$"
 }
diff --git a/tools/templates/module/client-react/index.native.tsx b/tools/templates/module/client-react/index.native.tsx
index 13c4fa03b4..e3a08d4277 100644
--- a/tools/templates/module/client-react/index.native.tsx
+++ b/tools/templates/module/client-react/index.native.tsx
@@ -4,7 +4,7 @@ import { createStackNavigator } from 'react-navigation';
 import { translate } from '@gqlapp/i18n-client-react';
 import ClientModule from '@gqlapp/module-client-react-native';
 
-import { HeaderTitle, IconButton } from '../../../packages/client/src/modules/common/components/native';
+import { HeaderTitle, IconButton } from '@gqlapp/look-client-react-native';
 import $Module$ from './containers/$Module$';
 import resources from './locales';
 

From 17413737deaf3f4ad8db8603e4d415163e9dd726 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 15 Feb 2019 13:45:15 +0100
Subject: [PATCH 313/327] small fixes

---
 tools/cli/commands/updateSchema.js                 | 10 +++++-----
 tools/templates/crud/client-react/index.native.tsx |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tools/cli/commands/updateSchema.js b/tools/cli/commands/updateSchema.js
index 98542cf49c..02859fbcb8 100644
--- a/tools/cli/commands/updateSchema.js
+++ b/tools/cli/commands/updateSchema.js
@@ -267,11 +267,11 @@ input ${pascalize(value.type[0].name)}UpdateWhereInput {
             } else if (hasTypeOf(String)) {
               defaults += `${key}_contains: '',\n`;
             } else if (hasTypeOf(DomainSchema.Int)) {
-              defaults += `    ${key}\n`;
-              defaults += `    ${key}_lt\n`;
-              defaults += `    ${key}_lte\n`;
-              defaults += `    ${key}_gt\n`;
-              defaults += `    ${key}_gte\n`;
+              defaults += `    ${key}: '',\n`;
+              defaults += `    ${key}_lt: '',\n`;
+              defaults += `    ${key}_lte: '',\n`;
+              defaults += `    ${key}_gt: '',\n`;
+              defaults += `    ${key}_gte: '',\n`;
             } else {
               defaults += `${key}: '',\n`;
             }
diff --git a/tools/templates/crud/client-react/index.native.tsx b/tools/templates/crud/client-react/index.native.tsx
index e85b803823..c766f8e527 100644
--- a/tools/templates/crud/client-react/index.native.tsx
+++ b/tools/templates/crud/client-react/index.native.tsx
@@ -5,7 +5,7 @@ import { translate } from '@gqlapp/i18n-client-react';
 import ClientModule from '@gqlapp/module-client-react-native';
 
 import { HeaderTitle, IconButton } from '@gqlapp/look-client-react-native';
-import $Module$ from './containers/$Module$List';
+import $Module$List from './containers/$Module$List';
 import resources from './locales';
 
 const HeaderTitleWithI18n = translate('$module$')(HeaderTitle);
@@ -16,7 +16,7 @@ export default new ClientModule({
       $Module$: {
         screen: createStackNavigator({
           $Module$: {
-            screen: $Module$,
+            screen: $Module$List,
             navigationOptions: ({ navigation }: any) => ({
               headerTitle: <HeaderTitleWithI18n style="subTitle" />,
               headerLeft: (

From 133475c8e8593f9d5f49d3fdc33a939e4094821f Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Mon, 11 Mar 2019 10:50:06 +0100
Subject: [PATCH 314/327] merge latest changes

---
 .../core/client-react/crud/FilterView.web.jsx |  32 +-
 modules/core/common/utils.ts                  |  32 +-
 modules/database/server-ts/sql/crud.js        |   4 +-
 .../components/RenderSelectQuery.jsx          |   4 +-
 .../components/RenderCellSelectQuery.jsx      |   2 +-
 .../ui-antd/components/RenderSelectQuery.jsx  |   4 +-
 .../client-react/ui-antd/styles/styles.less   |   4 -
 .../components/RenderCellSelectQuery.jsx      |   2 +-
 .../components/RenderSelectQuery.jsx          |   2 +-
 .../client-react/components/LoginForm.web.jsx |   2 +-
 .../client-react/containers/ModuleEdit.jsx    |   8 +-
 .../client-react/containers/ModuleList.jsx    |   2 +-
 yarn.lock                                     | 395 ++++++++++++++----
 13 files changed, 375 insertions(+), 118 deletions(-)

diff --git a/modules/core/client-react/crud/FilterView.web.jsx b/modules/core/client-react/crud/FilterView.web.jsx
index 7ea6d98956..a57fde5ce3 100644
--- a/modules/core/client-react/crud/FilterView.web.jsx
+++ b/modules/core/client-react/crud/FilterView.web.jsx
@@ -72,7 +72,7 @@ class FilterView extends React.PureComponent {
         render={({ values, handleChange, handleBlur, handleSubmit, handleReset }) => (
           <Form className="ant-advanced-search-form bootstrap-advanced-search-form" onSubmit={handleSubmit}>
             <Row>
-              <Col span={8}>
+              <Col lg={8} md={6} xs={24}>
                 <FormItem label="Find" {...formItemLayout}>
                   <DebounceInput
                     minLength={2}
@@ -83,20 +83,22 @@ class FilterView extends React.PureComponent {
                   />
                 </FormItem>
               </Col>
-              <Col span={16} style={{ textAlign: 'right' }}>
-                <Button type="primary" htmlType="submit">
-                  Search
-                </Button>
-                <Button style={{ marginLeft: 8 }} onClick={handleReset}>
-                  Clear
-                </Button>
-                <a style={{ marginLeft: 8, fontSize: 12 }} onClick={this.toggle}>
-                  Advanced{' '}
-                  <Icon
-                    type={this.state.expand ? 'up' : 'down'}
-                    className={this.state.expand ? 'fas fa-chevron-up' : 'fas fa-chevron-down'}
-                  />
-                </a>
+              <Col md={18} xs={24} style={{ float: 'right' }}>
+                <FormItem>
+                  <Button type="primary" htmlType="submit">
+                    Search
+                  </Button>
+                  <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+                    Clear
+                  </Button>
+                  <a style={{ marginLeft: 8, fontSize: 12 }} onClick={this.toggle}>
+                    Advanced{' '}
+                    <Icon
+                      type={this.state.expand ? 'up' : 'down'}
+                      className={this.state.expand ? 'fas fa-chevron-up' : 'fas fa-chevron-down'}
+                    />
+                  </a>
+                </FormItem>
               </Col>
             </Row>
             <Row gutter={24} style={{ display: expand ? 'block' : 'none' }}>
diff --git a/modules/core/common/utils.ts b/modules/core/common/utils.ts
index 04daf1b405..943486ad9a 100644
--- a/modules/core/common/utils.ts
+++ b/modules/core/common/utils.ts
@@ -88,7 +88,7 @@ const removeBySchema = (key: any, obj: any, schema: any) => {
     return obj[key] !== '';
   } else {
     const schemaKey = key.endsWith('Id') ? key.substring(0, key.length - 2) : key;
-    if (schema.values[schemaKey].type.isSchema) {
+    if (schema && schema.values[schemaKey] && schema.values[schemaKey].type.isSchema) {
       return obj[key] !== '' && obj[key] !== null;
     } else {
       return obj[key] !== '';
@@ -100,15 +100,27 @@ export const removeEmpty = (obj: any, schema: any = null) => {
   return Object.keys(obj)
     .filter(key => removeBySchema(key, obj, schema))
     .reduce((redObj, key) => {
-      if (schema && schema.values[key] && schema.values[key].type.constructor === Array) {
-        if (obj[key].create && obj[key].create.length > 0) {
-          const tmpObj = obj[key];
-          tmpObj.create[0] = removeEmpty(obj[key].create[0], schema.values[key].type[0]);
-          redObj[key] = tmpObj;
-        } else if (obj[key].update && obj[key].update.length > 0) {
-          const tmpObj = obj[key];
-          tmpObj.update[0].data = removeEmpty(obj[key].update[0].data, schema.values[key].type[0]);
-          redObj[key] = tmpObj;
+      if (schema && schema.values[key]) {
+        const hasTypeOf = (targetType: any) =>
+          schema.values[key].type === targetType || schema.values[key].type.prototype instanceof targetType;
+        if (schema.values[key].type.constructor === Array) {
+          if (obj[key].create && obj[key].create.length > 0) {
+            const tmpObj = obj[key];
+            tmpObj.create[0] = removeEmpty(obj[key].create[0], schema.values[key].type[0]);
+            redObj[key] = tmpObj;
+          } else if (obj[key].update && obj[key].update.length > 0) {
+            const tmpObj = obj[key];
+            tmpObj.update[0].data = removeEmpty(obj[key].update[0].data, schema.values[key].type[0]);
+            redObj[key] = tmpObj;
+          } else if (schema.values[key].type[0].isSchema) {
+            redObj[key] = removeEmpty(obj[key], schema.values[key].type[0]);
+          } else {
+            redObj[key] = obj[key];
+          }
+        } else if (hasTypeOf(Number)) {
+          redObj[key] = Number(obj[key]);
+        } else if (hasTypeOf(Boolean)) {
+          redObj[key] = obj[key] === 'true' ? true : false;
         } else {
           redObj[key] = obj[key];
         }
diff --git a/modules/database/server-ts/sql/crud.js b/modules/database/server-ts/sql/crud.js
index 5573218af6..9b6cf89c05 100644
--- a/modules/database/server-ts/sql/crud.js
+++ b/modules/database/server-ts/sql/crud.js
@@ -1004,8 +1004,8 @@ export class Crud {
     }
   }
 
-  async getByIds(ids, by, Obj, info) {
-    info = parseFields(info);
+  async getByIds(ids, by, Obj, info, infoCustom = null) {
+    info = infoCustom === null ? parseFields(info) : infoCustom;
     const remoteId = by !== 'id' ? `${by}Id` : by;
     info[remoteId] = true;
     const baseQuery = knex(`${Obj.getFullTableName()} as ${Obj.getTableName()}`);
diff --git a/modules/look/client-react-native/ui-native-base/components/RenderSelectQuery.jsx b/modules/look/client-react-native/ui-native-base/components/RenderSelectQuery.jsx
index b4c06e6714..924b79dbc3 100644
--- a/modules/look/client-react-native/ui-native-base/components/RenderSelectQuery.jsx
+++ b/modules/look/client-react-native/ui-native-base/components/RenderSelectQuery.jsx
@@ -6,6 +6,8 @@ import { schemaQueries } from '@gqlapp/core-client-react';
 import { RenderSelect } from './index';
 import InputItemStyles from '../styles/InputItem';
 
+const LIMIT = 20;
+
 const handleSelect = (selectedValue, edges, onChange) => {
   let selectedItem = edges && Array.isArray(edges) ? edges.find(item => item.value == selectedValue) : '';
   onChange(selectedItem ? selectedItem : '');
@@ -48,7 +50,7 @@ const RenderSelectQuery = ({
   }
 
   return (
-    <Query limit={10}>
+    <Query limit={LIMIT}>
       {({ loading, data }) => {
         if (!loading || data) {
           let computedData = null;
diff --git a/modules/look/client-react/ui-antd/components/RenderCellSelectQuery.jsx b/modules/look/client-react/ui-antd/components/RenderCellSelectQuery.jsx
index f660b132f8..4f05db5bc3 100644
--- a/modules/look/client-react/ui-antd/components/RenderCellSelectQuery.jsx
+++ b/modules/look/client-react/ui-antd/components/RenderCellSelectQuery.jsx
@@ -6,7 +6,7 @@ import { pascalize } from 'humps';
 import schemaQueries from '../../generatedContainers';
 
 const Option = Select.Option;
-const LIMIT = 10;
+const LIMIT = 20;
 
 export default class RenderCellSelectQuery extends React.Component {
   static propTypes = {
diff --git a/modules/look/client-react/ui-antd/components/RenderSelectQuery.jsx b/modules/look/client-react/ui-antd/components/RenderSelectQuery.jsx
index 68dd7ce90e..f8d01f43cf 100644
--- a/modules/look/client-react/ui-antd/components/RenderSelectQuery.jsx
+++ b/modules/look/client-react/ui-antd/components/RenderSelectQuery.jsx
@@ -7,7 +7,7 @@ import { FormItem } from './index';
 import schemaQueries from '../../generatedContainers';
 
 const Option = Select.Option;
-const LIMIT = 10;
+const LIMIT = 20;
 
 export default class RenderSelectQuery extends React.Component {
   static propTypes = {
@@ -78,7 +78,7 @@ export default class RenderSelectQuery extends React.Component {
     return (
       <FormItem label={label} {...formItemLayout} validateStatus={touched && error ? 'error' : ''} help={error}>
         <div>
-          <Query limit={10} filter={{ searchText }} orderBy={orderBy()}>
+          <Query limit={LIMIT} filter={{ searchText }} orderBy={orderBy()}>
             {({ loading, data }) => {
               if (!loading || data) {
                 const {
diff --git a/modules/look/client-react/ui-antd/styles/styles.less b/modules/look/client-react/ui-antd/styles/styles.less
index 6b75b63de9..8397324b63 100644
--- a/modules/look/client-react/ui-antd/styles/styles.less
+++ b/modules/look/client-react/ui-antd/styles/styles.less
@@ -89,10 +89,6 @@
   margin-bottom: 24px;
 }
 
-.ant-advanced-search-form .ant-form-item {
-  display: flex;
-}
-
 .ant-advanced-search-form .ant-form-item-label {
   overflow: visible;
 }
diff --git a/modules/look/client-react/ui-bootstrap/components/RenderCellSelectQuery.jsx b/modules/look/client-react/ui-bootstrap/components/RenderCellSelectQuery.jsx
index bf6d68731e..9a44411aed 100644
--- a/modules/look/client-react/ui-bootstrap/components/RenderCellSelectQuery.jsx
+++ b/modules/look/client-react/ui-bootstrap/components/RenderCellSelectQuery.jsx
@@ -4,7 +4,7 @@ import { pascalize } from 'humps';
 import { Select, Spin } from './index';
 import schemaQueries from '../../generatedContainers';
 
-const LIMIT = 10;
+const LIMIT = 20;
 
 export default class RenderCellSelectQuery extends React.Component {
   static propTypes = {
diff --git a/modules/look/client-react/ui-bootstrap/components/RenderSelectQuery.jsx b/modules/look/client-react/ui-bootstrap/components/RenderSelectQuery.jsx
index f34b83b86a..9b799ee04e 100644
--- a/modules/look/client-react/ui-bootstrap/components/RenderSelectQuery.jsx
+++ b/modules/look/client-react/ui-bootstrap/components/RenderSelectQuery.jsx
@@ -5,7 +5,7 @@ import { FormFeedback } from 'reactstrap';
 import { FormItem, Select, Spin } from './index';
 import schemaQueries from '../../generatedContainers';
 
-const LIMIT = 10;
+const LIMIT = 20;
 
 export default class RenderSelectQuery extends React.Component {
   static propTypes = {
diff --git a/modules/user/client-react/components/LoginForm.web.jsx b/modules/user/client-react/components/LoginForm.web.jsx
index 7ed2046d14..822f007ee6 100644
--- a/modules/user/client-react/components/LoginForm.web.jsx
+++ b/modules/user/client-react/components/LoginForm.web.jsx
@@ -16,7 +16,7 @@ import settings from '../../../../settings';
 
 const loginFormSchema = {
   usernameOrEmail: [required, minLength(3)],
-  password: [required, minLength(8)]
+  password: [required, minLength(settings.user.auth.password.minLength)]
 };
 const { facebook, linkedin, google, github } = settings.user.auth;
 
diff --git a/tools/templates/crud/client-react/containers/ModuleEdit.jsx b/tools/templates/crud/client-react/containers/ModuleEdit.jsx
index 2c076ab54b..2f2f7ffb46 100644
--- a/tools/templates/crud/client-react/containers/ModuleEdit.jsx
+++ b/tools/templates/crud/client-react/containers/ModuleEdit.jsx
@@ -16,13 +16,7 @@ class $Module$Edit extends React.Component {
 export default compose(
   graphql($MODULE$_QUERY, {
     options: props => {
-      let id = 0;
-      if (props.match) {
-        id = props.match.params.id;
-      } else if (props.navigation) {
-        id = props.navigation.state.params.id;
-      }
-
+      const id = Number(props.match ? props.match.params.id : props.navigation.state.params.id);
       return {
         fetchPolicy: 'cache-and-network',
         variables: { where: { id } }
diff --git a/tools/templates/crud/client-react/containers/ModuleList.jsx b/tools/templates/crud/client-react/containers/ModuleList.jsx
index 7fb9af7fbc..717fada52d 100644
--- a/tools/templates/crud/client-react/containers/ModuleList.jsx
+++ b/tools/templates/crud/client-react/containers/ModuleList.jsx
@@ -98,7 +98,7 @@ export default compose(
     options: ({ limit, orderBy, filter }) => {
       return {
         fetchPolicy: 'cache-and-network',
-        variables: { limit, orderBy, filter: removeEmpty(filter) }
+        variables: { limit, orderBy, filter: removeEmpty(filter, $Module$Schema) }
       };
     },
     props: ({ data: { loading, $module$sConnection, refetch, error, fetchMore, subscribeToMore } }) => {
diff --git a/yarn.lock b/yarn.lock
index b01ff70ca4..ad3e2cd62d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -97,10 +97,10 @@
     ant-design-palettes "^1.1.3"
     babel-runtime "^6.26.0"
 
-"@ant-design/icons@~1.1.16":
-  version "1.1.16"
-  resolved "https://registry.npmjs.org/@ant-design/icons/-/icons-1.1.16.tgz#ac6426216934e3f4bc108f2f48f92ed66789235e"
-  integrity sha512-0zNVP5JYBJkfMi9HotN6QBQjF3SFmUlumJNJXZIH+pZWp/5EbrCczzlG3YTmBWoyRHAsuOGIjSFIy8v/76DTPg==
+"@ant-design/icons@~1.2.0":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@ant-design/icons/-/icons-1.2.1.tgz#8e19301b1433ec67d6bbd0e892782e2ade561ff9"
+  integrity sha512-gQx3nH6m1xvebOWh5xibhzVK02aoqHY7JUXUS4doAidSDRWsj5iwKC8Gq9DemDZ4T+bW6xO7jJZN1UsbvcW7Uw==
 
 "@apollographql/apollo-tools@^0.3.0":
   version "0.3.2"
@@ -1056,6 +1056,18 @@
   dependencies:
     debug "^3.1.0"
 
+"@domain-schema/formik@^0.0.34":
+  version "0.0.34"
+  resolved "https://registry.yarnpkg.com/@domain-schema/formik/-/formik-0.0.34.tgz#a5023113c5540def45aba2bfb1d5fb0b1c2ce461"
+  integrity sha512-rw4q+MtAd//brE1VmZssoaGOeInCEmkiuw1e9QRfnc9CEU8TV1ptNG9vyXmfFzvV/iZKkMQe7u4/nK6hTcRcWA==
+  dependencies:
+    debug "^3.1.0"
+    formik "^0.11.11"
+    humps "^2.0.1"
+  optionalDependencies:
+    react-test-renderer "^16.2.0"
+    reactstrap "^6.0.1"
+
 "@domain-schema/graphql@^0.0.33":
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/@domain-schema/graphql/-/graphql-0.0.33.tgz#201d8cc5d21a9eba69f2eb8cb1fe44f012381cec"
@@ -1071,6 +1083,14 @@
     debug "^3.1.0"
     humps "^2.0.1"
 
+"@domain-schema/validation@^0.0.36":
+  version "0.0.36"
+  resolved "https://registry.yarnpkg.com/@domain-schema/validation/-/validation-0.0.36.tgz#b4740e577e4c745710fb4388e857ee62f70e33ea"
+  integrity sha512-dAfqH/yFbmecfEccRt2FK/jx3XvfpcfwNPUBQaVAFXD/urSTLAPG5DmML68qpYs+9ms9p412U/IN3CyiLmUGcw==
+  dependencies:
+    debug "^3.1.0"
+    humps "^2.0.1"
+
 "@expo/bunyan@3.0.2":
   version "3.0.2"
   resolved "https://registry.npmjs.org/@expo/bunyan/-/bunyan-3.0.2.tgz#775680bd479a8b79ada4a5676936a58eef1579c9"
@@ -1294,6 +1314,11 @@
   dependencies:
     "@fortawesome/fontawesome-common-types" "^0.1.7"
 
+"@fortawesome/fontawesome-free-webfonts@^1.0.9":
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free-webfonts/-/fontawesome-free-webfonts-1.0.9.tgz#72f2c10453422aba0d338fa6a9cb761b50ba24d5"
+  integrity sha512-nLgl6b6a+tXaoJJnSRw0hjN8cWM/Q5DhxKAwI9Xr0AiC43lQ2F98vQ1KLA6kw5OoYeAyisGGqmlwtBj0WqOI5Q==
+
 "@fortawesome/fontawesome@^1.1.8":
   version "1.1.8"
   resolved "https://registry.npmjs.org/@fortawesome/fontawesome/-/fontawesome-1.1.8.tgz#75fe66a60f95508160bb16bd781ad7d89b280f5b"
@@ -2413,6 +2438,13 @@
     "@types/history" "*"
     "@types/react" "*"
 
+"@types/react-slick@^0.23.3":
+  version "0.23.3"
+  resolved "https://registry.yarnpkg.com/@types/react-slick/-/react-slick-0.23.3.tgz#c9d14323a75f54f46a652fb745fe553aad091ce0"
+  integrity sha512-B6wU5ynINOolrByhoeJ448qZPjCFPcuhyQI5sjihjG8gQJuoTH6a4YQhuDm4umvbRVielJQANhptc8hmxA85IA==
+  dependencies:
+    "@types/react" "*"
+
 "@types/react-stripe-elements@^1.1.7":
   version "1.1.10"
   resolved "https://registry.npmjs.org/@types/react-stripe-elements/-/react-stripe-elements-1.1.10.tgz#c224a6bc1b1638ff94b84c881758d534defeff64"
@@ -2986,23 +3018,25 @@ antd-mobile-rn@^2.2.1:
     rn-topview "^0.1.6"
     utility-types "^2.1.0"
 
-antd@^3.10.0:
-  version "3.12.4"
-  resolved "https://registry.npmjs.org/antd/-/antd-3.12.4.tgz#b5d07cfe275006fc01aefe8b333445e874ec857e"
-  integrity sha512-EyDbHgkCA9Whhq3QFzEksXrj9YJ5TVeUZY8U9dN0LG56VxmoNgtaTakLuDU4V2C4GFphLpzIWAcRJTWDFxHUbw==
+antd@^3.10.4:
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/antd/-/antd-3.15.0.tgz#af187ce62902edf261d7251fc9105407527fad9d"
+  integrity sha512-gSoVmQN7rfYmhfpv0dL2sL9gk0Pu9JHgGiExjLJZaSnbPjpCOTAYjIzxG/oo8GzCSeK5abgN5F1saWR5ggLVFQ==
   dependencies:
-    "@ant-design/icons" "~1.1.16"
+    "@ant-design/icons" "~1.2.0"
     "@ant-design/icons-react" "~1.1.2"
+    "@types/react-slick" "^0.23.3"
     array-tree-filter "^2.1.0"
     babel-runtime "6.x"
     classnames "~2.2.6"
+    copy-to-clipboard "^3.0.8"
     create-react-class "^15.6.3"
     create-react-context "0.2.2"
     css-animation "^1.5.0"
     dom-closest "^0.2.0"
     enquire.js "^2.1.6"
     lodash "^4.17.11"
-    moment "^2.22.2"
+    moment "^2.24.0"
     omit.js "^1.0.0"
     prop-types "^15.6.2"
     raf "^3.4.0"
@@ -3010,28 +3044,28 @@ antd@^3.10.0:
     rc-calendar "~9.10.3"
     rc-cascader "~0.17.0"
     rc-checkbox "~2.1.5"
-    rc-collapse "~1.10.2"
+    rc-collapse "~1.11.1"
     rc-dialog "~7.3.0"
     rc-drawer "~1.7.6"
     rc-dropdown "~2.4.1"
     rc-editor-mention "^1.1.7"
     rc-form "^2.4.0"
-    rc-input-number "~4.3.7"
+    rc-input-number "~4.4.0"
     rc-menu "~7.4.12"
     rc-notification "~3.3.0"
     rc-pagination "~1.17.7"
-    rc-progress "~2.2.6"
+    rc-progress "~2.3.0"
     rc-rate "~2.5.0"
-    rc-select "^8.6.7"
-    rc-slider "~8.6.3"
+    rc-select "~9.0.0"
+    rc-slider "~8.6.5"
     rc-steps "~3.3.0"
-    rc-switch "~1.8.0"
+    rc-switch "~1.9.0"
     rc-table "~6.4.0"
-    rc-tabs "~9.5.2"
-    rc-time-picker "~3.5.0"
+    rc-tabs "~9.6.0"
+    rc-time-picker "~3.6.1"
     rc-tooltip "~3.7.3"
     rc-tree "~1.14.6"
-    rc-tree-select "~2.5.0"
+    rc-tree-select "~2.6.0"
     rc-trigger "^2.6.2"
     rc-upload "~2.6.0"
     rc-util "^4.5.1"
@@ -3538,7 +3572,7 @@ art@^0.10.0, art@^0.10.1:
   resolved "https://registry.npmjs.org/art/-/art-0.10.3.tgz#b01d84a968ccce6208df55a733838c96caeeaea2"
   integrity sha512-HXwbdofRTiJT6qZX/FnchtldzJjS3vkLJxQilc3Xj+ma2MXjY4UAyQ0ls1XZYVnDvVIBiFZbC6QsvtW86TD6tQ==
 
-asap@^2.0.0, asap@~2.0.3:
+asap@^2.0.0, asap@^2.0.6, asap@~2.0.3:
   version "2.0.6"
   resolved "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
   integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
@@ -4656,7 +4690,7 @@ bluebird@^2.10.2:
   resolved "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
   integrity sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=
 
-bluebird@^3.1.1, bluebird@^3.4.7, bluebird@^3.5.0, bluebird@^3.5.1, bluebird@^3.5.2, bluebird@^3.5.3:
+bluebird@^3.1.1, bluebird@^3.4.6, bluebird@^3.4.7, bluebird@^3.5.0, bluebird@^3.5.1, bluebird@^3.5.2, bluebird@^3.5.3:
   version "3.5.3"
   resolved "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
   integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==
@@ -6140,6 +6174,13 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
+copy-to-clipboard@^3.0.8:
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.0.8.tgz#f4e82f4a8830dce4666b7eb8ded0c9bcc313aba9"
+  integrity sha512-c3GdeY8qxCHGezVb1EFQfHYK/8NZRemgcTIzPq7PuxjHAf/raKibn2QdhHPb/y6q74PMgH6yizaDZlRmw6QyKw==
+  dependencies:
+    toggle-selection "^1.0.3"
+
 core-js@3.0.0-beta.3:
   version "3.0.0-beta.3"
   resolved "https://registry.npmjs.org/core-js/-/core-js-3.0.0-beta.3.tgz#b0f22009972b8c6c04550ebf38513ca4b3cc9559"
@@ -6240,7 +6281,7 @@ create-react-class@^15.5.3, create-react-class@^15.6.0, create-react-class@^15.6
     loose-envify "^1.3.1"
     object-assign "^4.1.1"
 
-create-react-context@0.2.2:
+create-react-context@0.2.2, create-react-context@<=0.2.2:
   version "0.2.2"
   resolved "https://registry.npmjs.org/create-react-context/-/create-react-context-0.2.2.tgz#9836542f9aaa22868cd7d4a6f82667df38019dca"
   integrity sha512-KkpaLARMhsTsgp0d2NA/R94F/eDLbhXERdIq3LvX2biCAXcDvHYoOqHfWCHf1+OLj+HKBotLG3KqaOOf+C1C+A==
@@ -6821,11 +6862,26 @@ dir-glob@^2.0.0:
   dependencies:
     path-type "^3.0.0"
 
+disposables@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/disposables/-/disposables-1.0.2.tgz#36c6a674475f55a2d6913567a601444e487b4b6e"
+  integrity sha1-NsamdEdfVaLWkTVnpgFETkh7S24=
+
 dlv@^1.1.2:
   version "1.1.2"
   resolved "https://registry.npmjs.org/dlv/-/dlv-1.1.2.tgz#270f6737b30d25b6657a7e962c784403f85137e5"
   integrity sha512-xxD4VSH67GbRvSGUrckvha94RD7hjgOH7rqGxiytLpkaeMvixOHFZTGFK6EkIm3T761OVHT8ABHmGkq9gXgu6Q==
 
+dnd-core@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/dnd-core/-/dnd-core-2.6.0.tgz#12bad66d58742c6e5f7cf2943fb6859440f809c4"
+  integrity sha1-ErrWbVh0LG5ffPKUP7aFlED4CcQ=
+  dependencies:
+    asap "^2.0.6"
+    invariant "^2.0.0"
+    lodash "^4.2.0"
+    redux "^3.7.1"
+
 dns-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
@@ -6892,7 +6948,7 @@ dom-matches@>=1.0.1:
   resolved "https://registry.npmjs.org/dom-matches/-/dom-matches-2.0.0.tgz#d2728b416a87533980eb089b848d253cf23a758c"
   integrity sha1-0nKLQWqHUzmA6wibhI0lPPI6dYw=
 
-dom-scroll-into-view@1.x, dom-scroll-into-view@^1.2.0:
+dom-scroll-into-view@1.x, dom-scroll-into-view@^1.2.0, dom-scroll-into-view@^1.2.1:
   version "1.2.1"
   resolved "https://registry.npmjs.org/dom-scroll-into-view/-/dom-scroll-into-view-1.2.1.tgz#e8f36732dd089b0201a88d7815dc3f88e6d66c7e"
   integrity sha1-6PNnMt0ImwIBqI14Fdw/iObWbH4=
@@ -8680,6 +8736,13 @@ flat-cache@^1.2.1:
     rimraf "~2.6.2"
     write "^0.2.1"
 
+flat@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/flat/-/flat-4.1.0.tgz#090bec8b05e39cba309747f1d588f04dbaf98db2"
+  integrity sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==
+  dependencies:
+    is-buffer "~2.0.3"
+
 flush-write-stream@^1.0.0:
   version "1.0.3"
   resolved "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd"
@@ -8782,6 +8845,17 @@ formidable@^1.2.0:
   resolved "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz#70fb7ca0290ee6ff961090415f4b3df3d2082659"
   integrity sha512-Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg==
 
+formik@^0.11.11:
+  version "0.11.11"
+  resolved "https://registry.yarnpkg.com/formik/-/formik-0.11.11.tgz#4b02838133c0196b1ef443aa973766cd097ec4a5"
+  integrity sha1-SwKDgTPAGWse9EOqlzdmzQl+xKU=
+  dependencies:
+    lodash.clonedeep "^4.5.0"
+    lodash.isequal "4.5.0"
+    lodash.topath "4.5.2"
+    prop-types "^15.5.10"
+    warning "^3.0.0"
+
 formik@^1.3.1:
   version "1.4.2"
   resolved "https://registry.npmjs.org/formik/-/formik-1.4.2.tgz#684e6e9fb0c8309a17b0d8f3f57993ee83bf96f2"
@@ -9737,7 +9811,7 @@ hoist-non-react-statics@^1.0.5:
   resolved "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb"
   integrity sha1-qkSM8JhtVcxAdzsXF0t90GbLfPs=
 
-hoist-non-react-statics@^2.2.0, hoist-non-react-statics@^2.2.1, hoist-non-react-statics@^2.2.2, hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0, hoist-non-react-statics@^2.5.5:
+hoist-non-react-statics@^2.1.0, hoist-non-react-statics@^2.2.0, hoist-non-react-statics@^2.2.1, hoist-non-react-statics@^2.2.2, hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0, hoist-non-react-statics@^2.5.5:
   version "2.5.5"
   resolved "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
   integrity sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==
@@ -10319,7 +10393,7 @@ into-stream@^3.1.0:
     from2 "^2.1.1"
     p-is-promise "^1.1.0"
 
-invariant@^2.2.0, invariant@^2.2.1, invariant@^2.2.2, invariant@^2.2.4:
+invariant@^2.0.0, invariant@^2.1.0, invariant@^2.2.0, invariant@^2.2.1, invariant@^2.2.2, invariant@^2.2.4:
   version "2.2.4"
   resolved "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
   integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
@@ -10413,7 +10487,7 @@ is-buffer@^1.1.5, is-buffer@~1.1.1:
   resolved "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
-is-buffer@^2.0.2:
+is-buffer@^2.0.2, is-buffer@~2.0.3:
   version "2.0.3"
   resolved "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725"
   integrity sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==
@@ -11664,6 +11738,21 @@ kleur@^2.0.1:
   resolved "https://registry.npmjs.org/kleur/-/kleur-2.0.2.tgz#b704f4944d95e255d038f0cb05fb8a602c55a300"
   integrity sha512-77XF9iTllATmG9lSlIv0qdQ2BQ/h9t0bJllHlbvsQ0zUWfU7Yi0S8L5JXzPZgkefIiajLmBJJ4BsMJmqcf7oxQ==
 
+knex-migrate@^1.6.1:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/knex-migrate/-/knex-migrate-1.7.0.tgz#613857264fb428ee6a7bec128345771bd7d70aa7"
+  integrity sha512-rVSJAHjXM807LNPZ04o3a+zvxQcBt3BkIkOoyN+sXqnoAc01JXq9u3RgcVCtA812WbErjzYK2d9G3CGdZ42vlw==
+  dependencies:
+    bluebird "^3.4.6"
+    core-js "^2.5.3"
+    invariant "^2.2.1"
+    lodash "^4.16.4"
+    minimist "^1.2.0"
+    prettyjson "^1.1.3"
+    regenerator-runtime "^0.11.1"
+    req-from "^1.0.1"
+    umzug "^2.1.0"
+
 knex@^0.14.2, knex@^0.14.6:
   version "0.14.6"
   resolved "https://registry.npmjs.org/knex/-/knex-0.14.6.tgz#ad57c4ef8fa1b51ebc8c37c2c9b483f6fb34e41e"
@@ -12441,6 +12530,11 @@ lodash.tonumber@^4.0.3:
   resolved "https://registry.npmjs.org/lodash.tonumber/-/lodash.tonumber-4.0.3.tgz#0b96b31b35672793eb7f5a63ee791f1b9e9025d9"
   integrity sha1-C5azGzVnJ5Prf1pj7nkfG56QJdk=
 
+lodash.topath@4.5.2:
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/lodash.topath/-/lodash.topath-4.5.2.tgz#3616351f3bba61994a0931989660bd03254fd009"
+  integrity sha1-NhY1Hzu6YZlKCTGYlmC9AyVP0Ak=
+
 lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
@@ -12471,7 +12565,7 @@ lodash@4.17.10:
   resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
   integrity sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==
 
-lodash@4.x, "lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.10.1, lodash@^4.11.1, lodash@^4.13.1, lodash@^4.14.1, lodash@^4.16.5, lodash@^4.16.6, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.6.1, lodash@~4.17.10:
+lodash@4.x, "lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.10.1, lodash@^4.11.1, lodash@^4.13.1, lodash@^4.14.1, lodash@^4.16.4, lodash@^4.16.5, lodash@^4.16.6, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.6.1, lodash@~4.17.10:
   version "4.17.11"
   resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
@@ -13376,7 +13470,7 @@ moment-timezone@^0.5.23:
   dependencies:
     moment ">= 2.9.0"
 
-moment@2.x, "moment@>= 2.9.0", moment@^2.10.6, moment@^2.19.0, moment@^2.22.2, moment@^2.6.0:
+moment@2.x, "moment@>= 2.9.0", moment@^2.10.6, moment@^2.19.0, moment@^2.20.1, moment@^2.22.2, moment@^2.24.0, moment@^2.6.0:
   version "2.24.0"
   resolved "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
   integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
@@ -15027,6 +15121,11 @@ popper.js@^1.12.9:
   resolved "https://registry.npmjs.org/popper.js/-/popper.js-1.14.6.tgz#ab20dd4edf9288b8b3b6531c47c361107b60b4b0"
   integrity sha512-AGwHGQBKumlk/MDfrSOf0JHhJCImdDMcGNoqKmKkU+68GFazv3CQ6q9r7Ja1sKDZmYWTckY/uLyEznheTDycnA==
 
+popper.js@^1.14.1, popper.js@^1.14.4:
+  version "1.14.7"
+  resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.7.tgz#e31ec06cfac6a97a53280c3e55e4e0c860e7738e"
+  integrity sha512-4q1hNvoUre/8srWsH7hnoSJ5xVmIL4qgz+s4qf2TnJIMyZFUFMGH+9vE7mXynAlHSZ/NdTmmow86muD0myUkVQ==
+
 portfinder@^1.0.9:
   version "1.0.20"
   resolved "https://registry.npmjs.org/portfinder/-/portfinder-1.0.20.tgz#bea68632e54b2e13ab7b0c4775e9b41bf270e44a"
@@ -15224,7 +15323,7 @@ pretty-format@^4.2.1:
   resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-4.3.1.tgz#530be5c42b3c05b36414a7a2a4337aa80acd0e8d"
   integrity sha1-UwvlxCs8BbNkFKeipDN6qArNDo0=
 
-prettyjson@^1.2.1:
+prettyjson@^1.1.3, prettyjson@^1.2.1:
   version "1.2.1"
   resolved "https://registry.npmjs.org/prettyjson/-/prettyjson-1.2.1.tgz#fcffab41d19cab4dfae5e575e64246619b12d289"
   integrity sha1-/P+rQdGcq0365eV15kJGYZsS0ok=
@@ -15664,16 +15763,17 @@ rc-checkbox@~2.1.5:
     prop-types "15.x"
     rc-util "^4.0.4"
 
-rc-collapse@~1.10.2:
-  version "1.10.2"
-  resolved "https://registry.npmjs.org/rc-collapse/-/rc-collapse-1.10.2.tgz#2136c9aca8f5f8e2af66d6454adde56693fa0f00"
-  integrity sha512-AtEE4rMXEBT05gScduc+NQf/257wqE0xk4tNX4N1DBq0qTx19xGcwX3EXDD+ZF8KuZ/A25pgmviXad/hthNQSg==
+rc-collapse@~1.11.1:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/rc-collapse/-/rc-collapse-1.11.1.tgz#4aa0977adbf5229d7db58205646b13905add72ad"
+  integrity sha512-9HA8f7aWE0yabnzfE2v/7IyMb6dTmj052A9cyEMB0aT1sdLESpetMAzT3FkLcPT5fl7YNRkyVZ3zwkC5qMmzmA==
   dependencies:
     classnames "2.x"
     css-animation "1.x"
     prop-types "^15.5.6"
     rc-animate "2.x"
     react-is "^16.7.0"
+    shallowequal "^1.1.0"
 
 rc-dialog@~7.3.0:
   version "7.3.0"
@@ -15761,10 +15861,10 @@ rc-hammerjs@~0.6.0:
     hammerjs "^2.0.8"
     prop-types "^15.5.9"
 
-rc-input-number@~4.3.7:
-  version "4.3.8"
-  resolved "https://registry.npmjs.org/rc-input-number/-/rc-input-number-4.3.8.tgz#6cb35dcd75bc45e2281c49304ff8ce464dcd223d"
-  integrity sha512-xqaghe3gfa2z4ObSn9p/EqnEXNBENDCcTtGxUP+RgS1Q3sWomBNFrnR6Nv5NEwp2zel8gapXy+u5Fwp/047FOw==
+rc-input-number@~4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/rc-input-number/-/rc-input-number-4.4.0.tgz#0ddaaab925a7b0d6c6dbc9eb157ca23e9529b8c7"
+  integrity sha512-AsXLVaQZ7rCU71B8zzP3nviL8/CkFGDcp5kIlpMzBdGIHoLyRnXcxei3itH9PfFSgMBixEnb5hFVoTikFbNWSQ==
   dependencies:
     babel-runtime "6.x"
     classnames "^2.2.0"
@@ -15810,10 +15910,10 @@ rc-pagination@~1.17.7:
     prop-types "^15.5.7"
     react-lifecycles-compat "^3.0.4"
 
-rc-progress@~2.2.6:
-  version "2.2.7"
-  resolved "https://registry.npmjs.org/rc-progress/-/rc-progress-2.2.7.tgz#e650928c83f54da876f39b957a680afa01b490f8"
-  integrity sha512-uLHHpQO4/yFa/AX6Uw2dJFUIfAkfI6430h0a1XJX/A0Ja0wmuwjEa03biuKfKwwqz2skFiAaXco1GlgaJK9mKA==
+rc-progress@~2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/rc-progress/-/rc-progress-2.3.0.tgz#cfbd07ff9026c450100980de209a92650e24f313"
+  integrity sha512-hYBKFSsNgD7jsF8j+ZC1J8y5UIC2X/ktCYI/OQhQNSX6mGV1IXnUCjAd9gbLmzmpChPvKyymRNfckScUNiTpFQ==
   dependencies:
     babel-runtime "6.x"
     prop-types "^15.5.8"
@@ -15828,10 +15928,10 @@ rc-rate@~2.5.0:
     rc-util "^4.3.0"
     react-lifecycles-compat "^3.0.4"
 
-rc-select@^8.6.7:
-  version "8.7.1"
-  resolved "https://registry.npmjs.org/rc-select/-/rc-select-8.7.1.tgz#7115731276e84828fe7a6e9d79b375674b50aaaa"
-  integrity sha512-9D/1DpBZsId9UZ9bs3RZ5ssHOXybfjzcAYY099jsfEDIOrWDXEGLAdQmZlClxLYw359Ne4z+AFCHWa9FYl8pvQ==
+rc-select@~9.0.0:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-9.0.2.tgz#ce0d297db5f8a5c7e8bbc3fc24d9ed5ba648012c"
+  integrity sha512-lwFz/aINmbznQmKvq/jFipc922h+RhA+iKCicxAglTqC4qmXg2REKWzviT5Tk0kqVe4mHcfNX8PyvMEHSmkaLA==
   dependencies:
     babel-runtime "^6.23.0"
     classnames "2.x"
@@ -15846,10 +15946,10 @@ rc-select@^8.6.7:
     react-lifecycles-compat "^3.0.2"
     warning "^4.0.2"
 
-rc-slider@~8.6.3:
-  version "8.6.4"
-  resolved "https://registry.npmjs.org/rc-slider/-/rc-slider-8.6.4.tgz#b9d9000180f2b89bb71b58717753164b479fc75f"
-  integrity sha512-CV2i2Ww6ib0EjFuBKvgjw3PgT6QwvWKC93iEpqPtrztZrx5wO9Iw//AUri4KHRqptW13AuBvFdEHovqLi6XFTw==
+rc-slider@~8.6.5:
+  version "8.6.6"
+  resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-8.6.6.tgz#008c5a5ccf29d83787d846b6b1d0bbb8e2a121c8"
+  integrity sha512-byfnq1LbBFyZ0HURWo22sjeiKIxLyzSnIiNUsUf6SWu1ZhQe/Qt24JnE/ZJsqKoUirXxlX+d577ptfAybZHm+Q==
   dependencies:
     babel-runtime "6.x"
     classnames "^2.2.5"
@@ -15857,7 +15957,7 @@ rc-slider@~8.6.3:
     rc-tooltip "^3.7.0"
     rc-util "^4.0.4"
     shallowequal "^1.0.1"
-    warning "^3.0.0"
+    warning "^4.0.3"
 
 rc-steps@~3.3.0:
   version "3.3.1"
@@ -15879,14 +15979,14 @@ rc-swipeout@~2.0.0:
     rc-gesture "~0.0.22"
     react-native-swipeout "^2.2.2"
 
-rc-switch@~1.8.0:
-  version "1.8.0"
-  resolved "https://registry.npmjs.org/rc-switch/-/rc-switch-1.8.0.tgz#cff32fd04c406d8c0c0397e69bc36350a333e236"
-  integrity sha512-n4H+K2XJCqGwVQKwWOjbxl1kpdov0PVE9DGhzs/S20gk65s/nAOkpdO9tBD7IM/20KRNTBh0fEWkEedByrqh6w==
+rc-switch@~1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/rc-switch/-/rc-switch-1.9.0.tgz#ab2b878f2713c681358a453391976c9b95b290f7"
+  integrity sha512-Isas+egaK6qSk64jaEw4GgPStY4umYDbT7ZY93bZF1Af+b/JEsKsJdNOU2qG3WI0Z6tXo2DDq0kJCv8Yhu0zww==
   dependencies:
-    babel-runtime "^6.23.0"
     classnames "^2.2.1"
     prop-types "^15.5.6"
+    react-lifecycles-compat "^3.0.4"
 
 rc-table@~6.4.0:
   version "6.4.3"
@@ -15904,10 +16004,10 @@ rc-table@~6.4.0:
     shallowequal "^1.0.2"
     warning "^3.0.0"
 
-rc-tabs@~9.5.2:
-  version "9.5.8"
-  resolved "https://registry.npmjs.org/rc-tabs/-/rc-tabs-9.5.8.tgz#c097e48999f704b5710307ca95db8bdfdf53c6a7"
-  integrity sha512-fvkM5FLa0Kq9jz7YNE72T9WeMEbF264FIhqRnKyvmKtaam2lI81qxbofMEfBGhNxcv1whWlZStHj9b1Wi3Q24w==
+rc-tabs@~9.6.0:
+  version "9.6.1"
+  resolved "https://registry.yarnpkg.com/rc-tabs/-/rc-tabs-9.6.1.tgz#e9426927d3f197003e3ca8e5eba5cd33b8b099db"
+  integrity sha512-3/Ip9yCEERFFvCjU0ZoQqvn6unMo0XOQESygNLq1DyOAYRcukpq8Q28awpXWqh8l8NBcyw1sVfrs6SZN/zmAKg==
   dependencies:
     babel-runtime "6.x"
     classnames "2.x"
@@ -15919,10 +16019,10 @@ rc-tabs@~9.5.2:
     rc-util "^4.0.4"
     warning "^3.0.0"
 
-rc-time-picker@~3.5.0:
-  version "3.5.0"
-  resolved "https://registry.npmjs.org/rc-time-picker/-/rc-time-picker-3.5.0.tgz#bbe8d50a677eff1cd65cb645cb0fc29f83b91c35"
-  integrity sha512-swJyFZgR3P4UgFix5DP0fQQPKHP7WYEKlzbAWXd72TmFV80VCxmR+l0OWyCOjZgXfo9VJ/mEDzUnMSjP8/xyrg==
+rc-time-picker@~3.6.1:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/rc-time-picker/-/rc-time-picker-3.6.2.tgz#fd7133390353c6cd29ec09aa6c9711ab59228f1c"
+  integrity sha512-SyGEVXO0ImeG2mz+7fkVmDoVM0+OrX6uYGpKYijNr/lAah7c5p310ZR6fVrblXOl4TpqVnfWR67RMJ3twAyM7w==
   dependencies:
     classnames "2.x"
     moment "2.x"
@@ -15938,24 +16038,24 @@ rc-tooltip@^3.7.0, rc-tooltip@~3.7.3:
     prop-types "^15.5.8"
     rc-trigger "^2.2.2"
 
-rc-tree-select@~2.5.0:
-  version "2.5.2"
-  resolved "https://registry.npmjs.org/rc-tree-select/-/rc-tree-select-2.5.2.tgz#94dbbb55238293aebff3a4e784dbd21c5e47c208"
-  integrity sha512-JdwCSF/xqTZ1XrBqdbpogKa7dyzwijY72JKyo8EYYu6XQS0aKeqdm8xOGyjmQLFUJ32XNJCyBI0WFLdvaG90LQ==
+rc-tree-select@~2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/rc-tree-select/-/rc-tree-select-2.6.0.tgz#8804a958422965f4cd28b6b599f3142542061b44"
+  integrity sha512-9svioSjzqqGeIK9XTuM5yNe0WteSro2Hc8/Go+CTGth6P/mflVC7vC0jTJlFVpFz+Aw1LzXcJFsbAyRwUiSaag==
   dependencies:
-    babel-runtime "^6.23.0"
     classnames "^2.2.1"
+    dom-scroll-into-view "^1.2.1"
     prop-types "^15.5.8"
     raf "^3.4.0"
     rc-animate "^3.0.0-rc.4"
-    rc-tree "~1.14.3"
+    rc-tree "~1.15.0"
     rc-trigger "^3.0.0-rc.2"
     rc-util "^4.5.0"
     react-lifecycles-compat "^3.0.4"
     shallowequal "^1.0.2"
     warning "^4.0.1"
 
-rc-tree@~1.14.3, rc-tree@~1.14.6:
+rc-tree@~1.14.6:
   version "1.14.9"
   resolved "https://registry.npmjs.org/rc-tree/-/rc-tree-1.14.9.tgz#a26634b401123471e187273dd2fd440de6b85958"
   integrity sha512-+B4657b3H0mTB4Jcd9EorydI1fevfJRukaTk/KYcbNzYhKgZFIEuT3PZrhJZoH/e+sBOEx04zSNA0uf6G6S/BA==
@@ -15968,6 +16068,19 @@ rc-tree@~1.14.3, rc-tree@~1.14.6:
     react-lifecycles-compat "^3.0.4"
     warning "^3.0.0"
 
+rc-tree@~1.15.0:
+  version "1.15.2"
+  resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-1.15.2.tgz#a0d6f20fa2bdbe51d829d5ceea74a407b04bfea9"
+  integrity sha512-VPXLA/GdV6U9N8evpl4rmjRsBkw5BoweqWjcVBVwYGzBtonNIFpdc+bnb7TDmd6S3mKOM7mXPbiSr2GKYdj4hA==
+  dependencies:
+    babel-runtime "^6.23.0"
+    classnames "2.x"
+    prop-types "^15.5.8"
+    rc-animate "^3.0.0-rc.5"
+    rc-util "^4.5.1"
+    react-lifecycles-compat "^3.0.4"
+    warning "^3.0.0"
+
 rc-trigger@^2.2.0, rc-trigger@^2.2.2, rc-trigger@^2.3.0, rc-trigger@^2.5.1, rc-trigger@^2.5.4, rc-trigger@^2.6.2:
   version "2.6.2"
   resolved "https://registry.npmjs.org/rc-trigger/-/rc-trigger-2.6.2.tgz#a9c09ba5fad63af3b2ec46349c7db6cb46657001"
@@ -16069,6 +16182,16 @@ react-cookie@^2.2.0:
     prop-types "^15.0.0"
     universal-cookie "^2.2.0"
 
+react-datepicker@^1.5.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/react-datepicker/-/react-datepicker-1.8.0.tgz#ee46148aa10234d42e22ab969d1110f74263ba56"
+  integrity sha512-N4LdVTtqJCsZyKXBQ/AqSEcH6FyhgsY1gD07zECNu60nGt5s4ngRlhYdHoE34VNFO+ZY+pvljZRLwSC8LS9RxQ==
+  dependencies:
+    classnames "^2.2.5"
+    prop-types "^15.6.0"
+    react-onclickoutside "^6.7.1"
+    react-popper "^1.0.2"
+
 react-debounce-input@^3.1.0:
   version "3.2.0"
   resolved "https://registry.npmjs.org/react-debounce-input/-/react-debounce-input-3.2.0.tgz#6978c6061d898f549f40417fb0d2ebbecf50aaaa"
@@ -16095,6 +16218,25 @@ react-devtools-core@3.3.4:
     shell-quote "^1.6.1"
     ws "^3.3.1"
 
+react-dnd-html5-backend@^2.5.4:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/react-dnd-html5-backend/-/react-dnd-html5-backend-2.6.0.tgz#590cd1cca78441bb274edd571fef4c0b16ddcf8e"
+  integrity sha1-WQzRzKeEQbsnTt1XH+9MCxbdz44=
+  dependencies:
+    lodash "^4.2.0"
+
+react-dnd@^2.5.4:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/react-dnd/-/react-dnd-2.6.0.tgz#7fa25676cf827d58a891293e3c1ab59da002545a"
+  integrity sha1-f6JWds+CfViokSk+PBq1naACVFo=
+  dependencies:
+    disposables "^1.0.1"
+    dnd-core "^2.6.0"
+    hoist-non-react-statics "^2.1.0"
+    invariant "^2.1.0"
+    lodash "^4.2.0"
+    prop-types "^15.5.10"
+
 react-dom@^16.8.0:
   version "16.8.1"
   resolved "https://registry.npmjs.org/react-dom/-/react-dom-16.8.1.tgz#ec860f98853d09d39bafd3a6f1e12389d283dbb4"
@@ -16167,6 +16309,11 @@ react-is@^16.8.1:
   resolved "https://registry.npmjs.org/react-is/-/react-is-16.8.1.tgz#a80141e246eb894824fb4f2901c0c50ef31d4cdb"
   integrity sha512-ioMCzVDWvCvKD8eeT+iukyWrBGrA3DiFYkXfBsVYIRdaREZuBjENG+KjrikavCLasozqRWTwFUagU/O4vPpRMA==
 
+react-is@^16.8.4:
+  version "16.8.4"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.4.tgz#90f336a68c3a29a096a3d648ab80e87ec61482a2"
+  integrity sha512-PVadd+WaUDOAciICm/J1waJaSvgq+4rHE/K70j0PFqKhkTBsPv/82UGQJNXAngz1fOQLLxI6z1sEDmJDQhCTAA==
+
 react-lazy-load@^3.0.13:
   version "3.0.13"
   resolved "https://registry.npmjs.org/react-lazy-load/-/react-lazy-load-3.0.13.tgz#3b0a92d336d43d3f0d73cbe6f35b17050b08b824"
@@ -16566,6 +16713,19 @@ react-navigation@^2.13.0, react-navigation@^2.18.2:
     react-navigation-stack "0.7.0"
     react-navigation-tabs "0.8.4"
 
+react-onclickoutside@^6.7.1:
+  version "6.8.0"
+  resolved "https://registry.yarnpkg.com/react-onclickoutside/-/react-onclickoutside-6.8.0.tgz#9f91b5b3ed59f4d9e43fd71620dc200773a4d569"
+  integrity sha512-5Q4Rn7QLEoh7WIe66KFvYIpWJ49GeHoygP1/EtJyZjXKgrWH19Tf0Ty3lWyQzrEEDyLOwUvvmBFSE3dcDdvagA==
+
+react-popper@^0.10.4:
+  version "0.10.4"
+  resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-0.10.4.tgz#af2a415ea22291edd504678d7afda8a6ee3295aa"
+  integrity sha1-rypBXqIike3VBGeNev2opu4ylao=
+  dependencies:
+    popper.js "^1.14.1"
+    prop-types "^15.6.1"
+
 react-popper@^0.8.3:
   version "0.8.3"
   resolved "https://registry.npmjs.org/react-popper/-/react-popper-0.8.3.tgz#0f73333137c9fb0af6ec4074d2d0585a0a0461e1"
@@ -16574,6 +16734,18 @@ react-popper@^0.8.3:
     popper.js "^1.12.9"
     prop-types "^15.6.0"
 
+react-popper@^1.0.2:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-1.3.3.tgz#2c6cef7515a991256b4f0536cd4bdcb58a7b6af6"
+  integrity sha512-ynMZBPkXONPc5K4P5yFWgZx5JGAUIP3pGGLNs58cfAPgK67olx7fmLp+AdpZ0+GoQ+ieFDa/z4cdV6u7sioH6w==
+  dependencies:
+    "@babel/runtime" "^7.1.2"
+    create-react-context "<=0.2.2"
+    popper.js "^1.14.4"
+    prop-types "^15.6.1"
+    typed-styles "^0.0.7"
+    warning "^4.0.2"
+
 react-proxy@^1.1.7:
   version "1.1.8"
   resolved "https://registry.npmjs.org/react-proxy/-/react-proxy-1.1.8.tgz#9dbfd9d927528c3aa9f444e4558c37830ab8c26a"
@@ -16676,6 +16848,16 @@ react-test-renderer@16.5.0:
     react-is "^16.5.0"
     schedule "^0.3.0"
 
+react-test-renderer@^16.2.0:
+  version "16.8.4"
+  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.8.4.tgz#abee4c2c3bf967a8892a7b37f77370c5570d5329"
+  integrity sha512-jQ9Tf/ilIGSr55Cz23AZ/7H3ABEdo9oy2zF9nDHZyhLHDSLKuoILxw2ifpBfuuwQvj4LCoqdru9iZf7gwFH28A==
+  dependencies:
+    object-assign "^4.1.1"
+    prop-types "^15.6.2"
+    react-is "^16.8.4"
+    scheduler "^0.13.4"
+
 react-test-renderer@^16.5.0:
   version "16.7.0"
   resolved "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.7.0.tgz#1ca96c2b450ab47c36ba92cd8c03fcefc52ea01c"
@@ -16727,6 +16909,16 @@ react-transition-group@^2.2.1, react-transition-group@^2.3.0-beta.0:
     prop-types "^15.6.2"
     react-lifecycles-compat "^3.0.4"
 
+react-transition-group@^2.3.1:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.6.0.tgz#3c41cbdd9c044c5f8604d4e8d319e860919c9fae"
+  integrity sha512-VzZ+6k/adL3pJHo4PU/MHEPjW59/TGQtRsXC+wnxsx2mxjQKNHnDdJL/GpYuPJIsyHGjYbBQfIJ2JNOAdPc8GQ==
+  dependencies:
+    dom-helpers "^3.3.1"
+    loose-envify "^1.4.0"
+    prop-types "^15.6.2"
+    react-lifecycles-compat "^3.0.4"
+
 react-tween-state@^0.1.5:
   version "0.1.5"
   resolved "https://registry.npmjs.org/react-tween-state/-/react-tween-state-0.1.5.tgz#e98b066551efb93cb92dd1be14995c2e3deae339"
@@ -16768,6 +16960,20 @@ reactstrap@^5.0.0-beta:
     react-popper "^0.8.3"
     react-transition-group "^2.2.1"
 
+reactstrap@^6.0.1:
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/reactstrap/-/reactstrap-6.5.0.tgz#ba655e32646e2621829f61faa033e607ec6624e5"
+  integrity sha512-dWb3fB/wBAiQloteKlf+j9Nl2VLe6BMZgTEt6hpeTt0t9TwtkeU+2v2NBYONZaF4FZATfMiIKozhWpc2HmLW1g==
+  dependencies:
+    classnames "^2.2.3"
+    lodash.isfunction "^3.0.9"
+    lodash.isobject "^3.0.2"
+    lodash.tonumber "^4.0.3"
+    prop-types "^15.5.8"
+    react-lifecycles-compat "^3.0.4"
+    react-popper "^0.10.4"
+    react-transition-group "^2.3.1"
+
 read-chunk@^2.0.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/read-chunk/-/read-chunk-2.1.0.tgz#6a04c0928005ed9d42e1a6ac5600e19cbc7ff655"
@@ -16993,7 +17199,7 @@ redux-logger@^2.7.4:
     loose-envify "^1.4.0"
     symbol-observable "^1.2.0"
 
-redux@^3.6.0:
+redux@^3.6.0, redux@^3.7.1:
   version "3.7.2"
   resolved "https://registry.npmjs.org/redux/-/redux-3.7.2.tgz#06b73123215901d25d065be342eb026bc1c8537b"
   integrity sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A==
@@ -17020,7 +17226,7 @@ regenerator-runtime@^0.10.0, regenerator-runtime@^0.10.5:
   resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
   integrity sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=
 
-regenerator-runtime@^0.11.0:
+regenerator-runtime@^0.11.0, regenerator-runtime@^0.11.1:
   version "0.11.1"
   resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
   integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
@@ -17179,6 +17385,13 @@ replace-string@^1.1.0:
   resolved "https://registry.npmjs.org/replace-string/-/replace-string-1.1.0.tgz#87062117f823fe5800c306bacb2cfa359b935fea"
   integrity sha1-hwYhF/gj/lgAwwa6yyz6NZuTX+o=
 
+req-from@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/req-from/-/req-from-1.0.1.tgz#bf81da5147947d32d13b947dc12a58ad4587350e"
+  integrity sha1-v4HaUUeUfTLRO5R9wSpYrUWHNQ4=
+  dependencies:
+    resolve-from "^2.0.0"
+
 request-promise-core@1.1.1:
   version "1.1.1"
   resolved "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.1.tgz#3eee00b2c5aa83239cfb04c5700da36f81cd08b6"
@@ -17284,6 +17497,11 @@ resolve-from@^1.0.0:
   resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
   integrity sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=
 
+resolve-from@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57"
+  integrity sha1-lICrIOlP+h2egKgEx+oUdhGWa1c=
+
 resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
@@ -17649,6 +17867,14 @@ scheduler@^0.13.1:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
+scheduler@^0.13.4:
+  version "0.13.4"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.4.tgz#8fef05e7a3580c76c0364d2df5e550e4c9140298"
+  integrity sha512-cvSOlRPxOHs5dAhP9yiS/6IDmVAVxmk33f0CtTJRkmUWcb1Us+t7b1wqdzoC0REw2muC9V5f1L/w5R5uKGaepA==
+  dependencies:
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+
 schema-utils@^0.4.2, schema-utils@^0.4.4, schema-utils@^0.4.5:
   version "0.4.7"
   resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
@@ -19070,6 +19296,11 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
+toggle-selection@^1.0.3:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/toggle-selection/-/toggle-selection-1.0.6.tgz#6e45b1263f2017fa0acc7d89d78b15b8bf77da32"
+  integrity sha1-bkWxJj8gF/oKzH2J14sVuL932jI=
+
 toidentifier@1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
@@ -19270,6 +19501,11 @@ type-is@^1.6.16, type-is@~1.6.16:
     media-typer "0.3.0"
     mime-types "~2.1.18"
 
+typed-styles@^0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/typed-styles/-/typed-styles-0.0.7.tgz#93392a008794c4595119ff62dde6809dbc40a3d9"
+  integrity sha512-pzP0PWoZUhsECYjABgCGQlRGL1n7tOHsgwYv3oIiEpJwGhFTuty/YNeduxQYzXXa3Ge5BdT6sHYIQYpl4uJ+5Q==
+
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
@@ -19340,6 +19576,14 @@ umask@^1.1.0:
   resolved "https://registry.npmjs.org/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d"
   integrity sha1-8pzr8B31F5ErtY/5xOUP3o4zMg0=
 
+umzug@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/umzug/-/umzug-2.2.0.tgz#6160bdc1817e4a63a625946775063c638623e62e"
+  integrity sha512-xZLW76ax70pND9bx3wqwb8zqkFGzZIK8dIHD9WdNy/CrNfjWcwQgQkGCuUqcuwEBvUm+g07z+qWvY+pxDmMEEw==
+  dependencies:
+    babel-runtime "^6.23.0"
+    bluebird "^3.5.3"
+
 unc-path-regex@^0.1.0, unc-path-regex@^0.1.2:
   version "0.1.2"
   resolved "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
@@ -19835,6 +20079,13 @@ warning@^4.0.1, warning@^4.0.2, warning@~4.0.2:
   dependencies:
     loose-envify "^1.0.0"
 
+warning@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3"
+  integrity sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==
+  dependencies:
+    loose-envify "^1.0.0"
+
 watch@~0.18.0:
   version "0.18.0"
   resolved "https://registry.npmjs.org/watch/-/watch-0.18.0.tgz#28095476c6df7c90c963138990c0a5423eb4b986"

From 5e5003f6668bc7026b05b4e668470bfe3c8106ac Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Mon, 11 Mar 2019 14:09:11 +0100
Subject: [PATCH 315/327] merge latest

---
 modules/database/server-ts/sql/crud.js                 | 4 ++--
 modules/user/client-react/components/LoginForm.web.jsx | 2 +-
 packages/client/package.json                           | 2 +-
 tools/templates/crud/client-react/index.native.tsx     | 2 +-
 tools/templates/module/client-react/index.native.tsx   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/database/server-ts/sql/crud.js b/modules/database/server-ts/sql/crud.js
index 5573218af6..9b6cf89c05 100644
--- a/modules/database/server-ts/sql/crud.js
+++ b/modules/database/server-ts/sql/crud.js
@@ -1004,8 +1004,8 @@ export class Crud {
     }
   }
 
-  async getByIds(ids, by, Obj, info) {
-    info = parseFields(info);
+  async getByIds(ids, by, Obj, info, infoCustom = null) {
+    info = infoCustom === null ? parseFields(info) : infoCustom;
     const remoteId = by !== 'id' ? `${by}Id` : by;
     info[remoteId] = true;
     const baseQuery = knex(`${Obj.getFullTableName()} as ${Obj.getTableName()}`);
diff --git a/modules/user/client-react/components/LoginForm.web.jsx b/modules/user/client-react/components/LoginForm.web.jsx
index 7ed2046d14..822f007ee6 100644
--- a/modules/user/client-react/components/LoginForm.web.jsx
+++ b/modules/user/client-react/components/LoginForm.web.jsx
@@ -16,7 +16,7 @@ import settings from '../../../../settings';
 
 const loginFormSchema = {
   usernameOrEmail: [required, minLength(3)],
-  password: [required, minLength(8)]
+  password: [required, minLength(settings.user.auth.password.minLength)]
 };
 const { facebook, linkedin, google, github } = settings.user.auth;
 
diff --git a/packages/client/package.json b/packages/client/package.json
index 42c3b9ffb6..841eb22dcd 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -53,7 +53,7 @@
     "@gqlapp/payments-client-react": "^0.1.0",
     "@gqlapp/reports-client-react": "^0.1.0",
     "@gqlapp/validation-common-react": "^0.1.0",
-    "antd": "^3.10.0",
+    "antd": "^3.10.4",
     "apollo-cache-inmemory": "1.4.2",
     "apollo-cache-router": "^1.1.6",
     "apollo-client": "^2.4.7",
diff --git a/tools/templates/crud/client-react/index.native.tsx b/tools/templates/crud/client-react/index.native.tsx
index 13c4fa03b4..e3a08d4277 100644
--- a/tools/templates/crud/client-react/index.native.tsx
+++ b/tools/templates/crud/client-react/index.native.tsx
@@ -4,7 +4,7 @@ import { createStackNavigator } from 'react-navigation';
 import { translate } from '@gqlapp/i18n-client-react';
 import ClientModule from '@gqlapp/module-client-react-native';
 
-import { HeaderTitle, IconButton } from '../../../packages/client/src/modules/common/components/native';
+import { HeaderTitle, IconButton } from '@gqlapp/look-client-react-native';
 import $Module$ from './containers/$Module$';
 import resources from './locales';
 
diff --git a/tools/templates/module/client-react/index.native.tsx b/tools/templates/module/client-react/index.native.tsx
index 13c4fa03b4..e3a08d4277 100644
--- a/tools/templates/module/client-react/index.native.tsx
+++ b/tools/templates/module/client-react/index.native.tsx
@@ -4,7 +4,7 @@ import { createStackNavigator } from 'react-navigation';
 import { translate } from '@gqlapp/i18n-client-react';
 import ClientModule from '@gqlapp/module-client-react-native';
 
-import { HeaderTitle, IconButton } from '../../../packages/client/src/modules/common/components/native';
+import { HeaderTitle, IconButton } from '@gqlapp/look-client-react-native';
 import $Module$ from './containers/$Module$';
 import resources from './locales';
 

From 186ef307428c57b524be0452ca10e2e95a21738b Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Mon, 11 Mar 2019 14:10:11 +0100
Subject: [PATCH 316/327] remove unused function

---
 modules/core/common/utils.ts | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/modules/core/common/utils.ts b/modules/core/common/utils.ts
index 943486ad9a..c44628f0a5 100644
--- a/modules/core/common/utils.ts
+++ b/modules/core/common/utils.ts
@@ -1,5 +1,4 @@
 import _ from 'lodash';
-import { i18n as i18next, Resource } from 'i18next';
 
 import log from './log';
 
@@ -47,24 +46,6 @@ export const traceMethodCalls = (obj: any) => {
   });
 };
 
-/**
- * Adds resources into the i18next bundle
- *
- * @param i18n - i18next
- * @param resources - The resources to add
- */
-export const addResourcesI18n = (i18n: i18next, resources: Array<{ ns: string; resources: Resource }>) => {
-  for (const localization of resources) {
-    for (const lang of Object.keys(localization.resources)) {
-      i18n.addResourceBundle(
-        (i18n.options.whitelist as string[]).filter((lng: string) => lng.indexOf(lang) > -1)[0] || lang,
-        localization.ns,
-        localization.resources[lang]
-      );
-    }
-  }
-};
-
 /**
  * Gets the current platform such as web, server, or mobile
  */

From 8a69ab848454d9725201bfdb87e2a165c5bb1270 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 16 Jul 2019 11:33:18 +0200
Subject: [PATCH 317/327] remove uneeded dep

---
 packages/client/package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index 8531cdb169..b1a6bee423 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -104,7 +104,6 @@
     "subscriptions-transport-ws": "^0.9.4"
   },
   "devDependencies": {
-    "@alienfast/i18next-loader": "^1.0.16",
     "@storybook/addon-actions": "^5.1.8",
     "@storybook/addon-links": "^5.1.8",
     "@storybook/addons": "^5.1.8",

From 387e3adb23a4cd32f71330d10577bb392f647a73 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 16 Jul 2019 13:01:13 +0200
Subject: [PATCH 318/327] update to latest

---
 .../core/client-react/crud/EditView.web.jsx   |  4 +--
 .../core/client-react/crud/ListView.web.jsx   |  2 +-
 modules/core/client-react/util.web.jsx        | 12 +++----
 modules/core/common/crud.js                   |  8 ++---
 modules/database/server-ts/sql/crud.js        | 31 +++++++++++++++----
 .../ui-antd/components/Progress.jsx           | 13 ++++++++
 .../ui-antd/components/RenderField.jsx        |  5 +--
 .../ui-antd/components/Tooltip.jsx            | 13 ++++++++
 .../client-react/ui-antd/components/index.js  |  2 ++
 .../user/client-react/containers/UserEdit.jsx |  8 +----
 .../crud/client-react/resolvers/index.js      |  2 +-
 11 files changed, 71 insertions(+), 29 deletions(-)
 create mode 100644 modules/look/client-react/ui-antd/components/Progress.jsx
 create mode 100644 modules/look/client-react/ui-antd/components/Tooltip.jsx

diff --git a/modules/core/client-react/crud/EditView.web.jsx b/modules/core/client-react/crud/EditView.web.jsx
index 6277b5af9d..2fa9c09270 100644
--- a/modules/core/client-react/crud/EditView.web.jsx
+++ b/modules/core/client-react/crud/EditView.web.jsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import Helmet from 'react-helmet';
 import { Link } from 'react-router-dom';
 
-import { PageLayout } from '@gqlapp/look-client-react';
+import { PageLayout, Button } from '@gqlapp/look-client-react';
 import FormView from './FormView';
 import settings from '../../../../settings';
 
@@ -42,7 +42,7 @@ class EditView extends React.PureComponent {
         <PageLayout>
           {this.renderMetaData(title)}
           <Link id="back-button" to={`/${link}`}>
-            Back
+            <Button>Back</Button>
           </Link>
           <h2>
             {data ? 'Edit' : 'Create'} {title}
diff --git a/modules/core/client-react/crud/ListView.web.jsx b/modules/core/client-react/crud/ListView.web.jsx
index 43a3ce97ce..036d3cefd6 100644
--- a/modules/core/client-react/crud/ListView.web.jsx
+++ b/modules/core/client-react/crud/ListView.web.jsx
@@ -353,7 +353,7 @@ class ListView extends React.Component {
           </Col>
           {showBatchFields && [
             <Col span={2} key="batchDelete" style={{ paddingTop: '3px' }}>
-              <Popconfirm title="Sure to delete?" onConfirm={this.handleDeleteMany} target={'batch-delete-button'}>
+              <Popconfirm title="Sure to delete?" onConfirm={this.handleDeleteMany}>
                 <Button color="primary" disabled={!hasSelected} loading={loading && !data}>
                   Delete
                 </Button>
diff --git a/modules/core/client-react/util.web.jsx b/modules/core/client-react/util.web.jsx
index be53e8d7a7..d11db855a2 100644
--- a/modules/core/client-react/util.web.jsx
+++ b/modules/core/client-react/util.web.jsx
@@ -318,11 +318,11 @@ const createFormField = (schema, key, type, values, formItemLayout, formType, ha
     if (formType === 'filter') {
       dateFields.push(
         <Field
-          name={`${prefix}${key}_lte`}
-          key={`${key}_lte`}
+          name={`${prefix}${key}_gte`}
+          key={`${key}_gte`}
           component={component}
           schema={type}
-          value={values[`${key}_lte`] ? values[`${key}_lte`] : ''}
+          value={values[`${key}_gte`] ? values[`${key}_gte`] : ''}
           type={inputType}
           style={style}
           label={`From ${startCase(key)}`}
@@ -334,11 +334,11 @@ const createFormField = (schema, key, type, values, formItemLayout, formType, ha
       );
       dateFields.push(
         <Field
-          name={`${prefix}${key}_gte`}
-          key={`${key}_gte`}
+          name={`${prefix}${key}_lte`}
+          key={`${key}_lte`}
           component={component}
           schema={type}
-          value={values[`${key}_gte`] ? values[`${key}_gte`] : ''}
+          value={values[`${key}_lte`] ? values[`${key}_lte`] : ''}
           type={inputType}
           style={style}
           label={`To ${startCase(key)}`}
diff --git a/modules/core/common/crud.js b/modules/core/common/crud.js
index 91473252ed..aa1bd0272e 100644
--- a/modules/core/common/crud.js
+++ b/modules/core/common/crud.js
@@ -76,9 +76,9 @@ export const pickInputFields = ({ schema, values, data = null, formType = 'form'
             }
           } else if (hasTypeOf(Boolean)) {
             if (values[key] === 'true') {
-              inputValues[key] = true;
+              inputValues[key] = 'true';
             } else if (values[key] === 'false') {
-              inputValues[key] = false;
+              inputValues[key] = 'false';
             } else {
               inputValues[key] = '';
             }
@@ -233,9 +233,9 @@ export const mergeFilter = (filter, defaults, schema) => {
     const hasTypeOf = targetType => value.type === targetType || value.type.prototype instanceof targetType;
     if (hasTypeOf(Boolean)) {
       if (mergeFilter[key] === 'true') {
-        mergeFilter[key] = true;
+        mergeFilter[key] = 'true';
       } else if (filter[key] === 'false') {
-        mergeFilter[key] = false;
+        mergeFilter[key] = 'false';
       }
     }
   }
diff --git a/modules/database/server-ts/sql/crud.js b/modules/database/server-ts/sql/crud.js
index 9b6cf89c05..bef26b0f51 100644
--- a/modules/database/server-ts/sql/crud.js
+++ b/modules/database/server-ts/sql/crud.js
@@ -479,7 +479,7 @@ export class Crud {
           const foundValue = value.type.keys().find(key => {
             return value.type.values[key].sortBy;
           });
-          column = `${tableName}.${foundValue ? foundValue.sortBy : 'name'}`;
+          column = `${tableName}.${foundValue ? foundValue : 'name'}`;
         } else {
           column = `${this.getTableName()}.${decamelize(column)}`;
         }
@@ -502,11 +502,11 @@ export class Crud {
           if (hasTypeOf(Date)) {
             if (filter[`${filterKey}_lte`]) {
               const filterValue_lte = moment(filter[`${filterKey}_lte`]).format(dateFormat);
-              _this.andWhere(`${tableName}.${decamelize(filterKey)}`, '>=', `${filterValue_lte}`);
+              _this.andWhere(`${tableName}.${decamelize(filterKey)}`, '<=', `${filterValue_lte}`);
             }
             if (filter[`${filterKey}_gte`]) {
               const filterValue_gte = moment(filter[`${filterKey}_gte`]).format(dateFormat);
-              _this.andWhere(`${tableName}.${decamelize(filterKey)}`, '<=', `${filterValue_gte}`);
+              _this.andWhere(`${tableName}.${decamelize(filterKey)}`, '>=', `${filterValue_gte}`);
             }
           } else if (hasTypeOf(Boolean)) {
             if (_.has(filter, filterKey)) {
@@ -543,7 +543,7 @@ export class Crud {
       for (const key of schema.keys()) {
         const value = schema.values[key];
         const isArray = value.type.constructor === Array;
-        if (isArray && filter[key]) {
+        if (isArray && !_.isEmpty(filter[key])) {
           const type = value.type[0];
           const fieldName = decamelize(key);
           const prefix = type.__.tablePrefix ? type.__.tablePrefix : '';
@@ -625,7 +625,12 @@ export class Crud {
     const tableName = this.getTableName();
     baseQuery.where(function() {
       Object.keys(where).map(key => {
-        this.andWhere(`${tableName}.${decamelize(key)}`, '=', where[key]);
+        if (key.endsWith('_in')) {
+          const keyIn = key.substring(0, key.length - 3);
+          this.whereIn(`${tableName}.${decamelize(keyIn)}`, where[key]);
+        } else {
+          this.andWhere(`${tableName}.${decamelize(key)}`, '=', where[key]);
+        }
       });
     });
 
@@ -693,6 +698,13 @@ export class Crud {
 
       return await this.get({ where: { id } }, info);
     } catch (e) {
+      await ctx.Log.create({
+        type: 'error',
+        module: this.getTableName(),
+        action: 'create',
+        message: JSON.stringify(e),
+        userId: ctx.user.id
+      });
       return { errors: e };
     }
   }
@@ -744,13 +756,20 @@ export class Crud {
 
       return await this.get(args, info);
     } catch (e) {
+      await ctx.Log.create({
+        type: 'error',
+        module: this.getTableName(),
+        action: 'update',
+        message: JSON.stringify(e),
+        userId: ctx.user.id
+      });
       return { errors: e };
     }
   }
 
   _delete({ where }) {
     return knex(this.getFullTableName())
-      .where(where)
+      .where(decamelizeKeys(where))
       .del();
   }
 
diff --git a/modules/look/client-react/ui-antd/components/Progress.jsx b/modules/look/client-react/ui-antd/components/Progress.jsx
new file mode 100644
index 0000000000..5d8861b219
--- /dev/null
+++ b/modules/look/client-react/ui-antd/components/Progress.jsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Progress as ADProgress } from 'antd';
+
+const Progress = ({ children, ...props }) => {
+  return <ADProgress {...props}>{children}</ADProgress>;
+};
+
+Progress.propTypes = {
+  children: PropTypes.node
+};
+
+export default Progress;
diff --git a/modules/look/client-react/ui-antd/components/RenderField.jsx b/modules/look/client-react/ui-antd/components/RenderField.jsx
index 8e0845f1f8..aa72a7e69f 100644
--- a/modules/look/client-react/ui-antd/components/RenderField.jsx
+++ b/modules/look/client-react/ui-antd/components/RenderField.jsx
@@ -4,7 +4,7 @@ import { Form, Input } from 'antd';
 
 const FormItem = Form.Item;
 
-const RenderField = ({ input, label, type, formItemLayout, meta: { touched, error }, placeholder }) => {
+const RenderField = ({ input, label, type, inputMode, formItemLayout, meta: { touched, error }, placeholder }) => {
   let validateStatus = '';
   if (touched && error) {
     validateStatus = 'error';
@@ -13,7 +13,7 @@ const RenderField = ({ input, label, type, formItemLayout, meta: { touched, erro
   return (
     <FormItem label={label} {...formItemLayout} validateStatus={validateStatus} help={touched && error}>
       <div>
-        <Input {...input} placeholder={label || placeholder} type={type} />
+        <Input {...input} placeholder={label || placeholder} type={type} inputMode={inputMode} />
       </div>
     </FormItem>
   );
@@ -24,6 +24,7 @@ RenderField.propTypes = {
   label: PropTypes.string,
   placeholder: PropTypes.string,
   type: PropTypes.string,
+  inputMode: PropTypes.string,
   meta: PropTypes.object,
   formItemLayout: PropTypes.object
 };
diff --git a/modules/look/client-react/ui-antd/components/Tooltip.jsx b/modules/look/client-react/ui-antd/components/Tooltip.jsx
new file mode 100644
index 0000000000..29e5558a9c
--- /dev/null
+++ b/modules/look/client-react/ui-antd/components/Tooltip.jsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Tooltip as ADTooltip } from 'antd';
+
+const Tooltip = ({ children, ...props }) => {
+  return <ADTooltip {...props}>{children}</ADTooltip>;
+};
+
+Tooltip.propTypes = {
+  children: PropTypes.node
+};
+
+export default Tooltip;
diff --git a/modules/look/client-react/ui-antd/components/index.js b/modules/look/client-react/ui-antd/components/index.js
index 44c7708866..e751094a12 100644
--- a/modules/look/client-react/ui-antd/components/index.js
+++ b/modules/look/client-react/ui-antd/components/index.js
@@ -41,4 +41,6 @@ export { default as DatePicker } from './DatePicker';
 export { default as RenderCellSelectQuery } from './RenderCellSelectQuery';
 export { default as Collapse } from './Collapse';
 export { default as Panel } from './Panel';
+export { default as Progress } from './Progress';
+export { default as Tooltip } from './Tooltip';
 export { onAppCreate } from './PageLayout';
diff --git a/modules/user/client-react/containers/UserEdit.jsx b/modules/user/client-react/containers/UserEdit.jsx
index 52af14e319..3c7466da6b 100644
--- a/modules/user/client-react/containers/UserEdit.jsx
+++ b/modules/user/client-react/containers/UserEdit.jsx
@@ -61,13 +61,7 @@ export default compose(
   translate('user'),
   graphql(USER_QUERY, {
     options: props => {
-      let id = 0;
-      if (props.match) {
-        id = props.match.params.id;
-      } else if (props.navigation) {
-        id = props.navigation.state.params.id;
-      }
-
+      const id = Number(props.match ? props.match.params.id : props.navigation.state.params.id);
       return {
         variables: { id }
       };
diff --git a/tools/templates/crud/client-react/resolvers/index.js b/tools/templates/crud/client-react/resolvers/index.js
index 7e85c3a701..56f7d393f1 100644
--- a/tools/templates/crud/client-react/resolvers/index.js
+++ b/tools/templates/crud/client-react/resolvers/index.js
@@ -69,7 +69,7 @@ const resolvers = {
     update$Module$Filter: (_, { filter }, { cache }) => {
       const { $module$State } = cache.readQuery({ query: $MODULE$_STATE_QUERY });
       const new$Module$State = update($module$State, {
-        filter: { $merge: mergeFilter(filter, defaults, $Module$Schema) }
+        filter: { $merge: mergeFilter(filter, defaultFilters, $Module$Schema) }
       });
 
       cache.writeData({

From ebcafd7deefabcc00f02011dee33ad297a46b68e Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 19 Jul 2019 08:36:42 +0200
Subject: [PATCH 319/327] yarn.lock

---
 yarn.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yarn.lock b/yarn.lock
index 4f4bee6460..f19e72d106 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,7 +2,7 @@
 # yarn lockfile v1
 
 
-"@alienfast/i18next-loader@^1.0.15", "@alienfast/i18next-loader@^1.0.16":
+"@alienfast/i18next-loader@^1.0.15":
   version "1.0.18"
   resolved "https://registry.yarnpkg.com/@alienfast/i18next-loader/-/i18next-loader-1.0.18.tgz#517d91c6eb356559c1615c9c9d7008a4d75d7f9b"
   integrity sha512-qQ+Q/F3RghtTXOef994XBG78OwWjETzIUnnIzYaj1H268jBmCMvQJcDp2rvaOxTElXKEiofsrXaq/EX74oCPEA==

From d4b647965ce9ae3738490e15bd2fa24fa2bd52c6 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 19 Jul 2019 08:53:06 +0200
Subject: [PATCH 320/327] fix styles less

---
 .../look/client-react/ui-antd/components/PageLayout.jsx   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/look/client-react/ui-antd/components/PageLayout.jsx b/modules/look/client-react/ui-antd/components/PageLayout.jsx
index bb4b1836cd..f1860dd9c6 100644
--- a/modules/look/client-react/ui-antd/components/PageLayout.jsx
+++ b/modules/look/client-react/ui-antd/components/PageLayout.jsx
@@ -1,10 +1,13 @@
 import React from 'react';
+import Helmet from 'react-helmet';
 import PropTypes from 'prop-types';
 import { withRouter, NavLink } from 'react-router-dom';
 import { Layout, Menu } from 'antd';
+
 import settings from '@gqlapp/config';
 
 import { Row, Col, MenuItem, Icon } from './index';
+import styles from '../styles/styles.less';
 
 const ref = { modules: null };
 
@@ -92,6 +95,11 @@ class PageLayout extends React.Component {
               </Row>
             </Header>
           )}
+          {__SERVER__ && __DEV__ && (
+            <Helmet>
+              <style type="text/css">{styles._getCss()}</style>
+            </Helmet>
+          )}
           <Content id="content" style={{ background: '#fff', padding: 24 }}>
             {children}
           </Content>

From d8a86804cdfd309551d3846074521ef90006ced3 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 19 Jul 2019 09:09:45 +0200
Subject: [PATCH 321/327] latest changes

---
 modules/database/server-ts/sql/crud.js | 31 +++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/modules/database/server-ts/sql/crud.js b/modules/database/server-ts/sql/crud.js
index 9b6cf89c05..bef26b0f51 100644
--- a/modules/database/server-ts/sql/crud.js
+++ b/modules/database/server-ts/sql/crud.js
@@ -479,7 +479,7 @@ export class Crud {
           const foundValue = value.type.keys().find(key => {
             return value.type.values[key].sortBy;
           });
-          column = `${tableName}.${foundValue ? foundValue.sortBy : 'name'}`;
+          column = `${tableName}.${foundValue ? foundValue : 'name'}`;
         } else {
           column = `${this.getTableName()}.${decamelize(column)}`;
         }
@@ -502,11 +502,11 @@ export class Crud {
           if (hasTypeOf(Date)) {
             if (filter[`${filterKey}_lte`]) {
               const filterValue_lte = moment(filter[`${filterKey}_lte`]).format(dateFormat);
-              _this.andWhere(`${tableName}.${decamelize(filterKey)}`, '>=', `${filterValue_lte}`);
+              _this.andWhere(`${tableName}.${decamelize(filterKey)}`, '<=', `${filterValue_lte}`);
             }
             if (filter[`${filterKey}_gte`]) {
               const filterValue_gte = moment(filter[`${filterKey}_gte`]).format(dateFormat);
-              _this.andWhere(`${tableName}.${decamelize(filterKey)}`, '<=', `${filterValue_gte}`);
+              _this.andWhere(`${tableName}.${decamelize(filterKey)}`, '>=', `${filterValue_gte}`);
             }
           } else if (hasTypeOf(Boolean)) {
             if (_.has(filter, filterKey)) {
@@ -543,7 +543,7 @@ export class Crud {
       for (const key of schema.keys()) {
         const value = schema.values[key];
         const isArray = value.type.constructor === Array;
-        if (isArray && filter[key]) {
+        if (isArray && !_.isEmpty(filter[key])) {
           const type = value.type[0];
           const fieldName = decamelize(key);
           const prefix = type.__.tablePrefix ? type.__.tablePrefix : '';
@@ -625,7 +625,12 @@ export class Crud {
     const tableName = this.getTableName();
     baseQuery.where(function() {
       Object.keys(where).map(key => {
-        this.andWhere(`${tableName}.${decamelize(key)}`, '=', where[key]);
+        if (key.endsWith('_in')) {
+          const keyIn = key.substring(0, key.length - 3);
+          this.whereIn(`${tableName}.${decamelize(keyIn)}`, where[key]);
+        } else {
+          this.andWhere(`${tableName}.${decamelize(key)}`, '=', where[key]);
+        }
       });
     });
 
@@ -693,6 +698,13 @@ export class Crud {
 
       return await this.get({ where: { id } }, info);
     } catch (e) {
+      await ctx.Log.create({
+        type: 'error',
+        module: this.getTableName(),
+        action: 'create',
+        message: JSON.stringify(e),
+        userId: ctx.user.id
+      });
       return { errors: e };
     }
   }
@@ -744,13 +756,20 @@ export class Crud {
 
       return await this.get(args, info);
     } catch (e) {
+      await ctx.Log.create({
+        type: 'error',
+        module: this.getTableName(),
+        action: 'update',
+        message: JSON.stringify(e),
+        userId: ctx.user.id
+      });
       return { errors: e };
     }
   }
 
   _delete({ where }) {
     return knex(this.getFullTableName())
-      .where(where)
+      .where(decamelizeKeys(where))
       .del();
   }
 

From f4a6cb68973c534319d02931217d5efbff5cd889 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Fri, 23 Aug 2019 10:04:22 +0200
Subject: [PATCH 322/327] commit yarn lock

---
 yarn.lock | 212 +++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 201 insertions(+), 11 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 4a1d53c2ca..b65a96b622 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1244,6 +1244,18 @@
   dependencies:
     debug "^3.1.0"
 
+"@domain-schema/formik@^0.0.34":
+  version "0.0.34"
+  resolved "https://registry.yarnpkg.com/@domain-schema/formik/-/formik-0.0.34.tgz#a5023113c5540def45aba2bfb1d5fb0b1c2ce461"
+  integrity sha512-rw4q+MtAd//brE1VmZssoaGOeInCEmkiuw1e9QRfnc9CEU8TV1ptNG9vyXmfFzvV/iZKkMQe7u4/nK6hTcRcWA==
+  dependencies:
+    debug "^3.1.0"
+    formik "^0.11.11"
+    humps "^2.0.1"
+  optionalDependencies:
+    react-test-renderer "^16.2.0"
+    reactstrap "^6.0.1"
+
 "@domain-schema/graphql@^0.0.33":
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/@domain-schema/graphql/-/graphql-0.0.33.tgz#201d8cc5d21a9eba69f2eb8cb1fe44f012381cec"
@@ -1259,6 +1271,14 @@
     debug "^3.1.0"
     humps "^2.0.1"
 
+"@domain-schema/validation@^0.0.36":
+  version "0.0.36"
+  resolved "https://registry.yarnpkg.com/@domain-schema/validation/-/validation-0.0.36.tgz#b4740e577e4c745710fb4388e857ee62f70e33ea"
+  integrity sha512-dAfqH/yFbmecfEccRt2FK/jx3XvfpcfwNPUBQaVAFXD/urSTLAPG5DmML68qpYs+9ms9p412U/IN3CyiLmUGcw==
+  dependencies:
+    debug "^3.1.0"
+    humps "^2.0.1"
+
 "@emotion/cache@^10.0.14":
   version "10.0.14"
   resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-10.0.14.tgz#56093cff025c04b0330bdd92afe8335ed326dd18"
@@ -5304,7 +5324,7 @@ art@^0.10.0, art@^0.10.1:
   resolved "https://registry.yarnpkg.com/art/-/art-0.10.3.tgz#b01d84a968ccce6208df55a733838c96caeeaea2"
   integrity sha512-HXwbdofRTiJT6qZX/FnchtldzJjS3vkLJxQilc3Xj+ma2MXjY4UAyQ0ls1XZYVnDvVIBiFZbC6QsvtW86TD6tQ==
 
-asap@^2.0.0, asap@~2.0.3:
+asap@^2.0.0, asap@^2.0.6, asap@~2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
   integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
@@ -6248,7 +6268,7 @@ bluebird@^2.10.2:
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
   integrity sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=
 
-bluebird@^3.1.1, bluebird@^3.3.5, bluebird@^3.4.7, bluebird@^3.5.1, bluebird@^3.5.2, bluebird@^3.5.3, bluebird@^3.5.5:
+bluebird@^3.1.1, bluebird@^3.3.5, bluebird@^3.4.6, bluebird@^3.4.7, bluebird@^3.5.1, bluebird@^3.5.2, bluebird@^3.5.3, bluebird@^3.5.5:
   version "3.5.5"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f"
   integrity sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==
@@ -8134,6 +8154,14 @@ create-react-context@^0.2.1, create-react-context@^0.2.2:
     fbjs "^0.8.0"
     gud "^1.0.0"
 
+create-react-context@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/create-react-context/-/create-react-context-0.3.0.tgz#546dede9dc422def0d3fc2fe03afe0bc0f4f7d8c"
+  integrity sha512-dNldIoSuNSvlTJ7slIKC/ZFGKexBMBrrcc+TTe1NdmROnaASuLPvqpwj9v4XS4uXZ8+YPu0sNmShX2rXI5LNsw==
+  dependencies:
+    gud "^1.0.0"
+    warning "^4.0.3"
+
 credit-card-type@^5.0.0:
   version "5.0.4"
   resolved "https://registry.yarnpkg.com/credit-card-type/-/credit-card-type-5.0.4.tgz#2dd9df280411ce2bb91ed95ac31e814605717aed"
@@ -8915,6 +8943,21 @@ dir-glob@^2.0.0:
   dependencies:
     path-type "^3.0.0"
 
+disposables@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/disposables/-/disposables-1.0.2.tgz#36c6a674475f55a2d6913567a601444e487b4b6e"
+  integrity sha1-NsamdEdfVaLWkTVnpgFETkh7S24=
+
+dnd-core@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/dnd-core/-/dnd-core-2.6.0.tgz#12bad66d58742c6e5f7cf2943fb6859440f809c4"
+  integrity sha1-ErrWbVh0LG5ffPKUP7aFlED4CcQ=
+  dependencies:
+    asap "^2.0.6"
+    invariant "^2.0.0"
+    lodash "^4.2.0"
+    redux "^3.7.1"
+
 dns-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
@@ -10684,6 +10727,13 @@ flat-cache@^2.0.1:
     rimraf "2.6.3"
     write "1.0.3"
 
+flat@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/flat/-/flat-4.1.0.tgz#090bec8b05e39cba309747f1d588f04dbaf98db2"
+  integrity sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==
+  dependencies:
+    is-buffer "~2.0.3"
+
 flatted@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08"
@@ -10838,6 +10888,17 @@ formidable@^1.2.0:
   resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.2.1.tgz#70fb7ca0290ee6ff961090415f4b3df3d2082659"
   integrity sha512-Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg==
 
+formik@^0.11.11:
+  version "0.11.11"
+  resolved "https://registry.yarnpkg.com/formik/-/formik-0.11.11.tgz#4b02838133c0196b1ef443aa973766cd097ec4a5"
+  integrity sha1-SwKDgTPAGWse9EOqlzdmzQl+xKU=
+  dependencies:
+    lodash.clonedeep "^4.5.0"
+    lodash.isequal "4.5.0"
+    lodash.topath "4.5.2"
+    prop-types "^15.5.10"
+    warning "^3.0.0"
+
 formik@^1.3.1:
   version "1.5.7"
   resolved "https://registry.yarnpkg.com/formik/-/formik-1.5.7.tgz#2fc5fc2f0c693cdc4e8c9dad3a10eb4c4e131ff5"
@@ -11936,7 +11997,7 @@ hoist-non-react-statics@^1.0.5:
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb"
   integrity sha1-qkSM8JhtVcxAdzsXF0t90GbLfPs=
 
-hoist-non-react-statics@^2.2.1, hoist-non-react-statics@^2.2.2, hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0:
+hoist-non-react-statics@^2.1.0, hoist-non-react-statics@^2.2.1, hoist-non-react-statics@^2.2.2, hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0:
   version "2.5.5"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
   integrity sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==
@@ -12653,7 +12714,7 @@ into-stream@^3.1.0:
     from2 "^2.1.1"
     p-is-promise "^1.1.0"
 
-invariant@2.2.4, invariant@^2.2.0, invariant@^2.2.2, invariant@^2.2.3, invariant@^2.2.4:
+invariant@2.2.4, invariant@^2.0.0, invariant@^2.1.0, invariant@^2.2.0, invariant@^2.2.1, invariant@^2.2.2, invariant@^2.2.3, invariant@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
   integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
@@ -12747,7 +12808,7 @@ is-buffer@^1.0.2, is-buffer@^1.1.5, is-buffer@~1.1.1:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
-is-buffer@^2.0.0, is-buffer@^2.0.2:
+is-buffer@^2.0.0, is-buffer@^2.0.2, is-buffer@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725"
   integrity sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==
@@ -14134,6 +14195,19 @@ kleur@^3.0.2, kleur@^3.0.3:
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
+knex-migrate@^1.6.1:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/knex-migrate/-/knex-migrate-1.7.2.tgz#9977ddbc9c9b992c7d4f3a37fcc95925bd46fa51"
+  integrity sha512-uL5e756BSvyiWIerXMiJeC2pBWBdYQOPXl6Aai+o4Lpyau1IgSzLqMQH9Pj3AfIC3MR3DS0ESEuJo9MH+/nU2A==
+  dependencies:
+    bluebird "^3.4.6"
+    invariant "^2.2.1"
+    lodash "^4.16.4"
+    minimist "^1.2.0"
+    prettyjson "^1.1.3"
+    req-from "^1.0.1"
+    umzug "^2.1.0"
+
 knex@^0.14.2, knex@^0.14.6:
   version "0.14.6"
   resolved "https://registry.yarnpkg.com/knex/-/knex-0.14.6.tgz#ad57c4ef8fa1b51ebc8c37c2c9b483f6fb34e41e"
@@ -14832,6 +14906,11 @@ lodash.tonumber@^4.0.3:
   resolved "https://registry.yarnpkg.com/lodash.tonumber/-/lodash.tonumber-4.0.3.tgz#0b96b31b35672793eb7f5a63ee791f1b9e9025d9"
   integrity sha1-C5azGzVnJ5Prf1pj7nkfG56QJdk=
 
+lodash.topath@4.5.2:
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/lodash.topath/-/lodash.topath-4.5.2.tgz#3616351f3bba61994a0931989660bd03254fd009"
+  integrity sha1-NhY1Hzu6YZlKCTGYlmC9AyVP0Ak=
+
 lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
@@ -14867,7 +14946,7 @@ lodash@4.17.5:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
 
-lodash@^4.17.14, lodash@^4.17.15:
+lodash@^4.16.4, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.2.0:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
@@ -15848,7 +15927,7 @@ modify-values@^1.0.0:
   resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
   integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==
 
-moment@2.x, moment@^2.10.6, moment@^2.19.0, moment@^2.22.2, moment@^2.24.0, moment@^2.6.0:
+moment@2.x, moment@^2.10.6, moment@^2.19.0, moment@^2.20.1, moment@^2.22.2, moment@^2.24.0, moment@^2.6.0:
   version "2.24.0"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
   integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
@@ -17770,7 +17849,7 @@ polished@^3.3.1:
   dependencies:
     "@babel/runtime" "^7.4.5"
 
-popper.js@^1.12.9, popper.js@^1.14.4, popper.js@^1.14.7, popper.js@^1.15.0:
+popper.js@^1.12.9, popper.js@^1.14.1, popper.js@^1.14.4, popper.js@^1.14.7, popper.js@^1.15.0:
   version "1.15.0"
   resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.15.0.tgz#5560b99bbad7647e9faa475c6b8056621f5a4ff2"
   integrity sha512-w010cY1oCUmI+9KwwlWki+r5jxKfTFDVoadl7MSrIujHU5MJ5OR6HTDj6Xo8aoR/QsA56x8jKjA59qGH4ELtrA==
@@ -18325,7 +18404,7 @@ pretty-hrtime@^1.0.3:
   resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
   integrity sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=
 
-prettyjson@^1.2.1:
+prettyjson@^1.1.3, prettyjson@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/prettyjson/-/prettyjson-1.2.1.tgz#fcffab41d19cab4dfae5e575e64246619b12d289"
   integrity sha1-/P+rQdGcq0365eV15kJGYZsS0ok=
@@ -19303,6 +19382,16 @@ react-cookie@^2.2.0:
     prop-types "^15.0.0"
     universal-cookie "^2.2.0"
 
+react-datepicker@^1.5.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/react-datepicker/-/react-datepicker-1.8.0.tgz#ee46148aa10234d42e22ab969d1110f74263ba56"
+  integrity sha512-N4LdVTtqJCsZyKXBQ/AqSEcH6FyhgsY1gD07zECNu60nGt5s4ngRlhYdHoE34VNFO+ZY+pvljZRLwSC8LS9RxQ==
+  dependencies:
+    classnames "^2.2.5"
+    prop-types "^15.6.0"
+    react-onclickoutside "^6.7.1"
+    react-popper "^1.0.2"
+
 react-debounce-input@^3.1.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/react-debounce-input/-/react-debounce-input-3.2.0.tgz#6978c6061d898f549f40417fb0d2ebbecf50aaaa"
@@ -19390,6 +19479,25 @@ react-devtools-core@^3.6.0:
     shell-quote "^1.6.1"
     ws "^3.3.1"
 
+react-dnd-html5-backend@^2.5.4:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/react-dnd-html5-backend/-/react-dnd-html5-backend-2.6.0.tgz#590cd1cca78441bb274edd571fef4c0b16ddcf8e"
+  integrity sha1-WQzRzKeEQbsnTt1XH+9MCxbdz44=
+  dependencies:
+    lodash "^4.2.0"
+
+react-dnd@^2.5.4:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/react-dnd/-/react-dnd-2.6.0.tgz#7fa25676cf827d58a891293e3c1ab59da002545a"
+  integrity sha1-f6JWds+CfViokSk+PBq1naACVFo=
+  dependencies:
+    disposables "^1.0.1"
+    dnd-core "^2.6.0"
+    hoist-non-react-statics "^2.1.0"
+    invariant "^2.1.0"
+    lodash "^4.2.0"
+    prop-types "^15.5.10"
+
 react-docgen@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/react-docgen/-/react-docgen-4.1.1.tgz#8fef0212dbf14733e09edecef1de6b224d87219e"
@@ -19520,6 +19628,11 @@ react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.3, react-is
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16"
   integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==
 
+react-is@^16.9.0:
+  version "16.9.0"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.9.0.tgz#21ca9561399aad0ff1a7701c01683e8ca981edcb"
+  integrity sha512-tJBzzzIgnnRfEm046qRcURvwQnZVXmuCbscxUO5RWrGTXpon2d4c8mI0D8WE6ydVIm29JiLB6+RslkIvym9Rjw==
+
 react-lazy-load@^3.0.13:
   version "3.0.13"
   resolved "https://registry.yarnpkg.com/react-lazy-load/-/react-lazy-load-3.0.13.tgz#3b0a92d336d43d3f0d73cbe6f35b17050b08b824"
@@ -19833,6 +19946,11 @@ react-navigation@^3.11.1:
     react-navigation-stack "~1.4.0"
     react-navigation-tabs "~1.1.4"
 
+react-onclickoutside@^6.7.1:
+  version "6.9.0"
+  resolved "https://registry.yarnpkg.com/react-onclickoutside/-/react-onclickoutside-6.9.0.tgz#a54bc317ae8cf6131a5d78acea55a11067f37a1f"
+  integrity sha512-8ltIY3bC7oGhj2nPAvWOGi+xGFybPNhJM0V1H8hY/whNcXgmDeaeoCMPPd8VatrpTsUWjb/vGzrmu6SrXVty3A==
+
 react-popper-tooltip@^2.8.3:
   version "2.8.3"
   resolved "https://registry.yarnpkg.com/react-popper-tooltip/-/react-popper-tooltip-2.8.3.tgz#1c63e7473a96362bd93be6c94fa404470a265197"
@@ -19841,6 +19959,14 @@ react-popper-tooltip@^2.8.3:
     "@babel/runtime" "^7.4.5"
     react-popper "^1.3.3"
 
+react-popper@^0.10.4:
+  version "0.10.4"
+  resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-0.10.4.tgz#af2a415ea22291edd504678d7afda8a6ee3295aa"
+  integrity sha1-rypBXqIike3VBGeNev2opu4ylao=
+  dependencies:
+    popper.js "^1.14.1"
+    prop-types "^15.6.1"
+
 react-popper@^0.8.3:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-0.8.3.tgz#0f73333137c9fb0af6ec4074d2d0585a0a0461e1"
@@ -19849,6 +19975,18 @@ react-popper@^0.8.3:
     popper.js "^1.12.9"
     prop-types "^15.6.0"
 
+react-popper@^1.0.2:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-1.3.4.tgz#f0cd3b0d30378e1f663b0d79bcc8614221652ced"
+  integrity sha512-9AcQB29V+WrBKk6X7p0eojd1f25/oJajVdMZkywIoAV6Ag7hzE1Mhyeup2Q1QnvFRtGQFQvtqfhlEoDAPfKAVA==
+  dependencies:
+    "@babel/runtime" "^7.1.2"
+    create-react-context "^0.3.0"
+    popper.js "^1.14.4"
+    prop-types "^15.6.1"
+    typed-styles "^0.0.7"
+    warning "^4.0.2"
+
 react-popper@^1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-1.3.3.tgz#2c6cef7515a991256b4f0536cd4bdcb58a7b6af6"
@@ -19991,6 +20129,16 @@ react-test-renderer@16.8.3:
     react-is "^16.8.3"
     scheduler "^0.13.3"
 
+react-test-renderer@^16.2.0:
+  version "16.9.0"
+  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.9.0.tgz#7ed657a374af47af88f66f33a3ef99c9610c8ae9"
+  integrity sha512-R62stB73qZyhrJo7wmCW9jgl/07ai+YzvouvCXIJLBkRlRqLx4j9RqcLEAfNfU3OxTGucqR2Whmn3/Aad6L3hQ==
+  dependencies:
+    object-assign "^4.1.1"
+    prop-types "^15.6.2"
+    react-is "^16.9.0"
+    scheduler "^0.15.0"
+
 react-test-renderer@^16.8.6:
   version "16.8.6"
   resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.8.6.tgz#188d8029b8c39c786f998aa3efd3ffe7642d5ba1"
@@ -20030,7 +20178,7 @@ react-transform-hmr@^1.0.4:
     global "^4.3.0"
     react-proxy "^1.1.7"
 
-react-transition-group@^2.2.1, react-transition-group@^2.3.0-beta.0:
+react-transition-group@^2.2.1, react-transition-group@^2.3.0-beta.0, react-transition-group@^2.3.1:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.9.0.tgz#df9cdb025796211151a436c69a8f3b97b5b07c8d"
   integrity sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==
@@ -20091,6 +20239,20 @@ reactstrap@^5.0.0-beta:
     react-popper "^0.8.3"
     react-transition-group "^2.2.1"
 
+reactstrap@^6.0.1:
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/reactstrap/-/reactstrap-6.5.0.tgz#ba655e32646e2621829f61faa033e607ec6624e5"
+  integrity sha512-dWb3fB/wBAiQloteKlf+j9Nl2VLe6BMZgTEt6hpeTt0t9TwtkeU+2v2NBYONZaF4FZATfMiIKozhWpc2HmLW1g==
+  dependencies:
+    classnames "^2.2.3"
+    lodash.isfunction "^3.0.9"
+    lodash.isobject "^3.0.2"
+    lodash.tonumber "^4.0.3"
+    prop-types "^15.5.8"
+    react-lifecycles-compat "^3.0.4"
+    react-popper "^0.10.4"
+    react-transition-group "^2.3.1"
+
 read-chunk@2.1.0, read-chunk@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/read-chunk/-/read-chunk-2.1.0.tgz#6a04c0928005ed9d42e1a6ac5600e19cbc7ff655"
@@ -20350,7 +20512,7 @@ redux-logger@^2.7.4:
   dependencies:
     deep-diff "0.3.4"
 
-redux@^3.6.0:
+redux@^3.6.0, redux@^3.7.1:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/redux/-/redux-3.7.2.tgz#06b73123215901d25d065be342eb026bc1c8537b"
   integrity sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A==
@@ -20583,6 +20745,13 @@ replace-string@1.1.0, replace-string@^1.1.0:
   resolved "https://registry.yarnpkg.com/replace-string/-/replace-string-1.1.0.tgz#87062117f823fe5800c306bacb2cfa359b935fea"
   integrity sha1-hwYhF/gj/lgAwwa6yyz6NZuTX+o=
 
+req-from@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/req-from/-/req-from-1.0.1.tgz#bf81da5147947d32d13b947dc12a58ad4587350e"
+  integrity sha1-v4HaUUeUfTLRO5R9wSpYrUWHNQ4=
+  dependencies:
+    resolve-from "^2.0.0"
+
 request-promise-core@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.1.tgz#3eee00b2c5aa83239cfb04c5700da36f81cd08b6"
@@ -20691,6 +20860,11 @@ resolve-from@4.0.0, resolve-from@^4.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
+resolve-from@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57"
+  integrity sha1-lICrIOlP+h2egKgEx+oUdhGWa1c=
+
 resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
@@ -21027,6 +21201,14 @@ scheduler@^0.13.3, scheduler@^0.13.6:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
+scheduler@^0.15.0:
+  version "0.15.0"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.15.0.tgz#6bfcf80ff850b280fed4aeecc6513bc0b4f17f8e"
+  integrity sha512-xAefmSfN6jqAa7Kuq7LIJY0bwAPG3xlCj0HMEBQk1lxYiDKZscY2xJ5U/61ZTrYbmNQbXa+gc7czPkVo11tnCg==
+  dependencies:
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+
 schema-utils@^0.4.2, schema-utils@^0.4.4, schema-utils@^0.4.5:
   version "0.4.7"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
@@ -23128,6 +23310,14 @@ umask@^1.1.0:
   resolved "https://registry.yarnpkg.com/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d"
   integrity sha1-8pzr8B31F5ErtY/5xOUP3o4zMg0=
 
+umzug@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/umzug/-/umzug-2.2.0.tgz#6160bdc1817e4a63a625946775063c638623e62e"
+  integrity sha512-xZLW76ax70pND9bx3wqwb8zqkFGzZIK8dIHD9WdNy/CrNfjWcwQgQkGCuUqcuwEBvUm+g07z+qWvY+pxDmMEEw==
+  dependencies:
+    babel-runtime "^6.23.0"
+    bluebird "^3.5.3"
+
 unc-path-regex@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"

From 29ca5c1a2db4bb901841e78f8e5ab6ae02b7b174 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Mon, 26 Aug 2019 11:06:59 +0200
Subject: [PATCH 323/327] compose from `@gplapp/core-common`

---
 .../client-react/containers/ModuleEdit.jsx    |   3 +-
 .../client-react/containers/ModuleFilter.jsx  |   4 +-
 .../client-react/containers/ModuleList.jsx    |   3 +-
 yarn.lock                                     | 191 ++++++++++++++++--
 4 files changed, 185 insertions(+), 16 deletions(-)

diff --git a/tools/templates/crud/client-react/containers/ModuleEdit.jsx b/tools/templates/crud/client-react/containers/ModuleEdit.jsx
index 2f2f7ffb46..f6648ba2b4 100644
--- a/tools/templates/crud/client-react/containers/ModuleEdit.jsx
+++ b/tools/templates/crud/client-react/containers/ModuleEdit.jsx
@@ -1,6 +1,7 @@
 import React from 'react';
-import { graphql, compose } from 'react-apollo';
+import { graphql } from 'react-apollo';
 
+import { compose } from '@gqlapp/core-common';
 import { EditView } from '@gqlapp/core-client-react';
 import { $Module$Schema } from '@gqlapp/$-module$-server-ts/schema';
 import $MODULE$_QUERY from '../graphql/$Module$Query.graphql';
diff --git a/tools/templates/crud/client-react/containers/ModuleFilter.jsx b/tools/templates/crud/client-react/containers/ModuleFilter.jsx
index 4508564a30..ae4cf78b13 100644
--- a/tools/templates/crud/client-react/containers/ModuleFilter.jsx
+++ b/tools/templates/crud/client-react/containers/ModuleFilter.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
-import { graphql, compose } from 'react-apollo';
+import { graphql } from 'react-apollo';
 import { FilterView } from '@gqlapp/core-client-react';
-import { removeTypename } from '@gqlapp/core-common';
+import { compose, removeTypename } from '@gqlapp/core-common';
 
 import { $Module$Schema } from '@gqlapp/$-module$-server-ts/schema';
 
diff --git a/tools/templates/crud/client-react/containers/ModuleList.jsx b/tools/templates/crud/client-react/containers/ModuleList.jsx
index 717fada52d..14fb77b38d 100644
--- a/tools/templates/crud/client-react/containers/ModuleList.jsx
+++ b/tools/templates/crud/client-react/containers/ModuleList.jsx
@@ -1,9 +1,10 @@
 import React from 'react';
-import { graphql, compose } from 'react-apollo';
+import { graphql } from 'react-apollo';
 import update from 'immutability-helper';
 import PropTypes from 'prop-types';
 import { ListView } from '@gqlapp/core-client-react';
 import { removeTypename, removeEmpty, updateEntry, deleteEntry } from '@gqlapp/core-common';
+import { compose } from '@gqlapp/core-common';
 
 import { $Module$Schema } from '@gqlapp/$-module$-server-ts/schema';
 
diff --git a/yarn.lock b/yarn.lock
index 48fa52c9ea..4808f615a5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1251,6 +1251,18 @@
   dependencies:
     debug "^3.1.0"
 
+"@domain-schema/formik@^0.0.34":
+  version "0.0.34"
+  resolved "https://registry.yarnpkg.com/@domain-schema/formik/-/formik-0.0.34.tgz#a5023113c5540def45aba2bfb1d5fb0b1c2ce461"
+  integrity sha512-rw4q+MtAd//brE1VmZssoaGOeInCEmkiuw1e9QRfnc9CEU8TV1ptNG9vyXmfFzvV/iZKkMQe7u4/nK6hTcRcWA==
+  dependencies:
+    debug "^3.1.0"
+    formik "^0.11.11"
+    humps "^2.0.1"
+  optionalDependencies:
+    react-test-renderer "^16.2.0"
+    reactstrap "^6.0.1"
+
 "@domain-schema/graphql@^0.0.33":
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/@domain-schema/graphql/-/graphql-0.0.33.tgz#201d8cc5d21a9eba69f2eb8cb1fe44f012381cec"
@@ -1266,6 +1278,14 @@
     debug "^3.1.0"
     humps "^2.0.1"
 
+"@domain-schema/validation@^0.0.36":
+  version "0.0.36"
+  resolved "https://registry.yarnpkg.com/@domain-schema/validation/-/validation-0.0.36.tgz#b4740e577e4c745710fb4388e857ee62f70e33ea"
+  integrity sha512-dAfqH/yFbmecfEccRt2FK/jx3XvfpcfwNPUBQaVAFXD/urSTLAPG5DmML68qpYs+9ms9p412U/IN3CyiLmUGcw==
+  dependencies:
+    debug "^3.1.0"
+    humps "^2.0.1"
+
 "@emotion/cache@^10.0.14":
   version "10.0.14"
   resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-10.0.14.tgz#56093cff025c04b0330bdd92afe8335ed326dd18"
@@ -5447,7 +5467,7 @@ art@^0.10.0, art@^0.10.1:
   resolved "https://registry.yarnpkg.com/art/-/art-0.10.3.tgz#b01d84a968ccce6208df55a733838c96caeeaea2"
   integrity sha512-HXwbdofRTiJT6qZX/FnchtldzJjS3vkLJxQilc3Xj+ma2MXjY4UAyQ0ls1XZYVnDvVIBiFZbC6QsvtW86TD6tQ==
 
-asap@^2.0.0, asap@~2.0.3:
+asap@^2.0.0, asap@^2.0.6, asap@~2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
   integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
@@ -6398,7 +6418,7 @@ bluebird@^2.10.2:
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
   integrity sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=
 
-bluebird@^3.1.1, bluebird@^3.3.5, bluebird@^3.4.7, bluebird@^3.5.1, bluebird@^3.5.2, bluebird@^3.5.3, bluebird@^3.5.5:
+bluebird@^3.1.1, bluebird@^3.3.5, bluebird@^3.4.6, bluebird@^3.4.7, bluebird@^3.5.1, bluebird@^3.5.2, bluebird@^3.5.3, bluebird@^3.5.5:
   version "3.5.5"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f"
   integrity sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==
@@ -8303,6 +8323,14 @@ create-react-context@^0.2.1, create-react-context@^0.2.2:
     fbjs "^0.8.0"
     gud "^1.0.0"
 
+create-react-context@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/create-react-context/-/create-react-context-0.3.0.tgz#546dede9dc422def0d3fc2fe03afe0bc0f4f7d8c"
+  integrity sha512-dNldIoSuNSvlTJ7slIKC/ZFGKexBMBrrcc+TTe1NdmROnaASuLPvqpwj9v4XS4uXZ8+YPu0sNmShX2rXI5LNsw==
+  dependencies:
+    gud "^1.0.0"
+    warning "^4.0.3"
+
 credit-card-type@^5.0.0:
   version "5.0.4"
   resolved "https://registry.yarnpkg.com/credit-card-type/-/credit-card-type-5.0.4.tgz#2dd9df280411ce2bb91ed95ac31e814605717aed"
@@ -9089,6 +9117,21 @@ dir-glob@^2.0.0:
   dependencies:
     path-type "^3.0.0"
 
+disposables@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/disposables/-/disposables-1.0.2.tgz#36c6a674475f55a2d6913567a601444e487b4b6e"
+  integrity sha1-NsamdEdfVaLWkTVnpgFETkh7S24=
+
+dnd-core@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/dnd-core/-/dnd-core-2.6.0.tgz#12bad66d58742c6e5f7cf2943fb6859440f809c4"
+  integrity sha1-ErrWbVh0LG5ffPKUP7aFlED4CcQ=
+  dependencies:
+    asap "^2.0.6"
+    invariant "^2.0.0"
+    lodash "^4.2.0"
+    redux "^3.7.1"
+
 dns-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
@@ -10853,6 +10896,13 @@ flat-cache@^2.0.1:
     rimraf "2.6.3"
     write "1.0.3"
 
+flat@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/flat/-/flat-4.1.0.tgz#090bec8b05e39cba309747f1d588f04dbaf98db2"
+  integrity sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==
+  dependencies:
+    is-buffer "~2.0.3"
+
 flatted@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08"
@@ -11014,6 +11064,17 @@ formidable@^1.2.0:
   resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.2.1.tgz#70fb7ca0290ee6ff961090415f4b3df3d2082659"
   integrity sha512-Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg==
 
+formik@^0.11.11:
+  version "0.11.11"
+  resolved "https://registry.yarnpkg.com/formik/-/formik-0.11.11.tgz#4b02838133c0196b1ef443aa973766cd097ec4a5"
+  integrity sha1-SwKDgTPAGWse9EOqlzdmzQl+xKU=
+  dependencies:
+    lodash.clonedeep "^4.5.0"
+    lodash.isequal "4.5.0"
+    lodash.topath "4.5.2"
+    prop-types "^15.5.10"
+    warning "^3.0.0"
+
 formik@^1.5.8:
   version "1.5.8"
   resolved "https://registry.yarnpkg.com/formik/-/formik-1.5.8.tgz#eee8cd345effe46839bc748c7f920486f12f14b0"
@@ -12136,7 +12197,7 @@ hoist-non-react-statics@^1.0.5:
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb"
   integrity sha1-qkSM8JhtVcxAdzsXF0t90GbLfPs=
 
-hoist-non-react-statics@^2.2.1, hoist-non-react-statics@^2.2.2, hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0:
+hoist-non-react-statics@^2.1.0, hoist-non-react-statics@^2.2.1, hoist-non-react-statics@^2.2.2, hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0:
   version "2.5.5"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
   integrity sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==
@@ -12868,7 +12929,7 @@ into-stream@^3.1.0:
     from2 "^2.1.1"
     p-is-promise "^1.1.0"
 
-invariant@2.2.4, invariant@^2.2.0, invariant@^2.2.2, invariant@^2.2.3, invariant@^2.2.4:
+invariant@2.2.4, invariant@^2.0.0, invariant@^2.1.0, invariant@^2.2.0, invariant@^2.2.1, invariant@^2.2.2, invariant@^2.2.3, invariant@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
   integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
@@ -12962,7 +13023,7 @@ is-buffer@^1.0.2, is-buffer@^1.1.5, is-buffer@~1.1.1:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
-is-buffer@^2.0.0, is-buffer@^2.0.2:
+is-buffer@^2.0.0, is-buffer@^2.0.2, is-buffer@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725"
   integrity sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==
@@ -14330,6 +14391,19 @@ kleur@^3.0.2, kleur@^3.0.3:
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
+knex-migrate@^1.6.1:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/knex-migrate/-/knex-migrate-1.7.2.tgz#9977ddbc9c9b992c7d4f3a37fcc95925bd46fa51"
+  integrity sha512-uL5e756BSvyiWIerXMiJeC2pBWBdYQOPXl6Aai+o4Lpyau1IgSzLqMQH9Pj3AfIC3MR3DS0ESEuJo9MH+/nU2A==
+  dependencies:
+    bluebird "^3.4.6"
+    invariant "^2.2.1"
+    lodash "^4.16.4"
+    minimist "^1.2.0"
+    prettyjson "^1.1.3"
+    req-from "^1.0.1"
+    umzug "^2.1.0"
+
 knex@^0.14.2, knex@^0.14.6:
   version "0.14.6"
   resolved "https://registry.yarnpkg.com/knex/-/knex-0.14.6.tgz#ad57c4ef8fa1b51ebc8c37c2c9b483f6fb34e41e"
@@ -15040,6 +15114,11 @@ lodash.tonumber@^4.0.3:
   resolved "https://registry.yarnpkg.com/lodash.tonumber/-/lodash.tonumber-4.0.3.tgz#0b96b31b35672793eb7f5a63ee791f1b9e9025d9"
   integrity sha1-C5azGzVnJ5Prf1pj7nkfG56QJdk=
 
+lodash.topath@4.5.2:
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/lodash.topath/-/lodash.topath-4.5.2.tgz#3616351f3bba61994a0931989660bd03254fd009"
+  integrity sha1-NhY1Hzu6YZlKCTGYlmC9AyVP0Ak=
+
 lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
@@ -15065,7 +15144,7 @@ lodash@4.17.11, "lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.11.1, lodash@^4.13.1
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
 
-lodash@^4.17.14, lodash@^4.17.15:
+lodash@^4.16.4, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.2.0:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
@@ -16051,7 +16130,7 @@ modify-values@^1.0.0:
   resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
   integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==
 
-moment@2.x, moment@^2.10.6, moment@^2.19.0, moment@^2.22.2, moment@^2.24.0, moment@^2.6.0:
+moment@2.x, moment@^2.10.6, moment@^2.19.0, moment@^2.20.1, moment@^2.22.2, moment@^2.24.0, moment@^2.6.0:
   version "2.24.0"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
   integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
@@ -18027,7 +18106,7 @@ polished@^3.3.1:
   dependencies:
     "@babel/runtime" "^7.4.5"
 
-popper.js@^1.12.9, popper.js@^1.14.4, popper.js@^1.14.7, popper.js@^1.15.0:
+popper.js@^1.12.9, popper.js@^1.14.1, popper.js@^1.14.4, popper.js@^1.14.7, popper.js@^1.15.0:
   version "1.15.0"
   resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.15.0.tgz#5560b99bbad7647e9faa475c6b8056621f5a4ff2"
   integrity sha512-w010cY1oCUmI+9KwwlWki+r5jxKfTFDVoadl7MSrIujHU5MJ5OR6HTDj6Xo8aoR/QsA56x8jKjA59qGH4ELtrA==
@@ -18579,7 +18658,7 @@ pretty-hrtime@^1.0.3:
   resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
   integrity sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=
 
-prettyjson@^1.2.1:
+prettyjson@^1.1.3, prettyjson@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/prettyjson/-/prettyjson-1.2.1.tgz#fcffab41d19cab4dfae5e575e64246619b12d289"
   integrity sha1-/P+rQdGcq0365eV15kJGYZsS0ok=
@@ -19557,6 +19636,16 @@ react-cookie@^2.2.0:
     prop-types "^15.0.0"
     universal-cookie "^2.2.0"
 
+react-datepicker@^1.5.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/react-datepicker/-/react-datepicker-1.8.0.tgz#ee46148aa10234d42e22ab969d1110f74263ba56"
+  integrity sha512-N4LdVTtqJCsZyKXBQ/AqSEcH6FyhgsY1gD07zECNu60nGt5s4ngRlhYdHoE34VNFO+ZY+pvljZRLwSC8LS9RxQ==
+  dependencies:
+    classnames "^2.2.5"
+    prop-types "^15.6.0"
+    react-onclickoutside "^6.7.1"
+    react-popper "^1.0.2"
+
 react-debounce-input@^3.1.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/react-debounce-input/-/react-debounce-input-3.2.0.tgz#6978c6061d898f549f40417fb0d2ebbecf50aaaa"
@@ -19644,6 +19733,25 @@ react-devtools-core@^3.6.0:
     shell-quote "^1.6.1"
     ws "^3.3.1"
 
+react-dnd-html5-backend@^2.5.4:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/react-dnd-html5-backend/-/react-dnd-html5-backend-2.6.0.tgz#590cd1cca78441bb274edd571fef4c0b16ddcf8e"
+  integrity sha1-WQzRzKeEQbsnTt1XH+9MCxbdz44=
+  dependencies:
+    lodash "^4.2.0"
+
+react-dnd@^2.5.4:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/react-dnd/-/react-dnd-2.6.0.tgz#7fa25676cf827d58a891293e3c1ab59da002545a"
+  integrity sha1-f6JWds+CfViokSk+PBq1naACVFo=
+  dependencies:
+    disposables "^1.0.1"
+    dnd-core "^2.6.0"
+    hoist-non-react-statics "^2.1.0"
+    invariant "^2.1.0"
+    lodash "^4.2.0"
+    prop-types "^15.5.10"
+
 react-docgen@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/react-docgen/-/react-docgen-4.1.1.tgz#8fef0212dbf14733e09edecef1de6b224d87219e"
@@ -20101,6 +20209,11 @@ react-navigation@^3.11.1:
     react-navigation-stack "~1.4.0"
     react-navigation-tabs "~1.1.4"
 
+react-onclickoutside@^6.7.1:
+  version "6.9.0"
+  resolved "https://registry.yarnpkg.com/react-onclickoutside/-/react-onclickoutside-6.9.0.tgz#a54bc317ae8cf6131a5d78acea55a11067f37a1f"
+  integrity sha512-8ltIY3bC7oGhj2nPAvWOGi+xGFybPNhJM0V1H8hY/whNcXgmDeaeoCMPPd8VatrpTsUWjb/vGzrmu6SrXVty3A==
+
 react-popper-tooltip@^2.8.3:
   version "2.8.3"
   resolved "https://registry.yarnpkg.com/react-popper-tooltip/-/react-popper-tooltip-2.8.3.tgz#1c63e7473a96362bd93be6c94fa404470a265197"
@@ -20109,6 +20222,14 @@ react-popper-tooltip@^2.8.3:
     "@babel/runtime" "^7.4.5"
     react-popper "^1.3.3"
 
+react-popper@^0.10.4:
+  version "0.10.4"
+  resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-0.10.4.tgz#af2a415ea22291edd504678d7afda8a6ee3295aa"
+  integrity sha1-rypBXqIike3VBGeNev2opu4ylao=
+  dependencies:
+    popper.js "^1.14.1"
+    prop-types "^15.6.1"
+
 react-popper@^0.8.3:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-0.8.3.tgz#0f73333137c9fb0af6ec4074d2d0585a0a0461e1"
@@ -20117,6 +20238,18 @@ react-popper@^0.8.3:
     popper.js "^1.12.9"
     prop-types "^15.6.0"
 
+react-popper@^1.0.2:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-1.3.4.tgz#f0cd3b0d30378e1f663b0d79bcc8614221652ced"
+  integrity sha512-9AcQB29V+WrBKk6X7p0eojd1f25/oJajVdMZkywIoAV6Ag7hzE1Mhyeup2Q1QnvFRtGQFQvtqfhlEoDAPfKAVA==
+  dependencies:
+    "@babel/runtime" "^7.1.2"
+    create-react-context "^0.3.0"
+    popper.js "^1.14.4"
+    prop-types "^15.6.1"
+    typed-styles "^0.0.7"
+    warning "^4.0.2"
+
 react-popper@^1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-1.3.3.tgz#2c6cef7515a991256b4f0536cd4bdcb58a7b6af6"
@@ -20249,7 +20382,7 @@ react-syntax-highlighter@^8.0.1:
     prismjs "^1.8.4"
     refractor "^2.4.1"
 
-react-test-renderer@16.9.0, react-test-renderer@^16.9.0:
+react-test-renderer@16.9.0, react-test-renderer@^16.2.0, react-test-renderer@^16.9.0:
   version "16.9.0"
   resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.9.0.tgz#7ed657a374af47af88f66f33a3ef99c9610c8ae9"
   integrity sha512-R62stB73qZyhrJo7wmCW9jgl/07ai+YzvouvCXIJLBkRlRqLx4j9RqcLEAfNfU3OxTGucqR2Whmn3/Aad6L3hQ==
@@ -20290,7 +20423,7 @@ react-transform-hmr@^1.0.4:
     global "^4.3.0"
     react-proxy "^1.1.7"
 
-react-transition-group@^2.2.1, react-transition-group@^2.3.0-beta.0:
+react-transition-group@^2.2.1, react-transition-group@^2.3.0-beta.0, react-transition-group@^2.3.1:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.9.0.tgz#df9cdb025796211151a436c69a8f3b97b5b07c8d"
   integrity sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==
@@ -20350,6 +20483,20 @@ reactstrap@^5.0.0-beta:
     react-popper "^0.8.3"
     react-transition-group "^2.2.1"
 
+reactstrap@^6.0.1:
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/reactstrap/-/reactstrap-6.5.0.tgz#ba655e32646e2621829f61faa033e607ec6624e5"
+  integrity sha512-dWb3fB/wBAiQloteKlf+j9Nl2VLe6BMZgTEt6hpeTt0t9TwtkeU+2v2NBYONZaF4FZATfMiIKozhWpc2HmLW1g==
+  dependencies:
+    classnames "^2.2.3"
+    lodash.isfunction "^3.0.9"
+    lodash.isobject "^3.0.2"
+    lodash.tonumber "^4.0.3"
+    prop-types "^15.5.8"
+    react-lifecycles-compat "^3.0.4"
+    react-popper "^0.10.4"
+    react-transition-group "^2.3.1"
+
 read-chunk@2.1.0, read-chunk@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/read-chunk/-/read-chunk-2.1.0.tgz#6a04c0928005ed9d42e1a6ac5600e19cbc7ff655"
@@ -20609,7 +20756,7 @@ redux-logger@^2.7.4:
   dependencies:
     deep-diff "0.3.4"
 
-redux@^3.6.0:
+redux@^3.6.0, redux@^3.7.1:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/redux/-/redux-3.7.2.tgz#06b73123215901d25d065be342eb026bc1c8537b"
   integrity sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A==
@@ -20857,6 +21004,13 @@ replace-string@1.1.0, replace-string@^1.1.0:
   resolved "https://registry.yarnpkg.com/replace-string/-/replace-string-1.1.0.tgz#87062117f823fe5800c306bacb2cfa359b935fea"
   integrity sha1-hwYhF/gj/lgAwwa6yyz6NZuTX+o=
 
+req-from@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/req-from/-/req-from-1.0.1.tgz#bf81da5147947d32d13b947dc12a58ad4587350e"
+  integrity sha1-v4HaUUeUfTLRO5R9wSpYrUWHNQ4=
+  dependencies:
+    resolve-from "^2.0.0"
+
 request-promise-core@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.1.tgz#3eee00b2c5aa83239cfb04c5700da36f81cd08b6"
@@ -20965,6 +21119,11 @@ resolve-from@4.0.0, resolve-from@^4.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
+resolve-from@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57"
+  integrity sha1-lICrIOlP+h2egKgEx+oUdhGWa1c=
+
 resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
@@ -23446,6 +23605,14 @@ umask@^1.1.0:
   resolved "https://registry.yarnpkg.com/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d"
   integrity sha1-8pzr8B31F5ErtY/5xOUP3o4zMg0=
 
+umzug@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/umzug/-/umzug-2.2.0.tgz#6160bdc1817e4a63a625946775063c638623e62e"
+  integrity sha512-xZLW76ax70pND9bx3wqwb8zqkFGzZIK8dIHD9WdNy/CrNfjWcwQgQkGCuUqcuwEBvUm+g07z+qWvY+pxDmMEEw==
+  dependencies:
+    babel-runtime "^6.23.0"
+    bluebird "^3.5.3"
+
 unc-path-regex@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"

From 046add7c4710b134d3cd0b1f0658b2817134d960 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 24 Dec 2019 10:24:21 +0100
Subject: [PATCH 324/327] update crud engine

---
 .../core/client-react/crud/ListView.web.jsx   |  4 +--
 modules/database/server-ts/sql/crud.js        | 31 ++++++++++++++++---
 modules/database/server-ts/sql/helpers.js     | 16 ++++++++--
 3 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/modules/core/client-react/crud/ListView.web.jsx b/modules/core/client-react/crud/ListView.web.jsx
index 036d3cefd6..8d57774093 100644
--- a/modules/core/client-react/crud/ListView.web.jsx
+++ b/modules/core/client-react/crud/ListView.web.jsx
@@ -327,11 +327,11 @@ class ListView extends React.Component {
     const title = () => {
       return showCustomActions && customActions && customActions.render ? (
         customActions.render
-      ) : (
+      ) : showCustomActions ? (
         <Link to={`/${link}/0`}>
           <Button color="primary">Add</Button>
         </Link>
-      );
+      ) : null;
     };
 
     const footer = () => {
diff --git a/modules/database/server-ts/sql/crud.js b/modules/database/server-ts/sql/crud.js
index bef26b0f51..4dce0e7196 100644
--- a/modules/database/server-ts/sql/crud.js
+++ b/modules/database/server-ts/sql/crud.js
@@ -8,7 +8,7 @@ import moment from 'moment';
 import { FieldError } from '@gqlapp/validation-common-react';
 
 import knex from './connector';
-import { selectBy, orderedFor } from './helpers';
+import { selectBy, orderedFor, removeTransient } from './helpers';
 import selectAdapter from './select';
 
 const dateFormat = 'YYYY-MM-DD';
@@ -485,6 +485,7 @@ export class Crud {
         }
       }
       queryBuilder.orderBy(column, order);
+      queryBuilder.groupBy(`${this.getTableName()}.id`);
     } else {
       queryBuilder.orderBy(`${this.getTableName()}.id`);
     }
@@ -675,6 +676,7 @@ export class Crud {
           nestedEntries.push({ key, data: data[key] });
           delete data[key];
         }
+        data = removeTransient(data, key, value);
       }
 
       if (this.isSortable()) {
@@ -718,6 +720,7 @@ export class Crud {
         nestedEntries.push({ key: value.type[0].name, data: data[key] });
         delete data[key];
       }
+      data = removeTransient(data, key, value);
     }
 
     // create, update, delete nested entries
@@ -744,7 +747,7 @@ export class Crud {
 
     return knex(this.getFullTableName())
       .update(decamelizeKeys(this.normalizeFields(data)))
-      .where(where);
+      .where(decamelizeKeys(where));
   }
 
   async update(args, ctx, info) {
@@ -955,7 +958,11 @@ export class Crud {
             .whereIn('id', ids);
         }
       } else {
-        normalizedData[`${this.getTableName()}.${key}`] = data[key];
+        if (value.type.constructor === Array) {
+          // TODO: Array
+        } else {
+          normalizedData[`${this.getTableName()}.${key}`] = data[key];
+        }
       }
     }
 
@@ -1023,13 +1030,27 @@ export class Crud {
     }
   }
 
-  async getByIds(ids, by, Obj, info, infoCustom = null) {
+  async getByIds(ids, by, Obj, info, infoCustom = null, args = null) {
     info = infoCustom === null ? parseFields(info) : infoCustom;
     const remoteId = by !== 'id' ? `${by}Id` : by;
     info[remoteId] = true;
     const baseQuery = knex(`${Obj.getFullTableName()} as ${Obj.getTableName()}`);
     const select = selectBy(Obj.getSchema(), info, false);
-    const res = await knexnest(select(baseQuery).whereIn(`${Obj.getTableName()}.${decamelize(remoteId)}`, ids));
+
+    const res = await knexnest(
+      select(baseQuery)
+        .whereIn(`${Obj.getTableName()}.${decamelize(remoteId)}`, ids)
+        // add additional filter options on joined table
+        .andWhere(function() {
+          if (!_.isEmpty(args)) {
+            Object.keys(args).forEach(key => {
+              if (key.endsWith('_in')) {
+                this.whereIn(`${Obj.getTableName()}.${decamelize(key.substring(0, key.length - 3))}`, args[key]);
+              }
+            });
+          }
+        })
+    );
     return orderedFor(res, ids, remoteId, false);
   }
 }
diff --git a/modules/database/server-ts/sql/helpers.js b/modules/database/server-ts/sql/helpers.js
index cca4231f87..a8e40dbbe7 100644
--- a/modules/database/server-ts/sql/helpers.js
+++ b/modules/database/server-ts/sql/helpers.js
@@ -20,13 +20,17 @@ export const truncateTables = async (knex, Promise, tables) => {
   }
 };
 
-export const orderedFor = (rows, collection, field, singleObject) => {
+export const orderedFor = (rows, collection, field, singleObject, singleField = false) => {
   // return the rows ordered for the collection
   const inGroupsOfField = groupBy(rows, field);
   return collection.map(element => {
     const elementArray = inGroupsOfField[element];
     if (elementArray) {
-      return singleObject ? elementArray[0] : elementArray;
+      return singleObject
+        ? singleField
+          ? elementArray[0][Object.keys(elementArray[0])[0]]
+          : elementArray[0]
+        : elementArray;
     }
     return singleObject ? {} : [];
   });
@@ -158,3 +162,11 @@ export const selectBy = (schema, fields, single = false) => {
     return query.select(selectItems);
   };
 };
+
+export const removeTransient = (data, key, value) => {
+  // remove transient field
+  if (value && value.transient) {
+    delete data[key];
+  }
+  return data;
+};

From 3dd3f8ca9f74aa11a11f0351babb28f829a85156 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Thu, 23 Jan 2020 10:15:32 +0100
Subject: [PATCH 325/327] fix error on ssr loading true

---
 .../crud/client-react/containers/ModuleFilter.jsx      |  8 +++-----
 .../crud/client-react/containers/ModuleList.jsx        | 10 ++++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tools/templates/crud/client-react/containers/ModuleFilter.jsx b/tools/templates/crud/client-react/containers/ModuleFilter.jsx
index ae4cf78b13..09c0a2bc39 100644
--- a/tools/templates/crud/client-react/containers/ModuleFilter.jsx
+++ b/tools/templates/crud/client-react/containers/ModuleFilter.jsx
@@ -16,12 +16,10 @@ class $Module$Filter extends React.Component {
 
 export default compose(
   graphql($MODULE$_STATE_QUERY, {
-    props({
-      data: {
-        $module$State: { filter }
+    props({ data: { loading, $module$State } }) {
+      if (loading === false) {
+        return removeTypename($module$State.filter);
       }
-    }) {
-      return removeTypename(filter);
     }
   }),
   graphql(UPDATE_FILTER, {
diff --git a/tools/templates/crud/client-react/containers/ModuleList.jsx b/tools/templates/crud/client-react/containers/ModuleList.jsx
index 14fb77b38d..d5cbb320d0 100644
--- a/tools/templates/crud/client-react/containers/ModuleList.jsx
+++ b/tools/templates/crud/client-react/containers/ModuleList.jsx
@@ -97,10 +97,12 @@ export default compose(
   }),
   graphql($MODULE$S_QUERY, {
     options: ({ limit, orderBy, filter }) => {
-      return {
-        fetchPolicy: 'cache-and-network',
-        variables: { limit, orderBy, filter: removeEmpty(filter, $Module$Schema) }
-      };
+      if (limit && orderBy && filter) {
+        return {
+          fetchPolicy: 'cache-and-network',
+          variables: { limit, orderBy, filter: removeEmpty(filter, $Module$Schema) }
+        };
+      }
     },
     props: ({ data: { loading, $module$sConnection, refetch, error, fetchMore, subscribeToMore } }) => {
       const loadMoreRows = limit => {

From 9a507dd870dc91e6cd1b6a92ef5aa3f808ebd4a6 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Tue, 25 Feb 2020 11:57:30 +0100
Subject: [PATCH 326/327] fix styles error

---
 .../ui-native-base/components/RenderSelectQuery.jsx             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/look/client-react-native/ui-native-base/components/RenderSelectQuery.jsx b/modules/look/client-react-native/ui-native-base/components/RenderSelectQuery.jsx
index 8c77f2a73c..4cc925fdc0 100644
--- a/modules/look/client-react-native/ui-native-base/components/RenderSelectQuery.jsx
+++ b/modules/look/client-react-native/ui-native-base/components/RenderSelectQuery.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { pascalize } from 'humps';
 import { View, Text, StyleSheet } from 'react-native';
-import { schemaQueries } from '@gqlapp/core-client-react';
+import schemaQueries from '../../../client-react/generatedContainers';
 import RenderSelect from './RenderSelect';
 import InputItemStyles from '../styles/InputItem';
 

From 093a4cdd20feafb5b25c78247e639d1ac9a26875 Mon Sep 17 00:00:00 2001
From: Mitja Debeljak <mitjade@gmail.com>
Date: Wed, 26 Feb 2020 15:52:53 +0100
Subject: [PATCH 327/327] merge with project

---
 modules/core/common/createApolloClient.ts     |  2 +-
 modules/database/server-ts/sql/crud.js        |  4 +--
 .../ui-antd/components/ButtonGroup.jsx        | 15 ++++++++
 .../ui-antd/components/RadioButton.jsx        | 34 +++++++++++++++++++
 .../ui-antd/components/RadioGroup.jsx         | 15 ++++++++
 .../ui-antd/components/TabPane.jsx            | 15 ++++++++
 .../client-react/ui-antd/components/Tabs.jsx  | 13 +++++++
 packages/client/webpack.config.js             |  2 +-
 8 files changed, 96 insertions(+), 4 deletions(-)
 create mode 100644 modules/look/client-react/ui-antd/components/ButtonGroup.jsx
 create mode 100644 modules/look/client-react/ui-antd/components/RadioButton.jsx
 create mode 100644 modules/look/client-react/ui-antd/components/RadioGroup.jsx
 create mode 100644 modules/look/client-react/ui-antd/components/TabPane.jsx
 create mode 100644 modules/look/client-react/ui-antd/components/Tabs.jsx

diff --git a/modules/core/common/createApolloClient.ts b/modules/core/common/createApolloClient.ts
index ea298d6b50..e2b3a73dc3 100644
--- a/modules/core/common/createApolloClient.ts
+++ b/modules/core/common/createApolloClient.ts
@@ -43,7 +43,7 @@ const createApolloClient = ({
           // Pass all @client queries and @client defaults to localCache
           return localCache;
         } else {
-          // Pass all the other queries to netCache);
+          // Pass all the other queries to netCache
           return netCache;
         }
       }
diff --git a/modules/database/server-ts/sql/crud.js b/modules/database/server-ts/sql/crud.js
index 4dce0e7196..e791502c87 100644
--- a/modules/database/server-ts/sql/crud.js
+++ b/modules/database/server-ts/sql/crud.js
@@ -705,7 +705,7 @@ export class Crud {
         module: this.getTableName(),
         action: 'create',
         message: JSON.stringify(e),
-        userId: ctx.user.id
+        userId: ctx.auth.isAuthenticated.id
       });
       return { errors: e };
     }
@@ -764,7 +764,7 @@ export class Crud {
         module: this.getTableName(),
         action: 'update',
         message: JSON.stringify(e),
-        userId: ctx.user.id
+        userId: ctx.auth.isAuthenticated.id
       });
       return { errors: e };
     }
diff --git a/modules/look/client-react/ui-antd/components/ButtonGroup.jsx b/modules/look/client-react/ui-antd/components/ButtonGroup.jsx
new file mode 100644
index 0000000000..f264b6b36c
--- /dev/null
+++ b/modules/look/client-react/ui-antd/components/ButtonGroup.jsx
@@ -0,0 +1,15 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Button } from 'antd';
+
+const ADButtonGroup = Button.Group;
+
+const ButtonGroup = ({ children, ...props }) => {
+  return <ADButtonGroup {...props}>{children}</ADButtonGroup>;
+};
+
+ButtonGroup.propTypes = {
+  children: PropTypes.node
+};
+
+export default ButtonGroup;
diff --git a/modules/look/client-react/ui-antd/components/RadioButton.jsx b/modules/look/client-react/ui-antd/components/RadioButton.jsx
new file mode 100644
index 0000000000..2280ed8646
--- /dev/null
+++ b/modules/look/client-react/ui-antd/components/RadioButton.jsx
@@ -0,0 +1,34 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Radio } from 'antd';
+
+const ADRadioButton = Radio.Button;
+
+class RadioButton extends React.Component {
+  render() {
+    const { children, color, type, size, ...props } = this.props;
+
+    let buttonSize = 'default';
+
+    if (size === 'sm') {
+      buttonSize = 'small';
+    } else if (size === 'lg') {
+      buttonSize = 'large';
+    }
+
+    return (
+      <ADRadioButton type={color} htmlType={type} size={buttonSize} {...props}>
+        {children}
+      </ADRadioButton>
+    );
+  }
+}
+
+RadioButton.propTypes = {
+  children: PropTypes.node,
+  color: PropTypes.string,
+  type: PropTypes.string,
+  size: PropTypes.string
+};
+
+export default RadioButton;
diff --git a/modules/look/client-react/ui-antd/components/RadioGroup.jsx b/modules/look/client-react/ui-antd/components/RadioGroup.jsx
new file mode 100644
index 0000000000..32a37931e9
--- /dev/null
+++ b/modules/look/client-react/ui-antd/components/RadioGroup.jsx
@@ -0,0 +1,15 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Radio } from 'antd';
+
+const ADRadioGroup = Radio.Group;
+
+const RadioGroup = ({ children, ...props }) => {
+  return <ADRadioGroup {...props}>{children}</ADRadioGroup>;
+};
+
+RadioGroup.propTypes = {
+  children: PropTypes.node
+};
+
+export default RadioGroup;
diff --git a/modules/look/client-react/ui-antd/components/TabPane.jsx b/modules/look/client-react/ui-antd/components/TabPane.jsx
new file mode 100644
index 0000000000..dd2055724f
--- /dev/null
+++ b/modules/look/client-react/ui-antd/components/TabPane.jsx
@@ -0,0 +1,15 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Tabs } from 'antd';
+
+const ADTabPane = Tabs.TabPane;
+
+const TabPane = ({ children, ...props }) => {
+  return <ADTabPane {...props}>{children}</ADTabPane>;
+};
+
+TabPane.propTypes = {
+  children: PropTypes.node
+};
+
+export default TabPane;
diff --git a/modules/look/client-react/ui-antd/components/Tabs.jsx b/modules/look/client-react/ui-antd/components/Tabs.jsx
new file mode 100644
index 0000000000..be2ba0e677
--- /dev/null
+++ b/modules/look/client-react/ui-antd/components/Tabs.jsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Tabs as ADTabs } from 'antd';
+
+const Tabs = ({ children, ...props }) => {
+  return <ADTabs {...props}>{children}</ADTabs>;
+};
+
+Tabs.propTypes = {
+  children: PropTypes.node
+};
+
+export default Tabs;
diff --git a/packages/client/webpack.config.js b/packages/client/webpack.config.js
index eef4eb647f..aa9b16ad9a 100644
--- a/packages/client/webpack.config.js
+++ b/packages/client/webpack.config.js
@@ -176,7 +176,7 @@ const config = {
     public: `localhost:${webpackPort}`,
     publicPath: '/',
     headers: { 'Access-Control-Allow-Origin': '*' },
-    open: true,
+    open: false,
     quiet: false,
     noInfo: true,
     historyApiFallback: true,