Client Fixed Bug 69365
This commit is contained in:
parent
3a4132edfa
commit
f564944c98
@ -116,6 +116,13 @@ const LOADER_TIMER = 500;
|
|||||||
let loadingTime;
|
let loadingTime;
|
||||||
let timer;
|
let timer;
|
||||||
|
|
||||||
|
const systemFolders = [
|
||||||
|
FolderType.InProgress,
|
||||||
|
FolderType.Done,
|
||||||
|
FolderType.SubFolderDone,
|
||||||
|
FolderType.SubFolderInProgress,
|
||||||
|
];
|
||||||
|
|
||||||
class ContextOptionsStore {
|
class ContextOptionsStore {
|
||||||
settingsStore;
|
settingsStore;
|
||||||
dialogsStore;
|
dialogsStore;
|
||||||
@ -409,7 +416,9 @@ class ContextOptionsStore {
|
|||||||
|
|
||||||
const isShared = shared || sharedItem;
|
const isShared = shared || sharedItem;
|
||||||
|
|
||||||
if (isShared && !isArchive) {
|
const isSystemFolder = systemFolders.includes(item.type);
|
||||||
|
|
||||||
|
if (isShared && !isArchive && !isSystemFolder) {
|
||||||
try {
|
try {
|
||||||
const itemLink = item.isFolder
|
const itemLink = item.isFolder
|
||||||
? await getFolderLink(item.id)
|
? await getFolderLink(item.id)
|
||||||
|
@ -1723,6 +1723,8 @@ class FilesStore {
|
|||||||
].includes(err?.response?.status);
|
].includes(err?.response?.status);
|
||||||
|
|
||||||
if (isUserError && !isThirdPartyError) {
|
if (isUserError && !isThirdPartyError) {
|
||||||
|
if (isPublicRoom()) return Promise.reject(err);
|
||||||
|
|
||||||
this.setIsErrorRoomNotAvailable(true);
|
this.setIsErrorRoomNotAvailable(true);
|
||||||
} else {
|
} else {
|
||||||
if (axios.isCancel(err)) {
|
if (axios.isCancel(err)) {
|
||||||
|
@ -29,6 +29,7 @@ import { makeAutoObservable } from "mobx";
|
|||||||
|
|
||||||
import api from "@docspace/shared/api";
|
import api from "@docspace/shared/api";
|
||||||
import FilesFilter from "@docspace/shared/api/files/filter";
|
import FilesFilter from "@docspace/shared/api/files/filter";
|
||||||
|
import { combineUrl } from "@docspace/shared/utils/combineUrl";
|
||||||
import {
|
import {
|
||||||
frameCallCommand,
|
frameCallCommand,
|
||||||
isPublicRoom as isPublicRoomUtil,
|
isPublicRoom as isPublicRoomUtil,
|
||||||
@ -124,7 +125,13 @@ class PublicRoomStore {
|
|||||||
|
|
||||||
if (filter) {
|
if (filter) {
|
||||||
const folderId = filter.folder;
|
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();
|
return Promise.resolve();
|
||||||
|
Loading…
Reference in New Issue
Block a user