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

Client Fixed Bug 69365

Browse Source
This commit is contained in:
Akmal Isomadinov 2024-07-24 18:00:52 +05:00
parent 3a4132edfa
commit f564944c98
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/client/src/store/ContextOptionsStore.js
View File

@ -116,6 +116,13 @@ const LOADER_TIMER = 500;
let loadingTime;
let timer;
const systemFolders = [
FolderType.InProgress,
FolderType.Done,
FolderType.SubFolderDone,
FolderType.SubFolderInProgress,
];
class ContextOptionsStore {
settingsStore;
dialogsStore;
@ -409,7 +416,9 @@ class ContextOptionsStore {
const isShared = shared || sharedItem;
if (isShared && !isArchive) {
const isSystemFolder = systemFolders.includes(item.type);
if (isShared && !isArchive && !isSystemFolder) {
try {
const itemLink = item.isFolder
? await getFolderLink(item.id)

2
packages/client/src/store/FilesStore.js
View File

@ -1723,6 +1723,8 @@ class FilesStore {
].includes(err?.response?.status);
if (isUserError && !isThirdPartyError) {
if (isPublicRoom()) return Promise.reject(err);
this.setIsErrorRoomNotAvailable(true);
} else {
if (axios.isCancel(err)) {

9
packages/client/src/store/PublicRoomStore.js
View File

@ -29,6 +29,7 @@ import { makeAutoObservable } from "mobx";
import api from "@docspace/shared/api";
import FilesFilter from "@docspace/shared/api/files/filter";
import { combineUrl } from "@docspace/shared/utils/combineUrl";
import {
frameCallCommand,
isPublicRoom as isPublicRoomUtil,
@ -124,7 +125,13 @@ class PublicRoomStore {
if (filter) {
const folderId = filter.folder;
return fetchFiles(folderId, filter);
return fetchFiles(folderId, filter).catch((error) => {
if (error.response.status === 403) {
window.location.replace(
combineUrl(window.ClientConfig?.proxy?.url, "/login"),
);
}
});
}
return Promise.resolve();