bfg-common 1.2.186 → 1.2.187

package/components/common/wizards/network/add/steps/IpFourSettings.vue

@@ -0,0 +1,245 @@
+<template>
+  <div class="wizard-content-container add-networking-step">
+    <div class="wizard-content wizard-content-port">
+      <atoms-alert
+        v-if="props.alertMessages.length"
+        status="alert-danger"
+        :items="props.alertMessages"
+        @remove="onHideAlert"
+      />
+      <form>
+        <div class="radio">
+          <input
+            id="Obtain"
+            v-model="fields.ipSettings"
+            type="radio"
+            value="0"
+            name="IPv4-settings"
+          />
+          <label for="Obtain">
+            {{ localization.obtainIPv4SettingsAutomatically }}
+          </label>
+        </div>
+        <div class="radio">
+          <input
+            id="static"
+            v-model="fields.ipSettings"
+            type="radio"
+            value="1"
+            name="IPv4-settings"
+          />
+          <label for="static"> {{ localization.useStaticIPv4Settings }} </label>
+        </div>
+
+        <div
+          :class="[
+            'form-block form-block-ipv',
+            { disabled: fields.ipSettings === '0' },
+          ]"
+        >
+          <div class="horizontal-flex-container p-b-14">
+            <label class="property-label-group">
+              {{ localization.ipv4address }}
+            </label>
+            <div class="margin-left-property-value-group">
+              <div class="property-value-group">
+                <fieldset>
+                  <atoms-tooltip-error
+                    :has-error="!!props.messagesFields['tcp_config.ipv4'].field"
+                  >
+                    <template #elem>
+                      <input
+                        v-model="fields.static.ipFourAddress"
+                        type="text"
+                        placeholder="e.g. 192.168.1.1"
+                        :class="[
+                          'tooltip-field port-properties-network-label',
+                          {
+                            'danger-not-valid':
+                              props.messagesFields['tcp_config.ipv4'].field,
+                          },
+                        ]"
+                      />
+                    </template>
+                    <template #content>
+                      {{ props.messagesFields['tcp_config.ipv4'].field }}
+                    </template>
+                  </atoms-tooltip-error>
+                </fieldset>
+              </div>
+            </div>
+          </div>
+          <div class="horizontal-flex-container p-b-14">
+            <label class="property-label-group">
+              {{ localization.subnetMask }}
+            </label>
+            <div class="margin-left-property-value-group">
+              <div class="property-value-group">
+                <fieldset>
+                  <atoms-tooltip-error
+                    :has-error="
+                      !!props.messagesFields['tcp_config.net_mask'].field
+                    "
+                  >
+                    <template #elem>
+                      <input
+                        v-model="fields.static.subnetMask"
+                        type="text"
+                        placeholder="e.g. 255.255.255.0"
+                        :class="[
+                          'tooltip-field',
+                          {
+                            'danger-not-valid':
+                              props.messagesFields['tcp_config.net_mask'].field,
+                          },
+                        ]"
+                      />
+                    </template>
+                    <template #content>
+                      {{ props.messagesFields['tcp_config.net_mask'].field }}
+                    </template>
+                  </atoms-tooltip-error>
+                </fieldset>
+              </div>
+            </div>
+          </div>
+          <div class="horizontal-flex-container p-b-14">
+            <label class="property-label-group">
+              {{ localization.defaultGateway }}
+            </label>
+            <div class="margin-left-property-value-group">
+              <div class="property-value-group">
+                <div
+                  class="flex-property-label-group small checkbox-inline with-margin p-b-14"
+                >
+                  <input
+                    id="default-gateway"
+                    v-model="fields.static.defaultGateway.override"
+                    type="checkbox"
+                  />
+                  <label
+                    for="default-gateway"
+                    class="normal-weight normal-font-size"
+                  >
+                    {{ localization.overrideDefaultGatewayForThisAdapter }}
+                  </label>
+                </div>
+                <div>
+                  <fieldset>
+                    <atoms-tooltip-error
+                      :has-error="
+                        !!props.messagesFields['tcp_config.gateway'].field
+                      "
+                    >
+                      <template #elem>
+                        <input
+                          v-model="fields.static.defaultGateway.value"
+                          type="text"
+                          :disabled="!fields.static.defaultGateway.override"
+                          placeholder="10.10.101.1"
+                          :class="[
+                            'tooltip-field',
+                            {
+                              'danger-not-valid':
+                                props.messagesFields['tcp_config.gateway']
+                                  .field,
+                            },
+                          ]"
+                        />
+                      </template>
+                      <template #content>
+                        {{ props.messagesFields['tcp_config.gateway'].field }}
+                      </template>
+                    </atoms-tooltip-error>
+                  </fieldset>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </form>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { UI_I_ArbitraryObject, UI_I_Localization } from '~/models/interfaces'
+import { UI_I_IpFourSettings } from '~/components/common/wizards/network/add/models/interfaces'
+import { UI_I_ErrorFields } from '~/components/atoms/wizard/models/interfaces'
+import type Wizard from '~/components/atoms/wizard/utils/utils'
+import {
+  removeIpFourSettingsValidationLocal,
+  validateAddressIpFourSettingsLocal,
+  validateGatewayIpFourSettingsLocal,
+  validateMaskIpFourSettingsLocal,
+} from '~/components/common/wizards/network/add/validations/validations'
+
+const props = defineProps<{
+  ipFourSettings: UI_I_IpFourSettings
+  alertMessages: string[]
+  messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
+  wizard: Wizard
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const emits = defineEmits<{
+  (event: 'change-ip-four-settings', ipFourSettings: UI_I_IpFourSettings): void
+  (event: 'hide-alert', stepId: 4): void
+}>()
+
+const fields = ref<UI_I_IpFourSettings>(useDeepCopy(props.ipFourSettings))
+
+let oldFields = useDeepCopy(fields.value)
+
+watch(
+  fields,
+  (newFields: UI_I_IpFourSettings) => {
+    console.log(oldFields, newFields)
+
+    if (newFields.ipSettings === '1') {
+      oldFields.static.ipFourAddress !== newFields.static.ipFourAddress &&
+        validateAddressIpFourSettingsLocal(
+          localization.value,
+          newFields,
+          props.wizard
+        )
+
+      oldFields.static.subnetMask !== newFields.static.subnetMask &&
+        validateMaskIpFourSettingsLocal(
+          localization.value,
+          newFields,
+          props.wizard
+        )
+
+      newFields.static.defaultGateway &&
+        oldFields.static.defaultGateway.value !==
+          newFields.static.defaultGateway.value &&
+        validateGatewayIpFourSettingsLocal(
+          localization.value,
+          newFields,
+          props.wizard
+        )
+    } else {
+      removeIpFourSettingsValidationLocal(props.wizard)
+    }
+
+    oldFields = useDeepCopy(fields.value)
+
+    emits('change-ip-four-settings', newFields)
+  },
+  { deep: true }
+)
+
+const onHideAlert = (): void => {
+  emits('hide-alert', 4)
+}
+</script>
+<style lang="scss" scoped>
+.p-b-14 {
+  padding-bottom: 14px;
+}
+fieldset :deep(.flex) {
+  width: 144px;
+}
+</style>

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

@@ -1,9 +1,5 @@
 <template>
   <div class="wizard-content-container add-networking-step">
-    <common-add-networking-steps-header
-      :title="props.title"
-      :text="props.text"
-    />
     <div class="wizard-content">
       <common-adapter-manager
         test-id="adapter-manager"
@@ -14,11 +10,4 @@
   </div>
 </template>
 
-<script setup lang="ts">
-// Props from up
-const props = defineProps<{
-  title: string
-  text: string
-  stepId: number
-}>()
-</script>
+<script setup lang="ts"></script>

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

@@ -1,15 +1,11 @@
 <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="hasValidationError"
+        v-if="props.alertMessages.length"
         status="alert-danger"
-        :items="props.errorMessages"
-        @remove="onHideErrorMessageAlert"
+        :items="props.alertMessages"
+        @remove="onHideAlert"
       />
       <form>
         <b class="property-label-group">
@@ -24,7 +20,7 @@
             <div class="property-value-group">
               <fieldset>
                 <atoms-tooltip-error
-                  :has-error="!!fieldsErrorMessages.networkLabel"
+                  :has-error="!!props.messagesFields.network_name.field"
                 >
                   <template #elem>
                     <input
@@ -35,14 +31,15 @@
                       :class="[
                         'tooltip-field port-properties-network-label',
                         {
-                          'danger-not-valid': fieldsErrorMessages.networkLabel,
+                          'danger-not-valid':
+                            props.messagesFields.network_name.field,
                         },
                       ]"
                       @click.stop
                     />
                   </template>
                   <template #content>
