Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 5 additions & 16 deletions config/eslint/eslint.seatbelt.tsv
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,6 @@
"../../src/libs/actions/__mocks__/App.ts" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/libs/actions/__mocks__/App.ts" "no-restricted-syntax" 2
"../../src/libs/actions/__mocks__/OnyxUpdates.ts" "no-restricted-syntax" 1
"../../src/libs/actions/Agent.ts" "rulesdir/no-direct-personal-details-list" 9
"../../src/libs/actions/App.ts" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/libs/actions/App.ts" "no-restricted-syntax" 1
"../../src/libs/actions/applyOnyxUpdatesReliably.ts" "no-restricted-syntax" 1
Expand All @@ -582,7 +581,6 @@
"../../src/libs/actions/Delegate.ts" "rulesdir/no-direct-personal-details-list" 1
"../../src/libs/actions/Domain.ts" "@typescript-eslint/no-unsafe-type-assertion" 3
"../../src/libs/actions/Domain.ts" "no-restricted-syntax" 1
"../../src/libs/actions/Domain.ts" "rulesdir/no-direct-personal-details-list" 6
"../../src/libs/actions/ExitSurvey.ts" "no-restricted-syntax" 1
"../../src/libs/actions/getCompanyCardBankConnection/index.tsx" "@typescript-eslint/no-unsafe-type-assertion" 4
"../../src/libs/actions/getCompanyCardBankConnection/index.tsx" "no-restricted-imports" 1
Expand All @@ -607,7 +605,6 @@
"../../src/libs/actions/IOU/MoneyRequestBuilder.ts" "@typescript-eslint/no-deprecated/getReportTransactions" 2
"../../src/libs/actions/IOU/MoneyRequestBuilder.ts" "@typescript-eslint/no-deprecated/translateLocal" 1
"../../src/libs/actions/IOU/MoneyRequestBuilder.ts" "@typescript-eslint/no-unsafe-type-assertion" 2
"../../src/libs/actions/IOU/MoneyRequestBuilder.ts" "rulesdir/no-direct-personal-details-list" 2
"../../src/libs/actions/IOU/PayMoneyRequest.ts" "@typescript-eslint/no-deprecated/getReportTransactions" 2
"../../src/libs/actions/IOU/PayMoneyRequest.ts" "@typescript-eslint/no-unsafe-type-assertion" 2
"../../src/libs/actions/IOU/PayMoneyRequest.ts" "no-restricted-imports" 1
Expand All @@ -624,15 +621,12 @@
"../../src/libs/actions/IOU/SearchUpdate.ts" "rulesdir/no-direct-personal-details-list" 2
"../../src/libs/actions/IOU/SendInvoice.ts" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/libs/actions/IOU/SendInvoice.ts" "no-restricted-syntax" 1
"../../src/libs/actions/IOU/SendInvoice.ts" "rulesdir/no-direct-personal-details-list" 2
"../../src/libs/actions/IOU/SendMoney.ts" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/libs/actions/IOU/SendMoney.ts" "no-restricted-syntax" 1
"../../src/libs/actions/IOU/SendMoney.ts" "rulesdir/no-direct-personal-details-list" 2
"../../src/libs/actions/IOU/Split.ts" "@typescript-eslint/no-deprecated/getReportTransactions" 1
"../../src/libs/actions/IOU/Split.ts" "@typescript-eslint/no-deprecated/Localize.translateLocal" 2
"../../src/libs/actions/IOU/Split.ts" "@typescript-eslint/no-unsafe-type-assertion" 2
"../../src/libs/actions/IOU/Split.ts" "no-restricted-syntax" 3
"../../src/libs/actions/IOU/Split.ts" "rulesdir/no-direct-personal-details-list" 1
"../../src/libs/actions/IOU/SplitExpenseItems.ts" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/libs/actions/IOU/SplitTransactionUpdate.ts" "@typescript-eslint/no-unsafe-type-assertion" 20
"../../src/libs/actions/IOU/TrackExpense.ts" "@typescript-eslint/no-deprecated/getReportTransactions" 1
Expand Down Expand Up @@ -664,14 +658,13 @@
"../../src/libs/actions/PersonalCards.ts" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/libs/actions/PersonalDetails.ts" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/libs/actions/PersonalDetails.ts" "no-restricted-syntax" 5
"../../src/libs/actions/PersonalDetails.ts" "rulesdir/no-direct-personal-details-list" 15
"../../src/libs/actions/Plaid.ts" "no-restricted-syntax" 1
"../../src/libs/actions/Policy/Category.ts" "no-restricted-syntax" 5
"../../src/libs/actions/Policy/DistanceRate.ts" "no-restricted-syntax" 2
"../../src/libs/actions/Policy/Member.ts" "@typescript-eslint/no-unsafe-type-assertion" 2
"../../src/libs/actions/Policy/Member.ts" "no-restricted-imports" 1
"../../src/libs/actions/Policy/Member.ts" "no-restricted-syntax" 7
"../../src/libs/actions/Policy/Member.ts" "rulesdir/no-direct-personal-details-list" 2
"../../src/libs/actions/Policy/Member.ts" "rulesdir/no-direct-personal-details-list" 1
"../../src/libs/actions/Policy/Member.ts" "rulesdir/no-onyx-connect" 1
"../../src/libs/actions/Policy/PerDiem.ts" "no-restricted-syntax" 1
"../../src/libs/actions/Policy/Plan.ts" "no-restricted-syntax" 1
Expand All @@ -691,13 +684,12 @@
"../../src/libs/actions/QueuedOnyxUpdates.ts" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/libs/actions/ReimbursementAccount/resetNonUSDBankAccount.ts" "no-restricted-syntax" 1
"../../src/libs/actions/ReimbursementAccount/resetUSDBankAccount.ts" "no-restricted-syntax" 1
"../../src/libs/actions/replaceOptimisticAgentWithActualAgent.ts" "rulesdir/no-direct-personal-details-list" 1
"../../src/libs/actions/replaceOptimisticReportWithActualReport.ts" "@typescript-eslint/no-unsafe-type-assertion" 2
"../../src/libs/actions/Report/index.ts" "@typescript-eslint/no-deprecated/getReportTransactions" 3
"../../src/libs/actions/Report/index.ts" "@typescript-eslint/no-deprecated/reportAction.originalMessage" 1
"../../src/libs/actions/Report/index.ts" "@typescript-eslint/no-unsafe-type-assertion" 19
"../../src/libs/actions/Report/index.ts" "no-restricted-syntax" 7
"../../src/libs/actions/Report/index.ts" "rulesdir/no-direct-personal-details-list" 8
"../../src/libs/actions/Report/index.ts" "rulesdir/no-direct-personal-details-list" 1
"../../src/libs/actions/Report/index.ts" "rulesdir/no-onyx-connect" 3
"../../src/libs/actions/Report/MarkAllMessageAsRead.tsx" "no-restricted-syntax" 1
"../../src/libs/actions/ReportLayout.ts" "@typescript-eslint/no-unsafe-type-assertion" 1
Expand All @@ -708,7 +700,6 @@
"../../src/libs/actions/Search.ts" "@typescript-eslint/no-unsafe-type-assertion" 16
"../../src/libs/actions/Session/index.ts" "@typescript-eslint/no-unsafe-type-assertion" 3
"../../src/libs/actions/Session/index.ts" "no-restricted-syntax" 9
"../../src/libs/actions/Session/index.ts" "rulesdir/no-direct-personal-details-list" 1
"../../src/libs/actions/Session/index.ts" "rulesdir/no-onyx-connect" 2
"../../src/libs/actions/SplitExpenses.ts" "@typescript-eslint/no-unsafe-type-assertion" 2
"../../src/libs/actions/StatsCounter.ts" "no-restricted-syntax" 2
Expand All @@ -720,7 +711,7 @@
"../../src/libs/actions/Task.ts" "@typescript-eslint/no-unsafe-type-assertion" 3
"../../src/libs/actions/Task.ts" "no-restricted-imports" 1
"../../src/libs/actions/Task.ts" "no-restricted-syntax" 5
"../../src/libs/actions/Task.ts" "rulesdir/no-direct-personal-details-list" 2
"../../src/libs/actions/Task.ts" "rulesdir/no-direct-personal-details-list" 1
"../../src/libs/actions/TaxRate.ts" "no-restricted-syntax" 1
"../../src/libs/actions/TeachersUnite.ts" "no-restricted-syntax" 1
"../../src/libs/actions/Transaction.ts" "@typescript-eslint/no-deprecated/getReportTransactions" 2
Expand All @@ -733,7 +724,6 @@
"../../src/libs/actions/User.ts" "@typescript-eslint/no-unsafe-type-assertion" 3
"../../src/libs/actions/User.ts" "no-restricted-imports" 1
"../../src/libs/actions/User.ts" "no-restricted-syntax" 7
"../../src/libs/actions/User.ts" "rulesdir/no-direct-personal-details-list" 3
"../../src/libs/actions/VacationDelegate.ts" "no-restricted-syntax" 2
"../../src/libs/actions/Wallet.ts" "@typescript-eslint/no-unsafe-type-assertion" 4
"../../src/libs/actions/Wallet.ts" "no-restricted-syntax" 1
Expand Down Expand Up @@ -806,7 +796,7 @@
"../../src/libs/MergeTransactionUtils.ts" "@typescript-eslint/no-unsafe-type-assertion" 5
"../../src/libs/Middleware/HandleUnusedOptimisticID.ts" "@typescript-eslint/no-unsafe-type-assertion" 4
"../../src/libs/Middleware/HandleUnusedOptimisticID.ts" "no-restricted-syntax" 1
"../../src/libs/Middleware/HandleUnusedOptimisticID.ts" "rulesdir/no-direct-personal-details-list" 4
"../../src/libs/Middleware/HandleUnusedOptimisticID.ts" "rulesdir/no-direct-personal-details-list" 2
"../../src/libs/Middleware/Logging.ts" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/libs/Middleware/Pagination.ts" "@typescript-eslint/no-unsafe-type-assertion" 5
"../../src/libs/Middleware/SaveResponseInOnyx.ts" "no-restricted-syntax" 1
Expand Down Expand Up @@ -926,7 +916,7 @@
"../../src/libs/ReportUtils.ts" "@typescript-eslint/no-deprecated/getReportTransactions" 17
"../../src/libs/ReportUtils.ts" "@typescript-eslint/no-deprecated/translateLocal" 8
"../../src/libs/ReportUtils.ts" "@typescript-eslint/no-unsafe-type-assertion" 32
"../../src/libs/ReportUtils.ts" "rulesdir/no-direct-personal-details-list" 6
"../../src/libs/ReportUtils.ts" "rulesdir/no-direct-personal-details-list" 1
"../../src/libs/ReportUtils.ts" "rulesdir/no-onyx-connect" 15
"../../src/libs/sanitizeLogParams.ts" "@typescript-eslint/no-unsafe-type-assertion" 2
"../../src/libs/SearchAutocompleteUtils.ts" "@typescript-eslint/no-unsafe-type-assertion" 3
Expand Down Expand Up @@ -1457,7 +1447,6 @@
"../../src/stories/DragAndDrop.stories.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/stories/EReceipt.stories.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/stories/Form.stories.tsx" "@typescript-eslint/no-unsafe-type-assertion" 10
"../../src/stories/MenuItemComparison.stories.tsx" "rulesdir/no-direct-personal-details-list" 1
"../../src/stories/ReportActionItemImages.stories.tsx" "no-restricted-syntax" 1
"../../src/stories/TextInput.stories.tsx" "react-hooks/set-state-in-effect" 1
"../../src/styles/index.ts" "@typescript-eslint/no-unsafe-type-assertion" 1
Expand Down
13 changes: 3 additions & 10 deletions src/libs/Middleware/HandleUnusedOptimisticID.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import {prepareOnyxDataForCleanUpOptimisticParticipants} from '@libs/actions/Report';
import {WRITE_COMMANDS} from '@libs/API/types';
import deepReplaceKeysAndValues from '@libs/deepReplaceKeysAndValues';
import {buildPersonalDetailsUpdate} from '@libs/PersonalDetailsUtils';
import type {Middleware} from '@libs/Request';

