bfg-common 1.5.486 → 1.5.488

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

@@ -2,7 +2,7 @@
   <ui-wizard
     :steps="props.wizard.steps"
     :selected-scheme="props.selectedScheme"
-    :title="localization.common.newVirtualMachine2"
+    :title="props.title"
     :texts="texts"
     :is-loading="props.isLoading"
     :class="[{ 'select-template-step': props.isShowSelectTemplate }]"
@@ -72,7 +72,9 @@
             "
             :name-form-submit="props.nameFormSubmit"
             :project="props.project"
+            :is-vmt="props.isVmt"
             :data-center="props.dataCenter"
+            :validate-empty-name="props.validateEmptyName"
             @submit="emits('change-name', $event)"
             @check-name="emits('check-name', $event)"
             @has-errors="isNameAlertWrapperEmpty = $event"
@@ -249,6 +251,7 @@
           <div class="select-block-wrap customize-hardware flex flex-col">
             <common-vm-actions-common-customize-hardware
               :project="props.project"
+              :is-vmt="props.isVmt"
               :vm-name="vmForm.name"
               :guest-machine-type="vmForm.guestMachineType"
               :guest-os-family="vmForm.guestOsFamily"
@@ -311,6 +314,7 @@
           >
             <common-vm-actions-common-customize-hardware
               :project="props.project"
+              :is-vmt="props.isVmt"
               :vm-name="vmForm.name"
               :guest-machine-type="vmForm.guestMachineType"
               :guest-os-family="vmForm.guestOsFamily"
