bfg-common 1.6.112 → 1.6.114

package/assets/localization/local_be.json

@@ -3959,7 +3959,17 @@
     "streamKeyValidation": "Праверка Stream Key",
     "hostSettingsSubtitle": "Імя хаста, пад якім метрыкі будуць адпраўляцца ў Monq",
     "hostNameLabel": "Імя хаста (як адлюстроўваецца ў Monq)",
-    "metricsWillAppearInMonqText": "Метрыкі будуць адлюстроўвацца ў Monq пад гэтым імем. Звычайна гэта IP гіпервізара або FQDN."
+    "metricsWillAppearInMonqText": "Метрыкі будуць адлюстроўвацца ў Monq пад гэтым імем. Звычайна гэта IP гіпервізара або FQDN.",
+    "monqSystemStatusDescription": "Сачыце за прадукцыйнасцю адаптара і правярайце падключэнні да Monq",
+    "adapterIsRunning": "Адаптар працуе",
+    "metricsAreBeingSent": "Метрыкі адпраўляюцца (адпраўлена: {0})",
+    "monqIsNotAvailable": "Monq недаступны",
+    "deleteMonqIntegrationConfiguration": "Вы ўпэўнены, што хочаце выдаліць канфігурацыю інтэграцыі Monq?",
+    "configurationSavedAdapterStarted": "Канфігурацыя захавана, адаптар запушчаны",
+    "monqAdapterLogs": "Логі адаптара Monq",
+    "clearLogs": "Ачысціць логі",
+    "noLogs": "Няма логаў",
+    "noErrorLogs": "Няма логаў з памылкамі"
   },
   "glpi": {
     "connectToGlpi": "Падключыцца да GLPI",
@@ -4648,7 +4658,8 @@
   "advancedSystemSettings": {
     "key": "Ключ",
     "value": "Значэнне",
-    "summary": "Зводка"
+    "summary": "Зводка",
+    "keysCountText": "ключ(ы)"
   },
   "tagsAndAttributes": {
     "attributeDeleteConfirmation": "Вы ўпэўненыя, што хочаце выдаліць карыстацкі атрыбут \"{attributeName}\"?",

package/assets/localization/local_en.json

@@ -3963,7 +3963,17 @@
     "streamKeyValidation": "Stream Key validation",
     "hostSettingsSubtitle": "The hostname under which metrics will be sent to Monq",
     "hostNameLabel": "Hostname (as shown in Monq)",
-    "metricsWillAppearInMonqText": "Metrics will appear in Monq under this name. Usually the hypervisor IP or FQDN."
+    "metricsWillAppearInMonqText": "Metrics will appear in Monq under this name. Usually the hypervisor IP or FQDN.",
+    "monqSystemStatusDescription": "Monitor adapter performance and verify connections to Monq",
+    "adapterIsRunning": "Adapter is running",
+    "metricsAreBeingSent": "Metrics are being sent (sent: {0})",
+    "monqIsNotAvailable": "Monq is not available",
+    "deleteMonqIntegrationConfiguration": "Are you sure you want to delete the Monq integration configuration?",
+    "configurationSavedAdapterStarted": "Configuration saved, adapter started",
+    "monqAdapterLogs": "Monq Adapter Logs",
+    "clearLogs": "Clear Logs",
+    "noLogs": "No logs",
+    "noErrorLogs": "No Error logs"
   },
   "glpi": {
     "connectToGlpi": "Connect to GLPI",
@@ -4653,7 +4663,8 @@
   "advancedSystemSettings": {
     "key": "Key",
     "value": "Value",
-    "summary": "Summary"
+    "summary": "Summary",
+    "keysCountText": "key(s)"
   },
   "tagsAndAttributes": {
     "attributeDeleteConfirmation": "Are you sure you want to delete the custom attribute \"{attributeName}\"?",

package/assets/localization/local_hy.json

@@ -3963,7 +3963,17 @@
     "streamKeyValidation": "Stream Key-ի ստուգում",
     "hostSettingsSubtitle": "Հոսթի անունը, որի ներքո մետրիկաները կուղարկվեն Monq",
     "hostNameLabel": "Հոսթի անունը (ինչպես ցուցադրվում է Monq-ում)",
-    "metricsWillAppearInMonqText": "Մետրիկաները կհայտնվեն Monq-ում այս անունով։ Սովորաբար դա հիպերվիզորի IP-ն կամ FQDN-ն է։"
+    "metricsWillAppearInMonqText": "Մետրիկաները կհայտնվեն Monq-ում այս անունով։ Սովորաբար դա հիպերվիզորի IP-ն կամ FQDN-ն է։",
+    "monqSystemStatusDescription": "Վերահսկեք ադապտերի աշխատանքը և ստուգեք Monq-ի հետ կապերը",
+    "adapterIsRunning": "Ադապտերը աշխատում է",
+    "metricsAreBeingSent": "Մետրիկաները ուղարկվում են (ուղարկված՝ {0})",
+    "monqIsNotAvailable": "Monq-ը հասանելի չէ",
+    "deleteMonqIntegrationConfiguration": "Վստա՞հ եք, որ ցանկանում եք ջնջել Monq ինտեգրման կոնֆիգուրացիան",
+    "configurationSavedAdapterStarted": "Կոնֆիգուրացիան պահպանված է, ադապտերը գործարկված է",
+    "monqAdapterLogs": "Monq ադապտերի լոգեր",
+    "clearLogs": "Մաքրել լոգերը",
+    "noLogs": "Լոգեր չկան",
+    "noErrorLogs": "Սխալների լոգեր չկան"
   },
   "glpi": {
     "connectToGlpi": "Միացեք GLPI- ին",
@@ -4652,7 +4662,8 @@
   "advancedSystemSettings": {
     "key": "Բանալի",
     "value": "Արժեք",
-    "summary": "Ամփոփում"
+    "summary": "Ամփոփում",
+    "keysCountText": "բանալի(ներ)"
   },
   "tagsAndAttributes": {
     "attributeDeleteConfirmation": "Համոզվա՞ծ եք, որ ցանկանում եք հեռացնել \"{attributeName}\" հատուկ ատրիբուտը?",

package/assets/localization/local_kk.json

@@ -3962,7 +3962,17 @@
     "streamKeyValidation": "Stream Key тексеруі",
     "hostSettingsSubtitle": "Метрикалар Monq-қа жіберілетін хост атауы",
     "hostNameLabel": "Хост атауы (Monq-та көрсетілгендей)",
-    "metricsWillAppearInMonqText": "Метрикалар Monq-та осы атаумен көрінеді. Әдетте бұл гипервизордың IP мекенжайы немесе FQDN."
+    "metricsWillAppearInMonqText": "Метрикалар Monq-та осы атаумен көрінеді. Әдетте бұл гипервизордың IP мекенжайы немесе FQDN.",
+    "monqSystemStatusDescription": "Адаптердің өнімділігін бақылаңыз және Monq-пен қосылымдарды тексеріңіз",
+    "adapterIsRunning": "Адаптер жұмыс істеп тұр",
+    "metricsAreBeingSent": "Метрикалар жіберілуде (жіберілгені: {0})",
+    "monqIsNotAvailable": "Monq қолжетімсіз",
+    "deleteMonqIntegrationConfiguration": "Monq интеграциясының конфигурациясын жойғыңыз келетініне сенімдісіз бе?",
+    "configurationSavedAdapterStarted": "Конфигурация сақталды, адаптер іске қосылды",
+    "monqAdapterLogs": "Monq адаптерінің логтары",
+    "clearLogs": "Логтарды тазалау",
+    "noLogs": "Логтар жоқ",
+    "noErrorLogs": "Қате логтары жоқ"
   },
   "glpi": {
     "connectToGlpi": "GLPI-ге қосылыңыз",
@@ -4651,7 +4661,8 @@
   "advancedSystemSettings": {
     "key": "Кілт",
     "value": "Мән",
-    "summary": "Түйіндеме"
+    "summary": "Түйіндеме",
+    "keysCountText": "кілт(тер)"
   },
   "tagsAndAttributes": {
     "attributeDeleteConfirmation": "\"{attributeName}\" теңшелетін төлсипатын жойғыңыз келетініне сенімдісіз бе?",

package/assets/localization/local_ru.json

@@ -3962,7 +3962,17 @@
     "streamKeyValidation": "Проверка Stream Key",
     "hostSettingsSubtitle": "Имя хоста, под которым метрики будут отправляться в Monq",
     "hostNameLabel": "Имя хоста (как отображается в Monq)",
-    "metricsWillAppearInMonqText": "Метрики будут отображаться в Monq под этим именем. Обычно это IP гипервизора или FQDN."
+    "metricsWillAppearInMonqText": "Метрики будут отображаться в Monq под этим именем. Обычно это IP гипервизора или FQDN.",
+    "monqSystemStatusDescription": "Отслеживайте производительность адаптера и проверяйте подключения к Monq",
+    "adapterIsRunning": "Адаптер запущен",
+    "metricsAreBeingSent": "Метрики отправляются (отправлено: {0})",
+    "monqIsNotAvailable": "Monq недоступен",
+    "deleteMonqIntegrationConfiguration": "Вы уверены, что хотите удалить конфигурацию интеграции Monq?",
+    "configurationSavedAdapterStarted": "Конфигурация сохранена, адаптер запущен",
+    "monqAdapterLogs": "Логи адаптера Monq",
+    "clearLogs": "Очистить логи",
+    "noLogs": "Нет логов",
+    "noErrorLogs": "Нет логов с ошибками"
   },
   "glpi": {
     "connectToGlpi": "Подключитесь к GLPI",
@@ -4651,7 +4661,8 @@
   "advancedSystemSettings": {
     "key": "Ключ",
     "value": "Значение",
-    "summary": "Сводка"
+    "summary": "Сводка",
+    "keysCountText": "ключ(и)"
   },
   "tagsAndAttributes": {
     "attributeDeleteConfirmation": "Вы уверены, что хотите удалить пользовательский атрибут \"{attributeName}\"?",

package/assets/localization/local_zh.json

@@ -3960,7 +3960,17 @@
     "streamKeyValidation": "Stream Key 验证",
     "hostSettingsSubtitle": "用于向 Monq 发送指标的主机名",
     "hostNameLabel": "主机名（在 Monq 中显示）",
-    "metricsWillAppearInMonqText": "指标将以此名称显示在 Monq 中。通常为虚拟化主机的 IP 或 FQDN。"
+    "metricsWillAppearInMonqText": "指标将以此名称显示在 Monq 中。通常为虚拟化主机的 IP 或 FQDN。",
+    "monqSystemStatusDescription": "监控适配器性能并检查与 Monq 的连接",
+    "adapterIsRunning": "适配器正在运行",
+    "metricsAreBeingSent": "指标正在发送（已发送：{0}）",
+    "monqIsNotAvailable": "Monq 不可用",
+    "deleteMonqIntegrationConfiguration": "您确定要删除 Monq 集成配置吗？",
+    "configurationSavedAdapterStarted": "配置已保存，适配器已启动",
+    "monqAdapterLogs": "Monq 适配器日志",
+    "clearLogs": "清除日志",
+    "noLogs": "没有日志",
+    "noErrorLogs": "没有错误日志"
   },
   "glpi": {
     "connectToGlpi": "连接到GLPI",
@@ -4649,7 +4659,8 @@
   "advancedSystemSettings": {
     "key": "键",
     "value": "值",
-    "summary": "摘要"
+    "summary": "摘要",
+    "keysCountText": "密钥"
   },
   "tagsAndAttributes": {
     "attributeDeleteConfirmation": "您确定要删除自定义属性\"{attributeName}\"吗？",

package/components/common/configure/advancedSystemSettings/AdvancedSystemSettings.vue

@@ -1,20 +1,17 @@
 <template>
-  <atoms-loader v-show="loading" test-id="advanced-system-settings-spinner" />
-  <div class="advanced-system-settings flex flex-col h-full">
-    <common-configure-advanced-system-settings-tools
-      class="mb-1"
-      @show-edit="isShowEdit = true"
-    />
-
-    <common-configure-advanced-system-settings-table-view :data="settings" />
-
-    <common-configure-advanced-system-settings-modals-edit
-      v-if="isShowEdit"
-      :host="props.host"
-      :settings="settings"
-      @hide="isShowEdit = false"
-    />
-  </div>
+  <component
+    :is="currentComponent"
+    :is-loading="isLoading"
+    :settings="settings"
+    @show-edit-modal="isShowEdit = true"
+  />
+
+  <common-configure-advanced-system-settings-modals-edit
+    v-if="isShowEdit"
+    :host="props.host"
+    :settings="settings"
+    @hide="isShowEdit = false"
+  />
 </template>
 
 <script lang="ts" setup>
@@ -27,11 +24,22 @@ const props = defineProps<{
 
 const { $store }: any = useNuxtApp()
 
-const loading = computed<boolean>(() => $store.getters['advancedSystemSettings/getLoading']('settings'))
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const currentComponent = computed(() =>
+  isNewView.value
+    ? defineAsyncComponent(() => import('./New.vue'))
+    : defineAsyncComponent(() => import('./Old.vue'))
+)
+
+const isLoading = computed<boolean>(() =>
+  $store.getters['advancedSystemSettings/getLoading']('settings')
+)
 
 const settings = computed<API_UI_I_DataTable<UI_I_AdvancedSystemSetting[]>>(
   () => $store.getters['advancedSystemSettings/getSettings']
 )
+
 const getSettings = async (): Promise<void> => {
   await $store.dispatch('advancedSystemSettings/A_GET_SETTINGS', props.host)
 }

package/components/common/configure/advancedSystemSettings/New.vue

@@ -0,0 +1,41 @@
+<template>
+  <div class="advanced-system-settings flex flex-col h-full">
+    <div v-if="props.isLoading" class="flex justify-between items-start mb-4">
+      <ui-skeleton-item width="160" height="22" />
+      <ui-skeleton-item width="34" height="34" border-radius="8" />
+    </div>
+    <common-configure-advanced-system-settings-tools
+      v-else
+      @show-edit-modal="emits('show-edit-modal')"
+    />
+    <common-configure-advanced-system-settings-table-view
+      :data="props.settings"
+      :is-loading="props.isLoading"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { API_UI_I_DataTable } from '~/lib/models/table/interfaces'
+import type { UI_I_AdvancedSystemSetting } from '~/store/inventory/modules/configure/advancedSystemSettings/lib/models/interfaces'
+
+const props = defineProps<{
+  isLoading: boolean
+  settings: API_UI_I_DataTable<UI_I_AdvancedSystemSetting[]>
+}>()
+
+const emits = defineEmits<{
+  (event: 'show-edit-modal'): void
+}>()
+</script>
+
+<style lang="scss" scoped>
+.advanced-system-settings {
+  margin-top: 6px;
+  margin-right: 14px;
+
+  :deep(.data-table-skeleton) {
+    height: inherit;
+  }
+}
+</style>

package/components/common/configure/advancedSystemSettings/Old.vue

@@ -0,0 +1,36 @@
+<template>
+  <atoms-loader
+    v-show="props.isLoading"
+    test-id="advanced-system-settings-spinner"
+  />
+  <div class="advanced-system-settings flex flex-col h-full">
+    <common-configure-advanced-system-settings-tools
+      class="mb-1"
+      @show-edit-modal="emits('show-edit-modal')"
+    />
+
+    <common-configure-advanced-system-settings-table-view
+      :data="props.settings"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { API_UI_I_DataTable } from '~/lib/models/table/interfaces'
+import type { UI_I_AdvancedSystemSetting } from '~/store/inventory/modules/configure/advancedSystemSettings/lib/models/interfaces'
+
+const props = defineProps<{
+  isLoading: boolean
+  settings: API_UI_I_DataTable<UI_I_AdvancedSystemSetting[]>
+}>()
+
+const emits = defineEmits<{
+  (event: 'show-edit-modal'): void
+}>()
+</script>
+
+<style lang="scss" scoped>
+.advanced-system-settings {
+  padding-left: 10px;
+}
+</style>

package/components/common/configure/advancedSystemSettings/modals/edit/Edit.vue

@@ -5,7 +5,7 @@
     v-model:invalid-fields="invalidFields"
     :host="props.host"
     :settings="props.settings"
-    :loading="loading"
+    :is-loading="isLoading"
     :errors="errors"
     @hide="onHide"
     @submit="onSubmit"
@@ -39,7 +39,7 @@ const settingsLocal = ref<API_UI_I_DataTable<UI_I_AdvancedSystemSetting[]>>(
   useDeepCopy(props.settings)
 )
 
-const loading = ref<boolean>(false)
+const isLoading = ref<boolean>(false)
 
 const errors = ref<string[]>([])
 const invalidFields = ref<string[]>([])
@@ -50,7 +50,7 @@ const onSubmit = async (): Promise<void> => {
     return
   }
 
-  loading.value = true
+  isLoading.value = true
 
   const error = await $store.dispatch(
     'advancedSystemSettings/A_UPDATE_SETTINGS',
@@ -67,7 +67,7 @@ const onSubmit = async (): Promise<void> => {
   if (error) errors.value.push(error)
   else onHide()
 
-  loading.value = false
+  isLoading.value = false
 }
 
 const onHide = (): void => {

package/components/common/configure/advancedSystemSettings/modals/edit/New.vue

@@ -1,42 +1,52 @@
 <template>
-  <atoms-modal
-    :title="localization.common.edit"
-    :second-title="props.host"
-    :loading="props.loading"
+  <ui-modal
+    :title="localization.common.editSettings"
+    :subtitle="props.host"
+    :texts="modalTextsLocal"
+    :is-loading="props.isLoading"
     test-id="advanced-system-settings-edit"
-    class="advanced-system-settings"
+    width="720px"
     show
     @hide="onHide"
   >
-    <template #modalBody>
-      <atoms-alert
-        v-show="props.errors.length"
-        :items="props.errors"
-        status="alert-danger"
-        test-id="advanced-system-service-alert"
-        class="mb-1"
-        @remove="emits('remove-validation-errors')"
-      />
-
-      <common-configure-advanced-system-settings-table-view
-        v-model:invalid-fields="invalidFields"
-        :data="props.settings"
-      />
+    <template #content>
+      <div class="advanced-system-settings-edit-modal-body grid gap-4 mx-8">
+        <ui-alert
+          v-if="props.errors.length"
+          :messages="props.errors"
+          test-id="advanced-system-settings-edit-alert"
+          type="error"
+        />
+
+        <common-configure-advanced-system-settings-table-view
+          v-model:settings="model"
+          v-model:invalid-fields="invalidFields"
+          :data="props.settings"
+          is-edit
+        />
+      </div>
     </template>
-  </atoms-modal>
+    <template #footerLeftContent><span></span></template>
+  </ui-modal>
 </template>
 
 <script lang="ts" setup>
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { API_UI_I_DataTable } from '~/lib/models/table/interfaces'
 import type { UI_I_AdvancedSystemSetting } from '~/store/inventory/modules/configure/advancedSystemSettings/lib/models/interfaces'
+import type { UI_I_ModalTexts } from 'bfg-uikit/components/ui/modal/models/interfaces'
 
-const invalidFields = defineModel<string[]>('invalid-fields', {required: true})
+const model = defineModel<API_UI_I_DataTable<UI_I_AdvancedSystemSetting[]>>({
+  required: true,
+})
+const invalidFields = defineModel<string[]>('invalid-fields', {
+  required: true,
+})
 
 const props = defineProps<{
   host: string
   settings: API_UI_I_DataTable<UI_I_AdvancedSystemSetting[]>
-  loading: boolean
+  isLoading: boolean
   errors: string[]
 }>()
 
@@ -48,9 +58,18 @@ const emits = defineEmits<{
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
+const modalTextsLocal = computed<UI_I_ModalTexts>(() => ({
+  button2: localization.value.common.save,
+}))
+
 const onHide = (): void => {
   emits('hide')
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.advanced-system-settings-edit-modal-body {
+  height: 400px;
+  overflow: auto;
+}
+</style>

package/components/common/configure/advancedSystemSettings/modals/edit/Old.vue

@@ -2,7 +2,7 @@
   <atoms-modal
     :title="localization.common.edit"
     :second-title="props.host"
-    :loading="props.loading"
+    :loading="props.isLoading"
     test-id="advanced-system-settings-edit"
     class="advanced-system-settings"
     width="863px"
@@ -38,12 +38,14 @@ import type { UI_I_AdvancedSystemSetting } from '~/store/inventory/modules/confi
 const model = defineModel<API_UI_I_DataTable<UI_I_AdvancedSystemSetting[]>>({
   required: true,
 })
-const invalidFields = defineModel<string[]>('invalid-fields', {required: true})
+const invalidFields = defineModel<string[]>('invalid-fields', {
+  required: true,
+})
 
 const props = defineProps<{
   host: string
   settings: API_UI_I_DataTable<UI_I_AdvancedSystemSetting[]>
-  loading: boolean
+  isLoading: boolean
   errors: string[]
 }>()
 

package/components/common/configure/advancedSystemSettings/tableView/TableView.vue

@@ -1,18 +1,21 @@
 <template>
   <component
     :is="currentComponent"
-    v-model:settings="settings"
-    v-model:invalid-fields="invalidFields"
     :data-table="props.data?.items || []"
     :total-items="props.data?.total_items || 0"
     :total-pages="props.data?.total_pages || 1"
     :is-edit="props.isEdit"
+    :is-loading="props.isLoading"
+    @change-setting="onChangeSetting"
+    @update-invalid-fields="onUpdateInvalidFields"
   />
 </template>
 
 <script lang="ts" setup>
 import type { API_UI_I_DataTable } from '~/lib/models/table/interfaces'
 import type { UI_I_AdvancedSystemSetting } from '~/store/inventory/modules/configure/advancedSystemSettings/lib/models/interfaces'
+import type { UI_I_ArbitraryObject } from '~/lib/models/interfaces'
+import type { UI_I_AdvancedSystemSettingsEditData } from '~/components/common/configure/advancedSystemSettings/tableView/old/lib/models/interfaces'
 
 const settings = defineModel<API_UI_I_DataTable<UI_I_AdvancedSystemSetting[]>>(
   'settings',
@@ -24,6 +27,7 @@ const invalidFields = defineModel<string[]>('invalid-fields', {
 const props = withDefaults(
   defineProps<{
     data: API_UI_I_DataTable<UI_I_AdvancedSystemSetting[]>
+    isLoading: boolean
     isEdit?: boolean
   }>(),
   { isEdit: false }
@@ -37,4 +41,25 @@ const currentComponent = computed(() =>
     ? defineAsyncComponent(() => import('./new/New.vue'))
     : defineAsyncComponent(() => import('./old/Old.vue'))
 )
+
+const onChangeSetting = (
+  value: UI_I_AdvancedSystemSettingsEditData['value'],
+  key: string
+): void => {
+  settings.value.items = settings.value.items.map((item) => {
+    if (item.key === key) {
+      item.value = value
+    }
+    return item
+  })
+}
+
+const invalidFieldsLocal = ref<UI_I_ArbitraryObject<string>>({})
+const onUpdateInvalidFields = (value: string, key: string): void => {
+  invalidFieldsLocal.value[key] = value
+  if (invalidFields.value)
+    invalidFields.value = Object.values(invalidFieldsLocal.value).filter(
+      (error) => error
+    )
+}
 </script>

package/components/common/configure/advancedSystemSettings/tableView/{old/field → field}/Field.vue

@@ -1,67 +1,37 @@
 <template>
-  <atoms-tooltip-error :has-error="invalid">
-    <template #elem>
-      <div v-if="props.data.type === 'number'">
-        <input
-          v-model="valueLocal"
-          type="number"
-          :class="{ 'has-error': invalid }"
-          @input="onChangeSetting($event)"
-        />
-      </div>
-      <div v-if="props.data.type === 'string'">
-        <input
-          v-model="valueLocal"
-          type="text"
-          :class="{ 'has-error': invalid }"
-          @input="onChangeSetting($event)"
-        />
-      </div>
-      <div v-if="props.data.type === 'boolean'" class="select">
-        <select
-          v-model="valueLocal"
-          @change="onChangeSetting($event)"
-          :class="{ 'has-error': invalid }"
-        >
-          <option value="false">false</option>
-          <option value="true">true</option>
-        </select>
-      </div>
-      <!--      <div v-if="props.data.type === 'select'" class="select">-->
-      <!--        <select-->
-      <!--          v-model="valueLocal"-->
-      <!--          @change="onChangeSetting($event)"-->
-      <!--          :class="{ 'has-error': invalid }"-->
-      <!--        >-->
-      <!--          <option-->
-      <!--            v-for="item2 in props.data.options"-->
-      <!--            :key="item2.key"-->
-      <!--            :value="item2.key"-->
-      <!--          >-->
-      <!--            {{ item2.value }}-->
-      <!--          </option>-->
-      <!--        </select>-->
-      <!--      </div>-->
-    </template>
-    <template #content>
-      {{ errorMessage }}
-    </template>
-  </atoms-tooltip-error>
+  <component
+    :is="currentComponent"
+    v-model:value="valueLocal"
+    :data="props.data"
+    :invalid="invalid"
+    :error-message="errorMessage"
+    @change="onChangeSetting"
+  />
 </template>
 
 <script setup lang="ts">
 import type { UI_I_AdvancedSystemSettingsEditData } from '~/components/common/configure/advancedSystemSettings/tableView/old/lib/models/interfaces'
-import { E_Format } from '~/components/common/configure/advancedSystemSettings/tableView/old/field/lib/models/enums'
+import { UI_E_Format } from '~/components/common/configure/advancedSystemSettings/tableView/field/lib/models/enums'
 import { allRegExp } from '~/lib/config/regExp'
 
 const props = defineProps<{
   data: UI_I_AdvancedSystemSettingsEditData
 }>()
+
 const emits = defineEmits<{
   (event: 'change', value: UI_I_AdvancedSystemSettingsEditData['value']): void
   (event: 'error-message', value: string): void
 }>()
 
+const { $store }: any = useNuxtApp()
+
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+const currentComponent = computed(() =>
+  isNewView.value
+    ? defineAsyncComponent(() => import('./New.vue'))
+    : defineAsyncComponent(() => import('./Old.vue'))
+)
+
 const valueLocal = ref<UI_I_AdvancedSystemSettingsEditData['value']>(
   props.data.value
 )
@@ -118,7 +88,7 @@ const onChangeSetting = (event: Event): void => {
   if (invalid.value) return
 
   if (validation.Format) {
-    const format = E_Format[validation.Format]
+    const format = UI_E_Format[validation.Format]
     invalid.value = !allRegExp[format].test(value)
     errorMessage.value = invalid.value ? `Value must be ${format}` : ''
   }