-                    {{ fieldsErrorMessages.networkLabel }}
+                    {{ props.messagesFields.network_name.field }}
                   </template>
                 </atoms-tooltip-error>
               </fieldset>
@@ -61,12 +58,13 @@
                     v-model="fields.vlanId"
                     :items="vlanIdSelectData"
                     :class="{
-                      'danger-not-valid': fieldsErrorMessages.vlanId,
+                      'danger-not-valid':
+                        props.messagesFields['new_network.vlan'].field,
                     }"
                     @click.stop
                   />
                   <div
-                    v-show="fieldsErrorMessages.vlanId"
+                    v-show="props.messagesFields['new_network.vlan'].field"
                     class="flex-align-center"
                   >
                     <div class="tooltip flex align-middle">
@@ -77,7 +75,7 @@
                         name="info"
                       />
                       <div class="tooltip-top-left tooltip-content error">
-                        {{ fieldsErrorMessages.vlanId }}
+                        {{ props.messagesFields['new_network.vlan'].field }}
                       </div>
                     </div>
                   </div>
@@ -101,7 +99,9 @@
                   <option value="1">{{ localization.custom }}</option>
                 </select>
               </div>
-              <atoms-tooltip-error :has-error="!!fieldsErrorMessages.mtu">
+              <atoms-tooltip-error
+                :has-error="!!props.messagesFields.mtu.field"
+              >
                 <template #elem>
                   <input
                     id="mtu"
