bfg-common 1.5.883 → 1.5.885

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

@@ -1,5 +1,4 @@
 import type { UI_I_ScheduleNewTasksForm } from '~/components/common/pages/scheduledTasks/modals/lib/models/interfaces'
-import type { API_UI_I_DataTable } from '~/lib/models/table/interfaces'
 
 export interface UI_I_ModalPayloadSchedulerData<T = UI_I_ScheduleNewTasksForm> {
   isSchedulerTask: false
@@ -32,9 +31,6 @@ export interface API_UI_I_ScheduledTasksTableItem {
 export interface UI_I_ScheduledTasksTableItem
   extends API_UI_I_ScheduledTasksTableItem {}
 
-export interface UI_I_ScheduledTasks
-  extends API_UI_I_DataTable<UI_I_ScheduledTasksTableItem[]> {}
-
 export interface UI_I_CreateScheduledTaskArgs {
   name: string
   description: string

package/components/common/pages/scheduledTasks/table/Table.vue

@@ -1,12 +1,38 @@
 <template>
-  <component
-    :is="currentComponent"
-    v-model="selectedScheduledTaskLocal"
-    :table-items="props.schedulerData?.items || []"
-    :total-items="props.schedulerData?.total_items || 0"
-    :total-pages="props.schedulerData?.total_pages || 1"
-    :is-loading="props.isLoading"
-  />
+  <div class="data-table-view">
+    <atoms-table-data-grid
+      v-model:selected-row="selectedScheduledTaskLocal"
+      v-model:page-size="pagination.pageSize"
+      v-model:page="pagination.page"
+      :head-items="headItems"
+      :body-items="bodyItems"
+      :total-items="props.totalItems"
+      :total-pages="props.totalPages"
+      :items-per-page="itemsPerPage"
+      :z-index-header-shift="2"
+      :loading="loading"
+      type="radio"
+      class="data-table"
+      test-id="scheduled-tasks-table"
+      hide-pagination
+      hide-page-size
+      off-select-by-row
+      server-off
+    >
+      <template #icon="{ item }">
+        <atoms-the-icon :name="item.data.iconClassName" class="icon" />
+        <span :title="item.text" class="text-ellipsis">
+          {{ item.text }}
+        </span>
+      </template>
+
+      <template #toggleBlock="{ item }">
+        <common-pages-scheduled-tasks-table-expand-details
+          :data="item[0].data.expandData"
+        />
+      </template>
+    </atoms-table-data-grid>
+  </div>
 </template>
 
 <script lang="ts" setup>
@@ -14,25 +40,21 @@ import type {
   UI_I_HeadItem,
   UI_I_BodyItem,
 } from '~/components/atoms/table/dataGrid/lib/models/interfaces'
+import { itemsPerPage } from '~/components/atoms/table/dataGrid/lib/config/itemsPerPage'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_Pagination } from '~/lib/models/table/interfaces'
-import type { UI_I_ScheduledTasks } from '~/components/common/pages/scheduledTasks/lib/models/interfaces'
+import type { UI_I_ScheduledTasksTableItem } from '~/components/common/pages/scheduledTasks/lib/models/interfaces'
+import * as scheduledTaskTable from '~/components/common/pages/scheduledTasks/table/lib/config/scheduledTasksTable'
 
-const selectedScheduledTaskLocal = defineModel<string | null>()
 const props = defineProps<{
-  schedulerData: UI_I_ScheduledTasks
-  isLoading: boolean
+  dataTable: UI_I_ScheduledTasksTableItem[]
+  loading: boolean
+  totalItems: number
+  totalPages: number
 }>()
+const selectedScheduledTaskLocal = defineModel<string | null>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
-const { $store }: any = useNuxtApp()
-
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-const currentComponent = computed(() =>
-  isNewView.value
-    ? defineAsyncComponent(() => import('./new/New.vue'))
-    : defineAsyncComponent(() => import('./old/Old.vue'))
-)
 
 const pagination = ref<UI_I_Pagination>({
   page: 1,

package/components/common/pages/scheduledTasks/table/{old/lib → lib}/config/scheduledTasksTable.ts

@@ -9,8 +9,8 @@ import {
 } from '~/lib/models/store/tasks/enums'
 import * as defaultSettings from '~/components/atoms/table/dataGrid/lib/config/settingsTable'
 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 { scheduledTaskTableItemsKeys } from '~/components/common/pages/scheduledTasks/table/old/lib/config/tableKeys'
+import { scheduledTaskTableItemsKeys } from '~/components/common/pages/scheduledTasks/table/lib/config/tableKeys'
+import { schedulerRunStatus } from '~/components/common/pages/scheduledTasks/table/lib/config/schedulerStatus'
 
 const getItems = (
   localization: UI_I_Localization
@@ -67,20 +67,16 @@ export const bodyItems = (
     const statusText =
       historyLastRun &&
       UI_E_RecentTaskStatus[
-        historyLastRun?.result?.toLowerCase() ===
-        UI_E_SchedulerRunStatus.SUCCESS
-          ? 2
-          : -1
+        historyLastRun?.result?.toLowerCase() === 'success' ? 2 : -1
       ]
 
     const statusData = {
       iconClassName:
         historyLastRun &&
         UI_E_IconNameByRecentTaskStatus[
-          historyLastRun?.result.toLowerCase() ===
-          UI_E_SchedulerRunStatus.SUCCESS
+          historyLastRun?.result.toLowerCase() === schedulerRunStatus.SUCCESS
             ? 2
-            : historyLastRun?.result === UI_E_SchedulerRunStatus.RUNNING
+            : historyLastRun?.result === schedulerRunStatus.RUNNING
             ? 1
             : 3
         ],
@@ -117,8 +113,8 @@ export const bodyItems = (
         id: task.rid,
         testId: `adapter-table-${key}-row-item`,
         data: {
-          sortValue: lastRun || 0,
-        },
+          sortValue: lastRun || 0
+        }
       },
       {
         key: 'icon',
@@ -133,8 +129,8 @@ export const bodyItems = (
         id: task.rid,
         testId: `adapter-table-${key}-row-item`,
         data: {
-          sortValue: task[scheduledTaskTableItemsKeys[4]],
-        },
+          sortValue: task[scheduledTaskTableItemsKeys[4]]
+        }
       },
     ])
   })

package/components/common/pages/scheduledTasks/table/lib/config/schedulerStatus.ts

@@ -0,0 +1,4 @@
+export const schedulerRunStatus = {
+  RUNNING: 'this task has been started',
+  SUCCESS: 'success',
+}

package/components/common/pages/scheduledTasks/table/{old/lib → lib}/config/tableKeys.ts

@@ -1,4 +1,4 @@
-import type { UI_T_ScheduledTaskTableItemsTuple } from '~/components/common/pages/scheduledTasks/table/old/lib/models/types'
+import type { UI_T_ScheduledTaskTableItemsTuple } from '~/components/common/pages/scheduledTasks/table/lib/models/types'
 
 export const scheduledTaskTableItemsKeys: UI_T_ScheduledTaskTableItemsTuple = [
   'name',

package/components/common/vm/actions/common/customizeHardware/virtualHardware/New.vue

@@ -78,7 +78,7 @@
             :index="props.hardDisksIndex[key]"
             :type="props.hardDisksType[key]"
             :main-storage="props.storage"
-            :main-storage-free="props.storageFree"
+            :max-size="props.hardDisksMaxSize[props.hardDisksIndex[key]]"
             :error-validation-fields="props.errorValidationFields"
             :get-datastore-table-func="props.getDatastoreTableFunc"
             :datastore="props.datastore"
@@ -201,19 +201,19 @@
             "
           />
         </div>
-          <div v-for="(item, key) in model.passthrough_usb_devices" :key="key">
-            <common-vm-actions-common-customize-hardware-virtual-hardware-new-usb-device
-              :item="item"
-              :index="props.usbDevicesIndex[key]"
-              :type="props.usbDevicesType[key]"
-              :available-usb-devices="props.availableUsbDevices"
-              :state="props.state"
-              @change="
-                emits('change-usb-device', [props.usbDevicesIndex[key], $event])
-              "
-              @remove="emits('remove-usb-device', props.usbDevicesIndex[key])"
-            />
-          </div>
+        <div v-for="(item, key) in model.passthrough_usb_devices" :key="key">
+          <common-vm-actions-common-customize-hardware-virtual-hardware-new-usb-device
+            :item="item"
+            :index="props.usbDevicesIndex[key]"
+            :type="props.usbDevicesType[key]"
+            :available-usb-devices="props.availableUsbDevices"
+            :state="props.state"
+            @change="
+              emits('change-usb-device', [props.usbDevicesIndex[key], $event])
+            "
+            @remove="emits('remove-usb-device', props.usbDevicesIndex[key])"
+          />
+        </div>
         <div v-for="(item, key) in model.usb_controllers" :key="key">
           <common-vm-actions-common-customize-hardware-virtual-hardware-new-usb-controller
             v-model="item.type"
@@ -299,7 +299,10 @@ import type {
   UI_T_PciDeviceType,
 } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/types'
 import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type {
+  UI_I_ArbitraryObject,
+  UI_I_Localization,
+} from '~/lib/models/interfaces'
 import type {
   API_UI_I_VmEditCpu,
   UI_I_MediatedDevice,
@@ -323,7 +326,7 @@ const props = withDefaults(
     files: UI_I_FileTreeNode[]
     isEdit: boolean
     storage: UI_I_DatastoreTableItem | null
-    storageFree: number
+    hardDisksMaxSize: UI_I_ArbitraryObject<number>
     project: UI_T_Project
     maxMemory: number
     cpuModels: UI_I_OptionItem[]
@@ -369,7 +372,7 @@ const props = withDefaults(
     vmCpuHelpTextSecond: undefined,
     computeResource: undefined,
     compatibilityInfo: undefined,
-    nums: null
+    nums: null,
   }
 )
 const emits = defineEmits<{

package/components/common/vm/actions/common/customizeHardware/virtualHardware/Old.vue

@@ -58,7 +58,7 @@
             :index="props.hardDisksIndex[key]"
             :type="props.hardDisksType[key]"
             :main-storage="props.storage"
-            :main-storage-free="props.storageFree"
+            :max-size="props.hardDisksMaxSize[props.hardDisksIndex[key]]"
             :error-validation-fields="props.errorValidationFields"
             :get-datastore-table-func="props.getDatastoreTableFunc"
             :datastore="props.datastore"
@@ -276,7 +276,10 @@ import type {
   UI_I_DropdownTreeItem,
   UI_I_DropdownTreeItemChild,
 } from '~/components/atoms/dropdown/tree/lib/models/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type {
+  UI_I_ArbitraryObject,
+  UI_I_Localization,
+} from '~/lib/models/interfaces'
 import type {
   API_UI_I_VmEditCpu,
   UI_I_MediatedDevice,
@@ -299,7 +302,7 @@ const props = withDefaults(
     files: UI_I_FileTreeNode[]
     isEdit: boolean
     storage: UI_I_DatastoreTableItem | null
-    storageFree: number
+    hardDisksMaxSize: UI_I_ArbitraryObject<number>
     project: UI_T_Project
     maxMemory: number
     cpuModels: UI_I_OptionItem[]
@@ -341,7 +344,7 @@ const props = withDefaults(
     mediatedDevices: () => [],
     vmCpuHelpTextSecond: undefined,
     computeResource: undefined,
-    nums: null
+    nums: null,
   }
 )
 const emits = defineEmits<{

package/components/common/vm/actions/common/customizeHardware/virtualHardware/VirtualHardware.vue

@@ -9,7 +9,7 @@
     :files="props.files"
     :is-edit="props.isEdit"
     :storage="props.storage"
-    :storage-free="storageFree"
+    :hard-disks-max-size="hardDisksMaxSize"
     :project="props.project"
     :max-memory="props.maxMemory"
     :cpu-models="props.cpuModels"
@@ -91,7 +91,10 @@ import type {
   UI_I_DropdownTreeItem,
   UI_I_DropdownTreeItemChild,
 } from '~/components/atoms/dropdown/tree/lib/models/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type {
+  UI_I_ArbitraryObject,
+  UI_I_Localization,
+} from '~/lib/models/interfaces'
 import type {
   UI_I_MediatedDevice,
   UI_I_PciDevice,
@@ -252,22 +255,45 @@ if (!model.value.disk_devices?.length) {
 //   { immediate: true }
 // )
 
-const getDisksSize = (): number => {
-  return (
-    model.value.disk_devices.reduce(
-      (acum, disk) => (acum += disk.size || 0),
-      0
-    ) || 0
-  )
-}
-const initialDisksSize = getDisksSize()
-const storageFree = computed<number>(() => {
-  if (!props.storage) return 0
-  const free = (props.storage.capacity.free_mb || props.storage.free) as number // TODO fix
+const hardDisksMaxSize = ref<UI_I_ArbitraryObject<number>>({})
+const disksInitialSize: UI_I_ArbitraryObject<number> = {}
+watchEffect(() => {
+  hardDisksMaxSize.value = {}
+  const datastoreFree: UI_I_ArbitraryObject<string> = {}
+
+  model.value.disk_devices.forEach((disk, i) => {
+    if (disk.device_type !== 'disk') return
+
+    if (!disk.create && !disksInitialSize[i]) {
+      disksInitialSize[i] = disk.size
+    }
 
-  const disksSize = getDisksSize()
+    const storageLocal = disk.storage || props.storage
 
-  return free + initialDisksSize - (disksSize - initialDisksSize)
+    const hasStorage = datastoreFree[storageLocal.id]
+    const storage = props.datastore.find((item) => item.id === storageLocal.id)
+    const storageFree = storage?.capacity?.free_mb || storage?.free || 0
+
+    const newSize = disk.create ? disk.size : disk.size - disksInitialSize[i]
+    if (!hasStorage) {
+      datastoreFree[storageLocal.id] = storageFree - newSize
+    } else {
+      datastoreFree[storageLocal.id] = datastoreFree[storageLocal.id] - newSize
+    }
+  })
+  model.value.disk_devices.forEach((disk, i) => {
+    if (disk.device_type !== 'disk') return
+
+    const storageLocal = disk.storage || props.storage
+
+    const isExisting = hardDisksType.value[hardDisksIndex.value[i]] === 'exist'
+    if (isExisting) {
+      hardDisksMaxSize.value[hardDisksIndex.value[i]] = disksInitialSize[i]
+    } else {
+      const free = datastoreFree[storageLocal.id]
+      hardDisksMaxSize.value[hardDisksIndex.value[i]] = free + disk.size
+    }
+  })
 })
 
 const addHardDisk = (

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newHardDisk/NewHardDisk.vue

@@ -27,7 +27,7 @@
     :is-disabled-cache="isDisabledCache"
     :is-disabled-bus="isDisabledBus"
     :hard-disk-type-options="hardDiskTypeOptions"
-    :max-hard-disk="maxHardDisk"
+    :max-hard-disk="props.maxSize"
     :location="location"
     :is-running="isRunning"
     :is-new-hard-disk="isNewHardDisk"
@@ -66,7 +66,9 @@ import { minLimitIops } from '~/components/common/vm/actions/common/customizeHar
 
 const size = defineModel<number>('size', { required: true })
 const initialSize = size.value
-const vmStoragePolicy = defineModel<boolean>('vmStoragePolicy', { required: true })
+const vmStoragePolicy = defineModel<boolean>('vmStoragePolicy', {
+  required: true,
+})
 // const provisionType = ref<string>('thick')
 const provisionType = defineModel<string>('provisionType', { required: true })
 // const sharing = ref<string>('')
@@ -136,7 +138,7 @@ const detach = defineModel<boolean>('detach', { required: true })
 const props = withDefaults(
   defineProps<{
     mainStorage: UI_I_DatastoreTableItem | null
-    mainStorageFree: number
+    maxSize: number
     // hardDisk: UI_I_SendDataNewHardDisk
     type: UI_T_HardDiskType
     index: number
@@ -217,26 +219,15 @@ const label = computed<string>(() => {
   return `${localization.value.common.newHardDisk} *`
 })
 
-const maxHardDisk = computed<number>(() => {
-  // // const hardDiskSizeMb = $binary.gbToMb(props.hardDisk.size)
-  //
-  // if (props.type === 'exist') return initialSize
-  //
-  // if (!storageLocal.value) return 0
-  // const free = (storageLocal.value.capacity.free_mb ||
-  //   storageLocal.value.free) as number // TODO fix
-  //
-  // if (props.type === 'edit') return free + initialSize
-  //
-  // return free
-  if (props.type === 'exist') return initialSize
-
-  if (!storageLocal.value) return 0
-
-  return props.mainStorageFree + size.value
-})
+// const maxHardDisk = computed<number>(() => {
+//   if (props.type === 'exist') return initialSize
+//
+//   if (!storageLocal.value) return 0
+//
+//   return props.hardDisksMaxSize[props.index]
+// })
 const hardDiskTypeErrorLocalText = computed<string>(() => {
-  if (size.value > maxHardDisk.value) {
+  if (size.value > props.maxSize) {
     return localization.value.common.diskCapacitySpecifiedGreater
   }
 

package/components/common/vm/actions/editSettings/EditSettings.vue

@@ -149,7 +149,7 @@ const checkCustomizeHardware = async (): Promise<boolean> => {
 }
 
 let modelJson = ''
-// Нухен для того чтоби со второго раза сработал, так как в первый раз попадает в watch когда получаем данные от радителя
+// Нужен для того чтоби со второго раза сработал, так как в первый раз попадает в watch когда получаем данные от радителя
 // а второй раз правки от дочерных и сохраняем его
 let helper = 1
 watch(

package/package.json

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

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

@@ -1,4 +0,0 @@
-export enum UI_E_SchedulerRunStatus {
-  RUNNING = 'this task has been started',
-  SUCCESS = 'success',
-}

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

@@ -1,336 +0,0 @@
-<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"
-    @main-filter="onSearchEvents"
-    @select-row="onSelectRow"
-  >
-    <template #insteadOfTitleActions>
-      <!--      <common-pages-events-tools-panel-->
-      <!--        v-model="filterFormModel"-->
-      <!--        :selected-events="props.selectedEvents"-->
-      <!--        @filter="onFilterEvents"-->
-      <!--      />-->
-    </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)"
-        >
-          {{ item.text }}
-        </span>
-      </span>
-    </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>
-
-    <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 }]"
-          >
-            <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>
-          </template>
-        </ui-dropdown>
-      </div>
-    </template>
-
-    <template #expand="{ item }">
-      <common-pages-scheduled-tasks-table-expand-details
-        :data="item[0].data.expandData"
-      />
-
-      <common-pages-events-table-expand-details :data="item.data">
-        <template #objectTarget="{ target }">
-          <span
-            :data-id="`${target?.testId}-link`"
-            :class="target.data.isLink && 'target-link'"
-            @click.stop="onSelectNodeOfTree(target.data)"
-          >
-            {{ target.text }}
-          </span>
-        </template>
-      </common-pages-events-table-expand-details>
-    </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" />
-        </div>
-      </div>
-    </template>
-  </ui-data-table>
-</template>
-
-<script setup lang="ts">
-import { useDebounceFn } from '@vueuse/core'
-import type { UI_I_Dropdown } from '~/node_modules/bfg-uikit/components/ui/dropdown/models/interfaces'
-import type {
-  UI_I_DataTable,
-  UI_I_DataTableHeader,
-  UI_I_DataTableBody,
-  UI_I_DataTableBodyData,
-  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_ScheduledTasksTableItem } from '~/components/common/pages/scheduledTasks/lib/models/interfaces'
-import {
-  options,
-  getTargetActionsFunc,
-  getHeaderDataFunc,
-  getBodyDataFunc,
-} from '~/components/common/pages/scheduledTasks/table/new/lib/config/scheduledTasksTable'
-
-const selectedScheduledTaskLocal = defineModel<string | null>({
-  required: true,
-})
-const props = defineProps<{
-  tableItems: UI_I_ScheduledTasksTableItem[]
-  totalItems: number
-  totalPages: number
-  selectedEvents: UI_I_ScheduledTasksTableItem
-  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: [],
-})
-
-const actionsShowId = ref<number>(-1)
-
-const data = computed<UI_I_DataTable>(() => ({
-  id: 'scheduled-tasks-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)
-}
-
-const actions = computed<UI_I_Dropdown[]>(() =>
-  getTargetActionsFunc(localization.value)
-)
-const onToggleActions = (id: number): void => {
-  if (actionsShowId.value === id) {
-    actionsShowId.value = -1
-  } else {
-    actionsShowId.value = id
-  }
-}
-const onSelectAction = (
-  data: UI_I_DataTableBodyData['data'],
-  action: 'view-target' | 'copy-clipboard' | 'export'
-): void => {
-  const { target, event } = data
-
-  switch (action) {
-    case 'view-target':
-      onSelectNodeOfTree(target)
-      break
-    case 'copy-clipboard': {
-      const clipboardText =
-        [event]?.map((item) => Object.values(item).join(',')).join('\n') || ''
-
-      navigator.clipboard.writeText(clipboardText)
-      break
-    }
-    case 'export':
-      break
-  }
-  onHideActionsDropdown()
-}
-const onHideActionsDropdown = (): void => {
-  actionsShowId.value = -1
-}
-
-const onSearchEvents = useDebounceFn((searchText: string) => {
-  emits('search')
-}, 400)
-
-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 {
-  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);
-    }
-  }
-  .chip-icon {
-    min-width: 14px;
-  }
-  .icon {
-    margin-right: 4px;
-  }
-
-  .actions {
-    width: 100%;
-
-    .action-icon {
-      width: 20px;
-      height: 20px;
-      color: var(--tasks-actions-icon-color);
-
-      &:hover {
-        color: var(--tasks-actions-icon-hover-color);
-      }
-      &.active {
-        color: var(--tasks-actions-icon-icative-color);
-      }
-    }
-
-    .action-text {
-      margin-left: 8px;
-    }
-  }
-  &__tooltip {
-    margin-left: 8px;
-  }
-}
-
-.skeleton-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-
-  .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;
-  }
-}
-</style>

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

@@ -1,217 +0,0 @@
-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_Dropdown } from '~/node_modules/bfg-uikit/components/ui/dropdown/models/interfaces'
-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,
-} 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,
-  },
-  [E_SchedulerStatus.Running]: {
-    textKey: 'running',
-    icon: E_SchedulerChipIcon.StatusCheck,
-    chipColor: E_SchedulerChipColor.Green,
-  },
-  [E_SchedulerStatus.Failed]: {
-    textKey: 'failed',
-    icon: E_SchedulerChipIcon.Information,
-    chipColor: E_SchedulerChipColor.Red,
-  },
-}
-
-export const getHeaderDataFunc = (
-  localization: UI_I_Localization
-): UI_I_DataTableHeader[] => [
-  {
-    col: 'col0',
-    colName: 'name',
-    text: localization.common.scheduledTask,
-    isSortable: true,
-    sort: 'asc',
-    width: '240px',
-    show: true,
-    filter: true,
-  },
-  {
-    col: 'col1',
-    colName: 'sheduler',
-    text: localization.common.schedule,
-    isSortable: true,
-    sort: 'asc',
-    width: '180px',
-    show: true,
-    filter: true,
-  },
-  {
-    col: 'col2',
-    colName: 'last_modified',
-    text: localization.common.lastRun,
-    isSortable: true,
-    sort: 'asc',
-    width: '180px',
-    show: true,
-    filter: true,
-  },
-  {
-    col: 'col3',
-    colName: 'last_run_result',
-    text: localization.common.lastRunResult,
-    isSortable: true,
-    sort: 'asc',
-    width: '110px',
-    show: true,
-    filter: true,
-  },
-
-  {
-    col: 'col4',
-    colName: 'next_run',
-    text: localization.common.nextRun,
-    isSortable: true,
-    sort: 'asc',
-    width: '160px',
-    show: true,
-    filter: true,
-  },
-]
-
-export const getTargetActionsFunc = (
-  localization: UI_I_Localization
-): UI_I_Dropdown[] => {
-  return [
-    {
-      value: 'view-target',
-      text: localization.common.viewTarget,
-      iconName: 'password-hide',
-      selected: false,
-    },
-    {
-      value: 'copy-clipboard',
-      text: localization.events.copyToClipboard,
-      iconName: 'copy-to-clipboard',
-      selected: false,
-    },
-    // {
-    //   value: 'export',
-    //   text: localization.common.export,
-    //   iconName: 'download-2',
-    //   selected: false,
-    // },
-  ]
-}
-
-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: true,
-  isFocusable: false,
-  showPagination: true,
-  showPaginationOnTop: false,
-  showPageInfo: true,
-  isSortable: true,
-  server: true,
-  isResizable: true,
-  showSearch: true,
-  showSelectedRows: true,
-  showColumnManager: true,
-  withActions: true,
-  inBlock: true,
-  showExport: true,
-  withCollapse: true,
-}
-
-export const getBodyDataFunc = (
-  bodyData: UI_I_ScheduledTasksTableItem[],
-  localization: UI_I_Localization
-): UI_I_DataTableBody[] => {
-  const { $formattedDatetime }: any = useNuxtApp()
-  return bodyData.map((scheduler, index: number) => {
-    const historyLastRun = scheduler?.last_5_run?.at(-1)
-
-    const lastRun = historyLastRun?.start
-    const formattedLastRun =
-      lastRun && $formattedDatetime(+lastRun * 1000, { hasSeconds: true })
-
-    const nextRun = scheduler.next_run
-    const formattedNextRun =
-      nextRun && $formattedDatetime(+nextRun * 1000, { hasSeconds: true })
-
-    const statusKey =
-      historyLastRun?.result.toLowerCase() === UI_E_SchedulerRunStatus.SUCCESS
-        ? E_SchedulerStatus.Completed
-        : historyLastRun?.result === UI_E_SchedulerRunStatus.RUNNING
-        ? E_SchedulerStatus.Running
-        : E_SchedulerStatus.Failed
-    const statusData = {
-      ...STATUS_MAPPING[statusKey],
-      testId: `${scheduler.rid}-${index}-status`,
-    }
-
-    return {
-      row: scheduler.rid,
-      collapse: true,
-      isHiddenCollapse: false,
-      collapseToggle: false,
-      data: [
-        {
-          key: 'icon',
-          col: 'col0',
-          text: scheduler.name,
-          data: {
-            iconClassName: 'icon-events',
-            expandData: scheduler,
-          },
-          testId: `table-item-${scheduler.rid}`,
-        },
-        {
-          col: 'col1',
-          text: scheduler.sheduler || '--',
-          data: 'statusData',
-          testId: `table-item-${scheduler.rid}`,
-        },
-        {
-          col: 'col2',
-          text: formattedLastRun,
-          testId: `table-item-${scheduler.rid}`,
-        },
-        {
-          key: 'status',
-          col: 'col3',
-          text: localization.common[statusData.textKey],
-          data: statusData,
-          testId: `table-item-${scheduler.rid}`,
-        },
-        {
-          key: 'icon',
-          col: 'col4',
-          text: formattedNextRun,
-          data: 'dataTarget',
-          testId: `table-item-${scheduler.rid}`,
-        },
-        {
-          key: 'default-actions',
-          col: 'default-actions',
-          text: '',
-          data: { id: index, target: 'dataTarget', scheduler },
-        },
-      ],
-    }
-  })
-}

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

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

package/components/common/pages/scheduledTasks/table/old/Old.vue

@@ -1,93 +0,0 @@
-<template>
-  <div class="data-table-view">
-    <atoms-table-data-grid
-      v-model:selected-row="selectedScheduledTaskLocal"
-      v-model:page-size="pagination.pageSize"
-      v-model:page="pagination.page"
-      :head-items="headItems"
-      :body-items="bodyItems"
-      :total-items="props.totalItems"
-      :total-pages="props.totalPages"
-      :items-per-page="itemsPerPage"
-      :z-index-header-shift="2"
-      :loading="props.isLoading"
-      type="radio"
-      class="data-table"
-      test-id="scheduled-tasks-table"
-      hide-pagination
-      hide-page-size
-      off-select-by-row
-      server-off
-    >
-      <template #icon="{ item }">
-        <atoms-the-icon :name="item.data.iconClassName" class="icon" />
-        <span :title="item.text" class="text-ellipsis">
-          {{ item.text }}
-        </span>
-      </template>
-
-      <template #toggleBlock="{ item }">
-        <common-pages-scheduled-tasks-table-expand-details
-          :data="item[0].data.expandData"
-        />
-      </template>
-    </atoms-table-data-grid>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import type {
-  UI_I_HeadItem,
-  UI_I_BodyItem,
-} from '~/components/atoms/table/dataGrid/lib/models/interfaces'
-import { itemsPerPage } from '~/components/atoms/table/dataGrid/lib/config/itemsPerPage'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_Pagination } from '~/lib/models/table/interfaces'
-import type { UI_I_ScheduledTasksTableItem } from '~/components/common/pages/scheduledTasks/lib/models/interfaces'
-import * as scheduledTaskTable from '~/components/common/pages/scheduledTasks/table/old/lib/config/scheduledTasksTable'
-
-const selectedScheduledTaskLocal = defineModel<string | null>()
-const props = defineProps<{
-  tableItems: UI_I_ScheduledTasksTableItem[]
-  totalItems: number
-  totalPages: number
-  isLoading: boolean
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const pagination = ref<UI_I_Pagination>({
-  page: 1,
-  pageSize: 100,
-})
-
-const headItems = computed<UI_I_HeadItem[]>(() =>
-  scheduledTaskTable.headItems(localization.value)
-)
-const bodyItems = computed<UI_I_BodyItem[][]>(() => {
-  return scheduledTaskTable.bodyItems(props.tableItems || [])
-})
-</script>
-
-<style lang="scss" scoped>
-.data-table-view {
-  overflow: hidden;
-  height: inherit;
-  margin-bottom: 10px;
-  :deep(.data-table) {
-    height: inherit;
-    .datagrid-outer-wrapper {
-      height: inherit;
-      padding-top: 0;
-      //.datagrid {
-      //  margin-top: 0;
-      //}
-    }
-  }
-  .icon {
-    width: 18px;
-    min-width: 18px;
-    margin-right: 3px;
-  }
-}
-</style>