bfg-common 1.1.62 → 1.1.63

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

@@ -26,7 +26,13 @@
             :period-type="props.periodType"
             :selected-custom-time="props.selectedCustomTime"
             :selected-chart-option-name="props.selectedChartOptionName"
-            @update-tools="onUpdateTools"
+            :custom-date-from="props.customDateFrom"
+            :custom-date-to="props.customDateTo"
+            :custom-time-from="props.customTimeFrom"
+            :custom-time-to="props.customTimeTo"
+            :total-cores="totalCores"
+            :host-id="props.hostId"
+            @update-tools="emits('update-tools', $event)"
             @exporting="onExporting"
             @open-advanced-page="onGetEmptyPage"
             @select-row="emits('select-row', $event)"
@@ -38,6 +44,11 @@
             @update-custom-time="emits('update-custom-time', $event)"
             @select-chart-name="emits('select-chart-name', $event)"
             @delete-option="emits('delete-option')"
+            @update-custom-date-from="emits('update-custom-date-from', $event)"
+            @update-custom-date-to="emits('update-custom-date-to', $event)"
+            @update-custom-time-from="emits('update-custom-time-from', $event)"
+            @update-custom-time-to="emits('update-custom-time-to', $event)"
+            @submit-options="emits('submit-options', $event)"
           />
 
           <div v-show="!props.data" class="empty-container">
@@ -85,6 +96,7 @@ import {
   T_ChartHost,
   T_ChartVm,
 } from '~/components/common/monitor/advanced/tools/chartOptionsModal/models/types'
