bfg-common 1.1.82 → 1.1.83

package/models/store/vm/interfaces.ts

@@ -1,207 +1,207 @@
-import { UI_I_DatastoreTableItem } from '~/models/store/storage/interfaces'
-import { UI_I_OptionItem } from '~/components/atoms/models/interfaces'
-import {
-  UI_I_SendDataNewCdDvdDrive,
-  UI_I_SendDataNewHardDisk,
-  UI_I_SendDataNewNetwork,
-  UI_I_SendDataNewPciDevice,
-  UI_I_SendDataVideoCard,
-} from '~/components/common/vm/actions/add/customizeHardware/virtualHardware/models/interfaces'
-import { UI_I_CreateVmData } from '~/components/common/vm/actions/add/models/interfaces'
-
-export interface API_UI_I_VmEditCpu {
-  core_per_socket: number
-  hotplug: boolean
-  limit_mhz: number
-  max_vcpus: number
-  model: string
-  reservation_mhz: number
-  shares: number
-  vcpus: number
-}
-export interface API_UI_I_VmEditMemory {
-  hotplug: boolean
-  limit_mb: number
-  reservation_mb: number
-  size_mb: number
-}
-export interface API_UI_I_VmEditOptions {
-  boot_options: {
-    boot_delay_ms: number
-    boot_menu: boolean
-    firmware: string
-  }
-  guest_tools: {
-    enabled: boolean
-    synchronized_time: boolean
-  }
-  remote_console: {
-    guest_os_lock: boolean
-    keymap: string
-    limit_sessions: number
-    password: string
-    port: number
-    spice: {
-      clipboard: boolean
-      file_transfer: boolean
-      img_compression: string
-      jpeg_compression: string
-      playback_compression: boolean
-      streaming_mode: string
-      zlib_glz_compression: string
-    }
-    type: string
-  }
-}
-
-export interface UI_I_VmSettings {
-  name: string
-  storage: UI_I_DatastoreTableItem
-  guestMachineType: UI_I_OptionItem
-  guestOsFamily: UI_I_OptionItem
-  guestOsVersion: UI_I_OptionItem
-  cpuModels: UI_I_OptionItem[]
-  hardDisks: UI_I_SendDataNewHardDisk[] | null
-  cdDvdDrives: UI_I_SendDataNewCdDvdDrive[] | null
-  networks: UI_I_SendDataNewNetwork[] | null
-  videoCard: UI_I_SendDataVideoCard
-  pciDevices: UI_I_SendDataNewPciDevice[] | null
-  usbController: string
-  maxCpus: number
-  maxMemory: number
-  uuid: string
-  compatibility: string
-  options: API_UI_I_VmEditOptions
-  cpu: API_UI_I_VmEditCpu
-  memory: API_UI_I_VmEditMemory
-}
-
-export interface UI_I_CreateVmPayload {
-  start: boolean
-  pvm: UI_I_CreateVmData
-  location?: string // для сферы
-  compute_resource?: string // для сферы
-}
-
-export interface UI_I_EditVmPayload {
-  vmId: string
-  body: UI_I_CreateVmData
-}
-
-export interface API_UI_I_VmReadyToCompleteCpu {
-  core_per_socket: number
-  hotplug: number
-  limit_mhz: number
-  max_vcpus: number
-  model: string
-  reservation_mhz: number
-  shares: number
-  vcpus: number
-}
-export interface API_UI_I_VmReadyToCompleteDiskDevices {
-  boot_order: number
-  bus: string
-  cache: string
-  create: boolean
-  device_type: string
-  discard: string
-  disk_mode: string
-  io: string
-  limit_iops: number
-  provision_type: string
-  read_only: boolean
-  shares: number
-  sharing: boolean
-  size: number
-  source: string
-  storage_id: string
-  target: string
-}
-export interface API_UI_I_VmReadyToCompleteInputDevices {
-  bus: string
-  type: string
-}
-export interface API_UI_I_VmReadyToCompleteMemory {
-  hotplug: boolean
-  limit_mb: number
-  reservation_mb: number
-  size_mb: number
-}
-export interface API_UI_I_VmReadyToCompleteNetworkDevices {
-  boot_order: number
-  mac: string
-  model: string
-  net_bridge: string
-  network: string
-  target: string
-}
-export interface API_UI_I_VmReadyToCompleteOptions {
-  boot_options: {
-    boot_delay_ms: number
-    boot_menu: boolean
-    firmware: string
-  }
-  guest_tools: {
-    enabled: boolean
-    synchronized_time: boolean
-  }
-  remote_console: {
-    guest_os_lock: boolean
-    keymap: string
-    limit_sessions: number
-    password: string
-    port: number
-    type: string
-    spice: {
-      clipboard: boolean
-      file_transfer: boolean
-      img_compression: string
-      jpeg_compression: string
-      playback_compression: boolean
-      streaming_mode: string
-      zlib_glz_compression: string
-    }
-  }
-  id: string
-}
-export interface API_UI_I_VmReadyToCompleteStorage {
-  folder: string
-  id: string
-}
-export interface API_UI_I_VmReadyToCompleteUsbController {
-  type: number
-}
-export interface API_UI_I_VmReadyToCompleteVideoCard {
-  adapter: string
-  displays: number
-  memory_mb: number
-}
-export interface API_UI_I_VmReadyToCompletePciDevice {
-  id: string
-  class_name: string
-  device_name: string
-  vendor_name: string
-}
-export interface API_UI_I_VmReadyToComplete {
-  message: string
-  vm_desc: {
-    compatibility: string
-    deployment_name: string
-    guest_os_family: string
-    guest_os_version: string
-    machine_type: string
-    name: string
-    uuid: string
-    cpu: API_UI_I_VmReadyToCompleteCpu
-    disk_devices: API_UI_I_VmReadyToCompleteDiskDevices[]
-    input_devices: API_UI_I_VmReadyToCompleteInputDevices[]
-    memory: API_UI_I_VmReadyToCompleteMemory
-    monitoring: any
-    network_devices: API_UI_I_VmReadyToCompleteNetworkDevices[]
-    options: API_UI_I_VmReadyToCompleteOptions
-    storage: API_UI_I_VmReadyToCompleteStorage
-    usb_controllers: API_UI_I_VmReadyToCompleteUsbController[]
-    video_card: API_UI_I_VmReadyToCompleteVideoCard
-    pci_pt_devices: API_UI_I_VmReadyToCompletePciDevice[]
-  }
-}
+import { UI_I_DatastoreTableItem } from '~/models/store/storage/interfaces'
+import { UI_I_OptionItem } from '~/components/atoms/models/interfaces'
+import {
+  UI_I_SendDataNewCdDvdDrive,
+  UI_I_SendDataNewHardDisk,
+  UI_I_SendDataNewNetwork,
+  UI_I_SendDataNewPciDevice,
+  UI_I_SendDataVideoCard,
+} from '~/components/common/vm/actions/add/customizeHardware/virtualHardware/models/interfaces'
+import { UI_I_CreateVmData } from '~/components/common/vm/actions/add/models/interfaces'
+
+export interface API_UI_I_VmEditCpu {
+  core_per_socket: number
+  hotplug: boolean
+  limit_mhz: number
+  max_vcpus: number
+  model: string
+  reservation_mhz: number
+  shares: number
+  vcpus: number
+}
+export interface API_UI_I_VmEditMemory {
+  hotplug: boolean
+  limit_mb: number
+  reservation_mb: number
+  size_mb: number
+}
+export interface API_UI_I_VmEditOptions {
+  boot_options: {
+    boot_delay_ms: number
+    boot_menu: boolean
+    firmware: string
+  }
+  guest_tools: {
+    enabled: boolean
+    synchronized_time: boolean
+  }
+  remote_console: {
+    guest_os_lock: boolean
+    keymap: string
+    limit_sessions: number
+    password: string
+    port: number
+    spice: {
+      clipboard: boolean
+      file_transfer: boolean
+      img_compression: string
+      jpeg_compression: string
+      playback_compression: boolean
+      streaming_mode: string
+      zlib_glz_compression: string
+    }
+    type: string
+  }
+}
+
+export interface UI_I_VmSettings {
+  name: string
+  storage: UI_I_DatastoreTableItem
+  guestMachineType: UI_I_OptionItem
+  guestOsFamily: UI_I_OptionItem
+  guestOsVersion: UI_I_OptionItem
+  cpuModels: UI_I_OptionItem[]
+  hardDisks: UI_I_SendDataNewHardDisk[] | null
+  cdDvdDrives: UI_I_SendDataNewCdDvdDrive[] | null
+  networks: UI_I_SendDataNewNetwork[] | null
+  videoCard: UI_I_SendDataVideoCard
+  pciDevices: UI_I_SendDataNewPciDevice[] | null
+  usbController: string
+  maxCpus: number
+  maxMemory: number
+  uuid: string
+  compatibility: string
+  options: API_UI_I_VmEditOptions
+  cpu: API_UI_I_VmEditCpu
+  memory: API_UI_I_VmEditMemory
+}
+
+export interface UI_I_CreateVmPayload {
+  start: boolean
+  pvm: UI_I_CreateVmData
+  location?: string // для сферы
+  compute_resource?: string // для сферы
+}
+
+export interface UI_I_EditVmPayload {
+  vmId: string
+  body: UI_I_CreateVmData
+}
+
+export interface API_UI_I_VmReadyToCompleteCpu {
+  core_per_socket: number
+  hotplug: number
+  limit_mhz: number
+  max_vcpus: number
+  model: string
+  reservation_mhz: number
+  shares: number
+  vcpus: number
+}
+export interface API_UI_I_VmReadyToCompleteDiskDevices {
+  boot_order: number
+  bus: string
+  cache: string
+  create: boolean
+  device_type: string
+  discard: string
+  disk_mode: string
+  io: string
+  limit_iops: number
+  provision_type: string
+  read_only: boolean
+  shares: number
+  sharing: boolean
+  size: number
+  source: string
+  storage_id: string
+  target: string
+}
+export interface API_UI_I_VmReadyToCompleteInputDevices {
+  bus: string
+  type: string
+}
+export interface API_UI_I_VmReadyToCompleteMemory {
+  hotplug: boolean
+  limit_mb: number
+  reservation_mb: number
+  size_mb: number
+}
+export interface API_UI_I_VmReadyToCompleteNetworkDevices {
+  boot_order: number
+  mac: string
+  model: string
+  net_bridge: string
+  network: string
+  target: string
+}
+export interface API_UI_I_VmReadyToCompleteOptions {
+  boot_options: {
+    boot_delay_ms: number
+    boot_menu: boolean
+    firmware: string
+  }
+  guest_tools: {
+    enabled: boolean
+    synchronized_time: boolean
+  }
+  remote_console: {
+    guest_os_lock: boolean
+    keymap: string
+    limit_sessions: number
+    password: string
+    port: number
+    type: string
+    spice: {
+      clipboard: boolean
+      file_transfer: boolean
+      img_compression: string
+      jpeg_compression: string
+      playback_compression: boolean
+      streaming_mode: string
+      zlib_glz_compression: string
+    }
+  }
+  id: string
+}
+export interface API_UI_I_VmReadyToCompleteStorage {
+  folder: string
+  id: string
+}
+export interface API_UI_I_VmReadyToCompleteUsbController {
+  type: number
+}
+export interface API_UI_I_VmReadyToCompleteVideoCard {
+  adapter: string
+  displays: number
+  memory_mb: number
+}
+export interface API_UI_I_VmReadyToCompletePciDevice {
+  id: string
+  class_name: string
+  device_name: string
+  vendor_name: string
+}
+export interface API_UI_I_VmReadyToComplete {
+  message: string
+  vm_desc: {
+    compatibility: string
+    deployment_name: string
+    guest_os_family: string
+    guest_os_version: string
+    machine_type: string
+    name: string
+    uuid: string
+    cpu: API_UI_I_VmReadyToCompleteCpu
+    disk_devices: API_UI_I_VmReadyToCompleteDiskDevices[]
+    input_devices: API_UI_I_VmReadyToCompleteInputDevices[]
+    memory: API_UI_I_VmReadyToCompleteMemory
+    monitoring: any
+    network_devices: API_UI_I_VmReadyToCompleteNetworkDevices[]
+    options: API_UI_I_VmReadyToCompleteOptions
+    storage: API_UI_I_VmReadyToCompleteStorage
+    usb_controllers: API_UI_I_VmReadyToCompleteUsbController[]
+    video_card: API_UI_I_VmReadyToCompleteVideoCard
+    pci_pt_devices: API_UI_I_VmReadyToCompletePciDevice[]
+  }
+}

