bfg-common 1.5.902 → 1.5.904

package/assets/localization/local_be.json

@@ -3393,7 +3393,8 @@
     "fourth": "Па-чацвёртае",
     "once": "Адзін раз",
     "selectFrequency": "Выберыце частату",
-    "frequency": "Частата"
+    "frequency": "Частата",
+    "delayMinutes": "Затрымка (хвілін)"
   },
   "license": {
     "limits": "Мяжа",

package/assets/localization/local_en.json

@@ -3397,7 +3397,8 @@
     "fourth": "Fourth",
     "once": "Once",
     "selectFrequency": "Select Frequency",
-    "frequency": "Frequency"
+    "frequency": "Frequency",
+    "delayMinutes": "Delay (Minutes)"
   },
   "license": {
     "limits": "Limits",

package/assets/localization/local_hy.json

@@ -3397,7 +3397,8 @@
     "fourth": "Չորրորդ",
     "once": "Մեկ անգամ",
     "selectFrequency": "Ընտրեք հաճախականությունը",
-    "frequency": "Հաճախականություն"
+    "frequency": "Հաճախականություն",
+    "delayMinutes": "Ժամանակաձգում (րոպե)"
   },
   "license": {
     "limits": "Սահմանները",

package/assets/localization/local_kk.json

@@ -3396,7 +3396,8 @@
     "fourth": "Төртінші",
     "once": "Бір рет",
     "selectFrequency": "Жиілікті таңдаңыз",
-    "frequency": "Жиілік"
+    "frequency": "Жиілік",
+    "delayMinutes": "Кешігу (минут)"
   },
   "license": {
     "limits": "Шектеулер",

package/assets/localization/local_ru.json

@@ -3396,7 +3396,8 @@
     "fourth": "Четвертый",
     "once": "Один раз",
     "selectFrequency": "Выберите частоту",
-    "frequency": "Частота"
+    "frequency": "Частота",
+    "delayMinutes": "Задержка (минут)"
   },
   "license": {
     "limits": "Пределы",

package/assets/localization/local_zh.json

@@ -3394,7 +3394,8 @@
     "fourth": "第四",
     "once": "一次",
     "selectFrequency": "选择频率",
-    "frequency": "频率"
+    "frequency": "频率",
+    "delayMinutes": "延迟（分钟）"
   },
   "license": {
     "limits": "限制",

package/components/common/pages/scheduledTasks/modals/common/frequency/afterStartup/AfterStartup.vue

@@ -1,32 +1,10 @@
 <template>
-  <div class="after-startup clr-col-6 pl-0">
-    <span class="after-startup__prefix">
-      {{ localization.scheduledTasks.with }}
-    </span>
-
-    <label
-      :class="timeIntervalErrorText && 'invalid'"
-      for="minute-delay-field"
-      class="tooltip tooltip-validation tooltip-xs tooltip-top-left"
-    >
-      <input
-        id="minute-delay-field"
-        v-model="modelFrequencyLocal.frg_after_startup"
-        data-id="edit-lockout-policy-time-interval-input"
-        type="text"
-        @input="onInitTimeIntervalValidation"
-        @blur="onInitTimeIntervalValidation"
-      />
-
-      <span class="tooltip-content">
-        {{ timeIntervalErrorText }}
-      </span>
-    </label>
-
-    <span class="after-startup__suffix">
-      {{ localization.scheduledTasks.minuteDelay }}
-    </span>
-  </div>
+  <component
+    :is="currentComponent"
+    v-model="modelFrequencyLocal.frg_after_startup"
+    :time-interval-error-text="timeIntervalErrorText"
+    @init-validation="onInitValidation"
+  />
 </template>
 
 <script lang="ts" setup>
@@ -39,9 +17,17 @@ const modelFrequencyLocal = defineModel<UI_I_ScheduleNewTasksForm>({
 })
 
 const localization = computed<UI_I_Localization>(() => useLocal())
+const { $store }: any = useNuxtApp()
+
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+const currentComponent = computed(() =>
+  isNewView.value
+    ? defineAsyncComponent(() => import('./New.vue'))
+    : defineAsyncComponent(() => import('./Old.vue'))
+)
 
 const isInitTimeIntervalValidation = ref<boolean>(false)
-const onInitTimeIntervalValidation = (): void => {
+const onInitValidation = (): void => {
   isInitTimeIntervalValidation.value = true
 }
 
@@ -61,22 +47,3 @@ watch(
   { immediate: true }
 )
 </script>
-
-<style lang="scss" scoped>
-@import 'bfg-common/assets/scss/common/mixins.scss';
-.after-startup {
-  @include flex($align: center);
-  margin-top: 10px;
-  &__suffix {
-    white-space: nowrap;
-  }
-  .tooltip {
-    & > .tooltip-content {
-      width: 200px;
-    }
-  }
-  input {
-    width: 70px;
-  }
-}
-</style>

package/components/common/pages/scheduledTasks/modals/common/frequency/afterStartup/New.vue

@@ -0,0 +1,43 @@
+<template>
+  <div class="frequency-after-startup">
+    <h2>{{ localization.scheduledTasks.delayMinutes }}</h2>
+    <ui-input
+      id="ip-address"
+      v-model="afterStartupModel"
+      :error="props.timeIntervalErrorText"
+      :placeholder="localization.scheduledTasks.delayMinutes"
+      test-id="scheduler-frequency-delay-minute-field"
+      autocomplete="off"
+      type="number"
+      @input="onInitValidation"
+    ></ui-input>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+const afterStartupModel = defineModel<number>({ required: true })
+const props = defineProps<{
+  timeIntervalErrorText: string
+}>()
+const emits = defineEmits<{
+  (event: 'init-validation'): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const onInitValidation = (): void => emits('init-validation')
+</script>
+
+<style lang="scss" scoped>
+.frequency-after-startup {
+  h2 {
+    font-family: 'Inter', sans-serif;
+    color: var(--title-form-first-color);
+    font-size: 14px;
+    font-weight: 500;
+    margin-bottom: 12px;
+  }
+}
+</style>

package/components/common/pages/scheduledTasks/modals/common/frequency/afterStartup/Old.vue

@@ -0,0 +1,65 @@
+<template>
+  <div class="after-startup clr-col-6 pl-0">
+    <span class="after-startup__prefix">
+      {{ localization.scheduledTasks.with }}
+    </span>
+
+    <label
+      :class="props.timeIntervalErrorText && 'invalid'"
+      for="minute-delay-field"
+      class="tooltip tooltip-validation tooltip-xs tooltip-top-left"
+    >
+      <input
+        id="minute-delay-field"
+        v-model="afterStartupModel"
+        data-id="edit-lockout-policy-time-interval-input"
+        type="text"
+        @input="onInitValidation"
+        @blur="onInitValidation"
+      />
+
+      <span class="tooltip-content">
+        {{ props.timeIntervalErrorText }}
+      </span>
+    </label>
+
+    <span class="after-startup__suffix">
+      {{ localization.scheduledTasks.minuteDelay }}
+    </span>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+const afterStartupModel = defineModel<number>({ required: true })
+const props = defineProps<{
+  timeIntervalErrorText: string
+}>()
+const emits = defineEmits<{
+  (event: 'init-validation'): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const onInitValidation = (): void => emits('init-validation')
+</script>
+
+<style lang="scss" scoped>
+@import 'bfg-common/assets/scss/common/mixins.scss';
+.after-startup {
+  @include flex($align: center);
+  margin-top: 10px;
+  &__suffix {
+    white-space: nowrap;
+  }
+  .tooltip {
+    & > .tooltip-content {
+      width: 200px;
+    }
+  }
+  input {
+    width: 70px;
+  }
+}
+</style>

package/components/common/pages/scheduledTasks/modals/common/frequency/on/New.vue

@@ -0,0 +1,45 @@
+<template>
+  <div class="frequency-on-date">
+    <div>
+      <h2>{{ localization.common.on }}</h2>
+      <ui-input-with-datepicker
+        id="events-filter-time-range-date-to"
+        v-model="scheduledTaskFormLocal.frg_on_time"
+        :format="datepickerFormat"
+        test-id="frequency-on-date-input"
+        time-format="12"
+        :error="''"
+        :error-timepicker="''"
+      />
+    </div>
+  </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 { getUiDatepickerFormatByLanguage } from '~/lib/utils/date'
+
+const scheduledTaskFormLocal = defineModel<UI_I_ScheduleNewTasksForm>({
+  required: true,
+})
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const datepickerFormat = computed<string>(
+  () => getUiDatepickerFormatByLanguage('en_US') // TODO из пропс должен приходить язык
+)
+</script>
+
+<style lang="scss" scoped>
+.frequency-on-date {
+  h2 {
+    font-family: 'Inter', sans-serif;
+    color: var(--title-form-first-color);
+    font-size: 14px;
+    font-weight: 500;
+    line-height: 18px;
+    margin-bottom: 12px;
+  }
+}
+</style>

package/components/common/pages/scheduledTasks/modals/common/frequency/on/Old.vue

@@ -0,0 +1,242 @@
+<template>
+  <div class="on-time">
+    <label class="on-time__label">
+      {{ localization.common.on }}
+    </label>
+
+    <common-pages-scheduled-tasks-modals-common-frequency-on-select-week
+      v-if="props.type === 'week'"
+      v-model="model"
+    />
+
+    <div v-if="props.type === 'month'">
+      <div class="on-time__radio radio">
+        <input
+          id="on-time-monthly-by-day"
+          v-model="model.frg_monthly_mode"
+          data-id="on-time-monthly-by-day"
+          type="radio"
+          value="day"
+          class="custom-radio-button"
+          name="name"
+        />
+        <label for="on-time-monthly-by-day" class="custom-radio-label">
+          {{ localization.scheduledTasks.day }}
+        </label>
+
+        <label
+          :class="[
+            'tooltip tooltip-validation tooltip-xs tooltip-top-left',
+            schedulerOnDayErrorText && 'invalid',
+          ]"
+          for="monthly-by-day-field"
+        >
+          <input
+            id="monthly-by-day-field"
+            v-model="model.frg_monthly_day"
+            :disabled="isDisabledMonthlyDayField"
+            data-id="edit-lockout-policy-time-interval-input"
+            type="text"
+            class="monthly-day-field"
+            @input="onInitTimeIntervalValidation"
+            @blur="onInitTimeIntervalValidation"
+          />
+
+          <span class="tooltip-content">
+            {{ schedulerOnDayErrorText }}
+          </span>
+        </label>
+      </div>
+
+      <div class="on-time__radio radio">
+        <input
+          id="on-time-monthly-by-week"
+          v-model="model.frg_monthly_mode"
+          data-id="on-time-monthly-by-week"
+          type="radio"
+          value="week"
+          class="custom-radio-button"
+          name="name"
+        />
+
+        <label for="on-time-monthly-by-week" class="custom-radio-label mr-6">
+          {{ localization.scheduledTasks.the }}
+        </label>
+        <common-select-input
+          v-model="model.frq_ordinal_number"
+          :data="frequencyOnOrdinalNumber"
+          :class="[
+            'radio__select ordinary-day',
+            !isDisabledMonthlyDayField && 'disabled',
+          ]"
+        />
+
+        <common-select-input
+          v-model="model.frq_week_day"
+          :data="frequencyOnWeeksDays"
+          :class="[
+            'radio__select week-days',
+            !isDisabledMonthlyDayField && 'disabled',
+          ]"
+        />
+      </div>
+    </div>
+
+    <label
+      v-if="props.type === 'once'"
+      :class="[
+        'tooltip tooltip-validation tooltip-xs tooltip-top-left',
+        schedulerAtOnceErrorText && 'invalid',
+      ]"
+      for="frequency-on-date"
+    >
+      <input
+        id="frequency-on-date"
+        v-model.lazy="model.frg_on_time"
+        data-id="frequency-on-date-input"
+        type="datetime-local"
+      />
+
+      <span class="tooltip-content">
+        {{ schedulerAtOnceErrorText }}
+      </span>
+    </label>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_ScheduleNewTasksForm } from '~/components/common/pages/scheduledTasks/modals/lib/models/interfaces'
+import {
+  frequencyOnOrdinalNumberFunc,
+  frequencyOnWeeksDaysFunc,
+} from '~/components/common/pages/scheduledTasks/modals/common/frequency/on/lib/config/options'
+import {
+  validateDate,
+  validateField,
+} from '~/components/common/pages/scheduledTasks/modals/common/frequency/lib/utils'
+
+const model = defineModel<UI_I_ScheduleNewTasksForm>({ required: true })
+const props = defineProps<{
+  type: string
+}>()
+
+const { $formattedDatetime }: any = useNuxtApp()
+
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const frequencyOnWeeksDays = computed<UI_I_SelectInputItem[]>(() => {
+  return frequencyOnWeeksDaysFunc(localization.value)
+})
+const frequencyOnOrdinalNumber = computed<UI_I_SelectInputItem[]>(() => {
+  return frequencyOnOrdinalNumberFunc(localization.value)
+})
+
+const isDisabledMonthlyDayField = computed<boolean>(
+  () => model.value.frg_monthly_mode === 'week'
+)
+
+const isInitTimeIntervalValidation = ref<boolean>(false)
+const onInitTimeIntervalValidation = (): void => {
+  isInitTimeIntervalValidation.value = true
+}
+const schedulerOnDayErrorText = computed<string>(() => {
+  if (!isInitTimeIntervalValidation.value || isDisabledMonthlyDayField.value)
+    return ''
+
+  return validateField(
+    localization.value,
+    model.value.frg_monthly_day,
+    true,
+    true
+  )
+})
+watch(
+  schedulerOnDayErrorText,
+  (newValue: string) => {
+    model.value.isValid = !!newValue
+  },
+  { immediate: true }
+)
+
+const schedulerAtOnceErrorText = computed<string>(() => {
+  return !model.value.frg_on_time
+    ? localization.value.common.fieldRequired
+    : validateDate(localization.value, model.value.frg_on_time)
+})
+watch(
+  schedulerAtOnceErrorText,
+  (newValue: string) => {
+    model.value.isValid = !!newValue
+  },
+  { immediate: true }
+)
+
+onMounted(() => {
+  props.type === 'once' && setDefaultDateTime()
+})
+const setDefaultDateTime = () => {
+  model.value.frg_on_time = $formattedDatetime(new Date(), {
+    formatDate: 'yyyy-MM-dd',
+    separator: ' ',
+    formatTime: 'HH:mm',
+  })
+}
+</script>
+
+<style lang="scss" scoped>
+@import 'bfg-common/assets/scss/common/mixins.scss';
+.on-time {
+  display: flex;
+  margin-top: 25px;
+  &__label {
+    font-weight: 400;
+    padding-left: 0;
+    margin-right: 15px;
+  }
+  &__radio {
+    @include flex($align: center);
+    .monthly-day-field {
+      width: 110px;
+    }
+  }
+}
+.radio {
+  &__select {
+    width: 100%;
+    margin-top: 10px;
+    :deep(.select-input__inner) {
+      max-width: 100% !important;
+      min-width: max-content;
+    }
+    &.ordinary-day :deep(select) {
+      min-width: 80px;
+    }
+    &.week-days {
+      margin-left: 15px;
+      :deep(select) {
+        min-width: 110px;
+      }
+    }
+    select {
+      width: 80px;
+    }
+    &.disabled {
+      opacity: 0.6;
+      pointer-events: none;
+    }
+  }
+}
+
+.tooltip {
+  & > .tooltip-content {
+    width: 200px;
+  }
+}
+input[type='radio']:focus:checked + label::before,
+input[type='radio']:focus + label::before {
+  box-shadow: inset 0 0 0 0.25rem #0094d2;
+}
+</style>