+import { getCountCores } from '~/components/common/monitor/advanced/tools/utils/countCores'
 
 const props = defineProps<{
   type: UI_T_AdvancedType
@@ -103,6 +115,11 @@ const props = defineProps<{
   periodType: string
   selectedCustomTime: string
   selectedChartOptionName: string
+  customDateFrom: string
+  customDateTo: string
+  customTimeFrom: string
+  customTimeTo: string
+  hostId: string
   disabledPeriod?: boolean
   disabledView?: boolean
 }>()
@@ -120,12 +137,25 @@ const emits = defineEmits<{
   (event: 'update-custom-time', value: string): void
   (event: 'select-chart-name', value: string): void
   (event: 'delete-option'): void
+  (event: 'update-custom-date-from', value: string): void
+  (event: 'update-custom-date-to', value: string): void
+  (event: 'update-custom-time-from', value: string): void
+  (event: 'update-custom-time-to', value: string): void
+  (event: 'submit-options', value: string): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const onUpdateTools = (tools: UI_I_MonitorGraphPayload): void =>
-  emits('update-tools', tools)
+const totalCores = ref<number>(0)
+watch(
+  () => props.data,
+  (newValue) => {
+    if (!newValue) return
+
+    totalCores.value = getCountCores(newValue)
+  },
+  { immediate: true }
+)
 
 const exportGraph = ref<string>('')
 const onExporting = (key: string): void => {

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

@@ -6,7 +6,7 @@
         :data="chartData"
         :update="chartHelper"
         :export-type="exportType"
-        :selected-row="selectedRow"
+        :selected-row="props.selectedRow"
       />
     </template>
   </div>
@@ -129,10 +129,10 @@ watch(width, (newValue) => {
 const exportType = ref<string>('')
 watch(
   () => props.export,
-  (val) => {
-    if (!val) return
+  (newValue) => {
+    if (!newValue) return
 
-    exportType.value = val
+    exportType.value = newValue
   },
   { immediate: true }
 )

package/components/common/monitor/advanced/table/Table.vue

@@ -59,17 +59,17 @@ const dataBody = ref<UI_I_BodyItem[][]>([])
 
 watch(
   () => props.data,
-  (val) => {
-    if (!val) return
+  (newValue) => {
+    if (!newValue) return
 
-    dataBody.value = table.bodyItems(val)
+    dataBody.value = table.bodyItems(newValue)
   },
   { immediate: true }
 )
 watch(
   selectedRow,
-  (val) => {
-    emits('select', val)
+  (newValue) => {
+    emits('select', newValue)
   },
   { deep: true }
 )

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

@@ -19,6 +19,7 @@
           id="periodSelect"
           v-model="selectedPeriod"
           :disabled="props.disabledPeriod"
+          @change="onChangePeriod"
         >
           <option
             v-for="(item, index) in periodOptions"
@@ -46,6 +47,7 @@
           id="viewSelect"
           v-model="selectedView"
           :disabled="props.disabledView"
+          @change="onChangeView"
         >
           <option
             v-for="(item, index) in viewOptions"
@@ -93,6 +95,12 @@
     :period-type="props.periodType"
     :selected-custom-time="props.selectedCustomTime"
     :selected-chart-option-name="props.selectedChartOptionName"
+    :custom-date-from="props.customDateFrom"
+    :custom-date-to="props.customDateTo"
+    :custom-time-from="props.customTimeFrom"
+    :custom-time-to="props.customTimeTo"
+    :total-cores="props.totalCores"
+    :host-id="props.hostId"
     @hide="isShowModal = false"
     @select-row="emits('select-row', $event)"
     @select-metric="emits('select-metric', $event)"
@@ -104,6 +112,11 @@
     @select-chart-name="onSelectChartName"
     @delete-option="onDeleteOption"
     @save-option-name="onSaveOptionName"
+    @update-custom-date-from="emits('update-custom-date-from', $event)"
+    @update-custom-date-to="emits('update-custom-date-to', $event)"
+    @update-custom-time-from="emits('update-custom-time-from', $event)"
+    @update-custom-time-to="emits('update-custom-time-to', $event)"
+    @submit-options="emits('submit-options', $event)"
   />
 </template>
 
@@ -125,6 +138,7 @@ import {
   exportFunc,
   getCurrentOptionsStorageFunc,
 } from '~/components/common/monitor/advanced/tools/config/advancedToolbar'
+import { checkDateFunc } from '~/components/common/monitor/overview/filters/customIntervalModal/config/dateChecker'
 
 const props = defineProps<{
   type: UI_T_AdvancedType
@@ -139,6 +153,12 @@ const props = defineProps<{
   periodType: string
   selectedCustomTime: string
   selectedChartOptionName: string
+  customDateFrom: string
+  customDateTo: string
+  customTimeFrom: string
+  customTimeTo: string
+  totalCores: number
+  hostId: string
   disabledPeriod?: boolean
   disabledView?: boolean
 }>()
@@ -156,6 +176,11 @@ const emits = defineEmits<{
   (event: 'update-custom-time', value: string): void
   (event: 'select-chart-name', value: string): void
   (event: 'delete-option'): void
+  (event: 'update-custom-date-from', value: string): void
+  (event: 'update-custom-date-to', value: string): void
+  (event: 'update-custom-time-from', value: string): void
+  (event: 'update-custom-time-to', value: string): void
+  (event: 'submit-options', value: string): void
 }>()
 
 const routeType = '' + useRoute().params.type
@@ -199,7 +224,7 @@ const onDeleteOption = (): void => {
 
 const selectedPeriod = ref<string>('')
 const periodOptions = computed<UI_I_OptionItem[]>(() =>
-  periodFunc(localization.value)
+  periodFunc(localization.value, props.selectedTimespanType)
 )
 watch(
   () => periodOptions.value,
@@ -208,6 +233,15 @@ watch(
   },
   { immediate: true }
 )
+watch(
+  () => props.selectedTimespanType,
+  (newValue) => {
+    if (!newValue) return
+
+    selectedPeriod.value = newValue
+    updateTools()
+  }
+)
 
 const isShowModal = ref<boolean>(false)
 watch(isShowModal, (newValue) => {
@@ -215,34 +249,63 @@ watch(isShowModal, (newValue) => {
     selectedView.value = viewOptions.value[0].value
 })
 
-watch(
-  () => [selectedPeriod.value, selectedView.value],
-  (newValue: string[]) => {
-    const selectedValue = useLocalStorage(
-      newValue[1] + 'ChartOptions',
-      undefined,
-      false
+const selectedObjects = ref<string>('')
+
+const updateTools = (): void => {
+  const periodValue = selectedPeriod.value
+  const viewValue = selectedView.value
+  const selectedValue = useLocalStorage(
+    viewValue + 'ChartOptions',
+    undefined,
+    false
+  )
+
+  const fields = selectedValue
+    ? selectedValue.counters.map((item) => item.name).join(', ')
+    : ''
+  const validPeriodData = getValidDateByOptionFunc(
+    periodValue,
+    selectedValue,
+    props.unitsCount,
+    props.selectedCustomTime
+  )
+
+  const period = [
+    Math.round(validPeriodData[0] / 1000),
+    Math.round(validPeriodData[1] / 1000),
+  ]
+
+  if (periodValue === 'custom_interval' && props.periodType === 'period') {
+    const checkDateResult = checkDateFunc(
+      localization.value,
+      props.customDateFrom,
+      props.customDateTo,
+      props.customTimeFrom,
+      props.customTimeTo
     )
-    const fields = selectedValue
-      ? selectedValue.counters.map((item) => item.name).join(', ')
-      : ''
-
-    const validPeriodData = getValidDateByOptionFunc(newValue[0])
-
-    const period = [
-      Math.round(validPeriodData[0] / 1000),
-      Math.round(validPeriodData[1] / 1000),
-    ]
-    const tools: UI_I_MonitorGraphPayload = {
-      fields,
-      period,
-      periodType: newValue[0],
-      view: newValue[1],
+    if (Array.isArray(checkDateResult)) {
+      period[0] = Math.round(checkDateResult[0] / 1000)
+      period[1] = Math.round(checkDateResult[1] / 1000)
     }
-    emits('update-tools', tools)
-  },
-  { immediate: true }
-)
+  }
+
+  const tools: UI_I_MonitorGraphPayload = {
+    fields,
+    period,
+    periodType: periodValue,
+    view: viewValue,
+  }
+  emits('update-timespan-type', selectedPeriod.value)
+  emits('update-tools', tools)
+}
+
+const onChangePeriod = (): void => {
+  updateTools()
+}
+
+const onChangeView = (): void => {
+  updateTools()
+}
 
 const chartTitleDate = computed<string>(() => {
   if (!props.startDate) return ''
@@ -269,6 +332,7 @@ const onSaveOptionName = (): void => {
 
 onMounted(() => {
   optionsNames.value = getCurrentOptionsStorageFunc(routeType)
+  updateTools()
 })
 </script>