Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0

packages/asc-web-components/table-container/TableHeader.js

@@ -198,7 +198,12 @@ class TableHeader extends React.Component {
   };
 
   onResize = () => {
-    const { containerRef, columnStorageName, checkboxSize } = this.props;
+    const {
+      containerRef,
+      columnStorageName,
+      checkboxSize,
+      resetColumnsSize,
+    } = this.props;
 
     let activeColumnIndex = null;
 
@@ -208,7 +213,8 @@ class TableHeader extends React.Component {
 
     if (!container) return;
 
-    const storageSize = localStorage.getItem(columnStorageName);
+    const storageSize =
+      !resetColumnsSize && localStorage.getItem(columnStorageName);
     const tableContainer = storageSize
       ? storageSize.split(" ")
       : container.style.gridTemplateColumns.split(" ");
@@ -412,6 +418,7 @@ TableHeader.propTypes = {
   headerMenu: PropTypes.arrayOf(PropTypes.object),
   onClick: PropTypes.func,
   hasAccess: PropTypes.bool,
+  resetColumnsSize: PropTypes.bool,
 };
 
 export default TableHeader;

products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableHeader.js

@@ -11,7 +11,7 @@ class FilesTableHeader extends React.Component {
   constructor(props) {
     super(props);
 
-    const { t, withContent } = props;
+    const { t, withContent, personal } = props;
 
     const defaultColumns = [
       {
@@ -78,9 +78,17 @@ class FilesTableHeader extends React.Component {
       },
     ];
 
-    const columns = this.getColumns(defaultColumns);
+    personal && defaultColumns.splice(1, 1);
 
-    this.state = { columns };
+    const storageColumns = localStorage.getItem(TABLE_COLUMNS);
+    const splitColumns = storageColumns && storageColumns.split(",");
+    const columns = this.getColumns(defaultColumns, splitColumns);
+    const resetColumnsSize =
+      splitColumns && splitColumns.length !== columns.length;
+    const tableColumns = columns.map((c) => c.enable && c.key);
+    resetColumnsSize && localStorage.setItem(TABLE_COLUMNS, tableColumns);
+
+    this.state = { columns, resetColumnsSize };
   }
 
   componentDidUpdate(prevProps) {
@@ -94,13 +102,10 @@ class FilesTableHeader extends React.Component {
     }
   }
 
-  getColumns = (defaultColumns) => {
-    const storageColumns = localStorage.getItem(TABLE_COLUMNS);
+  getColumns = (defaultColumns, splitColumns) => {
     const columns = [];
 
-    if (storageColumns) {
-      const splitColumns = storageColumns.split(",");
-
+    if (splitColumns) {
       for (let col of defaultColumns) {
         const column = splitColumns.find((key) => key === col.key);
         column ? (col.enable = true) : (col.enable = false);
@@ -168,7 +173,7 @@ class FilesTableHeader extends React.Component {
 
     const { sortBy, sortOrder } = filter;
 
-    const { columns } = this.state;
+    const { columns, resetColumnsSize } = this.state;
 
     const checkboxOptions = (
       <>
@@ -232,6 +237,7 @@ class FilesTableHeader extends React.Component {
         isChecked={isHeaderChecked}
         isIndeterminate={isHeaderIndeterminate}
         headerMenu={getHeaderMenu(t)}
+        resetColumnsSize={resetColumnsSize}
       />
     );
   }
@@ -239,6 +245,7 @@ class FilesTableHeader extends React.Component {
 
 export default inject(
   ({
+    auth,
     filesStore,
     filesActionsStore,
     selectedFolderStore,
@@ -258,6 +265,7 @@ export default inject(
     const { isPrivacyFolder } = treeFoldersStore;
 
     const withContent = canShare || (canShare && isPrivacyFolder && isDesktop);
+    const { personal } = auth.settingsStore;
 
     return {
       isHeaderVisible,
@@ -266,6 +274,7 @@ export default inject(
       filter,
       selectedFolderId: selectedFolderStore.id,
       withContent,
+      personal,
 
       setSelected,
       setIsLoading,

products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js

@@ -86,6 +86,7 @@ const FilesTableRow = (props) => {
     onDrop,
     onMouseDown,
     showShare,
+    personal,
   } = props;
 
   const sharedButton =
@@ -158,9 +159,11 @@ const FilesTableRow = (props) => {
           <FileNameCell {...props} />
           <StyledBadgesContainer>{badgesComponent}</StyledBadgesContainer>
         </TableCell>
-        <TableCell {...dragStyles} {...selectionProp}>
-          <AuthorCell sideColor={sideColor} {...props} />
-        </TableCell>
+        {!personal && (
+          <TableCell {...dragStyles} {...selectionProp}>
+            <AuthorCell sideColor={sideColor} {...props} />
+          </TableCell>
+        )}
         <TableCell {...dragStyles} {...selectionProp}>
           <DateCell create sideColor={sideColor} {...props} />
         </TableCell>