-
Notifications
You must be signed in to change notification settings - Fork 3.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(#1510): implement grouping of services in wallboard
- Loading branch information
Showing
10 changed files
with
300 additions
and
162 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
86 changes: 59 additions & 27 deletions
86
spring-boot-admin-server-ui/src/main/frontend/services/instanceGroupService.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,44 +1,76 @@ | ||
| import Instance from "@/services/instance"; | ||
| import {groupBy, sortBy, transform} from "lodash-es"; | ||
| import Application from "@/services/application"; | ||
| import {useApplicationStore} from "@/composables/useApplicationStore"; | ||
|
|
||
| const groupingFunctions = { | ||
| 'application': (instance: Instance) => instance.registration.name, | ||
| 'group': (instance: Instance) => instance.registration.metadata?.['group'] ?? "term.no_group", | ||
| 'application': (instance: Instance) => instance.registration.name, | ||
| 'group': (instance: Instance) => instance.registration.metadata?.['group'] ?? "term.no_group", | ||
| } | ||
|
|
||
| export type GroupingType = keyof typeof groupingFunctions; | ||
| export const isGroupingType = (grouping: string = ""): grouping is GroupingType => { | ||
| return Object.keys(groupingFunctions).includes(grouping); | ||
| } | ||
|
|
||
| export type InstancesListType = { | ||
| name?: string; | ||
| statusKey?: string; | ||
| status?: string; | ||
| instances?: Instance[]; | ||
| applications?: Application[]; | ||
| export type InstancesListItem = { | ||
| name: string; | ||
| statusKey?: string; | ||
| status?: string; | ||
| instances: Instance[]; | ||
| } | ||
|
|
||
| export const groupApplicationsBy = (applications: Application[], groupingFunction: GroupingType) => { | ||
| const instances = applications.flatMap(application => application.instances); | ||
| return groupInstancesBy(instances, groupingFunction); | ||
| const {applicationStore} = useApplicationStore(); | ||
| const instances = applications.flatMap(application => application.instances); | ||
| const groupedInstances = groupInstancesBy(instances, groupingFunction); | ||
|
|
||
| if (groupingFunction === 'application') { | ||
| return groupedInstances | ||
| .map(item => { | ||
| return { | ||
| ...applicationStore.findApplicationByInstanceId(item.instances[0].id), | ||
| ...item, | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| return groupedInstances | ||
| .map(item => { | ||
| return { | ||
| status: getStatus(item.instances), | ||
| ...item, | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| function getStatus(instances: Instance[]) { | ||
| if (instances.every(instance => instance.statusInfo.status === 'DOWN')) { | ||
| return 'DOWN'; | ||
| } | ||
| if (instances.every(instance => instance.statusInfo.status === 'UP')) { | ||
| return 'UP'; | ||
| } | ||
| return "RESTRICTED"; | ||
| } | ||
|
|
||
| export const groupInstancesBy = (instances: Instance[], groupingFunction: GroupingType) => { | ||
| const grouped = groupBy<Instance>( | ||
| instances, | ||
| groupingFunctions[groupingFunction] | ||
| ); | ||
|
|
||
| const list = transform<Instance[], InstancesListType[]>( | ||
| grouped, | ||
| (result, instances, name) => { | ||
| result.push({ | ||
| name, | ||
| instances: sortBy(instances, [ | ||
| (instance) => instance.registration.name, | ||
| ]), | ||
| }); | ||
| }, []); | ||
|
|
||
| return sortBy(list, [(item) => item.status]); | ||
| const grouped = groupBy<Instance>( | ||
| instances, | ||
| groupingFunctions[groupingFunction] | ||
| ); | ||
|
|
||
| const list = transform<Instance[], InstancesListItem[]>( | ||
| grouped, | ||
| (result, instances, name) => { | ||
| result.push({ | ||
| name, | ||
| instances: sortBy(instances, [ | ||
| (instance) => instance.registration.name, | ||
| ]), | ||
| }); | ||
| }, []); | ||
|
|
||
| return sortBy(list, [(item) => item.status]); | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.