From d58dfa5f5f79aa676b3fdd3382a87cfa5408f729 Mon Sep 17 00:00:00 2001
From: mmelko <mmelko@redhat.com>
Date: Tue, 19 Sep 2023 14:28:26 +0200
Subject: [PATCH] chore(runtime): make tables sriped, remove whitespaces,
 change plugin id

---
 packages/hawtio/src/plugins/runtime/Metrics.tsx       | 7 ++-----
 packages/hawtio/src/plugins/runtime/Runtime.tsx       | 4 ++--
 packages/hawtio/src/plugins/runtime/SysProps.test.tsx | 5 +++--
 packages/hawtio/src/plugins/runtime/SysProps.tsx      | 7 +++----
 packages/hawtio/src/plugins/runtime/Threads.tsx       | 6 +++---
 packages/hawtio/src/plugins/runtime/index.ts          | 2 +-
 6 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/packages/hawtio/src/plugins/runtime/Metrics.tsx b/packages/hawtio/src/plugins/runtime/Metrics.tsx
index 12b575bcd..08e0371a4 100644
--- a/packages/hawtio/src/plugins/runtime/Metrics.tsx
+++ b/packages/hawtio/src/plugins/runtime/Metrics.tsx
@@ -25,11 +25,9 @@ export const Metrics: React.FunctionComponent = () => {
       <GridItem>
         <Card>
           <CardHeader>
-            {' '}
-            <Title headingLevel='h3'>System</Title>
+            <Title headingLevel='h2'>System</Title>
           </CardHeader>
           <CardBody>
-            {' '}
             {metrics
               .filter(m => m.type === 'System')
               .map((metric, index) => {
@@ -61,8 +59,7 @@ export const Metrics: React.FunctionComponent = () => {
       <GridItem>
         <Card>
           <CardHeader>
-            {' '}
-            <Title headingLevel='h3'>JVM</Title>
+            <Title headingLevel='h2'>JVM</Title>
           </CardHeader>
 
           <CardBody>
diff --git a/packages/hawtio/src/plugins/runtime/Runtime.tsx b/packages/hawtio/src/plugins/runtime/Runtime.tsx
index 1ec91831e..cc385f333 100644
--- a/packages/hawtio/src/plugins/runtime/Runtime.tsx
+++ b/packages/hawtio/src/plugins/runtime/Runtime.tsx
@@ -11,7 +11,7 @@ import {
 } from '@patternfly/react-core'
 import React from 'react'
 
-import { SysProps } from '@hawtiosrc/plugins/runtime/SysProps'
+import { SysProps } from './SysProps'
 import { Navigate, NavLink, Route, Routes, useLocation } from 'react-router-dom'
 import { Metrics } from './Metrics'
 import { Threads } from './Threads'
@@ -37,7 +37,7 @@ export const Runtime: React.FunctionComponent = () => {
       </PageSection>
       <PageGroup>
         <PageNavigation>
-          <Nav aria-label='Nav' variant='tertiary'>
+          <Nav aria-label='Runtime Nav' variant='tertiary'>
             <NavList>
               {navItems.map(navItem => (
                 <NavItem key={navItem.id} isActive={location.pathname === `/runtime/${navItem.id}`}>
diff --git a/packages/hawtio/src/plugins/runtime/SysProps.test.tsx b/packages/hawtio/src/plugins/runtime/SysProps.test.tsx
index 4483caeaa..d98f81f11 100644
--- a/packages/hawtio/src/plugins/runtime/SysProps.test.tsx
+++ b/packages/hawtio/src/plugins/runtime/SysProps.test.tsx
@@ -1,5 +1,5 @@
 import { render, screen, waitFor, within } from '@testing-library/react'
-import { SysProps } from '@hawtiosrc/plugins/runtime/SysProps'
+import { SysProps } from '.SysProps'
 import { SystemProperty } from './types'
 import userEvent from '@testing-library/user-event'
 
@@ -11,9 +11,10 @@ function getMockedProperties(): SystemProperty[] {
   ]
 }
 
-jest.mock('@hawtiosrc/plugins/runtime/runtime-service', () => ({
+jest.mock('./runtime-service', () => ({
   getSystemProperties: jest.fn().mockResolvedValue(getMockedProperties()),
 }))
+
 describe('SysProps.tsx', () => {
   const renderSysProps = () => {
     return render(<SysProps />)
diff --git a/packages/hawtio/src/plugins/runtime/SysProps.tsx b/packages/hawtio/src/plugins/runtime/SysProps.tsx
index c73c456fa..39f09755c 100644
--- a/packages/hawtio/src/plugins/runtime/SysProps.tsx
+++ b/packages/hawtio/src/plugins/runtime/SysProps.tsx
@@ -21,7 +21,7 @@ import {
 } from '@patternfly/react-core'
 import { TableComposable, Tbody, Td, Th, Thead, ThProps, Tr } from '@patternfly/react-table'
 import { SearchIcon } from '@patternfly/react-icons'
-import { getSystemProperties } from './runtime-service'
+import { loadSystemProperties } from './runtime-service'
 import { objectSorter } from '@hawtiosrc/util/objects'
 import { SystemProperty } from './types'
 
@@ -38,7 +38,7 @@ export const SysProps: React.FunctionComponent = () => {
   const [isDropdownOpen, setIsDropdownOpen] = useState(false)
 
   useEffect(() => {
-    getSystemProperties().then(props => {
+    loadSystemProperties().then(props => {
       setProperties(props)
       setFilteredProperties(props)
     })
@@ -151,7 +151,6 @@ export const SysProps: React.FunctionComponent = () => {
   }
   return (
     <Card isFullHeight>
-      {/*<CardTitle>Browse Messages</CardTitle>*/}
       <CardBody>
         <Toolbar>
           <ToolbarContent>
@@ -197,7 +196,7 @@ export const SysProps: React.FunctionComponent = () => {
 
         {sortProperties().length > 0 && (
           <FormGroup>
-            <TableComposable aria-label='Message Table' variant='compact' height='80vh'>
+            <TableComposable aria-label='Message Table' variant='compact' height='80vh' isStriped>
               <Thead>
                 <Tr>
                   <Th data-testid={'name-header'} sort={getSortParams(0)}>
diff --git a/packages/hawtio/src/plugins/runtime/Threads.tsx b/packages/hawtio/src/plugins/runtime/Threads.tsx
index 2c358c862..9a419b548 100644
--- a/packages/hawtio/src/plugins/runtime/Threads.tsx
+++ b/packages/hawtio/src/plugins/runtime/Threads.tsx
@@ -27,7 +27,7 @@ import {
 import { TableComposable, Tbody, Td, Th, Thead, ThProps, Tr } from '@patternfly/react-table'
 import { SearchIcon } from '@patternfly/react-icons'
 import {
-  getThreads,
+  loadThreads,
   dumpThreads,
   enableThreadContentionMonitoring,
   isThreadContentionMonitoringEnabled,
@@ -88,7 +88,7 @@ export const Threads: React.FunctionComponent = () => {
   useEffect(() => {
     let timeoutHandle: NodeJS.Timeout
     const readThreads = async () => {
-      const threads = await getThreads()
+      const threads = await loadThreads()
       setThreads(threads)
       setFilteredThreads(threads)
       setThreadConnectionMonitoring(await isThreadContentionMonitoringEnabled())
@@ -290,7 +290,7 @@ export const Threads: React.FunctionComponent = () => {
         </Toolbar>
         {sortThreads().length > 0 && (
           <FormGroup>
-            <TableComposable aria-label='Message Table' variant='compact' height='80vh'>
+            <TableComposable aria-label='Message Table' variant='compact' height='80vh' isStriped>
               <Thead>
                 <Tr>
                   {tableColumns.map((att, index) => (
diff --git a/packages/hawtio/src/plugins/runtime/index.ts b/packages/hawtio/src/plugins/runtime/index.ts
index 5a77d0ad6..b45a9ae25 100644
--- a/packages/hawtio/src/plugins/runtime/index.ts
+++ b/packages/hawtio/src/plugins/runtime/index.ts
@@ -13,5 +13,5 @@ export const runtime: HawtioPlugin = () => {
     component: Runtime,
     isActive: async () => workspace.hasMBeans(),
   })
-  helpRegistry.add(pluginId, 'Runtime', help, 15)
+  helpRegistry.add(pluginId, 'Runtime', help, 16)
 }