bfg-common 1.5.442 → 1.5.443

package/components/common/wizards/network/add/{modals → steps/selectTargetDevice/modals/old}/SelectStandardSwitch.vue

@@ -1,23 +1,30 @@
 <template>
   <div class="select-table-modal">
     <atoms-modal
-      :width="props.width"
-      :height="props.height"
+      width="576px"
+      height="468px"
       :show="props.show"
-      :title="props.title"
-      @hide="onHideModal"
+      :title="localization.common.selectSwitch"
+      @hide="emits('hide')"
     >
       <template #modalBody>
         <atoms-alert
-          v-if="isShowErrorMessageAlert"
+          v-if="props.isShowAlert"
           :items="[
             localization.common.noSwitchIsSelectedSelectSwitchToContinue,
           ]"
           status="alert-danger"
           test-id="select-standard-switch-alert"
-          @remove="onHideErrorMessageAlert"
+          @remove="emits('hide-alert')"
         />
-        <div class="table-top-margin-container">
+        <div
+          :class="[
+            'table-top-margin-container',
+            {
+              'with-alert': props.isShowAlert,
+            },
+          ]"
+        >
           <atoms-table-simple-table
             :head-items="headItems"
             :body-items="bodyItems"
@@ -30,7 +37,7 @@
         <button
           data-id="select-standard-switch-hide-button"
           class="btn btn-outline"
-          @click="onHideModal"
+          @click="emits('hide')"
         >
           {{ localization.common.cancel }}
         </button>
@@ -55,40 +62,27 @@ import type {
 } from '~/components/common/wizards/network/add/lib/models/interfaces'
 import { selectStandardSwitchTableHeadFunc } from '~/components/common/wizards/network/add/lib/config/config'
 
-const props = withDefaults(
-  defineProps<{
-    show: boolean
-    modalName: string
-    standardSwitchesInitial: UI_I_Switch[]
-    title?: string
-    width?: string
-    height?: string
-    withCollapse?: boolean
-  }>(),
-  {
-    width: '576px',
-    height: '420px',
-    title: '--',
-    withCollapse: undefined,
-  }
-)
+const props = defineProps<{
+  show: boolean
+  data: UI_I_Switch[]
+  isShowAlert: boolean
+}>()
 
 const emits = defineEmits<{
   (event: 'hide'): void
+  (event: 'hide-alert'): void
+  (event: 'show-alert'): void
   (event: 'select-standard-switch', switchId: string): void
 }>()
 