package/components/common/pages/scheduledTasks/modals/common/frequency/on/On.vue

@@ -1,107 +1,12 @@
 <template>
-  <div class="on-time">
-    <label class="on-time__label">
-      {{ localization.common.on }}
-    </label>
-
-    <common-pages-scheduled-tasks-modals-common-frequency-on-select-week
-      v-if="props.type === 'week'"
-      v-model="model"
-    />
-
-    <div v-if="props.type === 'month'">
-      <div class="on-time__radio radio">
-        <input
-          id="on-time-monthly-by-day"
-          v-model="model.frg_monthly_mode"
-          data-id="on-time-monthly-by-day"
-          type="radio"
-          value="day"
-          class="custom-radio-button"
-          name="name"
-        />
-        <label for="on-time-monthly-by-day" class="custom-radio-label">
-          {{ localization.scheduledTasks.day }}
-        </label>
-
-        <label
-          :class="[
-            'tooltip tooltip-validation tooltip-xs tooltip-top-left',
-            schedulerOnDayErrorText && 'invalid',
-          ]"
-          for="monthly-by-day-field"
-        >
-          <input
-            id="monthly-by-day-field"
-            v-model="model.frg_monthly_day"
-            :disabled="isDisabledMonthlyDayField"
-            data-id="edit-lockout-policy-time-interval-input"
-            type="text"
-            class="monthly-day-field"
-            @input="onInitTimeIntervalValidation"
-            @blur="onInitTimeIntervalValidation"
-          />
-
-          <span class="tooltip-content">
-            {{ schedulerOnDayErrorText }}
-          </span>
-        </label>
-      </div>
-
-      <div class="on-time__radio radio">
-        <input
-          id="on-time-monthly-by-week"
-          v-model="model.frg_monthly_mode"
-          data-id="on-time-monthly-by-week"
-          type="radio"
-          value="week"
-          class="custom-radio-button"
-          name="name"
-        />
-
-        <label for="on-time-monthly-by-week" class="custom-radio-label mr-6">
-          {{ localization.scheduledTasks.the }}
-        </label>
-        <common-select-input
-          v-model="model.frq_ordinal_number"
-          :data="frequencyOnOrdinalNumber"
-          :class="[
-            'radio__select ordinary-day',
-            !isDisabledMonthlyDayField && 'disabled',
-          ]"
-        />
-
-        <common-select-input
-          v-model="model.frq_week_day"
-          :data="frequencyOnWeeksDays"
-          :class="[
-            'radio__select week-days',
-            !isDisabledMonthlyDayField && 'disabled',
-          ]"
-        />
-      </div>
-    </div>
-
-    <label
-      v-if="props.type === 'once'"
-      :class="[
-        'tooltip tooltip-validation tooltip-xs tooltip-top-left',
-        schedulerAtOnceErrorText && 'invalid',
-      ]"
-      for="frequency-on-date"
-    >
-      <input
-        id="frequency-on-date"
-        v-model.lazy="model.frg_on_time"
-        data-id="frequency-on-date-input"
-        type="datetime-local"
-      />
-
-      <span class="tooltip-content">
-        {{ schedulerAtOnceErrorText }}
-      </span>
-    </label>
-  </div>
+  <component
+    :is="currentComponent"
+    v-model="model"
+    :frequency-on-weeks-days="frequencyOnWeeksDays"
+    :frequency-on-ordinal-number="frequencyOnOrdinalNumber"
+    :type="type"
+    @vue:mounted="onSetDefaultDateTime"
+  />
 </template>
 
 <script lang="ts" setup>
