import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.nodetype.NodeType;
+import javax.naming.InvalidNameException;
+import javax.naming.ldap.LdapName;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.argeo.api.NodeUtils;
import org.argeo.cms.CmsUserManager;
+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.entity.EntityNames;
import org.argeo.entity.EntityType;
import org.argeo.jcr.Jcr;
-import org.argeo.jcr.JcrUtils;
import org.argeo.suite.RankedObject;
+import org.argeo.suite.SuiteUtils;
+import org.argeo.util.LangUtils;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.osgi.framework.Constants;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventHandler;
+import org.osgi.service.useradmin.User;
/** The Argeo Suite App. */
public class SuiteApp extends AbstractCmsApp implements EventHandler {
public final static String HEADER_PID = PID_PREFIX + "header";
public final static String LEAD_PANE_PID = PID_PREFIX + "leadPane";
public final static String LOGIN_SCREEN_PID = PID_PREFIX + "loginScreen";
- // public final static String DASHBOARD_LAYER_PID = PID_PREFIX +
- // "dashboardLayer";
public final static String DASHBOARD_PID = PID_PREFIX + "dashboard";
public final static String RECENT_ITEMS_PID = PID_PREFIX + "recentItems";
private final static String DEFAULT_THEME_ID = "org.argeo.suite.theme.default";
private Map<String, RankedObject<CmsUiProvider>> uiProvidersByPid = Collections.synchronizedMap(new HashMap<>());
-// private Map<String, RankedObject<MvcProvider<?, ?, ?>>> mvcProvidersByPid = Collections
-// .synchronizedMap(new HashMap<>());
private Map<String, RankedObject<CmsUiProvider>> uiProvidersByType = Collections.synchronizedMap(new HashMap<>());
- private Map<String, RankedObject<SuiteLayer>> layers = Collections.synchronizedSortedMap(new TreeMap<>());
+ private Map<String, RankedObject<SuiteLayer>> layersByPid = Collections.synchronizedSortedMap(new TreeMap<>());
+ private Map<String, RankedObject<SuiteLayer>> layersByType = Collections.synchronizedSortedMap(new TreeMap<>());
private CmsUserManager cmsUserManager;
refreshPart(findUiProvider(HEADER_PID), ui.getHeader(), context);
CmsView cmsView = CmsView.getCmsView(parent);
if (cmsView.isAnonymous()) {
+ ui.logout();
ui.refreshBelowHeader(false);
refreshPart(findUiProvider(LOGIN_SCREEN_PID), ui.getBelowHeader(), context);
+ ui.layout(true, true);
} else {
- try {
- if (ui.getUserHome() == null)
- ui.initSessions(getRepository());
- context = ui.getUserHome();
-
- } catch (RepositoryException e) {
- e.printStackTrace();
+ if (ui.getUserDir() == null) {
+ CmsSession cmsSession = cmsView.getCmsSession();
+ Session adminSession = null;
+ try {
+ adminSession = NodeUtils.openDataAdminSession(getRepository(), null);
+ Node userDir = SuiteUtils.getOrCreateCmsSessionNode(adminSession, cmsSession);
+ ui.initSessions(getRepository(), userDir.getPath());
+ } finally {
+ Jcr.logout(adminSession);
+ }
}
- ui.refreshBelowHeader(true);
+ context = stateToNode(ui, state);
+ if (context == null)
+ context = ui.getUserDir();
- for (String key : layers.keySet()) {
- SuiteLayer layer = layers.get(key).get();
+ ui.refreshBelowHeader(true);
+ for (String key : layersByPid.keySet()) {
+ SuiteLayer layer = layersByPid.get(key).get();
ui.addLayer(key, layer);
}
refreshPart(findUiProvider(LEAD_PANE_PID), ui.getLeadPane(), context);
+ ui.layout(true, true);
+ setState(parent, state);
}
- ui.layout(true, true);
} catch (Exception e) {
CmsFeedback.show("Unexpected exception", e);
}
return uiProvidersByPid.get(pid).get();
}
- private CmsUiProvider findUiProvider(Node context) {
+ private <T> T findByType(Map<String, RankedObject<T>> byType, Node context) {
+ if (context == null)
+ throw new IllegalArgumentException("A node should be provided");
try {
// mixins
Set<String> types = new TreeSet<>();
for (NodeType nodeType : context.getMixinNodeTypes()) {
String typeName = nodeType.getName();
- if (uiProvidersByType.containsKey(typeName)) {
+ if (byType.containsKey(typeName)) {
types.add(typeName);
}
}
{
NodeType nodeType = context.getPrimaryNodeType();
String typeName = nodeType.getName();
- if (uiProvidersByType.containsKey(typeName)) {
+ if (byType.containsKey(typeName)) {
types.add(typeName);
}
for (NodeType mixin : nodeType.getDeclaredSupertypes()) {
- if (uiProvidersByType.containsKey(mixin.getName())) {
+ if (byType.containsKey(mixin.getName())) {
types.add(mixin.getName());
}
}
if (context.isNodeType(EntityType.entity.get())) {
if (context.hasProperty(EntityNames.ENTITY_TYPE)) {
String typeName = context.getProperty(EntityNames.ENTITY_TYPE).getString();
- if (uiProvidersByType.containsKey(typeName)) {
+ if (byType.containsKey(typeName)) {
types.add(typeName);
}
}
// if (context.getPath().equals("/")) {// root node
// types.add("nt:folder");
// }
- if (NodeUtils.isUserHome(context) && uiProvidersByType.containsKey("nt:folder")) {// home node
+ if (NodeUtils.isUserHome(context) && byType.containsKey("nt:folder")) {// home node
types.add("nt:folder");
}
if (types.size() == 0)
- throw new IllegalArgumentException("No UI provider found for " + context);
- return uiProvidersByType.get(types.iterator().next()).get();
+ throw new IllegalArgumentException("No type found for " + context);
+ String type = types.iterator().next();
+ if (!byType.containsKey(type))
+ throw new IllegalArgumentException("No component found for " + context + " with type " + type);
+ return byType.get(type).get();
} catch (RepositoryException e) {
throw new IllegalStateException(e);
}
@Override
public void setState(Composite parent, String state) {
- CmsView cmsView = CmsView.getCmsView(parent);
- // for the time being we systematically open a session, in order to make sure
- // that home is initialised
- Session session = null;
- try {
- if (state != null && state.startsWith("/")) {
- String path = state.substring(1);
- String workspace;
- if (path.equals("")) {
- workspace = null;
- path = "/";
- } else {
- int index = path.indexOf('/');
- if (index == 0) {
- log.error("Cannot interpret // " + state);
- cmsView.navigateTo("~");
- return;
- } else if (index > 0) {
- workspace = path.substring(0, index);
- path = path.substring(index);
- } else {// index<0, assuming root node
- workspace = path;
- path = "/";
- }
+ if (state == null || state.equals("~"))
+ return;
+ if (!state.startsWith("/") && !state.equals("~")) {
+ if (parent instanceof SuiteUi) {
+ SuiteUi ui = (SuiteUi) parent;
+ 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);
}
- session = cmsView.doAs(() -> Jcr.login(getRepository(), workspace));
+ }
+ return;
+ }
+ SuiteUi suiteUi = (SuiteUi) parent;
+ Node node = stateToNode(suiteUi, state);
+ if (node == null) {
+ suiteUi.getCmsView().navigateTo("~");
+ } else {
+ suiteUi.getCmsView().sendEvent(SuiteEvent.switchLayer.topic(), SuiteEvent.eventProperties(node));
+ suiteUi.getCmsView().sendEvent(SuiteEvent.refreshPart.topic(), SuiteEvent.eventProperties(node));
+ }
+ }
- Node node = session.getNode(path);
+ private String nodeToState(Node node) {
+ return '/' + Jcr.getWorkspaceName(node) + Jcr.getPath(node);
+ }
- cmsView.sendEvent(SuiteEvent.refreshPart.topic(), SuiteEvent.eventProperties(node));
+ private Node stateToNode(SuiteUi suiteUi, String state) {
+ if (suiteUi == null)
+ return null;
+ if (state == null || !state.startsWith("/"))
+ return null;
+
+ String path = state.substring(1);
+ String workspace;
+ if (path.equals("")) {
+ workspace = null;
+ path = "/";
+ } else {
+ int index = path.indexOf('/');
+ if (index == 0) {
+ log.error("Cannot interpret " + state);
+// cmsView.navigateTo("~");
+ return null;
+ } else if (index > 0) {
+ workspace = path.substring(0, index);
+ path = path.substring(index);
+ } else {// index<0, assuming root node
+ workspace = path;
+ path = "/";
}
- } catch (RepositoryException e) {
- log.error("Cannot load state " + state, e);
- cmsView.navigateTo("~");
- } finally {
- JcrUtils.logoutQuietly(session);
}
+ Session session = suiteUi.getSession(workspace);
+ if (session == null)
+ return null;
+ Node node = Jcr.getNode(session, path);
+ return node;
}
/*
// Specific UI related events
SuiteUi ui = getRelatedUi(event);
try {
- String currentLayerId = ui.getCurrentLayerId();
- SuiteLayer layer = currentLayerId != null ? layers.get(currentLayerId).get() : null;
+// String currentLayerId = ui.getCurrentLayerId();
+// SuiteLayer currentLayer = currentLayerId != null ? layersByPid.get(currentLayerId).get() : null;
if (isTopic(event, SuiteEvent.refreshPart)) {
- String nodePath = get(event, SuiteEvent.NODE_PATH);
- String workspace = get(event, SuiteEvent.WORKSPACE);
- Node node = Jcr.getNode(ui.getSession(workspace), nodePath);
- CmsUiProvider uiProvider = findUiProvider(node);
- layer.view(uiProvider, ui.getCurrentWorkArea(), node);
+ Node node = getNode(ui, event);
+ if (node == null)
+ return;
+ CmsUiProvider uiProvider = findByType(uiProvidersByType, node);
+ SuiteLayer layer = findByType(layersByType, node);
+ 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)) {
- String nodePath = get(event, SuiteEvent.NODE_PATH);
- String workspace = get(event, SuiteEvent.WORKSPACE);
- Node node = Jcr.getNode(ui.getSession(workspace), nodePath);
- CmsUiProvider uiProvider = findUiProvider(node);
- layer.open(uiProvider, ui.getCurrentWorkArea(), node);
+ Node node = getNode(ui, event);
+ if (node == null)
+ return;
+ CmsUiProvider uiProvider = findByType(uiProvidersByType, node);
+ SuiteLayer layer = findByType(layersByType, node);
+ 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)) {
String layerId = get(event, SuiteEvent.LAYER);
- ui.switchToLayer(layerId, Jcr.getRootNode(ui.getSession(null)));
+ if (layerId != null) {
+// ui.switchToLayer(layerId, ui.getUserDir());
+ ui.getCmsView().runAs(() -> ui.switchToLayer(layerId, ui.getUserDir()));
+ ui.getCmsView().navigateTo(layerId);
+ } else {
+ Node node = getNode(ui, event);
+ if (node != null) {
+ SuiteLayer layer = findByType(layersByType, node);
+ ui.getCmsView().runAs(() -> ui.switchToLayer(layer, node));
+ }
+ }
}
} catch (Exception e) {
log.error("Cannot handle event " + event, e);
}
- private String nodeToState(Node node) {
- return '/' + Jcr.getWorkspaceName(node) + Jcr.getPath(node);
+ private Node getNode(SuiteUi ui, Event event) {
+ String nodePath = get(event, SuiteEvent.NODE_PATH);
+ String workspaceName = get(event, SuiteEvent.WORKSPACE);
+ Session session = ui.getSession(workspaceName);
+ Node node;
+ if (nodePath == null) {
+ // look for a user
+ String username = get(event, SuiteEvent.USERNAME);
+ if (username == null)
+ return null;
+ User user = cmsUserManager.getUser(username);
+ if (user == null)
+ return null;
+ LdapName userDn;
+ try {
+ userDn = new LdapName(user.getName());
+ } catch (InvalidNameException e) {
+ throw new IllegalArgumentException("Badly formatted username", e);
+ }
+ String userNodePath = SuiteUtils.getUserNodePath(userDn);
+ if (Jcr.itemExists(session, userNodePath))
+ node = Jcr.getNode(session, userNodePath);
+ else {
+ Session adminSession = null;
+ try {
+ adminSession = NodeUtils.openDataAdminSession(getRepository(), workspaceName);
+ SuiteUtils.getOrCreateUserNode(adminSession, userDn);
+ } finally {
+ Jcr.logout(adminSession);
+ }
+ node = Jcr.getNode(session, userNodePath);
+ }
+ } else {
+ node = Jcr.getNode(session, nodePath);
+ }
+ return node;
}
private SuiteUi getRelatedUi(Event event) {
private static String get(Event event, String key) {
Object value = event.getProperty(key);
if (value == null)
- throw new IllegalArgumentException("Property " + key + " must be set");
+ return null;
+// throw new IllegalArgumentException("Property " + key + " must be set");
return value.toString();
}
RankedObject.putIfHigherRank(uiProvidersByPid, pid, uiProvider, properties);
}
if (properties.containsKey(EntityConstants.TYPE)) {
- // TODO manage String arrays as well
- String type = (String) properties.get(EntityConstants.TYPE);
- RankedObject.putIfHigherRank(uiProvidersByType, type, uiProvider, properties);
+ List<String> types = LangUtils.toStringList(properties.get(EntityConstants.TYPE));
+ for (String type : types)
+ RankedObject.putIfHigherRank(uiProvidersByType, type, uiProvider, properties);
}
}
}
}
}
-
+ if (properties.containsKey(EntityConstants.TYPE)) {
+ List<String> types = LangUtils.toStringList(properties.get(EntityConstants.TYPE));
+ for (String type : types) {
+ if (uiProvidersByType.containsKey(type)) {
+ if (uiProvidersByType.get(type).equals(new RankedObject<CmsUiProvider>(uiProvider, properties))) {
+ uiProvidersByType.remove(type);
+ }
+ }
+ }
+ }
}
-// public void addMvcProvider(MvcProvider<?, ?, ?> uiProvider, Map<String, Object> properties) {
-// if (properties.containsKey(Constants.SERVICE_PID)) {
-// String pid = (String) properties.get(Constants.SERVICE_PID);
-// RankedObject.putIfHigherRank(mvcProvidersByPid, pid, uiProvider, properties);
-// }
-// }
-//
-// public void removeMvcProvider(MvcProvider<?, ?, ?> uiProvider, Map<String, Object> properties) {
-// if (properties.containsKey(Constants.SERVICE_PID)) {
-// String pid = (String) properties.get(Constants.SERVICE_PID);
-// if (mvcProvidersByPid.containsKey(pid)) {
-// if (mvcProvidersByPid.get(pid).equals(new RankedObject<MvcProvider<?, ?, ?>>(uiProvider, properties))) {
-// mvcProvidersByPid.remove(pid);
-// }
-// }
-// }
-//
-// }
-
public void addLayer(SuiteLayer layer, Map<String, Object> properties) {
if (properties.containsKey(Constants.SERVICE_PID)) {
String pid = (String) properties.get(Constants.SERVICE_PID);
- RankedObject.putIfHigherRank(layers, pid, layer, properties);
+ RankedObject.putIfHigherRank(layersByPid, pid, layer, properties);
+ }
+ if (properties.containsKey(EntityConstants.TYPE)) {
+ List<String> types = LangUtils.toStringList(properties.get(EntityConstants.TYPE));
+ for (String type : types)
+ RankedObject.putIfHigherRank(layersByType, type, layer, properties);
}
}
public void removeLayer(SuiteLayer layer, Map<String, Object> properties) {
if (properties.containsKey(Constants.SERVICE_PID)) {
String pid = (String) properties.get(Constants.SERVICE_PID);
- if (layers.containsKey(pid)) {
- if (layers.get(pid).equals(new RankedObject<SuiteLayer>(layer, properties))) {
- layers.remove(pid);
+ if (layersByPid.containsKey(pid)) {
+ if (layersByPid.get(pid).equals(new RankedObject<SuiteLayer>(layer, properties))) {
+ layersByPid.remove(pid);
+ }
+ }
+ }
+ if (properties.containsKey(EntityConstants.TYPE)) {
+ List<String> types = LangUtils.toStringList(properties.get(EntityConstants.TYPE));
+ for (String type : types) {
+ if (layersByType.containsKey(type)) {
+ if (layersByType.get(type).equals(new RankedObject<CmsUiProvider>(layer, properties))) {
+ layersByType.remove(type);
+ }
}
}
}
projects / gpl / argeo-suite.git / blobdiff