bfg-common 1.5.420 → 1.5.421

package/components/common/wizards/datastore/add/steps/nameAndDevice/table/Table.vue

@@ -26,8 +26,7 @@
 
 <script lang="ts" setup>
 import { useDebounceFn } from '@vueuse/core'
-import { UI_I_Localization } from '~/lib/models/interfaces'
-import { UI_I_Pagination } from '~/lib/models/table/interfaces'
+import type { UI_I_Pagination } from '~/lib/models/table/interfaces'
 import type {
   UI_I_CreateStorageLunDiskItem,
   UI_I_CreateStorageLunDisks,
@@ -36,31 +35,27 @@ import type {
 const modelLunDiskLocal = defineModel<UI_I_CreateStorageLunDiskItem[]>({
   required: true,
 })
-const props = defineProps<{
-  lunDisksData: UI_I_CreateStorageLunDisks
-  loading: boolean
-  pagination: UI_I_Pagination
-  isMainFilter?: boolean
-}>()
+const props = withDefaults(
+  defineProps<{
+    lunDisksData: UI_I_CreateStorageLunDisks
+    loading: boolean
+    pagination: UI_I_Pagination
+    isMainFilter?: boolean
+  }>(),
+  {
+    isMainFilter: undefined,
+  }
+)
 const emits = defineEmits<{
   (event: 'pagination', value: UI_I_Pagination): void
   (event: 'sort', value: string): void
   (event: 'main-filter', value: string): void
 }>()
 
-const localization = computed<UI_I_Localization>(() => useLocal())
 const { $store }: any = useNuxtApp()
 
 const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 
-const sorting = (e: [number, boolean]): void => {
-  const [column, status] = e
-  const direction = status ? 'desc' : 'asc'
-
-  const sort = `${column}.${direction}`
-
-  emits('sort', sort)
-}
 const sendFilter = useDebounceFn((searchText: string) => {
   emits('main-filter', searchText)
 }, 1000)

package/components/common/wizards/datastore/add/steps/nameAndDevice/table/new/New.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="device-table-container">
     <ui-data-table
-      test-id="device-selection-lun-disk-table"
       :data="data"
       :options="options"
       :loading="props.loading"
@@ -10,6 +9,7 @@
       :texts="texts"
       :default-layout="false"
       :skeleton="tableSkeleton"
+      test-id="device-selection-lun-disk-table"
       class="device-table"
       size="sm"
       @select-row="onSelectRow"
@@ -63,12 +63,12 @@ import type {
   UI_I_TableTexts,
 } from '~/node_modules/bfg-uikit/components/ui/dataTable/models/interfaces'
 import type { UI_I_DataTableSkeleton } from '~/node_modules/bfg-uikit/components/ui/dataTable/models/interfaces'
+import type { UI_I_CreateStorageLunDiskItem } from '~/components/common/wizards/datastore/add/steps/nameAndDevice/table/lib/models/interfaces'
 import {
   options,
   getHeaderDataFunc,
   getBodyDataFunc,
 } from '~/components/common/wizards/datastore/add/steps/nameAndDevice/table/new/lib/config/lunDiskTable'
-import type { UI_I_CreateStorageLunDiskItem } from '~/components/common/wizards/datastore/add/steps/nameAndDevice/table/lib/models/interfaces'
 
 const selectedLunDisks = defineModel<UI_I_CreateStorageLunDiskItem[]>({
   required: true,
@@ -146,17 +146,6 @@ const onSelectRow = (value: UI_I_DataTableBody[]): void => {
 }
 </script>
 
-<style>
-:root {
-  --select-storage-border-color: #e9ebed;
-  --select-storage-bg-color: #ffffff;
-}
-:root.dark-theme {
-  --select-storage-border-color: #e9ebed1f;
-  --select-storage-bg-color: var(--wizard-right-bg);
-}
-</style>
-
 <style lang="scss" scoped>
 .device-table-container {
   .device-table {

package/components/common/wizards/datastore/add/steps/nameAndDevice/table/new/lib/config/lunDiskTable.ts

@@ -6,24 +6,24 @@ import type {
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_CreateStorageLunDiskItem } from '~/components/common/wizards/datastore/add/steps/nameAndDevice/table/lib/models/interfaces'
 import {
-  E_DeviceStatus,
-  E_DeviceStatusChipColor,
-  E_DeviceStatusIcon,
+  UI_E_DeviceStatus,
+  UI_E_DeviceStatusChipColor,
+  UI_E_DeviceStatusIcon,
 } from '~/components/common/wizards/datastore/add/steps/nameAndDevice/table/new/lib/models/enums'
 
 // Маппинг для статусов
 const STATUS_MAPPING = {
-  [E_DeviceStatus.Unknown]: {
-    icon: E_DeviceStatusIcon.HelpIcon,
-    chipColor: E_DeviceStatusChipColor.Primary,
+  [UI_E_DeviceStatus.Unknown]: {
+    icon: UI_E_DeviceStatusIcon.HelpIcon,
+    chipColor: UI_E_DeviceStatusChipColor.Primary,
   },
-  [E_DeviceStatus.Supported]: {
-    icon: E_DeviceStatusIcon.StatusCheck,
-    chipColor: E_DeviceStatusChipColor.Green,
+  [UI_E_DeviceStatus.Supported]: {
+    icon: UI_E_DeviceStatusIcon.StatusCheck,
+    chipColor: UI_E_DeviceStatusChipColor.Green,
   },
-  [E_DeviceStatus.NotSupported]: {
-    icon: E_DeviceStatusIcon.Close,
-    chipColor: E_DeviceStatusChipColor.Red,
+  [UI_E_DeviceStatus.NotSupported]: {
+    icon: UI_E_DeviceStatusIcon.Close,
+    chipColor: UI_E_DeviceStatusChipColor.Red,
   },
 }
 
@@ -133,8 +133,8 @@ export const getBodyDataFunc = (
 
   return bodyData.map((device, index: number) => {
     const statusKey = device.hardware_acceleration
-      ? E_DeviceStatus.Unknown
-      : E_DeviceStatus.Supported
+      ? UI_E_DeviceStatus.Unknown
+      : UI_E_DeviceStatus.Supported
     const hardwareAccelerationData = {
       ...STATUS_MAPPING[statusKey],
       testId: `${device.identifier}-${index}-status`,

package/components/common/wizards/datastore/add/steps/nameAndDevice/table/new/lib/models/enums.ts

@@ -1,15 +1,15 @@
-export enum E_DeviceStatus {
+export enum UI_E_DeviceStatus {
   Unknown = 'unknown',
   Supported = 'supported',
   NotSupported = 'not-supported',
 }
 
-export enum E_DeviceStatusChipColor {
+export enum UI_E_DeviceStatusChipColor {
   Green = 'green',
   Red = 'red',
   Primary = 'primary',
 }
-export enum E_DeviceStatusIcon {
+export enum UI_E_DeviceStatusIcon {
   StatusCheck = 'status-check',
   Close = 'close',
   HelpIcon = 'icon-help',

package/components/common/wizards/datastore/add/steps/nameAndDevice/table/old/Old.vue

@@ -5,9 +5,6 @@
       v-model:column-keys="columnKeys"
       v-model:page-size="props.pagination.pageSize"
       v-model:page="props.pagination.page"
-      type="checkbox"
-      class="data-table"
-      test-id="device-selection-lun-disk-table"
       :head-items="headItems"
       :body-items="bodyItems"
       :total-items="props.totalItems"
@@ -15,6 +12,9 @@
       :loading="props.loading"
       :is-main-filter="props.isMainFilter"
       :main-filter-placeholder="localization.filter"
+      type="checkbox"
+      class="data-table"
+      test-id="device-selection-lun-disk-table"
       hide-page-size
       @sorting="onSorting"
       @main-filter="emits('main-filter', $event)"
@@ -29,19 +29,24 @@ import type {
   UI_I_ColumnKey,
   UI_I_BodyItem,
 } from '~/components/atoms/table/dataGrid/lib/models/interfaces'
-import { UI_I_Localization } from '~/lib/models/interfaces'
-import { UI_I_Pagination } from '~/lib/models/table/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_Pagination } from '~/lib/models/table/interfaces'
 import type { UI_I_CreateStorageLunDiskItem } from '~/components/common/wizards/datastore/add/steps/nameAndDevice/table/lib/models/interfaces'
 import * as lunDiskTable from '~/components/common/wizards/datastore/add/steps/nameAndDevice/table/old/lib/config/lunDiskTable'
 
-const props = defineProps<{
-  tableData: UI_I_CreateStorageLunDiskItem[]
-  loading: boolean
-  totalItems: number
-  totalPages: number
-  pagination: UI_I_Pagination
-  isMainFilter?: boolean
-}>()
+const props = withDefaults(
+  defineProps<{
+    tableData: UI_I_CreateStorageLunDiskItem[]
+    loading: boolean
+    totalItems: number
+    totalPages: number
+    pagination: UI_I_Pagination
+    isMainFilter?: boolean
+  }>(),
+  {
+    isMainFilter: undefined,
+  }
+)
 const emits = defineEmits<{
   (event: 'select-lun-disk', value: number[]): void
   (event: 'pagination', value: UI_I_Pagination): void

package/components/common/wizards/datastore/add/steps/readyComplete/ReadyCompleteNew.vue

@@ -73,7 +73,7 @@ const localLanguage = computed<string>(
   () => $store.getters['main/getInterfaceLang']
 )
 
-const detailsItemLabel = ref([])
+const detailsItemLabel = ref<any>([])
 const labelMaxWidth = computed<number>(() => {
   let maxWidth = 0
   for (const key in detailsItemLabel.value) {

package/components/common/wizards/datastore/add/steps/typeMode/lib/config/typeOptions.ts

@@ -1,43 +1,43 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_T_Project } from '~/lib/models/types'
-import type { UI_I_RadioOption } from '~/components/common/select/radio/lib/models/interfaces'
-
-export const datastoreTypesFunc = (
-  localization: UI_I_Localization,
-  _project?: UI_T_Project
-): UI_I_RadioOption[] => {
-  return [
-    {
-      id: 'datastore-type-shared-storm',
-      label: localization.common.stormSharedStorage,
-      value: 2,
-      disabled: false,
-      description: localization.common.sharedStormDesc,
-      isTooltip: false,
-      tooltipContent: localization.common.stormSharedStorageHelpDesc,
-      testId: 'datastore-type-shared-storm',
-    },
-    {
-      id: 'datastore-type-nfs',
-      label: localization.common.nfs,
-      value: 4,
-      disabled: false,
-      description: localization.common.nfsDesc,
-      isTooltip: false,
-      tooltipContent: localization.common.nfsHelpDesc,
-      testId: 'datastore-type-nfs',
-    },
-  ]
-
-  // if (project === 'procurator') {
-  //   types.unshift({
-  //     label: localization.common.localStorage,
-  //     value: 1,
-  //     disabled: false,
-  //     description: localization.common.localDesc,
-  //     isTooltip: false,
-  //     tooltipContent: localization.common.localStorageHelpDesc,
-  //     testId: 'datastore-type-local',
-  //   })
-  // }
-}
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
+import type { UI_I_RadioOption } from '~/components/common/select/radio/lib/models/interfaces'
+
+export const datastoreTypesFunc = (
+  localization: UI_I_Localization,
+  _project?: UI_T_Project
+): UI_I_RadioOption[] => {
+  return [
+    {
+      id: 'datastore-type-shared-storm',
+      label: localization.common.stormSharedStorage,
+      value: 2,
+      disabled: false,
+      description: localization.common.sharedStormDesc,
+      isTooltip: false,
+      tooltipContent: localization.common.stormSharedStorageHelpDesc,
+      testId: 'datastore-type-shared-storm',
+    },
+    {
+      id: 'datastore-type-nfs',
+      label: localization.common.nfs,
+      value: 4,
+      disabled: false,
+      description: localization.common.nfsDesc,
+      isTooltip: false,
+      tooltipContent: localization.common.nfsHelpDesc,
+      testId: 'datastore-type-nfs',
+    },
+  ]
+
+  // if (project === 'procurator') {
+  //   types.unshift({
+  //     label: localization.common.localStorage,
+  //     value: 1,
+  //     disabled: false,
+  //     description: localization.common.localDesc,
+  //     isTooltip: false,
+  //     tooltipContent: localization.common.localStorageHelpDesc,
+  //     testId: 'datastore-type-local',
+  //   })
+  // }
+}

package/components/common/wizards/network/add/Add.vue

@@ -131,15 +131,15 @@ import type {
   API_UI_I_SwitchItem,
   UI_I_AvailableAdapters,
 } from '~/components/common/diagramMain/lib/models/interfaces'
-import { getAvailableAdapters } from '~/components/common/diagramMain/lib/utils/utils'
 import type {
   UI_I_ValidationReturn,
   UI_I_WizardStep,
   UI_I_WizardStepNavigation,
 } from '~/components/atoms/wizard/lib/models/interfaces'
 import { UI_E_ValidationFields } from '~/components/common/wizards/network/add/lib/models/enums'
-import { getVlanId } from '~/components/common/wizards/network/add/lib/utils/utils'
 import Wizard from '~/components/atoms/wizard/lib/utils/utils'
+import { getVlanId } from '~/components/common/wizards/network/add/lib/utils/utils'
+import { getAvailableAdapters } from '~/components/common/diagramMain/lib/utils/utils'
 import {
   createZeroSchemeReadyCompleteFunc,
   createFirstSchemeReadyCompleteFunc,

package/components/common/wizards/network/add/lib/models/interfaces.ts

@@ -1,10 +1,10 @@
-import {
+import type {
   UI_I_ArbitraryObject,
   UI_I_ListIndex,
   UI_I_State,
 } from '~/lib/models/interfaces'
 import type { UI_T_TCP } from '~/components/common/wizards/network/add/lib/models/types'
-import {
+import type {
   UI_I_AdapterStatus,
   API_UI_I_SwitchItem,
 } from '~/components/common/diagramMain/lib/models/interfaces'

package/components/common/wizards/network/add/modals/SelectNetwork.vue

@@ -75,19 +75,25 @@ const props = withDefaults(
   defineProps<{
     show: boolean
     modalName: string
+    data: UI_I_NetworkForAdding[]
     title?: string
     width?: string
     height?: string
     withCollapse?: boolean
-    data: UI_I_NetworkForAdding[]
   }>(),
   {
     width: '576px',
     height: '420px',
     title: '--',
+    withCollapse: undefined,
   }
 )
 
+const emits = defineEmits<{
+  (event: 'hide'): void
+  (event: 'select-network', networkId: string): void
+}>()
+
 // UI_I_Localization
 const localization = computed<UI_I_Localization>(() => useLocal())
 
@@ -138,10 +144,6 @@ const onSelectNetwork = (): void => {
   emits('hide')
 }
 
-const emits = defineEmits<{
-  (event: 'hide'): void
-  (event: 'select-network', networkId: string): void
-}>()
 const onHideModal = (): void => {
   onHideErrorMessageAlert()
   emits('hide')

package/components/common/wizards/network/add/modals/SelectStandardSwitch.vue

@@ -53,24 +53,20 @@ import type {
   UI_I_SelectedSwitch,
   UI_I_BodyItems,
 } from '~/components/common/wizards/network/add/lib/models/interfaces'
+import type { UI_I_SelectStandardSwitchModalProps } from '~/components/common/wizards/network/add/modals/lib/models/interfaces'
 import { selectStandardSwitchTableHeadFunc } from '~/components/common/wizards/network/add/lib/config/config'
 
-interface I_SelectSwitchModalProps {
-  show: boolean
-  modalName: string
-  title?: string
-  width?: string
-  height?: string
-  withCollapse?: boolean
-  standardSwitchesInitial: UI_I_Switch[]
-}
-
-const props = withDefaults(defineProps<I_SelectSwitchModalProps>(), {
+const props = withDefaults(defineProps<UI_I_SelectStandardSwitchModalProps>(), {
   width: '576px',
   height: '420px',
   title: '--',
 })
 
+const emits = defineEmits<{
+  (event: 'hide'): void
+  (event: 'select-standard-switch', switchId: string): void
+}>()
+
 // UI_I_Localization
 const localization = computed<UI_I_Localization>(() => useLocal())
 
@@ -123,10 +119,6 @@ const onSelectSwitch = (): void => {
   emits('hide')
 }
 
-const emits = defineEmits<{
-  (event: 'hide'): void
-  (event: 'select-standard-switch', switchId: string): void
-}>()
 const onHideModal = (): void => {
   onHideErrorMessageAlert()
   emits('hide')

package/components/common/wizards/network/add/modals/SelectSwitch.vue

@@ -53,24 +53,20 @@ import type {
   UI_I_SelectedSwitch,
   UI_I_BodyItems,
 } from '~/components/common/wizards/network/add/lib/models/interfaces'
+import type { UI_I_SelectSwitchModalProps } from '~/components/common/wizards/network/add/modals/lib/models/interfaces'
 import { selectSwitchTableHeadFunc } from '~/components/common/wizards/network/add/lib/config/config'
 
-interface I_SelectSwitchModalProps {
-  show: boolean
-  modalName: string
-  title?: string
-  width?: string
-  height?: string
-  withCollapse?: boolean
-  data: UI_I_Switch[]
-}
-
-const props = withDefaults(defineProps<I_SelectSwitchModalProps>(), {
+const props = withDefaults(defineProps<UI_I_SelectSwitchModalProps>(), {
   width: '576px',
   height: '420px',
   title: '--',
 })
 
+const emits = defineEmits<{
+  (event: 'hide'): void
+  (event: 'select-switch', switchId: string): void
+}>()
+
 // UI_I_Localization
 const localization = computed<UI_I_Localization>(() => useLocal())
 
@@ -116,10 +112,6 @@ const onSelectSwitch = (): void => {
   emits('hide')
 }
 
-const emits = defineEmits<{
-  (event: 'hide'): void
-  (event: 'select-switch', switchId: string): void
-}>()
 const onHideModal = (): void => {
   onHideErrorMessageAlert()
   emits('hide')

package/components/common/wizards/network/add/modals/lib/models/interfaces.ts

@@ -0,0 +1,21 @@
+import type { UI_I_Switch } from '~/components/common/wizards/network/add/lib/models/interfaces'
+
+export interface UI_I_SelectStandardSwitchModalProps {
+  show: boolean
+  modalName: string
+  title?: string
+  width?: string
+  height?: string
+  withCollapse?: boolean
+  standardSwitchesInitial: UI_I_Switch[]
+}
+
+export interface UI_I_SelectSwitchModalProps {
+  show: boolean
+  modalName: string
+  title?: string
+  width?: string
+  height?: string
+  withCollapse?: boolean
+  data: UI_I_Switch[]
+}

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

@@ -93,9 +93,9 @@ import type {
   UI_I_Localization,
 } from '~/lib/models/interfaces'
 import type { UI_I_ConnectionSettings } from '~/components/common/wizards/network/add/lib/models/interfaces'
-import { vlanIdSelectData } from '~/components/common/wizards/network/add/lib/config/config'
 import type { UI_I_ErrorFields } from '~/components/atoms/wizard/lib/models/interfaces'
 import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
+import { vlanIdSelectData } from '~/components/common/wizards/network/add/lib/config/config'
 import {
   validateNetworkConnectionSettingsLocal,
   validateVlanIdConnectionSettingsLocal,
@@ -108,8 +108,6 @@ const props = defineProps<{
   wizard: Wizard
 }>()
 
-const localization = computed<UI_I_Localization>(() => useLocal())
-
 const emits = defineEmits<{
   (
     event: 'change-connection-settings',
@@ -118,6 +116,8 @@ const emits = defineEmits<{
   (event: 'hide-alert', stepId: 5): void
 }>()
 
+const localization = computed<UI_I_Localization>(() => useLocal())
+
 const fields = ref<UI_I_ConnectionSettings>(
   useDeepCopy(props.connectionSettings)
 )

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

@@ -2,15 +2,15 @@
   <div class="wizard-content-container add-networking-step">
     <div class="wizard-content">
       <common-adapter-manager
-        test-id="adapter-manager"
-        :is-active="true"
-        :full-mode="true"
         :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="adapter-manager"
+        is-active
+        full-mode
         @change-added-adapters="onChangeAddedAdapters"
         @change-adapter-status="onChangeAdapterStatus"
         @get-free-adapters="onGetFreeAdapters"

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

@@ -57,9 +57,6 @@
                     <template #elem>
                       <input
                         v-model="fields.static.ipFourAddress"
-                        data-id="ip-four-address-input"
-                        type="text"
-                        placeholder="e.g. 192.168.1.1"
                         :class="[
                           'tooltip-field port-properties-network-label',
                           {
@@ -67,6 +64,9 @@
                               props.messagesFields['ipv4_settings.ipv4'].field,
                           },
                         ]"
+                        data-id="ip-four-address-input"
+                        type="text"
+                        placeholder="e.g. 192.168.1.1"
                       />
                     </template>
                     <template #content>
@@ -201,23 +201,23 @@ const props = withDefaults(
     alertMessages: string[]
     messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
     wizard: Wizard
-    tcpStacks?: UI_I_TCPStack[]
     tcp: string
     gatewayFlag: boolean
+    tcpStacks?: UI_I_TCPStack[]
   }>(),
   {
     tcpStacks: () => [],
   }
 )
 
-const localization = computed<UI_I_Localization>(() => useLocal())
-
 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 localization = computed<UI_I_Localization>(() => useLocal())
+
 const fields = ref<UI_I_IpFourSettings>(useDeepCopy(props.ipFourSettings))
 
 let oldFields = useDeepCopy(fields.value)

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

@@ -2,9 +2,9 @@
   <div class="wizard-content-container add-networking-step">
     <div class="wizard-content">
       <common-adapter-manager
-        :is-active="true"
-        :full-mode="true"
         test-id="adapter-manager"
+        is-active
+        full-mode
       />
     </div>
   </div>