bfg-common 1.5.486 → 1.5.488

package/components/common/wizards/network/add/steps/createStandardSwitch/CreateStandardSwitchNew.vue

@@ -0,0 +1,80 @@
+<template>
+  <div class="content">
+    <common-adapter-manager
+      :adapters="props.adapters"
+      :free-adapters="props.freeAdapters"
+      :added-adapters="props.addedAdapters"
+      :core-adapters="props.coreAdapters"
+      :adapter-status="props.adapterStatus"
+      :is-dark-mode="props.isDarkMode"
+      :test-id="props.testId"
+      :is-active="props.isActive"
+      :full-mode="props.fullMode"
+      :is-show-no-connected-active-adapters-modal="
+        props.isShowNoConnectedActiveAdaptersModal
+      "
+      :is-show-no-active-adapters-modal="props.isShowNoActiveAdaptersModal"
+      @hide-no-active-adapters-modal="onHideNoActiveAdaptersModal"
+      @hide-no-connected-active-adapters-modal="
+        onHideNoConnectedActiveAdaptersModal
+      "
+      @submit-from-modal="onConfirmNoActiveAdaptersModal"
+      @change-added-adapters="onChangeAddedAdapters"
+      @change-adapter-status="onChangeAdapterStatus"
+      @get-free-adapters="onGetFreeAdapters"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_ItemsWithTotalCounts } from '~/lib/models/interfaces'
+import type {
+  UI_I_Adapter,
+  UI_I_AdapterStatus,
+  UI_I_SwitchAdapterItem,
+} from '~/components/common/diagramMain/lib/models/interfaces'
+
+const props = defineProps<{
+  adapters: UI_I_ItemsWithTotalCounts<UI_I_SwitchAdapterItem>
+  freeAdapters: UI_I_Adapter[]
+  addedAdapters: string[]
+  coreAdapters: string[]
+  adapterStatus: UI_I_AdapterStatus
+  isDarkMode: boolean
+  testId: string
+  isActive: boolean
+  fullMode: boolean
+  isShowNoActiveAdaptersModal: boolean
+  isShowNoConnectedActiveAdaptersModal: boolean
+}>()
+
+const emits = defineEmits<{
+  (event: 'get-free-adapters', showModal: () => void): void
+  (event: 'change-added-adapters', addedAdapters: string[]): void
+  (event: 'change-adapter-status', adapterStatus: UI_I_AdapterStatus): void
+  (event: 'submit-from-modal'): void
+  (event: 'hide-no-connected-active-adapters-modal'): void
+  (event: 'hide-no-active-adapters-modal'): void
+}>()
+
+const onGetFreeAdapters = (showModal: () => void): void =>
+  emits('get-free-adapters', showModal)
+
+const onChangeAddedAdapters = (addedAdapters: string[]): void =>
+  emits('change-added-adapters', addedAdapters)
+
+const onChangeAdapterStatus = (adapterStatus: UI_I_AdapterStatus): void =>
+  emits('change-adapter-status', adapterStatus)
+
+const onConfirmNoActiveAdaptersModal = (): void => emits('submit-from-modal')
+const onHideNoConnectedActiveAdaptersModal = (): void =>
+  emits('hide-no-connected-active-adapters-modal')
+const onHideNoActiveAdaptersModal = (): void =>
+  emits('hide-no-active-adapters-modal')
+</script>
+
+<style lang="scss" scoped>
+.content {
+  margin-top: 16px;
+}
+</style>

package/components/common/wizards/network/add/steps/{CreateStandardSwitch.vue → createStandardSwitch/CreateStandardSwitchOld.vue}

@@ -8,66 +8,57 @@
         :core-adapters="props.coreAdapters"
         :adapter-status="props.adapterStatus"
         :is-dark-mode="props.isDarkMode"
-        test-id="adapter-manager"
-        is-active
-        full-mode
+        :test-id="props.testId"
+        :is-active="props.isActive"
+        :full-mode="props.fullMode"
+        :is-show-no-connected-active-adapters-modal="
+          props.isShowNoConnectedActiveAdaptersModal
+        "
+        :is-show-no-active-adapters-modal="props.isShowNoActiveAdaptersModal"
+        @hide-no-active-adapters-modal="onHideNoActiveAdaptersModal"
+        @hide-no-connected-active-adapters-modal="
+          onHideNoConnectedActiveAdaptersModal
+        "
+        @submit-from-modal="onConfirmNoActiveAdaptersModal"
         @change-added-adapters="onChangeAddedAdapters"
         @change-adapter-status="onChangeAdapterStatus"
         @get-free-adapters="onGetFreeAdapters"
       />
     </div>
