Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Properly handle previous data formats when saving the updates from the server to Onyx #27180

Merged
merged 12 commits into from
Sep 17, 2023
Merged

Properly handle previous data formats when saving the updates from the server to Onyx #27180

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e90946a
added a check if the value was a number and return if it is
danieldoglas Sep 11, 2023
0236648
adding comment
danieldoglas Sep 11, 2023
6187e71
adding prettier
danieldoglas Sep 11, 2023
9be34e8
changing to is object instead
danieldoglas Sep 11, 2023
a98dc74
changing if to check format of the update
danieldoglas Sep 11, 2023
6425ff1
import _
danieldoglas Sep 11, 2023
3c59fb4
linter and addressing comments
danieldoglas Sep 11, 2023
e4172fd
missing linter
danieldoglas Sep 11, 2023
1810160
prettier
danieldoglas Sep 11, 2023
89455eb
changing to underscore function
danieldoglas Sep 13, 2023
941fbc9
changing OR to AND
danieldoglas Sep 15, 2023
5029f33
fixing clause, adding OR and unpausing sequential queue
danieldoglas Sep 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/libs/actions/OnyxUpdateManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import Onyx from 'react-native-onyx';
import _ from 'underscore';
import ONYXKEYS from '../../ONYXKEYS';
import Log from '../Log';
import * as SequentialQueue from '../Network/SequentialQueue';
import * as App from './App';
import * as OnyxUpdates from './OnyxUpdates';
import CONST from '../../CONST';

// This file is in charge of looking at the updateIDs coming from the server and comparing them to the last updateID that the client has.
// If the client is behind the server, then we need to
Expand Down Expand Up @@ -35,6 +37,19 @@ export default () => {
return;
}

// Since we used the same key that used to store another object, let's confirm that the current object is
// following the new format before we proceed. If it isn't, then let's clear the object in Onyx.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any idea how long we have to keep this code here for? We should be able to remove it after about a month or so, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would say 1 week after it reaches production (then we should have 90% of the people using the new version)

if (
!_.isObject(val) ||
!_.has(val, 'type') ||
(!(val.type === CONST.ONYX_UPDATE_TYPES.HTTPS && _.has(val, 'request') && _.has(val, 'response')) && !(val.type === CONST.ONYX_UPDATE_TYPES.PUSHER && _.has(val, 'updates')))
) {
console.debug('[OnyxUpdateManager] Invalid format found for updates, cleaning and unpausing the queue');
Onyx.set(ONYXKEYS.ONYX_UPDATES_FROM_SERVER, null);
SequentialQueue.unpause();
return;
}

const updateParams = val;
const lastUpdateIDFromServer = val.lastUpdateID;
const previousUpdateIDFromServer = val.previousUpdateID;
Expand Down
Loading