bfg-common 1.4.701 → 1.4.704

package/components/common/pages/tasks/Tasks.vue

@@ -6,8 +6,11 @@
 
     <common-pages-tasks-table
       :table-data="tasksList?.items || []"
+      :total-pages="tasksList?.total_pages || 1"
+      :total-items="tasksList?.total_items || 0"
       :loading="isLoading"
       :project="props.project"
+      @pagination="onUpdatePagination"
     />
   </div>
 </template>
@@ -41,15 +44,6 @@ const pauseGlobalRefresh = (): void => {
 
 const tasksList = computed<UI_I_Task>(() => $store.getters['tasks/getTaskList'])
 
-// const onClickButton = (status: string): void => {
-//   if (status === 'next') {
-//     pagination.value.page += 1
-//     return
-//   }
-//
-//   pagination.value.page -= 1
-// }
-
 const getTasks = async (): Promise<void> => {
   pauseGlobalRefresh()
 
@@ -61,10 +55,10 @@ const getTasks = async (): Promise<void> => {
 }
 getTasks()
 
-// const onUpdatePagination = (event: UI_I_Pagination): void => {
-//   pagination.value = event
-//   getTasks()
-// }
+const onUpdatePagination = (event: UI_I_Pagination): void => {
+  pagination.value = event
+  getTasks()
+}
 
 // const onSortTable = (event: string): void => {
 //   sort.value = event

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

@@ -8,6 +8,7 @@
     :total-items="props.totalItems"
     class="task-table"
     @sorting="onSorting"
+    @pagination="onPagination"
   >
     <template #icon="{ item }">
       <span class="flex-align-center">
@@ -93,6 +94,7 @@ import type {
   UI_I_DataTable,
   UI_I_DataTableHeader,
   UI_I_DataTableBody,
+  UI_I_Pagination,
 } from '~/node_modules/bfg-uikit/components/ui/dataTable/models/interfaces'
 import type { UI_T_Project, UI_T_ProcuratorTypeNodes } from '~/lib/models/types'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
@@ -113,6 +115,7 @@ const props = defineProps<{
 }>()
 const emits = defineEmits<{
   (event: 'sort', value: string): void
+  (event: 'pagination', value: UI_I_Pagination): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
@@ -146,6 +149,9 @@ watch(
 const onSorting = (value: string): void => {
   emits('sort', value)
 }
+const onPagination = (value: UI_I_Pagination): void => {
+  emits('pagination', value)
+}
 
 const actions = computed<UI_I_Dropdown[]>(() =>
   getTargetActionsFunc(localization.value, props.project)

package/components/common/pages/tasks/table/expandDetails/ExpandDetails.vue

@@ -155,6 +155,7 @@ const onSelectNodeOfTree = (data: any): void => {
     }
   }
   &__status {
+    @include flex($align: center);
     .ui-chip {
       width: max-content;
       :deep(.ui-chip__label) {

package/components/common/pages/tasks/table/lib/config/config.ts

@@ -19,7 +19,7 @@ export const getHeaderDataFunc = (
   localization: UI_I_Localization
 ): UI_I_DataTableHeader[] => [
   {
-    col: 0,
+    col: 'col0',
     colName: 'task_name',
     text: localization.tasks.taskName,
     isSortable: true,
@@ -30,7 +30,7 @@ export const getHeaderDataFunc = (
     filter: true,
   },
   {
-    col: 1,
+    col: 'col1',
     colName: 'target',
     text: localization.common.target,
     isSortable: true,
@@ -40,7 +40,7 @@ export const getHeaderDataFunc = (
     filter: true,
   },
   {
-    col: 2,
+    col: 'col2',
     colName: 'status',
     text: localization.common.status,
     isSortable: true,
@@ -50,7 +50,7 @@ export const getHeaderDataFunc = (
     filter: true,
   },
   {
-    col: 3,
+    col: 'col3',
     colName: 'details',
     text: localization.common.details,
     isSortable: true,
@@ -60,7 +60,7 @@ export const getHeaderDataFunc = (
     filter: true,
   },
   {
-    col: 4,
+    col: 'col4',
     colName: 'initiator',
     text: localization.common.initiator,
     isSortable: true,
@@ -70,7 +70,7 @@ export const getHeaderDataFunc = (
     filter: true,
   },
   {
-    col: 5,
+    col: 'col5',
     colName: 'queued_for',
     text: localization.common.queuedFor,
     isSortable: true,
@@ -80,7 +80,7 @@ export const getHeaderDataFunc = (
     filter: true,
   },
   {
-    col: 6,
+    col: 'col6',
     colName: 'start_time',
     text: localization.common.startTime,
     isSortable: true,
@@ -90,7 +90,7 @@ export const getHeaderDataFunc = (
     filter: true,
   },
   {
-    col: 7,
+    col: 'col7',
     colName: 'completion_time',
     text: localization.common.completionTime,
     isSortable: true,
@@ -100,7 +100,7 @@ export const getHeaderDataFunc = (
     filter: true,
   },
   {
-    col: 8,
+    col: 'col8',
     colName: 'execution_time',
     text: localization.common.executionTime,
     isSortable: true,
@@ -110,7 +110,7 @@ export const getHeaderDataFunc = (
     filter: true,
   },
   {
-    col: 9,
+    col: 'col9',
     colName: 'server',
     text: localization.common.server,
     isSortable: true,
@@ -120,7 +120,7 @@ export const getHeaderDataFunc = (
     filter: true,
   },
   {
-    col: 10,
+    col: 'col10',
     colName: 'zone',
     text: localization.common.zone,
     isSortable: true,
@@ -129,12 +129,6 @@ export const getHeaderDataFunc = (
     show: true,
     filter: true,
   },
-  {
-    col: 11,
-    colName: 'default-actions',
-    text: '',
-    show: true,
-  },
 ]
 
 export const getTargetActionsFunc = (
@@ -166,20 +160,21 @@ export const options: UI_I_DataTableOptions = {
   perPageOptions: [
     { text: '10', value: 10 },
     { text: '50', value: 50 },
-    { text: '100', value: 100 },
+    { text: '100', value: 100, default: true },
   ],
   isSelectable: true,
   isFocusable: false,
   showPagination: true,
+  showPaginationOnTop: true,
   showPageInfo: true,
   isSortable: true,
-  server: false,
+  server: true,
   isResizable: true,
   showSearch: false,
   showSelectedRows: true,
   showColumnManager: true,
   withActions: true,
-  inBlockOnlyLightMode: true,
+  inBlock: true,
 }
 
 export const getBodyDataFunc = (
@@ -235,35 +230,35 @@ export const getBodyDataFunc = (
       isHiddenCollapse: false,
       collapseToggle: false,
       data: [
-        { col: 0, text: task.taskName },
+        { col: 'col0', text: task.taskName },
         {
           key: 'icon',
-          col: 1,
+          col: 'col1',
           text: task.target,
           data: targetData,
         },
         {
           key: 'status',
-          col: 2,
+          col: 'col2',
           text: localization.common[UI_E_RecentTaskStatus[task.status]],
           data: statusData,
         },
-        { col: 3, text: task.details || '--' },
-        { col: 4, text: task.initiator },
-        { col: 5, text: `${task.queuedFor} ms` },
-        { col: 6, text: formattedStartTime },
-        { col: 7, text: formattedCompletionTime },
-        { col: 8, text: `${task.execution} ms` },
-        { col: 9, text: task.server },
+        { col: 'col3', text: task.details || '--' },
+        { col: 'col4', text: task.initiator },
+        { col: 'col5', text: `${task.queuedFor} ms` },
+        { col: 'col6', text: formattedStartTime },
+        { col: 'col7', text: formattedCompletionTime },
+        { col: 'col8', text: `${task.execution} ms` },
+        { col: 'col9', text: task.server },
         {
           key: 'icon',
-          col: 10,
+          col: 'col10',
           text: task.zone,
           data: zoneData,
         },
         {
           key: 'default-actions',
-          col: 11,
+          col: 'default-actions',
           text: '',
           data: { id: index, target: targetData },
         },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.4.701",
+  "version": "1.4.704",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",
@@ -35,7 +35,7 @@
     "@vueuse/components": "^10.1.2",
     "date-fns": "^2.29.3",
     "bfg-nuxt-3-graph": "1.0.15",
-    "bfg-uikit": "1.0.288",
+    "bfg-uikit": "1.0.289",
     "html2canvas": "^1.4.1",
     "prettier-eslint": "^15.0.1"
   }