-    <teleport to="body">
-      <common-adapter-manager-no-connected-active-adapters-modal
-        :show="props.isShowNoConnectedActiveAdaptersModal"
-        :title="localization.common.physicalNetworkAdaptersWarning"
-        @hide="onHideNoConnectedActiveAdaptersModal"
-        @submit="onConfirmNoActiveAdaptersModal"
-      />
-      <common-adapter-manager-no-active-adapters-modal
-        :show="props.isShowNoActiveAdaptersModal"
-        :title="localization.common.physicalNetworkAdaptersWarning"
-        @hide="onHideNoActiveAdaptersModal"
-        @submit="onConfirmNoActiveAdaptersModal"
-      />
-    </teleport>
   </div>
 </template>
 
 <script setup lang="ts">
-import type {
-  UI_I_Localization,
-  UI_I_ItemsWithTotalCounts,
-} from '~/lib/models/interfaces'
+import type { UI_I_ItemsWithTotalCounts } from '~/lib/models/interfaces'
 import type {
   UI_I_Adapter,
   UI_I_AdapterStatus,
   UI_I_SwitchAdapterItem,
 } from '~/components/common/diagramMain/lib/models/interfaces'
 
-// Props from up
 const props = defineProps<{
-  addedAdapters: string[]
-  freeAdapters: UI_I_Adapter[]
-  adapterStatus: UI_I_AdapterStatus
   adapters: UI_I_ItemsWithTotalCounts<UI_I_SwitchAdapterItem>
+  freeAdapters: UI_I_Adapter[]
+  addedAdapters: string[]
   coreAdapters: string[]
-  isShowNoConnectedActiveAdaptersModal: boolean
-  isShowNoActiveAdaptersModal: boolean
+  adapterStatus: UI_I_AdapterStatus
   isDarkMode: boolean
+  testId: string
+  isActive: boolean
+  fullMode: boolean
+  isShowNoActiveAdaptersModal: boolean
+  isShowNoConnectedActiveAdaptersModal: boolean
 }>()
 
 const emits = defineEmits<{
   (event: 'get-free-adapters', showModal: () => void): void
   (event: 'change-added-adapters', addedAdapters: string[]): void
   (event: 'change-adapter-status', adapterStatus: UI_I_AdapterStatus): void
-  (event: 'confirm-no-active-adapters-modal'): void
+  (event: 'submit-from-modal'): void
   (event: 'hide-no-connected-active-adapters-modal'): void
   (event: 'hide-no-active-adapters-modal'): void
 }>()
 
-// UI_I_Localization
-const localization = computed<UI_I_Localization>(() => useLocal())
-
 const onGetFreeAdapters = (showModal: () => void): void =>
   emits('get-free-adapters', showModal)
 
@@ -77,13 +68,13 @@ const onChangeAddedAdapters = (addedAdapters: string[]): void =>
 const onChangeAdapterStatus = (adapterStatus: UI_I_AdapterStatus): void =>
   emits('change-adapter-status', adapterStatus)
 
-const onConfirmNoActiveAdaptersModal = (): void =>
-  emits('confirm-no-active-adapters-modal')
+const onConfirmNoActiveAdaptersModal = (): void => emits('submit-from-modal')
 const onHideNoConnectedActiveAdaptersModal = (): void =>
   emits('hide-no-connected-active-adapters-modal')
 const onHideNoActiveAdaptersModal = (): void =>
   emits('hide-no-active-adapters-modal')
 </script>
