X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=core%2Forg.argeo.suite.ui%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fui%2FSuiteApp.java;h=9a6208b7e0d86ef2e3a120a341e7124e87561e5f;hp=dabd8afbce15714807fc6db7e477c88a39c112c0;hb=cbf5614674c1013fdcc4ba6f0b9fae700b5f3681;hpb=38b1c40accd8da0b5bd791cc2b2257773b69ac56

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 dabd8af..9a6208b 100644
--- 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
@@ -336,22 +336,18 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
 		if (!state.startsWith("/")) {
 			if (parent instanceof SuiteUi) {
 				SuiteUi ui = (SuiteUi) parent;
-				if (LOGIN.equals(state) || state.equals(HOME_STATE)) {
+				if (LOGIN.equals(state)) {
 					String appTitle = "";
 					if (ui.getTitle() != null)
 						appTitle = ui.getTitle().lead();
 					ui.getCmsView().stateChanged(state, appTitle);
 					return;
 				}
-				String currentLayerId = ui.getCurrentLayerId();
-//				if (state.equals(currentLayerId))
-//					return; // does nothing
-//				else {
 				Map<String, Object> properties = new HashMap<>();
-				properties.put(SuiteEvent.LAYER, state);
+				String layerId = HOME_STATE.equals(state) ? defaultLayerPid : state;
+				properties.put(SuiteEvent.LAYER, layerId);
 				properties.put(SuiteEvent.NODE_PATH, HOME_STATE);
 				ui.getCmsView().sendEvent(SuiteEvent.switchLayer.topic(), properties);
-//				}
 			}
 			return;
 		}
@@ -365,7 +361,8 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
 		}
 	}
 
-	private String nodeToState(Node node) {
+	// TODO move it to an internal package?
+	static String nodeToState(Node node) {
 		return '/' + Jcr.getWorkspaceName(node) + Jcr.getPath(node);
 	}
 
@@ -442,6 +439,8 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
 				if (layerId != null) {
 //					ui.switchToLayer(layerId, ui.getUserDir());
 					SuiteLayer suiteLayer = findLayer(layerId);
+					if (suiteLayer == null)
+						throw new IllegalArgumentException("No layer '" + layerId + "' available.");
 					Localized layerTitle = suiteLayer.getTitle();
 					// FIXME make sure we don't rebuild the work area twice
 					Composite workArea = ui.getCmsView().doAs(() -> ui.switchToLayer(layerId, ui.getUserDir()));
@@ -451,7 +450,8 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
 					Node nodeFromState = getNode(ui, event);
 					if (nodeFromState != null && nodeFromState.getPath().equals(ui.getUserDir().getPath())) {
 						// default layer view is forced
-						ui.getCmsView().stateChanged(layerId, appTitle + title);
+						String state = defaultLayerPid.equals(layerId) ? "~" : layerId;
+						ui.getCmsView().stateChanged(state, appTitle + title);
 						suiteLayer.view(null, workArea, nodeFromState);
 					} else {
 						Node layerCurrentContext = suiteLayer.getCurrentContext(workArea);