bfg-common 1.3.335 → 1.3.337

package/components/common/lib/config/states.ts

@@ -1,111 +1,126 @@
-export const hostLocalizationByState = [
-  'unknown',
-  'connected',
-  'warning',
-  'error',
-  'maintenance',
-  'notResponding',
-  'disconnected',
-]
-
-export const hostIconByState = [
-  'host-error',
-  'host',
-  'host-warning',
-  'host-error',
-  'host-maintenance',
-  'host-not-responding',
-  'host-disconnected',
-]
-
-export const vmLocalizationByState = [
-  'unknown',
-  'powerOff',
-  'poweredOn',
-  'suspended',
-  'error',
-  'warning',
-  'pending',
-  'paused',
-  'blocked',
-  'shuttingDown',
-  'shuttingOff',
-]
-
-export const vmIconByState = [
-  'vm-error',
-  'vm',
-  'vm-on',
-  'vm-suspended',
-  'vm-error',
-  'vm-warning',
-  'vm-warning',
-  'vm-suspended',
-  'vm-warning',
-  'vm-warning',
-  'vm-warning',
-]
-
-export const datastoreLocalizationByState = [
-  'unknown',
-  'connected',
-  'warning',
-  'error',
-  'maintenance',
-  'inaccessible',
-  'disconnected',
-]
-
-export const datastoreIconByState = [
-  'datastore-error',
-  'datastore',
-  'datastore-warning',
-  'datastore-error',
-  'datastore-maintenance',
-  'datastore-inaccessible',
-  'datastore-unmount', // 'datastore-disconnected',
-]
-
-export const networkLocalizationByState = [
-  'unknown',
-  'connected',
-  'warning',
-  'error',
-]
-
-export const networkIconByState = [
-  'network-error',
-  'network',
-  'network-warning',
-  'network-error',
-]
-
-export const switchLocalizationByState = [
-  'unknown',
-  'connected',
-  'warning',
-  'error',
-]
-
-export const switchIconByState = [
-  'switch-error',
-  'switch',
-  'switch-warning',
-  'switch-error',
-]
-
-export const resourcePoolLocalizationByState = [
-  'unknown',
-  'normal',
-  'warning',
-  'error',
-  'alert',
-]
-
-export const resourcePoolIconByState = [
-  'resourcePoolAlert',
-  'resource-pool',
-  'resourcePoolWarning',
-  'resourcePoolAlert',
-  'resourcePoolAlert',
-]
+export const clusterLocalizationByState = [
+  'unknown',
+  'connected',
+  'warning',
+  'error',
+]
+
+export const clusterIconByState = [
+  'cluster-error',
+  'cluster',
+  'cluster-warning',
+  'cluster-error',
+  // TODO Добавил на скорую руку нужно дополнить, если есть что добавить
+]
+
+export const hostLocalizationByState = [
+  'unknown',
+  'connected',
+  'warning',
+  'error',
+  'maintenance',
+  'notResponding',
+  'disconnected',
+]
+
+export const hostIconByState = [
+  'host-error',
+  'host',
+  'host-warning',
+  'host-error',
+  'host-maintenance',
+  'host-not-responding',
+  'host-disconnected',
+]
+
+export const vmLocalizationByState = [
+  'unknown',
+  'powerOff',
+  'poweredOn',
+  'suspended',
+  'error',
+  'warning',
+  'pending',
+  'paused',
+  'blocked',
+  'shuttingDown',
+  'shuttingOff',
+]
+
+export const vmIconByState = [
+  'vm-error',
+  'vm',
+  'vm-on',
+  'vm-suspended',
+  'vm-error',
+  'vm-warning',
+  'vm-warning',
+  'vm-suspended',
+  'vm-warning',
+  'vm-warning',
+  'vm-warning',
+]
+
+export const datastoreLocalizationByState = [
+  'unknown',
+  'connected',
+  'warning',
+  'error',
+  'maintenance',
+  'inaccessible',
+  'disconnected',
+]
+
+export const datastoreIconByState = [
+  'datastore-error',
+  'datastore',
+  'datastore-warning',
+  'datastore-error',
+  'datastore-maintenance',
+  'datastore-inaccessible',
+  'datastore-unmount', // 'datastore-disconnected',
+]
+
+export const networkLocalizationByState = [
+  'unknown',
+  'connected',
+  'warning',
+  'error',
+]
+
+export const networkIconByState = [
+  'network-error',
+  'network',
+  'network-warning',
+  'network-error',
+]
+
+export const switchLocalizationByState = [
+  'unknown',
+  'connected',
+  'warning',
+  'error',
+]
+
+export const switchIconByState = [
+  'switch-error',
+  'switch',
+  'switch-warning',
+  'switch-error',
+]
+
+export const resourcePoolLocalizationByState = [
+  'unknown',
+  'normal',
+  'warning',
+  'error',
+  'alert',
+]
+
+export const resourcePoolIconByState = [
+  'resourcePoolAlert',
+  'resource-pool',
+  'resourcePoolWarning',
+  'resourcePoolAlert',
+  'resourcePoolAlert',
+]

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

