You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/04/08 08:31:07 UTC
[isis] branch master updated: ISIS-2340: remove wicket viewer menu
separator hack (just use css)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new f38af8c ISIS-2340: remove wicket viewer menu separator hack (just use css)
f38af8c is described below
commit f38af8cfba3870ddd503785a514a3f4c58d59e0c
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Apr 8 10:30:55 2020 +0200
ISIS-2340: remove wicket viewer menu separator hack (just use css)
---
.../viewer/common/model/menu/MenuModelFactory.java | 20 +--
.../common/model/menuitem/MenuItemUiModel.java | 1 -
.../actionmenu/entityactions/LinkAndLabelUtil.java | 4 +-
.../actionmenu/serviceactions/MenuActionPanel.java | 110 ++++++++++++++++
.../serviceactions/ServiceActionUtil.java | 145 +++++++--------------
.../serviceactions/ServiceActionsPanel.java | 112 +++++++---------
.../serviceactions/TertiaryActionsPanel.java | 56 ++------
.../wicket/ui/pages/bootstrap-overrides-all-v2.css | 7 +
8 files changed, 230 insertions(+), 225 deletions(-)
diff --git a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuModelFactory.java b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuModelFactory.java
index 161b8a6..ffb4739 100644
--- a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuModelFactory.java
+++ b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuModelFactory.java
@@ -4,15 +4,16 @@ import java.util.concurrent.atomic.LongAdder;
import java.util.function.Consumer;
import java.util.function.Function;
-import org.apache.isis.applib.layout.menubars.bootstrap3.BS3Menu;
import org.apache.isis.applib.layout.menubars.bootstrap3.BS3MenuBar;
import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import org.apache.isis.viewer.common.model.action.MenuActionFactory;
import org.apache.isis.viewer.common.model.menuitem.MenuItemUiModel;
import lombok.val;
+import lombok.experimental.UtilityClass;
import lombok.extern.log4j.Log4j2;
+@UtilityClass
@Log4j2
public class MenuModelFactory {
@@ -29,7 +30,7 @@ public class MenuModelFactory {
val itemsPerSectionCounter = new LongAdder();
- for (final BS3Menu menu : menuBar.getMenus()) {
+ for (val menu : menuBar.getMenus()) {
val menuItemModel = menuItemFactory.apply(menu.getNamed());
@@ -65,14 +66,13 @@ public class MenuModelFactory {
serviceAdapter);
// Optionally creates a sub-menu item based on visibility and usability
- menuItemModel
- .addSubMenuItemFor(
- menuActionUiModel,
- isFirstInSection,
- newSubMenuItem->{
- // increment counter only when a sub item was actually added
- itemsPerSectionCounter.increment();
- newSubMenuItem.setMenuActionUiModel(menuActionUiModel);
+ menuItemModel.addSubMenuItemFor(
+ menuActionUiModel,
+ isFirstInSection,
+ newSubMenuItem->{
+ // increment counter only when a sub item was actually added
+ itemsPerSectionCounter.increment();
+ newSubMenuItem.setMenuActionUiModel(menuActionUiModel);
});
}
diff --git a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menuitem/MenuItemUiModel.java b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menuitem/MenuItemUiModel.java
index 545ae5c..cfead66 100644
--- a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menuitem/MenuItemUiModel.java
+++ b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menuitem/MenuItemUiModel.java
@@ -71,7 +71,6 @@ public abstract class MenuItemUiModel<T, U extends MenuItemUiModel<T, U>> {
* To determine whether requires a separator before it.
*/
@Getter @Setter private boolean isFirstInSection = false; // unless set otherwise
- @Getter @Setter private boolean separator;
@Getter @Setter private String disabledReason;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/LinkAndLabelUtil.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/LinkAndLabelUtil.java
index 4ad8d4a..8b4ac72 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/LinkAndLabelUtil.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/LinkAndLabelUtil.java
@@ -30,11 +30,11 @@ import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.model.models.ToggledMementosProvider;
import lombok.val;
+import lombok.experimental.UtilityClass;
+@UtilityClass
public final class LinkAndLabelUtil {
- private LinkAndLabelUtil(){}
-
public static List<LinkAndLabel> asActionLinks(
final ScalarModel scalarModel,
final List<ObjectAction> associatedActions) {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/MenuActionPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/MenuActionPanel.java
new file mode 100644
index 0000000..10ef3fe
--- /dev/null
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/MenuActionPanel.java
@@ -0,0 +1,110 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.viewer.wicket.ui.components.actionmenu.serviceactions;
+
+import java.util.List;
+import java.util.function.BooleanSupplier;
+
+import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.markup.html.WebComponent;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.viewer.wicket.ui.panels.PanelBase;
+import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
+
+import lombok.val;
+
+@SuppressWarnings("rawtypes")
+public abstract class MenuActionPanel extends PanelBase {
+
+ private static final long serialVersionUID = 1L;
+
+ public MenuActionPanel(final String id) {
+ super(id);
+ }
+
+ protected ListView<CssMenuItem> subMenuItemsView(final List<CssMenuItem> subMenuItems) {
+ return new ListView<CssMenuItem>("subMenuItems", subMenuItems) {
+
+ private static final long serialVersionUID = 1L;
+ private transient int populationCount = 0;
+
+ @Override
+ protected void populateItem(ListItem<CssMenuItem> listItem) {
+ val subMenuItem = listItem.getModelObject();
+
+ if(subMenuItem.isFirstInSection()
+ && populationCount>0) {
+ addSeparatorBefore(subMenuItem, listItem);
+ }
+
+ if (subMenuItem.hasSubMenuItems()) {
+ addFolderItem(subMenuItem, listItem);
+ } else {
+ addLeafItem(subMenuItem, listItem);
+ }
+
+ populationCount++;
+ }
+ };
+ }
+
+ protected WebComponent divider(final BooleanSupplier visibilityCheck) {
+ return new WebComponent("divider") {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(visibilityCheck.getAsBoolean());
+ }
+ };
+ }
+
+
+ //TODO candidate to be supported by the model itself (recursive)
+ protected List<CssMenuItem> flatten(final List<CssMenuItem> menuItems) {
+ val subMenuItems = _Lists.<CssMenuItem>newArrayList();
+ for (val menuItem : menuItems) {
+ subMenuItems.addAll(menuItem.getSubMenuItems());
+ }
+ return subMenuItems;
+ }
+
+ // -- HELPER
+
+ private void addSeparatorBefore(CssMenuItem menuItem, ListItem<CssMenuItem> listItem) {
+ listItem.add(new CssClassAppender("list-separator"));
+ }
+
+ private void addFolderItem(CssMenuItem menuItem, ListItem<CssMenuItem> listItem) {
+ final MarkupContainer parent = this;
+ ServiceActionUtil.addFolderItem(super.getCommonContext(), menuItem, listItem, parent);
+ }
+
+ private void addLeafItem(CssMenuItem menuItem, ListItem<CssMenuItem> listItem) {
+ final MarkupContainer parent = this;
+ ServiceActionUtil.addLeafItem(
+ super.getCommonContext(), menuItem, listItem, parent);
+ }
+
+
+}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
index d9f4c8c..dc1f757 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
@@ -32,7 +32,6 @@ import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.isis.applib.layout.menubars.bootstrap3.BS3MenuBar;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.core.commons.internal.base._Strings;
-import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
@@ -47,128 +46,76 @@ import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
import org.apache.isis.viewer.wicket.ui.util.Tooltips;
import lombok.val;
+import lombok.experimental.UtilityClass;
import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig;
+@UtilityClass
//@Log4j2
public final class ServiceActionUtil {
- private ServiceActionUtil(){}
-
static void addLeafItem(
IsisWebAppCommonContext commonContext,
CssMenuItem menuItem,
ListItem<CssMenuItem> listItem,
MarkupContainer parent) {
- Fragment leafItem;
- if (!menuItem.isSeparator()) {
- leafItem = new Fragment("content", "leafItem", parent);
+ Fragment leafItem = new Fragment("content", "leafItem", parent);
- val menuItemActionLink = menuItem.getActionLinkComponent();
+ val menuItemActionLink = menuItem.getActionLinkComponent();
- Label menuItemLabel = new Label("menuLinkLabel", menuItem.getName());
- menuItemActionLink.addOrReplace(menuItemLabel);
+ Label menuItemLabel = new Label("menuLinkLabel", menuItem.getName());
+ menuItemActionLink.addOrReplace(menuItemLabel);
- listItem.add(new CssClassAppender("isis-" + CssClassAppender.asCssStyle(menuItem.getActionIdentifier())));
- if (!menuItem.isEnabled()) {
- listItem.add(new CssClassAppender("disabled"));
- menuItemActionLink.setEnabled(false);
+ listItem.add(new CssClassAppender("isis-" + CssClassAppender.asCssStyle(menuItem.getActionIdentifier())));
+ if (!menuItem.isEnabled()) {
+ listItem.add(new CssClassAppender("disabled"));
+ menuItemActionLink.setEnabled(false);
- Tooltips.addTooltip(listItem, menuItem.getDisabledReason());
+ Tooltips.addTooltip(listItem, menuItem.getDisabledReason());
- } else {
+ } else {
- if(!_Strings.isNullOrEmpty(menuItem.getDescription())) {
- Tooltips.addTooltip(listItem, menuItem.getDescription());
- }
+ if(!_Strings.isNullOrEmpty(menuItem.getDescription())) {
+ Tooltips.addTooltip(listItem, menuItem.getDescription());
+ }
- //XXX ISIS-1626, confirmation dialog for no-parameter menu actions
- if (menuItem.isRequiresImmediateConfirmation()) {
-
- val translationService =
- commonContext.lookupServiceElseFail(TranslationService.class);
- Confirmations
- .addConfirmationDialog(translationService, menuItemActionLink, TooltipConfig.Placement.bottom);
- }
+ //XXX ISIS-1626, confirmation dialog for no-parameter menu actions
+ if (menuItem.isRequiresImmediateConfirmation()) {
+ val translationService =
+ commonContext.lookupServiceElseFail(TranslationService.class);
+ Confirmations
+ .addConfirmationDialog(translationService, menuItemActionLink, TooltipConfig.Placement.bottom);
}
- if (menuItem.isPrototyping()) {
- menuItemActionLink.add(new CssClassAppender("prototype"));
- }
- leafItem.add(menuItemActionLink);
- String cssClassFa = menuItem.getCssClassFa();
- if (_Strings.isNullOrEmpty(cssClassFa)) {
- menuItemActionLink.add(new CssClassAppender("menuLinkSpacer"));
- } else {
- menuItemLabel.add(new CssClassFaBehavior(cssClassFa, menuItem.getCssClassFaPosition()));
- }
+ }
+ if (menuItem.isPrototyping()) {
+ menuItemActionLink.add(new CssClassAppender("prototype"));
+ }
+ leafItem.add(menuItemActionLink);
- String cssClass = menuItem.getCssClass();
- if (!_Strings.isNullOrEmpty(cssClass)) {
- menuItemActionLink.add(new CssClassAppender(cssClass));
- }
+ String cssClassFa = menuItem.getCssClassFa();
+ if (_Strings.isNullOrEmpty(cssClassFa)) {
+ menuItemActionLink.add(new CssClassAppender("menuLinkSpacer"));
} else {
- leafItem = new Fragment("content", "empty", parent);
- listItem.add(new CssClassAppender("divider"));
+ menuItemLabel.add(new CssClassFaBehavior(cssClassFa, menuItem.getCssClassFaPosition()));
}
- listItem.add(leafItem);
- }
-
- enum SeparatorStrategy {
- WITH_SEPARATORS {
- @Override
- List<CssMenuItem> applySeparatorStrategy(final CssMenuItem subMenuItem) {
- return withSeparators(subMenuItem);
- }
-
- },
- WITHOUT_SEPARATORS {
- @Override
- List<CssMenuItem> applySeparatorStrategy(final CssMenuItem subMenuItem) {
- final List<CssMenuItem> subMenuItems = subMenuItem.getSubMenuItems();
- return subMenuItems;
- }
- };
-
- abstract List<CssMenuItem> applySeparatorStrategy(final CssMenuItem subMenuItem);
- }
-
- static List<CssMenuItem> withSeparators(CssMenuItem subMenuItem) {
- final List<CssMenuItem> subMenuItems = subMenuItem.getSubMenuItems();
- final List<CssMenuItem> cssMenuItemsWithSeparators = withSeparators(subMenuItems);
- subMenuItem.replaceSubMenuItems(cssMenuItemsWithSeparators);
- return cssMenuItemsWithSeparators;
- }
-
- static List<CssMenuItem> withSeparators(List<CssMenuItem> subMenuItems) {
- final List<CssMenuItem> itemsWithSeparators = _Lists.newArrayList();
- for (CssMenuItem menuItem : subMenuItems) {
- if(menuItem.isFirstInSection()) {
- if(!itemsWithSeparators.isEmpty()) {
- // bit nasty... we add a new separator item
- val separatorItem = CssMenuItem
- .newMenuItem(menuItem.getName() + "-separator");
- separatorItem.setPrototyping(menuItem.isPrototyping());
- separatorItem.setSeparator(true);
- itemsWithSeparators.add(separatorItem);
- }
- menuItem.setFirstInSection(false); // why is that?
- }
- itemsWithSeparators.add(menuItem);
+ String cssClass = menuItem.getCssClass();
+ if (!_Strings.isNullOrEmpty(cssClass)) {
+ menuItemActionLink.add(new CssClassAppender(cssClass));
}
- return itemsWithSeparators;
+
+ listItem.add(leafItem);
}
static void addFolderItem(
IsisWebAppCommonContext commonContext,
CssMenuItem subMenuItem,
ListItem<CssMenuItem> listItem,
- MarkupContainer parent,
- SeparatorStrategy separatorStrategy) {
+ MarkupContainer parent) {
listItem.add(new CssClassAppender("dropdown-submenu"));
@@ -176,7 +123,7 @@ public final class ServiceActionUtil {
listItem.add(folderItem);
folderItem.add(new Label("folderName", subMenuItem.getName()));
- final List<CssMenuItem> menuItems = separatorStrategy.applySeparatorStrategy(subMenuItem);
+ final List<CssMenuItem> menuItems = subMenuItem.getSubMenuItems();
ListView<CssMenuItem> subMenuItemsView = new ListView<CssMenuItem>("subMenuItems",
menuItems) {
private static final long serialVersionUID = 1L;
@@ -186,7 +133,7 @@ public final class ServiceActionUtil {
CssMenuItem subMenuItem = listItem.getModelObject();
if (subMenuItem.hasSubMenuItems()) {
- addFolderItem(commonContext, subMenuItem, listItem, parent, SeparatorStrategy.WITHOUT_SEPARATORS);
+ addFolderItem(commonContext, subMenuItem, listItem, parent);
} else {
addLeafItem(commonContext, subMenuItem, listItem, parent);
}
@@ -195,7 +142,7 @@ public final class ServiceActionUtil {
folderItem.add(subMenuItemsView);
}
-
+
private static class MenuActionFactoryWkt implements MenuActionFactory<AbstractLink> {
@Override
@@ -204,35 +151,35 @@ public final class ServiceActionUtil {
String named,
ObjectAction objectAction,
ManagedObject serviceAction) {
-
+
val objectModel = EntityModel.ofAdapter(commonContext, serviceAction);
-
+
return new MenuActionWkt(
new MenuActionLinkFactory(PageAbstract.ID_MENU_LINK, objectModel),
named,
objectAction,
objectModel);
}
-
+
}
-
+
public static void buildMenu(
final IsisWebAppCommonContext commonContext,
final ServiceActionsModel serviceActionsModel,
final Consumer<CssMenuItem> onNewMenuItem) {
-
+
val menuBars = commonContext.getMenuBarsService().menuBars();
// TODO: remove hard-coded dependency on BS3
final BS3MenuBar menuBar = (BS3MenuBar) menuBars.menuBarFor(serviceActionsModel.getMenuBar());
-
+
MenuModelFactory.buildMenuItems(
commonContext,
menuBar,
new MenuActionFactoryWkt(),
CssMenuItem::newMenuItem,
onNewMenuItem);
-
+
}
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.java
index 2c1f3cd..6823d15 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.java
@@ -23,7 +23,6 @@ import java.util.stream.Collectors;
import javax.annotation.Nullable;
-import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
@@ -35,11 +34,12 @@ import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.request.resource.CssResourceReference;
import org.apache.isis.core.commons.internal.base._NullSafe;
-import org.apache.isis.viewer.wicket.ui.panels.PanelBase;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
import org.apache.isis.viewer.wicket.ui.util.SSESupport;
import org.apache.isis.viewer.wicket.ui.util.Tooltips;
+import lombok.val;
+
import de.agilecoders.wicket.extensions.markup.html.bootstrap.button.DropdownAutoOpenJavaScriptReference;
/**
@@ -50,88 +50,31 @@ import de.agilecoders.wicket.extensions.markup.html.bootstrap.button.DropdownAut
* <a href="http://bootsnipp.com/snippets/featured/multi-level-dropdown-menu-bs3">Bootsnip</a>
* </p>
*/
-public class ServiceActionsPanel extends PanelBase {
+public class ServiceActionsPanel extends MenuActionPanel {
private static final long serialVersionUID = 1L;
public ServiceActionsPanel(String id, List<CssMenuItem> menuItems) {
super(id);
- ListView<CssMenuItem> menuItemsView = new ListView<CssMenuItem>("menuItems", menuItems) {
+ val menuItemsView = new ListView<CssMenuItem>("menuItems", menuItems) {
private static final long serialVersionUID = 1L;
@Override
protected void populateItem(ListItem<CssMenuItem> listItem) {
- CssMenuItem menuItem = listItem.getModelObject();
+ val menuItem = listItem.getModelObject();
+
+ val topMenu = new WebMarkupContainer("topMenu");
+ topMenu.add(subMenuItemsView(menuItem.getSubMenuItems()));
+ topMenu.add(new CssClassAppender(cssForTopMenu(menuItem)));
+
listItem.add(new Label("name", menuItem.getName()));
- MarkupContainer topMenu = new WebMarkupContainer("topMenu");
- topMenu.add(new CssClassAppender("top-menu-" + CssClassAppender.asCssStyle(menuItem.getName())));
listItem.add(topMenu);
- List<CssMenuItem> subMenuItems = ServiceActionUtil.withSeparators(menuItem);
-
- // fake data to test multi-level menus
- // if (menuItem.getName().equals("ToDos")) {
- // CssMenuItem fakeItem = menuItem.newSubMenuItem("Fake item").build();
- //
- // fakeItem.newSubMenuItem("Fake item 1").link(new ExternalLink("menuLink", "http://abv.bg")).build();
- // CssMenuItem fakeMenu12 = fakeItem.newSubMenuItem("Fake item 2").link(new ExternalLink("menuLink", "http://google.com")).build();
- //
- // fakeMenu12.newSubMenuItem("Fake item 2.1").link(new ExternalLink("menuLink", "http://web.de")).build();
- // }
-
- ListView<CssMenuItem> subMenuItemsView = new ListView<CssMenuItem>("subMenuItems", subMenuItems) {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void populateItem(ListItem<CssMenuItem> listItem) {
- CssMenuItem subMenuItem = listItem.getModelObject();
-
- if (subMenuItem.hasSubMenuItems()) {
- addFolderItem(subMenuItem, listItem);
- } else {
-
- final MarkupContainer parent = ServiceActionsPanel.this;
- ServiceActionUtil.addLeafItem(
- ServiceActionsPanel.super.getCommonContext(), subMenuItem, listItem, parent);
-
- }
- }
- };
- final List<CssMenuItem> childItems = menuItem.getSubMenuItems();
- final String cssForServices = _NullSafe.stream(childItems)
- .map((final CssMenuItem input) -> {
- final String actionIdentifier = input.getActionIdentifier();
- if (actionIdentifier != null) {
- // busrules-busrulesobjects-findbyname
- final String actionId = CssClassAppender.asCssStyle(actionIdentifier);
- final int i = actionId.lastIndexOf("-");
- // busrules-busrulesobjects
- return i == -1 ? actionId : actionId.substring(0, i);
- } else {
- return null;
- }
- })
- .filter((@Nullable final String input) -> {
- return input != null;
- })
- .map((final String input) -> {
- return "isis-" + input;
- })
- .distinct()
- .collect(Collectors.joining(" "));
-
- listItem.add(new CssClassAppender(cssForServices));
-
- topMenu.add(subMenuItemsView);
+ listItem.add(new CssClassAppender(cssForServices(menuItem)));
}
};
add(menuItemsView);
}
- private void addFolderItem(CssMenuItem subMenuItem, ListItem<CssMenuItem> listItem) {
- final MarkupContainer parent = ServiceActionsPanel.this;
- ServiceActionUtil.addFolderItem(super.getCommonContext(), subMenuItem, listItem, parent, ServiceActionUtil.SeparatorStrategy.WITH_SEPARATORS);
- }
-
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
@@ -145,5 +88,38 @@ public class ServiceActionsPanel extends PanelBase {
SSESupport.renderHead(response);
}
+
+ // -- HELPER
+
+ private static String cssForTopMenu(CssMenuItem menuItem) {
+ return "top-menu-" + CssClassAppender.asCssStyle(menuItem.getName());
+ }
+
+ private static String cssForServices(CssMenuItem menuItem) {
+ final List<CssMenuItem> childItems = menuItem.getSubMenuItems();
+ return _NullSafe.stream(childItems)
+ .map((final CssMenuItem input) -> {
+ final String actionIdentifier = input.getActionIdentifier();
+ if (actionIdentifier != null) {
+ // busrules-busrulesobjects-findbyname
+ final String actionId = CssClassAppender.asCssStyle(actionIdentifier);
+ final int i = actionId.lastIndexOf("-");
+ // busrules-busrulesobjects
+ return i == -1 ? actionId : actionId.substring(0, i);
+ } else {
+ return null;
+ }
+ })
+ .filter((@Nullable final String input) -> {
+ return input != null;
+ })
+ .map((final String input) -> {
+ return "isis-" + input;
+ })
+ .distinct()
+ .collect(Collectors.joining(" "));
+ }
+
+
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
index 314f5c0..628f8bd 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
@@ -19,6 +19,7 @@
package org.apache.isis.viewer.wicket.ui.components.actionmenu.serviceactions;
import java.util.List;
+import java.util.function.BooleanSupplier;
import javax.inject.Inject;
@@ -26,20 +27,17 @@ import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.request.resource.CssResourceReference;
-import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
-import org.apache.isis.viewer.wicket.ui.panels.PanelBase;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
import org.apache.isis.viewer.wicket.ui.util.Tooltips;
+import lombok.val;
+
/**
* A panel responsible to render the application actions as menu in a navigation bar.
*
@@ -48,7 +46,7 @@ import org.apache.isis.viewer.wicket.ui.util.Tooltips;
* <a href="http://bootsnipp.com/snippets/featured/multi-level-dropdown-menu-bs3">Bootsnip</a>
* </p>
*/
-public class TertiaryActionsPanel extends PanelBase {
+public class TertiaryActionsPanel extends MenuActionPanel {
private static final long serialVersionUID = 1L;
@@ -57,45 +55,19 @@ public class TertiaryActionsPanel extends PanelBase {
public TertiaryActionsPanel(String id, List<CssMenuItem> menuItems) {
super(id);
addLogoutLink(this);
- final List<CssMenuItem> subMenuItems = flatten(menuItems);
- final ListView<CssMenuItem> subMenuItemsView = new ListView<CssMenuItem>("subMenuItems", subMenuItems) {
- private static final long serialVersionUID = 1L;
+ val subMenuItems = flatten(menuItems);
+ val subMenuItemsView = subMenuItemsView(subMenuItems);
- @Override
- protected void populateItem(ListItem<CssMenuItem> listItem) {
- CssMenuItem subMenuItem = listItem.getModelObject();
- if (subMenuItem.hasSubMenuItems()) {
- addFolderItem(subMenuItem, listItem);
- } else {
- ServiceActionUtil.addLeafItem(
- TertiaryActionsPanel.super.getCommonContext(), subMenuItem, listItem, TertiaryActionsPanel.this);
- }
- }
- };
-
- WebComponent divider = new WebComponent("divider") {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
-
- subMenuItemsView.configure();
- setVisible(!subMenuItems.isEmpty());
- }
+ final BooleanSupplier dividerVisibility = ()->{
+ subMenuItemsView.configure();
+ return !subMenuItems.isEmpty();
};
+
+ val divider = divider(dividerVisibility);
add(subMenuItemsView, divider);
}
- protected List<CssMenuItem> flatten(List<CssMenuItem> menuItems) {
- List<CssMenuItem> subMenuItems = _Lists.newArrayList();
- for (CssMenuItem menuItem : menuItems) {
- subMenuItems.addAll(menuItem.getSubMenuItems());
- }
- return subMenuItems;
- }
-
private void addLogoutLink(MarkupContainer themeDiv) {
Link<Void> logoutLink = new Link<Void>("logoutLink") {
@@ -130,12 +102,6 @@ public class TertiaryActionsPanel extends PanelBase {
return pageClassRegistry.getPageClass(PageType.SIGN_IN);
}
-
- private void addFolderItem(CssMenuItem subMenuItem, ListItem<CssMenuItem> listItem) {
- final MarkupContainer parent = TertiaryActionsPanel.this;
- ServiceActionUtil.addFolderItem(super.getCommonContext(), subMenuItem, listItem, parent, ServiceActionUtil.SeparatorStrategy.WITHOUT_SEPARATORS);
- }
-
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-all-v2.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-all-v2.css
index 91f974f..1e2c6ab 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-all-v2.css
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-all-v2.css
@@ -1081,6 +1081,11 @@ h4.iconAndTitle a:focus {
text-decoration: none;
}
+li.list-separator {
+ border-top: 1px solid #e5e5e5;
+ padding-top: .4em;
+ margin-top: .4em;
+}
.list-inline > li {
padding-left: 0px;
@@ -1106,3 +1111,5 @@ div.sidebar-panel div.extra-content {
color: green;
}
+
+