Use directory kinds.

diff --git a/org.argeo.app.core/src/org/argeo/app/core/SuiteUtils.java b/org.argeo.app.core/src/org/argeo/app/core/SuiteUtils.java
index cc0e3bfffc63b858c91ce44d5035f59b84051d43..2b211423a145200eef6b67ad3969cfa58bb6081a 100644 (file)
--- a/org.argeo.app.core/src/org/argeo/app/core/SuiteUtils.java
+++ b/org.argeo.app.core/src/org/argeo/app/core/SuiteUtils.java
@@ -1,5 +1,7 @@
 package org.argeo.app.core;
 
+import static org.argeo.cms.acr.ContentUtils.SLASH;
+
 import java.util.HashSet;
 import java.util.Set;
 
@@ -11,18 +13,32 @@ import javax.jcr.security.Privilege;
 import javax.naming.ldap.LdapName;
 import javax.security.auth.x500.X500Principal;
 
+import org.argeo.api.acr.Content;
+import org.argeo.api.acr.ContentSession;
 import org.argeo.api.cms.CmsConstants;
 import org.argeo.api.cms.CmsSession;
 import org.argeo.app.api.EntityType;
 import org.argeo.app.api.SuiteRole;
+import org.argeo.cms.CmsUserManager;
+import org.argeo.cms.acr.CmsContentRepository;
 import org.argeo.jackrabbit.security.JackrabbitSecurityUtils;
 import org.argeo.jcr.JcrException;
 import org.argeo.jcr.JcrUtils;
+import org.argeo.osgi.useradmin.UserDirectory;
 import org.argeo.util.naming.LdapAttrs;