@@ -54,7 +54,7 @@
             :datastore-type="datastoreType"
             :nfs-configuration-submit="nfsConfigurationSubmit"
             :host-accessibility-submit="hostAccessibilitySubmit"
-            :datacenter-hosts="props.datacenterHosts"
+            :hosts="props.nfsHosts"
             @loading="(e) => (loading = e)"
             @change-nfs-version="updateNfsVersion"
             @submit="saveChangesAndNextNfs"
@@ -95,6 +95,7 @@ const props = defineProps<{
     version: UI_T_NfsType
   ) => Promise<void>
   datacenterHosts?: UI_I_SelectHostOptions[]
+  nfsHosts?: any
   isMainFilter?: boolean
 }>()
 const emits = defineEmits<{

package/components/common/wizards/datastore/add/nfs/Nfs.vue

@@ -24,7 +24,7 @@
     <common-wizards-datastore-add-nfs-accessibility
       v-if="showHostAccessibility"
       :host-accessibility-submit="props.hostAccessibilitySubmit"
-      :datacenter-hosts="props.datacenterHosts"
+      :datacenter-hosts="props.hosts"
       @next="applyChangesAndNext"
     />
     <!-- TODO Он будет когда будем делать групповое  -->
@@ -39,7 +39,6 @@ import {
   UI_T_WizardDatastoreMode,
 } from '~/components/common/wizards/datastore/add/lib/models/types'
 import { UI_I_ConfigurationSendDataNfs } from '~/components/common/wizards/datastore/add/nfs/configuration/lib/models/interfaces'
-import { UI_I_SelectHostOptions } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/interfaces'
 import { subTitleFunc } from '~/components/common/wizards/datastore/add/lib/config/stepItems'
 
 const props = defineProps<{
@@ -48,7 +47,7 @@ const props = defineProps<{
   datastoreType: UI_T_DatastoreType
   nfsConfigurationSubmit: number
   hostAccessibilitySubmit: number
-  datacenterHosts?: UI_I_SelectHostOptions[]
+  hosts?: any
 }>()
 const emits = defineEmits<{
   (event: 'loading', value: boolean): void

package/components/common/wizards/datastore/add/nfs/accessibility/Accessibility.vue

@@ -34,16 +34,14 @@
 <script lang="ts" setup>
 import { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
 import { UI_I_Localization } from '~/lib/models/interfaces'
-import { API_UI_I_DataTable } from '~/lib/models/table/interfaces'
 import { UI_I_Pagination } from '~/lib/models/table/interfaces'
 import { T_HostsAccessibilityTab } from '~/components/common/wizards/datastore/add/nfs/accessibility/lib/models/types'
-import { UI_I_SelectHostOptions } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/interfaces'
 import { hostAccessibilityTabsFunc } from '~/components/common/wizards/datastore/add/nfs/accessibility/lib/config/tabsPannel'
 // import { hostsAccessibilityTablesFunc } from '~/components/common/wizards/datastore/add/nfs/accessibility/tablesView/lib/config/hostsTableItems'
 
 const props = defineProps<{
   hostAccessibilitySubmit: number
-  datacenterHosts?: UI_I_SelectHostOptions[]
+  hosts?: any
 }>()
 const localization = computed<UI_I_Localization>(() => useLocal())
 const emits = defineEmits<{
@@ -59,13 +57,7 @@ console.log(444444)
 
 // const dataTable = computed(() => hostsAccessibilityTablesFunc(activeTab.value))
 // TODO refactoring
-const dataTable = computed<API_UI_I_DataTable<UI_I_SelectHostOptions[]>>(() => {
-  return {
-    items: props.datacenterHosts,
-    total_items: props.datacenterHosts.length,
-    total_pages: 1,
-  }
-})
+const dataTable = computed<any>(() => props.hosts)
 
 const pagination = ref<UI_I_Pagination>({
   page: 1,

package/components/common/wizards/datastore/add/nfs/accessibility/tablesView/lib/config/compatibleTable.ts

@@ -1,55 +1,62 @@
-import {
-  UI_I_HeadItem,
-  UI_I_BodyItem,
-} from '~/components/atoms/table/dataGrid/lib/models/interfaces'
-import { UI_I_Localization } from '~/lib/models/interfaces'
-import { constructHeadItem } from '~/components/atoms/table/dataGrid/lib/utils/constructDataTable'
-import { I_CompatibleHostsTable } from '~/components/common/wizards/datastore/add/nfs/accessibility/lib/models/interfaces'
-import { E_NodeIconsByState } from '~/lib/models/enums'
-import { compatibleHostsTableKeys } from '~/components/common/wizards/datastore/add/nfs/accessibility/tablesView/lib/config/tableKeys'
-
-const getItems = (
-  localization: UI_I_Localization
-): [string, boolean, string, string][] => {
-  return [
-    [localization.host, true, '96px', compatibleHostsTableKeys[0]],
-    [localization.cluster, true, '180px', compatibleHostsTableKeys[1]],
-  ]
-}
-
-export const headItems = (localization: UI_I_Localization): UI_I_HeadItem[] => {
-  const result: UI_I_HeadItem[] = []
-  getItems(localization).forEach((item) => {
-    result.push(constructHeadItem('icon', item[0], item[3], false, item[2]))
-  })
-  return result
-}
-
-export const bodyItems = (data: I_CompatibleHostsTable[]): UI_I_BodyItem[][] => {
-  console.log(data, 11111);
-  const bodyItems: UI_I_BodyItem[][] = []
-  data.forEach((item: I_CompatibleHostsTable, key) => {
-    const hostData = {
-      iconClassName: E_NodeIconsByState.host_Normal,
-    }
-    const clusterData = {
-      iconClassName: E_NodeIconsByState.host_Normal,
-    }
-
-    bodyItems.push([
-      {
-        key: 'icon',
-        text: item[compatibleHostsTableKeys[0]],
-        data: hostData,
-        id: key,
-      },
-      {
-        key: 'icon',
-        text: item[compatibleHostsTableKeys[1]],
-        data: clusterData,
-        id: key,
-      },
-    ])
-  })
-  return bodyItems
-}
+import {
+  UI_I_HeadItem,
+  UI_I_BodyItem,
+} from '~/components/atoms/table/dataGrid/lib/models/interfaces'
+import { UI_I_Localization } from '~/lib/models/interfaces'
+import { constructHeadItem } from '~/components/atoms/table/dataGrid/lib/utils/constructDataTable'
+import { I_CompatibleHostsTable } from '~/components/common/wizards/datastore/add/nfs/accessibility/lib/models/interfaces'
+import { compatibleHostsTableKeys } from '~/components/common/wizards/datastore/add/nfs/accessibility/tablesView/lib/config/tableKeys'
+import {
+  hostIconByState,
+  clusterIconByState,
+} from '~/components/common/lib/config/states'
+
+const getItems = (
+  localization: UI_I_Localization
+): [string, boolean, string, string][] => {
+  return [
+    [localization.host, true, '96px', compatibleHostsTableKeys[0]],
+    [localization.cluster, true, '180px', compatibleHostsTableKeys[1]],
+  ]
+}
+
+export const headItems = (localization: UI_I_Localization): UI_I_HeadItem[] => {
+  const result: UI_I_HeadItem[] = []
+  getItems(localization).forEach((item) => {
+    result.push(constructHeadItem('icon', item[0], item[3], false, item[2]))
+  })
+  return result
+}
+
+export const bodyItems = (
+  data: I_CompatibleHostsTable[]
+): UI_I_BodyItem[][] => {
+  console.log(data, 11111)
+  const bodyItems: UI_I_BodyItem[][] = []
+  data.forEach((item: I_CompatibleHostsTable, key) => {
+    const hostData = {
+      iconClassName: `vsphere-icon-${hostIconByState[1]}`,
+    }
+    const clusterData = {
+      iconClassName: `vsphere-icon-${clusterIconByState[1]}`,
+    }
+
+    bodyItems.push([
+      {
+        key: 'icon',
+        text: item[compatibleHostsTableKeys[0]],
+        data: hostData,
+        id: item.id,
+        testId: `host-table-item-${item.host}`,
+      },
+      {
+        key: 'icon',
+        text: item[compatibleHostsTableKeys[1]],
+        data: clusterData,
+        id: item.id,
+        testId: `host-table-item-${item.host}`,
+      },
+    ])
+  })
+  return bodyItems
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.3.335",
+  "version": "1.3.337",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",