Page MenuHomePhabricator
Differential D12143

[lib] Refactor the entries reducer to return an object
ClosedPublic
Actions

Authored by tomek on May 21 2024, 6:47 AM.
Tags
None
Referenced Files
F5310992: D12143.id.diff
Tue, Apr 8, 8:07 AM
F5310546: D12143.id40661.diff
Tue, Apr 8, 7:47 AM
F5305562: D12143.id40500.diff
Tue, Apr 8, 4:59 AM
F5301208: D12143.id40460.diff
Tue, Apr 8, 3:08 AM
Unknown Object (File)
Mon, Apr 7, 3:26 PM
Unknown Object (File)
Sun, Apr 6, 8:58 AM
Unknown Object (File)
Tue, Mar 11, 11:39 PM
Unknown Object (File)
Tue, Mar 11, 2:41 PM
View All 99 Files
Subscribers
ashoat

Details

Reviewers
kamil
marcin
Commits
rCOMMa22ddae034ab: [lib] Refactor the entries reducer to return an object
Summary

Returning an array isn't convenient anymore because we're introducing a new return value - the operations.

Depends on D12148

https://linear.app/comm/issue/ENG-3486/move-entrystore-to-sqlite

Test Plan

Tried creating, editing and deleting an entry. Flow.

Diff Detail

Repository
rCOMM Comm
Branch
entries
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

tomek created this revision.May 21 2024, 6:47 AM
Herald added a subscriber: ashoat. · View Herald TranscriptMay 21 2024, 6:47 AM
Harbormaster completed remote builds in B29096: Diff 40460.May 21 2024, 7:03 AM
tomek requested review of this revision.May 21 2024, 7:03 AM
tomek added a child revision: D12147: [lib] Handle setClientDBStoreActionType for entries.May 21 2024, 7:30 AM
tomek edited parent revisions, added: D12148: Connect pipes between C++ and JS for entry store; removed: D12141: [lib] Create entry store handler.May 21 2024, 7:52 AM
tomek updated this revision to Diff 40500.May 21 2024, 12:34 PM
tomek added a parent revision: D12141: [lib] Create entry store handler.

Rebase

tomek removed a parent revision: D12141: [lib] Create entry store handler.May 21 2024, 12:38 PM
Harbormaster completed remote builds in B29132: Diff 40500.May 21 2024, 12:52 PM
marcin accepted this revision.May 22 2024, 2:41 AM
This revision is now accepted and ready to land.May 22 2024, 2:41 AM
tomek edited the test plan for this revision. (Show Details)May 22 2024, 3:54 AM
tomek added a parent revision: D12141: [lib] Create entry store handler.
tomek edited the summary of this revision. (Show Details)
tomek removed a parent revision: D12141: [lib] Create entry store handler.
Closed by commit rCOMMa22ddae034ab: [lib] Refactor the entries reducer to return an object (authored by tomek). · Explain WhyMay 27 2024, 5:50 AM
This revision was automatically updated to reflect the committed changes.
tomek added a commit: rCOMMa22ddae034ab: [lib] Refactor the entries reducer to return an object.

Revision Contents
Changeset List

PathSize
lib/
reducers/
245 lines
7 lines

Diff 40460

View Options

