X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=org.argeo.suite.ui%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fui%2FSuiteApp.java;h=1c7398f31a5e9986927a402efccf92ed6b3804e0;hp=80ebd6e8cf16bdfcdecac84d97161864eb3e5bd9;hb=9cfd54a608937b5373c6ac880a9874aa542bb2a1;hpb=d21b6765434d473fe04de867e2c3e773a6da8030 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 80ebd6e..1c7398f 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 @@ -6,6 +6,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Set; import java.util.TreeMap; @@ -15,11 +16,15 @@ import javax.jcr.Node; 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.LocaleUtils; +import org.argeo.cms.auth.CmsSession; import org.argeo.cms.ui.AbstractCmsApp; import org.argeo.cms.ui.CmsTheme; import org.argeo.cms.ui.CmsUiProvider; @@ -27,32 +32,40 @@ import org.argeo.cms.ui.CmsView; import org.argeo.cms.ui.dialogs.CmsFeedback; import org.argeo.cms.ui.util.CmsEvent; import org.argeo.cms.ui.util.CmsUiUtils; +import org.argeo.eclipse.ui.specific.UiContext; import org.argeo.entity.EntityConstants; 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 { private final static Log log = LogFactory.getLog(SuiteApp.class); - public final static String PID_PREFIX = "argeo.suite.ui."; - 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_PID = PID_PREFIX + "dashboard"; - public final static String RECENT_ITEMS_PID = PID_PREFIX + "recentItems"; + 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"; - private final static String DEFAULT_UI_NAME = "app"; - private final static String DEFAULT_THEME_ID = "org.argeo.suite.theme.default"; + private String publicBasePath = null; + + private String pidPrefix; + private String headerPid; + private String leadPanePid; + private String loginScreenPid; +// private String DASHBOARD_PID = pidPrefix + "dashboard"; +// private String RECENT_ITEMS_PID = pidPrefix + "recentItems"; + + private String defaultUiName = "app"; + private String defaultThemeId = "org.argeo.suite.theme.default"; private Map> uiProvidersByPid = Collections.synchronizedMap(new HashMap<>()); private Map> uiProvidersByType = Collections.synchronizedMap(new HashMap<>()); @@ -66,12 +79,32 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { // private CmsUiProvider headerPart = null; - public void init(Map properties) { + public void init(Map properties) { if (log.isDebugEnabled()) log.info("Argeo Suite App started"); + + if (properties.containsKey(DEFAULT_UI_NAME_PROPERTY)) + defaultUiName = LangUtils.get(properties, DEFAULT_UI_NAME_PROPERTY); + if (properties.containsKey(DEFAULT_THEME_ID_PROPERTY)) + defaultThemeId = LangUtils.get(properties, DEFAULT_THEME_ID_PROPERTY); + publicBasePath = LangUtils.get(properties, PUBLIC_BASE_PATH_PROPERTY); + + if (properties.containsKey(Constants.SERVICE_PID)) { + String servicePid = properties.get(Constants.SERVICE_PID).toString(); + if (servicePid.endsWith(".app")) { + pidPrefix = servicePid.substring(0, servicePid.length() - "app".length()); + } + } + + if (pidPrefix == null) + throw new IllegalArgumentException("PID prefix must be set."); + + headerPid = pidPrefix + "header"; + leadPanePid = pidPrefix + "leadPane"; + loginScreenPid = pidPrefix + "loginScreen"; } - public void destroy(Map properties) { + public void destroy(Map properties) { for (SuiteUi ui : managedUis.values()) if (!ui.isDisposed()) ui.dispose(); @@ -83,7 +116,7 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { @Override public Set getUiNames() { HashSet uiNames = new HashSet<>(); - uiNames.add(DEFAULT_UI_NAME); + uiNames.add(defaultUiName); return uiNames; } @@ -110,8 +143,7 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { @Override public String getThemeId(String uiName) { - // TODO make it configurable - return DEFAULT_THEME_ID; + return defaultThemeId; } @Override @@ -119,36 +151,59 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { try { Node context = null; SuiteUi ui = (SuiteUi) parent; - refreshPart(findUiProvider(HEADER_PID), ui.getHeader(), context); CmsView cmsView = CmsView.getCmsView(parent); - if (cmsView.isAnonymous()) { + if (cmsView.isAnonymous() && publicBasePath == null) {// internal app, must login ui.logout(); + refreshPart(findUiProvider(headerPid), ui.getHeader(), context); ui.refreshBelowHeader(false); - refreshPart(findUiProvider(LOGIN_SCREEN_PID), ui.getBelowHeader(), context); + refreshPart(findUiProvider(loginScreenPid), ui.getBelowHeader(), context); + ui.layout(true, true); } else { - try { - if (ui.getUserHome() == null) - ui.initSessions(getRepository()); - context = ui.getUserHome(); - - } catch (RepositoryException e) { - e.printStackTrace(); + CmsSession cmsSession = cmsView.getCmsSession(); + if (ui.getUserDir() == null) { + if (cmsView.isAnonymous()) { + assert publicBasePath != null; + ui.initSessions(getRepository(), publicBasePath); + } else { + 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); + initLocale(cmsSession); + context = stateToNode(ui, state); + if (context == null) + context = ui.getUserDir(); + refreshPart(findUiProvider(headerPid), ui.getHeader(), context); + 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); + refreshPart(findUiProvider(leadPanePid), ui.getLeadPane(), context); + ui.layout(true, true); + setState(parent, state); } - ui.layout(true, true); - setState(parent, state); } catch (Exception e) { CmsFeedback.show("Unexpected exception", e); } } + private void initLocale(CmsSession cmsSession) { + if (cmsSession == null) + return; + Locale locale = cmsSession.getLocale(); + UiContext.setLocale(locale); + LocaleUtils.setThreadLocale(locale); + + } + private void refreshPart(CmsUiProvider uiProvider, Composite part, Node context) { CmsUiUtils.clear(part); uiProvider.createUiPart(part, context); @@ -161,6 +216,8 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { } private T findByType(Map> byType, Node context) { + if (context == null) + throw new IllegalArgumentException("A node should be provided"); try { // mixins Set types = new TreeSet<>(); @@ -201,7 +258,7 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { } if (types.size() == 0) - throw new IllegalArgumentException("No component found for " + context); + 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); @@ -213,46 +270,66 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { @Override public void setState(Composite parent, String state) { - CmsView cmsView = CmsView.getCmsView(parent); - if(cmsView.isAnonymous()) + if (state == null || state.equals("~")) return; - // 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.startsWith("/") && !state.equals("~")) { + if (parent instanceof SuiteUi) { + SuiteUi ui = (SuiteUi) parent; + String currentLayerId = ui.getCurrentLayerId(); + if (state.equals(currentLayerId)) + return; // does nothing + else { + Map 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); + } + + private Node stateToNode(SuiteUi suiteUi, String state) { + if (suiteUi == null) + return null; + if (state == null || !state.startsWith("/")) + return null; - cmsView.sendEvent(SuiteEvent.switchLayer.topic(), SuiteEvent.eventProperties(node)); - cmsView.sendEvent(SuiteEvent.refreshPart.topic(), SuiteEvent.eventProperties(node)); + 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; } /* @@ -264,34 +341,40 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { // Specific UI related events SuiteUi ui = getRelatedUi(event); + if (ui == null) + return; try { - String currentLayerId = ui.getCurrentLayerId(); - SuiteLayer currentLayer = currentLayerId != null ? layersByPid.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); + Node node = getNode(ui, event); + if (node == null) + return; CmsUiProvider uiProvider = findByType(uiProvidersByType, node); - currentLayer.view(uiProvider, ui.getCurrentWorkArea(), 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); + Node node = getNode(ui, event); + if (node == null) + return; CmsUiProvider uiProvider = findByType(uiProvidersByType, node); - currentLayer.open(uiProvider, ui.getCurrentWorkArea(), 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); if (layerId != null) { - ui.switchToLayer(layerId, Jcr.getRootNode(ui.getSession(null))); +// ui.switchToLayer(layerId, ui.getUserDir()); + ui.getCmsView().runAs(() -> ui.switchToLayer(layerId, ui.getUserDir())); + ui.getCmsView().navigateTo(layerId); } 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); + Node node = getNode(ui, event); + if (node != null) { SuiteLayer layer = findByType(layersByType, node); - ui.switchToLayer(layer, node); + ui.getCmsView().runAs(() -> ui.switchToLayer(layer, node)); } } } @@ -302,8 +385,42 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { } - 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) {