@@ -117,15 +22,21 @@ import {
   validateField,
 } from '~/components/common/pages/scheduledTasks/modals/common/frequency/lib/utils'
 
+const model = defineModel<UI_I_ScheduleNewTasksForm>({ required: true })
 const props = defineProps<{
   type: string
 }>()
 
+const localization = computed<UI_I_Localization>(() => useLocal())
 const { $formattedDatetime }: any = useNuxtApp()
+const { $store }: any = useNuxtApp()
 
-const model = defineModel<UI_I_ScheduleNewTasksForm>({ required: true })
-
-const localization = computed<UI_I_Localization>(() => useLocal())
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+const currentComponent = computed(() =>
+  isNewView.value
+    ? defineAsyncComponent(() => import('./New.vue'))
+    : defineAsyncComponent(() => import('./Old.vue'))
+)
 
 const frequencyOnWeeksDays = computed<UI_I_SelectInputItem[]>(() => {
   return frequencyOnWeeksDaysFunc(localization.value)
@@ -174,10 +85,9 @@ watch(
   { immediate: true }
 )
 
-onMounted(() => {
-  props.type === 'once' && setDefaultDateTime()
-})
-const setDefaultDateTime = () => {
+const onSetDefaultDateTime = () => {
+  if (props.type !== 'once') return
+
   model.value.frg_on_time = $formattedDatetime(new Date(), {
     formatDate: 'yyyy-MM-dd',
     separator: ' ',
@@ -185,58 +95,3 @@ const setDefaultDateTime = () => {
   })
 }
 </script>
-
-<style lang="scss" scoped>
-@import 'bfg-common/assets/scss/common/mixins.scss';
-.on-time {
-  display: flex;
-  margin-top: 25px;
-  &__label {
-    font-weight: 400;
-    padding-left: 0;
-    margin-right: 15px;
-  }
-  &__radio {
-    @include flex($align: center);
-    .monthly-day-field {
-      width: 110px;
-    }
-  }
-}
-.radio {
-  &__select {
-    width: 100%;
-    margin-top: 10px;
-    :deep(.select-input__inner) {
-      max-width: 100% !important;
-      min-width: max-content;
-    }
-    &.ordinary-day :deep(select) {
-      min-width: 80px;
-    }
-    &.week-days {
-      margin-left: 15px;
-      :deep(select) {
-        min-width: 110px;
-      }
-    }
-    select {
-      width: 80px;
-    }
-    &.disabled {
-      opacity: 0.6;
-      pointer-events: none;
-    }
-  }
-}
-
-.tooltip {
-  & > .tooltip-content {
-    width: 200px;
-  }
-}
-input[type='radio']:focus:checked + label::before,
-input[type='radio']:focus + label::before {
-  box-shadow: inset 0 0 0 0.25rem #0094d2;
-}
-</style>

package/components/common/pages/scheduledTasks/modals/common/taskForm/New.vue

@@ -35,7 +35,7 @@
         class="form__description"
       />
 
-      <div>
+      <div class="form__run">
         <h2>{{ localization.common.run }}</h2>
 
         <h2 class="frequency">{{ localization.scheduledTasks.frequency }}</h2>
@@ -48,6 +48,10 @@
           select-width="100%"
           class="mt-3"
         />
+        <common-pages-scheduled-tasks-modals-common-frequency
+          v-model="model"
+          :type="model.frequency"
+        />
       </div>
 
       <div class="form__email">
@@ -71,8 +75,6 @@ import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/models/interfaces'
 import type { UI_I_ScheduleNewTasksForm } from '~/components/common/pages/scheduledTasks/modals/lib/models/interfaces'
 import type { UI_I_InitialValidationFields } from '~/components/common/pages/scheduledTasks/modals/common/taskForm/lib/models/interfaces'
-import type { UI_T_FrequencyType } from '~/components/common/pages/scheduledTasks/modals/common/frequency/lib/models/types'
-import * as cron from '~/components/common/pages/scheduledTasks/modals/common/taskForm/lib/utils'
 
 const model = defineModel<UI_I_ScheduleNewTasksForm>({ required: true })
 const props = defineProps<{
@@ -110,52 +112,6 @@ const frequencyMethodOptionsLocal = computed<UI_I_Dropdown[]>(() =>
       text: item.label,
     }))
 )
-
-watch(
-  model,
-  (newValue: UI_I_ScheduleNewTasksForm) => {
-    newValue.cron = generateCronExpression(newValue.frequency, newValue)
-  },
-  { deep: true }
-)
-
-const generateCronExpression = (
-  runType: UI_T_FrequencyType,
-  interval: UI_I_ScheduleNewTasksForm
-): string => {
-  let cronExpression
-
-  // Генерируем cron-выражение на основе runType
-  switch (runType) {
-    case 'once':
-      const timestamp = Math.floor(
-        new Date(interval.frg_on_time).getTime() / 1000
-      )
-      cronExpression = `* * * * * ${timestamp}:0-0-0-0:once`
-      break
-    case 'after-startup':
-      const suffixDelay =
-        interval.frg_after_startup === 0 ? '' : `-${interval.frg_after_startup}`
-      cronExpression = `* * * * * after_procurator_startup${suffixDelay}` // Выполняется после запуска procurator_startup с задержой N минут
-      break
-    case 'hour':
-      cronExpression = cron.generateHourlyCronExpression(interval)
-      break
-    case 'day':
-      cronExpression = cron.generateDailyCronExpression(interval)
-      break
-    case 'week':
-      cronExpression = cron.generateWeeklyCronExpression(interval)
-      break
-    case 'month':
-      cronExpression = cron.generateMonthlyCronExpression(interval)
-      break
-    default:
-      cronExpression = '* * * * *'
-  }
-
-  return cronExpression
-}
 </script>
 
 <style lang="scss" scoped>
@@ -190,6 +146,7 @@ const generateCronExpression = (
     }
   }
 
+  &__run,
   &__email {
     border-top: 1px solid var(--horizontal-line);
     padding-top: 16px;

package/components/common/pages/scheduledTasks/modals/common/taskForm/Old.vue

@@ -102,8 +102,6 @@ import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/models/interfaces'
 import type { UI_I_ScheduleNewTasksForm } from '~/components/common/pages/scheduledTasks/modals/lib/models/interfaces'
 import type { UI_I_InitialValidationFields } from '~/components/common/pages/scheduledTasks/modals/common/taskForm/lib/models/interfaces'
-import type { UI_T_FrequencyType } from '~/components/common/pages/scheduledTasks/modals/common/frequency/lib/models/types'
-import * as cron from '~/components/common/pages/scheduledTasks/modals/common/taskForm/lib/utils'
 
 const model = defineModel<UI_I_ScheduleNewTasksForm>({ required: true })
 const props = defineProps<{
@@ -121,52 +119,6 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 const onInitValidation = (types: string[]): void => {
   emits('init-validation', types)
 }
-
-watch(
-  model,
-  (newValue: UI_I_ScheduleNewTasksForm) => {
-    newValue.cron = generateCronExpression(newValue.frequency, newValue)
-  },
-  { deep: true }
-)
-
-const generateCronExpression = (
-  runType: UI_T_FrequencyType,
-  interval: UI_I_ScheduleNewTasksForm
-): string => {
-  let cronExpression
-
-  // Генерируем cron-выражение на основе runType
-  switch (runType) {
-    case 'once':
-      const timestamp = Math.floor(
-        new Date(interval.frg_on_time).getTime() / 1000
-      )
-      cronExpression = `* * * * * ${timestamp}:0-0-0-0:once`
-      break
-    case 'after-startup':
-      const suffixDelay =
-        interval.frg_after_startup === 0 ? '' : `-${interval.frg_after_startup}`
-      cronExpression = `* * * * * after_procurator_startup${suffixDelay}` // Выполняется после запуска procurator_startup с задержой N минут
-      break
-    case 'hour':
-      cronExpression = cron.generateHourlyCronExpression(interval)
-      break
-    case 'day':
-      cronExpression = cron.generateDailyCronExpression(interval)
-      break
-    case 'week':
-      cronExpression = cron.generateWeeklyCronExpression(interval)
-      break
-    case 'month':
-      cronExpression = cron.generateMonthlyCronExpression(interval)
-      break
-    default:
-      cronExpression = '* * * * *'
-  }
-
-  return cronExpression
-}
 </script>
 
 <style lang="scss" scoped>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.5.902",
+  "version": "1.5.904",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",