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

Client:PublicRoom Refactoring

Browse Source
This commit is contained in:
Akmal Isomadinov 2024-03-04 17:22:54 +05:00
parent 2a9fa214dd
commit cd0f3c10bf
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,7 @@ import {
import { RoomsTypes } from "@docspace/shared/utils";
import { combineUrl } from "@docspace/shared/utils/combineUrl";
import { updateTempContent } from "@docspace/shared/utils/common";
import { updateTempContent, isPublicRoom } from "@docspace/shared/utils/common";
import { toastr } from "@docspace/shared/components/toast";
import config from "PACKAGE_FILE";
@ -1570,7 +1570,7 @@ class FilesStore {
this.setCreatedItem(null);
}
if (window.location.pathname === "/rooms/share") {
if (isPublicRoom()) {
return Promise.resolve(data);
} else {
return Promise.resolve(selectedFolder);

6
packages/shared/routes/Route.public.tsx
View File

@ -4,6 +4,7 @@ import { Navigate, useLocation } from "react-router-dom";
import { TenantStatus } from "@docspace/shared/enums";
import { combineUrl } from "@docspace/shared/utils/combineUrl";
import { isPublicRoom } from "@docspace/shared/utils/common";
import type { PublicRouteProps } from "./Routers.types";
@ -32,10 +33,7 @@ export const PublicRoute = (props: PublicRouteProps) => {
return children;
}
if (
location.pathname === "/rooms/share" ||
location.pathname.includes("/rooms/share/media/view/")
) {
if (isPublicRoom()) {
return children;
}