bfg-common 1.5.773 → 1.5.775

package/components/common/pages/backups/modals/restore/lib/config/readyToCompleteOptions.ts

@@ -1,75 +1,43 @@
-import type { UI_I_RestoreForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_TableInfoItem } from '~/components/atoms/table/info/lib/models/interfaces'
+import type {UI_I_RestoreForm} from "~/components/common/pages/backups/modals/lib/models/interfaces";
+import type {UI_I_Localization} from "~/lib/models/interfaces";
+import type {UI_I_TableInfoItem} from "~/components/atoms/table/info/lib/models/interfaces";
 import { restoreCodes } from '~/components/common/pages/backups/modals/restore/lib/config/restoreCodes'
 
-const getDisks = (
-  model: UI_I_RestoreForm,
-  localization: UI_I_Localization
-): UI_I_TableInfoItem[] => {
-  const result: UI_I_TableInfoItem[] = []
 
-  model.pvm.disk_devices.forEach((disk_device, i) => {
-    if (!disk_device.source) return
-
-    result.push({
-      label: `${localization.common.disk} ${i}`,
-      value: disk_device.source,
-      iconClassName: 'icon-vSphere-dsVmDisk',
-    })
-  })
-
-  return result
-}
-
-export const readyToCompleteOptions = (
-  model: UI_I_RestoreForm,
-  localization: UI_I_Localization,
-  selectedStorageName: string
-): UI_I_TableInfoItem[] => {
-  const result: UI_I_TableInfoItem[] = []
+export const readyToCompleteOptions = (model: UI_I_RestoreForm, localization: UI_I_Localization, selectedStorageName: string): UI_I_TableInfoItem[] => {
+  const result = []
 
   switch (model.restore_code) {
     case restoreCodes.diskOnly:
-      result.push({
-        label: localization.common.backup,
-        value: model.backup,
-        iconClassName: 'icon-backup',
-      })
-      // Disks
-      result.push(...getDisks(model, localization))
-      break
     case restoreCodes.existing:
       result.push({
         label: localization.common.backup,
         value: model.backup,
-        iconClassName: 'icon-backup',
+        iconClassName: 'icon-backup'
       })
       break
     case restoreCodes.asNew:
       result.push({
         label: localization.common.vmName,
         value: model.pvm.name,
-        iconClassName: 'vsphere-icon-vm',
+        iconClassName: 'vsphere-icon-vm'
       })
 
       // Datastores
       result.push({
         label: localization.common.datastore,
         value: selectedStorageName,
-        iconClassName: 'vsphere-icon-datastore',
+        iconClassName: 'vsphere-icon-datastore'
       })
 
       // Disks
-      result.push(...getDisks(model, localization))
+      model.pvm.disk_devices.forEach((disk_device, i) => {
+        if (!disk_device.source) return
 
-      // Disks for Copy
-      model.copy_disks.forEach((disk_device, i) => {
         result.push({
-          // label: `${localization.common.disk} ${i}`,
-          label: localization.backup.diskCopyN.replace('{0}', i.toString()),
+          label: `${localization.common.disk} ${i}`,
           value: disk_device.source,
-          iconClassName: 'icon-vSphere-dsVmDisk',
+          iconClassName: 'icon-vSphere-dsVmDisk'
         })
       })
 
@@ -78,7 +46,7 @@ export const readyToCompleteOptions = (
         result.push({
           label: localization.common.network,
           value: network.network,
-          iconClassName: 'vsphere-icon-network',
+          iconClassName: 'vsphere-icon-network'
         })
       })
       break
@@ -91,4 +59,4 @@ export const readyToCompleteOptions = (
   }
 
   return result
-}
+}

package/components/common/pages/backups/modals/restore/lib/config/restoreCodes.ts

@@ -1,5 +1,5 @@
 export const restoreCodes = {
     diskOnly: 1,
     existing: 2,
-    asNew: 3,
+    asNew: 3
 }

package/components/common/pages/backups/modals/restore/lib/config/steps.ts

@@ -7,13 +7,12 @@ export const dynamicSteps = {
   selectName: 1,
   selectStorage: 2,
   selectDisks: 3,
-  selectDisksForCopy: 4,
-  selectNetwork: 5,
-  readyComplete: 6,
+  selectNetwork: 4,
+  readyComplete: 5
 }
 
 export const stepsFunc = (
-    localization: UI_I_Localization
+  localization: UI_I_Localization
 ): UI_I_WizardStep[] => {
   return [
     {
@@ -24,7 +23,7 @@ export const stepsFunc = (
       status: UI_E_WIZARD_STATUS.SELECTED,
       isValid: true,
       fields: {},
-      testId: 'backup-restore-type',
+      testId: 'backup-restore-type'
     },
     {
       id: dynamicSteps.selectName,
@@ -37,9 +36,9 @@ export const stepsFunc = (
       fields: {
         name: {
           field: '',
-          alert: '',
-        },
-      },
+          alert: ''
+        }
+      }
     },
     {
       id: dynamicSteps.selectStorage,
@@ -52,9 +51,9 @@ export const stepsFunc = (
       fields: {
         storage: {
           field: '',
-          alert: '',
-        },
-      },
+          alert: ''
+        }
+      }
     },
     {
       id: dynamicSteps.selectDisks,
@@ -66,35 +65,20 @@ export const stepsFunc = (
       fields: {
         disk_devices: {
           field: '',
-          alert: '',
-        },
-      },
-      testId: 'backup-restore-select-disks',
-    },
-    {
-      id: dynamicSteps.selectDisksForCopy,
-      stepName: '',
-      title: localization.common.selectDisksForCopy,
-      subTitle: localization.common.selectDisksInvolvedBackup,
-      status: UI_E_WIZARD_STATUS.INACTIVE,
-      isValid: true,
-      fields: {
-        disk_devices: {
-          field: '',
-          alert: '',
-        },
+          alert: ''
+        }
       },
-      testId: 'backup-restore-select-disks-for-copy',
+      testId: 'backup-restore-select--disks'
     },
     {
       id: dynamicSteps.selectNetwork,
       stepName: '',
       title: localization.common.selectNetwork,
-      subTitle: 'Select adapter types and networks in Procurator.', // TODO
+      subTitle: 'Select adapter types and networks in Procurator.',
       status: UI_E_WIZARD_STATUS.INACTIVE,
       isValid: true,
       testId: 'backup-restore-select-network',
-      fields: {},
+      fields: {}
     },
     {
       id: dynamicSteps.readyComplete,
@@ -104,27 +88,21 @@ export const stepsFunc = (
       status: UI_E_WIZARD_STATUS.INACTIVE,
       isValid: true,
       testId: 'backup-restore-ready-complete',
-      fields: {},
-    },
+      fields: {}
+    }
   ]
 }
 
 export const stepsSchemeInitial = [
   // [0, 1, 5], // disk only
-  [
-    dynamicSteps.selectType,
-    dynamicSteps.selectDisks,
-    dynamicSteps.readyComplete,
-  ], // disk only
-  // [dynamicSteps.selectType, dynamicSteps.readyComplete], // disk only
+  [dynamicSteps.selectType, dynamicSteps.readyComplete], // disk only
   [dynamicSteps.selectType, dynamicSteps.readyComplete], // existing
   [
     dynamicSteps.selectType,
     dynamicSteps.selectName,
     dynamicSteps.selectStorage,
     dynamicSteps.selectDisks,
-    dynamicSteps.selectDisksForCopy,
     dynamicSteps.selectNetwork,
-    dynamicSteps.readyComplete,
-  ], // as new
+    dynamicSteps.readyComplete
+  ] // as new
 ]

