bfg-common 1.5.903 → 1.5.905

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/interval/Interval.vue

@@ -1,34 +1,11 @@
 <template>
-  <div class="interval clr-col-6 pl-0">
-    <span class="interval__prefix">
-      {{ localization.scheduledTasks.repeatEvery }}
-    </span>
-
-    <label
-      :class="[
-        'tooltip tooltip-validation tooltip-xs tooltip-top-left',
-        timeIntervalErrorText && 'invalid',
-      ]"
-      for="frequency-time-interval"
-    >
-      <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>
+  <component
+    :is="currentComponent"
+    v-model="modelFrequencyLocal.frg_interval"
+    :time-interval-error-text="timeIntervalErrorText"
+    :time-interval-suffix-label="intervalSuffixLabel"
+    @init-validation="onInitValidation"
+  />
 </template>
 
 <script lang="ts" setup>
@@ -39,17 +16,25 @@ import {
   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 props = defineProps<{
+  type: string
+}>()
 
 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
 }
 
@@ -81,22 +66,3 @@ const intervalSuffixLabel = computed<string>(() => {
   )
 })
 </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/interval/New.vue

@@ -0,0 +1,44 @@
+<template>
+  <div class="frequency-interval">
+    <h2>{{ localization.scheduledTasks.repeatEvery }}</h2>
+    <ui-input
+      id="ip-address"
+      v-model="intervalModel"
+      :error="props.timeIntervalErrorText"
+      :placeholder="localization.common.value"
+      test-id="frequency-time-interval-input"
+      autocomplete="off"
+      type="number"
+      @input="onInitValidation"
+    ></ui-input>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+const intervalModel = defineModel<number>({ required: true })
+const props = defineProps<{
+  timeIntervalErrorText: string
+  intervalSuffixLabel: 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-interval {
+  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/interval/Old.vue

@@ -0,0 +1,68 @@
+<template>
+  <div class="interval clr-col-6 pl-0">
+    <span class="interval__prefix">
+      {{ localization.scheduledTasks.repeatEvery }}
+    </span>
+
+    <label
+      :class="[
+        'tooltip tooltip-validation tooltip-xs tooltip-top-left',
+        props.timeIntervalErrorText && 'invalid',
+      ]"
+      for="frequency-time-interval"
+    >
+      <input
+        id="frequency-time-interval"
+        v-model="intervalModel"
+        data-id="frequency-time-interval-input"
+        type="text"
+        @input="onInitValidation"
+        @blur="onInitValidation"
+      />
+
+      <span class="tooltip-content">
+        {{ props.timeIntervalErrorText }}
+      </span>
+    </label>
+
+    <span class="interval__suffix">
+      {{ props.intervalSuffixLabel }}
+    </span>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+const intervalModel = defineModel<number>({ required: true })
+const props = defineProps<{
+  timeIntervalErrorText: string
+  intervalSuffixLabel: string
+}>()
+const emits = defineEmits<{
+  (event: 'init-validation'): void
+}>()
+
+const onInitValidation = (): void => emits('init-validation')
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+</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/utils.ts

@@ -74,7 +74,7 @@ export const validateField = (
     return localization.common.theValueTooSmall
   }
 
-  if (value.length > 3) {
+  if (String(value).length > 3) {
     return localization.common.theValueTooLarge
   }
   // Если значение не является цифрой

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

@@ -8,8 +8,8 @@
         :format="datepickerFormat"
         test-id="frequency-on-date-input"
         time-format="12"
-        :error="'dateToErrorText.date'"
-        :error-timepicker="'dateToErrorText.time'"
+        :error="''"
+        :error-timepicker="''"
       />
     </div>
   </div>

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

@@ -5,6 +5,7 @@
     :frequency-on-weeks-days="frequencyOnWeeksDays"
     :frequency-on-ordinal-number="frequencyOnOrdinalNumber"
     :type="type"
+    @vue:mounted="onSetDefaultDateTime"
   />
 </template>
 
@@ -33,8 +34,8 @@ const { $store }: any = useNuxtApp()
 const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 const currentComponent = computed(() =>
   isNewView.value
-    ? defineAsyncComponent(() => import('./new/New.vue'))
-    : defineAsyncComponent(() => import('./old/Old.vue'))
+    ? defineAsyncComponent(() => import('./New.vue'))
+    : defineAsyncComponent(() => import('./Old.vue'))
 )
 
 const frequencyOnWeeksDays = computed<UI_I_SelectInputItem[]>(() => {
@@ -84,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: ' ',
@@ -95,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

@@ -38,20 +38,31 @@
       <div class="form__run">
         <h2>{{ localization.common.run }}</h2>
 
-        <h2 class="frequency">{{ localization.scheduledTasks.frequency }}</h2>
-        <ui-select
-          v-model="model.frequency"
-          :items="frequencyMethodOptionsLocal"
-          test-id="schedule-task-frequency-select"
-          :placeholder="localization.scheduledTasks.selectFrequency"
-          size="md"
-          select-width="100%"
-          class="mt-3"
-        />
-        <common-pages-scheduled-tasks-modals-common-frequency
-          v-model="model"
-          :type="model.frequency"
-        />
+        <div
+          class="form__run-frequency"
+          :class="model.frequency === 'once' && 'grid-single-col'"
+        >
+          <div>
+            <h2 class="frequency">
+              {{ localization.scheduledTasks.frequency }}
+            </h2>
+            <ui-select
+              v-model="model.frequency"
+              :items="frequencyMethodOptionsLocal"
+              test-id="schedule-task-frequency-select"
+              :placeholder="localization.scheduledTasks.selectFrequency"
+              size="md"
+              select-width="100%"
+              class="mt-3"
+            />
+          </div>
+
+          <common-pages-scheduled-tasks-modals-common-frequency
+            v-if="model.frequency"
+            v-model="model"
+            :type="model.frequency"
+          />
+        </div>
       </div>
 
       <div class="form__email">
@@ -152,6 +163,17 @@ const frequencyMethodOptionsLocal = computed<UI_I_Dropdown[]>(() =>
     padding-top: 16px;
   }
 
+  &__run {
+    &-frequency {
+      display: grid;
+      grid-template-columns: repeat(auto-fit, minmax(0, 1fr));
+      grid-gap: 16px;
+      &.grid-single-col {
+        grid-template-columns: 1fr;
+      }
+    }
+  }
+
   h2 {
     font-family: 'Inter', sans-serif;
     color: var(--title-form-first-color);

package/package.json

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