Web: Files: removed useless code from withBadges HOC

This commit is contained in:
Nikita Gopienko 2021-11-24 14:15:32 +03:00
parent b99b3d8ca5
commit 838e734078

View File

@ -1,13 +1,11 @@
import React from "react"; import React from "react";
import { inject, observer } from "mobx-react"; import { inject, observer } from "mobx-react";
import { import {
ShareAccessRights, ShareAccessRights,
AppServerConfig, AppServerConfig,
} from "@appserver/common/constants"; } from "@appserver/common/constants";
import toastr from "@appserver/components/toast/toastr"; import toastr from "@appserver/components/toast/toastr";
import { combineUrl } from "@appserver/common/utils"; import { combineUrl } from "@appserver/common/utils";
import { getFileConversationProgress } from "@appserver/common/api/files";
import Badges from "../components/Badges"; import Badges from "../components/Badges";
import config from "../../package.json"; import config from "../../package.json";
@ -72,59 +70,6 @@ export default function withBadges(WrappedComponent) {
} }
}; };
getConvertProgress = (fileId) => {
const {
selectedFolderId,
filter,
setIsLoading,
setSecondaryProgressBarData,
t,
clearSecondaryProgressData,
fetchFiles,
} = this.props;
getFileConversationProgress(fileId).then((res) => {
if (res && res[0] && res[0].progress !== 100) {
setSecondaryProgressBarData({
icon: "file",
visible: true,
percent: res[0].progress,
label: t("Convert"),
alert: false,
});
setTimeout(() => this.getConvertProgress(fileId), 1000);
} else {
if (res[0].error) {
setSecondaryProgressBarData({
visible: true,
alert: true,
});
toastr.error(res[0].error);
setTimeout(() => clearSecondaryProgressData(), TIMEOUT);
} else {
setSecondaryProgressBarData({
icon: "file",
visible: true,
percent: 100,
label: t("Convert"),
alert: false,
});
setTimeout(() => clearSecondaryProgressData(), TIMEOUT);
const newFilter = filter.clone();
fetchFiles(selectedFolderId, newFilter)
.catch((err) => {
setSecondaryProgressBarData({
visible: true,
alert: true,
});
//toastr.error(err);
setTimeout(() => clearSecondaryProgressData(), TIMEOUT);
})
.finally(() => setIsLoading(false));
}
}
});
};
setConvertDialogVisible = () => { setConvertDialogVisible = () => {
this.props.setConvertItem(this.props.item); this.props.setConvertItem(this.props.item);
this.props.setConvertDialogVisible(true); this.props.setConvertDialogVisible(true);
@ -190,16 +135,11 @@ export default function withBadges(WrappedComponent) {
selectedFolderStore, selectedFolderStore,
dialogsStore, dialogsStore,
filesStore, filesStore,
uploadDataStore,
}, },
{ item } { item }
) => { ) => {
const { docserviceStore } = formatsStore; const { docserviceStore } = formatsStore;
const { const { isRecycleBinFolder, isPrivacyFolder } = treeFoldersStore;
isRecycleBinFolder,
isPrivacyFolder,
updateRootBadge,
} = treeFoldersStore;
const { const {
lockFileAction, lockFileAction,
setFavoriteAction, setFavoriteAction,
@ -212,12 +152,7 @@ export default function withBadges(WrappedComponent) {
setConvertDialogVisible, setConvertDialogVisible,
setConvertItem, setConvertItem,
} = dialogsStore; } = dialogsStore;
const { filter, setIsLoading, fetchFiles } = filesStore; const { setIsLoading } = filesStore;
const { secondaryProgressDataStore } = uploadDataStore;
const {
setSecondaryProgressBarData,
clearSecondaryProgressData,
} = secondaryProgressDataStore;
const canWebEdit = docserviceStore.canWebEdit(item.fileExst); const canWebEdit = docserviceStore.canWebEdit(item.fileExst);
const canConvert = docserviceStore.canConvert(item.fileExst); const canConvert = docserviceStore.canConvert(item.fileExst);
@ -237,13 +172,7 @@ export default function withBadges(WrappedComponent) {
selectedFolderPathParts: selectedFolderStore.pathParts, selectedFolderPathParts: selectedFolderStore.pathParts,
markAsRead, markAsRead,
setNewFilesPanelVisible, setNewFilesPanelVisible,
updateRootBadge,
setSecondaryProgressBarData,
selectedFolderId: selectedFolderStore.id,
filter,
setIsLoading, setIsLoading,
clearSecondaryProgressData,
fetchFiles,
setConvertDialogVisible, setConvertDialogVisible,
setConvertItem, setConvertItem,
isDesktopClient, isDesktopClient,