X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.ui%2Fsrc%2Forg%2Fargeo%2Fapp%2Fui%2Fpeople%2FUsersEntryArea.java;h=355f5202732422fe8e71b4a19c001daa25317076;hb=9c3baf6fd38128aea09679be4c0b54d23cf7a876;hp=d0e24d5bb5a4129e6022cfbea49fcc499460d4d2;hpb=ca5ab3a2e58b3607ea8920fd94e0a936c55cf99d;p=gpl%2Fargeo-suite.git 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 d0e24d5..355f520 100644 --- 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,25 +8,34 @@ import javax.jcr.RepositoryException; import org.argeo.api.acr.Content; import org.argeo.api.acr.ContentRepository; -import org.argeo.api.cms.CmsTheme; -import org.argeo.api.cms.CmsView; +import org.argeo.api.acr.ContentSession; +import org.argeo.api.cms.ux.CmsIcon; +import org.argeo.api.cms.ux.CmsView; import org.argeo.app.ui.SuiteEvent; import org.argeo.app.ui.SuiteIcon; import org.argeo.app.ui.dialogs.NewUserWizard; import org.argeo.cms.CmsUserManager; +import org.argeo.cms.acr.ContentUtils; +import org.argeo.cms.auth.CmsRole; +import org.argeo.cms.auth.CurrentUser; +import org.argeo.cms.auth.UserAdminUtils; import org.argeo.cms.jcr.acr.JcrContent; +import org.argeo.cms.jface.dialog.CmsWizardDialog; +import org.argeo.cms.swt.CmsSwtTheme; import org.argeo.cms.swt.CmsSwtUtils; import org.argeo.cms.swt.Selected; import org.argeo.cms.swt.acr.SwtUiProvider; -import org.argeo.cms.swt.dialogs.CmsWizardDialog; import org.argeo.cms.swt.widgets.SwtHierarchicalPart; import org.argeo.cms.swt.widgets.SwtTabularPart; import org.argeo.cms.ui.CmsUiProvider; +import org.argeo.cms.ux.widgets.Column; import org.argeo.cms.ux.widgets.HierarchicalPart; import org.argeo.cms.ux.widgets.TabularPart; -import org.argeo.osgi.useradmin.HierarchyUnit; import org.argeo.osgi.useradmin.UserDirectory; import org.argeo.util.LangUtils; +import org.argeo.util.directory.HierarchyUnit; +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; @@ -35,7 +44,6 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.TableItem; import org.eclipse.swt.widgets.ToolBar; import org.eclipse.swt.widgets.ToolItem; import org.eclipse.swt.widgets.TreeItem; @@ -51,10 +59,11 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider { @Override public Control createUiPart(Composite parent, Content context) { - CmsTheme theme = CmsSwtUtils.getCmsTheme(parent); + CmsSwtTheme theme = CmsSwtUtils.getCmsTheme(parent); CmsView cmsView = CmsSwtUtils.getCmsView(parent); parent.setLayout(new GridLayout()); + ContentSession contentSession = contentRepository.get(); SashForm sashForm = new SashForm(parent, SWT.VERTICAL); CmsSwtUtils.fill(sashForm); @@ -69,24 +78,35 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider { protected void refreshRootItem(TreeItem item) { int index = getTree().indexOf(item); UserDirectory directory = (UserDirectory) directories.get(index); - item.setData(directory); + List visible = new ArrayList<>(); +// item.setData(directory); item.setText(directory.getName()); - - item.setItemCount(LangUtils.size(directory.getRootHierarchyUnits())); +// if (CmsRole.userAdmin.implied(CurrentUser.getCmsSession().getSubject(), directory.getGlobalId())) { +// visible.addAll(directory.getRootHierarchyUnits(true)); +// +// } else { + for (HierarchyUnit hu : directory.getDirectHierarchyUnits(true)) { + if (CurrentUser.implies(CmsRole.userAdmin, hu.getContext())) { + visible.add(hu); + } + } +// } + item.setData(visible); + item.setItemCount(visible.size()); } @Override protected void refreshItem(TreeItem parentItem, TreeItem item) { int index = getTree().indexOf(item); Iterable children; - if (parentItem.getData() instanceof UserDirectory) - children = ((UserDirectory) parentItem.getData()).getRootHierarchyUnits(); + if (parentItem.getData() instanceof Iterable) + children = (Iterable) parentItem.getData(); else - children = ((HierarchyUnit) parentItem.getData()).getDirectHierachyUnits(); + children = ((HierarchyUnit) parentItem.getData()).getDirectHierachyUnits(true); HierarchyUnit child = LangUtils.getAt(children, index); item.setData(child); item.setText(child.getHierarchyUnitName()); - item.setItemCount(LangUtils.size(child.getDirectHierachyUnits())); + item.setItemCount(LangUtils.size(child.getDirectHierachyUnits(true))); } @Override @@ -97,27 +117,88 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider { }; TabularPart usersView = new SwtTabularPart(sashForm, SWT.NONE) { - List roles; + List roles = new ArrayList<>(); @Override - protected void refreshItem(TableItem item) { - int index = getTable().indexOf(item); - User role = (User) roles.get(index); - item.setData(role); - item.setText(role.getName()); + protected Object getData(int row) { + return roles.get(row); } +// @Override +// protected void refreshItem(TableItem item) { +// int index = getTable().indexOf(item); +// User role = (User) roles.get(index); +// item.setData(role); +// item.setText(role.getName()); +// Image icon; +// if (role instanceof Organization) { +// icon = theme.getSmallIcon(SuiteIcon.organisation); +// } else if (role instanceof FunctionalGroup) { +// icon = theme.getSmallIcon(SuiteIcon.group); +// } else if (role instanceof Person) { +// icon = theme.getSmallIcon(SuiteIcon.person); +// } 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); + UserDirectory ud = (UserDirectory) hu.getDirectory(); + for (HierarchyUnit directChild : hu.getDirectHierachyUnits(false)) { + if (!directChild.isFunctional()) { + for (Role r : ud.getHierarchyUnitRoles(directChild, null, false)) { + Content content = ContentUtils.roleToContent(cmsUserManager, contentSession, r); + // if (r instanceof Person || r instanceof Organization) + if (content.hasContentClass(LdapObjs.inetOrgPerson.qName(), LdapObjs.organization.qName())) + roles.add(content); + } + } + } + // roles = hu.getHierarchyUnitRoles(null, false); return roles.size(); } }; + usersView.addColumn(new Column() { + + @Override + public String getText(Content role) { + if (role.isContentClass(LdapObjs.inetOrgPerson.qName())) + return UserAdminUtils.getUserDisplayName(role.adapt(User.class)); + else if (role.isContentClass(LdapObjs.organization.qName())) + return role.attr(LdapAttrs.o.qName()); + else if (role.isContentClass(LdapObjs.groupOfNames.qName())) + return role.attr(LdapAttrs.cn.qName()); + else + return null; + } + + @Override + public CmsIcon getIcon(Content role) { + if (role.isContentClass(LdapObjs.inetOrgPerson.qName())) + return SuiteIcon.person; + else if (role.isContentClass(LdapObjs.organization.qName())) + return SuiteIcon.organisation; + else if (role.isContentClass(LdapObjs.groupOfNames.qName())) + return SuiteIcon.group; + else + return null; + } + @Override + public int getWidth() { + return 300; + } + + }); + usersView.addColumn((Column) (role) -> role.attr(LdapAttrs.mail.qName())); + + // toolbar Composite bottom = new Composite(parent, SWT.NONE); bottom.setLayoutData(CmsSwtUtils.fillWidth()); bottom.setLayout(CmsSwtUtils.noSpaceGridLayout()); @@ -126,9 +207,11 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider { ToolItem deleteItem = new ToolItem(bottomToolBar, SWT.FLAT); deleteItem.setEnabled(false); // CmsUiUtils.style(deleteItem, SuiteStyle.recentItems); - deleteItem.setImage(SuiteIcon.delete.getSmallIcon(theme)); + deleteItem.setImage(theme.getSmallIcon(SuiteIcon.delete)); ToolItem addItem = new ToolItem(bottomToolBar, SWT.FLAT); - addItem.setImage(SuiteIcon.add.getSmallIcon(theme)); + addItem.setImage(theme.getSmallIcon(SuiteIcon.add)); + + sashForm.setWeights(new int[] { 30, 70 }); // CONTROLLER directoriesView.onSelected((o) -> { @@ -138,7 +221,7 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider { }); usersView.onSelected((o) -> { - User user = (User) o; + Content user = (Content) o; if (user != null) { cmsView.sendEvent(SuiteEvent.refreshPart.topic(), SuiteEvent.eventProperties(user)); deleteItem.setEnabled(true); @@ -148,7 +231,7 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider { }); usersView.onAction((o) -> { - User user = (User) o; + Content user = (Content) o; if (user != null) { cmsView.sendEvent(SuiteEvent.openNewPart.topic(), SuiteEvent.eventProperties(user)); } @@ -170,9 +253,18 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider { return sashForm; } -// private String getUserProperty(Object element, String key) { -// Object value = ((User) element).getProperties().get(key); +// static String getProperty(Role role, LdapAttrs attr) { +// Object value = role.getProperties().get(attr.name()); // 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) {