@iobroker/adapter-react-v5 3.0.17 → 3.1.0

package/Components/FileBrowser.js

@@ -348,7 +348,10 @@ var styles = function styles(theme) {
       width: 'calc(100% - 40px)',
       height: 'calc(100% - 40px)',
       position: 'relative',
-      color: theme.palette.mode === 'dark' ? '#222' : '#CCC'
+      color: theme.palette.mode === 'dark' ? '#222' : '#CCC',
+      display: 'flex',
+      alignItems: 'center',
+      justifyContent: 'center'
     },
     uploadCenterIcon: {
       width: '25%',
@@ -364,14 +367,7 @@ var styles = function styles(theme) {
       top: 30,
       right: 30
     },
-    uploadCenterTextAndIcon: {
-      position: 'absolute',
-      top: '50%',
-      left: '50%',
-      height: '30%',
-      width: '50%',
-      margin: '-15% 0 0 -25%'
-    },
+    uploadCenterTextAndIcon: {},
     menuButtonExpertActive: {
       color: '#c00000'
     },
@@ -428,6 +424,9 @@ var styles = function styles(theme) {
         textAlign: 'end',
         direction: 'rtl'
       }
+    },
+    specialFolder: {
+      color: theme.palette.mode === 'dark' ? '#229b0f' : '#5dd300'
     }
   };
 };
