From 1489eb2c1e7ee347bd742990d6440739a4118a2d Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Wed, 26 Feb 2025 22:51:37 +0700 Subject: [PATCH 1/7] fix not found page appears when enabling policy feature offline --- src/libs/API/index.ts | 2 ++ src/libs/actions/Policy/Category.ts | 5 ++- src/libs/actions/Policy/DistanceRate.ts | 5 ++- src/libs/actions/Policy/Policy.ts | 33 ++++++++++++----- src/libs/actions/Policy/Tag.ts | 5 ++- src/libs/actions/RequestConflictUtils.ts | 46 ++++++++++++++++++++++++ src/types/onyx/Request.ts | 3 ++ tests/unit/APITest.ts | 27 ++++++++++++++ tests/unit/PersistedRequests.ts | 4 +++ tests/unit/RequestConflictUtilsTest.ts | 28 ++++++++++++++- 10 files changed, 146 insertions(+), 12 deletions(-) diff --git a/src/libs/API/index.ts b/src/libs/API/index.ts index 92f23260cc19..498082f79c90 100644 --- a/src/libs/API/index.ts +++ b/src/libs/API/index.ts @@ -1,6 +1,7 @@ import type {OnyxUpdate} from 'react-native-onyx'; import Onyx from 'react-native-onyx'; import type {SetRequired} from 'type-fest'; +import DateUtils from '@libs/DateUtils'; import Log from '@libs/Log'; import {HandleUnusedOptimisticID, Logging, Pagination, Reauthentication, RecheckConnection, SaveResponseInOnyx} from '@libs/Middleware'; import {isOffline} from '@libs/Network/NetworkStore'; @@ -78,6 +79,7 @@ function prepareRequest( command, data, initiatedOffline: isOffline(), + created: DateUtils.getDBTime(), ...onyxDataWithoutOptimisticData, ...conflictResolver, }; diff --git a/src/libs/actions/Policy/Category.ts b/src/libs/actions/Policy/Category.ts index 5613209b9a0d..642b36c17161 100644 --- a/src/libs/actions/Policy/Category.ts +++ b/src/libs/actions/Policy/Category.ts @@ -36,6 +36,7 @@ import type {Policy, PolicyCategories, PolicyCategory, RecentlyUsedCategories, R import type {ApprovalRule, ExpenseRule, MccGroup} from '@src/types/onyx/Policy'; import type {PolicyCategoryExpenseLimitType} from '@src/types/onyx/PolicyCategory'; import type {OnyxData} from '@src/types/onyx/Request'; +import {resolveEnableFeatureConflicts} from '@userActions/RequestConflictUtils'; const allPolicies: OnyxCollection = {}; Onyx.connect({ @@ -1107,7 +1108,9 @@ function enablePolicyCategories(policyID: string, enabled: boolean, shouldGoBack const parameters: EnablePolicyCategoriesParams = {policyID, enabled}; - API.write(WRITE_COMMANDS.ENABLE_POLICY_CATEGORIES, parameters, onyxData); + API.write(WRITE_COMMANDS.ENABLE_POLICY_CATEGORIES, parameters, onyxData, { + checkAndFixConflictingRequest: (persistedRequests) => resolveEnableFeatureConflicts(WRITE_COMMANDS.ENABLE_POLICY_CATEGORIES, persistedRequests, parameters), + }); if (enabled && getIsNarrowLayout() && shouldGoBack) { goBackWhenEnableFeature(policyID); diff --git a/src/libs/actions/Policy/DistanceRate.ts b/src/libs/actions/Policy/DistanceRate.ts index a56cc3d576e9..e8939a777130 100644 --- a/src/libs/actions/Policy/DistanceRate.ts +++ b/src/libs/actions/Policy/DistanceRate.ts @@ -21,6 +21,7 @@ import type {Policy, Report} from '@src/types/onyx'; import type {ErrorFields} from '@src/types/onyx/OnyxCommon'; import type {Attributes, CustomUnit, Rate} from '@src/types/onyx/Policy'; import type {OnyxData} from '@src/types/onyx/Request'; +import {resolveEnableFeatureConflicts} from '@userActions/RequestConflictUtils'; type NewCustomUnit = { customUnitID: string; @@ -163,7 +164,9 @@ function enablePolicyDistanceRates(policyID: string, enabled: boolean) { const parameters: EnablePolicyDistanceRatesParams = {policyID, enabled}; - API.write(WRITE_COMMANDS.ENABLE_POLICY_DISTANCE_RATES, parameters, onyxData); + API.write(WRITE_COMMANDS.ENABLE_POLICY_DISTANCE_RATES, parameters, onyxData, { + checkAndFixConflictingRequest: (persistedRequests) => resolveEnableFeatureConflicts(WRITE_COMMANDS.ENABLE_POLICY_DISTANCE_RATES, persistedRequests, parameters), + }); if (enabled && getIsNarrowLayout()) { goBackWhenEnableFeature(policyID); diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts index 106af3a30cd1..3717b9906223 100644 --- a/src/libs/actions/Policy/Policy.ts +++ b/src/libs/actions/Policy/Policy.ts @@ -99,6 +99,7 @@ import type {Errors} from '@src/types/onyx/OnyxCommon'; import type {Attributes, CompanyAddress, CustomUnit, NetSuiteCustomList, NetSuiteCustomSegment, Rate, TaxRate} from '@src/types/onyx/Policy'; import type {OnyxData} from '@src/types/onyx/Request'; import {isEmptyObject} from '@src/types/utils/EmptyObject'; +import {resolveEnableFeatureConflicts} from '@userActions/RequestConflictUtils'; import {buildOptimisticMccGroup, buildOptimisticPolicyCategories} from './Category'; type ReportCreationData = Record< @@ -2844,7 +2845,9 @@ function enablePolicyConnections(policyID: string, enabled: boolean) { const parameters: EnablePolicyConnectionsParams = {policyID, enabled}; - API.write(WRITE_COMMANDS.ENABLE_POLICY_CONNECTIONS, parameters, onyxData); + API.write(WRITE_COMMANDS.ENABLE_POLICY_CONNECTIONS, parameters, onyxData, { + checkAndFixConflictingRequest: (persistedRequests) => resolveEnableFeatureConflicts(WRITE_COMMANDS.ENABLE_POLICY_CONNECTIONS, persistedRequests, parameters), + }); if (enabled && getIsNarrowLayout()) { goBackWhenEnableFeature(policyID); @@ -2901,7 +2904,9 @@ function enableExpensifyCard(policyID: string, enabled: boolean, shouldNavigateT const parameters: EnablePolicyExpensifyCardsParams = {authToken, policyID, enabled}; - API.write(WRITE_COMMANDS.ENABLE_POLICY_EXPENSIFY_CARDS, parameters, onyxData); + API.write(WRITE_COMMANDS.ENABLE_POLICY_EXPENSIFY_CARDS, parameters, onyxData, { + checkAndFixConflictingRequest: (persistedRequests) => resolveEnableFeatureConflicts(WRITE_COMMANDS.ENABLE_POLICY_EXPENSIFY_CARDS, persistedRequests, parameters), + }); if (enabled && shouldNavigateToExpensifyCardPage) { navigateToExpensifyCardPage(policyID); @@ -2956,7 +2961,9 @@ function enableCompanyCards(policyID: string, enabled: boolean, shouldGoBack = t const parameters: EnablePolicyCompanyCardsParams = {authToken, policyID, enabled}; - API.write(WRITE_COMMANDS.ENABLE_POLICY_COMPANY_CARDS, parameters, onyxData); + API.write(WRITE_COMMANDS.ENABLE_POLICY_COMPANY_CARDS, parameters, onyxData, { + checkAndFixConflictingRequest: (persistedRequests) => resolveEnableFeatureConflicts(WRITE_COMMANDS.ENABLE_POLICY_COMPANY_CARDS, persistedRequests, parameters), + }); if (enabled && getIsNarrowLayout() && shouldGoBack) { goBackWhenEnableFeature(policyID); @@ -3004,7 +3011,9 @@ function enablePolicyReportFields(policyID: string, enabled: boolean, shouldGoBa const parameters: EnablePolicyReportFieldsParams = {policyID, enabled}; - API.write(WRITE_COMMANDS.ENABLE_POLICY_REPORT_FIELDS, parameters, onyxData); + API.write(WRITE_COMMANDS.ENABLE_POLICY_REPORT_FIELDS, parameters, onyxData, { + checkAndFixConflictingRequest: (persistedRequests) => resolveEnableFeatureConflicts(WRITE_COMMANDS.ENABLE_POLICY_REPORT_FIELDS, persistedRequests, parameters), + }); if (enabled && getIsNarrowLayout() && shouldGoBack) { goBackWhenEnableFeature(policyID); @@ -3118,7 +3127,9 @@ function enablePolicyTaxes(policyID: string, enabled: boolean) { if (shouldAddDefaultTaxRatesData) { parameters.taxFields = JSON.stringify(defaultTaxRates); } - API.write(WRITE_COMMANDS.ENABLE_POLICY_TAXES, parameters, onyxData); + API.write(WRITE_COMMANDS.ENABLE_POLICY_TAXES, parameters, onyxData, { + checkAndFixConflictingRequest: (persistedRequests) => resolveEnableFeatureConflicts(WRITE_COMMANDS.ENABLE_POLICY_TAXES, persistedRequests, parameters), + }); if (enabled && getIsNarrowLayout()) { goBackWhenEnableFeature(policyID); @@ -3209,7 +3220,9 @@ function enablePolicyWorkflows(policyID: string, enabled: boolean) { const parameters: EnablePolicyWorkflowsParams = {policyID, enabled}; - API.write(WRITE_COMMANDS.ENABLE_POLICY_WORKFLOWS, parameters, onyxData); + API.write(WRITE_COMMANDS.ENABLE_POLICY_WORKFLOWS, parameters, onyxData, { + checkAndFixConflictingRequest: (persistedRequests) => resolveEnableFeatureConflicts(WRITE_COMMANDS.ENABLE_POLICY_WORKFLOWS, persistedRequests, parameters), + }); if (enabled && getIsNarrowLayout()) { goBackWhenEnableFeature(policyID); @@ -3273,7 +3286,9 @@ function enablePolicyRules(policyID: string, enabled: boolean, shouldGoBack = tr }; const parameters: SetPolicyRulesEnabledParams = {policyID, enabled}; - API.write(WRITE_COMMANDS.SET_POLICY_RULES_ENABLED, parameters, onyxData); + API.write(WRITE_COMMANDS.SET_POLICY_RULES_ENABLED, parameters, onyxData, { + checkAndFixConflictingRequest: (persistedRequests) => resolveEnableFeatureConflicts(WRITE_COMMANDS.SET_POLICY_RULES_ENABLED, persistedRequests, parameters), + }); if (enabled && getIsNarrowLayout() && shouldGoBack) { goBackWhenEnableFeature(policyID); @@ -3384,7 +3399,9 @@ function enablePolicyInvoicing(policyID: string, enabled: boolean) { const parameters: EnablePolicyInvoicingParams = {policyID, enabled}; - API.write(WRITE_COMMANDS.ENABLE_POLICY_INVOICING, parameters, onyxData); + API.write(WRITE_COMMANDS.ENABLE_POLICY_INVOICING, parameters, onyxData, { + checkAndFixConflictingRequest: (persistedRequests) => resolveEnableFeatureConflicts(WRITE_COMMANDS.ENABLE_POLICY_INVOICING, persistedRequests, parameters), + }); if (enabled && getIsNarrowLayout()) { goBackWhenEnableFeature(policyID); diff --git a/src/libs/actions/Policy/Tag.ts b/src/libs/actions/Policy/Tag.ts index c22a5922d0dd..9f47b613ce30 100644 --- a/src/libs/actions/Policy/Tag.ts +++ b/src/libs/actions/Policy/Tag.ts @@ -32,6 +32,7 @@ import type {Policy, PolicyTag, PolicyTagLists, PolicyTags, RecentlyUsedTags, Re import type {OnyxValueWithOfflineFeedback} from '@src/types/onyx/OnyxCommon'; import type {ApprovalRule, Attributes, Rate} from '@src/types/onyx/Policy'; import type {OnyxData} from '@src/types/onyx/Request'; +import {resolveEnableFeatureConflicts} from '@userActions/RequestConflictUtils'; type NewCustomUnit = { customUnitID: string; @@ -689,7 +690,9 @@ function enablePolicyTags(policyID: string, enabled: boolean) { const parameters: EnablePolicyTagsParams = {policyID, enabled}; - API.write(WRITE_COMMANDS.ENABLE_POLICY_TAGS, parameters, onyxData); + API.write(WRITE_COMMANDS.ENABLE_POLICY_TAGS, parameters, onyxData, { + checkAndFixConflictingRequest: (persistedRequests) => resolveEnableFeatureConflicts(WRITE_COMMANDS.ENABLE_POLICY_TAGS, persistedRequests, parameters), + }); if (enabled && getIsNarrowLayout()) { goBackWhenEnableFeature(policyID); diff --git a/src/libs/actions/RequestConflictUtils.ts b/src/libs/actions/RequestConflictUtils.ts index 7e1092016e28..0fc423d84e61 100644 --- a/src/libs/actions/RequestConflictUtils.ts +++ b/src/libs/actions/RequestConflictUtils.ts @@ -1,7 +1,9 @@ import type {OnyxUpdate} from 'react-native-onyx'; import Onyx from 'react-native-onyx'; +import type {TupleToUnion} from 'type-fest'; import type {OpenReportParams, UpdateCommentParams} from '@libs/API/parameters'; import {WRITE_COMMANDS} from '@libs/API/types'; +import type {ApiRequestCommandParameters} from '@libs/API/types'; import ONYXKEYS from '@src/ONYXKEYS'; import type OnyxRequest from '@src/types/onyx/Request'; import type {ConflictActionData} from '@src/types/onyx/Request'; @@ -19,6 +21,22 @@ const commentsToBeDeleted = new Set([ WRITE_COMMANDS.REMOVE_EMOJI_REACTION, ]); +const enablePolicyFeatureCommand = [ + WRITE_COMMANDS.ENABLE_POLICY_DISTANCE_RATES, + WRITE_COMMANDS.ENABLE_POLICY_EXPENSIFY_CARDS, + WRITE_COMMANDS.ENABLE_POLICY_COMPANY_CARDS, + WRITE_COMMANDS.ENABLE_POLICY_CONNECTIONS, + WRITE_COMMANDS.ENABLE_POLICY_CATEGORIES, + WRITE_COMMANDS.ENABLE_POLICY_TAGS, + WRITE_COMMANDS.ENABLE_POLICY_TAXES, + WRITE_COMMANDS.ENABLE_POLICY_REPORT_FIELDS, + WRITE_COMMANDS.ENABLE_POLICY_WORKFLOWS, + WRITE_COMMANDS.SET_POLICY_RULES_ENABLED, + WRITE_COMMANDS.ENABLE_POLICY_INVOICING, +] as const; + +type EnablePolicyFeatureCommand = TupleToUnion; + function createUpdateCommentMatcher(reportActionID: string) { return function (request: OnyxRequest) { return request.command === WRITE_COMMANDS.UPDATE_COMMENT && request.data?.reportActionID === reportActionID; @@ -175,10 +193,38 @@ function resolveEditCommentWithNewAddCommentRequest(persistedRequests: OnyxReque } as ConflictActionData; } +function resolveEnableFeatureConflicts( + command: EnablePolicyFeatureCommand, + persistedRequests: OnyxRequest[], + parameters: ApiRequestCommandParameters[EnablePolicyFeatureCommand], +): ConflictActionData { + const deleteRequestIndex = persistedRequests.findIndex( + (request) => request.command === command && request.data?.policyID === parameters.policyID && request.data?.enabled !== parameters.enabled, + ); + + if (deleteRequestIndex === -1) { + return { + conflictAction: { + type: 'push', + }, + }; + } + + return { + conflictAction: { + type: 'delete', + indices: [deleteRequestIndex], + pushNewRequest: false, + }, + }; +} + export { resolveDuplicationConflictAction, resolveOpenReportDuplicationConflictAction, resolveCommentDeletionConflicts, resolveEditCommentWithNewAddCommentRequest, createUpdateCommentMatcher, + resolveEnableFeatureConflicts, + enablePolicyFeatureCommand, }; diff --git a/src/types/onyx/Request.ts b/src/types/onyx/Request.ts index ffbd7f858caa..62d32e30d2a8 100644 --- a/src/types/onyx/Request.ts +++ b/src/types/onyx/Request.ts @@ -63,6 +63,9 @@ type RequestData = { * More info https://github.com/Expensify/App/issues/51761 */ initiatedOffline?: boolean; + + /** The created time of the request */ + created?: string; }; /** diff --git a/tests/unit/APITest.ts b/tests/unit/APITest.ts index 7c7182059bec..8cda88e64a15 100644 --- a/tests/unit/APITest.ts +++ b/tests/unit/APITest.ts @@ -581,6 +581,33 @@ describe('APITests', () => { }); }); + test('All write requests are in the queue should be called even some of them are the same', () => { + // Given offline state where all requests will eventualy succeed without issue + const xhr = jest.spyOn(HttpUtils, 'xhr').mockResolvedValue({jsonCode: CONST.JSON_CODE.SUCCESS}); + return Onyx.multiSet({ + [ONYXKEYS.SESSION]: {authToken: 'anyToken'}, + [ONYXKEYS.NETWORK]: {isOffline: true}, + [ONYXKEYS.CREDENTIALS]: {autoGeneratedLogin: 'test_user', autoGeneratedPassword: 'psswd'}, + }) + .then(() => { + // When we queue 3 persistable commands and two of them are the same + API.write('MockCommand' as WriteCommand, {content: 'value1'} as ApiRequestCommandParameters[WriteCommand]); + API.write('MockCommand' as WriteCommand, {content: 'value2'} as ApiRequestCommandParameters[WriteCommand]); + API.write('MockCommand' as WriteCommand, {content: 'value1'} as ApiRequestCommandParameters[WriteCommand]); + + return waitForBatchedUpdates(); + }) + .then(() => Onyx.set(ONYXKEYS.NETWORK, {isOffline: false})) + .then(waitForBatchedUpdates) + .then(() => { + // Then expect all 3 calls to have been made and for the Writes to be made in the order that we made them + expect(xhr.mock.calls.length).toBe(3); + expect(xhr.mock.calls.at(0)?.[1].content).toBe('value1'); + expect(xhr.mock.calls.at(1)?.[1].content).toBe('value2'); + expect(xhr.mock.calls.at(2)?.[1].content).toBe('value1'); + }); + }); + test('Read request should not stuck when SequentialQueue is paused and resumed', async () => { // Given 2 WRITE requests and 1 READ request where the first write request pauses the SequentialQueue const xhr = jest.spyOn(HttpUtils, 'xhr').mockResolvedValueOnce({previousUpdateID: 1}); diff --git a/tests/unit/PersistedRequests.ts b/tests/unit/PersistedRequests.ts index c488b36013ad..f1d1c0d59195 100644 --- a/tests/unit/PersistedRequests.ts +++ b/tests/unit/PersistedRequests.ts @@ -9,6 +9,7 @@ const request: Request = { command: 'OpenReport', successData: [{key: 'reportMetadata_1', onyxMethod: 'merge', value: {}}], failureData: [{key: 'reportMetadata_2', onyxMethod: 'merge', value: {}}], + created: '1', }; beforeAll(() => @@ -52,6 +53,7 @@ describe('PersistedRequests', () => { command: 'AddComment', successData: [{key: 'reportMetadata_3', onyxMethod: 'merge', value: {}}], failureData: [{key: 'reportMetadata_4', onyxMethod: 'merge', value: {}}], + created: '2', }; PersistedRequests.save(request2); PersistedRequests.processNextRequest(); @@ -66,6 +68,7 @@ describe('PersistedRequests', () => { command: 'OpenReport', successData: [{key: 'reportMetadata_1', onyxMethod: 'set', value: {}}], failureData: [{key: 'reportMetadata_2', onyxMethod: 'set', value: {}}], + created: '3', }; PersistedRequests.update(0, newRequest); expect(PersistedRequests.getAll().at(0)).toEqual(newRequest); @@ -76,6 +79,7 @@ describe('PersistedRequests', () => { command: 'OpenReport', successData: [{key: 'reportMetadata_1', onyxMethod: 'set', value: {}}], failureData: [{key: 'reportMetadata_2', onyxMethod: 'set', value: {}}], + created: '4', }; PersistedRequests.updateOngoingRequest(newRequest); expect(PersistedRequests.getOngoingRequest()).toEqual(newRequest); diff --git a/tests/unit/RequestConflictUtilsTest.ts b/tests/unit/RequestConflictUtilsTest.ts index c290940289d8..1d8dac8a6fd1 100644 --- a/tests/unit/RequestConflictUtilsTest.ts +++ b/tests/unit/RequestConflictUtilsTest.ts @@ -1,5 +1,11 @@ import Onyx from 'react-native-onyx'; -import {resolveCommentDeletionConflicts, resolveDuplicationConflictAction, resolveEditCommentWithNewAddCommentRequest} from '@libs/actions/RequestConflictUtils'; +import { + enablePolicyFeatureCommand, + resolveCommentDeletionConflicts, + resolveDuplicationConflictAction, + resolveEditCommentWithNewAddCommentRequest, + resolveEnableFeatureConflicts, +} from '@libs/actions/RequestConflictUtils'; import type {WriteCommand} from '@libs/API/types'; describe('RequestConflictUtils', () => { @@ -134,4 +140,24 @@ describe('RequestConflictUtils', () => { }, }); }); + + it.each(enablePolicyFeatureCommand)('resolveEnableFeatureConflicts should return push when the same enable feature API is not found', (commandName) => { + const persistedRequests = [{command: commandName, data: {policyID: '1', enabled: true}}]; + const parameters = {policyID: '2', enabled: false}; + const result = resolveEnableFeatureConflicts(commandName, persistedRequests, parameters); + expect(result).toEqual({conflictAction: {type: 'push'}}); + }); + + it.each(enablePolicyFeatureCommand)('resolveEnableFeatureConflicts should return delete when the same enable feature API is found', (commandName) => { + const persistedRequests = [{command: commandName, data: {policyID: '1', enabled: true}}]; + const parameters = {policyID: '1', enabled: false}; + const result = resolveEnableFeatureConflicts(commandName, persistedRequests, parameters); + expect(result).toEqual({ + conflictAction: { + type: 'delete', + indices: [0], + pushNewRequest: false, + }, + }); + }); }); From 01289522288dbedabe5e53611f869446a690e9c7 Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Wed, 26 Feb 2025 23:19:00 +0700 Subject: [PATCH 2/7] fix lint --- src/libs/API/index.ts | 3 +-- src/libs/actions/Policy/Category.ts | 2 +- src/libs/actions/Policy/DistanceRate.ts | 2 +- src/libs/actions/Policy/Policy.ts | 2 +- src/libs/actions/Policy/Tag.ts | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/libs/API/index.ts b/src/libs/API/index.ts index 498082f79c90..fa17c44f5cdc 100644 --- a/src/libs/API/index.ts +++ b/src/libs/API/index.ts @@ -1,7 +1,6 @@ import type {OnyxUpdate} from 'react-native-onyx'; import Onyx from 'react-native-onyx'; import type {SetRequired} from 'type-fest'; -import DateUtils from '@libs/DateUtils'; import Log from '@libs/Log'; import {HandleUnusedOptimisticID, Logging, Pagination, Reauthentication, RecheckConnection, SaveResponseInOnyx} from '@libs/Middleware'; import {isOffline} from '@libs/Network/NetworkStore'; @@ -79,7 +78,7 @@ function prepareRequest( command, data, initiatedOffline: isOffline(), - created: DateUtils.getDBTime(), + created: new Date().getTime().toString(), ...onyxDataWithoutOptimisticData, ...conflictResolver, }; diff --git a/src/libs/actions/Policy/Category.ts b/src/libs/actions/Policy/Category.ts index 642b36c17161..b7637c0caba3 100644 --- a/src/libs/actions/Policy/Category.ts +++ b/src/libs/actions/Policy/Category.ts @@ -30,13 +30,13 @@ import enhanceParameters from '@libs/Network/enhanceParameters'; import {hasEnabledOptions} from '@libs/OptionsListUtils'; import {getPolicy, goBackWhenEnableFeature} from '@libs/PolicyUtils'; import {getAllPolicyReports} from '@libs/ReportUtils'; +import {resolveEnableFeatureConflicts} from '@userActions/RequestConflictUtils'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import type {Policy, PolicyCategories, PolicyCategory, RecentlyUsedCategories, Report} from '@src/types/onyx'; import type {ApprovalRule, ExpenseRule, MccGroup} from '@src/types/onyx/Policy'; import type {PolicyCategoryExpenseLimitType} from '@src/types/onyx/PolicyCategory'; import type {OnyxData} from '@src/types/onyx/Request'; -import {resolveEnableFeatureConflicts} from '@userActions/RequestConflictUtils'; const allPolicies: OnyxCollection = {}; Onyx.connect({ diff --git a/src/libs/actions/Policy/DistanceRate.ts b/src/libs/actions/Policy/DistanceRate.ts index e8939a777130..a9b00be5e646 100644 --- a/src/libs/actions/Policy/DistanceRate.ts +++ b/src/libs/actions/Policy/DistanceRate.ts @@ -15,13 +15,13 @@ import * as ErrorUtils from '@libs/ErrorUtils'; import getIsNarrowLayout from '@libs/getIsNarrowLayout'; import {getDistanceRateCustomUnit, goBackWhenEnableFeature, removePendingFieldsFromCustomUnit} from '@libs/PolicyUtils'; import * as ReportUtils from '@libs/ReportUtils'; +import {resolveEnableFeatureConflicts} from '@userActions/RequestConflictUtils'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import type {Policy, Report} from '@src/types/onyx'; import type {ErrorFields} from '@src/types/onyx/OnyxCommon'; import type {Attributes, CustomUnit, Rate} from '@src/types/onyx/Policy'; import type {OnyxData} from '@src/types/onyx/Request'; -import {resolveEnableFeatureConflicts} from '@userActions/RequestConflictUtils'; type NewCustomUnit = { customUnitID: string; diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts index 3717b9906223..a242eaf656aa 100644 --- a/src/libs/actions/Policy/Policy.ts +++ b/src/libs/actions/Policy/Policy.ts @@ -78,6 +78,7 @@ import * as ReportUtils from '@libs/ReportUtils'; import type {PolicySelector} from '@pages/home/sidebar/FloatingActionButtonAndPopover'; import * as PaymentMethods from '@userActions/PaymentMethods'; import * as PersistedRequests from '@userActions/PersistedRequests'; +import {resolveEnableFeatureConflicts} from '@userActions/RequestConflictUtils'; import type {OnboardingPurpose} from '@src/CONST'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; @@ -99,7 +100,6 @@ import type {Errors} from '@src/types/onyx/OnyxCommon'; import type {Attributes, CompanyAddress, CustomUnit, NetSuiteCustomList, NetSuiteCustomSegment, Rate, TaxRate} from '@src/types/onyx/Policy'; import type {OnyxData} from '@src/types/onyx/Request'; import {isEmptyObject} from '@src/types/utils/EmptyObject'; -import {resolveEnableFeatureConflicts} from '@userActions/RequestConflictUtils'; import {buildOptimisticMccGroup, buildOptimisticPolicyCategories} from './Category'; type ReportCreationData = Record< diff --git a/src/libs/actions/Policy/Tag.ts b/src/libs/actions/Policy/Tag.ts index 9f47b613ce30..d792d9625b04 100644 --- a/src/libs/actions/Policy/Tag.ts +++ b/src/libs/actions/Policy/Tag.ts @@ -26,13 +26,13 @@ import {goBackWhenEnableFeature} from '@libs/PolicyUtils'; import * as ReportUtils from '@libs/ReportUtils'; import {getTagArrayFromName} from '@libs/TransactionUtils'; import type {PolicyTagList} from '@pages/workspace/tags/types'; +import {resolveEnableFeatureConflicts} from '@userActions/RequestConflictUtils'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import type {Policy, PolicyTag, PolicyTagLists, PolicyTags, RecentlyUsedTags, Report} from '@src/types/onyx'; import type {OnyxValueWithOfflineFeedback} from '@src/types/onyx/OnyxCommon'; import type {ApprovalRule, Attributes, Rate} from '@src/types/onyx/Policy'; import type {OnyxData} from '@src/types/onyx/Request'; -import {resolveEnableFeatureConflicts} from '@userActions/RequestConflictUtils'; type NewCustomUnit = { customUnitID: string; From f3505cb61a35bcd7dc7d50e331746796e9f91e17 Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Wed, 26 Feb 2025 23:25:18 +0700 Subject: [PATCH 3/7] use requestID instead of created --- src/libs/API/index.ts | 4 +++- src/types/onyx/Request.ts | 2 +- tests/unit/PersistedRequests.ts | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/libs/API/index.ts b/src/libs/API/index.ts index fa17c44f5cdc..8badd28edb3c 100644 --- a/src/libs/API/index.ts +++ b/src/libs/API/index.ts @@ -36,6 +36,8 @@ use(Pagination); // middlewares after this, because the SequentialQueue depends on the result of this middleware to pause the queue (if needed) to bring the app to an up-to-date state. use(SaveResponseInOnyx); +let requestIndex = 0; + type OnyxData = { optimisticData?: OnyxUpdate[]; successData?: OnyxUpdate[]; @@ -78,7 +80,7 @@ function prepareRequest( command, data, initiatedOffline: isOffline(), - created: new Date().getTime().toString(), + requestID: requestIndex++, ...onyxDataWithoutOptimisticData, ...conflictResolver, }; diff --git a/src/types/onyx/Request.ts b/src/types/onyx/Request.ts index 62d32e30d2a8..7349dacf3714 100644 --- a/src/types/onyx/Request.ts +++ b/src/types/onyx/Request.ts @@ -65,7 +65,7 @@ type RequestData = { initiatedOffline?: boolean; /** The created time of the request */ - created?: string; + requestID?: number; }; /** diff --git a/tests/unit/PersistedRequests.ts b/tests/unit/PersistedRequests.ts index f1d1c0d59195..67d435b80745 100644 --- a/tests/unit/PersistedRequests.ts +++ b/tests/unit/PersistedRequests.ts @@ -9,7 +9,7 @@ const request: Request = { command: 'OpenReport', successData: [{key: 'reportMetadata_1', onyxMethod: 'merge', value: {}}], failureData: [{key: 'reportMetadata_2', onyxMethod: 'merge', value: {}}], - created: '1', + requestID: 1, }; beforeAll(() => @@ -53,7 +53,7 @@ describe('PersistedRequests', () => { command: 'AddComment', successData: [{key: 'reportMetadata_3', onyxMethod: 'merge', value: {}}], failureData: [{key: 'reportMetadata_4', onyxMethod: 'merge', value: {}}], - created: '2', + requestID: 2, }; PersistedRequests.save(request2); PersistedRequests.processNextRequest(); @@ -68,7 +68,7 @@ describe('PersistedRequests', () => { command: 'OpenReport', successData: [{key: 'reportMetadata_1', onyxMethod: 'set', value: {}}], failureData: [{key: 'reportMetadata_2', onyxMethod: 'set', value: {}}], - created: '3', + requestID: 3, }; PersistedRequests.update(0, newRequest); expect(PersistedRequests.getAll().at(0)).toEqual(newRequest); @@ -79,7 +79,7 @@ describe('PersistedRequests', () => { command: 'OpenReport', successData: [{key: 'reportMetadata_1', onyxMethod: 'set', value: {}}], failureData: [{key: 'reportMetadata_2', onyxMethod: 'set', value: {}}], - created: '4', + requestID: 4 }; PersistedRequests.updateOngoingRequest(newRequest); expect(PersistedRequests.getOngoingRequest()).toEqual(newRequest); From 8f415735a2d1cd2346c58e7772a0351b213640df Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Wed, 26 Feb 2025 23:30:29 +0700 Subject: [PATCH 4/7] run prettier --- tests/unit/PersistedRequests.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/PersistedRequests.ts b/tests/unit/PersistedRequests.ts index 67d435b80745..321b0af3ad41 100644 --- a/tests/unit/PersistedRequests.ts +++ b/tests/unit/PersistedRequests.ts @@ -79,7 +79,7 @@ describe('PersistedRequests', () => { command: 'OpenReport', successData: [{key: 'reportMetadata_1', onyxMethod: 'set', value: {}}], failureData: [{key: 'reportMetadata_2', onyxMethod: 'set', value: {}}], - requestID: 4 + requestID: 4, }; PersistedRequests.updateOngoingRequest(newRequest); expect(PersistedRequests.getOngoingRequest()).toEqual(newRequest); From 69bf6d9c229b0d9e2a8422d078d07f5460798d4b Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Tue, 4 Mar 2025 10:58:54 +0700 Subject: [PATCH 5/7] update description for requestID --- src/types/onyx/Request.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/types/onyx/Request.ts b/src/types/onyx/Request.ts index 7349dacf3714..b0dcc043a5bf 100644 --- a/src/types/onyx/Request.ts +++ b/src/types/onyx/Request.ts @@ -64,7 +64,7 @@ type RequestData = { */ initiatedOffline?: boolean; - /** The created time of the request */ + /** The unique ID of the request */ requestID?: number; }; From 4623d1b9bfe100edd91c3794bb0631e27612b1a9 Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Tue, 4 Mar 2025 11:15:38 +0700 Subject: [PATCH 6/7] fix test --- tests/actions/ReportTest.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/actions/ReportTest.ts b/tests/actions/ReportTest.ts index 5f8df4c08134..f31a331cb795 100644 --- a/tests/actions/ReportTest.ts +++ b/tests/actions/ReportTest.ts @@ -974,6 +974,7 @@ describe('actions/Report', () => { await waitForNetworkPromises(); const newComment = PersistedRequests.getAll().at(1); + const reportActionID = newComment?.data?.reportActionID as string | undefined; const reportAction = TestHelper.buildTestReportComment(created, TEST_USER_ACCOUNT_ID, reportActionID); From 57f74966f27932341ce3038ae29bdabe5831ef47 Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Tue, 4 Mar 2025 11:16:05 +0700 Subject: [PATCH 7/7] fix lint --- tests/actions/ReportTest.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/actions/ReportTest.ts b/tests/actions/ReportTest.ts index f31a331cb795..5f8df4c08134 100644 --- a/tests/actions/ReportTest.ts +++ b/tests/actions/ReportTest.ts @@ -974,7 +974,6 @@ describe('actions/Report', () => { await waitForNetworkPromises(); const newComment = PersistedRequests.getAll().at(1); - const reportActionID = newComment?.data?.reportActionID as string | undefined; const reportAction = TestHelper.buildTestReportComment(created, TEST_USER_ACCOUNT_ID, reportActionID);