import org.argeo.entity.EntityNames;
import org.argeo.entity.EntityType;
import org.argeo.jcr.Jcr;
+import org.argeo.jcr.JcrException;
import org.argeo.suite.RankedObject;
import org.argeo.suite.SuiteUtils;
import org.argeo.util.LangUtils;
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;
private String pidPrefix;
private String headerPid;
+ private String footerPid;
private String leadPanePid;
private String loginScreenPid;
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)) {
throw new IllegalArgumentException("PID prefix must be set.");
headerPid = pidPrefix + "header";
+ footerPid = pidPrefix + "footer";
leadPanePid = pidPrefix + "leadPane";
loginScreenPid = pidPrefix + "loginScreen";
}
SuiteUi ui = (SuiteUi) parent;
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();
if (cmsView.isAnonymous() && publicBasePath == null) {// internal app, must login
ui.logout();
- refreshPart(headerUiProvider, ui.getHeader(), context);
+ if (headerUiProvider != null)
+ refreshPart(headerUiProvider, ui.getHeader(), context);
ui.refreshBelowHeader(false);
refreshPart(findUiProvider(loginScreenPid), ui.getBelowHeader(), context);
+ if (footerUiProvider != null)
+ refreshPart(footerUiProvider, ui.getFooter(), context);
ui.layout(true, true);
setState(ui, LOGIN);
} else {
state = null;
CmsSession cmsSession = cmsView.getCmsSession();
if (ui.getUserDir() == null) {
- if (cmsView.isAnonymous()) {
+ // FIXME NPE on CMSSession when logging in from anonymous
+ if (cmsSession == null || cmsView.isAnonymous()) {
assert publicBasePath != null;
ui.initSessions(getRepository(), publicBasePath);
} else {
if (context == null)
context = ui.getUserDir();
- refreshPart(headerUiProvider, ui.getHeader(), context);
+ if (headerUiProvider != null)
+ refreshPart(headerUiProvider, ui.getHeader(), context);
ui.refreshBelowHeader(true);
for (String key : layersByPid.keySet()) {
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);
setState(parent, state != null ? state : defaultLayerPid);
}
private CmsUiProvider findUiProvider(String pid) {
if (!uiProvidersByPid.containsKey(pid))
- throw new IllegalArgumentException("No UI provider registered as " + pid);
+ return null;
return uiProvidersByPid.get(pid).get();
}
private SuiteLayer findLayer(String pid) {
if (!layersByPid.containsKey(pid))
- throw new IllegalArgumentException("No UI provider registered as " + pid);
+ return null;
return layersByPid.get(pid).get();
}
try {
// mixins
Set<String> types = new TreeSet<>();
- for (NodeType nodeType : context.getMixinNodeTypes()) {
- String typeName = nodeType.getName();
- if (byType.containsKey(typeName)) {
- types.add(typeName);
+ for (NodeType mixinType : context.getMixinNodeTypes()) {
+ String mixinTypeName = mixinType.getName();
+ if (byType.containsKey(mixinTypeName)) {
+ types.add(mixinTypeName);
+ }
+ for (NodeType superType : mixinType.getDeclaredSupertypes()) {
+ if (byType.containsKey(superType.getName())) {
+ types.add(superType.getName());
+ }
}
}
// primary node type
- {
- NodeType nodeType = context.getPrimaryNodeType();
- String typeName = nodeType.getName();
- if (byType.containsKey(typeName)) {
- types.add(typeName);
- }
- for (NodeType mixin : nodeType.getDeclaredSupertypes()) {
- if (byType.containsKey(mixin.getName())) {
- types.add(mixin.getName());
- }
+ NodeType primaryType = context.getPrimaryNodeType();
+ String primaryTypeName = primaryType.getName();
+ if (byType.containsKey(primaryTypeName)) {
+ types.add(primaryTypeName);
+ }
+ for (NodeType superType : primaryType.getDeclaredSupertypes()) {
+ if (byType.containsKey(superType.getName())) {
+ types.add(superType.getName());
}
}
// entity type
if (context.isNodeType(EntityType.entity.get())) {
if (context.hasProperty(EntityNames.ENTITY_TYPE)) {
- String typeName = context.getProperty(EntityNames.ENTITY_TYPE).getString();
- if (byType.containsKey(typeName)) {
- types.add(typeName);
+ String entityTypeName = context.getProperty(EntityNames.ENTITY_TYPE).getString();
+ if (byType.containsKey(entityTypeName)) {
+ types.add(entityTypeName);
}
}
}
}
if (types.size() == 0)
- throw new IllegalArgumentException("No type found for " + context);
+ throw new IllegalArgumentException("No type found for " + context + " (" + listTypes(context) + ")");
String type = types.iterator().next();
if (!byType.containsKey(type))
throw new IllegalArgumentException("No component found for " + context + " with type " + type);
}
}
+ private static String listTypes(Node context) {
+ try {
+ StringBuilder sb = new StringBuilder();
+ sb.append(context.getPrimaryNodeType().getName());
+ for (NodeType superType : context.getPrimaryNodeType().getDeclaredSupertypes()) {
+ sb.append(' ');
+ sb.append(superType.getName());
+ }
+
+ for (NodeType nodeType : context.getMixinNodeTypes()) {
+ sb.append(' ');
+ sb.append(nodeType.getName());
+ if (nodeType.getName().equals(EntityType.local.get()))
+ sb.append('/').append(context.getProperty(EntityNames.ENTITY_TYPE).getString());
+ for (NodeType superType : nodeType.getDeclaredSupertypes()) {
+ sb.append(' ');
+ sb.append(superType.getName());
+ }
+ }
+ return sb.toString();
+ } catch (RepositoryException e) {
+ throw new JcrException(e);
+ }
+ }
+
@Override
public void setState(Composite parent, String state) {
if (state == null)
if (!state.startsWith("/")) {
if (parent instanceof SuiteUi) {
SuiteUi ui = (SuiteUi) parent;
- if (LOGIN.equals(state) || state.equals("~")) {
+ 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);
- ui.getCmsView().sendEvent(SuiteEvent.switchLayer.topic(), properties);
- }
+ Map<String, Object> properties = new HashMap<>();
+ 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;
}
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);
}
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();
- 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
+ String state = defaultLayerPid.equals(layerId) ? "~" : layerId;
+ ui.getCmsView().stateChanged(state, 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;
projects / gpl / argeo-suite.git / blobdiff