bfg-common 1.2.189 → 1.2.190

package/components/common/{wizards/network/add → addNetworking}/steps/PortProperties.vue

@@ -1,11 +1,15 @@
 <template>
   <div class="wizard-content-container add-networking-step">
+    <common-add-networking-steps-header
+      :title="props.title"
+      :text="props.text"
+    />
     <div class="wizard-content wizard-content-port">
       <atoms-alert
-        v-if="props.alertMessages.length"
+        v-if="hasValidationError"
         status="alert-danger"
-        :items="props.alertMessages"
-        @remove="onHideAlert"
+        :items="props.errorMessages"
+        @remove="onHideErrorMessageAlert"
       />
       <form>
         <b class="property-label-group">
@@ -20,7 +24,7 @@
             <div class="property-value-group">
               <fieldset>
                 <atoms-tooltip-error
-                  :has-error="!!props.messagesFields.network_name.field"
+                  :has-error="!!fieldsErrorMessages.networkLabel"
                 >
                   <template #elem>
                     <input
@@ -31,15 +35,14 @@
                       :class="[
                         'tooltip-field port-properties-network-label',
                         {
-                          'danger-not-valid':
-                            props.messagesFields.network_name.field,
+                          'danger-not-valid': fieldsErrorMessages.networkLabel,
                         },
                       ]"
                       @click.stop
                     />
                   </template>
                   <template #content>
-                    {{ props.messagesFields.network_name.field }}
+                    {{ fieldsErrorMessages.networkLabel }}
                   </template>
                 </atoms-tooltip-error>
               </fieldset>
@@ -58,13 +61,12 @@
                     v-model="fields.vlanId"
                     :items="vlanIdSelectData"
                     :class="{
-                      'danger-not-valid':
-                        props.messagesFields['new_network.vlan'].field,
+                      'danger-not-valid': fieldsErrorMessages.vlanId,
                     }"
                     @click.stop
                   />
                   <div
-                    v-show="props.messagesFields['new_network.vlan'].field"
+                    v-show="fieldsErrorMessages.vlanId"
                     class="flex-align-center"
                   >
                     <div class="tooltip flex align-middle">
@@ -75,7 +77,7 @@
                         name="info"
                       />
                       <div class="tooltip-top-left tooltip-content error">
-                        {{ props.messagesFields['new_network.vlan'].field }}
+                        {{ fieldsErrorMessages.vlanId }}
                       </div>
                     </div>
                   </div>
@@ -99,9 +101,7 @@
                   <option value="1">{{ localization.custom }}</option>
                 </select>
               </div>
-              <atoms-tooltip-error
-                :has-error="!!props.messagesFields.mtu.field"
-              >
+              <atoms-tooltip-error :has-error="!!fieldsErrorMessages.mtu">
                 <template #elem>
                   <input
                     id="mtu"
@@ -112,14 +112,14 @@
                       'tooltip-field show-arrow',
                       {
                         disabled: fields.mtu.option === '0',
-                        'danger-not-valid': props.messagesFields.mtu.field,
+                        'danger-not-valid': fieldsErrorMessages.mtu,
                       },
                     ]"
                     @click.stop
                   />
                 </template>
                 <template #content>
-                  {{ props.messagesFields.mtu.field }}
+                  {{ fieldsErrorMessages.mtu }}
                 </template>
               </atoms-tooltip-error>
             </div>
@@ -205,45 +205,74 @@ import { UI_T_Project } from '~/models/types'
 import {
   servicesInitial,
   vlanIdSelectData,
+  portPropertiesFieldsErrorMessages,
   portPropertiesEnabledServicesFunc,
-} from '~/components/common/wizards/network/add/config'
-import { UI_I_PortProperties } from '~/components/common/wizards/network/add/models/interfaces'
-import { UI_T_TCP } from '~/components/common/wizards/network/add/models/types'
-import { UI_I_ErrorFields } from '~/components/atoms/wizard/models/interfaces'
-import type Wizard from '~/components/atoms/wizard/utils/utils'
+} from '~/components/common/addNetworking/config'
+import {
+  UI_I_PortProperties,
+  UI_I_PortPropertiesFieldsErrorMessages,
+} from '~/components/common/addNetworking/models/interfaces'
 import {
-  validateMtuPortPropertiesLocal,
-  validateNetworkPortPropertiesLocal,
-  validateVlanIdPortPropertiesLocal,
-} from '~/components/common/wizards/network/add/validations/validations'
+  UI_T_PortPropertiesFieldName,
+  UI_T_TCP,
+} from '~/components/common/addNetworking/models/types'
 
+// Props from up
 const props = withDefaults(
   defineProps<{
+    title: string
+    text: string
+    stepId: number
     portProperties: UI_I_PortProperties
-    mtuFromSwitch?: number
+    isShowErrorMessageAlert: boolean
+    errorMessages: string[]
+    networkLabelExistingErrorMessage: string
+    mtuFromSwitch: number
+    error: UI_I_ArbitraryObject<string>
     project: UI_T_Project
-    alertMessages: string[]
-    messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
-    wizard: Wizard
   }>(),
   {
     mtuFromSwitch: 1500,
   }
 )
 
