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

Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0

Browse Source
This commit is contained in:
Nikita Gopienko 2022-11-30 13:09:45 +03:00
commit 42155dcf46
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,6 @@ import {
import { providersData } from "@docspace/common/constants";
import withLoader from "../withLoader";
import MoreLoginModal from "@docspace/common/components/MoreLoginModal";
import AppLoader from "@docspace/common/components/AppLoader";
import EmailInput from "@docspace/components/email-input";
import { hugeMobile, tablet } from "@docspace/components/utils/device";
import { getPasswordErrorMessage } from "../../../helpers/utils";
@ -242,8 +241,6 @@ const Confirm = (props) => {
const [user, setUser] = useState("");
const [isLoaded, setIsLoaded] = useState(false);
const [isGreetingMode, setIsGreetingMode] = useState(true);
const [isEmailErrorShow, setIsEmailErrorShow] = useState(false);
@ -269,19 +266,20 @@ const Confirm = (props) => {
}
}, []);
useEffect(async () => {
const { linkData } = props;
const uid = linkData.uid;
const confirmKey = linkData.confirmHeader;
const user = await getUserFromConfirm(uid, confirmKey);
setUser(user);
useEffect(() => {
async () => {
const { linkData } = props;
const uid = linkData.uid;
const confirmKey = linkData.confirmHeader;
const user = await getUserFromConfirm(uid, confirmKey);
setUser(user);
window.authCallback = authCallback;
window.authCallback = authCallback;
Promise.all([setProviders(), getSso()]).then(() => {
setIsLoaded(true);
await setProviders();
await getSso();
focusInput();
});
};
}, []);
const onSubmit = () => {
@ -555,7 +553,6 @@ const Confirm = (props) => {
setIsPasswordErrorShow(true);
};
if (!isLoaded) return <AppLoader />;
return (
<ConfirmContainer>
<GreetingContainer isGreetingMode={isGreetingMode}>

3
packages/client/src/store/FilesActionsStore.js
View File

@ -890,6 +890,7 @@ class FilesActionStore {
const { setSelectedFolder } = this.selectedFolderStore;
const { roomsFolder, isRoomsFolder } = this.treeFoldersStore;
const { setPortalQuota } = this.authStore.currentQuotaStore;
const {
secondaryProgressDataStore,
@ -938,6 +939,7 @@ class FilesActionStore {
this.updateCurrentFolder();
})
.then(() => setPortalQuota())
.then(() => {
const successTranslation =
folders.length !== 1 && Array.isArray(folders)
@ -974,6 +976,7 @@ class FilesActionStore {
await this.uploadDataStore.loopFilesOperations(data, pbData);
this.updateCurrentFolder(null, [items]);
})
.then(() => setPortalQuota())
.then(() => {
const successTranslation =
folders.length !== 1 && Array.isArray(folders)