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

Merge pull request #49 from ONLYOFFICE/bugfix/room-owner

Browse Source 
fixed missing isMe variable
This commit is contained in:
Ilya Oleshko 2023-10-20 12:16:22 +03:00 committed by GitHub
commit badf0be78a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/ChangeRoomOwner/index.js
View File

@ -33,7 +33,7 @@ const ChangeRoomOwner = ({
<Text fontWeight={600} fontSize="13px">
{roomOwner.displayName}
</Text>
{roomOwner?.id === currentUserId && (
{roomOwner.id === currentUserId && (
<Text className="me-label">({t("Common:MeLabel")})</Text>
)}
</div>

7
packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
View File

@ -55,9 +55,13 @@ const SetRoomParams = ({
enableThirdParty,
setChangeRoomOwnerIsVisible,
isAdmin,
userId,
}) => {
const [previewIcon, setPreviewIcon] = React.useState(null);
const isMe = userId === roomParams?.roomOwner?.id;
const canChangeRoomOwner = (isAdmin || isMe) && roomParams.roomOwner;
const onChangeName = (e) => {
setIsValidTitle(true);
setRoomParams({ ...roomParams, title: e.target.value });
@ -128,7 +132,7 @@ const SetRoomParams = ({
/>
)} */}
{(isAdmin || isMe) && roomParams.roomOwner && (
{isEdit && canChangeRoomOwner && (
<ChangeRoomOwner
roomOwner={roomParams.roomOwner}
onOwnerChange={onOwnerChange}
@ -183,6 +187,7 @@ export default inject(({ auth, dialogsStore }) => {
return {
setChangeRoomOwnerIsVisible,
isAdmin: user.isAdmin || user.isOwner,
userId: user.id,
};
})(
observer(