Merge pull request #269 from oknosoft/develop

20171106

.gitignore

@@ -32,7 +32,6 @@ packages/metadata-react/plugin.min.js
 packages/metadata-redux/index.js
 packages/metadata-redux/index.js.map
 packages/metadata-redux/index.min.js
-packages/metadata-redux/with.min.js
 
 packages/metadata-superlogin/index.js
 packages/metadata-superlogin/index.js.map

lerna.json

@@ -1,4 +1,4 @@
 {
   "lerna": "2.2.0",
-  "version": "2.0.16-beta.35"
+  "version": "2.0.16-beta.38"
 }

package.json

@@ -15,7 +15,7 @@
     "alasql": "^0.4.3",
     "clipboard": "^1.7",
     "debug": "^3.1.0",
-    "material-ui": "^1.0.0-beta.19",
+    "material-ui": "^1.0.0-beta.20",
     "material-ui-icons": "^1.0.0-beta.17",
     "moment": "^2.19.1",
     "pouchdb": "^6.3.4",
@@ -28,7 +28,7 @@
     "pouchdb-find": "^6.3.4",
     "pouchdb-mapreduce": "^6.3.4",
     "pouchdb-replication": "^6.3.4",
-    "rc-calendar": "^9.1.11",
+    "rc-calendar": "^9.1.12",
     "rc-cascader": "^0.11.6",
     "rc-time-picker": "^3.1.0",
     "react-onclickoutside": "^6.6.3",
