@iobroker/adapter-react-v5 4.8.1 → 4.9.0

package/Components/ObjectBrowser.js

@@ -37,6 +37,7 @@ var _IconState = _interopRequireDefault(require("../icons/IconState"));
 var _IconClosed = _interopRequireDefault(require("../icons/IconClosed"));
 var _IconOpen = _interopRequireDefault(require("../icons/IconOpen"));
 var _IconClearFilter = _interopRequireDefault(require("../icons/IconClearFilter"));
+var _Connection = _interopRequireDefault(require("../Connection"));
 var _Icon = _interopRequireDefault(require("./Icon"));
 var _withWidth = _interopRequireDefault(require("./withWidth"));
 var _Utils = _interopRequireDefault(require("./Utils"));
@@ -489,7 +490,7 @@ var styles = function styles(theme) {
       marginTop: -2
     },
     cellButtonsButtonWithCustoms: {
-      color: theme.palette.secondary.main
+      color: theme.palette.mode === 'dark' ? theme.palette.primary.main : theme.palette.secondary.main
     },
     cellButtonsButtonWithoutCustoms: {
       opacity: 0.2
@@ -746,6 +747,9 @@ var styles = function styles(theme) {
       marginLeft: theme.spacing(1),
       opacity: 0.7,
       fontSize: 'smaller'
+    },
+    contextMenuWithSubMenu: {
+      display: 'flex'
     }
   };
 };