+
 <style lang="scss" scoped>
 :deep(.table-fixed-height) {
   max-height: 302px;

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

@@ -0,0 +1,143 @@
+<template>
+  <common-wizards-network-add-steps-ip-four-settings-new
+    v-if="isNewView"
+    v-model="fields"
+    :messages-fields="props.messagesFields"
+  />
+  <common-wizards-network-add-steps-ip-four-settings-old
+    v-else
+    v-model="fields"
+    :messages-fields="props.messagesFields"
+    :alert-messages="props.alertMessages"
+    @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_I_IpFourSettings,
+  UI_I_TCPStack,
+} from '~/components/common/wizards/network/add/lib/models/interfaces'
+import {
+  removeIpFourSettingsValidationLocal,
+  validateAddressIpFourSettingsLocal,
+  validateGatewayIpFourSettingsLocal,
+  validateMaskIpFourSettingsLocal,
+} from '~/components/common/wizards/network/add/validations/validations'
+import { UI_E_ValidationFields } from '~/components/common/wizards/network/add/lib/models/enums'
+
+const props = defineProps<{
+  wizard: Wizard
+  ipFourSettings: UI_I_IpFourSettings
+  messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
+  alertMessages: string[]
+  tcp: string
+  gatewayFlag: boolean
+  tcpStacks?: UI_I_TCPStack[]
+}>()
+
+const emits = defineEmits<{
+  (event: 'change-ip-four-settings', ipFourSettings: UI_I_IpFourSettings): void
+  (event: 'change-gateway-flag', value: boolean): void
+  (event: 'hide-alert', stepId: 4): void
+}>()
+
+const { $store }: any = useNuxtApp()
+
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const fields = ref<UI_I_IpFourSettings>(useDeepCopy(props.ipFourSettings))
+
+let oldFields = useDeepCopy(fields.value)
+
+watch(
+  fields,
+  (newFields: UI_I_IpFourSettings) => {
+    if (newFields.ipSettings === '1') {
+      ;(oldFields.ipSettings === '0' ||
+        oldFields.static.ipFourAddress !== newFields.static.ipFourAddress) &&
+        validateAddressIpFourSettingsLocal(
+          localization.value,
+          newFields,
+          props.wizard
+        )
+      ;(oldFields.ipSettings === '0' ||
+        oldFields.static.subnetMask !== newFields.static.subnetMask) &&
+        validateMaskIpFourSettingsLocal(
+          localization.value,
+          newFields,
+          props.wizard
+        )
+
+      const isGatewayChanged =
+        newFields.static.defaultGateway &&
+        oldFields.static.defaultGateway.value !==
+          newFields.static.defaultGateway.value
+
+      emits('change-gateway-flag', true)
+
+      if (
+        oldFields.static.defaultGateway.override &&
+        !newFields.static.defaultGateway.override
+      ) {
+        fields.value.static.defaultGateway.value = props.tcpStacks.find(
+          (tcp: UI_I_TCPStack) => tcp.id === props.tcp
+        ).gateway
+        props.wizard.removeValidationLocal(
+          4,
+          UI_E_ValidationFields.IPV_SETTINGS_GATEWAY
+        )
+      }
+
+      ;(oldFields.ipSettings === '0' || isGatewayChanged) &&
+        validateGatewayIpFourSettingsLocal(
+          localization.value,
+          newFields,
+          props.wizard
+        )
+    } else {
+      removeIpFourSettingsValidationLocal(props.wizard)
+    }
+
+    oldFields = useDeepCopy(fields.value)
+
+    emits('change-ip-four-settings', newFields)
+  },
+  { deep: true }
+)
+
+watch(
+  () => props.tcpStacks,
+  (newValue: UI_I_TCPStack[]) => {
+    if (fields.value.static.defaultGateway.value === '') {
+      fields.value.static.defaultGateway.value = newValue?.[0]?.gateway || ''
+    }
+  },
+  { deep: true, immediate: true }
+)
+
+watch(
+  () => props.tcp,
+  (newValue: string) => {
+    if (newValue && !props.gatewayFlag) {
+      fields.value.static.defaultGateway.value = props.tcpStacks.find(
+        (tcp: UI_I_TCPStack) => tcp.id === newValue
+      ).gateway
+    }
+  },
+  { immediate: true }
+)
+
+const onHideAlert = (): void => {
+  emits('hide-alert', 4)
+}
+</script>
+<style lang="scss" scoped></style>

package/components/common/wizards/network/add/steps/ipFourSettings/IpFourSettingsNew.vue