import * as PersistedRequests from '@userActions/PersistedRequests';
Expand Down Expand Up @@ -167,11 +168,7 @@ const handleUnusedOptimisticID: Middleware = (requestResponse, request, isFromSe
participants: redundantParticipants,
},
},
{
onyxMethod: Onyx.METHOD.MERGE,
key: ONYXKEYS.PERSONAL_DETAILS_LIST,
value: redundantParticipants,
},
buildPersonalDetailsUpdate(redundantParticipants),
);
}

Expand All @@ -184,11 +181,7 @@ const handleUnusedOptimisticID: Middleware = (requestResponse, request, isFromSe
invitedEmails ?? [],
);
if (!isEmptyObject(restoredPersonalDetails)) {
(response.onyxData as AnyOnyxUpdate[]).push({
onyxMethod: Onyx.METHOD.MERGE,
key: ONYXKEYS.PERSONAL_DETAILS_LIST,
value: restoredPersonalDetails,
});
(response.onyxData as AnyOnyxUpdate[]).push(buildPersonalDetailsUpdate(restoredPersonalDetails));
}
}
return response;
Expand Down
21 changes: 7 additions & 14 deletions src/libs/PersonalDetailsUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,9 @@ function buildPersonalDetailsUpdate(personalDetails: PersonalDetailsUpdate): Ony
};
}

