X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=swt%2Forg.argeo.app.ui%2Fsrc%2Forg%2Fargeo%2Fapp%2Fui%2Fpeople%2FPeopleEntryArea.java;h=156a092afa96f727fc76cd3b633e6c71fe5e28de;hp=d50d0506a2df1f60ebef25af48500adc3779908a;hb=f893986710c4b32e897093c09cd2a3483805a96b;hpb=91e7e55536284e755520f45fe99b6346b283e3f0 diff --git a/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/PeopleEntryArea.java b/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/PeopleEntryArea.java index d50d050..156a092 100644 --- a/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/PeopleEntryArea.java +++ b/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/PeopleEntryArea.java @@ -9,14 +9,20 @@ 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.acr.ldap.LdapAttrs; +import org.argeo.api.acr.ldap.LdapObjs; +import org.argeo.api.cms.directory.CmsDirectory; +import org.argeo.api.cms.directory.CmsUserManager; +import org.argeo.api.cms.directory.HierarchyUnit; +import org.argeo.api.cms.directory.UserDirectory; import org.argeo.api.cms.ux.CmsIcon; import org.argeo.api.cms.ux.CmsView; import org.argeo.app.ui.SuiteIcon; +import org.argeo.app.ui.SuiteMsg; import org.argeo.app.ui.SuiteUxEvent; -import org.argeo.cms.CmsUserManager; +import org.argeo.cms.CurrentUser; 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.swt.CmsSwtTheme; @@ -32,18 +38,18 @@ import org.argeo.cms.ux.widgets.Column; import org.argeo.cms.ux.widgets.DefaultTabularPart; import org.argeo.cms.ux.widgets.GuidedForm; import org.argeo.cms.ux.widgets.HierarchicalPart; -import org.argeo.osgi.useradmin.UserDirectory; -import org.argeo.util.directory.Directory; -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.swt.SWT; import org.eclipse.swt.custom.SashForm; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.graphics.Rectangle; 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.Display; +import org.eclipse.swt.widgets.Menu; +import org.eclipse.swt.widgets.MenuItem; import org.eclipse.swt.widgets.ToolBar; import org.eclipse.swt.widgets.ToolItem; import org.osgi.service.useradmin.Role; @@ -66,16 +72,6 @@ public class PeopleEntryArea implements SwtUiProvider, CmsUiProvider { SashForm sashForm = new SashForm(parent, SWT.VERTICAL); CmsSwtUtils.fill(sashForm); - // MODEL -// List directories = new ArrayList<>(); -// // List orgs = cmsUserManager.listGroups(null, true, false); -// for (UserDirectory directory : cmsUserManager.getUserDirectories()) { -// if (CurrentUser.implies(CmsRole.userAdmin, directory.getContext())) { -// directories.add(directory); -// } -// -// } - // VIEW HierarchicalPart hierarchyPart = new AbstractHierarchicalPart<>() { @@ -83,7 +79,7 @@ public class PeopleEntryArea implements SwtUiProvider, CmsUiProvider { public List getChildren(HierarchyUnit parent) { List visible = new ArrayList<>(); if (parent != null) { - if (parent instanceof Directory) // do no show children of the directories + if (parent instanceof CmsDirectory) // do no show children of the directories return visible; for (HierarchyUnit hu : parent.getDirectHierarchyUnits(true)) { visible.add(hu); @@ -112,9 +108,9 @@ public class PeopleEntryArea implements SwtUiProvider, CmsUiProvider { @Override public CmsIcon getIcon(HierarchyUnit model) { Content content = ContentUtils.hierarchyUnitToContent(contentSession, model); - if (content.hasContentClass(LdapObjs.organization.qName())) + if (content.hasContentClass(LdapObjs.organization)) return SuiteIcon.organisation; - else if (content.hasContentClass(LdapObjs.posixGroup.qName())) + else if (content.hasContentClass(LdapObjs.posixGroup)) return SuiteIcon.users; else return SuiteIcon.addressBook; @@ -132,19 +128,18 @@ public class PeopleEntryArea implements SwtUiProvider, CmsUiProvider { if (ud.getRealm().isPresent()) { for (Role r : ud.getHierarchyUnitRoles(ud, null, true)) { Content content = ContentUtils.roleToContent(cmsUserManager, contentSession, r); - // if (r instanceof Person || r instanceof Organization) - if (content.hasContentClass(LdapObjs.inetOrgPerson.qName(), LdapObjs.organization.qName())) + if (content.hasContentClass(LdapObjs.inetOrgPerson, LdapObjs.organization)) roles.add(content); } } else { for (HierarchyUnit directChild : hu.getDirectHierarchyUnits(false)) { - if (!directChild.isFunctional()) { + if (!(directChild.isType(HierarchyUnit.Type.FUNCTIONAL) + || directChild.isType(HierarchyUnit.Type.ROLES))) { 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(), LdapObjs.groupOfNames.qName())) + if (content.hasContentClass(LdapObjs.inetOrgPerson, LdapObjs.organization, + LdapObjs.groupOfNames)) roles.add(content); } } @@ -157,25 +152,25 @@ public class PeopleEntryArea implements SwtUiProvider, CmsUiProvider { @Override public String getText(Content role) { - if (role.isContentClass(LdapObjs.inetOrgPerson.qName())) + if (role.hasContentClass(LdapObjs.inetOrgPerson)) 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 if (role.hasContentClass(LdapObjs.organization)) + return role.attr(LdapAttrs.o); + else if (role.hasContentClass(LdapObjs.groupOfNames)) + return role.attr(LdapAttrs.cn); else return null; } @Override public CmsIcon getIcon(Content role) { - if (role.hasContentClass(LdapObjs.posixAccount.qName())) + if (role.hasContentClass(LdapObjs.posixAccount)) return SuiteIcon.user; - else if (role.isContentClass(LdapObjs.inetOrgPerson.qName())) + else if (role.hasContentClass(LdapObjs.inetOrgPerson)) return SuiteIcon.person; - else if (role.isContentClass(LdapObjs.organization.qName())) + else if (role.hasContentClass(LdapObjs.organization)) return SuiteIcon.organisationContact; - else if (role.isContentClass(LdapObjs.groupOfNames.qName())) + else if (role.hasContentClass(LdapObjs.groupOfNames)) return SuiteIcon.group; else return null; @@ -187,32 +182,77 @@ public class PeopleEntryArea implements SwtUiProvider, CmsUiProvider { } }); - usersPart.addColumn((Column) (role) -> role.attr(LdapAttrs.mail.qName())); +// usersPart.addColumn((Column) (role) -> role.attr(LdapAttrs.mail)); + usersPart.addColumn(new Column() { - SwtTableView usersView = new SwtTableView<>(sashForm, SWT.BORDER, usersPart); + @Override + public String getText(Content role) { + return role.attr(LdapAttrs.mail); + } + @Override + public int getWidth() { + return 300; + } + }); // toolbar - Composite bottom = new Composite(parent, SWT.NONE); + Composite bottom = new Composite(sashForm, SWT.NONE); bottom.setLayoutData(CmsSwtUtils.fillWidth()); bottom.setLayout(CmsSwtUtils.noSpaceGridLayout()); ToolBar bottomToolBar = new ToolBar(bottom, SWT.NONE); bottomToolBar.setLayoutData(new GridData(SWT.END, SWT.FILL, true, false)); + ToolItem deleteItem = new ToolItem(bottomToolBar, SWT.FLAT); deleteItem.setEnabled(false); // CmsUiUtils.style(deleteItem, SuiteStyle.recentItems); deleteItem.setImage(theme.getSmallIcon(SuiteIcon.delete)); - ToolItem addItem = new ToolItem(bottomToolBar, SWT.FLAT); + + Menu menu = new Menu(Display.getCurrent().getActiveShell(), SWT.POP_UP); + // TODO display add user only if hierarchy unit is a POSIX group + // hierarchyUnit.hasContentClass(LdapObjs.posixGroup.qName()) + MenuItem addUserItem = new MenuItem(menu, SWT.PUSH); + addUserItem.setImage(theme.getSmallIcon(SuiteIcon.user)); + addUserItem.setText(SuiteMsg.user.lead()); + addUserItem.addSelectionListener((Selected) (e) -> { + HierarchyUnit hierarchyUnit = usersPart.getInput(); + Content huContent = ContentUtils.hierarchyUnitToContent(contentSession, hierarchyUnit); + GuidedForm wizard = new NewUserForm(cmsUserManager, huContent); + SwtGuidedFormDialog dialog = new SwtGuidedFormDialog(parent.getShell(), wizard); + if (dialog.open() == Window.OK) { + // TODO create + } + }); + + MenuItem addOrgItem = new MenuItem(menu, SWT.PUSH); + addOrgItem.setImage(theme.getSmallIcon(SuiteIcon.organisation)); + addOrgItem.setText(SuiteMsg.org.lead()); + addOrgItem.addSelectionListener((Selected) (e) -> { + HierarchyUnit hierarchyUnit = usersPart.getInput(); + Content huContent = ContentUtils.hierarchyUnitToContent(contentSession, hierarchyUnit); + GuidedForm wizard = new NewOrgForm(cmsUserManager, huContent); + SwtGuidedFormDialog dialog = new SwtGuidedFormDialog(parent.getShell(), wizard); + if (dialog.open() == Window.OK) { + // TODO create + } + }); + + ToolItem addItem = new ToolItem(bottomToolBar, SWT.PUSH); + addItem.setEnabled(false); addItem.setImage(theme.getSmallIcon(SuiteIcon.add)); sashForm.setWeights(new int[] { 30, 70 }); + SwtTableView usersTable = new SwtTableView<>(bottom, SWT.BORDER, usersPart); + usersTable.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + // CONTROLLER hierarchyPart.onSelected((o) -> { if (o instanceof HierarchyUnit) { HierarchyUnit hierarchyUnit = (HierarchyUnit) o; usersPart.setInput(hierarchyUnit); - cmsView.sendEvent(SuiteUxEvent.refreshPart.topic(), SuiteUxEvent - .eventProperties(ContentUtils.hierarchyUnitToContent(contentSession, hierarchyUnit))); + addItem.setEnabled(true); +// cmsView.sendEvent(SuiteUxEvent.refreshPart.topic(), SuiteUxEvent +// .eventProperties(ContentUtils.hierarchyUnitToContent(contentSession, hierarchyUnit))); } }); @@ -234,14 +274,13 @@ public class PeopleEntryArea implements SwtUiProvider, CmsUiProvider { }); addItem.addSelectionListener((Selected) (e) -> { - HierarchyUnit hierarchyUnit = usersPart.getInput(); - Content huContent = ContentUtils.hierarchyUnitToContent(contentSession, hierarchyUnit); - GuidedForm wizard = new NewUserForm(cmsUserManager, huContent); - SwtGuidedFormDialog dialog = new SwtGuidedFormDialog(parent.getShell(), wizard); - // WizardDialog dialog = new WizardDialog(shell, wizard); - if (dialog.open() == Window.OK) { - // TODO create - } +// if (e.detail == SWT.ARROW) { + Rectangle rect = addItem.getBounds(); + Point pt = new Point(rect.x, rect.y + rect.height); + pt = bottomToolBar.toDisplay(pt); + menu.setLocation(pt.x, pt.y); + menu.setVisible(true); +// } }); directoriesView.refresh(); @@ -250,20 +289,6 @@ public class PeopleEntryArea implements SwtUiProvider, CmsUiProvider { return sashForm; } -// 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) { this.cmsUserManager = cmsUserManager; }