bfg-common 1.4.736 → 1.4.737

package/components/common/vm/actions/common/select/storage/StorageOld.vue

@@ -1,129 +1,129 @@
-<template>
-  <div class="select-storage">
-    <atoms-alert
-      v-show="props.errors.length"
-      status="alert-danger"
-      test-id="storage-alert"
-      :items="props.errors"
-      @remove="emits('remove-error')"
-    />
-    <div class="table-wrap">
-      <atoms-table-data-grid
-        v-model:selected-row="selectedRow"
-        v-model:column-keys="columnKeys"
-        v-model:page-size="pagination.pageSize"
-        v-model:page="pagination.page"
-        type="radio"
-        test-id="storage-table"
-        :head-items="headItems"
-        :body-items="bodyItems"
-        :total-items="bodyItems.length"
-        :total-pages="1"
-        server-off
-        hide-page-size
-        @change="emits('change-storage', $event)"
-      >
-        <template #icon="{ item }">
-          <span :class="['datagrid-cell-icon', item.data]" />
-          <span class="text-ellipsis">
-            {{ item.text }}
-          </span>
-        </template>
-      </atoms-table-data-grid>
-    </div>
-
-    <div v-if="!props.hideCompatibility" class="compatibility-wrap">
-      <p class="compatibility">
-        {{ localization.inventorySummary.compatibility }}
-      </p>
-      <div class="compatibility-message flex-align-center">
-        <template v-if="props.selectedStorage">
-          <div class="icon-status-ok" />
-          <span>{{ localization.common.compatibilityChecksSucceeded }}</span>
-        </template>
-        <div v-else>
-          <br />
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import type {
-  UI_I_Pagination,
-  UI_I_TablePayload,
-} from '~/lib/models/table/interfaces'
-import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type {
-  UI_I_ColumnKey,
-  UI_I_HeadItem,
-  UI_I_BodyItem,
-} from '~/components/atoms/table/dataGrid/lib/models/interfaces'
-import * as table from '~/components/common/vm/actions/common/select/storage/lib/config/config'
-
-const selectedRow = defineModel<number | null>('selectedRow')
-const pagination = defineModel<UI_I_Pagination>('pagination', {
-  required: true,
-})
-
-const props = defineProps<{
-  datastore: UI_I_DatastoreTableItem[]
-  getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
-  errors: string[]
-  selectedStorage: UI_I_DatastoreTableItem | null
-  hideCompatibility?: boolean
-}>()
-const emits = defineEmits<{
-  (event: 'remove-error'): void
-  (event: 'change-storage', value: number): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const headItems = ref<UI_I_HeadItem[]>(table.headItems(localization.value))
-const columnKeys = ref<UI_I_ColumnKey[]>(table.columnKeys(localization.value))
-watch(localization, () => {
-  columnKeys.value = table.columnKeys(localization.value)
-})
-
-const bodyItems = computed<UI_I_BodyItem[][]>(() => {
-  return table.bodyItems(props.datastore || [], localization.value)
-})
-</script>
-
-<style scoped lang="scss">
-.select-storage {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-
-  .table-wrap {
-    flex: 1;
-
-    .datagrid-cell-icon {
-      margin-right: 6px;
-    }
-
-    :deep(.relative) {
-      height: 100%;
-
-      .datagrid-outer-wrapper {
-        height: 100%;
-      }
-    }
-  }
-
-  .compatibility-wrap {
-    padding-top: 10px;
-
-    .compatibility-message {
-      border: 1px solid #000;
-      padding-top: 5px;
-      padding-left: 5px;
-      overflow: auto;
-    }
-  }
-}
-</style>
+<template>
+  <div class="select-storage">
+    <atoms-alert
+      v-show="props.errors.length"
+      status="alert-danger"
+      test-id="storage-alert"
+      :items="props.errors"
+      @remove="emits('remove-error')"
+    />
+    <div class="table-wrap">
+      <atoms-table-data-grid
+        v-model:selected-row="selectedRow"
+        v-model:column-keys="columnKeys"
+        v-model:page-size="pagination.pageSize"
+        v-model:page="pagination.page"
+        type="radio"
+        test-id="storage-table"
+        :head-items="headItems"
+        :body-items="bodyItems"
+        :total-items="bodyItems.length"
+        :total-pages="1"
+        server-off
+        hide-page-size
+        @change="emits('change-storage', $event)"
+      >
+        <template #icon="{ item }">
+          <span :class="['datagrid-cell-icon', item.data]" />
+          <span class="text-ellipsis">
+            {{ item.text }}
+          </span>
+        </template>
+      </atoms-table-data-grid>
+    </div>
+
+    <div v-if="!props.hideCompatibility" class="compatibility-wrap">
+      <p class="compatibility">
+        {{ localization.inventorySummary.compatibility }}
+      </p>
+      <div class="compatibility-message flex-align-center">
+        <template v-if="props.selectedStorage">
+          <div class="icon-status-ok" />
+          <span>{{ localization.common.compatibilityChecksSucceeded }}</span>
+        </template>
+        <div v-else>
+          <br />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type {
+  UI_I_Pagination,
+  UI_I_TablePayload,
+} from '~/lib/models/table/interfaces'
+import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type {
+  UI_I_ColumnKey,
+  UI_I_HeadItem,
+  UI_I_BodyItem,
+} from '~/components/atoms/table/dataGrid/lib/models/interfaces'
+import * as table from '~/components/common/vm/actions/common/select/storage/lib/config/config'
+
+const selectedRow = defineModel<number | null>('selectedRow')
+const pagination = defineModel<UI_I_Pagination>('pagination', {
+  required: true,
+})
+
+const props = defineProps<{
+  datastore: UI_I_DatastoreTableItem[]
+  getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
+  errors: string[]
+  selectedStorage: UI_I_DatastoreTableItem | null
+  hideCompatibility?: boolean
+}>()
+const emits = defineEmits<{
+  (event: 'remove-error'): void
+  (event: 'change-storage', value: number): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const headItems = ref<UI_I_HeadItem[]>(table.headItems(localization.value))
+const columnKeys = ref<UI_I_ColumnKey[]>(table.columnKeys(localization.value))
+watch(localization, () => {
+  columnKeys.value = table.columnKeys(localization.value)
+})
+
+const bodyItems = computed<UI_I_BodyItem[][]>(() => {
+  return table.bodyItems(props.datastore || [], localization.value)
+})
+</script>
+
+<style scoped lang="scss">
+.select-storage {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+
+  .table-wrap {
+    flex: 1;
+
+    .datagrid-cell-icon {
+      margin-right: 6px;
+    }
+
+    :deep(.relative) {
+      height: 100%;
+
+      .datagrid-outer-wrapper {
+        height: 100%;
+      }
+    }
+  }
+
+  .compatibility-wrap {
+    padding-top: 10px;
+
+    .compatibility-message {
+      border: 1px solid #000;
+      padding-top: 5px;
+      padding-left: 5px;
+      overflow: auto;
+    }
+  }
+}
+</style>

package/components/common/vm/actions/editSettings/EditSettings.vue

@@ -74,6 +74,7 @@ import type { UI_T_Project } from '~/lib/models/types'
 import type { UI_I_FileTreeNode } from '~/components/lib/models/interfaces'
 import type { UI_I_NetworkTableItem } from '~/lib/models/store/network/interfaces'
 import type {
+  UI_I_MediatedDevice,
   UI_I_PciDevice,
   UI_I_VmSettings,
 } from '~/lib/models/store/vm/interfaces'
@@ -113,7 +114,7 @@ const props = defineProps<{
   getDatastoreTableFunc?: (payload: UI_I_TablePayload) => Promise<void>
   state?: string | number
   passthroughDevices?: UI_I_PciDevice[]
-  mediatedDevices?: any[]
+  mediatedDevices?: UI_I_MediatedDevice[]
   capabilities?: UI_I_Capabilities
 }>()
 

package/components/common/vm/actions/editSettings/new/Skeleton.vue

@@ -1,88 +1,88 @@
-<template>
-  <div class="skeleton-wrap">
-    <div class="tabs">
-      <ui-skeleton-item width="64px" height="16px" />
-      <ui-skeleton-item width="64px" height="16px" />
-    </div>
-    <div class="actions">
-      <ui-skeleton-item width="80px" height="16px" />
-      <ui-skeleton-item width="152px" height="32px" border-radius="6px" />
-    </div>
-    <div class="stack-block-wrap">
-      <div class="stack-block">
-        <div class="stack-label flex-1">
-          <ui-skeleton-item width="16px" height="16px" border-radius="50%" />
-          <ui-skeleton-item height="16px" />
-        </div>
-        <div class="stack-value flex-1">
-          <ui-skeleton-item width="102px" height="32px" border-radius="8px" />
-        </div>
-      </div>
-
-      <div v-for="item in 2" :key="item" class="stack-block">
-        <div class="stack-label flex-1">
-          <ui-skeleton-item width="16px" height="16px" border-radius="50%" />
-          <ui-skeleton-item height="16px" />
-        </div>
-        <div class="stack-value flex-1">
-          <ui-skeleton-item width="102px" height="32px" border-radius="8px" />
-          <ui-skeleton-item width="80px" height="32px" border-radius="8px" />
-        </div>
-      </div>
-
-      <div v-for="item in 5" :key="item" class="stack-block">
-        <div class="stack-label flex-1">
-          <ui-skeleton-item width="16px" height="16px" border-radius="50%" />
-          <ui-skeleton-item height="16px" />
-        </div>
-        <div class="stack-value flex-1">
-          <ui-skeleton-item width="196px" height="32px" border-radius="8px" />
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts"></script>
-
-<style scoped lang="scss">
-.skeleton-wrap {
-  padding: 0 32px;
-
-  .tabs {
-    display: flex;
-    align-items: center;
-    gap: 56px;
-    padding-bottom: 12px;
-    border-bottom: 1px solid var(--divider-color);
-  }
-
-  .actions {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin: 12px 0;
-  }
-
-  .stack-block-wrap {
-    display: grid;
-    grid-gap: 12px;
-
-    .stack-block {
-      display: flex;
-      align-items: center;
-      gap: 8px;
-      padding: 8px 12px;
-      background: var(--stack-block-bg-color);
-      border-radius: 6px;
-
-      .stack-label,
-      .stack-value {
-        display: flex;
-        align-items: center;
-        gap: 8px;
-      }
-    }
-  }
-}
-</style>
+<template>
+  <div class="skeleton-wrap">
+    <div class="tabs">
+      <ui-skeleton-item width="64px" height="16px" />
+      <ui-skeleton-item width="64px" height="16px" />
+    </div>
+    <div class="actions">
+      <ui-skeleton-item width="80px" height="16px" />
+      <ui-skeleton-item width="152px" height="32px" border-radius="6px" />
+    </div>
+    <div class="stack-block-wrap">
+      <div class="stack-block">
+        <div class="stack-label flex-1">
+          <ui-skeleton-item width="16px" height="16px" border-radius="50%" />
+          <ui-skeleton-item height="16px" />
+        </div>
+        <div class="stack-value flex-1">
+          <ui-skeleton-item width="102px" height="32px" border-radius="8px" />
+        </div>
+      </div>
+
+      <div v-for="item in 2" :key="item" class="stack-block">
+        <div class="stack-label flex-1">
+          <ui-skeleton-item width="16px" height="16px" border-radius="50%" />
+          <ui-skeleton-item height="16px" />
+        </div>
+        <div class="stack-value flex-1">
+          <ui-skeleton-item width="102px" height="32px" border-radius="8px" />
+          <ui-skeleton-item width="80px" height="32px" border-radius="8px" />
+        </div>
+      </div>
+
+      <div v-for="item in 5" :key="item" class="stack-block">
+        <div class="stack-label flex-1">
+          <ui-skeleton-item width="16px" height="16px" border-radius="50%" />
+          <ui-skeleton-item height="16px" />
+        </div>
+        <div class="stack-value flex-1">
+          <ui-skeleton-item width="196px" height="32px" border-radius="8px" />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts"></script>
+
+<style scoped lang="scss">
+.skeleton-wrap {
+  padding: 0 32px;
+
+  .tabs {
+    display: flex;
+    align-items: center;
+    gap: 56px;
+    padding-bottom: 12px;
+    border-bottom: 1px solid var(--divider-color);
+  }
+
+  .actions {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin: 12px 0;
+  }
+
+  .stack-block-wrap {
+    display: grid;
+    grid-gap: 12px;
+
+    .stack-block {
+      display: flex;
+      align-items: center;
+      gap: 8px;
+      padding: 8px 12px;
+      background: var(--stack-block-bg-color);
+      border-radius: 6px;
+
+      .stack-label,
+      .stack-value {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+      }
+    }
+  }
+}
+</style>

package/composables/productNameLocal.ts

@@ -1,30 +1,30 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_T_LanguageKey } from '~/lib/models/types'
-
-export function productNameLocal(
-  localization: UI_I_Localization
-): UI_I_Localization {
-  const config = useRuntimeConfig()
-
-  const productName =
-    config.public.LOCALIZATION_CODE === 'ru'
-      ? config.public.PRODUCT_NAME_RU
-      : config.public.PRODUCT_NAME_EN
-
-  return replaceProductNameRecursion(localization, productName)
-}
-
-const replaceProductNameRecursion = (
-  localization: UI_I_Localization,
-  productName: any
-): UI_I_Localization => {
-  for (const key of Object.keys(localization)) {
-    let item = localization[key as UI_T_LanguageKey]
-
-    for (const key2 of Object.keys(item)) {
-      item[key2] = item[key2].replaceAll('{productName}', productName)
-    }
-  }
-
-  return localization
-}
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_T_LanguageKey } from '~/lib/models/types'
+
+export function productNameLocal(
+  localization: UI_I_Localization
+): UI_I_Localization {
+  const config = useRuntimeConfig()
+
+  const productName =
+    config.public.LOCALIZATION_CODE === 'ru'
+      ? config.public.PRODUCT_NAME_RU
+      : config.public.PRODUCT_NAME_EN
+
+  return replaceProductNameRecursion(localization, productName)
+}
+
+const replaceProductNameRecursion = (
+  localization: UI_I_Localization,
+  productName: any
+): UI_I_Localization => {
+  for (const key of Object.keys(localization)) {
+    let item = localization[key as UI_T_LanguageKey]
+
+    for (const key2 of Object.keys(item)) {
+      item[key2] = item[key2].replaceAll('{productName}', productName)
+    }
+  }
+
+  return localization
+}

