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 10:50:19 UTC

[isis] 02/03: ISIS-2340: extract common models for branding and user-profile

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

commit a8e46d062a0f344a2ba60f3bc89df6f49d7751bb
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Apr 9 12:48:58 2020 +0200

    ISIS-2340: extract common models for branding and user-profile
---
 .../services/userprof/UserProfileService.java      |  2 -
 .../vaadin/ui/IsisModuleIncViewerVaadinUi.java     |  2 +
 .../common/model/IsisModuleViewerCommon.java}      | 31 ++++++------
 .../common/model/branding/BrandingUiModel.java}    | 31 +++++++-----
 .../model/branding/BrandingUiModelProvider.java}   | 37 +++++++++-----
 .../viewer/common/model/header/HeaderUiModel.java} | 28 +++++------
 .../common/model/header/HeaderUiModelProvider.java | 22 ++++++++
 .../model/userprofile/UserProfileUiModel.java}     | 25 ++++------
 .../userprofile/UserProfileUiModelProvider.java    | 28 +++++++++++
 .../viewer/wicket/ui/IsisModuleViewerWicketUi.java |  2 +
 .../serviceactions/TertiaryActionsPanel.java       |  2 +-
 .../wicket/ui/components/header/HeaderPanel.java   | 58 ++++++----------------
 .../ui/components/widgets/navbar/BrandLogo.java    | 11 ++--
 .../ui/components/widgets/navbar/BrandName.java    | 18 +++----
 .../accmngt/AccountManagementPageAbstract.java     | 12 +++--
 .../viewer/wicket/ui/panels/PanelAbstract.java     |  2 -
 .../isis/viewer/wicket/ui/panels/PanelBase.java    |  8 +++
 17 files changed, 179 insertions(+), 140 deletions(-)

diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/userprof/UserProfileService.java b/api/applib/src/main/java/org/apache/isis/applib/services/userprof/UserProfileService.java
index f9e5651..238f094 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/userprof/UserProfileService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/userprof/UserProfileService.java
@@ -18,8 +18,6 @@
  */
 package org.apache.isis.applib.services.userprof;
 
