bfg-common 1.5.344 → 1.5.346

package/assets/localization/local_be.json

@@ -2588,7 +2588,9 @@
     "virtualMachineAutomation": "Аўтаматызацыя віртуальных машын",
     "virtualMachineAutomationInfo": "Вы можаце наладзіць пераазначэнне для асобных віртуальных машын на старонцы пераазначэння віртуальных машын.",
     "optionS": "варыянт(ы)",
-    "removeOptionDialog": "Вы ўпэўненыя, што хочаце выдаліць параметр \"{optionName}\" з \"{selectedItemName}\"?"
+    "removeOptionDialog": "Вы ўпэўненыя, што хочаце выдаліць параметр \"{optionName}\" з \"{selectedItemName}\"?",
+    "sphereAvailability": "Даступнасць Sphere",
+    "vmOverrides": "Пераазначэнні ВМ"
   },
   "datastoreWizard": {
     "accessMode": "Рэжым доступу",
@@ -3296,5 +3298,6 @@
     "clientId": "Ідэнтыфікатар кліента",
     "clientSecret": "Сакрэт кліента",
     "credentials": "Уліковыя даныя"
-  }
+  },
+  "sphereAvailability": {}
 }

package/assets/localization/local_en.json

@@ -2592,7 +2592,9 @@
     "virtualMachineAutomation": "Virtual Machine Automation",
     "virtualMachineAutomationInfo": "You can configure overrides for individual virtual machines on the VM Overrides page.",
     "optionS": "option(s)",
-    "removeOptionDialog": "Are you sure you want to delete option \"{optionName}\" from \"{selectedItemName}\"?"
+    "removeOptionDialog": "Are you sure you want to delete option \"{optionName}\" from \"{selectedItemName}\"?",
+    "sphereAvailability": "Sphere Availability",
+    "vmOverrides": "VM Overrides"
   },
   "datastoreWizard": {
     "accessMode": "Access Mode",
@@ -3300,5 +3302,6 @@
     "clientId": "Client ID",
     "clientSecret": "Client Secret",
     "credentials": "Credentials"
-  }
+  },
+  "sphereAvailability": {}
 }

package/assets/localization/local_hy.json

@@ -2592,7 +2592,9 @@
     "virtualMachineAutomation": "Վիրտուալ մեքենաների ավտոմատացում",
     "virtualMachineAutomationInfo": "Վիրտուալ մեքենաների անտեսման էջում կարող եք կարգավորել անհատական վիրտուալ մեքենաների անտեսումները:",
     "optionS": "տարբերակ(ներ)",
-    "removeOptionDialog": "Համոզված եք, որ ցանկանում եք հեռացնել \"{optionName}\" տարբերակը \"{selectedItemName}\"-ից:"
+    "removeOptionDialog": "Համոզված եք, որ ցանկանում եք հեռացնել \"{optionName}\" տարբերակը \"{selectedItemName}\"-ից:",
+    "sphereAvailability": "Sphere-ի հասանելիություն",
+    "vmOverrides": "ՎՄ վերագրանցումներ"
   },
   "datastoreWizard": {
     "accessMode": "Մուտքի ռեժիմ",
@@ -3300,5 +3302,6 @@
     "clientId": "Հաճախորդի ID",
     "clientSecret": "Հաճախորդի գաղտնի բանալի",
     "credentials": "Հավաստագրեր"
-  }
+  },
+  "sphereAvailability": {}
 }

package/assets/localization/local_kk.json

@@ -2591,7 +2591,9 @@
     "virtualMachineAutomation": "Виртуалды Машиналарды Автоматтандыру",
     "virtualMachineAutomationInfo": "ВМ Қайта Анықтау бетінде жеке виртуалды машиналар үшін қайта анықтауларды конфигурациялауға болады.",
     "optionS": "опция(лар)ы",
