Skip to content
Merged
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
10 changes: 4 additions & 6 deletions src/libs/actions/OnyxDerived/configs/cardFeedErrors.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {getCombinedCardFeedsFromAllFeeds, getWorkspaceCardFeedsStatus} from '@libs/CardFeedUtils';
import {filterInactiveCards, getCardFeedWithDomainID, isBrokenConnectionPastDismissThreshold, isCardConnectionBroken, isPersonalCard} from '@libs/CardUtils';
import {filterAllInactiveCards, forEachAssignedCard, getCardFeedWithDomainID, isBrokenConnectionPastDismissThreshold, isCardConnectionBroken, isPersonalCard} from '@libs/CardUtils';

import createOnyxDerivedValueConfig from '@userActions/OnyxDerived/createOnyxDerivedValueConfig';

Expand Down Expand Up @@ -172,18 +172,16 @@ export default createOnyxDerivedValueConfig({
}
}

for (const [key, workspaceCardFeedCards] of Object.entries(allWorkspaceCards ?? {})) {
const workspaceCards = allWorkspaceCards ?? {};
for (const key of Object.keys(workspaceCards)) {
const keyParts = key.split(ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST);
const workspaceCardParamParts = keyParts.at(1)?.split('_');

if (!workspaceCardParamParts) {
continue;
}

const {cardList, ...filteredCards} = filterInactiveCards(workspaceCardFeedCards);
for (const card of Object.values(filteredCards)) {
addErrorsForCard(card);
}
forEachAssignedCard(filterAllInactiveCards(workspaceCards[key]), addErrorsForCard);
}

allFeedsState.shouldShowRBR = getShouldShowRBR(allFeedsState);
Expand Down
24 changes: 15 additions & 9 deletions src/libs/actions/OnyxDerived/configs/reportAttributes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ const displayNameSignature = (details: PersonalDetails | null): string => JSON.s

const snapshotDisplayNames = (personalDetails: PersonalDetailsList): Record<string, string> => {
const snapshot: Record<string, string> = {};
for (const [key, value] of Object.entries(personalDetails)) {
snapshot[key] = displayNameSignature(value);
for (const key of Object.keys(personalDetails)) {
snapshot[key] = displayNameSignature(personalDetails[key]);
}
return snapshot;
};
Expand Down Expand Up @@ -112,8 +112,8 @@ const getDisplayNameChanges = (personalDetails: OnyxEntry<PersonalDetailsList>):
const changedAccountIDs = new Set<number>();

// Build the new snapshot and compare it against the old one in the same loop.
for (const [key, value] of Object.entries(personalDetails)) {
const signature = displayNameSignature(value);
for (const key of Object.keys(personalDetails)) {
const signature = displayNameSignature(personalDetails[key]);
nextSnapshot[key] = signature;
if (hadBaseline && signature !== previousDisplayNames[key]) {
changedAccountIDs.add(Number(key));
Expand Down Expand Up @@ -269,7 +269,8 @@ export default createOnyxDerivedValueConfig({
}
}
if (changedPolicyIDs.size > 0) {
for (const [reportKey, report] of Object.entries(reports ?? {})) {
for (const reportKey of Object.keys(reports ?? {})) {
const report = reports?.[reportKey];
if (!report) {
continue;
}
Expand Down Expand Up @@ -332,7 +333,8 @@ export default createOnyxDerivedValueConfig({
// locale change); in that case useIncrementalUpdates is false and the full scan below handles it.
const personalDetailsChangedReportKeys: string[] = [];
if (displayNameChanges instanceof Set && useIncrementalUpdates) {
for (const [reportKey, report] of Object.entries(reports)) {
for (const reportKey of Object.keys(reports)) {
const report = reports[reportKey];
if (report && reportReferencesAccountIDs(report, displayNameChanges)) {
personalDetailsChangedReportKeys.push(reportKey);
}
Expand Down Expand Up @@ -417,9 +419,13 @@ export default createOnyxDerivedValueConfig({
}
if (policyTagsUpdates) {
const changedPolicyIDs = new Set(Object.keys(policyTagsUpdates).map((key) => key.replace(ONYXKEYS.COLLECTION.POLICY_TAGS, '')));
const affectedReportKeys = Object.values(reports)
.filter((report) => !!report?.policyID && changedPolicyIDs.has(report.policyID))
.map((report) => `${ONYXKEYS.COLLECTION.REPORT}${report?.reportID}`);
const affectedReportKeys: string[] = [];
for (const report of Object.values(reports)) {
if (!report?.policyID || !changedPolicyIDs.has(report.policyID)) {
continue;
}
affectedReportKeys.push(`${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`);
}
dataToIterate.push(...prepareReportKeys(affectedReportKeys));
}
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@ export default createOnyxDerivedValueConfig({
const lastActions: SortedReportActionsDerivedValue['lastActions'] = {};
const transactionThreadIDs: SortedReportActionsDerivedValue['transactionThreadIDs'] = {};

for (const [key, actions] of Object.entries(allReportActions)) {
for (const key of Object.keys(allReportActions)) {
const actions = allReportActions[key];
if (!actions) {
continue;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,17 @@ export default createOnyxDerivedValueConfig({
if (sessionUpdates) {
const result: VisibleReportActionsDerivedValue = {};

for (const [reportActionsKey, reportActions] of Object.entries(allReportActions)) {
for (const reportActionsKey of Object.keys(allReportActions)) {
const reportActions = allReportActions[reportActionsKey];
if (!reportActions) {
continue;
}

const reportID = reportActionsKey.replace(ONYXKEYS.COLLECTION.REPORT_ACTIONS, '');
const reportVisibility = getOrCreateReportVisibilityRecord(result, reportID, clonedReportIDs);

for (const [actionID, action] of Object.entries(reportActions)) {
for (const actionID of Object.keys(reportActions)) {
const action = reportActions[actionID];
if (action) {
if (actionID !== action.reportActionID) {
continue;
Expand Down
Loading