bfg-common 1.5.920 → 1.5.921

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

@@ -1,55 +1,25 @@
 import type { UI_I_Localization } from '~/lib/models/interfaces'
+import { UI_I_SelectWeekDayTab } from '~/components/common/pages/scheduledTasks/modals/common/frequency/on/selectWeek/lib/models/interfaces'
+
+const WEEK_DAYS_CONFIG = [
+  { value: 1, newKey: 'weekMon', oldKey: 'weekM', testId: 'week-m-value' },
+  { value: 2, newKey: 'weekTue', oldKey: 'weekT', testId: 'week-t-value' },
+  { value: 3, newKey: 'weekWed', oldKey: 'weekW', testId: 'week-w-value' },
+  { value: 4, newKey: 'weekThu', oldKey: 'weekTh', testId: 'week-th-value' },
+  { value: 5, newKey: 'weekFri', oldKey: 'weekF', testId: 'week-f-value' },
+  { value: 6, newKey: 'weekSat', oldKey: 'weekS', testId: 'week-s-value' },
+  { value: 0, newKey: 'weekSun', oldKey: 'weekSu', testId: 'week-su-value' },
+]
 
 export const weekDaysFunc = (
   localization: UI_I_Localization,
-  selectedWeeks: number[]
-): any => {
-  return [
-    {
-      name: localization.common.weekM,
-      value: 1,
-      isActive: checkIsActiveDay(1, selectedWeeks),
-      testId: 'week-m-value',
-    },
-    {
-      name: localization.common.weekT,
-      value: 2,
-      isActive: checkIsActiveDay(2, selectedWeeks),
-      testId: 'week-t-value',
-    },
-    {
-      name: localization.common.weekW,
-      value: 3,
-      isActive: checkIsActiveDay(3, selectedWeeks),
-      testId: 'week-w-value',
-    },
-    {
-      name: localization.common.weekTh,
-      value: 4,
-      isActive: checkIsActiveDay(4, selectedWeeks),
-      testId: 'week-th-value',
-    },
-    {
-      name: localization.common.weekF,
-      value: 5,
-      isActive: checkIsActiveDay(5, selectedWeeks),
-      testId: 'week-f-value',
-    },
-    {
-      name: localization.common.weekS,
-      value: 6,
-      isActive: checkIsActiveDay(6, selectedWeeks),
-      testId: 'week-s-value',
-    },
-    {
-      name: localization.common.weekSu,
-      value: 0,
-      isActive: checkIsActiveDay(0, selectedWeeks),
-      testId: 'week-su-value',
-    },
-  ]
-}
-
-const checkIsActiveDay = (value: number, weeks: number[]): boolean => {
-  return !!weeks?.includes(value)
+  selectedWeeks: number[],
+  isNewView: boolean
+): UI_I_SelectWeekDayTab[] => {
+  return WEEK_DAYS_CONFIG.map((day) => ({
+    name: localization.common[isNewView ? day.newKey : day.oldKey],
+    value: day.value,
+    isActive: selectedWeeks.includes(day.value),
+    testId: day.testId,
+  }))
 }

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

