bfg-common 1.5.486 → 1.5.487

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/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,
+  ],
 ]

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

@@ -14,6 +14,7 @@
     v-model:vm-name="vmName"
     v-model:is-show-help="isShowHelp"
     :project="props.project"
+    :is-vmt="props.isVmt"
     :errors="errors"
     :data-center="props.dataCenter"
     @remove-validation-errors="onRemoveValidationErrors"
@@ -32,12 +33,14 @@ const props = withDefaults(
     nameFormSubmit: null | Function
     show: boolean
     project: UI_T_Project
+    isVmt?: boolean
     validateEmptyName?: boolean
     dataCenter?: UI_I_TreeNode // для сферы
     existName?: string
   }>(),
   {
     validateEmptyName: false,
+    isVmt: false,
     dataCenter: undefined,
     existName: undefined,
   }

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

@@ -1,124 +1,131 @@
-<template>
-  <div class="select-name">
-    <atoms-alert
-      v-show="props.errors.length"
-      :items="props.errors"
-      status="alert-danger"
-      test-id="name-alert"
-      @remove="emits('remove-validation-errors')"
-    />
-
-    <form id="virtual-machine-form" @submit.prevent>
-      <label for="virtual-machine-name">{{ localization.common.name }}:</label>
-      <input
-        id="virtual-machine-name"
-        v-model.trim="vmName"
-        data-id="virtual-machine-name-input"
-        type="text"
-        maxlength="54"
-      />
-      <div id="vm-name-help-icon" class="content-signpost relative">
-        <atoms-the-icon
-          data-id="show-vm-name-help-icon"
-          class="icon-show-help"
-          fill="#0072a3"
-          width="24px"
-          height="24px"
-          name="info-circle"
-          @click="isShowHelp = !isShowHelp"
-        />
-        <atoms-tooltip-signpost
-          v-if="isShowHelp"
-          test-id="help-signpost"
-          elem-id="vm-name-help-icon"
-          @hide="isShowHelp = false"
-        >
-          <p>
-            {{ localization.common.vmNameValidationDescription }}
-          </p>
-        </atoms-tooltip-signpost>
-      </div>
-    </form>
-
-    <template v-if="props.project === 'sphere'">
-      <p class="new-vm-name-and-folder-instructions mt-1">
-        {{ localization.common.selectLocationVirtualMachine }}
-      </p>
-      <div class="tree-view-wrap">
-        <common-vm-actions-add-folder-tree-view
-          :data-center="props.dataCenter"
-          @select-node="emits('select-node', $event)"
-        />
-      </div>
-    </template>
-  </div>
-</template>
-
-<script setup lang="ts">
-// import { API_UI_I_Error } from '~/lib/models/store/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_T_Project } from '~/lib/models/types'
-import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
-
-const vmName = defineModel<string>('vmName', { required: true })
-const isShowHelp = defineModel<boolean>('isShowHelp', { required: true })
-
-const props = withDefaults(
-  defineProps<{
-    project: UI_T_Project
-    errors: string[]
-    dataCenter?: UI_I_TreeNode // для сферы
-  }>(),
-  {
-    dataCenter: undefined,
-  }
-)
-const emits = defineEmits<{
-  (event: 'remove-validation-errors'): void
-  (event: 'select-node', value: UI_I_TreeNode): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-</script>
-
-<style scoped lang="scss">
-.select-name {
-  form {
-    display: flex;
-    align-items: center;
-    padding-top: 20px;
-
-    label {
-      width: 216px;
-    }
-    input {
-      width: 345px;
-    }
-  }
-
-  .tree-view-wrap {
-    position: relative;
-    border: 1px solid #000;
-    padding: 5px;
-    max-height: 300px;
-    min-height: 200px;
-    overflow: auto;
-    margin-bottom: 10px;
-  }
-}
-.content-signpost {
-  user-select: none;
-
-  .icon-show-help {
-    cursor: pointer;
-  }
-
-  .help-title {
-    font-size: 22px;
-    margin-bottom: 24px;
-  }
-  .signpost {
-    max-width: 360px;
-  }
-}
-</style>
+<template>
+  <div class="select-name">
+    <atoms-alert
+      v-show="props.errors.length"
+      :items="props.errors"
+      status="alert-danger"
+      test-id="name-alert"
+      @remove="emits('remove-validation-errors')"
+    />
+
+    <form id="virtual-machine-form" @submit.prevent>
+      <label for="virtual-machine-name">{{ localization.common.name }}:</label>
+      <input
+        id="virtual-machine-name"
+        v-model.trim="vmName"
+        data-id="virtual-machine-name-input"
+        type="text"
+        maxlength="54"
+      />
+      <div id="vm-name-help-icon" class="content-signpost relative">
+        <atoms-the-icon
+          data-id="show-vm-name-help-icon"
+          class="icon-show-help"
+          fill="#0072a3"
+          width="24px"
+          height="24px"
+          name="info-circle"
+          @click="isShowHelp = !isShowHelp"
+        />
+        <atoms-tooltip-signpost
+          v-if="isShowHelp"
+          test-id="help-signpost"
+          elem-id="vm-name-help-icon"
+          @hide="isShowHelp = false"
+        >
+          <p>
+            {{ localization.common.vmNameValidationDescription }}
+          </p>
+        </atoms-tooltip-signpost>
+      </div>
+    </form>
+
+    <template v-if="props.project === 'sphere'">
+      <p class="new-vm-name-and-folder-instructions mt-1">
+        {{ locationDescription }}
+      </p>
+      <div class="tree-view-wrap">
+        <common-vm-actions-add-folder-tree-view
+          :data-center="props.dataCenter"
+          @select-node="emits('select-node', $event)"
+        />
+      </div>
+    </template>
+  </div>
+</template>
+
+<script setup lang="ts">
+// import { API_UI_I_Error } from '~/lib/models/store/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
+import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
+
+const vmName = defineModel<string>('vmName', { required: true })
+const isShowHelp = defineModel<boolean>('isShowHelp', { required: true })
+
+const props = withDefaults(
+  defineProps<{
+    project: UI_T_Project
+    errors: string[]
+    isVmt: boolean
+    dataCenter?: UI_I_TreeNode // для сферы
+  }>(),
+  {
+    dataCenter: undefined,
+  }
+)
+const emits = defineEmits<{
+  (event: 'remove-validation-errors'): void
+  (event: 'select-node', value: UI_I_TreeNode): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const locationDescription = computed<string>(() =>
+  props.isVmt
+    ? localization.value.vmt.selectLocationTemplate
+    : localization.value.common.selectLocationVirtualMachine
+)
+</script>
+
+<style scoped lang="scss">
+.select-name {
+  form {
+    display: flex;
+    align-items: center;
+    padding-top: 20px;
+
+    label {
+      width: 216px;
+    }
+    input {
+      width: 345px;
+    }
+  }
+
+  .tree-view-wrap {
+    position: relative;
+    border: 1px solid #000;
+    padding: 5px;
+    max-height: 300px;
+    min-height: 200px;
+    overflow: auto;
+    margin-bottom: 10px;
+  }
+}
+.content-signpost {
+  user-select: none;
+
+  .icon-show-help {
+    cursor: pointer;
+  }
+
+  .help-title {
+    font-size: 22px;
+    margin-bottom: 24px;
+  }
+  .signpost {
+    max-width: 360px;
+  }
+}
+</style>