bfg-common 1.5.407 → 1.5.409

package/components/common/pages/scheduledTasks/modals/common/frequency/interval/Interval.vue

@@ -1,100 +1,100 @@
-<template>
-  <div class="interval clr-col-6 pl-0">
-    <span class="interval__prefix">
-      {{ localization.scheduledTasks.repeatEvery }}
-    </span>
-
-    <label
-      for="frequency-time-interval"
-      class="tooltip tooltip-validation tooltip-xs tooltip-top-left"
-      :class="timeIntervalErrorText && 'invalid'"
-    >
-      <input
-        id="frequency-time-interval"
-        v-model="modelFrequencyLocal.frg_interval"
-        data-id="frequency-time-interval-input"
-        type="text"
-        @input="onInitTimeIntervalValidation"
-        @blur="onInitTimeIntervalValidation"
-      />
-
-      <span class="tooltip-content">
-        {{ timeIntervalErrorText }}
-      </span>
-    </label>
-
-    <span class="interval__suffix">
-      {{ intervalSuffixLabel }}
-    </span>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_ScheduleNewTasksForm } from '~/components/common/pages/scheduledTasks/modals/lib/models/interfaces'
-import {
-  defineIntervalSuffixLabelFunc,
-  validateField,
-} from '~/components/common/pages/scheduledTasks/modals/common/frequency/lib/utils'
-
-const props = defineProps<{
-  type: string
-}>()
-const modelFrequencyLocal = defineModel<UI_I_ScheduleNewTasksForm>({
-  required: true,
-})
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const isInitTimeIntervalValidation = ref<boolean>(false)
-const onInitTimeIntervalValidation = (): void => {
-  isInitTimeIntervalValidation.value = true
-}
-
-const timeIntervalErrorText = computed<string>(() => {
-  if (!isInitTimeIntervalValidation.value) return ''
-
-  return validateField(
-    localization.value,
-    modelFrequencyLocal.value.frg_interval,
-    true
-  )
-})
-watch(
-  timeIntervalErrorText,
-  (newValue: string) => {
-    modelFrequencyLocal.value.isValid = !!newValue
-  },
-  { immediate: true }
-)
-
-const intervalSuffixLabel = computed(() => {
-  const lang = useLocalStorage('lang')
-
-  return defineIntervalSuffixLabelFunc(
-    localization.value,
-    props.type,
-    modelFrequencyLocal.value.frg_interval,
-    lang
-  )
-})
-</script>
-
-<style lang="scss" scoped>
-@import 'bfg-common/assets/scss/common/mixins.scss';
-.interval {
-  @include flex($align: center);
-  margin-top: 10px;
-  &__prefix {
-    white-space: nowrap;
-  }
-  .tooltip {
-    & > .tooltip-content {
-      width: 10rem;
-    }
-  }
-  input {
-    width: 70px;
-  }
-}
-</style>
+<template>
+  <div class="interval clr-col-6 pl-0">
+    <span class="interval__prefix">
+      {{ localization.scheduledTasks.repeatEvery }}
+    </span>
+
+    <label
+      for="frequency-time-interval"
+      class="tooltip tooltip-validation tooltip-xs tooltip-top-left"
+      :class="timeIntervalErrorText && 'invalid'"
+    >
+      <input
+        id="frequency-time-interval"
+        v-model="modelFrequencyLocal.frg_interval"
+        data-id="frequency-time-interval-input"
+        type="text"
+        @input="onInitTimeIntervalValidation"
+        @blur="onInitTimeIntervalValidation"
+      />
+
+      <span class="tooltip-content">
+        {{ timeIntervalErrorText }}
+      </span>
+    </label>
+
+    <span class="interval__suffix">
+      {{ intervalSuffixLabel }}
+    </span>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_ScheduleNewTasksForm } from '~/components/common/pages/scheduledTasks/modals/lib/models/interfaces'
+import {
+  defineIntervalSuffixLabelFunc,
+  validateField,
+} from '~/components/common/pages/scheduledTasks/modals/common/frequency/lib/utils'
+
+const props = defineProps<{
+  type: string
+}>()
+const modelFrequencyLocal = defineModel<UI_I_ScheduleNewTasksForm>({
+  required: true,
+})
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const isInitTimeIntervalValidation = ref<boolean>(false)
+const onInitTimeIntervalValidation = (): void => {
+  isInitTimeIntervalValidation.value = true
+}
+
+const timeIntervalErrorText = computed<string>(() => {
+  if (!isInitTimeIntervalValidation.value) return ''
+
+  return validateField(
+    localization.value,
+    modelFrequencyLocal.value.frg_interval,
+    true
+  )
+})
+watch(
+  timeIntervalErrorText,
+  (newValue: string) => {
+    modelFrequencyLocal.value.isValid = !!newValue
+  },
+  { immediate: true }
+)
+
+const intervalSuffixLabel = computed(() => {
+  const lang = useLocalStorage('lang')
+
+  return defineIntervalSuffixLabelFunc(
+    localization.value,
+    props.type,
+    modelFrequencyLocal.value.frg_interval,
+    lang
+  )
+})
+</script>
+
+<style lang="scss" scoped>
+@import 'bfg-common/assets/scss/common/mixins.scss';
+.interval {
+  @include flex($align: center);
+  margin-top: 10px;
+  &__prefix {
+    white-space: nowrap;
+  }
+  .tooltip {
+    & > .tooltip-content {
+      width: 10rem;
+    }
+  }
+  input {
+    width: 70px;
+  }
+}
+</style>

