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

Merge pull request #298 from ONLYOFFICE/feature/empinvite-confitm-link

Browse Source 
Added fromInviteLink = true for "EmpInvite"
This commit is contained in:
Alexey Safronov 2024-03-04 19:41:20 +04:00 committed by GitHub
commit ee83ad1a08
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -302,13 +302,12 @@ const CreateUserForm = (props) => {
const createConfirmUser = async (registerData, loginData, key) => {
const { defaultPage } = props;
const fromInviteLink = linkData.type === "LinkInvite" ? true : false;
const fromInviteLink =
linkData.type === "LinkInvite" || linkData.type === "EmpInvite"
? true
: false;
const data = Object.assign(
{ fromInviteLink: fromInviteLink },
registerData,
loginData,
);
const data = Object.assign({ fromInviteLink }, registerData, loginData);
await createUser(data, key);
@ -449,13 +448,9 @@ const CreateUserForm = (props) => {
<Text fontSize="16px">
<Trans
t={t}
i18nKey={
roomName ? "InvitationToRoom" : "InvitationToPortal"
}
ns="Common"
defaults={
roomName ? DEFAULT_ROOM_TEXT : DEFAULT_PORTAL_TEXT
}
i18nKey={roomName ? "InvitationToRoom" : "InvitationToPortal"}
ns="Common"
defaults={roomName ? DEFAULT_ROOM_TEXT : DEFAULT_PORTAL_TEXT}
values={{
firstName: user.firstName,
lastName: user.lastName,
@ -641,10 +636,8 @@ const CreateUserForm = (props) => {
primary
size="medium"
scale={true}
label={
isLoading
? t("Common:LoadingProcessing")
: t("SignUp")
label={
isLoading ? t("Common:LoadingProcessing") : t("SignUp")
}
tabIndex={1}
isDisabled={isLoading}