bfg-common 1.4.799 → 1.4.800

package/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/common.ts

@@ -1,14 +1,14 @@
-export const isIntegerNumberInRange = (
-  value: number | string | undefined,
-  down: number,
-  up: number
-): boolean =>
-  isNaN(Number(value)) ||
-  Number(value) < down ||
-  Number(value) > up ||
-  Number(value) !== Math.round(Number(value))
-
-export const checkVlanId = (vlanId: string): boolean =>
-  vlanId !== 'None (0)' &&
-  vlanId !== 'All (4095)' &&
-  (isIntegerNumberInRange(vlanId, 0, 4095) || vlanId === '')
+export const isIntegerNumberInRange = (
+  value: number | string | undefined,
+  down: number,
+  up: number
+): boolean =>
+  isNaN(Number(value)) ||
+  Number(value) < down ||
+  Number(value) > up ||
+  Number(value) !== Math.round(Number(value))
+
+export const checkVlanId = (vlanId: string): boolean =>
+  vlanId !== 'None (0)' &&
+  vlanId !== 'All (4095)' &&
+  (isIntegerNumberInRange(vlanId, 0, 4095) || vlanId === '')

package/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/connectionSettings.ts

@@ -1,137 +1,137 @@
-import type { UI_I_ConnectionSettings } from '~/components/common/wizards/network/add/lib/models/interfaces'
-import type { UI_I_MigrateVmkernelAdapterEmits } from '~/components/common/diagramMain/lib/models/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type {
-  UI_I_AsyncCheckReturn,
-  UI_I_ValidationReturn,
-  UI_I_WizardStep,
-} from '~/components/atoms/wizard/lib/models/interfaces'
-import { UI_E_MigrationValidationFields } from '~/components/common/diagramMain/lib/models/enums'
-import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
-import { checkVlanId } from '~/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/common'
-
-export const validateVlanIdConnectionSettingsLocal = (
-  localization: UI_I_Localization,
-  data: UI_I_ConnectionSettings,
-  wizard: Wizard
-): void => {
-  wizard.validateFieldLocal(
-    1,
-    UI_E_MigrationValidationFields.CONNECTION_SETTINGS_VLAN,
-    checkVlanId(data.vlanId),
-    localization.common.vlanIdInvalidMessage,
-    localization.common.vlanIdInvalidMessage
-  )
-}
-
-export const validateNetworkConnectionSettingsLocal = (
-  localization: UI_I_Localization,
-  data: UI_I_ConnectionSettings,
-  wizard: Wizard
-): void => {
-  wizard.validateFieldLocal(
-    1,
-    UI_E_MigrationValidationFields.CONNECTION_SETTINGS_NETWORK,
-    data.networkLabel === '',
-    localization.common.networkLabelInvalidMessage,
-    localization.common.networkLabelInvalidMessage
-  )
-}
-
-export const checkConnectionSettingsSync = (
-  localization: UI_I_Localization,
-  data: UI_I_ConnectionSettings,
-  wizard: Wizard,
-  value: UI_I_WizardStep[]
-): UI_I_ValidationReturn => {
-  let stepHasError = false
-
-  if (checkVlanId(data.vlanId)) {
-    stepHasError = wizard.setValidation(
-      1,
-      UI_E_MigrationValidationFields.CONNECTION_SETTINGS_VLAN,
-      {
-        fieldMessage: localization.common.vlanIdInvalidMessage,
-        alertMessage: localization.common.vlanIdInvalidMessage,
-      }
-    )
-  } else if (
-    wizard.hasMessage(
-      1,
-      UI_E_MigrationValidationFields.CONNECTION_SETTINGS_VLAN
-    )
-  ) {
-    value = wizard.removeValidation(
-      1,
-      UI_E_MigrationValidationFields.CONNECTION_SETTINGS_VLAN,
-      value
-    )
-  }
-
-  return {
-    newValue: value,
-    stepHasError,
-  }
-}
-
-const checkNetwork = async (
-  label: string,
-  localization: UI_I_Localization,
-  emits: UI_I_MigrateVmkernelAdapterEmits
-): Promise<UI_I_AsyncCheckReturn> => {
-  if (label) {
-    return new Promise((resolve, _reject) =>
-      emits('check-network-label', label, (message: string) => {
-        if (message === '') {
-          resolve({
-            isValid: true,
-            message: '',
-          })
-        }
-
-        if (message !== '') {
-          resolve({
-            isValid: false,
-            message,
-          })
-        }
-      })
-    )
-  } else {
-    return {
-      isValid: false,
-      message: localization.common.networkLabelInvalidMessage,
-    }
-  }
-}
-
-export const checkNetworkAsync = async (
-  value: UI_I_WizardStep[],
-  label: string,
-  stepId: number,
-  fieldName: string,
-  emits: UI_I_MigrateVmkernelAdapterEmits,
-  localization: UI_I_Localization,
-  wizard: Wizard
-): Promise<UI_I_ValidationReturn> => {
-  let stepHasError = false
-
-  const labelValidation: {
-    isValid: boolean
-    message: string
-  } = await checkNetwork(label, localization, emits)
-
-  if (!labelValidation.isValid) {
-    stepHasError = wizard.setValidation(stepId, fieldName, {
-      fieldMessage: labelValidation.message,
-      alertMessage: labelValidation.message,
-    })
-  } else if (wizard.hasMessage(stepId, fieldName)) {
-    value = wizard.removeValidation(stepId, fieldName, value)
-  }
-
-  return {
-    newValue: value,
-    stepHasError,
-  }
-}
+import type { UI_I_ConnectionSettings } from '~/components/common/wizards/network/add/lib/models/interfaces'
+import type { UI_I_MigrateVmkernelAdapterEmits } from '~/components/common/diagramMain/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type {
+  UI_I_AsyncCheckReturn,
+  UI_I_ValidationReturn,
+  UI_I_WizardStep,
+} from '~/components/atoms/wizard/lib/models/interfaces'
+import { UI_E_MigrationValidationFields } from '~/components/common/diagramMain/lib/models/enums'
+import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
+import { checkVlanId } from '~/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/common'
+
+export const validateVlanIdConnectionSettingsLocal = (
+  localization: UI_I_Localization,
+  data: UI_I_ConnectionSettings,
+  wizard: Wizard
+): void => {
+  wizard.validateFieldLocal(
+    1,
+    UI_E_MigrationValidationFields.CONNECTION_SETTINGS_VLAN,
+    checkVlanId(data.vlanId),
+    localization.common.vlanIdInvalidMessage,
+    localization.common.vlanIdInvalidMessage
+  )
+}
+
+export const validateNetworkConnectionSettingsLocal = (
+  localization: UI_I_Localization,
+  data: UI_I_ConnectionSettings,
+  wizard: Wizard
+): void => {
+  wizard.validateFieldLocal(
+    1,
+    UI_E_MigrationValidationFields.CONNECTION_SETTINGS_NETWORK,
+    data.networkLabel === '',
+    localization.common.networkLabelInvalidMessage,
+    localization.common.networkLabelInvalidMessage
+  )
+}
+
+export const checkConnectionSettingsSync = (
+  localization: UI_I_Localization,
+  data: UI_I_ConnectionSettings,
+  wizard: Wizard,
+  value: UI_I_WizardStep[]
+): UI_I_ValidationReturn => {
+  let stepHasError = false
+
+  if (checkVlanId(data.vlanId)) {
+    stepHasError = wizard.setValidation(
+      1,
+      UI_E_MigrationValidationFields.CONNECTION_SETTINGS_VLAN,
+      {
+        fieldMessage: localization.common.vlanIdInvalidMessage,
+        alertMessage: localization.common.vlanIdInvalidMessage,
+      }
+    )
+  } else if (
+    wizard.hasMessage(
+      1,
+      UI_E_MigrationValidationFields.CONNECTION_SETTINGS_VLAN
+    )
+  ) {
+    value = wizard.removeValidation(
+      1,
+      UI_E_MigrationValidationFields.CONNECTION_SETTINGS_VLAN,
+      value
+    )
+  }
+
+  return {
+    newValue: value,
+    stepHasError,
+  }
+}
+
+const checkNetwork = async (
+  label: string,
+  localization: UI_I_Localization,
+  emits: UI_I_MigrateVmkernelAdapterEmits
+): Promise<UI_I_AsyncCheckReturn> => {
+  if (label) {
+    return new Promise((resolve, _reject) =>
+      emits('check-network-label', label, (message: string) => {
+        if (message === '') {
+          resolve({
+            isValid: true,
+            message: '',
+          })
+        }
+
+        if (message !== '') {
+          resolve({
+            isValid: false,
+            message,
+          })
+        }
+      })
+    )
+  } else {
+    return {
+      isValid: false,
+      message: localization.common.networkLabelInvalidMessage,
+    }
+  }
+}
+
+export const checkNetworkAsync = async (
+  value: UI_I_WizardStep[],
+  label: string,
+  stepId: number,
+  fieldName: string,
+  emits: UI_I_MigrateVmkernelAdapterEmits,
+  localization: UI_I_Localization,
+  wizard: Wizard
+): Promise<UI_I_ValidationReturn> => {
+  let stepHasError = false
+
+  const labelValidation: {
+    isValid: boolean
+    message: string
+  } = await checkNetwork(label, localization, emits)
+
+  if (!labelValidation.isValid) {
+    stepHasError = wizard.setValidation(stepId, fieldName, {
+      fieldMessage: labelValidation.message,
+      alertMessage: labelValidation.message,
+    })
+  } else if (wizard.hasMessage(stepId, fieldName)) {
+    value = wizard.removeValidation(stepId, fieldName, value)
+  }
+
+  return {
+    newValue: value,
+    stepHasError,
+  }
+}

