Merge branch 'hotfix/v2.6.1' into feature/upload-rename
This commit is contained in:
commit
622aa853ec
@ -54,7 +54,10 @@ export const GreetingContainer = styled.div`
|
||||
}
|
||||
|
||||
.tooltip {
|
||||
p {
|
||||
.invitation-text {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
|
@ -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}
|
||||
|
@ -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;
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user