Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ watch(() => budgetCreatePageState.thresholds, () => {
const values = budgetCreatePageState.thresholds.map((t) => Number(t.value));
invalidThreshold.value = budgetCreatePageState.thresholds.map((threshold, idx) => {
const val = values[idx];
const isValidNumber = val > 0 && val < 101;
const isValidNumber = val > 0;
const isDuplicate = values.indexOf(val) !== idx;
return !(isValidNumber && !isDuplicate);
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,11 +159,7 @@ watch(() => budgetCreatePageState, async () => {
<template>
<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: 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,
}) }}
{{ $t('BILLING.COST_MANAGEMENT.BUDGET.FORM.CREATE.PREVIOUS_PERIOD_SPEND') }}
</p>
<div ref="chartContext"
class="chart"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,10 @@ export const getDefaultSearchSchema = (fields: DynamicField[], isTrustedAccount:
name: field.name ?? field.key,
type: 'text',
})),
{
key: 'service_account_mgr_id',
name: 'Service Account Manager',
},
{
key: 'project_id',
name: 'Project',
Expand Down
20 changes: 10 additions & 10 deletions packages/language-pack/console-translation-2.8.babel
Original file line number Diff line number Diff line change
Expand Up @@ -13174,7 +13174,7 @@
</translations>
</concept_node>
<concept_node>
<name>LAST_COST_TREND</name>
<name>MONTHLY</name>
<definition_loaded>false</definition_loaded>
<description/>
<comment/>
Expand All @@ -13195,7 +13195,7 @@
</translations>
</concept_node>
<concept_node>
<name>MONTHLY</name>
<name>MONTHLY_BUDGET_ALLOCATION</name>
<definition_loaded>false</definition_loaded>
<description/>
<comment/>
Expand All @@ -13207,16 +13207,16 @@
</translation>
<translation>
<language>ja-JP</language>
<approved>true</approved>
<approved>false</approved>
</translation>
<translation>
<language>ko-KR</language>
<approved>true</approved>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>MONTHLY_BUDGET_ALLOCATION</name>
<name>MONTHLY_GROWTH_RATE</name>
<definition_loaded>false</definition_loaded>
<description/>
<comment/>
Expand All @@ -13237,7 +13237,7 @@
</translations>
</concept_node>
<concept_node>
<name>MONTHLY_GROWTH_RATE</name>
<name>OTHERS</name>
<definition_loaded>false</definition_loaded>
<description/>
<comment/>
Expand All @@ -13249,16 +13249,16 @@
</translation>
<translation>
<language>ja-JP</language>
<approved>false</approved>
<approved>true</approved>
</translation>
<translation>
<language>ko-KR</language>
<approved>false</approved>
<approved>true</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>OTHERS</name>
<name>PREVIOUS</name>
<definition_loaded>false</definition_loaded>
<description/>
<comment/>
Expand All @@ -13279,7 +13279,7 @@
</translations>
</concept_node>
<concept_node>
<name>PREVIOUS</name>
<name>PREVIOUS_PERIOD_SPEND</name>
<definition_loaded>false</definition_loaded>
<description/>
<comment/>
Expand Down
4 changes: 2 additions & 2 deletions packages/language-pack/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -695,12 +695,12 @@
"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",
"MONTHLY": "Monthly",
"MONTHLY_BUDGET_ALLOCATION": "Monthly Budget Allocation",
"MONTHLY_GROWTH_RATE": "Monthly Growth Rate",
"OTHERS": "Others",
"PREVIOUS": "Previous",
"PREVIOUS_PERIOD_SPEND": "Previous Period Spending",
"PROJECT": "Project",
"PROJECT_DUPLICATED_WARNING1": "The project {project} already has a budget set for the following month(s): {month_list}",
"PROJECT_DUPLICATED_WARNING2": "The service account {serviceAccount} under project {project} already has a budget set for the following month(s): {month_list}",
Expand All @@ -722,7 +722,7 @@
"STEP1_DESC": "Set up a budget easily to track and manage your spending.",
"STEP2_DESCRIPTION": "Create a budget by setting the currency and budget cycle.",
"STEP3_DESCRIPTION": "Receive alerts when ‘Actual Spend’ exceeds the threshold.",
"THRESHOLD_INVALID_TEXT": "Alert Threshold is required.",
"THRESHOLD_INVALID_TEXT": "Please ensure the amount is entered and not duplicated.",
"WORKSPACE_OWNERS": "Workspace Owners"
},
"CREATE_BUDGET": "Create Budget",
Expand Down
4 changes: 2 additions & 2 deletions packages/language-pack/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -695,12 +695,12 @@
"FIXED_TERM": "固定期間",
"INCRASE_BY_SPECIFIC_PERCENTAGE": "",
"INITIAL_AMOUNT": "",
"LAST_COST_TREND": "過去{count}か月のコスト推移",
"MONTHLY": "月次",
"MONTHLY_BUDGET_ALLOCATION": "",
"MONTHLY_GROWTH_RATE": "",
"OTHERS": "その他",
"PREVIOUS": "前へ",
"PREVIOUS_PERIOD_SPEND": "過去の同期間の費用推移",
"PROJECT": "プロジェクト",
"PROJECT_DUPLICATED_WARNING1": "プロジェクト「{project}」には、すでに以下の月の予算が設定されています:{month_list}",
"PROJECT_DUPLICATED_WARNING2": "プロジェクト「{project}」のサービスアカウント「{serviceAccount}」には、すでに以下の月の予算が設定されています:{month_list}",
Expand All @@ -722,7 +722,7 @@
"STEP1_DESC": "支出を簡単に追跡・管理するために予算を設定しましょう。",
"STEP2_DESCRIPTION": "通貨と予算サイクルを設定して予算を作成します。",
"STEP3_DESCRIPTION": "実際の支出が閾値を超えた際にアラートを受け取ります。",
"THRESHOLD_INVALID_TEXT": "アラート基準額の入力が必要です。",
"THRESHOLD_INVALID_TEXT": "金額が未入力または重複していないか確認してください。",
"WORKSPACE_OWNERS": "ワークスペースのオーナー"
},
"CREATE_BUDGET": "予算作成",
Expand Down
4 changes: 2 additions & 2 deletions packages/language-pack/ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -695,12 +695,12 @@
"FIXED_TERM": "고정 예산",
"INCRASE_BY_SPECIFIC_PERCENTAGE": "",
"INITIAL_AMOUNT": "",
"LAST_COST_TREND": "최근 {count}개월 비용 추이",
"MONTHLY": "월별 예산",
"MONTHLY_BUDGET_ALLOCATION": "",
"MONTHLY_GROWTH_RATE": "",
"OTHERS": "이외 사용자",
"PREVIOUS": "뒤로가기",
"PREVIOUS_PERIOD_SPEND": "과거 동일 기간의 비용 추이",
"PROJECT": "프로젝트",
"PROJECT_DUPLICATED_WARNING1": " {project} 프로젝트에는 이미 해당 월들에 대한 예산이 설정되어 있습니다: {month_list}",
"PROJECT_DUPLICATED_WARNING2": "프로젝트 {project} 의 서비스 어카운트 {serviceAccount} 에는 이미 해당 월(들)에 대한 예산이 설정되어 있습니다: {month_list}",
Expand All @@ -722,7 +722,7 @@
"STEP1_DESC": "예산을 간편하게 설정하여 클라우드 비용을 추적하고 관리하세요.",
"STEP2_DESCRIPTION": "통화 및 예산 주기를 설정하여 예산을 생성하세요.",
"STEP3_DESCRIPTION": "실제 지출이 임계값을 초과하면 알림을 받습니다.",
"THRESHOLD_INVALID_TEXT": "알림 기준 금액을 입력해 주세요.",
"THRESHOLD_INVALID_TEXT": "금액이 비어 있거나 중복되지 않았는지 확인해 주세요.",
"WORKSPACE_OWNERS": "워크스페이스 소유자"
},
"CREATE_BUDGET": "예산 생성",
Expand Down
Loading