package/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/selectVmkernelAdapter.ts

@@ -1,52 +1,52 @@
-import type { UI_I_SelectVmkernelAdapter } from '~/components/common/wizards/network/add/lib/models/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_WizardStep, UI_I_ValidationReturn } from '~/components/atoms/wizard/lib/models/interfaces'
-import { UI_E_MigrationValidationFields } from '~/components/common/diagramMain/lib/models/enums'
-import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
-
-export const validateSelectedVmLocal = (
-  localization: UI_I_Localization,
-  data: UI_I_SelectVmkernelAdapter,
-  wizard: Wizard
-): void => {
-  wizard.validateFieldLocal(
-    0,
-    'vm',
-    data.vm === '',
-    '',
-    localization.common.noVmKernelNetworkAdapterSelectedForMigration
-  )
-}
-
-export const checkSelectedVmSync = (
-  localization: UI_I_Localization,
-  data: UI_I_SelectVmkernelAdapter,
-  wizard: Wizard,
-  value: UI_I_WizardStep[]
-): UI_I_ValidationReturn => {
-  let stepHasError = false
-
-  if (data.vm === '') {
-    stepHasError = wizard.setValidation(
-      0,
-      UI_E_MigrationValidationFields.SELECT_ADAPTER_VM,
-      {
-        fieldMessage: '',
-        alertMessage: localization.common.noVmKernelNetworkAdapterSelectedForMigration,
-      }
-    )
-  } else if (
-    wizard.hasMessage(0, UI_E_MigrationValidationFields.SELECT_ADAPTER_VM)
-  ) {
-    value = wizard.removeValidation(
-      0,
-      UI_E_MigrationValidationFields.SELECT_ADAPTER_VM,
-      value
-    )
-  }
-
-  return {
-    newValue: value,
-    stepHasError,
-  }
-}
+import type { UI_I_SelectVmkernelAdapter } from '~/components/common/wizards/network/add/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_WizardStep, UI_I_ValidationReturn } from '~/components/atoms/wizard/lib/models/interfaces'
+import { UI_E_MigrationValidationFields } from '~/components/common/diagramMain/lib/models/enums'
+import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
+
+export const validateSelectedVmLocal = (
+  localization: UI_I_Localization,
+  data: UI_I_SelectVmkernelAdapter,
+  wizard: Wizard
+): void => {
+  wizard.validateFieldLocal(
+    0,
+    'vm',
+    data.vm === '',
+    '',
+    localization.common.noVmKernelNetworkAdapterSelectedForMigration
+  )
+}
+
+export const checkSelectedVmSync = (
+  localization: UI_I_Localization,
+  data: UI_I_SelectVmkernelAdapter,
+  wizard: Wizard,
+  value: UI_I_WizardStep[]
+): UI_I_ValidationReturn => {
+  let stepHasError = false
+
+  if (data.vm === '') {
+    stepHasError = wizard.setValidation(
+      0,
+      UI_E_MigrationValidationFields.SELECT_ADAPTER_VM,
+      {
+        fieldMessage: '',
+        alertMessage: localization.common.noVmKernelNetworkAdapterSelectedForMigration,
+      }
+    )
+  } else if (
+    wizard.hasMessage(0, UI_E_MigrationValidationFields.SELECT_ADAPTER_VM)
+  ) {
+    value = wizard.removeValidation(
+      0,
+      UI_E_MigrationValidationFields.SELECT_ADAPTER_VM,
+      value
+    )
+  }
+
+  return {
+    newValue: value,
+    stepHasError,
+  }
+}

