bfg-common 1.1.99 → 1.1.101

package/components/common/modals/Rename.vue

@@ -1,165 +1,165 @@
-<template>
-  <atoms-modal
-    :test-id="`${props.testId}-rename`"
-    width="576px"
-    class="rename"
-    :show="true"
-    :title="localization.rename"
-    :second-title="name"
-    @submit="onRename"
-    @hide="onHide"
-  >
-    <template #modalBody>
-      <div class="rename__body">
-        <form
-          :id="`${props.testId}-rename-form`"
-          class="clr-form clr-form-horizontal"
-          @submit.prevent
-        >
-          <slot v-if="$slots.description" name="description"></slot>
-
-          <div class="clr-row clr-error clr-form-control">
-            <label
-              for="rename"
-              :class="['clr-control-label', `clr-col-md-${labelWidth}`]"
-              >{{ labelName }}</label
-            >
-            <div class="clr-control-container clr-col-8">
-              <div class="form-group__input">
-                <input
-                  id="rename"
-                  v-model="form.name.value"
-                  type="text"
-                  :class="nameErrorText && 'clr-input'"
-                  @blur="initValidation"
-                  @input="initValidation"
-                />
-                <div v-show="nameErrorText" class="form-validate">
-                  <atoms-the-icon
-                    class="is-error tooltip-trigger"
-                    name="info"
-                  />
-                </div>
-              </div>
-              <div
-                v-show="nameErrorText"
-                class="form-group__input-error clr-subtext"
-              >
-                {{ nameErrorText }}
-              </div>
-            </div>
-          </div>
-        </form>
-      </div>
-    </template>
-  </atoms-modal>
-</template>
-
-<script lang="ts" setup>
-import { UI_I_ValidationTouchResult } from '~/models/plugins/validation/interfaces'
-import { UI_I_Localization } from '~/models/interfaces'
-import { UI_I_RenameForm } from '~/components/common/modals/models/interfaces'
-import { defaultFormRenameFunc } from '~/components/common/modals/config/defaultForm'
-import { labelWidthFunc } from '~/components/common/modals/config/renameLabelWidth'
-
-const props = withDefaults(
-  defineProps<{
-    testId: string
-    name: string
-    label?: string
-  }>(),
-  {
-    label: 'enterNewName',
-  }
-)
-const emits = defineEmits<{
-  (event: 'hide'): void
-  (event: 'apply-changes', value: string): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-const { $validation } = useNuxtApp()
-
-const validation = $validation.call({})
-const defaultForm: UI_I_RenameForm = defaultFormRenameFunc(
-  localization.value,
-  props?.name || ''
-)
-const form = ref<UI_I_RenameForm>(useDeepCopy(defaultForm))
-
-const setForm = () => {
-  form.value = useDeepCopy(defaultForm)
-  validation.setForm(form)
-}
-setForm()
-
-const validForm = ref<UI_I_ValidationTouchResult | null>(null)
-
-const labelName = computed<string>(() => localization.value[props.label])
-
-/* Validation for Name input */
-const initValidation = () => {
-  validForm.value = validation.touch()
-}
-
-const nameErrorText = computed<string>(() => {
-  return validForm.value?.errors?.name?.[0] || ''
-})
-/* Validation Name input end */
-
-const labelWidth = computed<number>(() => labelWidthFunc(labelName.value))
-
-const onRename = (): void => {
-  const { isValid = true } = validForm?.value || {}
-
-  if (!isValid) return
-  emits('apply-changes', form.value.name.value)
-}
-
-const onHide = (): void => {
-  emits('hide')
-}
-</script>
-
-<style lang="scss" scoped>
-@import '~/assets/scss/common/mixins.scss';
-.rename {
-  &__body {
-    @include flex($dir: column);
-    .clr-form-control {
-      @include flex($dir: row);
-
-      .clr-control-container {
-        min-height: 48px;
-      }
-      .form-group {
-        &__input {
-          @include flex();
-          input {
-            width: 100%;
-          }
-          .form-validate {
-            svg {
-              width: 24px;
-              height: 24px;
-            }
-          }
-          &-error {
-            margin-top: 0;
-          }
-        }
-      }
-    }
-  }
-  :deep(.modal-content) {
-    .modal-title {
-      white-space: nowrap;
-    }
-    .secondary-title {
-      word-break: break-all;
-      font-size: 18px;
-      font-weight: 300;
-    }
-  }
-}
-</style>
+<template>
+  <atoms-modal
+    :test-id="`${props.testId}-rename`"
+    width="576px"
+    class="rename"
+    :show="true"
+    :title="localization.rename"
+    :second-title="name"
+    @submit="onRename"
+    @hide="onHide"
+  >
+    <template #modalBody>
+      <div class="rename__body">
+        <form
+          :id="`${props.testId}-rename-form`"
+          class="clr-form clr-form-horizontal"
+          @submit.prevent
+        >
+          <slot v-if="$slots.description" name="description"></slot>
+
+          <div class="clr-row clr-error clr-form-control">
+            <label
+              for="rename"
+              :class="['clr-control-label', `clr-col-md-${labelWidth}`]"
+              >{{ labelName }}</label
+            >
+            <div class="clr-control-container clr-col-8">
+              <div class="form-group__input">
+                <input
+                  id="rename"
+                  v-model="form.name.value"
+                  type="text"
+                  :class="nameErrorText && 'clr-input'"
+                  @blur="initValidation"
+                  @input="initValidation"
+                />
+                <div v-show="nameErrorText" class="form-validate">
+                  <atoms-the-icon
+                    class="is-error tooltip-trigger"
+                    name="info"
+                  />
+                </div>
+              </div>
+              <div
+                v-show="nameErrorText"
+                class="form-group__input-error clr-subtext"
+              >
+                {{ nameErrorText }}
+              </div>
+            </div>
+          </div>
+        </form>
+      </div>
+    </template>
+  </atoms-modal>
+</template>
+
+<script lang="ts" setup>
+import { UI_I_ValidationTouchResult } from '~/models/plugins/validation/interfaces'
+import { UI_I_Localization } from '~/models/interfaces'
+import { UI_I_RenameForm } from '~/components/common/modals/models/interfaces'
+import { defaultFormRenameFunc } from '~/components/common/modals/config/defaultForm'
+import { labelWidthFunc } from '~/components/common/modals/config/renameLabelWidth'
+
+const props = withDefaults(
+  defineProps<{
+    testId: string
+    name: string
+    label?: string
+  }>(),
+  {
+    label: 'enterNewName',
+  }
+)
+const emits = defineEmits<{
+  (event: 'hide'): void
+  (event: 'apply-changes', value: string): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+const { $validation } = useNuxtApp()
+
+const validation = $validation.call({})
+const defaultForm: UI_I_RenameForm = defaultFormRenameFunc(
+  localization.value,
+  props?.name || ''
+)
+const form = ref<UI_I_RenameForm>(useDeepCopy(defaultForm))
+
+const setForm = () => {
+  form.value = useDeepCopy(defaultForm)
+  validation.setForm(form)
+}
+setForm()
+
+const validForm = ref<UI_I_ValidationTouchResult | null>(null)
+
+const labelName = computed<string>(() => localization.value[props.label])
+
+/* Validation for Name input */
+const initValidation = () => {
+  validForm.value = validation.touch()
+}
+
+const nameErrorText = computed<string>(() => {
+  return validForm.value?.errors?.name?.[0] || ''
+})
+/* Validation Name input end */
+
+const labelWidth = computed<number>(() => labelWidthFunc(labelName.value))
+
+const onRename = (): void => {
+  const { isValid = true } = validForm?.value || {}
+
+  if (!isValid) return
+  emits('apply-changes', form.value.name.value)
+}
+
+const onHide = (): void => {
+  emits('hide')
+}
+</script>
+
+<style lang="scss" scoped>
+@import '~/assets/scss/common/mixins.scss';
+.rename {
+  &__body {
+    @include flex($dir: column);
+    .clr-form-control {
+      @include flex($dir: row);
+
+      .clr-control-container {
+        min-height: 48px;
+      }
+      .form-group {
+        &__input {
+          @include flex();
+          input {
+            width: 100%;
+          }
+          .form-validate {
+            svg {
+              width: 24px;
+              height: 24px;
+            }
+          }
+          &-error {
+            margin-top: 0;
+          }
+        }
+      }
+    }
+  }
+  :deep(.modal-content) {
+    .modal-title {
+      white-space: nowrap;
+    }
+    .secondary-title {
+      word-break: break-all;
+      font-size: 18px;
+      font-weight: 300;
+    }
+  }
+}
+</style>

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

@@ -2,6 +2,7 @@ import { I_SeriesLine } from 'bfg-nuxt-3-graph/graph/models/interfaces'
 import { UI_T_OverviewRequestType } from '~/components/common/monitor/overview/filters/models/types'
 
 export interface UI_I_GraphDataSettingItem {
+  place: string
   title: string
   loader: boolean
   data: I_SeriesLine | null

package/components/common/monitor/overview/Overview.vue

@@ -104,6 +104,7 @@ const props = defineProps<{
   themeMode?: 'string'
   formatDate?: 'string'
   formatTime?: 'string'
+  graphType: 'string'
 }>()
 
 const { $formattedDatetime } = useNuxtApp()
@@ -129,11 +130,10 @@ const chartFour = ref<any>(null)
 const currentChartName = ref<string>('')
 
 const getCurrentChart = (chart: any): any => {
-  if (currentChartName.value === 'cpu' || currentChartName.value === 'space')
-    return (chartOne.value = chart)
-  if (currentChartName.value === 'memory') return (chartTwo.value = chart)
-  if (currentChartName.value === 'disk') return (chartThree.value = chart)
-  if (currentChartName.value === 'network') return (chartFour.value = chart)
+  if (currentChartName.value === 'one') return (chartOne.value = chart)
+  if (currentChartName.value === 'two') return (chartTwo.value = chart)
+  if (currentChartName.value === 'three') return (chartThree.value = chart)
+  if (currentChartName.value === 'four') return (chartFour.value = chart)
 }
 
 const oneSettingsLocal = ref<UI_I_GraphDataSettingItem | null>(null)
@@ -164,7 +164,7 @@ const setCurrentGraphData = (
     false,
     true,
     true,
-    '',
+    props.graphType,
     '',
     width,
     getCurrentChart,
@@ -173,10 +173,11 @@ const setCurrentGraphData = (
     props.formatDate,
     props.formatTime
   )
-  if (name === 'cpu' || name === 'space') oneGraphData.value = graphData
-  if (name === 'memory') twoGraphData.value = graphData
-  if (name === 'disk') threeGraphData.value = graphData
-  if (name === 'network') fourGraphData.value = graphData
+
+  if (name === 'one') oneGraphData.value = graphData
+  if (name === 'two') twoGraphData.value = graphData
+  if (name === 'three') threeGraphData.value = graphData
+  if (name === 'four') fourGraphData.value = graphData
 }
 
 const outputSize = (): void => {
@@ -197,7 +198,7 @@ const outputSize = (): void => {
   }, 1000)
 }
 const updateGraph = (
-  graphSetting: UI_I_GraphDataSettingItem,
+  graphSetting: UI_I_GraphDataSettingItem | null,
   name: string
 ): void => {
   outputSize()
@@ -205,10 +206,16 @@ const updateGraph = (
 }
 
 const updateGraphsData = (
-  data: UI_I_GraphDataSettingItem,
+  data: UI_I_GraphDataSettingItem | null,
   name: string
 ): void => {
-  if (!data.data) return
+  if (!data?.data) {
+    if (name === 'one') oneGraphData.value = null
+    if (name === 'two') twoGraphData.value = null
+    if (name === 'three') threeGraphData.value = null
+    if (name === 'four') fourGraphData.value = null
+    return
+  }
 
   const themeMode = useLocalStorage('themeMode') || props.themeMode
   const isDarkMode = themeMode === 'dark-theme'
@@ -233,11 +240,12 @@ const checkIsMountedError = (): void => {
 
 watch(
   () => props.oneChart,
-  (value) => {
-    if (!value) return
+  (newValue) => {
+    if (newValue === undefined) return
 
-    oneSettingsLocal.value = value
-    updateGraph(oneSettingsLocal.value, value.title)
+    oneSettingsLocal.value = newValue
+
+    if (newValue) updateGraph(oneSettingsLocal.value, newValue.place)
 
     isMountedLoader.value && checkIsMountedError()
   },
@@ -246,11 +254,12 @@ watch(
 
 watch(
   () => props.twoChart,
-  (value) => {
-    if (!value) return
+  (newValue) => {
+    if (newValue === undefined) return
+
+    twoSettingsLocal.value = newValue
 
-    twoSettingsLocal.value = value
-    updateGraph(twoSettingsLocal.value, value.title)
+    if (newValue) updateGraph(twoSettingsLocal.value, newValue.place)
 
     isMountedLoader.value && checkIsMountedError()
   },
@@ -259,11 +268,12 @@ watch(
 
 watch(
   () => props.threeChart,
-  (value) => {
-    if (!value) return
+  (newValue) => {
+    if (newValue === undefined) return
 
-    threeSettingsLocal.value = value
-    updateGraph(threeSettingsLocal.value, value.title)
+    threeSettingsLocal.value = newValue
+
+    if (newValue) updateGraph(threeSettingsLocal.value, newValue.place)
 
     isMountedLoader.value && checkIsMountedError()
   },
@@ -290,11 +300,12 @@ watch(chartThree, (newValue) => {
 
 watch(
   () => props.fourChart,
-  (value) => {
-    if (!value) return
+  (newValue) => {
+    if (newValue === undefined) return
+
+    fourSettingsLocal.value = newValue
 
-    fourSettingsLocal.value = value
-    updateGraph(fourSettingsLocal.value, value.title)
+    if (newValue) updateGraph(fourSettingsLocal.value, newValue.place)
 
     isMountedLoader.value && checkIsMountedError()
   },

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

@@ -38,7 +38,6 @@
             v-for="(item, index) in viewOptions"
             :key="index"
             :value="item.value"
-            disabled
           >
             {{ item.text }}
           </option>

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

@@ -53,15 +53,17 @@ export const viewFunc = (
     ],
     host: [
       { text: localization.overview, value: 'overview' },
-      { text: localization.networkAdapters, value: 'network_adapters' },
+      { text: localization.memory, value: 'memory' },
+      // { text: localization.overview, value: 'overview' },
+      { text: localization.network, value: 'network' },
       { text: localization.disks, value: 'disks' },
-      { text: localization.virtual_machines, value: 'virtual_machines' },
+      // { text: localization.virtual_machines, value: 'virtual_machines' },
     ],
     vm: [
       { text: localization.overview, value: 'overview' },
-      { text: localization.space, value: 'space' },
-      { text: localization.spaceUtilization, value: 'space_utilization' },
-      { text: localization.networkAdapters, value: 'network_adapters' },
+      // { text: localization.space, value: 'space' },
+      // { text: localization.spaceUtilization, value: 'space_utilization' },
+      { text: localization.network, value: 'network' },
       { text: localization.disks, value: 'disks' },
     ],
   }

package/components/common/perPage/PerPage.vue

@@ -1,51 +1,51 @@
-<template>
-  <div class="page-size">
-    {{ selectLabel }}
-
-    <div class="clr-select-wrapper">
-      <select
-        :id="`${props.testId}-page-size-select`"
-        :value="props.pageSize"
-        class="clr-page-size-select"
-        @change="change"
-      >
-        <option
-          v-for="(item, key) in props.options"
-          :key="key"
-          :value="item.value"
-        >
-          {{ item.text }}
-        </option>
-      </select>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { UI_I_Localization } from '~/models/interfaces'
-import { UI_I_OptionItem } from '~/components/atoms/models/interfaces'
-
-const props = withDefaults(
-  defineProps<{
-    testId: string
-    pageSize: number
-    options: UI_I_OptionItem[]
-    label?: string
-  }>(),
-  {
-    label: 'itemsPerPage',
-  }
-)
-const emits = defineEmits<{
-  (event: 'change', num: number): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-const selectLabel = computed<string>(() => localization.value[props.label])
-
-const change = (e: InputEvent): void => {
-  emits('change', +(e.target as HTMLInputElement).value)
-}
-</script>
-
-<style scoped></style>
+<template>
+  <div class="page-size">
+    {{ selectLabel }}
+
+    <div class="clr-select-wrapper">
+      <select
+        :id="`${props.testId}-page-size-select`"
+        :value="props.pageSize"
+        class="clr-page-size-select"
+        @change="change"
+      >
+        <option
+          v-for="(item, key) in props.options"
+          :key="key"
+          :value="item.value"
+        >
+          {{ item.text }}
+        </option>
+      </select>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { UI_I_Localization } from '~/models/interfaces'
+import { UI_I_OptionItem } from '~/components/atoms/models/interfaces'
+
+const props = withDefaults(
+  defineProps<{
+    testId: string
+    pageSize: number
+    options: UI_I_OptionItem[]
+    label?: string
+  }>(),
+  {
+    label: 'itemsPerPage',
+  }
+)
+const emits = defineEmits<{
+  (event: 'change', num: number): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+const selectLabel = computed<string>(() => localization.value[props.label])
+
+const change = (e: InputEvent): void => {
+  emits('change', +(e.target as HTMLInputElement).value)
+}
+</script>
+
+<style scoped></style>