Skip to content

chore(budget-qa): fix critical & major bugs #5803

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
seungyeoneeee merged 4 commits into from
Apr 23, 2025
Merged

chore(budget-qa): fix critical & major bugs #5803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1b47d4d
Merge branch 'develop' into feature-service-account-budget
seungyeoneeee Apr 22, 2025
0870bc4
chore(budget-qa): fix critical & major & minor & trivial bugs (#5799)
seungyeoneeee Apr 22, 2025
846411f
chore(budget-qa): fix critical & minor bug (#5800)
seungyeoneeee Apr 22, 2025
6e08d4c
fix: fix major bug of budget create error (#5802)
seungyeoneeee Apr 23, 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
164 changes: 103 additions & 61 deletions apps/web/src/services/cost-explorer/components/BudgetCreateStep2.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@ const state = reactive({
existingBudgetUsageList: [] as BudgetUsageModel[],
});


const isCycleEnabled = computed(() => budgetCreatePageState.startMonth.length > 0
&& budgetCreatePageState.endMonth.length > 0
&& state.existingBudgetUsageList.length === 0);

const emit = defineEmits<{(e: 'click-next'): void}>();

const isDateInRange = (index: number) => {
Expand Down Expand Up @@ -139,10 +144,24 @@ const fetchBudgetUsage = async (params: BudgetUsageListParameters) => {
watch([() => budgetCreatePageState.startMonth, () => budgetCreatePageState.endMonth], async () => {
if (budgetCreatePageState.startMonth.length > 0 && budgetCreatePageState.endMonth.length > 0) {
await fetchBudgetUsage({
project_id: budgetCreatePageState.project,
service_account_id: budgetCreatePageState.scope.serviceAccount,
query: {
filter: [
budgetCreatePageState.scope.serviceAccount
? {
k: 'service_account_id',
v: budgetCreatePageState.scope.serviceAccount,
o: 'eq',
}
: {
k: 'service_account_id',
v: [null, ''],
o: 'in',
},
{
k: 'project_id',
v: budgetCreatePageState.project,
o: 'eq',
},
{
k: 'date',
v: dayjs.utc(budgetCreatePageState.startMonth[0]).format('YYYY-MM'),
Expand Down Expand Up @@ -176,6 +195,25 @@ watch(() => [budgetCreatePageState.startMonth, budgetCreatePageState.endMonth],
}
}, { immediate: true });

watch(() => budgetCreatePageState.selectedMonthlyBudgetAllocation, (nv, ov) => {
if (nv !== ov) {
if (nv === 'applySameAmount') {
budgetCreatePageStore.setInitialAmount(undefined);
budgetCreatePageStore.setMonthlyGrowthRate(undefined);
budgetCreatePageState.budgetEachDate = Array(12).fill('');
} else if (nv === 'increaseBySpecificPercentage') {
budgetCreatePageStore.setBudgetAppliedSameAmount(undefined);
budgetCreatePageState.budgetEachDate = Array(12).fill('');
} else if (nv === 'enterManually') {
budgetCreatePageStore.setBudgetAppliedSameAmount(undefined);
budgetCreatePageStore.setInitialAmount(undefined);
budgetCreatePageStore.setMonthlyGrowthRate(undefined);
}

budgetCreatePageStore.setPlannedLimits([]);
}
}, { immediate: true });

watch(() => [
budgetCreatePageState.selectedMonthlyBudgetAllocation,
budgetCreatePageState.budgetAppliedSameAmount,
Expand All @@ -185,53 +223,59 @@ watch(() => [
budgetCreatePageState.startMonth,
budgetCreatePageState.endMonth,
], () => {
const planned_limits: any[] = [];

if (budgetCreatePageState.startMonth.length === 0 || budgetCreatePageState.endMonth.length === 0) {
budgetCreatePageStore.setPlannedLimits([]);
return;
}

const planned_limits: any = [];
const startDate = dayjs.utc(budgetCreatePageState.startMonth[0]);
const endDate = dayjs.utc(budgetCreatePageState.endMonth[0]);
let currentDate = startDate;

const dateDiff = endDate.diff(startDate, 'month') + 1;

if (budgetCreatePageState.selectedMonthlyBudgetAllocation === 'applySameAmount') {
while (currentDate.isSameOrBefore(endDate, 'month') && budgetCreatePageState.budgetAppliedSameAmount
&& budgetCreatePageState.budgetAppliedSameAmount > 0) {
planned_limits.push({
date: currentDate.format('YYYY-MM'),
limit: budgetCreatePageState.budgetAppliedSameAmount,
});
currentDate = currentDate.add(1, 'month');
if (isValidPositiveNumber(budgetCreatePageState.budgetAppliedSameAmount)) {
while (currentDate.isSameOrBefore(endDate, 'month')) {
planned_limits.push({
date: currentDate.format('YYYY-MM'),
limit: Number(budgetCreatePageState.budgetAppliedSameAmount),
});
currentDate = currentDate.add(1, 'month');
}
}
} else if (budgetCreatePageState.selectedMonthlyBudgetAllocation === 'increaseBySpecificPercentage'
&& budgetCreatePageState.initialAmount && budgetCreatePageState.monthlyGrowthRate
) {
let currentAmount = budgetCreatePageState.initialAmount;
while (currentDate.isSameOrBefore(endDate, 'month')) {
planned_limits.push({
date: currentDate.format('YYYY-MM'),
limit: Math.round(currentAmount),
});
currentAmount *= (1 + ((budgetCreatePageState.monthlyGrowthRate || 0) / 100));
currentDate = currentDate.add(1, 'month');
} else if (budgetCreatePageState.selectedMonthlyBudgetAllocation === 'increaseBySpecificPercentage') {
if (isValidPositiveNumber(budgetCreatePageState.initialAmount) && isValidPositiveNumber(budgetCreatePageState.monthlyGrowthRate)) {
let currentAmount = budgetCreatePageState.initialAmount;
while (currentDate.isSameOrBefore(endDate, 'month')) {
planned_limits.push({
date: currentDate.format('YYYY-MM'),
limit: Math.round(currentAmount),
});
currentAmount *= (1 + (budgetCreatePageState.monthlyGrowthRate / 100));
currentDate = currentDate.add(1, 'month');
}
}
} else if (budgetCreatePageState.selectedMonthlyBudgetAllocation === 'enterManually'
&& budgetCreatePageState.budgetEachDate.length === Number(endDate.month() - startDate.month() + 1)) {
const monthIndices = Array.from({ length: 12 }, (_, i) => i);
monthIndices.forEach((i) => {
if (currentDate.isSameOrBefore(endDate, 'month')) {
} else if (budgetCreatePageState.selectedMonthlyBudgetAllocation === 'enterManually') {
if (budgetCreatePageState.budgetEachDate.length === dateDiff) {
for (let i = 0; i < dateDiff; i++) {
const value = budgetCreatePageState.budgetEachDate[i];
if (!isValidPositiveNumber(value)) {
budgetCreatePageStore.setPlannedLimits([]);
return;
}
planned_limits.push({
date: currentDate.format('YYYY-MM'),
limit: Number(budgetCreatePageState.budgetEachDate[i]),
limit: Number(value),
});
currentDate = currentDate.add(1, 'month');
}
});
}
}

if (planned_limits.length > 0) {
budgetCreatePageStore.setPlannedLimits(planned_limits);
}
budgetCreatePageStore.setPlannedLimits(planned_limits);
}, { deep: true });

watch(() => [
Expand All @@ -248,6 +292,10 @@ watch(() => [
budgetCreatePageState.startMonth,
budgetCreatePageState.endMonth,
], () => {
if (!budgetCreatePageState.time_unit) {
state.isContinueAble = false;
return;
}
if (state.existingBudgetUsageList.length > 0) {
state.isContinueAble = false;
return;
Expand Down Expand Up @@ -304,10 +352,6 @@ watch(() => [
watch(() => budgetCreatePageState.selectedMonthlyBudgetAllocation, (nv, ov) => {
if (nv !== ov) {
budgetCreatePageStore.setPlannedLimits([]);
budgetCreatePageStore.setBudgetAppliedSameAmount(undefined);
budgetCreatePageStore.setInitialAmount(undefined);
budgetCreatePageStore.setMonthlyGrowthRate(undefined);
budgetCreatePageState.budgetEachDate = [];
}
}, { immediate: true });

Expand Down Expand Up @@ -351,16 +395,15 @@ watch(() => budgetCreatePageState.limit, () => {
}
}, { immediate: true });

watch(() => state.existingBudgetUsageList, () => {
if (state.existingBudgetUsageList.length > 0) {
budgetCreatePageState.time_unit = '';
budgetCreatePageState.limit = undefined;
budgetCreatePageState.budgetAppliedSameAmount = undefined;
budgetCreatePageState.initialAmount = undefined;
budgetCreatePageState.monthlyGrowthRate = undefined;
budgetCreatePageState.budgetEachDate = [];
watch(() => budgetCreatePageState.startMonth[0], (newVal, oldVal) => {
if (newVal !== oldVal && budgetCreatePageState.currentStep === 2) {
const isValidationReturn = budgetCreatePageState.time_unit !== '' || budgetCreatePageState.endMonth.length > 0;
if (!isValidationReturn) {
budgetCreatePageState.endMonth = [];
budgetCreatePageState.time_unit = '';
}
}
}, { deep: true, immediate: true });
}, { immediate: true });
</script>

<template>
Expand Down Expand Up @@ -410,8 +453,6 @@ watch(() => state.existingBudgetUsageList, () => {
>
<p-datetime-picker data-type="yearToMonth"
:selected-dates.sync="budgetCreatePageState.startMonth"
:min-date="budgetCreatePageState.endMonth.length > 0 ? dayjs.utc(budgetCreatePageState.endMonth[0]).subtract(11, 'month').format('YYYY-MM') : ''"
:max-date="budgetCreatePageState.endMonth.length > 0 ? dayjs.utc(budgetCreatePageState.endMonth[0]).format('YYYY-MM'): ''"
:placeholder="$t('BILLING.COST_MANAGEMENT.BUDGET.FORM.CREATE.SELECT_MONTH')"
:invalid="state.existingBudgetUsageList.length > 0"
/>
Expand All @@ -426,7 +467,8 @@ watch(() => state.existingBudgetUsageList, () => {
:min-date="budgetCreatePageState.startMonth.length > 0
? dayjs.utc(budgetCreatePageState.startMonth[0]).add(1, 'month').format('YYYY-MM') : ''"
:max-date="budgetCreatePageState.startMonth.length > 0 ? dayjs.utc(budgetCreatePageState.startMonth[0]).add(11, 'month').format('YYYY-MM') : ''"
:invalid="state.existingBudgetUsageList.length > 0"
:invalid="state.existingBudgetUsageList.length > 0 || (budgetCreatePageState.startMonth.length > 0
&& budgetCreatePageState.endMonth.length === 0)"
/>
</p-field-group>
</div>
Expand All @@ -436,33 +478,36 @@ watch(() => state.existingBudgetUsageList, () => {
{{ budgetCreatePageState.scope.type === 'project'
? $t('BILLING.COST_MANAGEMENT.BUDGET.FORM.CREATE.PROJECT_DUPLICATED_WARNING1', {
project: project[budgetCreatePageState.project].name,
month_list: state.existingBudgetUsageList.map(d => d.date)
month_list: state.existingBudgetUsageList.sort((a, b) => (a.date > b.date ? 1 : -1)).map(d => d.date)
}) : $t('BILLING.COST_MANAGEMENT.BUDGET.FORM.CREATE.PROJECT_DUPLICATED_WARNING2', {
project: project[budgetCreatePageState.project].name,
serviceAccount: serviceAccount[budgetCreatePageState.scope.serviceAccount ?? ''].name,
month_list: state.existingBudgetUsageList.map(d => d.date)
month_list: state.existingBudgetUsageList.sort((a, b) => (a.date > b.date ? 1 : -1)).map(d => d.date)
}) }}
</span>
<div class="mt-2">
<budget-last-three-month-cost-trend-bar-chart />
</div>
<div class="flex mt-6">
<p-field-group
:label="$t('BILLING.COST_MANAGEMENT.BUDGET.FORM.CREATE.BUDGET_CYCLE')"
:help-text="budgetCreatePageState.startMonth.length === 0 || budgetCreatePageState.endMonth.length === 0
? $t('BILLING.COST_MANAGEMENT.BUDGET.FORM.CREATE.BUDGET_CYCLE_DESCRIPTION') : ''"
:help-text="!isCycleEnabled ? $t('BILLING.COST_MANAGEMENT.BUDGET.FORM.CREATE.BUDGET_CYCLE_DESCRIPTION') : ''"
required
>
<p-radio-group>
<p-radio v-for="(cycle, idx) in state.budgetCycleList"
:key="`budget-cycle-${idx}`"
v-model="budgetCreatePageState.time_unit"
:value="cycle.name"
:disabled="state.existingBudgetUsageList.length > 0"
<p-radio-group class="mt-2">
<p-radio
v-for="(cycle, idx) in state.budgetCycleList"
:key="`budget-cycle-${idx}`"
v-model="budgetCreatePageState.time_unit"
:value="cycle.name"
:disabled="!isCycleEnabled"
>
<span>{{ cycle.label }}</span>
</p-radio>
</p-radio-group>
</p-field-group>
</div>
<p-pane-layout v-if="budgetCreatePageState.time_unit.length > 0"
<p-pane-layout v-if="budgetCreatePageState.time_unit.length > 0 && isCycleEnabled"
class="cycle-info-layout"
:class="{'fixed-term-layout': budgetCreatePageState.time_unit === 'TOTAL'}"
>
Expand Down Expand Up @@ -579,9 +624,6 @@ watch(() => state.existingBudgetUsageList, () => {
</div>
</p-pane-layout>
</div>
<div class="right-section">
<budget-last-three-month-cost-trend-bar-chart />
</div>
</div>
<div class="mt-8 flex justify-end gap-4">
<p-button style-type="transparent"
Expand Down
2 changes: 0 additions & 2 deletions apps/web/src/services/cost-explorer/components/BudgetCreateStep3.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,10 @@ const createBudget = async (type: 'skip' | 'set') => {
};
await SpaceConnector.clientV2.costAnalysis.budget.create<BudgetCreateParameters, BudgetModel>(params);

budgetCreatePageState.loading = false;
router.push({
name: COST_EXPLORER_ROUTE.BUDGET._NAME,
});
showSuccessMessage(i18n.t('BILLING.COST_MANAGEMENT.BUDGET.ALT_S_CREATE_BUDGET'), '');
budgetCreatePageStore.reset();
} catch (error: any) {
showErrorMessage(i18n.t('BILLING.COST_MANAGEMENT.BUDGET.ALT_E_CREATE_BUDGET'), error.message);
budgetCreatePageState.currentStep = 1;
Expand Down
17 changes: 6 additions & 11 deletions apps/web/src/services/cost-explorer/components/BudgetDetailBaseInformation.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import { useServiceAccountReferenceStore } from '@/store/reference/service-accou

import { showErrorMessage, showSuccessMessage } from '@/lib/helper/notice-alert-helper';

import ErrorHandler from '@/common/composables/error/errorHandler';
import { usePageEditableStatus } from '@/common/composables/page-editable-status';
import ProjectLinkButton from '@/common/modules/project/ProjectLinkButton.vue';
import UserSelectDropdown from '@/common/modules/user/UserSelectDropdown.vue';
Expand Down Expand Up @@ -139,7 +138,6 @@ const handleUpdateAlertRecipients = async () => {
data: 'alertRecipients'.replace(/([A-Z])/g, ' $1').replace(/^./, (s) => s.toUpperCase()),
}), '');
} catch (error: any) {
ErrorHandler.handleError(error, true);
showErrorMessage(error.code, error.message);
}
};
Expand All @@ -154,7 +152,7 @@ const handleUpdateBudgetThresholds = async () => {
threshold: Number(threshold),
})),
},
});
}, 'budgetAlerts');
state.budgetAlertEdit = false;
};

Expand Down Expand Up @@ -349,14 +347,11 @@ watch(() => state.selectedBudgetManager, (nv, ov) => {
}"
/>
<div class="flex gap-2 items-start">
<span>{{ $t('BILLING.COST_MANAGEMENT.BUDGET.DETAIL.BASE_INFORMATION.BUDGET_ALERTS_TEXT') }}:</span>
<p v-if="!state.budgetAlertEdit">
<span v-for="(plan, index) in [...data.plans].sort((a, b) => a.threshold - b.threshold)"
:key="`plan-${index}`"
>
{{ plan.threshold }}{{ plan.unit === 'PERCENT' ? '%' : '' }}<template v-if="index !== data.plans.length - 1">, </template>
</span>
</p>
<span>{{ $t('BILLING.COST_MANAGEMENT.BUDGET.DETAIL.BASE_INFORMATION.BUDGET_ALERTS_TEXT', {
threshold: [...data.plans].sort((a, b) => a.threshold - b.threshold).map(plan => {
return ` ${plan.threshold}${plan.unit === 'PERCENT' ? '%' : ''}`
})
}) }}</span>
<div v-if="state.budgetAlertEdit">
<p-text-input appearance-type="stack"
multi-input
Expand Down
14 changes: 7 additions & 7 deletions 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 @@ -29,11 +29,11 @@ const state = reactive({
data: {},
xAxisData: computed(() => {
const startDate = budgetCreatePageState.startMonth.length > 0
? dayjs.utc(budgetCreatePageState.startMonth[0])
: dayjs.utc().subtract(3, 'month');
? dayjs.utc(budgetCreatePageState.startMonth[0]).subtract(1, 'year')
: dayjs.utc().subtract(1, 'year').subtract(3, 'month');
const endDate = budgetCreatePageState.endMonth.length > 0
? dayjs.utc(budgetCreatePageState.endMonth[0])
: dayjs.utc().subtract(1, 'month');
? dayjs.utc(budgetCreatePageState.endMonth[0]).subtract(1, 'year')
: dayjs.utc().subtract(1, 'year').subtract(1, 'month');
const monthDiff = endDate.diff(startDate, 'month');

return Array.from({ length: monthDiff + 1 }, (_, i) => startDate.add(i, 'month').format('YYYY-MM'));
Expand Down Expand Up @@ -102,8 +102,8 @@ const fetchBudgetUsageAnalyze = async () => {
try {
const { results } = await SpaceConnector.clientV2.costAnalysis.unifiedCost.analyze({
query: {
start: dayjs.utc(budgetCreatePageState.startMonth[0]).format('YYYY-MM'),
end: dayjs.utc(budgetCreatePageState.endMonth[0]).format('YYYY-MM'),
start: dayjs.utc(budgetCreatePageState.startMonth[0]).subtract(1, 'year').format('YYYY-MM'),
end: dayjs.utc(budgetCreatePageState.endMonth[0]).subtract(1, 'year').format('YYYY-MM'),
group_by: !budgetCreatePageState.scope.serviceAccount ? ['project_id', 'is_confirmed'] : ['project_id', 'service_account_id', 'is_confirmed'],
fields: {
cost_trend: {
Expand Down Expand Up @@ -173,7 +173,7 @@ watch(() => budgetCreatePageState, async () => {

<style scoped lang="postcss">
.chart-wrapper {
width: 25rem;
width: 56rem;
height: 17rem;
.chart {
height: 100%;
Expand Down
Loading
Loading