@@ -1296,7 +1300,7 @@ function buildTree(objects, options) {
     do {
       repeat = false;
 
-      // If current level is still OK, and we can add ID to children
+      // If the current level is still OK, and we can add ID to children
       if (!currentPath || id.startsWith("".concat(currentPath, "."))) {
         var _obj$common, _obj$common2, _obj$common3, _obj$common4;
         // if more than one level added
@@ -1913,7 +1917,14 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       if (_this.contextMenu && Date.now() - _this.contextMenu.ts < 2000) {
         e.preventDefault();
         _this.setState({
-          showContextMenu: _this.contextMenu.item
+          showContextMenu: {
+            item: _this.contextMenu.item
+          }
+        });
+      } else if (_this.state.showContextMenu) {
+        e.preventDefault();
+        _this.setState({
+          showContextMenu: null
         });
       }
       _this.contextMenu = null;
@@ -2780,7 +2791,15 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       aclEveryone_read_object: props.t('ra_aclEveryone_read_object'),
       aclEveryone_read_state: props.t('ra_aclEveryone_read_state'),
       aclEveryone_write_object: props.t('ra_aclEveryone_write_object'),
-      aclEveryone_write_state: props.t('ra_aclEveryone_write_state')
+      aclEveryone_write_state: props.t('ra_aclEveryone_write_state'),
+      create: props.t('ra_Create'),
+      createBooleanState: props.t('ra_create_boolean_state'),
+      createNumberState: props.t('ra_create_number_state'),
+      createStringState: props.t('ra_create_string_state'),
+      createState: props.t('ra_create_state'),
+      createChannel: props.t('ra_create_channel'),
+      createDevice: props.t('ra_create_device'),
+      createFolder: props.t('ra_Create folder')
     };
     _this.levelPadding = props.levelPadding || ITEM_LEVEL;
     var resizerCurrentWidths = (window._localStorage || window.localStorage).getItem("".concat(_this.props.dialogName || 'App', ".table"));
@@ -2807,131 +2826,182 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
   }
   (0, _createClass2["default"])(ObjectBrowser, [{
     key: "loadAllObjects",
-    value: function loadAllObjects(update) {
-      var _this2 = this;
-      var props = this.props;
-      var objects;
-      return new Promise(function (resolve) {
-        _this2.setState({
-          updating: true
-        }, function () {
-          return resolve();
-        });
-      }).then(function () {
-        return _this2.props.objectsWorker ? _this2.props.objectsWorker.getObjects(update) : props.socket.getObjects(update, true);
-      }).then(function (_objects) {
-        objects = _objects;
-        if (props.types && props.types[0] !== 'state') {
-          if (props.length >= 1) {
-            console.error('more than one type does not supported! Use filterFunc instead');
-          }
-          return props.socket.getObjectViewSystem(props.types[0], null, null);
-        }
-        return !objects['system.config'] ? props.socket.getObject('system.config').then(function (obj) {
-          return {
-            'system.config': obj
-          };
-        }) : Promise.resolve(null);
-      }).then(function (moreObjects) {
-        _this2.systemConfig = objects['system.config'] || moreObjects['system.config'] || {};
-        if (moreObjects) {
-          if (moreObjects['system.config']) {
-            delete moreObjects['system.config'];
-          }
-          Object.assign(objects, moreObjects);
-        }
-        _this2.systemConfig.common = _this2.systemConfig.common || {};
-        _this2.systemConfig.common.defaultNewAcl = _this2.systemConfig.common.defaultNewAcl || {};
-        _this2.systemConfig.common.defaultNewAcl.owner = _this2.systemConfig.common.defaultNewAcl.owner || 'system.user.admin';
-        _this2.systemConfig.common.defaultNewAcl.ownerGroup = _this2.systemConfig.common.defaultNewAcl.ownerGroup || 'system.group.administrator';
-        if (typeof _this2.systemConfig.common.defaultNewAcl.state !== 'number') {
-          // TODO: may be convert here from string
-          _this2.systemConfig.common.defaultNewAcl.state = 0x664;
-        }
-        if (typeof _this2.systemConfig.common.defaultNewAcl.object !== 'number') {
-          // TODO: may be convert here from string
-          _this2.systemConfig.common.defaultNewAcl.state = 0x664;
-        }
-        if (typeof props.filterFunc === 'function') {
-          _this2.objects = {};
-          Object.keys(objects).forEach(function (id) {
-            try {
-              if (props.filterFunc(objects[id])) {
-                _this2.objects[id] = objects[id];
+    value: function () {
+      var _loadAllObjects = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(update) {
+        var _this2 = this;
+        var props, objects, i, moreObjects, columnsForAdmin, _buildTree2, info, root, node;
+        return _regenerator["default"].wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              props = this.props;
+              _context4.prev = 1;
+              _context4.next = 4;
+              return new Promise(function (resolve) {
+                _this2.setState({
+                  updating: true
+                }, function () {
+                  return resolve();
+                });
+              });
+            case 4:
+              if (!this.props.objectsWorker) {
+                _context4.next = 10;
+                break;
+              }
+              _context4.next = 7;
+              return this.props.objectsWorker.getObjects(update);
+            case 7:
+              _context4.t0 = _context4.sent;
+              _context4.next = 13;
+              break;
+            case 10:
+              _context4.next = 12;
+              return props.socket.getObjects(update, true);
+            case 12:
+              _context4.t0 = _context4.sent;
+            case 13:
+              objects = _context4.t0;
+              if (!(props.types && _Connection["default"].isWeb())) {
+                _context4.next = 26;
+                break;
+              }
+              i = 0;
+            case 16:
+              if (!(i < props.types.length)) {
+                _context4.next = 26;
+                break;
+              }
+              if (!(props.types[i] === 'state' || props.types[i] === 'channel' || props.types[i] === 'device' || props.types[i] === 'enum')) {
+                _context4.next = 19;
+                break;
+              }
+              return _context4.abrupt("continue", 23);
+            case 19:
+              _context4.next = 21;
+              return props.socket.getObjectViewSystem(props.types[i], null, null);
+            case 21:
+              moreObjects = _context4.sent;
+              Object.assign(objects, moreObjects);
+            case 23:
+              i++;
+              _context4.next = 16;
+              break;
+            case 26:
+              _context4.t1 = this.systemConfig || objects['system.config'];
+              if (_context4.t1) {
+                _context4.next = 31;
+                break;
+              }
+              _context4.next = 30;
+              return props.socket.getObject('system.config');
+            case 30:
+              _context4.t1 = _context4.sent;
+            case 31:
+              this.systemConfig = _context4.t1;
+              this.systemConfig.common = this.systemConfig.common || {};
+              this.systemConfig.common.defaultNewAcl = this.systemConfig.common.defaultNewAcl || {};
+              this.systemConfig.common.defaultNewAcl.owner = this.systemConfig.common.defaultNewAcl.owner || 'system.user.admin';
+              this.systemConfig.common.defaultNewAcl.ownerGroup = this.systemConfig.common.defaultNewAcl.ownerGroup || 'system.group.administrator';
+              if (typeof this.systemConfig.common.defaultNewAcl.state !== 'number') {
+                // TODO: may be convert here from string
+                this.systemConfig.common.defaultNewAcl.state = 0x664;
+              }
+              if (typeof this.systemConfig.common.defaultNewAcl.object !== 'number') {
+                // TODO: may be convert here from string
+                this.systemConfig.common.defaultNewAcl.state = 0x664;
+              }
+              if (typeof props.filterFunc === 'function') {
+                this.objects = {};
+                Object.keys(objects).forEach(function (id) {
+                  try {
+                    if (props.filterFunc(objects[id])) {
+                      _this2.objects[id] = objects[id];
+                    }
+                  } catch (e) {
+                    console.log("Error by filtering of \"".concat(id, "\": ").concat(e));
+                  }
+                });
+              } else if (props.types) {
+                this.objects = {};
+                Object.keys(objects).forEach(function (id) {
+                  var type = objects[id] && objects[id].type;
+                  // include "folder" types too
+                  if (type && (type === 'channel' || type === 'device' || type === 'enum' || type === 'folder' || type === 'adapter' || type === 'instance' || props.types.includes(type))) {
+                    _this2.objects[id] = objects[id];
+                  }
+                });
+              } else {
+                this.objects = objects;
               }
-            } catch (e) {
-              console.log("Error by filtering of \"".concat(id, "\": ").concat(e));
-            }
-          });
-        } else if (props.types) {
-          _this2.objects = {};
-          Object.keys(objects).forEach(function (id) {
-            var type = objects[id] && objects[id].type;
-            // include "folder" types too
-            if (type && (type === 'channel' || type === 'device' || type === 'enum' || type === 'folder' || type === 'adapter' || type === 'instance' || props.types.includes(type))) {
-              _this2.objects[id] = objects[id];
-            }
-          });
-        } else {
-          _this2.objects = objects;
-        }
-
-        // read default history
-        _this2.defaultHistory = _this2.systemConfig.common.defaultHistory;
-        if (_this2.defaultHistory) {
-          props.socket.getState("system.adapter.".concat(_this2.defaultHistory, ".alive")).then(function (state) {
-            if (!state || !state.val) {
-              _this2.defaultHistory = '';
-            }
-          })["catch"](function (e) {
-            return window.alert("Cannot get state: ".concat(e));
-          });
-        }
-        return _this2.getAdditionalColumns();
-      }).then(function (columnsForAdmin) {
-        _this2.calculateColumnsVisibility(null, null, columnsForAdmin);
-        var _buildTree2 = buildTree(_this2.objects, _this2.props),
-          info = _buildTree2.info,
-          root = _buildTree2.root;
-        _this2.root = root;
-        _this2.info = info;
 
-        // Show first selected item
-        var node = _this2.state.selected && _this2.state.selected.length && findNode(_this2.root, _this2.state.selected[0]);
-        _this2.lastAppliedFilter = null;
+              // read default history
+              this.defaultHistory = this.systemConfig.common.defaultHistory;
+              if (this.defaultHistory) {
+                props.socket.getState("system.adapter.".concat(this.defaultHistory, ".alive")).then(function (state) {
+                  if (!state || !state.val) {
+                    _this2.defaultHistory = '';
+                  }
+                })["catch"](function (e) {
+                  return window.alert("Cannot get state: ".concat(e));
+                });
+              }
+              _context4.next = 43;
+              return this.getAdditionalColumns();
+            case 43:
+              columnsForAdmin = _context4.sent;
+              this.calculateColumnsVisibility(null, null, columnsForAdmin);
+              _buildTree2 = buildTree(this.objects, this.props), info = _buildTree2.info, root = _buildTree2.root;
+              this.root = root;
+              this.info = info;
 
-        // If the selected ID is not visible, reset filter
-        if (node && !applyFilter(node, _this2.state.filter, _this2.props.lang, _this2.objects, null, null, props.customFilter, props.types)) {
-          // reset filter
-          _this2.setState({
-            filter: _objectSpread({}, DEFAULT_FILTER),
-            columnsForAdmin: columnsForAdmin
-          }, function () {
-            _this2.setState({
-              loaded: true,
-              updating: false
-            }, function () {
-              return _this2.expandAllSelected(function () {
-                return _this2.onAfterSelect();
-              });
-            });
-          });
-        } else {
-          _this2.setState({
-            loaded: true,
-            updating: false,
-            columnsForAdmin: columnsForAdmin
-          }, function () {
-            return _this2.expandAllSelected(function () {
-              return _this2.onAfterSelect();
-            });
-          });
-        }
-      })["catch"](function (e) {
-        return _this2.showError(e);
-      });
-    }
+              // Show first selected item
+              node = this.state.selected && this.state.selected.length && findNode(this.root, this.state.selected[0]);
+              this.lastAppliedFilter = null;
 
+              // If the selected ID is not visible, reset filter
+              if (node && !applyFilter(node, this.state.filter, this.props.lang, this.objects, null, null, props.customFilter, props.types)) {
+                // reset filter
+                this.setState({
+                  filter: _objectSpread({}, DEFAULT_FILTER),
+                  columnsForAdmin: columnsForAdmin
+                }, function () {
+                  _this2.setState({
+                    loaded: true,
+                    updating: false
+                  }, function () {
+                    return _this2.expandAllSelected(function () {
+                      return _this2.onAfterSelect();
+                    });
+                  });
+                });
+              } else {
+                this.setState({
+                  loaded: true,
+                  updating: false,
+                  columnsForAdmin: columnsForAdmin
+                }, function () {
+                  return _this2.expandAllSelected(function () {
+                    return _this2.onAfterSelect();
+                  });
+                });
+              }
+              _context4.next = 56;
+              break;
+            case 53:
+              _context4.prev = 53;
+              _context4.t2 = _context4["catch"](1);
+              this.showError(_context4.t2);
+            case 56:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4, this, [[1, 53]]);
+      }));
+      function loadAllObjects(_x5) {
+        return _loadAllObjects.apply(this, arguments);
+      }
+      return loadAllObjects;
+    }()
     /**
      * Check if it is a non-expert id
      *
@@ -3018,11 +3088,11 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
      * Called when component is mounted.
      */
     function () {
-      var _componentDidMount = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
-        return _regenerator["default"].wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+      var _componentDidMount = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
+        return _regenerator["default"].wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              _context4.next = 2;
+              _context5.next = 2;
               return this.loadAllObjects(!objectsAlreadyLoaded);
             case 2:
               if (this.props.objectsWorker) {
@@ -3034,9 +3104,9 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
               window.addEventListener('contextmenu', this.onContextMenu, true);
             case 5:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4, this);
+        }, _callee5, this);
       }));
       function componentDidMount() {
         return _componentDidMount.apply(this, arguments);
@@ -4068,47 +4138,47 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
   }, {
     key: "_exportObjects",
     value: (function () {
-      var _exportObjects2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(options) {
+      var _exportObjects2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(options) {
         var result, id, ids, _iterator2, _step2, _result$key, key, state, enums;
-        return _regenerator["default"].wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+        return _regenerator["default"].wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
               if (!options.isAll) {
-                _context5.next = 3;
+                _context6.next = 3;
                 break;
               }
               generateFile('allObjects.json', this.objects, options);
-              return _context5.abrupt("return");
+              return _context6.abrupt("return");
             case 3:
               if (this.state.selected.length || this.state.selectedNonObject) {
-                _context5.next = 6;
+                _context6.next = 6;
                 break;
               }
               window.alert(this.props.t('ra_Save of objects-tree is not possible'));
-              return _context5.abrupt("return");
+              return _context6.abrupt("return");
             case 6:
               result = {};
               id = this.state.selected[0] || this.state.selectedNonObject;
               ids = this._getSelectedIdsForExport();
               _iterator2 = _createForOfIteratorHelper(ids);
-              _context5.prev = 10;
+              _context6.prev = 10;
               _iterator2.s();
             case 12:
               if ((_step2 = _iterator2.n()).done) {
-                _context5.next = 23;
+                _context6.next = 23;
                 break;
               }
               key = _step2.value;
               result[key] = JSON.parse(JSON.stringify(this.objects[key]));
               // read states values
               if (!(((_result$key = result[key]) === null || _result$key === void 0 ? void 0 : _result$key.type) === 'state' && !options.noStatesByExportImport)) {
-                _context5.next = 20;
+                _context6.next = 20;
                 break;
               }
-              _context5.next = 18;
+              _context6.next = 18;
               return this.props.socket.getState(key);
             case 18:
-              state = _context5.sent;
+              state = _context6.sent;
               if (state) {
                 result[key].val = state.val;
                 result[key].ack = state.ack;
@@ -4122,28 +4192,28 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
                 }
               }
             case 21:
-              _context5.next = 12;
+              _context6.next = 12;
               break;
             case 23:
-              _context5.next = 28;
+              _context6.next = 28;
               break;
             case 25:
-              _context5.prev = 25;
-              _context5.t0 = _context5["catch"](10);
-              _iterator2.e(_context5.t0);
+              _context6.prev = 25;
+              _context6.t0 = _context6["catch"](10);
+              _iterator2.e(_context6.t0);
             case 28:
-              _context5.prev = 28;
+              _context6.prev = 28;
               _iterator2.f();
-              return _context5.finish(28);
+              return _context6.finish(28);
             case 31:
               generateFile("".concat(id, ".json"), result, options);
             case 32:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
-        }, _callee5, this, [[10, 25, 28, 31]]);
+        }, _callee6, this, [[10, 25, 28, 31]]);
       }));
