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

Merge branch 'release/1.0.0' into bugfix/profile-form-validation

Browse Source
This commit is contained in:
Tatiana Lopaeva 2021-10-06 13:32:50 +03:00
commit e734f222f5
8 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/asc-web-common/desktop/index.js
View File

@ -4,8 +4,8 @@ import omit from "lodash/omit";
export const desktopConstants = Object.freeze({
domain: window.location.origin,
provider: "AppServer",
guid: "{FFF0E1EB-13DB-4678-B67D-FF0A41DBBCEF}",
provider: "onlyoffice",
cryptoEngineId: "{FFF0E1EB-13DB-4678-B67D-FF0A41DBBCEF}",
});
export function regDesktop(
@ -33,7 +33,7 @@ export function regDesktop(
extendedData = {
...data,
encryptionKeys: {
cryptoEngineId: desktopConstants.guid,
cryptoEngineId: desktopConstants.cryptoEngineId,
},
};

2
packages/asc-web-common/store/AuthStore.js
View File

@ -256,7 +256,7 @@ class AuthStore {
window.AscDesktopEditor.cloudCryptoCommand(
"share",
{
cryptoEngineId: desktopConstants.guid,
cryptoEngineId: desktopConstants.cryptoEngineId,
file: [file.viewUrl],
keys: keys,
},

1
products/ASC.Files/Client/src/components/dialogs/DownloadDialog/index.js
View File

@ -86,6 +86,7 @@ class DownloadDialogComponent extends React.Component {
window.open(viewUrl, "_self");
this.onClose();
} else if (fileConvertIds.length || folderIds.length) {
this.onClose();
downloadFiles(fileConvertIds, folderIds, t("Translations:ArchivingData"));
}
};

1
products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js
View File

@ -136,7 +136,6 @@ const SelectFileDialogAsideView = ({
isDisabled={selectedFile.length === 0}
/>
<Button
primary
size="big"
label={t("Common:CloseButton")}
onClick={onClose}

1
products/ASC.Files/Client/src/components/panels/SelectFileDialog/ModalView.js
View File

@ -242,7 +242,6 @@ class SelectFileDialogModalView extends React.Component {
/>
<Button
className="modal-dialog-button"
primary
size="medium"
label={t("Common:CloseButton")}
onClick={onClose}

1
products/ASC.Files/Client/src/components/panels/SelectFolderDialog/AsideView.js
View File

@ -92,7 +92,6 @@ const SelectFolderDialogAsideView = ({
isDisabled={isLoadingData || !isAvailable || !canCreate}
/>
<Button
primary
size="big"
label={t("Common:CloseButton")}
onClick={onClose}

1
products/ASC.Files/Client/src/components/panels/SelectFolderDialog/ModalView.js
View File

@ -69,7 +69,6 @@ const SelectFolderDialogModalView = ({
isDisabled={isLoadingData || !isAvailable || !canCreate}
/>
<Button
primary
size="medium"
label={t("Common:CloseButton")}
onClick={onClose}

4
products/ASC.Files/Client/src/helpers/desktop.js
View File

@ -8,7 +8,7 @@ export function encryptionUploadDialog(callback) {
const filter = docserviceStore.encryptedDocs.map((f) => "*" + f).join(" ");
const data = {
cryptoEngineId: desktopConstants.guid,
cryptoEngineId: desktopConstants.cryptoEngineId,
filter: filter,
};
@ -30,7 +30,7 @@ export function setEncryptionAccess(file) {
window.AscDesktopEditor.cloudCryptoCommand(
"share",
{
cryptoEngineId: desktopConstants.guid,
cryptoEngineId: desktopConstants.cryptoEngineId,
file: [file.viewUrl],
keys: keys,
},