@@ -0,0 +1,224 @@
+<template>
+  <div class="content">
+    <div class="radio-container">
+      <div
+        :class="['radio-block', { selected: fields.ipSettings === '0' }]"
+        @click="fields.ipSettings = '0'"
+      >
+        <ui-radio
+          v-model="fields.ipSettings"
+          :label="localization.common.obtainIPv4SettingsAutomatically"
+          value="0"
+          test-id="obtain-input"
+          size="md"
+        />
+      </div>
+
+      <div
+        :class="['radio-block', { selected: fields.ipSettings === '1' }]"
+        @click="fields.ipSettings = '1'"
+      >
+        <ui-radio
+          v-model="fields.ipSettings"
+          :label="localization.common.useStaticIPv4Settings"
+          value="1"
+          test-id="static-input"
+          size="md"
+        />
+      </div>
+    </div>
+
+    <ui-line margin="16px 0" />
+
+    <div :class="['content-fields', { disabled: fields.ipSettings === '0' }]">
+      <div class="col">
+        <h4 class="content-subtitle col-left">
+          {{ localization.common.ipv4address }}
+        </h4>
+        <div class="col-right">
+          <ui-input
+            id="ip-four-address"
+            v-model="fields.static.ipFourAddress"
+            test-id="ip-four-address-input"
+            type="text"
+            placeholder="10.10.123.1"
+            size="md"
+            :error="props.messagesFields['ipv4_settings.ipv4'].field"
+            :disabled="fields.ipSettings === '0'"
+          />
+        </div>
+      </div>
+
+      <ui-line margin="16px 0" />
+
+      <div class="col">
+        <h4 class="content-subtitle col-left">
+          {{ localization.common.subnetMask }}
+        </h4>
+        <div class="col-right">
+          <ui-input
+            id="subnet-mask"
+            v-model="fields.static.subnetMask"
+            test-id="subnet-mask-input"
+            type="text"
+            placeholder="255.255.255.0"
+            size="md"
+            :error="props.messagesFields['ipv4_settings.mask'].field"
+            :disabled="fields.ipSettings === '0'"
+          />
+        </div>
+      </div>
+
+      <ui-line margin="16px 0" />
+
+      <div class="col mb-4">
+        <h4 class="content-subtitle col-left">
+          {{ localization.common.defaultGateway }}
+        </h4>
+        <div class="col-right pt-2">
+          <ui-checkbox
+            id="default-gateway-override-input"
+            v-model="fields.static.defaultGateway.override"
+            class="mb-3"
+            :label-text="
+              localization.common.overrideDefaultGatewayForThisAdapter
+            "
+            :disabled="fields.ipSettings === '0'"
+            test-id="default-gateway-override-input"
+            size="md"
+          />
+          <ui-input
+            id="default-gateway-input"
+            v-model="fields.static.defaultGateway.value"
+            test-id="default-gateway-input"
+            type="text"
+            placeholder="10.10.101.1"
+            size="md"
+            :error="props.messagesFields['ipv4_settings.gateway'].field"
+            :disabled="
+              fields.ipSettings === '0' ||
+              !fields.static.defaultGateway.override
+            "
+          />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_ErrorFields } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
+import type {
+  UI_I_ArbitraryObject,
+  UI_I_Localization,
+} from '~/lib/models/interfaces'
+import type { UI_I_IpFourSettings } from '~/components/common/wizards/network/add/lib/models/interfaces'
+
+const props = defineProps<{
+  modelValue: UI_I_IpFourSettings
+  messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
+}>()
+
+const emits = defineEmits<{
+  (event: 'update:model-value', value: UI_I_PortProperties): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const fields = computed({
+  get(): UI_I_IpFourSettings {
+    return props.modelValue
+  },
+  set(newValue: UI_I_IpFourSettings) {
+    emits('update:model-value', newValue)
+  },
+})
+</script>
+<style scoped lang="scss">
+.content {
+  .radio-container {
+    display: flex;
+    column-gap: 12px;
+    margin: 16px 0;
+  }
+
+  :root.dark-theme {
+    .radio-block:not(.selected).disabled {
+      background-color: #1b2a371f;
+      opacity: unset;
+    }
+  }
+  .radio-block {
+    width: 100%;
+    background-color: var(--radio-block-bg-color);
+    box-shadow: inset 0 0 0 1px var(--radio-block-border-color);
+    transition: box-shadow 0.1s ease-in-out;
+    padding: 12px;
+    border-radius: 8px;
+
+    &:not(.selected):not(.disabled) {
+      &:hover {
+        box-shadow: inset 0 0 0 1px var(--radio-block-border-hover-color);
+      }
+    }
+
+    &:not(.disabled) {
+      cursor: pointer;
+    }
+
+    &:not(.selected).disabled {
+      background-color: #ffffff;
+      opacity: 0.6;
+    }
+
+    &.selected {
+      background-color: var(--radio-block-selected-bg-color);
+      box-shadow: inset 0 0 0 1.5px var(--radio-block-selected-border-color);
+    }
+  }
+
+  :deep(.radio-label__container) {
+    align-items: unset !important;
+  }
+
+  &-subtitle {
+    font-weight: 400;
+    font-size: 13px;
+    line-height: 20px;
+    letter-spacing: 0;
+    vertical-align: middle;
+    color: var(--title-form-first-color);
+  }
+
+  .col {
+    display: flex;
+    column-gap: 16px;
+
+    &-left {
+      padding-top: 8px;
+      width: calc((100% - 8px) / 3);
+    }
+
+    &-right {
+      width: calc(((100% - 8px) / 3) * 2);
+    }
+  }
+
+  &-fields {
+    &.disabled {
+      .content-subtitle {
+        color: var(--btn-text-disabled-color);
+      }
+    }
+  }
+}
+
+@media (max-width: 896px) {
+  .radio-container {
+    display: flex;
+    flex-direction: column;
+    row-gap: 12px;
+    margin: 16px 0;
+  }
+}
+</style>

package/components/common/wizards/network/add/steps/{IpFourSettings.vue → ipFourSettings/IpFourSettingsOld.vue}

@@ -179,121 +179,33 @@
 
 <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_I_IpFourSettings,
-  UI_I_TCPStack,
-} from '~/components/common/wizards/network/add/lib/models/interfaces'
-import {
-  removeIpFourSettingsValidationLocal,
-  validateAddressIpFourSettingsLocal,
-  validateGatewayIpFourSettingsLocal,
-  validateMaskIpFourSettingsLocal,
-} from '~/components/common/wizards/network/add/validations/validations'
+import type { UI_I_IpFourSettings } from '~/components/common/wizards/network/add/lib/models/interfaces'
 
