Merge branch 'release/v2.5.0' into feature/roomadmin-groups-crud-access
This commit is contained in:
commit
7e91a77328
@ -168,7 +168,11 @@ const Table = ({
|
||||
const columnStorageName = `${COLUMNS_SIZE}=${userId}`;
|
||||
const columnInfoPanelStorageName = `${INFO_PANEL_COLUMNS_SIZE}=${userId}`;
|
||||
|
||||
return (
|
||||
const isEmptyPage = !insideGroupIsLoading && peopleList.length === 0;
|
||||
|
||||
return isEmptyPage ? (
|
||||
<EmptyScreen />
|
||||
) : (
|
||||
<StyledTableContainer useReactWindow={!withPaging} forwardedRef={ref}>
|
||||
<TableHeader
|
||||
columnStorageName={columnStorageName}
|
||||
|
@ -3962,11 +3962,21 @@ class FilesStore {
|
||||
const tileGap = isDesktopView ? 16 : 14;
|
||||
const minTileWidth = 216 + tileGap;
|
||||
const body = document.getElementById("section");
|
||||
const tileContainer = document.getElementById("tileContainer");
|
||||
|
||||
const sectionPadding =
|
||||
body?.offsetWidth - tileContainer?.clientWidth - tileGap + 1;
|
||||
const elem = document.getElementsByClassName("section-wrapper-content")[0];
|
||||
let containerWidth = 0;
|
||||
if (elem) {
|
||||
const elemPadding = window
|
||||
.getComputedStyle(elem)
|
||||
?.getPropertyValue("padding");
|
||||
|
||||
containerWidth =
|
||||
elem?.clientWidth -
|
||||
elemPadding.split("px")[1] -
|
||||
elemPadding.split("px")[3];
|
||||
}
|
||||
|
||||
const sectionPadding = body?.offsetWidth - containerWidth - tileGap + 1;
|
||||
const sectionWidth = body ? body.offsetWidth - sectionPadding : 0;
|
||||
|
||||
return Math.floor(sectionWidth / minTileWidth);
|
||||
|
@ -199,6 +199,10 @@ class GroupsStore {
|
||||
this.currentGroup = currentGroup;
|
||||
};
|
||||
|
||||
setInsideGroupLoading = (value: boolean) => {
|
||||
this.insideGroupIsLoading = value;
|
||||
};
|
||||
|
||||
setInsideGroupBackUrl = (url: string) => {
|
||||
this.insideGroupBackUrl = url;
|
||||
};
|
||||
@ -277,6 +281,8 @@ class GroupsStore {
|
||||
updateFilter = false,
|
||||
withFilterLocalStorage = false,
|
||||
) => {
|
||||
this.setInsideGroupLoading(true);
|
||||
|
||||
const filterData = filter ? filter.clone() : AccountsFilter.getDefault();
|
||||
filterData.group = groupId;
|
||||
|
||||
@ -316,6 +322,8 @@ class GroupsStore {
|
||||
this.setInsideGroupFilterParams(filterData);
|
||||
}
|
||||
|
||||
this.setInsideGroupLoading(false);
|
||||
|
||||
return Promise.resolve(filteredMembersRes.items);
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user