@@ -38,7 +38,7 @@
   },
   "devDependencies": {
     "babel-core": "^6.26.0",
-    "babel-eslint": "^8.0.1",
+    "babel-eslint": "^8.0.2",
     "babel-loader": "^7.1.2",
     "babel-plugin-external-helpers": "^6.22.0",
     "babel-plugin-syntax-object-rest-spread": "^6.13.0",

packages/metadata-1c/package.json

@@ -1,12 +1,12 @@
 {
   "name": "metadata-1c",
   "description": "1C data adapter for metadata.js",
-  "version": "2.0.16-beta.35",
+  "version": "2.0.16-beta.38",
   "author": "Evgeniy Malyarov <[email protected]> (http://www.oknosoft.ru)",
   "license": "MIT",
   "engines": {
-    "node": "^7.10",
-    "npm": "^5.0"
+    "node": "^8.8",
+    "npm": "^5.5"
   },
   "main": "./index.js",
   "repository": {

packages/metadata-abstract-ui/package.json

@@ -1,14 +1,14 @@
 {
   "name": "metadata-abstract-ui",
   "description": "Abstract enums and methods for metadata.js",
-  "version": "2.0.16-beta.35",
+  "version": "2.0.16-beta.38",
   "author": "Evgeniy Malyarov <[email protected]> (http://www.oknosoft.ru)",
   "license": "MIT",
   "engines": {
-    "node": "^7.10",
-    "npm": "^5.0"
+    "node": "^8.8",
+    "npm": "^5.5"
   },
-  "peerDependencies": {
+  "dependencies": {
     "clipboard": "^1.7"
   },
   "repository": {

packages/metadata-angular/package.json

@@ -1,12 +1,12 @@
 {
   "name": "metadata-angular",
   "description": "Angular UI components for metadata.js",
-  "version": "2.0.16-beta.35",
+  "version": "2.0.16-beta.38",
   "author": "Evgeniy Malyarov <[email protected]> (http://www.oknosoft.ru)",
   "license": "MIT",
   "engines": {
-    "node": "^7.10",
-    "npm": "^5.0"
+    "node": "^8.8",
+    "npm": "^5.5"
   },
   "main": "./index.js",
   "repository": {

packages/metadata-background/package.json

@@ -1,12 +1,12 @@
 {
   "name": "metadata-background",
   "description": "Background tasks for metadata.js",
-  "version": "2.0.16-beta.35",
+  "version": "2.0.16-beta.38",
   "author": "Evgeniy Malyarov <[email protected]> (http://www.oknosoft.ru)",
   "license": "MIT",
   "engines": {
-    "node": "^7.10",
-    "npm": "^5.0"
+    "node": "^8.8",
+    "npm": "^5.5"
   },
   "main": "./index.js",
   "repository": {

packages/metadata-core/package.json

@@ -1,15 +1,16 @@
 {
   "name": "metadata-core",
   "description": "The core of metadata.js as a standalone package",
-  "version": "2.0.16-beta.35",
+  "version": "2.0.16-beta.38",
   "author": "Evgeniy Malyarov <[email protected]> (http://www.oknosoft.ru)",
   "license": "MIT",
   "engines": {
-    "node": "^7.10",
-    "npm": "^5.0"
+    "node": "^8.8",
+    "npm": "^5.5"
   },
-  "peerDependencies": {
+  "dependencies": {
     "alasql": "^0.4",
+    "debug": "^3.1.0",
     "moment": "^2.19"
   },
   "repository": {
@@ -25,15 +26,10 @@
     "metadata",
     "browser data engine",
     "spa offline",
-    "rest",
-    "odata",
-    "1c",
-    "1с",
     "web сервис",
     "клиент 1с",
     "offline framework",
     "offline data engine",
-    "CRDT",
     "offline-first",
     "replication"
   ]

packages/metadata-dhtmlx/package.json

@@ -1,12 +1,12 @@
 {
   "name": "metadata-dhtmlx",
   "description": "Dhtmlx UI components for metadata.js",
-  "version": "2.0.16-beta.35",
+  "version": "2.0.16-beta.38",
   "author": "Evgeniy Malyarov <[email protected]> (http://www.oknosoft.ru)",
   "license": "MIT",
   "engines": {
-    "node": "^7.10",
-    "npm": "^5.0"
+    "node": "^8.8",
+    "npm": "^5.5"
   },
   "repository": {
     "type": "git",

packages/metadata-ember/package.json

@@ -1,15 +1,15 @@
 {
   "name": "metadata-ember",
   "description": "Ember UI components for metadata.js",
-  "version": "2.0.16-beta.35",
+  "version": "2.0.16-beta.38",
   "author": "Evgeniy Malyarov <[email protected]> (http://www.oknosoft.ru)",
   "license": "MIT",
   "engines": {
-    "node": "^7.10",
-    "npm": "^5.0"
+    "node": "^8.8",
+    "npm": "^5.5"
   },
-  "peerDependencies": {
-    "metadata-abstract-ui": "^2.0.16-beta.35"
+  "dependencies": {
+    "metadata-abstract-ui": "^2.0.16-beta.38"
   },
   "main": "dist/index.js",
   "repository": {

packages/metadata-external/package.json

@@ -1,12 +1,16 @@
 {
   "name": "metadata-external",
   "description": "1C data adapter for metadata.js",
-  "version": "2.0.16-beta.35",
+  "version": "2.0.16-beta.38",
   "author": "Evgeniy Malyarov <[email protected]> (http://www.oknosoft.ru)",
   "license": "MIT",
   "engines": {
-    "node": "^7.10",
-    "npm": "^5.0"
+    "node": "^8.8",
+    "npm": "^5.5"
+  },
+  "dependencies": {
+    "create-react-class": "^15.6.2",
+    "react-contextmenu": "^2.8.0"
   },
   "repository": {
     "type": "git",

packages/metadata-postgres/package.json

@@ -1,12 +1,12 @@
 {
   "name": "metadata-postgres",
   "description": "PostgreSQL data adapter for metadata.js",
-  "version": "2.0.16-beta.35",
+  "version": "2.0.16-beta.38",
   "author": "Evgeniy Malyarov <[email protected]> (http://www.oknosoft.ru)",
   "license": "MIT",
   "engines": {
-    "node": "^7.10",
-    "npm": "^5.0"
+    "node": "^8.8",
+    "npm": "^5.5"
   },
   "peerDependencies": {
     "pg": "^7.2"

packages/metadata-pouchdb/package.json

@@ -1,14 +1,15 @@
 {
   "name": "metadata-pouchdb",
   "description": "PouchDB data adapter for metadata.js",
-  "version": "2.0.16-beta.35",
+  "version": "2.0.16-beta.38",
   "author": "Evgeniy Malyarov <[email protected]> (http://www.oknosoft.ru)",
   "license": "MIT",
   "engines": {
-    "node": "^7.10",
-    "npm": "^5.0"
+    "node": "^8.8",
+    "npm": "^5.5"
   },
-  "peerDependencies": {
+  "dependencies": {
+    "pouchdb": "^6.3.4",
     "pouchdb-adapter-http": "^6.3",
     "pouchdb-adapter-idb": "^6.3",
     "pouchdb-adapter-memory": "^6.3",

packages/metadata-pouchdb/src/adapter.js

@@ -1056,15 +1056,20 @@ function adapter({AbstracrAdapter}) {
      * @method load_doc_ram
      */
     load_doc_ram() {
+      const {local, props} = this;
+      if(!local.doc){
+        return;
+      }
       const res = [];
       const {_m} = this.$p.md;
-      this.props._doc_ram_loading = true;
+
+      props._doc_ram_loading = true;
       ['cat', 'cch', 'ireg'].forEach((kind) => {
         for (const name in _m[kind]) {
           _m[kind][name].cachable === 'doc_ram' && res.push(kind + '.' + name);
         }
       });
-      return this.local.doc.find({
+      return local.doc.find({
         selector: {class_name: {$in: res}},
         limit: 10000,
       })
@@ -1074,8 +1079,8 @@ function adapter({AbstracrAdapter}) {
         })
         .then((data) => this.load_changes(data))
         .then(() => {
-          this.props._doc_ram_loading = false;
-          this.props._doc_ram_loaded = true;
+          props._doc_ram_loading = false;
+          props._doc_ram_loaded = true;
           this.emit('pouch_doc_ram_loaded');
         });
     }

packages/metadata-pouchdb/webpack.config.js

@@ -44,7 +44,7 @@ function getExternals() {
     'alasql/dist/alasql.min': true,
     'clipboard/lib/clipboard-action': true,
   };
-  for (const key in package_data.peerDependencies) {
+  for (const key in package_data.dependencies) {
     if(!externals[key]) {
       externals[key] = true;
     }

packages/metadata-react/App/AppContent.js

@@ -0,0 +1,34 @@
+// @flow
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import classNames from 'classnames';
+import { withStyles } from 'material-ui/styles';
+
+const styles = theme => ({
+  content: theme.mixins.gutters({
+    paddingTop: 64,
+    flex: '1 1 100%',
+    maxWidth: '100%',
+    margin: '0 auto',
+  }),
+  [theme.breakpoints.up(900 + theme.spacing.unit * 6)]: {
+    content: {
+      maxWidth: 900,
+    },
+  },
+});
+
+function AppContent(props) {
+  const { className, classes, children } = props;
+
+  return <div className={classNames(classes.content, className)}>{children}</div>;
+}
+
+AppContent.propTypes = {
+  children: PropTypes.node.isRequired,
+  classes: PropTypes.object.isRequired,
+  className: PropTypes.string,
+};
+
+export default withStyles(styles)(AppContent);