bfg-common 1.5.261 → 1.5.262

package/components/common/pages/licensing/listView/ListView.vue

@@ -5,7 +5,7 @@
         <label>{{ item.label }}</label>
         <span :class="['word-break-all form-value', { expired: item.data?.isExpired }]">
           <atoms-the-icon v-if="item.icon" :name="item.icon" class="icon" />
-          {{ item.value }}
+          {{ item.value || '--' }}
         </span>
       </div>
     </section>

package/components/common/vm/actions/common/customizeHardware/virtualHardware/browseView/BrowseView.vue

@@ -159,11 +159,19 @@ const selectedNodeInfo = computed<UI_I_FileInfo[] | null>(() => {
 
   if (node.type !== 4) {
     const modified = node.modified_time || 0
-    result.push({
-      type: 'date',
-      title: localization.value.common.modified,
-      value: +modified * 1000,
-    })
+    if (modified !== 0) {
+      result.push({
+        type: 'date',
+        title: localization.value.common.modified,
+        value: +modified * 1000,
+      })
+    } else {
+      result.push({
+        type: 'text',
+        title: localization.value.common.modified,
+        value: ' --',
+      })
+    }
   }
 
   return result

package/components/common/vm/actions/common/customizeHardware/virtualHardware/videoCard/VideoCard.vue

@@ -1,136 +1,147 @@
-<template>
-  <common-vm-actions-common-customize-hardware-virtual-hardware-video-card-new
-    v-if="isNewView"
-    v-model:invalid="invalid"
-    v-model:number-displays="numberDisplays"
-    v-model:video-card-model="videoCardModel"
-    :is-edit="props.isEdit"
-    :error-validation-fields="props.errorValidationFields"
-    :video-card-model-name="videoCardModelName"
-    :error-text="apiError"
-    :is-disabled="isDisabled"
-    :state="props.state"
-    :video-card-model-options="videoCardModelOptions"
-    @remove-error="onRemoveValidationError"
-    @remove-error-by-title="emits('remove-error-by-title', $event)"
-  />
-  <common-vm-actions-common-customize-hardware-virtual-hardware-video-card-old
-    v-else
-    v-model:invalid="invalid"
-    v-model:number-displays="numberDisplays"
-    v-model:video-card-model="videoCardModel"
-    :is-edit="props.isEdit"
-    :error-validation-fields="props.errorValidationFields"
-    :video-card-model-name="videoCardModelName"
-    :error-text="apiError"
-    :is-disabled="isDisabled"
-    :state="props.state"
-    :video-card-model-options="videoCardModelOptions"
-    @remove-error="onRemoveValidationError"
-    @remove-error-by-title="emits('remove-error-by-title', $event)"
-  />
-</template>
-
-<script setup lang="ts">
-import type { UI_I_SendDataVideoCard } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/interfaces'
-import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
-import type {UI_I_Localization} from "~/lib/models/interfaces";
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-import {
-  videoCardModelOptionsConfigFunc
-} from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/videoCard/model/lib/config/options'
-
-const props = defineProps<{
-  isEdit: boolean
-  errorValidationFields: UI_I_ErrorValidationField[]
-  videoCard?: UI_I_SendDataVideoCard
-  state?: string | number
-}>()
-const emits = defineEmits<{
-  (event: 'send-data', value: UI_I_SendDataVideoCard): void
-  (event: 'invalid', value: boolean): void
-  (event: 'remove-error-by-title', value: string): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const { $store }: any = useNuxtApp()
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const isDisabled = computed<boolean>(
-  () => props.isEdit && props.state !== 1
-)
-watch(isDisabled, (newValue) => {
-  if (!newValue) {
-    return
-  }
-
-  numberDisplays.value = '1'
-})
-const numberDisplays = ref<string>('1')
-
-// const totalVideoMemory = ref<number>(64)
-const invalid = ref<boolean>(false)
-watch(
-  invalid,
-  (newValue) => {
-    emits('invalid', newValue)
-  },
-  { immediate: true }
-)
-
-// const graphics = ref(false)
-
-const videoCardModel = ref<string>('qxl')
-const videoCardModelOptions = computed<UI_I_OptionItem[]>(() =>
-    videoCardModelOptionsConfigFunc(localization.value)
-)
-const videoCardModelName = computed<string>(
-  () =>
-    videoCardModelOptions.value.find(
-      (videoCard) => videoCard.value === videoCardModel.value
-    )?.text || ''
-)
-
-watch(
-  // [numberDisplays, totalVideoMemory, videoCardModel],
-  [numberDisplays, videoCardModel],
-  () => {
-    emits('send-data', {
-      adapter: videoCardModel.value,
-      displays: +numberDisplays.value,
-      // memory_mb: totalVideoMemory.value,
-    })
-  },
-  { immediate: true }
-)
-
-// Добавляем данные для редактирования
-watch(
-  () => props.videoCard,
-  (newValue) => {
-    if (!newValue) return
-
-    videoCardModel.value = newValue.adapter
-    numberDisplays.value = '' + newValue.displays
-    // totalVideoMemory.value = newValue.memory_mb
-  },
-  { immediate: true }
-)
-
-const typeError = 'video_card.adapter'
-
-const apiError = computed<string>(() => {
-  return (
-    props.errorValidationFields?.find((message) => message.field === typeError)
-      ?.error_message || ''
-  )
-})
-
-const onRemoveValidationError = (): void => {
-  emits('remove-error-by-title', typeError)
-}
-</script>
-
-<style scoped lang="scss">
-</style>
+<template>
+  <common-vm-actions-common-customize-hardware-virtual-hardware-video-card-new
+    v-if="isNewView"
+    v-model:invalid="invalid"
+    v-model:number-displays="numberDisplays"
+    v-model:video-card-model="videoCardModel"
+    :is-edit="props.isEdit"
+    :error-validation-fields="props.errorValidationFields"
+    :video-card-model-name="videoCardModelName"
+    :error-text="apiError"
+    :is-disabled="isDisabled"
+    :state="props.state"
+    :video-card-model-options="videoCardModelOptions"
+    :number-displays-options="numberDisplaysOptions"
+    @remove-error="onRemoveValidationError"
+    @remove-error-by-title="emits('remove-error-by-title', $event)"
+  />
+  <common-vm-actions-common-customize-hardware-virtual-hardware-video-card-old
+    v-else
+    v-model:invalid="invalid"
+    v-model:number-displays="numberDisplays"
+    v-model:video-card-model="videoCardModel"
+    :is-edit="props.isEdit"
+    :error-validation-fields="props.errorValidationFields"
+    :video-card-model-name="videoCardModelName"
+    :error-text="apiError"
+    :is-disabled="isDisabled"
+    :state="props.state"
+    :video-card-model-options="videoCardModelOptions"
+    :number-displays-options="numberDisplaysOptions"
+    @remove-error="onRemoveValidationError"
+    @remove-error-by-title="emits('remove-error-by-title', $event)"
+  />
+</template>
+
+<script setup lang="ts">
+import type { UI_I_SendDataVideoCard } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/interfaces'
+import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+import { videoCardModelOptionsConfigFunc } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/videoCard/model/lib/config/options'
+import { numberDisplaysOptionsFunc } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/videoCard/lib/config/options'
+
+const props = defineProps<{
+  isEdit: boolean
+  errorValidationFields: UI_I_ErrorValidationField[]
+  videoCard?: UI_I_SendDataVideoCard
+  state?: string | number
+}>()
+const emits = defineEmits<{
+  (event: 'send-data', value: UI_I_SendDataVideoCard): void
+  (event: 'invalid', value: boolean): void
+  (event: 'remove-error-by-title', value: string): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const { $store }: any = useNuxtApp()
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const isDisabled = computed<boolean>(() => props.isEdit && props.state !== 1)
+watch(isDisabled, (newValue) => {
+  if (!newValue) {
+    return
+  }
+
+  numberDisplays.value = '1'
+})
+
+const videoCardModel = ref<string>('qxl')
+const videoCardModelOptions = computed<UI_I_OptionItem[]>(() =>
+  videoCardModelOptionsConfigFunc(localization.value)
+)
+const videoCardModelName = computed<string>(
+  () =>
+    videoCardModelOptions.value.find(
+      (videoCard) => videoCard.value === videoCardModel.value
+    )?.text || ''
+)
+
+const numberDisplays = ref<string>('1')
+const numberDisplaysOptions = ref<UI_I_OptionItem[]>(numberDisplaysOptionsFunc())
+
+// const totalVideoMemory = ref<number>(64)
+const invalid = ref<boolean>(false)
+watch(
+  invalid,
+  (newValue) => {
+    emits('invalid', newValue)
+  },
+  { immediate: true }
+)
+
+// const graphics = ref(false)
+
+const changeNumberDisplays = (model: any): void => {
+  if (model === 'none') {
+    numberDisplaysOptions.value.unshift({text: '0', value: '0'})
+    numberDisplays.value = '0'
+  } else if (numberDisplays.value === '0') {
+    numberDisplays.value = '1'
+    numberDisplaysOptions.value.shift()
+  }
+}
+watch(
+  // [numberDisplays, totalVideoMemory, videoCardModel],
+  [numberDisplays, videoCardModel],
+  ([_newValue1, newValue2]) => {
+    changeNumberDisplays(newValue2)
+
+    emits('send-data', {
+      adapter: videoCardModel.value,
+      displays: +numberDisplays.value,
+      // memory_mb: totalVideoMemory.value,
+    })
+  },
+  { immediate: true }
+)
+
+// Добавляем данные для редактирования
+watch(
+  () => props.videoCard,
+  (newValue) => {
+    if (!newValue) return
+
+    videoCardModel.value = newValue.adapter
+    numberDisplays.value = '' + newValue.displays
+    // totalVideoMemory.value = newValue.memory_mb
+  },
+  { immediate: true }
+)
+
+const typeError = 'video_card.adapter'
+
+const apiError = computed<string>(() => {
+  return (
+    props.errorValidationFields?.find((message) => message.field === typeError)
+      ?.error_message || ''
+  )
+})
+
+const onRemoveValidationError = (): void => {
+  emits('remove-error-by-title', typeError)
+}
+</script>
+
+<style scoped lang="scss"></style>

package/components/common/vm/actions/common/customizeHardware/virtualHardware/videoCard/VideoCardNew.vue

@@ -39,6 +39,7 @@
     <template #stackChildren>
       <common-vm-actions-common-customize-hardware-virtual-hardware-video-card-number-displays
         v-model:number-displays="numberDisplays"
+        :number-displays-options="props.numberDisplaysOptions"
         :disabled="props.isDisabled"
         :error-validation-fields="props.errorValidationFields"
         @remove-error-by-title="emits('remove-error-by-title', $event)"
@@ -81,6 +82,7 @@ const props = defineProps<{
   errorText: string
   isDisabled: boolean
   videoCardModelOptions: UI_I_OptionItem[]
+  numberDisplaysOptions: UI_I_OptionItem[]
   state?: string | number
 }>()
 const emits = defineEmits<{

package/components/common/vm/actions/common/customizeHardware/virtualHardware/videoCard/VideoCardOld.vue

@@ -52,6 +52,7 @@
       <template #stackChildren>
         <common-vm-actions-common-customize-hardware-virtual-hardware-video-card-number-displays
           v-model:number-displays="numberDisplays"
+          :number-displays-options="props.numberDisplaysOptions"
           :disabled="props.isDisabled"
           :error-validation-fields="props.errorValidationFields"
           @remove-error-by-title="emits('remove-error-by-title', $event)"
@@ -95,6 +96,7 @@ const props = defineProps<{
   errorText: string
   isDisabled: boolean
   videoCardModelOptions: UI_I_OptionItem[]
+  numberDisplaysOptions: UI_I_OptionItem[]
   state?: string | number
 }>()
 const emits = defineEmits<{

package/components/common/vm/actions/common/customizeHardware/virtualHardware/videoCard/lib/config/options.ts

@@ -1,11 +1,14 @@
-// import type { UI_I_Localization } from '~/lib/models/interfaces'
-// import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-//
-// export const videoCardOptionsFunc = (
-//   localization: UI_I_Localization
-// ): UI_I_OptionItem[] => {
-//   return [
-//     { text: localization.common.autoDetectSettings, value: 0 },
-//     { text: localization.common.specifyCustomSettings, value: 1 },
-//   ]
-// }
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+
+export const numberDisplaysOptionsFunc = (): UI_I_OptionItem[] => [
+    { text: '1', value: '1' },
+    { text: '2', value: '2' },
+    { text: '3', value: '3' },
+    { text: '4', value: '4' },
+    // { text: '5', value: '5' },
+    // { text: '6', value: '6' },
+    // { text: '7', value: '7' },
+    // { text: '8', value: '8' },
+    // { text: '9', value: '9' },
+    // { text: '10', value: '10' },
+]

package/components/common/vm/actions/common/customizeHardware/virtualHardware/videoCard/numberDisplays/NumberDisplays.vue

@@ -1,57 +1,53 @@
-<template>
-  <common-vm-actions-common-customize-hardware-virtual-hardware-video-card-number-displays-new
-    v-if="isNewView"
-    v-model:number-displays="numberDisplays"
-    :disabled="props.disabled"
-    :error-text="apiError"
-    :number-displays-options="numberDisplaysOptions"
-    @remove-error="onRemoveValidationError"
-    />
-  <common-vm-actions-common-customize-hardware-virtual-hardware-video-card-number-displays-old
-    v-else
-    v-model:number-displays="numberDisplays"
-    :disabled="props.disabled"
-    :error-text="apiError"
-    :number-displays-options="numberDisplaysOptions"
-    @remove-error="onRemoveValidationError"
-    />
-</template>
-
-<script setup lang="ts">
-import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-import { numberDisplaysOptionsConfig } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/videoCard/numberDisplays/lib/config/options'
-
-const numberDisplays = defineModel<string>('numberDisplays', {required: true})
-
-const props = defineProps<{
-  disabled: boolean
-  errorValidationFields: UI_I_ErrorValidationField[]
-}>()
-
-const emits = defineEmits<{
-  (event: 'remove-error-by-title', value: string): void
-}>()
-
-const { $store }: any = useNuxtApp()
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const numberDisplaysOptions = ref<UI_I_OptionItem[]>(
-  numberDisplaysOptionsConfig
-)
-
-const typeError = 'video_card.displays'
-
-const apiError = computed<string>(() => {
-  return (
-    props.errorValidationFields?.find((message) => message.field === typeError)
-      ?.error_message || ''
-  )
-})
-
-const onRemoveValidationError = (): void => {
-  emits('remove-error-by-title', typeError)
-}
-</script>
-
-<style scoped></style>
+<template>
+  <common-vm-actions-common-customize-hardware-virtual-hardware-video-card-number-displays-new
+    v-if="isNewView"
+    v-model:number-displays="numberDisplays"
+    :disabled="props.disabled"
+    :error-text="apiError"
+    :number-displays-options="props.numberDisplaysOptions"
+    @remove-error="onRemoveValidationError"
+  />
+  <common-vm-actions-common-customize-hardware-virtual-hardware-video-card-number-displays-old
+    v-else
+    v-model:number-displays="numberDisplays"
+    :disabled="props.disabled"
+    :error-text="apiError"
+    :number-displays-options="props.numberDisplaysOptions"
+    @remove-error="onRemoveValidationError"
+  />
+</template>
+
+<script setup lang="ts">
+import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+
+const numberDisplays = defineModel<string>('numberDisplays', { required: true })
+
+const props = defineProps<{
+  numberDisplaysOptions: UI_I_OptionItem[]
+  disabled: boolean
+  errorValidationFields: UI_I_ErrorValidationField[]
+}>()
+
+const emits = defineEmits<{
+  (event: 'remove-error-by-title', value: string): void
+}>()
+
+const { $store }: any = useNuxtApp()
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const typeError = 'video_card.displays'
+
+const apiError = computed<string>(() => {
+  return (
+    props.errorValidationFields?.find((message) => message.field === typeError)
+      ?.error_message || ''
+  )
+})
+
+const onRemoveValidationError = (): void => {
+  emits('remove-error-by-title', typeError)
+}
+</script>
+
+<style scoped></style>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.5.261",
+  "version": "1.5.262",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",

package/components/common/vm/actions/common/customizeHardware/virtualHardware/videoCard/numberDisplays/lib/config/options.ts

@@ -1,14 +0,0 @@
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-
-export const numberDisplaysOptionsConfig: UI_I_OptionItem[] = [
-  { text: '1', value: '1' },
-  { text: '2', value: '2' },
-  { text: '3', value: '3' },
-  { text: '4', value: '4' },
-  // { text: '5', value: '5' },
-  // { text: '6', value: '6' },
-  // { text: '7', value: '7' },
-  // { text: '8', value: '8' },
-  // { text: '9', value: '9' },
-  // { text: '10', value: '10' },
-]