package/composables/useAppVersion.ts

@@ -1,21 +1,21 @@
-import type { UI_I_UseAppVersionReturnType } from '~/lib/models/composables/useAppVersion/interfaces'
-
-export function useAppVersion(): UI_I_UseAppVersionReturnType {
-  const config = useRuntimeConfig()
-  const version = config.public.APP_VERSION as string
-
-  // const regexHasDot = /\./
-  // const regexHasDotAndB = /\.\d*b$/
-  // const regexHasDotAndD = /\..*d/
-
-  // const isBeta = regexHasDotAndB.test(version)
-  // const isDev =
-  //   regexHasDotAndD.test(version) ||
-  //   (!regexHasDot.test(version) && version.length < 8)
-
-  return {
-    version,
-    // isBeta,
-    // isDev,
-  }
-}
+import type { UI_I_UseAppVersionReturnType } from '~/lib/models/composables/useAppVersion/interfaces'
+
+export function useAppVersion(): UI_I_UseAppVersionReturnType {
+  const config = useRuntimeConfig()
+  const version = config.public.APP_VERSION as string
+
+  // const regexHasDot = /\./
+  // const regexHasDotAndB = /\.\d*b$/
+  // const regexHasDotAndD = /\..*d/
+
+  // const isBeta = regexHasDotAndB.test(version)
+  // const isDev =
+  //   regexHasDotAndD.test(version) ||
+  //   (!regexHasDot.test(version) && version.length < 8)
+
+  return {
+    version,
+    // isBeta,
+    // isDev,
+  }
+}

package/lib/models/store/vm/interfaces.ts

@@ -215,6 +215,17 @@ export interface API_UI_I_PciDevice {
   vendor_name: string
 }
 export interface UI_I_PciDevice extends API_UI_I_PciDevice {}
+export interface UI_I_MediatedDevice {
+  available_instances: number
+  framebuffer: string
+  heads: number
+  human_readable: string
+  max_instance: number
+  max_resolution: string
+  name: string
+  profile_name: string
+  root_device: string
+}
 
 export interface API_UI_I_VmReadyToComplete {
   message: string

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.4.736",
+  "version": "1.4.737",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",
@@ -34,8 +34,8 @@
     "@nuxtjs/eslint-config-typescript": "^12.0.0",
     "@vueuse/components": "^10.1.2",
     "date-fns": "^2.29.3",
-    "bfg-nuxt-3-graph": "1.0.17",
-    "bfg-uikit": "1.0.313",
+    "bfg-nuxt-3-graph": "1.0.15",
+    "bfg-uikit": "1.0.301",
     "html2canvas": "^1.4.1",
     "prettier-eslint": "^15.0.1"
   }