Web: Deleted canConvert;

This commit is contained in:
Tatiana Lopaeva 2022-12-16 13:54:39 +03:00
parent d0b03e170b
commit 57707de013
7 changed files with 7 additions and 25 deletions

View File

@ -84,7 +84,6 @@ export default function withBadges(WrappedComponent) {
item, item,
isTrashFolder, isTrashFolder,
isPrivacyFolder, isPrivacyFolder,
canConvert,
onFilesClick, onFilesClick,
isAdmin, isAdmin,
isDesktopClient, isDesktopClient,
@ -110,7 +109,6 @@ export default function withBadges(WrappedComponent) {
showNew={showNew} showNew={showNew}
newItems={newItems} newItems={newItems}
sectionWidth={sectionWidth} sectionWidth={sectionWidth}
canConvert={canConvert}
isTrashFolder={isTrashFolder} isTrashFolder={isTrashFolder}
isPrivacyFolder={isPrivacyFolder} isPrivacyFolder={isPrivacyFolder}
isDesktopClient={isDesktopClient} isDesktopClient={isDesktopClient}
@ -139,7 +137,6 @@ export default function withBadges(WrappedComponent) {
versionHistoryStore, versionHistoryStore,
dialogsStore, dialogsStore,
filesStore, filesStore,
settingsStore,
}, },
{ item } { item }
) => { ) => {
@ -154,13 +151,10 @@ export default function withBadges(WrappedComponent) {
} = dialogsStore; } = dialogsStore;
const { setIsLoading } = filesStore; const { setIsLoading } = filesStore;
const canConvert = settingsStore.canConvert(item.fileExst);
return { return {
theme, theme,
isAdmin: auth.isAdmin, isAdmin: auth.isAdmin,
canConvert,
isTrashFolder: isRecycleBinFolder, isTrashFolder: isRecycleBinFolder,
isPrivacyFolder, isPrivacyFolder,
homepage: config.homepage, homepage: config.homepage,

View File

@ -61,7 +61,6 @@ const Badges = ({
isTrashFolder, isTrashFolder,
isPrivacyFolder, isPrivacyFolder,
isDesktopClient, isDesktopClient,
canConvert,
accessToEdit, accessToEdit,
showNew, showNew,
onFilesClick, onFilesClick,
@ -159,7 +158,7 @@ const Badges = ({
title={isForm ? t("Common:FillFormButton") : t("Common:EditButton")} title={isForm ? t("Common:FillFormButton") : t("Common:EditButton")}
/> />
)} )}
{canConvert && !isTrashFolder && ( {item.viewAccessability?.Convert && !isTrashFolder && (
<ColorTheme <ColorTheme
themeId={ThemeType.IconButton} themeId={ThemeType.IconButton}
onClick={setConvertDialogVisible} onClick={setConvertDialogVisible}

View File

@ -248,7 +248,7 @@ class ContextOptionsStore {
onClickLinkEdit = (item) => { onClickLinkEdit = (item) => {
const { setConvertItem, setConvertDialogVisible } = this.dialogsStore; const { setConvertItem, setConvertDialogVisible } = this.dialogsStore;
const canConvert = this.settingsStore.canConvert(item.fileExst); const canConvert = item.viewAccessability?.Convert;
if (canConvert) { if (canConvert) {
setConvertItem(item); setConvertItem(item);

View File

@ -1768,7 +1768,7 @@ class FilesActionStore {
const isMediaOrImage = const isMediaOrImage =
item.viewAccessability?.ImageView || item.viewAccessability?.MediaView; item.viewAccessability?.ImageView || item.viewAccessability?.MediaView;
const canConvert = this.settingsStore.canConvert(item.fileExst); const canConvert = item.viewAccessability?.Convert;
const canWebEdit = item.viewAccessability?.WebEdit; const canWebEdit = item.viewAccessability?.WebEdit;
const canViewedDocs = item.viewAccessability?.WebView; const canViewedDocs = item.viewAccessability?.WebView;

View File

@ -2130,8 +2130,6 @@ class FilesStore {
Object.keys(RoomsProviderType).find((key) => key === item.providerKey) Object.keys(RoomsProviderType).find((key) => key === item.providerKey)
]; ];
const { canConvert } = this.filesSettingsStore;
const canOpenPlayer = const canOpenPlayer =
item.viewAccessability?.ImageView || item.viewAccessability?.MediaView; item.viewAccessability?.ImageView || item.viewAccessability?.MediaView;
@ -2164,7 +2162,7 @@ class FilesStore {
const folderUrl = this.getFolderUrl(id, isFolder); const folderUrl = this.getFolderUrl(id, isFolder);
const needConvert = canConvert(fileExst); const needConvert = item.viewAccessability?.Convert;
const isEditing = const isEditing =
(item.fileStatus & FileStatus.IsEditing) === FileStatus.IsEditing; (item.fileStatus & FileStatus.IsEditing) === FileStatus.IsEditing;
@ -2539,8 +2537,6 @@ class FilesStore {
} }
getOptions = (selection, externalAccess = false) => { getOptions = (selection, externalAccess = false) => {
const { canConvert } = this.filesSettingsStore;
if (selection[0].encrypted) { if (selection[0].encrypted) {
return ["FullAccess", "DenyAccess"]; return ["FullAccess", "DenyAccess"];
} }
@ -2563,7 +2559,7 @@ class FilesStore {
(x) => x.viewAccessability?.WebCustomFilterEditing (x) => x.viewAccessability?.WebCustomFilterEditing
); );
const webNeedConvert = selection.find((x) => canConvert(x.fileExst)); const webNeedConvert = selection.find((x) => x.viewAccessability?.Convert);
if ((webEdit && !webNeedConvert) || !externalAccess) if ((webEdit && !webNeedConvert) || !externalAccess)
AccessOptions.push("FullAccess"); AccessOptions.push("FullAccess");

View File

@ -22,7 +22,6 @@ import {
import { EditorWrapper } from "../components/StyledEditor"; import { EditorWrapper } from "../components/StyledEditor";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import withDialogs from "../helpers/withDialogs"; import withDialogs from "../helpers/withDialogs";
import { canConvert } from "../helpers/utils";
import { assign } from "@docspace/common/utils"; import { assign } from "@docspace/common/utils";
import toastr from "@docspace/components/toast/toastr"; import toastr from "@docspace/components/toast/toastr";
import { DocumentEditor } from "@onlyoffice/document-editor-react"; import { DocumentEditor } from "@onlyoffice/document-editor-react";
@ -160,7 +159,7 @@ function Editor({
url.indexOf("#message/") > -1 && url.indexOf("#message/") > -1 &&
fileInfo && fileInfo &&
fileInfo?.fileExst && fileInfo?.fileExst &&
canConvert(fileInfo.fileExst, filesSettings) fileInfo?.viewAccessability?.Convert
) { ) {
showDocEditorMessage(url); showDocEditorMessage(url);
} }
@ -222,7 +221,7 @@ function Editor({
if (index) { if (index) {
let convertUrl = url.substring(0, index); let convertUrl = url.substring(0, index);
if (canConvert(fileInfo.fileExst, filesSettings)) { if (fileInfo?.viewAccessability?.Convert) {
const newUrl = await convertDocumentUrl(); const newUrl = await convertDocumentUrl();
if (newUrl) { if (newUrl) {
convertUrl = newUrl.webUrl; convertUrl = newUrl.webUrl;

View File

@ -1,11 +1,5 @@
import pkg from "../../../package.json"; import pkg from "../../../package.json";
export const canConvert = (extension, filesSettings) => {
const array = filesSettings?.extsMustConvert || [];
const result = array.findIndex((item) => item === extension);
return result === -1 ? false : true;
};
export const initI18n = (initialI18nStoreASC) => { export const initI18n = (initialI18nStoreASC) => {
if (!initialI18nStoreASC || window.i18n) return; if (!initialI18nStoreASC || window.i18n) return;