From 4438ec1066da0b0f3228f1e9ea5df7e9e88d8adf Mon Sep 17 00:00:00 2001 From: gopienkonikita Date: Wed, 24 May 2023 17:05:30 +0300 Subject: [PATCH] Web: Files: hidden share menu, fixed download icon, fixed socket --- packages/client/src/components/QuickButtons.js | 3 ++- .../Body/views/Members/sub-components/LinkRow.js | 12 ++++++------ packages/common/api/files/index.js | 6 ++++-- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/packages/client/src/components/QuickButtons.js b/packages/client/src/components/QuickButtons.js index 68c6d42c85..f9dc57085d 100644 --- a/packages/client/src/components/QuickButtons.js +++ b/packages/client/src/components/QuickButtons.js @@ -63,7 +63,8 @@ const QuickButtons = (props) => { const isAvailableLockFile = !folderCategory && fileExst && displayBadges && item.security.Lock; - const isAvailableDownloadFile = isPublicRoom && item.security.Download; + const isAvailableDownloadFile = + isPublicRoom && item.security.Download && viewAs === "tile"; return (
diff --git a/packages/client/src/pages/Home/InfoPanel/Body/views/Members/sub-components/LinkRow.js b/packages/client/src/pages/Home/InfoPanel/Body/views/Members/sub-components/LinkRow.js index c07009bc07..ec6bf2037c 100644 --- a/packages/client/src/pages/Home/InfoPanel/Body/views/Members/sub-components/LinkRow.js +++ b/packages/client/src/pages/Home/InfoPanel/Body/views/Members/sub-components/LinkRow.js @@ -104,12 +104,12 @@ const LinkRow = (props) => { key: "edit-link-separator", isSeparator: true, }, - { - key: "share-key", - label: t("Files:Share"), - icon: ShareReactSvgUrl, - // onClick: () => args.onClickLabel("label2"), - }, + // { + // key: "share-key", + // label: t("Files:Share"), + // icon: ShareReactSvgUrl, + // // onClick: () => args.onClickLabel("label2"), + // }, { key: "embedding-settings-key", label: t("Files:EmbeddingSettings"), diff --git a/packages/common/api/files/index.js b/packages/common/api/files/index.js index 94fa68c4f0..b2499024c3 100644 --- a/packages/common/api/files/index.js +++ b/packages/common/api/files/index.js @@ -440,10 +440,12 @@ export function createHtmlFileInCommon(title, content) { return request(options); } -export function getFileInfo(fileId) { +export function getFileInfo(fileId, publicKey) { + const key = publicKey ? `?share=${publicKey}` : ""; + const options = { method: "get", - url: `/files/file/${fileId}`, + url: `/files/file/${fileId}${key}`, }; return request(options);