package/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/validations.ts

@@ -1,19 +1,19 @@
-import {
-  validateVlanIdConnectionSettingsLocal,
-  validateNetworkConnectionSettingsLocal,
-  checkConnectionSettingsSync,
-  checkNetworkAsync,
-} from '~/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/connectionSettings'
-import {
-  checkSelectedVmSync,
-  validateSelectedVmLocal,
-} from '~/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/selectVmkernelAdapter'
-
-export {
-  validateVlanIdConnectionSettingsLocal,
-  validateNetworkConnectionSettingsLocal,
-  checkConnectionSettingsSync,
-  checkNetworkAsync,
-  checkSelectedVmSync,
-  validateSelectedVmLocal,
-}
+import {
+  validateVlanIdConnectionSettingsLocal,
+  validateNetworkConnectionSettingsLocal,
+  checkConnectionSettingsSync,
+  checkNetworkAsync,
+} from '~/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/connectionSettings'
+import {
+  checkSelectedVmSync,
+  validateSelectedVmLocal,
+} from '~/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/selectVmkernelAdapter'
+
+export {
+  validateVlanIdConnectionSettingsLocal,
+  validateNetworkConnectionSettingsLocal,
+  checkConnectionSettingsSync,
+  checkNetworkAsync,
+  checkSelectedVmSync,
+  validateSelectedVmLocal,
+}