+import org.osgi.service.useradmin.Role;
 
 /** Utilities around the Argeo Suite APIs. */
 public class SuiteUtils {
+       public static Content roleToContent(CmsUserManager userManager, ContentSession contentSession, Role role) {
+               UserDirectory userDirectory = userManager.getDirectory(role);
+               String path = CmsContentRepository.DIRECTORY_BASE + SLASH + userDirectory.getName() + SLASH
+                               + userDirectory.getRolePath(role);
+               Content content = contentSession.get(path);
+               return content;
+       }
 
+       @Deprecated
        public static String getUserNodePath(LdapName userDn) {
                String uid = userDn.getRdn(userDn.size() - 1).getValue().toString();
                return EntityType.user.basePath() + '/' + uid;
@@ -55,6 +71,7 @@ public class SuiteUtils {
                }
        }
 
+       @Deprecated
        public static Node getCmsSessionNode(Session session, CmsSession cmsSession) {
                try {
                        return session.getNode(getUserNodePath(cmsSession.getUserDn()) + '/' + cmsSession.getUuid().toString());
@@ -63,6 +80,7 @@ public class SuiteUtils {
                }
        }
 
+       @Deprecated
        public static Node getOrCreateCmsSessionNode(Session adminSession, CmsSession cmsSession) {
                try {
                        LdapName userDn = cmsSession.getUserDn();

diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java
index 63e332450bfdaf3e10e4c6a181c7e46637e0c9f7..3777b2ecda03557afa810dd561b32f5d0935ba3d 100644 (file)
--- a/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java
@@ -32,6 +32,7 @@ import org.argeo.app.api.EntityConstants;
 import org.argeo.app.api.EntityNames;
 import org.argeo.app.api.EntityType;
 import org.argeo.app.api.RankedObject;
+import org.argeo.app.core.SuiteUtils;
 import org.argeo.cms.AbstractCmsApp;
 import org.argeo.cms.CmsUserManager;
 import org.argeo.cms.LocaleUtils;
@@ -574,10 +575,7 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
                        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 = SuiteUtils.roleToContent(cmsUserManager, contentSession, user);
 //                     LdapName userDn;
 //                     try {
 //                             userDn = new LdapName(user.getName());

diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/SuiteIcon.java b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteIcon.java
index bfc92c370936e56955fd66ad6aa3dacc9bf29fe2..fda0eb9f915bde91cdad7a69d3baa5aecabece44 100644 (file)
--- a/org.argeo.app.ui/src/org/argeo/app/ui/SuiteIcon.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteIcon.java
@@ -6,7 +6,7 @@ import org.argeo.cms.swt.CmsIcon;
 public enum SuiteIcon implements CmsIcon {
        add, save, close, closeAll, search, delete, logout, dashboard,
        // people
-       people, person, organisation,
+       people, group, person, organisation,
        // library
        documents, document, folder,
        // admin and settings

diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/people/UsersEntryArea.java b/org.argeo.app.ui/src/org/argeo/app/ui/people/UsersEntryArea.java
index d0e24d5bb5a4129e6022cfbea49fcc499460d4d2..04cccf7b89f64dff6b43811bf248e643af155b74 100644 (file)
--- a/org.argeo.app.ui/src/org/argeo/app/ui/people/UsersEntryArea.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/people/UsersEntryArea.java
@@ -8,6 +8,7 @@ import javax.jcr.RepositoryException;
 
 import org.argeo.api.acr.Content;
 import org.argeo.api.acr.ContentRepository;
+import org.argeo.api.acr.ContentSession;
 import org.argeo.api.cms.CmsTheme;
 import org.argeo.api.cms.CmsView;
 import org.argeo.app.ui.SuiteEvent;
@@ -24,13 +25,19 @@ import org.argeo.cms.swt.widgets.SwtTabularPart;
 import org.argeo.cms.ui.CmsUiProvider;
 import org.argeo.cms.ux.widgets.HierarchicalPart;
 import org.argeo.cms.ux.widgets.TabularPart;
+import org.argeo.osgi.useradmin.FunctionalGroup;
 import org.argeo.osgi.useradmin.HierarchyUnit;
+import org.argeo.osgi.useradmin.Organization;
+import org.argeo.osgi.useradmin.Person;
 import org.argeo.osgi.useradmin.UserDirectory;
 import org.argeo.util.LangUtils;
+import org.argeo.util.naming.LdapAttrs;
+import org.argeo.util.naming.LdapObjs;
 import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.SashForm;
+import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
@@ -39,6 +46,7 @@ import org.eclipse.swt.widgets.TableItem;
 import org.eclipse.swt.widgets.ToolBar;
 import org.eclipse.swt.widgets.ToolItem;
 import org.eclipse.swt.widgets.TreeItem;
+import org.osgi.service.useradmin.Group;
 import org.osgi.service.useradmin.Role;
 import org.osgi.service.useradmin.User;
 
@@ -55,6 +63,8 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider {
                CmsView cmsView = CmsSwtUtils.getCmsView(parent);
                parent.setLayout(new GridLayout());
 
+               ContentSession contentSession = contentRepository.get();
+
                SashForm sashForm = new SashForm(parent, SWT.VERTICAL);
                CmsSwtUtils.fill(sashForm);
 
@@ -72,7 +82,7 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider {
                                item.setData(directory);
                                item.setText(directory.getName());
 
-                               item.setItemCount(LangUtils.size(directory.getRootHierarchyUnits()));
+                               item.setItemCount(LangUtils.size(directory.getRootHierarchyUnits(true)));
                        }
 
                        @Override
@@ -80,13 +90,13 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider {
                                int index = getTree().indexOf(item);
                                Iterable<HierarchyUnit> children;
                                if (parentItem.getData() instanceof UserDirectory)
-                                       children = ((UserDirectory) parentItem.getData()).getRootHierarchyUnits();
+                                       children = ((UserDirectory) parentItem.getData()).getRootHierarchyUnits(true);
                                else
-                                       children = ((HierarchyUnit) parentItem.getData()).getDirectHierachyUnits();
+                                       children = ((HierarchyUnit) parentItem.getData()).getFunctionalHierachyUnits();
                                HierarchyUnit child = LangUtils.getAt(children, index);
                                item.setData(child);
                                item.setText(child.getHierarchyUnitName());
-                               item.setItemCount(LangUtils.size(child.getDirectHierachyUnits()));
+                               item.setItemCount(LangUtils.size(child.getFunctionalHierachyUnits()));
                        }
 
                        @Override
@@ -97,7 +107,7 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider {
                };
 
                TabularPart usersView = new SwtTabularPart(sashForm, SWT.NONE) {
-                       List<? extends Role> roles;
+                       List<Role> roles = new ArrayList<>();
 
                        @Override
                        protected void refreshItem(TableItem item) {
@@ -105,14 +115,31 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider {
                                User role = (User) roles.get(index);
                                item.setData(role);
                                item.setText(role.getName());
+                               Image icon;
+                               if (role instanceof Organization) {
+                                       icon = SuiteIcon.organisation.getSmallIcon(theme);
+                               } else if (role instanceof FunctionalGroup) {
+                                       icon = SuiteIcon.group.getSmallIcon(theme);
+                               } else if (role instanceof Person) {
+                                       icon = SuiteIcon.person.getSmallIcon(theme);
+                               } else {
+                                       icon = null;
+                               }
+                               item.setImage(icon);
                        }
 
                        @Override
                        protected int getItemCount() {
+                               roles.clear();
                                HierarchyUnit hu = (HierarchyUnit) getInput();
                                if (hu == null)
                                        return 0;
-                               roles = hu.getHierarchyUnitRoles(null, false);
+                               for (HierarchyUnit directChild : hu.getDirectHierachyUnits()) {
+                                       if (!directChild.isFunctional()) {
+                                               roles.addAll(directChild.getHierarchyUnitRoles(null, false));
+                                       }
+                               }
+                               // roles = hu.getHierarchyUnitRoles(null, false);
                                return roles.size();
                        }
 
@@ -173,6 +200,15 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider {
 //     private String getUserProperty(Object element, String key) {
 //             Object value = ((User) element).getProperties().get(key);
 //             return value != null ? value.toString() : null;
+//     }
+
+//     private boolean isOrganisation(Role role) {
+//             String[] objectClasses = role.getProperties().get(LdapAttrs.objectClasses.name()).toString().split("\\n");
+//             for (String objectClass : objectClasses) {
+//                     if (LdapObjs.organization.name().equalsIgnoreCase(objectClass))
+//                             return true;
+//             }
+//             return false;
 //     }
 
        public void setCmsUserManager(CmsUserManager cmsUserManager) {