bfg-common 1.3.141 → 1.3.143

package/components/common/monitor/advanced/tools/lib/config/advancedToolbar.ts

@@ -1,125 +1,130 @@
-import { UI_I_Localization } from '~/lib/models/interfaces'
-import { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-import { UI_I_DropMenu } from '~/components/common/monitor/advanced/tools/lib/models/interfaces'
-import { UI_T_AdvancedType } from '~/components/common/monitor/advanced/lib/models/types'
-import { UI_I_OptionData } from '~/components/common/monitor/advanced/lib/models/interfaces'
-import { UI_T_Project } from '~/lib/models/types'
-
-export const periodFunc = (
-  localization: UI_I_Localization,
-  selectedTimespanType: string
-): UI_I_OptionItem[] => {
-  const result = [
-    {
-      text: localization.realTime,
-      value: 'real_time',
-    },
-    {
-      text: localization.lastDay,
-      value: 'last_day',
-    },
-    {
-      text: localization.lastWeek,
-      value: 'last_week',
-    },
-    {
-      text: localization.lastMonth,
-      value: 'last_month',
-    },
-    // {
-    //   text: localization.lastYear,
-    //   value: 'last_year',
-    // },
-  ]
-
-  if (selectedTimespanType === 'custom_interval') {
-    result.push({
-      text: localization.customInterval,
-      value: 'custom_interval',
-    })
-  }
-
-  return result
-}
-
-export const viewFunc = (
-  localization: UI_I_Localization,
-  type: UI_T_AdvancedType,
-  optionsNames?: string[]
-): UI_I_OptionItem[] => {
-  const viewData: UI_I_OptionData = {
-    cluster: [],
-    datacenter: [
-      {
-        text: localization.virtualMachineOperations,
-        value: 'virtualMachineOperations',
-      },
-    ],
-    host: [
-      { text: localization.cpuUsageInPercent, value: 'cpuUsageInPercent' },
-      // { text: localization.datastore, value: 'datastore' },
-      { text: localization.memory, value: 'memory' },
-      { text: localization.disk, value: 'disk' },
-      { text: localization.network, value: 'network' },
-      // { text: localization.power, value: 'power' },
-      // { text: localization.storageAdapters, value: 'storageAdapters' },
-      // { text: localization.storagePath, value: 'storagePath' },
-      // { text: localization.system, value: 'system' },
-      // {
-      //   text: localization.procuratorReplication,
-      //   value: 'procuratorReplication',
-      // },
-    ],
-    vm: [
-      { text: localization.cpuUsageInPercent, value: 'cpuUsageInPercent' },
-      // { text: localization.cpuUsageInMhz, value: 'cpuUsageInMhz' },
-      // { text: localization.cpuReady, value: 'cpuReady' },
-      // { text: localization.datastore, value: 'datastore' },
-      { text: localization.memory, value: 'memory' },
-      { text: localization.disk, value: 'disk' },
-      { text: localization.network, value: 'network' },
-      // { text: localization.power, value: 'power' },
-      // { text: localization.virtualDisk, value: 'virtualDisk' },
-    ],
-  }
-  const currentOptions = viewData[type]
-
-  if (optionsNames) {
-    optionsNames.forEach((item) => {
-      currentOptions.push({
-        text: item,
-        value: item,
-      })
-    })
-  }
-  return currentOptions
-}
-
-export const exportFunc = (
-  localization: UI_I_Localization
-): UI_I_DropMenu<string>[] => [
-  { text: localization.toPng + '...', action: 'png' },
-  { text: localization.toJpeg + '...', action: 'jpeg' },
-  { text: localization.toSvg + '...', action: 'svg' },
-  { text: localization.toCsv + '...', action: 'csv' },
-]
-
-export const getCurrentOptionsStorageFunc = (
-  routeType: string,
-  project: UI_T_Project
-): string[] => {
-  const prefix = project === 'sphere'
-  const optionsNames = []
-  for (const key of Object.entries(localStorage)) {
-    if (key[0].includes('ChartOptions')) {
-      const currentOptions = useLocalStorage(key[0], undefined, prefix)
-      if (
-        key[0].includes('ChartOptions') &&
-        currentOptions.routeType === routeType
-      ) {
-        optionsNames.push(key[0].replace('ChartOptions', ''))
-      }
-    }
-  }
-  return optionsNames
-}
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+import type { UI_I_DropMenu } from '~/components/common/monitor/advanced/tools/lib/models/interfaces'
+import type { UI_T_AdvancedType } from '~/components/common/monitor/advanced/lib/models/types'
+import type { UI_I_OptionData } from '~/components/common/monitor/advanced/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
+
+export const periodFunc = (
+  localization: UI_I_Localization,
+  selectedTimespanType: string
+): UI_I_OptionItem[] => {
+  const result = [
+    {
+      text: localization.realTime,
+      value: 'real_time',
+    },
+    {
+      text: localization.lastDay,
+      value: 'last_day',
+    },
+    {
+      text: localization.lastWeek,
+      value: 'last_week',
+    },
+    {
+      text: localization.lastMonth,
+      value: 'last_month',
+    },
+    // {
+    //   text: localization.lastYear,
+    //   value: 'last_year',
+    // },
+  ]
+
+  if (selectedTimespanType === 'custom_interval') {
+    result.push({
+      text: localization.customInterval,
+      value: 'custom_interval',
+    })
+  }
+
+  return result
+}
+
+export const viewFunc = (
+  localization: UI_I_Localization,
+  type: UI_T_AdvancedType,
+  optionsNames?: string[]
+): UI_I_OptionItem[] => {
+  const viewData: UI_I_OptionData = {
+    zone: [
+      { text: localization.cpuUsageInPercent, value: 'cpuUsageInPercent' },
+    ],
+    cluster: [
+      { text: localization.cpuUsageInPercent, value: 'cpuUsageInPercent' },
+    ],
+    datacenter: [
+      {
+        text: localization.virtualMachineOperations,
+        value: 'virtualMachineOperations',
+      },
+    ],
+    host: [
+      { text: localization.cpuUsageInPercent, value: 'cpuUsageInPercent' },
+      // { text: localization.datastore, value: 'datastore' },
+      { text: localization.memory, value: 'memory' },
+      { text: localization.disk, value: 'disk' },
+      { text: localization.network, value: 'network' },
+      // { text: localization.power, value: 'power' },
+      // { text: localization.storageAdapters, value: 'storageAdapters' },
+      // { text: localization.storagePath, value: 'storagePath' },
+      // { text: localization.system, value: 'system' },
+      // {
+      //   text: localization.procuratorReplication,
+      //   value: 'procuratorReplication',
+      // },
+    ],
+    vm: [
+      { text: localization.cpuUsageInPercent, value: 'cpuUsageInPercent' },
+      // { text: localization.cpuUsageInMhz, value: 'cpuUsageInMhz' },
+      // { text: localization.cpuReady, value: 'cpuReady' },
+      // { text: localization.datastore, value: 'datastore' },
+      { text: localization.memory, value: 'memory' },
+      { text: localization.disk, value: 'disk' },
+      { text: localization.network, value: 'network' },
+      // { text: localization.power, value: 'power' },
+      // { text: localization.virtualDisk, value: 'virtualDisk' },
+    ],
+  }
+  const currentOptions = viewData[type]
+
+  if (optionsNames) {
+    optionsNames.forEach((item) => {
+      currentOptions.push({
+        text: item,
+        value: item,
+      })
+    })
+  }
+  return currentOptions
+}
+
+export const exportFunc = (
+  localization: UI_I_Localization
+): UI_I_DropMenu<string>[] => [
+  { text: localization.toPng + '...', action: 'png' },
+  { text: localization.toJpeg + '...', action: 'jpeg' },
+  { text: localization.toSvg + '...', action: 'svg' },
+  { text: localization.toCsv + '...', action: 'csv' },
+]
+
+export const getCurrentOptionsStorageFunc = (
+  routeType: string,
+  project: UI_T_Project
+): string[] => {
+  const prefix = project === 'sphere'
+  const optionsNames = []
+  for (const key of Object.entries(localStorage)) {
+    if (key[0].includes('ChartOptions')) {
+      const currentOptions = useLocalStorage(key[0], undefined, prefix)
+      if (
+        key[0].includes('ChartOptions') &&
+        currentOptions.routeType === routeType
+      ) {
+        optionsNames.push(key[0].replace('ChartOptions', ''))
+      }
+    }
+  }
+  return optionsNames
+}

package/components/common/monitor/advanced/tools/lib/utils/countCores.ts

@@ -1,4 +1,4 @@
-import { I_SeriesLine } from 'bfg-nuxt-3-graph/graph/lib/models/interfaces'
+import type { I_SeriesLine } from 'bfg-nuxt-3-graph/graph/lib/models/interfaces'
 
 export const getCountCores = (data: I_SeriesLine | null): number => {
   if (!data) return 0

package/components/common/monitor/lib/models/interfaces.ts

@@ -1,5 +1,5 @@
-import { I_SeriesLine } from 'bfg-nuxt-3-graph/graph/lib/models/interfaces'
-import { UI_T_OverviewRequestType } from '~/components/common/monitor/overview/filters/lib/models/types'
+import type { I_SeriesLine } from 'bfg-nuxt-3-graph/graph/lib/models/interfaces'
+import type { UI_T_OverviewRequestType } from '~/components/common/monitor/overview/filters/lib/models/types'
 
 export interface UI_I_GraphDataSettingItem {
   title: string

package/components/common/monitor/overview/filters/Filters.vue

@@ -53,11 +53,11 @@
 </template>
 
 <script setup lang="ts">
-import { UI_I_Localization } from '~/lib/models/interfaces'
-import { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-import { UI_T_Project } from '~/lib/models/types'
-import { UI_I_MonitorGraphPayload } from '~/components/common/monitor/lib/models/interfaces'
-import { UI_T_OverviewViewType } from '~/components/common/monitor/overview/filters/lib/models/types'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
+import type { UI_I_MonitorGraphPayload } from '~/components/common/monitor/lib/models/interfaces'
+import type { UI_T_OverviewViewType } from '~/components/common/monitor/overview/filters/lib/models/types'
 import {
   periodFunc,
   viewFunc,

package/components/common/monitor/overview/filters/lib/config/filterOptions.ts

@@ -1,8 +1,8 @@
-import { UI_I_Localization } from '~/lib/models/interfaces'
-import { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-import { UI_I_OverviewViewOptionData } from '~/components/common/monitor/overview/filters/lib/models/interfaces'
-import { UI_T_OverviewViewType } from '~/components/common/monitor/overview/filters/lib/models/types'
-import { UI_T_Project } from '~/lib/models/types'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+import type { UI_I_OverviewViewOptionData } from '~/components/common/monitor/overview/filters/lib/models/interfaces'
+import type { UI_T_OverviewViewType } from '~/components/common/monitor/overview/filters/lib/models/types'
+import type { UI_T_Project } from '~/lib/models/types'
 
 export const periodFunc = (
   localization: UI_I_Localization
@@ -53,6 +53,7 @@ export const viewFunc = (
     })
 
   const viewData: UI_I_OverviewViewOptionData = {
+    zone: [{ text: localization.overview, value: 'overview' }],
     datacenter: [
       {
         text: localization.clusters,

package/components/common/monitor/overview/filters/lib/models/interfaces.ts

@@ -1,6 +1,7 @@
-import { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 
 export interface UI_I_OverviewViewOptionData {
+  zone: UI_I_OptionItem[]
   datacenter: UI_I_OptionItem[]
   host: UI_I_OptionItem[]
   vm: UI_I_OptionItem[]

package/components/common/monitor/overview/filters/lib/models/types.ts

@@ -1,3 +1,13 @@
-export type UI_T_OverviewViewType = 'host' | 'vm' | 'datacenter' | 'cluster'
-
-export type UI_T_OverviewRequestType = 'hosts' | 'vms' | 'datacenters'
+export type UI_T_OverviewViewType =
+  | 'zone'
+  | 'host'
+  | 'vm'
+  | 'datacenter'
+  | 'cluster'
+
+export type UI_T_OverviewRequestType =
+  | 'cluster'
+  | 'zone'
+  | 'hosts'
+  | 'vms'
+  | 'datacenters'

package/components/common/pages/Tasks.vue

@@ -1,120 +1,120 @@
-<template>
-  <div class="tasks">
-    <common-headline
-      :headline="localization.taskConsole"
-      class="tasks__headline"
-    />
-
-    <div class="btn-group">
-      <button
-        id="task-previous-button"
-        class="btn btn-sm btn-link nav-link"
-        :disabled="pagination.page === 1"
-        @click="onClickButton('previous')"
-      >
-        {{ localization.previous }}
-      </button>
-
-      <button
-        id="task-next-button"
-        class="btn btn-sm btn-link nav-link"
-        :disabled="pagination.page === tasksList?.total_pages"
-        @click="onClickButton('next')"
-      >
-        {{ localization.next }}
-      </button>
-    </div>
-
-    <templates-tasks-table-view
-      :data-table="tasksList?.items || []"
-      :total-items="tasksList?.total_items || 0"
-      :total-pages="tasksList?.total_pages || 1"
-      :pagination="pagination"
-      :loading="isLoading"
-      @pagination="onUpdatePagination"
-      @sort="onSortTable"
-    />
-  </div>
-</template>
-
-<script lang="ts" setup>
-import type {
-  UI_I_Localization,
-} from '~/lib/models/interfaces'
-import type {
-  UI_I_Pagination,
-  UI_I_DataTableQuery,
-} from '~/lib/models/table/interfaces'
-import type { UI_I_Task } from '~/lib/models/store/tasks/interfaces'
-
-definePageMeta({
-  middleware: ['auth'],
-})
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-const { $store }: any = useNuxtApp()
-
-const pagination = ref<UI_I_Pagination>({
-  page: 1,
-  pageSize: 100,
-})
-const sort = ref<string | null>(null)
-
-const tasksList = computed<UI_I_Task>(() => $store.getters['tasks/getTaskList'])
-
-const onClickButton = (status: string): void => {
-  if (status === 'next') {
-    pagination.value.page += 1
-    return
-  }
-
-  pagination.value.page -= 1
-}
-
-const getTasks = async (): Promise<void> => {
-  pauseGlobalRefresh()
-
-  const payload: UI_I_DataTableQuery = {
-    ...pagination.value,
-    sortBy: sort.value || '',
-  }
-  await $store.dispatch('tasks/A_GET_TASKS', payload)
-}
-
-const onUpdatePagination = (event: UI_I_Pagination): void => {
-  pagination.value = event
-  getTasks()
-}
-
-const onSortTable = (event: string): void => {
-  sort.value = event
-  getTasks()
-}
-
-const isLoading = computed<boolean>(() =>
-  $store.getters['tasks/getLoading']('tasks')
-)
-const pauseGlobalRefresh = (): void => {
-  const tasksLastRequestType = $store.getters['tasks/getTasksLastRequestType']
-  $store.dispatch('main/A_PAUSE_GLOBAL_REFRESH', tasksLastRequestType)
-}
-onUnmounted(() => {
-  pauseGlobalRefresh()
-})
-</script>
-
-<style lang="scss">
-@import '~/node_modules/bfg-common/assets/scss/common/mixins';
-.tasks {
-  @include flex($dir: column);
-  height: 100%;
-  padding-left: 10px;
-  &__headline {
-    padding-left: 10px;
-    margin-bottom: 0.6rem;
-  }
-  .btn {
-    text-transform: uppercase;
-  }
-}
-</style>
+<template>
+  <div class="tasks">
+    <common-headline
+      :headline="localization.taskConsole"
+      class="tasks__headline"
+    />
+
+    <div class="btn-group">
+      <button
+        id="task-previous-button"
+        class="btn btn-sm btn-link nav-link"
+        :disabled="pagination.page === 1"
+        @click="onClickButton('previous')"
+      >
+        {{ localization.previous }}
+      </button>
+
+      <button
+        id="task-next-button"
+        class="btn btn-sm btn-link nav-link"
+        :disabled="pagination.page === tasksList?.total_pages"
+        @click="onClickButton('next')"
+      >
+        {{ localization.next }}
+      </button>
+    </div>
+
+    <templates-tasks-table-view
+      :data-table="tasksList?.items || []"
+      :total-items="tasksList?.total_items || 0"
+      :total-pages="tasksList?.total_pages || 1"
+      :pagination="pagination"
+      :loading="isLoading"
+      @pagination="onUpdatePagination"
+      @sort="onSortTable"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type {
+  UI_I_Localization,
+} from '~/lib/models/interfaces'
+import type {
+  UI_I_Pagination,
+  UI_I_DataTableQuery,
+} from '~/lib/models/table/interfaces'
+import type { UI_I_Task } from '~/lib/models/store/tasks/interfaces'
+
+definePageMeta({
+  middleware: ['auth'],
+})
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+const { $store }: any = useNuxtApp()
+
+const pagination = ref<UI_I_Pagination>({
+  page: 1,
+  pageSize: 100,
+})
+const sort = ref<string | null>(null)
+
+const tasksList = computed<UI_I_Task>(() => $store.getters['tasks/getTaskList'])
+
+const onClickButton = (status: string): void => {
+  if (status === 'next') {
+    pagination.value.page += 1
+    return
+  }
+
+  pagination.value.page -= 1
+}
+
+const getTasks = async (): Promise<void> => {
+  pauseGlobalRefresh()
+
+  const payload: UI_I_DataTableQuery = {
+    ...pagination.value,
+    sortBy: sort.value || '',
+  }
+  await $store.dispatch('tasks/A_GET_TASKS', payload)
+}
+
+const onUpdatePagination = (event: UI_I_Pagination): void => {
+  pagination.value = event
+  getTasks()
+}
+
+const onSortTable = (event: string): void => {
+  sort.value = event
+  getTasks()
+}
+
+const isLoading = computed<boolean>(() =>
+  $store.getters['tasks/getLoading']('tasks')
+)
+const pauseGlobalRefresh = (): void => {
+  const tasksLastRequestType = $store.getters['tasks/getTasksLastRequestType']
+  $store.dispatch('main/A_PAUSE_GLOBAL_REFRESH', tasksLastRequestType)
+}
+onUnmounted(() => {
+  pauseGlobalRefresh()
+})
+</script>
+
+<style lang="scss">
+@import '~/node_modules/bfg-common/assets/scss/common/mixins';
+.tasks {
+  @include flex($dir: column);
+  height: 100%;
+  padding-left: 10px;
+  &__headline {
+    padding-left: 10px;
+    margin-bottom: 0.6rem;
+  }
+  .btn {
+    text-transform: uppercase;
+  }
+}
+</style>