From 18fccc9b7b026c55a12e9058450d481cc4bd5c55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=B4=EC=8A=B9=EC=97=B0?=
 <165753731+seungyeoneeee@users.noreply.github.com>
Date: Wed, 23 Apr 2025 16:31:13 +0900
Subject: [PATCH] chore(budget-qa): fix major & minor bug (#5805)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: fix major bug of costAnalaysis link as admin mode

Signed-off-by: 이승연 <sylee1274@mz.co.kr>

* fix: fix minor bug about alert recipients

Signed-off-by: 이승연 <sylee1274@mz.co.kr>

* fix: fix major bug about enterManually validation check

Signed-off-by: 이승연 <sylee1274@mz.co.kr>

---------

Signed-off-by: 이승연 <sylee1274@mz.co.kr>
---
 .../components/BudgetCreateStep2.vue            | 17 +++++++++++------
 .../components/BudgetDetailBaseInformation.vue  |  1 +
 .../cost-explorer/routes/admin/routes.ts        | 10 ++++++++++
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/apps/web/src/services/cost-explorer/components/BudgetCreateStep2.vue b/apps/web/src/services/cost-explorer/components/BudgetCreateStep2.vue
index 6a319af621..4ea3ba7fe6 100644
--- a/apps/web/src/services/cost-explorer/components/BudgetCreateStep2.vue
+++ b/apps/web/src/services/cost-explorer/components/BudgetCreateStep2.vue
@@ -335,15 +335,20 @@ watch(() => [
             state.isContinueAble = isInitialValid && isGrowthValid;
             return;
         } else if (budgetCreatePageState.selectedMonthlyBudgetAllocation === 'enterManually') {
-            const startDate = dayjs.utc(budgetCreatePageState.startMonth[0]);
-            const endDate = dayjs.utc(budgetCreatePageState.endMonth[0]);
-            const length = endDate.diff(startDate, 'month') + 1;
-            const valid = budgetCreatePageState.budgetEachDate.length === length
-                && budgetCreatePageState.budgetEachDate.every((v, idx) => isDateInRange(idx) && isValidPositiveNumber(v));
-            if (valid) {
+            const allValuesFilled = budgetCreatePageState.budgetEachDate.length === 12 && budgetCreatePageState.budgetEachDate
+                .every((v, idx) => {
+                    if (isDateInRange(idx)) {
+                        return isValidPositiveNumber(v);
+                    }
+                    return true; // skip validation for disabled months
+                });
+
+            if (allValuesFilled) {
                 state.isContinueAble = true;
                 return;
             }
+            state.isContinueAble = false;
+            return;
         }
         state.isContinueAble = false;
     }
diff --git a/apps/web/src/services/cost-explorer/components/BudgetDetailBaseInformation.vue b/apps/web/src/services/cost-explorer/components/BudgetDetailBaseInformation.vue
index 7fa9db7160..dedefc644f 100644
--- a/apps/web/src/services/cost-explorer/components/BudgetDetailBaseInformation.vue
+++ b/apps/web/src/services/cost-explorer/components/BudgetDetailBaseInformation.vue
@@ -411,6 +411,7 @@ watch(() => state.selectedBudgetManager, (nv, ov) => {
                             show-user-list
                             selection-type="multiple"
                             :selected-ids="data"
+                            :excluded-selected-ids="[budgetPageState.budgetData?.budget_manager_id ?? '']"
                             @update:selected-ids="handleSelectAlertRecipients"
                         />
                         <p-button v-if="!state.alertRecipientsEdit && !storeState.isAdminMode && hasReadWriteAccess"
diff --git a/apps/web/src/services/cost-explorer/routes/admin/routes.ts b/apps/web/src/services/cost-explorer/routes/admin/routes.ts
index fb97bc1716..4138b03a99 100644
--- a/apps/web/src/services/cost-explorer/routes/admin/routes.ts
+++ b/apps/web/src/services/cost-explorer/routes/admin/routes.ts
@@ -67,12 +67,22 @@ const adminCostExplorerRoutes: RouteConfig = {
                             } else if (to.params.dataSourceId && to.params.costQuerySetId) {
                                 next();
                             } else {
+                                const normalizedQuery = { ...to.query };
+                                if (normalizedQuery.project) {
+                                    normalizedQuery.project_id = normalizedQuery.project;
+                                    delete normalizedQuery.project;
+                                }
+                                if (normalizedQuery.service_account) {
+                                    normalizedQuery.service_account_id = normalizedQuery.service_account;
+                                    delete normalizedQuery.service_account;
+                                }
                                 next({
                                     name: ADMIN_COST_EXPLORER_ROUTE.COST_ANALYSIS.QUERY_SET._NAME,
                                     params: {
                                         dataSourceId: UNIFIED_COST_KEY,
                                         costQuerySetId: MANAGED_COST_QUERY_SET_IDS.MONTHLY_PRODUCT,
                                     },
+                                    query: normalizedQuery,
                                 });
                             }
                         } catch (e) {