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

Merge branch 'hotfix/v2.6.1' into feature/upload-rename

Browse Source
This commit is contained in:
Alexey Safronov 2024-08-15 19:17:59 +04:00
commit 5b496dd329
7 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/client/src/components/panels/InvitePanel/sub-components/ExternalLinks.js
View File

@ -88,7 +88,7 @@ const ExternalLinks = ({
copyLink(link.shareLink);
}
} else {
!externalLinksVisible ? editLink() : disableLink();
!externalLinksVisible ? await editLink() : await disableLink();
}
onChangeExternalLinksVisible(!externalLinksVisible);
} catch (error) {
@ -98,9 +98,10 @@ const ExternalLinks = ({
}
};
const disableLink = () => {
setInvitationLinks(roomId, "Invite", 0, shareLinks[0].id);
setShareLinks([]);
const disableLink = async () => {
shareLinks?.length &&
(await setInvitationLinks(roomId, "Invite", 0, shareLinks[0].id));
return setShareLinks([]);
};
const editLink = async () => {
@ -120,7 +121,7 @@ const ExternalLinks = ({
copyLink(shareLink);
setShareLinks([activeLink]);
setActiveLink(activeLink);
return setActiveLink(activeLink);
};
const onSelectAccess = async (access) => {

4
packages/client/src/pages/Home/InfoPanel/Body/styles/common.js
View File

@ -264,8 +264,8 @@ const StyledProperties = styled.div`
grid-template-columns: 120px 1fr;
grid-column-gap: 24px;
-webkit-box-align: center;
align-items: center;
-webkit-box-align: baseline;
align-items: baseline;
.property-title {
font-size: 13px;

16
packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableHeader.js
View File

@ -138,15 +138,8 @@ class InsideGroupTableHeader extends React.Component {
newFilter.sortBy = sortBy;
if (sortBy === "AZ") {
if (
newFilter.sortBy !== "lastname" &&
newFilter.sortBy !== "firstname"
) {
newFilter.sortBy = "firstname";
} else if (newFilter.sortBy === "lastname") {
newFilter.sortBy = "firstname";
} else {
newFilter.sortBy = "lastname";
if (newFilter.sortBy !== "displayname") {
newFilter.sortBy = "displayname";
}
newFilter.sortOrder =
newFilter.sortOrder === "ascending" ? "descending" : "ascending";
@ -176,10 +169,7 @@ class InsideGroupTableHeader extends React.Component {
} = this.props;
const { sortOrder } = filter;
const sortBy =
filter.sortBy === "firstname" || filter.sortBy === "lastname"
? "AZ"
: filter.sortBy;
const sortBy = filter.sortBy === "displayname" ? "AZ" : filter.sortBy;
return (
<TableHeader

9
packages/client/src/pages/Home/Section/AccountsBody/People/TableView/TableHeader.js
View File

@ -143,7 +143,7 @@ class PeopleTableHeader extends React.Component {
if (
newFilter.sortBy === sortBy ||
(sortBy === "AZ" && newFilter.sortBy === "firstname")
(sortBy === "AZ" && newFilter.sortBy === "displayname")
) {
newFilter.sortOrder =
newFilter.sortOrder === "ascending" ? "descending" : "ascending";
@ -151,7 +151,7 @@ class PeopleTableHeader extends React.Component {
newFilter.sortBy = sortBy;
if (sortBy === "AZ") {
newFilter.sortBy = "firstname";
newFilter.sortBy = "displayname";
}
}
@ -178,10 +178,7 @@ class PeopleTableHeader extends React.Component {
} = this.props;
const { sortOrder } = filter;
const sortBy =
filter.sortBy === "firstname" || filter.sortBy === "lastname"
? "AZ"
: filter.sortBy;
const sortBy = filter.sortBy === "displayname" ? "AZ" : filter.sortBy;
return (
<TableHeader

4
packages/client/src/pages/Home/Section/Filter/index.js
View File

@ -1961,8 +1961,8 @@ const SectionFilterContent = ({
const options = [];
const firstName = {
id: "sort-by_first-name",
key: "firstname",
id: "sort-by_displayname",
key: "displayname",
label: t("Common:Name"),
default: true,
};

2
packages/shared/api/people/filter.js
View File

@ -29,7 +29,7 @@ import { getObjectByLocation, toUrlParams } from "../../utils/common";
const DEFAULT_PAGE = 0;
const DEFAULT_PAGE_COUNT = 25;
const DEFAULT_TOTAL = 0;
const DEFAULT_SORT_BY = "firstname";
const DEFAULT_SORT_BY = "displayname";
const DEFAULT_SORT_ORDER = "ascending";
const DEFAULT_EMPLOYEE_STATUS = null;
const DEFAULT_ACTIVATION_STATUS = null;

6
public/scripts/sdk/1.0.1/api.js
View File

@ -98,6 +98,7 @@
onSignOut: null,
onDownload: null,
onNoAccess: null,
onContentReady: null,
},
};
@ -814,7 +815,10 @@
targetFrame.style.height = this.config.height;
targetFrame.parentNode.style.height = "inherit";
if (loader) loader.remove();
if (loader) {
loader.remove();
this.config.events.onContentReady();
}
}
}