Page MenuHomePhabricator
Differential D11133

[lib] Filter out calendar filters that use threads from a different keyserver
ClosedPublic
Actions

Authored by tomek on Feb 21 2024, 7:27 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Mar 10, 4:16 AM
Unknown Object (File)
Tue, Feb 25, 9:39 AM
Unknown Object (File)
Feb 16 2025, 12:18 AM
Unknown Object (File)
Feb 16 2025, 12:18 AM
Unknown Object (File)
Feb 16 2025, 12:17 AM
Unknown Object (File)
Feb 16 2025, 12:17 AM
Unknown Object (File)
Feb 6 2025, 11:43 PM
Unknown Object (File)
Jan 23 2025, 6:50 AM
View All 63 Files
Subscribers
ashoat

Details

Reviewers
inka
kamil
michal
atul
Commits
rCOMMd4354fe394cb: [lib] Filter out calendar filters that use threads from a different keyserver
Summary

Each calendar-query-handler should receive only the filters from its keyserver.

https://linear.app/comm/issue/ENG-5779/update-calendarqueryhandler

Depends on D11131

Test Plan

Check if the handler receives the correct query by adding console logs in componentDidUpdate.
Add some code that modifies calendar filter to reference a thread from a different keyserver and check if it gets filtered out.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
lib/
socket/
18 lines

Diff 37431

View Options

lib/socket/calendar-query-handler.react.js

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import _isEqual from 'lodash/fp/isEqual.js'; import _isEqual from 'lodash/fp/isEqual.js';
import * as React from 'react'; import * as React from 'react';
import { import {
updateCalendarQueryActionTypes, updateCalendarQueryActionTypes,
useUpdateCalendarQuery, useUpdateCalendarQuery,
} from '../actions/entry-actions.js'; } from '../actions/entry-actions.js';
import type { UpdateCalendarQueryInput } from '../actions/entry-actions.js'; import type { UpdateCalendarQueryInput } from '../actions/entry-actions.js';
import { extractKeyserverIDFromID } from '../keyserver-conn/keyserver-call-utils.js';
import { filterThreadIDsInFilterList } from '../reducers/calendar-filters-reducer.js';
import { connectionSelector } from '../selectors/keyserver-selectors.js'; import { connectionSelector } from '../selectors/keyserver-selectors.js';
import { timeUntilCalendarRangeExpiration } from '../selectors/nav-selectors.js'; import { timeUntilCalendarRangeExpiration } from '../selectors/nav-selectors.js';
import { useIsAppForegrounded } from '../shared/lifecycle-utils.js'; import { useIsAppForegrounded } from '../shared/lifecycle-utils.js';
import type { import type {
CalendarQuery, CalendarQuery,
CalendarQueryUpdateResult, CalendarQueryUpdateResult,
CalendarQueryUpdateStartingPayload, CalendarQueryUpdateStartingPayload,
} from '../types/entry-types.js'; } from '../types/entry-types.js';
▲ Show 20 Lines • Show All 103 Lines • ▼ Show 20 Lines possiblyUpdateCalendarQuery = () => {
if (this.shouldUpdateCalendarQuery) { if (this.shouldUpdateCalendarQuery) {
this.updateCalendarQuery(); this.updateCalendarQuery();
} }
}; };
} }
const ConnectedCalendarQueryHandler: React.ComponentType<BaseProps> = const ConnectedCalendarQueryHandler: React.ComponentType<BaseProps> =
React.memo<BaseProps>(function ConnectedCalendarQueryHandler(props) { React.memo<BaseProps>(function ConnectedCalendarQueryHandler(props) {
const connection = useSelector(connectionSelector(props.keyserverID)); const { currentCalendarQuery, keyserverID } = props;
const connection = useSelector(connectionSelector(keyserverID));
invariant(connection, 'keyserver missing from keyserverStore'); invariant(connection, 'keyserver missing from keyserverStore');
const lastUserInteractionCalendar = useSelector( const lastUserInteractionCalendar = useSelector(
state => state.entryStore.lastUserInteractionCalendar, state => state.entryStore.lastUserInteractionCalendar,
); );
// We include this so that componentDidUpdate will be called on foreground // We include this so that componentDidUpdate will be called on foreground
const foreground = useIsAppForegrounded(); const foreground = useIsAppForegrounded();
const callUpdateCalendarQuery = useUpdateCalendarQuery(); const callUpdateCalendarQuery = useUpdateCalendarQuery();
const dispatchActionPromise = useDispatchActionPromise(); const dispatchActionPromise = useDispatchActionPromise();
const calendarQuery = useSelector(state => state.actualizedCalendarQuery); const calendarQuery = useSelector(state => state.actualizedCalendarQuery);
const getCurrentCalendarQuery = React.useCallback(() => {
const query = currentCalendarQuery();
return {
...query,
filters: filterThreadIDsInFilterList(
query.filters,
(threadID: string) =>
extractKeyserverIDFromID(threadID) === keyserverID,
),
};
}, [currentCalendarQuery, keyserverID]);
return ( return (
<CalendarQueryHandler <CalendarQueryHandler
{...props} {...props}
connection={connection} connection={connection}
calendarQuery={calendarQuery} calendarQuery={calendarQuery}
lastUserInteractionCalendar={lastUserInteractionCalendar} lastUserInteractionCalendar={lastUserInteractionCalendar}
foreground={foreground} foreground={foreground}
updateCalendarQuery={callUpdateCalendarQuery} updateCalendarQuery={callUpdateCalendarQuery}
dispatchActionPromise={dispatchActionPromise} dispatchActionPromise={dispatchActionPromise}
currentCalendarQuery={getCurrentCalendarQuery}
/> />
); );
}); });
export default ConnectedCalendarQueryHandler; export default ConnectedCalendarQueryHandler;