@@ -0,0 +1,46 @@
+<template>
+  <div class="frequency-start-on">
+    <h2>{{ localization.common.start }}</h2>
+    <ui-input-with-datepicker
+      id="frequency-start-on-date"
+      v-model="modelFrequencyLocal.frg_start_on_time"
+      :format="datepickerFormat"
+      test-id="frequency-start-on-date-input"
+      time-format="12"
+      :error="''"
+      :error-timepicker="''"
+    />
+  </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 modelFrequencyLocal = 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-start-on {
+  grid-column: span 2;
+  border-top: 1px solid var(--horizontal-line);
+  padding-top: 16px;
+  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/startOn/Old.vue

@@ -0,0 +1,77 @@
+<template>
+  <div class="start-on">
+    <label class="clr-control-label clr-col-2 pl-0 start-on__label">
+      {{ localization.scheduledTasks.startOn }}
+    </label>
+
+    <label
+      :class="[
+        'tooltip tooltip-validation tooltip-xs tooltip-top-left',
+        schedulerStartOnErrorText && 'invalid',
+      ]"
+      for="frequency-start-on-date"
+    >
+      <input
+        id="frequency-start-on-date"
+        v-model.lazy="modelFrequencyLocal.frg_start_on_time"
+        data-id="frequency-start-on-date-input"
+        type="datetime-local"
+      />
+
+      <span class="tooltip-content">
+        {{ schedulerStartOnErrorText }}
+      </span>
+    </label>
+  </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 { validateDate } from '~/components/common/pages/scheduledTasks/modals/common/frequency/lib/utils'
+
+const modelFrequencyLocal = defineModel<UI_I_ScheduleNewTasksForm>({
+  required: true,
+})
+
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+// const { $formattedDate, $isDate, $getUnixByDate }: any = useNuxtApp()
+
+const schedulerStartOnErrorText = computed<string>(() => {
+  return !modelFrequencyLocal.value.frg_start_on_time
+    ? localization.value.common.fieldRequired
+    : validateDate(
+        localization.value,
+        modelFrequencyLocal.value.frg_start_on_time
+      )
+})
+watch(
+  schedulerStartOnErrorText,
+  (newValue: string) => {
+    modelFrequencyLocal.value.isValid = !!newValue
+  },
+  { immediate: true }
+)
+</script>
+
+<style lang="scss" scoped>
+@import 'bfg-common/assets/scss/common/mixins.scss';
+.start-on {
+  @include flex($align: center);
+  margin-top: 10px;
+  &__select-input {
+    :deep(.select-input__label) {
+      font-weight: 400;
+    }
+    :deep(.select) {
+      max-width: 80px !important;
+    }
+  }
+}
+.tooltip {
+  & > .tooltip-content {
+    width: 200px;
+  }
+}
+</style>

package/components/common/pages/scheduledTasks/modals/common/frequency/startOn/StartOn.vue

@@ -1,28 +1,9 @@
 <template>
-  <div class="start-on">
-    <label class="clr-control-label clr-col-2 pl-0 start-on__label">
-      {{ localization.scheduledTasks.startOn }}
-    </label>
-
-    <label
-      :class="[
-        'tooltip tooltip-validation tooltip-xs tooltip-top-left',
-        schedulerStartOnErrorText && 'invalid',
-      ]"
-      for="frequency-start-on-date"
-    >
-      <input
-        id="frequency-start-on-date"
-        v-model.lazy="modelFrequencyLocal.frg_start_on_time"
-        data-id="frequency-start-on-date-input"
-        type="datetime-local"
-      />
-
-      <span class="tooltip-content">
-        {{ schedulerStartOnErrorText }}
-      </span>
-    </label>
-  </div>
+  <component
+    :is="currentComponent"
+    v-model="modelFrequencyLocal"
+    @vue:mounted="onSetDefaultDateTime"
+  />
 </template>
 
 <script lang="ts" setup>
@@ -34,11 +15,18 @@ const modelFrequencyLocal = defineModel<UI_I_ScheduleNewTasksForm>({
   required: true,
 })
 
-const { $formattedDatetime }: any = useNuxtApp()
-
 const localization = computed<UI_I_Localization>(() => useLocal())
