Page MenuHomePhabricator
Differential D10883

[lib] refactor deleting keyserver account `keyserver-reducer` to ops
ClosedPublic
Actions

Authored by kamil on Jan 31 2024, 5:46 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Mar 19, 11:03 PM
Unknown Object (File)
Sun, Mar 9, 11:10 AM
Unknown Object (File)
Feb 21 2025, 9:16 AM
Unknown Object (File)
Feb 21 2025, 9:16 AM
Unknown Object (File)
Feb 21 2025, 9:16 AM
Unknown Object (File)
Feb 21 2025, 9:16 AM
Unknown Object (File)
Feb 21 2025, 9:16 AM
Unknown Object (File)
Feb 21 2025, 9:15 AM
View All 91 Files
Subscribers
ashoat
tomek

Details

Reviewers
inka
Commits
rCOMMa1cfde03647c: [lib] refactor deleting keyserver account `keyserver-reducer` to ops
Summary

Convert logic to ops approach.

Depends on D10772

Test Plan

Run keyserver-reducer.test.js

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

kamil created this revision.Jan 31 2024, 5:46 AM
kamil held this revision as a draft.
Herald added subscribers: tomek, ashoat. · View Herald TranscriptJan 31 2024, 5:46 AM
kamil added a child revision: D10773: [lib] refactor `reduceKeyserverStore` to return ops.Jan 31 2024, 5:47 AM
kamil published this revision for review.Jan 31 2024, 5:53 AM
Harbormaster completed remote builds in B26328: Diff 36381.Jan 31 2024, 6:05 AM
inka requested changes to this revision.Jan 31 2024, 6:15 AM
inka added inline comments.
lib/reducers/keyserver-reducer.js
430 ↗(On Diff #36381)

You want to check if action.payload.keyserverIDs includes ashoatKeyserverID.
The logic is that this action has in action.payload.keyserverIDs ids of keyservers the user is disconnecting from. We want to remove them from the store, with the exception of Ashoat's keyserver, which has to be in the store at all times. So if Ashoat's keyserver is included in action.payload.keyserverIDs, we just want to clear some fields for it.

For the record, state.keyserverInfos should always include and entry for ashoatKeyserverID (until we have real DMs)

This revision now requires changes to proceed.Jan 31 2024, 6:15 AM
kamil updated this revision to Diff 36382.Jan 31 2024, 7:24 AM

address review

inka accepted this revision.Jan 31 2024, 7:37 AM

It would be great if you could also check if running this action with Ashoat's id in payload resets Ashoat's keyserver correctly - this is not included in keyserver-reducer.test.js

Also, what does thread-activity-reducer.test.js have to do with this?

This revision is now accepted and ready to land.Jan 31 2024, 7:37 AM
Harbormaster completed remote builds in B26329: Diff 36382.Jan 31 2024, 7:44 AM
kamil updated this revision to Diff 36386.Jan 31 2024, 8:01 AM

implement tests

kamil edited the test plan for this revision. (Show Details)Jan 31 2024, 8:02 AM
inka accepted this revision.Jan 31 2024, 8:05 AM
This revision was landed with ongoing or failed builds.Jan 31 2024, 8:23 AM
Closed by commit rCOMMa1cfde03647c: [lib] refactor deleting keyserver account `keyserver-reducer` to ops (authored by kamil). · Explain Why
This revision was automatically updated to reflect the committed changes.
kamil added a commit: rCOMMa1cfde03647c: [lib] refactor deleting keyserver account `keyserver-reducer` to ops.
Harbormaster completed remote builds in B26333: Diff 36386.Jan 31 2024, 8:26 AM

Revision Contents
Changeset List

PathSize
lib/
reducers/
51 lines
80 lines

Diff 36402

View Options

lib/reducers/keyserver-reducer.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
View Options

lib/reducers/keyserver-reducer.test.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