-import org.apache.isis.applib.annotation.Programmatic;
-
 /**
  * Optional API providing details about the user.
  *
diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/IsisModuleIncViewerVaadinUi.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/IsisModuleIncViewerVaadinUi.java
index 7e0d858..99ffde6 100644
--- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/IsisModuleIncViewerVaadinUi.java
+++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/IsisModuleIncViewerVaadinUi.java
@@ -26,11 +26,13 @@ import org.springframework.context.annotation.Import;
 import org.apache.isis.incubator.viewer.vaadin.model.IsisModuleIncViewerVaadinModel;
 import org.apache.isis.incubator.viewer.vaadin.ui.auth.LogoutHandlerVaa;
 import org.apache.isis.incubator.viewer.vaadin.ui.auth.VaadinAuthenticationHandler;
+import org.apache.isis.viewer.common.model.IsisModuleViewerCommon;
 
 
 @Configuration
 @Import({
         // modules
+        IsisModuleViewerCommon.class,
         IsisModuleIncViewerVaadinModel.class,
 
         // @Service's
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/Placement.java b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/IsisModuleViewerCommon.java
similarity index 56%
copy from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/Placement.java
copy to viewers/common/src/main/java/org/apache/isis/viewer/common/model/IsisModuleViewerCommon.java
index c8c5202..933793e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/Placement.java
+++ b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/IsisModuleViewerCommon.java
@@ -16,24 +16,23 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.wicket.ui.components.widgets.navbar;
+package org.apache.isis.viewer.common.model;
 
-import java.util.Optional;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 
-import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.viewer.common.model.branding.BrandingUiModelProvider;
+import org.apache.isis.viewer.common.model.header.HeaderUiModelProvider;
+import org.apache.isis.viewer.common.model.userprofile.UserProfileUiModelProvider;
 
-import lombok.val;
+@Configuration
+@Import({
 
-public enum Placement {
-    HEADER,
-    SIGNIN;
-
-    String urlFor(final String logoHeaderUrl, final String logoSigninUrl) {
-        return this == Placement.HEADER ? logoHeaderUrl : logoSigninUrl;
-    }
-
-    Optional<String> configFrom(IsisConfiguration isisConfiguration) {
-        val appConfig = isisConfiguration.getViewer().getWicket().getApplication();
-        return this == Placement.HEADER ? appConfig.getBrandLogoHeader() : appConfig.getBrandLogoSignin();
-    }
+    // @Service's
+    BrandingUiModelProvider.class,
+    UserProfileUiModelProvider.class,
+    HeaderUiModelProvider.class,
+    
+})
+public class IsisModuleViewerCommon {
 }
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/Placement.java b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/branding/BrandingUiModel.java
similarity index 56%
copy from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/Placement.java
copy to viewers/common/src/main/java/org/apache/isis/viewer/common/model/branding/BrandingUiModel.java
index c8c5202..3996946 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/Placement.java
+++ b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/branding/BrandingUiModel.java
@@ -16,24 +16,31 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.wicket.ui.components.widgets.navbar;
+package org.apache.isis.viewer.common.model.branding;
 
+import java.io.Serializable;
 import java.util.Optional;
 
-import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.commons.internal.base._Strings;
 
-import lombok.val;
+import lombok.RequiredArgsConstructor;
 
-public enum Placement {
-    HEADER,
-    SIGNIN;
+@RequiredArgsConstructor(staticName = "of")
+public class BrandingUiModel implements Serializable {
 
-    String urlFor(final String logoHeaderUrl, final String logoSigninUrl) {
-        return this == Placement.HEADER ? logoHeaderUrl : logoSigninUrl;
+    private static final long serialVersionUID = 1L;
+    
+    private final String name;
+    private final String logoHref;
+    
+    public Optional<String> getName() {
+        return _Strings.isNotEmpty(logoHref)
+                ? Optional.empty()
+                : Optional.ofNullable(name);
     }
-
-    Optional<String> configFrom(IsisConfiguration isisConfiguration) {
-        val appConfig = isisConfiguration.getViewer().getWicket().getApplication();
-        return this == Placement.HEADER ? appConfig.getBrandLogoHeader() : appConfig.getBrandLogoSignin();
+    
+    public Optional<String> getLogoHref() {
+        return Optional.ofNullable(logoHref);
     }
+    
 }
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/Placement.java b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/branding/BrandingUiModelProvider.java
similarity index 51%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/Placement.java
rename to viewers/common/src/main/java/org/apache/isis/viewer/common/model/branding/BrandingUiModelProvider.java
index c8c5202..3450d5a 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/Placement.java
+++ b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/branding/BrandingUiModelProvider.java
@@ -16,24 +16,35 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.wicket.ui.components.widgets.navbar;
+package org.apache.isis.viewer.common.model.branding;
 
-import java.util.Optional;
+import javax.inject.Inject;
 
-import org.apache.isis.core.config.IsisConfiguration;
+import org.springframework.stereotype.Service;
 
-import lombok.val;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.IsisConfiguration.Viewer.Wicket.Application;
 
-public enum Placement {
-    HEADER,
-    SIGNIN;
+@Service
+public class BrandingUiModelProvider {
+    
+    private final Application appConfig;
 
-    String urlFor(final String logoHeaderUrl, final String logoSigninUrl) {
-        return this == Placement.HEADER ? logoHeaderUrl : logoSigninUrl;
+    @Inject 
+    public BrandingUiModelProvider(IsisConfiguration isisConfiguration) {
+        this.appConfig = isisConfiguration.getViewer().getWicket().getApplication();
     }
-
-    Optional<String> configFrom(IsisConfiguration isisConfiguration) {
-        val appConfig = isisConfiguration.getViewer().getWicket().getApplication();
-        return this == Placement.HEADER ? appConfig.getBrandLogoHeader() : appConfig.getBrandLogoSignin();
+    
+    public BrandingUiModel getHeaderBranding() {
+        return BrandingUiModel.of(
+                appConfig.getName(),
+                appConfig.getBrandLogoHeader().orElse(null));
+    }
+    
+    public BrandingUiModel getSignInBranding() {
+        return BrandingUiModel.of(
+                appConfig.getName(),
+                appConfig.getBrandLogoSignin().orElse(null));
     }
+    
 }
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/IsisModuleViewerWicketUi.java b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/header/HeaderUiModel.java
similarity index 56%
copy from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/IsisModuleViewerWicketUi.java
copy to viewers/common/src/main/java/org/apache/isis/viewer/common/model/header/HeaderUiModel.java
index 3398149..a3c795b 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/IsisModuleViewerWicketUi.java
+++ b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/header/HeaderUiModel.java
@@ -16,23 +16,21 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.wicket.ui;
+package org.apache.isis.viewer.common.model.header;
 
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
+import org.apache.isis.viewer.common.model.branding.BrandingUiModel;
+import org.apache.isis.viewer.common.model.userprofile.UserProfileUiModel;
 
-import org.apache.isis.viewer.wicket.model.IsisModuleViewerWicketModel;
-import org.apache.isis.viewer.wicket.ui.app.logout.LogoutHandlerWkt;
-import org.apache.isis.viewer.wicket.ui.components.widgets.themepicker.IsisWicketThemeSupportDefault;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
-@Configuration
-@Import({
-        // modules
-        IsisModuleViewerWicketModel.class,
+@Data
+@AllArgsConstructor(staticName = "of")
+@NoArgsConstructor
+public class HeaderUiModel {
 
-        // @Service's
-        IsisWicketThemeSupportDefault.class,
-        LogoutHandlerWkt.class,
-})
-public class IsisModuleViewerWicketUi {
+    private BrandingUiModel branding;
+    private UserProfileUiModel userProfile;
+    
 }
diff --git a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/header/HeaderUiModelProvider.java b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/header/HeaderUiModelProvider.java
new file mode 100644
index 0000000..66846a7
--- /dev/null
+++ b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/header/HeaderUiModelProvider.java
@@ -0,0 +1,22 @@
+package org.apache.isis.viewer.common.model.header;
+
+import javax.inject.Inject;
+
+import org.springframework.stereotype.Service;
+
+import org.apache.isis.viewer.common.model.branding.BrandingUiModelProvider;
+import org.apache.isis.viewer.common.model.userprofile.UserProfileUiModelProvider;
+
+@Service
+public class HeaderUiModelProvider {
+    
+    @Inject private BrandingUiModelProvider brandingUiModelProvider;
+    @Inject private UserProfileUiModelProvider userProfileUiModelProvider;
+
+    public HeaderUiModel getHeader() {
+        return HeaderUiModel.of(
+                brandingUiModelProvider.getHeaderBranding(),
+                userProfileUiModelProvider.getUserProfile());
+    }
+    
+}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/IsisModuleViewerWicketUi.java b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/userprofile/UserProfileUiModel.java
similarity index 56%
copy from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/IsisModuleViewerWicketUi.java
copy to viewers/common/src/main/java/org/apache/isis/viewer/common/model/userprofile/UserProfileUiModel.java
index 3398149..57ce2da 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/IsisModuleViewerWicketUi.java
+++ b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/userprofile/UserProfileUiModel.java
@@ -16,23 +16,16 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.wicket.ui;
+package org.apache.isis.viewer.common.model.userprofile;
 
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
-import org.apache.isis.viewer.wicket.model.IsisModuleViewerWicketModel;
-import org.apache.isis.viewer.wicket.ui.app.logout.LogoutHandlerWkt;
-import org.apache.isis.viewer.wicket.ui.components.widgets.themepicker.IsisWicketThemeSupportDefault;
+@Data
+@AllArgsConstructor(staticName = "of")
+@NoArgsConstructor
+public class UserProfileUiModel {
 
-@Configuration
-@Import({
-        // modules
-        IsisModuleViewerWicketModel.class,
-
-        // @Service's
-        IsisWicketThemeSupportDefault.class,
-        LogoutHandlerWkt.class,
-})
-public class IsisModuleViewerWicketUi {
+    private String userProfileName;
 }
diff --git a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/userprofile/UserProfileUiModelProvider.java b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/userprofile/UserProfileUiModelProvider.java
new file mode 100644
index 0000000..37518ac
--- /dev/null
+++ b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/userprofile/UserProfileUiModelProvider.java
@@ -0,0 +1,28 @@
+package org.apache.isis.viewer.common.model.userprofile;
+
+import javax.inject.Inject;
+
+import org.springframework.stereotype.Service;
+
+import org.apache.isis.applib.services.userprof.UserProfileService;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSessionTracker;
+
+@Service
+public class UserProfileUiModelProvider implements UserProfileService {
+
+    @Inject private AuthenticationSessionTracker authenticationSessionTracker;
+    
+    @Override
+    public String userProfileName() {
+        return authenticationSessionTracker
+                .currentAuthenticationSession()
+                .map(AuthenticationSession::getUserName)
+                .orElse("<Anonymous>");
+    }
+
+    public UserProfileUiModel getUserProfile() {
+        return UserProfileUiModel.of(userProfileName());
+    }
+    
+}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/IsisModuleViewerWicketUi.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/IsisModuleViewerWicketUi.java
index 3398149..e7e71e9 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/IsisModuleViewerWicketUi.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/IsisModuleViewerWicketUi.java
@@ -21,6 +21,7 @@ package org.apache.isis.viewer.wicket.ui;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
+import org.apache.isis.viewer.common.model.IsisModuleViewerCommon;
 import org.apache.isis.viewer.wicket.model.IsisModuleViewerWicketModel;
 import org.apache.isis.viewer.wicket.ui.app.logout.LogoutHandlerWkt;
 import org.apache.isis.viewer.wicket.ui.components.widgets.themepicker.IsisWicketThemeSupportDefault;
@@ -28,6 +29,7 @@ import org.apache.isis.viewer.wicket.ui.components.widgets.themepicker.IsisWicke
 @Configuration
 @Import({
         // modules
+        IsisModuleViewerCommon.class,
         IsisModuleViewerWicketModel.class,
 
         // @Service's
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 f9613df..0b01203 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
@@ -41,7 +41,7 @@ public class TertiaryActionsPanel extends MenuActionPanel {
     public TertiaryActionsPanel(String id, List<CssMenuItem> menuItems) {
         super(id);
         val subMenuItems = flatten(menuItems);
-        add(subMenuItemsView(subMenuItems));
+        add(super.subMenuItemsView(subMenuItems));
     }
 
     @Override
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.java
index 777e0e0..c7cb395 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.java
@@ -22,7 +22,6 @@ import java.util.Locale;
 
 import org.apache.wicket.Component;
 import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.Page;
 import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.link.BookmarkablePageLink;
@@ -30,13 +29,13 @@ import org.apache.wicket.model.Model;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 
 import org.apache.isis.applib.annotation.DomainServiceLayout;
-import org.apache.isis.applib.services.userprof.UserProfileService;
+import org.apache.isis.viewer.common.model.branding.BrandingUiModel;
+import org.apache.isis.viewer.common.model.userprofile.UserProfileUiModel;
 import org.apache.isis.viewer.wicket.model.common.PageParametersUtils;
 import org.apache.isis.viewer.wicket.model.models.ServiceActionsModel;
 import org.apache.isis.viewer.wicket.ui.ComponentType;
 import org.apache.isis.viewer.wicket.ui.components.widgets.navbar.BrandLogo;
 import org.apache.isis.viewer.wicket.ui.components.widgets.navbar.BrandName;
-import org.apache.isis.viewer.wicket.ui.components.widgets.navbar.Placement;
 import org.apache.isis.viewer.wicket.ui.pages.error.ErrorPage;
 import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
 import org.apache.isis.viewer.wicket.ui.util.Components;
@@ -68,8 +67,10 @@ public class HeaderPanel extends PanelAbstract<Model<String>> {
     protected void onInitialize() {
         super.onInitialize();
 
-        addApplicationName();
-        addUserName();
+        val headerUiModel = super.getHeaderModel();
+        
+        addApplicationName(headerUiModel.getBranding());
+        addUserName(headerUiModel.getUserProfile());
         addServiceActionMenuBars();
     }
 
@@ -81,49 +82,21 @@ public class HeaderPanel extends PanelAbstract<Model<String>> {
         setVisible(parameters.get(PageParametersUtils.ISIS_NO_HEADER_PARAMETER_NAME).isNull());
     }
 
-    protected void addApplicationName() {
-        Class<? extends Page> homePage = getApplication().getHomePage();
-        final BookmarkablePageLink<Void> applicationNameLink = new BookmarkablePageLink<>("applicationName", homePage);
-
-        final Placement placement = Placement.HEADER;
-        final BrandLogo brandImage = new BrandLogo("brandLogo", placement);
-        final BrandName brandName = new BrandName("brandText", Placement.HEADER);
-        applicationNameLink.add(brandName, brandImage);
+    protected void addApplicationName(BrandingUiModel branding) {
+        val homePage = getApplication().getHomePage();
+        val applicationNameLink = new BookmarkablePageLink<Void>("applicationName", homePage);
+        applicationNameLink.add(
+                new BrandName("brandText", branding),
+                new BrandLogo("brandLogo", branding));
 
         add(applicationNameLink);
     }
 
-
-    protected void addUserName() {
-        final UserProfileService userProfileService = getUserProfileService();
-        final Label userName = new Label(ID_USER_NAME, userProfileService.userProfileName());
+    protected void addUserName(UserProfileUiModel userProfile) {
+        val userName = new Label(ID_USER_NAME, userProfile.getUserProfileName());
         add(userName);
     }
 
-    private UserProfileService getUserProfileService() {
-        
-        val commonContext = super.getCommonContext();
-        
-        return new UserProfileService() {
-            @Override
-            public String userProfileName() {
-                if(getPage() instanceof ErrorPage) {
-                    return commonContext.getAuthenticationSessionTracker()
-                            .getAuthenticationSessionElseFail()
-                            .getUserName();
-                }
-                try {
-                    val userProfileService = commonContext.lookupServiceElseFail(UserProfileService.class);
-                    return userProfileService.userProfileName();
-                } catch (final Exception e) {
-                    return commonContext.getAuthenticationSessionTracker()
-                            .getAuthenticationSessionElseFail()
-                            .getUserName();
-                }
-            }
-        };
-    }
-
     protected void addServiceActionMenuBars() {
         if (getPage() instanceof ErrorPage) {
             Components.permanentlyHide(this, ID_PRIMARY_MENU_BAR);
@@ -145,7 +118,8 @@ public class HeaderPanel extends PanelAbstract<Model<String>> {
         Component menuBarComponent = getComponentFactoryRegistry().createComponent(ComponentType.SERVICE_ACTIONS, id, model);
         menuBarComponent.add(AttributeAppender.append("class", menuBar.name().toLowerCase(Locale.ENGLISH)));
         container.add(menuBarComponent);
-
     }
+    
+
 
 }
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java
index e0d322d..5611057 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java
@@ -20,6 +20,7 @@ package org.apache.isis.viewer.wicket.ui.components.widgets.navbar;
 
 import org.apache.wicket.markup.ComponentTag;
 
+import org.apache.isis.viewer.common.model.branding.BrandingUiModel;
 import org.apache.isis.viewer.wicket.ui.components.WebComponentBase;
 
 /**
@@ -29,7 +30,7 @@ public class BrandLogo extends WebComponentBase {
 
     private static final long serialVersionUID = 1L;
 
-    private final Placement placement;
+    private final BrandingUiModel branding;
 
     /**
      * Constructor.
@@ -37,16 +38,16 @@ public class BrandLogo extends WebComponentBase {
      * @param id The component id
      * @param placement
      */