-      function _exportObjects(_x5) {
+      function _exportObjects(_x6) {
         return _exportObjects2.apply(this, arguments);
       }
       return _exportObjects;
@@ -4398,7 +4468,9 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         disabled: !allowObjectCreation,
         onClick: function onClick() {
           return _this25.setState({
-            modalNewObj: true
+            modalNewObj: {
+              id: _this25.state.selected[0] || _this25.state.selectedNonObject
+            }
           });
         },
         size: "large"
@@ -6401,6 +6473,18 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         }
       });
     }
+  }, {
+    key: "showAddDataPointDialog",
+    value: function showAddDataPointDialog(id, initialType, initialStateType) {
+      this.setState({
+        showContextMenu: null,
+        modalNewObj: {
+          id: id,
+          initialType: initialType,
+          initialStateType: initialStateType
+        }
+      });
+    }
 
     /**
      * Renders the right mouse button context menu
@@ -6422,7 +6506,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       if (!this.state.showContextMenu) {
         return null;
       }
-      var item = this.state.showContextMenu;
+      var item = this.state.showContextMenu.item;
       var id = item.data.id;
       var items = [];
       // const ctrl = isIOS() ? '⌘' : (this.props.lang === 'de' ? 'Strg+' : 'Ctrl+');
@@ -6439,6 +6523,10 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         }
       }
       var enumEditable = !this.props.notEditable && obj && (this.state.filter.expertMode || obj.type === 'state' || obj.type === 'channel' || obj.type === 'device');
+      var createStateVisible = !item.data.obj || item.data.obj.type === 'folder' || item.data.obj.type === 'channel' || item.data.obj.type === 'device' || item.data.id === '0_userdata.0' || item.data.obj.type === 'meta';
+      var createChannelVisible = !item.data.obj || item.data.obj.type === 'folder' || item.data.obj.type === 'device' || item.data.id === '0_userdata.0' || item.data.obj.type === 'meta';
+      var createDeviceVisible = !item.data.obj || item.data.obj.type === 'folder' || item.data.id === '0_userdata.0' || item.data.obj.type === 'meta';
+      var createFolderVisible = !item.data.obj || item.data.obj.type === 'folder' || item.data.id === '0_userdata.0' || item.data.obj.type === 'meta';
       var ITEMS = {
         EDIT: {
           key: '0',
@@ -6612,6 +6700,80 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
             }
           }
         },
+        CREATE: {
+          key: '+',
+          visibility: (item.data.id.startsWith('0_userdata.0') || item.data.id.startsWith('javascript.')) && (createStateVisible || createChannelVisible || createDeviceVisible || createFolderVisible),
+          icon: /*#__PURE__*/_react["default"].createElement(_iconsMaterial.Add, {
+            fontSize: "small",
+            className: this.props.classes.cellButtonsButtonWithCustoms
+          }),
+          className: this.props.classes.contextMenuWithSubMenu,
+          label: this.texts.create,
+          subMenu: [{
+            label: this.texts.createBooleanState,
+            visibility: createStateVisible,
+            icon: /*#__PURE__*/_react["default"].createElement(_IconState["default"], {
+              fontSize: "small"
+            }),
+            onClick: function onClick() {
+              return _this46.showAddDataPointDialog(item.data.id, 'state', 'boolean');
+            }
+          }, {
+            label: this.texts.createNumberState,
+            visibility: createStateVisible,
+            icon: /*#__PURE__*/_react["default"].createElement(_IconState["default"], {
+              fontSize: "small"
+            }),
+            onClick: function onClick() {
+              return _this46.showAddDataPointDialog(item.data.id, 'state', 'number');
+            }
+          }, {
+            label: this.texts.createStringState,
+            visibility: createStateVisible,
+            icon: /*#__PURE__*/_react["default"].createElement(_IconState["default"], {
+              fontSize: "small"
+            }),
+            onClick: function onClick() {
+              return _this46.showAddDataPointDialog(item.data.id, 'state', 'string');
+            }
+          }, {
+            label: this.texts.createState,
+            visibility: createStateVisible,
+            icon: /*#__PURE__*/_react["default"].createElement(_IconState["default"], {
+              fontSize: "small"
+            }),
+            onClick: function onClick() {
+              return _this46.showAddDataPointDialog(item.data.id, 'state');
+            }
+          }, {
+            label: this.texts.createChannel,
+            visibility: createChannelVisible,
+            icon: /*#__PURE__*/_react["default"].createElement(_IconChannel["default"], {
+              fontSize: "small"
+            }),
+            onClick: function onClick() {
+              return _this46.showAddDataPointDialog(item.data.id, 'channel');
+            }
+          }, {
+            label: this.texts.createDevice,
+            visibility: createDeviceVisible,
+            icon: /*#__PURE__*/_react["default"].createElement(_IconDevice["default"], {
+              fontSize: "small"
+            }),
+            onClick: function onClick() {
+              return _this46.showAddDataPointDialog(item.data.id, 'device');
+            }
+          }, {
+            label: this.texts.createFolder,
+            icon: /*#__PURE__*/_react["default"].createElement(_iconsMaterial.CreateNewFolder, {
+              fontSize: "small"
+            }),
+            visibility: createFolderVisible,
+            onClick: function onClick() {
+              return _this46.showAddDataPointDialog(item.data.id, 'folder');
+            }
+          }]
+        },
         DELETE: {
           key: 'Delete',
           visibility: this.props.onObjectDelete && (((_item$children6 = item.children) === null || _item$children6 === void 0 ? void 0 : _item$children6.length) || obj && !((_obj$common15 = obj.common) !== null && _obj$common15 !== void 0 && _obj$common15.dontDelete)),
@@ -6636,16 +6798,59 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       };
       Object.keys(ITEMS).forEach(function (key) {
         if (ITEMS[key].visibility) {
-          items.push( /*#__PURE__*/_react["default"].createElement(_material.MenuItem, {
-            key: key,
-            onClick: ITEMS[key].onClick,
-            className: ITEMS[key].className
-          }, /*#__PURE__*/_react["default"].createElement(_material.ListItemIcon, {
-            style: ITEMS[key].iconStyle,
-            className: ITEMS[key].listItemIconClass
-          }, ITEMS[key].icon), /*#__PURE__*/_react["default"].createElement(_material.ListItemText, null, ITEMS[key].label), ITEMS[key].key ? /*#__PURE__*/_react["default"].createElement("div", {
-            className: _this46.props.classes.contextMenuKeys
-          }, "Alt+".concat(ITEMS[key].key === 'Delete' ? _this46.props.t('ra_Del') : ITEMS[key].key)) : null));
+          if (ITEMS[key].subMenu) {
+            items.push( /*#__PURE__*/_react["default"].createElement(_material.MenuItem, {
+              key: key,
+              onClick: function onClick(e) {
+                return _this46.setState({
+                  showContextMenu: {
+                    item: _this46.state.showContextMenu.item,
+                    subItem: key,
+                    subAnchor: e.target
+                  }
+                });
+              },
+              className: ITEMS[key].className
+            }, /*#__PURE__*/_react["default"].createElement(_material.ListItemIcon, {
+              style: ITEMS[key].iconStyle,
+              className: ITEMS[key].listItemIconClass
+            }, ITEMS[key].icon), /*#__PURE__*/_react["default"].createElement(_material.ListItemText, null, ITEMS[key].label, "..."), /*#__PURE__*/_react["default"].createElement(_material.ListItemSecondaryAction, null, /*#__PURE__*/_react["default"].createElement(_iconsMaterial.ArrowRight, null))));
+            if (_this46.state.showContextMenu.subItem === key) {
+              items.push( /*#__PURE__*/_react["default"].createElement(_material.Menu, {
+                key: "subContextMenu",
+                open: !0,
+                anchorEl: _this46.state.showContextMenu.subAnchor,
+                onClose: function onClose() {
+                  _this46.setState({
+                    showContextMenu: {
+                      item: _this46.state.showContextMenu.item
+                    }
+                  });
+                  _this46.contextMenu = null;
+                }
+              }, ITEMS[key].subMenu.map(function (subItem) {
+                return subItem.visibility ? /*#__PURE__*/_react["default"].createElement(_material.MenuItem, {
+                  key: subItem.label,
+                  onClick: subItem.onClick,
+                  className: subItem.className
+                }, /*#__PURE__*/_react["default"].createElement(_material.ListItemIcon, {
+                  style: subItem.iconStyle,
+                  className: subItem.listItemIconClass
+                }, subItem.icon), /*#__PURE__*/_react["default"].createElement(_material.ListItemText, null, subItem.label)) : null;
+              })));
+            }
+          } else {
+            items.push( /*#__PURE__*/_react["default"].createElement(_material.MenuItem, {
+              key: key,
+              onClick: ITEMS[key].onClick,
+              className: ITEMS[key].className
+            }, /*#__PURE__*/_react["default"].createElement(_material.ListItemIcon, {
+              style: ITEMS[key].iconStyle,
+              className: ITEMS[key].listItemIconClass
+            }, ITEMS[key].icon), /*#__PURE__*/_react["default"].createElement(_material.ListItemText, null, ITEMS[key].label), ITEMS[key].key ? /*#__PURE__*/_react["default"].createElement("div", {
+              className: _this46.props.classes.contextMenuKeys
+            }, "Alt+".concat(ITEMS[key].key === 'Delete' ? _this46.props.t('ra_Del') : ITEMS[key].key)) : null));
+          }
         }
       });
       if (!items.length) {