Skip to content

Commit

Permalink
feat: Further enhance the plugin header items extension point
Browse files Browse the repository at this point in the history
* core.ts
 * Some plugins require their header items to remain displayed on the
   header navbar, even though the plugin is not displayed, eg. when
   click 'connect' in hawtio-online with the discover plugin, a new window
   displays hawtio-app showing the connection JMX data. This new window
   still benefits from having the discover plugin dropdown list present so
   that other pods or console can be accessed without returing to the
   discover plugin.
* Adds a 'universal' property to Plugin structure so that an individual
  plugin can state whether its header items should remain on the header
  toolbar even if the rest of the plugin is not the focused-on display

* HawtioHeader.tsx
 * Find all header items that are either from the focused plugin or
   are marked as 'universal' to build the customized toolbar
  • Loading branch information
phantomjinx committed Sep 14, 2023
1 parent 03ea6c9 commit 61b3d7f
Show file tree
Hide file tree
Showing 5 changed files with 81 additions and 17 deletions.
12 changes: 10 additions & 2 deletions app/src/examples/example3/Example3.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,16 @@ export const Example3: React.FunctionComponent = () => (
<Text component='h1'>Example 3</Text>
<Text component='p'>
This is another example plugin that also demonstrates the addition of custom components to the main header
toolbar. Components should be added in the Plugin structure using the `headerItems` array. Toolbar components
should be created as single FunctionComponents and added to the array.
toolbar.
</Text>
<Text component='p'>
Components should be added in to the Plugin structure using the `headerItems` array. Toolbar components should
be created as single FunctionComponents and added to the array.
</Text>
<Text component='p'>
Header components will remain in the toolbar until the focus is changed to an alternative plugin. However,
should you wish to persist the components despite the UI focus then an alternative structure can be added to the
`headerItems` array in the form <code>&#123;component: &apos;MyComponent&apos;, universal: true&#125;</code>.
</Text>
</TextContent>
</PageSection>
Expand Down
4 changes: 2 additions & 2 deletions app/src/examples/example3/ToolbarItemComp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const ToolbarItemComp1: React.FunctionComponent = () => {
</Button>,
]}
>
Hello World!
Hello World! I am part of the Example3 plugin
</Modal>
</React.Fragment>
)
Expand Down Expand Up @@ -81,7 +81,7 @@ export const ToolbarItemComp2: React.FunctionComponent = () => {
onSelect={onSelect}
toggle={
<DropdownToggle id='toggle-basic' onToggle={onToggle}>
Dropdown
Plugin Example 3 Dropdown
</DropdownToggle>
}
isOpen={isOpen}
Expand Down
2 changes: 1 addition & 1 deletion app/src/examples/example3/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const registerExample3: HawtioPlugin = () => {
title: 'Example 3',
path: '/example3',
component: Example3,
headerItems: [ToolbarItemComp1, ToolbarItemComp2],
headerItems: [ToolbarItemComp1, { component: ToolbarItemComp2, universal: true }],
isActive: async () => true,
})
}
33 changes: 31 additions & 2 deletions packages/hawtio/src/core/core.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,36 @@ import $ from 'jquery'
import { eventService } from './event-service'
import { log } from './globals'

/*
* Components to be added to the header navbar
* Can define either a single component type or
* a component with a universal property.
*
* By default, components will only be displayed
* if the plugin UI is also visible. However, setting
* universal to 'true' will ensure the component
* remains displayed regardless of which plugin is
* given focus.
*/
export interface UniversalHeaderItem {
// The components that should be populated as
// dropdown items on the header bar
// eslint-disable-next-line @typescript-eslint/no-explicit-any
component: React.ComponentType<any>

// Should components remain visible on header even when
// the plugin is not being displayed.
universal: boolean
}

// eslint-disable-next-line @typescript-eslint/no-explicit-any
export type HeaderItem = React.ComponentType<any> | UniversalHeaderItem

// eslint-disable-next-line @typescript-eslint/no-explicit-any
export function isUniversalHeaderItem(obj: any): obj is UniversalHeaderItem {
return typeof obj.universal === 'boolean'
}

/**
* Internal representation of a Hawtio plugin.
*/
Expand All @@ -13,8 +43,7 @@ export interface Plugin {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
component: React.ComponentType<any>

// eslint-disable-next-line @typescript-eslint/no-explicit-any
headerItems?: React.ComponentType<any>[]
headerItems?: HeaderItem[]

/**
* Returns if this plugin should be activated.
Expand Down
47 changes: 37 additions & 10 deletions packages/hawtio/src/ui/page/HawtioHeader.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { PUBLIC_USER, userService } from '@hawtiosrc/auth'
import { DEFAULT_APP_NAME, useHawtconfig, Plugin } from '@hawtiosrc/core'
import { DEFAULT_APP_NAME, useHawtconfig, UniversalHeaderItem, isUniversalHeaderItem } from '@hawtiosrc/core'
import { hawtioLogo, userAvatar } from '@hawtiosrc/img'
import { preferencesService } from '@hawtiosrc/preferences/preferences-service'
import { HawtioAbout } from '@hawtiosrc/ui/about'
Expand Down Expand Up @@ -105,23 +105,50 @@ const HawtioHeaderToolbar: React.FunctionComponent = () => {
userItems.pop()
}

/*
* Determine which plugin is currently displaying
* based on the path of the current location
*/
const pluginFromLocation = (): Plugin | null => {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const collectHeaderItems = (): React.ComponentType<any>[] => {
const path = location.pathname
return plugins.find(plugin => path.startsWith(plugin.path)) ?? null

// eslint-disable-next-line @typescript-eslint/no-explicit-any
const components: React.ComponentType<any>[] = []

// Iterate through the plugins ...
plugins.forEach(plugin => {
if (!plugin.headerItems || plugin.headerItems.length === 0) return // no header items in plugin

// if plugin is currently visible in UI
if (path.startsWith(plugin.path)) {
components.push(
...plugin.headerItems.map(headerItem =>
isUniversalHeaderItem(headerItem) ? headerItem.component : headerItem,
),
)
return
}

components.push(
...plugin.headerItems
.filter(
headerItem => isUniversalHeaderItem(headerItem) && (headerItem as UniversalHeaderItem).universal === true,
)
.map(headerItem => (headerItem as UniversalHeaderItem).component),
)
})

return components
}

const plugin = pluginFromLocation()
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const headerComponents: React.ComponentType<any>[] = collectHeaderItems()

return (
<Toolbar id='hawtio-header-toolbar'>
<ToolbarContent>
<ToolbarGroup>
{plugin?.headerItems?.map((comp, index) => (
<ToolbarItem key={`hawtio-header-toolbar-plugin-item-${index}`}>{React.createElement(comp)}</ToolbarItem>
{headerComponents.map((component, index) => (
<ToolbarItem key={`hawtio-header-toolbar-plugin-item-${index}`}>
{React.createElement(component)}
</ToolbarItem>
))}
</ToolbarGroup>
<ToolbarGroup>
Expand Down

0 comments on commit 61b3d7f

Please sign in to comment.