+// UI_I_Localization
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const isSphereProject = computed<boolean>(() => props.project === 'sphere')
 
+// Making port properties enabled services template
 const portPropertiesEnabledServices = computed(() =>
   portPropertiesEnabledServicesFunc(localization.value, isSphereProject.value)
 )
 
+// Define emits for changing data and validation messages
 const emits = defineEmits<{
   (event: 'change-port-properties', portProperties: UI_I_PortProperties): void
-  (event: 'hide-alert', stepId: 3): void
+  (
+    event: 'change-error-messages',
+    errorMessages: string[],
+    stepIndex: number
+  ): void
+  (event: 'hide-error-message-alert'): void
+  (event: 'set-error-empty', fieldName: string): void
 }>()
 
+// Checking network label existing
+watch(
+  () => props.networkLabelExistingErrorMessage,
+  (newValue: string) => {
+    if (fieldsErrorMessages.value.networkLabel) return
+
+    fieldsErrorMessages.value.networkLabel = newValue
+  }
+)
+
+// Validation error check for this step
+const hasValidationError = computed<boolean>(
+  () => props.isShowErrorMessageAlert && !!props.errorMessages.length
+)
+
 const mtuCustom = ref<number>()
 
 const fields = ref<UI_I_PortProperties>({
@@ -257,6 +286,56 @@ const fields = ref<UI_I_PortProperties>({
   },
 })
 
+const fieldsErrorMessages = ref<UI_I_PortPropertiesFieldsErrorMessages>(
+  portPropertiesFieldsErrorMessages
+)
+
+const messageTexts = (
+  local: UI_I_Localization
+): UI_I_ArbitraryObject<string> => ({
+  networkLabel: local.networkLabelInvalidMessage,
+  vlanId: local.vlanIdInvalidMessage,
+  mtu: local.mtuInvalidMessage,
+})
+const isNumberInRange = (value: number | string, down: number, up: number) =>
+  isNaN(Number(value)) || Number(value) < down || Number(value) > up
+
+const setMessageOnChangedField = (
+  values: UI_I_PortProperties,
+  name: UI_T_PortPropertiesFieldName,
+  text: string
+): void => {
+  if (
+    name === 'mtu' &&
+    values.mtu.option === '1' &&
+    isNumberInRange(values.mtu.size, 1280, 65535)
+  ) {
+    fieldsErrorMessages.value[name] = text
+    return
+  } else if (name === 'mtu' && !props.error.mtu) {
+    fieldsErrorMessages.value[name] = ''
+    return
+  }
+  if (name === 'networkLabel' && !values.networkLabel) {
+    fieldsErrorMessages.value[name] = text
+    return
+  } else if (name === 'networkLabel' && !props.error.network_name) {
+    fieldsErrorMessages.value[name] = ''
+    return
+  }
+  if (
+    name === 'vlanId' &&
+    values.vlanId !== 'None (0)' &&
+    values.vlanId !== 'All (4095)' &&
+    (isNumberInRange(values.vlanId, 0, 4095) || values.vlanId === '')
+  ) {
+    fieldsErrorMessages.value[name] = text
+  } else if (name === 'vlanId' && !props.error['new_network.vlan']) {
+    fieldsErrorMessages.value[name] = ''
+  }
+}
+
+// Setting enabled services type depends on tcp value
 const setEnabledServiceDefault = (
   tcp: UI_T_TCP,
   currentFields: UI_I_PortProperties
@@ -267,7 +346,6 @@ const setEnabledServiceDefault = (
       services: servicesInitial,
     })
 }
-
 const setEnabledServiceProvisioning = (
   tcp: UI_T_TCP,
   currentFields: UI_I_PortProperties,
@@ -282,7 +360,6 @@ const setEnabledServiceProvisioning = (
       },
     })
 }
-
 const setEnabledServiceVMotion = (
   tcp: UI_T_TCP,
   currentFields: UI_I_PortProperties,
@@ -298,40 +375,82 @@ const setEnabledServiceVMotion = (
     })
 }
 
