From e4db64742dd27a3f4df5c141c2f165992d03f451 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=84=8B=E1=85=B5=E1=84=89=E1=85=B3=E1=86=BC=E1=84=8B?=
 =?UTF-8?q?=E1=85=A7=E1=86=AB?= <sylee1274@mz.co.kr>
Date: Fri, 9 May 2025 10:09:44 +0900
Subject: [PATCH 01/15] feat: update languages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 이승연 <sylee1274@mz.co.kr>
---
 .../console-translation-2.8.babel             | 21 +++++++++++++++++++
 packages/language-pack/en.json                |  1 +
 packages/language-pack/ja.json                |  1 +
 packages/language-pack/ko.json                |  1 +
 4 files changed, 24 insertions(+)

diff --git a/packages/language-pack/console-translation-2.8.babel b/packages/language-pack/console-translation-2.8.babel
index e6222317ab..ff0b887c4a 100644
--- a/packages/language-pack/console-translation-2.8.babel
+++ b/packages/language-pack/console-translation-2.8.babel
@@ -62538,6 +62538,27 @@
                                                     </translation>
                                                 </translations>
                                             </concept_node>
+                                            <concept_node>
+                                                <name>DUPLICATED_INVALID_TEXT</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>true</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>ko-KR</language>
+                                                        <approved>true</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
                                             <concept_node>
                                                 <name>GROUP_NAME</name>
                                                 <definition_loaded>false</definition_loaded>
diff --git a/packages/language-pack/en.json b/packages/language-pack/en.json
index 56a35adf1f..e0ffe2ee3d 100644
--- a/packages/language-pack/en.json
+++ b/packages/language-pack/en.json
@@ -3399,6 +3399,7 @@
 					"CANCEL": "Cancel",
 					"CONFIRM": "Confirm",
 					"DESCRIPTION": "Description",
+					"DUPLICATED_INVALID_TEXT": "This group name already exists. Please enter a different name.",
 					"GROUP_NAME": "Group Name",
 					"NOTIFICATION_CHANNEL": "Notification Channel",
 					"PROTOCOL": "Protocol",
diff --git a/packages/language-pack/ja.json b/packages/language-pack/ja.json
index 51830c3efe..28a51bbed3 100644
--- a/packages/language-pack/ja.json
+++ b/packages/language-pack/ja.json
@@ -3399,6 +3399,7 @@
 					"CANCEL": "キャンセル",
 					"CONFIRM": "確認",
 					"DESCRIPTION": "説明",
+					"DUPLICATED_INVALID_TEXT": "このグループ名は既に存在します。別の名前を入力してください。",
 					"GROUP_NAME": "グループ名",
 					"NOTIFICATION_CHANNEL": "お知らせチャンネル",
 					"PROTOCOL": "Protocol",
diff --git a/packages/language-pack/ko.json b/packages/language-pack/ko.json
index ab92a79b0a..501e7f1055 100644
--- a/packages/language-pack/ko.json
+++ b/packages/language-pack/ko.json
@@ -3399,6 +3399,7 @@
 					"CANCEL": "취소",
 					"CONFIRM": "확인",
 					"DESCRIPTION": "설명",
+					"DUPLICATED_INVALID_TEXT": "이미 존재하는 그룹 이름입니다. 다른 이름을 입력해주세요.",
 					"GROUP_NAME": "그룹 이름",
 					"NOTIFICATION_CHANNEL": "알림 채널",
 					"PROTOCOL": "Protocol",

From 207a85b38c9439dc34060dff6ba14a7b160563ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=84=8B=E1=85=B5=E1=84=89=E1=85=B3=E1=86=BC=E1=84=8B?=
 =?UTF-8?q?=E1=85=A7=E1=86=AB?= <sylee1274@mz.co.kr>
Date: Fri, 9 May 2025 10:10:40 +0900
Subject: [PATCH 02/15] feat: update user group name duplicated validation
 check
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 이승연 <sylee1274@mz.co.kr>
---
 .../UserGroupManagementAddGroupInfo.vue          | 16 +++++++++++++++-
 .../components/UserGroupManagementEditModal.vue  |  8 +++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/apps/web/src/services/iam/components/UserGroupManagementAddGroupInfo.vue b/apps/web/src/services/iam/components/UserGroupManagementAddGroupInfo.vue
index 700d18c51b..aec423878b 100644
--- a/apps/web/src/services/iam/components/UserGroupManagementAddGroupInfo.vue
+++ b/apps/web/src/services/iam/components/UserGroupManagementAddGroupInfo.vue
@@ -1,26 +1,37 @@
 <script lang="ts" setup>
-import { reactive, watchEffect } from 'vue';
+import { computed, reactive, watchEffect } from 'vue';
 
 import { PFieldGroup, PTextInput } from '@cloudforet/mirinae';
 
+import { useUserGroupReferenceStore } from '@/store/reference/user-group-reference-store';
+
 import { USER_GROUP_MODAL_TYPE } from '@/services/iam/constants/user-group-constant';
 import { useUserGroupPageStore } from '@/services/iam/store/user-group-page-store';
 
 const userGroupPageStore = useUserGroupPageStore();
 const userGroupPageState = userGroupPageStore.state;
 const userGroupPageGetters = userGroupPageStore.getters;
+const userGroupReferenceStore = useUserGroupReferenceStore();
+const userGroupReferenceState = userGroupReferenceStore.state;
 
 const emit = defineEmits(['update:values']);
 
 const state = reactive({
     groupName: userGroupPageState.modal.type === USER_GROUP_MODAL_TYPE.CREATE ? '' : userGroupPageGetters.selectedUserGroups[0].name,
     description: userGroupPageState.modal.type === USER_GROUP_MODAL_TYPE.CREATE ? '' : userGroupPageGetters.selectedUserGroups[0].description,
+    isGroupNameDuplicated: computed<boolean>(() => {
+        if (userGroupReferenceState.items && state.groupName && Object.values(userGroupReferenceState.items).map((d) => d.name).includes(state.groupName)) {
+            return true;
+        }
+        return false;
+    }),
 });
 
 watchEffect(() => {
     emit('update:values', {
         groupName: state.groupName,
         description: state.description,
+        isGroupNameDuplicated: state.isGroupNameDuplicated,
     });
 });
 
