bfg-common 1.1.44 → 1.1.46

package/components/common/addNetworking/config/addNetworkingSteps.ts

@@ -120,6 +120,40 @@ export const createSecondSchemeReadyCompleteFunc = (
   },
 ]
 
+export const createThirdSchemeReadyCompleteFunc = (
+  connectionSettingsValues: UI_I_ConnectionSettings,
+  targetDeviceValues: UI_I_TargetDevice,
+  addedAdapters: string[],
+  localization: UI_I_Localization
+): UI_I_ReadyCompleteData[] => [
+  {
+    id: 0,
+    type: 0,
+    rows: [
+      {
+        name: localization.newStandardSwitch,
+        value: '--',
+      },
+      {
+        name: localization.virtualMachinePortGroup,
+        value: connectionSettingsValues.networkLabel,
+      },
+      {
+        name: localization.assignedAdapters,
+        value: addedAdapters.join(', '),
+      },
+      {
+        name: localization.switchMTU,
+        value: targetDeviceValues.mtu?.toString(),
+      },
+      {
+        name: localization.vlanId,
+        value: connectionSettingsValues.vlanId,
+      },
+    ],
+  },
+]
+
 const makeFirstColumnOfZeroAndFirstScheme = (
   targetDevice: UI_I_TargetDevice,
   portProperties: UI_I_PortProperties,

package/components/common/addNetworking/config/index.ts

@@ -13,6 +13,7 @@ export const {
   createSecondSchemeReadyCompleteFunc,
   createZeroSchemeReadyCompleteFunc,
   createFirstSchemeReadyCompleteFunc,
+  createThirdSchemeReadyCompleteFunc,
 } = addNetworkingStepsConfig
 export const {
   servicesInitial,
@@ -41,6 +42,6 @@ export const {
 } = selectSwitches
 
 export const {
-  addNetworkingSecondSchemeDataFunc,
   addNetworkingZeroOrFirstSchemeDataFunc,
+  addNetworkingSecondOrThirdSchemeDataFunc,
 } = sendData

package/components/common/addNetworking/config/sendData.ts

@@ -3,22 +3,37 @@ import {
   UI_I_ConnectionSettings,
   UI_I_IpFourSettings,
   UI_I_PortProperties,
-  UI_I_SecondSchemeData,
   UI_I_TargetDevice,
+  UI_I_AddNetworkingSecondOrThirdSchemeDataSend,
 } from '~/components/common/addNetworking/models/interfaces'
 import { UI_I_AdapterStatus } from '~/components/common/diagramMain/models/interfaces'
 
-export const addNetworkingSecondSchemeDataFunc = (
+export const addNetworkingSecondOrThirdSchemeDataFunc = (
   connectionSettings: UI_I_ConnectionSettings,
   targetDevice: UI_I_TargetDevice,
-  vlan: number
-): UI_I_SecondSchemeData => {
-  return {
-    vlan,
-    name: connectionSettings.networkLabel,
-    switch: targetDevice.standardSwitch,
-  }
-}
+  vlan: number,
+  isSecondScheme: boolean = false,
+  adapterStatus?: UI_I_AdapterStatus
+): UI_I_AddNetworkingSecondOrThirdSchemeDataSend =>
+  isSecondScheme
+    ? {
+        vlan,
+        name: connectionSettings.networkLabel,
+        switch: targetDevice.standardSwitch,
+      }
+    : {
+        vlan,
+        name: connectionSettings.networkLabel,
+        new_switch: {
+          mtu: targetDevice.selected === '3' ? targetDevice.mtu : undefined,
+          nics: {
+            active: adapterStatus?.active || [],
+            standby: adapterStatus?.standby || [],
+            unused: adapterStatus?.unused || [],
+          },
+        },
+      }
+
 export const addNetworkingZeroOrFirstSchemeDataFunc = (
   targetDevice: UI_I_TargetDevice,
   vlan: number,

package/components/common/addNetworking/models/interfaces.ts

@@ -1,7 +1,5 @@
 import { UI_E_StepStatus } from '~/components/common/addNetworking/models/enums'
 import { UI_T_TCP } from '~/components/common/addNetworking/models/types'
-import { addNetworkingSecondSchemeDataFunc } from '~/components/common/addNetworking/config/sendData'
-import { createSecondSchemeReadyCompleteFunc } from '~/components/common/addNetworking/config/addNetworkingSteps'
 
 export interface UI_I_Services {
   vMotion: boolean
@@ -121,11 +119,6 @@ export interface UI_I_PortPropertiesEnabledService {
   modelValue: string
 }
 
-export interface UI_I_AddNetworkingSecondSchemeDataSend {
-  name: string
-  vlan: number
-  switch?: string
-}
 export interface UI_I_AddNetworkingZeroOrFirstSchemeDataSend {
   switch?: string
   new_switch?: {
@@ -178,10 +171,18 @@ export interface UI_I_BodyItems {
   id?: string
 }
 
-export interface UI_I_SecondSchemeData {
+export interface UI_I_AddNetworkingSecondOrThirdSchemeDataSend {
   vlan: number
   name: string
-  switch: string | undefined
+  switch?: string | undefined
+  new_switch?: {
+    mtu: number | undefined
+    nics: {
+      active: string[]
+      standby: string[]
+      unused: string[]
+    }
+  }
 }
 
 export interface UI_I_VlanIdData {

package/components/common/addNetworking/steps/SelectedTargetDevice.vue

@@ -137,12 +137,7 @@
         </div>
 
         <div>
-          <div
-            :class="[
-              'radio',
-              { 'disabled-on-time': props.connectionType === '1' },
-            ]"
-          >
+          <div class="radio">
             <input
               id="standard-switch"
               v-model="fields.selected"

package/components/common/diagramMain/DiagramMain.vue

@@ -214,7 +214,7 @@
         view-name="migrate-vmkernel-adapter"
         width="956px"
         height="636px"
-        :title="`esxi1.aobfg.ru - ${localization.migrateVmKernelNetworkAdapterTo} vSwitch0`"
+        :title="`esxi1.иридиум - ${localization.migrateVmKernelNetworkAdapterTo} vSwitch0`"
         :switch-name="diagramData.id"
         :networks-list="props.networksList"
         :switch-networks="diagramData.networks"

package/components/common/vm/actions/add/select/computeResource/ComputeResource.spec.ts

@@ -24,7 +24,7 @@ vi.stubGlobal('useNuxtApp', () => {
               id: 0,
               state: 2,
               type: 'host',
-              text: 'hdev1.aobfg.ru',
+              text: 'hdev1.иридиум',
               CLUSTER: 'cluster01',
               shCpuUsage: 49,
               shdFreeMem: '',
@@ -82,7 +82,7 @@ vi.stubGlobal('useNuxtApp', () => {
               id: 2,
               state: 2,
               type: 'host',
-              text: 'hdev3.aobfg.ru',
+              text: 'hdev3.иридиум',
               CLUSTER: 'cluster01',
               shCpuUsage: 0,
               shdFreeMem: '',
@@ -140,7 +140,7 @@ vi.stubGlobal('useNuxtApp', () => {
               id: 24,
               state: 2,
               type: 'host',
-              text: 'hdev4.aobfg.ru',
+              text: 'hdev4.иридиум',
               CLUSTER: 'cluster02',
               shCpuUsage: 0,
               shdFreeMem: '',
@@ -198,7 +198,7 @@ vi.stubGlobal('useNuxtApp', () => {
               id: 25,
               state: 2,
               type: 'host',
-              text: 'hdev5.aobfg.ru',
+              text: 'hdev5.иридиум',
               CLUSTER: 'cluster02',
               shCpuUsage: 0,
               shdFreeMem: '',
@@ -256,7 +256,7 @@ vi.stubGlobal('useNuxtApp', () => {
               id: 26,
               state: 2,
               type: 'host',
-              text: 'hdev2.aobfg.ru',
+              text: 'hdev2.иридиум',
               CLUSTER: 'cluster02',
               shCpuUsage: 100,
               shdFreeMem: '',
@@ -317,7 +317,7 @@ vi.stubGlobal('useNuxtApp', () => {
             id: 24,
             state: 2,
             type: 'host',
-            text: 'hdev4.aobfg.ru',
+            text: 'hdev4.иридиум',
             CLUSTER: 'cluster02',
             shCpuUsage: 0,
             shdFreeMem: '',
@@ -388,7 +388,7 @@ vi.stubGlobal('useNuxtApp', () => {
 //   children: [
 //     {
 //       id: 24,
-//       text: 'hdev4.aobfg.ru',
+//       text: 'hdev4.иридиум',
 //       iconClassName: 'icon-host-connect',
 //       type: 'host',
 //       isActive: false,
@@ -399,7 +399,7 @@ vi.stubGlobal('useNuxtApp', () => {
 //     },
 //     {
 //       id: 25,
-//       text: 'hdev5.aobfg.ru',
+//       text: 'hdev5.иридиум',
 //       iconClassName: 'icon-host-connect',
 //       type: 'host',
 //       isActive: false,
@@ -410,7 +410,7 @@ vi.stubGlobal('useNuxtApp', () => {
 //     },
 //     {
 //       id: 26,
-//       text: 'hdev2.aobfg.ru',
+//       text: 'hdev2.иридиум',
 //       iconClassName: 'icon-host-connect',
 //       type: 'host',
 //       isActive: false,
@@ -425,7 +425,7 @@ vi.stubGlobal('useNuxtApp', () => {
 //
 // const selectedNode2 = {
 //   id: 24,
-//   text: 'hdev4.aobfg.ru',
+//   text: 'hdev4.иридиум',
 //   iconClassName: 'icon-host-connect',
 //   type: 'host',
 //   isActive: true,

package/components/common/wizards/datastore/add/nfs/accessibility/tablesView/config/hostsTableItems.ts

@@ -9,27 +9,27 @@ const compatibleHostsTable: API_UI_I_DataTable<I_CompatibleHostsTable[]> = {
   items: [
     {
       id: 1,
-      host: 'esxi0.aobfg.ru',
+      host: 'esxi0.иридиум',
       cluster: 'Cluster00',
     },
     {
       id: 2,
-      host: ' esxi0.aobfg.ru',
+      host: ' esxi0.иридиум',
       cluster: 'Cluster00',
     },
     {
       id: 3,
-      host: 'esxi3.aobfg.ru',
+      host: 'esxi3.иридиум',
       cluster: 'Cluster00',
     },
     {
       id: 4,
-      host: 'esxi4.aobfg.ru',
+      host: 'esxi4.иридиум',
       cluster: 'Cluster00',
     },
     {
       id: 5,
-      host: 'esxi1.aobfg.ru',
+      host: 'esxi1.иридиум',
       cluster: 'Cluster01',
     },
   ],
@@ -40,21 +40,21 @@ const incompatibleHostsTable: API_UI_I_DataTable<I_IncompatibleHostsTable[]> = {
   items: [
     {
       id: 1,
-      host: 'esxi0.aobfg.ru',
+      host: 'esxi0.иридиум',
       host_incompatibility_reason:
         'Kerberos is not supported as host is not in AD domain',
       cluster: 'Cluster00',
     },
     {
       id: 2,
-      host: 'esxi0.aobfg.ru',
+      host: 'esxi0.иридиум',
       host_incompatibility_reason:
         'Kerberos is not supported as host is not in AD domain',
       cluster: 'Cluster00',
     },
     {
       id: 3,
-      host: 'esxi0.aobfg.ru',
+      host: 'esxi0.иридиум',
       host_incompatibility_reason:
         'Kerberos is not supported as host is not in AD domain',
       cluster: 'Cluster00',

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
+//     }
+//   },
+// })

package/modules/replaceEnv/index.ts

@@ -0,0 +1,47 @@
+import { defineNuxtModule } from '@nuxt/kit'
+const fs = require('fs')
+const path = require('path')
+
+const npmGenerate = (): void => {
+  // Переносим весь контент и удаляем все файлы кроме картинок
+  const filePath = path.join(
+    __dirname.replace('/node_modules/bfg-common/modules/fixContentBuild', ''),
+    'assets',
+    'scss',
+    'common',
+    'normalize.css'
+  )
+  if (!fs.existsSync(filePath)) return
+
+  const searchString = 'FONT'
+  const replacementString = process.env.FONT || ''
+  fs.readFile(filePath, 'utf8', (err: any, data: string) => {
+    if (err) {
+      return console.log(err)
+    }
+
+    if (data.match(replacementString)) {
+      return
+    }
+
+    const updatedContent = data.replace(searchString, replacementString)
+
+    fs.writeFile(filePath, updatedContent, 'utf8', (err: any) => {
+      if (err) {
+        return console.log(err)
+      }
+    })
+  })
+}
+
+// @ts-ignore
+export default defineNuxtModule(() => {
+  switch (process.env.npm_command) {
+    case 'run-script':
+      // npmDev()
+      break
+    case 'exec':
+      npmGenerate()
+      break
+  }
+})

package/package.json

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