X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=swt%2Forg.argeo.app.ui%2Fsrc%2Forg%2Fargeo%2Fapp%2Fui%2Fpeople%2FPeopleEntryArea.java;h=41310aa8c6e8f36a0c46f918526169653e81334e;hb=0b492f2cfb8a24ec84e1dd52825624f5e9ab7e81;hp=339ea25dcc6f8807009f3601da3fa32928a15caf;hpb=2362aefd312e04eea437824f37cb6e63389cd361;p=gpl%2Fargeo-suite.git 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 339ea25..41310aa 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 @@ -1,23 +1,19 @@ 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.ux.CmsIcon; +import org.argeo.api.acr.ldap.LdapAttrs; +import org.argeo.api.cms.directory.CmsUserManager; +import org.argeo.api.cms.directory.HierarchyUnit; import org.argeo.api.cms.ux.CmsView; -import org.argeo.app.ui.SuiteUxEvent; import org.argeo.app.ui.SuiteIcon; -import org.argeo.cms.CmsUserManager; +import org.argeo.app.ui.SuiteMsg; +import org.argeo.app.ui.SuiteUxEvent; 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; import org.argeo.cms.swt.CmsSwtUtils; @@ -27,27 +23,22 @@ import org.argeo.cms.swt.widgets.SwtGuidedFormDialog; import org.argeo.cms.swt.widgets.SwtTableView; import org.argeo.cms.swt.widgets.SwtTreeView; import org.argeo.cms.ui.CmsUiProvider; -import org.argeo.cms.ux.widgets.AbstractHierarchicalPart; 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.HierarchyUnit; -import org.argeo.util.directory.ldap.IpaUtils; -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; -import org.osgi.service.useradmin.User; /** Entry to the admin area. */ public class PeopleEntryArea implements SwtUiProvider, CmsUiProvider { @@ -66,161 +57,81 @@ 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<>() { - - @Override - public List getChildren(HierarchyUnit parent) { - List visible = new ArrayList<>(); - if (parent != null) { - for (HierarchyUnit hu : parent.getDirectHierarchyUnits(true)) { - // if parent was visible, it is visible - // TODO restrict more? - -// if (CurrentUser.implies(CmsRole.userAdmin, hu.getBase()) // -// ) // IPA -// { - visible.add(hu); -// } - } - } else { - for (UserDirectory directory : cmsUserManager.getUserDirectories()) { - if (CurrentUser.implies(CmsRole.userAdmin, directory.getBase()) // - || CurrentUser.implies(CmsRole.userAdmin, - IpaUtils.IPA_ACCOUNTS_RDN + "," + directory.getBase())) // IPA - { - // TODO show base level - } - for (HierarchyUnit hu : directory.getDirectHierarchyUnits(true)) { - if (CurrentUser.implies(CmsRole.userAdmin, hu.getBase())) { - visible.add(hu); - } - } - - } - } - return visible; - } - - @Override - public String getText(HierarchyUnit model) { - return model.getHierarchyUnitLabel(CurrentUser.locale()); - } - - @Override - public CmsIcon getIcon(HierarchyUnit model) { - Content content = ContentUtils.hierarchyUnitToContent(contentSession, model); - if (content.hasContentClass(LdapObjs.organization.qName())) - return SuiteIcon.organisation; - else if (content.hasContentClass(LdapObjs.posixGroup.qName())) - return SuiteIcon.users; - else - return SuiteIcon.addressBook; - } - - }; + HierarchyUnitPart hierarchyPart = new HierarchyUnitPart(contentSession, cmsUserManager); SwtTreeView directoriesView = new SwtTreeView<>(sashForm, SWT.BORDER, hierarchyPart); - DefaultTabularPart usersPart = new DefaultTabularPart<>() { - - @Override - protected List asList(HierarchyUnit hu) { - List roles = new ArrayList<>(); - UserDirectory ud = (UserDirectory) hu.getDirectory(); - 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())) - roles.add(content); - } - - } else { - for (HierarchyUnit directChild : hu.getDirectHierarchyUnits(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(), LdapObjs.groupOfNames.qName())) - roles.add(content); - } - } - } - } - return roles; - } - }; + UsersPart usersPart = new UsersPart(contentSession, cmsUserManager); usersPart.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.hasContentClass(LdapObjs.posixAccount.qName())) - return SuiteIcon.user; - else if (role.isContentClass(LdapObjs.inetOrgPerson.qName())) - return SuiteIcon.person; - else if (role.isContentClass(LdapObjs.organization.qName())) - return SuiteIcon.organisationContact; - else if (role.isContentClass(LdapObjs.groupOfNames.qName())) - return SuiteIcon.group; - else - return null; + return role.attr(LdapAttrs.mail); } @Override public int getWidth() { return 300; } - }); - usersPart.addColumn((Column) (role) -> role.attr(LdapAttrs.mail.qName())); - - SwtTableView usersView = new SwtTableView<>(sashForm, SWT.BORDER, usersPart); - // 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 usersView = new SwtTableView<>(bottom, SWT.BORDER, usersPart); + usersView.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))); } }); @@ -242,14 +153,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(); @@ -258,20 +168,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; }