bfg-common 1.5.369 → 1.5.370

package/assets/localization/local_be.json

@@ -3192,7 +3192,13 @@
     "directSync": "Сінхронны прамы запіс",
     "unsafe": "Небяспечны рэжым",
     "lastCreateSubtitle": "Праверце падрабязнасці перад стварэннем віртуальнай машыны.",
-    "noDestinationComputeResourceSelected": "Не абраны вылічаны рэсурс прызначэння."
+    "noDestinationComputeResourceSelected": "Не абраны вылічаны рэсурс прызначэння.",
+    "selectAdvancedOptionsCloning": "Абярыце пашыраныя параметры для кланавання.",
+    "customizeOS": "Наладзіць АС",
+    "customizeOperatingSystem": "Наладзіць аперацыйную сістэму.",
+    "customizeVMHardware": "Наладзіць абсталяванне гэтай віртуальнай машыны.",
+    "autoPowerOn": "Аўтазапуск",
+    "powerVMAfterCreation": "Уключыць віртуальную машыну пасля стварэння."
   },
   "feedback": {
     "additionalDetailsHelp": "Даведка па дадатковых звестках",

package/assets/localization/local_en.json

@@ -3196,7 +3196,13 @@
     "directSync": "Direct Sync",
     "unsafe": "Unsafe",
     "lastCreateSubtitle": "Review the details before the virtual machine is created.",
-    "noDestinationComputeResourceSelected": "No destination compute resource selected."
+    "noDestinationComputeResourceSelected": "No destination compute resource selected.",
+    "selectAdvancedOptionsCloning": "Select advanced options for cloning.",
+    "customizeOS": "Customize OS",
+    "customizeOperatingSystem": "Customize the operating system.",
+    "customizeVMHardware": "Customize this virtual machine’s hardware.",
+    "autoPowerOn": "Auto Power On",
+    "powerVMAfterCreation": "Power on virtual machine after creation."
   },
   "feedback": {
     "additionalDetailsHelp": "Additional Details Help",

package/assets/localization/local_hy.json

@@ -3196,7 +3196,13 @@
     "directSync": "Սինխրոն ուղիղ ձայնագրություն",
     "unsafe": "Անապահով ռեժիմ",
     "lastCreateSubtitle": "Վիրտուալ մեքենա ստեղծելուց առաջ ստուգեք մանրամասները։",
-    "noDestinationComputeResourceSelected": "Ընտրված չէ որեւէ նշանակման ռեսուրս:"
+    "noDestinationComputeResourceSelected": "Ընտրված չէ որեւէ նշանակման ռեսուրս:",
+    "selectAdvancedOptionsCloning": "Ընտրեք կլոնավորման ընդլայնված պարամետրերը։",
+    "customizeOS": "Անհատականացնել օպերացիոն համակարգը",
+    "customizeOperatingSystem": "Անհատականացնել օպերացիոն համակարգը։",
+    "customizeVMHardware": "Անհատականացնել այս վիրտուալ մեքենայի սարքավորումները։",
+    "autoPowerOn": "Ավտոմատ միացում",
+    "powerVMAfterCreation": "Վիրտուալ մեքենան միացնել ստեղծումից հետո։"
   },
   "feedback": {
     "additionalDetailsHelp": "Լրացուցիչ մանրամասներ Օգնություն",

package/assets/localization/local_kk.json

@@ -3195,7 +3195,13 @@
     "directSync": "Синхронды тікелей жазу",
     "unsafe": "Қауіпті режим",
     "lastCreateSubtitle": "Виртуалды машина құрылмас бұрын мәліметтерді қарап шығыңыз.",
-    "noDestinationComputeResourceSelected": "Тағайындалған есептеу ресурстары таңдалмайды."
+    "noDestinationComputeResourceSelected": "Тағайындалған есептеу ресурстары таңдалмайды.",
+    "selectAdvancedOptionsCloning": "Көшіру үшін кеңейтілген параметрлерді таңдаңыз.",
+    "customizeOS": "ОЖ баптау",
+    "customizeOperatingSystem": "Операциялық жүйені баптау.",
+    "customizeVMHardware": "Бұл виртуалды машинаның жабдығын баптау.",
+    "autoPowerOn": "Автоқосу",
+    "powerVMAfterCreation": "Виртуалды машинаны жасау кейін қосу."
   },
   "feedback": {
     "additionalDetailsHelp": "Қосымша мәліметтер анықтамасы",

package/assets/localization/local_ru.json

@@ -3195,7 +3195,13 @@
     "directSync": "Синхронная прямая запись",
     "unsafe": "Небезопасный режим",
     "lastCreateSubtitle": "Проверьте детали перед созданием виртуальной машины.",
-    "noDestinationComputeResourceSelected": "Нет выбранного ресурса."
+    "noDestinationComputeResourceSelected": "Нет выбранного ресурса.",
+    "selectAdvancedOptionsCloning": "Выберите расширенные параметры для клонирования.",
+    "customizeOS": "Настроить ОС",
+    "customizeOperatingSystem": "Настроить операционную систему.",
+    "customizeVMHardware": "Настроить оборудование этой виртуальной машины.",
+    "autoPowerOn": "Автоматическое включение",
+    "powerVMAfterCreation": "Включить виртуальную машину после создания."
   },
   "feedback": {
     "additionalDetailsHelp": "Дополнительная информация Помощь",

package/assets/localization/local_zh.json

@@ -3193,7 +3193,13 @@
     "directSync": "同步直接记录",
     "unsafe": "不安全模式",
     "lastCreateSubtitle": "在创建虚拟机之前请查看详细信息。",
-    "noDestinationComputeResourceSelected": "未选择目标计算资源。"
+    "noDestinationComputeResourceSelected": "未选择目标计算资源。",
+    "selectAdvancedOptionsCloning": "选择用于克隆的高级选项。",
+    "customizeOS": "自定义操作系统",
+    "customizeOperatingSystem": "自定义操作系统。",
+    "customizeVMHardware": "自定义此虚拟机的硬件。",
+    "autoPowerOn": "自动开机",
+    "powerVMAfterCreation": "创建后启动虚拟机。"
   },
   "feedback": {
     "additionalDetailsHelp": "其他详细信息帮助",

package/components/common/vm/actions/add/New.vue

@@ -157,7 +157,17 @@
           selectedStep.id === dynamicSteps.selectOptions ||
           selectedStep.id === dynamicSteps.selectOptionsForDeployment
         "
+        :sub-title-height="heightSelectOptions"
       >
+        <template #subTitle>
+          <div ref="subTitleBlockSelectOptions">
+            <div class="subtitle-block">
+              <ui-wizard-subtitle
+                :sub-title="localization.vmWizard.selectAdvancedOptionsCloning"
+              />
+            </div>
+          </div>
+        </template>
         <template #content>
           <common-vm-actions-common-select-options
             :is-create-template="selectedCreateType === '1'"
@@ -575,6 +585,10 @@ const subTitleBlockReadyComplete = ref<HTMLElement | null>(null)
 const { height: heightReadyComplete } = useElementSize(
   subTitleBlockReadyComplete
 )
+const subTitleBlockSelectOptions = ref<HTMLElement | null>(null)
+const { height: heightSelectOptions } = useElementSize(
+  subTitleBlockSelectOptions
+)
 
 const isNameAlertWrapperEmpty = ref<boolean>(false)
 const isComputeResourceAlertWrapperEmpty = ref<boolean>(false)

package/components/common/vm/actions/common/select/options/New.vue

@@ -0,0 +1,189 @@
+<template>
+  <div
+    ref="mainContainer"
+    :class="['select-options grid gap-3 mt-4', { 'is-sm-size': isContainerSm }]"
+  >
+    <div
+      :class="[
+        'checkbox-container',
+        { checked: isCustomizeOs },
+        { disabled: props.isCreateTemplate },
+      ]"
+      @click.stop.prevent="onToggleCustomizeOs"
+    >
+      <ui-checkbox
+        v-model="isCustomizeOs"
+        :label-text="localization.vmWizard.customizeOS"
+        :title="localization.vmWizard.customizeOS"
+        :disabled="props.isCreateTemplate"
+        test-id="customize-os"
+      />
+      <p class="checkbox-block-description mt-2 ml-7 mr-3">
+        {{ localization.vmWizard.customizeOperatingSystem }}
+      </p>
+    </div>
+    <div
+      v-if="!props.isCreateTemplate"
+      :class="[
+        'checkbox-container',
+        { checked: isCustomizeHardware },
+        { disabled: props.isCreateTemplate },
+      ]"
+      @click.stop.prevent="onToggleCustomizeHardware"
+    >
+      <ui-checkbox
+        v-model="isCustomizeHardware"
+        :label-text="localization.common.customizeHardware"
+        :title="localization.common.customizeHardware"
+        :disabled="props.isCreateTemplate"
+        test-id="customize-hardware"
+      />
+      <p class="checkbox-block-description mt-2 ml-7 mr-3">
+        {{ localization.vmWizard.customizeVMHardware }}
+      </p>
+    </div>
+    <div
+      :class="[
+        'checkbox-container',
+        { checked: isPowerOn },
+        { disabled: props.isCreateTemplate },
+      ]"
+      @click.stop.prevent="onTogglePowerOn"
+    >
+      <ui-checkbox
+        v-model="isPowerOn"
+        :label-text="localization.vmWizard.autoPowerOn"
+        :title="localization.vmWizard.autoPowerOn"
+        :disabled="props.isCreateTemplate"
+        test-id="power-on"
+      />
+      <p class="checkbox-block-description mt-2 ml-7 mr-3">
+        {{ localization.vmWizard.powerVMAfterCreation }}
+      </p>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useElementSize } from '@vueuse/core'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+const modelValue = defineModel<string[]>({ required: true })
+
+const props = defineProps<{
+  isCreateTemplate?: boolean // TODO change
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const mainContainer = ref<HTMLElement | null>(null)
+const { width: mainContainerWidth } = useElementSize(mainContainer)
+
+const isCustomizeOs = ref<boolean>(false)
+const isCustomizeHardware = ref<boolean>(false)
+const isPowerOn = ref<boolean>(false)
+
+const onToggleCustomizeOs = (): void => {
+  if (props.isCreateTemplate) return
+
+  isCustomizeOs.value = !isCustomizeOs.value
+  if (isCustomizeOs.value) {
+    !modelValue.value.includes('customize-os') &&
+      modelValue.value.push('customize-os')
+  } else {
+    modelValue.value = modelValue.value.filter(
+      (item) => item !== 'customize-os'
+    )
+  }
+}
+
+const onToggleCustomizeHardware = (): void => {
+  if (props.isCreateTemplate) return
+
+  isCustomizeHardware.value = !isCustomizeHardware.value
+  if (isCustomizeHardware.value) {
+    !modelValue.value.includes('customize-hardware') &&
+      modelValue.value.push('customize-hardware')
+  } else {
+    modelValue.value = modelValue.value.filter(
+      (item) => item !== 'customize-hardware'
+    )
+  }
+}
+
+const onTogglePowerOn = (): void => {
+  if (props.isCreateTemplate) return
+
+  isPowerOn.value = !isPowerOn.value
+  if (isPowerOn.value) {
+    !modelValue.value.includes('power-on') && modelValue.value.push('power-on')
+  } else {
+    modelValue.value = modelValue.value.filter((item) => item !== 'power-on')
+  }
+}
+
+const isContainerSm = ref<boolean>(false)
+watch(
+  mainContainerWidth,
+  (newValue) => {
+    isContainerSm.value = newValue <= 600
+  },
+  { immediate: true }
+)
+</script>
+
+<style>
+:root {
+  --radio-btn-active-label-bg-color: #f0f8fd;
+  --radio-btn-active-label-border-color: #008fd6;
+}
+:root.dark-theme {
+  --radio-btn-active-label-bg-color: #2ba2de14;
+  --radio-btn-active-label-border-color: #2ba2de;
+}
+</style>
+
+<style scoped lang="scss">
+.select-options {
+  grid-template-columns: 1fr 1fr 1fr;
+  grid-template-rows: max-content;
+  overflow-y: auto;
+  padding-bottom: 16px;
+
+  &.is-sm-size {
+    grid-template-columns: 1fr;
+  }
+
+  .checkbox-container {
+    width: 100%;
+    background-color: var(--select-bg);
+    border-radius: 8px;
+    padding: 12px;
+    transition: box-shadow 0.1s ease-in-out;
+    box-shadow: inset 0 0 0 1px var(--line-color);
+
+    &.disabled {
+      cursor: not-allowed;
+    }
+    &:not(.disabled):hover {
+      cursor: pointer;
+    }
+    &:not(.disabled):not(.checked):hover {
+      box-shadow: inset 0 0 0 1px var(--select-border);
+    }
+    &.checked {
+      background-color: var(--radio-btn-active-label-bg-color);
+      box-shadow: inset 0 0 0 1.5px var(--radio-btn-active-label-border-color);
+    }
+
+    :deep(.ui-checkbox-label) {
+      align-items: flex-start;
+    }
+
+    .checkbox-block-description {
+      color: #9da6ad;
+      line-height: 18px;
+    }
+  }
+}
+</style>

package/components/common/vm/actions/common/select/options/Old.vue

@@ -0,0 +1,70 @@
+<template>
+  <div :class="['select-options', { disabled: props.isCreateTemplate }]">
+    <div class="checkbox">
+      <input
+        id="customize-os"
+        v-model="modelValue"
+        data-id="customize-os"
+        type="checkbox"
+        value="customize-os"
+        :disabled="props.isCreateTemplate"
+      />
+      <label for="customize-os">{{
+        localization.common.customizeTheOperatingSystem
+      }}</label>
+    </div>
+    <div v-if="!props.isCreateTemplate" class="checkbox">
+      <input
+        id="customize-hardware"
+        v-model="modelValue"
+        data-id="customize-hardware"
+        type="checkbox"
+        value="customize-hardware"
+      />
+      <label for="customize-hardware">{{
+        localization.common.customizeThisVirtualMachineHardware
+      }}</label>
+    </div>
+    <div class="checkbox">
+      <input
+        id="power-on"
+        v-model="modelValue"
+        data-id="power-on"
+        type="checkbox"
+        value="power-on"
+        :disabled="props.isCreateTemplate"
+      />
+      <label for="power-on">{{
+        localization.common.powerOnVirtualMachineAfterCreation
+      }}</label>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+const modelValue = defineModel<string[]>()
+
+const props = defineProps<{
+  isCreateTemplate?: boolean // TODO change
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+</script>
+
+<style scoped lang="scss">
+.select-options {
+  padding: 12px 0 0;
+
+  &.disabled {
+    input,
+    label {
+      cursor: not-allowed;
+    }
+  }
+  .checkbox {
+    margin: 6px 0;
+  }
+}
+</style>

package/components/common/vm/actions/common/select/options/Options.vue

@@ -1,49 +1,17 @@
 <template>
-  <div :class="['select-options', {disabled: props.isCreateTemplate}]">
-    <div class="checkbox">
-      <input
-        id="customize-os"
-        v-model="selectedOptions"
-        data-id="customize-os"
-        type="checkbox"
-        value="customize-os"
-        :disabled="props.isCreateTemplate"
-      />
-      <label for="customize-os">{{
-        localization.common.customizeTheOperatingSystem
-      }}</label>
-    </div>
-    <div v-if="!props.isCreateTemplate" class="checkbox">
-      <input
-        id="customize-hardware"
-        v-model="selectedOptions"
-        data-id="customize-hardware"
-        type="checkbox"
-        value="customize-hardware"
-      />
-      <label for="customize-hardware">{{
-        localization.common.customizeThisVirtualMachineHardware
-      }}</label>
-    </div>
-    <div class="checkbox">
-      <input
-        id="power-on"
-        v-model="selectedOptions"
-        data-id="power-on"
-        type="checkbox"
-        value="power-on"
-        :disabled="props.isCreateTemplate"
-      />
-      <label for="power-on">{{
-        localization.common.powerOnVirtualMachineAfterCreation
-      }}</label>
-    </div>
-  </div>
+  <common-vm-actions-common-select-options-new
+    v-if="isNewView"
+    v-model="selectedOptions"
+    :is-create-template="props.isCreateTemplate"
+  />
+  <common-vm-actions-common-select-options-old
+    v-else
+    v-model="selectedOptions"
+    :is-create-template="props.isCreateTemplate"
+  />
 </template>
 
 <script setup lang="ts">
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-
 const props = defineProps<{
   isCreateTemplate?: boolean // TODO change
 }>()
@@ -51,7 +19,10 @@ const props = defineProps<{
 const emits = defineEmits<{
   (event: 'change', value: string[]): void
 }>()
-const localization = computed<UI_I_Localization>(() => useLocal())
+
+const { $store }: any = useNuxtApp()
+
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 
 const selectedOptions = ref<string[]>([])
 watch(selectedOptions, (newValue) => {
@@ -59,17 +30,4 @@ watch(selectedOptions, (newValue) => {
 })
 </script>
 
-<style scoped lang="scss">
-.select-options {
-  padding: 12px 0 0;
-
-  &.disabled {
-    input, label {
-      cursor: not-allowed;
-    }
-  }
-  .checkbox {
-    margin: 6px 0;
-  }
-}
-</style>
+<style scoped lang="scss"></style>

package/components/common/vm/actions/common/select/template/Template.vue

@@ -1,20 +1,18 @@
 <template>
-  <div class="select-template">
-    <atoms-alert
-      v-show="errors.length"
-      :items="errors"
-      status="alert-danger"
-      test-id="template-alert"
-      @remove="onRemoveValidationErrors"
-    />
-
-    <div class="tree-view-wrap">
-      <common-vm-actions-common-select-template-tree-view
-        :templates-tree="props.templatesTree"
-        @select-node="onSelectNode"
-      />
-    </div>
-  </div>
+  <common-vm-actions-common-select-template-new
+    v-if="isNewView"
+    :templates-tree="props.templatesTree"
+    :errors="errors"
+    @remove="onRemove"
+    @select="onSelect"
+  />
+  <common-vm-actions-common-select-template-old
+    v-else
+    :templates-tree="props.templatesTree"
+    :errors="errors"
+    @remove="onRemove"
+    @select="onSelect"
+  />
 </template>
 
 <script setup lang="ts">
@@ -29,10 +27,14 @@ const emits = defineEmits<{
   (event: 'submit', value: UI_I_TreeNode): void
 }>()
 
+const { $store }: any = useNuxtApp()
+
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const selectedNode = ref<UI_I_TreeNode | null>(null)
-const onSelectNode = (node: UI_I_TreeNode): void => {
+const onSelect = (node: UI_I_TreeNode): void => {
   selectedNode.value = node
 }
 
@@ -44,19 +46,23 @@ watch(
 )
 
 const submit = async (cb: Function): Promise<void> => {
-  if (!selectedNode.value || selectedNode.value.type !== 'vmt' && selectedNode.value.type !== 'vm_template') {
+  if (
+    !selectedNode.value ||
+    (selectedNode.value.type !== 'vmt' &&
+      selectedNode.value.type !== 'vm_template')
+  ) {
     errors.value = [localization.value.vmWizard.selectValidTemplate]
     cb(false)
     return
   }
 
-  onRemoveValidationErrors()
+  onRemove()
   emits('submit', selectedNode.value)
   cb(true)
 }
 
 const errors = ref<string[]>([])
-const onRemoveValidationErrors = (): void => {
+const onRemove = (): void => {
   errors.value = []
 }
 </script>

package/components/common/vm/actions/common/select/template/new/New.vue

@@ -0,0 +1,42 @@
+<template>
+  <div class="select-template">
+    <ui-alert
+      v-if="props.errors.length"
+      :messages="props.errors"
+      test-id="select-template-error-alert"
+      type="error"
+      size="md"
+      class="alert-template"
+      @hide="emits('remove')"
+    />
+    <common-vm-actions-common-select-template-tree-view
+      :templates-tree="props.templatesTree"
+      @select-node="emits('select', $event)"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
+
+const props = defineProps<{
+  templatesTree: UI_I_TreeNode[]
+  errors: string[]
+}>()
+
+const emits = defineEmits<{
+  (event: 'remove'): void
+  (event: 'select', value: UI_I_TreeNode): void
+}>()
+</script>
+
+<style scoped lang="scss">
+.select-template {
+  height: calc(100% - 12px);
+  overflow: hidden;
+
+  .alert-template {
+    margin-bottom: 16px;
+  }
+}
+</style>

package/components/common/vm/actions/common/select/template/old/Old.vue

@@ -0,0 +1,34 @@
+<template>
+  <div class="select-template">
+    <atoms-alert
+      v-show="props.errors.length"
+      :items="props.errors"
+      status="alert-danger"
+      test-id="template-alert"
+      @remove="emits('remove')"
+    />
+
+    <div class="tree-view-wrap">
+      <common-vm-actions-common-select-template-tree-view
+        :templates-tree="props.templatesTree"
+        @select-node="emits('select', $event)"
+      />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
+
+const props = defineProps<{
+  templatesTree: UI_I_TreeNode[]
+  errors: string[]
+}>()
+
+const emits = defineEmits<{
+  (event: 'remove'): void
+  (event: 'select', value: UI_I_TreeNode): void
+}>()
+</script>
+
+<style scoped lang="scss"></style>

package/components/common/vm/actions/common/select/template/treeView/New.vue

@@ -0,0 +1,89 @@
+<template>
+  <div class="tree-view-wrap">
+    <div class="tree-view">
+      <ui-tree
+        :nodes="props.nodes"
+        :expand-all="false"
+        :is-loading="props.loading"
+        @toggle-node="onToggleNode"
+        @select-node="emits('select-node', $event)"
+      >
+        <template #content="{ node }">
+          <div class="flex-align-center">
+            <span :class="['node-icon', node.iconClassName]"></span>
+            <span class="node-name">{{ node.name }}</span>
+          </div>
+        </template>
+      </ui-tree>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
+
+const props = defineProps<{
+  loading: boolean
+  nodes: UI_I_TreeNode[]
+}>()
+const emits = defineEmits<{
+  (event: 'select-node', value: UI_I_TreeNode): void
+  (
+    event: 'get-nodes',
+    value: {
+      node: UI_I_TreeNode
+      cb: () => void
+    }
+  ): void
+}>()
+
+const onToggleNode = (node: UI_I_TreeNode): void => {
+  emits('get-nodes', { node, cb: () => {} })
+}
+</script>
+
+<style>
+:root {
+  --select-name-border-color: #e9ebeda3;
+  --select-name-location-bg-color: #ffffff;
+}
+:root.dark-theme {
+  --select-name-border-color: #e9ebed1f;
+  --select-name-location-bg-color: #1b2a371f;
+}
+</style>
+<style scoped lang="scss">
+.tree-view-wrap {
+  flex: 1;
+  border-radius: 8px;
+  border: 1px solid var(--select-name-border-color);
+  padding: 8px;
+  background-color: var(--select-name-location-bg-color);
+  overflow: auto;
+  margin-top: 8px;
+  height: inherit;
+
+  :deep(.skeleton-tree) {
+    padding: 4px 8px;
+
+    .skeleton-tree-row:last-child {
+      display: none;
+    }
+  }
+  :deep(.tree-content) {
+    padding: 0 !important;
+
+    .node-wrapper {
+      border-radius: 4px;
+
+      .node-name {
+        font-size: 12px;
+        margin-left: 8px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+    }
+  }
+}
+</style>

package/components/common/vm/actions/common/select/template/treeView/Old.vue

@@ -0,0 +1,50 @@
+<template>
+  <div class="tree-view">
+    <atoms-loader-pre-loader
+      v-show="props.loading"
+      id="loader"
+      :show="true"
+      class="absolute-center tree-view__loading"
+    />
+    <common-recursion-tree
+      :nodes="props.nodes"
+      class="recursion-tree"
+      @get-nodes="emits('get-nodes', $event)"
+      @select-node="emits('select-node', $event)"
+      @contextmenu.prevent
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
+
+const props = defineProps<{
+  loading: boolean
+  nodes: UI_I_TreeNode[]
+}>()
+const emits = defineEmits<{
+  (event: 'select-node', value: UI_I_TreeNode): void
+  (
+    event: 'get-nodes',
+    value: {
+      node: UI_I_TreeNode
+      cb: () => void
+    }
+  ): void
+}>()
+</script>
+
+<style scoped lang="scss">
+.tree-view {
+  &__loading {
+    :deep(.spinner.spinner-inverse) {
+      position: static;
+      width: 45px;
+      height: 45px;
+      min-width: 45px;
+      min-height: 45px;
+    }
+  }
+}
+</style>

package/components/common/vm/actions/common/select/template/{TemplateTreeView.vue → treeView/TreeView.vue}

@@ -1,19 +1,18 @@
 <template>
-  <div class="tree-view">
-    <atoms-loader-pre-loader
-      v-show="loading"
-      id="loader"
-      :show="true"
-      class="absolute-center tree-view__loading"
-    />
-    <common-recursion-tree
-      :nodes="nodes"
-      class="recursion-tree"
-      @get-nodes="showNodes($event)"
-      @select-node="selectNode"
-      @contextmenu.prevent
-    />
-  </div>
+  <common-vm-actions-common-select-template-tree-view-new
+    v-if="isNewView"
+    :loading="loading"
+    :nodes="nodes"
+    @select-node="onSelectNode"
+    @get-nodes="onShowNodes"
+  />
+  <common-vm-actions-common-select-template-tree-view-old
+    v-else
+    :loading="loading"
+    :nodes="nodes"
+    @select-node="onSelectNode"
+    @get-nodes="onShowNodes"
+  />
 </template>
 
 <script setup lang="ts">
@@ -22,22 +21,18 @@ import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models
 const props = defineProps<{
   templatesTree: UI_I_TreeNode[]
 }>()
+
 const emits = defineEmits<{
   (event: 'select-node', value: UI_I_TreeNode): void
 }>()
 
 const { $store, $recursion }: any = useNuxtApp()
 
-const nodes = ref<UI_I_TreeNode[]>([])
-watch(
-  () => props.templatesTree,
-  (newValue) => {
-    nodes.value = useDeepCopy(newValue)
-  },
-  { deep: true, immediate: true }
-)
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 
 const loading = ref<boolean>(false)
+const nodes = ref<UI_I_TreeNode[]>([])
+
 const getTree = async (): Promise<void> => {
   loading.value = true
   await $store.dispatch('inventory/A_GET_NODES', { name: 'vm' })
@@ -45,7 +40,15 @@ const getTree = async (): Promise<void> => {
 }
 getTree()
 
-const showNodes = ({
+watch(
+  () => props.templatesTree,
+  (newValue) => {
+    nodes.value = useDeepCopy(newValue)
+  },
+  { deep: true, immediate: true }
+)
+
+const onShowNodes = ({
   node,
   cb,
 }: {
@@ -61,7 +64,8 @@ const showNodes = ({
 
   cb()
 }
-const selectNode = (node: UI_I_TreeNode): void => {
+
+const onSelectNode = (node: UI_I_TreeNode): void => {
   $recursion.findAndActivate(
     nodes.value,
     [node.type, node.id],
@@ -73,16 +77,4 @@ const selectNode = (node: UI_I_TreeNode): void => {
 }
 </script>
 
-<style scoped lang="scss">
-.tree-view {
-  &__loading {
-    :deep(.spinner.spinner-inverse) {
-      position: static;
-      width: 45px;
-      height: 45px;
-      min-width: 45px;
-      min-height: 45px;
-    }
-  }
-}
-</style>
+<style scoped lang="scss"></style>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.5.369",
+  "version": "1.5.370",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",