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

Merge branch 'bugfix/list-accounts-double-fetch' of github.com:ONLYOFFICE/DocSpace-client into bugfix/list-accounts-double-fetch

Browse Source
This commit is contained in:
Akmal Isomadinov 2023-11-27 15:16:21 +05:00
commit bbdc74a5f4
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/client/src/pages/Home/InfoPanel/Body/index.js
View File

@ -38,7 +38,8 @@ const InfoPanelBodyContent = ({
const isNoItemGallery = isGallery && !gallerySelected;
const itemIsRoot =
selection?.isSelectedFolder && selection?.id === selection?.rootFolderId;
const isNoItem = !isSeveralItems && (isNoItemGallery || itemIsRoot);
const isNoItem =
!isSeveralItems && (isNoItemGallery || (itemIsRoot && !isGallery));
const defaultProps = {
selection,

15
packages/client/src/pages/Wizard/index.js
View File

@ -1,4 +1,4 @@
import React, { useState, useRef, useEffect } from "react";
import { useState, useRef, useEffect } from "react";
import axios from "axios";
import { useTranslation } from "react-i18next";
import { useNavigate } from "react-router-dom";
@ -25,7 +25,9 @@ import {
combineUrl,
createPasswordHash,
convertLanguage,
setCookie,
} from "@docspace/common/utils";
import { LANGUAGE, COOKIE_EXPIRATION_YEAR } from "@docspace/common/constants";
import {
Wrapper,
@ -254,13 +256,12 @@ const Wizard = (props) => {
wizardToken,
analytics
);
setCookie(LANGUAGE, selectedLanguage.key, {
"max-age": COOKIE_EXPIRATION_YEAR,
});
setWizardComplete();
// navigate(combineUrl(window.DocSpaceConfig?.proxy?.url, "/login"));
window.location.replace(
combineUrl(window.DocSpaceConfig?.proxy?.url, "/login")
);
} catch (error) {
console.error(error);
setIsCreated(false);