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/09 14:45:37 UTC
[isis] branch master updated: ISIS-2340: plug the new common ui
header model into vaadin (main view)
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 1026086 ISIS-2340: plug the new common ui header model into vaadin (main view)
1026086 is described below
commit 1026086a606af6805d3b7493b3af352172ecd636
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Apr 9 16:45:27 2020 +0200
ISIS-2340: plug the new common ui header model into vaadin (main view)
---
.../viewer/vaadin/ui/pages/main/MainView.java | 14 ++-
.../viewer/vaadin/ui/pages/main/MenuUtil.java | 45 ++++---
.../vaadin/ui/pages/main/SimpleMainView.java | 136 ---------------------
.../model/branding/BrandingUiModelProvider.java | 1 +
.../isis/viewer/common/model/menu/MenuUiModel.java | 28 +++++
...actory.java => MenuUiModel_buildMenuItems.java} | 4 +-
.../serviceactions/ServiceActionUtil.java | 15 +--
.../serviceactions/ServiceActionsPanelFactory.java | 12 +-
.../serviceactions/TertiaryMenuPanelFactory.java | 13 +-
9 files changed, 77 insertions(+), 191 deletions(-)
diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/MainView.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/MainView.java
index 3b95c87..24f86e6 100644
--- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/MainView.java
+++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/MainView.java
@@ -35,11 +35,11 @@ import com.vaadin.flow.theme.lumo.Lumo;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.context.MetaModelContext;
-import org.apache.isis.core.runtimeservices.menubars.bootstrap3.MenuBarsServiceBS3;
import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import org.apache.isis.incubator.viewer.vaadin.model.action.MenuActionVaa;
import org.apache.isis.incubator.viewer.vaadin.ui.components.collection.TableView;
import org.apache.isis.incubator.viewer.vaadin.ui.components.object.ObjectFormView;
+import org.apache.isis.viewer.common.model.header.HeaderUiModelProvider;
import lombok.val;
@@ -58,7 +58,7 @@ implements BeforeEnterObserver {
private static final long serialVersionUID = 1L;
private final transient IsisWebAppCommonContext commonContext;
- private final transient MenuBarsServiceBS3 menuBarsService;
+ private final transient HeaderUiModelProvider headerUiModelProvider;
private Div pageContent = new Div();
/**
@@ -67,10 +67,10 @@ implements BeforeEnterObserver {
@Inject
public MainView(
final MetaModelContext metaModelContext,
- final MenuBarsServiceBS3 menuBarsService) {
+ final HeaderUiModelProvider headerUiModelProvider) {
this.commonContext = IsisWebAppCommonContext.of(metaModelContext);
- this.menuBarsService = menuBarsService;
+ this.headerUiModelProvider = headerUiModelProvider;
}
@Override
@@ -78,7 +78,11 @@ implements BeforeEnterObserver {
setPrimarySection(Section.NAVBAR);
- val menuBarContainer = MenuUtil.createMenu(commonContext, menuBarsService, this::onMenuAction);
+ val menuBarContainer = MenuUtil.createMenu(
+ commonContext,
+ headerUiModelProvider.getHeader(),
+ this::onMenuAction);
+
addToNavbar(menuBarContainer);
setContent(pageContent = new Div());
setDrawerOpened(false);
diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/MenuUtil.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/MenuUtil.java
index 39666ad..01367a9 100644
--- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/MenuUtil.java
+++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/MenuUtil.java
@@ -12,14 +12,13 @@ import com.vaadin.flow.component.menubar.MenuBar;
import com.vaadin.flow.component.orderedlayout.FlexComponent.Alignment;
import com.vaadin.flow.component.orderedlayout.FlexLayout;
-import org.apache.isis.applib.layout.menubars.bootstrap3.BS3MenuBar;
-import org.apache.isis.applib.services.menu.MenuBarsService.Type;
-import org.apache.isis.core.runtimeservices.menubars.bootstrap3.MenuBarsServiceBS3;
import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import org.apache.isis.incubator.viewer.vaadin.model.action.MenuActionFactoryVaa;
import org.apache.isis.incubator.viewer.vaadin.model.action.MenuActionVaa;
import org.apache.isis.incubator.viewer.vaadin.model.menu.MenuItemVaa;
-import org.apache.isis.viewer.common.model.menu.MenuModelFactory;
+import org.apache.isis.viewer.common.model.branding.BrandingUiModel;
+import org.apache.isis.viewer.common.model.header.HeaderUiModel;
+import org.apache.isis.viewer.common.model.menu.MenuUiModel;
import lombok.val;
import lombok.experimental.UtilityClass;
@@ -30,10 +29,10 @@ final class MenuUtil {
static Component createMenu(
final IsisWebAppCommonContext commonContext,
- final MenuBarsServiceBS3 menuBarsService,
+ final HeaderUiModel headerUiModel,
final Consumer<MenuActionVaa> subMenuEventHandler) {
- val titleOrLogo = createTitleOrLogo(commonContext);
+ val titleOrLogo = createTitleOrLogo(commonContext, headerUiModel.getBranding());
val leftMenuBar = new MenuBar();
val horizontalSpacer = new Div();
// horizontalSpacer.setWidthFull();
@@ -54,8 +53,6 @@ final class MenuUtil {
menuBarContainer.setWidthFull();
- val bs3MenuBars = menuBarsService.menuBars(Type.DEFAULT);
-
// menu section handler, that creates and adds sub-menus to their parent top level menu
final BiConsumer<MenuBar, MenuItemVaa> menuSectionBuilder = (parentMenu, menuSectionUiModel) -> {
val menuItem = parentMenu.addItem(menuSectionUiModel.getName());
@@ -76,14 +73,14 @@ final class MenuUtil {
};
// top level left aligned ...
- buildMenuModel(commonContext, bs3MenuBars.getPrimary(), newMenuItem->
+ buildMenuModel(commonContext, headerUiModel.getPrimary(), newMenuItem->
menuSectionBuilder.accept(leftMenuBar, newMenuItem));
// top level right aligned ...
- buildMenuModel(commonContext, bs3MenuBars.getSecondary(), newMenuItem->
+ buildMenuModel(commonContext, headerUiModel.getSecondary(), newMenuItem->
menuSectionBuilder.accept(rightMenuBar, newMenuItem));
// TODO tertiary menu items should get collected under a top level menu labeled with the current user's name
- buildMenuModel(commonContext, bs3MenuBars.getTertiary(), newMenuItem->
+ buildMenuModel(commonContext, headerUiModel.getTertiary(), newMenuItem->
menuSectionBuilder.accept(rightMenuBar, newMenuItem));
return menuBarContainer;
@@ -92,34 +89,34 @@ final class MenuUtil {
// -- HELPER
- private static Component createTitleOrLogo(IsisWebAppCommonContext commonContext) {
+ private static Component createTitleOrLogo(
+ final IsisWebAppCommonContext commonContext,
+ final BrandingUiModel brandingUiModel) {
- val isisConfiguration = commonContext.getConfiguration();
- val webAppContextPath = commonContext.getWebAppContextPath();
- //TODO application name/logo borrowed from Wicket's configuration, we might generalize this config option to all viewers
- val applicationName = isisConfiguration.getViewer().getWicket().getApplication().getName();
- val applicationLogo = isisConfiguration.getViewer().getWicket().getApplication().getBrandLogoHeader();
+ val brandingName = brandingUiModel.getName();
+ val brandingLogo = brandingUiModel.getLogoHref();
- if(applicationLogo.isPresent()) {
- val logo = new Image(webAppContextPath.prependContextPathIfLocal(applicationLogo.get()), "logo");
+ if(brandingLogo.isPresent()) {
+ val webAppContextPath = commonContext.getWebAppContextPath();
+ val logo = new Image(
+ webAppContextPath.prependContextPathIfLocal(brandingLogo.get()),
+ "brandingLogo");
logo.setWidth("48px");
logo.setHeight("48px");
return logo;
}
-
- return new Text(applicationName);
+ return new Text(brandingName.orElse("App"));
}
private static void buildMenuModel(
final IsisWebAppCommonContext commonContext,
- final BS3MenuBar menuBar,
+ final MenuUiModel menuUiModel,
final Consumer<MenuItemVaa> onNewMenuItem) {
- MenuModelFactory.buildMenuItems(
+ menuUiModel.buildMenuItems(
commonContext,
- menuBar,
new MenuActionFactoryVaa(),
MenuItemVaa::newMenuItem,
onNewMenuItem);
diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/SimpleMainView.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/SimpleMainView.java
deleted file mode 100644
index e65fdd7..0000000
--- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/SimpleMainView.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * 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.incubator.viewer.vaadin.ui.pages.main;
-
-import java.util.Collections;
-
-import javax.inject.Inject;
-
-import com.vaadin.flow.component.ClickEvent;
-import com.vaadin.flow.component.ComponentEventListener;
-import com.vaadin.flow.component.Text;
-import com.vaadin.flow.component.button.Button;
-import com.vaadin.flow.component.dependency.JsModule;
-import com.vaadin.flow.component.html.Div;
-import com.vaadin.flow.component.orderedlayout.VerticalLayout;
-import com.vaadin.flow.router.Route;
-import com.vaadin.flow.theme.Theme;
-import com.vaadin.flow.theme.lumo.Lumo;
-
-import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
-import org.apache.isis.core.metamodel.context.MetaModelContext;
-import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.runtimeservices.menubars.bootstrap3.MenuBarsServiceBS3;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
-import org.apache.isis.incubator.viewer.vaadin.model.action.MenuActionVaa;
-import org.apache.isis.incubator.viewer.vaadin.ui.components.collection.TableView;
-import org.apache.isis.incubator.viewer.vaadin.ui.components.object.ObjectFormView;
-
-import lombok.val;
-
-@Route("simple")
-@JsModule("@vaadin/vaadin-lumo-styles/presets/compact.js")
-//@Theme(value = Material.class, variant = Material.DARK)
-@Theme(value = Lumo.class)
-//@Log4j2
-public class SimpleMainView extends VerticalLayout {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * Constructs the main view of the web-application, with the menu-bar and page content.
- */
- @Inject
- public SimpleMainView(
- final MetaModelContext metaModelContext,
- final MenuBarsServiceBS3 menuBarsService) {
-
- val commonContext = IsisWebAppCommonContext.of(metaModelContext);
-
- val selectedMenuItem = new Text("");
- val actionResult = new VerticalLayout();
- val message = new Div(new Text("Selected: "), selectedMenuItem);
-
- val menuBarContainer = MenuUtil.createMenu(commonContext, menuBarsService, saModel ->
- onMenuAction(saModel, selectedMenuItem, actionResult));
-
- add(menuBarContainer);
- add(message);
- add(actionResult);
-
- setWidthFull();
- }
-
-
- private void onMenuAction(
- final MenuActionVaa saModel,
- final Text selected,
- final VerticalLayout actionResultDiv) {
-
- val objectAction = saModel.getObjectAction();
-
- actionResultDiv.removeAll();
-
- selected.setText(objectAction.toString());
- objectAction.getParameters();
- actionResultDiv.add(new Div(new Text("Name: " + objectAction.getName())));
- actionResultDiv.add(new Div(new Text("Description: " + objectAction.getDescription())));
- actionResultDiv.add(new Div(new Text("Parameters: " + objectAction.getParameters())));
- final Div actionResult = new Div();
- actionResult.setWidthFull();
-
- if (objectAction.isAction() && objectAction.getParameters().isEmpty()) {
- actionResultDiv.add(new Button("run", executeAndHandleResultAction(saModel, objectAction, actionResult)));
- actionResultDiv.add(actionResult);
- }
- actionResultDiv.setWidthFull();
-
- }
-
- private ComponentEventListener<ClickEvent<Button>> executeAndHandleResultAction(
- final MenuActionVaa menuActionModel,
- final ObjectAction objectAction,
- final Div actionResult) {
-
- return buttonClickEvent -> {
-
- actionResult.removeAll();
-
- val actionOwner = menuActionModel.getActionHolder().getManagedObject();
-
- val result = objectAction
- .execute(
- actionOwner,
- null,
- Collections.emptyList(),
- InteractionInitiatedBy.USER
- );
-
- if (result.getSpecification().isParentedOrFreeCollection()) {
- actionResult.add(TableView.fromCollection(result));
- } else {
- actionResult.add(new ObjectFormView(result));
- }
-
- };
- }
-
-
-
-}
\ No newline at end of file
diff --git a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/branding/BrandingUiModelProvider.java b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/branding/BrandingUiModelProvider.java
index 3450d5a..fa9826a 100644
--- a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/branding/BrandingUiModelProvider.java
+++ b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/branding/BrandingUiModelProvider.java
@@ -32,6 +32,7 @@ public class BrandingUiModelProvider {
@Inject
public BrandingUiModelProvider(IsisConfiguration isisConfiguration) {
+ //TODO application name/logo borrowed from Wicket's configuration, we might generalize this config option to all viewers
this.appConfig = isisConfiguration.getViewer().getWicket().getApplication();
}
diff --git a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModel.java b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModel.java
index 6cd8751..170a8d0 100644
--- a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModel.java
+++ b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModel.java
@@ -21,16 +21,23 @@ package org.apache.isis.viewer.common.model.menu;
import java.io.Serializable;
import java.util.List;
import java.util.Locale;
+import java.util.function.Consumer;
+import java.util.function.Function;
import java.util.stream.Stream;
import org.apache.isis.applib.annotation.DomainServiceLayout;
+import org.apache.isis.applib.layout.menubars.bootstrap3.BS3MenuBar;
import org.apache.isis.core.commons.internal.base._NullSafe;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.spec.ManagedObject;
+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.Getter;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
+import lombok.val;
@Getter
@RequiredArgsConstructor(staticName = "of")
@@ -53,5 +60,26 @@ public class MenuUiModel implements Serializable {
.filter(_NullSafe::isPresent);
}
+ public <T, M extends MenuItemUiModel<T, M>>
+ void buildMenuItems(
+ final IsisWebAppCommonContext commonContext,
+ final MenuActionFactory<T> menuActionFactory,
+ final Function<String, M> menuItemFactory,
+ final Consumer<M> onNewMenuItem) {
+
+ val menuBars = commonContext.getMenuBarsService().menuBars();
+
+ // TODO: remove hard-coded dependency on BS3
+ final BS3MenuBar menuBar = (BS3MenuBar) menuBars.menuBarFor(getMenuBarSelect());
+
+ MenuUiModel_buildMenuItems.buildMenuItems(
+ commonContext,
+ menuBar,
+ menuActionFactory,
+ menuItemFactory,
+ onNewMenuItem);
+
+ }
+
}
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/MenuUiModel_buildMenuItems.java
similarity index 98%
rename from viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuModelFactory.java
rename to viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModel_buildMenuItems.java
index 1c6b26a..fee2eab 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/MenuUiModel_buildMenuItems.java
@@ -28,12 +28,10 @@ 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 {
+final class MenuUiModel_buildMenuItems {
public static <T, M extends MenuItemUiModel<T, M>>
void buildMenuItems(
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 28076ae..7c485b1 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
@@ -29,16 +29,14 @@ import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
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.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import org.apache.isis.viewer.common.model.action.MenuActionFactory;
-import org.apache.isis.viewer.common.model.menu.MenuModelFactory;
+import org.apache.isis.viewer.common.model.menu.MenuUiModel;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
-import org.apache.isis.viewer.wicket.model.models.ServiceActionsModel;
import org.apache.isis.viewer.wicket.ui.components.actionmenu.CssClassFaBehavior;
import org.apache.isis.viewer.wicket.ui.pages.PageAbstract;
import org.apache.isis.viewer.wicket.ui.util.Confirmations;
@@ -165,21 +163,14 @@ public final class ServiceActionUtil {
public static void buildMenu(
final IsisWebAppCommonContext commonContext,
- final ServiceActionsModel serviceActionsModel,
+ final MenuUiModel menuUiModel,
final Consumer<CssMenuItem> onNewMenuItem) {
- val menuBars = commonContext.getMenuBarsService().menuBars();
-
- // TODO: remove hard-coded dependency on BS3
- final BS3MenuBar menuBar = (BS3MenuBar) menuBars.menuBarFor(serviceActionsModel.getObject().getMenuBarSelect());
-
- MenuModelFactory.buildMenuItems(
+ menuUiModel.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/ServiceActionsPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanelFactory.java
index 5b4d073..74a4045 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanelFactory.java
@@ -51,18 +51,20 @@ public class ServiceActionsPanelFactory extends ComponentFactoryAbstract {
if(!(model instanceof ServiceActionsModel)) {
return ApplicationAdvice.DOES_NOT_APPLY;
}
- final ServiceActionsModel serviceActionsModel = (ServiceActionsModel) model;
- final DomainServiceLayout.MenuBar menuBar = serviceActionsModel.getObject().getMenuBarSelect();
- return appliesIf(menuBar != DomainServiceLayout.MenuBar.TERTIARY && menuBar != null);
+ val menuUiModel = ((ServiceActionsModel) model).getObject();
+ val menuBarSelect = menuUiModel.getMenuBarSelect();
+ return appliesIf(
+ menuBarSelect != DomainServiceLayout.MenuBar.TERTIARY
+ && menuBarSelect != null);
}
@Override
public Component createComponent(final String id, final IModel<?> model) {
- final ServiceActionsModel serviceActionsModel = (ServiceActionsModel) model;
+ val menuUiModel = ((ServiceActionsModel) model).getObject();
val menuItems = _Lists.<CssMenuItem>newArrayList();
ServiceActionUtil.buildMenu(
- super.getCommonContext(), serviceActionsModel, menuItems::add);
+ super.getCommonContext(), menuUiModel, menuItems::add);
return new ServiceActionsPanel(id, menuItems);
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryMenuPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryMenuPanelFactory.java
index 187b941..c5740a5 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryMenuPanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryMenuPanelFactory.java
@@ -50,19 +50,20 @@ public class TertiaryMenuPanelFactory extends ComponentFactoryAbstract {
if(!(model instanceof ServiceActionsModel)) {
return ApplicationAdvice.DOES_NOT_APPLY;
}
- val serviceActionsModel = (ServiceActionsModel) model;
- final DomainServiceLayout.MenuBar menuBar = serviceActionsModel.getObject().getMenuBarSelect();
- final boolean applicability = menuBar == DomainServiceLayout.MenuBar.TERTIARY || menuBar == null;
- return appliesIf(applicability);
+ val menuUiModel = ((ServiceActionsModel) model).getObject();
+ val menuBarSelect = menuUiModel.getMenuBarSelect();
+ return appliesIf(
+ menuBarSelect == DomainServiceLayout.MenuBar.TERTIARY
+ || menuBarSelect == null);
}
@Override
public Component createComponent(final String id, final IModel<?> model) {
- val serviceActionsModel = (ServiceActionsModel) model;
+ val menuUiModel = ((ServiceActionsModel) model).getObject();
val menuItems = _Lists.<CssMenuItem>newArrayList();
ServiceActionUtil.buildMenu(
- super.getCommonContext(), serviceActionsModel, menuItems::add);
+ super.getCommonContext(), menuUiModel, menuItems::add);
return new TertiaryActionsPanel(id, menuItems);
}