Skip to content

feat: update budget minor changes #5772

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
merged 5 commits into from
Apr 15, 2025
Merged

feat: update budget minor changes #5772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ad36dbe
feat: update languages
seungyeoneeee Apr 15, 2025
8791cd9
feat: add option about page-size of component `UserSelectDropdown`
seungyeoneeee Apr 15, 2025
9d5cc47
feat: update budget schema type
seungyeoneeee Apr 15, 2025
6ef0d37
feat: add budget_year filter to budget main page query
seungyeoneeee Apr 15, 2025
10cc444
feat: fix title about period number of chart
seungyeoneeee Apr 15, 2025
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
1 change: 1 addition & 0 deletions apps/web/src/api-clients/cost-analysis/budget/schema/api-verbs/create.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ export interface BudgetCreateParameters {
project_id?: string;
service_account_id?: string;
budget_manager_id?: string;
budget_year?: string;
}
4 changes: 3 additions & 1 deletion apps/web/src/common/modules/user/UserSelectDropdown.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ const props = withDefaults(defineProps<{
placeholder?: string;
excludedSelectedIds?: string[];
size?: 'sm'|'md';
pageSize?: number;
}>(), {
selectedId: undefined,
selectedIds: undefined,
Expand All @@ -73,6 +74,7 @@ const props = withDefaults(defineProps<{
placeholder: 'Select',
excludedSelectedIds: undefined,
size: 'md',
pageSize: 10,
});

const emit = defineEmits<{(event: 'update:selected-id', value?: string): void;
Expand Down Expand Up @@ -269,7 +271,6 @@ watch([() => props.selectedId, () => props.selectedIds], ([newUserId, newUserIds

<template>
<p-select-dropdown class="user-select-dropdown"
page-size="10"
show-select-marker
is-filterable
show-delete-all-button
Expand All @@ -286,6 +287,7 @@ watch([() => props.selectedId, () => props.selectedIds], ([newUserId, newUserIds
:placeholder="props.placeholder"
:block="props.block"
:size="props.size"
:page-size="props.pageSize"
@update:selected="handleUpdateSelectedUserItems"
>
<template v-if="props.appearanceType === 'stack'"
Expand Down
4 changes: 3 additions & 1 deletion apps/web/src/services/cost-explorer/components/BudgetLastThreeMonthCostTrendBarChart.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,9 @@ watch(() => budgetCreatePageState, async () => {
<p-pane-layout class="chart-wrapper p-4">
<p class="font-bold text-sm">
{{ $t('BILLING.COST_MANAGEMENT.BUDGET.FORM.CREATE.LAST_COST_TREND', {
count: Number(dayjs(budgetCreatePageState.endMonth[0], 'YYYY-MM').diff(dayjs(budgetCreatePageState.startMonth[0], 'YYYY-MM'), 'month') + 1),
count: budgetCreatePageState.startMonth.length > 0 && budgetCreatePageState.endMonth.length > 0
? Number(dayjs(budgetCreatePageState.endMonth[0], 'YYYY-MM').diff(dayjs(budgetCreatePageState.startMonth[0], 'YYYY-MM'), 'month') + 1)
: 3,
}) }}
</p>
<div ref="chartContext"
Expand Down
8 changes: 8 additions & 0 deletions apps/web/src/services/cost-explorer/components/BudgetMainList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,14 @@ const handleDeleteConfirm = async () => {
const getBudgetFilters = (): ApiFilter[] => {
const filters: ApiFilter[] = [];

if (state.query?.year && state.query?.year !== 'all') {
filters.push({
k: 'budget_year',
v: state.query?.year,
o: 'eq',
});
}

if (state.query?.cycle && state.query.cycle !== 'all') {
filters.push({
k: 'time_unit',
Expand Down
8 changes: 5 additions & 3 deletions apps/web/src/services/cost-explorer/components/BudgetMainToolset.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,11 @@ const storeState = reactive({

const state = reactive<BudgetMainToolsetState>({
yearList: [
{ name: 'nextYear', label: dayjs.utc().add(1, 'year').format('YYYY') },
{ name: 'thisYear', label: dayjs.utc().format('YYYY') },
{ name: 'lastYear', label: dayjs.utc().subtract(1, 'year').format('YYYY') },
{ name: 'all', label: 'All' },
{ type: 'divider', name: 'divider' },
{ name: dayjs.utc().add(1, 'year').format('YYYY'), label: dayjs.utc().add(1, 'year').format('YYYY') },
{ name: dayjs.utc().format('YYYY'), label: dayjs.utc().format('YYYY') },
{ name: dayjs.utc().subtract(1, 'year').format('YYYY'), label: dayjs.utc().subtract(1, 'year').format('YYYY') },
],
selectedYear: '',
budgetCycleList: [
Expand Down
6 changes: 3 additions & 3 deletions apps/web/src/services/cost-explorer/stores/budget-detail-page-store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ export const useBudgetDetailPageStore = defineStore('page-budget-detail', {
ErrorHandler.handleRequestError(e, '');
}
},
async updateBudgetNotifications(params: { budgetId: string; notifications: BudgetModel['notification'] }): Promise<void> {
async updateBudgetNotifications(params: BudgetSetNotificationParameters): Promise<void> {
try {
this.budgetData = await SpaceConnector.clientV2.costAnalysis.budget.setNotification<BudgetSetNotificationParameters, BudgetModel>({
notification: params.notifications,
budget_id: params.budgetId,
notification: params.notification,
budget_id: params.budget_id,
});
} catch (e) {
ErrorHandler.handleRequestError(e, '');
Expand Down
42 changes: 42 additions & 0 deletions packages/language-pack/console-translation-2.8.babel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10167,6 +10167,27 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>UPDATE_SUCCESS</name>
<definition_loaded>false</definition_loaded>
<description/>
<comment/>
<default_text/>
<translations>
<translation>
<language>en-US</language>
<approved>true</approved>
</translation>
<translation>
<language>ja-JP</language>
<approved>false</approved>
</translation>
<translation>
<language>ko-KR</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
</children>
</folder_node>
<concept_node>
Expand Down Expand Up @@ -13700,6 +13721,27 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>CREATE_SUCCESS</name>
<definition_loaded>false</definition_loaded>
<description/>
<comment/>
<default_text/>
<translations>
<translation>
<language>en-US</language>
<approved>true</approved>
</translation>
<translation>
<language>ja-JP</language>
<approved>false</approved>
</translation>
<translation>
<language>ko-KR</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>CUSTOM</name>
<definition_loaded>false</definition_loaded>
Expand Down
6 changes: 4 additions & 2 deletions packages/language-pack/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,8 @@
"EDIT": "Edit",
"NAME_INVALID_TEXT": "The name is either missing or already in use.",
"SERVICE_ACCOUNT_MANAGERS": "Service Account Managers",
"TITLE": "Base Information"
"TITLE": "Base Information",
"UPDATE_SUCCESS": "{data} successfully updated"
},
"BUDGETED": "Budgeted",
"BUDGET_NOTIFICATIONS": "Budget Notifications",
Expand Down Expand Up @@ -674,7 +675,7 @@
"FIXED_TERM": "Fixed term",
"INCRASE_BY_SPECIFIC_PERCENTAGE": "Increase by a specific % each month",
"INITIAL_AMOUNT": "Initial Amount",
"LAST_COST_TREND": "Last {{count}} Month Cost Trend",
"LAST_COST_TREND": "Last {count} Month Cost Trend",
"MONTHLY": "Monthly",
"MONTHLY_BUDGET_ALLOCATION": "Monthly Budget Allocation",
"MONTHLY_GROWTH_RATE": "Monthly Growth Rate",
Expand Down Expand Up @@ -721,6 +722,7 @@
"COST_TYPE": "Cost Type",
"CREATE": "Create",
"CREATE_BUDGET": "Create Budget",
"CREATE_SUCCESS": "Budget successfully created",
"CUSTOM": "Custom",
"DATA_SOURCE": "Data Source",
"DELETE": "Delete",
Expand Down
6 changes: 4 additions & 2 deletions packages/language-pack/ja.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,8 @@
"EDIT": "編集",
"NAME_INVALID_TEXT": "名前が入力されていないか、すでに使用されています。",
"SERVICE_ACCOUNT_MANAGERS": "サービスアカウント管理者",
"TITLE": "基本情報"
"TITLE": "基本情報",
"UPDATE_SUCCESS": "{data} が正常に更新されました"
},
"BUDGETED": "予算",
"BUDGET_NOTIFICATIONS": "予算に関するお知らせ",
Expand Down Expand Up @@ -674,7 +675,7 @@
"FIXED_TERM": "固定期間",
"INCRASE_BY_SPECIFIC_PERCENTAGE": "",
"INITIAL_AMOUNT": "",
"LAST_COST_TREND": "過去{{count}}か月のコスト推移",
"LAST_COST_TREND": "過去{count}か月のコスト推移",
"MONTHLY": "",
"MONTHLY_BUDGET_ALLOCATION": "",
"MONTHLY_GROWTH_RATE": "",
Expand Down Expand Up @@ -721,6 +722,7 @@
"COST_TYPE": "コストタイプ",
"CREATE": "予算作成",
"CREATE_BUDGET": "予算作成",
"CREATE_SUCCESS": "",
"CUSTOM": "カスタム",
"DATA_SOURCE": "データソース",
"DELETE": "削除",
Expand Down
6 changes: 4 additions & 2 deletions packages/language-pack/ko.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,8 @@
"EDIT": "편집",
"NAME_INVALID_TEXT": "이름을 입력하지 않았거나, 이미 존재하는 이름입니다.",
"SERVICE_ACCOUNT_MANAGERS": "서비스 어카운트 관리자",
"TITLE": "기본 정보"
"TITLE": "기본 정보",
"UPDATE_SUCCESS": "{data} 이(가) 성공적으로 업데이트되었습니다."
},
"BUDGETED": "예산",
"BUDGET_NOTIFICATIONS": "예산 사용 알림 설정",
Expand Down Expand Up @@ -674,7 +675,7 @@
"FIXED_TERM": "고정 예산",
"INCRASE_BY_SPECIFIC_PERCENTAGE": "",
"INITIAL_AMOUNT": "",
"LAST_COST_TREND": "최근 {{count}}개월 비용 추이",
"LAST_COST_TREND": "최근 {count}개월 비용 추이",
"MONTHLY": "",
"MONTHLY_BUDGET_ALLOCATION": "",
"MONTHLY_GROWTH_RATE": "",
Expand Down Expand Up @@ -721,6 +722,7 @@
"COST_TYPE": "비용 발생 기준",
"CREATE": "예산 생성",
"CREATE_BUDGET": "예산 생성",
"CREATE_SUCCESS": "",
"CUSTOM": "기간 선택",
"DATA_SOURCE": "데이터 소스",
"DELETE": "삭제",
Expand Down
Loading