-    "removeOptionDialog": "\"{selectedItemName}\" ішінен \"{optionName}\" опциясын жойғыңыз келетініне сенімдісіз бе?"
+    "removeOptionDialog": "\"{selectedItemName}\" ішінен \"{optionName}\" опциясын жойғыңыз келетініне сенімдісіз бе?",
+    "sphereAvailability": "Sphere қолжетімділігі",
+    "vmOverrides": "VM қайта анықтаулары"
   },
   "datastoreWizard": {
     "accessMode": "Қол жеткізу режимі",
@@ -3299,5 +3301,6 @@
     "clientId": "Клиент идентификаторы",
     "clientSecret": "Клиент құпиясы",
     "credentials": "Тіркелгі деректері"
-  }
+  },
+  "sphereAvailability": {}
 }

package/assets/localization/local_ru.json

@@ -2591,7 +2591,9 @@
     "virtualMachineAutomation": "Автоматизация виртуальных машин",
     "virtualMachineAutomationInfo": "Вы можете настроить переопределения для отдельных виртуальных машин на странице Переопределения виртуальных машин.",
     "optionS": "вариант(ы)",
-    "removeOptionDialog": "Вы уверены, что хотите удалить параметр “{optionName}” из “{selectedItemName}”?"
+    "removeOptionDialog": "Вы уверены, что хотите удалить параметр “{optionName}” из “{selectedItemName}”?",
+    "sphereAvailability": "Доступность Sphere",
+    "vmOverrides": "Переопределения ВМ"
   },
   "datastoreWizard": {
     "accessMode": "Режим доступа",
@@ -3299,5 +3301,6 @@
     "clientId": "ID клиента",
     "clientSecret": "Секрет клиента",
     "credentials": "Учетные данные"
-  }
+  },
+  "sphereAvailability": {}
 }

package/assets/localization/local_zh.json

@@ -2589,7 +2589,9 @@
     "virtualMachineAutomation": "虚拟机自动化",
     "virtualMachineAutomationInfo": "您可以在VM复盖页面上为单个虚拟机配置复盖。",
     "optionS": "选项",
-    "removeOptionDialog": "您确定要从\"{selectedItemName}\"中删除选项\"{optionName}\"吗？"
+    "removeOptionDialog": "您确定要从\"{selectedItemName}\"中删除选项\"{optionName}\"吗？",
+    "sphereAvailability": "Sphere 可用性",
+    "vmOverrides": "虚拟机覆盖设置"
   },
   "datastoreWizard": {
     "accessMode": "访问方式",
@@ -3297,5 +3299,6 @@
     "clientId": "客户端 ID",
     "clientSecret": "客户端密钥",
     "credentials": "凭证"
-  }
+  },
+  "sphereAvailability": {}
 }

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

@@ -274,7 +274,7 @@ watch(
         wizard.changeScheme(isSphere.value ? 1 : 0)
         break
       case '1':
-        wizard.changeScheme(2)
+        wizard.changeScheme(isSphere.value ? 6 : 2)
     }
   },
   { immediate: true }
@@ -777,13 +777,13 @@ const onChangeSelectOptions = (options: string[]) => {
     options.includes('customize-os') &&
     options.includes('customize-hardware')
   ) {
-    wizard.changeScheme(5)
+    wizard.changeScheme(isSphere.value ? 9 : 5)
   } else if (options.includes('customize-os')) {
-    wizard.changeScheme(3)
+    wizard.changeScheme(isSphere.value ? 7 : 3)
   } else if (options.includes('customize-hardware')) {
-    wizard.changeScheme(4)
+    wizard.changeScheme(isSphere.value ? 8 : 4)
   } else {
-    wizard.changeScheme(2)
+    wizard.changeScheme(isSphere.value ? 6 : 2)
   }
 
   isPowerOnByDefault.value = options.includes('power-on')

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

@@ -210,9 +210,7 @@
           </div>
         </template>
         <template #content>
