bfg-common 1.4.315 → 1.4.316

package/assets/localization/local_be.json

@@ -2216,7 +2216,11 @@
     "or": "або",
     "hrs": "гадз",
     "mins": "мін",
-    "secs": "сек"
+    "secs": "сек",
+    "thePasswordsDoNotMatch": "Паролі не супадаюць",
+    "changePasswordDesc": "Каб захаваць ваш уліковы запіс у бяспецы, упэўніцеся, што ваш новы пароль адрозніваецца ад любога з вашых папярэдніх пароляў.",
+    "changePasswordPreviouslyUsed": "Ваш новы пароль выкарыстоўваўся раней. ",
+    "currentPasswordIncorrect": "Бягучы пароль няправільны. "
   },
   "auth": {
     "welcomeTo": "Сардэчна запрашаем у",

package/assets/localization/local_en.json

@@ -2220,7 +2220,11 @@
     "or": "Or",
     "hrs": "hrs",
     "mins": "mins",
-    "secs": "secs"
+    "secs": "secs",
+    "thePasswordsDoNotMatch": "The passwords do not match",
+    "changePasswordDesc": "To keep your account secure, please make sure that your new password is different from any of your previous passwords.",
+    "changePasswordPreviouslyUsed": "Your new password has been previously used. Please choose a different one.",
+    "currentPasswordIncorrect": "Current password is incorrect. Please try again."
   },
   "auth": {
     "welcomeTo": "Welcome to",

package/assets/localization/local_hy.json

@@ -2220,7 +2220,11 @@
     "or": "կամ",
     "hrs": "ժ",
     "mins": "րոպե",
-    "secs": "վրկ"
+    "secs": "վրկ",
+    "thePasswordsDoNotMatch": "Գաղտնաբառերը չեն համընկնում",
+    "changePasswordDesc": "Ձեր հաշիվն ապահով պահելու համար համոզվեք, որ ձեր նոր գաղտնաբառը տարբերվում է ձեր նախկին գաղտնաբառերից:",
+    "changePasswordPreviouslyUsed": "Ձեր նոր գաղտնաբառը նախկինում օգտագործվել է: ",
+    "currentPasswordIncorrect": "Ընթացիկ գաղտնաբառը սխալ է: "
   },
   "auth": {
     "welcomeTo": "Բարի գալուստ",

package/assets/localization/local_kk.json

@@ -2219,7 +2219,11 @@
     "or": "немесе",
     "hrs": "сағ",
     "mins": "мин",
-    "secs": "сек"
+    "secs": "сек",
+    "thePasswordsDoNotMatch": "Құпия сөздер сәйкес келмейді",
+    "changePasswordDesc": "Тіркелгіңізді қауіпсіз сақтау үшін жаңа құпия сөзіңіздің бұрынғы құпия сөздеріңізден басқаша екеніне көз жеткізіңіз.",
+    "changePasswordPreviouslyUsed": "Жаңа құпия сөзіңіз бұрын қолданылған. ",
+    "currentPasswordIncorrect": "Ағымдағы құпия сөз дұрыс емес. "
   },
   "auth": {
     "welcomeTo": "Қош келдіңіз",

package/assets/localization/local_ru.json

@@ -2222,7 +2222,11 @@
     "or": "или",
     "hrs": "час",
     "mins": "мин",
-    "secs": "сек"
+    "secs": "сек",
+    "thePasswordsDoNotMatch": "Пароли не совпадают",
+    "changePasswordDesc": "Чтобы обеспечить безопасность вашей учетной записи, убедитесь, что ваш новый пароль отличается от любого из ваших предыдущих паролей.",
+    "changePasswordPreviouslyUsed": "Ваш новый пароль уже использовался ранее. ",
+    "currentPasswordIncorrect": "Текущий пароль неверен. "
   },
   "auth": {
     "welcomeTo": "Добро пожаловать в",

package/assets/localization/local_zh.json

@@ -2218,7 +2218,11 @@
     "or": "或者",
     "hrs": "小时",
     "mins": "分钟",
-    "secs": "秒"
+    "secs": "秒",
+    "thePasswordsDoNotMatch": "密码不匹配",
+    "changePasswordDesc": "为了确保您的帐户安全，请确保您的新密码与之前的密码不同。",
+    "changePasswordPreviouslyUsed": "您的新密码之前已被使用过。",
+    "currentPasswordIncorrect": "当前密码不正确。"
   },
   "auth": {
     "welcomeTo": "欢迎来到",

package/components/common/layout/theHeader/userMenu/UserMenu.vue

@@ -12,10 +12,11 @@
 
   <Teleport to="body">
     <common-layout-the-header-user-menu-modals-change-password
-      :show="isChangePassword"
+      v-if="isShowChangePasswordModal"
+      v-model="isShowChangePasswordModal"
+      :new-view="props.newView"
       :hostname="props.hostname"
       :project="props.project"
-      @hide="isChangePassword = false"
     />
 
     <common-layout-the-header-user-menu-modals-preferences
@@ -74,7 +75,7 @@ const emits = defineEmits<{
 
 const { $store }: any = useNuxtApp()
 
-const isChangePassword = ref<boolean>(false)
+const isShowChangePasswordModal = ref<boolean>(false)
 
 const onLogout = async (): Promise<void> => {
   await $store.dispatch('auth/A_LOGOUT', null)
@@ -83,7 +84,7 @@ const onLogout = async (): Promise<void> => {
 const onSelectDropdown = (value: string): void => {
   switch (value) {
     case 'changePassword':
-      isChangePassword.value = true
+      isShowChangePasswordModal.value = true
       break
     case 'preferences':
       emits('show-preference')

package/components/common/layout/theHeader/userMenu/modals/changePassword/ChangePassword.vue

@@ -1,88 +1,21 @@
 <template>
-  <atoms-modal
-    width="580px"
-    test-id="change-password"
-    :show="props.show"
-    :title="localization.common.changePassword"
-    :second-title="props.hostname"
-    :disabled-submit="buttonDisabled"
+  <common-layout-the-header-user-menu-modals-change-password-new
+    v-if="newView"
+    v-model="form"
+    :subtitle="props.hostname"
+    :project="props.project"
     @hide="onHideModal"
-    @submit="onChangePassword"
-  >
-    <template #modalBody>
-      <form id="change-password-form" class="compact" @submit.prevent>
-        <section class="form-block">
-          <div class="form-group">
-            <label for="current-password-field"
-              >{{ localization.common.currentPassword }}:</label
-            >
-            <input
-              id="current-password-field"
-              v-model="form.password.value"
-              data-id="change-password-input"
-              type="password"
-            />
-          </div>
-
-          <div class="form-group">
-            <label for="new-password-field"
-              >{{ localization.common.newPassword }}:</label
-            >
-
-            <div class="form-group__input">
-              <atoms-tooltip-error
-                :has-error="isValid"
-                selector="#new-password-field"
-              >
-                <template #elem>
-                  <input
-                    id="new-password-field"
-                    v-model="form.newPassword.value"
-                    data-id="new-password-input"
-                    type="password"
-                  />
-                </template>
-                <template #content>{{ errorText }}</template>
-              </atoms-tooltip-error>
-              <atoms-the-icon
-                v-show="isValid"
-                class="is-error tooltip-trigger"
-                name="info"
-              />
-            </div>
-          </div>
-
-          <div class="form-group">
-            <label for="confirm-password-field"
-              >{{ localization.common.confirmPassword }}:</label
-            >
-
-            <div class="form-group__input">
-              <atoms-tooltip-error
-                :has-error="isValid"
-                selector="#confirm-password-field"
-              >
-                <template #elem>
-                  <input
-                    id="confirm-password-field"
-                    v-model="form.confirmPassword.value"
-                    data-id="confirm-password-input"
-                    type="password"
-                  />
-                </template>
-                <template #content>{{ errorText }}</template>
-              </atoms-tooltip-error>
-              <atoms-the-icon
-                v-show="isValid"
-                class="is-error tooltip-trigger"
-                name="info"
-              />
-            </div>
-          </div>
-        </section>
-      </form>
-    </template>
-  </atoms-modal>
+    @change-password="onChangePassword"
+  />
+
+  <common-layout-the-header-user-menu-modals-change-password-old
+    v-else
+    v-model="form"
+    :hostname="props.hostname"
+    :project="props.project"
+    @hide="onHideModal"
+    @apply="onChangePassword"
+  />
 </template>
 
 <script setup lang="ts">
@@ -93,60 +26,30 @@ import type {
   UI_I_FormChangePassword,
 } from '~/components/common/layout/theHeader/userMenu/modals/changePassword/lib/models/interfaces'
 import type { UI_T_Project } from '~/lib/models/types'
-import { defaultFormFunc } from '~/components/common/layout/theHeader/userMenu/modals/changePassword/lib/config/form'
 
 const props = defineProps<{
-  show: boolean
+  newView: boolean
   hostname: string
   project: UI_T_Project
 }>()
-const emits = defineEmits<{
-  (event: 'hide'): void
-}>()
+const isShowModalLocal = defineModel<boolean>({ required: true })
 
 const localization = computed<UI_I_Localization>(() => useLocal())
-const { $store, $validation }: any = useNuxtApp()
-const validation = $validation.call({})
+const { $store }: any = useNuxtApp()
 
-const isValid = ref<boolean>(false)
-const errorText = ref<string>('')
-const form = ref<UI_I_FormChangePassword>(
-  useDeepCopy(defaultFormFunc(localization.value))
-)
-
-const setForm = (): void => {
-  form.value = useDeepCopy(defaultFormFunc(localization.value))
-  validation.setForm(form)
-}
-setForm()
-
-const buttonDisabled = computed<boolean>(() => {
-  const { password, confirmPassword, newPassword } = form.value
-  return (
-    password.value &&
-    confirmPassword.value &&
-    newPassword.value !== confirmPassword.value
-  )
+const form = ref<UI_I_FormChangePassword>({
+  password: '',
+  new_password: '',
+  confirm_password: '',
 })
-
 const onChangePassword = async (): Promise<void> => {
-  const valid = validation.touch()
-  const { newPassword, password } = form.value
-
-  if (newPassword.value === password.value) {
-    showValidationErrors(localization.value.common.newPasswordMustDifferentOld)
-    return
-  }
-  if (!valid.isValid) {
-    showValidationErrors(valid.errors.confirmPassword[0])
-    return
-  }
+  const { new_password, password } = form.value
 
   onHideModal()
 
   const sendData: UI_I_ChangePasswordBodyRequest = {
-    current_password: password.value,
-    new_password: newPassword.value,
+    current_password: password,
+    new_password: new_password,
   }
 
   let url = ''
@@ -177,34 +80,7 @@ const onChangePassword = async (): Promise<void> => {
     })
   }
 }
-
-const showValidationErrors = (text: string): void => {
-  isValid.value = true
-  errorText.value = text
-}
-
 const onHideModal = (): void => {
-  emits('hide')
-  setForm()
-  isValid.value = false
+  isShowModalLocal.value = false
 }
 </script>
-
-<style lang="scss" scoped>
-.form-block {
-  .form-group {
-    &:not(:first-child) input {
-      width: 100%;
-    }
-    &__input {
-      display: flex;
-      width: 100%;
-    }
-  }
-
-  svg {
-    width: 24px;
-    height: 24px;
-  }
-}
-</style>

package/components/common/layout/theHeader/userMenu/modals/changePassword/ChangePasswordNew.vue

@@ -0,0 +1,134 @@
+<template>
+  <ui-modal
+    test-id="change-password-modal"
+    width="560px"
+    :title="localization.common.changePassword"
+    :subtitle="props.subtitle"
+    class="change-password"
+    @submit="onSubmit"
+  >
+    <template #content>
+      <ui-modal-block-standard>
+        <ui-alert
+          v-if="errorText"
+          test-id="change-password-error-alert"
+          type="error"
+          hide-close-button
+          :messages="[errorText]"
+          class="change-password__alert"
+        />
+
+        <p class="change-password__description">
+          To keep your account secure, please make sure that your new password
+          is different from any of your previous passwords.
+        </p>
+
+        <div class="change-password__form">
+          <ui-input
+            v-model="modelLocal.current_password"
+            test-id="change-password-password-field"
+            :label="localization.auth.password"
+            :error="passwordErrorText"
+            type="password"
+          ></ui-input>
+
+          <ui-input
+            v-model="modelLocal.new_password"
+            test-id="change-password-new-password-field"
+            :label="localization.common.newPassword"
+            :error="newPasswordErrorText"
+            type="password"
+          ></ui-input>
+
+          <ui-input
+            v-model="modelLocal.confirm_password"
+            test-id="change-password-confirm-password-field"
+            :label="localization.common.confirmPassword"
+            :error="confirmPasswordErrorText"
+            type="password"
+          ></ui-input>
+        </div>
+      </ui-modal-block-standard>
+    </template>
+
+    <template #footerLeftContent><span /></template>
+  </ui-modal>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~//lib/models/interfaces'
+import type { UI_I_FormChangePassword } from '~/components/common/layout/theHeader/userMenu/modals/changePassword/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
+
+const props = defineProps<{
+  project: UI_T_Project
+  subtitle: string
+}>()
+const emits = defineEmits<{
+  (event: 'hide'): void
+  (event: 'change-password'): void
+}>()
+const modelLocal = defineModel<UI_I_FormChangePassword>({ required: true })
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+// const isValid = ref<boolean>(false)
+const errorText = ref<string>('')
+
+const passwordErrorText = computed<string>(() => {
+  return ''
+})
+const newPasswordErrorText = computed<string>(() => {
+  return ''
+})
+const confirmPasswordErrorText = computed<string>(() => {
+  return ''
+})
+
+// const showValidationErrors = (text: string): void => {
+//   isValid.value = true
+//   errorText.value = text
+// }
+
+// const onHideModal = (): void => {
+//   emits('hide')
+//   setForm()
+//   isValid.value = false
+// }
+
+const onSubmit = (): void => {
+  // const {  } = modelLocal.value
+  errorText.value = 'asdaldjlkdjkadj'
+
+  const notReady = true
+  if (notReady) {
+    return
+  }
+  emits('change-password')
+}
+</script>
+
+<style lang="scss" scoped>
+@import 'assets/scss/common/mixins.scss';
+.change-password {
+  &__description {
+    color: #9da6ad;
+    font-size: 12px;
+    font-weight: 400;
+    line-height: 14.52px;
+    margin-bottom: 20px;
+  }
+  &__alert {
+    padding: 10px 12px;
+    margin-bottom: 12px;
+    :deep(svg) {
+      width: 16px;
+      height: 16px;
+    }
+  }
+  &__form {
+    @include flex($dir: column);
+    row-gap: 18px;
+  }
+}
+</style>

package/components/common/layout/theHeader/userMenu/modals/changePassword/ChangePasswordOld.vue

@@ -0,0 +1,209 @@
+<template>
+  <atoms-modal
+    width="580px"
+    test-id="change-password"
+    show
+    :title="localization.common.changePassword"
+    :second-title="props.hostname"
+    :disabled-submit="buttonDisabled"
+    @hide="onHideModal"
+    @submit="onChangePassword"
+  >
+    <template #modalBody>
+      <form id="change-password-form" class="compact" @submit.prevent>
+        <section class="form-block">
+          <div class="form-group">
+            <label for="current-password-field"
+              >{{ localization.common.currentPassword }}:</label
+            >
+            <input
+              id="current-password-field"
+              v-model="form.password.value"
+              data-id="change-password-input"
+              type="password"
+            />
+          </div>
+
+          <div class="form-group">
+            <label for="new-password-field"
+              >{{ localization.common.newPassword }}:</label
+            >
+
+            <div class="form-group__input">
+              <atoms-tooltip-error
+                :has-error="isValid"
+                selector="#new-password-field"
+              >
+                <template #elem>
+                  <input
+                    id="new-password-field"
+                    v-model="form.newPassword.value"
+                    data-id="new-password-input"
+                    type="password"
+                  />
+                </template>
+                <template #content>{{ errorText }}</template>
+              </atoms-tooltip-error>
+              <atoms-the-icon
+                v-show="isValid"
+                class="is-error tooltip-trigger"
+                name="info"
+              />
+            </div>
+          </div>
+
+          <div class="form-group">
+            <label for="confirm-password-field"
+              >{{ localization.common.confirmPassword }}:</label
+            >
+
+            <div class="form-group__input">
+              <atoms-tooltip-error
+                :has-error="isValid"
+                selector="#confirm-password-field"
+              >
+                <template #elem>
+                  <input
+                    id="confirm-password-field"
+                    v-model="form.confirmPassword.value"
+                    data-id="confirm-password-input"
+                    type="password"
+                  />
+                </template>
+                <template #content>{{ errorText }}</template>
+              </atoms-tooltip-error>
+              <atoms-the-icon
+                v-show="isValid"
+                class="is-error tooltip-trigger"
+                name="info"
+              />
+            </div>
+          </div>
+        </section>
+      </form>
+    </template>
+  </atoms-modal>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { API_UI_I_Error } from '~/lib/models/store/interfaces'
+import type {
+  UI_I_ChangePasswordBodyRequest,
+  UI_I_FormChangePassword,
+} from '~/components/common/layout/theHeader/userMenu/modals/changePassword/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
+import { defaultFormFunc } from '~/components/common/layout/theHeader/userMenu/modals/changePassword/lib/config/form'
+
+const props = defineProps<{
+  hostname: string
+  project: UI_T_Project
+}>()
+const emits = defineEmits<{
+  (event: 'hide'): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+const { $store, $validation }: any = useNuxtApp()
+const validation = $validation.call({})
+
+const isValid = ref<boolean>(false)
+const errorText = ref<string>('')
+const form = ref<UI_I_FormChangePassword>(
+  useDeepCopy(defaultFormFunc(localization.value))
+)
+
+const setForm = (): void => {
+  form.value = useDeepCopy(defaultFormFunc(localization.value))
+  validation.setForm(form)
+}
+setForm()
+
+const buttonDisabled = computed<boolean>(() => {
+  const { password, confirmPassword, newPassword } = form.value
+  return (
+    password.value &&
+    confirmPassword.value &&
+    newPassword.value !== confirmPassword.value
+  )
+})
+
+const onChangePassword = async (): Promise<void> => {
+  const valid = validation.touch()
+  const { newPassword, password } = form.value
+
+  if (newPassword.value === password.value) {
+    showValidationErrors(localization.value.common.newPasswordMustDifferentOld)
+    return
+  }
+  if (!valid.isValid) {
+    showValidationErrors(valid.errors.confirmPassword[0])
+    return
+  }
+
+  onHideModal()
+
+  const sendData: UI_I_ChangePasswordBodyRequest = {
+    current_password: password.value,
+    new_password: newPassword.value,
+  }
+
+  let url = ''
+  if (props.project === 'sphere') {
+    const { id } = useLocalStorage('userData')
+
+    url = `ui/users/${id}/passwd`
+  } else if (props.project === 'procurator') {
+    url = '/ui/passwd'
+  }
+
+  const { error } = await useMyFetch<never, API_UI_I_Error>(url, {
+    method: 'POST',
+    body: sendData,
+    key: Date.now().toString(),
+  })
+
+  if (error.value?.data && error.value.data.error_code !== 0) {
+    $store.dispatch('main/A_SHOW_NOTIFICATION', {
+      status: 'error',
+      headline: localization.value.common.operationFailed,
+      messages: [
+        {
+          title: 'Error',
+          descriptions: [error.value.data.error_message],
+        },
+      ],
+    })
+  }
+}
+
+const showValidationErrors = (text: string): void => {
+  isValid.value = true
+  errorText.value = text
+}
+
+const onHideModal = (): void => {
+  emits('hide')
+  setForm()
+  isValid.value = false
+}
+</script>
+
+<style lang="scss" scoped>
+.form-block {
+  .form-group {
+    &:not(:first-child) input {
+      width: 100%;
+    }
+    &__input {
+      display: flex;
+      width: 100%;
+    }
+  }
+
+  svg {
+    width: 24px;
+    height: 24px;
+  }
+}
+</style>

package/components/common/monitor/advanced/tools/chartOptionsModal/metrics/lib/config/optionsMetrics.ts

@@ -152,11 +152,11 @@ export const metricsFunc = (
         value: 'memory',
         testId: 'metric-item-memory-button',
       },
-      // {
-      //   text: localization.common.datastore,
-      //   value: 'datastore',
-      //   testId: 'metric-item-datastore-button',
-      // },
+      {
+        text: localization.common.datastore,
+        value: 'datastore',
+        testId: 'metric-item-datastore-button',
+      },
       // {
       //   text: localization.common.power,
       //   value: 'power',

package/components/common/pages/scheduledTasks/modals/common/frequency/end/End.vue

@@ -62,8 +62,6 @@ watch(
   ([newValue1, newValue2]: [string, 'never' | 'on']) => {
     modelFrequencyLocal.value.isValid =
       newValue2 === 'never' ? false : !!newValue1
-
-    newValue2 === 'never' && (modelFrequencyLocal.value.frg_end_time = '')
   }
 )
 </script>

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

@@ -62,8 +62,7 @@ const getCorrectRuForm = (value: number | string, type: string): string => {
 export const validateField = (
   localization: UI_I_Localization,
   value: string,
-  checkZero: boolean = false,
-  checkDayRange: boolean = false // параметр для проверки диапазона дней
+  checkZero: boolean = false
 ): string => {
   // Если поле пустое
   if (!value) {
@@ -75,7 +74,7 @@ export const validateField = (
     return localization.common.theValueTooSmall
   }
 
-  if (value.length > 3 ) {
+  if (value.length > 3) {
     return localization.common.theValueTooLarge
   }
   // Если значение не является цифрой
@@ -83,10 +82,6 @@ export const validateField = (
     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 = (

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

@@ -9,11 +9,11 @@
       v-model="model"
     />
 
-    <div v-if="props.type === 'month'">
+    <div v-if="props.type === 'month'" class="">
       <div class="on-time__radio radio">
         <input
           id="on-time-monthly-by-day"
-          v-model="model.frg_monthly_mode"
+          v-model="selectedTimeMode"
           data-id="on-time-monthly-by-day"
           type="radio"
           value="day"
@@ -49,7 +49,7 @@
       <div class="on-time__radio radio">
         <input
           id="on-time-monthly-by-week"
-          v-model="model.frg_monthly_mode"
+          v-model="selectedTimeMode"
           data-id="on-time-monthly-by-week"
           type="radio"
           value="week"
@@ -115,6 +115,8 @@ const model = defineModel<UI_I_ScheduleNewTasksForm>({ required: true })
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
+const selectedTimeMode = ref<'day' | 'week'>('day')
+
 const frequencyOnWeeksDays = computed<UI_I_SelectInputItem[]>(() => {
   return frequencyOnWeeksDaysFunc(localization.value)
 })
@@ -123,7 +125,7 @@ const frequencyOnOrdinalNumber = computed<UI_I_SelectInputItem[]>(() => {
 })
 
 const isDisabledMonthlyDayField = computed<boolean>(
-  () => model.value.frg_monthly_mode === 'week'
+  () => selectedTimeMode.value === 'week'
 )
 
 const isInitTimeIntervalValidation = ref<boolean>(false)
@@ -134,12 +136,7 @@ const schedulerOnDayErrorText = computed<string>(() => {
   if (!isInitTimeIntervalValidation.value || isDisabledMonthlyDayField.value)
     return ''
 
-  return validateField(
-    localization.value,
-    model.value.frg_monthly_day,
-    true,
-    true
-  )
+  return validateField(localization.value, model.value.frg_monthly_day, true)
 })
 watch(
   schedulerOnDayErrorText,

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

@@ -7,31 +7,31 @@ export const frequencyOnWeeksDaysFunc = (
   return [
     {
       label: localization.common.sunday,
-      value: 6,
+      value: 'sunday',
     },
     {
       label: localization.common.monday,
-      value: 1,
+      value: 'monday',
     },
     {
       label: localization.common.tuesday,
-      value: 2,
+      value: 'tuesday',
     },
     {
       label: localization.common.wednesday,
-      value: 3,
+      value: 'wednesday',
     },
     {
       label: localization.common.thursday,
-      value: 4,
+      value: 'thursday',
     },
     {
       label: localization.common.friday,
-      value: 5,
+      value: 'friday',
     },
     {
       label: localization.common.saturday,
-      value: 0,
+      value: 'saturday',
     },
   ]
 }
@@ -42,23 +42,23 @@ export const frequencyOnOrdinalNumberFunc = (
   return [
     {
       label: localization.scheduledTasks.first,
-      value: 1,
+      value: '',
     },
     {
       label: localization.scheduledTasks.second,
-      value: 2,
+      value: 'once',
     },
     {
       label: localization.scheduledTasks.third,
-      value: 3,
+      value: 'after-startup',
     },
     {
       label: localization.scheduledTasks.fourth,
-      value: 4,
+      value: 'hour',
     },
     {
       label: localization.common.last,
-      value: 5,
+      value: 'day',
     },
   ]
 }

package/components/common/pages/scheduledTasks/modals/common/newTaskForm/NewTaskForm.vue

@@ -101,7 +101,6 @@ import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/
 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/newTaskForm/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/newTaskForm/lib/utils'
 import { frequencyMethodFunc } from '~/components/common/pages/scheduledTasks/modals/common/frequency/lib/config/frequencyOptions'
 
 const props = defineProps<{
@@ -134,6 +133,57 @@ watch(
   },
   { deep: true }
 )
+/* TODO рефакторинг все методы надо рефакторить */
+const generateOnceCronExpression = (date: Date): any => {
+  if (!date) return
+
+  const minutes = date.getMinutes()
+  const hours = date.getHours()
+  const day = date.getDate()
+  const month = date.getMonth() + 1 // В cron месяцы начинаются с 1 (январь = 1)
+  const dayOfWeek = '*' // Для одноразовой задачи день недели неважен
+
+  // Генерируем cron-выражение
+  return `${minutes} ${hours} ${day} ${month} ${dayOfWeek} once`
+}
+const generateHourlyCronExpression = (delay: string, date: Date): any => {
+  if (!date) return
+
+  const minutes = date.getMinutes()
+  const hours = date.getHours()
+
+  // Генерируем cron-выражение
+  return `${minutes} ${hours}/${delay} * * *`
+}
+const generateDaylyCronExpression = (delay: string, date: Date): string => {
+  if (!date) return
+
+  const minutes = date.getMinutes()
+  const hours = date.getHours()
+  const day = date.getDate()
+
+  // Генерируем cron-выражение
+  return `${minutes} ${hours} ${day}/${delay} * *`
+}
+const generateWeeklyCronExpression = (
+  data: UI_I_ScheduleNewTasksForm
+): string => {
+  const { frg_on_week_days } = data
+
+  // Генерируем cron-выражение
+  return `* * * * ${frg_on_week_days.join(',')}`
+}
+const generateMonthlyCronExpression = (delay: string, date: Date): string => {
+  if (!date) return
+
+  const minutes = date.getMinutes()
+  const hours = date.getHours()
+  const day = date.getDate()
+  const month = date.getMonth() + 1
+
+  // Генерируем cron-выражение
+  return `${minutes} ${hours} ${day} ${month}/${delay} *`
+}
 
 const generateCronExpression = (
   runType: UI_T_FrequencyType,
@@ -144,27 +194,40 @@ const generateCronExpression = (
   // Генерируем cron-выражение на основе runType
   switch (runType) {
     case 'once':
-      const timestamp = Math.floor(
-        new Date(interval.frg_on_time).getTime() / 1000
+      cronExpression = generateOnceCronExpression(
+        new Date(interval.frg_on_time)
       )
-      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 минут
+      const delay =
+        interval.frg_after_startup === 0
+          ? '*'
+          : `*/${interval.frg_after_startup}`
+      cronExpression = `${delay} * * * * after_procurator_startup` // Выполняется каждые N минут после запуска  procurator_startup
       break
     case 'hour':
-      cronExpression = cron.generateHourlyCronExpression(interval)
+      const hourlyDelay = interval.frg_interval
+      cronExpression = generateHourlyCronExpression(
+        hourlyDelay,
+        new Date(interval.frg_start_on_time)
+      )
       break
     case 'day':
-      cronExpression = cron.generateDailyCronExpression(interval)
+      const dayDelay = interval.frg_interval
+      cronExpression = generateDaylyCronExpression(
+        dayDelay,
+        new Date(interval.frg_start_on_time)
+      )
       break
     case 'week':
-      cronExpression = cron.generateWeeklyCronExpression(interval)
+      cronExpression = generateWeeklyCronExpression(interval)
       break
     case 'month':
-      cronExpression = cron.generateMonthlyCronExpression(interval)
+      const monthDelay = interval.frg_interval
+      cronExpression = generateMonthlyCronExpression(
+        monthDelay,
+        new Date(interval.frg_start_on_time)
+      )
       break
     default:
       cronExpression = '* * * * *'

package/components/common/pages/scheduledTasks/modals/lib/config/createScheduledTask.ts

@@ -11,13 +11,12 @@ export const scheduledTaskDefaultFormFunc = (): UI_I_ScheduleNewTasksForm => {
     frequency: '',
     frg_after_startup: 0,
     frg_interval: 1,
-    frg_end_time: '',
-    frg_start_on_time: '',
-    frg_monthly_mode: 'day',
-    frg_monthly_day: 1,
+    frg_end_time: null,
+    frg_start_on_time: null,
+    frg_monthly_day: 0,
     frq_week_day: '',
     frq_ordinal_number: '',
-    frg_on_time: '',
+    frg_on_time: null,
     frg_on_week_days: [],
   }
 }

package/components/common/pages/scheduledTasks/modals/lib/models/interfaces.ts

@@ -9,13 +9,12 @@ export interface UI_I_ScheduleNewTasksForm {
   toggle: boolean
   frg_after_startup: number
   frg_interval: number
-  frg_end_time: string
-  frg_start_on_time: string
-  frg_monthly_mode: 'day' | 'week'
+  frg_end_time: number | null
+  frg_start_on_time: number | null
   frg_monthly_day: number
   frq_ordinal_number: string
   frq_week_day: UI_T_FrequencyWeeksDays
-  frg_on_time: string
+  frg_on_time: number | null
   frg_on_week_days: number[]
   cron: string
 }

package/package.json

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

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

@@ -1,67 +0,0 @@
-import type { UI_I_ScheduleNewTasksForm } from '~/components/common/pages/scheduledTasks/modals/lib/models/interfaces'
-
-export const generateHourlyCronExpression = (
-  data: UI_I_ScheduleNewTasksForm
-): string => {
-  const startTimestamp = Math.floor(
-    new Date(data.frg_start_on_time).getTime() / 1000
-  )
-  const endTimestamp = Math.floor(new Date(data.frg_end_time).getTime() / 1000)
-
-  // Генерируем cron-выражение
-  return endTimestamp
-    ? `* * * * * ${startTimestamp}-${endTimestamp}:${data.frg_interval}-0-0-0`
-    : `* * * * * ${startTimestamp}:${data.frg_interval}-0-0-0`
-}
-export const generateWeeklyCronExpression = (
-  data: UI_I_ScheduleNewTasksForm
-): string => {
-  const { frg_on_week_days } = data
-
-  const startTimestamp = Math.floor(
-    new Date(data.frg_start_on_time).getTime() / 1000
-  )
-  const endTimestamp = Math.floor(new Date(data.frg_end_time).getTime() / 1000)
-  const daysOfWeek = frg_on_week_days.join(',')
-
-  return endTimestamp
-    ? `* * * * ${daysOfWeek} ${startTimestamp}-${endTimestamp}:0-0-0-${data.frg_interval}`
-    : `* * * * ${daysOfWeek} ${startTimestamp}:0-0-0-${data.frg_interval}`
-}
-
-export const generateDailyCronExpression = (
-  data: UI_I_ScheduleNewTasksForm
-): string => {
-  const startTimestamp = Math.floor(
-    new Date(data.frg_start_on_time).getTime() / 1000
-  )
-  const endTimestamp = Math.floor(new Date(data.frg_end_time).getTime() / 1000)
-
-  // Генерируем cron-выражение
-  return endTimestamp
-    ? `* * * * * ${startTimestamp}-${endTimestamp}:0-${data.frg_interval}-0-0`
-    : `* * * * * ${startTimestamp}:0-${data.frg_interval}-0-0`
-}
-
-export const generateMonthlyCronExpression = (
-  data: UI_I_ScheduleNewTasksForm
-): string => {
-  const { frg_interval, frg_monthly_day, frq_week_day, frq_ordinal_number } =
-    data
-
-  const startTimestamp = Math.floor(
-    new Date(data.frg_start_on_time).getTime() / 1000
-  )
-  const endTimestamp = Math.floor(new Date(data.frg_end_time).getTime() / 1000)
-
-  const daysOfWeek = `${frq_week_day}#${frq_ordinal_number}`
-
-  const timestamp = endTimestamp
-    ? `${startTimestamp}-${endTimestamp}`
-    : startTimestamp
-
-  // Генерируем cron-выражение
-  return data.frg_monthly_mode === 'week'
-    ? `* * * * * ${timestamp}:0-0-${frg_interval}-${daysOfWeek}`
-    : `* * ${frg_monthly_day} */${frg_interval} * ${timestamp}:0-0-0-0`
-}