Page MenuHomePhabricator
Differential D11183

[lib] Compare only entities from one keyserver when checking the inconsistencies
ClosedPublic
Actions

Authored by tomek on Feb 27 2024, 5:23 AM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Mar 6, 11:43 PM
Unknown Object (File)
Feb 16 2025, 12:21 PM
Unknown Object (File)
Feb 15 2025, 11:32 PM
Unknown Object (File)
Feb 15 2025, 11:32 PM
Unknown Object (File)
Feb 15 2025, 11:32 PM
Unknown Object (File)
Feb 15 2025, 11:32 PM
Unknown Object (File)
Feb 15 2025, 11:31 PM
Unknown Object (File)
Feb 1 2025, 7:20 AM
View All 78 Files
Subscribers
ashoat

Details

Reviewers
atul
inka
kamil
michal
Commits
rCOMMb47820b1a752: [lib] Compare only entities from one keyserver when checking the inconsistencies
Summary

We don't want to report inconsistencies when there are entities from different keyserver - only the ones from a keyserver performing state check should be compared.

https://linear.app/comm/issue/ENG-3915/refactor-generating-a-response-to-serverrequesttypescheck-state

Depends on D11182

Test Plan

Tests

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

tomek created this revision.Feb 27 2024, 5:23 AM
Herald added a subscriber: ashoat. · View Herald TranscriptFeb 27 2024, 5:23 AM
Harbormaster completed remote builds in B27199: Diff 37648.Feb 27 2024, 5:38 AM
tomek requested review of this revision.Feb 27 2024, 5:38 AM
tomek added a child revision: D11184: [lib] Compute hashes only from one keyserver.Feb 27 2024, 5:59 AM
atul accepted this revision.Feb 27 2024, 1:19 PM
atul added inline comments.
lib/shared/state-sync/threads-state-sync-spec.test.js
174 ↗(On Diff #37648)

In earlier diffs we decided to use eg threadTypes.PRIVATE instead of literal for "readability" when pasting Redux state into unit tests.

Don't feel strongly personally, but figure it makes sense to be consistent.

This revision is now accepted and ready to land.Feb 27 2024, 1:19 PM
michal requested changes to this revision.Feb 28 2024, 6:00 AM
michal added inline comments.
lib/shared/state-sync/entries-state-sync-spec.test.js
56 ↗(On Diff #37648)

If we hardcode the current data into the entries but use defaultCalendarQuery here won't that mean that in a ~month we will just start filtering all entries and the tests will always pass?

This revision now requires changes to proceed.Feb 28 2024, 6:00 AM
michal resigned from this revision.Feb 28 2024, 8:17 AM

Resigning so I won't block landing. I don't there should be any problems with fixing the tests.

This revision is now accepted and ready to land.Feb 28 2024, 8:17 AM
tomek updated this revision to Diff 37699.EditedFeb 29 2024, 7:08 AM

Use thread type const.
Update entries test by adding explicit calendar query from the past - the test failed as expected. Updated the dates in entries, which fixed the tests.

lib/shared/state-sync/entries-state-sync-spec.test.js
56 ↗(On Diff #37648)

Great find! Going to fix it

lib/shared/state-sync/threads-state-sync-spec.test.js
174 ↗(On Diff #37648)

Makes sense!

Harbormaster completed remote builds in B27237: Diff 37699.Feb 29 2024, 7:24 AM
Closed by commit rCOMMb47820b1a752: [lib] Compare only entities from one keyserver when checking the inconsistencies (authored by tomek). · Explain WhyFeb 29 2024, 7:42 AM
This revision was automatically updated to reflect the committed changes.
tomek added a commit: rCOMMb47820b1a752: [lib] Compare only entities from one keyserver when checking the inconsistencies.

Revision Contents
Changeset List

Diff 37699

View Options

lib/shared/state-sync/entries-state-sync-spec.js

// @flow // @flow
import type { PossiblyStaleNavigationState } from '@react-navigation/native'; import type { PossiblyStaleNavigationState } from '@react-navigation/native';
import { useRoute } from '@react-navigation/native';
import _memoize from 'lodash/memoize.js'; import _memoize from 'lodash/memoize.js';
import * as React from 'react'; import * as React from 'react';
import { createSelector } from 'reselect'; import { createSelector } from 'reselect';
import { nonThreadCalendarFiltersSelector } from 'lib/selectors/calendar-filter-selectors.js'; import { nonThreadCalendarFiltersSelector } from 'lib/selectors/calendar-filter-selectors.js';
import { currentCalendarQuery } from 'lib/selectors/nav-selectors.js'; import { currentCalendarQuery } from 'lib/selectors/nav-selectors.js';
import { useCanEditMessage } from 'lib/shared/edit-messages-utils.js';
import type { CalendarQuery } from 'lib/types/entry-types.js'; import type { CalendarQuery } from 'lib/types/entry-types.js';
import type { CalendarFilter } from 'lib/types/filter-types.js'; import type { CalendarFilter } from 'lib/types/filter-types.js';
import type {
ComposableMessageInfo,
RobotextMessageInfo,
} from 'lib/types/message-types.js';
import type { ThreadInfo } from 'lib/types/thread-types.js';
import type { NavContextType } from './navigation-context.js'; import type { NavContextType } from './navigation-context.js';
import { NavContext } from './navigation-context.js'; import { NavContext } from './navigation-context.js';
import { import {
getStateFromNavigatorRoute, getStateFromNavigatorRoute,
getThreadIDFromRoute, getThreadIDFromRoute,
currentLeafRoute, currentLeafRoute,
} from './navigation-utils.js'; } from './navigation-utils.js';
import { import {
AppRouteName, AppRouteName,
TabNavigatorRouteName, TabNavigatorRouteName,
MessageListRouteName, MessageListRouteName,
ChatRouteName, ChatRouteName,
CalendarRouteName, CalendarRouteName,
ThreadPickerModalRouteName, ThreadPickerModalRouteName,
ActionResultModalRouteName, ActionResultModalRouteName,
accountModals, accountModals,
scrollBlockingModals, scrollBlockingModals,
chatRootModals, chatRootModals,
threadRoutes, threadRoutes,
CommunityDrawerNavigatorRouteName, CommunityDrawerNavigatorRouteName,
MessageResultsScreenRouteName,
MessageSearchRouteName,
} from './route-names.js'; } from './route-names.js';
import type { RemoveEditMode } from '../chat/message-list-types'; import type { RemoveEditMode } from '../chat/message-list-types';
import { useSelector } from '../redux/redux-utils.js'; import { useSelector } from '../redux/redux-utils.js';
import type { NavPlusRedux } from '../types/selector-types.js'; import type { NavPlusRedux } from '../types/selector-types.js';
import type { GlobalTheme } from '../types/themes.js'; import type { GlobalTheme } from '../types/themes.js';
const baseCreateIsForegroundSelector = (routeName: string) => const baseCreateIsForegroundSelector = (routeName: string) =>
createSelector( createSelector(
▲ Show 20 Lines • Show All 343 Lines • ▼ Show 20 Linesfunction useCurrentLeafRouteName(): ?string {
return React.useMemo(() => { return React.useMemo(() => {
if (!navContext) { if (!navContext) {
return undefined; return undefined;
} }
return currentLeafRoute(navContext.state).name; return currentLeafRoute(navContext.state).name;
}, [navContext]); }, [navContext]);
} }
function useCanEditMessageNative(
threadInfo: ThreadInfo,
targetMessageInfo: ComposableMessageInfo | RobotextMessageInfo,
): boolean {
const route = useRoute();
const screenKey = route.key;
const threadCreationTime = threadInfo.creationTime;
const messageCreationTime = targetMessageInfo.time;
const canEditInThisScreen =
!screenKey.startsWith(MessageSearchRouteName) &&
!screenKey.startsWith(MessageResultsScreenRouteName) &&
messageCreationTime >= threadCreationTime;
return (
useCanEditMessage(threadInfo, targetMessageInfo) && canEditInThisScreen
);
}
export { export {
createIsForegroundSelector, createIsForegroundSelector,
useIsAppLoggedIn, useIsAppLoggedIn,
createActiveTabSelector, createActiveTabSelector,
scrollBlockingModalsClosedSelector, scrollBlockingModalsClosedSelector,
selectBackgroundIsDark, selectBackgroundIsDark,
activeThreadSelector, activeThreadSelector,
activeMessageListSelector, activeMessageListSelector,
useActiveThread, useActiveThread,
useActiveMessageList, useActiveMessageList,
calendarActiveSelector, calendarActiveSelector,
nativeCalendarQuery, nativeCalendarQuery,
nonThreadCalendarQuery, nonThreadCalendarQuery,
useCalendarQuery, useCalendarQuery,
drawerSwipeEnabledSelector, drawerSwipeEnabledSelector,
useCurrentLeafRouteName, useCurrentLeafRouteName,
getRemoveEditMode, getRemoveEditMode,
getTabNavState, getTabNavState,
getChatNavStateFromTabNavState, getChatNavStateFromTabNavState,
useCanEditMessageNative,
}; };
View Options

lib/shared/state-sync/entries-state-sync-spec.test.js

// @flow // @flow
import type { PossiblyStaleNavigationState } from '@react-navigation/native'; import type { PossiblyStaleNavigationState } from '@react-navigation/native';
import { useRoute } from '@react-navigation/native';
import _memoize from 'lodash/memoize.js'; import _memoize from 'lodash/memoize.js';
import * as React from 'react'; import * as React from 'react';
import { createSelector } from 'reselect'; import { createSelector } from 'reselect';
import { nonThreadCalendarFiltersSelector } from 'lib/selectors/calendar-filter-selectors.js'; import { nonThreadCalendarFiltersSelector } from 'lib/selectors/calendar-filter-selectors.js';
import { currentCalendarQuery } from 'lib/selectors/nav-selectors.js'; import { currentCalendarQuery } from 'lib/selectors/nav-selectors.js';
import { useCanEditMessage } from 'lib/shared/edit-messages-utils.js';
import type { CalendarQuery } from 'lib/types/entry-types.js'; import type { CalendarQuery } from 'lib/types/entry-types.js';
import type { CalendarFilter } from 'lib/types/filter-types.js'; import type { CalendarFilter } from 'lib/types/filter-types.js';
import type {
ComposableMessageInfo,
RobotextMessageInfo,
} from 'lib/types/message-types.js';
import type { ThreadInfo } from 'lib/types/thread-types.js';
import type { NavContextType } from './navigation-context.js'; import type { NavContextType } from './navigation-context.js';
import { NavContext } from './navigation-context.js'; import { NavContext } from './navigation-context.js';
import { import {
getStateFromNavigatorRoute, getStateFromNavigatorRoute,
getThreadIDFromRoute, getThreadIDFromRoute,
currentLeafRoute, currentLeafRoute,
} from './navigation-utils.js'; } from './navigation-utils.js';
import { import {
AppRouteName, AppRouteName,
TabNavigatorRouteName, TabNavigatorRouteName,
MessageListRouteName, MessageListRouteName,
ChatRouteName, ChatRouteName,
CalendarRouteName, CalendarRouteName,
ThreadPickerModalRouteName, ThreadPickerModalRouteName,
ActionResultModalRouteName, ActionResultModalRouteName,
accountModals, accountModals,
scrollBlockingModals, scrollBlockingModals,
chatRootModals, chatRootModals,
threadRoutes, threadRoutes,
CommunityDrawerNavigatorRouteName, CommunityDrawerNavigatorRouteName,
MessageResultsScreenRouteName,
MessageSearchRouteName,
} from './route-names.js'; } from './route-names.js';
import type { RemoveEditMode } from '../chat/message-list-types'; import type { RemoveEditMode } from '../chat/message-list-types';
import { useSelector } from '../redux/redux-utils.js'; import { useSelector } from '../redux/redux-utils.js';
import type { NavPlusRedux } from '../types/selector-types.js'; import type { NavPlusRedux } from '../types/selector-types.js';
import type { GlobalTheme } from '../types/themes.js'; import type { GlobalTheme } from '../types/themes.js';
const baseCreateIsForegroundSelector = (routeName: string) => const baseCreateIsForegroundSelector = (routeName: string) =>
createSelector( createSelector(
▲ Show 20 Lines • Show All 343 Lines • ▼ Show 20 Linesfunction useCurrentLeafRouteName(): ?string {
return React.useMemo(() => { return React.useMemo(() => {
if (!navContext) { if (!navContext) {
return undefined; return undefined;
} }
return currentLeafRoute(navContext.state).name; return currentLeafRoute(navContext.state).name;
}, [navContext]); }, [navContext]);
} }
function useCanEditMessageNative(
threadInfo: ThreadInfo,
targetMessageInfo: ComposableMessageInfo | RobotextMessageInfo,
): boolean {
const route = useRoute();
const screenKey = route.key;
const threadCreationTime = threadInfo.creationTime;
const messageCreationTime = targetMessageInfo.time;
const canEditInThisScreen =
!screenKey.startsWith(MessageSearchRouteName) &&
!screenKey.startsWith(MessageResultsScreenRouteName) &&
messageCreationTime >= threadCreationTime;
return (
useCanEditMessage(threadInfo, targetMessageInfo) && canEditInThisScreen
);
}
export { export {
createIsForegroundSelector, createIsForegroundSelector,
useIsAppLoggedIn, useIsAppLoggedIn,
createActiveTabSelector, createActiveTabSelector,
scrollBlockingModalsClosedSelector, scrollBlockingModalsClosedSelector,
selectBackgroundIsDark, selectBackgroundIsDark,
activeThreadSelector, activeThreadSelector,
activeMessageListSelector, activeMessageListSelector,
useActiveThread, useActiveThread,
useActiveMessageList, useActiveMessageList,
calendarActiveSelector, calendarActiveSelector,
nativeCalendarQuery, nativeCalendarQuery,
nonThreadCalendarQuery, nonThreadCalendarQuery,
useCalendarQuery, useCalendarQuery,
drawerSwipeEnabledSelector, drawerSwipeEnabledSelector,
useCurrentLeafRouteName, useCurrentLeafRouteName,
getRemoveEditMode, getRemoveEditMode,
getTabNavState, getTabNavState,
getChatNavStateFromTabNavState, getChatNavStateFromTabNavState,
useCanEditMessageNative,
}; };
View Options

lib/shared/state-sync/threads-state-sync-spec.js

// @flow // @flow
import type { PossiblyStaleNavigationState } from '@react-navigation/native'; import type { PossiblyStaleNavigationState } from '@react-navigation/native';
import { useRoute } from '@react-navigation/native';
import _memoize from 'lodash/memoize.js'; import _memoize from 'lodash/memoize.js';
import * as React from 'react'; import * as React from 'react';
import { createSelector } from 'reselect'; import { createSelector } from 'reselect';
import { nonThreadCalendarFiltersSelector } from 'lib/selectors/calendar-filter-selectors.js'; import { nonThreadCalendarFiltersSelector } from 'lib/selectors/calendar-filter-selectors.js';
import { currentCalendarQuery } from 'lib/selectors/nav-selectors.js'; import { currentCalendarQuery } from 'lib/selectors/nav-selectors.js';
import { useCanEditMessage } from 'lib/shared/edit-messages-utils.js';
import type { CalendarQuery } from 'lib/types/entry-types.js'; import type { CalendarQuery } from 'lib/types/entry-types.js';
import type { CalendarFilter } from 'lib/types/filter-types.js'; import type { CalendarFilter } from 'lib/types/filter-types.js';
import type {
ComposableMessageInfo,
RobotextMessageInfo,
} from 'lib/types/message-types.js';
import type { ThreadInfo } from 'lib/types/thread-types.js';
import type { NavContextType } from './navigation-context.js'; import type { NavContextType } from './navigation-context.js';
import { NavContext } from './navigation-context.js'; import { NavContext } from './navigation-context.js';
import { import {
getStateFromNavigatorRoute, getStateFromNavigatorRoute,
getThreadIDFromRoute, getThreadIDFromRoute,
currentLeafRoute, currentLeafRoute,
} from './navigation-utils.js'; } from './navigation-utils.js';
import { import {
AppRouteName, AppRouteName,
TabNavigatorRouteName, TabNavigatorRouteName,
MessageListRouteName, MessageListRouteName,
ChatRouteName, ChatRouteName,
CalendarRouteName, CalendarRouteName,
ThreadPickerModalRouteName, ThreadPickerModalRouteName,
ActionResultModalRouteName, ActionResultModalRouteName,
accountModals, accountModals,
scrollBlockingModals, scrollBlockingModals,
chatRootModals, chatRootModals,
threadRoutes, threadRoutes,
CommunityDrawerNavigatorRouteName, CommunityDrawerNavigatorRouteName,
MessageResultsScreenRouteName,
MessageSearchRouteName,
} from './route-names.js'; } from './route-names.js';
import type { RemoveEditMode } from '../chat/message-list-types'; import type { RemoveEditMode } from '../chat/message-list-types';
import { useSelector } from '../redux/redux-utils.js'; import { useSelector } from '../redux/redux-utils.js';
import type { NavPlusRedux } from '../types/selector-types.js'; import type { NavPlusRedux } from '../types/selector-types.js';
import type { GlobalTheme } from '../types/themes.js'; import type { GlobalTheme } from '../types/themes.js';
const baseCreateIsForegroundSelector = (routeName: string) => const baseCreateIsForegroundSelector = (routeName: string) =>
createSelector( createSelector(
▲ Show 20 Lines • Show All 343 Lines • ▼ Show 20 Linesfunction useCurrentLeafRouteName(): ?string {
return React.useMemo(() => { return React.useMemo(() => {
if (!navContext) { if (!navContext) {
return undefined; return undefined;
} }
return currentLeafRoute(navContext.state).name; return currentLeafRoute(navContext.state).name;
}, [navContext]); }, [navContext]);
} }
function useCanEditMessageNative(
threadInfo: ThreadInfo,
targetMessageInfo: ComposableMessageInfo | RobotextMessageInfo,
): boolean {
const route = useRoute();
const screenKey = route.key;
const threadCreationTime = threadInfo.creationTime;
const messageCreationTime = targetMessageInfo.time;
const canEditInThisScreen =
!screenKey.startsWith(MessageSearchRouteName) &&
!screenKey.startsWith(MessageResultsScreenRouteName) &&
messageCreationTime >= threadCreationTime;
return (
useCanEditMessage(threadInfo, targetMessageInfo) && canEditInThisScreen
);
}
export { export {
createIsForegroundSelector, createIsForegroundSelector,
useIsAppLoggedIn, useIsAppLoggedIn,
createActiveTabSelector, createActiveTabSelector,
scrollBlockingModalsClosedSelector, scrollBlockingModalsClosedSelector,
selectBackgroundIsDark, selectBackgroundIsDark,
activeThreadSelector, activeThreadSelector,
activeMessageListSelector, activeMessageListSelector,
useActiveThread, useActiveThread,
useActiveMessageList, useActiveMessageList,
calendarActiveSelector, calendarActiveSelector,
nativeCalendarQuery, nativeCalendarQuery,
nonThreadCalendarQuery, nonThreadCalendarQuery,
useCalendarQuery, useCalendarQuery,
drawerSwipeEnabledSelector, drawerSwipeEnabledSelector,
useCurrentLeafRouteName, useCurrentLeafRouteName,
getRemoveEditMode, getRemoveEditMode,
getTabNavState, getTabNavState,
getChatNavStateFromTabNavState, getChatNavStateFromTabNavState,
useCanEditMessageNative,
}; };
View Options

lib/shared/state-sync/threads-state-sync-spec.test.js

// @flow // @flow
import type { PossiblyStaleNavigationState } from '@react-navigation/native'; import type { PossiblyStaleNavigationState } from '@react-navigation/native';
import { useRoute } from '@react-navigation/native';
import _memoize from 'lodash/memoize.js'; import _memoize from 'lodash/memoize.js';
import * as React from 'react'; import * as React from 'react';
import { createSelector } from 'reselect'; import { createSelector } from 'reselect';
import { nonThreadCalendarFiltersSelector } from 'lib/selectors/calendar-filter-selectors.js'; import { nonThreadCalendarFiltersSelector } from 'lib/selectors/calendar-filter-selectors.js';
import { currentCalendarQuery } from 'lib/selectors/nav-selectors.js'; import { currentCalendarQuery } from 'lib/selectors/nav-selectors.js';
import { useCanEditMessage } from 'lib/shared/edit-messages-utils.js';
import type { CalendarQuery } from 'lib/types/entry-types.js'; import type { CalendarQuery } from 'lib/types/entry-types.js';
import type { CalendarFilter } from 'lib/types/filter-types.js'; import type { CalendarFilter } from 'lib/types/filter-types.js';
import type {
ComposableMessageInfo,
RobotextMessageInfo,
} from 'lib/types/message-types.js';
import type { ThreadInfo } from 'lib/types/thread-types.js';
import type { NavContextType } from './navigation-context.js'; import type { NavContextType } from './navigation-context.js';
import { NavContext } from './navigation-context.js'; import { NavContext } from './navigation-context.js';
import { import {
getStateFromNavigatorRoute, getStateFromNavigatorRoute,
getThreadIDFromRoute, getThreadIDFromRoute,
currentLeafRoute, currentLeafRoute,
} from './navigation-utils.js'; } from './navigation-utils.js';
import { import {
AppRouteName, AppRouteName,
TabNavigatorRouteName, TabNavigatorRouteName,
MessageListRouteName, MessageListRouteName,
ChatRouteName, ChatRouteName,
CalendarRouteName, CalendarRouteName,
ThreadPickerModalRouteName, ThreadPickerModalRouteName,
ActionResultModalRouteName, ActionResultModalRouteName,
accountModals, accountModals,
scrollBlockingModals, scrollBlockingModals,
chatRootModals, chatRootModals,
threadRoutes, threadRoutes,
CommunityDrawerNavigatorRouteName, CommunityDrawerNavigatorRouteName,
MessageResultsScreenRouteName,
MessageSearchRouteName,
} from './route-names.js'; } from './route-names.js';
import type { RemoveEditMode } from '../chat/message-list-types'; import type { RemoveEditMode } from '../chat/message-list-types';
import { useSelector } from '../redux/redux-utils.js'; import { useSelector } from '../redux/redux-utils.js';
import type { NavPlusRedux } from '../types/selector-types.js'; import type { NavPlusRedux } from '../types/selector-types.js';
import type { GlobalTheme } from '../types/themes.js'; import type { GlobalTheme } from '../types/themes.js';
const baseCreateIsForegroundSelector = (routeName: string) => const baseCreateIsForegroundSelector = (routeName: string) =>
createSelector( createSelector(
▲ Show 20 Lines • Show All 343 Lines • ▼ Show 20 Linesfunction useCurrentLeafRouteName(): ?string {
return React.useMemo(() => { return React.useMemo(() => {
if (!navContext) { if (!navContext) {
return undefined; return undefined;
} }
return currentLeafRoute(navContext.state).name; return currentLeafRoute(navContext.state).name;
}, [navContext]); }, [navContext]);
} }
function useCanEditMessageNative(
threadInfo: ThreadInfo,
targetMessageInfo: ComposableMessageInfo | RobotextMessageInfo,
): boolean {
const route = useRoute();
const screenKey = route.key;
const threadCreationTime = threadInfo.creationTime;
const messageCreationTime = targetMessageInfo.time;
const canEditInThisScreen =
!screenKey.startsWith(MessageSearchRouteName) &&
!screenKey.startsWith(MessageResultsScreenRouteName) &&
messageCreationTime >= threadCreationTime;
return (
useCanEditMessage(threadInfo, targetMessageInfo) && canEditInThisScreen
);
}
export { export {
createIsForegroundSelector, createIsForegroundSelector,
useIsAppLoggedIn, useIsAppLoggedIn,
createActiveTabSelector, createActiveTabSelector,
scrollBlockingModalsClosedSelector, scrollBlockingModalsClosedSelector,
selectBackgroundIsDark, selectBackgroundIsDark,
activeThreadSelector, activeThreadSelector,
activeMessageListSelector, activeMessageListSelector,
useActiveThread, useActiveThread,
useActiveMessageList, useActiveMessageList,
calendarActiveSelector, calendarActiveSelector,
nativeCalendarQuery, nativeCalendarQuery,
nonThreadCalendarQuery, nonThreadCalendarQuery,
useCalendarQuery, useCalendarQuery,
drawerSwipeEnabledSelector, drawerSwipeEnabledSelector,
useCurrentLeafRouteName, useCurrentLeafRouteName,
getRemoveEditMode, getRemoveEditMode,
getTabNavState, getTabNavState,
getChatNavStateFromTabNavState, getChatNavStateFromTabNavState,
useCanEditMessageNative,
}; };