+const { $formattedDatetime }: any = useNuxtApp()
+const { $store }: any = useNuxtApp()
 // const { $formattedDate, $isDate, $getUnixByDate }: any = useNuxtApp()
 
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+const currentComponent = computed(() =>
+  isNewView.value
+    ? defineAsyncComponent(() => import('./New.vue'))
+    : defineAsyncComponent(() => import('./Old.vue'))
+)
+
 const schedulerStartOnErrorText = computed<string>(() => {
   return !modelFrequencyLocal.value.frg_start_on_time
     ? localization.value.common.fieldRequired
@@ -55,10 +43,7 @@ watch(
   { immediate: true }
 )
 
-onMounted(() => {
-  setDefaultDateTime()
-})
-const setDefaultDateTime = () => {
+const onSetDefaultDateTime = () => {
   modelFrequencyLocal.value.frg_start_on_time = $formattedDatetime(new Date(), {
     formatDate: 'yyyy-MM-dd',
     separator: ' ',
@@ -66,24 +51,3 @@ const setDefaultDateTime = () => {
   })
 }
 </script>
-
-<style lang="scss" scoped>
-@import 'bfg-common/assets/scss/common/mixins.scss';
-.start-on {
-  @include flex($align: center);
-  margin-top: 10px;
-  &__select-input {
-    :deep(.select-input__label) {
-      font-weight: 400;
-    }
-    :deep(.select) {
-      max-width: 80px !important;
-    }
-  }
-}
-.tooltip {
-  & > .tooltip-content {
-    width: 200px;
-  }
-}
-</style>

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

@@ -0,0 +1,194 @@
+<template>
+  <form class="form" @submit.prevent>
+    <section class="flex flex-direction-column row-gap-6">
+      <div class="flex justify-between column-gap-4 form__target">
+        <div class="flex items-center column-gap-2 text-ellipsis">
+          <p class="text">{{ localization.common.target }}:</p>
+          <span class="icon vsphere-icon-vm"></span>
+          <span class="text">{{ props.target }}</span>
+        </div>
+        <div class="flex items-center column-gap-3">
+          <p class="text">{{ localization.common.active }}</p>
+          <ui-switch
+            v-model="model.toggle"
+            test-id="scheduled-task-active-switch-input"
+          />
+        </div>
+      </div>
+
+      <ui-input
+        id="schedule-task-name-field"
+        v-model="model.task_name"
+        :label="localization.common.taskName"
+        :error="props.taskNameErrorText"
+        test-id="schedule-task-name-field"
+        class="form__user-name"
+        @input="onInitValidation(['taskName'])"
+      />
+
+      <ui-textarea
+        id="description"
+        v-model="model.description"
+        :label="textareaLabel"
+        test-id="schedule-task-description-field"
+        height="84"
+        class="form__description"
+      />
+
+      <div class="form__run">
+        <h2>{{ localization.common.run }}</h2>
+
+        <div
+          class="form__run-frequency"
+          :class="{
+            'grid-single-col': !model.frequency || model.frequency === 'once',
+          }"
+        >
+          <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"
+            :template-view-mode="props.templateViewMode"
+          />
+        </div>
+      </div>
+
+      <div class="form__email">
+        <h2>{{ emailCompletionLabel }}</h2>
+        <ui-textarea
+          id="email-completion"
+          v-model="model.ntfn_target"
+          placeholder="example1@email.com,example2@email.com"
+          test-id="schedule-task-email-completion-field"
+          height="84"
+          class="form__description"
+        />
+      </div>
+    </section>
+  </form>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Dropdown } from '~/node_modules/bfg-uikit/components/ui/dropdown/models/interfaces'
+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'
+
+const model = defineModel<UI_I_ScheduleNewTasksForm>({ required: true })
+const props = defineProps<{
+  target: string
+  formValidationFields: UI_I_InitialValidationFields
+  taskNameErrorText: string
+  frequencyMethodOptions: UI_I_SelectInputItem[]
+  templateViewMode: 'horizontal' | 'vertical'
+}>()
+const emits = defineEmits<{
+  (event: 'init-validation', value: string[]): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const onInitValidation = (types: string[]): void => {
+  emits('init-validation', types)
+}
+
+const textareaLabel = computed<string>(() => {
+  const { description, optional } = localization.value.common
+  return `${description} (${optional})`
+})
+
+const emailCompletionLabel = computed<string>(() => {
+  const { emailNotificationUponCompletion, optional } =
+    localization.value.common
+  return `${emailNotificationUponCompletion} (${optional})`
+})
+
+const frequencyMethodOptionsLocal = computed<UI_I_Dropdown[]>(() =>
+  props.frequencyMethodOptions
+    .filter((frequency: UI_I_SelectInputItem) => frequency.value !== '')
+    .map((item: UI_I_SelectInputItem) => ({
+      ...item,
+      text: item.label,
+    }))
+)
+</script>
+
+<style lang="scss" scoped>
+.form {
+  &__target {
+    background-color: var(--info-block-bg);
+    border-radius: 8px;
+    padding: 12px;
+    .text {
+      font-family: 'Inter', sans-serif;
+      font-size: 13px;
+      font-weight: 400;
+      color: var(--title-form-first-color);
+    }
+    /* Target */
+    > div:first-child p.text {
+      color: #9da6ad; // for dark and light theme
+    }
+    /* Active */
+    > div:last-child p.text {
+      text-transform: Capitalize;
+    }
+
+    span.text {
+      color: var(--title-color);
+    }
+
+    .icon {
+      min-width: 20px;
+      width: 20px;
+      height: 20px;
+    }
+  }
+
+  &__run,
+  &__email {
+    border-top: 1px solid var(--horizontal-line);
+    padding-top: 16px;
+  }
+
+  &__run {
+    &-frequency {
+      display: grid;
+      grid-template-columns: 1fr 1fr;
+      grid-gap: 16px;
+      &.grid-single-col {
+        grid-template-columns: 1fr;
+        column-gap: 0;
+      }
+    }
+  }
+
+  h2 {
+    font-family: 'Inter', sans-serif;
+    color: var(--title-form-first-color);
+    font-size: 16px;
+    font-weight: 500;
+    margin-bottom: 16px;
+    &.frequency {
+      font-size: 14px;
+      margin-bottom: 12px;
+    }
+  }
+}
+</style>

package/components/common/pages/scheduledTasks/modals/common/{newTaskForm/NewTaskForm.vue → taskForm/Old.vue}

@@ -9,7 +9,7 @@
         <label
           :class="[
             'clr-control-container tooltip tooltip-validation tooltip-xs tooltip-bottom-left clr-col-md-8',
-            userNameErrorText && 'invalid',
+            props.taskNameErrorText && 'invalid',
           ]"
         >
           <input
@@ -22,7 +22,7 @@
             @blur="onInitValidation(['taskName'])"
           />
           <span class="tooltip-content">
-            {{ userNameErrorText }}
+            {{ props.taskNameErrorText }}
           </span>
         </label>
       </div>
@@ -69,7 +69,7 @@
       <common-select-input
         v-model="model.frequency"
         :label="localization.common.run"
-        :data="frequencyMethodOptions"
+        :data="props.frequencyMethodOptions"
         class="clr-form-control run"
       >
         <template #options="{ value }">
@@ -101,80 +101,23 @@
 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/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'
+import type { UI_I_InitialValidationFields } from '~/components/common/pages/scheduledTasks/modals/common/taskForm/lib/models/interfaces'
 
+const model = defineModel<UI_I_ScheduleNewTasksForm>({ required: true })
 const props = defineProps<{
   target: string
+  formValidationFields: UI_I_InitialValidationFields
+  taskNameErrorText: string
+  frequencyMethodOptions: UI_I_SelectInputItem[]
+}>()
+const emits = defineEmits<{
+  (event: 'init-validation', value: string[]): void
 }>()
-const model = defineModel<UI_I_ScheduleNewTasksForm>({ required: true })
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const initValidationFields = ref<UI_I_InitialValidationFields>({
-  taskName: false,
-})
 const onInitValidation = (types: string[]): void => {
-  types.forEach((type) => (initValidationFields.value[type] = true))
-}
-const userNameErrorText = computed<string>(() => {
-  if (!initValidationFields.value.taskName) return ''
-
-  model.value.task_name = model.value.task_name.replace(/^\s+/, '')
-
-  return !model.value.task_name ? localization.value.common.fieldRequired : ''
-})
-
-const frequencyMethodOptions = computed<UI_I_SelectInputItem[]>(() =>
-  frequencyMethodFunc(localization.value)
-)
-
-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
+  emits('init-validation', types)
 }
 </script>