bfg-common 1.5.486 → 1.5.488

package/components/common/tools/Actions.vue

@@ -1,207 +1,207 @@
-<template>
-  <!--  :style="{ 'padding-right': rightSpace + 'px' }"-->
-  <div
-    :id="id"
-    :style="{ paddingRight: spaceForCollapseBtn + 'px' }"
-    class="btn-group"
-  >
-    <div v-for="(button, key) in props.actions" :key="button.type">
-      <label
-        v-if="button.uploaded"
-        v-development="button.development"
-        v-permission="button.permission"
-        >
-        <span
-          :class="[`btn btn-link ${props.size}`]"
-          :data-id="`${button.testId}-text`"
-        >
-          <slot name="icon" :data="button" />
-          {{ button.text }}
-        </span>
-        <input
-          :id="`select-file-button-${key}`"
-          :data-id="button.testId"
-          :disabled="button.disabled"
-          :multiple="button?.multiple || false"
-          type="file"
-          class="btn-group__file"
-          @change="(event) => onSelectFiles(event, button.type, key)"
-        />
-      </label>
-
-      <button
-        v-else
-        :id="`actions-button-${key}`"
-        v-development="button.development"
-        v-permission="button.permission"
-        :data-id="button.testId"
-        :class="[`btn btn-link ${props.size}`]"
-        :disabled="button.disabled"
-        @click="onClickButton(button.type)"
-      >
-        <slot name="icon" :data="button" />
-        {{ button.text }}
-      </button>
-    </div>
-    <atoms-collapse-nav
-      v-show="collapsedItems.length"
-      :test-id="`${props.testId}-item`"
-      :items="collapsedItems"
-      class="nav-tabs"
-      close-after-click
-      @change="onClickButton"
-      @select-file="onSelectFiles"
-    />
-  </div>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Button } from '~/components/common/tools/lib/models/interfaces'
-import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
-
-const props = withDefaults(
-  defineProps<{
-    actions: UI_I_Button[]
-    testId: string
-    size?: 'btn-sm' | ''
-  }>(),
-  {
-    size: 'btn-sm',
-  }
-)
-const emits = defineEmits<{
-  (event: 'click', value1: string, value2?: Event | null): void
-}>()
-
-const onClickButton = (type: string): void => {
-  emits('click', type)
-}
-
-const onSelectFiles = (event: Event, type: string, key: number): void => {
-  emits('click', type, event)
-
-  const input = document.getElementById(
-    `select-file-button-${key}`
-  ) as HTMLInputElement | null
-  input && (input.value = '')
-}
-
-const visibleCount = ref<number>(props.actions.length)
-const collapsedItems = computed<UI_I_CollapseNavItem[]>(() => {
-  return props.actions
-    .filter((_, index) => {
-      return index >= visibleCount.value
-    })
-    .map((item) => {
-      return {
-        text: item.text,
-        value: item.type,
-        disabled: item.disabled,
-        development: item.development,
-        permission: item.permission,
-        uploaded: item.uploaded,
-        testId: item.testId,
-      }
-    })
-})
-watch(
-  () => props.actions,
-  () => {
-    // visibleCount.value = newValue.length
-    outputSize()
-  },
-  { deep: true }
-)
-
-// const rightSpace = ref<number>(0)
-// watch(
-//   collapsedItems,
-//   (newValue) => {
-//     let space = 0
-//     const element: any = document.getElementById(id.value)
-//     if (!element || !newValue.length) space = 0
-//     else if (element.lastChild?.className?.includes('tabs-overflow')) {
-//       space =
-//         element.getBoundingClientRect().right -
-//         element.lastChild.getBoundingClientRect().left
-//     }
-//
-//     rightSpace.value = space
-//   },
-//   { deep: true }
-// )
-
-const spaceForCollapseBtn = ref<number>(65)
-const outputSize = (): void => {
-  const el = document.getElementById(id.value)
-  if (!el) return
-
-  const elWidth = el.clientWidth + 1
-  // const elItems = el.children
-  const elItems = Array.from(el.children).filter(
-    (item) => !item.classList.contains('nav-tabs')
-  )
-  // const elItemsMarginLeft = parseInt(getComputedStyle(elItems[0]).marginLeft)
-  // const elItemsMarginRight = parseInt(getComputedStyle(elItems[0]).marginRight)
-  // const childrenMarginX = elItemsMarginLeft + elItemsMarginRight
-
-  // let childrenWidth = -10 // TODO Найти способ лучше. Не всегда совпадает ширина элементов с шириной родительского элемента
-  let childrenWidth = spaceForCollapseBtn.value // TODO Найти способ лучше. Не всегда совпадает ширина элементов с шириной родительского элемента
-  let count = 0
-  for (let i = 0; i < elItems.length; i++) {
-    const elItemsMarginLeft = parseInt(getComputedStyle(elItems[i]).marginLeft)
-    const elItemsMarginRight = parseInt(
-      getComputedStyle(elItems[i]).marginRight
-    )
-    const childrenMarginX = elItemsMarginLeft + elItemsMarginRight
-
-    childrenWidth += elItems[i].clientWidth + childrenMarginX
-    // const isWrap = elWidth - rightSpace.value < childrenWidth
-    const isWrap = elWidth < childrenWidth
-
-    if (isWrap) break
-    count++
-  }
-
-  visibleCount.value = count
-}
-
-const setResizeObserve = (): void => {
-  const el = document.getElementById(id.value)
-
-  if (!el) {
-    setTimeout(setResizeObserve, 0)
-    return
-  }
-
-  new ResizeObserver(outputSize).observe(el)
-}
-const id = ref<string>('')
-onMounted(() => {
-  id.value = `tool-actions-${useUniqueId()}`
-  setResizeObserve()
-})
-</script>
-
-<style lang="scss" scoped>
-.btn {
-  &:disabled {
-    color: var(--btn-link-disabled);
-  }
-  &-group {
-    margin-top: 10px;
-    box-shadow: none;
-    position: relative;
-    overflow: hidden;
-    display: flex;
-    flex-wrap: wrap;
-    min-height: 25px;
-    height: 25px;
-    box-sizing: content-box;
-
-    &__file {
-      display: none;
-    }
-  }
-}
-</style>
+<template>
+  <!--  :style="{ 'padding-right': rightSpace + 'px' }"-->
+  <div
+    :id="id"
+    :style="{ paddingRight: spaceForCollapseBtn + 'px' }"
+    class="btn-group"
+  >
+    <div v-for="(button, key) in props.actions" :key="button.type">
+      <label
+        v-if="button.uploaded"
+        v-development="button.development"
+        v-permission="button.permission"
+        >
+        <span
+          :class="[`btn btn-link ${props.size}`]"
+          :data-id="`${button.testId}-text`"
+        >
+          <slot name="icon" :data="button" />
+          {{ button.text }}
+        </span>
+        <input
+          :id="`select-file-button-${key}`"
+          :data-id="button.testId"
+          :disabled="button.disabled"
+          :multiple="button?.multiple || false"
+          type="file"
+          class="btn-group__file"
+          @change="(event) => onSelectFiles(event, button.type, key)"
+        />
+      </label>
+
+      <button
+        v-else
+        :id="`actions-button-${key}`"
+        v-development="button.development"
+        v-permission="button.permission"
+        :data-id="button.testId"
+        :class="[`btn btn-link ${props.size}`]"
+        :disabled="button.disabled"
+        @click="onClickButton(button.type)"
+      >
+        <slot name="icon" :data="button" />
+        {{ button.text }}
+      </button>
+    </div>
+    <atoms-collapse-nav
+      v-show="collapsedItems.length"
+      :test-id="`${props.testId}-item`"
+      :items="collapsedItems"
+      class="nav-tabs"
+      close-after-click
+      @change="onClickButton"
+      @select-file="onSelectFiles"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Button } from '~/components/common/tools/lib/models/interfaces'
+import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
+
+const props = withDefaults(
+  defineProps<{
+    actions: UI_I_Button[]
+    testId: string
+    size?: 'btn-sm' | ''
+  }>(),
+  {
+    size: 'btn-sm',
+  }
+)
+const emits = defineEmits<{
+  (event: 'click', value1: string, value2?: Event | null): void
+}>()
+
+const onClickButton = (type: string): void => {
+  emits('click', type)
+}
+
+const onSelectFiles = (event: Event, type: string, key: number): void => {
+  emits('click', type, event)
+
+  const input = document.getElementById(
+    `select-file-button-${key}`
+  ) as HTMLInputElement | null
+  input && (input.value = '')
+}
+
+const visibleCount = ref<number>(props.actions.length)
+const collapsedItems = computed<UI_I_CollapseNavItem[]>(() => {
+  return props.actions
+    .filter((_, index) => {
+      return index >= visibleCount.value
+    })
+    .map((item) => {
+      return {
+        text: item.text,
+        value: item.type,
+        disabled: item.disabled,
+        development: item.development,
+        permission: item.permission,
+        uploaded: item.uploaded,
+        testId: item.testId,
+      }
+    })
+})
+watch(
+  () => props.actions,
+  () => {
+    // visibleCount.value = newValue.length
+    outputSize()
+  },
+  { deep: true }
+)
+
+// const rightSpace = ref<number>(0)
+// watch(
+//   collapsedItems,
+//   (newValue) => {
+//     let space = 0
+//     const element: any = document.getElementById(id.value)
+//     if (!element || !newValue.length) space = 0
+//     else if (element.lastChild?.className?.includes('tabs-overflow')) {
+//       space =
+//         element.getBoundingClientRect().right -
+//         element.lastChild.getBoundingClientRect().left
+//     }
+//
+//     rightSpace.value = space
+//   },
+//   { deep: true }
+// )
+
+const spaceForCollapseBtn = ref<number>(65)
+const outputSize = (): void => {
+  const el = document.getElementById(id.value)
+  if (!el) return
+
+  const elWidth = el.clientWidth + 1
+  // const elItems = el.children
+  const elItems = Array.from(el.children).filter(
+    (item) => !item.classList.contains('nav-tabs')
+  )
+  // const elItemsMarginLeft = parseInt(getComputedStyle(elItems[0]).marginLeft)
+  // const elItemsMarginRight = parseInt(getComputedStyle(elItems[0]).marginRight)
+  // const childrenMarginX = elItemsMarginLeft + elItemsMarginRight
+
+  // let childrenWidth = -10 // TODO Найти способ лучше. Не всегда совпадает ширина элементов с шириной родительского элемента
+  let childrenWidth = spaceForCollapseBtn.value // TODO Найти способ лучше. Не всегда совпадает ширина элементов с шириной родительского элемента
+  let count = 0
+  for (let i = 0; i < elItems.length; i++) {
+    const elItemsMarginLeft = parseInt(getComputedStyle(elItems[i]).marginLeft)
+    const elItemsMarginRight = parseInt(
+      getComputedStyle(elItems[i]).marginRight
+    )
+    const childrenMarginX = elItemsMarginLeft + elItemsMarginRight
+
+    childrenWidth += elItems[i].clientWidth + childrenMarginX
+    // const isWrap = elWidth - rightSpace.value < childrenWidth
+    const isWrap = elWidth < childrenWidth
+
+    if (isWrap) break
+    count++
+  }
+
+  visibleCount.value = count
+}
+
+const setResizeObserve = (): void => {
+  const el = document.getElementById(id.value)
+
+  if (!el) {
+    setTimeout(setResizeObserve, 0)
+    return
+  }
+
+  new ResizeObserver(outputSize).observe(el)
+}
+const id = ref<string>('')
+onMounted(() => {
+  id.value = `tool-actions-${useUniqueId()}`
+  setResizeObserve()
+})
+</script>
+
+<style lang="scss" scoped>
+.btn {
+  &:disabled {
+    color: var(--btn-link-disabled);
+  }
+  &-group {
+    margin-top: 10px;
+    box-shadow: none;
+    position: relative;
+    overflow: hidden;
+    display: flex;
+    flex-wrap: wrap;
+    min-height: 25px;
+    height: 25px;
+    box-sizing: content-box;
+
+    &__file {
+      display: none;
+    }
+  }
+}
+</style>

