IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/v2.5.0' of github.com:ONLYOFFICE/DocSpace-client into release/v2.5.0

Browse Source
This commit is contained in:
Nikita Gopienko 2024-04-01 13:54:56 +03:00
commit d8a11dad31
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/client/src/pages/PortalSettings/categories/integration/ThirdPartyServicesSettings/index.js
View File

@ -195,11 +195,12 @@ class ThirdPartyServices extends React.Component {
const filteredConsumers = consumers.filter(
(consumer) =>
consumer.title !== "Bitly" &&
consumer.title !== "WordPress" &&
consumer.title !== "DocuSign" &&
consumer.name !== "bitly" &&
consumer.name !== "wordpress" &&
consumer.name !== "docusign" &&
consumer.name !== "clickatell" && //TODO: hide while 2fa by sms is not working
consumer.name !== "twilio",
consumer.name !== "twilio" &&
consumer.name !== "selectel",
);
const freeConsumers = filteredConsumers.filter(

4
packages/client/src/store/ContextOptionsStore.js
View File

@ -356,6 +356,8 @@ class ContextOptionsStore {
const { shared, navigationPath, canCopyPublicLink } =
this.selectedFolderStore;
const isArchive = item.rootFolderType === FolderType.Archive;
const { href } = item;
const sharedItem = navigationPath.find((r) => r.shared);
@ -363,7 +365,7 @@ class ContextOptionsStore {
(sharedItem && sharedItem.canCopyPublicLink) ||
(shared && canCopyPublicLink);
if (isShared && !item.isFolder) {
if (isShared && !item.isFolder && !isArchive) {
const fileLinkData = await getFileLink(item.id);
copy(fileLinkData.sharedTo.shareLink);
return toastr.success(t("Translations:LinkCopySuccess"));