Strange that diffs that appear to depend on this one are already landed, before this one. Will this present any issues on master? Does it block release?

In D10926#315341, @ashoat wrote:

Strange that diffs that appear to depend on this one are already landed, before this one.

D10785 and D10787 depend on this one - those are still in review.

Will this present any issues on master? Does it block release?

No, it's just a refactor - logic is the same.

inka accepted this revision.Feb 5 2024, 2:28 AM

This revision is now accepted and ready to land.Feb 5 2024, 2:28 AM

Closed by commit rCOMM4fa3ac20d292: [web] refactor set new session in `redux-setup` to ops (authored by kamil). · Explain WhyFeb 5 2024, 10:11 AM

This revision was automatically updated to reflect the committed changes.

kamil added a commit: rCOMM4fa3ac20d292: [web] refactor set new session in `redux-setup` to ops.

Revision Contents
Changeset List

Path

Size

web/

redux/

redux-setup.js

21 lines

Diff 36630

View Options

web/redux/redux-setup.js

Show All 23 Lines
import { reduceThreadInfos } from './thread-reducer.js';		import { reduceThreadInfos } from './thread-reducer.js';
import { reduceCurrentUserInfo, reduceUserInfos } from './user-reducer.js';		import { reduceCurrentUserInfo, reduceUserInfos } from './user-reducer.js';
import { addKeyserverActionType } from '../actions/keyserver-actions.js';		import { addKeyserverActionType } from '../actions/keyserver-actions.js';
import { siweAuthActionTypes } from '../actions/siwe-actions.js';		import { siweAuthActionTypes } from '../actions/siwe-actions.js';
import {		import {
keyserverRegisterActionTypes,		keyserverRegisterActionTypes,
logInActionTypes,		logInActionTypes,
} from '../actions/user-actions.js';		} from '../actions/user-actions.js';
		import {
		keyserverStoreOpsHandlers,
		type ReplaceKeyserverOperation,
		} from '../ops/keyserver-store-ops.js';
import { isStaff } from '../shared/staff-utils.js';		import { isStaff } from '../shared/staff-utils.js';
import type { BaseNavInfo } from '../types/nav-types.js';		import type { BaseNavInfo } from '../types/nav-types.js';
import type { BaseAppState, BaseAction } from '../types/redux-types.js';		import type { BaseAppState, BaseAction } from '../types/redux-types.js';
import {		import {
fullStateSyncActionType,		fullStateSyncActionType,
incrementalStateSyncActionType,		incrementalStateSyncActionType,
} from '../types/socket-types.js';		} from '../types/socket-types.js';
import type { StoreOperations } from '../types/store-ops-types.js';		import type { StoreOperations } from '../types/store-ops-types.js';
▲ Show 20 Lines • Show All 42 Lines • ▼ Show 20 Lines	): { state: T, storeOperations: StoreOperations } {
if (		if (
action.type !== incrementalStateSyncActionType &&		action.type !== incrementalStateSyncActionType &&
action.type !== fullStateSyncActionType &&		action.type !== fullStateSyncActionType &&
action.type !== keyserverRegisterActionTypes.success &&		action.type !== keyserverRegisterActionTypes.success &&
action.type !== logInActionTypes.success &&		action.type !== logInActionTypes.success &&
action.type !== siweAuthActionTypes.success &&		action.type !== siweAuthActionTypes.success &&
action.type !== addKeyserverActionType		action.type !== addKeyserverActionType
) {		) {
		const replaceOperations: ReplaceKeyserverOperation[] = [];
for (const keyserverID in keyserverStore.keyserverInfos) {		for (const keyserverID in keyserverStore.keyserverInfos) {
if (		if (
keyserverStore.keyserverInfos[keyserverID].connection.status ===		keyserverStore.keyserverInfos[keyserverID].connection.status ===
'connected'		'connected'
) {		) {
continue;		continue;
}		}
if (		if (
messageStore.currentAsOf[keyserverID] !==		messageStore.currentAsOf[keyserverID] !==
state.messageStore.currentAsOf[keyserverID]		state.messageStore.currentAsOf[keyserverID]
) {		) {
messageStore = {		messageStore = {
...messageStore,		...messageStore,
currentAsOf: {		currentAsOf: {
...messageStore.currentAsOf,		...messageStore.currentAsOf,
[keyserverID]: state.messageStore.currentAsOf[keyserverID],		[keyserverID]: state.messageStore.currentAsOf[keyserverID],
},		},
};		};
}		}
if (		if (
state.keyserverStore.keyserverInfos[keyserverID] &&		state.keyserverStore.keyserverInfos[keyserverID] &&
keyserverStore.keyserverInfos[keyserverID].updatesCurrentAsOf !==		keyserverStore.keyserverInfos[keyserverID].updatesCurrentAsOf !==
state.keyserverStore.keyserverInfos[keyserverID].updatesCurrentAsOf		state.keyserverStore.keyserverInfos[keyserverID].updatesCurrentAsOf
) {		) {
const keyserverInfos = { ...keyserverStore.keyserverInfos };		replaceOperations.push({
keyserverInfos[keyserverID] = {		type: 'replace_keyserver',
...keyserverInfos[keyserverID],		payload: {
		id: keyserverID,
		keyserverInfo: {
		...keyserverStore.keyserverInfos[keyserverID],
updatesCurrentAsOf:		updatesCurrentAsOf:
state.keyserverStore.keyserverInfos[keyserverID].updatesCurrentAsOf,		state.keyserverStore.keyserverInfos[keyserverID]
};		.updatesCurrentAsOf,
keyserverStore = { ...keyserverStore, keyserverInfos };		},
		},
		});
}		}
}		}
		if (replaceOperations.length > 0) {
		keyserverStore = {
		...keyserverStore,
		keyserverInfos: keyserverStoreOpsHandlers.processStoreOperations(
		keyserverStore.keyserverInfos,
		replaceOperations,
		),
		};
		}
}		}

const { draftStore, draftStoreOperations } = reduceDraftStore(		const { draftStore, draftStoreOperations } = reduceDraftStore(
state.draftStore,		state.draftStore,
action,		action,
);		);

const { reportStore, reportStoreOperations } = reduceReportStore(		const { reportStore, reportStoreOperations } = reduceReportStore(
▲ Show 20 Lines • Show All 63 Lines • Show Last 20 Lines

[web] refactor set new session in `redux-setup` to opsClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 36630

web/redux/redux-setup.js

[web] refactor set new session in `redux-setup` to ops
ClosedPublic
Actions

Revision Contents
Changeset List