package/components/common/treeView/TreeView.vue

@@ -1,52 +1,52 @@
-<template>
-  <div class="tree-view w-full overflow-auto">
-    <common-recursion-tree
-      v-show="!props.loading"
-      :nodes="nodesLocal"
-      class="recursion-tree"
-      @select-node="onSelectNode"
-      @get-nodes="onShowNodes($event)"
-    />
-  </div>
-</template>
-
-<script setup lang="ts">
-// TODO remove
-const props = defineProps<{
-  loading: boolean
-  nodes: any[]
-}>()
-
-const emits = defineEmits<{
-  (event: 'select-node', value: any): void
-  (event: 'show-nodes', value: string | number): void
-}>()
-
-const nodesLocal = ref<any[]>([])
-watch(
-  () => props.nodes,
-  (newValue) => {
-    if (!newValue.length) return
-
-    nodesLocal.value = newValue
-  },
-  { immediate: true, deep: true }
-)
-
-const onSelectNode = (item: any): void => {
-  emits('select-node', item)
-}
-
-const onShowNodes = ({ node, cb }: { node: any; cb: () => void }): void => {
-  // emits('show-nodes', +node.id) // ???
-  emits('show-nodes', node.id) // Для делева бэкапов
-
-  cb()
-}
-</script>
-
-<style scoped lang="scss">
-.tree-view {
-  height: 90%;
-}
-</style>
+<template>
+  <div class="tree-view w-full overflow-auto">
+    <common-recursion-tree
+      v-show="!props.loading"
+      :nodes="nodesLocal"
+      class="recursion-tree"
+      @select-node="onSelectNode"
+      @get-nodes="onShowNodes($event)"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+// TODO remove
+const props = defineProps<{
+  loading: boolean
+  nodes: any[]
+}>()
+
+const emits = defineEmits<{
+  (event: 'select-node', value: any): void
+  (event: 'show-nodes', value: string | number): void
+}>()
+
+const nodesLocal = ref<any[]>([])
+watch(
+  () => props.nodes,
+  (newValue) => {
+    if (!newValue.length) return
+
+    nodesLocal.value = newValue
+  },
+  { immediate: true, deep: true }
+)
+
+const onSelectNode = (item: any): void => {
+  emits('select-node', item)
+}
+
+const onShowNodes = ({ node, cb }: { node: any; cb: () => void }): void => {
+  // emits('show-nodes', +node.id) // ???
+  emits('show-nodes', node.id) // Для делева бэкапов
+
+  cb()
+}
+</script>
+
+<style scoped lang="scss">
+.tree-view {
+  height: 90%;
+}
+</style>

