bfg-common 1.5.930 → 1.5.932

package/assets/localization/local_be.json

@@ -3410,7 +3410,8 @@
     "delayMinutes": "Затрымка (хвілін)",
     "selectPosition": "Выберыце пазіцыю",
     "selectDay": "Выберыце дзень",
-    "emails": "Электронныя лісты"
+    "emails": "Электронныя лісты",
+    "taskDetails": "Падрабязнасці задання"
   },
   "license": {
     "limits": "Мяжа",

package/assets/localization/local_en.json

@@ -3414,7 +3414,8 @@
     "delayMinutes": "Delay (Minutes)",
     "selectPosition": "Select Position",
     "selectDay": "Select Day",
-    "emails": "Emails"
+    "emails": "Emails",
+    "taskDetails": "Task Details"
   },
   "license": {
     "limits": "Limits",

package/assets/localization/local_hy.json

@@ -3414,7 +3414,8 @@
     "delayMinutes": "Ժամանակաձգում (րոպե)",
     "selectPosition": "Ընտրեք դիրքը",
     "selectDay": "Ընտրեք օրը",
-    "emails": "Էլեկտրոնային նամակներ"
+    "emails": "Էլեկտրոնային նամակներ",
+    "taskDetails": "Առաջադրանքի մանրամասներ"
   },
   "license": {
     "limits": "Սահմանները",

package/assets/localization/local_kk.json

@@ -3413,7 +3413,8 @@
     "delayMinutes": "Кешігу (минут)",
     "selectPosition": "Орынды таңдаңыз",
     "selectDay": "Күнді таңдаңыз",
-    "emails": "Электрондық хаттар"
+    "emails": "Электрондық хаттар",
+    "taskDetails": "Тапсырма мәліметтері"
   },
   "license": {
     "limits": "Шектеулер",

package/assets/localization/local_ru.json

@@ -3413,7 +3413,8 @@
     "delayMinutes": "Задержка (минут)",
     "selectPosition": "Выберите позицию",
     "selectDay": "Выберите день",
-    "emails": "Электронные письма"
+    "emails": "Электронные письма",
+    "taskDetails": "Сведения о задании"
   },
   "license": {
     "limits": "Пределы",

package/assets/localization/local_zh.json

@@ -3411,7 +3411,8 @@
     "delayMinutes": "延迟（分钟）",
     "selectPosition": "选择位置",
     "selectDay": "选择日期",
-    "emails": "电子邮件"
+    "emails": "电子邮件",
+    "taskDetails": "任务详情"
   },
   "license": {
     "limits": "限制",

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

@@ -1,5 +1,8 @@
 <template>
   <form class="form" @submit.prevent>
+    <h2 v-if="!isHideFormLeftCol" class="task-details">
+      {{ localization.scheduledTasks.taskDetails }}
+    </h2>
     <section class="form__section" :class="!isHideFormLeftCol && 'horizontal'">
       <!-- Используем, когда форма применяется внутри модалки -->
       <div
@@ -38,7 +41,7 @@
         </div>
       </div>
 
-      <div class="form__row">
+      <div class="form__row description">
         <div v-if="!isHideFormLeftCol" class="form__row-title">
           <span class="text-ellipsis">
             {{ textareaLabel }}
@@ -84,28 +87,40 @@
         </div>
       </div>
 
-      <div class="form__row">
+      <h2>{{ localization.common.run }}</h2>
+      <div class="form__row" :class="isHideFormLeftCol && 'vertical'">
         <div v-if="!isHideFormLeftCol" class="form__row-title">
           <span class="text-ellipsis">
             {{ localization.scheduledTasks.frequency }}
           </span>
         </div>
-        <div class="form__row-content">
-          <ui-select
-            v-model="model.frequency"
-            :items="frequencyMethodOptionsLocal"
-            test-id="schedule-task-frequency-select"
-            :placeholder="localization.scheduledTasks.selectFrequency"
-            size="md"
-            select-width="100%"
+        <div
+          class="form__row-content frequency-run"
+          :class="{
+            'grid-single-col': !model.frequency || model.frequency === 'once',
+          }"
+        >
+          <div>
+            <h2 v-if="isHideFormLeftCol" 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%"
+            />
+          </div>
+
+          <common-pages-scheduled-tasks-modals-common-frequency
+            v-if="isHideFormLeftCol && model.frequency"
+            v-model="model"
+            :type="model.frequency"
+            :template-view-mode="props.templateViewMode"
           />
-
-          <!--          <common-pages-scheduled-tasks-modals-common-frequency-->
-          <!--            v-if="model.frequency"-->
-          <!--            v-model="model"-->
-          <!--            :type="model.frequency"-->
-          <!--            :template-view-mode="props.templateViewMode"-->
-          <!--          />-->
         </div>
       </div>
 
@@ -122,41 +137,8 @@
         />
       </div>
 
-      <!--      <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>-->
-
       <h2>{{ emailCompletionLabel }}</h2>
-      <div class="form__row">
+      <div class="form__row email">
         <div v-if="!isHideFormLeftCol" class="form__row-title">
           <span class="text-ellipsis">
             {{ emailTextareaLabel }}
@@ -172,100 +154,10 @@
           />
         </div>
       </div>
-
-      <!--      <div class="form__email"></div>-->
     </section>
   </form>
 </template>
 
-<!--<template>-->
-<!--  <form class="form" @submit.prevent>-->
-<!--    <section class="flex flex-direction-column row-gap-6">-->
-<!--      <div-->
-<!--        v-if="isHideFormLeftCol"-->
-<!--        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'
@@ -365,30 +257,15 @@ const frequencyMethodOptionsLocal = computed<UI_I_Dropdown[]>(() =>
     }
   }
 
-  //&__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;
+    margin: -8px 0;
+    &.task-details {
+      margin: 0 0 16px 0;
+    }
     &.frequency {
       font-size: 14px;
       margin-bottom: 12px;
@@ -401,6 +278,10 @@ const frequencyMethodOptionsLocal = computed<UI_I_Dropdown[]>(() =>
     display: flex;
     align-items: center;
     column-gap: 16px;
+    &.email,
+    &.description {
+      align-items: baseline;
+    }
     .horizontal &:not(:last-child) {
       border-bottom: 1px solid var(--wizard-content-line);
       padding-bottom: 16px;
@@ -440,6 +321,18 @@ const frequencyMethodOptionsLocal = computed<UI_I_Dropdown[]>(() =>
       letter-spacing: 0;
       vertical-align: middle;
     }
+
+    &.vertical {
+      .frequency-run {
+        display: grid;
+        grid-template-columns: 1fr 1fr;
+        grid-gap: 16px;
+        &.grid-single-col {
+          grid-template-columns: 1fr;
+          column-gap: 0;
+        }
+      }
+    }
   }
 }
 </style>

package/package.json

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