public final static String PUBLIC_BASE_PATH_PROPERTY = "publicBasePath";
public final static String DEFAULT_UI_NAME_PROPERTY = "defaultUiName";
public final static String DEFAULT_THEME_ID_PROPERTY = "defaultThemeId";
+ public final static String DEFAULT_LAYER_PROPERTY = "defaultLayer";
private final static String LOGIN = "login";
+ private final static String HOME_STATE = "~";
private String publicBasePath = null;
defaultUiName = LangUtils.get(properties, DEFAULT_UI_NAME_PROPERTY);
if (properties.containsKey(DEFAULT_THEME_ID_PROPERTY))
defaultThemeId = LangUtils.get(properties, DEFAULT_THEME_ID_PROPERTY);
+ if (properties.containsKey(DEFAULT_LAYER_PROPERTY))
+ defaultLayerPid = LangUtils.get(properties, DEFAULT_LAYER_PROPERTY);
publicBasePath = LangUtils.get(properties, PUBLIC_BASE_PATH_PROPERTY);
if (properties.containsKey(Constants.SERVICE_PID)) {
CmsView cmsView = CmsView.getCmsView(parent);
CmsUiProvider headerUiProvider = findUiProvider(headerPid);
CmsUiProvider footerUiProvider = findUiProvider(footerPid);
+ CmsUiProvider leadPaneUiProvider = findUiProvider(leadPanePid);
+
Localized appTitle = null;
if (headerUiProvider instanceof DefaultHeader) {
appTitle = ((DefaultHeader) headerUiProvider).getTitle();
SuiteLayer layer = layersByPid.get(key).get();
ui.addLayer(key, layer);
}
- refreshPart(findUiProvider(leadPanePid), ui.getLeadPane(), context);
+
+ if (leadPaneUiProvider != null)
+ refreshPart(leadPaneUiProvider, ui.getLeadPane(), context);
if (footerUiProvider != null)
refreshPart(footerUiProvider, ui.getFooter(), context);
ui.layout(true, true);
if (!state.startsWith("/")) {
if (parent instanceof SuiteUi) {
SuiteUi ui = (SuiteUi) parent;
- if (LOGIN.equals(state) || state.equals("~")) {
+ if (LOGIN.equals(state) || state.equals(HOME_STATE)) {
String appTitle = "";
if (ui.getTitle() != null)
appTitle = ui.getTitle().lead();
return;
}
String currentLayerId = ui.getCurrentLayerId();
- if (state.equals(currentLayerId))
- return; // does nothing
- else {
- Map<String, Object> properties = new HashMap<>();
- properties.put(SuiteEvent.LAYER, state);
- ui.getCmsView().sendEvent(SuiteEvent.switchLayer.topic(), properties);
- }
+// if (state.equals(currentLayerId))
+// return; // does nothing
+// else {
+ Map<String, Object> properties = new HashMap<>();
+ properties.put(SuiteEvent.LAYER, state);
+ properties.put(SuiteEvent.NODE_PATH, HOME_STATE);
+ ui.getCmsView().sendEvent(SuiteEvent.switchLayer.topic(), properties);
+// }
}
return;
}
SuiteUi suiteUi = (SuiteUi) parent;
Node node = stateToNode(suiteUi, state);
if (node == null) {
- suiteUi.getCmsView().navigateTo("~");
+ suiteUi.getCmsView().navigateTo(HOME_STATE);
} else {
suiteUi.getCmsView().sendEvent(SuiteEvent.switchLayer.topic(), SuiteEvent.eventProperties(node));
suiteUi.getCmsView().sendEvent(SuiteEvent.refreshPart.topic(), SuiteEvent.eventProperties(node));
}
}
- private String nodeToState(Node node) {
+ // TODO move it to an internal package?
+ static String nodeToState(Node node) {
return '/' + Jcr.getWorkspaceName(node) + Jcr.getPath(node);
}
// ui.switchToLayer(layerId, ui.getUserDir());
SuiteLayer suiteLayer = findLayer(layerId);
Localized layerTitle = suiteLayer.getTitle();
- ui.getCmsView().runAs(() -> ui.switchToLayer(layerId, ui.getUserDir()));
+ // FIXME make sure we don't rebuild the work area twice
+ Composite workArea = ui.getCmsView().doAs(() -> ui.switchToLayer(layerId, ui.getUserDir()));
String title = null;
if (layerTitle != null)
title = layerTitle.lead();
- ui.getCmsView().stateChanged(layerId, appTitle + title);
+ 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);
+ suiteLayer.view(null, workArea, nodeFromState);
+ } else {
+ Node layerCurrentContext = suiteLayer.getCurrentContext(workArea);
+ if (layerCurrentContext != null) {
+ // layer was already showing a context so we set the state to it
+ ui.getCmsView().stateChanged(nodeToState(layerCurrentContext),
+ appTitle + Jcr.getTitle(layerCurrentContext));
+ } else {
+ // no context was shown
+ ui.getCmsView().stateChanged(layerId, appTitle + title);
+ }
+ }
} else {
Node node = getNode(ui, event);
if (node != null) {
private Node getNode(SuiteUi ui, Event event) {
String nodePath = get(event, SuiteEvent.NODE_PATH);
+ if (nodePath != null && nodePath.equals(HOME_STATE))
+ return ui.getUserDir();
String workspaceName = get(event, SuiteEvent.WORKSPACE);
Session session = ui.getSession(workspaceName);
Node node;