Improve layers UI.

[gpl/argeo-suite.git] / core / org.argeo.suite.ui / src / org / argeo / suite / ui / SuiteApp.java

diff --git a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java
index dbed85357bbb3ced44d55cc785faa917aeb3a2a3..7087783ff55cc258ce5ae9ec3c88ffe15138b0b6 100644 (file)
--- a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java
+++ b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java
@@ -24,13 +24,13 @@ import org.apache.commons.logging.LogFactory;
 import org.argeo.api.NodeUtils;
 import org.argeo.cms.CmsUserManager;
 import org.argeo.cms.LocaleUtils;
+import org.argeo.cms.Localized;
 import org.argeo.cms.auth.CmsSession;
 import org.argeo.cms.ui.AbstractCmsApp;
 import org.argeo.cms.ui.CmsTheme;
 import org.argeo.cms.ui.CmsUiProvider;
 import org.argeo.cms.ui.CmsView;
 import org.argeo.cms.ui.dialogs.CmsFeedback;
-import org.argeo.cms.ui.util.CmsEvent;
 import org.argeo.cms.ui.util.CmsUiUtils;
 import org.argeo.eclipse.ui.specific.UiContext;
 import org.argeo.entity.EntityConstants;
@@ -61,7 +61,8 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
        private String headerPid;
        private String leadPanePid;
        private String loginScreenPid;
-//     private String DASHBOARD_PID = pidPrefix + "dashboard";
+       
+       private String defaultLayerPid = "argeo.suite.ui.dashboardLayer";
 //     private String RECENT_ITEMS_PID = pidPrefix + "recentItems";
 
        private String defaultUiName = "app";
@@ -77,7 +78,8 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
        // TODO make more optimal or via CmsSession/CmsView
        private Map<String, SuiteUi> managedUis = new HashMap<>();
 
-//     private CmsUiProvider headerPart = null;
+//     private Localized defaultTitle;
+////   private CmsUiProvider headerPart = null;
 
        public void init(Map<String, Object> properties) {
                if (log.isDebugEnabled())
@@ -137,7 +139,6 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
                        if (log.isDebugEnabled())
                                log.debug("Suite UI " + uid + " has been disposed.");
                });
-               refreshUi(argeoSuiteUi, null);
                return argeoSuiteUi;
        }
 
@@ -152,9 +153,13 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
                        Node context = null;
                        SuiteUi ui = (SuiteUi) parent;
                        CmsView cmsView = CmsView.getCmsView(parent);
+                       CmsUiProvider headerUiProvider = findUiProvider(headerPid);
+//                     if (headerUiProvider instanceof Localized) {
+//                             defaultTitle = (Localized) headerUiProvider;
+//                     }
                        if (cmsView.isAnonymous() && publicBasePath == null) {// internal app, must login
                                ui.logout();
-                               refreshPart(findUiProvider(headerPid), ui.getHeader(), context);
+                               refreshPart(headerUiProvider, ui.getHeader(), context);
                                ui.refreshBelowHeader(false);
                                refreshPart(findUiProvider(loginScreenPid), ui.getBelowHeader(), context);
                                ui.layout(true, true);
@@ -180,7 +185,7 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
                                if (context == null)
                                        context = ui.getUserDir();
 
-                               refreshPart(findUiProvider(headerPid), ui.getHeader(), context);
+                               refreshPart(headerUiProvider, ui.getHeader(), context);
                                ui.refreshBelowHeader(true);
                                for (String key : layersByPid.keySet()) {
                                        SuiteLayer layer = layersByPid.get(key).get();
@@ -188,7 +193,7 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
                                }
                                refreshPart(findUiProvider(leadPanePid), ui.getLeadPane(), context);
                                ui.layout(true, true);
-                               setState(parent, state);
+                               setState(parent, state != null ? state : defaultLayerPid);
                        }
                } catch (Exception e) {
                        CmsFeedback.show("Unexpected exception", e);
@@ -215,6 +220,12 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
                return uiProvidersByPid.get(pid).get();
        }
 
+       private SuiteLayer findLayer(String pid) {
+               if (!layersByPid.containsKey(pid))
+                       throw new IllegalArgumentException("No UI provider registered as " + pid);
+               return layersByPid.get(pid).get();
+       }
+
        private <T> T findByType(Map<String, RankedObject<T>> byType, Node context) {
                if (context == null)
                        throw new IllegalArgumentException("A node should be provided");
@@ -346,7 +357,7 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
                try {
 //                     String currentLayerId = ui.getCurrentLayerId();
 //                     SuiteLayer currentLayer = currentLayerId != null ? layersByPid.get(currentLayerId).get() : null;
-                       if (isTopic(event, SuiteEvent.refreshPart)) {
+                       if (SuiteUiUtils.isTopic(event, SuiteEvent.refreshPart)) {
                                Node node = getNode(ui, event);
                                if (node == null)
                                        return;
@@ -355,7 +366,7 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
                                ui.switchToLayer(layer, node);
                                ui.getCmsView().runAs(() -> layer.view(uiProvider, ui.getCurrentWorkArea(), node));
                                ui.getCmsView().stateChanged(nodeToState(node), Jcr.getTitle(node));
-                       } else if (isTopic(event, SuiteEvent.openNewPart)) {
+                       } else if (SuiteUiUtils.isTopic(event, SuiteEvent.openNewPart)) {
                                Node node = getNode(ui, event);
                                if (node == null)
                                        return;
@@ -364,12 +375,17 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
                                ui.switchToLayer(layer, node);
                                ui.getCmsView().runAs(() -> layer.open(uiProvider, ui.getCurrentWorkArea(), node));
                                ui.getCmsView().stateChanged(nodeToState(node), Jcr.getTitle(node));
-                       } else if (isTopic(event, SuiteEvent.switchLayer)) {
+                       } else if (SuiteUiUtils.isTopic(event, SuiteEvent.switchLayer)) {
                                String layerId = get(event, SuiteEvent.LAYER);
                                if (layerId != null) {
 //                                     ui.switchToLayer(layerId, ui.getUserDir());
+                                       SuiteLayer suiteLayer = findLayer(layerId);
+                                       Localized layerTitle = suiteLayer.getTitle();
                                        ui.getCmsView().runAs(() -> ui.switchToLayer(layerId, ui.getUserDir()));
-                                       ui.getCmsView().navigateTo(layerId);
+                                       String title = null;
+                                       if (layerTitle != null)
+                                               title = layerTitle.lead();
+                                       ui.getCmsView().stateChanged(layerId, title);
                                } else {
                                        Node node = getNode(ui, event);
                                        if (node != null) {
@@ -427,11 +443,7 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
                return managedUis.get(get(event, CMS_VIEW_UID_PROPERTY));
        }
 
-       private static boolean isTopic(Event event, CmsEvent cmsEvent) {
-               return event.getTopic().equals(cmsEvent.topic());
-       }
-
-       private static String get(Event event, String key) {
+       public static String get(Event event, String key) {
                Object value = event.getProperty(key);
                if (value == null)
                        return null;