Web: Files: fixed label on icon, returned label
This commit is contained in:
parent
5c6e3da4ec
commit
e6007dc302
@ -79,15 +79,17 @@ class DeleteDialogComponent extends React.Component {
|
||||
const currentProcess = res.find((x) => x.id === id);
|
||||
if (currentProcess && currentProcess.progress !== 100) {
|
||||
setProgressBarData({
|
||||
icon: "trash",
|
||||
percent: currentProcess.progress,
|
||||
label: "trash",
|
||||
label: t("DeleteOperation"),
|
||||
visible: true,
|
||||
});
|
||||
setTimeout(() => this.loopDeleteOperation(id), 1000);
|
||||
} else {
|
||||
setProgressBarData({
|
||||
icon: "trash",
|
||||
percent: 100,
|
||||
label: "trash",
|
||||
label: t("DeleteOperation"),
|
||||
visible: true,
|
||||
});
|
||||
setTimeout(() => clearProgressData(), 5000);
|
||||
@ -140,8 +142,9 @@ class DeleteDialogComponent extends React.Component {
|
||||
onClose();
|
||||
if (folderIds.length || fileIds.length) {
|
||||
setProgressBarData({
|
||||
icon: "trash",
|
||||
visible: true,
|
||||
label: "trash",
|
||||
label: t("DeleteOperation"),
|
||||
percent: 0,
|
||||
});
|
||||
|
||||
|
@ -190,7 +190,7 @@ class PureHome extends React.Component {
|
||||
showProgressBar={progressData.visible}
|
||||
progressBarValue={progressData.percent}
|
||||
//progressBarDropDownContent={progressBarContent}
|
||||
progressBarIcon={progressData.label}
|
||||
progressBarIcon={progressData.icon}
|
||||
viewAs={viewAs}
|
||||
hideAside={!!fileActionId || progressData.visible}
|
||||
isLoaded={isLoaded}
|
||||
|
@ -551,7 +551,9 @@ export function getShareUsers(folderIds, fileIds) {
|
||||
|
||||
export function clearProgressData() {
|
||||
return (dispatch) => {
|
||||
dispatch(setProgressBarData({ visible: false, percent: 0, label: "" }));
|
||||
dispatch(
|
||||
setProgressBarData({ visible: false, percent: 0, label: "", icon: "" })
|
||||
);
|
||||
};
|
||||
}
|
||||
|
||||
@ -700,8 +702,16 @@ const startUploadFiles = (
|
||||
getState
|
||||
) => {
|
||||
if (filesLength > 0 || convertFilesLength > 0) {
|
||||
const progressData = { visible: true, percent: 0, label: "" };
|
||||
progressData.label = "upload";
|
||||
const progressData = {
|
||||
visible: true,
|
||||
percent: 0,
|
||||
label: "",
|
||||
icon: "upload",
|
||||
};
|
||||
progressData.label = t("UploadingLabel", {
|
||||
file: 0,
|
||||
totalFiles: filesLength + convertFilesLength,
|
||||
});
|
||||
dispatch(setProgressBarData(progressData));
|
||||
startSessionFunc(0, t, dispatch, getState);
|
||||
}
|
||||
@ -815,8 +825,12 @@ const sendChunk = (
|
||||
if (index + 1 !== requestsDataArray.length) {
|
||||
dispatch(
|
||||
setProgressBarData({
|
||||
label: "upload",
|
||||
newPercent,
|
||||
icon: "upload",
|
||||
label: t("UploadingLabel", {
|
||||
file: uploadedFiles,
|
||||
totalFiles: files.length,
|
||||
}),
|
||||
percent: newPercent,
|
||||
visible: true,
|
||||
})
|
||||
);
|
||||
@ -1007,7 +1021,8 @@ const updateConvertProgress = (uploadData, t, dispatch) => {
|
||||
|
||||
dispatch(
|
||||
setProgressBarData({
|
||||
label: "upload",
|
||||
icon: "upload",
|
||||
label: t("UploadingLabel", { file, totalFiles }),
|
||||
percent,
|
||||
visible: true,
|
||||
})
|
||||
@ -1029,10 +1044,20 @@ export const setDialogVisible = (t) => {
|
||||
} = uploadData;
|
||||
|
||||
dispatch(setConvertDialogVisible(false));
|
||||
const label = "upload";
|
||||
const label = t("UploadingLabel", {
|
||||
file: uploadedFiles,
|
||||
totalFiles: files.length,
|
||||
});
|
||||
|
||||
if (uploadStatus === null) {
|
||||
dispatch(setProgressBarData({ label, percent: 100, visible: true }));
|
||||
dispatch(
|
||||
setProgressBarData({
|
||||
icon: "upload",
|
||||
label,
|
||||
percent: 100,
|
||||
visible: true,
|
||||
})
|
||||
);
|
||||
uploadData.uploadedFiles = 0;
|
||||
uploadData.percent = 0;
|
||||
dispatch(setUploadData(uploadData));
|
||||
@ -1040,7 +1065,9 @@ export const setDialogVisible = (t) => {
|
||||
} else if (!files.length) {
|
||||
dispatch(clearProgressData());
|
||||
} else {
|
||||
dispatch(setProgressBarData({ label, percent, visible: true }));
|
||||
dispatch(
|
||||
setProgressBarData({ icon: "upload", label, percent, visible: true })
|
||||
);
|
||||
uploadData.uploadStatus = "cancel";
|
||||
dispatch(setUploadData(uploadData));
|
||||
}
|
||||
@ -1149,6 +1176,7 @@ export const loopFilesOperations = (id, destFolderId, isCopy) => {
|
||||
if (currentItem && currentItem.progress !== 100) {
|
||||
dispatch(
|
||||
setProgressBarData({
|
||||
icon: "upload",
|
||||
label: progressData.label,
|
||||
percent: currentItem.progress,
|
||||
visible: true,
|
||||
@ -1158,6 +1186,7 @@ export const loopFilesOperations = (id, destFolderId, isCopy) => {
|
||||
} else {
|
||||
dispatch(
|
||||
setProgressBarData({
|
||||
icon: "upload",
|
||||
label: progressData.label,
|
||||
percent: 100,
|
||||
visible: true,
|
||||
@ -1201,6 +1230,7 @@ export const loopFilesOperations = (id, destFolderId, isCopy) => {
|
||||
} else {
|
||||
dispatch(
|
||||
setProgressBarData({
|
||||
icon: "upload",
|
||||
label: progressData.label,
|
||||
percent: 100,
|
||||
visible: true,
|
||||
|
Loading…
Reference in New Issue
Block a user