bfg-common 1.4.648 → 1.4.649

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

@@ -1,234 +1,232 @@
-<template>
-  <div class="horizontal-flex-container overview-chart-title-bar">
-    <div class="horizontal-flex-container">
-      <label for="periodSelect" class="label-select"
-        >{{ localization.inventoryMonitor.period }}:</label
-      >
-      <div v-if="!disabledPeriodOptions" class="select">
-        <select
-          id="periodSelect"
-          v-model="selectedPeriod"
-          data-id="period-select"
-        >
-          <option
-            v-for="(item, index) in periodOptions"
-            :key="index"
-            :value="item.value"
-          >
-            {{ item.text }}
-          </option>
-        </select>
-      </div>
-      <span v-else class="single-option">{{ periodOptions[0].text }}</span>
-    </div>
-    <div v-show="isShowCustomIntervalButton">
-      <a
-        id="show-interval-modal-button"
-        data-id="show-interval-modal-button"
-        @click="onShowIntervalModal"
-        >{{ localization.inventoryMonitor.changeCustomInterval }}</a
-      >
-    </div>
-    <div v-if="!disabledPeriodOptions" class="chart-title">
-      {{ chartTitleDate }}
-    </div>
-    <div class="view-select-label horizontal-flex-container">
-      <label for="viewSelect" class="label-select"
-        >{{ localization.common.view }}:</label
-      >
-      <div class="select">
-        <select id="viewSelect" v-model="selectedView" data-id="view-select">
-          <option
-            v-for="(item, index) in viewOptions"
-            :key="index"
-            :value="item.value"
-          >
-            {{ item.text }}
-          </option>
-        </select>
-      </div>
-    </div>
-  </div>
-
-  <common-monitor-overview-filters-custom-interval-modal
-    v-if="isShowIntervalModal"
-    :selected-periods="props.selectedPeriods"
-    :format-date="props.formatDate"
-    :current-lang="props.currentLang"
-    @hide="onHideIntervalModal"
-    @submit="onSubmitIntervalModal"
-  />
-</template>
-
-<script setup lang="ts">
-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,
-} from '~/components/common/monitor/overview/filters/lib/config/filterOptions'
-import { getValidDateByOptionFunc } from '~/components/common/monitor/lib/config/getValidDateByOption'
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-const { $formattedDatetime } = useNuxtApp()
-
-const props = defineProps<{
-  startDate: number
-  endDate: number
-  chartType: 'spline' | 'pie'
-  view: UI_T_OverviewViewType
-  selectedPeriods: number[]
-  formatDate: string
-  project: UI_T_Project
-  currentLang: string
-  formatTime?: string
-}>()
-
-const emits = defineEmits<{
-  (event: 'update-filters', value: UI_I_MonitorGraphPayload): void
-  (event: 'update-custom-date', value: number[]): void
-}>()
-
-const selectedPeriod = ref<string>('')
-const periodOptions = computed<UI_I_OptionItem[]>(() =>
-  periodFunc(localization.value)
-)
-watch(
-  () => periodOptions.value,
-  (newValue: UI_I_OptionItem[]) => {
-    if (newValue) selectedPeriod.value = newValue[0].value
-  },
-  { immediate: true }
-)
-
-const isShowCustomIntervalButton = computed<boolean>(
-  () => selectedPeriod.value === 'custom_interval'
-)
-
-const isShowIntervalModal = ref<boolean>(false)
-const onShowIntervalModal = (): void => {
-  isShowIntervalModal.value = true
-}
-const onHideIntervalModal = (): void => {
-  isShowIntervalModal.value = false
-}
-const onSubmitIntervalModal = (customDates: number[]): void => {
-  customDatesData.value = customDates
-  sendUpdatedFilters()
-  onHideIntervalModal()
-  emits('update-custom-date', customDates)
-}
-
-const chartTitleDate = computed<string>(() => {
-  const startValue = props.startDate
-  const endValue = props.endDate
-  if (!startValue && !endValue) return ''
-
-  const start = $formattedDatetime(
-    startValue,
-    props.formatDate,
-    true,
-    '',
-    props.formatTime
-  )
-  const end = $formattedDatetime(
-    endValue,
-    props.formatDate,
-    true,
-    '',
-    props.formatTime
-  )
-  return `${start} - ${end}`
-})
-
-// const disabledPeriodOptions = computed<boolean>(
-//   () => props.chartType === 'pie' || !chartTitleDate.value
-// )
-
-const disabledPeriodOptions = computed<boolean>(() => props.chartType === 'pie')
-
-const selectedView = ref<string>('')
-const viewOptions = computed<UI_I_OptionItem[]>(() =>
-  viewFunc(localization.value, props.view, props.project)
-)
-watch(
-  () => viewOptions.value,
-  (newValue: UI_I_OptionItem[]) => {
-    if (newValue) selectedView.value = newValue[0].value
-  },
-  { immediate: true }
-)
-
-const customDatesData = ref<number[]>([])
-const sendUpdatedFilters = (): void => {
-  const currentPeriod =
-    selectedPeriod.value === 'custom_interval'
-      ? customDatesData.value
-      : getValidDateByOptionFunc(selectedPeriod.value)
-  const filters: UI_I_MonitorGraphPayload = {
-    period: currentPeriod,
-    view: selectedView.value,
-    periodName: selectedPeriod.value,
-  }
-
-  emits('update-filters', filters)
-}
-watch(
-  () => [selectedPeriod.value, selectedView.value],
-  (newValue: string[]) => {
-    newValue[0] !== 'custom_interval' && sendUpdatedFilters()
-  },
-  { immediate: true }
-)
-</script>
-
-<style scoped lang="scss">
-.horizontal-flex-container {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  line-height: 20px;
-  flex-shrink: 0;
-  padding-top: 5px;
-
-  .select {
-    position: relative;
-
-    select {
-      height: 20px;
-      margin: 5px;
-      color: var(--global-font-color);
-    }
-  }
-  .single-option {
-    margin-left: 5px;
-  }
-
-  .chart-title {
-    color: var(--global-font-color);
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
-    margin: 6px;
-    font-weight: 700;
-    text-transform: uppercase;
-  }
-
-  #show-interval-modal-button {
-    cursor: pointer;
-    color: var(--dropdown-item-color);
-  }
-
-  .view-select-label {
-    margin-left: auto;
-    padding-right: 7px;
-    padding-left: 7px;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    align-items: center;
-  }
-}
-</style>
+<template>
+  <div class="horizontal-flex-container overview-chart-title-bar">
+    <div class="horizontal-flex-container">
+      <label for="periodSelect" class="label-select"
+        >{{ localization.inventoryMonitor.period }}:</label
+      >
+      <div v-if="!disabledPeriodOptions" class="select">
+        <select
+          id="periodSelect"
+          v-model="selectedPeriod"
+          data-id="period-select"
+        >
+          <option
+            v-for="(item, index) in periodOptions"
+            :key="index"
+            :value="item.value"
+          >
+            {{ item.text }}
+          </option>
+        </select>
+      </div>
+      <span v-else class="single-option">{{ periodOptions[0].text }}</span>
+    </div>
+    <div v-show="isShowCustomIntervalButton">
+      <a
+        id="show-interval-modal-button"
+        data-id="show-interval-modal-button"
+        @click="onShowIntervalModal"
+        >{{ localization.inventoryMonitor.changeCustomInterval }}</a
+      >
+    </div>
+    <div v-if="!disabledPeriodOptions" class="chart-title">
+      {{ chartTitleDate }}
+    </div>
+    <div class="view-select-label horizontal-flex-container">
+      <label for="viewSelect" class="label-select"
+        >{{ localization.common.view }}:</label
+      >
+      <div class="select">
+        <select id="viewSelect" v-model="selectedView" data-id="view-select">
+          <option
+            v-for="(item, index) in viewOptions"
+            :key="index"
+            :value="item.value"
+          >
+            {{ item.text }}
+          </option>
+        </select>
+      </div>
+    </div>
+  </div>
+
+  <common-monitor-overview-filters-custom-interval-modal
+    v-if="isShowIntervalModal"
+    :selected-periods="props.selectedPeriods"
+    :format-date="props.formatDate"
+    :current-lang="props.currentLang"
+    @hide="onHideIntervalModal"
+    @submit="onSubmitIntervalModal"
+  />
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+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,
+} from '~/components/common/monitor/overview/filters/lib/config/filterOptions'
+import { getValidDateByOptionFunc } from '~/components/common/monitor/lib/config/getValidDateByOption'
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+const { $formattedDatetime } = useNuxtApp()
+
+const props = defineProps<{
+  startDate: number
+  endDate: number
+  chartType: 'spline' | 'pie'
+  view: UI_T_OverviewViewType
+  selectedPeriods: number[]
+  formatDate: string
+  currentLang: string
+  formatTime?: string
+}>()
+
+const emits = defineEmits<{
+  (event: 'update-filters', value: UI_I_MonitorGraphPayload): void
+  (event: 'update-custom-date', value: number[]): void
+}>()
+
+const selectedPeriod = ref<string>('')
+const periodOptions = computed<UI_I_OptionItem[]>(() =>
+  periodFunc(localization.value)
+)
+watch(
+  () => periodOptions.value,
+  (newValue: UI_I_OptionItem[]) => {
+    if (newValue) selectedPeriod.value = newValue[0].value
+  },
+  { immediate: true }
+)
+
+const isShowCustomIntervalButton = computed<boolean>(
+  () => selectedPeriod.value === 'custom_interval'
+)
+
+const isShowIntervalModal = ref<boolean>(false)
+const onShowIntervalModal = (): void => {
+  isShowIntervalModal.value = true
+}
+const onHideIntervalModal = (): void => {
+  isShowIntervalModal.value = false
+}
+const onSubmitIntervalModal = (customDates: number[]): void => {
+  customDatesData.value = customDates
+  sendUpdatedFilters()
+  onHideIntervalModal()
+  emits('update-custom-date', customDates)
+}
+
+const chartTitleDate = computed<string>(() => {
+  const startValue = props.startDate
+  const endValue = props.endDate
+  if (!startValue && !endValue) return ''
+
+  const start = $formattedDatetime(
+    startValue,
+    props.formatDate,
+    true,
+    '',
+    props.formatTime
+  )
+  const end = $formattedDatetime(
+    endValue,
+    props.formatDate,
+    true,
+    '',
+    props.formatTime
+  )
+  return `${start} - ${end}`
+})
+
+// const disabledPeriodOptions = computed<boolean>(
+//   () => props.chartType === 'pie' || !chartTitleDate.value
+// )
+
+const disabledPeriodOptions = computed<boolean>(() => props.chartType === 'pie')
+
+const selectedView = ref<string>('')
+const viewOptions = computed<UI_I_OptionItem[]>(() =>
+  viewFunc(localization.value, props.view)
+)
+watch(
+  () => viewOptions.value,
+  (newValue: UI_I_OptionItem[]) => {
+    if (newValue) selectedView.value = newValue[0].value
+  },
+  { immediate: true }
+)
+
+const customDatesData = ref<number[]>([])
+const sendUpdatedFilters = (): void => {
+  const currentPeriod =
+    selectedPeriod.value === 'custom_interval'
+      ? customDatesData.value
+      : getValidDateByOptionFunc(selectedPeriod.value)
+  const filters: UI_I_MonitorGraphPayload = {
+    period: currentPeriod,
+    view: selectedView.value,
+    periodName: selectedPeriod.value,
+  }
+
+  emits('update-filters', filters)
+}
+watch(
+  () => [selectedPeriod.value, selectedView.value],
+  (newValue: string[]) => {
+    newValue[0] !== 'custom_interval' && sendUpdatedFilters()
+  },
+  { immediate: true }
+)
+</script>
+
+<style scoped lang="scss">
+.horizontal-flex-container {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  line-height: 20px;
+  flex-shrink: 0;
+  padding-top: 5px;
+
+  .select {
+    position: relative;
+
+    select {
+      height: 20px;
+      margin: 5px;
+      color: var(--global-font-color);
+    }
+  }
+  .single-option {
+    margin-left: 5px;
+  }
+
+  .chart-title {
+    color: var(--global-font-color);
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    margin: 6px;
+    font-weight: 700;
+    text-transform: uppercase;
+  }
+
+  #show-interval-modal-button {
+    cursor: pointer;
+    color: var(--dropdown-item-color);
+  }
+
+  .view-select-label {
+    margin-left: auto;
+    padding-right: 7px;
+    padding-left: 7px;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    align-items: center;
+  }
+}
+</style>

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

