bfg-common 1.5.759 → 1.5.760

package/components/common/vm/snapshots/new/Skeleton.vue

@@ -19,7 +19,7 @@
       <ui-skeleton-item width="96" height="20" class="ml-auto" />
     </div>
     <div class="right-content grid p-4">
-      <div class="flex justify-between gap-4 flex-wrap top-container">
+      <div class="flex justify-between gap-4 pr-4 flex-wrap top-container">
         <ui-skeleton-item width="80" height="20" />
         <div class="actions-block flex">
           <ui-skeleton-item width="20" height="20" />
@@ -29,7 +29,13 @@
           <ui-skeleton-item width="20" height="20" />
         </div>
       </div>
-      <div class="details-block flex flex-col my-6">
+      <div
+        ref="detailsScrollBlock"
+        :class="[
+          'details-block flex flex-col my-6',
+          { 'has-scroll': hasScroll },
+        ]"
+      >
         <div
           v-for="index in detailsItemsCount"
           :key="index"
@@ -45,7 +51,19 @@
 </template>
 
 <script setup lang="ts">
+import { useTemplateRef } from 'vue'
+import { useElementSize } from '@vueuse/core'
+
 const detailsItemsCount = ref<number>(6)
+
+const detailsElement = useTemplateRef<HTMLDivElement>('detailsScrollBlock')
+const { height } = useElementSize(detailsElement)
+
+const hasScroll = computed<boolean>(
+  () =>
+    height.value &&
+    detailsElement.value?.scrollHeight > detailsElement.value?.clientHeight
+)
 </script>
 
 <style>
