Skip to content

Commit 06a17b3

Browse files
seungyeoneeeeseungyeoneeee
authored
feat: update budget minor changes (#5772)
* feat: update languages Signed-off-by: 이승연 <[email protected]> * feat: add option about page-size of component `UserSelectDropdown` Signed-off-by: 이승연 <[email protected]> * feat: update budget schema type Signed-off-by: 이승연 <[email protected]> * feat: add budget_year filter to budget main page query Signed-off-by: 이승연 <[email protected]> * feat: fix title about period number of chart Signed-off-by: 이승연 <[email protected]> --------- Signed-off-by: 이승연 <[email protected]>
1 parent 8aa3d34 commit 06a17b3

File tree

10 files changed

+77
-14
lines changed

10 files changed

+77
-14
lines changed

Diff for: ‎apps/web/src/api-clients/cost-analysis/budget/schema/api-verbs/create.ts

+1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,5 @@ export interface BudgetCreateParameters {
2121
project_id?: string;
2222
service_account_id?: string;
2323
budget_manager_id?: string;
24+
budget_year?: string;
2425
}

Diff for: ‎apps/web/src/common/modules/user/UserSelectDropdown.vue

+3-1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ const props = withDefaults(defineProps<{
5353
placeholder?: string;
5454
excludedSelectedIds?: string[];
5555
size?: 'sm'|'md';
56+
pageSize?: number;
5657
}>(), {
5758
selectedId: undefined,
5859
selectedIds: undefined,
@@ -73,6 +74,7 @@ const props = withDefaults(defineProps<{
7374
placeholder: 'Select',
7475
excludedSelectedIds: undefined,
7576
size: 'md',
77+
pageSize: 10,
7678
});
7779
7880
const emit = defineEmits<{(event: 'update:selected-id', value?: string): void;
@@ -269,7 +271,6 @@ watch([() => props.selectedId, () => props.selectedIds], ([newUserId, newUserIds
269271
270272
<template>
271273
<p-select-dropdown class="user-select-dropdown"
272-
page-size="10"
273274
show-select-marker
274275
is-filterable
275276
show-delete-all-button
@@ -286,6 +287,7 @@ watch([() => props.selectedId, () => props.selectedIds], ([newUserId, newUserIds
286287
:placeholder="props.placeholder"
287288
:block="props.block"
288289
:size="props.size"
290+
:page-size="props.pageSize"
289291
@update:selected="handleUpdateSelectedUserItems"
290292
>
291293
<template v-if="props.appearanceType === 'stack'"

Diff for: ‎apps/web/src/services/cost-explorer/components/BudgetLastThreeMonthCostTrendBarChart.vue

+3-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,9 @@ watch(() => budgetCreatePageState, async () => {
159159
<p-pane-layout class="chart-wrapper p-4">
160160
<p class="font-bold text-sm">
161161
{{ $t('BILLING.COST_MANAGEMENT.BUDGET.FORM.CREATE.LAST_COST_TREND', {
162-
count: Number(dayjs(budgetCreatePageState.endMonth[0], 'YYYY-MM').diff(dayjs(budgetCreatePageState.startMonth[0], 'YYYY-MM'), 'month') + 1),
162+
count: budgetCreatePageState.startMonth.length > 0 && budgetCreatePageState.endMonth.length > 0
163+
? Number(dayjs(budgetCreatePageState.endMonth[0], 'YYYY-MM').diff(dayjs(budgetCreatePageState.startMonth[0], 'YYYY-MM'), 'month') + 1)
164+
: 3,
163165
}) }}
164166
</p>
165167
<div ref="chartContext"

Diff for: ‎apps/web/src/services/cost-explorer/components/BudgetMainList.vue

+8
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,14 @@ const handleDeleteConfirm = async () => {
234234
const getBudgetFilters = (): ApiFilter[] => {
235235
const filters: ApiFilter[] = [];
236236
237+
if (state.query?.year && state.query?.year !== 'all') {
238+
filters.push({
239+
k: 'budget_year',
240+
v: state.query?.year,
241+
o: 'eq',
242+
});
243+
}
244+
237245
if (state.query?.cycle && state.query.cycle !== 'all') {
238246
filters.push({
239247
k: 'time_unit',

Diff for: ‎apps/web/src/services/cost-explorer/components/BudgetMainToolset.vue

+5-3
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,11 @@ const storeState = reactive({
4646
4747
const state = reactive<BudgetMainToolsetState>({
4848
yearList: [
49-
{ name: 'nextYear', label: dayjs.utc().add(1, 'year').format('YYYY') },
50-
{ name: 'thisYear', label: dayjs.utc().format('YYYY') },
51-
{ name: 'lastYear', label: dayjs.utc().subtract(1, 'year').format('YYYY') },
49+
{ name: 'all', label: 'All' },
50+
{ type: 'divider', name: 'divider' },
51+
{ name: dayjs.utc().add(1, 'year').format('YYYY'), label: dayjs.utc().add(1, 'year').format('YYYY') },
52+
{ name: dayjs.utc().format('YYYY'), label: dayjs.utc().format('YYYY') },
53+
{ name: dayjs.utc().subtract(1, 'year').format('YYYY'), label: dayjs.utc().subtract(1, 'year').format('YYYY') },
5254
],
5355
selectedYear: '',
5456
budgetCycleList: [

Diff for: ‎apps/web/src/services/cost-explorer/stores/budget-detail-page-store.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ export const useBudgetDetailPageStore = defineStore('page-budget-detail', {
4343
ErrorHandler.handleRequestError(e, '');
4444
}
4545
},
46-
async updateBudgetNotifications(params: { budgetId: string; notifications: BudgetModel['notification'] }): Promise<void> {
46+
async updateBudgetNotifications(params: BudgetSetNotificationParameters): Promise<void> {
4747
try {
4848
this.budgetData = await SpaceConnector.clientV2.costAnalysis.budget.setNotification<BudgetSetNotificationParameters, BudgetModel>({
49-
notification: params.notifications,
50-
budget_id: params.budgetId,
49+
notification: params.notification,
50+
budget_id: params.budget_id,
5151
});
5252
} catch (e) {
5353
ErrorHandler.handleRequestError(e, '');

Diff for: ‎packages/language-pack/console-translation-2.8.babel

+42
Original file line numberDiff line numberDiff line change
@@ -10167,6 +10167,27 @@
1016710167
</translation>
1016810168
</translations>
1016910169
</concept_node>
10170+
<concept_node>
10171+
<name>UPDATE_SUCCESS</name>
10172+
<definition_loaded>false</definition_loaded>
10173+
<description/>
10174+
<comment/>
10175+
<default_text/>
10176+
<translations>
10177+
<translation>
10178+
<language>en-US</language>
10179+
<approved>true</approved>
10180+
</translation>
10181+
<translation>
10182+
<language>ja-JP</language>
10183+
<approved>false</approved>
10184+
</translation>
10185+
<translation>
10186+
<language>ko-KR</language>
10187+
<approved>false</approved>
10188+
</translation>
10189+
</translations>
10190+
</concept_node>
1017010191
</children>
1017110192
</folder_node>
1017210193
<concept_node>
@@ -13700,6 +13721,27 @@
1370013721
</translation>
1370113722
</translations>
1370213723
</concept_node>
13724+
<concept_node>
13725+
<name>CREATE_SUCCESS</name>
13726+
<definition_loaded>false</definition_loaded>
13727+
<description/>
13728+
<comment/>
13729+
<default_text/>
13730+
<translations>
13731+
<translation>
13732+
<language>en-US</language>
13733+
<approved>true</approved>
13734+
</translation>
13735+
<translation>
13736+
<language>ja-JP</language>
13737+
<approved>false</approved>
13738+
</translation>
13739+
<translation>
13740+
<language>ko-KR</language>
13741+
<approved>false</approved>
13742+
</translation>
13743+
</translations>
13744+
</concept_node>
1370313745
<concept_node>
1370413746
<name>CUSTOM</name>
1370513747
<definition_loaded>false</definition_loaded>

Diff for: ‎packages/language-pack/en.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,8 @@
535535
"EDIT": "Edit",
536536
"NAME_INVALID_TEXT": "The name is either missing or already in use.",
537537
"SERVICE_ACCOUNT_MANAGERS": "Service Account Managers",
538-
"TITLE": "Base Information"
538+
"TITLE": "Base Information",
539+
"UPDATE_SUCCESS": "{data} successfully updated"
539540
},
540541
"BUDGETED": "Budgeted",
541542
"BUDGET_NOTIFICATIONS": "Budget Notifications",
@@ -674,7 +675,7 @@
674675
"FIXED_TERM": "Fixed term",
675676
"INCRASE_BY_SPECIFIC_PERCENTAGE": "Increase by a specific % each month",
676677
"INITIAL_AMOUNT": "Initial Amount",
677-
"LAST_COST_TREND": "Last {{count}} Month Cost Trend",
678+
"LAST_COST_TREND": "Last {count} Month Cost Trend",
678679
"MONTHLY": "Monthly",
679680
"MONTHLY_BUDGET_ALLOCATION": "Monthly Budget Allocation",
680681
"MONTHLY_GROWTH_RATE": "Monthly Growth Rate",
@@ -721,6 +722,7 @@
721722
"COST_TYPE": "Cost Type",
722723
"CREATE": "Create",
723724
"CREATE_BUDGET": "Create Budget",
725+
"CREATE_SUCCESS": "Budget successfully created",
724726
"CUSTOM": "Custom",
725727
"DATA_SOURCE": "Data Source",
726728
"DELETE": "Delete",

Diff for: ‎packages/language-pack/ja.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,8 @@
535535
"EDIT": "編集",
536536
"NAME_INVALID_TEXT": "名前が入力されていないか、すでに使用されています。",
537537
"SERVICE_ACCOUNT_MANAGERS": "サービスアカウント管理者",
538-
"TITLE": "基本情報"
538+
"TITLE": "基本情報",
539+
"UPDATE_SUCCESS": "{data} が正常に更新されました"
539540
},
540541
"BUDGETED": "予算",
541542
"BUDGET_NOTIFICATIONS": "予算に関するお知らせ",
@@ -674,7 +675,7 @@
674675
"FIXED_TERM": "固定期間",
675676
"INCRASE_BY_SPECIFIC_PERCENTAGE": "",
676677
"INITIAL_AMOUNT": "",
677-
"LAST_COST_TREND": "過去{{count}}か月のコスト推移",
678+
"LAST_COST_TREND": "過去{count}か月のコスト推移",
678679
"MONTHLY": "",
679680
"MONTHLY_BUDGET_ALLOCATION": "",
680681
"MONTHLY_GROWTH_RATE": "",
@@ -721,6 +722,7 @@
721722
"COST_TYPE": "コストタイプ",
722723
"CREATE": "予算作成",
723724
"CREATE_BUDGET": "予算作成",
725+
"CREATE_SUCCESS": "",
724726
"CUSTOM": "カスタム",
725727
"DATA_SOURCE": "データソース",
726728
"DELETE": "削除",

Diff for: ‎packages/language-pack/ko.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,8 @@
535535
"EDIT": "편집",
536536
"NAME_INVALID_TEXT": "이름을 입력하지 않았거나, 이미 존재하는 이름입니다.",
537537
"SERVICE_ACCOUNT_MANAGERS": "서비스 어카운트 관리자",
538-
"TITLE": "기본 정보"
538+
"TITLE": "기본 정보",
539+
"UPDATE_SUCCESS": "{data} 이(가) 성공적으로 업데이트되었습니다."
539540
},
540541
"BUDGETED": "예산",
541542
"BUDGET_NOTIFICATIONS": "예산 사용 알림 설정",
@@ -674,7 +675,7 @@
674675
"FIXED_TERM": "고정 예산",
675676
"INCRASE_BY_SPECIFIC_PERCENTAGE": "",
676677
"INITIAL_AMOUNT": "",
677-
"LAST_COST_TREND": "최근 {{count}}개월 비용 추이",
678+
"LAST_COST_TREND": "최근 {count}개월 비용 추이",
678679
"MONTHLY": "",
679680
"MONTHLY_BUDGET_ALLOCATION": "",
680681
"MONTHLY_GROWTH_RATE": "",
@@ -721,6 +722,7 @@
721722
"COST_TYPE": "비용 발생 기준",
722723
"CREATE": "예산 생성",
723724
"CREATE_BUDGET": "예산 생성",
725+
"CREATE_SUCCESS": "",
724726
"CUSTOM": "기간 선택",
725727
"DATA_SOURCE": "데이터 소스",
726728
"DELETE": "삭제",

0 commit comments

Comments
 (0)