bfg-common 1.2.41 → 1.2.43

package/components/common/diagramMain/modals/config/portModal.ts

@@ -2,7 +2,7 @@ import { UI_I_Localization } from '~/models/interfaces'
 import { UI_I_ModalsInitialData } from '~/components/common/diagramMain/models/interfaces'
 
 export const portViewSettingsModalTabsFunc = (
-    localization: UI_I_Localization
+  localization: UI_I_Localization
 ) => [
   {
     text: localization.all,
@@ -19,31 +19,31 @@ export const portViewSettingsModalTabsFunc = (
 ]
 
 export const portViewSettingsFunc = (
-    localization: UI_I_Localization,
-    initialData: UI_I_ModalsInitialData
+  localization: UI_I_Localization,
+  initialData: UI_I_ModalsInitialData
 ) => {
   let enabledServices = ''
   initialData.services?.vMotion &&
-  (enabledServices += localization.vMotion + '\n')
+    (enabledServices += localization.vMotion + '\n')
   initialData.services?.provisioning &&
-  (enabledServices += localization.provisioning + '\n')
+    (enabledServices += localization.provisioning + '\n')
   initialData.services?.faultToleranceLogging &&
-  (enabledServices += localization.faultToleranceLogging + '\n')
+    (enabledServices += localization.faultToleranceLogging + '\n')
   initialData.services?.faultToleranceLogging &&
-  (enabledServices += localization.faultToleranceLogging + '\n')
+    (enabledServices += localization.faultToleranceLogging + '\n')
   initialData.services?.management &&
-  (enabledServices += localization.management + '\n')
+    (enabledServices += localization.management + '\n')
   initialData.services?.replication &&
-  (enabledServices += localization.procuratorReplication + '\n')
+    (enabledServices += localization.procuratorReplication + '\n')
   initialData.services?.replicationNFC &&
-  (enabledServices += localization.procuratorReplicationNFC + '\n')
+    (enabledServices += localization.procuratorReplicationNFC + '\n')
   initialData.services?.vSAN && (enabledServices += localization.vSAN + '\n')
   initialData.services?.backupNFC &&
-  (enabledServices += localization.procuratorBackupNFC + '\n')
+    (enabledServices += localization.procuratorBackupNFC + '\n')
   initialData.services?.nVMeOverTCP &&
-  (enabledServices += localization.nvmEOverTCP + '\n')
+    (enabledServices += localization.nvmEOverTCP + '\n')
   initialData.services?.nVMeOverRDMA &&
-  (enabledServices += localization.nvmEOverRDMA + '\n')
+    (enabledServices += localization.nvmEOverRDMA + '\n')
   return [
     {
       title: localization.portProperties,
@@ -73,36 +73,36 @@ export const portViewSettingsFunc = (
       id: 2,
       type: 2,
       rows:
-          initialData.tcpConfig?.ipv4Settings === '0'
-              ? [
-                {
-                  name: localization.dhcp,
-                  value: localization.enabled,
-                },
-              ]
-              : [
-                {
-                  name: localization.dhcp,
-                  value: localization.disabled,
-                },
-                {
-                  name: localization.ipv4address,
-                  value: initialData.tcpConfig?.ipv4Address,
-                  // (${localization.static})
-                },
-                {
-                  name: localization.subnetMask,
-                  value: initialData.tcpConfig?.subnetMask,
-                },
-                {
-                  name: localization.defaultGateway,
-                  value: initialData.tcpConfig?.defaultGateway?.value,
-                },
-                {
-                  name: localization.dnsServerAddresses,
-                  value: ['--'],
-                },
-              ],
+        initialData.tcpConfig?.ipv4Settings === '0'
+          ? [
+              {
+                name: localization.dhcp,
+                value: localization.enabled,
+              },
+            ]
+          : [
+              {
+                name: localization.dhcp,
+                value: localization.disabled,
+              },
+              {
+                name: localization.ipv4address,
+                value: initialData.tcpConfig?.ipv4Address,
+                // (${localization.static})
+              },
+              {
+                name: localization.subnetMask,
+                value: initialData.tcpConfig?.subnetMask,
+              },
+              {
+                name: localization.defaultGateway,
+                value: initialData.tcpConfig?.defaultGateway?.value,
+              },
+              {
+                name: localization.dnsServerAddresses,
+                value: ['--'],
+              },
+            ],
     },
     // {
     //   title: localization.ipV6Settings,
@@ -175,26 +175,29 @@ export const portPopupFieldsFunc = (localization: UI_I_Localization) => [
 ]
 
 export const portPropertiesEnabledServicesFunc = (
-    localization: UI_I_Localization
+  localization: UI_I_Localization
 ) => [
+  // {
+  //   label: localization.vMotion,
+  //   modelValue: 'vMotion',
+  // },
   {
     mainLabel: localization.enabledServices,
-    label: localization.vMotion,
-    modelValue: 'vMotion',
-  },
-  { label: localization.provisioning, modelValue: 'provisioning' },
-  {
-    label: localization.faultToleranceLogging,
-    modelValue: 'faultToleranceLogging',
+    label: localization.provisioning,
+    modelValue: 'provisioning',
   },
+  // {
+  //   label: localization.faultToleranceLogging,
+  //   modelValue: 'faultToleranceLogging',
+  // },
   { label: localization.management, modelValue: 'management' },
-  { label: localization.procuratorReplication, modelValue: 'replication' },
-  {
-    label: localization.procuratorReplicationNFC,
-    modelValue: 'replicationNFC',
-  },
+  // { label: localization.procuratorReplication, modelValue: 'replication' },
+  // {
+  //   label: localization.procuratorReplicationNFC,
+  //   modelValue: 'replicationNFC',
+  // },
   { label: localization.vSAN, modelValue: 'vSAN' },
-  { label: localization.procuratorBackupNFC, modelValue: 'backupNFC' },
-  { label: localization.nvmEOverTCP, modelValue: 'nVMeOverTCP' },
-  { label: localization.nvmEOverRDMA, modelValue: 'nVMeOverRDMA' },
+  // { label: localization.procuratorBackupNFC, modelValue: 'backupNFC' },
+  // { label: localization.nvmEOverTCP, modelValue: 'nVMeOverTCP' },
+  // { label: localization.nvmEOverRDMA, modelValue: 'nVMeOverRDMA' },
 ]

package/components/common/vm/actions/clone/Clone.vue

@@ -51,7 +51,7 @@
             :cd-dvd-drives="vmSettings.cdDvdDrives"
             :hard-disks="vmSettings.hardDisks"
             :networks="vmSettings.networks"
-            :customize-hardware-submit="0"
+            :customize-hardware-submit="customizeHardwareSubmit"
             :max-cpus="vmSettings.maxCpus"
             :max-memory="vmSettings.maxMemory"
             :cpu-models="vmSettings.cpuModels"
@@ -72,14 +72,15 @@
             :get-datastore-table-func="props.getDatastoreTableFunc"
             :datastore="props.datastore"
             is-clone
+            @change-boot-order="onChangeBootOrder"
+            @send-data="onChangeCustomizeHardware"
             @get-storage="emits('get-storage', $event)"
             @get-folders-or-files="emits('get-folders-or-files', $event)"
             @get-active-device-child="emits('get-active-device-child', $event)"
             @show-datastore-child="emits('show-datastore-child', $event)"
             @get-networks-table="emits('get-networks-table', $event)"
             @get-pci-devices="emits('get-pci-devices')"
-            @change-boot-order="onChangeBootOrder"
-            @send-data="onChangeCustomizeHardware"
+            @next="onNext(true)"
           />
           <common-vm-actions-clone-ready-to-complete
             v-if="stepPosition === 4"
@@ -406,7 +407,7 @@ const checkSubmitByManual = (step: number): boolean => {
     storageSubmit.value++
     return false
   }
-  if (step === 5) {
+  if (step === 3) {
     customizeHardwareSubmit.value++
     return false
   }

package/components/common/vm/actions/clone/readyToComplete/ReadyToComplete.vue

@@ -0,0 +1,15 @@
+<template>
+  <div>
+    <atoms-table-info :items="props.readyCompleteTableInfo" />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { UI_I_TableInfoItem } from '~/components/atoms/table/info/models/interfaces'
+
+const props = defineProps<{
+  readyCompleteTableInfo: UI_I_TableInfoItem[]
+}>()
+</script>
+
+<style lang="scss" scoped></style>

package/models/store/vm/interfaces.ts

@@ -82,6 +82,12 @@ export interface UI_I_CreateVmPayload {
   location?: string // для сферы
   compute_resource?: string // для сферы
 }
+export interface UI_I_CloneVmPayload {
+  start: boolean
+  cloned_from: string,
+  storage_id: string,
+  cloned_name: string,
+}
 
 export interface UI_I_EditVmPayload {
   vmId: string

package/package.json

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