lib/reducers/entry-reducer.js

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import * as React from 'react'; import * as React from 'react';
import { import {
updateRelationships as serverUpdateRelationships, updateRelationships as serverUpdateRelationships,
updateRelationshipsActionTypes, updateRelationshipsActionTypes,
} from '../actions/relationship-actions.js'; } from '../actions/relationship-actions.js';
import { getSingleOtherUser } from '../shared/thread-utils.js'; import { getSingleOtherUser } from '../shared/thread-utils.js';
import type { ThreadInfo } from '../types/minimally-encoded-thread-permissions-types.js'; import type { ThreadInfo } from '../types/minimally-encoded-thread-permissions-types.js';
import { import {
type RelationshipAction,
relationshipActions, relationshipActions,
type TraditionalRelationshipAction,
} from '../types/relationship-types.js'; } from '../types/relationship-types.js';
import type { UserInfo } from '../types/user-types.js'; import type { UserInfo } from '../types/user-types.js';
import { useLegacyAshoatKeyserverCall } from '../utils/action-utils.js'; import { useLegacyAshoatKeyserverCall } from '../utils/action-utils.js';
import { useDispatchActionPromise } from '../utils/redux-promise-utils.js'; import { useDispatchActionPromise } from '../utils/redux-promise-utils.js';
import { useSelector } from '../utils/redux-utils.js'; import { useSelector } from '../utils/redux-utils.js';
type RelationshipCallbacks = { type RelationshipCallbacks = {
+blockUser: () => void, +blockUser: () => void,
▲ Show 20 Lines • Show All 42 Lines • ▼ Show 20 Lines
function useRelationshipCallbacks( function useRelationshipCallbacks(
otherUserID?: string, otherUserID?: string,
onErrorCallback?: () => void, onErrorCallback?: () => void,
): RelationshipCallbacks { ): RelationshipCallbacks {
const callUpdateRelationships = useLegacyAshoatKeyserverCall( const callUpdateRelationships = useLegacyAshoatKeyserverCall(
serverUpdateRelationships, serverUpdateRelationships,
); );
const updateRelationship = React.useCallback( const updateRelationship = React.useCallback(
async (action: RelationshipAction) => { async (action: TraditionalRelationshipAction) => {
try { try {
invariant(otherUserID, 'Other user info id should be present'); invariant(otherUserID, 'Other user info id should be present');
return await callUpdateRelationships({ return await callUpdateRelationships({
action, action,
userIDs: [otherUserID], userIDs: [otherUserID],
}); });
} catch (e) { } catch (e) {
onErrorCallback?.(); onErrorCallback?.();
throw e; throw e;
} }
}, },
[callUpdateRelationships, onErrorCallback, otherUserID], [callUpdateRelationships, onErrorCallback, otherUserID],
); );
const dispatchActionPromise = useDispatchActionPromise(); const dispatchActionPromise = useDispatchActionPromise();
const onButtonPress = React.useCallback( const onButtonPress = React.useCallback(
(action: RelationshipAction) => { (action: TraditionalRelationshipAction) => {
void dispatchActionPromise( void dispatchActionPromise(
updateRelationshipsActionTypes, updateRelationshipsActionTypes,
updateRelationship(action), updateRelationship(action),
); );
}, },
[dispatchActionPromise, updateRelationship], [dispatchActionPromise, updateRelationship],
); );
Show All 29 Lines
View Options

lib/reducers/master-reducer.js

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import * as React from 'react'; import * as React from 'react';
import { import {
updateRelationships as serverUpdateRelationships, updateRelationships as serverUpdateRelationships,
updateRelationshipsActionTypes, updateRelationshipsActionTypes,
} from '../actions/relationship-actions.js'; } from '../actions/relationship-actions.js';
import { getSingleOtherUser } from '../shared/thread-utils.js'; import { getSingleOtherUser } from '../shared/thread-utils.js';
import type { ThreadInfo } from '../types/minimally-encoded-thread-permissions-types.js'; import type { ThreadInfo } from '../types/minimally-encoded-thread-permissions-types.js';
import { import {
type RelationshipAction,
relationshipActions, relationshipActions,
type TraditionalRelationshipAction,
} from '../types/relationship-types.js'; } from '../types/relationship-types.js';
import type { UserInfo } from '../types/user-types.js'; import type { UserInfo } from '../types/user-types.js';
import { useLegacyAshoatKeyserverCall } from '../utils/action-utils.js'; import { useLegacyAshoatKeyserverCall } from '../utils/action-utils.js';
import { useDispatchActionPromise } from '../utils/redux-promise-utils.js'; import { useDispatchActionPromise } from '../utils/redux-promise-utils.js';
import { useSelector } from '../utils/redux-utils.js'; import { useSelector } from '../utils/redux-utils.js';
type RelationshipCallbacks = { type RelationshipCallbacks = {
+blockUser: () => void, +blockUser: () => void,
▲ Show 20 Lines • Show All 42 Lines • ▼ Show 20 Lines
function useRelationshipCallbacks( function useRelationshipCallbacks(
otherUserID?: string, otherUserID?: string,
onErrorCallback?: () => void, onErrorCallback?: () => void,
): RelationshipCallbacks { ): RelationshipCallbacks {
const callUpdateRelationships = useLegacyAshoatKeyserverCall( const callUpdateRelationships = useLegacyAshoatKeyserverCall(
serverUpdateRelationships, serverUpdateRelationships,
); );
const updateRelationship = React.useCallback( const updateRelationship = React.useCallback(
async (action: RelationshipAction) => { async (action: TraditionalRelationshipAction) => {
try { try {
invariant(otherUserID, 'Other user info id should be present'); invariant(otherUserID, 'Other user info id should be present');
return await callUpdateRelationships({ return await callUpdateRelationships({
action, action,
userIDs: [otherUserID], userIDs: [otherUserID],
}); });
} catch (e) { } catch (e) {
onErrorCallback?.(); onErrorCallback?.();
throw e; throw e;
} }
}, },
[callUpdateRelationships, onErrorCallback, otherUserID], [callUpdateRelationships, onErrorCallback, otherUserID],
); );
const dispatchActionPromise = useDispatchActionPromise(); const dispatchActionPromise = useDispatchActionPromise();
const onButtonPress = React.useCallback( const onButtonPress = React.useCallback(
(action: RelationshipAction) => { (action: TraditionalRelationshipAction) => {
void dispatchActionPromise( void dispatchActionPromise(
updateRelationshipsActionTypes, updateRelationshipsActionTypes,
updateRelationship(action), updateRelationship(action),
); );
}, },
[dispatchActionPromise, updateRelationship], [dispatchActionPromise, updateRelationship],
); );
Show All 29 Lines