Skip to content

feat: show all provider in 'Details By Product' section #5932

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 1 commit into from
Jun 5, 2025
+10 −3
Merged

feat: show all provider in 'Details By Product' section #5932

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions apps/web/src/common/pages/CostReportDetailPage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,12 @@ const getConvertedProductTableData = (rawData: CostReportDataAnalyzeResult[]): C
});
return results;
};
const getFormattedProductTotalValue = (provider: string, serviceAccount: string): string => {
const productData = state.productRawData.find((d) => d.provider === provider && d.service_account_name === serviceAccount);
return currencyMoneyFormatter(productData?._total_value_sum ?? 0, numberFormatterOption.value) ?? '';
};


const drawChart = () => {
state.chartData = costByProviderTableData.value.map((d) => ({
name: d.provider,
Expand Down Expand Up @@ -496,7 +502,7 @@ const handleCollapseAll = () => {
{{ $t('COMMON.COST_REPORT.COLLAPSE_ALL') }}
</p-button>
</div>
<div v-for="([provider, providerData], idx) in Object.entries(costByProductTableData)"
<div v-for="({ provider }, idx) in state.providerRawData"
:key="`${provider}-${idx}`"
class="mb-6"
>
Expand All @@ -505,7 +511,7 @@ const handleCollapseAll = () => {
:provider-icon-src="storeState.providers[provider]?.icon"
class="table-header"
/>
<div v-for="([serviceAccount, productData], pIdx) in Object.entries(providerData)"
<div v-for="([serviceAccount, productData], pIdx) in Object.entries(costByProductTableData[provider] ?? {})"
:key="`${provider}-${serviceAccount}-${pIdx}`"
>
<div class="service-account-collapsible-wrapper"
Expand All @@ -518,7 +524,7 @@ const handleCollapseAll = () => {
{{ serviceAccount === 'Unknown' ? ETC : serviceAccount }}
</div>
<div class="right-part text-paragraph-md">
{{ currencyMoneyFormatter(sum(Object.values(productData).map((d) => d.value)), numberFormatterOption) }}
{{ getFormattedProductTotalValue(provider, serviceAccount) }}
</div>
</div>
<p-data-table v-if="!state.collapsedState[`${provider}-${serviceAccount}`]"
Expand Down Expand Up @@ -708,6 +714,7 @@ const handleCollapseAll = () => {
.table-header {
@apply bg-gray-100;
padding: 0.75rem 1rem;
margin-bottom: 0.25rem;
}
.service-account-collapsible-wrapper {
@apply flex items-center justify-between border-b border-gray-300;
Expand Down
Loading