package/components/common/diagramMain/port/Ports.vue

@@ -1,47 +1,47 @@
-<template>
-  <g>
-    <template v-if="props.network.toggle">
-      <template v-for="port in props.network.ports" :key="port.id">
-        <common-diagram-main-port
-          :network="props.network"
-          :port="port"
-          :is-dark-mode="props.isDarkMode"
-          :selected-port="props.selectedPort"
-          :selected-adapter="props.selectedAdapter"
-          @select-port="onSelectPort"
-          @show-modal="onShowModal"
-        />
-      </template>
-    </template>
-  </g>
-</template>
-
-<script setup lang="ts">
-import type {
-  UI_I_ModalsInitialData,
-  UI_I_NetworkFullWithPositions,
-  UI_I_SelectedAdapter,
-  UI_I_SelectedPort,
-} from '~/components/common/diagramMain/lib/models/interfaces'
-
-const props = defineProps<{
-  network: UI_I_NetworkFullWithPositions
-  selectedPort: UI_I_SelectedPort
-  selectedAdapter: UI_I_SelectedAdapter
-  isDarkMode: boolean
-}>()
-
-const emits = defineEmits<{
-  (event: 'select-port', networkId: string, portId: string): void
-  (
-    event: 'show-modal',
-    value: string,
-    properties?: UI_I_ModalsInitialData
-  ): void
-}>()
-
-const onSelectPort = (networkId: string, portId: string) =>
-  emits('select-port', networkId, portId)
-const onShowModal = (value: string, properties?: UI_I_ModalsInitialData) =>
-  emits('show-modal', value, properties)
-</script>
+<template>
+  <g>
+    <template v-if="props.network.toggle">
+      <template v-for="port in props.network.ports" :key="port.id">
+        <common-diagram-main-port
+          :network="props.network"
+          :port="port"
+          :is-dark-mode="props.isDarkMode"
+          :selected-port="props.selectedPort"
+          :selected-adapter="props.selectedAdapter"
+          @select-port="onSelectPort"
+          @show-modal="onShowModal"
+        />
+      </template>
+    </template>
+  </g>
+</template>
+
+<script setup lang="ts">
+import type {
+  UI_I_ModalsInitialData,
+  UI_I_NetworkFullWithPositions,
+  UI_I_SelectedAdapter,
+  UI_I_SelectedPort,
+} from '~/components/common/diagramMain/lib/models/interfaces'
+
+const props = defineProps<{
+  network: UI_I_NetworkFullWithPositions
+  selectedPort: UI_I_SelectedPort
+  selectedAdapter: UI_I_SelectedAdapter
+  isDarkMode: boolean
+}>()
+
+const emits = defineEmits<{
+  (event: 'select-port', networkId: string, portId: string): void
+  (
+    event: 'show-modal',
+    value: string,
+    properties?: UI_I_ModalsInitialData
+  ): void
+}>()
+
+const onSelectPort = (networkId: string, portId: string) =>
+  emits('select-port', networkId, portId)
+const onShowModal = (value: string, properties?: UI_I_ModalsInitialData) =>
+  emits('show-modal', value, properties)
+</script>