-// UI_I_Localization
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const selectedRowData = ref<UI_I_SelectedSwitch[]>()
-
-const standardSwitches = ref<UI_I_Switch[]>(props.standardSwitchesInitial)
+const selectedRowData = ref<UI_I_SelectedSwitch[]>([])
 
 const headItems = selectStandardSwitchTableHeadFunc(localization.value)
 
 const bodyItems = computed<UI_I_BodyItems[][]>(() =>
-  standardSwitches.value.map((switchData: UI_I_Switch) => [
+  props.data.map((switchData: UI_I_Switch) => [
     {
       editable: false,
       text: switchData.name,
@@ -97,20 +91,6 @@ const bodyItems = computed<UI_I_BodyItems[][]>(() =>
   ])
 )
 
-watch(
-  () => props.standardSwitchesInitial,
-  (newStandardSwitches: UI_I_Switch[]) => {
-    standardSwitches.value = newStandardSwitches
-  },
-  { deep: true, immediate: true }
-)
-
-const isShowErrorMessageAlert = ref<boolean>(false)
-const onHideErrorMessageAlert = (): void => {
-  selectedRowData.value = []
-  isShowErrorMessageAlert.value = false
-}
-
 const onSelectRow = (_index: number, item: UI_I_SelectedSwitch[]): void => {
   selectedRowData.value = item
 }
@@ -122,17 +102,12 @@ const onSelectSwitch = (): void => {
     selectedRowData.value[0].id
 
   if (!selectedSwitchId) {
-    isShowErrorMessageAlert.value = true
+    emits('show-alert')
     return
   }
-  emits('select-standard-switch', selectedSwitchId)
-  onHideErrorMessageAlert()
-  emits('hide')
-}
 
-const onHideModal = (): void => {
-  onHideErrorMessageAlert()
-  emits('hide')
+  emits('select-standard-switch', selectedSwitchId)
+  selectedRowData.value = []
 }
 </script>
 
@@ -140,4 +115,14 @@ const onHideModal = (): void => {
 :deep(.table-wrap) {
   height: 300px;
 }
+
+.with-alert {
+  :deep(.table-wrap) {
+    height: 254px;
+  }
+}
+
+.table-top-margin-container {
+  margin-top: 8px;
+}
 </style>

package/components/common/wizards/network/add/{modals → steps/selectTargetDevice/modals/old}/SelectSwitch.vue

@@ -1,23 +1,30 @@
 <template>
   <div class="select-table-modal">
     <atoms-modal
-      :width="props.width"
-      :height="props.height"
+      width="576px"
+      height="468px"
       :show="props.show"
-      :title="props.title"
-      @hide="onHideModal"
+      :title="localization.common.selectSwitch"
+      @hide="emits('hide')"
     >
       <template #modalBody>
         <atoms-alert
-          v-if="isShowErrorMessageAlert"
+          v-if="props.isShowAlert"
           :items="[
             localization.common.noSwitchIsSelectedSelectSwitchToContinue,
           ]"
           status="alert-danger"
           test-id="select-switch-alert"
-          @remove="onHideErrorMessageAlert"
+          @remove="emits('hide-alert')"
         />
-        <div class="table-top-margin-container">
+        <div
+          :class="[
+            'table-top-margin-container',
+            {
+              'with-alert': props.isShowAlert,
+            },
+          ]"
+        >
           <atoms-table-simple-table
             :head-items="headItems"
             :body-items="bodyItems"
@@ -30,12 +37,12 @@
         <button
           data-id="select-switch-hide-button"
           class="btn btn-outline"
-          @click="onHideModal"
+          @click="emits('hide')"
         >
           {{ localization.common.cancel }}
         </button>
         <button
-          data-id="select-submit-hide-button"
+          data-id="select-switch-submit-button"
           class="btn btn-primary"
           @click="onSelectSwitch"
         >
@@ -55,33 +62,22 @@ import type {
 } from '~/components/common/wizards/network/add/lib/models/interfaces'
 import { selectSwitchTableHeadFunc } from '~/components/common/wizards/network/add/lib/config/config'
 
-const props = withDefaults(
-  defineProps<{
-    show: boolean
-    modalName: string
-    data: UI_I_Switch[]
-    title?: string
-    width?: string
-    height?: string
-    withCollapse?: boolean
-  }>(),
-  {
-    width: '576px',
-    height: '420px',
-    title: '--',
-    withCollapse: undefined,
-  }
-)
+const props = defineProps<{
+  show: boolean
+  data: UI_I_Switch[]
+  isShowAlert: boolean
+}>()
 
 const emits = defineEmits<{
   (event: 'hide'): void
+  (event: 'hide-alert'): void
+  (event: 'show-alert'): void
   (event: 'select-switch', switchId: string): void
 }>()
 
-// UI_I_Localization
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const selectedRowData = ref<UI_I_SelectedSwitch[]>()
+const selectedRowData = ref<UI_I_SelectedSwitch[]>([])
 
 const headItems = selectSwitchTableHeadFunc(localization.value)
 
@@ -99,12 +95,6 @@ const bodyItems = computed<UI_I_BodyItems[][]>(() =>
   ])
 )
 
-const isShowErrorMessageAlert = ref<boolean>(false)
-const onHideErrorMessageAlert = (): void => {
-  selectedRowData.value = []
-  isShowErrorMessageAlert.value = false
-}
-
 const onSelectRow = (_index: number, item: UI_I_SelectedSwitch[]): void => {
   selectedRowData.value = item
 }
@@ -114,18 +104,14 @@ const onSelectSwitch = (): void => {
     selectedRowData.value &&
     selectedRowData.value[0] &&
     selectedRowData.value[0].id
+
   if (!selectedSwitchId) {
-    isShowErrorMessageAlert.value = true
+    emits('show-alert')
     return
   }
-  emits('select-switch', selectedSwitchId)
-  onHideErrorMessageAlert()
-  emits('hide')
-}
 
-const onHideModal = (): void => {
-  onHideErrorMessageAlert()
-  emits('hide')
+  emits('select-switch', selectedSwitchId)
+  selectedRowData.value = []
 }
 </script>
 
@@ -133,4 +119,14 @@ const onHideModal = (): void => {
 :deep(.table-wrap) {
   height: 300px;
 }
+
+.with-alert {
+  :deep(.table-wrap) {
+    height: 254px;
+  }
+}
+
+.table-top-margin-container {
+  margin-top: 8px;
+}
 </style>

package/components/common/wizards/network/add/validations/connectionSettings.ts

@@ -1,11 +1,11 @@
-import type { UI_I_ConnectionSettings } from '~/components/common/wizards/network/add/lib/models/interfaces'
-import { UI_E_ValidationFields } from '~/components/common/wizards/network/add/lib/models/enums'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
 import type {
   UI_I_ValidationReturn,
   UI_I_WizardStep,
-} from '~/components/atoms/wizard/lib/models/interfaces'
+} 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_ConnectionSettings } from '~/components/common/wizards/network/add/lib/models/interfaces'
+import { UI_E_ValidationFields } from '~/components/common/wizards/network/add/lib/models/enums'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
 import { checkVlanId } from '~/components/common/wizards/network/add/validations/common'
 
 export const validateVlanIdConnectionSettingsLocal = (

package/components/common/wizards/network/add/validations/createStandardSwitch.ts

@@ -1,12 +1,12 @@
+import type {
+  UI_I_ValidationReturn,
+  UI_I_WizardStep,
+} from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
 import type {
   UI_I_AdapterStatus,
   UI_I_Adapter,
 } from '~/components/common/diagramMain/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type {
-  UI_I_ValidationReturn,
-  UI_I_WizardStep,
-} from '~/components/atoms/wizard/lib/models/interfaces'
 
 export const checkAdaptersSync = (
   localization: UI_I_Localization,

package/components/common/wizards/network/add/validations/ipFourSettings.ts

@@ -1,11 +1,11 @@
-import type { UI_I_IpFourSettings } from '~/components/common/wizards/network/add/lib/models/interfaces'
-import { UI_E_ValidationFields } from '~/components/common/wizards/network/add/lib/models/enums'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
+import type Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils/utils'
 import type {
   UI_I_ValidationReturn,
   UI_I_WizardStep,
-} from '~/components/atoms/wizard/lib/models/interfaces'
+} from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
+import type { UI_I_IpFourSettings } from '~/components/common/wizards/network/add/lib/models/interfaces'
+import { UI_E_ValidationFields } from '~/components/common/wizards/network/add/lib/models/enums'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
 import { checkIfValidIP } from '~/components/common/wizards/network/add/validations/common'
 
 export const validateAddressIpFourSettingsLocal = (

package/components/common/wizards/network/add/validations/networkValidation.ts

@@ -1,11 +1,11 @@
-import type { UI_I_AddNetworkingEmits } from '~/components/common/wizards/network/add/lib/models/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
+import type Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils/utils'
 import type {
   UI_I_AsyncCheckReturn,
   UI_I_ValidationReturn,
   UI_I_WizardStep,
-} from '~/components/atoms/wizard/lib/models/interfaces'
+} from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
+import type { UI_I_AddNetworkingEmits } from '~/components/common/wizards/network/add/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
 
 const checkNetwork = async (
   label: string,

package/components/common/wizards/network/add/validations/physicalAdapter.ts

@@ -1,10 +1,10 @@
-// import { UI_E_ValidationFields } from '~/components/common/wizards/network/add/lib/models/enums'
-// import type { UI_I_Localization } from '~/lib/models/interfaces'
-// import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
 // import {
 //     UI_I_ValidationReturn,
 //     UI_I_WizardStep,
-// } from '~/components/atoms/wizard/lib/models/interfaces'
+// } 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 { UI_E_ValidationFields } from '~/components/common/wizards/network/add/lib/models/enums'
+// import type { UI_I_Localization } from '~/lib/models/interfaces'
 // import {
 //     UI_I_AdapterStatus,
 //     UI_I_Adapter,

package/components/common/wizards/network/add/validations/portProperties.ts

@@ -1,8 +1,8 @@
+import type Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils/utils'
+import type {UI_I_ValidationReturn, UI_I_WizardStep} from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
 import type { UI_I_PortProperties } from '~/components/common/wizards/network/add/lib/models/interfaces'
 import { UI_E_ValidationFields } from '~/components/common/wizards/network/add/lib/models/enums'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
-import type {UI_I_ValidationReturn, UI_I_WizardStep} from '~/components/atoms/wizard/lib/models/interfaces'
 import {
   checkVlanId,
   checkMtu,

package/components/common/wizards/network/add/validations/targetDevice.ts

@@ -1,11 +1,11 @@
-import type { UI_I_TargetDevice } from '~/components/common/wizards/network/add/lib/models/interfaces'
-import { UI_E_ValidationFields } from '~/components/common/wizards/network/add/lib/models/enums'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
+import type Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils/utils'
 import type {
   UI_I_ValidationReturn,
   UI_I_WizardStep,
-} from '~/components/atoms/wizard/lib/models/interfaces'
+} from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
+import type { UI_I_TargetDevice } from '~/components/common/wizards/network/add/lib/models/interfaces'
+import { UI_E_ValidationFields } from '~/components/common/wizards/network/add/lib/models/enums'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
 import { checkMtu } from '~/components/common/wizards/network/add/validations/common'
 
 export const validateMtuTargetDeviceLocal = (
@@ -18,7 +18,7 @@ export const validateMtuTargetDeviceLocal = (
     UI_E_ValidationFields.TARGET_DEVICE_MTU,
     data.selected === '3' && checkMtu(data.mtu || 0),
     localization.common.mtuInvalidMessage,
-      localization.common.mtuInvalidMessage
+    ''
   )
 }
 
@@ -26,7 +26,8 @@ export const checkTargetDeviceSync = (
   localization: UI_I_Localization,
   data: UI_I_TargetDevice,
   wizard: Wizard,
-  value: UI_I_WizardStep[]
+  value: UI_I_WizardStep[],
+  isNewView: boolean
 ): UI_I_ValidationReturn => {
   let stepHasError = false
 
@@ -36,7 +37,7 @@ export const checkTargetDeviceSync = (
       UI_E_ValidationFields.TARGET_DEVICE_NETWORK,
       {
         fieldMessage: localization.common.networkInvalidMessage,
-        alertMessage: localization.common.networkInvalidMessage,
+        alertMessage: isNewView ? '' : localization.common.networkInvalidMessage,
       }
     )
   } else if (
@@ -55,7 +56,7 @@ export const checkTargetDeviceSync = (
       UI_E_ValidationFields.TARGET_DEVICE_STANDARD_SWITCH,
       {
         fieldMessage: localization.common.standardSwitchInvalidMessage,
-        alertMessage: localization.common.standardSwitchInvalidMessage,
+        alertMessage: isNewView ? '' : localization.common.standardSwitchInvalidMessage,
       }
     )
   } else if (
@@ -74,7 +75,7 @@ export const checkTargetDeviceSync = (
       UI_E_ValidationFields.TARGET_DEVICE_SWITCH,
       {
         fieldMessage: localization.common.switchInvalidMessage,
-        alertMessage: localization.common.switchInvalidMessage,
+        alertMessage: isNewView ? '' : localization.common.switchInvalidMessage,
       }
     )
   } else if (wizard.hasMessage(1, UI_E_ValidationFields.TARGET_DEVICE_SWITCH)) {

package/components/common/wizards/vm/migrate/Migrate.vue

@@ -93,8 +93,8 @@
 import type {
   UI_I_WizardStep,
   UI_I_ValidationReturn,
-} from '~/components/atoms/wizard/lib/models/interfaces'
-import Wizard from '~/components/atoms/wizard/lib/utils/utils'
+} from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
+import Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils/utils'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_T_Project } from '~/lib/models/types'
 import type {

package/components/common/wizards/vm/migrate/lib/config/steps.ts

@@ -1,6 +1,6 @@
+import type { UI_I_WizardStep } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
+import { UI_E_WIZARD_STATUS } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/enums'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_WizardStep } from '~/components/atoms/wizard/lib/models/interfaces'
-import { UI_E_WIZARD_STATUS } from '~/components/atoms/wizard/lib/models/enums'
 
 export const dynamicSteps = {
   schedulingOptions: 0,

package/components/common/wizards/vm/migrate/lib/validations.ts

@@ -1,9 +1,9 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type {
   UI_I_ValidationReturn,
   UI_I_WizardStep,
-} from '~/components/atoms/wizard/lib/models/interfaces'
-import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
+} 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_Localization } from '~/lib/models/interfaces'
 import type { UI_I_ComputeResourceFormLocal } from '~/components/common/wizards/vm/migrate/select/computeResource/lib/models/interfaces'
 import { dynamicSteps } from '~/components/common/wizards/vm/migrate/lib/config/steps'
 

package/components/common/wizards/vm/migrate/select/targetServer/new/New.vue

@@ -121,11 +121,11 @@
 </template>
 
 <script lang="ts" setup>
+import type Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils/utils'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_T_AlertStatus } from '~/components/atoms/alert/lib/models/types'
 import type { UI_I_InitialValidationFields } from '~/components/common/wizards/vm/migrate/select/targetServer/new/lib/models/interfaces'
 import type { UI_I_ConnectEsxiServerForm } from '~/components/common/wizards/vm/migrate/select/targetServer/new/lib/models/interfaces'
-import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
 
 const props = defineProps<{
   wizard: Wizard

package/components/common/wizards/vm/migrate/select/targetServer/targetServer.vue

@@ -22,7 +22,7 @@
 </template>
 
 <script lang="ts" setup>
-import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
+import type Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils/utils'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
 import type { UI_I_ConnectEsxiServerForm } from '~/components/common/wizards/vm/migrate/select/targetServer/new/lib/models/interfaces'

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.5.442",
+  "version": "1.5.443",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",
@@ -35,7 +35,7 @@
     "@vueuse/components": "^10.1.2",
     "date-fns": "^2.29.3",
     "bfg-nuxt-3-graph": "1.0.26",
-    "bfg-uikit": "1.0.496",
+    "bfg-uikit": "1.0.507",
     "html2canvas": "^1.4.1",
     "prettier-eslint": "^15.0.1"
   }

package/components/atoms/wizard/lib/models/enums.ts

@@ -1,8 +0,0 @@
-export enum UI_E_WIZARD_STATUS {
-  COMPLETED,
-  SELECTED,
-  INACTIVE,
-  ACTIVE,
-  INVALID,
-  INVALID_SELECTED,
-}

package/components/atoms/wizard/lib/models/interfaces.ts

@@ -1,59 +0,0 @@
-import { UI_E_WIZARD_STATUS } from '~/components/atoms/wizard/lib/models/enums'
-
-export interface UI_I_ErrorFields {
-  alert: string
-  field: string
-}
-
-export interface UI_I_WizardStep {
-  id: number
-  title: string
-  status: UI_E_WIZARD_STATUS
-  fields: {
-    [key: string]: UI_I_ErrorFields
-  }
-  isValid: boolean
-  testId: string
-  stepName?: string
-  subTitle?: string
-  accessDynamicTestIdForStep?: boolean
-  accessDynamicTestIdForHide?: boolean
-  accessDynamicTestIdForBack?: boolean
-  accessDynamicTestIdForNext?: boolean
-  accessDynamicTestIdForFinish?: boolean
-}
-
-export interface UI_I_WizardStepNavigation
-  extends Omit<UI_I_WizardStep, 'status'> {
-  status: {
-    disabled: boolean
-    active: boolean
-    error: boolean
-    complete: boolean
-  }
-}
-
-export interface UI_I_WizardSchemeData {
-  stepId: number
-  dataId: string
-}
-
-export interface UI_I_Loader {
-  status?: boolean
-  messages?: string[]
-}
-
-export interface UI_I_ValidationReturn {
-  stepHasError: boolean
-  stepShouldStop?: {
-    ifOnCurrentStep: boolean
-    ifFromAnyStep: boolean
-    stoppageStepId: number
-  }
-  newValue: UI_I_WizardStep[]
-}
-
-export interface UI_I_AsyncCheckReturn {
-  isValid: boolean
-  message: string
-}