OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Enable new room list store forever

pull/21833/head
Travis Ralston 2020-07-17 15:14:58 -06:00
parent 2b15ba21dd
commit 1cce6e2e32
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/stores/AsyncStoreWithClient.ts
View File

@ -18,7 +18,6 @@ import { MatrixClient } from "matrix-js-sdk/src/client";
import { AsyncStore } from "./AsyncStore"; import { AsyncStore } from "./AsyncStore";
import { ActionPayload } from "../dispatcher/payloads"; import { ActionPayload } from "../dispatcher/payloads";
export abstract class AsyncStoreWithClient<T extends Object> extends AsyncStore<T> { export abstract class AsyncStoreWithClient<T extends Object> extends AsyncStore<T> {
protected matrixClient: MatrixClient; protected matrixClient: MatrixClient;

21
src/stores/room-list/RoomListStore.ts
View File

@ -44,7 +44,7 @@ interface IState {
*/ */
export const LISTS_UPDATE_EVENT = "lists_update"; export const LISTS_UPDATE_EVENT = "lists_update";
export class RoomListStoreClass extends AsyncStoreWithClient<ActionPayload> { export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
/** /**
* Set to true if you're running tests on the store. Should not be touched in * Set to true if you're running tests on the store. Should not be touched in
* any other environment. * any other environment.
@ -52,7 +52,6 @@ export class RoomListStoreClass extends AsyncStoreWithClient<ActionPayload> {
public static TEST_MODE = false; public static TEST_MODE = false;
private initialListsGenerated = false; private initialListsGenerated = false;
private enabled = true;
private algorithm = new Algorithm(); private algorithm = new Algorithm();
private filterConditions: IFilterCondition[] = []; private filterConditions: IFilterCondition[] = [];
private tagWatcher = new TagWatcher(this); private tagWatcher = new TagWatcher(this);
@ -66,7 +65,7 @@ export class RoomListStoreClass extends AsyncStoreWithClient<ActionPayload> {
constructor() { constructor() {
super(defaultDispatcher); super(defaultDispatcher);
this.checkEnabled(); this.checkLoggingEnabled();
for (const settingName of this.watchedSettings) SettingsStore.monitorSetting(settingName, null); for (const settingName of this.watchedSettings) SettingsStore.monitorSetting(settingName, null);
RoomViewStore.addListener(() => this.handleRVSUpdate({})); RoomViewStore.addListener(() => this.handleRVSUpdate({}));
this.algorithm.on(LIST_UPDATED_EVENT, this.onAlgorithmListUpdated); this.algorithm.on(LIST_UPDATED_EVENT, this.onAlgorithmListUpdated);
@ -106,9 +105,7 @@ export class RoomListStoreClass extends AsyncStoreWithClient<ActionPayload> {
super.matrixClient = forcedClient; super.matrixClient = forcedClient;
} }
// TODO: Remove with https://github.com/vector-im/riot-web/issues/14367 this.checkLoggingEnabled();
this.checkEnabled();
if (!this.enabled) return;
// Update any settings here, as some may have happened before we were logically ready. // Update any settings here, as some may have happened before we were logically ready.
// Update any settings here, as some may have happened before we were logically ready. // Update any settings here, as some may have happened before we were logically ready.
@ -121,7 +118,7 @@ export class RoomListStoreClass extends AsyncStoreWithClient<ActionPayload> {
this.updateFn.trigger(); this.updateFn.trigger();
} }
private checkEnabled() { private checkLoggingEnabled() {
if (SettingsStore.getValue("advancedRoomListLogging")) { if (SettingsStore.getValue("advancedRoomListLogging")) {
console.warn("Advanced room list logging is enabled"); console.warn("Advanced room list logging is enabled");
} }
@ -141,7 +138,6 @@ export class RoomListStoreClass extends AsyncStoreWithClient<ActionPayload> {
* be used if the calling code will manually trigger the update. * be used if the calling code will manually trigger the update.
*/ */
private async handleRVSUpdate({trigger = true}) { private async handleRVSUpdate({trigger = true}) {
if (!this.enabled) return; // TODO: Remove with https://github.com/vector-im/riot-web/issues/14367
if (!this.matrixClient) return; // We assume there won't be RVS updates without a client if (!this.matrixClient) return; // We assume there won't be RVS updates without a client
const activeRoomId = RoomViewStore.getRoomId(); const activeRoomId = RoomViewStore.getRoomId();
@ -186,9 +182,6 @@ export class RoomListStoreClass extends AsyncStoreWithClient<ActionPayload> {
} }
protected async onDispatchAsync(payload: ActionPayload) { protected async onDispatchAsync(payload: ActionPayload) {
// TODO: Remove this once the RoomListStore becomes default
if (!this.enabled) return;
// Everything here requires a MatrixClient or some sort of logical readiness. // Everything here requires a MatrixClient or some sort of logical readiness.
const logicallyReady = this.matrixClient && this.initialListsGenerated; const logicallyReady = this.matrixClient && this.initialListsGenerated;
if (!logicallyReady) return; if (!logicallyReady) return;
@ -509,12 +502,6 @@ export class RoomListStoreClass extends AsyncStoreWithClient<ActionPayload> {
} }
} }
protected async updateState(newState: IState) {
if (!this.enabled) return;
await super.updateState(newState);
}
private onAlgorithmListUpdated = () => { private onAlgorithmListUpdated = () => {
if (SettingsStore.getValue("advancedRoomListLogging")) { if (SettingsStore.getValue("advancedRoomListLogging")) {
// TODO: Remove debug: https://github.com/vector-im/riot-web/issues/14035 // TODO: Remove debug: https://github.com/vector-im/riot-web/issues/14035