-const props = withDefaults(
-  defineProps<{
-    ipFourSettings: UI_I_IpFourSettings
-    alertMessages: string[]
-    messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
-    wizard: Wizard
-    tcp: string
-    gatewayFlag: boolean
-    tcpStacks?: UI_I_TCPStack[]
-  }>(),
-  {
-    tcpStacks: () => [],
-  }
-)
+const props = defineProps<{
+  modelValue: UI_I_IpFourSettings
+  alertMessages: string[]
+  messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
+}>()
 
 const emits = defineEmits<{
-  (event: 'change-ip-four-settings', ipFourSettings: UI_I_IpFourSettings): void
-  (event: 'change-gateway-flag', value: boolean): void
   (event: 'hide-alert', stepId: 4): void
+  (event: 'update:model-value', value: UI_I_PortProperties): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const fields = ref<UI_I_IpFourSettings>(useDeepCopy(props.ipFourSettings))
-
-let oldFields = useDeepCopy(fields.value)
-
-watch(
-  fields,
-  (newFields: UI_I_IpFourSettings) => {
-    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
-        )
-
-      const isGatewayChanged =
-        newFields.static.defaultGateway &&
-        oldFields.static.defaultGateway.value !==
-          newFields.static.defaultGateway.value
-
-      emits('change-gateway-flag', true)
-
-      if (
-        oldFields.static.defaultGateway.override &&
-        !newFields.static.defaultGateway.override
-      ) {
-        fields.value.static.defaultGateway.value = props.tcpStacks.find(
-          (tcp: UI_I_TCPStack) => tcp.id === props.tcp
-        ).gateway
-      }
-
-      isGatewayChanged &&
-        validateGatewayIpFourSettingsLocal(
-          localization.value,
-          newFields,
-          props.wizard
-        )
-    } else {
-      removeIpFourSettingsValidationLocal(props.wizard)
-    }
-
-    oldFields = useDeepCopy(fields.value)
-
-    emits('change-ip-four-settings', newFields)
+const fields = computed({
+  get(): UI_I_IpFourSettings {
+    return props.modelValue
   },
-  { deep: true }
-)
-
-watch(
-  () => props.tcpStacks,
-  (newValue: UI_I_TCPStack[]) => {
-    if (fields.value.static.defaultGateway.value === '') {
-      fields.value.static.defaultGateway.value = newValue?.[0]?.gateway || ''
-    }
-  },
-  { deep: true, immediate: true }
-)
-
-watch(
-  () => props.tcp,
-  (newValue: string) => {
-    if (newValue && !props.gatewayFlag) {
-      fields.value.static.defaultGateway.value = props.tcpStacks.find(
-        (tcp: UI_I_TCPStack) => tcp.id === newValue
-      ).gateway
-    }
+  set(newValue: UI_I_IpFourSettings) {
+    emits('update:model-value', newValue)
   },
-  { immediate: true }
-)
+})
 
 const onHideAlert = (): void => {
   emits('hide-alert', 4)