Florian DurosandGitHub
b68ecdb860
* refactor(room-list): migrate SpaceStore off the legacy room list store SpaceStore.setActiveRoomInSpace iterated the legacy RoomListStore's `orderedLists` in `TAG_ORDER`; switch it to the space-aware RoomListStoreV3.getSortedRoomsInActiveSpace() accessor. This drops the last non-UI dependency on the legacy store and on `TAG_ORDER` (exported from LegacyRoomList, deleted next). * feat(room-list)!: remove the legacy room list UI Delete the old sublist-based room list and its components now that the new RoomListPanel is the default. Removed: LegacyRoomList, LegacyRoomListHeader, RoomSublist, ExtraTile, RoomTile (+ Subtitle/ CallSummary), RoomBreadcrumbs and RoomSearch, plus their styles and tests. LeftPanel collapses to the RoomListPanel-only path. The shared `contextMenuBelow` helper is relocated into RoomResultContextMenus (its only remaining consumer). * feat(room-list)!: remove the legacy RoomListStore The legacy sublist-based room list UI is gone, so the old `stores/room-list` store (Algorithm, sorters, filters, layout store, space watcher) has no remaining consumers. Delete the directory and its tests. MatrixChat.forgetRoom no longer calls the legacy `manualRoomUpdate`; the new room list store removes the room on the `AfterForgetRoom` dispatch that still fires. Drop the `mxRoomListStore`/`mxRoomListLayoutStore` globals and the now-dead test imports. * feat(room-list)!: remove the feature_new_room_list labs flag The new room list is now the only room list, so remove the feature_new_room_list labs flag and make its enabled behaviour unconditional everywhere it was gated: - LoggedInView: always use the resizable layout and NEW_ROOM_LIST_MIN_WIDTH; drop the collapsible/minimized legacy path. - SpaceStore: People and Favourites are dropped from metaSpaceOrder (per the long-standing TODO on the removed accessor). - MessagePreviewStore: stop appending thread replies to previews. - Settings, SidebarUserSettingsTab, PreferencesUserSettingsTab, QuickSettingsButton, SpacePanel, LandmarkNavigation: drop the flag reads and legacy branches. Update the tests that toggled the flag; the People/Favourites meta space tests covered behaviour that the flag (default on) already disabled. * feat(room-list)!: remove the dead legacy left-panel resizer LoggedInView still built the old `Resizer`/`CollapseDistributor` over an `lp-resizer` ResizeHandle and persisted `mx_lhs_size`. That handle is no longer rendered (the resizable layout is now driven by LeftResizablePanelView + ResizerViewModel, which persists its own state via RoomList.panelSize/RoomList.isPanelCollapsed), so the old resizer was inert dead code left over from the legacy room list. Remove createResizer/loadResizer/loadResizerPreferences, the _resizeContainer/resizeHandler refs, the ResizeHandle render, the mx_lhs_size handling and NEW_ROOM_LIST_MIN_WIDTH, plus the unit tests that exercised the mocked resizer. * feat(room-list)!: update i18n files * refactor(room-list): remove the now-unused collapseLhs state `collapseLhs` is write-only since the left panel no longer collapses: it was last read by LoggedInView's `shouldUseMinimizedUI`, removed with the feature_new_room_list flag. Drop it from MatrixChat's IState (and its assignments), collapsing the hide/show_left_panel handlers to just the `notifyLeftHandleResized()` call they still need, and from LoggedInView's IProps and the test props. * fix(room-list): instantiate message previewers lazily Removing the unused SettingsStore import from MessagePreviewStore (when the feature_new_room_list flag was dropped) changed module load order and exposed a latent circular dependency: ReactionEventPreview imports MessagePreviewStore, which eagerly did `new ReactionEventPreview()` at module-eval — so importing ReactionEventPreview first (as its unit test does) hit "ReactionEventPreview is not a constructor". Construct the previewers lazily on first use (cached) instead of at module load, so nothing dereferences a mid-evaluation module. Fixes ReactionEventPreview-test. * test(room-list): remove `feature_new_room_list` labs flag in e2e tests * chore: remove remaining `newRoomList` flag * chore: cleanup theme files * fix: restore the re-resizable TouchEvent polyfill * chore: remove usage of breadcrumbs settings in BreadcrumbStore * Revert "fix(room-list): instantiate message previewers lazily" This reverts commit 4e6eedfff0449c68a96c0470a4eb425b5aec5512. * chore: remove unused function in BreadCrumbStore * test: remove unused fuction of BreadcrumStore in tests * test: add tests for RoomResultContextMenu
84 lines
3.5 KiB
TypeScript
84 lines
3.5 KiB
TypeScript
/*
|
|
Copyright 2025 Element Creations Ltd.
|
|
|
|
SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
|
|
Please see LICENSE files in the repository root for full details.
|
|
*/
|
|
|
|
import { waitFor } from "jest-matrix-react";
|
|
|
|
import { type RoomListStoreApi, StoresApi } from "../../../src/modules/StoresApi";
|
|
import RoomListStoreV3, {
|
|
LISTS_LOADED_EVENT,
|
|
LISTS_UPDATE_EVENT,
|
|
} from "../../../src/stores/room-list-v3/RoomListStoreV3";
|
|
import { mkRoom, stubClient } from "../../test-utils/test-utils";
|
|
import { Room } from "../../../src/modules/models/Room";
|
|
|
|
describe("StoresApi", () => {
|
|
describe("RoomListStoreApi", () => {
|
|
it("should return promise that resolves when RLS is ready", async () => {
|
|
jest.spyOn(RoomListStoreV3.instance, "isLoadingRooms", "get").mockReturnValue(true);
|
|
const store = new StoresApi();
|
|
let hasResolved = false;
|
|
// The following async function will set hasResolved to false
|
|
// only when waitForReady resolves.
|
|
(async () => {
|
|
await store.roomListStore.waitForReady();
|
|
hasResolved = true;
|
|
})();
|
|
// Shouldn't have resolved yet.
|
|
expect(hasResolved).toStrictEqual(false);
|
|
|
|
// Wait for the module to load so that we can test the listener.
|
|
await (store.roomListStore as RoomListStoreApi).moduleLoadPromise;
|
|
// Emit the loaded event.
|
|
RoomListStoreV3.instance.emit(LISTS_LOADED_EVENT);
|
|
// Should resolve now.
|
|
await waitFor(() => {
|
|
expect(hasResolved).toStrictEqual(true);
|
|
});
|
|
});
|
|
|
|
describe("getRooms()", () => {
|
|
it("should return rooms from RLS", async () => {
|
|
const cli = stubClient();
|
|
const room1 = mkRoom(cli, "!foo1:m.org");
|
|
const room2 = mkRoom(cli, "!foo2:m.org");
|
|
const room3 = mkRoom(cli, "!foo3:m.org");
|
|
jest.spyOn(RoomListStoreV3.instance, "getSortedRooms").mockReturnValue([room1, room2, room3]);
|
|
jest.spyOn(RoomListStoreV3.instance, "isLoadingRooms", "get").mockReturnValue(false);
|
|
|
|
const store = new StoresApi();
|
|
await store.roomListStore.waitForReady();
|
|
const watchable = store.roomListStore.getRooms();
|
|
expect(watchable.value).toHaveLength(3);
|
|
expect(watchable.value[0]).toBeInstanceOf(Room);
|
|
});
|
|
|
|
it("should update from RLS", async () => {
|
|
const cli = stubClient();
|
|
const room1 = mkRoom(cli, "!foo1:m.org");
|
|
const room2 = mkRoom(cli, "!foo2:m.org");
|
|
const rooms = [room1, room2];
|
|
|
|
jest.spyOn(RoomListStoreV3.instance, "getSortedRooms").mockReturnValue(rooms);
|
|
jest.spyOn(RoomListStoreV3.instance, "isLoadingRooms", "get").mockReturnValue(false);
|
|
|
|
const store = new StoresApi();
|
|
await store.roomListStore.waitForReady();
|
|
const watchable = store.roomListStore.getRooms();
|
|
const fn = jest.fn();
|
|
watchable.watch(fn);
|
|
expect(watchable.value).toHaveLength(2);
|
|
|
|
const room3 = mkRoom(cli, "!foo3:m.org");
|
|
rooms.push(room3);
|
|
RoomListStoreV3.instance.emit(LISTS_UPDATE_EVENT);
|
|
expect(fn).toHaveBeenCalledTimes(1);
|
|
expect(watchable.value).toHaveLength(3);
|
|
});
|
|
});
|
|
});
|
|
});
|