bfg-common 1.5.774 → 1.5.775

package/components/common/wizards/network/add/Add.vue

@@ -146,7 +146,7 @@ import {
   connectionSettingsInitial,
   portPropertiesInitial,
   ipFourSettingsInitial,
-  targetDeviceInitialFunc,
+  targetDeviceInitial,
   addNetworkingZeroOrFirstSchemeDataFunc,
   addNetworkingSecondOrThirdSchemeDataFunc,
   addNetworkingFourthOrFifthSchemeDataFunc,
@@ -245,21 +245,8 @@ const alertMessages = computed<string[][]>(() => wizard.alertMessages.value)
 
 const readyCompleteFields = ref<UI_I_ReadyCompleteFields[]>([])
 
-const globalPermissions = computed<any>(
-  () => $store.getters['globalPermissions/getPermissions']
-)
-
 // Step's content data (connectionType)
-const connectionType = ref<string>(
-  globalPermissions.value === undefined
-    ? '0'
-    : !globalPermissions.value?.['Networks.CreateSysx'] &&
-      !globalPermissions.value?.['Networks.CreatePortGroup']
-    ? '2'
-    : !globalPermissions.value?.['Networks.CreateSysx']
-    ? '1'
-    : '0'
-)
+const connectionType = ref<string>('0')
 
 const connectionTypeLocal = computed<string>({
   get() {
@@ -291,11 +278,7 @@ const onChangeAdapterStatus = (adapterStatusNew: UI_I_AdapterStatus): void => {
 }
 
 // Step's content data and changers (targetDevice)
-const targetDevice = ref<UI_I_TargetDevice>(
-  useDeepCopy(
-    targetDeviceInitialFunc(globalPermissions.value?.['Networks.UpdateSwitch'])
-  )
-)
+const targetDevice = ref<UI_I_TargetDevice>(useDeepCopy(targetDeviceInitial))
 const mtuFromSwitch = ref<number>(1500)
 
 const onChangeTargetDevice = (newTargetDevice: UI_I_TargetDevice): void => {
@@ -386,11 +369,7 @@ watch(
         ? (targetDevice.value.selected = '1')
         : (targetDevice.value.selected = '0')
       newCT === '1' && (targetDevice.value.selected = '1')
-      newCT === '2' &&
-        (globalPermissions.value === undefined ||
-        globalPermissions.value?.['Networks.UpdateSwitch']
-          ? (targetDevice.value.selected = '2')
-          : (targetDevice.value.selected = '3'))
+      newCT === '2' && (targetDevice.value.selected = '2')
     }
     if (newCT === '0') {
       ;(newTD.selected === '0' || newTD.selected === '1') &&
@@ -517,9 +496,7 @@ watch(
 const reset = (): void => {
   wizard.reset()
   connectionTypeLocal.value = '0'
-  targetDevice.value = useDeepCopy(
-    targetDeviceInitialFunc(globalPermissions.value?.['Networks.UpdateSwitch'])
-  )
+  targetDevice.value = useDeepCopy(targetDeviceInitial)
   connectionSettings.value = useDeepCopy(connectionSettingsInitial)
   portProperties.value = useDeepCopy(portPropertiesInitial)
   ipFourSettings.value = useDeepCopy(ipFourSettingsInitial)

package/components/common/wizards/network/add/lib/config/config.ts

@@ -18,7 +18,7 @@ export const {
 export const {
   servicesInitial,
   vlanIdSelectData,
-  targetDeviceInitialFunc,
+  targetDeviceInitial,
   portPropertiesInitial,
   ipFourSettingsInitial,
   connectionSettingsInitial,

package/components/common/wizards/network/add/lib/config/initialData.ts

@@ -22,16 +22,13 @@ export const servicesInitial: UI_I_Services = {
   nVMeOverRDMA: false,
 }
 
-export const targetDeviceInitialFunc = (
-  updateSwitchPermission: boolean
-): UI_I_TargetDevice => ({
-  selected:
-    updateSwitchPermission === undefined || updateSwitchPermission ? '1' : '3',
+export const targetDeviceInitial: UI_I_TargetDevice = {
+  selected: '1',
   network: '',
   switch: '',
   standardSwitch: '',
   mtu: 1500,
-})
+}
 
 export const portPropertiesInitial: UI_I_PortProperties = {
   networkLabel: '',

package/components/common/wizards/network/add/lib/config/selectConnectionTypeStep.ts

@@ -27,6 +27,5 @@ export const selectConnectionTypeFunc = (
     value: '2',
     testId: 'physical-adapter-radio',
     id: 'physical-adapter',
-    permission: 'Networks.UpdateSwitch Networks.CreateSwitch',
   },
 ]

package/components/common/wizards/network/add/steps/portProperties/PortProperties.vue

@@ -1,192 +1,192 @@
-<template>
-  <common-wizards-network-add-steps-port-properties-new
-    v-if="isNewView"
-    v-model="fields"
-    :messages-fields="props.messagesFields"
-    :tcp-stacks="props.tcpStacks"
-    :port-properties-enabled-services="portPropertiesEnabledServices"
-  />
-  <common-wizards-network-add-steps-port-properties-old
-    v-else
-    v-model="fields"
-    :messages-fields="props.messagesFields"
-    :alert-messages="props.alertMessages"
-    :tcp-stacks="props.tcpStacks"
-    :port-properties-enabled-services="portPropertiesEnabledServices"
-    @hide-alert="onHideAlert"
-  />
-</template>
-
-<script setup lang="ts">
-import type { UI_I_ErrorFields } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
-import type Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils/utils'
-import type {
-  UI_I_ArbitraryObject,
-  UI_I_Localization,
-} from '~/lib/models/interfaces'
-import type { UI_T_Project } from '~/lib/models/types'
-import type {
-  UI_I_PortProperties,
-  UI_I_TCPStack,
-  UI_I_PortPropertiesEnabledService,
-} from '~/components/common/wizards/network/add/lib/models/interfaces'
-import type { UI_T_TCP } from '~/components/common/wizards/network/add/lib/models/types'
-import {
-  servicesInitial,
-  portPropertiesEnabledServicesFunc,
-} from '~/components/common/wizards/network/add/lib/config/config'
-import {
-  validateMtuPortPropertiesLocal,
-  validateNetworkPortPropertiesLocal,
-  validateVlanIdPortPropertiesLocal,
-} from '~/components/common/wizards/network/add/validations/validations'
-
-const props = withDefaults(
-  defineProps<{
-    wizard: Wizard
-    portProperties: UI_I_PortProperties
-    mtuFromSwitch?: number
-    project: UI_T_Project
-    messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
-    alertMessages: string[]
-    tcpStacks?: UI_I_TCPStack[]
-  }>(),
-  {
-    mtuFromSwitch: 1500,
-    tcpStacks: () => [],
-  }
-)
-
-const emits = defineEmits<{
-  (event: 'change-port-properties', portProperties: UI_I_PortProperties): void
-  (event: 'change-gateway-flag', value: boolean): void
-  (event: 'hide-alert', stepId: 3): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const { $store }: any = useNuxtApp()
-
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const portPropertiesEnabledServices = computed<
-  UI_I_PortPropertiesEnabledService[]
->(() => portPropertiesEnabledServicesFunc(localization.value))
-
-const mtuCustom = ref<number>()
-
-const fields = ref<UI_I_PortProperties>({
-  ...props.portProperties,
-  mtu: {
-    ...props.portProperties.mtu,
-    size:
-      !mtuCustom.value && props.portProperties.mtu.option !== '1'
-        ? props.mtuFromSwitch
-        : props.portProperties.mtu.size,
-  },
-})
-
-const setEnabledService = (
-  tcp: UI_T_TCP,
-  currentFields: UI_I_PortProperties,
-  newFields?: UI_I_PortProperties
-): void => {
-  if (tcp === 'default') {
-    fields.value = {
-      ...currentFields,
-      services: useDeepCopy(servicesInitial),
-    }
-  } else if (servicesInitial.hasOwnProperty(tcp)) {
-    fields.value = {
-      ...(newFields || currentFields),
-      services: {
-        ...useDeepCopy(servicesInitial),
-        [tcp]: true,
-      },
-    }
-  } else {
-    fields.value = {
-      ...(newFields || currentFields),
-      services: useDeepCopy(servicesInitial),
-    }
-  }
-}
-
-let oldFields = useDeepCopy(fields.value)
-
-watch(
-  fields,
-  (newFields: UI_I_PortProperties) => {
-    if (newFields.tcp && newFields.tcp !== oldFields.tcp) {
-      emits('change-gateway-flag', false)
-      setEnabledService(newFields.tcp, fields.value, newFields)
-    }
-
-    oldFields.networkLabel !== newFields.networkLabel &&
-      validateNetworkPortPropertiesLocal(
-        localization.value,
-        newFields,
-        props.wizard
-      )
-
-    oldFields.vlanId !== newFields.vlanId &&
-      validateVlanIdPortPropertiesLocal(
-        localization.value,
-        newFields,
-        props.wizard
-      )
-
-    oldFields.mtu.size !== newFields.mtu.size &&
-      validateMtuPortPropertiesLocal(
-        localization.value,
-        newFields,
-        props.wizard
-      )
-
-    oldFields = useDeepCopy(newFields)
-
-    emits('change-port-properties', newFields)
-  },
-  { deep: true, immediate: true }
-)
-
-watch(
-  () => fields.value.mtu,
-  (newMtu: { size: number; option: string }) => {
-    if (newMtu.option === '0') {
-      mtuCustom.value = props.mtuFromSwitch
-      fields.value.mtu.size = props.mtuFromSwitch
-      return
-    }
-    mtuCustom.value = newMtu.size
-  },
-  { deep: true, immediate: true }
-)
-
-watch(
-  () => fields.value.tcp,
-  (newTcp: UI_T_TCP, oldTcp: UI_T_TCP) => {
-    if (newTcp !== oldTcp) {
-      setEnabledService(newTcp, fields.value)
-    }
-    emits('change-port-properties', fields.value)
-  }
-)
-
-watch(
-  () => props.tcpStacks,
-  (newValue: UI_I_TCPStack[]) => {
-    if (fields.value.tcp === '') {
-      fields.value.tcp =
-        newValue?.find?.((item) => item.id === 'default')?.id ||
-        newValue?.[0]?.id ||
-        ''
-    }
-  },
-  { deep: true, immediate: true }
-)
-
-const onHideAlert = (): void => {
-  emits('hide-alert', 3)
-}
-</script>
+<template>
+  <common-wizards-network-add-steps-port-properties-new
+    v-if="isNewView"
+    v-model="fields"
+    :messages-fields="props.messagesFields"
+    :tcp-stacks="props.tcpStacks"
+    :port-properties-enabled-services="portPropertiesEnabledServices"
+  />
+  <common-wizards-network-add-steps-port-properties-old
+    v-else
+    v-model="fields"
+    :messages-fields="props.messagesFields"
+    :alert-messages="props.alertMessages"
+    :tcp-stacks="props.tcpStacks"
+    :port-properties-enabled-services="portPropertiesEnabledServices"
+    @hide-alert="onHideAlert"
+  />
+</template>
+
+<script setup lang="ts">
+import type { UI_I_ErrorFields } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
+import type Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils/utils'
+import type {
+  UI_I_ArbitraryObject,
+  UI_I_Localization,
+} from '~/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
+import type {
+  UI_I_PortProperties,
+  UI_I_TCPStack,
+  UI_I_PortPropertiesEnabledService,
+} from '~/components/common/wizards/network/add/lib/models/interfaces'
+import type { UI_T_TCP } from '~/components/common/wizards/network/add/lib/models/types'
+import {
+  servicesInitial,
+  portPropertiesEnabledServicesFunc,
+} from '~/components/common/wizards/network/add/lib/config/config'
+import {
+  validateMtuPortPropertiesLocal,
+  validateNetworkPortPropertiesLocal,
+  validateVlanIdPortPropertiesLocal,
+} from '~/components/common/wizards/network/add/validations/validations'
+
+const props = withDefaults(
+  defineProps<{
+    wizard: Wizard
+    portProperties: UI_I_PortProperties
+    mtuFromSwitch?: number
+    project: UI_T_Project
+    messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
+    alertMessages: string[]
+    tcpStacks?: UI_I_TCPStack[]
+  }>(),
+  {
+    mtuFromSwitch: 1500,
+    tcpStacks: () => [],
+  }
+)
+
+const emits = defineEmits<{
+  (event: 'change-port-properties', portProperties: UI_I_PortProperties): void
+  (event: 'change-gateway-flag', value: boolean): void
+  (event: 'hide-alert', stepId: 3): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const { $store }: any = useNuxtApp()
+
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const portPropertiesEnabledServices = computed<
+  UI_I_PortPropertiesEnabledService[]
+>(() => portPropertiesEnabledServicesFunc(localization.value))
+
+const mtuCustom = ref<number>()
+
+const fields = ref<UI_I_PortProperties>({
+  ...props.portProperties,
+  mtu: {
+    ...props.portProperties.mtu,
+    size:
+      !mtuCustom.value && props.portProperties.mtu.option !== '1'
+        ? props.mtuFromSwitch
+        : props.portProperties.mtu.size,
+  },
+})
+
+const setEnabledService = (
+  tcp: UI_T_TCP,
+  currentFields: UI_I_PortProperties,
+  newFields?: UI_I_PortProperties
+): void => {
+  if (tcp === 'default') {
+    fields.value = {
+      ...currentFields,
+      services: useDeepCopy(servicesInitial),
+    }
+  } else if (servicesInitial.hasOwnProperty(tcp)) {
+    fields.value = {
+      ...(newFields || currentFields),
+      services: {
+        ...useDeepCopy(servicesInitial),
+        [tcp]: true,
+      },
+    }
+  } else {
+    fields.value = {
+      ...(newFields || currentFields),
+      services: useDeepCopy(servicesInitial),
+    }
+  }
+}
+
+let oldFields = useDeepCopy(fields.value)
+
+watch(
+  fields,
+  (newFields: UI_I_PortProperties) => {
+    if (newFields.tcp && newFields.tcp !== oldFields.tcp) {
+      emits('change-gateway-flag', false)
+      setEnabledService(newFields.tcp, fields.value, newFields)
+    }
+
+    oldFields.networkLabel !== newFields.networkLabel &&
+      validateNetworkPortPropertiesLocal(
+        localization.value,
+        newFields,
+        props.wizard
+      )
+
+    oldFields.vlanId !== newFields.vlanId &&
+      validateVlanIdPortPropertiesLocal(
+        localization.value,
+        newFields,
+        props.wizard
+      )
+
+    oldFields.mtu.size !== newFields.mtu.size &&
+      validateMtuPortPropertiesLocal(
+        localization.value,
+        newFields,
+        props.wizard
+      )
+
+    oldFields = useDeepCopy(newFields)
+
+    emits('change-port-properties', newFields)
+  },
+  { deep: true, immediate: true }
+)
+
+watch(
+  () => fields.value.mtu,
+  (newMtu: { size: number; option: string }) => {
+    if (newMtu.option === '0') {
+      mtuCustom.value = props.mtuFromSwitch
+      fields.value.mtu.size = props.mtuFromSwitch
+      return
+    }
+    mtuCustom.value = newMtu.size
+  },
+  { deep: true, immediate: true }
+)
+
+watch(
+  () => fields.value.tcp,
+  (newTcp: UI_T_TCP, oldTcp: UI_T_TCP) => {
+    if (newTcp !== oldTcp) {
+      setEnabledService(newTcp, fields.value)
+    }
+    emits('change-port-properties', fields.value)
+  }
+)
+
+watch(
+  () => props.tcpStacks,
+  (newValue: UI_I_TCPStack[]) => {
+    if (fields.value.tcp === '') {
+      fields.value.tcp =
+        newValue?.find?.((item) => item.id === 'default')?.id ||
+        newValue?.[0]?.id ||
+        ''
+    }
+  },
+  { deep: true, immediate: true }
+)
+
+const onHideAlert = (): void => {
+  emits('hide-alert', 3)
+}
+</script>

package/components/common/wizards/network/add/steps/selectTargetDevice/SelectTargetDeviceNew.vue

@@ -34,7 +34,6 @@
 
         <div
           v-show="props.connectionType === '2'"
-          v-permission="'Networks.UpdateSwitch'"
           :class="['radio-block', { selected: fieldsLocal.selected === '2' }]"
           @click="fieldsLocal.selected = '2'"
         >
@@ -47,8 +46,8 @@
           />
         </div>
 
+        <!-- v-permission="'Networks.CreateSwitch'" -->
         <div
-          v-permission="'Networks.CreateSwitch'"
           :class="['radio-block', { selected: fieldsLocal.selected === '3' }]"
           @click="fieldsLocal.selected = '3'"
         >

package/components/common/wizards/network/add/steps/selectTargetDevice/SelectTargetDeviceOld.vue

@@ -135,7 +135,7 @@
         </div>
 
         <div v-show="props.connectionType === '2'">
-          <div v-permission="'Networks.UpdateSwitch'" class="radio">
+          <div class="radio">
             <input
               id="existing-switch"
               v-model="fieldsLocal.selected"
@@ -149,7 +149,6 @@
             </label>
           </div>
           <fieldset
-            v-permission="'Networks.UpdateSwitch'"
             :class="{
               disabled: fieldsLocal.selected !== '2',
             }"
@@ -198,7 +197,8 @@
         </div>
 
         <div>
-          <div v-permission="'Networks.CreateSwitch'" class="radio">
+          <!--            v-permission="'Networks.CreateSwitch'"-->
+          <div class="radio">
             <input
               id="standard-switch"
               v-model="fieldsLocal.selected"
@@ -213,7 +213,6 @@
             </label>
           </div>
           <fieldset
-            v-permission="'Networks.CreateSwitch'"
             :class="{
               disabled: fieldsLocal.selected !== '3',
             }"
@@ -268,7 +267,9 @@ import type {
   UI_I_ArbitraryObject,
   UI_I_Localization,
 } from '~/lib/models/interfaces'
-import type { UI_I_TargetDevice } from '~/components/common/wizards/network/add/lib/models/interfaces'
+import type {
+  UI_I_TargetDevice,
+} from '~/components/common/wizards/network/add/lib/models/interfaces'
 
 const props = defineProps<{
   fields: UI_I_TargetDevice
@@ -287,19 +288,6 @@ const emits = defineEmits<{
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const existingStandardSwitchPermission = computed<string>(() => {
-  switch (props.connectionType) {
-    case '0':
-      return 'Networks.CreateSysx'
-    case '1':
-      return 'Networks.CreatePortGroup'
-    case '2':
-      return 'Networks.UpdateSwitch'
-    default:
-      return ''
-  }
-})
-
 const fieldsLocal = computed({
   get() {
     return props.fields

package/components/common/wizards/vm/migrate/lib/models/enums.ts

@@ -1,6 +1,6 @@
 export enum UI_E_VmMigrationType {
-  resource = 'changeComputeResourceOnly',
-  storage = 'changeStorageOnly',
+  resource = 'changeComputeResourceOriginalStorage',
+  storage = 'changeStorageComputeResource',
   'resource-storage' = 'changeComputeResourceAndStorage',
   server = '',
 }

package/components/common/wizards/vm/migrate/steps/computeResource/tableView/old/lib/config/hostTable.ts

@@ -159,7 +159,7 @@ export const bodyItems = (
         testId: `migrate-host-table-item-${key}`
       },
       {
-        key: 'col13',
+        key: 'col14',
         text: host[hostTableItemKeys[13]],
         id: key,
         testId: `migrate-host-table-item-${key}`

package/components/common/wizards/vm/migrate/steps/selectStorage/SelectStorage.vue

@@ -80,10 +80,10 @@ const onApplyChanges = (): void => {
   /* TODO сделать рефакторинг потом */
   model.value.configure.disks.forEach((disk) => {
     const selectedDisk = selectedPerDisks.value.find(
-      (selectedDisk) =>
-        selectedDisk.virtual_machine === disk.virtual_machine &&
-        selectedDisk.extra.disk_source === disk.extra.disk_source &&
-        selectedDisk.extra.datastore_id === disk.extra.datastore_id
+      (selected) =>
+        selected.virtual_machine === disk.virtual_machine &&
+        selected.file === disk.file &&
+        selected.extra.datastore_id === disk.extra.datastore_id
     )!
 
     if (selectedDisk) {

package/components/common/wizards/vm/migrate/steps/selectStorage/configure/disk/table/new/lib/config/diskTable.ts

@@ -158,16 +158,12 @@ export const getBodyDataFunc = (
   bodyData: UI_I_StorageConfigurePerDiskItem[],
   localization: UI_I_Localization
 ): UI_I_DataTableBody[] => {
+  const { $binary }: any = useNuxtApp()
 
   return bodyData.map((disk, index: number) => {
     const diskFormat =
       index === 0 ? 'N/A' : UI_E_SelectStorageDiskFormat[disk.disk_format]
 
-    const file =
-      disk.extra.disk_source === 'meta'
-        ? disk.file
-        : `${disk.extra.disk_source} (${disk.extra.disk_size} ${localization.common.mb} )`
-
     const diskSharingKey = disk.extra.sharing
       ? E_DiskSharing.Active
       : E_DiskSharing.Inactive
@@ -202,7 +198,7 @@ export const getBodyDataFunc = (
         },
         {
           col: 'col2',
-          text: file,
+          text: disk.file,
         },
         {
           col: 'col3',