package/components/common/vm/actions/add/Add.vue

@@ -5,6 +5,7 @@
     v-model:selected-create-type="selectedCreateType"
     v-model:is-power-on-by-default="isPowerOnByDefault"
     :project="props.project"
+    :is-vmt="props.isVmt"
     :nodes="props.nodes"
     :files="props.files"
     :networks-table="props.networksTable"
@@ -47,6 +48,8 @@
     :vmt-settings="props.vmtSettings"
     :is-loading="isLoading"
     :selected-template-id="props.selectedTemplateId"
+    :validate-empty-name="props.validateEmptyName"
+    :title="title"
     @check-name="emits('check-name', $event)"
     @get-storage="emits('get-storage', $event)"
     @get-folders-or-files="emits('get-folders-or-files', $event)"
@@ -77,6 +80,7 @@
     v-model:selected-create-type="selectedCreateType"
     v-model:is-power-on-by-default="isPowerOnByDefault"
     :project="props.project"
+    :is-vmt="props.isVmt"
     :nodes="props.nodes"
     :files="props.files"
     :networks-table="props.networksTable"
@@ -117,6 +121,8 @@
     :compute-resource-tree="props.computeResourceTree"
     :vmt-settings="props.vmtSettings"
     :is-loading="isLoading"
+    :validate-empty-name="props.validateEmptyName"
+    :title="title"
     @check-name="emits('check-name', $event)"
     @get-storage="emits('get-storage', $event)"
     @get-folders-or-files="emits('get-folders-or-files', $event)"
