bfg-common 1.5.227 → 1.5.228

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

@@ -1,167 +1,174 @@
-<template>
-  <common-vm-actions-common-select-name-new
-    v-if="isNewView"
-    v-model:vm-name="vmName"
-    v-model:is-show-help="isShowHelp"
-    :project="props.project"
-    :errors="errors"
-    :data-center="props.dataCenter"
-    @remove-validation-errors="onRemoveValidationErrors"
-    @select-node="onSelectNode"
-  />
-  <common-vm-actions-common-select-name-old
-    v-else
-    v-model:vm-name="vmName"
-    v-model:is-show-help="isShowHelp"
-    :project="props.project"
-    :errors="errors"
-    :data-center="props.dataCenter"
-    @remove-validation-errors="onRemoveValidationErrors"
-    @select-node="onSelectNode"
-  />
-</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 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 { $store }: any = useNuxtApp()
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-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.common.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 405: // Invalid kind
-            showValidationErrors([
-              localization.value.common.kindValidationDescription,
-            ])
-            resolve(false)
-            break
-          case 406: // Invalid name
-            showValidationErrors([
-              localization.value.common.vmNameValidationDescription,
-            ])
-            resolve(false)
-            break
-          case 409: // Name exist
-            showValidationErrors([
-              localization.value.common.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">
-</style>
+<template>
+  <common-vm-actions-common-select-name-new
+    v-if="isNewView"
+    v-model:vm-name="vmName"
+    v-model:is-show-help="isShowHelp"
+    :project="props.project"
+    :errors="errors"
+    :data-center="props.dataCenter"
+    @remove-validation-errors="onRemoveValidationErrors"
+    @select-node="onSelectNode"
+  />
+  <common-vm-actions-common-select-name-old
+    v-else
+    v-model:vm-name="vmName"
+    v-model:is-show-help="isShowHelp"
+    :project="props.project"
+    :errors="errors"
+    :data-center="props.dataCenter"
+    @remove-validation-errors="onRemoveValidationErrors"
+    @select-node="onSelectNode"
+  />
+</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 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
+  (event: 'has-errors', value: boolean): void
+}>()
+
+const { $store }: any = useNuxtApp()
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+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.common.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 405: // Invalid kind
+            showValidationErrors([
+              localization.value.common.kindValidationDescription,
+            ])
+            resolve(false)
+            break
+          case 406: // Invalid name
+            showValidationErrors([
+              localization.value.common.vmNameValidationDescription,
+            ])
+            resolve(false)
+            break
+          case 409: // Name exist
+            showValidationErrors([
+              localization.value.common.vmNameExistInSelectedLocation,
+            ])
+            resolve(false)
+            break
+        }
+
+        resolve(true)
+      },
+    ])
+  })
+}
+
+const errors = ref<string[]>([])
+const showValidationErrors = (data: string[]): void => {
+  errors.value = data
+}
+const onRemoveValidationErrors = (): void => {
+  errors.value = []
+}
+watch(
+  errors,
+  (newValue) => {
+    emits('has-errors', !newValue.length)
+  },
+  { immediate: true, deep: true }
+)
+
+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"></style>

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="select-name">
+  <div :class="['select-name', { 'pb-6': props.project === 'sphere' }]">
     <Teleport to="#name-alert-wrapper">
       <ui-alert
         v-show="props.errors.length"
@@ -7,7 +7,8 @@
         status="alert-danger"
         test-id="name-alert"
         class="errors-alert"
-        @remove="emits('remove-validation-errors')"
+        size="md"
+        @hide="emits('remove-validation-errors')"
       />
     </Teleport>
 
@@ -31,9 +32,8 @@
           :show="isShowHelp"
           :items="[]"
           elem-id="virtual-machine-name-icon"
-          test-id=""
+          test-id="virtual-machine-name"
           width="320px"
-          top
           left
           @hide="isShowHelp = false"
         >
@@ -64,7 +64,7 @@
       <div class="flex-2">
         <ui-input
           v-model="vmName"
-          :placeholder="localization.common.name"
+          :placeholder="`${localization.common.name} (${localization.common.optional})`"
           type="text"
           maxlength="54"
           test-id="virtual-machine-name"
@@ -133,7 +133,7 @@ const onSelectNode = (node: UI_I_TreeNode) => {
   --select-name-help-icon-hover-color: #4d5d69;
   --select-name-help-icon-active-color: #008fd6;
   --select-name-help-hide-icon-color: #213444;
-  --select-name-border-color: #e9ebed;
+  --select-name-border-color: #e9ebeda3;
   --select-name-location-node-color: #182531;
   --select-name-location-bg-color: #ffffff;
 }
@@ -144,7 +144,7 @@ const onSelectNode = (node: UI_I_TreeNode) => {
   --select-name-help-hide-icon-color: #e9eaec;
   --select-name-border-color: #e9ebed1f;
   --select-name-location-node-color: #e9eaec;
-  --select-name-location-bg-color: transparent;
+  --select-name-location-bg-color: #1b2a371f;
 }
 </style>
 <style scoped lang="scss">
@@ -157,11 +157,16 @@ const onSelectNode = (node: UI_I_TreeNode) => {
   .name-field {
     display: flex;
     align-items: center;
+    column-gap: 16px;
 
     .name-label {
       font-size: 13px;
       color: var(--select-name-text-color);
       margin-right: 8px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      max-width: 204px;
     }
     #virtual-machine-name-icon {
       color: #9da6ad; // equal in dark and white modes
@@ -182,10 +187,15 @@ const onSelectNode = (node: UI_I_TreeNode) => {
     margin-top: 16px;
     padding: 16px 0;
     border-top: 1px solid var(--select-name-border-color);
+    column-gap: 16px;
 
     .location-label {
       font-size: 13px;
       color: var(--select-name-text-color);
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      max-width: 204px;
     }
 
     .selected-location {
@@ -193,6 +203,10 @@ const onSelectNode = (node: UI_I_TreeNode) => {
       align-items: center;
       gap: 8px;
 
+      .node-icon {
+        width: 20px;
+        height: 20px;
+      }
       .text {
         font-size: 13px;
         color: var(--select-name-location-node-color);
@@ -207,11 +221,25 @@ const onSelectNode = (node: UI_I_TreeNode) => {
     flex: 1;
     border-radius: 8px;
     border: 1px solid var(--select-name-border-color);
-    padding: 12px;
+    padding: 8px;
     background-color: var(--select-name-location-bg-color);
+    max-height: 240px;
+    overflow: auto;
 
     :deep(.tree-content) {
       padding: 0 !important;
+
+      .node-wrapper {
+        border-radius: 4px;
+
+        .node-name {
+          font-size: 12px;
+          margin-left: 8px;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+      }
     }
   }
 }