-          <div
-            class="select-block-wrap overflow-auto h-full flex flex-col pb-4"
-          >
+          <div class="select-block-wrap overflow-auto pb-4">
             <common-vm-actions-common-select-os
               v-model:machine-type="vmForm.guestMachineType"
               v-model:guest-os-family="vmForm.guestOsFamily"
@@ -223,7 +221,7 @@
               :error-validation-fields="props.errorValidationFields"
               @remove-error-by-title="emits('remove-error-by-title', $event)"
             />
-            <div class="vm-hardware-version-wrap justify-end flex flex-1 mt-4">
+            <div class="vm-hardware-version-wrap justify-end flex flex-1 mt-7">
               <span class="vm-hardware-version">{{
                 props.compatibilityInfo
               }}</span>
@@ -605,7 +603,7 @@ const isCompatibilityAlertWrapperEmpty = ref<boolean>(false)
   &.customize-hardware {
     height: inherit;
     max-height: 100%;
-    padding-bottom: 40px;
+    padding-bottom: 16px;
 
     :deep(.tabs-wrapper) {
       overflow-y: auto;

package/components/common/vm/actions/add/lib/config/steps.ts

@@ -211,7 +211,7 @@ export const stepsFunc = (
 }
 
 export const stepsSchemeInitial = [
-  // Procurator
+  // 0 Procurator
   [
     dynamicSteps.creationType,
     dynamicSteps.selectName,
@@ -221,7 +221,7 @@ export const stepsSchemeInitial = [
     dynamicSteps.customizeHardware,
     dynamicSteps.readyComplete,
   ],
-  // Sphere
+  // 1 Sphere
   [
     dynamicSteps.creationType,
     dynamicSteps.selectNameFolder,
@@ -232,7 +232,7 @@ export const stepsSchemeInitial = [
     dynamicSteps.customizeHardware,
     dynamicSteps.readyComplete,
   ],
-  // Deploy from template (Procurator)
+  // 2 Deploy from template (Procurator)
   [
     dynamicSteps.creationType,
     dynamicSteps.selectTemplate,
@@ -241,7 +241,7 @@ export const stepsSchemeInitial = [
     dynamicSteps.selectOptionsForDeployment,
     dynamicSteps.readyComplete,
   ],
-  // Deploy from template with Customize the operating system (Procurator)
+  // 3 Deploy from template with Customize the operating system (Procurator)
   [
     dynamicSteps.creationType,
     dynamicSteps.selectTemplate,
@@ -251,7 +251,7 @@ export const stepsSchemeInitial = [
     dynamicSteps.selectGuestOSMachineType,
     dynamicSteps.readyComplete,
   ],
-  // Deploy from template with Customize this virtual machine's hardware (Procurator)
+  // 4 Deploy from template with Customize this virtual machine's hardware (Procurator)
   [
     dynamicSteps.creationType,
     dynamicSteps.selectTemplate,
@@ -261,7 +261,7 @@ export const stepsSchemeInitial = [
     dynamicSteps.customizeHardwareTemplate,
     dynamicSteps.readyComplete,
   ],
-  // Deploy from template with Customize the operating system and this virtual machine's hardware (Procurator)
+  // 5 Deploy from template with Customize the operating system and this virtual machine's hardware (Procurator)
   [
     dynamicSteps.creationType,
     dynamicSteps.selectTemplate,
@@ -272,4 +272,48 @@ export const stepsSchemeInitial = [
     dynamicSteps.customizeHardwareTemplate,
     dynamicSteps.readyComplete,
   ],
+  // 6 Deploy from template (Sphere)
+  [
+    dynamicSteps.creationType,
+    dynamicSteps.selectTemplate,
+    dynamicSteps.selectNameFolder,
+    dynamicSteps.selectComputeResource,
+    dynamicSteps.selectStorage,
+    dynamicSteps.selectOptionsForDeployment,
+    dynamicSteps.readyComplete,
+  ],
+  // 7 Deploy from template with Customize the operating system (Sphere)
+  [
+    dynamicSteps.creationType,
+    dynamicSteps.selectTemplate,
+    dynamicSteps.selectNameFolder,
+    dynamicSteps.selectComputeResource,
+    dynamicSteps.selectStorage,
+    dynamicSteps.selectOptionsForDeployment,
+    dynamicSteps.selectGuestOSMachineType,
+    dynamicSteps.readyComplete,
+  ],
+  // 8 Deploy from template with Customize this virtual machine's hardware (Sphere)
+  [
+    dynamicSteps.creationType,
+    dynamicSteps.selectTemplate,
+    dynamicSteps.selectNameFolder,
+    dynamicSteps.selectComputeResource,
+    dynamicSteps.selectStorage,
+    dynamicSteps.selectOptionsForDeployment,
+    dynamicSteps.customizeHardwareTemplate,
+    dynamicSteps.readyComplete,
+  ],
+  // 9 Deploy from template with Customize the operating system and this virtual machine's hardware (Sphere)
+  [
+    dynamicSteps.creationType,
+    dynamicSteps.selectTemplate,
+    dynamicSteps.selectNameFolder,
+    dynamicSteps.selectComputeResource,
+    dynamicSteps.selectStorage,
+    dynamicSteps.selectOptionsForDeployment,
+    dynamicSteps.selectGuestOSMachineType,
+    dynamicSteps.customizeHardwareTemplate,
+    dynamicSteps.readyComplete,
+  ],
 ]

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

@@ -219,6 +219,7 @@ const onSelectRow = (selectedData: UI_I_DataTable): void => {
   :deep(.column-manager-button) {
     span {
       font-size: 12px;
+      font-weight: 500;
     }
     &:not(.active):hover {
       background-color: var(

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

@@ -44,7 +44,7 @@ watch(
 )
 
 const submit = async (cb: Function): Promise<void> => {
-  if (!selectedNode.value || selectedNode.value.type !== 'vmt') {
+  if (!selectedNode.value || selectedNode.value.type !== 'vmt' && selectedNode.value.type !== 'vm_template') {
     errors.value = [localization.value.vmWizard.selectValidTemplate]
     cb(false)
     return

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

@@ -34,7 +34,7 @@ watch(
   (newValue) => {
     nodes.value = useDeepCopy(newValue)
   },
-  { deep: true }
+  { deep: true, immediate: true }
 )
 
 const loading = ref<boolean>(false)

package/lib/models/interfaces.ts

@@ -54,6 +54,7 @@ export interface UI_I_Localization {
   vmt: UI_I_ArbitraryObject<string>
   passwordRule: UI_I_ArbitraryObject<string>
   identityProvider: UI_I_ArbitraryObject<string>
+  sphereAvailability: UI_I_ArbitraryObject<string>
 }
 export interface UI_I_SendTaskParams {
   method: string

package/package.json

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

package/plugins/recursion.ts

@@ -236,6 +236,37 @@ export default defineNuxtPlugin(() => {
       return res
     }
 
+
+    self.filtrationTreeByExpectedType = (
+      arr: any,
+      itemsProp: string,
+      expectedType: string[]
+    ): any[] => {
+      const result = []
+
+      for (let i = 0; i < arr.length; i++) {
+        const item = { ...arr[i] }
+
+        if (item[itemsProp]?.length) {
+          item.nodes = self.filtrationTreeByExpectedType(
+            item[itemsProp],
+            itemsProp,
+            expectedType
+          )
+        }
+        if (
+          expectedType.includes(item.type) || item.nodes.length
+        ) {
+          result.push(item)
+        } else {
+          item.nodes = []
+        }
+      }
+
+      return result
+    }
+
+    // TODO удалить и использовать filtrationTreeByExpectedType
     // TODO изменить nodes и сделать динамичной
     self.filtrationTreeByExpectedTypeRecursion = (
       node: any,