Merge branch 'feature/thirdparty-integrations' of github.com:ONLYOFFICE/AppServer into feature/thirdparty-integrations

products/ASC.Files/Client/src/components/dialogs/ConnectDialog/index.js

@@ -27,6 +27,7 @@ import {
   loopTreeFolders,
   getMyFolderId,
   getCommonFolderId,
+  getThirdPartyProviders,
 } from "../../../store/files/selectors";
 import { withTranslation, I18nextProvider } from "react-i18next";
 import { connect } from "react-redux";
@@ -83,6 +84,7 @@ const PureConnectDialogContainer = (props) => {
     commonFolderId,
     setIsLoading,
     setSelectedNode,
+    providers,
   } = props;
   const { corporate, title, link, token, provider_id, provider_key } = item;
 
@@ -99,6 +101,10 @@ const PureConnectDialogContainer = (props) => {
   const onChangeFolderName = (e) => setCustomerTitleValue(e.target.value);
   const onChangeMakeShared = (e) => setMakeShared(!isCorporate);
 
+  const folderTitle = providers.find(
+    (el) => el.provider_key === item.provider_key
+  ).customer_title;
+
   const onSave = () => {
     onClose();
     setIsLoading(true);
@@ -187,7 +193,7 @@ const PureConnectDialogContainer = (props) => {
             <Text className="dialog-form-text">{t("ConnectFolderTitle")}</Text>
             <TextInput
               scale
-              value={`${customerTitle}`}
+              value={`${folderTitle}`}
               onChange={onChangeFolderName}
             />
           </div>
@@ -226,6 +232,7 @@ const mapStateToProps = (state) => {
     treeFolders: getTreeFolders(state),
     myFolderId: getMyFolderId(state),
     commonFolderId: getCommonFolderId(state),
+    providers: getThirdPartyProviders(state),
   };
 };
 

products/ASC.Files/Client/src/components/pages/Settings/Section/Body/ConnectedClouds.js

@@ -21,6 +21,7 @@ import {
   setConnectItem,
   setShowThirdPartyPanel,
   fetchFiles,
+  setSelectedNode,
 } from "../../../../../store/files/actions";
 import {
   getThirdPartyCapabilities,
@@ -255,13 +256,18 @@ class ConnectClouds extends React.Component {
   };
 
   openLocation = (e) => {
-    const { myDirectoryFolders, filter, fetchFiles } = this.props;
+    const {
+      myDirectoryFolders,
+      filter,
+      fetchFiles,
+      setSelectedNode,
+    } = this.props;
     const provider = e.currentTarget.dataset.providerKey;
     const id = myDirectoryFolders
       .filter((f) => f.providerKey === provider)
       .map((f) => f.id)
       .join();
-    return fetchFiles(id, filter);
+    return fetchFiles(id, filter).then(() => setSelectedNode([id]));
   };
 
   render() {
@@ -551,4 +557,5 @@ export default connect(mapStateToProps, {
   setConnectItem,
   setShowThirdPartyPanel,
   fetchFiles,
+  setSelectedNode,
 })(withTranslation()(ConnectClouds));

products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js

@@ -100,9 +100,10 @@ class OperationsPanelComponent extends React.Component {
       return onClose();
     } else {
       const isProviderFolder = selection.find((x) => !x.providerKey);
-      const items = isProviderFolder
-        ? selection.filter((x) => !x.providerKey)
-        : selection;
+      const items =
+        isProviderFolder && !isCopy
+          ? selection.filter((x) => !x.providerKey)
+          : selection;
 
       for (let item of items) {
         if (item.fileExst) {

products/ASC.Files/Server/Controllers/FilesController.cs

@@ -1767,6 +1767,12 @@ namespace ASC.Api.Documents
             return FilesControllerHelperInt.SetAceLink(fileId, model.Share);
         }
 
+        [Update("{fileId}/setacelink")]
+        public bool SetAceLink(string fileId, [FromBody] GenerateSharedLinkModel model)
+        {
+            return FilesControllerHelperString.SetAceLink(fileId, model.Share);
+        }
+
         /// <summary>
         ///   Get a list of available providers
         /// </summary>

web/ASC.Web.Common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "asc-web-common",
-  "version": "1.0.314",
+  "version": "1.0.315",
   "description": "Ascensio System SIA common components and solutions library",
   "license": "AGPL-3.0",
   "files": [

web/ASC.Web.Common/src/store/auth/reducer.js

@@ -25,6 +25,10 @@ import { LANGUAGE } from "../../constants";
 const desktop = window["AscDesktopEditor"] !== undefined;
 const desktopEncryption =
   desktop && typeof window.AscDesktopEditor.cloudCryptoCommand === "function";
+const lang = localStorage
+  .getItem("language")
+  .split("-")
+  .find((el) => el[0]);
 
 const initialState = {
   isAuthenticated: false,
@@ -58,8 +62,7 @@ const initialState = {
     enableAdmMess: false,
     urlLicense: "https://gnu.org/licenses/gpl-3.0.html",
     urlSupport: "https://helpdesk.onlyoffice.com/",
-    urlAuthKeys:
-      "https://helpcenter.onlyoffice.com/ru/installation/groups-authorization-keys.aspx",
+    urlAuthKeys: `https://helpcenter.onlyoffice.com/${lang}/installation/groups-authorization-keys.aspx`,
     logoUrl: "",
     customNames: {
       id: "Common",