Upgrade to Hawtio 5.0.1

Author: tadayosi

README.md

@@ -2,7 +2,7 @@
 
 [![Build](https://github.com/hawtio/hawtio-sample-plugin-ts/actions/workflows/build.yml/badge.svg)](https://github.com/hawtio/hawtio-sample-plugin-ts/actions/workflows/build.yml)
 
-This sample demonstrates how to write and use a custom plugin with [Hawtio v5](https://github.com/hawtio/hawtio/tree/5.x) in a Spring Boot application.
+This sample demonstrates how to write and use a custom plugin with [Hawtio v5](https://github.com/hawtio/hawtio) in a Spring Boot application.
 
 ## Key components
 

pom.xml

@@ -16,7 +16,7 @@
 
     <!-- Versions -->
     <spring-boot-version>4.0.3</spring-boot-version>
-    <hawtio-version>5.0.0</hawtio-version>
+    <hawtio-version>5.0.1</hawtio-version>
     <node-version>v22.16.0</node-version>
     <yarn-version>v1.22.22</yarn-version>
     <frontend-maven-plugin-version>2.0.0</frontend-maven-plugin-version>

sample-plugin/package.json

@@ -42,6 +42,9 @@
     "webpack-cli": "^7.0.0",
     "webpack-dev-server": "^5.2.3"
   },
+  "resolutions": {
+    "@module-federation/utilities": "3.1.83"
+  },
   "browserslist": {
     "production": [
       ">0.2%",

sample-plugin/src/sample-plugin/custom-tree/CustomTree.tsx

@@ -86,7 +86,7 @@ const CustomTreeContent: React.FunctionComponent = () => {
 
   if (!selectedNode) {
     return (
-      <PageSection hasBodyWrapper={false} variant='default' isFilled>
+      <PageSection hasBodyWrapper={false} isFilled>
         <EmptyState titleText={<Title headingLevel='h1' size='lg'>
           Select Node
         </Title>} variant='full' icon={CubesIcon} >
@@ -112,12 +112,12 @@ const CustomTreeContent: React.FunctionComponent = () => {
   return (
     <React.Fragment>
       <PageGroup>
-        <PageSection hasBodyWrapper={false} variant='default' className='custom-tree-content-header'>
+        <PageSection hasBodyWrapper={false} className='custom-tree-content-header'>
           <Title headingLevel='h1'>{selectedNode.name}</Title>
           <Content component='small'>{selectedNode.mbean}</Content>
         </PageSection>
       </PageGroup>
-      <PageSection hasBodyWrapper={false} variant='default' className='custom-tree-content-main'>
+      <PageSection hasBodyWrapper={false} className='custom-tree-content-main'>
         {customTreeContent}
       </PageSection>
     </React.Fragment>

sample-plugin/src/sample-plugin/custom-tree/CustomTreePreferences.tsx

@@ -1,11 +1,11 @@
-import { CardBody, Form, FormGroup, FormSection, Content, TextInput } from '@patternfly/react-core'
+import { CardBody, Content, Form, FormGroup, FormSection, TextInput } from '@patternfly/react-core'
 import React, { useState } from 'react'
 import { preferencesService } from './preferences-service'
 
 export const CustomTreePreferences: React.FunctionComponent = () => {
   const [domain, setDomain] = useState(preferencesService.loadDomain())
 
-  const onDomainChanged = (value: string) => {
+  const onDomainChanged = (_event: React.FormEvent<HTMLInputElement>, value: string) => {
     setDomain(value)
     preferencesService.saveDomain(value)
   }
@@ -18,7 +18,7 @@ export const CustomTreePreferences: React.FunctionComponent = () => {
           <FormGroup
             label='Domain'
             fieldId='custom-tree-prefs-form-domain'
-            helperText='The target domain to activate the plugin. This is just for demonstration purposes, as the plugin may not work with other domains than `java.lang`.'
+            labelInfo='The target domain to activate the plugin. This is just for demonstration purposes, as the plugin may not work with other domains than `java.lang`.'
           >
             <TextInput id='custom-tree-prefs-form-domain-input' type='text' value={domain} onChange={onDomainChanged} />
           </FormGroup>

sample-plugin/src/sample-plugin/simple/SimplePreferences.tsx

@@ -3,9 +3,7 @@ import React from 'react'
 
 export const SimplePreferences: React.FunctionComponent = () => (
   <CardBody>
-    <Content>
-      <Content component='h2'>Simple Plugin</Content>
-      <Content component='p'>Preferences view for Simple plugin.</Content>
-    </Content>
+    <Content component='h2'>Simple Plugin</Content>
+    <Content component='p'>Preferences view for Simple plugin.</Content>
   </CardBody>
 )

sample-plugin/yarn.lock

@@ -1299,18 +1299,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@module-federation/sdk@npm:0.22.1":
-  version: 0.22.1
-  resolution: "@module-federation/sdk@npm:0.22.1"
-  checksum: 10/7b742e502faca4c829d3e5be53b801b2dcb02381b9df70baca6cccba1ad303074834063d38900a39c0393746a292f37879997372cdd751cb99ff8588a70ca81e
+"@module-federation/sdk@npm:2.0.0":
+  version: 2.0.0
+  resolution: "@module-federation/sdk@npm:2.0.0"
+  checksum: 10/748d58797966cac8f820bf25803487a9b5317761af98bad1f3fc4756b80751b7b69145cc46590ce1afc1a12992a68bf29878f794fdcb99e48999187042486174
   languageName: node
   linkType: hard
 
-"@module-federation/utilities@npm:^3.1.77":
-  version: 3.1.79
-  resolution: "@module-federation/utilities@npm:3.1.79"
+"@module-federation/utilities@npm:3.1.83":
+  version: 3.1.83
+  resolution: "@module-federation/utilities@npm:3.1.83"
   dependencies:
-    "@module-federation/sdk": "npm:0.22.1"
+    "@module-federation/sdk": "npm:2.0.0"
   peerDependencies:
     react: ^16 || ^17 || ^18
     react-dom: ^16 || ^17 || ^18
@@ -1322,7 +1322,7 @@ __metadata:
       optional: true
     react-dom:
       optional: true
-  checksum: 10/84a88f36acd12b81ee85a867167a9f067c64707141641a8556a2f4cd90636caedf8493a5bd8e66b31363cb88dba1d5c6a5f3fb4f895bea7cc35296be2a42a937
+  checksum: 10/a12aa7161f290685db589c461d4137a5f9dba3d3cd239482fcfa723dda7ff120c389cd78a0d0bc0cf67e93b36f552a471939155f2a6022574abfe5493f6f78c7
   languageName: node
   linkType: hard