package/components/common/pages/scheduledTasks/modals/common/frequency/lib/config/frequencyOptions.ts

@@ -1,38 +1,38 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/models/interfaces'
-
-export const frequencyMethodFunc = (
-  localization: UI_I_Localization
-): UI_I_SelectInputItem[] => {
-  return [
-    {
-      label: localization.scheduledTasks.chooseFrequency,
-      value: '',
-      disabled: true,
-    },
-    {
-      label: localization.scheduledTasks.once,
-      value: 'once',
-    },
-    {
-      label: localization.common.afterVCenterStartup,
-      value: 'after-startup',
-    },
-    {
-      label: localization.common.hourly,
-      value: 'hour',
-    },
-    {
-      label: localization.common.daily,
-      value: 'day',
-    },
-    {
-      label: localization.common.weekly,
-      value: 'week',
-    },
-    {
-      label: localization.common.monthly,
-      value: 'month',
-    },
-  ]
-}
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/models/interfaces'
+
+export const frequencyMethodFunc = (
+  localization: UI_I_Localization
+): UI_I_SelectInputItem[] => {
+  return [
+    {
+      label: localization.scheduledTasks.chooseFrequency,
+      value: '',
+      disabled: true,
+    },
+    {
+      label: localization.scheduledTasks.once,
+      value: 'once',
+    },
+    {
+      label: localization.common.afterVCenterStartup,
+      value: 'after-startup',
+    },
+    {
+      label: localization.common.hourly,
+      value: 'hour',
+    },
+    {
+      label: localization.common.daily,
+      value: 'day',
+    },
+    {
+      label: localization.common.weekly,
+      value: 'week',
+    },
+    {
+      label: localization.common.monthly,
+      value: 'month',
+    },
+  ]
+}

package/components/common/pages/scheduledTasks/modals/common/frequency/lib/models/types.ts

@@ -1,7 +1,7 @@
-export type UI_T_FrequencyType =
-  | 'once'
-  | 'after-startup'
-  | 'hour'
-  | 'day'
-  | 'week'
-  | 'month'
+export type UI_T_FrequencyType =
+  | 'once'
+  | 'after-startup'
+  | 'hour'
+  | 'day'
+  | 'week'
+  | 'month'

package/components/common/pages/scheduledTasks/modals/common/frequency/lib/utils.ts

