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

Fix false alarm on socket "restore-backup"

Browse Source
This commit is contained in:
Alexey Safronov 2023-11-03 00:30:29 +04:00
parent e78e69c77e
commit f86a27c51e
2 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/client/src/Shell.jsx
View File

@ -28,7 +28,7 @@ import MainBar from "./components/MainBar";
import { Portal } from "@docspace/components";
import indexedDbHelper from "@docspace/common/utils/indexedDBHelper";
import { DeviceType, IndexedDBStores } from "@docspace/common/constants";
import AppLoader from "@docspace/common/components/AppLoader";
import { getRestoreProgress } from "@docspace/common/api/portal";
const Shell = ({ items = [], page = "home", ...rest }) => {
const {
@ -112,7 +112,19 @@ const Shell = ({ items = [], page = "home", ...rest }) => {
});
socketHelper.on("restore-backup", () => {
setPreparationPortalDialogVisible(true);
getRestoreProgress()
.then((response) => {
if (!response) {
console.log(
"Skip show <PreparationPortalDialog /> - empty progress response"
);
return;
}
setPreparationPortalDialogVisible(true);
})
.catch((e) => {
console.error("getRestoreProgress", e);
});
});
}, [socketHelper]);

21
packages/editor/src/client/helpers/withDialogs.js
View File

@ -1,5 +1,6 @@
import React, { useState, useEffect } from "react";
import { getPresignedUri } from "@docspace/common/api/files";
import { getRestoreProgress } from "@docspace/common/api/portal";
import {
EDITOR_ID,
FilesSelectorFilterTypes,
@ -51,12 +52,22 @@ const withDialogs = (WrappedComponent) => {
data: { roomParts: "backup-restore" },
});
socketHelper.on("restore-backup", () => {
const message = t("Common:PreparationPortalTitle");
const docEditor =
typeof window !== "undefined" &&
window.DocEditor?.instances[EDITOR_ID];
getRestoreProgress()
.then((response) => {
if (!response) {
console.log("Skip denyEditingRights - empty progress response");
return;
}
const message = t("Common:PreparationPortalTitle");
const docEditor =
typeof window !== "undefined" &&
window.DocEditor?.instances[EDITOR_ID];
docEditor?.denyEditingRights(message);
docEditor?.denyEditingRights(message);
})
.catch((e) => {
console.error("getRestoreProgress", e);
});
});
};