Migrate NVPs to their new keys #37556
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| import after from 'lodash/after'; | ||
| import Onyx from 'react-native-onyx'; | ||
| import ONYXKEYS from '@src/ONYXKEYS'; | ||
|
|
||
| const migrations = { | ||
This comment was marked as resolved.
Sorry, something went wrong. |
||
| // eslint-disable-next-line @typescript-eslint/naming-convention | ||
| nvp_lastPaymentMethod: ONYXKEYS.NVP_LAST_PAYMENT_METHOD, | ||
| isFirstTimeNewExpensifyUser: ONYXKEYS.NVP_IS_FIRST_TIME_NEW_EXPENSIFY_USER, | ||
| preferredLocale: ONYXKEYS.NVP_PREFERRED_LOCALE, | ||
| preferredEmojiSkinTone: ONYXKEYS.PREFERRED_EMOJI_SKIN_TONE, | ||
| frequentlyUsedEmojis: ONYXKEYS.FREQUENTLY_USED_EMOJIS, | ||
| // eslint-disable-next-line @typescript-eslint/naming-convention | ||
| private_blockedFromConcierge: ONYXKEYS.NVP_BLOCKED_FROM_CONCIERGE, | ||
| // eslint-disable-next-line @typescript-eslint/naming-convention | ||
| private_pushNotificationID: ONYXKEYS.NVP_PRIVATE_PUSH_NOTIFICATION_ID, | ||
| tryFocusMode: ONYXKEYS.NVP_TRY_FOCUS_MODE, | ||
| introSelected: ONYXKEYS.NVP_INTRO_SELECTED, | ||
| hasDismissedIdlePanel: ONYXKEYS.NVP_HAS_DISMISSED_IDLE_PANEL, | ||
| }; | ||
|
|
||
| // This migration changes the keys of all the NVP related keys so that they are standardized | ||
| export default function () { | ||
| return new Promise<void>((resolve) => { | ||
| // We add the number of manual connections we add below | ||
iwiznia marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| const resolveWhenDone = after(Object.entries(migrations).length + 2, () => resolve()); | ||
|
|
||
| for (const [oldKey, newKey] of Object.entries(migrations)) { | ||
| const connectionID = Onyx.connect({ | ||
| // @ts-expect-error oldKey is a variable | ||
| key: oldKey, | ||
| callback: (value) => { | ||
| Onyx.disconnect(connectionID); | ||
| if (value !== null) { | ||
|
There was a problem hiding this comment. NAB: I'm kind of surprised that there aren't lint warnings to switch these to early returns. I guess it's because there is no There was a problem hiding this comment. I like this approach more because if I do early return I will need to call There was a problem hiding this comment. Disregard, changing this given I need to pass resolveWhenDone to the promise too |
||
| // @ts-expect-error These keys are variables, so we can't check the type | ||
| Onyx.multiSet({ | ||
| [newKey]: value, | ||
| [oldKey]: null, | ||
| }); | ||
|
There was a problem hiding this comment. It's been a while since I've done the migrations, but do you know if it's a bad thing that this doesn't wait for the There was a problem hiding this comment. Yes, I just noticed this in while writing the message above, fixing it. |
||
| } | ||
| resolveWhenDone(); | ||
| }, | ||
| }); | ||
| } | ||
| const connectionIDAccount = Onyx.connect({ | ||
| key: ONYXKEYS.ACCOUNT, | ||
| callback: (value) => { | ||
| Onyx.disconnect(connectionIDAccount); | ||
| // @ts-expect-error we are removing this property, so it is not in the type anymore | ||
| if (value?.activePolicyID) { | ||
| // @ts-expect-error we are removing this property, so it is not in the type anymore | ||
| const activePolicyID = value.activePolicyID; | ||
| const newValue = {...value}; | ||
| // @ts-expect-error we are removing this property, so it is not in the type anymore | ||
| delete newValue.activePolicyID; | ||
| Onyx.multiSet({ | ||
| [ONYXKEYS.NVP_ACTIVE_POLICY_ID]: activePolicyID, | ||
| [ONYXKEYS.ACCOUNT]: newValue, | ||
| }); | ||
| } | ||
| resolveWhenDone(); | ||
| }, | ||
| }); | ||
| const connectionIDRecentlyUsedTags = Onyx.connect({ | ||
| key: ONYXKEYS.COLLECTION.OLD_POLICY_RECENTLY_USED_TAGS, | ||
| waitForCollectionCallback: true, | ||
| callback: (value) => { | ||
| Onyx.disconnect(connectionIDRecentlyUsedTags); | ||
| if (!value) { | ||
This comment was marked as resolved.
Sorry, something went wrong. |
||
| resolveWhenDone(); | ||
| return; | ||
| } | ||
| const newValue = {}; | ||
| for (const key of Object.keys(value)) { | ||
| // @ts-expect-error We have no fixed types here | ||
| newValue[`nvp_${key}`] = value[key]; | ||
| // @ts-expect-error We have no fixed types here | ||
| newValue[key] = null; | ||
| } | ||
| Onyx.multiSet(newValue); | ||
| resolveWhenDone(); | ||
| }, | ||
| }); | ||
| }); | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| import type CONST from '@src/CONST'; | ||
|
|
||
| type DismissedReferralBanners = { | ||
| [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.MONEY_REQUEST]?: boolean; | ||
| [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.START_CHAT]?: boolean; | ||
| [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.SEND_MONEY]?: boolean; | ||
| [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.REFER_FRIEND]?: boolean; | ||
| [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.SHARE_CODE]?: boolean; | ||
| }; | ||
|
|
||
| export default DismissedReferralBanners; | ||
|
Comment on lines
+1
to
+11
There was a problem hiding this comment. Could you update the description to also include the background for these changes for this dismissedReferralBanner nvp? There was a problem hiding this comment. I don't follow, what background? 😕 There was a problem hiding this comment. The explanation for why the changes to this nvp, it sees like it was refactored more than others in this PR |
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would really be great to group all these together under an
NVPkey like:Or if not that, at least put all the NVPs next to each other in this file.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Moving them to be together mostly because I don't know how to make my IDE refactor this automatically and I don't want to have to update 420 files.