package org.argeo.app.ui;
-import static org.argeo.api.cms.CmsView.CMS_VIEW_UID_PROPERTY;
-import static org.argeo.cms.acr.ContentUtils.SLASH;
+import static org.argeo.api.cms.ux.CmsView.CMS_VIEW_UID_PROPERTY;
import java.util.Collections;
import java.util.HashMap;
import org.argeo.api.acr.ContentRepository;
import org.argeo.api.acr.spi.ProvidedSession;
import org.argeo.api.cms.CmsConstants;
+import org.argeo.api.cms.CmsEventSubscriber;
import org.argeo.api.cms.CmsLog;
import org.argeo.api.cms.CmsSession;
-import org.argeo.api.cms.CmsTheme;
-import org.argeo.api.cms.CmsUi;
-import org.argeo.api.cms.CmsView;
+import org.argeo.api.cms.ux.CmsTheme;
+import org.argeo.api.cms.ux.CmsUi;
+import org.argeo.api.cms.ux.CmsView;
import org.argeo.app.api.EntityConstants;
import org.argeo.app.api.EntityNames;
import org.argeo.app.api.EntityType;
import org.argeo.cms.CmsUserManager;
import org.argeo.cms.LocaleUtils;
import org.argeo.cms.Localized;
-import org.argeo.cms.acr.CmsContentRepository;
+import org.argeo.cms.acr.ContentUtils;
import org.argeo.cms.jcr.CmsJcrUtils;
import org.argeo.cms.jcr.acr.JcrContent;
import org.argeo.cms.swt.CmsSwtUtils;
+import org.argeo.cms.swt.acr.SwtUiProvider;
import org.argeo.cms.swt.dialogs.CmsFeedback;
-import org.argeo.cms.ui.CmsUiProvider;
import org.argeo.cms.ux.CmsUxUtils;
import org.argeo.eclipse.ui.specific.UiContext;
import org.argeo.jcr.JcrException;
-import org.argeo.osgi.useradmin.UserDirectory;
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 class SuiteApp extends AbstractCmsApp implements CmsEventSubscriber {
private final static CmsLog log = CmsLog.getLog(SuiteApp.class);
public final static String PUBLIC_BASE_PATH_PROPERTY = "publicBasePath";
@Deprecated
private String defaultThemeId = "org.argeo.app.theme.default";
- private Map<String, RankedObject<CmsUiProvider>> uiProvidersByPid = Collections.synchronizedMap(new HashMap<>());
- private Map<String, RankedObject<CmsUiProvider>> uiProvidersByType = Collections.synchronizedMap(new HashMap<>());
+ // TODO use QName as key for byType
+ private Map<String, RankedObject<SwtUiProvider>> uiProvidersByPid = Collections.synchronizedMap(new HashMap<>());
+ private Map<String, RankedObject<SwtUiProvider>> uiProvidersByType = Collections.synchronizedMap(new HashMap<>());
private Map<String, RankedObject<SuiteLayer>> layersByPid = Collections.synchronizedSortedMap(new TreeMap<>());
private Map<String, RankedObject<SuiteLayer>> layersByType = Collections.synchronizedSortedMap(new TreeMap<>());
// private Repository repository;
public void init(Map<String, Object> properties) {
+ for (SuiteEvent event : SuiteEvent.values()) {
+ getCmsContext().getCmsEventBus().addEventSubscriber(event.topic(), this);
+ }
+
if (log.isDebugEnabled())
log.info("Argeo Suite App started");
ProvidedSession contentSession = (ProvidedSession) CmsUxUtils.getContentSession(contentRepository, cmsView);
- CmsUiProvider headerUiProvider = findUiProvider(headerPid);
- CmsUiProvider footerUiProvider = findUiProvider(footerPid);
- CmsUiProvider leadPaneUiProvider;
+ SwtUiProvider headerUiProvider = findUiProvider(headerPid);
+ SwtUiProvider footerUiProvider = findUiProvider(footerPid);
+ SwtUiProvider leadPaneUiProvider;
if (adminUiName.equals(uiName)) {
leadPaneUiProvider = findUiProvider(adminLeadPanePid);
} else {
if (cmsView.isAnonymous() && publicBasePath == null) {// internal app, must login
ui.logout();
+ ui.setLoginScreen(true);
if (headerUiProvider != null)
refreshPart(headerUiProvider, ui.getHeader(), context);
ui.refreshBelowHeader(false);
} else {
if (LOGIN.equals(state))
state = null;
+ if (ui.isLoginScreen()) {
+// if (state == null)
+// state = ui.getPostLoginState();
+ ui.setLoginScreen(false);
+// ui.setPostLoginState(null);
+ }
CmsSession cmsSession = cmsView.getCmsSession();
if (ui.getUserDirNode() == null) {
// FIXME NPE on CMSSession when logging in from anonymous
if (cmsSession == null || cmsView.isAnonymous()) {
assert publicBasePath != null;
- Content userDir = contentSession.get(CmsConstants.SYS_WORKSPACE + publicBasePath);
+ Content userDir = contentSession
+ .get(ContentUtils.SLASH + CmsConstants.SYS_WORKSPACE + publicBasePath);
ui.setUserDir(userDir);
// ui.initSessions(getRepository(), publicBasePath);
} else {
setState(ui, state != null ? state : defaultLayerPid);
}
} catch (Exception e) {
- CmsFeedback.show("Unexpected exception", e);
+ CmsFeedback.error("Unexpected exception", e);
}
}
}
- private void refreshPart(CmsUiProvider uiProvider, Composite part, Content context) {
+ private void refreshPart(SwtUiProvider uiProvider, Composite part, Content context) {
CmsSwtUtils.clear(part);
uiProvider.createUiPart(part, context);
}
- private CmsUiProvider findUiProvider(String pid) {
+ private SwtUiProvider findUiProvider(String pid) {
if (!uiProvidersByPid.containsKey(pid))
return null;
return uiProvidersByPid.get(pid).get();
} else {
- List<QName> objectClasses = content.getTypes();
+ List<QName> objectClasses = content.getContentClasses();
Set<String> types = new TreeSet<>();
for (QName cc : objectClasses) {
String type = cc.getPrefix() + ":" + cc.getLocalPart();
if (byType.containsKey(type))
types.add(type);
}
- if (types.size() == 0)
+ if (types.size() == 0) {
throw new IllegalArgumentException("No type found for " + content + " (" + objectClasses + ")");
+ }
String type = types.iterator().next();
if (!byType.containsKey(type))
throw new IllegalArgumentException("No component found for " + content + " with type " + type);
return;
}
SuiteUi suiteUi = (SuiteUi) cmsUi;
+ if (suiteUi.isLoginScreen()) {
+// suiteUi.setPostLoginState(state);
+ return;
+ }
+
Content node = stateToNode(suiteUi, state);
if (node == null) {
suiteUi.getCmsView().navigateTo(HOME_STATE);
*/
@Override
- public void handleEvent(Event event) {
+ public void onEvent(String topic, Map<String, Object> event) {
// Specific UI related events
SuiteUi ui = getRelatedUi(event);
if (ui == null)
return;
- try {
- String appTitle = "";
- if (ui.getTitle() != null)
- appTitle = ui.getTitle().lead() + " - ";
+ ui.getCmsView().runAs(() -> {
+ try {
+ String appTitle = "";
+ if (ui.getTitle() != null)
+ appTitle = ui.getTitle().lead() + " - ";
// String currentLayerId = ui.getCurrentLayerId();
// SuiteLayer currentLayer = currentLayerId != null ? layersByPid.get(currentLayerId).get() : null;
- if (SuiteUiUtils.isTopic(event, SuiteEvent.refreshPart)) {
- Content 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), appTitle + CmsUxUtils.getTitle(node));
- } else if (SuiteUiUtils.isTopic(event, SuiteEvent.openNewPart)) {
- Content 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), appTitle + CmsUxUtils.getTitle(node));
- } else if (SuiteUiUtils.isTopic(event, SuiteEvent.switchLayer)) {
- String layerId = get(event, SuiteEvent.LAYER);
- if (layerId != null) {
+ if (SuiteUiUtils.isTopic(topic, SuiteEvent.refreshPart)) {
+ Content node = getNode(ui, event);
+ if (node == null)
+ return;
+ SwtUiProvider uiProvider = findByType(uiProvidersByType, node);
+ SuiteLayer layer = findByType(layersByType, node);
+ ui.switchToLayer(layer, node);
+ layer.view(uiProvider, ui.getCurrentWorkArea(), node);
+ ui.getCmsView().stateChanged(nodeToState(node), appTitle + CmsUxUtils.getTitle(node));
+ } else if (SuiteUiUtils.isTopic(topic, SuiteEvent.openNewPart)) {
+ Content node = getNode(ui, event);
+ if (node == null)
+ return;
+ SwtUiProvider uiProvider = findByType(uiProvidersByType, node);
+ SuiteLayer layer = findByType(layersByType, node);
+ ui.switchToLayer(layer, node);
+ layer.open(uiProvider, ui.getCurrentWorkArea(), node);
+ ui.getCmsView().stateChanged(nodeToState(node), appTitle + CmsUxUtils.getTitle(node));
+ } else if (SuiteUiUtils.isTopic(topic, SuiteEvent.switchLayer)) {
+ String layerId = get(event, SuiteEvent.LAYER);
+ 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();
- // FIXME make sure we don't rebuild the work area twice
- Composite workArea = ui.getCmsView().doAs(() -> ui.switchToLayer(layerId, ui.getUserDirNode()));
- String title = null;
- if (layerTitle != null)
- title = layerTitle.lead();
- Content nodeFromState = getNode(ui, event);
- if (nodeFromState != null && nodeFromState.getPath().equals(ui.getUserDirNode().getPath())) {
- // default layer view is forced
- String state = defaultLayerPid.equals(layerId) ? "~" : layerId;
- ui.getCmsView().stateChanged(state, appTitle + title);
- suiteLayer.view(null, workArea, nodeFromState);
- } else {
- Content 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 + CmsUxUtils.getTitle(layerCurrentContext));
+ SuiteLayer suiteLayer = findLayer(layerId);
+ if (suiteLayer == null)
+ throw new IllegalArgumentException("No layer '" + layerId + "' available.");
+ Localized layerTitle = suiteLayer.getTitle();
+ // FIXME make sure we don't rebuild the work area twice
+ Composite workArea = ui.switchToLayer(layerId, ui.getUserDirNode());
+ String title = null;
+ if (layerTitle != null)
+ title = layerTitle.lead();
+ Content nodeFromState = getNode(ui, event);
+ if (nodeFromState != null && nodeFromState.getPath().equals(ui.getUserDirNode().getPath())) {
+ // default layer view is forced
+ String state = defaultLayerPid.equals(layerId) ? "~" : layerId;
+ ui.getCmsView().stateChanged(state, appTitle + title);
+ suiteLayer.view(null, workArea, nodeFromState);
} else {
- // no context was shown
- ui.getCmsView().stateChanged(layerId, appTitle + title);
+ Content 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 + CmsUxUtils.getTitle(layerCurrentContext));
+ } else {
+ // no context was shown
+ ui.getCmsView().stateChanged(layerId, appTitle + title);
+ }
+ }
+ } else {
+ Content node = getNode(ui, event);
+ if (node != null) {
+ SuiteLayer layer = findByType(layersByType, node);
+ ui.switchToLayer(layer, node);
}
- }
- } else {
- Content node = getNode(ui, event);
- if (node != null) {
- SuiteLayer layer = findByType(layersByType, node);
- ui.getCmsView().runAs(() -> ui.switchToLayer(layer, node));
}
}
+ } catch (Exception e) {
+ CmsFeedback.error("Cannot handle event " + topic + " " + event, e);
+// log.error("Cannot handle event " + event, e);
}
- } catch (Exception e) {
- log.error("Cannot handle event " + event, e);
-// CmsView.getCmsView(ui).exception(e);
- }
-
+ });
}
- private Content getNode(SuiteUi ui, Event event) {
+ private Content getNode(SuiteUi ui, Map<String, Object> event) {
ProvidedSession contentSession = (ProvidedSession) CmsUxUtils.getContentSession(contentRepository,
ui.getCmsView());
User user = cmsUserManager.getUser(username);
if (user == null)
return null;
- UserDirectory userDirectory = cmsUserManager.getUserDirectory(user);
- path = CmsContentRepository.DIRECTORY_BASE + SLASH + userDirectory.getGlobalId() + SLASH
- + userDirectory.getRolePath(user);
- node = contentSession.get(path);
+ node = ContentUtils.roleToContent(cmsUserManager, contentSession, user);
// LdapName userDn;
// try {
// userDn = new LdapName(user.getName());
return node;
}
- private SuiteUi getRelatedUi(Event event) {
- return managedUis.get(get(event, CMS_VIEW_UID_PROPERTY));
+ private SuiteUi getRelatedUi(Map<String, Object> eventProperties) {
+ return managedUis.get(get(eventProperties, CMS_VIEW_UID_PROPERTY));
}
- public static String get(Event event, String key) {
- Object value = event.getProperty(key);
+ public static String get(Map<String, Object> eventProperties, String key) {
+ Object value = eventProperties.get(key);
if (value == null)
return null;
// throw new IllegalArgumentException("Property " + key + " must be set");
* Dependency injection.
*/
- public void addUiProvider(CmsUiProvider uiProvider, Map<String, Object> properties) {
+ public void addUiProvider(SwtUiProvider uiProvider, Map<String, Object> properties) {
if (properties.containsKey(Constants.SERVICE_PID)) {
String pid = (String) properties.get(Constants.SERVICE_PID);
RankedObject.putIfHigherRank(uiProvidersByPid, pid, uiProvider, properties);
}
if (properties.containsKey(EntityConstants.TYPE)) {
List<String> types = LangUtils.toStringList(properties.get(EntityConstants.TYPE));
- for (String type : types)
+ for (String type : types) {
RankedObject.putIfHigherRank(uiProvidersByType, type, uiProvider, properties);
+ }
}
}
- public void removeUiProvider(CmsUiProvider uiProvider, Map<String, Object> properties) {
+ public void removeUiProvider(SwtUiProvider uiProvider, Map<String, Object> properties) {
if (properties.containsKey(Constants.SERVICE_PID)) {
String pid = (String) properties.get(Constants.SERVICE_PID);
if (uiProvidersByPid.containsKey(pid)) {
- if (uiProvidersByPid.get(pid).equals(new RankedObject<CmsUiProvider>(uiProvider, properties))) {
+ if (uiProvidersByPid.get(pid).equals(new RankedObject<SwtUiProvider>(uiProvider, properties))) {
uiProvidersByPid.remove(pid);
}
}
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))) {
+ if (uiProvidersByType.get(type).equals(new RankedObject<SwtUiProvider>(uiProvider, properties))) {
uiProvidersByType.remove(type);
}
}
}
}
+// public void addLayer(SuiteLayer layer, Map<String, Object> properties) {
+// if (!properties.containsKey(Constants.SERVICE_PID))
+// throw new IllegalArgumentException("A layer must have an ID");
+// String pid = (String) properties.get(Constants.SERVICE_PID);
+// List<String> types = properties.containsKey(EntityConstants.TYPE)
+// ? LangUtils.toStringList(properties.get(EntityConstants.TYPE))
+// : new ArrayList<>();
+// if (types.isEmpty()) {
+// RankedObject.putIfHigherRank(layersByPid, pid, layer, properties);
+// } else {
+// if (layersByPid.containsKey(pid)) {
+// RankedObject<SuiteLayer> current = layersByPid.get(pid);
+// List<String> currentTypes = current.getProperties().containsKey(EntityConstants.TYPE)
+// ? LangUtils.toStringList(current.getProperties().get(EntityConstants.TYPE))
+// : new ArrayList<>();
+// if (!types.containsAll(currentTypes)) {
+// throw new IllegalArgumentException("Higher-ranked layer " + pid + " contains only types " + types
+// + ", while it must override all " + currentTypes);
+// }
+// }
+// RankedObject.putIfHigherRank(layersByPid, pid, layer, properties);
+// for (String type : types)
+// RankedObject.putIfHigherRank(layersByType, type, layer, properties);
+// }
+// }
+
public void addLayer(SuiteLayer layer, Map<String, Object> properties) {
if (properties.containsKey(Constants.SERVICE_PID)) {
String pid = (String) properties.get(Constants.SERVICE_PID);
projects / gpl / argeo-suite.git / blobdiff