bfg-common 1.1.31 → 1.1.32

package/components/common/modals/Confirmation.vue

@@ -23,8 +23,8 @@
       <button class="btn btn-outline" @click="onHideModal">
         {{ localization.cancel }}
       </button>
-      <button :class="currentClasses" @click="onApply">
-        {{ currentText }}
+      <button class="btn btn-warning" @click="onRemove">
+        {{ localization.remove }}
       </button>
     </template>
   </atoms-modal>
@@ -38,9 +38,8 @@ const props = withDefaults(
     description: string
     headline?: string
     testId?: string
-    type?: 'confirm' | 'remove'
   }>(),
-  { testId: 'common-confirmation', headline: '', type: 'confirm' }
+  { testId: 'common-confirmation', headline: '' }
 )
 const emits = defineEmits<{
   (event: 'hide-modal'): void
@@ -49,20 +48,7 @@ const emits = defineEmits<{
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const currentClasses = computed<string>(() => {
-  let result = 'btn '
-  if (props.type === 'confirm') result += 'btn-primary'
-  else if (props.type === 'remove') result += 'btn-warning'
-  return result
-})
-const currentText = computed<string>(() => {
-  let result = ''
-  if (props.type === 'confirm') result = localization.value.ok
-  else if (props.type === 'remove') result = localization.value.remove
-  return result
-})
-
-const onApply = (): void => emits('confirm')
+const onRemove = (): void => emits('confirm')
 const onHideModal = (): void => emits('hide-modal')
 </script>
 

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

@@ -21,23 +21,12 @@
             :disabled-period="props.disabledPeriod"
             :disabled-view="props.disabledView"
             :selected-chart-type="props.selectedChartType"
-            :selected-timespan-type="props.selectedTimespanType"
-            :units-count="props.unitsCount"
-            :period-type="props.periodType"
-            :selected-custom-time="props.selectedCustomTime"
-            :selected-chart-option-name="props.selectedChartOptionName"
             @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)"
-            @update-timespan-type="emits('update-timespan-type', $event)"
-            @update-unit-count="emits('update-unit-count', $event)"
-            @update-period-type="emits('update-period-type', $event)"
-            @update-custom-time="emits('update-custom-time', $event)"
-            @select-chart-name="emits('select-chart-name', $event)"
-            @delete-option="emits('delete-option')"
           />
 
           <div v-show="!props.data" class="empty-container">
@@ -98,11 +87,6 @@ const props = defineProps<{
   selectedCountersKeys: number[]
   selectedMetric: T_ChartHost | T_ChartVm
   selectedChartType: string
-  selectedTimespanType: string
-  unitsCount: number
-  periodType: string
-  selectedCustomTime: string
-  selectedChartOptionName: string
   disabledPeriod?: boolean
   disabledView?: boolean
 }>()
@@ -114,12 +98,6 @@ const emits = defineEmits<{
   (event: 'select-row', value: UI_I_AdvancedCounterItem[]): void
   (event: 'select-metric', value: string): void
   (event: 'update-chart-type', value: string): void
-  (event: 'update-timespan-type', value: string): void
-  (event: 'update-unit-count', value: number): void
-  (event: 'update-period-type', value: string): void
-  (event: 'update-custom-time', value: string): void
-  (event: 'select-chart-name', value: string): void
-  (event: 'delete-option'): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())

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

@@ -88,22 +88,10 @@
     :selected-counters-keys="props.selectedCountersKeys"
     :selected-metric="props.selectedMetric"
     :selected-chart-type="props.selectedChartType"
-    :selected-timespan-type="props.selectedTimespanType"
-    :units-count="props.unitsCount"
-    :period-type="props.periodType"
-    :selected-custom-time="props.selectedCustomTime"
-    :selected-chart-option-name="props.selectedChartOptionName"
     @hide="isShowModal = false"
     @select-row="emits('select-row', $event)"
     @select-metric="emits('select-metric', $event)"
     @update-chart-type="emits('update-chart-type', $event)"
-    @update-timespan-type="emits('update-timespan-type', $event)"
-    @update-unit-count="emits('update-unit-count', $event)"
-    @update-period-type="emits('update-period-type', $event)"
-    @update-custom-time="emits('update-custom-time', $event)"
-    @select-chart-name="onSelectChartName"
-    @delete-option="onDeleteOption"
-    @save-option-name="onSaveOptionName"
   />
 </template>
 
@@ -123,7 +111,6 @@ import {
   periodFunc,
   viewFunc,
   exportFunc,
-  getCurrentOptionsStorageFunc,
 } from '~/components/common/monitor/advanced/tools/config/advancedToolbar'
 
 const props = defineProps<{
@@ -134,11 +121,6 @@ const props = defineProps<{
   selectedCountersKeys: number[]
   selectedMetric: T_ChartHost | T_ChartVm
   selectedChartType: string
-  selectedTimespanType: string
-  unitsCount: number
-  periodType: string
-  selectedCustomTime: string
-  selectedChartOptionName: string
   disabledPeriod?: boolean
   disabledView?: boolean
 }>()
@@ -150,83 +132,38 @@ const emits = defineEmits<{
   (event: 'select-row', value: UI_I_AdvancedCounterItem[]): void
   (event: 'select-metric', value: string): void
   (event: 'update-chart-type', value: string): void
-  (event: 'update-timespan-type', value: string): void
-  (event: 'update-unit-count', value: number): void
-  (event: 'update-period-type', value: string): void
-  (event: 'update-custom-time', value: string): void
-  (event: 'select-chart-name', value: string): void
-  (event: 'delete-option'): void
 }>()
 
-const routeType = '' + useRoute().params.type
-
 const localization = computed<UI_I_Localization>(() => useLocal())
 const { $formattedDatetime } = useNuxtApp()
 
 const selectedView = ref<string>('')
-const optionsNames = ref<string[]>([])
 const viewOptions = computed<UI_I_OptionItem[]>(() =>
-  viewFunc(localization.value, props.type, optionsNames.value)
+  viewFunc(localization.value, props.type)
 )
-
 watch(
-  () => props.selectedChartOptionName,
-  (newValue) => {
-    let currentValue = ''
-
-    if (newValue) currentValue = newValue
-    else if (
-      selectedView.value &&
-      optionsNames.value.includes(selectedView.value)
-    )
-      currentValue = selectedView.value
-    else currentValue = viewOptions.value[0].value
-
-    selectedView.value = currentValue
+  () => viewOptions.value,
+  (val: UI_I_OptionItem[]) => {
+    if (val) selectedView.value = val[0].value
   },
   { immediate: true }
 )
 
-const onSelectChartName = (name: string): void => {
-  emits('select-chart-name', name)
-  optionsNames.value = getCurrentOptionsStorageFunc(routeType)
-}
-
-const onDeleteOption = (): void => {
-  emits('delete-option')
-  optionsNames.value = getCurrentOptionsStorageFunc(routeType)
-}
-
 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
+  (val: UI_I_OptionItem[]) => {
+    if (val) selectedPeriod.value = val[0].value
   },
   { immediate: true }
 )
 
-const isShowModal = ref<boolean>(false)
-watch(isShowModal, (newValue) => {
-  if (!newValue && !selectedView.value)
-    selectedView.value = viewOptions.value[0].value
-})
-
 watch(
   () => [selectedPeriod.value, selectedView.value],
   (newValue: string[]) => {
-    const selectedValue = useLocalStorage(
-      newValue[1] + 'ChartOptions',
-      undefined,
-      false
-    )
-    const fields = selectedValue
-      ? selectedValue.counters.map((item) => item.name).join(', ')
-      : ''
-
     const validPeriodData = getValidDateByOptionFunc(newValue[0])
 
     const period = [
@@ -234,7 +171,6 @@ watch(
       Math.round(validPeriodData[1] / 1000),
     ]
     const tools: UI_I_MonitorGraphPayload = {
-      fields,
       period,
       periodType: newValue[0],
       view: newValue[1],
@@ -259,17 +195,10 @@ const exportMenu = ref<UI_I_DropMenu<string>[]>(exportFunc(localization.value))
 const onExportMenuItem = (item: UI_I_DropMenu<any>): void =>
   emits('exporting', item.action)
 
+const isShowModal = ref<boolean>(false)
 const onShowChartOptions = (): void => {
   isShowModal.value = true
 }
-
-const onSaveOptionName = (): void => {
-  optionsNames.value = getCurrentOptionsStorageFunc(routeType)
-}
-
-onMounted(() => {
-  optionsNames.value = getCurrentOptionsStorageFunc(routeType)
-})
 </script>
 
 <style scoped lang="scss">