bfg-common 1.5.917 → 1.5.919

package/assets/localization/local_be.json

@@ -2221,6 +2221,7 @@
     "sambaHelpDesc": "Samba Storage выкарыстоўвае пратакол SMBCIFS, забяспечвае доступ да платформы, гнуткія правы і інтэграцыю з Active Directory.",
     "deviceType": "Тып прылады",
     "selectDisksInvolvedBackup": "Выберыце дыскі, якія ўдзельнічаюць у рэзервовым капіраванні.",
+    "selectDisksInvolvedBackupNotRequired": "Выберыце рэзервовыя дыскі для капіявання. Вы можаце прапусціць гэты крок, калі капіраванне не патрабуецца.",
     "dateTime": "Дата Час",
     "eventTypeDescription": "Апісанне тыпу падзеі",
     "possibleCauses": "Магчымыя прычыны",
@@ -3725,10 +3726,10 @@
     "createBackupCommonSubtitle": "Укажыце ўнікальную назву і апісанне для рэзервовай копіі.",
     "virtualMachineName": "Імя віртуальнай машыны",
     "restoreBackupSelectNameSubtitle": "Укажыце ўнікальную назву для віртуальнай машыны.",
-    "nameValidationDescription": "Назва павінна ўтрымліваць лацінскія літары і лічбы, сімвалы «-», «_», «.», і складацца з 5–64 сімвалаў.",
+    "nameValidationDescription": "Імя павінна ўтрымліваць лацінскія літары і лічбы, '-', '_', '.' і павінна ўтрымліваць ад 5 да 64 сімвалаў. Калі вы прапусціце гэты крок, сістэма згенеруе імя аўтаматычна.",
     "vmNameExistInSelectedLocation": "Віртуальная машына або шаблон з такой назвай ужо існуе. Увядзіце іншую назву.",
     "noNetworksAvailable": "Няма даступных сетак",
