X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.ui%2Fsrc%2Forg%2Fargeo%2Fapp%2Fui%2Fpeople%2FUsersEntryArea.java;h=c31159b41e91a06ebd6bfc93cba608c2c5598708;hb=c6b561fc1d45dd5abcbf86f99ae546bdc3b42b8d;hp=14e4b26cc14c738209f60bf479443a2593b267b1;hpb=c68ffb7eadc935addc52bec34ffcbb20b6425b56;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 14e4b26..c31159b 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 @@ -7,13 +7,17 @@ import javax.jcr.Node; import javax.jcr.RepositoryException; import org.argeo.api.acr.Content; -import org.argeo.api.cms.CmsTheme; -import org.argeo.api.cms.CmsView; +import org.argeo.api.acr.ContentRepository; +import org.argeo.api.acr.ContentSession; +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.auth.CmsRole; +import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.jcr.acr.JcrContent; +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; @@ -21,14 +25,20 @@ 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.FunctionalGroup; +import org.argeo.util.directory.HierarchyUnit; +import org.argeo.util.directory.Organization; +import org.argeo.util.directory.Person; 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; @@ -45,12 +55,16 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider { private CmsUserManager cmsUserManager; + private ContentRepository contentRepository; + @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); @@ -65,20 +79,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); - item.setText(directory.getBasePath()); - - item.setItemCount(directory.getHierarchyChildCount()); + List visible = new ArrayList<>(); +// item.setData(directory); + item.setText(directory.getName()); +// 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); - HierarchyUnit parent = (HierarchyUnit) parentItem.getData(); - HierarchyUnit child = parent.getHierarchyChild(index); + Iterable children; + if (parentItem.getData() instanceof Iterable) + children = (Iterable) parentItem.getData(); + else + children = ((HierarchyUnit) parentItem.getData()).getDirectHierachyUnits(true); + HierarchyUnit child = LangUtils.getAt(children, index); item.setData(child); item.setText(child.getHierarchyUnitName()); - item.setItemCount(child.getHierarchyChildCount()); + item.setItemCount(LangUtils.size(child.getDirectHierachyUnits(true))); } @Override @@ -89,7 +118,7 @@ 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) { @@ -97,18 +126,46 @@ 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 = 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.getRoles(null, false); + UserDirectory ud = (UserDirectory) hu.getDirectory(); + for (HierarchyUnit directChild : hu.getDirectHierachyUnits(false)) { + if (!directChild.isFunctional()) { + for (Role r : ud.getHierarchyUnitRoles(directChild, null, false)) { + if (r instanceof Person || r instanceof Organization) + roles.add(r); + } + } + } + // roles = hu.getHierarchyUnitRoles(null, false); return roles.size(); } }; + usersView.addColumn(new Column() { + + @Override + public String getText(User model) { + return model.toString(); + } + }); Composite bottom = new Composite(parent, SWT.NONE); bottom.setLayoutData(CmsSwtUtils.fillWidth()); @@ -118,14 +175,16 @@ 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) -> { - HierarchyUnit hu = (HierarchyUnit) o; - usersView.setInput(hu); + if (o instanceof HierarchyUnit) { + usersView.setInput((HierarchyUnit) o); + } }); usersView.onSelected((o) -> { @@ -164,6 +223,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) { @@ -175,4 +243,8 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider { return createUiPart(parent, JcrContent.nodeToContent(context)); } + public void setContentRepository(ContentRepository contentRepository) { + this.contentRepository = contentRepository; + } + }