@@ -112,14 +112,14 @@
                       'tooltip-field show-arrow',
                       {
                         disabled: fields.mtu.option === '0',
-                        'danger-not-valid': fieldsErrorMessages.mtu,
+                        'danger-not-valid': props.messagesFields.mtu.field,
                       },
                     ]"
                     @click.stop
                   />
                 </template>
                 <template #content>
-                  {{ fieldsErrorMessages.mtu }}
+                  {{ props.messagesFields.mtu.field }}
                 </template>
               </atoms-tooltip-error>
             </div>
@@ -205,74 +205,45 @@ import { UI_T_Project } from '~/models/types'
 import {
   servicesInitial,
   vlanIdSelectData,
-  portPropertiesFieldsErrorMessages,
   portPropertiesEnabledServicesFunc,
-} from '~/components/common/addNetworking/config'
-import {
-  UI_I_PortProperties,
-  UI_I_PortPropertiesFieldsErrorMessages,
-} from '~/components/common/addNetworking/models/interfaces'
+} 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'
 import {
-  UI_T_PortPropertiesFieldName,
-  UI_T_TCP,
-} from '~/components/common/addNetworking/models/types'
+  validateMtuPortPropertiesLocal,
+  validateNetworkPortPropertiesLocal,
+  validateVlanIdPortPropertiesLocal,
+} from '~/components/common/wizards/network/add/validations/validations'
 
-// Props from up
 const props = withDefaults(
   defineProps<{
-    title: string
-    text: string
-    stepId: number
     portProperties: UI_I_PortProperties
-    isShowErrorMessageAlert: boolean
-    errorMessages: string[]
-    networkLabelExistingErrorMessage: string
-    mtuFromSwitch: number
-    error: UI_I_ArbitraryObject<string>
+    mtuFromSwitch?: number
     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: 'change-error-messages',
-    errorMessages: string[],
-    stepIndex: number
-  ): void
-  (event: 'hide-error-message-alert'): void
-  (event: 'set-error-empty', fieldName: string): void
+  (event: 'hide-alert', stepId: 3): 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>({
@@ -286,56 +257,6 @@ 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
@@ -346,6 +267,7 @@ const setEnabledServiceDefault = (
       services: servicesInitial,
     })
 }
+
 const setEnabledServiceProvisioning = (
   tcp: UI_T_TCP,
   currentFields: UI_I_PortProperties,
@@ -360,6 +282,7 @@ const setEnabledServiceProvisioning = (
       },
     })
 }
+
 const setEnabledServiceVMotion = (
   tcp: UI_T_TCP,
   currentFields: UI_I_PortProperties,
@@ -375,82 +298,40 @@ const setEnabledServiceVMotion = (
     })
 }
 
-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)
-}
+let oldFields = useDeepCopy(fields.value)
 
 // 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)
     }
 
-    const fieldsErrorMessagesFiltered = Object.values(
-      fieldsErrorMessages.value
-    ).filter((errorMessage: string) => errorMessage !== '')
+    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)
 
-    fieldsErrorMessagesFiltered.length === 0 &&
-      emits('hide-error-message-alert')
-
-    emits('change-error-messages', fieldsErrorMessagesFiltered, props.stepId)
     emits('change-port-properties', newFields)
   },
   { deep: true, immediate: true }
@@ -482,11 +363,7 @@ watch(
   }
 )
 
-// Validation message show and hide
-const onHideErrorMessageAlert = (): void => {
-  emits('hide-error-message-alert')
+const onHideAlert = (): void => {
+  emits('hide-alert', 3)
 }
-onUnmounted(() => {
-  emits('hide-error-message-alert')
-})
 </script>

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

@@ -1,15 +1,10 @@
 <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>
@@ -17,13 +12,9 @@
 </template>
 
 <script setup lang="ts">
-import { UI_I_ReadyCompleteFields } from '~/components/common/addNetworking/models/interfaces'
+import { UI_I_ReadyCompleteFields } from '~/components/common/wizards/network/add/models/interfaces'
 
-// Props from up
 const props = defineProps<{
-  title: string
-  text: string
-  stepId: number
   readyCompleteFields: UI_I_ReadyCompleteFields[]
 }>()
 </script>