From 0a4eec1f9ef1dd0d6871b9bd2c85b048416c6c96 Mon Sep 17 00:00:00 2001 From: gopienkonikita Date: Fri, 16 Aug 2024 16:04:25 +0300 Subject: [PATCH 1/3] Web: Files: fixed drag access --- packages/client/src/HOCs/withFileActions.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/client/src/HOCs/withFileActions.js b/packages/client/src/HOCs/withFileActions.js index 105767bbaa..3f839a7cbf 100644 --- a/packages/client/src/HOCs/withFileActions.js +++ b/packages/client/src/HOCs/withFileActions.js @@ -270,12 +270,12 @@ export default function withFileActions(WrappedFileItem) { isRecentTab, canDrag, } = this.props; - const { access, id } = item; + const { id, security } = item; const isDragging = !isDisabledDropItem && isFolder && - access < 2 && + security?.MoveTo && !isTrashFolder && !isPrivacy; From 034dd5026e0586b08937495da432396b3e75c51e Mon Sep 17 00:00:00 2001 From: gopienkonikita Date: Fri, 16 Aug 2024 16:07:08 +0300 Subject: [PATCH 2/3] Web: Components: TabledHeader: removed log --- packages/shared/components/table/TableHeader.tsx | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/shared/components/table/TableHeader.tsx b/packages/shared/components/table/TableHeader.tsx index 64a988c352..56f529a56a 100644 --- a/packages/shared/components/table/TableHeader.tsx +++ b/packages/shared/components/table/TableHeader.tsx @@ -233,11 +233,6 @@ class TableHeaderComponent extends React.Component< const defaultSize = columns[activeColumnIndex - 1].defaultSize; - if (!Array.isArray(clearSize)) { - console.log("addNewColumns clearSize", clearSize); - return true; - } - const indexOfMaxSize = clearSize.findLastIndex((s) => s === maxSize); const addedColumn = 1; From d0579f97277f48181b5f8a5ef80a6610f3f8025d Mon Sep 17 00:00:00 2001 From: gopienkonikita Date: Fri, 16 Aug 2024 16:24:41 +0300 Subject: [PATCH 3/3] Web: Files: fixed getCurrentTabId --- .../client/src/pages/PortalSettings/categories/common/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/pages/PortalSettings/categories/common/index.js b/packages/client/src/pages/PortalSettings/categories/common/index.js index afda2978c2..62b3ab7a5b 100644 --- a/packages/client/src/pages/PortalSettings/categories/common/index.js +++ b/packages/client/src/pages/PortalSettings/categories/common/index.js @@ -88,7 +88,7 @@ const TabsCommon = (props) => { const getCurrentTabId = () => { const path = location.pathname; const currentTab = data.find((item) => path.includes(item.id)); - return currentTab !== -1 && data.length ? currentTab.id : data[0].id; + return currentTab && data.length ? currentTab.id : data[0].id; }; const currentTabId = getCurrentTabId();