@@ -161,7 +167,7 @@ import type {
   UI_I_FolderOrFileTreePayload,
 } from '~/lib/models/store/storage/interfaces'
 import type {
-  API_UI_I_Error,
+  // API_UI_I_Error,
   UI_I_ErrorValidationField,
 } from '~/lib/models/store/interfaces'
 import type { UI_I_TablePayload } from '~/lib/models/table/interfaces'
@@ -219,26 +225,34 @@ const props = withDefaults(
     passthroughDevices: UI_I_PciDevice[]
     mediatedDevices: UI_I_MediatedDevice[]
     vmNameInWizard: string
-    templatesTree: UI_I_TreeNode[]
+    templatesTree?: UI_I_TreeNode[]
     capabilities?: UI_I_Capabilities
     vmtSettings?: UI_I_VmSettings | null
+    validateEmptyName?: boolean
     dataCenter?: UI_I_TreeNode // для сферы
     computeResource?: UI_I_TreeNode // для сферы
     computeResourceTree?: UI_I_TreeNode[] // для сферы
     selectedTemplateId?: string // для сферы
+    isVmt?: boolean // для сферы
   }>(),
   {
+    templatesTree: [],
     capabilities: undefined,
     vmtSettings: undefined,
+    validateEmptyName: false,
     dataCenter: undefined,
     computeResource: undefined,
     computeResourceTree: undefined,
     selectedTemplateId: '',
+    isVmt: false,
   }
 )
 
 const emits = defineEmits<{
-  (event: 'check-name', value: [string, (error: API_UI_I_Error) => void]): void
+  (
+      event: 'check-name',
+      value: [[string, UI_I_TreeNode | null], (error: any) => void]
+  ): void
   (event: 'get-storage', value: UI_I_TablePayload): void
   (event: 'get-folders-or-files', value: UI_I_FolderOrFileTreePayload): void
   (event: 'get-active-device-child', value: UI_I_FileTreeNode): void
@@ -265,6 +279,12 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 
 const isSphere = computed<boolean>(() => props.project === 'sphere')
 
+const title = computed<string>(() =>
+  props.isVmt
+    ? localization.value.vmt.newTemplate
+    : localization.value.common.newVirtualMachine2
+)
+
 watch(
   () => props.capabilities,
   () => {
@@ -274,9 +294,10 @@ watch(
 )
 
 const selectedCreateType = ref<string>('0')
+if (props.isVmt) selectedCreateType.value = '-1'
 
 const wizard: Wizard = new Wizard(
-  stepsFunc(localization.value),
+  stepsFunc(localization.value, props.isVmt),
   stepsSchemeInitial
 )
 watch(
@@ -288,10 +309,15 @@ watch(
         break
       case '1':
         wizard.changeScheme(isSphere.value ? 6 : 2)
+        break
+      case '-1':
+        wizard.changeScheme(10)
+        break
     }
   },
   { immediate: true }
 )
+
 // if (isSphere.value) wizard.changeScheme(1)
 const selectedScheme = computed<number[]>(() => wizard.selectedScheme.value)
 // const alertMessages = computed<string[][]>(() => wizard.alertMessages.value)
@@ -305,7 +331,8 @@ const isShowSelectTemplate = computed<boolean>(
 const isShowPowerOn = computed<boolean>(
   () =>
     wizard.selectedStepId > dynamicSteps.customizeHardware &&
-    selectedCreateType.value !== '1'
+    selectedCreateType.value !== '1' &&
+    !props.isVmt
 )
 
 const onChangeSteps = async (value: UI_I_WizardStep[]): Promise<void> => {