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

Merge branch 'feature/upload-rename' of https://github.com/ONLYOFFICE/DocSpace-client into feature/upload-rename

Browse Source
This commit is contained in:
Nikita Gopienko 2024-08-15 15:37:20 +03:00
commit 7ed3b060e1
4 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/client/src/pages/Confirm/sub-components/StyledCreateUser.js
View File

@ -54,7 +54,10 @@ export const GreetingContainer = styled.div`
}
.tooltip {
p {
.invitation-text {
display: flex;
flex-direction: column;
align-items: center;
text-align: center;
}

2
packages/client/src/pages/Confirm/sub-components/createUser.js
View File

@ -485,7 +485,7 @@ const CreateUserForm = (props) => {
<PortalLogo className="portal-logo" />
{linkData.type === "LinkInvite" && (
<div className="tooltip">
<Text fontSize="16px">
<Text fontSize="16px" as="div" className="invitation-text">
{roomName ? (
<Trans
t={t}

11
packages/client/src/pages/Home/Section/Filter/index.js
View File

@ -1963,14 +1963,7 @@ const SectionFilterContent = ({
const firstName = {
id: "sort-by_first-name",
key: "firstname",
label: t("Common:FirstName"),
default: true,
};
const lastName = {
id: "sort-by_last-name",
key: "lastname",
label: t("Common:LastName"),
label: t("Common:Name"),
default: true,
};
@ -2012,7 +2005,7 @@ const SectionFilterContent = ({
hideableColumns.Storage = storage;
}
options.push(firstName, lastName, type, department, email);
options.push(firstName, type, department, email);
if (showStorageInfo) options.push(storage);
return options;

7
packages/shared/utils/axiosClient.ts
View File

@ -220,10 +220,12 @@ class AxiosClient {
}
const loginURL = combineUrl(proxyURL, "/login");
if (!this.isSSR) {
switch (error.response?.status) {
case 401: {
if (options.skipUnauthorized) return Promise.resolve();
if (options.skipUnauthorized || window?.ClientConfig?.isFrame)
return Promise.resolve();
if (options.skipLogout) return Promise.reject(error);
const opt: AxiosRequestConfig = {
@ -244,14 +246,13 @@ class AxiosClient {
break;
case 403: {
const pathname = window.location.pathname;
const isFrame = window?.ClientConfig?.isFrame;
const isArchived = pathname.indexOf("/rooms/archived") !== -1;
const isRooms =
pathname.indexOf("/rooms/shared") !== -1 || isArchived;
if (isRooms && !skipRedirect && !isFrame) {
if (isRooms && !skipRedirect && !window?.ClientConfig?.isFrame) {
setTimeout(() => {
window.DocSpace.navigate(isArchived ? "/archived" : "/");
}, 1000);