bfg-common 1.5.752 → 1.5.754

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

@@ -146,7 +146,7 @@ import {
   connectionSettingsInitial,
   portPropertiesInitial,
   ipFourSettingsInitial,
-  targetDeviceInitial,
+  targetDeviceInitialFunc,
   addNetworkingZeroOrFirstSchemeDataFunc,
   addNetworkingSecondOrThirdSchemeDataFunc,
   addNetworkingFourthOrFifthSchemeDataFunc,
@@ -245,8 +245,19 @@ 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>('0')
+const connectionType = ref<string>(
+  !globalPermissions.value['Networks.CreateSysx'] &&
+    !globalPermissions.value['Networks.CreatePortGroup']
+    ? '2'
+    : !globalPermissions.value['Networks.CreateSysx']
+    ? '1'
+    : '0'
+)
 
 const connectionTypeLocal = computed<string>({
   get() {
@@ -278,7 +289,11 @@ const onChangeAdapterStatus = (adapterStatusNew: UI_I_AdapterStatus): void => {
 }
 
 // Step's content data and changers (targetDevice)
-const targetDevice = ref<UI_I_TargetDevice>(useDeepCopy(targetDeviceInitial))
+const targetDevice = ref<UI_I_TargetDevice>(
+  useDeepCopy(
+    targetDeviceInitialFunc(globalPermissions.value['Networks.UpdateSwitch'])
+  )
+)
 const mtuFromSwitch = ref<number>(1500)
 
 const onChangeTargetDevice = (newTargetDevice: UI_I_TargetDevice): void => {
@@ -369,7 +384,10 @@ watch(
         ? (targetDevice.value.selected = '1')
         : (targetDevice.value.selected = '0')
       newCT === '1' && (targetDevice.value.selected = '1')
-      newCT === '2' && (targetDevice.value.selected = '2')
+      newCT === '2' &&
+        (globalPermissions.value['Networks.UpdateSwitch']
+          ? (targetDevice.value.selected = '2')
+          : (targetDevice.value.selected = '3'))
     }
     if (newCT === '0') {
       ;(newTD.selected === '0' || newTD.selected === '1') &&
@@ -496,7 +514,9 @@ watch(
 const reset = (): void => {
   wizard.reset()
   connectionTypeLocal.value = '0'
-  targetDevice.value = useDeepCopy(targetDeviceInitial)
+  targetDevice.value = useDeepCopy(
+    targetDeviceInitialFunc(globalPermissions.value['Networks.UpdateSwitch'])
+  )
   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,
-  targetDeviceInitial,
+  targetDeviceInitialFunc,
   portPropertiesInitial,
   ipFourSettingsInitial,
   connectionSettingsInitial,

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

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

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

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

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

@@ -34,6 +34,7 @@
 
         <div
           v-show="props.connectionType === '2'"
+          v-permission="'Networks.UpdateSwitch'"
           :class="['radio-block', { selected: fieldsLocal.selected === '2' }]"
           @click="fieldsLocal.selected = '2'"
         >
@@ -46,8 +47,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 class="radio">
+          <div v-permission="'Networks.UpdateSwitch'" class="radio">
             <input
               id="existing-switch"
               v-model="fieldsLocal.selected"
@@ -149,6 +149,7 @@
             </label>
           </div>
           <fieldset
+            v-permission="'Networks.UpdateSwitch'"
             :class="{
               disabled: fieldsLocal.selected !== '2',
             }"
@@ -197,8 +198,7 @@
         </div>
 
         <div>
-          <!--            v-permission="'Networks.CreateSwitch'"-->
-          <div class="radio">
+          <div v-permission="'Networks.CreateSwitch'" class="radio">
             <input
               id="standard-switch"
               v-model="fieldsLocal.selected"
@@ -213,6 +213,7 @@
             </label>
           </div>
           <fieldset
+            v-permission="'Networks.CreateSwitch'"
             :class="{
               disabled: fieldsLocal.selected !== '3',
             }"
@@ -267,9 +268,7 @@ 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
@@ -288,6 +287,19 @@ 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/steps/computeResource/tableView/old/lib/config/hostTable.ts

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

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

@@ -84,57 +84,67 @@ export const bodyItems = (
         key: 'col0',
         text: disk[vmMigrateDiskTableItemKeys[0]],
         id: key,
+        testId: `disk-table-${key}`,
       },
       {
         key: 'col1',
         text: disk[vmMigrateDiskTableItemKeys[1]],
         id: key,
+        testId: `disk-table-${key}`,
       },
       {
         key: 'col2',
         text: file,
         id: key,
+        testId: `disk-table-${key}`,
       },
       {
         key: 'col3',
         text: disk[vmMigrateDiskTableItemKeys[3]],
         id: key,
+        testId: `disk-table-${key}`,
       },
       {
         key: 'col4',
         text: diskFormat,
         id: key,
+        testId: `disk-table-${key}`,
       },
       {
         key: 'col5',
         text: disk.extra[vmMigrateDiskTableItemKeys[5]],
         id: key,
+        testId: `disk-table-${key}`,
       },
-
       {
         key: 'col6',
         text: disk.extra[vmMigrateDiskTableItemKeys[6]],
         id: key,
+        testId: `disk-table-${key}`,
       },
       {
         key: 'col7',
         text: disk.extra[vmMigrateDiskTableItemKeys[7]],
         id: key,
+        testId: `disk-table-${key}`,
       },
       {
         key: 'col8',
         text: disk.extra[vmMigrateDiskTableItemKeys[8]],
         id: key,
+        testId: `disk-table-${key}`,
       },
       {
         key: 'col9',
         text: disk.extra[vmMigrateDiskTableItemKeys[9]],
         id: key,
+        testId: `disk-table-${key}`,
       },
       {
         key: 'col10',
         text: disk.extra[vmMigrateDiskTableItemKeys[10]],
         id: key,
+        testId: `disk-table-${key}`,
       },
     ])
   })

package/lib/config/regExp.ts

@@ -8,7 +8,7 @@ const url = /https?:\/\/([a-zA-Zа-яА-Я0-9.-]+\.[a-zA-Zа-яА-Я]{2,6})\b/
 const specialChar = /[!@#$%^&*(),.?":{}|<>]/
 const specialCharWidthSpace = /[!@#$%^&*(),?":{}|<>]|(\s)|\.$/
 const cron = /^(\*|([0-9]|1[0-9]|2[0-9]|3[0-9]|4[0-9]|5[0-9])|\*\/([0-9]|1[0-9]|2[0-9]|3[0-9]|4[0-9]|5[0-9])) (\*|([0-9]|1[0-9]|2[0-3])|\*\/([0-9]|1[0-9]|2[0-3])) (\*|([1-9]|1[0-9]|2[0-9]|3[0-1])|\*\/([1-9]|1[0-9]|2[0-9]|3[0-1])) (\*|([1-9]|1[0-2])|\*\/([1-9]|1[0-2])) (\*|([0-6])|\*\/([0-6]))$/
-export const RegExp = {
+export const allRegExp = {
   ip,
   email,
   password,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.5.752",
+  "version": "1.5.754",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",
@@ -18,7 +18,7 @@
     "@vueuse/core": "10.1.2",
     "@vueuse/nuxt": "10.1.2",
     "bfg-nuxt-3-graph": "1.0.27",
-    "bfg-uikit": "1.0.538",
+    "bfg-uikit": "1.0.539",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-myrules": "file:./eslint",
     "nuxt": "3.11.2",

package/plugins/validation.ts

@@ -1,4 +1,4 @@
-import { RegExp } from '~/lib/config/regExp'
+import { allRegExp } from '~/lib/config/regExp'
 import type {
   UI_I_Validation,
   UI_I_ValidationOption,
@@ -127,30 +127,30 @@ export default defineNuxtPlugin(() => {
           error = validation.errorText
         }
       } else if (validation.value === 'ip') {
-        const isValid = RegExp.ip.test(value)
+        const isValid = allRegExp.ip.test(value)
         if (!isValid) {
           error = validation.errorText
         }
       } else if (validation.value === 'password') {
-        const isValid = value ? RegExp.password.test(value) : true
+        const isValid = value ? allRegExp.password.test(value) : true
 
         if (!isValid) {
           error = validation.errorText
         }
       } else if (validation.value === 'email') {
-        const isValid = value ? RegExp.email.test(value) : true
+        const isValid = value ? allRegExp.email.test(value) : true
 
         if (!isValid) {
           error = validation.errorText
         }
       } else if (validation.value === 'url') {
-        const isValid = value ? RegExp.url.test(value) : true
+        const isValid = value ? allRegExp.url.test(value) : true
 
         if (!isValid) {
           error = validation.errorText
         }
       } else if (validation.value === 'cron') {
-        const isValid = value ? RegExp.cron.test(value) : true
+        const isValid = value ? allRegExp.cron.test(value) : true
 
         if (!isValid) {
           error = validation.errorText