-    public BrandLogo(final String id, final Placement placement) {
+    public BrandLogo(final String id, final BrandingUiModel branding) {
         super(id);
-        this.placement = placement;
+        this.branding = branding;
     }
 
     @Override
     protected void onComponentTag(final ComponentTag tag) {
         super.onComponentTag(tag);
 
-        placement.configFrom(getIsisConfiguration())
+        branding.getLogoHref()
             .map(super.getWebAppContextPath()::prependContextPathIfLocal)
             .ifPresent(url -> tag.put("src", url));
     }
@@ -54,7 +55,7 @@ public class BrandLogo extends WebComponentBase {
     @Override
     protected void onConfigure() {
         super.onConfigure();
-        setVisible(placement.configFrom(getIsisConfiguration()).isPresent());
+        setVisible(branding.getLogoHref().isPresent());
     }
 
 
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java
index f99e046..c5e6e4d 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java
@@ -18,10 +18,9 @@
  */
 package org.apache.isis.viewer.wicket.ui.components.widgets.navbar;
 
-import java.util.Optional;
-
 import org.apache.wicket.model.Model;
 
+import org.apache.isis.viewer.common.model.branding.BrandingUiModel;
 import org.apache.isis.viewer.wicket.ui.components.LabelBase;
 
 /**
@@ -31,8 +30,7 @@ public class BrandName extends LabelBase {
 
     private static final long serialVersionUID = 1L;
 
-    private final Placement placement;
-    private final String applicationName;
+    private final BrandingUiModel branding;
     
     /**
      * Constructor.
@@ -40,20 +38,16 @@ public class BrandName extends LabelBase {
      * @param id The component id
      * @param placement
      */
-    public BrandName(final String id, final Placement placement) {
+    public BrandName(final String id, final BrandingUiModel branding) {
         super(id);
-        this.placement = placement;
-
-        applicationName = getIsisConfiguration().getViewer().getWicket().getApplication().getName();
-
-        setDefaultModel(Model.of(applicationName));
+        this.branding = branding;
+        setDefaultModel(Model.of(branding.getName().orElse("")));
     }
 
     @Override
     protected void onConfigure() {
         super.onConfigure();
-
-        setVisible(! placement.configFrom(getIsisConfiguration()).isPresent());
+        setVisible(branding.getName().isPresent());
     }
 
 }
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
index 535a1c4..129f222 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
@@ -33,15 +33,17 @@ import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.link.BookmarkablePageLink;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 
+import org.apache.isis.viewer.common.model.branding.BrandingUiModelProvider;
 import org.apache.isis.viewer.wicket.model.models.PageType;
 import org.apache.isis.viewer.wicket.ui.components.widgets.navbar.BrandLogo;
 import org.apache.isis.viewer.wicket.ui.components.widgets.navbar.BrandName;
-import org.apache.isis.viewer.wicket.ui.components.widgets.navbar.Placement;
 import org.apache.isis.viewer.wicket.ui.errors.ExceptionModel;
 import org.apache.isis.viewer.wicket.ui.errors.ExceptionStackTracePanel;
 import org.apache.isis.viewer.wicket.ui.pages.PageAbstract;
 import org.apache.isis.viewer.wicket.ui.pages.WebPageBase;
 
+import lombok.val;
+
 import de.agilecoders.wicket.core.markup.html.bootstrap.behavior.BootstrapJavascriptBehavior;
 import de.agilecoders.wicket.core.markup.html.references.BootstrapJavaScriptReference;
 
@@ -103,9 +105,11 @@ public class AccountManagementPageAbstract extends WebPageBase {
     }
 
     private void addApplicationName(MarkupContainer parent) {
-        final Placement placement = Placement.SIGNIN;
-        final BrandLogo brandLogo = new BrandLogo("brandLogo", placement);
-        final BrandName brandName = new BrandName(ID_APPLICATION_NAME, placement);
+        val branding = super.getCommonContext()
+                .lookupServiceElseFail(BrandingUiModelProvider.class)
+                .getSignInBranding();
+        val brandLogo = new BrandLogo("brandLogo", branding);
+        val brandName = new BrandName(ID_APPLICATION_NAME, branding);
         parent.add(brandName, brandLogo);
     }
 
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
index 4f22aa0..05642e4 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
@@ -25,10 +25,8 @@ import org.apache.wicket.Component;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.model.IModel;
 
-import org.apache.isis.applib.annotation.SemanticsOf;
 import org.apache.isis.viewer.wicket.ui.ComponentType;
 import org.apache.isis.viewer.wicket.ui.util.Components;
-import org.apache.isis.viewer.wicket.ui.util.Confirmations;
 
 /**
  * Convenience adapter for {@link Panel}s built up using {@link ComponentType}s.
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
index e82c79e..2bd6f7c 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
@@ -34,6 +34,8 @@ import org.apache.isis.core.metamodel.context.MetaModelContext;
 import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
 import org.apache.isis.core.security.authentication.MessageBroker;
 import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.viewer.common.model.header.HeaderUiModel;
+import org.apache.isis.viewer.common.model.header.HeaderUiModelProvider;
 import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
 import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
 import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
@@ -68,6 +70,7 @@ public class PanelBase<T> extends GenericPanel<T> implements IsisWebAppCommonCon
     private transient EmailNotificationService emailNotificationService;
     private transient EmailVerificationUrlService emailVerificationUrlService;
     private transient PageNavigationService pageNavigationService;
+    private transient HeaderUiModelProvider headerUiModelProvider;
     
     protected PanelBase(String id) {
         this(id, null);
@@ -137,6 +140,11 @@ public class PanelBase<T> extends GenericPanel<T> implements IsisWebAppCommonCon
     protected MessageBroker getMessageBroker() {
         return commonContext.getAuthenticationSessionTracker().getMessageBrokerElseFail();
     }
+    
+    protected HeaderUiModel getHeaderModel() {
+        headerUiModelProvider = computeIfAbsent(HeaderUiModelProvider.class, headerUiModelProvider);
+        return headerUiModelProvider.getHeader();
+    }
 
     // Hint support