@@ -2,7 +2,6 @@ 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
@@ -35,21 +34,19 @@ export const periodFunc = (
 
 export const viewFunc = (
   localization: UI_I_Localization,
-  viewType: UI_T_OverviewViewType,
-  project: UI_T_Project
+  viewType: UI_T_OverviewViewType
 ): UI_I_OptionItem[] => {
   const host = [
     { text: localization.inventoryMonitor.overview, value: 'overview' },
     { text: localization.common.memory, value: 'memory' },
     { text: localization.common.network, value: 'network' },
     { text: localization.common.disks, value: 'disks' },
-    // { text: localization.common.virtual_machines, value: 'virtual_machines' },
-  ]
-  if (project === 'procurator')
-    host.push({
+    {
       text: localization.inventoryMonitor.spaceUtilization,
       value: 'spaceUtilization',
-    })
+    },
+    // { text: localization.common.virtual_machines, value: 'virtual_machines' },
+  ]
 
   const viewData: UI_I_OverviewViewOptionData = {
     zone: [{ text: localization.inventoryMonitor.overview, value: 'overview' }],
@@ -78,25 +75,6 @@ export const viewFunc = (
     cluster: [
       { text: localization.inventoryMonitor.overview, value: 'overview' },
     ],
-    datastore: [
-      { text: localization.inventoryMonitor.overview, value: 'overview' },
-      {
-        text: localization.inventoryMonitor.spaceUtilization,
-        value: 'space_utilization',
-      },
-      {
-        text: localization.common.storageIo,
-        value: 'storage_io',
-      },
-      {
-        text: localization.common.hosts,
-        value: 'hosts',
-      },
-      {
-        text: localization.common.vms_amount,
-        value: 'vms_amount',
-      },
-    ],
   }
 
   return viewData[viewType]

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

@@ -1,10 +1,9 @@
-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[]
-  cluster: UI_I_OptionItem[]
-  datastore: UI_I_OptionItem[]
-}
+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[]
+  cluster: UI_I_OptionItem[]
+}

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

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

package/package.json

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