bfg-common 1.4.484 → 1.4.486

package/components/common/pages/home/widgets/services/Services.vue

@@ -1,6 +1,7 @@
 <template>
   <common-pages-home-widgets-services-new
     v-if="isNewView"
+    :services="props.services"
     :loading="false"
   ></common-pages-home-widgets-services-new>
 

package/components/common/pages/home/widgets/services/ServicesNew.vue

@@ -3,14 +3,15 @@
     <template v-if="props.loading">
       <!--   skeleton   -->
     </template>
-    <div v-else>
+    <div v-else class="services-table">
+      <h1>{{ localization.home.services }}</h1>
+
       <ui-data-table
-        test-id="data-table-main"
+        test-id="home-services-table-main"
         :data="data"
         :options="options"
         :loading="props.loading"
         server-off
-        class="resent-task-table"
       >
         <template #icon="{ item }">
           <span class="flex-align-center">
@@ -36,6 +37,7 @@ import type {
   UI_I_DataTableHeader,
   UI_I_DataTableBody,
 } from '~/node_modules/bfg-uikit/components/ui/dataTable/models/interfaces'
+import type { UI_I_Service } from '~/components/common/home/lib/models/interfaces'
 import {
   options,
   getHeaderDataFunc,
@@ -43,7 +45,7 @@ import {
 } from '~/components/common/pages/home/widgets/services/lib/config/config'
 
 const props = defineProps<{
-  tableData: any
+  services: UI_I_Service[]
   loading: boolean
 }>()
 
@@ -61,8 +63,8 @@ const resentTaskHeadItems = computed<UI_I_DataTableHeader[]>(() =>
 
 const resentTaskBodyItems = ref<UI_I_DataTableBody[]>([])
 watch(
-  () => props.tableData,
-  (newValue) => {
+  () => props.services,
+  (newValue: UI_I_Service[]) => {
     if (!newValue?.length) return
 
     resentTaskBodyItems.value = getBodyDataFunc(newValue, localization.value)
@@ -72,6 +74,19 @@ watch(
 </script>
 
 <style lang="scss" scoped>
+.services-table {
+  :deep(.default-layout) {
+    box-shadow: none;
+    padding: 0;
+  }
+  & > h1 {
+    color: var(--widget-text-first);
+    font-size: 16px;
+    font-weight: 500;
+    line-height: 19.36px;
+  }
+}
+
 .target-link {
   font-family: Inter, serif;
   font-size: 13px;

package/components/common/pages/home/widgets/services/ServicesOld.vue

@@ -7,7 +7,7 @@
         icon-name="icon-content-libraries"
         class="most-alerts"
       >
-        <common-home-services-table :data-table="props.services" />
+        <common-pages-home-widgets-services-table :data-table="props.services" />
       </common-pages-home-card>
     </div>
   </div>

package/components/common/pages/home/widgets/services/lib/config/config.ts

@@ -4,7 +4,6 @@ import type {
   UI_I_DataTableOptions,
   UI_I_DataTableHeader,
 } from '~/node_modules/bfg-uikit/components/ui/dataTable/models/interfaces'
-import type { UI_I_RecentTaskItem } from '~/lib/models/store/tasks/interfaces'
 import { UI_E_RecentTaskStatus } from '~/lib/models/store/tasks/enums'
 import { E_NodeIconsByState } from '~/lib/models/enums'
 // import { E_TabsByType } from '~/components/templates/inventory/lib/models/enums'
@@ -12,63 +11,58 @@ import {
   E_RTaskChipColor,
   E_RTaskStatusIcon,
 } from '~/components/common/pages/home/widgets/services/lib/models/enums'
-import type { T_TypeNodes } from '~/lib/models/types'
 
 export const getHeaderDataFunc = (
   localization: UI_I_Localization
 ): UI_I_DataTableHeader[] => [
   {
     col: 0,
-    colName: 'taskName',
-    text: localization.tasks.taskName,
+    colName: 'item',
+    text: localization.common.item,
     isSortable: true,
     sort: 'asc',
     sortColumn: true,
-    width: '180px',
+    width: '33.3%',
     show: true,
     filter: true,
   },
   {
     col: 1,
-    colName: 'target',
-    text: localization.common.target,
+    colName: 'alerts',
+    text: localization.common.alerts,
     isSortable: true,
     sort: 'asc',
-    width: '180px',
+    width: '33.3%',
     show: true,
     filter: true,
   },
   {
     col: 2,
-    colName: 'status',
-    text: localization.common.status,
+    colName: 'warnings',
+    text: localization.common.warnings,
     isSortable: true,
     sort: 'asc',
-    width: '180px',
+    width: '33.3%',
     show: true,
     filter: true,
   },
 ]
 
 export const options: UI_I_DataTableOptions = {
-  perPageOptions: [
-    { text: '10', value: 10 },
-    { text: '50', value: 50 },
-    { text: '100', value: 100 },
-  ],
+  perPageOptions: [],
   isSelectable: false,
   isFocusable: false,
-  showPagination: true,
-  showPageInfo: true,
+  showPagination: false,
+  showPageInfo: false,
   isSortable: true,
   server: false,
-  isResizable: true,
+  isResizable: false,
   showSearch: false,
-  showColumnManager: true,
+  showColumnManager: false,
 }
 
 export const getBodyDataFunc = (
-  bodyData: UI_I_RecentTaskItem<T_TypeNodes>[],
+  bodyData: any,
   localization: UI_I_Localization
 ): UI_I_DataTableBody[] => {
   return bodyData.map((task, index: number) => {

package/components/common/{home/servicesTable/ServicesTable.vue → pages/home/widgets/services/table/Table.vue}

@@ -33,7 +33,7 @@ import type {
 import type { UI_T_SelectedRow } from '~/components/atoms/table/dataGrid/lib/models/types'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_Service } from '~/components/common/home/lib/models/interfaces'
-import * as table from '~/components/common/home/servicesTable/lib/config/config'
+import * as table from '~/components/common/pages/home/widgets/services/table/lib/config/config'
 
 const props = defineProps<{
   dataTable: UI_I_Service[]

package/components/common/pages/home/widgets/warnings/Warnings.vue

@@ -1,6 +1,7 @@
 <template>
   <common-pages-home-widgets-warnings-new
     v-if="isNewView"
+    :alerts="props.alerts"
     :loading="false"
   ></common-pages-home-widgets-warnings-new>
 

package/components/common/pages/home/widgets/warnings/WarningsNew.vue

@@ -3,9 +3,14 @@
     <template v-if="props.loading">
       <!--   skeleton   -->
     </template>
-    <div v-else>
+    <div v-else class="warnings-table">
+      <div class="warnings-table__title">
+        <h1>{{ localization.home.objectsWithMostAlerts }}</h1>
+        <span>({{ props.alerts.length }})</span>
+      </div>
+
       <ui-data-table
-        test-id="data-table-main"
+        test-id="home-warnings-table-main"
         :data="data"
         :options="options"
         :loading="props.loading"
@@ -36,6 +41,7 @@ import type {
   UI_I_DataTableHeader,
   UI_I_DataTableBody,
 } from '~/node_modules/bfg-uikit/components/ui/dataTable/models/interfaces'
+import type { UI_I_Alert } from '~/components/common/home/lib/models/interfaces'
 import {
   options,
   getHeaderDataFunc,
@@ -43,6 +49,7 @@ import {
 } from '~/components/common/pages/home/widgets/warnings/lib/config/config'
 
 const props = defineProps<{
+  alerts: UI_I_Alert[]
   loading: boolean
 }>()
 
@@ -60,8 +67,8 @@ const resentTaskHeadItems = computed<UI_I_DataTableHeader[]>(() =>
 
 const resentTaskBodyItems = ref<UI_I_DataTableBody[]>([])
 watch(
-  () => props.tableData,
-  (newValue) => {
+  () => props.alerts,
+  (newValue: UI_I_Alert[]) => {
     if (!newValue?.length) return
 
     resentTaskBodyItems.value = getBodyDataFunc(newValue, localization.value)
@@ -70,4 +77,17 @@ watch(
 )
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.warnings-table {
+  :deep(.default-layout) {
+    box-shadow: none;
+    padding: 0;
+  }
+  & > h1 {
+    color: var(--widget-text-first);
+    font-size: 16px;
+    font-weight: 500;
+    line-height: 19.36px;
+  }
+}
+</style>

package/components/common/pages/home/widgets/warnings/lib/config/config.ts

@@ -4,7 +4,6 @@ import type {
   UI_I_DataTableOptions,
   UI_I_DataTableHeader,
 } from '~/node_modules/bfg-uikit/components/ui/dataTable/models/interfaces'
-import type { UI_I_RecentTaskItem } from '~/lib/models/store/tasks/interfaces'
 import { UI_E_RecentTaskStatus } from '~/lib/models/store/tasks/enums'
 import { E_NodeIconsByState } from '~/lib/models/enums'
 // import { E_TabsByType } from '~/components/templates/inventory/lib/models/enums'
@@ -12,63 +11,58 @@ import {
   E_RTaskChipColor,
   E_RTaskStatusIcon,
 } from '~/components/common/pages/home/widgets/services/lib/models/enums'
-import type { T_TypeNodes } from '~/lib/models/types'
 
 export const getHeaderDataFunc = (
   localization: UI_I_Localization
 ): UI_I_DataTableHeader[] => [
   {
     col: 0,
-    colName: 'taskName',
-    text: localization.tasks.taskName,
+    colName: 'item',
+    text: localization.common.item,
     isSortable: true,
     sort: 'asc',
     sortColumn: true,
-    width: '180px',
+    width: '33.3%',
     show: true,
     filter: true,
   },
   {
     col: 1,
-    colName: 'target',
-    text: localization.common.target,
+    colName: 'status',
+    text: localization.common.status,
     isSortable: true,
     sort: 'asc',
-    width: '180px',
+    width: '33.3%',
     show: true,
     filter: true,
   },
   {
     col: 2,
-    colName: 'status',
-    text: localization.common.status,
+    colName: 'version',
+    text: localization.common.version,
     isSortable: true,
     sort: 'asc',
-    width: '180px',
+    width: '33.3%',
     show: true,
     filter: true,
   },
 ]
 
 export const options: UI_I_DataTableOptions = {
-  perPageOptions: [
-    { text: '10', value: 10 },
-    { text: '50', value: 50 },
-    { text: '100', value: 100 },
-  ],
+  perPageOptions: [],
   isSelectable: false,
   isFocusable: false,
-  showPagination: true,
-  showPageInfo: true,
+  showPagination: false,
+  showPageInfo: false,
   isSortable: true,
   server: false,
-  isResizable: true,
+  isResizable: false,
   showSearch: false,
-  showColumnManager: true,
+  showColumnManager: false,
 }
 
 export const getBodyDataFunc = (
-  bodyData: UI_I_RecentTaskItem<T_TypeNodes>[],
+  bodyData: any,
   localization: UI_I_Localization
 ): UI_I_DataTableBody[] => {
   return bodyData.map((task, index: number) => {

package/package.json

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