From f3891b2b8dacb2f5f10e19b5df22df330019aff2 Mon Sep 17 00:00:00 2001 From: Jeremy Lenz Date: Thu, 11 Apr 2024 15:58:48 -0400 Subject: [PATCH] Fixes #37309 - Add Katello columns to new host index page (#10950) --- webpack/ForemanColumnExtensions/index.js | 129 +++++++++++++++++++++++ webpack/global_index.js | 4 + 2 files changed, 133 insertions(+) create mode 100644 webpack/ForemanColumnExtensions/index.js diff --git a/webpack/ForemanColumnExtensions/index.js b/webpack/ForemanColumnExtensions/index.js new file mode 100644 index 00000000000..54c08cbed4d --- /dev/null +++ b/webpack/ForemanColumnExtensions/index.js @@ -0,0 +1,129 @@ +/* eslint-disable no-param-reassign */ +import React from 'react'; +import { + BugIcon, + SecurityIcon, + EnhancementIcon, + PackageIcon, +} from '@patternfly/react-icons'; +import { Link } from 'react-router-dom'; +import { Flex, FlexItem } from '@patternfly/react-core'; +import { translate as __ } from 'foremanReact/common/I18n'; +import RelativeDateTime from 'foremanReact/components/common/dates/RelativeDateTime'; + +const hostsIndexColumnExtensions = [ + { + columnName: 'rhel_lifecycle_status', + title: __('RHEL Lifecycle status'), + wrapper: (hostDetails) => { + const rhelLifecycle = hostDetails?.rhel_lifecycle_status_label; + return rhelLifecycle || '—'; + }, + weight: 2000, + isSorted: true, + }, + { + columnName: 'installable_updates', + title: __('Installable updates'), + wrapper: (hostDetails) => { + const errataCounts = hostDetails?.content_facet_attributes?.errata_counts; + const registered = !!hostDetails?.subscription_facet_attributes?.uuid; + const { security, bugfix, enhancement } = errataCounts ?? {}; + const upgradableRpmCount = hostDetails?.content_facet_attributes?.upgradable_package_count; + if (!registered) return '—'; + const hostErrataUrl = type => `hosts/${hostDetails?.name}#/Content/errata?type=${type}&show=installable`; + return ( + + {security !== undefined && + + + {security} + + } + {bugfix !== undefined && + + + {bugfix} + + } + {enhancement !== undefined && + + + {enhancement} + + } + {upgradableRpmCount !== undefined && + + + {upgradableRpmCount} + + } + + ); + }, + weight: 2100, + isSorted: false, + }, + { + columnName: 'last_checkin', + title: __('Last seen'), + wrapper: (hostDetails) => { + const lastCheckin = + hostDetails?.subscription_facet_attributes?.last_checkin; + return ; + }, + weight: 2200, + isSorted: true, + }, + { + columnName: 'lifecycle_environment', + title: __('Lifecycle environment'), + wrapper: (hostDetails) => { + const lifecycleEnvironment = + hostDetails?.content_facet_attributes?.lifecycle_environment?.name; + return lifecycleEnvironment || '—'; + }, + weight: 2300, + isSorted: true, + }, + { + columnName: 'content_view', + title: __('Content view'), + wrapper: (hostDetails) => { + const contentView = + hostDetails?.content_facet_attributes?.content_view?.name; + return contentView || '—'; + }, + weight: 2400, + isSorted: true, + }, + { + columnName: 'content_source', + title: __('Content source'), + wrapper: (hostDetails) => { + const contentSource = + hostDetails?.content_facet_attributes?.content_source_name; + return contentSource || '—'; + }, + weight: 2500, + isSorted: false, + }, + { + columnName: 'registered_at', + title: __('Registered at'), + wrapper: (hostDetails) => { + const registeredAt = hostDetails?.subscription_facet_attributes?.registered_at; + return ; + }, + weight: 2600, + isSorted: true, + }, +]; + +hostsIndexColumnExtensions.forEach((column) => { + column.tableName = 'hosts'; + column.categoryName = 'Content'; + column.categoryKey = 'content'; +}); + +export default hostsIndexColumnExtensions; diff --git a/webpack/global_index.js b/webpack/global_index.js index f90d05c0362..b9bc596596d 100644 --- a/webpack/global_index.js +++ b/webpack/global_index.js @@ -2,7 +2,9 @@ import React from 'react'; import { addGlobalFill } from 'foremanReact/components/common/Fill/GlobalFill'; import { registerReducer } from 'foremanReact/common/MountingService'; import { translate as __ } from 'foremanReact/common/I18n'; +import { registerColumns } from 'foremanReact/components/HostsIndex/Columns/core'; +import hostsIndexColumnExtensions from './ForemanColumnExtensions/index'; import SystemStatuses from './components/extensions/about'; import { RegistrationCommands, @@ -80,3 +82,5 @@ addGlobalFill( ); addGlobalFill('host-tab-details-cards', 'HW properties', , 200); + +registerColumns(hostsIndexColumnExtensions);