-let oldFields = useDeepCopy(fields.value)
+watch(
+  () => props.error,
+  (newError) => {
+    fieldsErrorMessages.value = {
+      networkLabel: newError.network_name,
+      vlanId: newError['new_network.vlan'],
+      mtu: newError.mtu,
+    }
+
+    const fieldsErrorMessagesFiltered = Object.values(
+      fieldsErrorMessages.value
+    ).filter(
+      (errorMessage: string | undefined) =>
+        errorMessage !== '' && errorMessage !== undefined
+    )
+
+    emits('change-error-messages', fieldsErrorMessagesFiltered, props.stepId)
+  },
+  { deep: true, immediate: true }
+)
+
+const oldFields = ref<any>(useDeepCopy(fields.value))
+
+const cacheOldFields = (newFields: UI_I_PortProperties): void => {
+  oldFields.value = useDeepCopy(newFields)
+}
+
+const setErrorEmpty = (
+  newValue: UI_I_PortProperties,
+  oldValue: UI_I_PortProperties,
+  fieldName: keyof UI_I_PortProperties,
+  errFieldName: string
+): void => {
+  newValue[fieldName] !== oldValue[fieldName] &&
+    emits('set-error-empty', errFieldName)
+}
 
 // Changing data and validate they
 watch(
   fields,
   (newFields: UI_I_PortProperties) => {
+    setErrorEmpty(newFields, oldFields.value, 'networkLabel', 'network_name')
+    setErrorEmpty(newFields, oldFields.value, 'vlanId', 'new_network.vlan')
+    newFields.mtu.size !== oldFields.value.mtu.size &&
+      emits('set-error-empty', 'mtu')
+
+    cacheOldFields(newFields)
+
+    setMessageOnChangedField(
+      newFields,
+      'mtu',
+      messageTexts(localization.value).mtu
+    )
+    setMessageOnChangedField(
+      newFields,
+      'vlanId',
+      messageTexts(localization.value).vlanId
+    )
+    setMessageOnChangedField(
+      newFields,
+      'networkLabel',
+      messageTexts(localization.value).networkLabel
+    )
     if (newFields.tcp && newFields.tcp !== fields.value.tcp) {
       setEnabledServiceProvisioning(newFields.tcp, fields.value, newFields)
       setEnabledServiceVMotion(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)
+    const fieldsErrorMessagesFiltered = Object.values(
+      fieldsErrorMessages.value
+    ).filter((errorMessage: string) => errorMessage !== '')
 
+    fieldsErrorMessagesFiltered.length === 0 &&
+      emits('hide-error-message-alert')
+
+    emits('change-error-messages', fieldsErrorMessagesFiltered, props.stepId)
     emits('change-port-properties', newFields)
   },
   { deep: true, immediate: true }
@@ -363,7 +482,11 @@ watch(
   }
 )
 
-const onHideAlert = (): void => {
-  emits('hide-alert', 3)
+// Validation message show and hide
+const onHideErrorMessageAlert = (): void => {
+  emits('hide-error-message-alert')
 }
+onUnmounted(() => {
+  emits('hide-error-message-alert')
+})
 </script>

package/components/common/{wizards/network/add → addNetworking}/steps/ReadyComplete.vue

@@ -1,10 +1,15 @@
 <template>
   <div class="wizard-content-container add-networking-step">
+    <common-add-networking-steps-header
+      :title="props.title"
+      :text="props.text"
+    />
     <template
       v-for="readyCompleteField in props.readyCompleteFields"
       :key="readyCompleteField.id"
     >
       <common-diagram-main-modals-view-settings
+        modal-name=""
         :view-settings-field="readyCompleteField"
       />
     </template>
@@ -12,9 +17,13 @@
 </template>
 
 <script setup lang="ts">
-import { UI_I_ReadyCompleteFields } from '~/components/common/wizards/network/add/models/interfaces'
+import { UI_I_ReadyCompleteFields } from '~/components/common/addNetworking/models/interfaces'
 
+// Props from up
 const props = defineProps<{
+  title: string
+  text: string
+  stepId: number
   readyCompleteFields: UI_I_ReadyCompleteFields[]
 }>()
 </script>

package/components/common/{wizards/network/add → addNetworking}/steps/SelectConnectionType.vue

@@ -1,5 +1,9 @@
 <template>
   <div class="wizard-content-container add-networking-step">
+    <common-add-networking-steps-header
+      :title="props.title"
+      :text="props.text"
+    />
     <div class="wizard-content">
       <form @change="onChangeConnectionType">
         <div class="radio">
@@ -55,18 +59,23 @@
 <script setup lang="ts">
 import { UI_I_Localization } from '~/models/interfaces'
 
+// Props from up
 const props = defineProps<{
+  title: string
+  text: string
+  stepId: number
   connectionType: string
 }>()
 
+// UI_I_Localization
 const localization = computed<UI_I_Localization>(() => useLocal())
 
+// Changing data
 const emits = defineEmits<{
   (event: 'change-connection-type', connectionType: string): void
 }>()
-const onChangeConnectionType = (newConnectionType: Event): void => {
-  const target = newConnectionType.target as HTMLFormElement
-  emits('change-connection-type', target?.value)
+const onChangeConnectionType = (newConnectionType: any): void => {
+  emits('change-connection-type', newConnectionType.target.value)
 }
 </script>
 
@@ -75,6 +84,7 @@ const onChangeConnectionType = (newConnectionType: Event): void => {
   height: auto;
   width: inherit;
   margin: 0;
+  padding-top: 12px;
 
   .radio {
     min-height: 20px;
@@ -91,4 +101,6 @@ const onChangeConnectionType = (newConnectionType: Event): void => {
     color: #333;
   }
 }
+
+
 </style>