Page MenuHomePhabricator
Differential D11044

[web] Restore logs
ClosedPublic
Actions

Authored by michal on Feb 12 2024, 7:29 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Mar 29, 2:15 AM
Unknown Object (File)
Fri, Mar 28, 6:13 PM
Unknown Object (File)
Mon, Mar 17, 11:58 AM
Unknown Object (File)
Feb 21 2025, 12:36 PM
Unknown Object (File)
Feb 21 2025, 12:36 PM
Unknown Object (File)
Feb 21 2025, 12:36 PM
Unknown Object (File)
Feb 21 2025, 12:36 PM
Unknown Object (File)
Feb 21 2025, 12:36 PM
View All 97 Files
Subscribers
ashoat
tomek

Details

Reviewers
marcin
bartek
kamil
Commits
rCOMMbc8f71d25837: [web] Restore logs
Summary

After restoring the compaction we can restore the logs, using another key passed in the message.

Depends on D11043

Test Plan
  • Add logging to the native client so that it logs backupID and encryption keys for compaction and logs
  • Upload a new compaction from native with a draft
  • Add a new draft, so that there are logs created
  • Send restore message on web with values logged from native
  • Reload web app
  • Check that both drafts (from compaction and logs) exists now on web. Check that the enabled apps are the same as before restore (redux persist didn't change)

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

michal created this revision.Feb 12 2024, 7:29 AM
Herald added subscribers: tomek, ashoat. · View Herald TranscriptFeb 12 2024, 7:29 AM
Harbormaster returned this revision to the author for changes because remote builds failed.Feb 12 2024, 7:34 AM
Harbormaster failed remote builds in B26764: Diff 37003!
michal updated this revision to Diff 37073.Feb 14 2024, 5:30 AM

Rebase

michal added a child revision: D11074: [native] Stop backup client in background.Feb 14 2024, 6:26 AM
michal published this revision for review.Feb 14 2024, 6:43 AM
Harbormaster failed remote builds in B26830: Diff 37073!Feb 14 2024, 11:34 AM
marcin accepted this revision.Feb 19 2024, 4:40 AM
This revision is now accepted and ready to land.Feb 19 2024, 4:40 AM
marcin added inline comments.Feb 19 2024, 4:44 AM
web/database/worker/backup.js
58

This method can throw and in case it does error message isn't directly understandable by JS. Please before you land:
Wrap the call to sqliteQueryExecutor with try{} .. catch{} and log error using getExceptionMessage from dbModule.

marcin mentioned this in D11043: [web] Restore compaction.Feb 19 2024, 4:46 AM
michal updated this revision to Diff 37335.Feb 19 2024, 9:47 AM

Fix error handling.

Harbormaster completed remote builds in B26976: Diff 37335.Feb 19 2024, 10:01 AM
kamil accepted this revision.Feb 21 2024, 4:55 AM
Closed by commit rCOMMbc8f71d25837: [web] Restore logs (authored by Michal Gniadek <michal.gniadek@swmansion.com>). · Explain WhyMar 6 2024, 6:13 AM
This revision was automatically updated to reflect the committed changes.
Michal Gniadek <michal.gniadek@swmansion.com> added a commit: rCOMMbc8f71d25837: [web] Restore logs.

Revision Contents
Changeset List

PathSize
web/
database/
worker/
8 lines
1 line
types/
1 line

Diff 37073

View Options

web/database/worker/backup.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,
MessageInfo,
} 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,
messageInfo: MessageInfo,
targetMessageInfo: ComposableMessageInfo | RobotextMessageInfo,
): boolean {
const route = useRoute();
const screenKey = route.key;
const threadCreationTime = threadInfo.creationTime;
const messageCreationTime = messageInfo.time;
const canEditInThisScreen =
!screenKey.startsWith(MessageSearchRouteName) &&
!screenKey.startsWith(MessageResultsScreenRouteName) &&
messageCreationTime > threadCreationTime;
tomekUnsubmitted
Not Done
Inline Actions

Should we use >=?

tomek: Should we use `>=`?
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

web/database/worker/db-worker.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,
MessageInfo,
} 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,
messageInfo: MessageInfo,
targetMessageInfo: ComposableMessageInfo | RobotextMessageInfo,
): boolean {
const route = useRoute();
const screenKey = route.key;
const threadCreationTime = threadInfo.creationTime;
const messageCreationTime = messageInfo.time;
const canEditInThisScreen =
!screenKey.startsWith(MessageSearchRouteName) &&
!screenKey.startsWith(MessageResultsScreenRouteName) &&
messageCreationTime > threadCreationTime;
tomekUnsubmitted
Not Done
Inline Actions

Should we use >=?

tomek: Should we use `>=`?
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

web/types/worker-types.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,
MessageInfo,
} 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,
messageInfo: MessageInfo,
targetMessageInfo: ComposableMessageInfo | RobotextMessageInfo,
): boolean {
const route = useRoute();
const screenKey = route.key;
const threadCreationTime = threadInfo.creationTime;
const messageCreationTime = messageInfo.time;
const canEditInThisScreen =
!screenKey.startsWith(MessageSearchRouteName) &&
!screenKey.startsWith(MessageResultsScreenRouteName) &&
messageCreationTime > threadCreationTime;
tomekUnsubmitted
Not Done
Inline Actions

Should we use >=?

tomek: Should we use `>=`?
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,
}; };