bfg-common 1.1.6 → 1.1.7

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/advanced/Advanced.vue

@@ -20,11 +20,13 @@
             :selected-metric="props.selectedMetric"
             :disabled-period="props.disabledPeriod"
             :disabled-view="props.disabledView"
+            :selected-chart-type="props.selectedChartType"
             @update-tools="onUpdateTools"
             @exporting="onExporting"
             @open-advanced-page="onGetEmptyPage"
             @select-row="emits('select-row', $event)"
             @select-metric="emits('select-metric', $event)"
+            @update-chart-type="emits('update-chart-type', $event)"
           />
 
           <div v-show="!props.data" class="empty-container">
@@ -45,6 +47,7 @@
                 :formatted-datetime="props.formattedDatetime"
                 :get-date-format="props.getDateFormat"
                 :language="props.language"
+                :selected-chart-type="props.selectedChartType"
               />
               <div class="datatable">
                 <common-monitor-advanced-table
@@ -83,6 +86,7 @@ const props = defineProps<{
   getDateFormat: any
   selectedCountersKeys: number[]
   selectedMetric: T_ChartHost | T_ChartVm
+  selectedChartType: string
   disabledPeriod?: boolean
   disabledView?: boolean
 }>()
@@ -93,6 +97,7 @@ const emits = defineEmits<{
   (event: 'update-selected-row', value: number[]): void
   (event: 'select-row', value: UI_I_AdvancedCounterItem[]): void
   (event: 'select-metric', value: string): void
+  (event: 'update-chart-type', value: string): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())

package/components/common/monitor/advanced/GraphView.vue

@@ -33,6 +33,7 @@ const props = defineProps<{
   formattedDatetime: any
   getDateFormat: any
   language: string
+  selectedChartType: string
 }>()
 
 const chartData = ref<I_LineGraph | null>(null)
@@ -62,7 +63,7 @@ const startChart = (): void => {
     true,
     false,
     false,
-    '',
+    props.selectedChartType,
     '',
     0,
     chartCallback,
@@ -99,6 +100,14 @@ watch(
   }
 )
 
+watch(
+  () => props.selectedChartType,
+  () => {
+    startChart()
+  },
+  { immediate: true }
+)
+
 const chartsView = ref(null)
 const { width } = useElementSize(chartsView)
 

package/components/common/monitor/advanced/tools/Tools.vue

@@ -87,9 +87,11 @@
     :language="props.language"
     :selected-counters-keys="props.selectedCountersKeys"
     :selected-metric="props.selectedMetric"
+    :selected-chart-type="props.selectedChartType"
     @hide="isShowModal = false"
     @select-row="emits('select-row', $event)"
     @select-metric="emits('select-metric', $event)"
+    @update-chart-type="emits('update-chart-type', $event)"
   />
 </template>
 
@@ -118,6 +120,7 @@ const props = defineProps<{
   language: string
   selectedCountersKeys: number[]
   selectedMetric: T_ChartHost | T_ChartVm
+  selectedChartType: string
   disabledPeriod?: boolean
   disabledView?: boolean
 }>()
@@ -128,6 +131,7 @@ const emits = defineEmits<{
   (event: 'open-advanced-page'): void
   (event: 'select-row', value: UI_I_AdvancedCounterItem[]): void
   (event: 'select-metric', value: string): void
+  (event: 'update-chart-type', value: string): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())

package/components/common/monitor/advanced/tools/chartOptionsModal/ChartOptionsModal.vue

@@ -26,7 +26,9 @@
               :language="props.language"
               :type="props.type"
               :selected-keys="props.selectedCountersKeys"
+              :selected-chart-type="props.selectedChartType"
               @select-row="selectedRows = $event"
+              @update-chart-type="selectedChartType = $event"
             />
           </div>
         </div>
