From 178319f949338509e788d350fca27406679270f2 Mon Sep 17 00:00:00 2001 From: Titouan Rigoudy Date: Fri, 30 Jul 2021 14:08:52 -0400 Subject: [PATCH] Disambiguate Room type. --- src/modules/room/RoomList.tsx | 4 ++-- src/modules/room/{Room.tsx => RoomListEntry.tsx} | 6 +++--- src/modules/room/slice.ts | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) rename src/modules/room/{Room.tsx => RoomListEntry.tsx} (80%) diff --git a/src/modules/room/RoomList.tsx b/src/modules/room/RoomList.tsx index e58bdec..a581dd4 100644 --- a/src/modules/room/RoomList.tsx +++ b/src/modules/room/RoomList.tsx @@ -2,10 +2,10 @@ import { FC } from "react"; import { useDispatch } from "react-redux"; import SearchableList from "components/SearchableList"; -import RoomComponent from "modules/room/Room"; +import RoomListEntry from "modules/room/RoomListEntry"; import { RoomSliceState, roomGetAll } from "modules/room/slice"; -const SearchableRoomList = SearchableList(RoomComponent); +const SearchableRoomList = SearchableList(RoomListEntry); const RoomList: FC = ({ rooms }) => { const dispatch = useDispatch(); diff --git a/src/modules/room/Room.tsx b/src/modules/room/RoomListEntry.tsx similarity index 80% rename from src/modules/room/Room.tsx rename to src/modules/room/RoomListEntry.tsx index 6082c51..729ec5c 100644 --- a/src/modules/room/Room.tsx +++ b/src/modules/room/RoomListEntry.tsx @@ -2,14 +2,14 @@ import { FC } from "react"; import { NavLink } from "react-router-dom"; import { encode } from "modules/base64"; -import { RoomMembership, Room as RoomState } from "modules/room/slice"; +import { RoomMembership, RoomState } from "modules/room/slice"; interface Props { name: string; data: RoomState; } -const Room: FC = ({ name, data }) => { +const RoomListEntry: FC = ({ name, data }) => { const { membership, userCount } = data; const classes = ["room"]; @@ -29,4 +29,4 @@ const Room: FC = ({ name, data }) => { ); }; -export default Room; +export default RoomListEntry; diff --git a/src/modules/room/slice.ts b/src/modules/room/slice.ts index 6187574..4bb1dd5 100644 --- a/src/modules/room/slice.ts +++ b/src/modules/room/slice.ts @@ -14,7 +14,7 @@ export interface RoomMessage { message: string; } -export interface Room { +export interface RoomState { name: string; membership: RoomMembership; visibility: string; @@ -29,7 +29,7 @@ export interface Room { } export interface RoomMap { - [name: string]: Room; + [name: string]: RoomState; } export interface RoomSliceState {