bfg-common 1.5.64 → 1.5.66

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

@@ -1,14 +1,16 @@
 <template>
-  <div class="select-create-type">
-    <atoms-list-select-list
-      v-model="model"
-      class="select"
-      :items="items"
-    />
-    <p class="description">
-      {{ description }}
-    </p>
-  </div>
+  <common-vm-actions-common-select-create-type-new
+    v-if="isNewView"
+    v-model="model"
+    :items="items"
+    :import-from-v-m-warev-sphere="props.importFromVMWarevSphere"
+  />
+  <common-vm-actions-common-select-create-type-old
+    v-else
+    v-model="model"
+    :items="items"
+    :import-from-v-m-warev-sphere="props.importFromVMWarevSphere"
+  />
 </template>
 
 <script setup lang="ts">
@@ -22,53 +24,15 @@ const props = defineProps<{
   importFromVMWarevSphere: string
 }>()
 
+const { $store }: any = useNuxtApp()
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const items = computed<UI_I_OptionItem[]>(() =>
   itemsFunc(localization.value, props.importFromVMWarevSphere)
 )
-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/New.vue

@@ -0,0 +1,84 @@
+<template>
+  <div class="select-create-type">
+    <div
+      v-for="item in props.items"
+      v-development="item.disabled"
+      :key="item.value"
+      :class="[
+        'select-create-type-block',
+        { selected: item.value === model, disabled: item.disabled },
+      ]"
+      @click="model = item.value"
+    >
+      <ui-radio
+        v-model="model"
+        :label="item.text"
+        :value="item.value"
+        :test-id="item.testId"
+        :disabled="item.disabled"
+        size="md"
+      />
+
+      <p class="description">
+        {{ item.description }}
+      </p>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_VmCreateTypeOption } from '~/components/common/vm/actions/common/select/createType/lib/models/interfaces'
+
+const model = defineModel<string>()
+
+const props = defineProps<{
+  items: UI_I_VmCreateTypeOption[]
+}>()
+</script>
+
+<style>
+:root {
+  --select-create-type-block-bg-color: #ffffff;
+  --select-create-type-block-border-color: #e9ebed;
+  --select-create-type-block-border-hover-color: #d3d6da;
+  --select-create-type-block-selected-bg-color: #f0f8fd;
+  --select-create-type-block-selected-border-color: #008fd6;
+}
+:root.dark-theme {
+  --select-create-type-block-bg-color: transparent;
+  --select-create-type-block-border-color: #e9ebed1f;
+  --select-create-type-block-border-hover-color: #e9ebed3d;
+  --select-create-type-block-selected-bg-color: #2ba2de14;
+  --select-create-type-block-selected-border-color: #2ba2de;
+}
+</style>
+<style scoped lang="scss">
+.select-create-type-block {
+  background-color: var(--select-create-type-block-bg-color);
+  border: 1px solid var(--select-create-type-block-border-color);
+  padding: 12px;
+  border-radius: 8px;
+
+  &:not(.selected):not(.disabled) {
+    cursor: pointer;
+    &:hover {
+      border-color: var(--select-create-type-block-border-hover-color);
+    }
+  }
+
+  &.selected {
+    background-color: var(--select-create-type-block-selected-bg-color);
+    border: 1.5px solid var(--select-create-type-block-selected-border-color);
+  }
+
+  &:not(:last-child) {
+    margin-bottom: 12px;
+  }
+
+  .description {
+    font-size: 13px;
+    color: #9da6ad;
+    margin: 8px 0 0 28px;
+  }
+}
+</style>

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,59 +1,24 @@
 <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>
+  <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">
@@ -77,6 +42,9 @@ const emits = defineEmits<{
   ): void
 }>()
 
