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=7e043776a70825d3c62173cea203be09b5b72c86;hpb=9b48d0d4441d079a371d6d292209f4184c366954;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 7e04377..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 @@ -1,34 +1,53 @@ 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.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; 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.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; 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; +import org.osgi.service.useradmin.Role; import org.osgi.service.useradmin.User; /** Entry to the admin area. */ @@ -36,59 +55,117 @@ 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()); - List orgs = cmsUserManager.listGroups(null, true, false); + ContentSession contentSession = contentRepository.get(); + + SashForm sashForm = new SashForm(parent, SWT.VERTICAL); + CmsSwtUtils.fill(sashForm); - SwtHierarchicalPart tree = new SwtHierarchicalPart(parent, SWT.NONE) { + // 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); - User org = (User) orgs.get(index); - item.setData(org); - item.setText(org.getName()); - - item.setItemCount(10); + UserDirectory directory = (UserDirectory) directories.get(index); + 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) { - String text = parentItem.getText() + " - " + parentItem.indexOf(item); - item.setText(text); - item.setItemCount(10); + int index = getTree().indexOf(item); + 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(LangUtils.size(child.getDirectHierachyUnits(true))); } @Override protected int getRootItemCount() { - return orgs.size(); + return directories.size(); } }; -// 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); -// } -// item.setText(text); -// item.setItemCount(10); -// }); -// tree.setItemCount(orgs.size()); -// tree.setLayoutData(CmsSwtUtils.fillAll()); - CmsSwtUtils.fill(tree); + 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 = 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; + 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()); @@ -98,30 +175,19 @@ 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)); - -// 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.onSelected((o) -> { + addItem.setImage(theme.getSmallIcon(SuiteIcon.add)); + + sashForm.setWeights(new int[] { 30, 70 }); + // CONTROLLER + directoriesView.onSelected((o) -> { + if (o instanceof HierarchyUnit) { + usersView.setInput((HierarchyUnit) o); + } + }); + + usersView.onSelected((o) -> { User user = (User) o; if (user != null) { cmsView.sendEvent(SuiteEvent.refreshPart.topic(), SuiteEvent.eventProperties(user)); @@ -131,37 +197,13 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider { } }); - tree.onAction((o) -> { + usersView.onAction((o) -> { User user = (User) o; if (user != null) { cmsView.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); -// } -// } -// -// @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)); -// } -// } -// }); - addItem.addSelectionListener((Selected) (e) -> { // SuiteUtils.getOrCreateUserNode(adminSession, userDn); Wizard wizard = new NewUserWizard(null); @@ -172,15 +214,25 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider { } }); - tree.refresh(); + directoriesView.refresh(); + usersView.refresh(); - return tree; + return sashForm; } - private String getUserProperty(Object element, String key) { - Object value = ((User) element).getProperties().get(key); - return value != null ? value.toString() : null; - } +// 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; @@ -191,4 +243,8 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider { return createUiPart(parent, JcrContent.nodeToContent(context)); } + public void setContentRepository(ContentRepository contentRepository) { + this.contentRepository = contentRepository; + } + }