@@ -856,13 +855,20 @@ var FileBrowser = /*#__PURE__*/function (_Component) {
           var _folders = [];
           var userData = null; // load only adapter.admin and not other meta files like hm-rpc.0.devices.blablabla
 
-          objs = objs.filter(function (obj) {
-            if (!_this7.state.expertMode) {
-              return obj._id === '0_userdata.0' || obj._id === 'vis.0';
-            } else {
-              return obj._id.split('.').length <= 2;
-            }
-          }); // remember, that all folders are loaded
+          if (!_this7.state.expertMode) {
+            objs = objs.filter(function (obj) {
+              return !obj._id.endsWith('.admin');
+            });
+          }
+
+          var pos = objs.findIndex(function (obj) {
+            return obj._id === 'system.meta.uuid';
+          });
+
+          if (pos !== -1) {
+            objs.splice(pos, 1);
+          } // remember, that all folders are loaded
+
 
           if (_this7.state.expertMode) {
             _this7.setState({
@@ -1077,12 +1083,14 @@ var FileBrowser = /*#__PURE__*/function (_Component) {
 
       var Icon = expanded ? _IconOpen["default"] : _IconClosed["default"];
       var padding = this.state.viewType === TABLE ? item.level * this.levelPadding : 0;
+      var isUserData = item.name === USER_DATA;
+      var isSpecialData = isUserData || item.name === 'vis.0';
       return /*#__PURE__*/_react["default"].createElement("div", {
         key: item.id,
         id: item.id,
         style: this.state.viewType === TABLE ? {
           marginLeft: padding,
-          width: 'calc(100% - ' + padding + 'px'
+          width: "calc(100% - ".concat(padding, "px")
         } : {},
         onClick: function onClick(e) {
           return _this11.state.viewType === TABLE ? _this11.select(item.id, e) : _this11.changeFolder(e, item.id);
@@ -1093,13 +1101,13 @@ var FileBrowser = /*#__PURE__*/function (_Component) {
         title: item.title && (0, _typeof2["default"])(item.title) === 'object' ? item.title[this.props.lang] || item.title.end || '' : item.title || null,
         className: _Utils["default"].clsx('browserItem', this.props.classes['item' + this.state.viewType], this.props.classes['itemFolder' + this.state.viewType], this.state.selected === item.id && this.props.classes.itemSelected, item.temp && this.props.classes['itemFolderTemp'])
       }, /*#__PURE__*/_react["default"].createElement(Icon, {
-        className: this.props.classes['itemFolderIcon' + this.state.viewType],
+        className: _Utils["default"].clsx(this.props.classes['itemFolderIcon' + this.state.viewType], isSpecialData && this.props.classes.specialFolder),
         onClick: this.state.viewType === TABLE ? function (e) {
           return _this11.toggleFolder(item, e);
         } : undefined
       }), /*#__PURE__*/_react["default"].createElement("div", {
         className: _Utils["default"].clsx(this.props.classes['itemName' + this.state.viewType], this.props.classes['itemNameFolder' + this.state.viewType])
-      }, item.name === USER_DATA ? this.props.t('ra_User files') : item.name), /*#__PURE__*/_react["default"].createElement(_material.Hidden, {
+      }, isUserData ? this.props.t('ra_User files') : item.name), /*#__PURE__*/_react["default"].createElement(_material.Hidden, {
         smDown: true
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: this.props.classes['itemSize' + this.state.viewType]
@@ -1265,7 +1273,7 @@ var FileBrowser = /*#__PURE__*/function (_Component) {
         },
         style: this.state.viewType === TABLE ? {
           marginLeft: padding,
-          width: 'calc(100% - ' + padding + 'px)'
+          width: "calc(100% - ".concat(padding, "px)")
         } : {},
         className: _Utils["default"].clsx('browserItem', this.props.classes['item' + this.state.viewType], this.props.classes['itemFile' + this.state.viewType], this.state.selected === item.id && this.props.classes.itemSelected)
       }, _FileViewer.EXTENSIONS.images.includes(ext) ? this.state.fileErrors.includes(item.id) ? /*#__PURE__*/_react["default"].createElement(_IconNoIcon["default"], {
@@ -1348,12 +1356,8 @@ var FileBrowser = /*#__PURE__*/function (_Component) {
     value: function renderItems(folderId) {
       var _this15 = this;
 
-      if (folderId && folderId !== '/' && !this.state.expertMode && folderId !== USER_DATA && !folderId.startsWith(USER_DATA) && folderId !== 'vis.0' && !folderId.startsWith('vis.0/')) {
-        return null;
-      } // tile
-
-
       if (this.state.folders && this.state.folders[folderId]) {
+        // tile
         if (this.state.viewType === TILE) {
           var res = [];
 
@@ -1362,10 +1366,6 @@ var FileBrowser = /*#__PURE__*/function (_Component) {
           }
 
           this.state.folders[folderId].forEach(function (item) {
-            if (!_this15.state.expertMode && item.id !== USER_DATA && !item.id.startsWith(USER_DATA) && item.id !== 'vis.0' && !item.id.startsWith('vis.0/')) {
-              return;
-            }
-
             if (item.folder) {
               res.push(_this15.renderFolder(item));
             } else if ((!_this15.props.filterFiles || _this15.props.filterFiles.includes(item.ext)) && (!_this15.props.filterByType || _FileViewer.EXTENSIONS[_this15.props.filterByType].includes(item.ext))) {
@@ -1377,10 +1377,6 @@ var FileBrowser = /*#__PURE__*/function (_Component) {
           return this.state.folders[folderId].map(function (item) {
             var res = [];
 
-            if (item.id && item.id !== '/' && !_this15.state.expertMode && item.id !== USER_DATA && !item.id.startsWith(USER_DATA) && item.id !== 'vis.0' && !item.id.startsWith('vis.0/')) {
-              return null;
-            }
-
             if (item.folder) {
               var expanded = _this15.state.expanded.includes(item.id);
 
@@ -1718,18 +1714,10 @@ var FileBrowser = /*#__PURE__*/function (_Component) {
 
                 _this19.uploadFile(id, reader.result).then(function () {
                   if (! --count) {
-                    var folders = {};
-                    Object.keys(_this19.state.folders).forEach(function (name) {
-                      if (name !== parentFolder && !name.startsWith(parentFolder + '/')) {
-                        folders[name] = _this19.state.folders[name];
-                      }
-                    });
-
                     _this19.setState({
-                      uploadFile: false,
-                      folders: folders
+                      uploadFile: false
                     }, function () {
-                      return _this19.browseFolders((0, _toConsumableArray2["default"])(_this19.state.expanded), folders).then(function (folders) {
+                      if (_this19.supportSubscribes) {
                         // open current folder
                         var expanded = (0, _toConsumableArray2["default"])(_this19.state.expanded);
 
@@ -1740,12 +1728,31 @@ var FileBrowser = /*#__PURE__*/function (_Component) {
                         }
 
                         _this19.setState({
-                          folders: folders,
                           expanded: expanded
                         }, function () {
                           return _this19.select(id);
                         });
-                      });
+                      } else {
+                        setTimeout(function () {
+                          return _this19.browseFolder(parentFolder, true).then(function (folders) {
+                            // open current folder
+                            var expanded = (0, _toConsumableArray2["default"])(_this19.state.expanded);
+
+                            if (!expanded.includes(parentFolder)) {
+                              expanded.push(parentFolder);
+                              expanded.sort();
+                              window.localStorage.setItem('files.expanded', JSON.stringify(expanded));
+                            }
+
+                            _this19.setState({
+                              folders: folders,
+                              expanded: expanded
+                            }, function () {
+                              return _this19.select(id);
+                            });
+                          });
+                        }, 500);
+                      }
                     });
                   }
                 });
@@ -1838,28 +1845,40 @@ var FileBrowser = /*#__PURE__*/function (_Component) {
         deleteItem: ''
       }, function () {
         return _this21.deleteRecursive(_deleteItem).then(function () {
+          var newState = {};
+
           var pos = _this21.state.expanded.indexOf(_deleteItem);
 
           if (pos !== -1) {
             var expanded = (0, _toConsumableArray2["default"])(_this21.state.expanded);
             expanded.splice(pos, 1);
             window.localStorage.setItem('files.expanded', JSON.stringify(expanded));
-
-            _this21.setState({
-              expanded: expanded
-            });
+            newState.expanded = expanded;
           }
-          /*let parentFolder = this.findFirstFolder(deleteItem);
-          const folders = {};
-          Object.keys(this.state.folders).forEach(name => {
+
+          if (!_this21.supportSubscribes) {
+            var parentFolder = _this21.findFirstFolder(_deleteItem);
+
+            var folders = {};
+            Object.keys(_this21.state.folders).forEach(function (name) {
               if (name !== parentFolder && !name.startsWith(parentFolder + '/')) {
-                  folders[name] = this.state.folders[name];
+                folders[name] = _this21.state.folders[name];
               }
-          });
-          this.setState({ folders }, () =>
-              this.browseFolders([...this.state.expanded], folders)
-                  .then(folders => this.setState({ folders })));*/
+            });
+            newState.folders = folders;
 
+            _this21.setState(newState, function () {
+              return setTimeout(function () {
+                return _this21.browseFolders((0, _toConsumableArray2["default"])(_this21.state.expanded), folders).then(function (folders) {
+                  return _this21.setState({
+                    folders: folders
+                  });
+                });
+              }, 200);
+            });
+          } else {
+            _this21.setState(newState);
+          }
         });
       });
     }