@@ -474,6 +478,7 @@ const isPowerOnByDefault = defineModel<boolean>('isPowerOnByDefault', {
 const props = withDefaults(
   defineProps<{
     project: UI_T_Project
+    isVmt: boolean
     nodes: UI_I_FileTreeNode[]
     files: UI_I_FileTreeNode[]
     networksTable: UI_I_NetworkTableItem[]
@@ -508,7 +513,9 @@ const props = withDefaults(
     selectedNavItem: UI_T_SelectedNavItem
     compatibilityInfo: string
     isShowPowerOn: boolean
+    validateEmptyName: boolean
     isShowSelectTemplate: boolean
+    title: string
     computeResourceSubmit: null | Function // для сферы
     dataCenter?: UI_I_TreeNode // для сферы
     computeResource?: UI_I_TreeNode // для сферы
@@ -528,7 +535,6 @@ const props = withDefaults(
 )
 
 const emits = defineEmits<{
-  (event: 'check-name', value: [string, (error: API_UI_I_Error) => void]): void
   (event: 'get-storage', value: UI_I_TablePayload): void
   (event: 'get-folders-or-files', value: UI_I_FolderOrFileTreePayload): void
   (event: 'get-active-device-child', value: UI_I_FileTreeNode): void

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

@@ -3,7 +3,7 @@
     <atoms-wizard
       :wizard="props.wizard"
       :selected-scheme="props.selectedScheme"
-      :title="localization.common.newVirtualMachine2"
+      :title="props.title"
       :localization="localization"
       test-id="new-virtual-machine-wizard"
       show
@@ -40,7 +40,9 @@
             "
             :name-form-submit="props.nameFormSubmit"
             :project="props.project"
+            :is-vmt="props.isVmt"
             :data-center="props.dataCenter"
+            :validate-empty-name="props.validateEmptyName"
             @submit="emits('change-name', $event)"
             @check-name="emits('check-name', $event)"
           />
@@ -106,6 +108,7 @@
           <common-vm-actions-common-customize-hardware
             v-show="selectedStep.id === dynamicSteps.customizeHardware"
             :project="props.project"
+            :is-vmt="props.isVmt"
             :vm-name="vmForm.name"
             :guest-machine-type="vmForm.guestMachineType"
             :guest-os-family="vmForm.guestOsFamily"
@@ -146,6 +149,7 @@
           <common-vm-actions-common-customize-hardware
             v-if="props.vmtSettings"
             v-show="selectedStep.id === dynamicSteps.customizeHardwareTemplate"
+            :is-vmt="props.isVmt"
             :project="props.project"
             :vm-name="vmForm.name"
             :guest-machine-type="vmForm.guestMachineType"
@@ -282,6 +286,7 @@ const isPowerOnByDefault = defineModel<boolean>('isPowerOnByDefault', {
 const props = withDefaults(
   defineProps<{
     project: UI_T_Project
+    isVmt: boolean
     nodes: UI_I_FileTreeNode[]
     files: UI_I_FileTreeNode[]
     networksTable: UI_I_NetworkTableItem[]
@@ -316,6 +321,8 @@ const props = withDefaults(
     selectedNavItem: UI_T_SelectedNavItem
     compatibilityInfo: string
     isShowPowerOn: boolean
+    validateEmptyName: boolean
+    title: string
     computeResourceSubmit?: null | Function // для сферы
     dataCenter?: UI_I_TreeNode // для сферы
     computeResource?: UI_I_TreeNode // для сферы
@@ -334,7 +341,6 @@ const props = withDefaults(
 )
 
 const emits = defineEmits<{
-  (event: 'check-name', value: [string, (error: API_UI_I_Error) => void]): void
   (event: 'get-storage', value: UI_I_TablePayload): void
   (event: 'get-folders-or-files', value: UI_I_FolderOrFileTreePayload): void
   (event: 'get-active-device-child', value: UI_I_FileTreeNode): void

package/components/common/vm/actions/add/folderTreeView/FolderTreeView.vue

@@ -1,72 +1,72 @@
-<template>
-  <common-vm-actions-add-folder-tree-view-new
-    v-if="isNewView"
-    :nodes="nodes"
-    :loading="loading"
-    @show-nodes="showNodes"
-    @select-node="selectNode"
-  />
-  <common-vm-actions-add-folder-tree-view-old
-    v-else
-    :nodes="nodes"
-    :loading="loading"
-    @show-nodes="showNodes"
-    @select-node="selectNode"
-  />
-</template>
-
-<script setup lang="ts">
-import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
-
-const props = defineProps<{
-  dataCenter: UI_I_TreeNode
-}>()
-const emits = defineEmits<{
-  (event: 'select-node', value: UI_I_TreeNode): void
-}>()
-
-const { $store }: any = useNuxtApp()
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const nodes = computed<UI_I_TreeNode[]>(
-  () => $store.getters['inventory/getFolderTree'] || []
-)
-const loading = ref<boolean>(false)
-const getTree = async (): Promise<void> => {
-  loading.value = true
-  await $store.dispatch('inventory/A_GET_FOLDER_TREE', null)
-  loading.value = false
-}
-getTree().then(() => {
-  selectNode(props.dataCenter)
-})
-
-const showNodes = ({
-  node,
-  cb,
-}: {
-  node: UI_I_TreeNode
-  cb: () => void
-}): void => {
-  const payload: any = { node, treeName: 'folderTree' }
-  $store.dispatch('inventory/A_SHOW_NODE', payload)
-  cb()
-}
-const selectNode = (node: UI_I_TreeNode): void => {
-  const payload: any = {
-    node,
-    treeName: 'folderTree',
-    doSelect: false,
-  }
-  $store.dispatch('inventory/A_SELECT_NODE', payload)
-
-  emits('select-node', node)
-}
-
-onUnmounted(() => {
-  $store.dispatch('inventory/A_CLEAR_FOLDER_TREE', null)
-})
-</script>
-
-<style scoped lang="scss">
-</style>
+<template>
+  <common-vm-actions-add-folder-tree-view-new
+    v-if="isNewView"
+    :nodes="nodes"
+    :loading="loading"
+    @show-nodes="showNodes"
+    @select-node="selectNode"
+  />
+  <common-vm-actions-add-folder-tree-view-old
+    v-else
+    :nodes="nodes"
+    :loading="loading"
+    @show-nodes="showNodes"
+    @select-node="selectNode"
+  />
+</template>
+
+<script setup lang="ts">
+import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
+
+const props = defineProps<{
+  dataCenter: UI_I_TreeNode
+}>()
+const emits = defineEmits<{
+  (event: 'select-node', value: UI_I_TreeNode): void
+}>()
+
+const { $store }: any = useNuxtApp()
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const nodes = computed<UI_I_TreeNode[]>(
+  () => $store.getters['inventory/getFolderTree'] || []
+)
+const loading = ref<boolean>(false)
+const getTree = async (): Promise<void> => {
+  loading.value = true
+  await $store.dispatch('inventory/A_GET_FOLDER_TREE', null)
+  loading.value = false
+}
+getTree().then(() => {
+  selectNode(props.dataCenter)
+})
+
+const showNodes = ({
+  node,
+  cb,
+}: {
+  node: UI_I_TreeNode
+  cb: () => void
+}): void => {
+  const payload: any = { node, treeName: 'folderTree' }
+  $store.dispatch('inventory/A_SHOW_NODE', payload)
+  cb()
+}
+const selectNode = (node: UI_I_TreeNode): void => {
+  const payload: any = {
+    node,
+    treeName: 'folderTree',
+    doSelect: false,
+  }
+  $store.dispatch('inventory/A_SELECT_NODE', payload)
+
+  emits('select-node', node)
+}
+
+onUnmounted(() => {
+  $store.dispatch('inventory/A_CLEAR_FOLDER_TREE', null)
+})
+</script>
+
+<style scoped lang="scss">
+</style>

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

@@ -1,40 +1,40 @@
-<template>
-  <div class="tree-view">
-    <ui-tree
-      :nodes="props.nodes"
-      :expand-all="false"
-      :is-loading="props.loading"
-      @toggle-node="onShowNodes"
-      @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>
-</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: 'show-nodes', value: {
-    node: UI_I_TreeNode
-    cb: () => void
-  }): void
-}>()
-
-const onShowNodes = (node: UI_I_TreeNode) => {
-  emits('show-nodes', { node, cb: (): void => {} })
-}
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+  <div class="tree-view">
+    <ui-tree
+      :nodes="props.nodes"
+      :expand-all="false"
+      :is-loading="props.loading"
+      @toggle-node="onShowNodes"
+      @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>
+</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: 'show-nodes', value: {
+    node: UI_I_TreeNode
+    cb: () => void
+  }): void
+}>()
+
+const onShowNodes = (node: UI_I_TreeNode) => {
+  emits('show-nodes', { node, cb: (): void => {} })
+}
+</script>
+
+<style scoped lang="scss"></style>

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

@@ -20,7 +20,8 @@ export const dynamicSteps = {
 }
 
 export const stepsFunc = (
-  localization: UI_I_Localization
+  localization: UI_I_Localization,
+  isVmt: boolean
 ): UI_I_WizardStep[] => {
   return [
     {
@@ -28,7 +29,7 @@ export const stepsFunc = (
       stepName: '',
       title: localization.vmWizard.selectCreationType,
       subTitle: localization.common.howWouldLikeCreateVirtualMachine,
-      status: UI_E_WIZARD_STATUS.SELECTED,
+      status: !isVmt ? UI_E_WIZARD_STATUS.SELECTED : UI_E_WIZARD_STATUS.COMPLETED,
       isValid: true,
       testId: 'vm-select-creation-type',
       fields: {},
@@ -70,7 +71,7 @@ export const stepsFunc = (
       stepName: '',
       title: localization.vmWizard.selectNameFolder,
       subTitle: localization.common.specifyUniqueNameTargetLocation,
-      status: UI_E_WIZARD_STATUS.INACTIVE,
+      status: !isVmt ? UI_E_WIZARD_STATUS.INACTIVE : UI_E_WIZARD_STATUS.SELECTED,
       isValid: true,
       testId: 'vm-select-name-folder',
       fields: {
@@ -317,4 +318,14 @@ export const stepsSchemeInitial = [
     dynamicSteps.customizeHardwareTemplate,
     dynamicSteps.readyComplete,
   ],
+  // 10 Create Template (Sphere)
+  [
+    dynamicSteps.selectNameFolder,
+    dynamicSteps.selectComputeResource,
+    dynamicSteps.selectStorage,
+    dynamicSteps.compatibility,
+    dynamicSteps.selectGuestOS,
+    dynamicSteps.customizeHardware,
+    dynamicSteps.readyComplete,
+  ],
 ]