package/components/common/pages/backups/modals/restore/name/lib/models/interfaces.ts

@@ -1,6 +1,6 @@
-import type { API_UI_I_Error } from '~/lib/models/store/interfaces'
-
-export interface UI_I_NameCheck {
-  name: string
-  cb: (error: API_UI_I_Error) => void
-}
+import type { API_UI_I_Error } from '~/lib/models/store/interfaces'
+
+export interface UI_I_NameCheck {
+  name: string
+  cb: (error: API_UI_I_Error) => void
+}

package/components/common/pages/backups/modals/restore/types/Types.vue

@@ -1,31 +1,19 @@
 <template>
-  <component
-    :is="currentComponent"
+  <common-pages-backups-modals-restore-types-new
+    v-if="isNewView"
     v-model="model"
-    :backup-types="backupTypes"
   />
+  <common-pages-backups-modals-restore-types-old v-else v-model="model" />
 </template>
 
 <script lang="ts" setup>
 import type { UI_I_RestoreForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import { backupsTypesFunc } from '~/components/common/pages/backups/modals/restore/types/lib/config/typeOptions'
 
 const model = defineModel<UI_I_RestoreForm>({ required: true })
 
 const { $store }: any = useNuxtApp()
 
 const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-const currentComponent = computed(() =>
-  isNewView.value
-    ? defineAsyncComponent(() => import('./New.vue'))
-    : defineAsyncComponent(() => import('./Old.vue'))
-)
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const backupTypes = ref<UI_I_OptionItem[]>(backupsTypesFunc(localization.value))
 </script>
 
 <style scoped lang="scss"></style>

package/components/common/pages/backups/modals/restore/types/{New.vue → TypesNew.vue}

@@ -2,7 +2,7 @@
   <section class="datastore-type">
     <div class="datastore-type__radio-container flex flex-col gap-3">
       <ui-radio
-        v-for="(option, key) in props.backupTypes"
+        v-for="(option, key) in backupTypes"
         :key="key"
         v-model="model.restore_code"
         :label="option.text"
@@ -22,23 +22,23 @@
 
 <script lang="ts" setup>
 import type { UI_I_Localization } from '~/lib/models/interfaces'
+import { backupsTypesFunc } from '~/components/common/pages/backups/modals/restore/types/lib/config/typeOptions'
 import type { UI_I_RestoreForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
 import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 
 const model = defineModel<UI_I_RestoreForm>({ required: true })
 
-const props = defineProps<{
-  backupTypes: UI_I_OptionItem[]
-}>()
-
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const optionsDescription = ref<string[]>([
-  localization.value.common.restoreDiskOnlyDescription,
-  localization.value.common.restoreExistingDescription,
-  localization.value.common.restoreAsNewDescription,
-  localization.value.common.restoreAsNewAndCopyDescription,
-])
+const backupTypes = ref<UI_I_OptionItem[]>(backupsTypesFunc(localization.value))
+
+const optionsDescription = computed<string[]>(() => {
+  return [
+    localization.value.common.restoreDiskOnlyDescription,
+    localization.value.common.restoreExistingDescription,
+    localization.value.common.restoreAsNewDescription,
+  ]
+})
 </script>
 
 <style lang="scss" scoped>

package/components/common/pages/backups/modals/restore/types/{Old.vue → TypesOld.vue}

@@ -2,7 +2,7 @@
   <div class="select-restore-type flex">
     <atoms-list-select-list
       v-model="model.restore_code"
-      :items="props.backupTypes"
+      :items="backupTypes"
       class="select"
     />
     <p class="description">
@@ -12,19 +12,18 @@
 </template>
 
 <script lang="ts" setup>
-import type { UI_I_RestoreForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+import type { UI_I_RestoreForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
+import { backupsTypesFunc } from '~/components/common/pages/backups/modals/restore/types/lib/config/typeOptions'
 import { descriptionsFunc } from '~/components/common/pages/backups/modals/restore/types/lib/config/descriptions'
 
 const model = defineModel<UI_I_RestoreForm>({ required: true })
 
-const props = defineProps<{
-  backupTypes: UI_I_OptionItem[]
-}>()
-
 const localization = computed<UI_I_Localization>(() => useLocal())
 
+const backupTypes = ref<UI_I_OptionItem[]>(backupsTypesFunc(localization.value))
+
 const description = computed<string>(
   () => descriptionsFunc(localization.value)[model.value.restore_code - 1]
 )

package/components/common/pages/backups/modals/restore/types/lib/config/descriptions.ts

@@ -4,6 +4,5 @@ export const descriptionsFunc = (localization: UI_I_Localization): string[] => [
   localization.common.restoreDiskOnlyDescription,
   localization.common.restoreExistingDescription,
   localization.common.restoreAsNewDescription,
-  localization.common.restoreAsNewAndCopyDescription,
 ]
 

package/components/common/pages/hardwareHealth/historyTestimony/tools/Tools.vue

@@ -166,12 +166,7 @@ const emits = defineEmits<{
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
-
-const { $store, $formattedDatetime }: any = useNuxtApp()
-
-const updateTimeFormatAndInterfaceLang = computed<number>(
-  () => $store.getters['main/getUpdateTimeFormatAndInterfaceLang']
-)
+const { $formattedDatetime }: any = useNuxtApp()
 
 const periodOptions = computed<UI_I_OptionItem[]>(() =>
   periodFunc(localization.value, props.selectedTimespanType)
@@ -268,7 +263,7 @@ const onUpdateTools = (): void => {
 }
 
 const chartTitleDate = computed<string>(() => {
-  if (!props.startDate || !updateTimeFormatAndInterfaceLang.value) return ''
+  if (!props.startDate) return ''
 
   const start = $formattedDatetime(props.startDate, { hasSeconds: true })
   const end = $formattedDatetime(props.endDate, { hasSeconds: true })

package/components/common/pages/hardwareHealth/tableView/TableView.vue

@@ -89,9 +89,6 @@ const props = defineProps<{
   tableMode: UI_T_HardwareHealthTabMode
 }>()
 const selectedRow = defineModel<number[]>('selectedRow')
-
-const { $store }: any = useNuxtApp()
-
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const table: any = {
@@ -121,12 +118,7 @@ const headItems = computed<UI_I_HeadItem[]>(() =>
   table[props.tableMode].headItems(localization.value)
 )
 
-const updateTimeFormatAndInterfaceLang = computed<number>(
-  () => $store.getters['main/getUpdateTimeFormatAndInterfaceLang']
-)
-
 const bodyItems = computed<UI_I_BodyItem[][]>(() => {
-  if (!updateTimeFormatAndInterfaceLang.value) return []
   // const tableData = ['sensor'].includes(props.tableMode) ? props.dataTable : [] // TODO временно так
   let tableData = props.dataTable
 

package/components/common/pages/hardwareHealth/tableView/lib/config/sensorTable.ts

@@ -89,9 +89,6 @@ export const bodyItems = (
   localization: UI_I_Localization
 ): UI_I_BodyItem[][] => {
   const bodyItems: UI_I_BodyItem[][] = []
-
-  const { $formattedDatetime }: any = useNuxtApp()
-
   data.forEach((sensor: UI_I_HardwareHealthSensors, key) => {
     const statusData = {
       iconClassName: sensorsIconByStatus[sensor.status],
@@ -99,15 +96,6 @@ export const bodyItems = (
       warning: sensor.warning,
     }
 
-    const lastUpdate = sensor[hardwareHealthSensorTableKeys[4]]
-    const currentLastUpdate =
-      typeof lastUpdate === 'number'
-        ? $formattedDatetime(lastUpdate, {
-            hasSeconds: true,
-            separator: ', ',
-          })
-        : lastUpdate
-
     bodyItems.push([
       // {
       //   data,
@@ -151,7 +139,7 @@ export const bodyItems = (
       },
       {
         key: 'col4',
-        text: currentLastUpdate,
+        text: sensor[hardwareHealthSensorTableKeys[4]],
         id: key,
       },
       {

package/components/common/pages/hardwareHealth/toolsPanel/lib/config/actionsPanel.ts

@@ -11,24 +11,24 @@ export const hardwareHealthActionsFunc = (
       text: localization.common.refresh,
       type: 'refresh',
       disabled: false,
-      allowed: ['sensor', 'storage-sensor', 'alert-warning', 'system-log'],
+      permission: ['sensor', 'storage-sensor', 'alert-warning', 'system-log'],
       testId: 'hardware-health-refresh',
     },
     {
       text: localization.common.exportToXml,
       type: 'export-to-xml',
       disabled: true,
-      allowed: ['sensor'],
+      permission: ['sensor'],
       testId: 'hardware-health-export-to-xml',
     },
     {
       text: localization.common.resetEventLog,
       type: 'reset-event-log',
       disabled: true,
-      allowed: ['system-log'],
+      permission: ['system-log'],
       testId: 'hardware-health-reset-event-log',
     },
   ]
 
-  return tabs.filter((tab) => tab.allowed.includes(<string>selectedTab))
+  return tabs.filter((tab) => tab.permission.includes(<string>selectedTab))
 }

package/components/common/pages/home/lib/models/interfaces.ts

@@ -1,48 +1,48 @@
-import type { UI_T_NodeType } from '~/components/common/pages/home/lib/models/types'
-import type { UI_I_Resources } from '~/components/common/resource/lib/models/interfaces'
-import type { UI_I_Option } from '~/components/atoms/select/lib/models/interfaces'
-
-export interface UI_I_ZoneList extends UI_I_Option {}
-export interface UI_I_Hosts {
-  connected: number
-  disconnected: number
-  maintenance: number
-  total: number
-}
-
-export interface UI_I_Vms {
-  powered_on: number
-  powered_off: number
-  suspended: number
-  total: number
-}
-
-export interface UI_I_Alert {
-  item: string
-  type: UI_T_NodeType
-  id: number
-  alerts: number
-  warnings: number
-}
-
-export interface UI_I_Service {
-  id: number
-  item: string
-  statusIcon: string
-  statusText: string
-  version: string
-}
-
-export interface UI_I_HomeInfo {
-  resource_meter: UI_I_Resources[]
-  vms: UI_I_Vms
-  alerts: UI_I_Alert[]
-  services: UI_I_Service[]
-  hosts?: UI_I_Hosts
-}
-
-export interface UI_I_Card {
-  text: string
-  value: number
-  icon?: string
-}
+import type { UI_T_NodeType } from '~/components/common/pages/home/lib/models/types'
+import type { UI_I_Resources } from '~/components/common/resource/lib/models/interfaces'
+import type { UI_I_Option } from '~/components/atoms/select/lib/models/interfaces'
+
+export interface UI_I_ZoneList extends UI_I_Option {}
+export interface UI_I_Hosts {
+  connected: number
+  disconnected: number
+  maintenance: number
+  total: number
+}
+
+export interface UI_I_Vms {
+  powered_on: number
+  powered_off: number
+  suspended: number
+  total: number
+}
+
+export interface UI_I_Alert {
+  item: string
+  type: UI_T_NodeType
+  id: number
+  alerts: number
+  warnings: number
+}
+
+export interface UI_I_Service {
+  id: number
+  item: string
+  statusIcon: string
+  statusText: string
+  version: string
+}
+
+export interface UI_I_HomeInfo {
+  resource_meter: UI_I_Resources[]
+  vms: UI_I_Vms
+  alerts: UI_I_Alert[]
+  services: UI_I_Service[]
+  hosts?: UI_I_Hosts
+}
+
+export interface UI_I_Card {
+  text: string
+  value: number
+  icon?: string
+}

package/components/common/pages/home/widgets/hosts/Hosts.vue

@@ -1,27 +1,27 @@
-<template>
-  <common-pages-home-widgets-hosts-new
-    v-if="isNewView"
-    :hosts="props.hosts"
-    :loading="props.loading"
-  />
-
-  <common-pages-home-widgets-hosts-old
-    v-else
-    :hosts="props.hosts"
-  />
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Hosts } from '~/components/common/pages/home/lib/models/interfaces'
-
-const props = defineProps<{
-  hosts: UI_I_Hosts
-  loading: boolean
-}>()
-
-const { $store }: any = useNuxtApp()
-
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-</script>
-
-<style lang="scss" scoped></style>
+<template>
+  <common-pages-home-widgets-hosts-new
+    v-if="isNewView"
+    :hosts="props.hosts"
+    :loading="props.loading"
+  />
+
+  <common-pages-home-widgets-hosts-old
+    v-else
+    :hosts="props.hosts"
+  />
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Hosts } from '~/components/common/pages/home/lib/models/interfaces'
+
+const props = defineProps<{
+  hosts: UI_I_Hosts
+  loading: boolean
+}>()
+
+const { $store }: any = useNuxtApp()
+
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+</script>
+
+<style lang="scss" scoped></style>