@@ -84,6 +102,8 @@ const detailsItemsCount = ref<number>(6)
     }
   }
   .right-content {
+    padding-right: 0;
+
     .top-container {
       .actions-block {
         grid-column-gap: 10px;
@@ -98,6 +118,10 @@ const detailsItemsCount = ref<number>(6)
       grid-row-gap: 10px;
       overflow: auto;
 
+      &:not(.has-scroll) {
+        padding-right: 16px;
+      }
+
       .details-block-item {
         background-color: var(--snapshots-right-skeleton-item-bg-color);
         border-radius: 6px;

package/components/common/wizards/common/compatibility/Compatibility.vue

@@ -1,35 +1,35 @@
-<template>
-  <common-wizards-common-compatibility-new
-    v-if="isNewView"
-    :status="props.status"
-    :text="props.text"
-    :loading="props.loading"
-  />
-  <common-wizards-common-compatibility-old
-    v-else
-    :status="props.status"
-    :text="props.text"
-  />
-</template>
-
-<script lang="ts" setup>
-import type {
-  UI_T_CompatibilityStatus
-} from "~/components/common/wizards/common/compatibility/lib/models/types";
-
-const props = withDefaults(
-  defineProps<{
-    text: string
-    status: UI_T_CompatibilityStatus
-    loading?: boolean
-  }>(),
-  {
-    loading: false,
-  }
-)
-
-const { $store }: any = useNuxtApp()
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-</script>
-
-<style lang="scss" scoped></style>
+<template>
+  <common-wizards-common-compatibility-new
+    v-if="isNewView"
+    :status="props.status"
+    :text="props.text"
+    :loading="props.loading"
+  />
+  <common-wizards-common-compatibility-old
+    v-else
+    :status="props.status"
+    :text="props.text"
+  />
+</template>
+
+<script lang="ts" setup>
+import type {
+  UI_T_CompatibilityStatus
+} from "~/components/common/wizards/common/compatibility/lib/models/types";
+
+const props = withDefaults(
+  defineProps<{
+    text: string
+    status: UI_T_CompatibilityStatus
+    loading?: boolean
+  }>(),
+  {
+    loading: false,
+  }
+)
+
+const { $store }: any = useNuxtApp()
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+</script>
+
+<style lang="scss" scoped></style>

package/components/common/wizards/common/steps/name/Name.vue

@@ -1,178 +1,178 @@
-<template>
-  <common-wizards-common-steps-name-new
-    v-if="isNewView"
-    v-model:name="name"
-    v-model:location="location"
-    :has-location="props.hasLocation"
-    :errors="errors"
-    :location-nodes="props.locationNodes"
-    :test-ids="props.testIds"
-    @remove-validation-errors="onRemoveValidationErrors"
-  />
-  <common-wizards-common-steps-name-old
-    v-else
-    v-model:name="name"
-    v-model:location="location"
-    :has-location="props.hasLocation"
-    :errors="errors"
-    :location-nodes="props.locationNodes"
-    :location-description="props.locationDescription"
-    :test-ids="props.testIds"
-    @remove-validation-errors="onRemoveValidationErrors"
-  />
-</template>
-
-<script setup lang="ts">
-import type { API_UI_I_Error } from '~/lib/models/store/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
-import type { UI_I_NameTestIds } from '~/components/common/wizards/common/steps/name/lib/models/interfaces'
-
-const name = defineModel<string>('name', { required: true })
-const location = defineModel<UI_I_TreeNode | null>('location') // для сферы
-
-const props = withDefaults(
-  defineProps<{
-    show: boolean
-    nameFormSubmit: null | Function
-    nameRequestUrl: string
-    nameExistValidationDescription: string
-    testIds: UI_I_NameTestIds
-    validationDescription?: string
-    hasLocation?: boolean
-    validateEmptyName?: boolean
-    locationNodes?: UI_I_TreeNode[]
-    locationDescription?: string
-    allowedLocationKinds?: number[]
-  }>(),
-  {
-    hasLocation: false,
-    validateEmptyName: false,
-    locationDescription: '',
-    locationNodes: () => [],
-    allowedLocationKinds: () => [],
-  }
-)
-const emits = defineEmits<{
-  (event: 'submit', value: [string, UI_I_TreeNode | null]): 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())
-
-watch(
-  () => props.nameFormSubmit,
-  (newValue) => {
-    newValue && submit(newValue)
-  }
-)
-
-// TODO defineExpose({
-// submit,
-// })
-const submit = async (cb: Function): Promise<void> => {
-  if (props.validateEmptyName && name.value === '') {
-    showValidationErrors([
-      localization.value.common.emptyNameValidationDescription,
-    ])
-    cb(false)
-    return
-  }
-  if (name.value !== '') {
-    const isNameValid = await checkNameIsValid(name.value)
-    if (!isNameValid) {
-      cb(false)
-      return
-    }
-  }
-
-  if (props.hasLocation) {
-    if (
-      !location.value ||
-      (location.value &&
-        !props.allowedLocationKinds.includes(location.value.kind))
-    ) {
-      showValidationErrors([
-        props.validationDescription,
-      ])
-      cb(false)
-      return
-    }
-  }
-
-  onRemoveValidationErrors()
-  emits('submit', [name.value, location.value])
-  cb(true)
-}
-const checkNameIsValid = async (nameLocal: string): Promise<boolean> => {
-  const nameRequestUrlLocal = props.nameRequestUrl.replace('{name}', nameLocal)
-  const { error } = await useMyFetch<null, API_UI_I_Error>(
-    nameRequestUrlLocal,
-    {
-      method: 'GET',
-    }
-  )
-  const status = error.value?.statusCode || 200
-  switch (status) {
-    case 400: // Empty name
-      showValidationErrors([
-        localization.value.common.emptyNameValidationDescription,
-      ])
-      return false
-    case 405: // Invalid kind
-      showValidationErrors([
-        localization.value.common.kindValidationDescription,
-      ])
-      return false
-    case 406: // Invalid name
-      showValidationErrors([
-        localization.value.common.nameValidationDescription,
-      ])
-      return false
-    case 409: // Name exist
-      showValidationErrors([
-        props.nameExistValidationDescription,
-      ])
-      return false
-  }
-
-  return 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 }
-)
-
-// TODO defineExpose({
-// focusNameInput,
-// })
-watch(
-  () => props.show,
-  (newValue) => {
-    if (!newValue) return
-
-    const input = document.getElementById('virtual-machine-name')
-    if (!input) return
-
-    setTimeout(() => {
-      input.focus()
-    }, 0)
-  }
-)
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+  <common-wizards-common-steps-name-new
+    v-if="isNewView"
+    v-model:name="name"
+    v-model:location="location"
+    :has-location="props.hasLocation"
+    :errors="errors"
+    :location-nodes="props.locationNodes"
+    :test-ids="props.testIds"
+    @remove-validation-errors="onRemoveValidationErrors"
+  />
+  <common-wizards-common-steps-name-old
+    v-else
+    v-model:name="name"
+    v-model:location="location"
+    :has-location="props.hasLocation"
+    :errors="errors"
+    :location-nodes="props.locationNodes"
+    :location-description="props.locationDescription"
+    :test-ids="props.testIds"
+    @remove-validation-errors="onRemoveValidationErrors"
+  />
+</template>
+
+<script setup lang="ts">
+import type { API_UI_I_Error } from '~/lib/models/store/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
+import type { UI_I_NameTestIds } from '~/components/common/wizards/common/steps/name/lib/models/interfaces'
+
+const name = defineModel<string>('name', { required: true })
+const location = defineModel<UI_I_TreeNode | null>('location') // для сферы
+
+const props = withDefaults(
+  defineProps<{
+    show: boolean
+    nameFormSubmit: null | Function
+    nameRequestUrl: string
+    nameExistValidationDescription: string
+    testIds: UI_I_NameTestIds
+    validationDescription?: string
+    hasLocation?: boolean
+    validateEmptyName?: boolean
+    locationNodes?: UI_I_TreeNode[]
+    locationDescription?: string
+    allowedLocationKinds?: number[]
+  }>(),
+  {
+    hasLocation: false,
+    validateEmptyName: false,
+    locationDescription: '',
+    locationNodes: () => [],
+    allowedLocationKinds: () => [],
+  }
+)
+const emits = defineEmits<{
+  (event: 'submit', value: [string, UI_I_TreeNode | null]): 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())
+
+watch(
+  () => props.nameFormSubmit,
+  (newValue) => {
+    newValue && submit(newValue)
+  }
+)
+
+// TODO defineExpose({
+// submit,
+// })
+const submit = async (cb: Function): Promise<void> => {
+  if (props.validateEmptyName && name.value === '') {
+    showValidationErrors([
+      localization.value.common.emptyNameValidationDescription,
+    ])
+    cb(false)
+    return
+  }
+  if (name.value !== '') {
+    const isNameValid = await checkNameIsValid(name.value)
+    if (!isNameValid) {
+      cb(false)
+      return
+    }
+  }
+
+  if (props.hasLocation) {
+    if (
+      !location.value ||
+      (location.value &&
+        !props.allowedLocationKinds.includes(location.value.kind))
+    ) {
+      showValidationErrors([
+        props.validationDescription,
+      ])
+      cb(false)
+      return
+    }
+  }
+
+  onRemoveValidationErrors()
+  emits('submit', [name.value, location.value])
+  cb(true)
+}
+const checkNameIsValid = async (nameLocal: string): Promise<boolean> => {
+  const nameRequestUrlLocal = props.nameRequestUrl.replace('{name}', nameLocal)
+  const { error } = await useMyFetch<null, API_UI_I_Error>(
+    nameRequestUrlLocal,
+    {
+      method: 'GET',
+    }
+  )
+  const status = error.value?.statusCode || 200
+  switch (status) {
+    case 400: // Empty name
+      showValidationErrors([
+        localization.value.common.emptyNameValidationDescription,
+      ])
+      return false
+    case 405: // Invalid kind
+      showValidationErrors([
+        localization.value.common.kindValidationDescription,
+      ])
+      return false
+    case 406: // Invalid name
+      showValidationErrors([
+        localization.value.common.nameValidationDescription,
+      ])
+      return false
+    case 409: // Name exist
+      showValidationErrors([
+        props.nameExistValidationDescription,
+      ])
+      return false
+  }
+
+  return 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 }
+)
+
+// TODO defineExpose({
+// focusNameInput,
+// })
+watch(
+  () => props.show,
+  (newValue) => {
+    if (!newValue) return
+
+    const input = document.getElementById('virtual-machine-name')
+    if (!input) return
+
+    setTimeout(() => {
+      input.focus()
+    }, 0)
+  }
+)
+</script>
+
+<style scoped lang="scss"></style>