Merge branch 'hotfix/v2.5.1' into develop
This commit is contained in:
commit
5aee9c9982
@ -93,6 +93,7 @@ const TagDropdown = ({
|
|||||||
heightTablet={32}
|
heightTablet={32}
|
||||||
key={i}
|
key={i}
|
||||||
label={tag}
|
label={tag}
|
||||||
|
onMouseDown={preventDefault}
|
||||||
onClick={() => addFetchedTag(tag)}
|
onClick={() => addFetchedTag(tag)}
|
||||||
/>
|
/>
|
||||||
));
|
));
|
||||||
|
@ -71,6 +71,7 @@ const Members = ({
|
|||||||
setExternalLink,
|
setExternalLink,
|
||||||
withPublicRoomBlock,
|
withPublicRoomBlock,
|
||||||
fetchMembers,
|
fetchMembers,
|
||||||
|
fetchMoreMembers,
|
||||||
membersIsLoading,
|
membersIsLoading,
|
||||||
searchValue,
|
searchValue,
|
||||||
searchResultIsLoading,
|
searchResultIsLoading,
|
||||||
@ -96,19 +97,7 @@ const Members = ({
|
|||||||
}, [infoPanelSelection, searchValue]);
|
}, [infoPanelSelection, searchValue]);
|
||||||
|
|
||||||
const loadNextPage = async () => {
|
const loadNextPage = async () => {
|
||||||
const roomId = infoPanelSelection.id;
|
await fetchMoreMembers(t, withoutTitlesAndLinks);
|
||||||
const fetchedMembers = await fetchMembers(t, false, withoutTitlesAndLinks);
|
|
||||||
const { users, administrators, expected, groups } = fetchedMembers;
|
|
||||||
|
|
||||||
const newMembers = {
|
|
||||||
roomId: roomId,
|
|
||||||
administrators: [...infoPanelMembers.administrators, ...administrators],
|
|
||||||
users: [...infoPanelMembers.users, ...users],
|
|
||||||
expected: [...infoPanelMembers.expected, ...expected],
|
|
||||||
groups: [...infoPanelMembers.groups, ...groups],
|
|
||||||
};
|
|
||||||
|
|
||||||
setInfoPanelMembers(newMembers);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
if (membersIsLoading) return <InfoPanelViewLoader view="members" />;
|
if (membersIsLoading) return <InfoPanelViewLoader view="members" />;
|
||||||
@ -301,6 +290,7 @@ export default inject(
|
|||||||
infoPanelMembers,
|
infoPanelMembers,
|
||||||
setInfoPanelMembers,
|
setInfoPanelMembers,
|
||||||
fetchMembers,
|
fetchMembers,
|
||||||
|
fetchMoreMembers,
|
||||||
membersIsLoading,
|
membersIsLoading,
|
||||||
withPublicRoomBlock,
|
withPublicRoomBlock,
|
||||||
searchValue,
|
searchValue,
|
||||||
@ -344,6 +334,7 @@ export default inject(
|
|||||||
setExternalLink,
|
setExternalLink,
|
||||||
withPublicRoomBlock,
|
withPublicRoomBlock,
|
||||||
fetchMembers,
|
fetchMembers,
|
||||||
|
fetchMoreMembers,
|
||||||
membersIsLoading,
|
membersIsLoading,
|
||||||
searchValue,
|
searchValue,
|
||||||
searchResultIsLoading,
|
searchResultIsLoading,
|
||||||
|
@ -89,7 +89,7 @@ const MembersList = (props) => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
const listOfTitles = list
|
const listOfTitles = list
|
||||||
.filter((x) => x.props.isTitle)
|
.filter((x) => x.props.user?.isTitle)
|
||||||
.map((item) => {
|
.map((item) => {
|
||||||
return {
|
return {
|
||||||
displayName: item.props.user.displayName,
|
displayName: item.props.user.displayName,
|
||||||
|
@ -47,7 +47,7 @@ const StyledRowContent = styled(RowContent)`
|
|||||||
|
|
||||||
.badges {
|
.badges {
|
||||||
flex-direction: row-reverse;
|
flex-direction: row-reverse;
|
||||||
margin-top: 10px;
|
|
||||||
margin-inline-end: 12px;
|
margin-inline-end: 12px;
|
||||||
|
|
||||||
.paid-badge {
|
.paid-badge {
|
||||||
|
@ -46,7 +46,7 @@ const StyledRowContent = styled(RowContent)`
|
|||||||
|
|
||||||
.badges {
|
.badges {
|
||||||
flex-direction: row-reverse;
|
flex-direction: row-reverse;
|
||||||
margin-top: 9px;
|
|
||||||
margin-inline-end: 12px;
|
margin-inline-end: 12px;
|
||||||
|
|
||||||
.paid-badge {
|
.paid-badge {
|
||||||
|
@ -133,8 +133,10 @@ class InfoPanelStore {
|
|||||||
};
|
};
|
||||||
|
|
||||||
setSearchValue = (value) => {
|
setSearchValue = (value) => {
|
||||||
|
if (value !== this.searchValue) {
|
||||||
this.setSearchResultIsLoading(true);
|
this.setSearchResultIsLoading(true);
|
||||||
this.searchValue = value;
|
this.searchValue = value;
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
resetSearch = () => {
|
resetSearch = () => {
|
||||||
@ -651,6 +653,38 @@ class InfoPanelStore {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
fetchMoreMembers = async (t, withoutTitles) => {
|
||||||
|
const roomId = this.infoPanelSelection.id;
|
||||||
|
const oldMembers = this.infoPanelMembers;
|
||||||
|
|
||||||
|
const data = await this.filesStore.getRoomMembers(roomId, false);
|
||||||
|
|
||||||
|
const newMembers = this.convertMembers(t, data, false, true);
|
||||||
|
|
||||||
|
const mergedMembers = {
|
||||||
|
roomId: roomId,
|
||||||
|
administrators: [
|
||||||
|
...oldMembers.administrators,
|
||||||
|
...newMembers.administrators,
|
||||||
|
],
|
||||||
|
users: [...oldMembers.users, ...newMembers.users],
|
||||||
|
expected: [...oldMembers.expected, ...newMembers.expectedMembers],
|
||||||
|
groups: [...oldMembers.groups, ...newMembers.groups],
|
||||||
|
};
|
||||||
|
|
||||||
|
if (!withoutTitles) {
|
||||||
|
this.addMembersTitle(
|
||||||
|
t,
|
||||||
|
mergedMembers.administrators,
|
||||||
|
mergedMembers.users,
|
||||||
|
mergedMembers.expected,
|
||||||
|
mergedMembers.groups,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.setInfoPanelMembers(mergedMembers);
|
||||||
|
};
|
||||||
|
|
||||||
addInfoPanelMembers = (t, members) => {
|
addInfoPanelMembers = (t, members) => {
|
||||||
const convertedMembers = this.convertMembers(t, members);
|
const convertedMembers = this.convertMembers(t, members);
|
||||||
|
|
||||||
|
@ -63,6 +63,8 @@ const Root = ({
|
|||||||
fileId,
|
fileId,
|
||||||
hash,
|
hash,
|
||||||
}: TResponse) => {
|
}: TResponse) => {
|
||||||
|
const editorRef = React.useRef<null | HTMLElement>(null);
|
||||||
|
|
||||||
const documentserverUrl = config?.editorUrl ?? error?.editorUrl;
|
const documentserverUrl = config?.editorUrl ?? error?.editorUrl;
|
||||||
const fileInfo = config?.file;
|
const fileInfo = config?.file;
|
||||||
|
|
||||||
@ -141,9 +143,19 @@ const Root = ({
|
|||||||
isSharingDialogVisible ||
|
isSharingDialogVisible ||
|
||||||
isVisibleSelectFolderDialog ||
|
isVisibleSelectFolderDialog ||
|
||||||
selectFileDialogVisible
|
selectFileDialogVisible
|
||||||
)
|
) {
|
||||||
calculateAsideHeight();
|
calculateAsideHeight();
|
||||||
|
|
||||||
|
const activeElement = document.activeElement as HTMLElement | null;
|
||||||
|
|
||||||
|
if (activeElement && activeElement.tagName === "IFRAME") {
|
||||||
|
editorRef.current = activeElement;
|
||||||
|
activeElement.blur();
|
||||||
|
}
|
||||||
|
} else if (editorRef.current) {
|
||||||
|
editorRef.current.focus();
|
||||||
|
}
|
||||||
|
|
||||||
if (isSharingDialogVisible) {
|
if (isSharingDialogVisible) {
|
||||||
setTimeout(calculateAsideHeight, 10);
|
setTimeout(calculateAsideHeight, 10);
|
||||||
}
|
}
|
||||||
|
@ -52,6 +52,7 @@ import RoReactSvgUrl from "PUBLIC_DIR/images/flags/ro.react.svg?url";
|
|||||||
import RuReactSvgUrl from "PUBLIC_DIR/images/flags/ru.react.svg?url";
|
import RuReactSvgUrl from "PUBLIC_DIR/images/flags/ru.react.svg?url";
|
||||||
import SkReactSvgUrl from "PUBLIC_DIR/images/flags/sk.react.svg?url";
|
import SkReactSvgUrl from "PUBLIC_DIR/images/flags/sk.react.svg?url";
|
||||||
import SlReactSvgUrl from "PUBLIC_DIR/images/flags/sl.react.svg?url";
|
import SlReactSvgUrl from "PUBLIC_DIR/images/flags/sl.react.svg?url";
|
||||||
|
import SiReactSvgUrl from "PUBLIC_DIR/images/flags/si.react.svg?url";
|
||||||
import SrLatnRSReactSvgUrl from "PUBLIC_DIR/images/flags/sr-Latn-RS.react.svg?url";
|
import SrLatnRSReactSvgUrl from "PUBLIC_DIR/images/flags/sr-Latn-RS.react.svg?url";
|
||||||
import TrReactSvgUrl from "PUBLIC_DIR/images/flags/tr.react.svg?url";
|
import TrReactSvgUrl from "PUBLIC_DIR/images/flags/tr.react.svg?url";
|
||||||
import UkUAReactSvgUrl from "PUBLIC_DIR/images/flags/uk-UA.react.svg?url";
|
import UkUAReactSvgUrl from "PUBLIC_DIR/images/flags/uk-UA.react.svg?url";
|
||||||
@ -87,6 +88,7 @@ export const flagsIcons = new Map([
|
|||||||
["ru.react.svg", RuReactSvgUrl],
|
["ru.react.svg", RuReactSvgUrl],
|
||||||
["sk.react.svg", SkReactSvgUrl],
|
["sk.react.svg", SkReactSvgUrl],
|
||||||
["sl.react.svg", SlReactSvgUrl],
|
["sl.react.svg", SlReactSvgUrl],
|
||||||
|
["si.react.svg", SiReactSvgUrl],
|
||||||
["sr-Latn-RS.react.svg", SrLatnRSReactSvgUrl],
|
["sr-Latn-RS.react.svg", SrLatnRSReactSvgUrl],
|
||||||
["tr.react.svg", TrReactSvgUrl],
|
["tr.react.svg", TrReactSvgUrl],
|
||||||
["uk-UA.react.svg", UkUAReactSvgUrl],
|
["uk-UA.react.svg", UkUAReactSvgUrl],
|
||||||
|
53
public/images/flags/si.react.svg
Normal file
53
public/images/flags/si.react.svg
Normal file
File diff suppressed because one or more lines are too long
After Width: | Height: | Size: 63 KiB |
Loading…
Reference in New Issue
Block a user