From d21b6765434d473fe04de867e2c3e773a6da8030 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 27 Nov 2020 11:59:08 +0100 Subject: [PATCH] Fully implements state support. --- .../src/org/argeo/suite/ui/RecentItems.java | 7 +- .../src/org/argeo/suite/ui/SuiteApp.java | 123 +++++++++++------- .../src/org/argeo/suite/ui/SuiteUi.java | 40 ++++-- 3 files changed, 106 insertions(+), 64 deletions(-) diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/RecentItems.java b/org.argeo.suite.ui/src/org/argeo/suite/ui/RecentItems.java index 5c6fa0d..bbe53b7 100644 --- a/org.argeo.suite.ui/src/org/argeo/suite/ui/RecentItems.java +++ b/org.argeo.suite.ui/src/org/argeo/suite/ui/RecentItems.java @@ -20,6 +20,7 @@ import org.argeo.cms.ui.CmsUiProvider; import org.argeo.cms.ui.CmsView; import org.argeo.cms.ui.util.CmsUiUtils; import org.argeo.eclipse.ui.EclipseUiUtils; +import org.argeo.entity.EntityConstants; import org.argeo.entity.EntityType; import org.argeo.jcr.Jcr; import org.argeo.jcr.JcrUtils; @@ -56,10 +57,6 @@ public class RecentItems implements CmsUiProvider { private final static int SEARCH_TEXT_DELAY = 800; private final static int SEARCH_DEFAULT_LIMIT = 100; - public static enum Property { - entityTypes; - } - private CmsTheme theme; private String entityType; @@ -132,7 +129,7 @@ public class RecentItems implements CmsUiProvider { public void init(Map properties) { // TODO manage multiple entities - entityType = properties.get(Property.entityTypes.name()); + entityType = properties.get(EntityConstants.TYPE); } class SingleEntityViewer { diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java b/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java index 9238271..80ebd6e 100644 --- a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java +++ b/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java @@ -5,6 +5,7 @@ import static org.argeo.cms.ui.CmsView.CMS_VIEW_UID_PROPERTY; 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; @@ -32,6 +33,7 @@ import org.argeo.entity.EntityType; import org.argeo.jcr.Jcr; import org.argeo.jcr.JcrUtils; import org.argeo.suite.RankedObject; +import org.argeo.util.LangUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.osgi.framework.Constants; @@ -46,8 +48,6 @@ 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"; @@ -55,10 +55,9 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { private final static String DEFAULT_THEME_ID = "org.argeo.suite.theme.default"; private Map> uiProvidersByPid = Collections.synchronizedMap(new HashMap<>()); -// private Map>> mvcProvidersByPid = Collections -// .synchronizedMap(new HashMap<>()); private Map> uiProvidersByType = Collections.synchronizedMap(new HashMap<>()); - private Map> layers = Collections.synchronizedSortedMap(new TreeMap<>()); + private Map> layersByPid = Collections.synchronizedSortedMap(new TreeMap<>()); + private Map> layersByType = Collections.synchronizedSortedMap(new TreeMap<>()); private CmsUserManager cmsUserManager; @@ -123,6 +122,7 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { 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); } else { @@ -136,13 +136,14 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { } ui.refreshBelowHeader(true); - for (String key : layers.keySet()) { - SuiteLayer layer = layers.get(key).get(); + 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); } catch (Exception e) { CmsFeedback.show("Unexpected exception", e); } @@ -159,13 +160,13 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { return uiProvidersByPid.get(pid).get(); } - private CmsUiProvider findUiProvider(Node context) { + private T findByType(Map> byType, Node context) { try { // mixins Set types = new TreeSet<>(); for (NodeType nodeType : context.getMixinNodeTypes()) { String typeName = nodeType.getName(); - if (uiProvidersByType.containsKey(typeName)) { + if (byType.containsKey(typeName)) { types.add(typeName); } } @@ -173,11 +174,11 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { { 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()); } } @@ -186,7 +187,7 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { 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); } } @@ -195,13 +196,16 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { // 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 component 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); } @@ -210,6 +214,8 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { @Override public void setState(Composite parent, String state) { CmsView cmsView = CmsView.getCmsView(parent); + if(cmsView.isAnonymous()) + return; // for the time being we systematically open a session, in order to make sure // that home is initialised Session session = null; @@ -223,7 +229,7 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { } else { int index = path.indexOf('/'); if (index == 0) { - log.error("Cannot interpret // " + state); + log.error("Cannot interpret " + state); cmsView.navigateTo("~"); return; } else if (index > 0) { @@ -238,6 +244,7 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { Node node = session.getNode(path); + cmsView.sendEvent(SuiteEvent.switchLayer.topic(), SuiteEvent.eventProperties(node)); cmsView.sendEvent(SuiteEvent.refreshPart.topic(), SuiteEvent.eventProperties(node)); } } catch (RepositoryException e) { @@ -259,24 +266,34 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { SuiteUi ui = getRelatedUi(event); try { String currentLayerId = ui.getCurrentLayerId(); - SuiteLayer layer = currentLayerId != null ? layers.get(currentLayerId).get() : null; + 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); + CmsUiProvider uiProvider = findByType(uiProvidersByType, node); + currentLayer.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); + CmsUiProvider uiProvider = findByType(uiProvidersByType, node); + currentLayer.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, Jcr.getRootNode(ui.getSession(null))); + } else { + String nodePath = get(event, SuiteEvent.NODE_PATH); + String workspace = get(event, SuiteEvent.WORKSPACE); + if (nodePath != null) { + Node node = Jcr.getNode(ui.getSession(workspace), nodePath); + SuiteLayer layer = findByType(layersByType, node); + ui.switchToLayer(layer, node); + } + } } } catch (Exception e) { log.error("Cannot handle event " + event, e); @@ -300,7 +317,8 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { 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(); } @@ -315,9 +333,9 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { 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 types = LangUtils.toStringList(properties.get(EntityConstants.TYPE)); + for (String type : types) + RankedObject.putIfHigherRank(uiProvidersByType, type, uiProvider, properties); } } @@ -330,41 +348,46 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { } } } - + if (properties.containsKey(EntityConstants.TYPE)) { + List types = LangUtils.toStringList(properties.get(EntityConstants.TYPE)); + for (String type : types) { + if (uiProvidersByType.containsKey(type)) { + if (uiProvidersByType.get(type).equals(new RankedObject(uiProvider, properties))) { + uiProvidersByType.remove(type); + } + } + } + } } -// public void addMvcProvider(MvcProvider uiProvider, Map 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 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>(uiProvider, properties))) { -// mvcProvidersByPid.remove(pid); -// } -// } -// } -// -// } - public void addLayer(SuiteLayer layer, Map 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 types = LangUtils.toStringList(properties.get(EntityConstants.TYPE)); + for (String type : types) + RankedObject.putIfHigherRank(layersByType, type, layer, properties); } } public void removeLayer(SuiteLayer layer, Map 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(layer, properties))) { - layers.remove(pid); + if (layersByPid.containsKey(pid)) { + if (layersByPid.get(pid).equals(new RankedObject(layer, properties))) { + layersByPid.remove(pid); + } + } + } + if (properties.containsKey(EntityConstants.TYPE)) { + List types = LangUtils.toStringList(properties.get(EntityConstants.TYPE)); + for (String type : types) { + if (layersByType.containsKey(type)) { + if (layersByType.get(type).equals(new RankedObject(layer, properties))) { + layersByType.remove(type); + } } } } diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUi.java b/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUi.java index 8c8780f..1231d92 100644 --- a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUi.java +++ b/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUi.java @@ -8,6 +8,8 @@ import javax.jcr.Repository; import javax.jcr.RepositoryException; import javax.jcr.Session; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.argeo.api.NodeConstants; import org.argeo.api.NodeUtils; import org.argeo.cms.ui.CmsView; @@ -20,7 +22,7 @@ import org.eclipse.swt.widgets.Composite; /** The view for the default ergonomics of Argeo Suite. */ class SuiteUi extends Composite { private static final long serialVersionUID = 6207018859086689108L; - + private final static Log log = LogFactory.getLog(SuiteUi.class); private Composite header; private Composite belowHeader; private Composite leadPane; @@ -95,26 +97,40 @@ class SuiteUi extends Composite { return workAreas.get(id); } - Composite switchToLayer(String layer, Node context) { + Composite switchToLayer(String layerId, Node context) { if (currentLayerId != null) { Composite current = getCurrentWorkArea(); - if (currentLayerId.equals(layer)) + if (currentLayerId.equals(layerId)) return current; } if (context == null) { if (!cmsView.isAnonymous()) context = userHome; } - Composite toShow = getLayer(layer, context); + Composite toShow = getLayer(layerId, context); + currentLayerId = layerId; if (!isDisposed()) getDisplay().syncExec(() -> { - toShow.moveAbove(null); + if (!toShow.isDisposed()) + toShow.moveAbove(null); + else + log.warn("Cannot show work area because it is disposed."); dynamicArea.layout(true, true); }); - currentLayerId = layer; return toShow; } + Composite switchToLayer(SuiteLayer layer, Node context) { + // TODO make it more robust + for (String layerId : layers.keySet()) { + SuiteLayer l = layers.get(layerId); + if (layer == l) { + return switchToLayer(layerId, context); + } + } + throw new IllegalArgumentException("Layer is not registered."); + } + void addLayer(String id, SuiteLayer layer) { layers.put(id, layer); } @@ -135,6 +151,14 @@ class SuiteUi extends Composite { return workArea; } + synchronized void logout() { + userHome = null; + Jcr.logout(sysSession); + Jcr.logout(homeSession); + currentLayerId = null; + workAreas.clear(); + } + /* * GETTERS / SETTERS */ @@ -155,7 +179,7 @@ class SuiteUi extends Composite { // return sysSession; // } // - void initSessions(Repository repository) throws RepositoryException { + synchronized void initSessions(Repository repository) throws RepositoryException { this.sysSession = repository.login(); this.homeSession = repository.login(NodeConstants.HOME_WORKSPACE); userHome = NodeUtils.getUserHome(homeSession); @@ -188,6 +212,4 @@ class SuiteUi extends Composite { return cmsView; } - - } -- 2.30.2