bfg-common 1.3.285 → 1.3.287

package/components/common/recursionTree/lib/models/interfaces.ts

@@ -18,4 +18,5 @@ export interface UI_I_TreeNode<N = UI_I_TreeNodeDuplicate, T = string>
   available?: number
   modified?: number
   testId?: string
+  kind?: number
 }

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

@@ -13,7 +13,8 @@ export const stepsFunc = (
       subTitle: localization.howWouldLikeCreateVirtualMachine,
       status: UI_E_WIZARD_STATUS.SELECTED,
       isValid: true,
-      fields: {},
+      testId: 'vm-select-creation-type',
+      fields: {}
     },
     // Procurator
     {
@@ -23,6 +24,7 @@ export const stepsFunc = (
       subTitle: localization.specifyUniqueName,
       status: UI_E_WIZARD_STATUS.INACTIVE,
       isValid: true,
+      testId: 'vm-select-name',
       fields: {
         name: {
           field: '',
@@ -38,6 +40,7 @@ export const stepsFunc = (
       subTitle: localization.specifyUniqueNameTargetLocation,
       status: UI_E_WIZARD_STATUS.INACTIVE,
       isValid: true,
+      testId: 'vm-select-name-folder',
       fields: {
         name: {
           field: '',
@@ -53,6 +56,7 @@ export const stepsFunc = (
       subTitle: localization.selectDestinationComputeResourceOperation,
       status: UI_E_WIZARD_STATUS.INACTIVE,
       isValid: true,
+      testId: 'vm-select-compute-resource',
       fields: {},
     },
     {
@@ -62,6 +66,7 @@ export const stepsFunc = (
       subTitle: localization.selectStorageConfigurationDiskFiles,
       status: UI_E_WIZARD_STATUS.INACTIVE,
       isValid: true,
+      testId: 'vm-select-storage',
       fields: {
         storage: {
           field: '',
@@ -76,6 +81,7 @@ export const stepsFunc = (
       subTitle: localization.selectCompatibilityVmDependingHostsEnvironment,
       status: UI_E_WIZARD_STATUS.INACTIVE,
       isValid: true,
+      testId: 'vm-select-compatibility',
       fields: {},
     },
     // Procurator
@@ -86,6 +92,7 @@ export const stepsFunc = (
       subTitle: localization.chooseGuestOSInstalledVmAndMachineTypeUsedCreateVm,
       status: UI_E_WIZARD_STATUS.INACTIVE,
       isValid: true,
+      testId: 'vm-select-guest-os-machine-type',
       fields: {},
     },
     // Sphere
@@ -96,6 +103,7 @@ export const stepsFunc = (
       subTitle: localization.chooseGuestOSInstalledVM,
       status: UI_E_WIZARD_STATUS.INACTIVE,
       isValid: true,
+      testId: 'vm-select-guest-os',
       fields: {},
     },
     {
@@ -105,6 +113,7 @@ export const stepsFunc = (
       subTitle: localization.configureVirtualMachineHardware,
       status: UI_E_WIZARD_STATUS.INACTIVE,
       isValid: true,
+      testId: 'vm-select-customize-hardware',
       fields: {
         customizeHardware: {
           field: '',
@@ -119,6 +128,7 @@ export const stepsFunc = (
       subTitle: localization.clickFinishStartCreation,
       status: UI_E_WIZARD_STATUS.INACTIVE,
       isValid: true,
+      testId: 'vm-ready-complete',
       fields: {},
     },
   ]

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

@@ -1,227 +1,229 @@
-<template>
-  <div class="select-name">
-    <atoms-alert
-      v-show="errors.length"
-      status="alert-danger"
-      :items="errors"
-      test-id="name-alert"
-      @remove="onRemoveValidationErrors"
-    />
-
-    <form id="virtual-machine-form" @submit.prevent>
-      <label for="virtual-machine-name"
-        >{{ localization.virtualMachineName }}:</label
-      >
-      <input
-        id="virtual-machine-name"
-        v-model.trim="vmName"
-        data-id="virtual-machine-name-input"
-        type="text"
-      />
-      <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.vmNameValidationDescription2 }}
-          </p>
-        </atoms-tooltip-signpost>
-      </div>
-    </form>
-
-    <template v-if="props.project === 'sphere'">
-      <p class="new-vm-name-and-folder-instructions mt-1">
-        {{ localization.selectLocationVirtualMachine }}
-      </p>
-      <div class="tree-view-wrap">
-        <common-vm-actions-add-folder-tree-view
-          :data-center="props.dataCenter"
-          @select-node="onSelectNode"
-        />
-      </div>
-    </template>
-  </div>
-</template>
-
-<script setup lang="ts">
-// import { API_UI_I_Error } from '~/lib/models/store/interfaces'
-import { UI_I_Localization } from '~/lib/models/interfaces'
-import { UI_T_Project } from '~/lib/models/types'
-import { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
-
-const props = defineProps<{
-  nameFormSubmit: null | Function
-  show: boolean
-  project: UI_T_Project
-  dataCenter?: UI_I_TreeNode // для сферы
-}>()
-const emits = defineEmits<{
-  (event: 'submit', value: [string, UI_I_TreeNode | null]): void
-  (event: 'loading', value: boolean): void
-  (
-    event: 'check-name',
-    value: [[string, UI_I_TreeNode | null], (error: any) => void]
-  ): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const vmName = ref<string>('')
-
-const selectedNode = ref<UI_I_TreeNode | null>(null)
-const onSelectNode = (node: UI_I_TreeNode): void => {
-  selectedNode.value = node
-}
-
-watch(
-  () => props.nameFormSubmit,
-  (newValue) => {
-    newValue && submit(newValue)
-  }
-)
-
-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 (cb: Function): Promise<void> => {
-  const name = vmName.value
-
-  if (name !== '') {
-    const isNameValid = await checkNameIsValid(name)
-    if (!isNameValid) {
-      cb(false)
-      return
-    }
-  }
-
-  if (props.project === 'sphere') {
-    const isDatacenterFolder = isParentDatacenter(selectedNode.value)
-
-    if (
-      selectedNode.value?.type !== 'datacenter' &&
-      selectedNode.value?.type === 'folder' &&
-      !isDatacenterFolder
-    ) {
-      showValidationErrors([
-        localization.value.enterValidLocationVirtualMachine,
-      ])
-      cb(false)
-      return
-    }
-  }
-
-  onRemoveValidationErrors()
-  emits('submit', [name, selectedNode.value])
-  cb(true)
-}
-const checkNameIsValid = async (name: string): Promise<boolean> => {
-  emits('loading', true)
-
-  return new Promise((resolve) => {
-    emits('check-name', [
-      [name, selectedNode.value],
-      (error) => {
-        emits('loading', false)
-
-        const status = error?.statusCode || 200
-        switch (status) {
-          case 406: // Invalid name
-            showValidationErrors([
-              localization.value.vmNameValidationDescription2,
-            ])
-            resolve(false)
-            break
-          case 409: // Name exist
-            showValidationErrors([
-              localization.value.vmNameExistInSelectedLocation,
-            ])
-            resolve(false)
-            break
-        }
-
-        resolve(true)
-      },
-    ])
-  })
-}
-
-const errors = ref<string[]>([])
-const showValidationErrors = (data: string[]): void => {
-  errors.value = data
-}
-const onRemoveValidationErrors = (): void => {
-  errors.value = []
-}
-
-watch(
-  () => props.show,
-  (newValue) => {
-    if (!newValue) return
-
-    const input = document.getElementById('virtual-machine-name')
-    if (!input) return
-
-    setTimeout(() => {
-      input.focus()
-    }, 0)
-  }
-)
-
-const isShowHelp = ref<boolean>(false)
-</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 {
-  .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="errors.length"
+      status="alert-danger"
+      :items="errors"
+      test-id="name-alert"
+      @remove="onRemoveValidationErrors"
+    />
+
+    <form id="virtual-machine-form" @submit.prevent>
+      <label for="virtual-machine-name"
+        >{{ localization.virtualMachineName }}:</label
+      >
+      <input
+        id="virtual-machine-name"
+        v-model.trim="vmName"
+        data-id="virtual-machine-name-input"
+        type="text"
+      />
+      <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.vmNameValidationDescription2 }}
+          </p>
+        </atoms-tooltip-signpost>
+      </div>
+    </form>
+
+    <template v-if="props.project === 'sphere'">
+      <p class="new-vm-name-and-folder-instructions mt-1">
+        {{ localization.selectLocationVirtualMachine }}
+      </p>
+      <div class="tree-view-wrap">
+        <common-vm-actions-add-folder-tree-view
+          :data-center="props.dataCenter"
+          @select-node="onSelectNode"
+        />
+      </div>
+    </template>
+  </div>
+</template>
+
+<script setup lang="ts">
+// import { API_UI_I_Error } from '~/lib/models/store/interfaces'
+import { UI_I_Localization } from '~/lib/models/interfaces'
+import { UI_T_Project } from '~/lib/models/types'
+import { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
+
+const props = defineProps<{
+  nameFormSubmit: null | Function
+  show: boolean
+  project: UI_T_Project
+  dataCenter?: UI_I_TreeNode // для сферы
+}>()
+const emits = defineEmits<{
+  (event: 'submit', value: [string, UI_I_TreeNode | null]): void
+  (event: 'loading', value: boolean): void
+  (
+    event: 'check-name',
+    value: [[string, UI_I_TreeNode | null], (error: any) => void]
+  ): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const vmName = ref<string>('')
+
+const selectedNode = ref<UI_I_TreeNode | null>(null)
+const onSelectNode = (node: UI_I_TreeNode): void => {
+  selectedNode.value = node
+}
+
+watch(
+  () => props.nameFormSubmit,
+  (newValue) => {
+    newValue && submit(newValue)
+  }
+)
+
+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 (cb: Function): Promise<void> => {
+  const name = vmName.value
+
+  if (name !== '') {
+    const isNameValid = await checkNameIsValid(name)
+    if (!isNameValid) {
+      cb(false)
+      return
+    }
+  }
+
+  if (props.project === 'sphere') {
+    // const isDatacenterFolder = isParentDatacenter(selectedNode.value)
+
+    if (
+      // selectedNode.value?.type !== 'datacenter' &&
+      // selectedNode.value?.type === 'folder' &&
+      // !isDatacenterFolder
+      // TODO рефакторинг, здесь сейчас проверяем является ли выбранный элемент датацентром или папкой(вм)
+        ![3, 7].includes(selectedNode.value?.kind)
+    ) {
+      showValidationErrors([
+        localization.value.enterValidLocationVirtualMachine,
+      ])
+      cb(false)
+      return
+    }
+  }
+
+  onRemoveValidationErrors()
+  emits('submit', [name, selectedNode.value])
+  cb(true)
+}
+const checkNameIsValid = async (name: string): Promise<boolean> => {
+  emits('loading', true)
+
+  return new Promise((resolve) => {
+    emits('check-name', [
+      [name, selectedNode.value],
+      (error) => {
+        emits('loading', false)
+
+        const status = error?.statusCode || 200
+        switch (status) {
+          case 406: // Invalid name
+            showValidationErrors([
+              localization.value.vmNameValidationDescription2,
+            ])
+            resolve(false)
+            break
+          case 409: // Name exist
+            showValidationErrors([
+              localization.value.vmNameExistInSelectedLocation,
+            ])
+            resolve(false)
+            break
+        }
+
+        resolve(true)
+      },
+    ])
+  })
+}
+
+const errors = ref<string[]>([])
+const showValidationErrors = (data: string[]): void => {
+  errors.value = data
+}
+const onRemoveValidationErrors = (): void => {
+  errors.value = []
+}
+
+watch(
+  () => props.show,
+  (newValue) => {
+    if (!newValue) return
+
+    const input = document.getElementById('virtual-machine-name')
+    if (!input) return
+
+    setTimeout(() => {
+      input.focus()
+    }, 0)
+  }
+)
+
+const isShowHelp = ref<boolean>(false)
+</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 {
+  .icon-show-help {
+    cursor: pointer;
+  }
+
+  .help-title {
+    font-size: 22px;
+    margin-bottom: 24px;
+  }
+  .signpost {
+    max-width: 360px;
+  }
+}
+</style>

package/package.json

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