Merge branch 'hotfix/v2.6.1' into feature/upload-rename
This commit is contained in:
commit
5b496dd329
@ -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) => {
|
||||
|
@ -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;
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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,
|
||||
};
|
||||
|
@ -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;
|
||||
|
@ -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();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user