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=32b6da85d713d011a8fd6a13605faa33b83d50f4;hp=fcf7e1f7c150de332cf59747cb8c1788bfcddb2b;hb=166340db957d4b72d7f6d0a077bdb639220333c3;hpb=8d0c4194d67dbd4816948328f5a4f90977fa7b4f

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 fcf7e1f..32b6da8 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
@@ -37,6 +37,7 @@ import org.argeo.entity.EntityConstants;
 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;
@@ -60,6 +61,7 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
 
 	private String pidPrefix;
 	private String headerPid;
+	private String footerPid;
 	private String leadPanePid;
 	private String loginScreenPid;
 
@@ -99,6 +101,7 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
 			throw new IllegalArgumentException("PID prefix must be set.");
 
 		headerPid = pidPrefix + "header";
+		footerPid = pidPrefix + "footer";
 		leadPanePid = pidPrefix + "leadPane";
 		loginScreenPid = pidPrefix + "loginScreen";
 	}
@@ -151,6 +154,7 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
 			SuiteUi ui = (SuiteUi) parent;
 			CmsView cmsView = CmsView.getCmsView(parent);
 			CmsUiProvider headerUiProvider = findUiProvider(headerPid);
+			CmsUiProvider footerUiProvider = findUiProvider(footerPid);
 			Localized appTitle = null;
 			if (headerUiProvider instanceof DefaultHeader) {
 				appTitle = ((DefaultHeader) headerUiProvider).getTitle();
@@ -159,9 +163,12 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
 
 			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 {
@@ -169,7 +176,8 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
 					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 {
@@ -188,13 +196,16 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
 				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 (footerUiProvider != null)
+					refreshPart(footerUiProvider, ui.getFooter(), context);
 				ui.layout(true, true);
 				setState(parent, state != null ? state : defaultLayerPid);
 			}
@@ -219,13 +230,13 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
 
 	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();
 	}
 
@@ -235,31 +246,34 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
 		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);
 					}
 				}
 			}
@@ -272,7 +286,7 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
 			}
 
 			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);
@@ -282,6 +296,31 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
 		}
 	}
 
+	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)