From 0eb92a6e573252c4c7720f00774cfc86da375fbd Mon Sep 17 00:00:00 2001
From: yuda <yuda@megazone.com>
Date: Thu, 5 Jun 2025 08:50:42 +0900
Subject: [PATCH 1/2] feat: delete `is_confirmed` filter from cost report
 analyze API

Signed-off-by: yuda <yuda@megazone.com>
---
 apps/web/src/common/pages/CostReportDetailPage.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/web/src/common/pages/CostReportDetailPage.vue b/apps/web/src/common/pages/CostReportDetailPage.vue
index fc8d542813..b79d2d1ec4 100644
--- a/apps/web/src/common/pages/CostReportDetailPage.vue
+++ b/apps/web/src/common/pages/CostReportDetailPage.vue
@@ -254,7 +254,6 @@ const fetchReportData = async () => {
 const fetchAnalyzeData = async (_groupBy: string[], fieldGroup?: string[]):Promise<AnalyzeResponse<CostReportDataAnalyzeResult>|undefined> => {
     try {
         return await SpaceConnector.clientV2.costAnalysis.costReportData.analyze<CostReportDataAnalyzeParameters, AnalyzeResponse<CostReportDataAnalyzeResult>>({
-            is_confirmed: true,
             query: {
                 group_by: _groupBy,
                 fields: {

From bb70b52fb39d1b2934c1ce540db41966d8cf9fcc Mon Sep 17 00:00:00 2001
From: yuda <yuda@megazone.com>
Date: Thu, 5 Jun 2025 08:51:43 +0900
Subject: [PATCH 2/2] fix: show workspace name at cost reports tab (admin mode)

Signed-off-by: yuda <yuda@megazone.com>
---
 .../components/CostReportReportsTab.vue       | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/apps/web/src/services/cost-explorer/components/CostReportReportsTab.vue b/apps/web/src/services/cost-explorer/components/CostReportReportsTab.vue
index 317e97c731..2d1b969d34 100644
--- a/apps/web/src/services/cost-explorer/components/CostReportReportsTab.vue
+++ b/apps/web/src/services/cost-explorer/components/CostReportReportsTab.vue
@@ -5,7 +5,7 @@ import {
 
 import dayjs from 'dayjs';
 
-import { makeDistinctValueHandler } from '@cloudforet/core-lib/component-util/query-search';
+import { makeDistinctValueHandler, makeReferenceValueHandler } from '@cloudforet/core-lib/component-util/query-search';
 import { setApiQueryWithToolboxOptions } from '@cloudforet/core-lib/component-util/toolbox';
 import type { ConsoleFilter } from '@cloudforet/core-lib/query/type';
 import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper';
@@ -20,6 +20,8 @@ import { i18n } from '@/translations';
 import { useAppContextStore } from '@/store/app-context/app-context-store';
 import { CURRENCY_SYMBOL } from '@/store/display/constant';
 import type { Currency } from '@/store/display/type';
+import { useAllReferenceStore } from '@/store/reference/all-reference-store';
+import type { WorkspaceReferenceMap } from '@/store/reference/workspace-reference-store';
 
 import { copyAnyData } from '@/lib/helper/copy-helper';
 import { currencyMoneyFormatter } from '@/lib/helper/currency-helper';
@@ -33,10 +35,14 @@ import CostReportResendModal from '@/services/cost-explorer/components/CostRepor
 import { useCostReportPageStore } from '@/services/cost-explorer/stores/cost-report-page-store';
 
 
+const allReferenceStore = useAllReferenceStore();
 const costReportPageStore = useCostReportPageStore();
 const costReportPageState = costReportPageStore.state;
 const appContextStore = useAppContextStore();
 
+const isAdminMode = computed<boolean>(() => appContextStore.getters.isAdminMode);
+const workspaces = computed<WorkspaceReferenceMap>(() => allReferenceStore.getters.workspace);
+
 const state = reactive({
     currency: computed(() => costReportPageState.costReportConfig?.currency || 'KRW' as Currency),
     periodMenuItems: computed<MenuItem[]>(() => {
@@ -63,7 +69,7 @@ const tableState = reactive({
     field: [
         { label: 'Issue Date', name: 'issue_date' },
         { label: 'Report Number', name: 'report_number' },
-        { label: 'Workspace', name: 'workspace_name' },
+        ...(isAdminMode.value ? [{ label: 'Workspace', name: 'workspace_id' }] : []),
         { label: 'Cost', name: 'cost', textAlign: 'right' },
         { label: ' ', name: 'extra' },
     ],
@@ -73,16 +79,16 @@ const tableState = reactive({
             items: [
                 { name: 'issue_date', label: 'Issue Date' },
                 { name: 'report_number', label: 'Report Number' },
-                { name: 'workspace_name', label: 'Workspace' },
+                { name: 'workspace_id', label: 'Workspace' },
             ],
         }] as KeyItemSet[],
     valueHandlerMap: {
         issue_date: makeDistinctValueHandler('cost_analysis.CostReport', 'issue_date', 'string', [{ k: 'status', v: 'SUCCESS', o: 'eq' }]),
         report_number: makeDistinctValueHandler('cost_analysis.CostReport', 'report_number', 'string', [{ k: 'status', v: 'SUCCESS', o: 'eq' }]),
-        workspace_name: makeDistinctValueHandler('cost_analysis.CostReport', 'workspace_name', 'string', [{ k: 'status', v: 'SUCCESS', o: 'eq' }]),
+        workspace_id: makeReferenceValueHandler('identity.Workspace'),
     },
 });
-const isAdminMode = computed<boolean>(() => appContextStore.getters.isAdminMode);
+
 
 
 const costReportListApiQueryHelper = new ApiQueryHelper()
@@ -251,6 +257,9 @@ watch(() => costReportPageState.activeTab, (activeTab) => {
                     </template>
                 </p-heading-layout>
             </template>
+            <template #col-workspace_id-format="{value}">
+                {{ workspaces[value]?.name || value }}
+            </template>
             <template #col-issue_date-format="{value}">
                 <div class="date-text">
                     {{ value }}