bfg-common 1.5.59 → 1.5.60

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

@@ -1,167 +1,236 @@
-<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>
+  <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.common.virtualMachineName }}:</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="onSelectNode"
+        />
+      </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 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.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">
+.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/components/common/vm/actions/common/select/storage/Storage.vue

@@ -1,130 +1,130 @@
-<template>
-  <common-vm-actions-common-select-storage-new
-    v-if="isNewView"
-    v-model:selected-row="selectedRow"
-    v-model:pagination="pagination"
-    :datastore="props.datastore"
-    :get-datastore-table-func="props.getDatastoreTableFunc"
-    :errors="errors"
-    :selected-storage="selectedStorage"
-    :hide-compatibility="props.hideCompatibility"
-    @remove-error="onRemoveValidationErrors"
-    @change-storage="changeStorage"
-  />
-  <common-vm-actions-common-select-storage-old
-    v-else
-    v-model:selected-row="selectedRow"
-    v-model:pagination="pagination"
-    :datastore="props.datastore"
-    :get-datastore-table-func="props.getDatastoreTableFunc"
-    :errors="errors"
-    :selected-storage="selectedStorage"
-    :hide-compatibility="props.hideCompatibility"
-    @remove-error="onRemoveValidationErrors"
-    @change-storage="changeStorage"
-  />
-</template>
-
-<script setup lang="ts">
-import type {
-  UI_I_Pagination,
-  UI_I_TablePayload,
-} from '~/lib/models/table/interfaces'
-import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-
-const props = defineProps<{
-  storageSubmit: null | Function
-  datastore: UI_I_DatastoreTableItem[]
-  getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
-  storage?: UI_I_DatastoreTableItem
-  hideCompatibility?: boolean
-}>()
-const emits = defineEmits<{
-  (event: 'submit', value: UI_I_DatastoreTableItem): void
-}>()
-
-const { $store }: any = useNuxtApp()
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const pagination = ref<UI_I_Pagination>({
-  page: 1,
-  pageSize: 100,
-})
-const getStorage = async (): Promise<void> => {
-  const payload: UI_I_TablePayload = {
-    pagination: pagination.value,
-    sortBy: null,
-    type: 'datastore',
-    schema: 'full',
-  }
-
-  props.getDatastoreTableFunc(payload).then(() => {
-    selectedRow.value = null
-    setStorageFromProps()
-  })
-}
-getStorage()
-
-const selectedStorage = ref<UI_I_DatastoreTableItem | null>(null)
-const selectedRow = ref<number | null>(null)
-const changeStorage = (index: number): void => {
-  if (!props.datastore) return
-  selectedStorage.value = props.datastore[index]
-  selectedRow.value = index
-}
-
-const setStorageFromProps = (): void => {
-  if (!props.storage) return
-  props.datastore.forEach((item, index) => {
-    if (item.id === props.storage.id) changeStorage(index)
-  })
-}
-watch(
-  () => props.storage,
-  () => {
-    setStorageFromProps()
-  },
-  { immediate: true }
-)
-watch(
-  () => props.datastore,
-  () => {
-    selectedRow.value = null
-    selectedStorage.value = null
-  },
-  { immediate: true }
-)
-
-watch(
-  () => props.storageSubmit,
-  (newValue) => {
-    newValue && submit(newValue)
-  }
-)
-const submit = (cb: Function): void => {
-  if (!selectedStorage.value) {
-    showValidationErrors([
-      localization.value.common.selectValidDestinationStorage,
-    ])
-    cb(false)
-    return
-  }
-
-  emits('submit', selectedStorage.value)
-  cb(true)
-}
-
-const errors = ref<string[]>([])
-const showValidationErrors = (arr: string[]): void => {
-  errors.value = arr
-}
-const onRemoveValidationErrors = (): void => {
-  errors.value = []
-}
-</script>
-
-<style scoped lang="scss">
-</style>
+<template>
+  <common-vm-actions-common-select-storage-new
+    v-if="isNewView"
+    v-model:selected-row="selectedRow"
+    v-model:pagination="pagination"
+    :datastore="props.datastore"
+    :get-datastore-table-func="props.getDatastoreTableFunc"
+    :errors="errors"
+    :selected-storage="selectedStorage"
+    :hide-compatibility="props.hideCompatibility"
+    @remove-error="onRemoveValidationErrors"
+    @change-storage="changeStorage"
+  />
+  <common-vm-actions-common-select-storage-old
+    v-else
+    v-model:selected-row="selectedRow"
+    v-model:pagination="pagination"
+    :datastore="props.datastore"
+    :get-datastore-table-func="props.getDatastoreTableFunc"
+    :errors="errors"
+    :selected-storage="selectedStorage"
+    :hide-compatibility="props.hideCompatibility"
+    @remove-error="onRemoveValidationErrors"
+    @change-storage="changeStorage"
+  />
+</template>
+
+<script setup lang="ts">
+import type {
+  UI_I_Pagination,
+  UI_I_TablePayload,
+} from '~/lib/models/table/interfaces'
+import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+const props = defineProps<{
+  storageSubmit: null | Function
+  datastore: UI_I_DatastoreTableItem[]
+  getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
+  storage?: UI_I_DatastoreTableItem
+  hideCompatibility?: boolean
+}>()
+const emits = defineEmits<{
+  (event: 'submit', value: UI_I_DatastoreTableItem): void
+}>()
+
+const { $store }: any = useNuxtApp()
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const pagination = ref<UI_I_Pagination>({
+  page: 1,
+  pageSize: 100,
+})
+const getStorage = async (): Promise<void> => {
+  const payload: UI_I_TablePayload = {
+    pagination: pagination.value,
+    sortBy: null,
+    type: 'datastore',
+    schema: 'full',
+  }
+
+  props.getDatastoreTableFunc(payload).then(() => {
+    selectedRow.value = null
+    setStorageFromProps()
+  })
+}
+getStorage()
+
+const selectedStorage = ref<UI_I_DatastoreTableItem | null>(null)
+const selectedRow = ref<number | null>(null)
+const changeStorage = (index: number): void => {
+  if (!props.datastore) return
+  selectedStorage.value = props.datastore[index]
+  selectedRow.value = index
+}
+
+const setStorageFromProps = (): void => {
+  if (!props.storage) return
+  props.datastore.forEach((item, index) => {
+    if (item.id === props.storage.id) changeStorage(index)
+  })
+}
+watch(
+  () => props.storage,
+  () => {
+    setStorageFromProps()
+  },
+  { immediate: true }
+)
+watch(
+  () => props.datastore,
+  () => {
+    selectedRow.value = null
+    selectedStorage.value = null
+  },
+  { immediate: true }
+)
+
+watch(
+  () => props.storageSubmit,
+  (newValue) => {
+    newValue && submit(newValue)
+  }
+)
+const submit = (cb: Function): void => {
+  if (!selectedStorage.value) {
+    showValidationErrors([
+      localization.value.common.selectValidDestinationStorage,
+    ])
+    cb(false)
+    return
+  }
+
+  emits('submit', selectedStorage.value)
+  cb(true)
+}
+
+const errors = ref<string[]>([])
+const showValidationErrors = (arr: string[]): void => {
+  errors.value = arr
+}
+const onRemoveValidationErrors = (): void => {
+  errors.value = []
+}
+</script>
+
+<style scoped lang="scss">
+</style>