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

Client:Store:UploadDataStore Refactoring

Browse Source
This commit is contained in:
Akmal Isomadinov 2024-06-10 15:08:00 +05:00
parent 87ebdad648
commit 6f29496a91
2 changed files with 58 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
packages/client/src/store/UploadDataStore.js
View File

@ -44,6 +44,7 @@ import {
checkIsFileExist, checkIsFileExist,
} from "@docspace/shared/api/files"; } from "@docspace/shared/api/files";
import { toastr } from "@docspace/shared/components/toast"; import { toastr } from "@docspace/shared/components/toast";
import { getOperationProgress } from "@docspace/shared/utils/getOperationProgress";
import { import {
isMobile as isMobileUtils, isMobile as isMobileUtils,
@ -1795,7 +1796,10 @@ class UploadDataStore {
let finished = data.finished; let finished = data.finished;
while (!finished) { while (!finished) {
const item = await this.getOperationProgress(data.id); const item = await getOperationProgress(
data.id,
getUnexpectedErrorText(),
);
operationItem = item; operationItem = item;
progress = item ? item.progress : 100; progress = item ? item.progress : 100;
@ -1913,29 +1917,6 @@ class UploadDataStore {
} }
}; };
getOperationProgress = async (id) => {
const promise = new Promise((resolve, reject) => {
setTimeout(async () => {
try {
await getProgress().then((res) => {
if (!res || res.length === 0) {
reject(getUnexpectedErrorText());
}
const currentItem = res.find((x) => x.id === id);
if (currentItem?.error) {
reject(currentItem.error);
}
resolve(currentItem);
});
} catch (error) {
reject(error);
}
}, 1000);
});
return promise;
};
clearActiveOperations = (fileIds = [], folderIds = []) => { clearActiveOperations = (fileIds = [], folderIds = []) => {
const { activeFiles, activeFolders, setActiveFiles, setActiveFolders } = const { activeFiles, activeFolders, setActiveFiles, setActiveFolders } =
this.filesStore; this.filesStore;

53
packages/shared/utils/getOperationProgress.ts Normal file
View File

@ -0,0 +1,53 @@
// (c) Copyright Ascensio System SIA 2009-2024
//
// This program is a free software product.
// You can redistribute it and/or modify it under the terms
// of the GNU Affero General Public License (AGPL) version 3 as published by the Free Software
// Foundation. In accordance with Section 7(a) of the GNU AGPL its Section 15 shall be amended
// to the effect that Ascensio System SIA expressly excludes the warranty of non-infringement of
// any third-party rights.
//
// This program is distributed WITHOUT ANY WARRANTY, without even the implied warranty
// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For details, see
// the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
//
// You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021.
//
// The interactive user interfaces in modified source and object code versions of the Program must
// display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3.
//
// Pursuant to Section 7(b) of the License you must retain the original Product logo when
// distributing the program. Pursuant to Section 7(e) we decline to grant you any rights under
// trademark law for use of our trademarks.
//
// All the Product's GUI elements, including illustrations and icon sets, as well as technical writing
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
import { getProgress } from "../api/files";
export const getOperationProgress = async (
id: string,
errorMessage: string,
) => {
const promise = new Promise((resolve, reject) => {
setTimeout(async () => {
try {
await getProgress().then((res) => {
if (!res || res.length === 0) {
reject(errorMessage);
}
const currentItem = res.find((x) => x.id === id);
if (currentItem?.error) {
reject(currentItem.error);
}
resolve(currentItem);
});
} catch (error) {
reject(error);
}
}, 1000);
});
return promise;
};