From: Mathieu Date: Sun, 13 Nov 2022 07:10:58 +0000 (+0100) Subject: Factorise People UI X-Git-Tag: v2.3.9~16 X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=0b492f2cfb8a24ec84e1dd52825624f5e9ab7e81 Factorise People UI --- diff --git a/swt/org.argeo.app.ui/OSGI-INF/l10n/bundle.properties b/swt/org.argeo.app.ui/OSGI-INF/l10n/bundle.properties index 764f93d..1215485 100644 --- a/swt/org.argeo.app.ui/OSGI-INF/l10n/bundle.properties +++ b/swt/org.argeo.app.ui/OSGI-INF/l10n/bundle.properties @@ -10,9 +10,10 @@ appTitle=Argeo Suite # PEOPLE # org.argeo.people.ui.PeopleMsg # -person=Person +person=person user=user org=organisation +group=group # NewPersonWizard firstName=First Name diff --git a/swt/org.argeo.app.ui/OSGI-INF/l10n/bundle_fr.properties b/swt/org.argeo.app.ui/OSGI-INF/l10n/bundle_fr.properties index eb9e741..22c5de6 100644 --- a/swt/org.argeo.app.ui/OSGI-INF/l10n/bundle_fr.properties +++ b/swt/org.argeo.app.ui/OSGI-INF/l10n/bundle_fr.properties @@ -17,6 +17,7 @@ appTitle=Argeo Suite person=personne user=utilisateur org=organisation +group=groupe # NewPersonWizard firstName=Prénom diff --git a/swt/org.argeo.app.ui/src/org/argeo/app/ui/SuiteMsg.java b/swt/org.argeo.app.ui/src/org/argeo/app/ui/SuiteMsg.java index 305d242..84ba5f0 100644 --- a/swt/org.argeo.app.ui/src/org/argeo/app/ui/SuiteMsg.java +++ b/swt/org.argeo.app.ui/src/org/argeo/app/ui/SuiteMsg.java @@ -5,7 +5,7 @@ import org.argeo.cms.Localized; /** Localized messages. */ public enum SuiteMsg implements Localized { // Entities - user, org, person, + user, org, person, group, // UI parts dashboard, people, documents, locations, recentItems, // NewPersonWizard diff --git a/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/GroupUiProvider.java b/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/GroupUiProvider.java index 297fc69..755821a 100644 --- a/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/GroupUiProvider.java +++ b/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/GroupUiProvider.java @@ -1,12 +1,18 @@ package org.argeo.app.ui.people; import org.argeo.api.acr.Content; +import org.argeo.api.acr.ldap.LdapAttrs; +import org.argeo.api.acr.ldap.LdapObjs; +import org.argeo.api.cms.directory.CmsGroup; import org.argeo.api.cms.directory.CmsUserManager; +import org.argeo.api.cms.directory.HierarchyUnit; +import org.argeo.app.ui.SuiteMsg; +import org.argeo.app.ui.SuiteUiUtils; +import org.argeo.cms.CurrentUser; import org.argeo.cms.swt.acr.SwtUiProvider; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; -import org.osgi.service.useradmin.Group; import org.osgi.service.useradmin.Role; public class GroupUiProvider implements SwtUiProvider { @@ -14,9 +20,20 @@ public class GroupUiProvider implements SwtUiProvider { @Override public Control createUiPart(Composite parent, Content context) { - new Label(parent, 0).setText("Group " + context); + CmsGroup group = context.adapt(CmsGroup.class); + Content hierarchyUnitContent = context.getParent().getParent(); + HierarchyUnit hierarchyUnit = hierarchyUnitContent.adapt(HierarchyUnit.class); + + // TODO localise at content level + String title; + if (context.hasContentClass(LdapObjs.organization)) + title = SuiteMsg.org.lead() + " " + context.attr(LdapAttrs.cn) + " (" + + hierarchyUnit.getHierarchyUnitLabel(CurrentUser.locale()) + ")"; + else + title = SuiteMsg.group.lead() + " " + context.attr(LdapAttrs.cn) + " (" + + hierarchyUnit.getHierarchyUnitLabel(CurrentUser.locale()) + ")"; + SuiteUiUtils.addFormLabel(parent, title); - Group group = context.adapt(Group.class); for (Role member : group.getMembers()) { new Label(parent, 0).setText(member.getName()); } diff --git a/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/HierarchyUnitPart.java b/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/HierarchyUnitPart.java new file mode 100644 index 0000000..9ad3457 --- /dev/null +++ b/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/HierarchyUnitPart.java @@ -0,0 +1,74 @@ +package org.argeo.app.ui.people; + +import java.util.ArrayList; +import java.util.List; + +import org.argeo.api.acr.Content; +import org.argeo.api.acr.ContentSession; +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.app.ui.SuiteIcon; +import org.argeo.cms.CurrentUser; +import org.argeo.cms.acr.ContentUtils; +import org.argeo.cms.auth.CmsRole; +import org.argeo.cms.ux.widgets.AbstractHierarchicalPart; +import org.argeo.cms.ux.widgets.Column; + +public class HierarchyUnitPart extends AbstractHierarchicalPart { + private ContentSession contentSession; + private CmsUserManager cmsUserManager; + + public HierarchyUnitPart(ContentSession contentSession, CmsUserManager cmsUserManager) { + this.contentSession = contentSession; + this.cmsUserManager = cmsUserManager; + + addColumn(new Column() { + + @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)) + return SuiteIcon.organisation; + else if (content.hasContentClass(LdapObjs.posixGroup)) + return SuiteIcon.users; + else + return SuiteIcon.addressBook; + } + }); + } + + @Override + public List getChildren(HierarchyUnit parent) { + List visible = new ArrayList<>(); + if (parent != null) { + if (parent instanceof CmsDirectory) // do no show children of the directories + return visible; + for (HierarchyUnit hu : parent.getDirectHierarchyUnits(true)) { + visible.add(hu); + } + } else { + for (UserDirectory directory : cmsUserManager.getUserDirectories()) { + if (CurrentUser.implies(CmsRole.userAdmin, directory.getBase())) { + visible.add(directory); + } + for (HierarchyUnit hu : directory.getDirectHierarchyUnits(true)) { + if (CurrentUser.implies(CmsRole.userAdmin, hu.getBase())) { + visible.add(hu); + } + } + + } + } + return visible; + } + +} diff --git a/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/NewOrgForm.java b/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/NewOrgForm.java index 539c23c..7af60b5 100644 --- a/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/NewOrgForm.java +++ b/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/NewOrgForm.java @@ -16,7 +16,7 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Text; -/** Ask first & last name. Update the passed node on finish */ +/** Form to create a new organisation. */ public class NewOrgForm extends AbstractGuidedForm { private Content hierarchyUnit; private CmsUserManager cmsUserManager; 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 156a092..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,8 +1,5 @@ package org.argeo.app.ui.people; -import java.util.ArrayList; -import java.util.List; - import javax.jcr.Node; import javax.jcr.RepositoryException; @@ -10,20 +7,13 @@ 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.CurrentUser; import org.argeo.cms.acr.ContentUtils; -import org.argeo.cms.auth.CmsRole; -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; @@ -33,11 +23,8 @@ 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.eclipse.jface.window.Window; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.SashForm; @@ -52,8 +39,6 @@ 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 { @@ -73,116 +58,10 @@ public class PeopleEntryArea implements SwtUiProvider, CmsUiProvider { CmsSwtUtils.fill(sashForm); // VIEW - HierarchicalPart hierarchyPart = new AbstractHierarchicalPart<>() { - - @Override - public List getChildren(HierarchyUnit parent) { - List visible = new ArrayList<>(); - if (parent != null) { - if (parent instanceof CmsDirectory) // do no show children of the directories - return visible; - for (HierarchyUnit hu : parent.getDirectHierarchyUnits(true)) { - visible.add(hu); - } - } else { - for (UserDirectory directory : cmsUserManager.getUserDirectories()) { - if (CurrentUser.implies(CmsRole.userAdmin, directory.getBase())) { - visible.add(directory); - } - 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)) - return SuiteIcon.organisation; - else if (content.hasContentClass(LdapObjs.posixGroup)) - 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 (content.hasContentClass(LdapObjs.inetOrgPerson, LdapObjs.organization)) - roles.add(content); - } - - } else { - for (HierarchyUnit directChild : hu.getDirectHierarchyUnits(false)) { - 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 (content.hasContentClass(LdapObjs.inetOrgPerson, LdapObjs.organization, - LdapObjs.groupOfNames)) - roles.add(content); - } - } - } - } - return roles; - } - }; - usersPart.addColumn(new Column() { - - @Override - public String getText(Content role) { - if (role.hasContentClass(LdapObjs.inetOrgPerson)) - return UserAdminUtils.getUserDisplayName(role.adapt(User.class)); - 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)) - return SuiteIcon.user; - else if (role.hasContentClass(LdapObjs.inetOrgPerson)) - return SuiteIcon.person; - else if (role.hasContentClass(LdapObjs.organization)) - return SuiteIcon.organisationContact; - else if (role.hasContentClass(LdapObjs.groupOfNames)) - return SuiteIcon.group; - else - return null; - } - - @Override - public int getWidth() { - return 300; - } - - }); -// usersPart.addColumn((Column) (role) -> role.attr(LdapAttrs.mail)); + UsersPart usersPart = new UsersPart(contentSession, cmsUserManager); usersPart.addColumn(new Column() { @Override @@ -242,8 +121,8 @@ public class PeopleEntryArea implements SwtUiProvider, CmsUiProvider { sashForm.setWeights(new int[] { 30, 70 }); - SwtTableView usersTable = new SwtTableView<>(bottom, SWT.BORDER, usersPart); - usersTable.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + SwtTableView usersView = new SwtTableView<>(bottom, SWT.BORDER, usersPart); + usersView.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); // CONTROLLER hierarchyPart.onSelected((o) -> { diff --git a/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/PersonUiProvider.java b/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/PersonUiProvider.java index c0adcf5..5ff00a7 100644 --- a/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/PersonUiProvider.java +++ b/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/PersonUiProvider.java @@ -8,6 +8,7 @@ import org.argeo.api.acr.Content; import org.argeo.api.acr.QNamed; import org.argeo.api.acr.ldap.LdapAttrs; import org.argeo.api.acr.ldap.LdapObjs; +import org.argeo.api.cms.directory.CmsUser; import org.argeo.api.cms.directory.CmsUserManager; import org.argeo.app.api.SuiteRole; import org.argeo.app.ui.SuiteMsg; @@ -37,7 +38,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; -import org.osgi.service.useradmin.User; /** Edit a suite user. */ public class PersonUiProvider implements SwtUiProvider { @@ -50,7 +50,9 @@ public class PersonUiProvider implements SwtUiProvider { main.setLayout(new GridLayout(2, false)); - User user = context.adapt(User.class); + CmsUser user = context.adapt(CmsUser.class); + + Content hierarchyUnitContent = context.getParent().getParent(); String roleContext = RoleNameUtils.getContext(user.getName()); @@ -62,15 +64,15 @@ public class PersonUiProvider implements SwtUiProvider { } if (context.hasContentClass(LdapObjs.posixAccount.qName())) { - - SwtSection rolesSection = new SwtSection(main, SWT.NONE); - rolesSection.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1)); - rolesSection.setLayout(new GridLayout(2, false)); - List roles = Arrays.asList(cmsUserManager.getUserRoles(user.getName())); - addRoleCheckBox(rolesSection, SuiteMsg.coworkerRole, SuiteRole.coworker, roleContext, roles); - addRoleCheckBox(rolesSection, SuiteMsg.publisherRole, SuiteRole.publisher, roleContext, roles); - addRoleCheckBox(rolesSection, SuiteMsg.userAdminRole, CmsRole.userAdmin, roleContext, roles); - + if (hierarchyUnitContent.hasContentClass(LdapObjs.organization)) { + SwtSection rolesSection = new SwtSection(main, SWT.NONE); + rolesSection.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1)); + rolesSection.setLayout(new GridLayout(2, false)); + List roles = Arrays.asList(cmsUserManager.getUserRoles(user.getName())); + addRoleCheckBox(rolesSection, SuiteMsg.coworkerRole, SuiteRole.coworker, roleContext, roles); + addRoleCheckBox(rolesSection, SuiteMsg.publisherRole, SuiteRole.publisher, roleContext, roles); + addRoleCheckBox(rolesSection, SuiteMsg.userAdminRole, CmsRole.userAdmin, roleContext, roles); + } // Composite facetsSection = new Composite(main, SWT.NONE); // facetsSection.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1)); // facetsSection.setLayout(new GridLayout()); diff --git a/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/UsersPart.java b/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/UsersPart.java new file mode 100644 index 0000000..d82b227 --- /dev/null +++ b/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/UsersPart.java @@ -0,0 +1,92 @@ +package org.argeo.app.ui.people; + +import java.util.ArrayList; +import java.util.List; + +import org.argeo.api.acr.Content; +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.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.app.ui.SuiteIcon; +import org.argeo.cms.acr.ContentUtils; +import org.argeo.cms.auth.UserAdminUtils; +import org.argeo.cms.ux.widgets.Column; +import org.argeo.cms.ux.widgets.DefaultTabularPart; +import org.osgi.service.useradmin.Role; +import org.osgi.service.useradmin.User; + +public class UsersPart extends DefaultTabularPart { + private ContentSession contentSession; + private CmsUserManager cmsUserManager; + + public UsersPart(ContentSession contentSession, CmsUserManager cmsUserManager) { + this.contentSession = contentSession; + this.cmsUserManager = cmsUserManager; + addColumn(new Column() { + + @Override + public String getText(Content role) { + if (role.hasContentClass(LdapObjs.inetOrgPerson)) + return UserAdminUtils.getUserDisplayName(role.adapt(User.class)); + 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)) + return SuiteIcon.user; + else if (role.hasContentClass(LdapObjs.inetOrgPerson)) + return SuiteIcon.person; + else if (role.hasContentClass(LdapObjs.organization)) + return SuiteIcon.organisationContact; + else if (role.hasContentClass(LdapObjs.groupOfNames)) + return SuiteIcon.group; + else + return null; + } + + @Override + public int getWidth() { + return 300; + } + + }); + } + + @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 (content.hasContentClass(LdapObjs.inetOrgPerson, LdapObjs.organization)) + roles.add(content); + } + + } else { + for (HierarchyUnit directChild : hu.getDirectHierarchyUnits(false)) { + 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 (content.hasContentClass(LdapObjs.inetOrgPerson, LdapObjs.organization, + LdapObjs.groupOfNames)) + roles.add(content); + } + } + } + } + return roles; + } + +}