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

Applied new MustConvert in viewAccessibility

Browse Source
This commit is contained in:
Alexey Safronov 2023-11-22 13:13:44 +04:00
parent b25ea659ec
commit 6bd7cbf4af
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/client/src/components/Badges.js
View File

@ -188,7 +188,7 @@ const Badges = ({
title={isForm ? t("Common:FillFormButton") : t("Common:EditButton")}
/>
)}
{item.viewAccessibility?.Convert &&
{item.viewAccessibility?.MustConvert &&
item.security?.Convert &&
!isTrashFolder &&
!isArchiveFolderRoot && (

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

@ -347,7 +347,7 @@ class ContextOptionsStore {
onClickLinkEdit = (item) => {
const { setConvertItem, setConvertDialogVisible } = this.dialogsStore;
const canConvert =
item.viewAccessibility?.Convert && item.security?.Convert;
item.viewAccessibility?.MustConvert && item.security?.Convert;
if (canConvert) {
setConvertItem({ ...item, isOpen: true });

2
packages/client/src/store/FilesActionsStore.js
View File

@ -2122,7 +2122,7 @@ class FilesActionStore {
const isMediaOrImage =
item.viewAccessibility?.ImageView || item.viewAccessibility?.MediaView;
const canConvert =
item.viewAccessibility?.Convert && item.security?.Convert;
item.viewAccessibility?.MustConvert && item.security?.Convert;
const canWebEdit = item.viewAccessibility?.WebEdit;
const canViewedDocs = item.viewAccessibility?.WebView;

6
packages/client/src/store/FilesStore.js
View File

@ -3049,7 +3049,7 @@ class FilesStore {
const folderUrl = isFolder && this.getItemUrl(id, isFolder, false, false);
const needConvert = item.viewAccessibility?.Convert;
const needConvert = item.viewAccessibility?.MustConvert;
const isEditing =
(item.fileStatus & FileStatus.IsEditing) === FileStatus.IsEditing;
@ -3483,7 +3483,9 @@ class FilesStore {
(x) => x.viewAccessibility?.WebCustomFilterEditing
);
const webNeedConvert = selection.find((x) => x.viewAccessibility?.Convert);
const webNeedConvert = selection.find(
(x) => x.viewAccessibility?.MustConvert
);
if ((webEdit && !webNeedConvert) || !externalAccess)
AccessOptions.push("FullAccess");

7
packages/editor/src/client/components/Editor.js
View File

@ -238,7 +238,7 @@ function Editor({
url.indexOf("#message/") > -1 &&
fileInfo &&
fileInfo?.fileExst &&
fileInfo?.viewAccessibility?.Convert &&
fileInfo?.viewAccessibility?.MustConvert &&
fileInfo?.security?.Convert
) {
showDocEditorMessage(url);
@ -321,7 +321,10 @@ function Editor({
if (index) {
let convertUrl = url.substring(0, index);
if (fileInfo?.viewAccessibility?.Convert && fileInfo?.security?.Convert) {
if (
fileInfo?.viewAccessibility?.MustConvert &&
fileInfo?.security?.Convert
) {
const newUrl = await convertDocumentUrl();
if (newUrl) {
convertUrl = newUrl.webUrl;