X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.ui%2Fsrc%2Forg%2Fargeo%2Fapp%2Fui%2Fpeople%2FUsersEntryArea.java;h=04cccf7b89f64dff6b43811bf248e643af155b74;hb=99a029d144e7aab7f8b5a9ac3a2c4383cae4a6f5;hp=b7720aefa9fa9cbc9366150769b0ea3cd5dbdaf7;hpb=beb5e6f076b22822c9a94839dccca1c28922f19b;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 b7720ae..04cccf7 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 @@ -1,12 +1,16 @@ package org.argeo.app.ui.people; +import java.util.ArrayList; import java.util.List; import javax.jcr.Node; 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; import org.argeo.app.ui.SuiteIcon; import org.argeo.app.ui.dialogs.NewUserWizard; @@ -16,21 +20,34 @@ 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.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.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; +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; 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.Tree; import org.eclipse.swt.widgets.TreeItem; import org.osgi.service.useradmin.Group; +import org.osgi.service.useradmin.Role; import org.osgi.service.useradmin.User; /** Entry to the admin area. */ @@ -38,31 +55,95 @@ 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); + CmsView cmsView = CmsSwtUtils.getCmsView(parent); parent.setLayout(new GridLayout()); - List orgs = cmsUserManager.listGroups(null, true, false); - - final Tree tree = new Tree(parent, SWT.VIRTUAL | SWT.BORDER); - tree.addListener(SWT.SetData, event -> { - TreeItem item = (TreeItem) event.item; - TreeItem parentItem = item.getParentItem(); - String text = null; - if (parentItem == null) { - int index = tree.indexOf(item); - User org = (User) orgs.get(index); - item.setData(org); - text = org.getName(); - } else { - text = parentItem.getText() + " - " + parentItem.indexOf(item); + ContentSession contentSession = contentRepository.get(); + + SashForm sashForm = new SashForm(parent, SWT.VERTICAL); + CmsSwtUtils.fill(sashForm); + + // MODEL + List directories = new ArrayList<>(cmsUserManager.getUserDirectories()); + // List orgs = cmsUserManager.listGroups(null, true, false); + + // VIEW + HierarchicalPart directoriesView = new SwtHierarchicalPart(sashForm, SWT.NONE) { + + @Override + protected void refreshRootItem(TreeItem item) { + int index = getTree().indexOf(item); + UserDirectory directory = (UserDirectory) directories.get(index); + item.setData(directory); + item.setText(directory.getName()); + + item.setItemCount(LangUtils.size(directory.getRootHierarchyUnits(true))); + } + + @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(true); + else + children = ((HierarchyUnit) parentItem.getData()).getFunctionalHierachyUnits(); + HierarchyUnit child = LangUtils.getAt(children, index); + item.setData(child); + item.setText(child.getHierarchyUnitName()); + item.setItemCount(LangUtils.size(child.getFunctionalHierachyUnits())); + } + + @Override + protected int getRootItemCount() { + return directories.size(); + } + + }; + + TabularPart usersView = new SwtTabularPart(sashForm, SWT.NONE) { + 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()); + 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); } - item.setText(text); - item.setItemCount(10); - }); - tree.setItemCount(orgs.size()); - tree.setLayoutData(CmsSwtUtils.fillAll()); + + @Override + protected int getItemCount() { + roles.clear(); + HierarchyUnit hu = (HierarchyUnit) getInput(); + if (hu == null) + return 0; + for (HierarchyUnit directChild : hu.getDirectHierachyUnits()) { + if (!directChild.isFunctional()) { + roles.addAll(directChild.getHierarchyUnitRoles(null, false)); + } + } + // roles = hu.getHierarchyUnitRoles(null, false); + return roles.size(); + } + + }; Composite bottom = new Composite(parent, SWT.NONE); bottom.setLayoutData(CmsSwtUtils.fillWidth()); @@ -76,46 +157,27 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider { ToolItem addItem = new ToolItem(bottomToolBar, SWT.FLAT); addItem.setImage(SuiteIcon.add.getSmallIcon(theme)); -// tree.addSelectionListener((Selected) (e) -> { -// User user = (User) e.item.getData(); -// if (user != null) { -// CmsSwtUtils.getCmsView(parent).sendEvent(SuiteEvent.refreshPart.topic(), -// SuiteEvent.eventProperties(user)); -// deleteItem.setEnabled(true); -// } else { -// deleteItem.setEnabled(false); -// } -// }); -// tree.addListener(SWT.MouseDoubleClick, (e) -> { -// User user = (User) e.item.getData(); -// if (user != null) { -// CmsSwtUtils.getCmsView(parent).sendEvent(SuiteEvent.openNewPart.topic(), -// SuiteEvent.eventProperties(user)); -// } -// -// }); - - tree.addSelectionListener(new SelectionListener() { - - @Override - public void widgetSelected(SelectionEvent e) { - User user = (User) e.item.getData(); - if (user != null) { - CmsSwtUtils.getCmsView(parent).sendEvent(SuiteEvent.refreshPart.topic(), - SuiteEvent.eventProperties(user)); - deleteItem.setEnabled(true); - } else { - deleteItem.setEnabled(false); - } + // CONTROLLER + directoriesView.onSelected((o) -> { + if (o instanceof HierarchyUnit) { + usersView.setInput((HierarchyUnit) o); } - - @Override - public void widgetDefaultSelected(SelectionEvent e) { - User user = (User) e.item.getData(); - if (user != null) { - CmsSwtUtils.getCmsView(parent).sendEvent(SuiteEvent.openNewPart.topic(), - SuiteEvent.eventProperties(user)); - } + }); + + usersView.onSelected((o) -> { + User user = (User) o; + if (user != null) { + cmsView.sendEvent(SuiteEvent.refreshPart.topic(), SuiteEvent.eventProperties(user)); + deleteItem.setEnabled(true); + } else { + deleteItem.setEnabled(false); + } + }); + + usersView.onAction((o) -> { + User user = (User) o; + if (user != null) { + cmsView.sendEvent(SuiteEvent.openNewPart.topic(), SuiteEvent.eventProperties(user)); } }); @@ -129,14 +191,26 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider { } }); - return tree; - } + directoriesView.refresh(); + usersView.refresh(); - private String getUserProperty(Object element, String key) { - Object value = ((User) element).getProperties().get(key); - return value != null ? value.toString() : null; + return sashForm; } +// 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) { this.cmsUserManager = cmsUserManager; } @@ -146,4 +220,8 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider { return createUiPart(parent, JcrContent.nodeToContent(context)); } + public void setContentRepository(ContentRepository contentRepository) { + this.contentRepository = contentRepository; + } + }