Skip to content

feat: add OUIA IDs for configuration finder columns and items #431

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
hpehl wants to merge 1 commit into from
Closed

feat: add OUIA IDs for configuration finder columns and items #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions op/console/src/main/java/org/jboss/hal/op/configuration/ConfigurationColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import jakarta.inject.Inject;

import org.jboss.hal.op.configuration.socket.SocketBindingGroupColumn;
import org.jboss.hal.resources.OuiaIds;
import org.jboss.hal.ui.finder.ColumnProvider;
import org.jboss.hal.ui.finder.ColumnRegistry;
import org.patternfly.extension.finder.FinderColumn;
Expand All @@ -45,6 +46,11 @@ public class ConfigurationColumn implements ColumnProvider {

/** Column identifier used for registration and OUIA test IDs. */
public static final String ID = "configuration-column";
static final String INTERFACES_ITEM = "interfaces-item";
static final String PATHS_ITEM = "paths-item";
static final String SOCKET_BINDINGS_ITEM = "socket-bindings-item";
static final String SUBSYSTEMS_ITEM = "subsystems-item";
static final String SYSTEM_PROPERTIES_ITEM = "system-properties-item";

private final Instance<ColumnRegistry> registry;

Expand All @@ -60,33 +66,33 @@ public String identifier() {

@Override
public FinderColumn get() {
return finderColumn(ID)
return finderColumn(ID).ouiaId(OuiaIds.ouia(ID))
.addHeader(finderColumnHeader("Configuration"))
.addItem(finderItem("subsystems-item", "Subsystems")
.addItem(finderItem(SUBSYSTEMS_ITEM, "Subsystems").ouiaId(OuiaIds.ouia(SUBSYSTEMS_ITEM))
.nextColumn(registry.get().column(SubsystemColumn.ID))
.onPreview((item, preview) ->
stackPreview(preview, "Subsystems", stack -> stack
.addItem(stackItem().add(content(p).editorial().html(SUBSYSTEM_DESCRIPTION))))))
.addItem(finderItem("interfaces-item", "Interfaces")
.addItem(finderItem(INTERFACES_ITEM, "Interfaces").ouiaId(OuiaIds.ouia(INTERFACES_ITEM))
.nextColumn(registry.get().column(InterfaceColumn.ID))
.onPreview((item, preview) ->
stackPreview(preview, "Interfaces", stack -> stack
.addItem(stackItem()
.add(content(p).editorial().html(INTERFACE_DESCRIPTION_1))
.add(content(p).editorial().html(INTERFACE_DESCRIPTION_2))))))
.addItem(finderItem("socket-bindings-item", "Socket Bindings")
.addItem(finderItem(SOCKET_BINDINGS_ITEM, "Socket Bindings").ouiaId(OuiaIds.ouia(SOCKET_BINDINGS_ITEM))
.nextColumn(registry.get().column(SocketBindingGroupColumn.ID))
.onPreview((item, preview) ->
stackPreview(preview, "Socket Bindings", stack -> stack
.addItem(stackItem().add(content(p).editorial().html(SOCKET_BINDING_DESCRIPTION))))))
.addItem(finderItem("paths-item", "Paths")
.addItem(finderItem(PATHS_ITEM, "Paths").ouiaId(OuiaIds.ouia(PATHS_ITEM))
.nextColumn(registry.get().column(PathColumn.ID))
.onPreview((item, preview) ->
stackPreview(preview, "Paths", stack -> stack
.addItem(stackItem()
.add(content(p).editorial().html(PATH_DESCRIPTION_1))
.add(content(p).editorial().html(PATH_DESCRIPTION_2))))))
.addItem(finderItem("system-properties-item", "System Properties")
.addItem(finderItem(SYSTEM_PROPERTIES_ITEM, "System Properties").ouiaId(OuiaIds.ouia(SYSTEM_PROPERTIES_ITEM))
.nextColumn(registry.get().column(SystemPropertyColumn.ID))
.onPreview((item, preview) ->
stackPreview(preview, "System Properties", stack -> stack
Expand Down
3 changes: 2 additions & 1 deletion op/console/src/main/java/org/jboss/hal/op/configuration/SubsystemColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.jboss.elemento.Id;
import org.jboss.elemento.router.PlaceManager;
import org.jboss.hal.meta.AddressTemplate;
import org.jboss.hal.resources.OuiaIds;
import org.jboss.hal.ui.finder.ColumnProvider;
import org.patternfly.extension.finder.FinderColumn;

Expand Down Expand Up @@ -62,7 +63,7 @@ public String identifier() {

@Override
public FinderColumn get() {
FinderColumn column = finderColumn(ID).pinnable();
FinderColumn column = finderColumn(ID).ouiaId(OuiaIds.ouia(ID)).pinnable();
return column.addHeader(finderColumnHeader("Subsystem").addActions(finderColumnActions()
.addButton(button(rotateRight()).plain().small().onClick((e, b) -> column.refresh()))))
.addItems(childResources(__ -> TEMPLATE, node -> finderItem(Id.build(node.asString()))
Expand Down
2 changes: 1 addition & 1 deletion ui/src/main/java/org/jboss/hal/ui/finder/FinderBricks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public static Finder topLevelFinder() {
public static FinderColumn crudColumn(String id, String header, List<String> previewAttributes,
Function<ResolvedFinderPath, AddressTemplate> templateFn,
Supplier<FinderColumn> nextColumn) {
FinderColumn column = finderColumn(id);
FinderColumn column = finderColumn(id).ouiaId(OuiaIds.ouia(id));
column.addHeader(finderColumnHeader(header).addActions(finderColumnActions()
.addButton(button(plus()).plain().small()
.ouiaId(OuiaIds.ouia(id, "add", "btn"))
Expand Down
Loading