bfg-common 1.0.6 → 1.0.8

package/components/common/vm/actions/add/select/computeResource/ComputeResource.vue

@@ -15,9 +15,15 @@
         :compute-resource="props.computeResource"
         :compute-resource-tree="props.computeResourceTree"
         @get-compute-resource-tree="emits('get-compute-resource-tree', $event)"
-        @show-compute-resource-tree="emits('show-compute-resource-tree', $event)"
-        @select-compute-resource-tree="emits('select-compute-resource-tree', $event)"
-        @clear-compute-resource-tree="emits('clear-compute-resource-tree', $event)"
+        @show-compute-resource-tree="
+          emits('show-compute-resource-tree', $event)
+        "
+        @select-compute-resource-tree="
+          emits('select-compute-resource-tree', $event)
+        "
+        @clear-compute-resource-tree="
+          emits('clear-compute-resource-tree', $event)
+        "
       />
     </div>
 
@@ -55,7 +61,10 @@ const props = defineProps<{
 const emits = defineEmits<{
   (event: 'submit', value: UI_I_TreeNode): void
   (event: 'update:model-value', value: UI_I_TreeNode | null): void
-  (event: 'get-compute-resource-tree', value: { id: string | number, cb: () => void }): void
+  (
+    event: 'get-compute-resource-tree',
+    value: { id: string | number; cb: () => void }
+  ): void
   (event: 'show-compute-resource-tree', value: UI_I_TreeNode): void
   (event: 'select-compute-resource-tree', value: UI_I_TreeNode): void
   (event: 'clear-compute-resource-tree'): void
@@ -69,12 +78,20 @@ watch(
     submit()
   }
 )
+const isParentDatacenter = (node: UI_I_TreeNode | null): boolean => {
+  if (!node) return false
+
+  if (node.parent?.type === 'datacenter') return true
+  if (node.parent?.type === 'folder') return isParentDatacenter(node.parent)
+  return false
+}
 const submit = (): void => {
+  const isDatacenterFolder = isParentDatacenter(selectedNode.value)
   if (
     !selectedNode.value ||
     !compatibilityText.value[1] ||
     selectedNode.value.type === 'datacenter' ||
-    selectedNode.value.type === 'folder' ||
+    selectedNode.value.type === 'folder' && !isDatacenterFolder ||
     (selectedNode.value.type === 'cluster' && !selectedNode.value.nodes.length)
   ) {
     showValidationErrors(
@@ -112,7 +129,10 @@ const compatibilityText = computed<[boolean, string]>(() => {
     localization.value.compatibilityChecksSucceeded,
   ]
 
-  if (selectedNode.value.type === 'datacenter' || selectedNode.value.type === 'folder') {
+  if (
+    selectedNode.value.type === 'datacenter' ||
+    selectedNode.value.type === 'folder'
+  ) {
     res = [false, localization.value.selectValidClusterOrHostDestination]
   }
   if (selectedNode.value.type === 'cluster') {

package/components/common/vm/actions/add/select/name/Name.vue

@@ -61,6 +61,14 @@ watch(
     submit()
   }
 )
+
+const isParentDatacenter = (node: UI_I_TreeNode | null): boolean => {
+  if (!node) return false
+
+  if (node.parent?.type === 'datacenter') return true
+  if (node.parent?.type === 'folder') return isParentDatacenter(node.parent)
+  return false
+}
 const submit = async (): Promise<void> => {
   const name = vmName.value
 
@@ -70,7 +78,9 @@ const submit = async (): Promise<void> => {
   }
 
   if (props.project === 'sphere') {
-    if (selectedNode.value?.type !== 'datacenter') {
+    const isDatacenterFolder = isParentDatacenter(selectedNode.value)
+
+    if (selectedNode.value?.type !== 'datacenter' && selectedNode.value?.type === 'folder' && !isDatacenterFolder) {
       showValidationErrors([
         localization.value.enterValidLocationVirtualMachine,
       ])

package/models/store/vm/interfaces.ts

@@ -9,7 +9,7 @@ import {
 } from '~/components/common/vm/actions/add/customizeHardware/virtualHardware/models/interfaces'
 import { UI_I_CreateVmData } from '~/components/common/vm/actions/add/models/interfaces'
 
-export interface API_UI_UI_I_VmEditCpu {
+export interface API_UI_I_VmEditCpu {
   core_per_socket: number
   hotplug: boolean
   limit_mhz: number
@@ -19,13 +19,13 @@ export interface API_UI_UI_I_VmEditCpu {
   shares: number
   vcpus: number
 }
-export interface API_UI_UI_I_VmEditMemory {
+export interface API_UI_I_VmEditMemory {
   hotplug: boolean
   limit_mb: number
   reservation_mb: number
   size_mb: number
 }
-export interface API_UI_UI_I_VmEditOptions {
+export interface API_UI_I_VmEditOptions {
   boot_options: {
     boot_delay_ms: number
     boot_menu: boolean
@@ -71,9 +71,9 @@ export interface UI_I_VmSettings {
   maxMemory: number
   uuid: string
   compatibility: string
-  options: API_UI_UI_I_VmEditOptions
-  cpu: API_UI_UI_I_VmEditCpu
-  memory: API_UI_UI_I_VmEditMemory
+  options: API_UI_I_VmEditOptions
+  cpu: API_UI_I_VmEditCpu
+  memory: API_UI_I_VmEditMemory
 }
 
 export interface UI_I_CreateVmPayload {

package/package.json

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