From 3505709f50eec3a940e82c6aac7bc2d4bd1dec65 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sun, 26 Jun 2022 10:47:24 +0200 Subject: [PATCH] Improve people entry area. --- org.argeo.app.ui/OSGI-INF/peopleEntryArea.xml | 2 +- .../argeo/app/ui/people/PeopleEntryArea.java | 245 +++++++++------ .../app/ui/people/SuiteUserUiProvider.java | 88 ------ .../app/ui/people/SuiteUsersEntryArea.java | 183 ----------- .../argeo/app/ui/people/UsersEntryArea.java | 283 ------------------ 5 files changed, 156 insertions(+), 645 deletions(-) delete mode 100644 org.argeo.app.ui/src/org/argeo/app/ui/people/SuiteUserUiProvider.java delete mode 100644 org.argeo.app.ui/src/org/argeo/app/ui/people/SuiteUsersEntryArea.java delete mode 100644 org.argeo.app.ui/src/org/argeo/app/ui/people/UsersEntryArea.java diff --git a/org.argeo.app.ui/OSGI-INF/peopleEntryArea.xml b/org.argeo.app.ui/OSGI-INF/peopleEntryArea.xml index 45c8efc..d702dc2 100644 --- a/org.argeo.app.ui/OSGI-INF/peopleEntryArea.xml +++ b/org.argeo.app.ui/OSGI-INF/peopleEntryArea.xml @@ -1,6 +1,6 @@ - + diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/people/PeopleEntryArea.java b/org.argeo.app.ui/src/org/argeo/app/ui/people/PeopleEntryArea.java index 46e1fb4..9ab179c 100644 --- a/org.argeo.app.ui/src/org/argeo/app/ui/people/PeopleEntryArea.java +++ b/org.argeo.app.ui/src/org/argeo/app/ui/people/PeopleEntryArea.java @@ -1,97 +1,169 @@ package org.argeo.app.ui.people; -import java.util.Set; +import java.util.ArrayList; +import java.util.List; import javax.jcr.Node; import javax.jcr.RepositoryException; -import org.argeo.app.api.SuiteRole; +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.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.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.jface.dialog.CmsWizardDialog; 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.widgets.SwtHierarchicalPart; +import org.argeo.cms.swt.widgets.SwtTabularPart; 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.HierarchicalPart; +import org.argeo.osgi.useradmin.UserDirectory; +import org.argeo.util.directory.HierarchyUnit; import org.argeo.util.naming.LdapAttrs; -import org.eclipse.jface.viewers.ColumnLabelProvider; -import org.eclipse.jface.viewers.DoubleClickEvent; -import org.eclipse.jface.viewers.IDoubleClickListener; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredContentProvider; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.jface.viewers.TableViewerColumn; -import org.eclipse.jface.viewers.Viewer; +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.custom.SashForm; 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.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 CmsUiProvider { +public class PeopleEntryArea implements SwtUiProvider, CmsUiProvider { private CmsUserManager cmsUserManager; + private ContentRepository contentRepository; + @Override - public Control createUi(Composite parent, Node context) throws RepositoryException { + public Control createUiPart(Composite parent, Content context) { CmsSwtTheme theme = CmsSwtUtils.getCmsTheme(parent); + CmsView cmsView = CmsSwtUtils.getCmsView(parent); parent.setLayout(new GridLayout()); - TableViewer usersViewer = new TableViewer(parent); - usersViewer.setContentProvider(new UsersContentProvider()); - TableViewerColumn idCol = new TableViewerColumn(usersViewer, SWT.NONE); - idCol.getColumn().setWidth(70); - idCol.setLabelProvider(new ColumnLabelProvider() { + ContentSession contentSession = contentRepository.get(); + 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 String getText(Object element) { + public List getChildren(HierarchyUnit parent) { + List visible = new ArrayList<>(); + if (parent != null) { + for (HierarchyUnit hu : parent.getDirectHierarchyUnits(true)) { + if (CurrentUser.implies(CmsRole.userAdmin, hu.getContext())) { + visible.add(hu); + } + } + } else { + for (UserDirectory directory : cmsUserManager.getUserDirectories()) { + if (CurrentUser.implies(CmsRole.userAdmin, directory.getContext())) { + visible.add(directory); + } - return getUserProperty(element, LdapAttrs.uid.name()); + } + } + return visible; } - }); - - TableViewerColumn givenNameCol = new TableViewerColumn(usersViewer, SWT.NONE); - givenNameCol.getColumn().setWidth(150); - givenNameCol.setLabelProvider(new ColumnLabelProvider() { @Override - public String getText(Object element) { - - return getUserProperty(element, LdapAttrs.givenName.name()); + public String getText(HierarchyUnit model) { + return model.getHierarchyUnitName(); } - }); - TableViewerColumn snCol = new TableViewerColumn(usersViewer, SWT.NONE); - snCol.getColumn().setWidth(150); - snCol.setLabelProvider(new ColumnLabelProvider() { + }; + SwtHierarchicalPart directoriesView = new SwtHierarchicalPart<>(sashForm, SWT.NONE, + hierarchyPart); - @Override - public String getText(Object element) { + DefaultTabularPart usersPart = new DefaultTabularPart<>() { - return getUserProperty(element, LdapAttrs.sn.name()); + @Override + protected List asList(HierarchyUnit hu) { + List roles = new ArrayList<>(); + UserDirectory ud = (UserDirectory) hu.getDirectory(); + 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())) + roles.add(content); + } + } + } + return roles; } - }); + }; + usersPart.addColumn(new Column() { - TableViewerColumn mailCol = new TableViewerColumn(usersViewer, SWT.NONE); - mailCol.getColumn().setWidth(400); - mailCol.setLabelProvider(new ColumnLabelProvider() { + @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 String getText(Object element) { + public CmsIcon getIcon(Content role) { + if (role.isContentClass(LdapObjs.inetOrgPerson.qName())) + return SuiteIcon.person; + else if (role.isContentClass(LdapObjs.organization.qName())) + return SuiteIcon.organisation; + else if (role.isContentClass(LdapObjs.groupOfNames.qName())) + return SuiteIcon.group; + else + return null; + } - return getUserProperty(element, LdapAttrs.mail.name()); + @Override + public int getWidth() { + return 300; } + }); + usersPart.addColumn((Column) (role) -> role.attr(LdapAttrs.mail.qName())); + + SwtTabularPart usersView = new SwtTabularPart<>(sashForm, SWT.NONE, usersPart); + // toolbar Composite bottom = new Composite(parent, SWT.NONE); bottom.setLayoutData(CmsSwtUtils.fillWidth()); bottom.setLayout(CmsSwtUtils.noSpaceGridLayout()); @@ -103,30 +175,30 @@ public class PeopleEntryArea implements CmsUiProvider { deleteItem.setImage(theme.getSmallIcon(SuiteIcon.delete)); ToolItem addItem = new ToolItem(bottomToolBar, SWT.FLAT); addItem.setImage(theme.getSmallIcon(SuiteIcon.add)); - usersViewer.addDoubleClickListener(new IDoubleClickListener() { - @Override - public void doubleClick(DoubleClickEvent event) { - User user = (User) usersViewer.getStructuredSelection().getFirstElement(); - if (user != null) { -// Node userNode = getOrCreateUserNode(user, context); - CmsSwtUtils.getCmsView(parent).sendEvent(SuiteEvent.openNewPart.topic(), - SuiteEvent.eventProperties(user)); - } + sashForm.setWeights(new int[] { 30, 70 }); + // CONTROLLER + hierarchyPart.onSelected((o) -> { + if (o instanceof HierarchyUnit) { + usersPart.setInput((HierarchyUnit) o); } }); - usersViewer.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - User user = (User) usersViewer.getStructuredSelection().getFirstElement(); - if (user != null) { -// Node userNode = getOrCreateUserNode(user, context); - CmsSwtUtils.getCmsView(parent).sendEvent(SuiteEvent.refreshPart.topic(), - SuiteEvent.eventProperties(user)); - deleteItem.setEnabled(true); - } else { - deleteItem.setEnabled(false); - } + + usersPart.onSelected((o) -> { + Content user = (Content) o; + if (user != null) { + cmsView.sendEvent(SuiteEvent.refreshPart.topic(), SuiteEvent.eventProperties(user)); + deleteItem.setEnabled(true); + } else { + deleteItem.setEnabled(false); + } + }); + + usersPart.onAction((o) -> { + Content user = (Content) o; + if (user != null) { + cmsView.sendEvent(SuiteEvent.openNewPart.topic(), SuiteEvent.eventProperties(user)); } }); @@ -140,44 +212,37 @@ public class PeopleEntryArea implements CmsUiProvider { } }); - usersViewer.getTable().setLayoutData(CmsSwtUtils.fillAll()); - usersViewer.setInput(cmsUserManager); + directoriesView.refresh(); +// usersView.refresh(); - return usersViewer.getTable(); + return sashForm; } -// private Node getOrCreateUserNode(User user, Node context) { -// return JcrUtils.mkdirs(Jcr.getSession(context), -// "/" + EntityType.user.name() + "/" + getUserProperty(user, LdapAttrs.uid.name()), -// EntityType.user.get()); +// static String getProperty(Role role, LdapAttrs attr) { +// Object value = role.getProperties().get(attr.name()); +// 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; - } - - class UsersContentProvider implements IStructuredContentProvider { - - @Override - public Object[] getElements(Object inputElement) { - CmsUserManager cum = (CmsUserManager) inputElement; - Set users = cum.listUsersInGroup(SuiteRole.coworker.dn(), null); - return users.toArray(); - } - - @Override - public void dispose() { - } +// 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; +// } - @Override - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - } + public void setCmsUserManager(CmsUserManager cmsUserManager) { + this.cmsUserManager = cmsUserManager; + } + @Override + public Control createUi(Composite parent, Node context) throws RepositoryException { + return createUiPart(parent, JcrContent.nodeToContent(context)); } - public void setCmsUserManager(CmsUserManager cmsUserManager) { - this.cmsUserManager = cmsUserManager; + public void setContentRepository(ContentRepository contentRepository) { + this.contentRepository = contentRepository; } } diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/people/SuiteUserUiProvider.java b/org.argeo.app.ui/src/org/argeo/app/ui/people/SuiteUserUiProvider.java deleted file mode 100644 index 6cec22d..0000000 --- a/org.argeo.app.ui/src/org/argeo/app/ui/people/SuiteUserUiProvider.java +++ /dev/null @@ -1,88 +0,0 @@ -package org.argeo.app.ui.people; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -import javax.jcr.Node; -import javax.jcr.RepositoryException; - -import org.argeo.app.ui.SuiteMsg; -import org.argeo.app.ui.SuiteUiUtils; -import org.argeo.cms.CmsUserManager; -import org.argeo.cms.swt.CmsSwtUtils; -import org.argeo.cms.ui.CmsUiProvider; -import org.argeo.cms.ui.viewers.Section; -import org.argeo.util.naming.LdapAttrs; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Group; -import org.eclipse.swt.widgets.Text; -import org.osgi.service.useradmin.User; - -/** Edit a suite user. */ -public class SuiteUserUiProvider implements CmsUiProvider { - private String[] availableRoles; - private CmsUserManager cmsUserManager; - - @Override - public Control createUi(Composite parent, Node context) throws RepositoryException { - Section main = new Section(parent, SWT.NONE, context); - main.setLayoutData(CmsSwtUtils.fillAll()); - - String uid = context.getName(); - User user = cmsUserManager.getUserFromLocalId(uid); - -// Text givenName = new Text(main, SWT.SINGLE); -// givenName.setText(getUserProperty(user, LdapAttrs.givenName.name())); - Text givenName = SuiteUiUtils.addFormInput(main, SuiteMsg.firstName.lead(), - getUserProperty(user, LdapAttrs.givenName.name())); - - Text sn = SuiteUiUtils.addFormInput(main, SuiteMsg.lastName.lead(), getUserProperty(user, LdapAttrs.sn.name())); - // sn.setText(getUserProperty(user, LdapAttrs.sn.name())); - - Text email = SuiteUiUtils.addFormInput(main, SuiteMsg.email.lead(), - getUserProperty(user, LdapAttrs.mail.name())); - // email.setText(getUserProperty(user, LdapAttrs.mail.name())); - - Text uidT = SuiteUiUtils.addFormLine(main, "uid", getUserProperty(user, LdapAttrs.uid.name())); - uidT.setText(uid); - -// Label dnL = new Label(main, SWT.NONE); -// dnL.setText(user.getName()); - - // roles - // Section rolesSection = new Section(main, SWT.NONE, context); - Group rolesSection = new Group(main, SWT.NONE); - rolesSection.setText("Roles"); - rolesSection.setLayoutData(CmsSwtUtils.fillWidth()); - rolesSection.setLayout(new GridLayout()); - // new Label(rolesSection, SWT.NONE).setText("Roles:"); - List roles = Arrays.asList(cmsUserManager.getUserRoles(user.getName())); - for (String role : availableRoles) { - // new Label(rolesSection, SWT.NONE).setText(role); - Button radio = new Button(rolesSection, SWT.CHECK); - radio.setText(role); - if (roles.contains(role)) - radio.setSelection(true); - } - - return main; - } - - public void setCmsUserManager(CmsUserManager cmsUserManager) { - this.cmsUserManager = cmsUserManager; - } - - private String getUserProperty(Object element, String key) { - Object value = ((User) element).getProperties().get(key); - return value != null ? value.toString() : null; - } - - public void init(Map properties) { - availableRoles = (String[]) properties.get("availableRoles"); - } -} diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/people/SuiteUsersEntryArea.java b/org.argeo.app.ui/src/org/argeo/app/ui/people/SuiteUsersEntryArea.java deleted file mode 100644 index 82787a4..0000000 --- a/org.argeo.app.ui/src/org/argeo/app/ui/people/SuiteUsersEntryArea.java +++ /dev/null @@ -1,183 +0,0 @@ -package org.argeo.app.ui.people; - -import java.util.Set; - -import javax.jcr.Node; -import javax.jcr.RepositoryException; - -import org.argeo.app.api.SuiteRole; -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.jface.dialog.CmsWizardDialog; -import org.argeo.cms.swt.CmsSwtTheme; -import org.argeo.cms.swt.CmsSwtUtils; -import org.argeo.cms.swt.Selected; -import org.argeo.cms.ui.CmsUiProvider; -import org.argeo.util.naming.LdapAttrs; -import org.eclipse.jface.viewers.ColumnLabelProvider; -import org.eclipse.jface.viewers.DoubleClickEvent; -import org.eclipse.jface.viewers.IDoubleClickListener; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredContentProvider; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.jface.viewers.TableViewerColumn; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jface.window.Window; -import org.eclipse.jface.wizard.Wizard; -import org.eclipse.swt.SWT; -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.ToolBar; -import org.eclipse.swt.widgets.ToolItem; -import org.osgi.service.useradmin.User; - -/** Entry to the admin area. */ -public class SuiteUsersEntryArea implements CmsUiProvider { - - private CmsUserManager cmsUserManager; - - @Override - public Control createUi(Composite parent, Node context) throws RepositoryException { - CmsSwtTheme theme = CmsSwtUtils.getCmsTheme(parent); - parent.setLayout(new GridLayout()); - TableViewer usersViewer = new TableViewer(parent); - usersViewer.setContentProvider(new UsersContentProvider()); - - TableViewerColumn idCol = new TableViewerColumn(usersViewer, SWT.NONE); - idCol.getColumn().setWidth(70); - idCol.setLabelProvider(new ColumnLabelProvider() { - - @Override - public String getText(Object element) { - - return getUserProperty(element, LdapAttrs.uid.name()); - } - }); - - TableViewerColumn givenNameCol = new TableViewerColumn(usersViewer, SWT.NONE); - givenNameCol.getColumn().setWidth(150); - givenNameCol.setLabelProvider(new ColumnLabelProvider() { - - @Override - public String getText(Object element) { - - return getUserProperty(element, LdapAttrs.givenName.name()); - } - }); - - TableViewerColumn snCol = new TableViewerColumn(usersViewer, SWT.NONE); - snCol.getColumn().setWidth(150); - snCol.setLabelProvider(new ColumnLabelProvider() { - - @Override - public String getText(Object element) { - - return getUserProperty(element, LdapAttrs.sn.name()); - } - }); - - TableViewerColumn mailCol = new TableViewerColumn(usersViewer, SWT.NONE); - mailCol.getColumn().setWidth(400); - mailCol.setLabelProvider(new ColumnLabelProvider() { - - @Override - public String getText(Object element) { - - return getUserProperty(element, LdapAttrs.mail.name()); - } - }); - - Composite bottom = new Composite(parent, 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); - addItem.setImage(theme.getSmallIcon(SuiteIcon.add)); - usersViewer.addDoubleClickListener(new IDoubleClickListener() { - - @Override - public void doubleClick(DoubleClickEvent event) { - User user = (User) usersViewer.getStructuredSelection().getFirstElement(); - if (user != null) { -// Node userNode = getOrCreateUserNode(user, context); - CmsSwtUtils.getCmsView(parent).sendEvent(SuiteEvent.openNewPart.topic(), - SuiteEvent.eventProperties(user)); - } - - } - }); - usersViewer.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - User user = (User) usersViewer.getStructuredSelection().getFirstElement(); - if (user != null) { -// Node userNode = getOrCreateUserNode(user, context); - CmsSwtUtils.getCmsView(parent).sendEvent(SuiteEvent.refreshPart.topic(), - SuiteEvent.eventProperties(user)); - deleteItem.setEnabled(true); - } else { - deleteItem.setEnabled(false); - } - } - }); - - addItem.addSelectionListener((Selected) (e) -> { - // SuiteUtils.getOrCreateUserNode(adminSession, userDn); - Wizard wizard = new NewUserWizard(null); - CmsWizardDialog dialog = new CmsWizardDialog(parent.getShell(), wizard); - // WizardDialog dialog = new WizardDialog(shell, wizard); - if (dialog.open() == Window.OK) { - // TODO create - } - }); - - usersViewer.getTable().setLayoutData(CmsSwtUtils.fillAll()); - usersViewer.setInput(cmsUserManager); - - return usersViewer.getTable(); - } - -// private Node getOrCreateUserNode(User user, Node context) { -// return JcrUtils.mkdirs(Jcr.getSession(context), -// "/" + EntityType.user.name() + "/" + getUserProperty(user, LdapAttrs.uid.name()), -// EntityType.user.get()); -// } - - private String getUserProperty(Object element, String key) { - Object value = ((User) element).getProperties().get(key); - return value != null ? value.toString() : null; - } - - class UsersContentProvider implements IStructuredContentProvider { - - @Override - public Object[] getElements(Object inputElement) { - CmsUserManager cum = (CmsUserManager) inputElement; - Set users = cum.listUsersInGroup(SuiteRole.coworker.dn(), null); - return users.toArray(); - } - - @Override - public void dispose() { - } - - @Override - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - } - - } - - public void setCmsUserManager(CmsUserManager cmsUserManager) { - this.cmsUserManager = cmsUserManager; - } - -} 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 deleted file mode 100644 index 355f520..0000000 --- a/org.argeo.app.ui/src/org/argeo/app/ui/people/UsersEntryArea.java +++ /dev/null @@ -1,283 +0,0 @@ -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.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.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.jface.dialog.CmsWizardDialog; -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.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.HierarchyUnit; -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.custom.SashForm; -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.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. */ -public class UsersEntryArea implements SwtUiProvider, CmsUiProvider { - - private CmsUserManager cmsUserManager; - - private ContentRepository contentRepository; - - @Override - public Control createUiPart(Composite parent, Content context) { - CmsSwtTheme theme = CmsSwtUtils.getCmsTheme(parent); - CmsView cmsView = CmsSwtUtils.getCmsView(parent); - parent.setLayout(new GridLayout()); - - 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); - 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) { - 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 directories.size(); - } - - }; - - TabularPart usersView = new SwtTabularPart(sashForm, SWT.NONE) { - List roles = new ArrayList<>(); - - @Override - protected Object getData(int row) { - return roles.get(row); - } -// @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)) { - 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); - } - } - } - // roles = hu.getHierarchyUnitRoles(null, false); - return roles.size(); - } - - }; - usersView.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.isContentClass(LdapObjs.inetOrgPerson.qName())) - return SuiteIcon.person; - else if (role.isContentClass(LdapObjs.organization.qName())) - return SuiteIcon.organisation; - else if (role.isContentClass(LdapObjs.groupOfNames.qName())) - return SuiteIcon.group; - else - return null; - } - - @Override - public int getWidth() { - return 300; - } - - }); - usersView.addColumn((Column) (role) -> role.attr(LdapAttrs.mail.qName())); - - // toolbar - Composite bottom = new Composite(parent, 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); - 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) -> { - Content user = (Content) o; - if (user != null) { - cmsView.sendEvent(SuiteEvent.refreshPart.topic(), SuiteEvent.eventProperties(user)); - deleteItem.setEnabled(true); - } else { - deleteItem.setEnabled(false); - } - }); - - usersView.onAction((o) -> { - Content user = (Content) o; - if (user != null) { - cmsView.sendEvent(SuiteEvent.openNewPart.topic(), SuiteEvent.eventProperties(user)); - } - }); - - addItem.addSelectionListener((Selected) (e) -> { - // SuiteUtils.getOrCreateUserNode(adminSession, userDn); - Wizard wizard = new NewUserWizard(null); - CmsWizardDialog dialog = new CmsWizardDialog(parent.getShell(), wizard); - // WizardDialog dialog = new WizardDialog(shell, wizard); - if (dialog.open() == Window.OK) { - // TODO create - } - }); - - directoriesView.refresh(); - usersView.refresh(); - - 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; - } - - @Override - public Control createUi(Composite parent, Node context) throws RepositoryException { - return createUiPart(parent, JcrContent.nodeToContent(context)); - } - - public void setContentRepository(ContentRepository contentRepository) { - this.contentRepository = contentRepository; - } - -} -- 2.30.2