bfg-common 1.5.57 → 1.5.59

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

@@ -0,0 +1,70 @@
+<template>
+  <div class="select-create-type">
+    <atoms-list-select-list
+      v-model="model"
+      class="select"
+      :items="props.items"
+    />
+    <p class="description">
+      {{ description }}
+    </p>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+const model = defineModel<string>()
+
+const props = defineProps<{
+  items: UI_I_OptionItem[]
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const description = computed<string>(() => {
+  let result = ''
+  switch (model.value) {
+    case '0':
+      result = localization.value.common.newVmCreateDescription
+      break
+    case '1':
+      result = localization.value.vmWizard.deployFromTemplateDescription
+      break
+  }
+  return result
+})
+</script>
+
+<style scoped lang="scss">
+.select-create-type {
+  display: flex;
+  padding-top: 12px;
+
+  .description {
+    color: #333333;
+    font-size: 13px;
+  }
+
+  .description,
+  .select {
+    flex: 1 1 100%;
+    margin-right: 5px;
+  }
+
+  :deep(select) {
+    background-color: transparent;
+    border-color: var(--type-list-border-color);
+  }
+}
+</style>
+
+<style>
+:root {
+  --type-list-border-color: #ccc;
+}
+:root.dark-theme {
+  --type-list-border-color: #000;
+}
+</style>

package/components/common/vm/actions/common/select/createType/lib/config/items.ts

@@ -1,27 +1,47 @@
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+import type {
+  UI_I_VmCreateTypeOption
+} from "~/components/common/vm/actions/common/select/createType/lib/models/interfaces";
 
 export const itemsFunc = (
     localization: UI_I_Localization,
     importFromVMWarevSphere: string
-): UI_I_OptionItem[] => {
+): UI_I_VmCreateTypeOption[] => {
   return [
     {
       text: localization.common.createNewVirtualMachine,
       value: '0',
       disabled: false,
+      testId: 'create-new-vm',
+      description: localization.common.newVmCreateDescription
+    },
+    {
+      text: localization.vmWizard.deployFromTemplate,
+      value: '1',
+      disabled: false,
+      testId: 'deploy-from-template',
+      description: localization.vmWizard.deployFromTemplateDescription
+    },
+    {
+      text: localization.common.deployVmFromOVF,
+      value: '2',
+      disabled: true,
+      testId: 'deploy-from-ovf',
+      description: ''
     },
-    { text: localization.vmWizard.deployFromTemplate, value: '1', disabled: false },
-    { text: localization.common.deployVmFromOVF, value: '2', disabled: true },
     {
       text: importFromVMWarevSphere,
       value: '3',
       disabled: true,
+      testId: 'import-from-vmware-vsphere',
+      description: ''
     },
     {
       text: localization.common.importFromGorizontVS,
       value: '4',
       disabled: true,
+      testId: 'import-from-gorizont-vs',
+      description: ''
     },
   ]
 }

package/components/common/vm/actions/common/select/createType/lib/models/interfaces.ts

@@ -0,0 +1,5 @@
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+
+export interface UI_I_VmCreateTypeOption extends UI_I_OptionItem {
+  description: string
+}

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

@@ -1,236 +1,167 @@
-<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>
+<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>

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

@@ -0,0 +1,143 @@
+<template>
+  <div class="select-name">
+    <div class="name-field">
+      <div class="flex-1 flex-align-center">
+        <label for="virtual-machine-name" class="name-label">{{
+          localization.common.name
+        }}</label>
+        <ui-icon
+          id="virtual-machine-name-icon"
+          width="16"
+          height="16"
+          name="info"
+          data-id="virtual-machine-name-icon"
+          :class="{ active: isShowHelp }"
+          @click.stop="isShowHelp = !isShowHelp"
+        />
+      </div>
+      <Teleport to="body">
+        <ui-dropdown
+          :show="isShowHelp"
+          elem-id="virtual-machine-name-icon"
+          test-id=""
+          :items="[]"
+          width="auto"
+          show-from-left
+          @hide="isShowHelp = false"
+        >
+          <template #content>
+            <div class="vm-name-help-content">
+              <div class="headline">
+                <ui-icon name="info-2" width="16" height="16" />
+                <h3 class="vm-name-help-title">
+                  {{ localization.common.cpu }}
+                </h3>
+                <ui-icon
+                  name="close"
+                  width="16"
+                  height="16"
+                  class="pointer"
+                  @click="isShowHelp = false"
+                />
+              </div>
+
+              <p class="vm-name-help-text">
+                {{ localization.common.vmCpuHelpText1 }}
+              </p>
+            </div>
+          </template>
+        </ui-dropdown>
+      </Teleport>
+
+      <div class="flex-2">
+        <ui-input
+          v-model="vmName"
+          type="text"
+          maxlength="54"
+          test-id="virtual-machine-name"
+        />
+      </div>
+    </div>
+  </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 = defineProps<{
+  project: UI_T_Project
+  errors: string[]
+  dataCenter?: UI_I_TreeNode // для сферы
+}>()
+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 {
+  .name-field {
+    display: flex;
+    align-items: center;
+
+    .name-label {
+      font-size: 13px;
+      color: #4d5d69;
+      margin-right: 8px;
+    }
+    #virtual-machine-name-icon {
+      color: #9da6ad;
+
+      &:hover {
+        color: #4d5d69;
+      }
+      &.active {
+        color: #008fd6;
+      }
+    }
+  }
+}
+
+.vm-name-help-content {
+  padding: 16px;
+
+  .headline {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    margin-bottom: 12px;
+
+    .vm-name-help-title {
+      flex: 1;
+      font-size: 14px;
+      font-weight: 500;
+      line-height: 16.94px;
+      color: #4d5d69;
+    }
+  }
+
+  .vm-name-help-text {
+    font-size: 13px;
+    line-height: 15.73px;
+    color: #4d5d69;
+    margin-bottom: 12px;
+  }
+
+  .vm-name-more-info {
+    font-size: 13px;
+    font-weight: 500;
+    line-height: 15.73px;
+    color: #008fd6;
+    text-decoration: none;
+  }
+}
+</style>