-    "restoreBackupSelectNetworkSubtitle": "Выберыце тыпы адаптараў і сеткі ў Procurator",
+    "restoreBackupSelectNetworkSubtitle": "Выберыце тыпы адаптараў і сеткі ў Procurator.",
     "restoreVirtualMachine": "Аднавіць віртуальную машыну"
   },
   "ssoUsers": {

package/assets/localization/local_en.json

@@ -2224,6 +2224,7 @@
     "sambaHelpDesc": "Samba storage uses the SMBCIFS protocol, provides cross -platform access, flexible rights and integration with Active Directory.",
     "deviceType": "Device type",
     "selectDisksInvolvedBackup": "Select disks involved in the backup.",
+    "selectDisksInvolvedBackupNotRequired": "Select backup disks for copy. You can skip this step if copying is not required.",
     "dateTime": "Date Time",
     "eventTypeDescription": "Event Type Description",
     "possibleCauses": "Possible Causes",
@@ -3729,7 +3730,7 @@
     "createBackupCommonSubtitle": "Specify a unique name and a description for the backup.",
     "virtualMachineName": "Virtual Machine Name",
     "restoreBackupSelectNameSubtitle": "Specify a unique name for the virtual machine.",
-    "nameValidationDescription": "The name must contain Latin letters and numbers, '-', '_', '.' and it must contain from 5 to 64 characters.",
+    "nameValidationDescription": "The name must contain Latin letters and numbers, '-', '_', '.' and it must contain from 5 to 64 characters. If you skip this step, the system will generate the name automatically.",
     "vmNameExistInSelectedLocation": "A virtual machine or template with the same name exists. Enter a different name.",
     "noNetworksAvailable": "No networks available",
     "restoreBackupSelectNetworkSubtitle": "Select adapter types and networks in Procurator.",

package/assets/localization/local_hy.json

@@ -2224,6 +2224,7 @@
     "sambaHelpDesc": "SAMBA- ի պահեստը օգտագործում է SMBCIF- ի արձանագրությունը, ապահովում է խաչմերուկի հասանելիություն, ճկուն իրավունքներ եւ ինտեգրում Active Directory:",
     "deviceType": "Սարքի տեսակը",
     "selectDisksInvolvedBackup": "Ընտրեք կրկնօրինակում ներգրավված սկավառակները:",
+    "selectDisksInvolvedBackupNotRequired": "Ընտրեք պահուստային սկավառակներ պատճենման համար: Կարող եք բաց թողնել այս քայլը, եթե պատճենահանում անհրաժեշտ չէ:",
     "dateTime": "Ամսաթիվ Ժամ",
     "eventTypeDescription": "Միջոցառման տեսակի նկարագրություն",
     "possibleCauses": "Հնարավոր պատճառներ",
@@ -3729,10 +3730,10 @@
     "createBackupCommonSubtitle": "Նշեք պահուստային պատճենի եզակի անունը և նկարագրությունը:",
     "virtualMachineName": "Վիրտուալ մեքենայի անվանումը",
     "restoreBackupSelectNameSubtitle": "Նշեք վիրտուալ մեքենայի եզակի անունը:",
-    "nameValidationDescription": "Անունը պետք է պարունակի լատինատառ տառեր և թվեր, «-», «_», «.» նշանները և լինի 5–64 նիշ երկարությամբ։",
+    "nameValidationDescription": "Անունը պետք է պարունակի լատինական տառեր և թվեր՝ '-', '_', '.' և պետք է պարունակի 5-ից 64 նիշ։ Եթե բաց թողնեք այս քայլը, համակարգը ավտոմատ կերպով կգեներացնի անունը։",
     "vmNameExistInSelectedLocation": "Նույն անունով վիրտուալ մեքենա կամ ձևանմուշ արդեն գոյություն ունի։ Մուտքագրեք այլ անուն։",
     "noNetworksAvailable": "Հասանելի ցանցեր չկան",
-    "restoreBackupSelectNetworkSubtitle": "Ընտրեք ադապտերների տեսակները և ցանցերը Procurator-ում",
+    "restoreBackupSelectNetworkSubtitle": "Ընտրեք ադապտերների տեսակները և ցանցերը Procurator-ում:",
     "restoreVirtualMachine": "Վերականգնել վիրտուալ մեքենան"
   },
   "ssoUsers": {

package/assets/localization/local_kk.json

@@ -2223,6 +2223,7 @@
     "sambaHelpDesc": "Samba сақтау SMBCIFS протоколын пайдаланады, кросс-платформаларға, икемді құқықтар мен интеграцияны белсенді каталогпен қамтамасыз етеді.",
     "deviceType": "Құрылғы түрі",
     "selectDisksInvolvedBackup": "Сақтық көшірмеге қатысатын дискілерді таңдаңыз.",
+    "selectDisksInvolvedBackupNotRequired": "Көшіру үшін сақтық көшірме дискілерін таңдаңыз. Көшіру қажет болмаса, бұл қадамды өткізіп жіберуге болады.",
     "dateTime": "Күні/Уақыты",
     "eventTypeDescription": "Оқиға түрі сипаттамасы",
     "possibleCauses": "Ықтимал себептері",
@@ -3728,10 +3729,10 @@
     "createBackupCommonSubtitle": "Сақтық көшірме үшін бірегей атау мен сипаттаманы көрсетіңіз.",
     "virtualMachineName": "Виртуалды машинаның атауы",
     "restoreBackupSelectNameSubtitle": "Виртуалды машина үшін бірегей атауды көрсетіңіз.",
-    "nameValidationDescription": "Атау латын әріптері мен сандарды, «-», «_», «.» таңбаларын қамтуы және 5–64 таңбадан тұруы керек.",
+    "nameValidationDescription": "Атауда латын әріптері мен сандары болуы керек, '-', '_', '.' және ол 5-тен 64 таңбаға дейін болуы керек. Бұл қадамды өткізіп жіберсеңіз, жүйе атауды автоматты түрде жасайды.",
     "vmNameExistInSelectedLocation": "Осындай атауы бар виртуалды машина немесе үлгі бар. Басқа атау енгізіңіз.",
     "noNetworksAvailable": "Қолжетімді желілер жоқ",
-    "restoreBackupSelectNetworkSubtitle": "Procurator ішінде адаптер түрлері мен желілерді таңдаңыз",
+    "restoreBackupSelectNetworkSubtitle": "Procurator ішінде адаптер түрлері мен желілерді таңдаңыз.",
     "restoreVirtualMachine": "Виртуалды машинаны қалпына келтіру"
   },
   "ssoUsers": {

package/assets/localization/local_ru.json

@@ -2223,6 +2223,7 @@
     "sambaHelpDesc": "Хранилище Samba, использует протокол SMB/CIFS, обеспечивает кроссплатформенный доступ, гибкую настройку прав и интеграцию с Active Directory.",
     "deviceType": "Тип устройства",
     "selectDisksInvolvedBackup": "Выберите диски учавствующие в резервной копии.",
+    "selectDisksInvolvedBackupNotRequired": "Выберите диски для резервного копирования. Этот шаг можно пропустить, если копирование не требуется.",
     "dateTime": "Дата Время",
     "eventTypeDescription": "Описание события",
     "possibleCauses": "Возможные причины",
@@ -3728,10 +3729,10 @@
     "createBackupCommonSubtitle": "Укажите уникальное имя и описание для резервной копии.",
     "virtualMachineName": "Имя виртуальной машины",
     "restoreBackupSelectNameSubtitle": "Укажите уникальное имя для виртуальной машины.",
-    "nameValidationDescription": "Имя должно содержать латинские буквы и цифры, символы «-», «_», «.», и состоять из 5–64 символов.",
+    "nameValidationDescription": "Имя должно содержать латинские буквы и цифры, символы '-', '_', '.' и состоять из 5–64 символов. Если вы пропустите этот шаг, система сгенерирует имя автоматически.",
     "vmNameExistInSelectedLocation": "Виртуальная машина или шаблон с таким именем уже существует. Введите другое имя.",
     "noNetworksAvailable": "Нет доступных сетей",
-    "restoreBackupSelectNetworkSubtitle": "Выберите типы адаптеров и сети в Procurator",
+    "restoreBackupSelectNetworkSubtitle": "Выберите типы адаптеров и сети в Procurator.",
     "restoreVirtualMachine": "Восстановить виртуальную машину"
   },
   "ssoUsers": {

package/assets/localization/local_zh.json

@@ -2221,7 +2221,8 @@
     "sambaDesc": "通过网络共享Samba共享的Samba数据存储。",
     "sambaHelpDesc": "Samba Storage使用SMBCIFS协议，提供跨平台访问，灵活的权利以及与Active Directory的集成。",
     "deviceType": "设备类型",
-    "selectDisksInvolvedBackup": "选择备份涉及的磁盘",
+    "selectDisksInvolvedBackup": "选择备份涉及的磁盘。",
+    "selectDisksInvolvedBackupNotRequired": "选择要复制的备份磁盘。如果不需要复制，可以跳过此步骤。",
     "dateTime": "日期/时间",
     "eventTypeDescription": "事件类型描述",
     "possibleCauses": "可能的原因",
@@ -3726,10 +3727,10 @@
     "createBackupCommonSubtitle": "为备份指定唯一的名称和描述。",
     "virtualMachineName": "虚拟机名称",
     "restoreBackupSelectNameSubtitle": "为虚拟机指定唯一名称。",
-    "nameValidationDescription": "名称必须包含拉丁字母和数字，以及 “-”、“_”、“.”，长度为 5–64 个字符。",
+    "nameValidationDescription": "名称必须包含拉丁字母、数字、连字符“-”、“_”和句点“.”，且长度必须在 5 到 64 个字符之间。如果跳过此步骤，系统将自动生成名称。",
     "vmNameExistInSelectedLocation": "已存在具有相同名称的虚拟机或模板。请输入其他名称。",
     "noNetworksAvailable": "没有可用的网络",
-    "restoreBackupSelectNetworkSubtitle": "请在 Procurator 中选择适配器类型和网络",
+    "restoreBackupSelectNetworkSubtitle": "请在 Procurator 中选择适配器类型和网络。",
     "restoreVirtualMachine": "恢复虚拟机"
   },
   "ssoUsers": {

package/components/common/pages/backups/modals/createBackup/general/General.vue

@@ -10,6 +10,7 @@
     v-model="model"
     :show="props.show"
     :alert-messages="props.alertMessages"
+    :messages-fields="props.messagesFields"
     @remove-validation-errors="emits('remove-validation-errors', $event)"
   />
 </template>

package/components/common/pages/backups/modals/createBackup/general/GeneralOld.vue

@@ -9,15 +9,37 @@
     />
 
     <form @submit.prevent>
-      <div class="field flex pt-4">
-        <label for="general-name">{{ localization.common.name }}:</label>
-        <input
-          id="general-name"
-          v-model.trim="model.name"
-          data-id="general-name-input"
-          type="text"
-        />
+      <div class="field clr-form-control flex flex-row pt-4 mt-0">
+        <label for="general-name">
+          {{ localization.common.name }}
+        </label>
+
+        <div
+            :class="[
+          'clr-control-container',
+            nameErrorText &&
+            'clr-error',
+        ]"
+        >
+          <div class="flex-align-center w-full">
+            <input
+                id="general-name"
+                v-model.trim="model.name"
+                data-id="general-name-input"
+                type="text"
+                class="clr-input w-full"
+            />
+            <atoms-the-icon class="error-icon" name="info-circle" />
+          </div>
+          <div
+              v-if="nameErrorText"
+              class="clr-subtext ng-star-inserted"
+          >
+            {{ nameErrorText }}
+          </div>
+        </div>
       </div>