+const { $store }: any = useNuxtApp()
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const vmName = ref<string>('')
@@ -119,7 +87,7 @@ const submit = async (cb: Function): Promise<void> => {
       // selectedNode.value?.type === 'folder' &&
       // !isDatacenterFolder
       // TODO рефакторинг, здесь сейчас проверяем является ли выбранный элемент датацентром или папкой(вм)
-        ![3, 7].includes(selectedNode.value?.kind)
+      ![3, 7].includes(selectedNode.value?.kind)
     ) {
       showValidationErrors([
         localization.value.common.enterValidLocationVirtualMachine,
@@ -196,41 +164,4 @@ 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/name/New.vue

@@ -0,0 +1,246 @@
+<template>
+  <div class="select-name">
+    <Teleport to="#name-alert-wrapper">
+      <ui-alert
+        v-show="props.errors.length"
+        status="alert-danger"
+        :messages="props.errors"
+        test-id="name-alert"
+        class="errors-alert"
+        @remove="emits('remove-validation-errors')"
+      />
+    </Teleport>
+
+    <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="320px"
+          top
+          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.vmWizard.vmNameRules }}
+                </h3>
+                <ui-icon
+                  name="close"
+                  width="16"
+                  height="16"
+                  class="hide-icon pointer"
+                  @click="isShowHelp = false"
+                />
+              </div>
+
+              <p class="vm-name-help-text">
+                {{ localization.common.vmNameValidationDescription }}
+              </p>
+            </div>
+          </template>
+        </ui-dropdown>
+      </Teleport>
+
+      <div class="flex-2">
+        <ui-input
+          v-model="vmName"
+          type="text"
+          maxlength="54"
+          :placeholder="localization.common.name"
+          test-id="virtual-machine-name"
+        />
+      </div>
+    </div>
+
+    <template v-if="props.project === 'sphere'">
+      <div class="location">
+        <span class="location-label">{{ localization.common.location }}</span>
+
+        <div v-if="selectedLocation" class="selected-location">
+          <span :class="['node-icon', selectedLocation.iconClassName]" />
+          <span :class="['text', isShowAlert && 'error']">
+            {{ selectedLocation.name }}
+          </span>
+        </div>
+        <ui-skeleton-item v-else width="160px" height="20px" />
+      </div>
+      <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 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())
+
+const isShowAlert = computed<boolean>(() =>
+  props.errors.includes(
+    localization.value.common.enterValidLocationVirtualMachine
+  )
+)
+const selectedLocation = ref<UI_I_TreeNode | null>(null)
+const onSelectNode = (node: UI_I_TreeNode) => {
+  selectedLocation.value = node
+  emits('select-node', node)
+}
+</script>
+
+<style>
+:root {
+  --select-name-text-color: #4d5d69;
+  --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-location-node-color: #182531;
+  --select-name-location-bg-color: #ffffff;
+}
+:root.dark-theme {
+  --select-name-text-color: #e9eaec;
+  --select-name-help-icon-hover-color: #e9eaec;
+  --select-name-help-icon-active-color: #2ba2de;
+  --select-name-help-hide-icon-color: #E9EAEC;
+  --select-name-border-color: #e9ebed1f;
+  --select-name-location-node-color: #e9eaec;
+  --select-name-location-bg-color: transparent;
+}
+</style>
+<style scoped lang="scss">
+.select-name {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  padding-top: 16px;
+
+  .name-field {
+    display: flex;
+    align-items: center;
+
+    .name-label {
+      font-size: 13px;
+      color: var(--select-name-text-color);
+      margin-right: 8px;
+    }
+    #virtual-machine-name-icon {
+      color: #9da6ad; // equal in dark and white modes
+      cursor: pointer;
+
+      &:hover {
+        color: var(--select-name-help-icon-hover-color);
+      }
+      &.active {
+        color: var(--select-name-help-icon-active-color);
+      }
+    }
+  }
+
+  .location {
+    display: grid;
+    grid-template-columns: 1fr 2fr;
+    margin-top: 16px;
+    padding: 16px 0;
+    border-top: 1px solid var(--select-name-border-color);
+
+    .location-label {
+      font-size: 13px;
+      color: var(--select-name-text-color);
+    }
+
+    .selected-location {
+      display: flex;
+      align-items: center;
+      gap: 8px;
+
+      .text {
+        font-size: 13px;
+        color: var(--select-name-location-node-color);
+
+        &.error {
+          color: #ea3223; // equal in dark and white modes
+        }
+      }
+    }
+  }
+  .tree-view-wrap {
+    flex: 1;
+    border-radius: 8px;
+    border: 1px solid var(--select-name-border-color);
+    padding: 12px;
+    background-color: var(--select-name-location-bg-color);
+
+    :deep(.tree-content) {
+      padding: 0 !important;
+    }
+  }
+}
+
+.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: var(--select-name-text-color);
+    }
+    .hide-icon {
+      color: var(--select-name-help-hide-icon-color)
+    }
+  }
+
+  .vm-name-help-text {
+    font-size: 13px;
+    line-height: 15.73px;
+    color: var(--select-name-text-color);
+  }
+}
+</style>