bfg-common 1.2.44 → 1.2.45

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/tools/Tools.vue

@@ -32,7 +32,6 @@
       </div>
       <a
         id="chart-options-button"
-        href="#"
         class="chart-options-button"
         @click="onShowChartOptions"
         >{{ localization.chartOptions }}</a
@@ -375,6 +374,7 @@ onMounted(() => {
     white-space: nowrap;
     text-transform: capitalize;
     color: var(--dropdown-item-color);
+    cursor: pointer;
   }
 
   .chart-action-bar {

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

@@ -18,12 +18,9 @@
       <span v-else class="single-option">{{ periodOptions[0].text }}</span>
     </div>
     <div v-show="isShowCustomIntervalButton">
-      <a
-        id="show-interval-modal-button"
-        href="#"
-        @click="onShowIntervalModal"
-        >{{ localization.changeCustomInterval }}</a
-      >
+      <a id="show-interval-modal-button" @click="onShowIntervalModal">{{
+        localization.changeCustomInterval
+      }}</a>
     </div>
     <div v-if="!disabledPeriodOptions" class="chart-title">
       {{ chartTitleDate }}
@@ -47,7 +44,9 @@
   </div>
 
   <common-monitor-overview-filters-custom-interval-modal
-    v-show="isShowIntervalModal"
+    v-if="isShowIntervalModal"
+    :selected-periods="props.selectedPeriods"
+    :format-date="props.formatDate"
     @hide="onHideIntervalModal"
     @submit="onSubmitIntervalModal"
   />
@@ -72,12 +71,14 @@ const props = defineProps<{
   endDate: number
   chartType: 'spline' | 'pie'
   view: UI_T_OverviewViewType
-  formatDate?: 'string'
-  formatTime?: 'string'
+  selectedPeriods: number[]
+  formatDate: string
+  formatTime?: string
 }>()
 
 const emits = defineEmits<{
-  (event: 'update-filters', filters: UI_I_MonitorGraphPayload): void
+  (event: 'update-filters', value: UI_I_MonitorGraphPayload): void
+  (event: 'update-custom-date', value: number[]): void
 }>()
 
 const selectedPeriod = ref<string>('')
@@ -107,6 +108,7 @@ const onSubmitIntervalModal = (customDates: number[]): void => {
   customDatesData.value = customDates
   sendUpdatedFilters()
   onHideIntervalModal()
+  emits('update-custom-date', customDates)
 }
 
 const chartTitleDate = computed<string>(() => {
@@ -197,6 +199,11 @@ watch(
     text-transform: uppercase;
   }
 
+  #show-interval-modal-button {
+    cursor: pointer;
+    color: var(--dropdown-item-color);
+  }
+
   .view-select-label {
     margin-left: auto;
     padding-right: 7px;

package/components/common/monitor/overview/filters/customIntervalModal/CustomIntervalModal.vue

@@ -105,12 +105,18 @@ import { format } from 'date-fns'
 import { UI_I_Localization } from '~/models/interfaces'
 import { checkDateFunc } from '~/components/common/monitor/overview/filters/customIntervalModal/config/dateChecker'
 
+const props = defineProps<{
+  formatDate: string
+  selectedPeriods: number[]
+}>()
+
 const emits = defineEmits<{
   (event: 'hide'): void
   (event: 'submit', arg1: number[]): void
 }>()
 
-const { $store, $formattedDate, $isDate, $getUnixByDate } = useNuxtApp()
+const { $store, $formattedDate, $formattedTime, $isDate, $getUnixByDate } =
+  useNuxtApp()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
@@ -132,12 +138,27 @@ const currentTimeFrom = ref<string>('')
 const currentTimeTo = ref<string>('')
 
 const getCurrentTime = (): void => {
-  currentDateFrom.value = $formattedDate(yesterday, '')
-  currentDateTo.value = $formattedDate(new Date(), '')
+  if (!props.selectedPeriods.length) {
+    currentDateFrom.value = $formattedDate(yesterday, props.formatDate)
+    currentDateTo.value = $formattedDate(new Date(), props.formatDate)
+
+    const currentTime = format(new Date(), 'H:mm:ss')
+    currentTimeFrom.value = currentTime
+    currentTimeTo.value = currentTime
+
+    return
+  }
 
-  const currentTime = format(new Date(), 'H:mm:ss')
-  currentTimeFrom.value = currentTime
-  currentTimeTo.value = currentTime
+  currentDateFrom.value = $formattedDate(
+    props.selectedPeriods[0],
+    props.formatDate
+  )
+  currentDateTo.value = $formattedDate(
+    props.selectedPeriods[1],
+    props.formatDate
+  )
+  currentTimeFrom.value = $formattedTime(props.selectedPeriods[0], '', true)
+  currentTimeTo.value = $formattedTime(props.selectedPeriods[1], '', true)
 }
 
 const timeFormatUpdater = computed<number>(
@@ -152,7 +173,7 @@ watch(timeFormatUpdater, () => {
 const onUpdateDateFrom = (val: number): void => {
   if (!val) return
 
-  currentDateFrom.value = $formattedDate(new Date(val), '')
+  currentDateFrom.value = $formattedDate(new Date(val), props.formatDate)
 }
 watch(currentDateFrom, (newValue) => {
   if (!newValue) return
@@ -163,7 +184,7 @@ watch(currentDateFrom, (newValue) => {
 const onUpdateDateTo = (val: number): void => {
   if (!val) return
 
-  currentDateTo.value = $formattedDate(new Date(val), '')
+  currentDateTo.value = $formattedDate(new Date(val), props.formatDate)
 }
 watch(currentDateTo, (newValue) => {
   if (!newValue) return

package/components/common/monitor/overview/filters/customIntervalModal/config/dateChecker.ts

@@ -7,29 +7,31 @@ export const checkDateFunc = (
   timeFrom: string,
   timeTo: string
 ): string | number[] => {
-  const { $formattedDatetime, $isDate } = useNuxtApp()
+  const { $isDate, $getUnixByDate } = useNuxtApp()
 
   let result = ''
   const startDate = dateFrom + ' ' + timeFrom
+  const unixStartDate = $getUnixByDate(startDate)
   const endDate = dateTo + ' ' + timeTo
+  const unixEndDate = $getUnixByDate(endDate)
 
-  if (!$isDate(startDate) || !$isDate(endDate) || !timeFrom || !timeTo)
+  if (
+    !$isDate(unixStartDate) ||
+    !$isDate(unixEndDate) ||
+    !timeFrom ||
+    !timeTo
+  ) {
     result = localization.invalidTimeEntry
-  else {
-    const endDateFormatted = $formattedDatetime(endDate, '', true)
-    const endDateTime = new Date(endDateFormatted).getTime()
-
-    const startDateFormatted = $formattedDatetime(startDate, '', true)
-    const startDateTime = new Date(startDateFormatted).getTime()
-
-    if (endDateTime > new Date().getTime())
-      result = localization.oneOfSelectedDatesIsInTheFuture
-    else if (endDateTime === startDateTime)
-      result = localization.timeToShouldBeLaterTimeFrom
-    else if (endDateTime - startDateTime <= 3600000)
-      result = localization.timeRangeShouldNotBeSmallerThanHour
-    else return [startDateTime, endDateTime]
+    return result
   }
 
+  if (unixEndDate > new Date().getTime())
+    result = localization.oneOfSelectedDatesIsInTheFuture
+  else if (unixEndDate === unixStartDate)
+    result = localization.timeToShouldBeLaterTimeFrom
+  else if (unixEndDate - unixStartDate <= 3600000)
+    result = localization.timeRangeShouldNotBeSmallerThanHour
+  else return [unixStartDate, unixEndDate]
+
   return result
 }

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>