+
       <div class="field flex pt-4">
         <label for="general-description"
         >{{ localization.common.description }} ({{
@@ -35,6 +57,8 @@
 </template>
 
 <script lang="ts" setup>
+import type {UI_I_ArbitraryObject} from "~/node_modules/bfg-uikit/models/interfaces";
+import type {UI_I_ErrorFields} from "~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces";
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_CreateBackupForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
 import { dynamicSteps } from '~/components/common/pages/backups/modals/createBackup/lib/config/steps'
@@ -44,6 +68,7 @@ const model = defineModel<UI_I_CreateBackupForm>({ required: true })
 const props = defineProps<{
   show: boolean
   alertMessages: string[]
+  messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
 }>()
 const emits = defineEmits<{
   (event: 'remove-validation-errors', value: number): void
@@ -51,6 +76,8 @@ const emits = defineEmits<{
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
+const nameErrorText = computed<string>(() => props.messagesFields?.name?.field || '')
+
 watch(
   () => props.show,
   (newValue) => {
@@ -75,9 +102,32 @@ const onRemoveErrors = (): void => {
   label {
     width: 216px;
   }
-  input,
   textarea {
     width: 345px;
   }
 }
+.clr-form-control {
+  display: flex;
+  flex-direction: row;
+
+  .clr-control-container {
+    min-height: 48px;
+    width: 345px;
+    &.clr-error {
+      .clr-subtext,
+      .error-icon {
+        display: block;
+      }
+    }
+    .clr-subtext,
+    .error-icon {
+      display: none;
+    }
+    .error-icon {
+      fill: #db2100;
+      width: 24px;
+      height: 24px;
+    }
+  }
+}
 </style>

package/components/common/pages/backups/modals/restore/New.vue

@@ -351,4 +351,8 @@ const onHideModal = (): void => emits('hide')
     }
   }
 }
+:deep(.column-manager-button.sm span) {
+  font-size: 12px;
+  font-weight: 500;
+}
 </style>

package/components/common/pages/backups/modals/restore/disks/tableView/new/lib/config/table.ts

@@ -138,6 +138,7 @@ export const getBodyDataFunc = (
               source: disk.source,
               location: disk.source,
               target: disk.target,
+              device_type: disk.device_type,
             },
           },
         },

package/components/common/pages/backups/modals/restore/lib/config/steps.ts

@@ -75,7 +75,7 @@ export const stepsFunc = (
       id: dynamicSteps.selectDisksForCopy,
       stepName: '',
       title: localization.common.selectDisksForCopy,
-      subTitle: localization.common.selectDisksInvolvedBackup,
+      subTitle: localization.common.selectDisksInvolvedBackupNotRequired,
       status: UI_E_WIZARD_STATUS.INACTIVE,
       isValid: true,
       fields: {

package/components/common/pages/backups/modals/restore/name/NameNew.vue

@@ -119,6 +119,9 @@ const localization = computed<UI_I_Localization>(() => useLocal())
         .tooltip {
           background-color: var(--restore-backup-new-name-tooltip-bg);
         }
+        .content-container {
+          color: #e9eaec;
+        }
       }
     }
   }

package/components/common/pages/backups/modals/restore/networks/table/new/Table.vue

@@ -236,6 +236,13 @@ const findNetwork = (net_bridge: string): any => {
     min-height: auto;
   }
 
+  :deep(.data-table-header.sm th) {
+    min-width: max-content !important;
+  }
+  :deep(tr:last-child td:last-child) {
+    max-width: 220px;
+  }
+
   :deep(.title-container-top-info h6.title-container-top-selected-rows) {
     font-size: 12px;
   }

package/components/common/pages/scheduledTasks/table/expandDetails/New.vue

@@ -6,48 +6,45 @@
       class="expand-details__row"
       :class="item.lastChild && 'history-run'"
     >
-      <span class="expand-details__label"> {{ item.text }}: </span>
-      <span
-        v-if="!item.lastChild"
-        :class="['expand-details__value', { disabled: item.disabled }]"
-      >
-        <ui-icon
-          v-if="item.iconClassName"
-          :name="item.iconClassName"
-          width="18"
-          height="18"
-          class="mr-1"
-        />
-        {{ item.value }}
-      </span>
+      <!-- Обычные строки -->
+      <template v-if="!item.lastChild">
+        <span class="expand-details__label"> {{ item.text }}: </span>
 
-      <common-pages-configure-scheduled-tasks-table-expand-details-history-run
-        v-else
-        :history-run-data="item.value"
-      />
+        <span :class="['expand-details__value', { disabled: item.disabled }]">
+          <ui-icon
+            v-if="item.iconClassName"
+            :name="item.iconClassName"
+            width="18"
+            height="18"
+            class="mr-1"
+          />
+          {{ item.value }}
+        </span>
+      </template>
+
+      <!-- History -->
+      <template v-else>
+        <div class="expand-details__label">
+          {{ item.text }}
+        </div>
+
+        <div class="expand-details__value">
+          <common-pages-scheduled-tasks-table-expand-details-history-run
+            v-else
+            :history-run-data="item.value"
+          />
+        </div>
+      </template>
     </div>
   </div>
 </template>
 
 <script lang="ts" setup>
 import type { UI_I_DataTableBodyData } from '~/node_modules/bfg-uikit/components/ui/dataTable/models/interfaces'
-import type { UI_I_Localization } from '~/node_modules/bfg-common/lib/models/interfaces'
 
 const props = defineProps<{
   expandData: UI_I_DataTableBodyData[]
 }>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const eventPossibleCauses = computed<string>(() => {
-  const { expandData } = props.expandData[0].data
-  return expandData?.message
-})
-
-const eventUser = computed<string>(() => {
-  const { expandData } = props.expandData[0].data
-  return expandData?.user_name
-})
 </script>
 
 <style lang="scss" scoped>
@@ -72,37 +69,24 @@ const eventUser = computed<string>(() => {
     @extend %properties;
     color: #9da6ad;
     text-transform: capitalize;
-
-    &.events {
-      height: 18px;
+    .history-run & {
+      color: var(--title-form-first-color);
+      grid-column: 1 / -1; /* 🔥 ВАЖНО */
+      margin-top: 12px;
     }
   }
   &__value {
     @extend %properties;
     color: var(--title-form-first-color);
-    &.target-link {
-      color: var(--bottom-pannel-rtask-link-text);
-      cursor: pointer;
-      &:hover {
-        color: var(--bottom-pannel-rtask-link-hover-text);
-      }
-    }
     &.disabled {
       color: var(--table-disabled-btn);
     }
-
     .icon {
       margin-right: 4px;
     }
-  }
-  &__status {
-    @include flex($align: center);
-    .ui-chip {
-      width: max-content;
+    .history-run & {
+      grid-column: 1 / -1; /* 🔥 ВАЖНО */
     }
   }
-  &__tooltip {
-    margin-left: 6px;
-  }
 }
 </style>

package/components/common/pages/scheduledTasks/table/expandDetails/historyRun/new/New.vue

@@ -1,10 +1,147 @@
 <template>
-  <div></div>
+  <ui-data-table
+    :data="data"
+    :options="options"
+    :loading="props.isLoading"
+    :total-pages="props.totalPages"
+    :total-items="props.totalItems"
+    :texts="texts"
+    :skeleton="skeletonData"
+    test-id="task-table"
+    @sort="onSorting"
+    @pagination="onPagination"
+    @column-filter="onColumnFilter"
+  >
+    <template #status="{ item }">
+      <ui-chip :test-id="item.data.testId" :color="item.data.chipColor" rounded>
+        <ui-icon
+          :name="item.data.icon"
+          width="14px"
+          height="14px"
+          class="chip-icon"
+        ></ui-icon>
+        {{ item.text }}
+      </ui-chip>
+
+      <common-tooltip-help
+        v-if="item.data.chipColor === 'red'"
+        :title="localization.common.failureReason"
+        :help-text="'Lorem Ipsum'"
+        :test-id="`${item.data.testId}`"
+        :help-id="`${item.data.testId}-tooltip`"
+        status="error"
+        dropdown-width="320px"
+        dropdown-left
+        dropdown-top
+        class="ml-2"
+      />
+    </template>
+  </ui-data-table>
 </template>
 
-<script lang="ts" setup>
-</script>
+<script setup lang="ts">
+import { useDebounceFn } from '@vueuse/core'
+import type {
+  UI_I_DataTable,
+  UI_I_DataTableHeader,
+  UI_I_DataTableBody,
+  UI_I_DataTableSkeleton,
+  UI_I_Pagination,
+  UI_I_TableTexts,
+} from '~/node_modules/bfg-uikit/components/ui/dataTable/models/interfaces'
+import type { UI_T_ArbitraryObject } from '~/node_modules/bfg-uikit/models/types'
+import type { UI_I_TableTarget } from '~/lib/models/table/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_ScheduledTasks } from '~/components/common/pages/scheduledTasks/lib/models/interfaces'
+import {
+  options,
+  getHeaderDataFunc,
+  getBodyDataFunc,
+} from '~/components/common/pages/scheduledTasks/table/expandDetails/historyRun/new/lib/config/historyRunsTable'
+
+
+const props = defineProps<{
+  tableItems: UI_I_ScheduledTasks['items']
+  totalItems: number
+  totalPages: number
+  isLoading: boolean
+}>()
+const emits = defineEmits<{
+  (event: 'sort', value: string): void
+  (event: 'pagination', value: UI_I_Pagination): void
+  (event: 'col-search', value: string): void
+  (event: 'select-node', value: UI_I_TableTarget<'sphere'>): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const texts = computed<UI_I_TableTexts>(() => ({
+  searchHere: localization.value.common.searchHere,
+  rowsPerPage: localization.value.common.rowsPerPage,
+  of: localization.value.common.of,
+  selected: localization.value.common.selected,
+  columns: localization.value.common.columns,
+  previous: localization.value.common.previous,
+  next: localization.value.common.next,
+  noItemsFound: localization.value.common.noItemsFound,
+  exportAll: localization.value.common.exportAll,
+  exportSelected: localization.value.common.exportSelected,
+  all: localization.value.common.all,
+  filter: localization.value.common.filter,
+}))
+const skeletonData = ref<UI_I_DataTableSkeleton>({
+  columnsCount: 6,
+  headColumns: [],
+  bodyColumns: [],
+})
 
-<style lang="scss" scoped>
+const data = computed<UI_I_DataTable>(() => ({
+  id: 'scheduled-tasks-history-table',
+  header: taskHeadItems.value,
+  body: taskBodyItems.value,
+}))
+
+const taskHeadItems = computed<UI_I_DataTableHeader[]>(() =>
+  getHeaderDataFunc(localization.value)
+)
+const taskBodyItems = computed<UI_I_DataTableBody[]>(() => {
+  return getBodyDataFunc(props.tableItems || [], localization.value)
+})
+
+const onSorting = (value: string): void => {
+  emits('sort', value)
+}
+const onPagination = (value: UI_I_Pagination): void => {
+  emits('pagination', value)
+}
+const sendFilter = useDebounceFn((searchText: string) => {
+  emits('col-search', searchText)
+}, 1000)
+const onColumnFilter = (obj: UI_T_ArbitraryObject<string>): void => {
+  let searchText = ''
+
+  for (const [key, value] of Object.entries(obj)) {
+    const currentFilter = searchText
+      ? ',' + key + '.' + value
+      : key + '.' + value
+
+    searchText = searchText + (value ? currentFilter : '')
+  }
+  sendFilter(searchText)
+}
+</script>
 
+<style scoped lang="scss">
+.task-table {
+  height: inherit;
+  .chip-icon {
+    min-width: 14px;
+  }
+  .icon {
+    margin-right: 4px;
+  }
+  &__tooltip {
+    margin-left: 8px;
+  }
+}
 </style>

package/components/common/pages/scheduledTasks/table/expandDetails/historyRun/new/lib/config/historyRunsTable.ts

@@ -0,0 +1,161 @@
+import type {
+  UI_I_DataTableBody,
+  UI_I_DataTableHeader,
+  UI_I_DataTableOptions,
+} from '~/node_modules/bfg-uikit/components/ui/dataTable/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_ScheduledTasks } from '~/components/common/pages/scheduledTasks/lib/models/interfaces'
+import { UI_E_SchedulerRunStatus } from '~/components/common/pages/scheduledTasks/table/lib/models/enums'
+import {
+  UI_E_SchedulerStatus,
+  UI_E_SchedulerChipColor,
+  UI_E_SchedulerChipIcon,
+} from '~/components/common/pages/scheduledTasks/table/new/lib/models/enums'
+
+// Маппинг для статусов
+const STATUS_MAPPING = {
+  [UI_E_SchedulerStatus.Completed]: {
+    textKey: 'completed',
+    icon: UI_E_SchedulerChipIcon.StatusCheck,
+    chipColor: UI_E_SchedulerChipColor.Green,
+  },
+  [UI_E_SchedulerStatus.Running]: {
+    textKey: 'running',
+    icon: UI_E_SchedulerChipIcon.StatusCheck,
+    chipColor: UI_E_SchedulerChipColor.Green,
+  },
+  [UI_E_SchedulerStatus.Failed]: {
+    textKey: 'failed',
+    icon: UI_E_SchedulerChipIcon.Information,
+    chipColor: UI_E_SchedulerChipColor.Red,
+  },
+}
+
+export const getHeaderDataFunc = (
+  localization: UI_I_Localization
+): UI_I_DataTableHeader[] => [
+  {
+    col: 'col0',
+    colName: 'start',
+    text: localization.common.startTime,
+    isSortable: true,
+    sort: 'asc',
+    width: '240px',
+    show: true,
+    filter: true,
+  },
+  {
+    col: 'col1',
+    colName: 'duration',
+    text: localization.scheduledTasks.duration,
+    isSortable: true,
+    sort: 'asc',
+    width: '180px',
+    show: true,
+    filter: true,
+  },
+  {
+    col: 'col2',
+    colName: 'end',
+    text: localization.scheduledTasks.endTime,
+    isSortable: true,
+    sort: 'asc',
+    width: '180px',
+    show: true,
+    filter: true,
+  },
+  {
+    col: 'col3',
+    colName: 'result',
+    text: localization.scheduledTasks.result,
+    isSortable: true,
+    sort: 'asc',
+    width: '110px',
+    show: true,
+    filter: true,
+  },
+]
+
+export const options: UI_I_DataTableOptions = {
+  perPageOptions: [
+    { text: '10', value: 10 },
+    { text: '25', value: 25 },
+    { text: '50', value: 50 },
+    { text: '100', value: 100, default: true },
+  ],
+  isSelectable: false,
+  isFocusable: false,
+  showPagination: false,
+  showPaginationOnTop: false,
+  showPageInfo: false,
+  isSortable: true,
+  server: false,
+  isResizable: true,
+  showSearch: false,
+  showSelectedRows: false,
+  showColumnManager: false,
+  withActions: false,
+  inBlock: true,
+  showExport: false,
+  withCollapse: false,
+}
+
+export const getBodyDataFunc = (
+  bodyData: UI_I_ScheduledTasks['items'][number]['last_5_run'],
+  localization: UI_I_Localization
+): UI_I_DataTableBody[] => {
+  const { $formattedDatetime }: any = useNuxtApp()
+  return bodyData.map((schedulerHistory, index: number) => {
+    const startTime = schedulerHistory.start
+    const formattedStartTime = $formattedDatetime(+startTime * 1000, {
+      hasSeconds: true,
+    })
+
+    const endTime = schedulerHistory.end
+    const formattedEndTime =
+      endTime && $formattedDatetime(+endTime * 1000, { hasSeconds: true })
+
+    const statusKey =
+      schedulerHistory?.result.toLowerCase() === UI_E_SchedulerRunStatus.SUCCESS
+        ? UI_E_SchedulerStatus.Completed
+        : schedulerHistory?.result === UI_E_SchedulerRunStatus.RUNNING
+        ? UI_E_SchedulerStatus.Running
+        : UI_E_SchedulerStatus.Failed
+    const statusData = {
+      ...STATUS_MAPPING[statusKey],
+      testId: `${schedulerHistory.tid}-${index}-status`,
+    }
+
+    return {
+      row: schedulerHistory.tid,
+      collapse: false,
+      isHiddenCollapse: false,
+      collapseToggle: false,
+      data: [
+        {
+          col: 'col0',
+          text: formattedStartTime,
+          testId: `table-item-${schedulerHistory.tid}`,
+        },
+        {
+          col: 'col1',
+          text: 'schedulerHistory.sched_type' || '--',
+          data: 'statusData',
+          testId: `table-item-${schedulerHistory.tid}`,
+        },
+        {
+          col: 'col2',
+          text: formattedEndTime,
+          testId: `table-item-${schedulerHistory.tid}`,
+        },
+        {
+          key: 'status',
+          col: 'col3',
+          text: localization.common[statusData.textKey],
+          data: statusData,
+          testId: `table-item-${schedulerHistory.tid}`,
+        },
+      ],
+    }
+  })
+}

package/components/common/pages/scheduledTasks/table/new/New.vue

@@ -1,120 +1,127 @@
 <template>
-  <ui-data-table
-    :data="data"
-    :options="options"
-    :loading="props.isLoading"
-    :total-pages="props.totalPages"
-    :total-items="props.totalItems"
-    :texts="texts"
-    :skeleton="skeletonData"
-    test-id="task-table"
-    @sort="onSorting"
-    @pagination="onPagination"
-    @column-filter="onColumnFilter"
-    @select-row="onSelectRow"
-  >
-    <template #insteadOfTitleActions>
-      <templates-inventory-vm-configure-scheduled-tasks-tools-panel
-        :selected-task="selectedScheduledTaskLocal"
-        :selected-task-from-table="props.selectedScheduler"
-      />
-    </template>
+  <div :class="`table-view-scheduled-tasks table-container-${data.id}`">
+    <ui-data-table
+      :data="data"
+      :options="options"
+      :loading="props.isLoading"
+      :total-pages="props.totalPages"
+      :total-items="props.totalItems"
+      :texts="texts"
+      :skeleton="skeletonData"
+      test-id="task-table"
+      @sort="onSorting"
+      @pagination="onPagination"
+      @column-filter="onColumnFilter"
+      @select-row="onSelectRow"
+    >
+      <template #insteadOfTitleActions>
+        <templates-inventory-vm-configure-scheduled-tasks-tools-panel
+          :selected-task="selectedScheduledTaskLocal"
+          :selected-task-from-table="props.selectedScheduler"
+        />
+      </template>
 
-    <template #icon="{ item }">
-      <span class="flex-align-center">
-        <span :class="['icon', item.data.iconClassName]" />
-
-        <span
-          :data-id="`rtask-${item.data.testId}`"
-          :class="item.data.isLink && 'target-link'"
-          @click.stop="onSelectNodeOfTree(item.data)"
-        >
+      <template #icon="{ item }">
+        <span class="flex-align-center">
+          <ui-icon
+            :name="item.data.iconClassName"
+            width="18"
+            height="18"
+            class="mr-1"
+          />
           {{ item.text }}
         </span>
-      </span>
-    </template>
+      </template>
 
-    <template #status="{ item }">
-      <ui-chip :test-id="item.data.testId" :color="item.data.chipColor" rounded>
-        <ui-icon
-          :name="item.data.icon"
-          width="14px"
-          height="14px"
-          class="chip-icon"
-        ></ui-icon>
-        {{ item.text }}
-      </ui-chip>
+      <template #status="{ item }">
+        <ui-chip
+          :test-id="item.data.testId"
+          :color="item.data.chipColor"
+          rounded
+        >
+          <ui-icon
+            :name="item.data.icon"
+            width="14px"
+            height="14px"
+            class="chip-icon"
+          ></ui-icon>
+          {{ item.text }}
+        </ui-chip>
 
-      <common-tooltip-help
-        v-if="item.data.chipColor === 'red'"
-        :title="localization.common.failureReason"
-        :help-text="'Lorem Ipsum'"
-        :test-id="`${item.data.testId}`"
-        :help-id="`${item.data.testId}-tooltip`"
-        status="error"
-        dropdown-width="320px"
-        dropdown-left
-        dropdown-top
-        class="ml-2"
-      />
-    </template>
+        <common-tooltip-help
+          v-if="item.data.chipColor === 'red'"
+          :title="localization.common.failureReason"
+          :help-text="item.data.runResult"
+          :test-id="`${item.data.testId}`"
+          :help-id="`${item.data.testId}-tooltip`"
+          status="error"
+          dropdown-width="320px"
+          dropdown-left
+          dropdown-top
+          class="ml-2"
+        />
+      </template>
 
-    <template #default-actions="{ item }">
-      <div class="actions">
-        <ui-button
-          :id="`event-table-action-${item.data.id}`"
-          :test-id="`event-table-action-${item.data.id}`"
-          variant="text"
-          is-without-height
-          is-without-sizes
-          @click.stop="onToggleActions(item.data.id)"
-        >
-          <span
-            :class="['action-icon', { active: actionsShowId === item.data.id }]"
+      <template #default-actions="{ item }">
+        <div class="scheduler-drop-action">
+          <ui-button
+            :id="`event-table-action-${item.data.id}`"
+            :test-id="`event-table-action-${item.data.id}`"
+            variant="text"
+            is-without-height
+            is-without-sizes
+            @click.stop="onToggleActions(item.data.id)"
           >
-            <ui-icon name="vertical-dotes" width="20" height="20" />
-          </span>
-        </ui-button>
-        <ui-dropdown
-          :show="actionsShowId === item.data.id"
-          :test-id="`event-table-action-dropdown-${item.data.id}`"
-          :items="actions"
-          :elem-id="`event-table-action-${item.data.id}`"
-          width="max-content"
-          left
-          @select="onSelectAction(item.data, $event)"
-          @hide="onHideActionsDropdown"
-        >
-          <template #row="{ item: dropMenu }">
-            <ui-icon :name="dropMenu.iconName" width="16" height="16" />
-            <span class="action-text">
-              {{ dropMenu.text }}
+            <span
+              :class="[
+                'scheduler-drop-action__icon',
+                { active: actionsShowId === item.data.id },
+              ]"
+            >
+              <ui-icon name="vertical-dotes" width="20" height="20" />
             </span>
-          </template>
-        </ui-dropdown>
-      </div>
-    </template>
+          </ui-button>
+          <ui-dropdown
+            :show="actionsShowId === item.data.id"
+            :test-id="`event-table-action-dropdown-${item.data.id}`"
+            :items="actions"
+            :elem-id="`event-table-action-${item.data.id}`"
+            width="max-content"
+            left
+            @select="onSelectAction(item.data, $event)"
+            @hide="onHideActionsDropdown"
+          >
+            <template #row="{ item: dropMenu }">
+              <ui-icon :name="dropMenu.iconName" width="16" height="16" />
+              <span class="scheduler-drop-action__icon__text">
+                {{ dropMenu.text }}
+              </span>
+            </template>
+          </ui-dropdown>
+        </div>
+      </template>
 
-    <template #expand="{ item }">
-      <common-pages-scheduled-tasks-table-expand-details
-        :data="item.data[0]?.data.expandData"
-      />
-    </template>
+      <template #expand="{ item }">
+        <common-pages-scheduled-tasks-table-expand-details
+          :data="item.data[0]?.data.expandData"
+        />
+      </template>
 
-    <template #skeleton-header>
-      <div class="skeleton-header">
-        <div class="left-skeleton">
-          <ui-skeleton-item width="70" height="16" />
-          <div class="vertical-line"></div>
-          <ui-skeleton-item width="70" height="16" />
-          <ui-skeleton-item width="70" height="16" />
-        </div>
-        <div class="right-skeleton">
-          <ui-skeleton-item width="128" height="36" border-radius="8" />
+      <template #skeleton-header>
+        <div class="skeleton-header">
+          <div class="left-skeleton">
+            <ui-skeleton-item width="70" height="16" />
+            <div class="vertical-line"></div>
+            <ui-skeleton-item width="70" height="16" />
+            <ui-skeleton-item width="70" height="16" />
+          </div>
+          <div class="right-skeleton">
+            <ui-skeleton-item width="128" height="36" border-radius="8" />
+          </div>
         </div>
-      </div>
-    </template>
-  </ui-data-table>
+      </template>
+    </ui-data-table>
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -130,7 +137,6 @@ import type {
   UI_I_TableTexts,
 } from '~/node_modules/bfg-uikit/components/ui/dataTable/models/interfaces'
 import type { UI_T_ArbitraryObject } from '~/node_modules/bfg-uikit/models/types'
-import type { UI_I_TableTarget } from '~/lib/models/table/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_ScheduledTasks } from '~/components/common/pages/scheduledTasks/lib/models/interfaces'
 import {
@@ -154,7 +160,6 @@ const emits = defineEmits<{
   (event: 'sort', value: string): void
   (event: 'pagination', value: UI_I_Pagination): void
   (event: 'col-search', value: string): void
-  (event: 'select-node', value: UI_I_TableTarget<'sphere'>): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
@@ -230,11 +235,10 @@ const onSelectAction = (
   data: UI_I_DataTableBodyData['data'],
   action: 'view-target' | 'copy-clipboard' | 'export'
 ): void => {
-  const { target, event } = data
+  const { event } = data
 
   switch (action) {
     case 'view-target':
-      onSelectNodeOfTree(target)
       break
     case 'copy-clipboard': {
       const clipboardText =
@@ -252,29 +256,19 @@ const onHideActionsDropdown = (): void => {
   actionsShowId.value = -1
 }
 
-const onSelectNodeOfTree = (data: UI_I_TableTarget<'sphere'>): void => {
-  emits('select-node', data)
-}
 const onSelectRow = (value: UI_I_DataTableBody[]): void => {
   selectedScheduledTaskLocal.value = value[0]?.row
 }
 </script>
 
 <style scoped lang="scss">
-.task-table {
+.table-view-scheduled-tasks {
   height: inherit;
 
-  .target-link {
-    font-family: 'Inter', sans-serif;
-    font-size: 13px;
-    color: var(--bottom-pannel-rtask-link-text);
-    font-weight: 400;
-    line-height: 15.73px;
-    cursor: pointer;
-    &:hover {
-      color: var(--bottom-pannel-rtask-link-hover-text);
-    }
+  :deep(.table-container) {
+    grid-template-rows: min-content auto min-content;
   }
+
   .chip-icon {
     min-width: 14px;
   }
@@ -282,10 +276,9 @@ const onSelectRow = (value: UI_I_DataTableBody[]): void => {
     margin-right: 4px;
   }
 
-  .actions {
+  .scheduler-drop-action {
     width: 100%;
-
-    .action-icon {
+    &__icon {
       width: 20px;
       height: 20px;
       color: var(--tasks-actions-icon-color);
@@ -297,35 +290,31 @@ const onSelectRow = (value: UI_I_DataTableBody[]): void => {
         color: var(--tasks-actions-icon-icative-color);
       }
     }
-
-    .action-text {
+    &__text {
       margin-left: 8px;
     }
   }
-  &__tooltip {
-    margin-left: 8px;
-  }
-}
-
-.skeleton-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
 
-  .left-skeleton {
+  .skeleton-header {
     display: flex;
+    justify-content: space-between;
     align-items: center;
-    column-gap: 16px;
-    .vertical-line {
-      height: 24px;
-      border-right: 1px solid var(--table-line);
+
+    .left-skeleton {
+      display: flex;
+      align-items: center;
+      column-gap: 16px;
+      .vertical-line {
+        height: 24px;
+        border-right: 1px solid var(--table-line);
+      }
     }
-  }
 
-  .right-skeleton {
-    display: flex;
-    align-items: center;
-    column-gap: 16px;
+    .right-skeleton {
+      display: flex;
+      align-items: center;
+      column-gap: 16px;
+    }
   }
 }
 </style>

package/components/common/pages/scheduledTasks/table/new/lib/config/scheduledTasksTable.ts

@@ -8,27 +8,27 @@ import type { UI_I_Dropdown } from '~/node_modules/bfg-uikit/components/ui/dropd
 import type { UI_I_ScheduledTasksTableItem } from '~/components/common/pages/scheduledTasks/lib/models/interfaces'
 import { UI_E_SchedulerRunStatus } from '~/components/common/pages/scheduledTasks/table/lib/models/enums'
 import {
-  E_SchedulerStatus,
-  E_SchedulerChipColor,
-  E_SchedulerChipIcon,
+  UI_E_SchedulerStatus,
+  UI_E_SchedulerChipColor,
+  UI_E_SchedulerChipIcon,
 } from '~/components/common/pages/scheduledTasks/table/new/lib/models/enums'
 
 // Маппинг для статусов
 const STATUS_MAPPING = {
-  [E_SchedulerStatus.Completed]: {
-    textKey: 'complete',
-    icon: E_SchedulerChipIcon.StatusCheck,
-    chipColor: E_SchedulerChipColor.Green,
+  [UI_E_SchedulerStatus.Completed]: {
+    textKey: 'completed',
+    icon: UI_E_SchedulerChipIcon.StatusCheck,
+    chipColor: UI_E_SchedulerChipColor.Green,
   },
-  [E_SchedulerStatus.Running]: {
+  [UI_E_SchedulerStatus.Running]: {
     textKey: 'running',
-    icon: E_SchedulerChipIcon.StatusCheck,
-    chipColor: E_SchedulerChipColor.Green,
+    icon: UI_E_SchedulerChipIcon.StatusCheck,
+    chipColor: UI_E_SchedulerChipColor.Green,
   },
-  [E_SchedulerStatus.Failed]: {
+  [UI_E_SchedulerStatus.Failed]: {
     textKey: 'failed',
-    icon: E_SchedulerChipIcon.Information,
-    chipColor: E_SchedulerChipColor.Red,
+    icon: UI_E_SchedulerChipIcon.Information,
+    chipColor: UI_E_SchedulerChipColor.Red,
   },
 }
 
@@ -156,12 +156,13 @@ export const getBodyDataFunc = (
 
     const statusKey =
       historyLastRun?.result.toLowerCase() === UI_E_SchedulerRunStatus.SUCCESS
-        ? E_SchedulerStatus.Completed
+        ? UI_E_SchedulerStatus.Completed
         : historyLastRun?.result === UI_E_SchedulerRunStatus.RUNNING
-        ? E_SchedulerStatus.Running
-        : E_SchedulerStatus.Failed
+        ? UI_E_SchedulerStatus.Running
+        : UI_E_SchedulerStatus.Failed
     const statusData = {
       ...STATUS_MAPPING[statusKey],
+      runResult: historyLastRun?.result,
       testId: `${scheduler.rid}-${index}-status`,
     }
 
@@ -176,7 +177,7 @@ export const getBodyDataFunc = (
           col: 'col0',
           text: scheduler.name,
           data: {
-            iconClassName: 'icon-events',
+            iconClassName: 'shortcuts-tasks',
             expandData: scheduler,
           },
           testId: `table-item-${scheduler.rid}`,
@@ -184,7 +185,6 @@ export const getBodyDataFunc = (
         {
           col: 'col1',
           text: scheduler.sheduler || '--',
-          data: 'statusData',
           testId: `table-item-${scheduler.rid}`,
         },
         {

package/components/common/pages/scheduledTasks/table/new/lib/models/enums.ts

@@ -1,14 +1,14 @@
-export enum E_SchedulerStatus {
+export enum UI_E_SchedulerStatus {
   Completed = 'completed',
   Running = 'running',
   Failed = 'failed',
 }
 
-export enum E_SchedulerChipColor {
+export enum UI_E_SchedulerChipColor {
   Green = 'green',
   Red = 'red',
 }
-export enum E_SchedulerChipIcon {
+export enum UI_E_SchedulerChipIcon {
   StatusCheck = 'status-check',
   Information = 'info-stroke',
 }

package/package.json

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