feat: apply adjustment to report detail page #5887
Merged
Conversation
This file contains hidden or 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
Signed-off-by: yuda <yuda@megazone.com>
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
2 Skipped Deployments
|
|
@yuda110 is attempting to deploy a commit to the cloudforet Team on Vercel. A member of the Team first needs to authorize it. |
Contributor
|
🎉 @seungyeoneeee has been randomly selected as the reviewer! Please review. 🙏 |
There was a problem hiding this comment.
Pull Request Overview
This PR refactors the cost report detail page to compute and display adjustment data alongside existing provider/project breakdowns and updates the UI/styling accordingly.
- Refactored
tableStateto store raw data and derive provider, project, and product tables via computed properties - Introduced adjustment logic (
adjustedProviderData,adjustedProjectData) and updated templates to render adjusted entries - Simplified sections (removed service account table), tweaked styling for adjusted rows
Comments suppressed due to low confidence (1)
apps/web/src/common/pages/CostReportDetailPage.vue:66
- [nitpick] The name
CostReportAdjustedDataAnalyzeResultByProvideris verbose and misaligned with its values (arrays of{product, value}). Consider renaming to something likeProviderAdjustmentDataand updating the type definition to reflect the actual data shape.
type CostReportAdjustedDataAnalyzeResultByProvider = {
| const costByProductTableData = computed<CostReportDataAnalyzeResultByProduct>(() => getConvertedProductTableData(tableState.productRawData)); | ||
| const costByProviderTableData = computed<CostReportDataAnalyzeResult[]>(() => getSortedTableData(tableState.productRawData)); | ||
| const costByProjectTableData = computed<CostReportDataAnalyzeResult[]>(() => tableState.projectRawData.filter((d) => !d.is_adjusted)); | ||
| const adjustedProviderData = computed<CostReportAdjustedDataAnalyzeResultByProvider>(() => { |
There was a problem hiding this comment.
The type annotation CostReportAdjustedDataAnalyzeResultByProvider expects CostReportDataAnalyzeResult[], but the code assigns d.value_sum (an array of {product, value} objects). Adjust the type to match Array<{product: string; value: number}> or wrap the data into CostReportDataAnalyzeResult.
| return `${startDate} ~ ${endDate}`; | ||
| }), | ||
| totalCost: computed<number>(() => sum(tableState.costByProvider.map((d) => d._total_value_sum))), | ||
| totalCost: computed<number>(() => sum(costByProviderTableData.value.map((d) => d._total_value_sum))), |
There was a problem hiding this comment.
Since _total_value_sum is optional, consider coalescing to zero (d._total_value_sum ?? 0) before summing to avoid potential NaN results.
Suggested change
| totalCost: computed<number>(() => sum(costByProviderTableData.value.map((d) => d._total_value_sum))), | |
| totalCost: computed<number>(() => sum(costByProviderTableData.value.map((d) => d._total_value_sum ?? 0))), |
Comment on lines
+180
to
+189
| const adjustedProviderData = computed<CostReportAdjustedDataAnalyzeResultByProvider>(() => { | ||
| const results: CostReportAdjustedDataAnalyzeResultByProvider = {}; | ||
| const adjustedData = tableState.productRawData.filter((d) => d.is_adjusted); | ||
| adjustedData.forEach((d) => { | ||
| results[d.provider] = d.value_sum; | ||
| }); | ||
| return results; | ||
| }); | ||
| const adjustedProjectData = computed<AdjustmentProductData>(() => { | ||
| const adjustedData = tableState.projectRawData.filter((d) => d.is_adjusted); |
There was a problem hiding this comment.
[nitpick] Both adjustedProviderData and adjustedProjectData filter rawData by is_adjusted. Extract this filtering into a shared helper to reduce duplication and improve readability.
Suggested change
| const adjustedProviderData = computed<CostReportAdjustedDataAnalyzeResultByProvider>(() => { | |
| const results: CostReportAdjustedDataAnalyzeResultByProvider = {}; | |
| const adjustedData = tableState.productRawData.filter((d) => d.is_adjusted); | |
| adjustedData.forEach((d) => { | |
| results[d.provider] = d.value_sum; | |
| }); | |
| return results; | |
| }); | |
| const adjustedProjectData = computed<AdjustmentProductData>(() => { | |
| const adjustedData = tableState.projectRawData.filter((d) => d.is_adjusted); | |
| const getAdjustedData = (data: CostReportDataAnalyzeResult[]) => data.filter((d) => d.is_adjusted); | |
| const adjustedProviderData = computed<CostReportAdjustedDataAnalyzeResultByProvider>(() => { | |
| const results: CostReportAdjustedDataAnalyzeResultByProvider = {}; | |
| const adjustedData = getAdjustedData(tableState.productRawData); | |
| adjustedData.forEach((d) => { | |
| results[d.provider] = d.value_sum; | |
| }); | |
| return results; | |
| }); | |
| const adjustedProjectData = computed<AdjustmentProductData>(() => { | |
| const adjustedData = getAdjustedData(tableState.projectRawData); |
yuda110
added a commit
that referenced
this pull request
May 29, 2025
Signed-off-by: yuda <yuda@megazone.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Skip Review (optional)
style,chore,ci,test,docs)Description (optional)
Things to Talk About (optional)