package/models/types.ts

@@ -1,6 +1,6 @@
-export type UI_T_Project = 'sphere' | 'procurator'
-
-export type UI_T_Schema = 'short' | 'ui' | 'full'
-
-export type UI_T_Binary = 'KB' | 'MB' | 'GB' | 'TB' | 'PB' | 'EB' | 'ZB' | 'YB'
-export type UI_T_BinaryLower = 'kb' | 'mb' | 'gb' | 'tb' | 'pb' | 'eb' | 'zb' | 'yb'
+export type UI_T_Project = 'sphere' | 'procurator'
+
+export type UI_T_Schema = 'short' | 'ui' | 'full'
+
+export type UI_T_Binary = 'KB' | 'MB' | 'GB' | 'TB' | 'PB' | 'EB' | 'ZB' | 'YB'
+export type UI_T_BinaryLower = 'kb' | 'mb' | 'gb' | 'tb' | 'pb' | 'eb' | 'zb' | 'yb'

package/modules/fixContentBuild/index.ts

@@ -1,92 +1,92 @@
-import { defineNuxtModule } from '@nuxt/kit'
-const fs = require('fs')
-const path = require('path')
-import {
-  replaceFileContent,
-  removeNonImageFiles,
-  removeImagesFromContent,
-  updateImagesPathAndCustomComponents,
-} from './utils/methods'
-
-// const npmDev = (): void => {
-//   const contentPath = path.join(
-//     __dirname.replace('/node_modules/bfg-common/modules/fixContentBuild', ''),
-//     'content',
-//     'help'
-//   )
-//   // Заменяем кастомные тэги
-//   updateCustomComponents(contentPath)
-// }
-
-const npmGenerate = (): void => {
-  // Правим путь к файлу
-  const filePath = path.join(
-    __dirname.replace('/bfg-common/modules/fixContentBuild', ''),
-    '@nuxt',
-    'content',
-    'dist',
-    'runtime',
-    'legacy',
-    'composables',
-    'query.js'
-  )
-  const searchString = '/query/${hash(params)}'
-  const replacementString = 'cache'
-  replaceFileContent(filePath, searchString, replacementString)
-  // End block
-
-  // Переносим весь контент и удаляем все файлы кроме картинок
-  const contentPath = path.join(
-    __dirname.replace('/node_modules/bfg-common/modules/fixContentBuild', ''),
-    'content',
-    'help'
-  )
-  if (!fs.existsSync(contentPath)) return
-
-  const publicPath = path.join(
-    __dirname.replace('/node_modules/bfg-common/modules/fixContentBuild', ''),
-    'public',
-    'help',
-    'images'
-  )
-  fs.cp(contentPath, publicPath, { recursive: true }, () => {
-    // Удаляем все файлы кроме картинок
-    removeNonImageFiles(publicPath)
-
-    // Удаляем картинки из папки content
-    removeImagesFromContent(contentPath)
-
-    // Правим путь к картинкам и заменяем кастомные тэги
-    updateImagesPathAndCustomComponents(contentPath)
-  })
-  // End block
-}
-
-// @ts-ignore
-export default defineNuxtModule(() => {
-  switch (process.env.npm_command) {
-    case 'run-script':
-      // npmDev()
-      break
-    case 'exec':
-      npmGenerate()
-      break
-  }
-})
-
-// export default defineNuxtModule({
-//   meta: {
-//     name: 'fix-content-build',
-//     configKey: 'fixContentBuild',
-//   },
-//   setup() {
-//     switch (process.env.npm_command) {
-//       case 'run-script':
-//         // npmDev()
-//         break
-//       case 'exec':
-//         npmGenerate()
-//         break
-//     }
-//   },
-// })
+import { defineNuxtModule } from '@nuxt/kit'
+const fs = require('fs')
+const path = require('path')
+import {
+  replaceFileContent,
+  removeNonImageFiles,
+  removeImagesFromContent,
+  updateImagesPathAndCustomComponents,
+} from './utils/methods'
+
+// const npmDev = (): void => {
+//   const contentPath = path.join(
+//     __dirname.replace('/node_modules/bfg-common/modules/fixContentBuild', ''),
+//     'content',
+//     'help'
+//   )
+//   // Заменяем кастомные тэги
+//   updateCustomComponents(contentPath)
+// }
+
+const npmGenerate = (): void => {
+  // Правим путь к файлу
+  const filePath = path.join(
+    __dirname.replace('/bfg-common/modules/fixContentBuild', ''),
+    '@nuxt',
+    'content',
+    'dist',
+    'runtime',
+    'legacy',
+    'composables',
+    'query.js'
+  )
+  const searchString = '/query/${hash(params)}'
+  const replacementString = 'cache'
+  replaceFileContent(filePath, searchString, replacementString)
+  // End block
+
+  // Переносим весь контент и удаляем все файлы кроме картинок
+  const contentPath = path.join(
+    __dirname.replace('/node_modules/bfg-common/modules/fixContentBuild', ''),
+    'content',
+    'help'
+  )
+  if (!fs.existsSync(contentPath)) return
+
+  const publicPath = path.join(
+    __dirname.replace('/node_modules/bfg-common/modules/fixContentBuild', ''),
+    'public',
+    'help',
+    'images'
+  )
+  fs.cp(contentPath, publicPath, { recursive: true }, () => {
+    // Удаляем все файлы кроме картинок
+    removeNonImageFiles(publicPath)
+
+    // Удаляем картинки из папки content
+    removeImagesFromContent(contentPath)
+
+    // Правим путь к картинкам и заменяем кастомные тэги
+    updateImagesPathAndCustomComponents(contentPath)
+  })
+  // End block
+}
+
+// @ts-ignore
+export default defineNuxtModule(() => {
+  switch (process.env.npm_command) {
+    case 'run-script':
+      // npmDev()
+      break
+    case 'exec':
+      npmGenerate()
+      break
+  }
+})
+
+// export default defineNuxtModule({
+//   meta: {
+//     name: 'fix-content-build',
+//     configKey: 'fixContentBuild',
+//   },
+//   setup() {
+//     switch (process.env.npm_command) {
+//       case 'run-script':
+//         // npmDev()
+//         break
+//       case 'exec':
+//         npmGenerate()
+//         break
+//     }
+//   },
+// })