bfg-common 1.5.446 → 1.5.448

package/components/common/pages/backups/tools/Tools.vue

@@ -1,75 +1,75 @@
-<template>
-  <div class="backup-actions grid py-0 px-6">
-    <button
-      v-if="targetType === 'vm'"
-      id="create-backup-button"
-      v-permission="permission"
-      :disabled="isDisabled"
-      data-id="create-backup-button"
-      class="btn btn-primary btn-sm"
-      @click="onSelect('createBackup')"
-    >
-      {{ localization.common.createBackup }}...
-    </button>
-    <atoms-tabs
-      :items="tabs"
-      test-id="vm-backup-tabs"
-      size="small"
-      class="tabs w-100"
-      @change="onSelect"
-    />
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { UI_T_Project } from '~/lib/models/types'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
-import type {
-  UI_T_BackupActionType,
-  UI_T_TargetType,
-} from '~/components/common/pages/backups/lib/models/types'
-import type { UI_I_BackupsTreeNode } from '~/components/common/pages/backups/lib/models/interfaces'
-import { backupsTabsFunc } from '~/components/common/pages/backups/tools/lib/config/tabs'
-
-const props = defineProps<{
-  project: UI_T_Project
-  backupsCount: number
-  backupsLoading: boolean
-  targetType: UI_T_TargetType
-  selectedNode: UI_I_BackupsTreeNode | null
-}>()
-
-const emits = defineEmits<{
-  (event: 'select', value: UI_T_BackupActionType): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const permission = computed<string>(() => {
-  return props.project === 'sphere' ? 'VirtualMachines.CreateBackup' : ''
-})
-
-const tabs = computed<UI_I_CollapseNavItem[]>(() =>
-  backupsTabsFunc(
-    localization.value,
-    isDisabled.value,
-    props.backupsCount,
-    props.selectedNode,
-    props.project
-  )
-)
-
-const onSelect = (action: UI_T_BackupActionType): void => {
-  emits('select', action)
-}
-
-const isDisabled = computed<boolean>(() => props.backupsLoading)
-</script>
-
-<style scoped lang="scss">
-.backup-actions {
-  grid-template-columns: auto 1fr;
-  align-items: baseline;
-}
-</style>
+<template>
+  <div class="backup-actions grid py-0 px-6">
+    <button
+      v-if="targetType === 'vm'"
+      id="create-backup-button"
+      v-permission="permission"
+      :disabled="isDisabled"
+      data-id="create-backup-button"
+      class="btn btn-primary btn-sm"
+      @click="onSelect('createBackup')"
+    >
+      {{ localization.common.createBackup }}...
+    </button>
+    <atoms-tabs
+      :items="tabs"
+      test-id="vm-backup-tabs"
+      size="small"
+      class="tabs w-100"
+      @change="onSelect"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_T_Project } from '~/lib/models/types'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
+import type {
+  UI_T_BackupActionType,
+  UI_T_TargetType,
+} from '~/components/common/pages/backups/lib/models/types'
+import type { UI_I_BackupsTreeNode } from '~/components/common/pages/backups/lib/models/interfaces'
+import { backupsTabsFunc } from '~/components/common/pages/backups/tools/lib/config/tabs'
+
+const props = defineProps<{
+  project: UI_T_Project
+  backupsCount: number
+  backupsLoading: boolean
+  targetType: UI_T_TargetType
+  selectedNode: UI_I_BackupsTreeNode | null
+}>()
+
+const emits = defineEmits<{
+  (event: 'select', value: UI_T_BackupActionType): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const permission = computed<string>(() => {
+  return props.project === 'sphere' ? 'VirtualMachines.CreateBackup' : ''
+})
+
+const tabs = computed<UI_I_CollapseNavItem[]>(() =>
+  backupsTabsFunc(
+    localization.value,
+    isDisabled.value,
+    props.backupsCount,
+    props.selectedNode,
+    props.project
+  )
+)
+
+const onSelect = (action: UI_T_BackupActionType): void => {
+  emits('select', action)
+}
+
+const isDisabled = computed<boolean>(() => props.backupsLoading)
+</script>
+
+<style scoped lang="scss">
+.backup-actions {
+  grid-template-columns: auto 1fr;
+  align-items: baseline;
+}
+</style>

package/components/common/pages/backups/tools/lib/config/tabs.ts

@@ -1,36 +1,36 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
-import type { UI_I_BackupsTreeNode } from '~/components/common/pages/backups/lib/models/interfaces'
-import type { UI_T_Project } from '~/lib/models/types'
-
-export const backupsTabsFunc = (
-  localization: UI_I_Localization,
-  isDisabled: boolean,
-  backupsCount: number,
-  selectedNode: UI_I_BackupsTreeNode | null,
-  project: UI_T_Project
-): UI_I_CollapseNavItem[] => {
-  return [
-    {
-      text: localization.common.restore.toUpperCase(),
-      value: 'restoreBackup',
-      disabled: isDisabled || selectedNode?.type !== 'backup',
-      testId: 'restore-backup',
-      permission: project === 'sphere' ? 'VirtualMachines.RestoreBackup' : '',
-    },
-    {
-      text: localization.common.delete.toUpperCase(),
-      value: 'deleteBackup',
-      disabled: isDisabled || selectedNode?.type !== 'backup',
-      testId: 'delete-backup',
-      permission: project === 'sphere' ? 'VirtualMachines.DeleteBackup' : '',
-    },
-    {
-      text: localization.common.deleteAll.toUpperCase(),
-      value: 'deleteBackupAll',
-      disabled: isDisabled || !backupsCount,
-      testId: 'delete-all-backups',
-      permission: project === 'sphere' ? 'VirtualMachines.DeleteBackups' : '',
-    },
-  ]
-}
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
+import type { UI_I_BackupsTreeNode } from '~/components/common/pages/backups/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
+
+export const backupsTabsFunc = (
+  localization: UI_I_Localization,
+  isDisabled: boolean,
+  backupsCount: number,
+  selectedNode: UI_I_BackupsTreeNode | null,
+  project: UI_T_Project
+): UI_I_CollapseNavItem[] => {
+  return [
+    {
+      text: localization.common.restore.toUpperCase(),
+      value: 'restoreBackup',
+      disabled: isDisabled || selectedNode?.type !== 'backup',
+      testId: 'restore-backup',
+      permission: project === 'sphere' ? 'VirtualMachines.RestoreBackup' : '',
+    },
+    {
+      text: localization.common.delete.toUpperCase(),
+      value: 'deleteBackup',
+      disabled: isDisabled || selectedNode?.type !== 'backup',
+      testId: 'delete-backup',
+      permission: project === 'sphere' ? 'VirtualMachines.DeleteBackup' : '',
+    },
+    {
+      text: localization.common.deleteAll.toUpperCase(),
+      value: 'deleteBackupAll',
+      disabled: isDisabled || !backupsCount,
+      testId: 'delete-all-backups',
+      permission: project === 'sphere' ? 'VirtualMachines.DeleteBackups' : '',
+    },
+  ]
+}

package/components/common/pages/home/headline/Headline.vue

@@ -22,10 +22,15 @@ import type { UI_T_Project } from '~/lib/models/types'
 
 const selectedZone = defineModel<string>('selectedZone', { required: true })
 
-const props = defineProps<{
-  zoneList: UI_I_ZoneList[]
-  project: UI_T_Project
-}>()
+const props = withDefaults(
+  defineProps<{
+    zoneList: UI_I_ZoneList[]
+    project?: UI_T_Project // TODO 700
+  }>(),
+  {
+    project: undefined,
+  }
+)
 
 const { $store }: any = useNuxtApp()
 

package/components/common/pages/home/headline/HeadlineNew.vue

@@ -41,10 +41,15 @@ import type { UI_T_Project } from '~/lib/models/types'
 import type { UI_I_Option } from '~/components/atoms/select/lib/models/interfaces'
 
 const selectedZoneModel = defineModel<string>({ required: true })
-const props = defineProps<{
-  project: UI_T_Project
-  data: UI_I_Option[]
-}>()
+const props = withDefaults(
+  defineProps<{
+    data: UI_I_Option[]
+    project?: UI_T_Project // TODO 700
+  }>(),
+  {
+    project: undefined,
+  }
+)
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 

package/components/common/pages/home/headline/HeadlineOld.vue

@@ -1,42 +1,47 @@
-<template>
-  <h2 class="headline-title">
-    {{ localization.mainNavigation.home }}
-  </h2>
-
-  <atoms-select-the-select
-    v-if="isProjectSphere"
-    v-model="selectedZoneModel"
-    :options="props.data"
-    test-id="home-zone-select"
-    @update:model-value="emits('update')"
-  >
-    <span class="vsphere-icon-vcenter" />
-  </atoms-select-the-select>
-</template>
-
-<script lang="ts" setup>
-import type { UI_T_Project } from '~/lib/models/types'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_Option } from '~/components/atoms/select/lib/models/interfaces'
-
-const selectedZoneModel = defineModel<string>({ required: true })
-const props = defineProps<{
-  project: UI_T_Project
-  data: UI_I_Option[]
-}>()
-const emits = defineEmits<{
-  (event: 'update'): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const isProjectSphere = ref<boolean>(props.project === 'sphere')
-</script>
-
-<style lang="scss" scoped>
-.headline-title {
-  font-size: 28px;
-  font-weight: 200;
-  letter-spacing: normal;
-}
-</style>
+<template>
+  <h2 class="headline-title">
+    {{ localization.mainNavigation.home }}
+  </h2>
+
+  <atoms-select-the-select
+    v-if="isProjectSphere"
+    v-model="selectedZoneModel"
+    :options="props.data"
+    test-id="home-zone-select"
+    @update:model-value="emits('update')"
+  >
+    <span class="vsphere-icon-vcenter" />
+  </atoms-select-the-select>
+</template>
+
+<script lang="ts" setup>
+import type { UI_T_Project } from '~/lib/models/types'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_Option } from '~/components/atoms/select/lib/models/interfaces'
+
+const selectedZoneModel = defineModel<string>({ required: true })
+const props = withDefaults(
+  defineProps<{
+    data: UI_I_Option[]
+    project?: UI_T_Project // TODO 700
+  }>(),
+  {
+    project: undefined,
+  }
+)
+const emits = defineEmits<{
+  (event: 'update'): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const isProjectSphere = ref<boolean>(props.project === 'sphere')
+</script>
+
+<style lang="scss" scoped>
+.headline-title {
+  font-size: 28px;
+  font-weight: 200;
+  letter-spacing: normal;
+}
+</style>

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/Widgets.vue

@@ -15,6 +15,7 @@
     :hosts="hosts"
     :alerts="alerts || []"
     :services="services || []"
+    :loading="props.loading"
     :project="props.project"
   />
 </template>

package/components/common/pages/home/widgets/WidgetsOld.vue

@@ -1,10 +1,15 @@
 <template>
   <div class="clr-row">
-    <common-pages-home-widgets-vms :vms="props.vms" :project="props.project" />
+    <common-pages-home-widgets-vms
+      :vms="props.vms"
+      :project="props.project"
+      :loading="props.loading"
+    />
 
     <common-pages-home-widgets-hosts
       v-if="props.project === 'sphere'"
       :hosts="props.hosts"
+      :loading="props.loading"
     />
 
     <!--    TODO 700-->
@@ -27,6 +32,7 @@ const props = withDefaults(
   defineProps<{
     vms: UI_I_Vms
     hosts: UI_I_Hosts
+    loading: boolean
     // TODO 700
     // alerts: UI_I_Alert[]
     // services: UI_I_Service[]

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>

package/components/common/pages/home/widgets/hosts/lib/config/items.ts

@@ -1,23 +1,23 @@
-import type {
-  UI_I_Card,
-  UI_I_Hosts,
-} from '~/components/common/pages/home/lib/models/interfaces'
-
-export const itemsFunc = (hosts: UI_I_Hosts): UI_I_Card[] => [
-  {
-    value: hosts.connected,
-    text: 'connected',
-    icon: 'vsphere-icon-Host_Connect',
-  },
-  {
-    value: hosts.disconnected,
-    text: 'disconnected',
-    icon: 'vsphere-icon-Host_Disconnect',
-  },
-
-  {
-    value: hosts.maintenance,
-    text: 'maintenance',
-    icon: 'vsphere-icon-host-maintenance',
-  },
-]
+import type {
+  UI_I_Card,
+  UI_I_Hosts,
+} from '~/components/common/pages/home/lib/models/interfaces'
+
+export const itemsFunc = (hosts: UI_I_Hosts): UI_I_Card[] => [
+  {
+    value: hosts.connected,
+    text: 'connected',
+    icon: 'vsphere-icon-Host_Connect',
+  },
+  {
+    value: hosts.disconnected,
+    text: 'disconnected',
+    icon: 'vsphere-icon-Host_Disconnect',
+  },
+
+  {
+    value: hosts.maintenance,
+    text: 'maintenance',
+    icon: 'vsphere-icon-host-maintenance',
+  },
+]

package/components/common/pages/home/widgets/vms/VmsOld.vue

@@ -1,35 +1,35 @@
-<template>
-  <div :class="classes">
-    <div class="entity-status">
-      <common-pages-home-card
-        :title="localization.common.vms"
-        :count="props.vms.total"
-        icon-name="vsphere-icon-vm"
-      >
-        <common-pages-home-status-content :items="props.vms" />
-      </common-pages-home-card>
-    </div>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_Vms } from '~/components/common/pages/home/lib/models/interfaces'
-import type { UI_T_Project } from '~/lib/models/types'
-const props = defineProps<{
-  vms: UI_I_Vms
-  project?: UI_T_Project
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const classes = computed<string>(() => {
-  let classes = 'clr-col-md-6 clr-col-sm-12'
-  if (props.project === 'procurator') {
-    classes = 'clr-col-md-12 clr-col-sm-12'
-  }
-  return classes
-})
-</script>
-
-<style lang="scss" scoped></style>
+<template>
+  <div :class="classes">
+    <div class="entity-status">
+      <common-pages-home-card
+        :title="localization.common.vms"
+        :count="props.vms.total"
+        icon-name="vsphere-icon-vm"
+      >
+        <common-pages-home-status-content :items="props.vms" />
+      </common-pages-home-card>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_Vms } from '~/components/common/pages/home/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
+const props = defineProps<{
+  vms: UI_I_Vms
+  project?: UI_T_Project
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const classes = computed<string>(() => {
+  let classes = 'clr-col-md-6 clr-col-sm-12'
+  if (props.project === 'procurator') {
+    classes = 'clr-col-md-12 clr-col-sm-12'
+  }
+  return classes
+})
+</script>
+
+<style lang="scss" scoped></style>