package/components/common/feedback/Buttons.vue

@@ -192,8 +192,8 @@ const isShowHelpInfo = ref<boolean>(false)
   h3 {
     font-size: 22px;
     color: inherit;
-    margin-top: 0px;
-    text-transform: capitalize;
+    margin-top: 0;
+    //text-transform: capitalize;
   }
 
   p {

package/components/common/feedback/Message.vue

@@ -444,6 +444,7 @@ onBeforeUnmount(() => {
     .text {
       padding-top: 0;
       min-width: 140px;
+      max-width: 140px;
       margin-right: 10px;
     }
     .textarea {

package/components/common/feedback/VisitPortal.vue

@@ -2,7 +2,9 @@
   <div>
     <div class="modal-body">
       <div>
-        {{ localization.common.useOurExternalIdeasPortal }}
+        <span>{{ descriptions[0] }}</span>
+        <b>Aha</b>
+        <span>{{ descriptions[1] }}</span>
       </div>
       <a
         id="portal-link"
@@ -26,6 +28,8 @@
 <script setup lang="ts">
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 const localization = computed<UI_I_Localization>(() => useLocal())
+
+const descriptions = ref<string[]>(localization.value.common.useOurExternalIdeasPortal.split('{0}'))
 </script>
 
 <style scoped lang="scss">

package/components/common/layout/theHeader/feedback/new/New.vue

@@ -9,11 +9,13 @@
         class="feedback"
         @hide="onHideModal"
       >
+        <template #headerDescription>
+          <common-layout-the-header-feedback-new-subtitle />
+        </template>
+
         <template #content>
           <ui-modal-block-standard>
             <template v-if="!options.isAnnotateImage">
-              <common-layout-the-header-feedback-new-subtitle />
-
               <common-layout-the-header-feedback-new-tabs
                 v-model="selectedTab"
                 class="metrics-tabs"
@@ -23,7 +25,9 @@
                 v-if="selectedTab === 'light-bulb'"
                 class="feedback__visit-portal"
               >
-                {{ localization.common.useOurExternalIdeasPortal }}
+                <span>{{ descriptions[0] }}</span>
+                <b>Aha</b>
+                <span>{{ descriptions[1] }}</span>
               </div>
             </template>
 
@@ -162,8 +166,28 @@ const onSubmit = (): void => {
 
   emits('submit')
 }
+
+const descriptions = ref<string[]>(localization.value.common.useOurExternalIdeasPortal.split('{0}'))
 </script>
 
+<style lang="scss">
+:root {
+  --feedback-tooltip-trigger-color: #9da6ad;
+  --feedback-tooltip-acctive-trigger-color: #008fd6;
+  --feedback-tooltip-hover-trigger-color: #4d5d69;
+  --feedback-text-color: #4d5d69;
+  --feedback-tooltip-close-color: #213444;
+  --feedback-tab-active-bg-color: #008fd60f;
+}
+:root.dark-theme {
+  --feedback-tooltip-trigger-color: #9da6ad;
+  --feedback-tooltip-acctive-trigger-color: #2ba2de;
+  --feedback-tooltip-hover-trigger-color: #e9eaec;
+  --feedback-text-color: #e9eaec;
+  --feedback-tooltip-close-color: #e9eaec;
+  --feedback-tab-active-bg-color: #2ba2de14;
+}
+</style>
 <style lang="scss" scoped>
 .feedback {
   &__visit-portal {
@@ -177,16 +201,7 @@ const onSubmit = (): void => {
     margin-right: 5px;
   }
 }
-</style>
-<style lang="scss">
-:root {
-  --feedback-text-color: #4d5d69;
-  --feedback-tooltip-close-color: #213444;
-  --feedback-tab-active-bg-color: #008fd60f;
-}
-:root.dark-theme {
-  --feedback-text-color: #e9eaec;
-  --feedback-tooltip-close-color: #e9eaec;
-  --feedback-tab-active-bg-color: #2ba2de14;
+:deep(.modal-container-standard) {
+  padding-top: 0;
 }
 </style>