@@ -37,12 +48,15 @@ const handleChangeDescription = (value: string) => {
 <template>
     <div class="user-group-info-wrapper">
         <p-field-group :label="$t('IAM.USER_GROUP.MODAL.CREATE_USER_GROUP.GROUP_NAME')"
+                       :invalid-text="$t('IAM.USER_GROUP.MODAL.CREATE_USER_GROUP.DUPLICATED_INVALID_TEXT')"
+                       :invalid="state.isGroupNameDuplicated"
                        required
         >
             <template #default>
                 <p-text-input
                     :value="state.groupName"
                     :placeholder="$t('IAM.USER_GROUP.MODAL.CREATE_USER_GROUP.GROUP_NAME')"
+                    :invalid="state.isGroupNameDuplicated"
                     @update:value="handleChangeGroupName"
                 />
             </template>
diff --git a/apps/web/src/services/iam/components/UserGroupManagementEditModal.vue b/apps/web/src/services/iam/components/UserGroupManagementEditModal.vue
index 60d9714651..0f17b98dad 100644
--- a/apps/web/src/services/iam/components/UserGroupManagementEditModal.vue
+++ b/apps/web/src/services/iam/components/UserGroupManagementEditModal.vue
@@ -33,12 +33,13 @@ const state = reactive({
     groupName: '',
     description: '',
     disabled: false,
+    isGroupNameDuplicated: false,
 });
 
 /* Watcher */
-watch(() => state.groupName, (groupName) => {
-    state.disabled = groupName.length > 0;
-}, { immediate: true });
+watch(() => state, () => {
+    state.disabled = state.groupName.length > 0 && !state.isGroupNameDuplicated;
+}, { deep: true, immediate: true });
 
 /* Component */
 const handleConfirm = async () => {
@@ -94,6 +95,7 @@ const handleClose = () => {
 const handleUpdateValues = (data) => {
     state.groupName = data.groupName;
     state.description = data.description;
+    state.isGroupNameDuplicated = data.isGroupNameDuplicated;
 };
 
 /* API */

From cc8ccc54e7ee281d6aa054774d7d460012f99140 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=84=8B=E1=85=B5=E1=84=89=E1=85=B3=E1=86=BC=E1=84=8B?=
 =?UTF-8?q?=E1=85=A7=E1=86=AB?= <sylee1274@mz.co.kr>
Date: Fri, 9 May 2025 15:48:41 +0900
Subject: [PATCH 03/15] feat: update notification channel schedule displaying
 method
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 이승연 <sylee1274@mz.co.kr>
---
 ...rGroupManagementTabNotificationChannel.vue | 173 +++++++++++++-----
 .../NotificationChannelItemSchedule.vue       | 101 ++++++----
 2 files changed, 194 insertions(+), 80 deletions(-)

diff --git a/apps/web/src/services/iam/components/UserGroupManagementTabNotificationChannel.vue b/apps/web/src/services/iam/components/UserGroupManagementTabNotificationChannel.vue
index 2e314abec0..5295513c8a 100644
--- a/apps/web/src/services/iam/components/UserGroupManagementTabNotificationChannel.vue
+++ b/apps/web/src/services/iam/components/UserGroupManagementTabNotificationChannel.vue
@@ -2,6 +2,7 @@
 import {
     computed, onMounted, reactive, ref, watch,
 } from 'vue';
+import type { TranslateResult } from 'vue-i18n';
 
 import { makeDistinctValueHandler } from '@cloudforet/core-lib/component-util/query-search';
 import { getApiQueryWithToolboxOptions } from '@cloudforet/core-lib/component-util/toolbox';
@@ -20,7 +21,7 @@ import type { UserGroupChannelListParameters } from '@/schema/alert-manager/user
 import { USER_GROUP_CHANNEL_SCHEDULE_TYPE } from '@/schema/alert-manager/user-group-channel/constants';
 import type { UserGroupChannelModel } from '@/schema/alert-manager/user-group-channel/model';
 import type {
-    UserGroupChannelScheduleType,
+    UserGroupChannelScheduleInfoType,
 } from '@/schema/alert-manager/user-group-channel/type';
 import { i18n } from '@/translations';
 
@@ -29,6 +30,7 @@ import type { PluginReferenceMap } from '@/store/reference/plugin-reference-stor
 
 import { assetUrlConverter } from '@/lib/helper/asset-helper';
 
+import type { DayType } from '@/common/components/schedule-setting-form/schedule-setting-form';
 import ErrorHandler from '@/common/composables/error/errorHandler';
 import { useQueryTags } from '@/common/composables/query-tags';
 
@@ -66,9 +68,9 @@ const { queryTags } = queryTagHelper;
 interface ChannelItem {
   name: string;
   channel_id: string;
-  // schedule: UserGroupChannelScheduleInfoType;
-  SCHEDULE_TYPE: UserGroupChannelScheduleType;
-  details?: any;
+  day: UserGroupChannelScheduleInfoType;
+  time: UserGroupChannelScheduleInfoType;
+  timeZone: string;
 }
 
 const isDeleteAble = ref<boolean>(false);
@@ -81,16 +83,20 @@ const storeState = reactive({
 
 const tableState = reactive({
     fields: computed(() => [
-        { name: 'name', label: 'Name' },
-        { name: 'channel_id', label: 'Channel' },
-        { name: 'schedule', label: 'Schedule' },
+        { name: 'name', label: 'Name', width: '350px' },
+        { name: 'channel_id', label: 'Channel', width: '230px' },
+        { name: 'day', label: 'Day', width: '337px' },
+        { name: 'time', label: 'Time', width: '116px' },
+        { name: 'timeZone', label: 'Time Zone', width: '250px' },
     ]),
     items: computed<ChannelItem[]>(() => {
         const channels = userGroupPageState.userGroupChannels.list ?? [];
         return channels.map((channel) => ({
             name: channel.name,
             channel_id: channel.protocol_id,
-            schedule: channel.schedule.SCHEDULE_TYPE,
+            day: channel.schedule,
+            time: channel.schedule,
+            timeZone: channel.schedule.TIMEZONE,
         }));
     }),
     valueHandlerMap: computed(() => ({
@@ -111,16 +117,35 @@ const tableState = reactive({
 const state = reactive({
     loading: false,
     channelName: '',
-    protocolList: computed<{ icon: string; label: string; value: string; }[]>(() => userGroupPageState.protocolList.map((protocol) => ({
+    protocolList: computed<{ icon: string; label: string; value: string; }[]>(() => userGroupPageState.protocolList?.map((protocol) => ({
         icon: storeState.plugins[protocol.plugin_info.plugin_id]?.icon || '',
         label: protocol.name,
         value: protocol.protocol_id,
-    }))),
+    })) ?? []),
+    dayMapping: computed<Record<DayType, TranslateResult>>(() => ({
+        MON: i18n.t('ALERT_MANAGER.NOTIFICATIONS.MONDAY'),
+        TUE: i18n.t('ALERT_MANAGER.NOTIFICATIONS.TUESDAY'),
+        WED: i18n.t('ALERT_MANAGER.NOTIFICATIONS.WEDNESDAY'),
+        THU: i18n.t('ALERT_MANAGER.NOTIFICATIONS.THURSDAY'),
+        FRI: i18n.t('ALERT_MANAGER.NOTIFICATIONS.FRIDAY'),
+        SAT: i18n.t('ALERT_MANAGER.NOTIFICATIONS.SATURDAY'),
+        SUN: i18n.t('ALERT_MANAGER.NOTIFICATIONS.SUNDAY'),
+    })),
 });
 
 const totalCount = ref(0);
 
 /* Component */
+const fetchListUserGroupChannel = async (params: UserGroupChannelListParameters) => {
+    try {
+        const { results } = await SpaceConnector.clientV2.alertManager.userGroupChannel.list<UserGroupChannelListParameters, ListResponse<UserGroupChannelModel>>(params);
+        userGroupPageState.userGroupChannels.list = results;
+        totalCount.value = results?.length ?? 0;
+    } catch (e) {
+        ErrorHandler.handleError(e, true);
+    }
+};
+
 const handleChange = async (options: any = {}) => {
     let value;
     if (options.queryTags) {
@@ -211,6 +236,61 @@ const handleUpdateModal = async (modalType: string) => {
     }
 };
 
+const getScheduleInfo = (schedule: UserGroupChannelScheduleInfoType) => {
+    const scheduleInfo = {
+        styleType: '', value: '' as TranslateResult, days: [] as TranslateResult[], time: '', timezone: '',
+    };
+
+
+    const formatTime = (time: number | undefined, defaultTime: number): string => `${String(time ?? defaultTime).padStart(2, '0')}:00`;
+    Object.entries(schedule).forEach(([day, s]) => {
+        if (day === 'SCHEDULE_TYPE') return;
+
+        if (day === 'TIMEZONE') {
+            scheduleInfo.timezone = s as string;
+            return;
+        }
+        const scheduleDay = s;
+        if (!scheduleDay || typeof scheduleDay === 'string') return;
+
+        const startTime = formatTime(scheduleDay.start, 0);
+        const endTime = formatTime(scheduleDay.end, 24);
+        if (schedule.SCHEDULE_TYPE === 'WEEK_DAY') {
+            scheduleInfo.days = Object.values(state.dayMapping).slice(0, 5).map((d) => d as TranslateResult);
+            if (scheduleDay.is_scheduled) {
+                scheduleInfo.time = `${startTime} ~ ${endTime}`;
+            }
+        } else if (schedule.SCHEDULE_TYPE === 'ALL_DAY') {
+            scheduleInfo.days = Object.values(state.dayMapping).map((d) => d as TranslateResult);
+            scheduleInfo.time = `${startTime} ~ ${endTime}`;
+        } else if (scheduleDay?.is_scheduled) {
+            scheduleInfo.days.push(state.dayMapping[day]);
+            scheduleInfo.time = `${startTime} ~ ${endTime}`;
+        }
+    });
+
+    switch (schedule.SCHEDULE_TYPE) {
+    case 'WEEK_DAY':
+        scheduleInfo.styleType = 'secondary1';
+        scheduleInfo.value = i18n.t('COMMON.SCHEDULE_SETTING.WEEKDAYS');
+        break;
+    case 'ALL_DAY':
+        scheduleInfo.styleType = 'primary1';
+        scheduleInfo.value = i18n.t('COMMON.SCHEDULE_SETTING.EVERYDAY');
+        break;
+    default:
+        scheduleInfo.styleType = 'coral500';
+        scheduleInfo.value = i18n.t('COMMON.SCHEDULE_SETTING.CUSTOM');
+        break;
+    }
+
+
+    return {
+        ...scheduleInfo,
+        days: scheduleInfo.days.join(', '),
+    };
+};
+
 /* Watcher */
 watch(isScheduleTagged, (nv_scheduled_tag) => {
     if (nv_scheduled_tag) {
@@ -248,25 +328,12 @@ watch([() => tableState.items, () => userGroupPageGetters.selectedUserGroupChann
 const fetchGetNotificationProtocol = async (params: NotificationProtocolGetParameters) => {
     try {
         return await SpaceConnector.clientV2.alertManager.notificationProtocol.get<NotificationProtocolGetParameters, NotificationProtocolModel>(params);
-        // notificationChannelCreateFormStore.$patch((_state) => {
-        //     _state.state.selectedProtocol.icon = result.plugin_info.plugin_id;
-        //     _state.state.selectedProtocol.name = result.name;
-        // });
     } catch (e) {
         ErrorHandler.handleError(e, true);
         return null;
     }
 };
 
-const fetchListUserGroupChannel = async (params: UserGroupChannelListParameters) => {
-    try {
-        const { results } = await SpaceConnector.clientV2.alertManager.userGroupChannel.list<UserGroupChannelListParameters, ListResponse<UserGroupChannelModel>>(params);
-        userGroupPageState.userGroupChannels.list = results;
-        totalCount.value = results.length;
-    } catch (e) {
-        ErrorHandler.handleError(e, true);
-    }
-};
 
 const fetchGetUserGroupChannel = async (params: UserGroupChannelGetParameters): Promise<UserGroupChannelModel | undefined> => {
     try {
@@ -316,7 +383,7 @@ onMounted(async () => {
             >
                 <div class="toolbox-wrapper">
                     <div class="toolbox">
-                        <p-button style-type="tertiary"
+                        <p-button style-type="secondary"
                                   icon-left="ic_plus"
                                   @click="handleUpdateModal('create')"
                         >
@@ -373,31 +440,39 @@ onMounted(async () => {
                     </div>
                 </div>
             </template>
-            <template #col-schedule-format="{value}">
-                <p-badge v-if="value === USER_GROUP_CHANNEL_SCHEDULE_TYPE.CUSTOM"
-                         badge-type="solid-outline"
-                         style-type="alert"
-                >
-                    {{ $t('IAM.USER_GROUP.MODAL.CREATE_CHANNEL.DESC.SCHEDULE.CUSTOM') }}
-                </p-badge>
-                <p-badge v-else-if="value === USER_GROUP_CHANNEL_SCHEDULE_TYPE.ALL_DAY"
-                         badge-type="solid-outline"
-                         style-type="indigo500"
-                >
-                    {{ $t('IAM.USER_GROUP.MODAL.CREATE_CHANNEL.DESC.SCHEDULE.EVERYDAY') }}
-                </p-badge>
-                <p-badge v-else-if="value === USER_GROUP_CHANNEL_SCHEDULE_TYPE.WEEK_DAY"
-                         badge-type="solid-outline"
-                         style-type="secondary1"
-                >
-                    {{ $t('IAM.USER_GROUP.MODAL.CREATE_CHANNEL.DESC.SCHEDULE.WEEKDAYS') }}
-                </p-badge>
-                <p-badge v-else-if="value === USER_GROUP_CHANNEL_SCHEDULE_TYPE.WEEKEND"
-                         badge-type="solid-outline"
-                         style-type="gray500"
-                >
-                    {{ $t('IAM.USER_GROUP.MODAL.CREATE_CHANNEL.DESC.SCHEDULE.WEEKEND') }}
-                </p-badge>
+            <template #col-day-format="{value}">
+                <div class="flex gap-2 items-center">
+                    <p-badge v-if="value.SCHEDULE_TYPE === USER_GROUP_CHANNEL_SCHEDULE_TYPE.CUSTOM"
+                             badge-type="solid-outline"
+                             style-type="alert"
+                    >
+                        {{ $t('IAM.USER_GROUP.MODAL.CREATE_CHANNEL.DESC.SCHEDULE.CUSTOM') }}
+                    </p-badge>
+                    <p-badge v-else-if="value.SCHEDULE_TYPE === USER_GROUP_CHANNEL_SCHEDULE_TYPE.ALL_DAY"
+                             badge-type="solid-outline"
+                             style-type="indigo500"
+                    >
+                        {{ $t('IAM.USER_GROUP.MODAL.CREATE_CHANNEL.DESC.SCHEDULE.EVERYDAY') }}
+                    </p-badge>
+                    <p-badge v-else-if="value.SCHEDULE_TYPE === USER_GROUP_CHANNEL_SCHEDULE_TYPE.WEEK_DAY"
+                             badge-type="solid-outline"
+                             style-type="secondary1"
+                    >
+                        {{ $t('IAM.USER_GROUP.MODAL.CREATE_CHANNEL.DESC.SCHEDULE.WEEKDAYS') }}
+                    </p-badge>
+                    <p-badge v-else-if="value.SCHEDULE_TYPE === USER_GROUP_CHANNEL_SCHEDULE_TYPE.WEEKEND"
+                             badge-type="solid-outline"
+                             style-type="gray500"
+                    >
+                        {{ $t('IAM.USER_GROUP.MODAL.CREATE_CHANNEL.DESC.SCHEDULE.WEEKEND') }}
+                    </p-badge>
+                    <span>
+                        {{ getScheduleInfo(value)['days'] }}
+                    </span>
+                </div>
+            </template>
+            <template #col-time-format="{value}">
+                {{ getScheduleInfo(value)['time'] }}
             </template>
         </p-toolbox-table>
     </div>
diff --git a/apps/web/src/services/my-page/components/NotificationChannelItemSchedule.vue b/apps/web/src/services/my-page/components/NotificationChannelItemSchedule.vue
index 4343665a7d..dd4d6841a2 100644
--- a/apps/web/src/services/my-page/components/NotificationChannelItemSchedule.vue
+++ b/apps/web/src/services/my-page/components/NotificationChannelItemSchedule.vue
@@ -4,6 +4,7 @@
 import {
     computed, reactive,
 } from 'vue';
+import type { TranslateResult } from 'vue-i18n';
 
 import { SpaceConnector } from '@cloudforet/core-lib/space-connector';
 import {
@@ -19,7 +20,7 @@ import { useUserStore } from '@/store/user/user-store';
 
 import { showSuccessMessage } from '@/lib/helper/notice-alert-helper';
 
-import type { ScheduleSettingFormType } from '@/common/components/schedule-setting-form/schedule-setting-form';
+import type { DayType, ScheduleSettingFormType } from '@/common/components/schedule-setting-form/schedule-setting-form';
 import ErrorHandler from '@/common/composables/error/errorHandler';
 
 import { utcToTimezoneFormatter } from '@/services/iam/helpers/user-notification-timezone-helper';
@@ -49,6 +50,15 @@ const state = reactive({
     scheduleModeForEdit: props.channelData.is_scheduled,
     scheduleForEdit: props.channelData.schedule,
     isScheduleValid: false,
+    dayMapping: computed<Record<DayType, TranslateResult>>(() => ({
+        MON: i18n.t('ALERT_MANAGER.NOTIFICATIONS.MONDAY'),
+        TUE: i18n.t('ALERT_MANAGER.NOTIFICATIONS.TUESDAY'),
+        WED: i18n.t('ALERT_MANAGER.NOTIFICATIONS.WEDNESDAY'),
+        THU: i18n.t('ALERT_MANAGER.NOTIFICATIONS.THURSDAY'),
+        FRI: i18n.t('ALERT_MANAGER.NOTIFICATIONS.FRIDAY'),
+        SAT: i18n.t('ALERT_MANAGER.NOTIFICATIONS.SATURDAY'),
+        SUN: i18n.t('ALERT_MANAGER.NOTIFICATIONS.SUNDAY'),
+    })),
     displayStartHour: computed(() => utcToTimezoneFormatter((props.channelData.schedule?.start_hour || 0), timezoneForFormatter)),
     displayEndHour: computed(() => utcToTimezoneFormatter((props.channelData.schedule?.end_hour || 0), timezoneForFormatter)),
     scheduleSettingFormType: {} as ScheduleSettingFormType,
@@ -120,37 +130,58 @@ const onClickSave = async () => {
     emit('change');
 };
 
-const SCHEDULE_TYPE_OPTIONS = {
-    ALL_DAY: 'Every Day',
-    CUSTOM: 'Custom',
-    WEEK_DAY: 'Weekdays',
-    WEEKEND: 'Weekend',
-};
 const getScheduleInfo = (schedule: ScheduleSettingFormType) => {
-    const { SCHEDULE_TYPE } = schedule;
-    let styleType: string;
-    let label;
-    switch (SCHEDULE_TYPE) {
-    case 'ALL_DAY':
-        styleType = 'indigo500';
-        label = SCHEDULE_TYPE_OPTIONS.ALL_DAY;
-        break;
-    case 'CUSTOM':
-        styleType = 'coral500';
-        label = SCHEDULE_TYPE_OPTIONS.CUSTOM;
-        break;
+    const scheduleInfo = {
+        styleType: '', value: '' as TranslateResult, days: [] as TranslateResult[], time: '', timezone: '',
+    };
+
+
+    const formatTime = (time: number | undefined, defaultTime: number): string => `${String(time ?? defaultTime).padStart(2, '0')}:00`;
+    Object.entries(schedule).forEach(([day, s]) => {
+        if (day === 'SCHEDULE_TYPE') return;
+
+        if (day === 'TIMEZONE') {
+            scheduleInfo.timezone = s as string;
+            return;
+        }
+        const scheduleDay = s;
+        if (!scheduleDay) return;
+
+        const startTime = formatTime(scheduleDay.start, 0);
+        const endTime = formatTime(scheduleDay.end, 24);
+        if (schedule.SCHEDULE_TYPE === 'WEEK_DAY') {
+            scheduleInfo.days = Object.values(state.dayMapping).slice(0, 5).map((d) => d as TranslateResult);
+            if (scheduleDay?.is_scheduled) {
+                scheduleInfo.time = `${startTime} ~ ${endTime}`;
+            }
+        } else if (schedule.SCHEDULE_TYPE === 'ALL_DAY') {
+            scheduleInfo.days = Object.values(state.dayMapping).map((d) => d as TranslateResult);
+            scheduleInfo.time = `${startTime} ~ ${endTime}`;
+        } else if (scheduleDay?.is_scheduled) {
+            scheduleInfo.days.push(state.dayMapping[day]);
+            scheduleInfo.time = `${startTime} ~ ${endTime}`;
+        }
+    });
+
+    switch (schedule.SCHEDULE_TYPE) {
     case 'WEEK_DAY':
-        styleType = 'secondary1';
-        label = SCHEDULE_TYPE_OPTIONS.WEEK_DAY;
+        scheduleInfo.styleType = 'secondary1';
+        scheduleInfo.value = i18n.t('COMMON.SCHEDULE_SETTING.WEEKDAYS');
+        break;
+    case 'ALL_DAY':
+        scheduleInfo.styleType = 'primary1';
+        scheduleInfo.value = i18n.t('COMMON.SCHEDULE_SETTING.EVERYDAY');
         break;
     default:
-        styleType = 'gray900';
-        label = SCHEDULE_TYPE_OPTIONS.WEEKEND;
+        scheduleInfo.styleType = 'coral500';
+        scheduleInfo.value = i18n.t('COMMON.SCHEDULE_SETTING.CUSTOM');
         break;
     }
+
+
     return {
-        styleType,
-        label,
+        ...scheduleInfo,
+        days: scheduleInfo.days.join(', '),
     };
 };
 </script>
@@ -200,12 +231,20 @@ const getScheduleInfo = (schedule: ScheduleSettingFormType) => {
                 <span v-else>{{ $t('IDENTITY.USER.NOTIFICATION.FORM.ALL_TIME') }}</span>
             </div>
             <div v-else-if="props.visibleUserNotification">
-                <div class="inline-flex items-center gap-2">
-                    <p-badge badge-type="solid-outline"
-                             :style-type="getScheduleInfo(props.channelData.schedule).styleType"
-                    >
-                        {{ getScheduleInfo(props.channelData.schedule).label }}
-                    </p-badge>
+                <div class="flex flex-col gap-1">
+                    <div class="flex items-center gap-2">
+                        <p>{{ $t('ALERT_MANAGER.NOTIFICATIONS.DAY') }}:</p>
+                        <p-badge badge-type="solid-outline"
+                                 :style-type="getScheduleInfo(props.channelData.schedule).styleType"
+                        >
+                            {{ getScheduleInfo(props.channelData.schedule).value }}
+                        </p-badge>
+                        <p>{{ getScheduleInfo(props.channelData.schedule).days }}</p>
+                    </div>
+                    <p>{{ $t('ALERT_MANAGER.NOTIFICATIONS.TIME') }}: {{ getScheduleInfo(props.channelData.schedule).time }}</p>
+                    <p class="text-gray-500">
+                        {{ $t('ALERT_MANAGER.TIMEZONE') }}: {{ getScheduleInfo(props.channelData.schedule).timezone }}
+                    </p>
                 </div>
             </div>
             <button class="edit-button"

From f6f90edeb45472cfec7e84ff46f0694c6d56e9cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=84=8B=E1=85=B5=E1=84=89=E1=85=B3=E1=86=BC=E1=84=8B?=
 =?UTF-8?q?=E1=85=A7=E1=86=AB?= <sylee1274@mz.co.kr>
Date: Fri, 9 May 2025 16:34:24 +0900
Subject: [PATCH 04/15] fix: fix incorrect v1/v2 branching logic using
 globalConfig
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 이승연 <sylee1274@mz.co.kr>
---
 .../my-page/components/NotificationChannelItemSchedule.vue    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/web/src/services/my-page/components/NotificationChannelItemSchedule.vue b/apps/web/src/services/my-page/components/NotificationChannelItemSchedule.vue
index dd4d6841a2..68b24921ce 100644
--- a/apps/web/src/services/my-page/components/NotificationChannelItemSchedule.vue
+++ b/apps/web/src/services/my-page/components/NotificationChannelItemSchedule.vue
@@ -18,6 +18,7 @@ import { i18n } from '@/translations';
 
 import { useUserStore } from '@/store/user/user-store';
 
+import { useGlobalConfigUiAffectsSchema } from '@/lib/config/global-config/composables/use-global-config-ui-affects-schema';
 import { showSuccessMessage } from '@/lib/helper/notice-alert-helper';
 
 import type { DayType, ScheduleSettingFormType } from '@/common/components/schedule-setting-form/schedule-setting-form';
@@ -46,7 +47,9 @@ const emit = defineEmits<{(event: 'change'): void;
 
 const userStore = useUserStore();
 const timezoneForFormatter = computed<string|undefined>(() => userStore.state.timezone).value;
+const alertManagerUiAffectSchema = useGlobalConfigUiAffectsSchema('ALERT_MANAGER');
 const state = reactive({
+    visibleUserNotification: computed<boolean>(() => alertManagerUiAffectSchema.value?.visibleUserNotification ?? false),
     scheduleModeForEdit: props.channelData.is_scheduled,
     scheduleForEdit: props.channelData.schedule,
     isScheduleValid: false,
@@ -198,6 +201,7 @@ const getScheduleInfo = (schedule: ScheduleSettingFormType) => {
         >
             <notification-add-schedule :schedule="props.channelData.schedule"
                                        :is-scheduled="props.channelData.is_scheduled"
+                                       :visible-user-notification="state.visibleUserNotification"
                                        @changeV1="onChangeScheduleV1"
                                        @change="onChangeSchedule"
             />

From 669c20a6528cea0b64abc7a608d9d0509c9271e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=84=8B=E1=85=B5=E1=84=89=E1=85=B3=E1=86=BC=E1=84=8B?=
 =?UTF-8?q?=E1=85=A7=E1=86=AB?= <sylee1274@mz.co.kr>
Date: Fri, 9 May 2025 16:38:49 +0900
Subject: [PATCH 05/15] feat: update languages about days
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 이승연 <sylee1274@mz.co.kr>
---
 ...erGroupManagementTabNotificationChannel.vue | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/apps/web/src/services/iam/components/UserGroupManagementTabNotificationChannel.vue b/apps/web/src/services/iam/components/UserGroupManagementTabNotificationChannel.vue
index 5295513c8a..637bdbb9d6 100644
--- a/apps/web/src/services/iam/components/UserGroupManagementTabNotificationChannel.vue
+++ b/apps/web/src/services/iam/components/UserGroupManagementTabNotificationChannel.vue
@@ -84,8 +84,8 @@ const storeState = reactive({
 const tableState = reactive({
     fields: computed(() => [
         { name: 'name', label: 'Name', width: '350px' },
-        { name: 'channel_id', label: 'Channel', width: '230px' },
-        { name: 'day', label: 'Day', width: '337px' },
+        { name: 'channel_id', label: 'Channel', width: '240px' },
+        { name: 'day', label: 'Day', width: '327px' },
         { name: 'time', label: 'Time', width: '116px' },
         { name: 'timeZone', label: 'Time Zone', width: '250px' },
     ]),
@@ -123,13 +123,13 @@ const state = reactive({
         value: protocol.protocol_id,
     })) ?? []),
     dayMapping: computed<Record<DayType, TranslateResult>>(() => ({
-        MON: i18n.t('ALERT_MANAGER.NOTIFICATIONS.MONDAY'),
-        TUE: i18n.t('ALERT_MANAGER.NOTIFICATIONS.TUESDAY'),
-        WED: i18n.t('ALERT_MANAGER.NOTIFICATIONS.WEDNESDAY'),
-        THU: i18n.t('ALERT_MANAGER.NOTIFICATIONS.THURSDAY'),
-        FRI: i18n.t('ALERT_MANAGER.NOTIFICATIONS.FRIDAY'),
-        SAT: i18n.t('ALERT_MANAGER.NOTIFICATIONS.SATURDAY'),
-        SUN: i18n.t('ALERT_MANAGER.NOTIFICATIONS.SUNDAY'),
+        MON: i18n.t('COMMON.SCHEDULE_SETTING.MON'),
+        TUE: i18n.t('COMMON.SCHEDULE_SETTING.TUE'),
+        WED: i18n.t('COMMON.SCHEDULE_SETTING.WED'),
+        THU: i18n.t('COMMON.SCHEDULE_SETTING.THU'),
+        FRI: i18n.t('COMMON.SCHEDULE_SETTING.FRI'),
+        SAT: i18n.t('COMMON.SCHEDULE_SETTING.SAT'),
+        SUN: i18n.t('COMMON.SCHEDULE_SETTING.SUN'),
     })),
 });
 

From 057cbf8929fade36234252d95cd09e40b7dc2d47 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: Tue, 13 May 2025 10:01:14 +0900
Subject: [PATCH 06/15] chore(budget-qa): update about minor additional QA
 (#5845)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: update value handler about service account manager

Signed-off-by: seungyeoneeee <sylee1274@mz.co.kr>

* feat: update languages

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

* fix: improved clarity by refining awkward expressions

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

---------

Signed-off-by: seungyeoneeee <sylee1274@mz.co.kr>
Signed-off-by: 이승연 <sylee1274@mz.co.kr>
---
 .../components/BudgetCreateStep3.vue          |  2 +-
 .../BudgetLastThreeMonthCostTrendBarChart.vue |  6 +-----
 .../dynamic-layout-schema-template.ts         |  4 ++++
 .../console-translation-2.8.babel             | 20 +++++++++----------
 packages/language-pack/en.json                |  4 ++--
 packages/language-pack/ja.json                |  4 ++--
 packages/language-pack/ko.json                |  4 ++--
 7 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/apps/web/src/services/cost-explorer/components/BudgetCreateStep3.vue b/apps/web/src/services/cost-explorer/components/BudgetCreateStep3.vue
index 6c987a4093..91a2d2a4c0 100644
--- a/apps/web/src/services/cost-explorer/components/BudgetCreateStep3.vue
+++ b/apps/web/src/services/cost-explorer/components/BudgetCreateStep3.vue
@@ -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);
     });
diff --git a/apps/web/src/services/cost-explorer/components/BudgetLastThreeMonthCostTrendBarChart.vue b/apps/web/src/services/cost-explorer/components/BudgetLastThreeMonthCostTrendBarChart.vue
index 353bf30c87..7e96db6154 100644
--- a/apps/web/src/services/cost-explorer/components/BudgetLastThreeMonthCostTrendBarChart.vue
+++ b/apps/web/src/services/cost-explorer/components/BudgetLastThreeMonthCostTrendBarChart.vue
@@ -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"
diff --git a/apps/web/src/services/service-account/helpers/dynamic-ui-schema-generator/dynamic-layout-schema-template.ts b/apps/web/src/services/service-account/helpers/dynamic-ui-schema-generator/dynamic-layout-schema-template.ts
index d5e6d73848..d619ad6c4e 100644
--- a/apps/web/src/services/service-account/helpers/dynamic-ui-schema-generator/dynamic-layout-schema-template.ts
+++ b/apps/web/src/services/service-account/helpers/dynamic-ui-schema-generator/dynamic-layout-schema-template.ts
@@ -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',
diff --git a/packages/language-pack/console-translation-2.8.babel b/packages/language-pack/console-translation-2.8.babel
index ff0b887c4a..7cb3592e57 100644
--- a/packages/language-pack/console-translation-2.8.babel
+++ b/packages/language-pack/console-translation-2.8.babel
@@ -13174,7 +13174,7 @@
                                                         </translations>
                                                     </concept_node>
                                                     <concept_node>
-                                                        <name>LAST_COST_TREND</name>
+                                                        <name>MONTHLY</name>
                                                         <definition_loaded>false</definition_loaded>
                                                         <description/>
                                                         <comment/>
@@ -13195,7 +13195,7 @@
                                                         </translations>
                                                     </concept_node>
                                                     <concept_node>
-                                                        <name>MONTHLY</name>
+                                                        <name>MONTHLY_BUDGET_ALLOCATION</name>
                                                         <definition_loaded>false</definition_loaded>
                                                         <description/>
                                                         <comment/>
@@ -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/>
@@ -13237,7 +13237,7 @@
                                                         </translations>
                                                     </concept_node>
                                                     <concept_node>
-                                                        <name>MONTHLY_GROWTH_RATE</name>
+                                                        <name>OTHERS</name>
                                                         <definition_loaded>false</definition_loaded>
                                                         <description/>
                                                         <comment/>
@@ -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/>
@@ -13279,7 +13279,7 @@
                                                         </translations>
                                                     </concept_node>
                                                     <concept_node>
-                                                        <name>PREVIOUS</name>
+                                                        <name>PREVIOUS_PERIOD_SPEND</name>
                                                         <definition_loaded>false</definition_loaded>
                                                         <description/>
                                                         <comment/>
diff --git a/packages/language-pack/en.json b/packages/language-pack/en.json
index e0ffe2ee3d..32c062e1a8 100644
--- a/packages/language-pack/en.json
+++ b/packages/language-pack/en.json
@@ -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}",
@@ -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",
diff --git a/packages/language-pack/ja.json b/packages/language-pack/ja.json
index 28a51bbed3..34109b58c6 100644
--- a/packages/language-pack/ja.json
+++ b/packages/language-pack/ja.json
@@ -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}",
@@ -722,7 +722,7 @@
 						"STEP1_DESC": "支出を簡単に追跡・管理するために予算を設定しましょう。",
 						"STEP2_DESCRIPTION": "通貨と予算サイクルを設定して予算を作成します。",
 						"STEP3_DESCRIPTION": "実際の支出が閾値を超えた際にアラートを受け取ります。",
-						"THRESHOLD_INVALID_TEXT": "アラート基準額の入力が必要です。",
+						"THRESHOLD_INVALID_TEXT": "金額が未入力または重複していないか確認してください。",
 						"WORKSPACE_OWNERS": "ワークスペースのオーナー"
 					},
 					"CREATE_BUDGET": "予算作成",
diff --git a/packages/language-pack/ko.json b/packages/language-pack/ko.json
index 501e7f1055..bf88f6901d 100644
--- a/packages/language-pack/ko.json
+++ b/packages/language-pack/ko.json
@@ -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}",
@@ -722,7 +722,7 @@
 						"STEP1_DESC": "예산을 간편하게 설정하여 클라우드 비용을 추적하고 관리하세요.",
 						"STEP2_DESCRIPTION": "통화 및 예산 주기를 설정하여 예산을 생성하세요.",
 						"STEP3_DESCRIPTION": "실제 지출이 임계값을 초과하면 알림을 받습니다.",
-						"THRESHOLD_INVALID_TEXT": "알림 기준 금액을 입력해 주세요.",
+						"THRESHOLD_INVALID_TEXT": "금액이 비어 있거나 중복되지 않았는지 확인해 주세요.",
 						"WORKSPACE_OWNERS": "워크스페이스 소유자"
 					},
 					"CREATE_BUDGET": "예산 생성",

From 4a4d9d464858ded6941bb7334af3da256bccf76d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=84=8B=E1=85=B5=E1=84=89=E1=85=B3=E1=86=BC=E1=84=8B?=
 =?UTF-8?q?=E1=85=A7=E1=86=AB?= <sylee1274@mz.co.kr>
Date: Tue, 13 May 2025 11:28:50 +0900
Subject: [PATCH 07/15] feat: fix major bug about service list pagination
 improvement
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 이승연 <sylee1274@mz.co.kr>
---
 .../v2/components/ServiceList.vue             | 120 +++++++++++-------
 1 file changed, 72 insertions(+), 48 deletions(-)

diff --git a/apps/web/src/services/alert-manager/v2/components/ServiceList.vue b/apps/web/src/services/alert-manager/v2/components/ServiceList.vue
index 8768009464..4b41f055d1 100644
--- a/apps/web/src/services/alert-manager/v2/components/ServiceList.vue
+++ b/apps/web/src/services/alert-manager/v2/components/ServiceList.vue
@@ -10,6 +10,7 @@ import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper';
 import {
     PToolbox, PDataLoader, PEmpty, PButton, PPagination,
 } from '@cloudforet/mirinae';
+import type { QueryTag } from '@cloudforet/mirinae/types/controls/search/query-search-tags/type';
 import type { ToolboxOptions } from '@cloudforet/mirinae/types/controls/toolbox/type';
 
 import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list';
@@ -61,7 +62,17 @@ const queryTagHelper = useQueryTags({ keyItemSets: SERVICE_SEARCH_HANDLER.keyIte
 const { queryTags } = queryTagHelper;
 
 const handleToolbox = async (options: ToolboxOptions) => {
-    if (options.queryTags !== undefined) queryTagHelper.setQueryTags(options.queryTags);
+    if (options.queryTags !== undefined) {
+        queryTagHelper.setQueryTags(options.queryTags);
+
+        const nameTags = options.queryTags.filter((tag) => tag.key?.name === 'name');
+        const names = nameTags.map((tag) => tag.value?.name).filter(Boolean);
+
+        replaceUrlQuery({
+            ...route.query,
+            serviceName: names.length ? names : undefined,
+        });
+    }
     await fetchBothLists();
 };
 
@@ -155,7 +166,7 @@ const handleNavigateToDetail = (serviceId: string) => {
 };
 
 onMounted(async () => {
-    const { unhealthyPage, healthyPage } = route.query;
+    const { unhealthyPage, healthyPage, serviceName } = route.query;
 
     let parsedUnhealthy = parseInt(unhealthyPage as string);
     let parsedHealthy = parseInt(healthyPage as string);
@@ -166,20 +177,30 @@ onMounted(async () => {
     serviceListPageStore.setUnhealthyPage(parsedUnhealthy);
     serviceListPageStore.setHealthyPage(parsedHealthy);
 
-    await fetchBothLists();
-});
-
-watch(() => route.query.serviceName, async (serviceName) => {
-    if (!serviceName) return;
-    queryTagHelper.setQueryTags([
-        {
+    // eslint-disable-next-line no-nested-ternary
+    const serviceNames = serviceName ? (Array.isArray(serviceName) ? serviceName : [serviceName]) : [];
+    if (serviceNames.length) {
+        const tags: QueryTag[] = serviceNames.map((name) => ({
             key: { name: 'name', label: 'Name' },
             operator: '=',
-            value: { label: serviceName as string, name: serviceName },
-        },
-    ]);
+            value: { label: name ?? '', name: name ?? '' },
+        }));
+        queryTagHelper.setQueryTags(tags);
+    }
+
     await fetchBothLists();
+});
+
+watch(() => queryTags.value, (tags) => {
+    const nameTags = tags.filter((tag) => tag.key?.name === 'name');
+    const names = nameTags.map((tag) => tag.value?.name).filter(Boolean);
+
+    replaceUrlQuery({
+        ...route.query,
+        serviceName: names.length ? names : undefined,
+    });
 }, { immediate: true });
+
 watch(() => serviceListPageStore.unhealthyThisPage, (val) => {
     replaceUrlQuery({
         unhealthyPage: String(val),
@@ -212,10 +233,12 @@ watch(() => serviceListPageStore.healthyThisPage, (val) => {
         />
 
         <section>
-            <p-data-loader :loading="state.loading"
-                           :data="state.alertServiceList"
-                           loader-backdrop-color="transparent"
-                           class="loader-wrapper"
+            <p-data-loader
+                :loading="state.loading"
+                :data="state.alertServiceList"
+                loader-backdrop-color="transparent"
+                disable-empty-case
+                class="loader-wrapper"
             >
                 <div>
                     <service-list-content v-if="state.alertServiceList.length > 0"
@@ -225,6 +248,7 @@ watch(() => serviceListPageStore.healthyThisPage, (val) => {
                     />
                     <div class="flex justify-center mt-4">
                         <p-pagination
+                            v-if="state.totalCount > 0"
                             :total-count="state.totalCount"
                             :this-page.sync="serviceListPageStore.unhealthyThisPage"
                             :page-size.sync="serviceListPageStore.unhealthyPageSize"
@@ -232,6 +256,15 @@ watch(() => serviceListPageStore.healthyThisPage, (val) => {
                         />
                     </div>
                 </div>
+            </p-data-loader>
+
+            <p-data-loader
+                :loading="state.healthyLoading"
+                :data="state.healthyServiceList"
+                loader-backdrop-color="transparent"
+                disable-empty-case
+                class="loader-wrapper"
+            >
                 <div>
                     <service-list-content v-if="state.healthyServiceList.length > 0"
                                           :list="state.healthyServiceList"
@@ -239,7 +272,7 @@ watch(() => serviceListPageStore.healthyThisPage, (val) => {
                                           @navigate-to-detail="handleNavigateToDetail"
                     />
                     <div class="flex justify-center mt-4">
-                        <p-pagination v-if="state.healthyTotalCount > serviceListPageStore.healthyPageSize"
+                        <p-pagination v-if="state.healthyTotalCount > 0"
                                       :total-count="state.healthyTotalCount"
                                       :this-page.sync="serviceListPageStore.healthyThisPage"
                                       :page-size.sync="serviceListPageStore.healthyPageSize"
@@ -247,38 +280,29 @@ watch(() => serviceListPageStore.healthyThisPage, (val) => {
                         />
                     </div>
                 </div>
-                <template #no-data>
-                    <div class="pt-12">
-                        <p-empty show-image
-                                 :show-button="hasReadWriteAccess"
-                        >
-                            <template #image>
-                                <img src="../../../../assets/images/img_jellyocto-with-a-telescope.png"
-                                     alt="empty-image"
-                                >
-                            </template>
-                            <template v-if="hasReadWriteAccess"
-                                      #button
-                            >
-                                <p-button icon-left="ic_plus_bold"
-                                          @click="handleClickCreateButton"
-                                >
-                                    {{ $t('ALERT_MANAGER.SERVICE.NO_DATA') }}
-                                </p-button>
-                            </template>
-                            {{ $t('ALERT_MANAGER.SERVICE.NO_DATA_DESC') }}
-                        </p-empty>
-                    </div>
-                </template>
             </p-data-loader>
+
+            <div v-if="!state.loading && !state.healthyLoading && state.alertServiceList.length === 0 && state.healthyServiceList.length === 0">
+                <p-empty show-image
+                         :show-button="hasReadWriteAccess"
+                >
+                    <template #image>
+                        <img src="../../../../assets/images/img_jellyocto-with-a-telescope.png"
+                             alt="empty-image"
+                        >
+                    </template>
+                    <template v-if="hasReadWriteAccess"
+                              #button
+                    >
+                        <p-button icon-left="ic_plus_bold"
+                                  @click="handleClickCreateButton"
+                        >
+                            {{ $t('ALERT_MANAGER.SERVICE.NO_DATA') }}
+                        </p-button>
+                    </template>
+                    {{ $t('ALERT_MANAGER.SERVICE.NO_DATA_DESC') }}
+                </p-empty>
+            </div>
         </section>
     </div>
 </template>
-
-<style scoped lang="postcss">
-.service-list {
-    .loader-wrapper {
-        min-height: 13.75rem;
-    }
-}
-</style>

From 3b38a0a21fb00f3665e86db6dddd9db9b542e456 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=84=8B=E1=85=B5=E1=84=89=E1=85=B3=E1=86=BC=E1=84=8B?=
 =?UTF-8?q?=E1=85=A7=E1=86=AB?= <sylee1274@mz.co.kr>
Date: Tue, 13 May 2025 11:31:45 +0900
Subject: [PATCH 08/15] feat: update css style as design
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 이승연 <sylee1274@mz.co.kr>
---
 .../src/services/alert-manager/v2/components/ServiceList.vue  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/web/src/services/alert-manager/v2/components/ServiceList.vue b/apps/web/src/services/alert-manager/v2/components/ServiceList.vue
index 4b41f055d1..83c9e991c5 100644
--- a/apps/web/src/services/alert-manager/v2/components/ServiceList.vue
+++ b/apps/web/src/services/alert-manager/v2/components/ServiceList.vue
@@ -282,7 +282,9 @@ watch(() => serviceListPageStore.healthyThisPage, (val) => {
                 </div>
             </p-data-loader>
 
-            <div v-if="!state.loading && !state.healthyLoading && state.alertServiceList.length === 0 && state.healthyServiceList.length === 0">
+            <div v-if="!state.loading && !state.healthyLoading && state.alertServiceList.length === 0 && state.healthyServiceList.length === 0"
+                 class="mt-4"
+            >
                 <p-empty show-image
                          :show-button="hasReadWriteAccess"
                 >

From 11eb632d845b58f8aacf161d177fd2315e08ff20 Mon Sep 17 00:00:00 2001
From: nayeongkim <nayeongkim@megazone.com>
Date: Tue, 13 May 2025 17:29:30 +0900
Subject: [PATCH 09/15] chore: update translations

Signed-off-by: NaYeong,Kim <nayeongkim@megazone.com>
---
 .../console-translation-2.8.babel             | 10 +++---
 packages/language-pack/ja.json                | 32 +++++++++----------
 packages/language-pack/ko.json                | 30 ++++++++---------
 3 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/packages/language-pack/console-translation-2.8.babel b/packages/language-pack/console-translation-2.8.babel
index ff0b887c4a..70591c7841 100644
--- a/packages/language-pack/console-translation-2.8.babel
+++ b/packages/language-pack/console-translation-2.8.babel
@@ -12593,11 +12593,11 @@
                                                             </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>
@@ -62547,15 +62547,15 @@
                                                 <translations>
                                                     <translation>
                                                         <language>en-US</language>
-                                                        <approved>true</approved>
+                                                        <approved>false</approved>
                                                     </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>
diff --git a/packages/language-pack/ja.json b/packages/language-pack/ja.json
index 28a51bbed3..8214cb30a1 100644
--- a/packages/language-pack/ja.json
+++ b/packages/language-pack/ja.json
@@ -399,7 +399,7 @@
 		},
 		"TOP_NOTI": {
 			"NO_WORKSPACE": "あなたはどのワークスペースにも所属していません。管理者にアクセスを要求してください。",
-			"PERMISSION_DENIED": "Permission denied. Please, Contact administrator to get a role."
+			"PERMISSION_DENIED": "権限がありません。役割を取得するには管理者に連絡してください。"
 		}
 	},
 	"AUTH": {
@@ -665,7 +665,7 @@
 						"WORKSPACE": "ワークスペース"
 					},
 					"BUDGET_DETAILS": {
-						"TITLE": ""
+						"TITLE": "予算の詳細"
 					},
 					"CANCEL": "取消",
 					"CONFIRM": "確認",
@@ -674,10 +674,10 @@
 						"ADD_RECIPIENTS_TEXT": "他の受信者に加えて、アラートは常に予算管理者に送信されます:",
 						"ADD_THRESHOLD": "閾値を追加",
 						"ALERT_RECIPIENTS": "アラートの受信者",
-						"AMOUNT_EACH_MONTH": "",
-						"APPLY_THE_SAME_AMOUNT": "",
-						"BASE_FOR_PERIOD_FILTER": "",
-						"BUDGET_AMOUNT": "",
+						"AMOUNT_EACH_MONTH": "月ごとの金額",
+						"APPLY_THE_SAME_AMOUNT": "毎月同じ金額を適用",
+						"BASE_FOR_PERIOD_FILTER": "期間フィルター基準",
+						"BUDGET_AMOUNT": "予算金額",
 						"BUDGET_CYCLE": "予算サイクル",
 						"BUDGET_CYCLE_DESCRIPTION": "まず上のセクションで開始月と終了月を設定してください。",
 						"BUDGET_MANAGER": "予算管理者",
@@ -688,30 +688,30 @@
 						"DEFAULT": "デフォルト",
 						"EDIT_BUDGET_MANAGER": "予算管理者を編集",
 						"END_MONTH": "終了月",
-						"ENTER_MANUALLY": "",
+						"ENTER_MANUALLY": "手動で入力",
 						"EXCEEDS_AMOUNT": "アラート基準額",
 						"EXCEEDS_AMOUNT_DESCRIPTION": "実際の支出が基準を超えた際に通知される金額を入力してください。",
 						"EXCHANGE_RATE_SOURCE": "為替基準",
 						"FIXED_TERM": "固定期間",
-						"INCRASE_BY_SPECIFIC_PERCENTAGE": "",
-						"INITIAL_AMOUNT": "",
+						"INCRASE_BY_SPECIFIC_PERCENTAGE": "毎月特定の割合で増加",
+						"INITIAL_AMOUNT": "初期金額",
 						"LAST_COST_TREND": "過去{count}か月のコスト推移",
 						"MONTHLY": "月次",
-						"MONTHLY_BUDGET_ALLOCATION": "",
-						"MONTHLY_GROWTH_RATE": "",
+						"MONTHLY_BUDGET_ALLOCATION": "月ごとの予算配分",
+						"MONTHLY_GROWTH_RATE": "月次成長率",
 						"OTHERS": "その他",
 						"PREVIOUS": "前へ",
 						"PROJECT": "プロジェクト",
 						"PROJECT_DUPLICATED_WARNING1": "プロジェクト「{project}」には、すでに以下の月の予算が設定されています：{month_list}",
 						"PROJECT_DUPLICATED_WARNING2": "プロジェクト「{project}」のサービスアカウント「{serviceAccount}」には、すでに以下の月の予算が設定されています：{month_list}",
 						"PROJECT_MEMBER": "プロジェクトメンバー",
-						"PROJECT_VALIDATION": "",
+						"PROJECT_VALIDATION": "このプロジェクトはすでに使用されています",
 						"REQUIRED_NAME": "名前を入力してください",
 						"RESET_DATE": "",
 						"SCOPE": "スコープ",
 						"SELECT_MONTH": "月を選択",
 						"SERVICE_ACCOUNT": "サービスアカウント",
-						"SERVICE_ACCOUNT_MANAGERS": "",
+						"SERVICE_ACCOUNT_MANAGERS": "サービスアカウントマネージャー",
 						"SET": "設定",
 						"SET_ALERT_THRESHOLD": "アラートのしきい値を設定",
 						"SET_BUDGET_ALERTS": "予算アラートを設定",
@@ -738,12 +738,12 @@
 					"ASC": "昇順",
 					"BUDGET": "予算",
 					"BUDGETED": "予算",
-					"BUDGET_CYCLE": "",
+					"BUDGET_CYCLE": "予算周期",
 					"BUDGET_DELETE_DESC": "選択した予算を本当に削除しますか？",
 					"BUDGET_EXCEEDED": "予算超過",
 					"BUDGET_NAME": "予算名",
 					"BUDGET_SPENT_USAGE": "{percent}% 以上使用",
-					"BUDGET_STATUS": "",
+					"BUDGET_STATUS": "予算状況",
 					"COST_TYPE": "コストタイプ",
 					"CREATE": "予算作成",
 					"CREATE_BUDGET": "予算作成",
@@ -754,7 +754,7 @@
 					"DESC": "降順",
 					"EDIT": "編集",
 					"EXCEEDED": "を超えています",
-					"EXCEEDED_BUDGET": "",
+					"EXCEEDED_BUDGET": "予算超過",
 					"EXPIRED": "期限切れ",
 					"FILTER": "フィルター",
 					"FIXED_TERM": "固定期間",
diff --git a/packages/language-pack/ko.json b/packages/language-pack/ko.json
index 501e7f1055..b1e5453088 100644
--- a/packages/language-pack/ko.json
+++ b/packages/language-pack/ko.json
@@ -665,7 +665,7 @@
 						"WORKSPACE": "워크스페이스"
 					},
 					"BUDGET_DETAILS": {
-						"TITLE": ""
+						"TITLE": "예산 상세"
 					},
 					"CANCEL": "취소",
 					"CONFIRM": "확인",
@@ -674,10 +674,10 @@
 						"ADD_RECIPIENTS_TEXT": "예산 담당자는 다른 수신자 설정 여부와 관계없이 항상 알림을 받습니다:",
 						"ADD_THRESHOLD": "임계값 추가",
 						"ALERT_RECIPIENTS": "얼럿 수신처",
-						"AMOUNT_EACH_MONTH": "",
-						"APPLY_THE_SAME_AMOUNT": "",
-						"BASE_FOR_PERIOD_FILTER": "",
-						"BUDGET_AMOUNT": "",
+						"AMOUNT_EACH_MONTH": "월별 금액",
+						"APPLY_THE_SAME_AMOUNT": "매달 동일한 금액 적용",
+						"BASE_FOR_PERIOD_FILTER": "‘기간’ 필터 기준",
+						"BUDGET_AMOUNT": "예산 금액",
 						"BUDGET_CYCLE": "예산 주기",
 						"BUDGET_CYCLE_DESCRIPTION": "먼저 위 섹션에서 시작 월과 종료 월을 설정하세요.",
 						"BUDGET_MANAGER": "예산 관리자",
@@ -688,30 +688,30 @@
 						"DEFAULT": "기본",
 						"EDIT_BUDGET_MANAGER": "예산 관리자 변경",
 						"END_MONTH": "종료 월",
-						"ENTER_MANUALLY": "",
+						"ENTER_MANUALLY": "직접 입력",
 						"EXCEEDS_AMOUNT": "알림 임계값",
 						"EXCEEDS_AMOUNT_DESCRIPTION": "실제 지출이 이를 초과할 경우 알림이 전송될 금액을 입력하세요.",
 						"EXCHANGE_RATE_SOURCE": "환율 기준",
 						"FIXED_TERM": "고정 예산",
-						"INCRASE_BY_SPECIFIC_PERCENTAGE": "",
-						"INITIAL_AMOUNT": "",
+						"INCRASE_BY_SPECIFIC_PERCENTAGE": "매달 지정된 %만큼 증가",
+						"INITIAL_AMOUNT": "초기 금액",
 						"LAST_COST_TREND": "최근 {count}개월 비용 추이",
 						"MONTHLY": "월별 예산",
-						"MONTHLY_BUDGET_ALLOCATION": "",
-						"MONTHLY_GROWTH_RATE": "",
+						"MONTHLY_BUDGET_ALLOCATION": "월간 예산 할당",
+						"MONTHLY_GROWTH_RATE": "월간 성장률",
 						"OTHERS": "이외 사용자",
 						"PREVIOUS": "뒤로가기",
 						"PROJECT": "프로젝트",
 						"PROJECT_DUPLICATED_WARNING1": " {project} 프로젝트에는 이미 해당 월들에 대한 예산이 설정되어 있습니다: {month_list}",
 						"PROJECT_DUPLICATED_WARNING2": "프로젝트 {project} 의 서비스 어카운트 {serviceAccount} 에는 이미 해당 월(들)에 대한 예산이 설정되어 있습니다: {month_list}",
 						"PROJECT_MEMBER": "프로젝트 멤버",
-						"PROJECT_VALIDATION": "",
+						"PROJECT_VALIDATION": "해당 프로젝트는 이미 사용 중입니다.",
 						"REQUIRED_NAME": "이름을 입력하세요.",
 						"RESET_DATE": "",
 						"SCOPE": "범위",
 						"SELECT_MONTH": "월 선택",
 						"SERVICE_ACCOUNT": "서비스 어카운트",
-						"SERVICE_ACCOUNT_MANAGERS": "",
+						"SERVICE_ACCOUNT_MANAGERS": "서비스 계정 담당자",
 						"SET": "설정",
 						"SET_ALERT_THRESHOLD": "알림 임계값 설정",
 						"SET_BUDGET_ALERTS": "예산 알림 설정",
@@ -738,12 +738,12 @@
 					"ASC": "오름차순",
 					"BUDGET": "예산",
 					"BUDGETED": "책정된 예산",
-					"BUDGET_CYCLE": "",
+					"BUDGET_CYCLE": "예산 주기",
 					"BUDGET_DELETE_DESC": "선택한 예산을 삭제 하시겠습니까?",
 					"BUDGET_EXCEEDED": "예산 초과됨",
 					"BUDGET_NAME": "예산명",
 					"BUDGET_SPENT_USAGE": "{percent}% 이상 사용됨",
-					"BUDGET_STATUS": "",
+					"BUDGET_STATUS": "예산 상태",
 					"COST_TYPE": "비용 발생 기준",
 					"CREATE": "예산 생성",
 					"CREATE_BUDGET": "예산 생성",
@@ -754,7 +754,7 @@
 					"DESC": "내림차순",
 					"EDIT": "편집",
 					"EXCEEDED": "초과됨",
-					"EXCEEDED_BUDGET": "",
+					"EXCEEDED_BUDGET": "예산 초과",
 					"EXPIRED": "만료됨",
 					"FILTER": "\u001d필터",
 					"FIXED_TERM": "고정 예산",

From 66ebf56160b5dde87e7ab7ee0b303734d364ddc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?NaYeong=2CKim=28=EA=B9=80=EB=82=98=EC=98=81=29?=
 <nayeongkim@megazone.com>
Date: Thu, 15 May 2025 22:10:59 +0900
Subject: [PATCH 10/15] chore: update translations

Signed-off-by: NaYeong,Kim <nayeongkim@megazone.com>
---
 .../console-translation-2.8.babel             | 135 +++----
 packages/language-pack/en.json                |   3 +-
 packages/language-pack/ja.json                | 333 +++++++++---------
 packages/language-pack/ko.json                |  35 +-
 4 files changed, 241 insertions(+), 265 deletions(-)

diff --git a/packages/language-pack/console-translation-2.8.babel b/packages/language-pack/console-translation-2.8.babel
index c25c9367ad..b6846f01b5 100644
--- a/packages/language-pack/console-translation-2.8.babel
+++ b/packages/language-pack/console-translation-2.8.babel
@@ -73,15 +73,15 @@
                                 <translations>
                                     <translation>
                                         <language>en-US</language>
-                                        <approved>false</approved>
+                                        <approved>true</approved>
                                     </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>
@@ -346,15 +346,15 @@
                                 <translations>
                                     <translation>
                                         <language>en-US</language>
-                                        <approved>false</approved>
+                                        <approved>true</approved>
                                     </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>
@@ -556,15 +556,15 @@
                                 <translations>
                                     <translation>
                                         <language>en-US</language>
-                                        <approved>false</approved>
+                                        <approved>true</approved>
                                     </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>
@@ -598,15 +598,15 @@
                                 <translations>
                                     <translation>
                                         <language>en-US</language>
-                                        <approved>false</approved>
+                                        <approved>true</approved>
                                     </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>
@@ -661,15 +661,15 @@
                                 <translations>
                                     <translation>
                                         <language>en-US</language>
-                                        <approved>false</approved>
+                                        <approved>true</approved>
                                     </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>
@@ -1039,15 +1039,15 @@
                                 <translations>
                                     <translation>
                                         <language>en-US</language>
-                                        <approved>false</approved>
+                                        <approved>true</approved>
                                     </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>
@@ -1144,15 +1144,15 @@
                                 <translations>
                                     <translation>
                                         <language>en-US</language>
-                                        <approved>false</approved>
+                                        <approved>true</approved>
                                     </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>
@@ -1375,15 +1375,15 @@
                                 <translations>
                                     <translation>
                                         <language>en-US</language>
-                                        <approved>false</approved>
+                                        <approved>true</approved>
                                     </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>
@@ -1459,15 +1459,15 @@
                                 <translations>
                                     <translation>
                                         <language>en-US</language>
-                                        <approved>false</approved>
+                                        <approved>true</approved>
                                     </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>
@@ -1947,15 +1947,15 @@
                                 <translations>
                                     <translation>
                                         <language>en-US</language>
-                                        <approved>false</approved>
+                                        <approved>true</approved>
                                     </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>
@@ -2456,15 +2456,15 @@
                                 <translations>
                                     <translation>
                                         <language>en-US</language>
-                                        <approved>false</approved>
+                                        <approved>true</approved>
                                     </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>
@@ -2477,15 +2477,15 @@
                                 <translations>
                                     <translation>
                                         <language>en-US</language>
-                                        <approved>false</approved>
+                                        <approved>true</approved>
                                     </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>
@@ -2498,15 +2498,15 @@
                                 <translations>
                                     <translation>
                                         <language>en-US</language>
-                                        <approved>false</approved>
+                                        <approved>true</approved>
                                     </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>
@@ -2519,15 +2519,15 @@
                                 <translations>
                                     <translation>
                                         <language>en-US</language>
-                                        <approved>false</approved>
+                                        <approved>true</approved>
                                     </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>
@@ -2561,15 +2561,15 @@
                                 <translations>
                                     <translation>
                                         <language>en-US</language>
-                                        <approved>false</approved>
+                                        <approved>true</approved>
                                     </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>
@@ -2582,15 +2582,15 @@
                                 <translations>
                                     <translation>
                                         <language>en-US</language>
-                                        <approved>false</approved>
+                                        <approved>true</approved>
                                     </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>
@@ -2603,15 +2603,15 @@
                                 <translations>
                                     <translation>
                                         <language>en-US</language>
-                                        <approved>false</approved>
+                                        <approved>true</approved>
                                     </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>
@@ -2624,15 +2624,15 @@
                                 <translations>
                                     <translation>
                                         <language>en-US</language>
-                                        <approved>false</approved>
+                                        <approved>true</approved>
                                     </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>
@@ -2645,15 +2645,15 @@
                                 <translations>
                                     <translation>
                                         <language>en-US</language>
-                                        <approved>false</approved>
+                                        <approved>true</approved>
                                     </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>
@@ -13425,27 +13425,6 @@
                                                             </translation>
                                                         </translations>
                                                     </concept_node>
-                                                    <concept_node>
-                                                        <name>RESET_DATE</name>
-                                                        <definition_loaded>false</definition_loaded>
-                                                        <description/>
-                                                        <comment/>
-                                                        <default_text/>
-                                                        <translations>
-                                                            <translation>
-                                                                <language>en-US</language>
-                                                                <approved>false</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>SCOPE</name>
                                                         <definition_loaded>false</definition_loaded>
diff --git a/packages/language-pack/en.json b/packages/language-pack/en.json
index 32c062e1a8..6b4d2c1de3 100644
--- a/packages/language-pack/en.json
+++ b/packages/language-pack/en.json
@@ -707,7 +707,6 @@
 						"PROJECT_MEMBER": "Project Member",
 						"PROJECT_VALIDATION": "The project is already in use.",
 						"REQUIRED_NAME": "Please enter name.",
-						"RESET_DATE": "",
 						"SCOPE": "Scope",
 						"SELECT_MONTH": "Select Month",
 						"SERVICE_ACCOUNT": "Service Account",
@@ -2349,7 +2348,7 @@
 				"UNCHECK_MODAL_HELP_TEXT_1": "This will affect the following widgets",
 				"UNCHECK_MODAL_HELP_TEXT_2": "which currently have options inherited by selected variable.",
 				"UNCHECK_MODAL_TITLE": "Not going to use this variable?",
-				"VALIDATION_NAME_REQUIRED": ""
+				"VALIDATION_NAME_REQUIRED": "Please enter name."
 			}
 		},
 		"DETAIL": {
diff --git a/packages/language-pack/ja.json b/packages/language-pack/ja.json
index 92fff27235..c9d6b2acf6 100644
--- a/packages/language-pack/ja.json
+++ b/packages/language-pack/ja.json
@@ -707,7 +707,6 @@
 						"PROJECT_MEMBER": "プロジェクトメンバー",
 						"PROJECT_VALIDATION": "このプロジェクトはすでに使用されています",
 						"REQUIRED_NAME": "名前を入力してください",
-						"RESET_DATE": "",
 						"SCOPE": "スコープ",
 						"SELECT_MONTH": "月を選択",
 						"SERVICE_ACCOUNT": "サービスアカウント",
@@ -1535,8 +1534,8 @@
 			"ALT_S_UPDATE": "個人情報編集完了",
 			"CONFIRM_PASSWORD": "パスワード確認",
 			"CURRENT_PASSWORD": "現在のパスワード",
-			"CURRENT_PASSWORD_INVALID": "",
-			"EDIT_ACCOUNT_INFO": "",
+			"CURRENT_PASSWORD_INVALID": "パスワードが正しくありません。",
+			"EDIT_ACCOUNT_INFO": "アカウント情報の編集",
 			"EMAIL": "メールアドレス",
 			"EMAIL_REQUIRED": "メールアドレスを入力してください",
 			"GROUP": "グループ/会社",
@@ -1552,7 +1551,7 @@
 			"PASSWORD": "パスワード",
 			"PASSWORD_CHECK": "パスワードの確認",
 			"PASSWORD_CHECK_INVALID": "同じパスワードを入力してください",
-			"PASSWORD_CHECK_TITLE": "",
+			"PASSWORD_CHECK_TITLE": "現在のパスワードを確認",
 			"PASSWORD_HELP_TEXT": "認証済みの通知専用メールアドレスがあるアカウントの場合に限り、パスワードリセットリンクの受信が可能です。",
 			"ROLE": "権限",
 			"SEND_LINK": "パスワードリセットメール送信",
@@ -1860,8 +1859,8 @@
 			},
 			"DEFAULT_WIDTH": "デフォルト幅",
 			"DELETE": "削除",
-			"DIMENSIONS": "",
-			"DIMENSIONS_DESC": "",
+			"DIMENSIONS": "ディメンション",
+			"DIMENSIONS_DESC": "最大3つまで選択して表示をカスタマイズできます。",
 			"DISPLAY_ANNOTATION": {
 				"DISPLAY_ANNOTATION": "追加情報",
 				"INVALID_VALUE": "情報を入力してください。",
@@ -2349,7 +2348,7 @@
 				"UNCHECK_MODAL_HELP_TEXT_1": "この変数を継承している",
 				"UNCHECK_MODAL_HELP_TEXT_2": "次のウィジェットに影響を与える可能性があります。",
 				"UNCHECK_MODAL_TITLE": "この変数を使用しないつもりですか？",
-				"VALIDATION_NAME_REQUIRED": ""
+				"VALIDATION_NAME_REQUIRED": "名前を入力してください"
 			}
 		},
 		"DETAIL": {
@@ -2663,7 +2662,7 @@
 					"SECURITY": "セキュリティ",
 					"SELECT_A_DATA_SOURCE": "データソースを選択",
 					"SELECT_DATA_SOURCE_TYPE": "データソースの種類を選択",
-					"UNIFIED_COST": ""
+					"UNIFIED_COST": "Unified Cost"
 				},
 				"STEP_2": {
 					"ADD_RULE": "ルールを追加",
@@ -2683,7 +2682,7 @@
 					"DATE_RANGE_INVALID_RANGE_TEXT": "開始日は終了日より前である必要があります。",
 					"DEPRECATED_OPTION": "非推奨オプション",
 					"DESCRIPTION": "説明",
-					"DIMENSIONS": "",
+					"DIMENSIONS": "ディメンション",
 					"DYNAMIC_FIELD": "ダイナミックフィールド",
 					"EDIT_DATA": "データを編集",
 					"END": "終了",
@@ -3572,7 +3571,7 @@
 				"SECRET_TYPE_LABEL": "暗号化キーのタイプ",
 				"SEE_MORE": "詳細はこちら",
 				"SERVICE_ACCOUNT": "サービスアカウント",
-				"SERVICE_ACCOUNT_MANAGER": "",
+				"SERVICE_ACCOUNT_MANAGER": "サービスアカウント管理者",
 				"TAB_INPUT": "直接入力",
 				"TAB_JSON": "JSONで入力",
 				"TAG_ADD": "タグ追加",
@@ -4535,12 +4534,12 @@
 		"MY_PAGE_ACCOUNT_PROFILE": "アカウント&プロフィール",
 		"MY_PAGE_API_KEY": "アクセス設定(API&CLI)",
 		"MY_PAGE_NOTIFICATIONS": "お知らせチャンネル",
-		"OPS_FLOW": "",
+		"OPS_FLOW": "オプスフロー",
 		"PROJECT": "プロジェクト",
 		"PROVIDER": "プロバイダー",
 		"SERVICE_ACCOUNT": "サービスアカウント",
-		"TASK_BOARD": "",
-		"TASK_MANAGEMENT": "",
+		"TASK_BOARD": "{task}ボード",
+		"TASK_MANAGEMENT": "タスク管理",
 		"WORKSPACE_HOME": "ホーム"
 	},
 	"MONITORING": {
@@ -4885,164 +4884,164 @@
 		"SPACEONE_USER": "SpaceONEユーザー"
 	},
 	"OPSFLOW": {
-		"ADD_TARGET": "",
-		"ALL_TASKS": "",
-		"ALT_E_ADD_TARGET": "",
-		"ALT_E_ASSIGN": "",
-		"ALT_E_CHANGE_DEFAULT_TARGET": "",
-		"ALT_E_CREATE_TARGET": "",
-		"ALT_E_DELETE_TARGET": "",
-		"ALT_E_EDIT_TARGET": "",
-		"ALT_E_UPDATE_TARGET": "",
-		"ALT_S_ADD_TARGET": "",
-		"ALT_S_ASSIGN": "",
-		"ALT_S_CHANGE_DEFAULT_TARGET": "",
-		"ALT_S_CREATE_TARGET": "",
-		"ALT_S_DELETE_TARGET": "",
-		"ALT_S_EDIT_TARGET": "",
-		"ALT_S_UPDATE_TARGET": "",
-		"ASSIGNEE": "",
-		"ASSIGNEE_POOL": "",
-		"CATEGORY": "",
-		"COLOR": "",
-		"CREATED_AT": "",
-		"CREATED_BY": "",
-		"CREATE_TARGET": "",
-		"DEFAULT": "",
-		"DELETE_TARGET": "",
-		"DELETE_TARGET_CONFIRMATION": "",
-		"DESCRIBE_FIELD": "",
-		"DESCRIPTION": "",
-		"EDIT_TARGET": "",
-		"FIELDS_CONFIG": "",
-		"FIELD_DESCRIPTION": "",
+		"ADD_TARGET": "{target}を追加",
+		"ALL_TASKS": "すべての{tasks}",
+		"ALT_E_ADD_TARGET": "{target}追加失敗",
+		"ALT_E_ASSIGN": "担当者割り当て失敗",
+		"ALT_E_CHANGE_DEFAULT_TARGET": "{target}の初期値変更に失敗しました。",
+		"ALT_E_CREATE_TARGET": "{target}作成失敗",
+		"ALT_E_DELETE_TARGET": "{target}削除失敗",
+		"ALT_E_EDIT_TARGET": "{target}変更失敗",
+		"ALT_E_UPDATE_TARGET": "{target}変更失敗",
+		"ALT_S_ADD_TARGET": "{target}追加完了",
+		"ALT_S_ASSIGN": "担当者割り当て完了",
+		"ALT_S_CHANGE_DEFAULT_TARGET": "{target}デフォルト値変更完了",
+		"ALT_S_CREATE_TARGET": "{target}作成完了",
+		"ALT_S_DELETE_TARGET": "{target}削除完了",
+		"ALT_S_EDIT_TARGET": "{target}変更完了",
+		"ALT_S_UPDATE_TARGET": "{target}変更完了",
+		"ASSIGNEE": "担当者",
+		"ASSIGNEE_POOL": "担当者プール",
+		"CATEGORY": "カテゴリ",
+		"COLOR": "色",
+		"CREATED_AT": "作成日",
+		"CREATED_BY": "作成者",
+		"CREATE_TARGET": "{target}作成",
+		"DEFAULT": "デフォルト",
+		"DELETE_TARGET": "{target}削除",
+		"DELETE_TARGET_CONFIRMATION": "この{object}{particle}を削除してもよろしいですか？",
+		"DESCRIBE_FIELD": "この{field}{particle}を簡潔に説明してください。",
+		"DESCRIPTION": "説明",
+		"EDIT_TARGET": "{target}を編集",
+		"FIELDS_CONFIG": "フィールド設定",
+		"FIELD_DESCRIPTION": "{field}の説明",
 		"FIELD_GENERATOR": {
-			"ASSET": "",
-			"DATE": "",
-			"DROPDOWN": "",
-			"ENTER_DEFAULT_DESCRIPTION": "",
-			"FIELD": "",
-			"FIELD_DELETE_DESC": "",
-			"FIELD_ID_EDIT_DESC": "",
-			"FIELD_NAME": "",
-			"FIELD_REQUIRED": "",
-			"FORM": "",
-			"GLOBAL": "",
-			"GROUP_TYPE": "",
-			"JSON": "",
-			"KEY": "",
-			"LABELS": "",
-			"PARAGRAPH": "",
-			"PROJECT": "",
-			"PROVIDER": "",
-			"REQUIRED": "",
-			"SERVICE_ACCOUNT": "",
-			"SHOW_TASK_CREATION": "",
-			"SHOW_TASK_CREATION_DESC": "",
-			"TASK_DESCRIPTION": "",
-			"TASK_TITLE": "",
-			"TEXT": "",
-			"UNDO": "",
-			"USER": "",
-			"VALUE": ""
+			"ASSET": "アセット",
+			"DATE": "日付",
+			"DROPDOWN": "ドロップダウン",
+			"ENTER_DEFAULT_DESCRIPTION": "表示するデフォルトの説明を入力してください。",
+			"FIELD": "フィールド",
+			"FIELD_DELETE_DESC": "{taskType}から{field}を削除すると、既存の{task}からも削除されます。",
+			"FIELD_ID_EDIT_DESC": "フィールドIDを変更すると、既存の{task}の内容は失われ、変更は新しい{tasks}にのみ適用されます。",
+			"FIELD_NAME": "フィールド名",
+			"FIELD_REQUIRED": "このフィールドは必須です。",
+			"FORM": "入力フォーム",
+			"GLOBAL": "グローバル",
+			"GROUP_TYPE": "グループ > タイプ",
+			"JSON": "JSON入力",
+			"KEY": "キー",
+			"LABELS": "ラベル",
+			"PARAGRAPH": "段落",
+			"PROJECT": "プロジェクト",
+			"PROVIDER": "プロバイダー",
+			"REQUIRED": "必須",
+			"SERVICE_ACCOUNT": "サービスアカウント",
+			"SHOW_TASK_CREATION": "{task}作成時に表示",
+			"SHOW_TASK_CREATION_DESC": "タスク作成時にこのフィールドを表示します。",
+			"TASK_DESCRIPTION": "{task}の説明",
+			"TASK_TITLE": "{task}のタイトル",
+			"TEXT": "短文",
+			"UNDO": "元に戻す",
+			"USER": "ユーザー",
+			"VALUE": "値"
 		},
-		"FIELD_ID": "",
-		"FIELD_NAME": "",
-		"KEY": "",
-		"NAME": "",
-		"NO_AVAILABLE_TARGET": "",
-		"PACKAGE": "",
-		"PROJECT": "",
-		"SCOPE": "",
-		"SET_AS_DEFAULT": "",
-		"SHOW_MORE": "",
-		"STATUS": "",
-		"STATUS_COMPLETED": "",
-		"STATUS_IN_PROGRESS": "",
-		"STATUS_TODO": "",
-		"STATUS_TYPE": "",
-		"SUPPORT_PACKAGE": "",
-		"TARGET_LIST": "",
+		"FIELD_ID": "{field} ID",
+		"FIELD_NAME": "{field}名",
+		"KEY": "キー",
+		"NAME": "名前",
+		"NO_AVAILABLE_TARGET": "利用可能な{target}がありません",
+		"PACKAGE": "パッケージ",
+		"PROJECT": "プロジェクト",
+		"SCOPE": "スコープ",
+		"SET_AS_DEFAULT": "デフォルトに設定",
+		"SHOW_MORE": "もっと見る",
+		"STATUS": "ステータス",
+		"STATUS_COMPLETED": "完了",
+		"STATUS_IN_PROGRESS": "進行中",
+		"STATUS_TODO": "未着手",
+		"STATUS_TYPE": "ステータスタイプ",
+		"SUPPORT_PACKAGE": "サポートパッケージ",
+		"TARGET_LIST": "{target}リスト",
 		"TASK_BOARD": {
-			"AFTER": "",
-			"ARCHIVED_TASK_DESC": "",
-			"ASSIGN": "",
-			"ASSIGN_TO": "",
-			"BEFORE": "",
-			"CHANGE_STATUS": "",
-			"COMMENT": "",
-			"COMMENTED": "",
-			"COMMENT_PLACEHOLDER": "",
-			"CONTENT": "",
-			"CREATED": "",
-			"FIELD": "",
-			"TASK_CONTENT": "",
-			"TASK_PROGRESS": "",
-			"TYPE_INFO": "",
-			"UPDATED": "",
-			"VIEW_ALL_TASKS": ""
+			"AFTER": "以降",
+			"ARCHIVED_TASK_DESC": "アーカイブ済み - この{taskCategory}または{taskType}はこのワークスペースで利用できません。バインド解除されたか削除された可能性があります。",
+			"ASSIGN": "割り当て",
+			"ASSIGN_TO": "割り当て先",
+			"BEFORE": "以前",
+			"CHANGE_STATUS": "ステータス変更済み",
+			"COMMENT": "コメント",
+			"COMMENTED": "コメント",
+			"COMMENT_PLACEHOLDER": "コメントを入力してください",
+			"CONTENT": "内容",
+			"CREATED": "作成済み",
+			"FIELD": "フィールド",
+			"TASK_CONTENT": "内容",
+			"TASK_PROGRESS": "{task}の進捗",
+			"TYPE_INFO": "{type}情報",
+			"UPDATED": "更新済み",
+			"VIEW_ALL_TASKS": "すべての{tasks}を表示"
 		},
 		"TASK_MANAGEMENT": {
-			"ALT_E_DISABLE_LANDING": "",
-			"ALT_E_ENABLE_LANDING": "",
-			"ALT_S_DISABLE_LANDING": "",
-			"ALT_S_ENABLE_LANDING": "",
+			"ALT_E_DISABLE_LANDING": "ランディングページの無効化に失敗しました。",
+			"ALT_E_ENABLE_LANDING": "ランディングページの有効化に失敗しました。",
+			"ALT_S_DISABLE_LANDING": "ランディングページの無効化に成功しました。",
+			"ALT_S_ENABLE_LANDING": "ランディングページの有効化に成功しました。",
 			"CATEGORY": {
-				"DELETE_CONFIRMATION_DESC": "",
-				"DESC": ""
+				"DELETE_CONFIRMATION_DESC": "このカテゴリの下に{tasks}{particle}があります。削除すると、{tasks}は編集できなくなります。続行してもよろしいですか？",
+				"DESC": "このグループは{tasks}の種類を分類します。ユーザーは{task}{taskObjectParticle}を提出する際に適切なカテゴリを選択し、担当者が{task}{taskObjectParticle}をより効率的に管理できるようにします。"
 			},
-			"ENABLE_LANDING": "",
-			"ENABLE_LANDING_DESC": "",
+			"ENABLE_LANDING": "ランディングページを有効化",
+			"ENABLE_LANDING_DESC": "ランディングページはOpsFlowの下に表示されます。",
 			"PACKAGE": {
-				"ADDED": "",
-				"AFFECTED_DESC": "",
-				"CHANGE_STATUS": "",
-				"C_CATEGORY": "",
-				"C_IS": "",
-				"C_WORKSPACE": "",
-				"DELETE_UNAVAILABLE": "",
-				"DESC": "",
-				"REMOVED": "",
-				"SET_DEFAULT_DESC": "",
-				"SET_TARGET_AS_DEFAULT": "",
-				"SPECIFIC_WORKSPACE": "",
-				"UNCHANGED": "",
-				"UNSET": "",
-				"UPDATE_CONFIRMATION": "",
-				"UPDATE_CONFIRM_DESC": ""
+				"ADDED": "追加されました",
+				"AFFECTED_DESC": "影響を受ける{workspace}と{category}は以下の通りです。",
+				"CHANGE_STATUS": "変更の有無",
+				"C_CATEGORY": "カテゴリ",
+				"C_IS": "is | are",
+				"C_WORKSPACE": "ワークスペース",
+				"DELETE_UNAVAILABLE": "リンクされたカテゴリがあるため、パッケージを削除できません。",
+				"DESC": "ユーザーの契約に基づいて提供される機能のセットで、サービスの全体範囲を表します。",
+				"REMOVED": "削除済み",
+				"SET_DEFAULT_DESC": "このパッケージを関連作業で使用するデフォルトのパッケージに変更します。",
+				"SET_TARGET_AS_DEFAULT": "{target}をデフォルトパッケージに設定します。",
+				"SPECIFIC_WORKSPACE": "ワークスペース選択",
+				"UNCHANGED": "変更なし",
+				"UNSET": "設定解除",
+				"UPDATE_CONFIRMATION": "パッケージ更新確認",
+				"UPDATE_CONFIRM_DESC": "{workspaceList}ワークスペースでは、{categoryList}カテゴリをこれ以上サポートしないことを確認しました。"
 			},
 			"STATUS": {
-				"DELETE_CONTINUE": "",
-				"DESC": "",
-				"SET_AS_DEFAULT": "",
-				"SET_DEFAULT_DESC": ""
+				"DELETE_CONTINUE": "このステータスを削除すると、関連するすべての{task}のステータスが自動的に{default}に変更されます。続行しますか？",
+				"DESC": "{tasks}のステータスリストを管理および設定します。",
+				"SET_AS_DEFAULT": "{status}をデフォルトステータスに設定します。",
+				"SET_DEFAULT_DESC": "このステータスが関連する{tasks}のデフォルトステータスに設定されます。"
 			},
 			"TASK_TYPE": {
-				"DELETE_UNAVAILABLE": "",
-				"DESC": ""
+				"DELETE_UNAVAILABLE": "下位の{tasks}{particle}が存在するため、{taskType}を削除できません。",
+				"DESC": "{taskTypes}は{task}に含まれるフィールドとデータを定義します。\n複数の{taskTypes}を作成でき、ユーザーはリクエストを提出する際に最適な{taskTypes}を選択できます。"
 			},
-			"TEMPLATE_DESC": "",
-			"TEMPLATE_TYPE": ""
+			"TEMPLATE_DESC": "テンプレートの説明",
+			"TEMPLATE_TYPE": "テンプレートタイプ"
 		},
-		"TITLE": "",
-		"TOTAL_DURATION": "",
+		"TITLE": "タイトル",
+		"TOTAL_DURATION": "総所要時間",
 		"VALIDATION": {
-			"DUPLICATED": "",
-			"ENUM_KEY_DUPLICATED": "",
-			"ENUM_KEY_REQUIRED": "",
-			"ENUM_NAME_REQUIRED": "",
-			"FIELD_REQUIRED": "",
-			"INVALID_FORMAT": "",
-			"LENGTH_MAX": "",
-			"PRIMARY_FIELD_REQUIRED": "",
-			"REQUIRED": "",
-			"UNSUPPORTED_FIELD_TYPE": "",
-			"VALUE_ARRAY": "",
-			"VALUE_ONLY_ONE": "",
-			"VALUE_STRING": "",
-			"VALUE_TOO_LONG": ""
+			"DUPLICATED": "すでに存在する{field}です。",
+			"ENUM_KEY_DUPLICATED": "重複したキーが存在します。",
+			"ENUM_KEY_REQUIRED": "キーは必須です。",
+			"ENUM_NAME_REQUIRED": "名前は必須です。",
+			"FIELD_REQUIRED": "このフィールドは必須です。",
+			"INVALID_FORMAT": "形式が正しくありません。期待される形式：{format}",
+			"LENGTH_MAX": "{topic}{particle}は{length}文字未満である必要があります。",
+			"PRIMARY_FIELD_REQUIRED": "「is_required」が有効になっている場合、「is_primary」も有効にする必要があります。",
+			"REQUIRED": "{topic}{particle}は必須です。",
+			"UNSUPPORTED_FIELD_TYPE": "サポートされていないフィールドタイプです。",
+			"VALUE_ARRAY": "値は配列でなければなりません。",
+			"VALUE_ONLY_ONE": "値は1つでなければなりません。",
+			"VALUE_STRING": "値は文字列でなければなりません。",
+			"VALUE_TOO_LONG": "入力内容が長すぎます。{length}文字以下で入力してください。"
 		},
-		"WORKSPACE": ""
+		"WORKSPACE": "ワークスペース"
 	},
 	"PAGE_SCHEMA": {
 		"ACCOUNT": "アカウントID",
@@ -5338,7 +5337,7 @@
 			},
 			"DELETE": "削除",
 			"DOWNLOAD_FILE": "ファイルをダウンロードする",
-			"EDIT_ACCESS": "",
+			"EDIT_ACCESS": "アクセス制限設定",
 			"FAILED": "失敗",
 			"GO_TO_DASHBOARD": "ダッシュボードに移動",
 			"HELP": "ヘルプ",
@@ -5403,11 +5402,11 @@
 			"MODAL_DELETE_WEBHOOK_TITLE": "選択したウェプフクを完全に削除します。",
 			"MODAL_DISABLE_WEBHOOK_DESC": "選択したウェプフクを無効化にしますか？",
 			"MODAL_DISABLE_WEBHOOK_TITLE": "ウェプフク無効化",
-			"MODAL_EDIT_ACCESS_TITLE": "",
+			"MODAL_EDIT_ACCESS_TITLE": "アクセス制限設定",
 			"MODAL_ENABLE_WEBHOOK_DESC": "選択したウェプフクを有効化にしますか？",
 			"MODAL_ENABLE_WEBHOOK_TITLE": "ウェプフク有効化",
-			"MODAL_RENAME_PROJECT_GROUP_TITLE": "",
-			"MODAL_RENAME_PROJECT_TITLE": "",
+			"MODAL_RENAME_PROJECT_GROUP_TITLE": "プロジェクトグループ名の変更",
+			"MODAL_RENAME_PROJECT_TITLE": "プロジェクト名の変更",
 			"MODAL_UPDATE_MEMBER_TITLE": "メンバー情報の更新",
 			"MODAL_UPDATE_PROJECT_TITLE": "プロジェクト変更",
 			"MODAL_UPDATE_WEBHOOK": "変更",
@@ -5429,7 +5428,7 @@
 			"PROJECT_ALERT_ACTIVATION_DESC_2": "統合された外部イベントを受信するかこのプロジェクトを管理のためには「通知有効化」をクリックしてください。",
 			"PROJECT_ID": "プロジェクトID：",
 			"PROJECT_MEMBER_LABEL": "ラベル",
-			"RENAME": "",
+			"RENAME": "名前の修正",
 			"REPORT_CANCEL": "キャンセル",
 			"REPORT_DESC": "SpaceONEは、プロジェクトベースの月次レポートを提供します。今後提供するコンテンツを追加する予定です",
 			"REPORT_DOWNLOAD_FILE_DESC": "*提供するファイル形式（PDF、PPTX、CSV）",
@@ -5547,9 +5546,9 @@
 			"CREATE_GROUP": "プロジェクトグループ作成",
 			"CREATE_PROJECT": "プロジェクト作成",
 			"DATABASE": "データベース",
-			"DELETE": "",
-			"DONE": "",
-			"EDIT_TAG": "",
+			"DELETE": "削除",
+			"DONE": "完了",
+			"EDIT_TAG": "タグ編集",
 			"EMPTY_PROJECT_GROUP_CREATE_BTN": "プロジェクトグループ作成",
 			"EMPTY_PROJECT_GROUP_MSG_CONTENT": "プロジェクトでリソースを管理してください",
 			"EMPTY_PROJECT_GROUP_MSG_CONTENT_ORDER_1": "まず、プロジェクトグループを作成してください。",
@@ -5561,7 +5560,7 @@
 			"EMPTY_TEXT_SEARCH": "結果が見つからないようです。",
 			"EVERYONE_AT_THIS_WORKSPACE": "このワークスペースの全員",
 			"FAVORITES": "お気に入り",
-			"GROUPS_AND_PROJECTS": "",
+			"GROUPS_AND_PROJECTS": "プロジェクトグループとプロジェクト",
 			"GROUP_MEMBER": "グループメンバー",
 			"GROUP_MEMBERS_WITH_ACCESS_TO_ALL_SUB_PROJECTS": "グループメンバーはすべてのサブプロジェクトにアクセスできます",
 			"INVITE_ONLY": "招待のみ",
@@ -5591,11 +5590,11 @@
 				"REMOVE": "削除"
 			},
 			"MODAL_UPDATE_PROJECT_GROUP_TITLE": "プロジェクトグループ編集",
-			"MOVE": "",
+			"MOVE": "移動",
 			"NO_GROUP_MEMBER": "グループメンバーなし",
 			"NO_PROJECT_GROUP_MSG": "このワークスペースにはまだプロジェクトまたはプロジェクトグループが作成されていません。",
 			"ONLY_PEOPLE_INVITED": "招待された人だけ",
-			"OVERVIEW": "",
+			"OVERVIEW": "ホーム",
 			"PLACE_HOLDER_EXAMPLE": "例）プロジェクト/プロジェクトグループ",
 			"PLACE_HOLDER_PROJECT": "プロジェクト",
 			"PLACE_HOLDER_SHOW_MORE": "もっと見る",
@@ -5609,7 +5608,7 @@
 				"DONE": "完了",
 				"EDIT": "編集"
 			},
-			"SAVE_CHANGES": "",
+			"SAVE_CHANGES": "変更を保存",
 			"SEARCH": "検索",
 			"SEARCH_EMPTY_TEXT": "結果が見つかりませんでした。\n別の用語で再試行してください。",
 			"SEARCH_PLACEHOLDER": "プロジェクトまたはグループを検索",
diff --git a/packages/language-pack/ko.json b/packages/language-pack/ko.json
index e56cc79118..94ec331706 100644
--- a/packages/language-pack/ko.json
+++ b/packages/language-pack/ko.json
@@ -707,7 +707,6 @@
 						"PROJECT_MEMBER": "프로젝트 멤버",
 						"PROJECT_VALIDATION": "해당 프로젝트는 이미 사용 중입니다.",
 						"REQUIRED_NAME": "이름을 입력하세요.",
-						"RESET_DATE": "",
 						"SCOPE": "범위",
 						"SELECT_MONTH": "월 선택",
 						"SERVICE_ACCOUNT": "서비스 어카운트",
@@ -1535,8 +1534,8 @@
 			"ALT_S_UPDATE": "개인 정보 수정 완료",
 			"CONFIRM_PASSWORD": "비밀번호 확인",
 			"CURRENT_PASSWORD": "현재 비밀번호",
-			"CURRENT_PASSWORD_INVALID": "",
-			"EDIT_ACCOUNT_INFO": "",
+			"CURRENT_PASSWORD_INVALID": "잘못된 비밀번호입니다.",
+			"EDIT_ACCOUNT_INFO": "계정 정보 수정",
 			"EMAIL": "이메일",
 			"EMAIL_REQUIRED": "이메일을 입력해주세요.",
 			"GROUP": "소속",
@@ -1552,7 +1551,7 @@
 			"PASSWORD": "비밀번호",
 			"PASSWORD_CHECK": "비밀번호 확인",
 			"PASSWORD_CHECK_INVALID": "동일한 비밀번호를 입력해 주세요.",
-			"PASSWORD_CHECK_TITLE": "",
+			"PASSWORD_CHECK_TITLE": "현재 비밀번호 확인",
 			"PASSWORD_HELP_TEXT": "인증된 알림 전용 이메일이 있는 계정일 경우에만 비밀번호 재설정 링크 수신이 가능합니다.",
 			"ROLE": "권한",
 			"SEND_LINK": "사용자에게 비밀번호 재설정 이메일 발송",
@@ -1860,8 +1859,8 @@
 			},
 			"DEFAULT_WIDTH": "기본 너비",
 			"DELETE": "삭제",
-			"DIMENSIONS": "",
-			"DIMENSIONS_DESC": "",
+			"DIMENSIONS": "차원",
+			"DIMENSIONS_DESC": "최대 3개까지 선택하여 보기 화면을 사용자 지정할 수 있습니다.",
 			"DISPLAY_ANNOTATION": {
 				"DISPLAY_ANNOTATION": "부가 정보 표시",
 				"INVALID_VALUE": "추가로 표시할 내용을 입력해주세요.",
@@ -2349,7 +2348,7 @@
 				"UNCHECK_MODAL_HELP_TEXT_1": "해당 변수를 상속받고 있는",
 				"UNCHECK_MODAL_HELP_TEXT_2": "다음과 같은 위젯들에 영향을 미칠 수 있습니다.",
 				"UNCHECK_MODAL_TITLE": "이 변수 사용을 해제할까요? ",
-				"VALIDATION_NAME_REQUIRED": ""
+				"VALIDATION_NAME_REQUIRED": "이름을 입력하세요."
 			}
 		},
 		"DETAIL": {
@@ -2663,7 +2662,7 @@
 					"SECURITY": "보안",
 					"SELECT_A_DATA_SOURCE": "데이터 소스 선택",
 					"SELECT_DATA_SOURCE_TYPE": "데이터 소스 타입 선택",
-					"UNIFIED_COST": ""
+					"UNIFIED_COST": "Unified Cost"
 				},
 				"STEP_2": {
 					"ADD_RULE": "규칙 추가",
@@ -2683,7 +2682,7 @@
 					"DATE_RANGE_INVALID_RANGE_TEXT": "시작 날짜는 종료 날짜보다 이전이어야 합니다.",
 					"DEPRECATED_OPTION": "지원 중지된 옵션",
 					"DESCRIPTION": "설명",
-					"DIMENSIONS": "",
+					"DIMENSIONS": "차원",
 					"DYNAMIC_FIELD": "변동 데이터 필드",
 					"EDIT_DATA": "데이터 수정",
 					"END": "종료",
@@ -4910,8 +4909,8 @@
 		"CREATE_TARGET": "{target} 생성",
 		"DEFAULT": "기본",
 		"DELETE_TARGET": "{target} 삭제",
-		"DELETE_TARGET_CONFIRMATION": "정말 이 {object}{particle} 삭제하시겠습니까?",
-		"DESCRIBE_FIELD": "이 {field}{particle} 간단히 설명해주세요.",
+		"DELETE_TARGET_CONFIRMATION": "이 {object}{particle}를 삭제하시겠습니까?",
+		"DESCRIBE_FIELD": "이 {field}{particle}를 간단히 설명하세요.",
 		"DESCRIPTION": "설명",
 		"EDIT_TARGET": "{target} 변경",
 		"FIELDS_CONFIG": "필드 설정",
@@ -4920,7 +4919,7 @@
 			"ASSET": "자산",
 			"DATE": "날짜",
 			"DROPDOWN": "드롭다운",
-			"ENTER_DEFAULT_DESCRIPTION": "기본적으로 표시될 설명을 입력하세요.",
+			"ENTER_DEFAULT_DESCRIPTION": "표시할 기본 설명을 입력하세요.",
 			"FIELD": "필드",
 			"FIELD_DELETE_DESC": "{taskType}의 {field}를 삭제하면, 기존 {task}에도 해당 필드 삭제가 반영됩니다.",
 			"FIELD_ID_EDIT_DESC": "필드 아이디를 수정하면 기존 {task}에 작성한 내용이 보이지 않게되며, 새로 생성되는 {task}에만 반영됩니다.",
@@ -4988,8 +4987,8 @@
 			"ALT_S_DISABLE_LANDING": "랜딩 페이지 비활성화",
 			"ALT_S_ENABLE_LANDING": "랜딩 페이지 활성화",
 			"CATEGORY": {
-				"DELETE_CONFIRMATION_DESC": "이 카테고리 하위에 {tasks}{particle} 존재합니다. 삭제 시엔 {tasks} 수정이 불가합니다. 그래도 정말 삭제하시겠습니까?",
-				"DESC": "이는 {tasks}의 유형을 그룹화한 것입니다. 사용자는 {task}{taskObjectParticle} 제출할 때 적절한 카테고리를 선택하여 담당자가 {tasks}{tasksObjectParticle} 더 효율적으로 관리할 수 있도록 돕습니다."
+				"DELETE_CONFIRMATION_DESC": "이 카테고리 아래에 {tasks}{particle}가 있습니다. 삭제하면 {tasks}는 수정할 수 없습니다. 계속 진행하시겠습니까?",
+				"DESC": "이 그룹은 {tasks} 유형을 분류합니다. 사용자는 {task}{taskObjectParticle}를 제출할 때 적절한 카테고리를 선택하며, 이는 담당자가 {task}{taskObjectParticle}를 보다 효율적으로 관리하는 데 도움이 됩니다."
 			},
 			"ENABLE_LANDING": "랜딩 페이지 활성화",
 			"ENABLE_LANDING_DESC": "OpsFlow 메뉴 아래에 랜딩 페이지가 표시됩니다.",
@@ -4998,10 +4997,10 @@
 				"AFFECTED_DESC": "영향 받는 {workspace}와 {category}는 다음과 같습니다.",
 				"CHANGE_STATUS": "변경 여부",
 				"C_CATEGORY": "카테고리",
-				"C_IS": "",
+				"C_IS": "is | are",
 				"C_WORKSPACE": "워크스페이스",
-				"DELETE_UNAVAILABLE": "연결된 카테고리가 존재하므로 패키지 삭제가 불가합니다.",
-				"DESC": "계약에 따라 사용자에게 제공되는 기능의 집합으로, 전체 서비스의 범위를 나타냅니다.",
+				"DELETE_UNAVAILABLE": "연결된 카테고리가 있어 패키지를 삭제할 수 없습니다.",
+				"DESC": "사용자의 계약에 따라 제공되는 기능들의 집합으로, 서비스의 전체 범위를 나타냅니다.",
 				"REMOVED": "삭제됨",
 				"SET_DEFAULT_DESC": "이 패키지를 관련 작업에 사용할 기본 패키지로 변경합니다.",
 				"SET_TARGET_AS_DEFAULT": "{target} 패키지를 기본으로 설정",
@@ -5591,7 +5590,7 @@
 				"REMOVE": "제거"
 			},
 			"MODAL_UPDATE_PROJECT_GROUP_TITLE": "프로젝트 그룹 수정",
-			"MOVE": "이동\n",
+			"MOVE": "이동",
 			"NO_GROUP_MEMBER": "프로젝트 그룹 멤버 없음",
 			"NO_PROJECT_GROUP_MSG": "이 워크스페이스에는 아직 생성된 프로젝트 또는 프로젝트 그룹이 없습니다.",
 			"ONLY_PEOPLE_INVITED": "초대된 사용자만",

From 72a497802bd1fc5d5973b048fb68a44a4b12f452 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=84=8B=E1=85=B5=E1=84=89=E1=85=B3=E1=86=BC=E1=84=8B?=
 =?UTF-8?q?=E1=85=A7=E1=86=AB?= <sylee1274@mz.co.kr>
Date: Fri, 16 May 2025 13:59:52 +0900
Subject: [PATCH 11/15] feat: update service main page pagination
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 이승연 <sylee1274@mz.co.kr>
---
 .../v2/components/ServiceDetailHeader.vue     |  1 -
 .../v2/components/ServiceList.vue             | 43 +++++++------------
 2 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/apps/web/src/services/alert-manager/v2/components/ServiceDetailHeader.vue b/apps/web/src/services/alert-manager/v2/components/ServiceDetailHeader.vue
index 92414637f1..245f93d81e 100644
--- a/apps/web/src/services/alert-manager/v2/components/ServiceDetailHeader.vue
+++ b/apps/web/src/services/alert-manager/v2/components/ServiceDetailHeader.vue
@@ -89,7 +89,6 @@ const handleGoBackButton = () => {
             query: {
                 unhealthyPage: validUnhealthyPage.toString(),
                 healthyPage: validHealthyPage.toString(),
-                serviceName: route.query.filterService,
             },
         }).catch(() => {});
         return;
diff --git a/apps/web/src/services/alert-manager/v2/components/ServiceList.vue b/apps/web/src/services/alert-manager/v2/components/ServiceList.vue
index 83c9e991c5..4cc9e30efe 100644
--- a/apps/web/src/services/alert-manager/v2/components/ServiceList.vue
+++ b/apps/web/src/services/alert-manager/v2/components/ServiceList.vue
@@ -10,7 +10,6 @@ import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper';
 import {
     PToolbox, PDataLoader, PEmpty, PButton, PPagination,
 } from '@cloudforet/mirinae';
-import type { QueryTag } from '@cloudforet/mirinae/types/controls/search/query-search-tags/type';
 import type { ToolboxOptions } from '@cloudforet/mirinae/types/controls/toolbox/type';
 
 import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list';
@@ -66,12 +65,23 @@ const handleToolbox = async (options: ToolboxOptions) => {
         queryTagHelper.setQueryTags(options.queryTags);
 
         const nameTags = options.queryTags.filter((tag) => tag.key?.name === 'name');
-        const names = nameTags.map((tag) => tag.value?.name).filter(Boolean);
+        const hasName = nameTags.length > 0;
 
-        replaceUrlQuery({
+        const newQuery: Record<string, any> = {
             ...route.query,
-            serviceName: names.length ? names : undefined,
-        });
+        };
+
+        if (hasName) {
+            delete newQuery.unhealthyPage;
+            delete newQuery.healthyPage;
+            serviceListPageStore.setUnhealthyPage(1);
+            serviceListPageStore.setHealthyPage(1);
+        } else {
+            newQuery.unhealthyPage = String(serviceListPageStore.unhealthyThisPage);
+            newQuery.healthyPage = String(serviceListPageStore.healthyThisPage);
+        }
+
+        replaceUrlQuery(newQuery);
     }
     await fetchBothLists();
 };
@@ -166,7 +176,7 @@ const handleNavigateToDetail = (serviceId: string) => {
 };
 
 onMounted(async () => {
-    const { unhealthyPage, healthyPage, serviceName } = route.query;
+    const { unhealthyPage, healthyPage } = route.query;
 
     let parsedUnhealthy = parseInt(unhealthyPage as string);
     let parsedHealthy = parseInt(healthyPage as string);
@@ -177,30 +187,9 @@ onMounted(async () => {
     serviceListPageStore.setUnhealthyPage(parsedUnhealthy);
     serviceListPageStore.setHealthyPage(parsedHealthy);
 
-    // eslint-disable-next-line no-nested-ternary
-    const serviceNames = serviceName ? (Array.isArray(serviceName) ? serviceName : [serviceName]) : [];
-    if (serviceNames.length) {
-        const tags: QueryTag[] = serviceNames.map((name) => ({
-            key: { name: 'name', label: 'Name' },
-            operator: '=',
-            value: { label: name ?? '', name: name ?? '' },
-        }));
-        queryTagHelper.setQueryTags(tags);
-    }
-
     await fetchBothLists();
 });
 
-watch(() => queryTags.value, (tags) => {
-    const nameTags = tags.filter((tag) => tag.key?.name === 'name');
-    const names = nameTags.map((tag) => tag.value?.name).filter(Boolean);
-
-    replaceUrlQuery({
-        ...route.query,
-        serviceName: names.length ? names : undefined,
-    });
-}, { immediate: true });
-
 watch(() => serviceListPageStore.unhealthyThisPage, (val) => {
     replaceUrlQuery({
         unhealthyPage: String(val),

From 7f3194627a0163573231698dbf54ea0be66e55e9 Mon Sep 17 00:00:00 2001
From: nayeongkim <nayeongkim@megazone.com>
Date: Fri, 16 May 2025 14:35:29 +0900
Subject: [PATCH 12/15] chore: apply jp at ops-flow

Signed-off-by: NaYeong,Kim <nayeongkim@megazone.com>
---
 .../translations/ja.json                      | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/apps/web/src/services/ops-flow/task-management-templates/translations/ja.json b/apps/web/src/services/ops-flow/task-management-templates/translations/ja.json
index d817394f6c..6cb0341879 100644
--- a/apps/web/src/services/ops-flow/task-management-templates/translations/ja.json
+++ b/apps/web/src/services/ops-flow/task-management-templates/translations/ja.json
@@ -1,25 +1,25 @@
 {
 	"default": {
-		"Task": "",
-		"TaskBoard": "",
-		"TaskCategory": "",
-		"TaskType": "",
-		"TemplateName": "",
-		"task": "",
-		"taskType": "",
-		"taskTypes": "",
-		"tasks": ""
+	  "Task": "タスク",
+	  "TaskBoard": "タスクボード",
+	  "TaskCategory": "タスクカテゴリ",
+	  "TaskType": "タスタイプ",
+	  "TemplateName": "デフォルト",
+	  "task": "タスク",
+	  "taskType": "タスタイプ",
+	  "taskTypes": "タスタイプ一覧",
+	  "tasks": "タスク一覧"
 	},
 	"service-desk": {
-		"Task": "",
-		"TaskBoard": "",
-		"TaskCategory": "",
-		"TaskType": "",
-		"TemplateName": "",
-		"landingDescription": "",
-		"task": "",
-		"taskType": "",
-		"taskTypes": "",
-		"tasks": ""
+	  "Task": "チケット",
+	  "TaskBoard": "チケットボード",
+	  "TaskCategory": "サポートカテゴリ",
+	  "TaskType": "リクエストタイプ",
+	  "TemplateName": "サービスデスク",
+	  "landingDescription": "サポートリクエストを簡単に送信・追跡できます。以下のカテゴリとリクエストタイプを選択して開始してください。アカウント管理、請求に関する問い合わせ、またはサービスリクエストなど、Service Deskがあなたのサポートを提供します。",
+	  "task": "チケット",
+	  "taskType": "リクエストタイプ",
+	  "taskTypes": "リクエストタイプ一覧",
+	  "tasks": "チケット一覧"
 	}
-}
+  }
\ No newline at end of file

From a66a6951531a8216fd807bde9a8e311f021cbbfd Mon Sep 17 00:00:00 2001
From: nayeongkim <nayeongkim@megazone.com>
Date: Fri, 16 May 2025 15:31:11 +0900
Subject: [PATCH 13/15] feat: changed excel export API

Signed-off-by: NaYeong,Kim <nayeongkim@megazone.com>
---
 .../v2/components/AlertsManagementTable.vue   | 35 +++++++++++++------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/apps/web/src/services/alert-manager/v2/components/AlertsManagementTable.vue b/apps/web/src/services/alert-manager/v2/components/AlertsManagementTable.vue
index 2d31136f9c..df7b9b3cd5 100644
--- a/apps/web/src/services/alert-manager/v2/components/AlertsManagementTable.vue
+++ b/apps/web/src/services/alert-manager/v2/components/AlertsManagementTable.vue
@@ -19,6 +19,8 @@ import type { ValueHandlerMap } from '@cloudforet/mirinae/types/controls/search/
 import type { DataTableFieldType } from '@cloudforet/mirinae/types/data-display/tables/data-table/type';
 import { iso8601Formatter } from '@cloudforet/utils';
 
+import type { ExportParameter } from '@/api-clients/_common/schema/api-verbs/export';
+import { QueryType } from '@/api-clients/_common/schema/api-verbs/export';
 import { ALERT_STATUS, ALERT_URGENCY } from '@/schema/alert-manager/alert/constants';
 import type { AlertModel } from '@/schema/alert-manager/alert/model';
 import type { CloudServiceGetParameters } from '@/schema/inventory/cloud-service/api-verbs/get';
@@ -32,8 +34,7 @@ import type { ServiceReferenceMap } from '@/store/reference/service-reference-st
 import type { WebhookReferenceMap } from '@/store/reference/webhook-reference-store';
 import { useUserStore } from '@/store/user/user-store';
 
-import { FILE_NAME_PREFIX } from '@/lib/excel-export/constant';
-import { downloadExcel } from '@/lib/helper/file-download-helper';
+import { downloadExcelByExportFetcher } from '@/lib/helper/file-download-helper';
 import { replaceUrlQuery } from '@/lib/router-query-string';
 
 import CustomDateModal from '@/common/components/custom-date-modal/CustomDateModal.vue';
@@ -295,15 +296,27 @@ const handleCustomFieldUpdate = (fields: DataTableFieldType[]) => {
     state.fields = fields;
 };
 const handleExportToExcel = async () => {
-    await downloadExcel({
-        url: '/alert-manager/alert/list',
-        param: {
-            query: { ...alertListApiQueryHelper.data, only: ALERT_EXCEL_FIELDS.map((d) => d.key) },
-        },
-        fields: ALERT_EXCEL_FIELDS,
-        file_name_prefix: FILE_NAME_PREFIX.alert,
-        timezone: storeState.timezone,
-    });
+    const excelQuery = new ApiQueryHelper()
+        .setMultiSortV2([{ key: 'created_at', desc: true }])
+        .setFilters([...filterQueryHelper.filters]);
+    const excelExportFetcher = () => {
+        const alertExcelExportParams: ExportParameter = {
+            file_name: 'alert_export',
+            options: [
+                {
+                    name: 'Main Table',
+                    query_type: QueryType.SEARCH,
+                    search_query: {
+                        ...excelQuery.data,
+                        fields: ALERT_EXCEL_FIELDS,
+                    },
+                },
+            ],
+            timezone: state.timezone,
+        };
+        return SpaceConnector.clientV2.alertManager.alert.export(alertExcelExportParams);
+    };
+    await downloadExcelByExportFetcher(excelExportFetcher);
 };
 const handleCustomRangeModalConfirm = (start: string, end: string) => {
     alertPageStore.setSelectedPeriodRange(ALERT_PERIOD_DROPDOWN_MENU.CUSTOM);

From 3cde59558fce25037c05edbd5060887f0b798332 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=84=8B=E1=85=B5=E1=84=89=E1=85=B3=E1=86=BC=E1=84=8B?=
 =?UTF-8?q?=E1=85=A7=E1=86=AB?= <sylee1274@mz.co.kr>
Date: Mon, 19 May 2025 11:36:43 +0900
Subject: [PATCH 14/15] feat: update service main page pagination
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 이승연 <sylee1274@mz.co.kr>
---
 .../v2/components/ServiceDetailHeader.vue     |  2 +
 .../v2/components/ServiceList.vue             | 56 +++++++++++++------
 2 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/apps/web/src/services/alert-manager/v2/components/ServiceDetailHeader.vue b/apps/web/src/services/alert-manager/v2/components/ServiceDetailHeader.vue
index 245f93d81e..87f8d57211 100644
--- a/apps/web/src/services/alert-manager/v2/components/ServiceDetailHeader.vue
+++ b/apps/web/src/services/alert-manager/v2/components/ServiceDetailHeader.vue
@@ -84,11 +84,13 @@ const handleGoBackButton = () => {
         const validHealthyPage = (!Number.isNaN(serviceListPageStore.healthyThisPage) && serviceListPageStore.healthyThisPage > 0)
             ? serviceListPageStore.healthyThisPage
             : 1;
+
         router.push({
             name: ALERT_MANAGER_ROUTE.SERVICE._NAME,
             query: {
                 unhealthyPage: validUnhealthyPage.toString(),
                 healthyPage: validHealthyPage.toString(),
+                serviceName: route.query.filterService,
             },
         }).catch(() => {});
         return;
diff --git a/apps/web/src/services/alert-manager/v2/components/ServiceList.vue b/apps/web/src/services/alert-manager/v2/components/ServiceList.vue
index 4cc9e30efe..70488fa006 100644
--- a/apps/web/src/services/alert-manager/v2/components/ServiceList.vue
+++ b/apps/web/src/services/alert-manager/v2/components/ServiceList.vue
@@ -1,5 +1,7 @@
 <script setup lang="ts">
-import { onMounted, reactive, watch } from 'vue';
+import {
+    onMounted, reactive, watch, watchEffect,
+} from 'vue';
 import {
     useRoute, useRouter,
 } from 'vue-router/composables';
@@ -65,27 +67,32 @@ const handleToolbox = async (options: ToolboxOptions) => {
         queryTagHelper.setQueryTags(options.queryTags);
 
         const nameTags = options.queryTags.filter((tag) => tag.key?.name === 'name');
-        const hasName = nameTags.length > 0;
+        const nameValues = nameTags.map((tag) => tag.value.name).filter(Boolean);
 
         const newQuery: Record<string, any> = {
-            ...route.query,
+            unhealthyPage: String(serviceListPageStore.unhealthyThisPage),
+            healthyPage: String(serviceListPageStore.healthyThisPage),
         };
 
-        if (hasName) {
-            delete newQuery.unhealthyPage;
-            delete newQuery.healthyPage;
-            serviceListPageStore.setUnhealthyPage(1);
-            serviceListPageStore.setHealthyPage(1);
+        if (nameValues.length > 0) {
+            newQuery.serviceName = nameValues.join(',');
         } else {
-            newQuery.unhealthyPage = String(serviceListPageStore.unhealthyThisPage);
-            newQuery.healthyPage = String(serviceListPageStore.healthyThisPage);
+            newQuery.serviceName = undefined;
         }
 
         replaceUrlQuery(newQuery);
+
+        serviceListPageStore.setUnhealthyPage(1);
+        serviceListPageStore.setHealthyPage(1);
     }
+
     await fetchBothLists();
 };
 
+watchEffect(() => {
+    console.log(route.query);
+});
+
 const fetchBothLists = async () => {
     await Promise.all([
         fetchServiceList(),
@@ -187,22 +194,35 @@ onMounted(async () => {
     serviceListPageStore.setUnhealthyPage(parsedUnhealthy);
     serviceListPageStore.setHealthyPage(parsedHealthy);
 
+    const { serviceName } = route.query;
+    if (serviceName && typeof serviceName === 'string') {
+        const nameValues = serviceName.split(',').map((name) => ({
+            key: { name: 'name' },
+            value: { label: name, name },
+        }));
+        queryTagHelper.setQueryTags(nameValues);
+    }
+
     await fetchBothLists();
 });
 
 watch(() => serviceListPageStore.unhealthyThisPage, (val) => {
-    replaceUrlQuery({
-        unhealthyPage: String(val),
-        healthyPage: String(serviceListPageStore.healthyThisPage),
-    });
+    if (!queryTags.value.some((tag) => tag.key?.name === 'name')) {
+        replaceUrlQuery({
+            unhealthyPage: String(val),
+            healthyPage: String(serviceListPageStore.healthyThisPage),
+        });
+    }
     handleUnhealthyPageChange();
 });
 
 watch(() => serviceListPageStore.healthyThisPage, (val) => {
-    replaceUrlQuery({
-        unhealthyPage: String(serviceListPageStore.unhealthyThisPage),
-        healthyPage: String(val),
-    });
+    if (!queryTags.value.some((tag) => tag.key?.name === 'name')) {
+        replaceUrlQuery({
+            unhealthyPage: String(serviceListPageStore.unhealthyThisPage),
+            healthyPage: String(val),
+        });
+    }
     handleHealthyPageChange();
 });
 </script>

From bc8de9688d46e38c0d37847d3c88dda426dcd527 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=84=8B=E1=85=B5=E1=84=89=E1=85=B3=E1=86=BC=E1=84=8B?=
 =?UTF-8?q?=E1=85=A7=E1=86=AB?= <sylee1274@mz.co.kr>
Date: Mon, 19 May 2025 14:16:53 +0900
Subject: [PATCH 15/15] fix: remove unnecessary console log
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 이승연 <sylee1274@mz.co.kr>
---
 .../services/alert-manager/v2/components/ServiceList.vue  | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/apps/web/src/services/alert-manager/v2/components/ServiceList.vue b/apps/web/src/services/alert-manager/v2/components/ServiceList.vue
index 70488fa006..1c398eacf6 100644
--- a/apps/web/src/services/alert-manager/v2/components/ServiceList.vue
+++ b/apps/web/src/services/alert-manager/v2/components/ServiceList.vue
@@ -1,7 +1,5 @@
 <script setup lang="ts">
-import {
-    onMounted, reactive, watch, watchEffect,
-} from 'vue';
+import { onMounted, reactive, watch } from 'vue';
 import {
     useRoute, useRouter,
 } from 'vue-router/composables';
@@ -89,10 +87,6 @@ const handleToolbox = async (options: ToolboxOptions) => {
     await fetchBothLists();
 };
 
-watchEffect(() => {
-    console.log(route.query);
-});
-
 const fetchBothLists = async () => {
     await Promise.all([
         fetchServiceList(),