@@ -1,128 +1,128 @@
-import { addHours, isBefore, parseISO, subMinutes } from 'date-fns'
-import type {
-  UI_I_Localization,
-  UI_I_ArbitraryObject,
-} from '~/lib/models/interfaces'
-
-export const defineIntervalSuffixLabelFunc = (
-  localization: UI_I_Localization,
-  type: 'hour' | 'day' | 'week' | 'month',
-  value: number | string,
-  lang: string
-): string => {
-  const isLangRu = lang === 'ru_RU'
-
-  const ruForms = {
-    hour: getCorrectRuForm(value, 'hour'),
-    day: getCorrectRuForm(value, 'day'),
-    week: getCorrectRuForm(value, 'week'),
-    month: getCorrectRuForm(value, 'month'),
-  }
-
-  const enForms = {
-    hour: localization.common.hours2,
-    day: localization.common.days2,
-    week: localization.common.weeks2,
-    month: localization.common.months2,
-  }
-
-  const forms = isLangRu ? ruForms : enForms
-  return forms[type]
-}
-
-const getCorrectRuForm = (value: number | string, type: string): string => {
-  // TODO перенести в common или плагин
-  const forms: UI_I_ArbitraryObject<string[]> = {
-    hour: ['Час', 'Часа', 'Часов'],
-    day: ['День', 'Дня', 'Дней'],
-    week: ['Неделя', 'Недели', 'Недель'],
-    month: ['Месяц', 'Месяца', 'Месяцев'],
-  }
-
-  let text: string
-
-  if (!value) {
-    return getCorrectRuForm[type]
-  }
-
-  if (+value % 10 === 1 && +value % 100 !== 11) {
-    text = forms[type][0]
-  } else if (
-    [2, 3, 4].includes(+value % 10) &&
-    ![12, 13, 14].includes(+value % 100)
-  ) {
-    text = forms[type][1]
-  } else {
-    text = forms[type][2]
-  }
-  getCorrectRuForm[type] = text
-  return text
-}
-
-export const validateField = (
-  localization: UI_I_Localization,
-  value: string,
-  checkZero: boolean = false,
-  checkDayRange: boolean = false // параметр для проверки диапазона дней
-): string => {
-  // Если поле пустое
-  if (!value) {
-    return localization.common.fieldRequired
-  }
-  // Если значение больше 2 символов
-
-  if (checkZero && value === '0') {
-    return localization.common.theValueTooSmall
-  }
-
-  if (value.length > 3) {
-    return localization.common.theValueTooLarge
-  }
-  // Если значение не является цифрой
-  if (!/^\d+$/.test(value)) {
-    return localization.common.inputContainsInvalidCharacters
-  }
-
-  if (checkDayRange && !/^([1-9]|[1-2][0-9]|3[0-1])$/.test(value)) {
-    return localization.common.theValueTooLarge
-  }
-
-  return ''
-}
-
-export const validateDate = (
-  localization: UI_I_Localization,
-  date: string,
-  predefinedDate?: string,
-  type?: string
-): string => {
-  const currentDateTime = new Date()
-  const thresholdDate = subMinutes(currentDateTime, 4) // Используем date-fns для вычитания 4 минут
-  const selectedDate = parseISO(date) // Начало дня выбранной даты theValueLargeThanStartTime
-
-  const comparisonDate = predefinedDate
-    ? parseISO(predefinedDate)
-    : thresholdDate
-
-  // return isBefore(selectedDate, comparisonDate)
-  //   ? comparisonDate
-  //     ? localization.common.theValueLargeThanStartTime
-  //     : localization.common.theValueTooSmall
-  //   : ''
-
-  if (isBefore(selectedDate, comparisonDate)) {
-    return predefinedDate
-      ? localization.common.theValueLargeThanStartTime
-      : localization.common.theValueTooSmall
-  }
-
-  // Дополнительная проверка для типа "hour"
-  if (type === 'hour' && predefinedDate) {
-    const minimumEndTime = addHours(parseISO(predefinedDate), 1)
-    if (isBefore(selectedDate, minimumEndTime)) {
-      return localization.common.valueMustBeAtLeastOneHourAfterStart
-    }
-  }
-
-  return ''
-}
+import { addHours, isBefore, parseISO, subMinutes } from 'date-fns'
+import type {
+  UI_I_Localization,
+  UI_I_ArbitraryObject,
+} from '~/lib/models/interfaces'
+
+export const defineIntervalSuffixLabelFunc = (
+  localization: UI_I_Localization,
+  type: 'hour' | 'day' | 'week' | 'month',
+  value: number | string,
+  lang: string
+): string => {
+  const isLangRu = lang === 'ru_RU'
+
+  const ruForms = {
+    hour: getCorrectRuForm(value, 'hour'),
+    day: getCorrectRuForm(value, 'day'),
+    week: getCorrectRuForm(value, 'week'),
+    month: getCorrectRuForm(value, 'month'),
+  }
+
+  const enForms = {
+    hour: localization.common.hours2,
+    day: localization.common.days2,
+    week: localization.common.weeks2,
+    month: localization.common.months2,
+  }
+
+  const forms = isLangRu ? ruForms : enForms
+  return forms[type]
+}
+
+const getCorrectRuForm = (value: number | string, type: string): string => {
+  // TODO перенести в common или плагин
+  const forms: UI_I_ArbitraryObject<string[]> = {
+    hour: ['Час', 'Часа', 'Часов'],
+    day: ['День', 'Дня', 'Дней'],
+    week: ['Неделя', 'Недели', 'Недель'],
+    month: ['Месяц', 'Месяца', 'Месяцев'],
+  }
+
+  let text: string
+
+  if (!value) {
+    return getCorrectRuForm[type]
+  }
+
+  if (+value % 10 === 1 && +value % 100 !== 11) {
+    text = forms[type][0]
+  } else if (
+    [2, 3, 4].includes(+value % 10) &&
+    ![12, 13, 14].includes(+value % 100)
+  ) {
+    text = forms[type][1]
+  } else {
+    text = forms[type][2]
+  }
+  getCorrectRuForm[type] = text
+  return text
+}
+
+export const validateField = (
+  localization: UI_I_Localization,
+  value: string,
+  checkZero: boolean = false,
+  checkDayRange: boolean = false // параметр для проверки диапазона дней
+): string => {
+  // Если поле пустое
+  if (!value) {
+    return localization.common.fieldRequired
+  }
+  // Если значение больше 2 символов
+
+  if (checkZero && value === '0') {
+    return localization.common.theValueTooSmall
+  }
+
+  if (value.length > 3) {
+    return localization.common.theValueTooLarge
+  }
+  // Если значение не является цифрой
+  if (!/^\d+$/.test(value)) {
+    return localization.common.inputContainsInvalidCharacters
+  }
+
+  if (checkDayRange && !/^([1-9]|[1-2][0-9]|3[0-1])$/.test(value)) {
+    return localization.common.theValueTooLarge
+  }
+
+  return ''
+}
+
+export const validateDate = (
+  localization: UI_I_Localization,
+  date: string,
+  predefinedDate?: string,
+  type?: string
+): string => {
+  const currentDateTime = new Date()
+  const thresholdDate = subMinutes(currentDateTime, 4) // Используем date-fns для вычитания 4 минут
+  const selectedDate = parseISO(date) // Начало дня выбранной даты theValueLargeThanStartTime
+
+  const comparisonDate = predefinedDate
+    ? parseISO(predefinedDate)
+    : thresholdDate
+
+  // return isBefore(selectedDate, comparisonDate)
+  //   ? comparisonDate
+  //     ? localization.common.theValueLargeThanStartTime
+  //     : localization.common.theValueTooSmall
+  //   : ''
+
+  if (isBefore(selectedDate, comparisonDate)) {
+    return predefinedDate
+      ? localization.common.theValueLargeThanStartTime
+      : localization.common.theValueTooSmall
+  }
+
+  // Дополнительная проверка для типа "hour"
+  if (type === 'hour' && predefinedDate) {
+    const minimumEndTime = addHours(parseISO(predefinedDate), 1)
+    if (isBefore(selectedDate, minimumEndTime)) {
+      return localization.common.valueMustBeAtLeastOneHourAfterStart
+    }
+  }
+
+  return ''
+}