Merge branch 'hotfix/v2.6.1' of https://github.com/ONLYOFFICE/DocSpace-client into hotfix/v2.6.1

This commit is contained in:
Timofey Boyko 2024-08-05 16:10:27 +03:00
commit 45d5df5073
7 changed files with 18 additions and 9 deletions

View File

@ -37,9 +37,9 @@ const OfficialDocumentation = ({ dataBackupUrl }) => {
const { t } = useTranslation("PaymentsEnterprise");
const dockerLink =
"https://helpcenter.onlyoffice.com/installation/docspace-enterprise-install-docker.aspx";
"https://helpcenter.onlyoffice.com/installation/docspace-enterprise-install-script.aspx";
const linuxDocker =
"https://helpcenter.onlyoffice.com/installation/docspace-enterprise-install-linux.aspx";
"https://helpcenter.onlyoffice.com/installation/docspace-enterprise-install-script.aspx";
const windowsDocker =
"https://helpcenter.onlyoffice.com/installation/docspace-enterprise-install-windows.aspx";

View File

@ -55,7 +55,7 @@ const LanguageComboboxWrapper = (props: TLanguageCombobox) => {
onSelectLanguage={onLanguageSelect}
cultures={cultures}
selectedCulture={currentCultureName}
withBorder={false}
withBorder={!isMobileView}
/>
);
};

View File

@ -320,7 +320,9 @@ const CreateUserForm = (props) => {
culture: currentCultureName,
};
signupOAuth(signupAccount)
const confirmKey = linkData.confirmHeader;
signupOAuth(signupAccount, confirmKey)
.then(() => {
const url = roomData.roomId
? `/rooms/shared/${roomData.roomId}/filter?folder=${roomData.roomId}/`

View File

@ -605,6 +605,7 @@ const PeopleTableRow = (props) => {
onClick={onEmailClick}
isTextOverflow
dir="auto"
enableUserSelect
>
{email}
</Link>

View File

@ -379,6 +379,7 @@ class FilesTableHeader extends React.Component {
columnInfoPanelStorageName,
sortBy,
sortOrder,
isRecentTab,
});
} else {
this.state = {
@ -388,6 +389,7 @@ class FilesTableHeader extends React.Component {
columnInfoPanelStorageName,
sortBy,
sortOrder,
isRecentTab,
};
}
};
@ -447,7 +449,7 @@ class FilesTableHeader extends React.Component {
isTrashFolder !== prevProps.isTrashFolder ||
columnStorageName !== prevProps.columnStorageName ||
columnInfoPanelStorageName !== prevProps.columnInfoPanelStorageName ||
isRecentTab !== prevProps.isRecentTab ||
isRecentTab !== this.state.isRecentTab ||
showStorageInfo !== prevProps.showStorageInfo ||
sortBy !== this.state.sortBy ||
sortOrder !== this.state.sortOrder

View File

@ -70,7 +70,7 @@ const LanguageComboboxWrapper = () => {
onSelectLanguage={onLanguageSelect}
cultures={cultures}
selectedCulture={currentCulture}
withBorder={false}
withBorder={!isMobileView}
isMobileView={isMobileView}
/>
);

View File

@ -346,12 +346,16 @@ export function linkOAuth(serializedProfile) {
});
}
export function signupOAuth(signupAccount) {
return request({
export function signupOAuth(signupAccount, confirmKey = null) {
const options = {
method: "post",
url: "people/thirdparty/signup",
data: signupAccount,
});
};
if (confirmKey) options.headers = { confirm: confirmKey };
return request(options);
}
export function unlinkOAuth(provider) {