Web: Files: Leave-room: fix
This commit is contained in:
parent
238b86bce5
commit
06846b07d2
@ -24,6 +24,8 @@ const LeaveRoomDialog = (props) => {
|
|||||||
isAdmin,
|
isAdmin,
|
||||||
setSelected,
|
setSelected,
|
||||||
isRoot,
|
isRoot,
|
||||||
|
folders,
|
||||||
|
setFolders,
|
||||||
} = props;
|
} = props;
|
||||||
|
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
@ -64,6 +66,12 @@ const LeaveRoomDialog = (props) => {
|
|||||||
|
|
||||||
toastr.success(t("Files:YouLeftTheRoom"));
|
toastr.success(t("Files:YouLeftTheRoom"));
|
||||||
})
|
})
|
||||||
|
.then(() => {
|
||||||
|
const newFolders = folders;
|
||||||
|
const folderIndex = newFolders.findIndex((r) => r.id === roomId);
|
||||||
|
newFolders[folderIndex].inRoom = false;
|
||||||
|
setFolders(newFolders);
|
||||||
|
})
|
||||||
.finally(() => {
|
.finally(() => {
|
||||||
onClose();
|
onClose();
|
||||||
setIsLoading(false);
|
setIsLoading(false);
|
||||||
@ -123,6 +131,8 @@ export default inject(
|
|||||||
updateRoomMemberRole,
|
updateRoomMemberRole,
|
||||||
removeFiles,
|
removeFiles,
|
||||||
setSelected,
|
setSelected,
|
||||||
|
folders,
|
||||||
|
setFolders,
|
||||||
} = filesStore;
|
} = filesStore;
|
||||||
|
|
||||||
const roomId = selection.length
|
const roomId = selection.length
|
||||||
@ -149,6 +159,8 @@ export default inject(
|
|||||||
isAdmin: user.isOwner || user.isAdmin,
|
isAdmin: user.isOwner || user.isAdmin,
|
||||||
setSelected,
|
setSelected,
|
||||||
isRoot,
|
isRoot,
|
||||||
|
folders,
|
||||||
|
setFolders,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
)(observer(withTranslation(["Common", "Files"])(LeaveRoomDialog)));
|
)(observer(withTranslation(["Common", "Files"])(LeaveRoomDialog)));
|
||||||
|
@ -49,6 +49,8 @@ const ChangeRoomOwner = (props) => {
|
|||||||
isAdmin,
|
isAdmin,
|
||||||
setRoomParams,
|
setRoomParams,
|
||||||
removeFiles,
|
removeFiles,
|
||||||
|
folders,
|
||||||
|
setFolders,
|
||||||
} = props;
|
} = props;
|
||||||
|
|
||||||
const [isLoading, setIsLoading] = useState(false);
|
const [isLoading, setIsLoading] = useState(false);
|
||||||
@ -75,6 +77,12 @@ const ChangeRoomOwner = (props) => {
|
|||||||
if (!isAdmin) removeFiles(null, [roomId]);
|
if (!isAdmin) removeFiles(null, [roomId]);
|
||||||
toastr.success(t("Files:LeftAndAppointNewOwner"));
|
toastr.success(t("Files:LeftAndAppointNewOwner"));
|
||||||
})
|
})
|
||||||
|
.then(() => {
|
||||||
|
const newFolders = folders;
|
||||||
|
const folderIndex = newFolders.findIndex((r) => r.id === roomId);
|
||||||
|
newFolders[folderIndex].inRoom = false;
|
||||||
|
setFolders(newFolders);
|
||||||
|
})
|
||||||
.finally(() => {
|
.finally(() => {
|
||||||
onClose();
|
onClose();
|
||||||
setIsLoading(false);
|
setIsLoading(false);
|
||||||
@ -162,6 +170,8 @@ export default inject(
|
|||||||
setFolder,
|
setFolder,
|
||||||
updateRoomMemberRole,
|
updateRoomMemberRole,
|
||||||
removeFiles,
|
removeFiles,
|
||||||
|
folders,
|
||||||
|
setFolders,
|
||||||
} = filesStore;
|
} = filesStore;
|
||||||
|
|
||||||
const roomId = selection.length
|
const roomId = selection.length
|
||||||
@ -182,6 +192,8 @@ export default inject(
|
|||||||
updateRoomMemberRole,
|
updateRoomMemberRole,
|
||||||
isAdmin: user.isOwner || user.isAdmin,
|
isAdmin: user.isOwner || user.isAdmin,
|
||||||
removeFiles,
|
removeFiles,
|
||||||
|
folders,
|
||||||
|
setFolders,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
)(observer(withTranslation(["Files"])(ChangeRoomOwner)));
|
)(observer(withTranslation(["Files"])(ChangeRoomOwner)));
|
||||||
|
Loading…
Reference in New Issue
Block a user