Skip to content

fix: ensure order is preserved in Promise.all of adjustments #5922

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

Merged
yuda110 merged 2 commits into from
Jun 4, 2025
Merged

fix: ensure order is preserved in Promise.all of adjustments #5922

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59eaf0e
fix: ensure order is preserved in Promise.all of adjustments
yuda110 Jun 4, 2025
71a4e07
fix: fix adjustment change-order bug
yuda110 Jun 4, 2025
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
38 changes: 17 additions & 21 deletions apps/web/src/services/cost-explorer/components/AdvancedSettingsSetAdjustmentsOverlay.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,10 @@ const updateAdjustmentPolicy = async (policy: AdjustmentPolicyData, idx: number)
await reportAdjustmentPolicyAPI.update(newPolicy);
}
const newOrder = idx + 1;
if (oldPolicy?.order !== newOrder) {
await reportAdjustmentPolicyAPI.changeOrder({
report_adjustment_policy_id: policy.id,
order: newOrder,
});
}
await reportAdjustmentPolicyAPI.changeOrder({
report_adjustment_policy_id: policy.id,
order: newOrder,
});
};
const deleteAdjustment = async (deletedPolicyIds: string[]) => {
const deletedAdjustmentIds: string[] = originalAdjustments.value
Expand Down Expand Up @@ -205,12 +203,10 @@ const updateAdjustment = async (adjustment: AdjustmentData, idx: number) => {
await reportAdjustmentAPI.update(newAdjustment);
}
const newOrder = idx + 1;
if (oldAdjustment?.order !== newOrder) {
await reportAdjustmentAPI.changeOrder({
report_adjustment_id: adjustment.id,
order: newOrder,
});
}
await reportAdjustmentAPI.changeOrder({
report_adjustment_id: adjustment.id,
order: newOrder,
});
};

/* Event */
Expand All @@ -222,27 +218,27 @@ const handleSave = async () => {
try {
// CUD Adjustment Policy
const deletedPolicyIds = await deleteAdjustmentPolicy();
const policyPromises = formPolicies.value.map(async (policy, idx) => {
await formPolicies.value.reduce(async (promise, policy, idx) => {
await promise;
if (policy.id.startsWith('rap-')) {
return updateAdjustmentPolicy(policy, idx);
}
return createAdjustmentPolicy(policy, idx);
});
await Promise.all(policyPromises);
}, Promise.resolve());

// CUD Adjustment
await deleteAdjustment(deletedPolicyIds);
const adjustmentPromises = formPolicies.value.flatMap(async (policy) => {
await formPolicies.value.reduce(async (promise, policy) => {
await promise;
const adjustments = formAdjustments.value.filter((adjustment) => adjustment.policyId === policy.id);
return adjustments.map(async (adjustment, idx) => {
return adjustments.reduce(async (adjPromise, adjustment, idx) => {
await adjPromise;
if (adjustment.id.startsWith('ra-')) {
return updateAdjustment(adjustment, idx);
}
return createAdjustment(adjustment, idx);
});
});
const resolvedAdjustments = await Promise.all(adjustmentPromises);
await Promise.all(resolvedAdjustments.flat());
}, Promise.resolve());
Comment on lines +221 to +240
Copy link

Copilot AI Jun 4, 2025

Choose a reason for hiding this comment

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

[nitpick] Using reduce to iterate over adjustments for sequential promise resolution may obscure the intent; a for-of loop might provide clearer control flow, making the code easier to understand and maintain.

Copilot uses AI. Check for mistakes.
}, Promise.resolve());
Comment on lines +221 to +241
Copy link

Copilot AI Jun 4, 2025

Choose a reason for hiding this comment

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

[nitpick] Using the reduce method for chaining promises can be less intuitive; consider using an explicit for-of loop for sequential processing to improve readability and maintainability.

Copilot uses AI. Check for mistakes.

showSuccessMessage(i18n.t('COST_EXPLORER.ADVANCED_SETTINGS.ALT_S_SAVE_COST_REPORT_ADJUSTMENTS'), '');
} catch (error) {
Expand Down
Loading