test: mvvm userinfoadmintools and view

Author: MarcWadai

src/components/viewmodels/right_panel/UserInfoAdminToolsContainerViewModel.tsx

@@ -17,7 +17,7 @@ import ConfirmUserActionDialog from "../../views/dialogs/ConfirmUserActionDialog
 import ErrorDialog from "../../views/dialogs/ErrorDialog";
 import BulkRedactDialog from "../../views/dialogs/BulkRedactDialog";
 
-interface RoomAdminToolsProps {
+export interface RoomAdminToolsProps {
     room: Room;
     member: RoomMember;
     isUpdating: boolean;
@@ -122,7 +122,7 @@ export function useRoomKickButtonViewModel( props: RoomAdminToolsProps ): RoomKi
             });
     };
 
-    const canUserBeKicked = member.membership !== KnownMembership.Invite && member.membership !== KnownMembership.Join;
+    const canUserBeKicked = member.membership === KnownMembership.Invite || member.membership === KnownMembership.Join;
 
     const kickLabel = room.isSpaceRoom()
         ? member.membership === KnownMembership.Invite
@@ -149,7 +149,7 @@ export interface RedactMessagesButtonState {
  * @param member - the member to redact messages for
  * @returns the redact messages button state
  */
-export const userRedactMessagesButtonViewModel = (member: RoomMember): RedactMessagesButtonState => {
+export const useRedactMessagesButtonViewModel = (member: RoomMember): RedactMessagesButtonState => {
     const cli = useContext(MatrixClientContext);
 
     const onRedactAllMessagesClick = (): void => {
@@ -168,12 +168,12 @@ export const userRedactMessagesButtonViewModel = (member: RoomMember): RedactMes
     };
 };
 
-export interface BanToggleButtonState {
+export interface BanButtonState {
     onBanOrUnbanClick: () => void;
     banLabel: string;
 }
 
-export const userBanToggleButtonViewModel = (props: RoomAdminToolsProps): BanToggleButtonState => {
+export const useBanButtonViewModel = (props: RoomAdminToolsProps): BanButtonState => {
     const { isUpdating, startUpdating, stopUpdating, room, member } = props;
 
     const cli = useContext(MatrixClientContext);
@@ -281,17 +281,17 @@ export const userBanToggleButtonViewModel = (props: RoomAdminToolsProps): BanTog
                 stopUpdating();
             });
     };
-    
+
     return {
         onBanOrUnbanClick,
         banLabel,
     };
-}
+};
 
 interface MuteButtonState {
     isMemberInTheRoom: boolean;
     muteLabel: string;
-    onMutebuttonClick: () => void;
+    onMuteButtonClick: () => void;
 }
 
 export const useMuteButtonViewModel = (props: RoomAdminToolsProps): MuteButtonState => {
@@ -320,7 +320,7 @@ export const useMuteButtonViewModel = (props: RoomAdminToolsProps): MuteButtonSt
 
     const isMemberInTheRoom = member.membership !== KnownMembership.Join;
 
-    const onMutebuttonClick = async (): Promise<void> => {
+    const onMuteButtonClick = async (): Promise<void> => {
         if (isUpdating) return; // only allow one operation at a time
         startUpdating();
 
@@ -367,7 +367,7 @@ export const useMuteButtonViewModel = (props: RoomAdminToolsProps): MuteButtonSt
 
     return {
         isMemberInTheRoom,
-        onMutebuttonClick,
+        onMuteButtonClick,
         muteLabel,
     };
 };
@@ -380,7 +380,7 @@ interface UserInfoAdminToolsContainerState {
     isCurrentUserInTheRoom: boolean;
 }
 
-interface RoomAdminToolsContainerProps {
+export interface RoomAdminToolsContainerProps {
     room: Room;
     member: RoomMember;
     powerLevels: IPowerLevelsContent;

src/components/views/right_panel/user_info/UserInfoAdminToolsContainer.tsx

@@ -19,7 +19,13 @@ import LeaveIcon from "@vector-im/compound-design-tokens/assets/web/icons/leave"
 
 import { _t } from "../../../../languageHandler";
 import { IPowerLevelsContent } from "../UserInfo";
-import { useMuteButtonViewModel, userBanToggleButtonViewModel, useRoomKickButtonViewModel, userRedactMessagesButtonViewModel, useUserInfoAdminToolsContainerViewModel } from "../../../viewmodels/right_panel/UserInfoAdminToolsContainerViewModel";
+import {
+    useMuteButtonViewModel,
+    useBanButtonViewModel,
+    useRoomKickButtonViewModel,
+    useRedactMessagesButtonViewModel,
+    useUserInfoAdminToolsContainerViewModel,
+} from "../../../viewmodels/right_panel/UserInfoAdminToolsContainerViewModel";
 
 
 
@@ -49,7 +55,7 @@ export const RoomKickButton = ({
 }: Omit<IBaseRoomProps, "powerLevels">): JSX.Element | null => {
     const vm = useRoomKickButtonViewModel({room, member, isUpdating, startUpdating, stopUpdating});
     // check if user can be kicked/disinvited
-    if (vm.canUserBeKicked) return <></>;
+    if (!vm.canUserBeKicked) return <></>;
 
     return (
         <MenuItem
@@ -67,7 +73,7 @@ export const RoomKickButton = ({
 };
 
 const RedactMessagesButton: React.FC<IBaseProps> = ({ member }) => {
-    const vm = userRedactMessagesButtonViewModel(member);
+    const vm = useRedactMessagesButtonViewModel(member);
 
     return (
         <MenuItem
@@ -91,7 +97,7 @@ export const BanToggleButton = ({
     stopUpdating,
 }: Omit<IBaseRoomProps, "powerLevels">): JSX.Element => {
 
-    const vm = userBanToggleButtonViewModel({room, member, isUpdating, startUpdating, stopUpdating});
+    const vm = useBanButtonViewModel({ room, member, isUpdating, startUpdating, stopUpdating });
 
     return (
         <MenuItem
@@ -134,7 +140,7 @@ const MuteToggleButton: React.FC<IBaseRoomProps> = ({
             role="button"
             onSelect={async (ev) => {
                 ev.preventDefault();
-                vm.onMutebuttonClick();
+                vm.onMuteButtonClick();
             }}
             disabled={isUpdating}
             label={vm.muteLabel}