@@ -51,12 +53,14 @@ const props = defineProps<{
   language: string
   selectedCountersKeys: number[]
   selectedMetric: T_ChartHost | T_ChartVm
+  selectedChartType: string
 }>()
 
 const emits = defineEmits<{
   (event: 'hide'): void
   (event: 'select-row', value: UI_I_AdvancedCounterItem[]): void
   (event: 'select-metric', value: string): void
+  (event: 'update-chart-type', value: string): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
@@ -81,6 +85,7 @@ const onHide = (): void => {
 }
 
 const selectedRows = ref<UI_I_AdvancedCounterItem[]>([])
+const selectedChartType = ref<string>('')
 
 const checkValidations = (): boolean => {
   if (selectedRows.value.length) return true
@@ -96,6 +101,7 @@ const onSave = (): void => {
 
   emits('select-metric', selectedMetric.value)
   emits('select-row', selectedRows.value)
+  emits('update-chart-type', selectedChartType.value)
   onHide()
 }
 </script>

package/components/common/monitor/advanced/tools/chartOptionsModal/counters/Counters.vue

@@ -9,6 +9,8 @@
     <common-monitor-advanced-tools-chart-options-modal-counters-timespan
       :language="props.language"
       :selected="selectedOptions"
+      :selected-chart-type="props.selectedChartType"
+      @update-chart-type="emits('update-chart-type', $event)"
     />
   </div>
 </template>
@@ -29,10 +31,12 @@ const props = defineProps<{
   chart: T_ChartHost | T_ChartVm
   type: UI_T_AdvancedType
   selectedKeys: number[]
+  selectedChartType: string
 }>()
 
 const emits = defineEmits<{
   (event: 'select-row', value: UI_I_AdvancedCounterItem[]): void
+  (event: 'update-chart-type', value: string): void
 }>()
 
 const selectedOptions = ref<UI_I_AdvancedTargetObject[][]>([])

package/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/Timespan.vue

@@ -2,6 +2,8 @@
   <div class="timespan-objects-section-direction flex horizontal">
     <common-monitor-advanced-tools-chart-options-modal-counters-timespan-form
       :language="props.language"
+      :selected-chart-type="props.selectedChartType"
+      @update-chart-type="emits('update-chart-type', $event)"
     />
     <common-monitor-advanced-tools-chart-options-modal-counters-timespan-object
       :selected="props.selected"
@@ -15,6 +17,11 @@ import { UI_I_AdvancedTargetObject } from '~/components/common/monitor/advanced/
 const props = defineProps<{
   selected: UI_I_AdvancedTargetObject[][]
   language: string
+  selectedChartType: string
+}>()
+
+const emits = defineEmits<{
+  (event: 'update-chart-type', value: string): void
 }>()
 </script>
 

package/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/form/Form.vue

@@ -188,7 +188,7 @@
             >{{ localization.chartType }}:</label
           >
           <div class="select">
-            <select id="chart-type-select" v-model="selectedChartType">
+            <select id="chart-type-select" v-model="chartType">
               <option
                 v-for="(item, index) in chartTypeOptions"
                 :key="index"
@@ -216,6 +216,11 @@ import {
 
 const props = defineProps<{
   language: string
+  selectedChartType: string
+}>()
+
+const emits = defineEmits<{
+  (event: 'update-chart-type', value: string): void
 }>()
 
 const { $formattedDate, $isDate, $getTimeFormat, $getUnixByDate } = useNuxtApp()
@@ -236,11 +241,38 @@ const customTimeOptions = computed<UI_I_OptionItem[]>(() =>
   customTimeFunc(localization.value)
 )
 
-const selectedChartType = ref<string>('line_graph')
+const chartType = ref<string>('line_graph')
 const chartTypeOptions = computed<UI_I_OptionItem[]>(() =>
   chartTypeFunc(localization.value)
 )
 
+const setCurrentChartType = (): void => {
+  const selected = props.selectedChartType
+  let result = 'line_graph'
+
+  if (selected === 'spline') result = 'line_graph'
+  else if (selected === 'area') result = 'stacked_graph'
+
+  chartType.value = result
+}
+
+watch(
+  () => props.selectedChartType,
+  () => {
+    setCurrentChartType()
+  },
+  { immediate: true }
+)
+
+watch(chartType, (newValue) => {
+  let currentValue = 'spline'
+
+  if (newValue === 'line_graph') currentValue = 'spline'
+  else if (newValue === 'stacked_graph') currentValue = 'area'
+
+  emits('update-chart-type', currentValue)
+})
+
 const yesterday = new Date().setDate(new Date().getDate() - 1)
 const dateFrom = ref<number>(yesterday)
 const dateTo = ref<number>(new Date().getTime())

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>