// The Onyx update produced by buildPersonalDetailsUpdate. Use it instead of naming the key in an OnyxUpdate generic.
type PersonalDetailsOnyxUpdate = ReturnType<typeof buildPersonalDetailsUpdate>;

/**
* Given a list of logins and accountIDs, return Onyx data for users with no existing personal details stored. These users might be brand new or unknown.
* They will have an "optimistic" accountID that must be cleaned up later.
Expand Down Expand Up @@ -357,21 +360,9 @@ function getPersonalDetailsOnyxDataForOptimisticUsers(
personalDetailsCleanup[accountID] = null;
}

const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.PERSONAL_DETAILS_LIST>> = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: ONYXKEYS.PERSONAL_DETAILS_LIST,
value: personalDetailsNew,
},
];
const optimisticData: PersonalDetailsOnyxUpdate[] = [buildPersonalDetailsUpdate(personalDetailsNew)];

const finallyData: Array<OnyxUpdate<typeof ONYXKEYS.PERSONAL_DETAILS_LIST>> = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: ONYXKEYS.PERSONAL_DETAILS_LIST,
value: personalDetailsCleanup,
},
];
const finallyData: PersonalDetailsOnyxUpdate[] = [buildPersonalDetailsUpdate(personalDetailsCleanup)];

return {
optimisticData,
Expand Down Expand Up @@ -598,6 +589,8 @@ function areTravelPersonalDetailsMissing(privatePersonalDetails: OnyxEntry<Priva
return !privatePersonalDetails?.legalFirstName || !privatePersonalDetails?.legalLastName;
}

export type {PersonalDetailsOnyxUpdate};

export {
getDisplayNameOrDefault,
getPersonalDetailForAccountID,
Expand Down
Loading
Loading