X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.ui%2Fsrc%2Forg%2Fargeo%2Fapp%2Fui%2Fpeople%2FPeopleEntryArea.java;h=789698bcf21f4904a5217244478be393cf432a86;hb=f1b87af2e0de38f1f49ab8fe68f9988018914811;hp=a2ddfe90ed953b6c12ae4607061a6b0e9d56591c;hpb=c6b561fc1d45dd5abcbf86f99ae546bdc3b42b8d;p=gpl%2Fargeo-suite.git 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 a2ddfe9..789698b 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,205 @@ 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.swt.CmsSwtTheme; import org.argeo.cms.swt.CmsSwtUtils; import org.argeo.cms.swt.Selected; -import org.argeo.cms.swt.dialogs.CmsWizardDialog; +import org.argeo.cms.swt.acr.SwtUiProvider; +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.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); - @Override - public String getText(Object element) { + // 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); +// } +// +// } - return getUserProperty(element, LdapAttrs.uid.name()); - } - }); + // VIEW + HierarchicalPart hierarchyPart = new AbstractHierarchicalPart<>() { - TableViewerColumn givenNameCol = new TableViewerColumn(usersViewer, SWT.NONE); - givenNameCol.getColumn().setWidth(150); - givenNameCol.setLabelProvider(new ColumnLabelProvider() { + @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(Object element) { + public String getText(HierarchyUnit model) { + return model.getHierarchyUnitLabel(CurrentUser.locale()); + } - return getUserProperty(element, LdapAttrs.givenName.name()); + @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; } - }); - TableViewerColumn snCol = new TableViewerColumn(usersViewer, SWT.NONE); - snCol.getColumn().setWidth(150); - snCol.setLabelProvider(new ColumnLabelProvider() { + }; + SwtTreeView directoriesView = new SwtTreeView<>(sashForm, SWT.NONE, hierarchyPart); + + DefaultTabularPart usersPart = new DefaultTabularPart<>() { @Override - public String getText(Object element) { + 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); + } - return getUserProperty(element, LdapAttrs.sn.name()); + } 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())) + 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.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 getUserProperty(element, LdapAttrs.mail.name()); + @Override + public int getWidth() { + return 300; } + }); + usersPart.addColumn((Column) (role) -> role.attr(LdapAttrs.mail.qName())); + SwtTableView usersView = new SwtTableView<>(sashForm, SWT.NONE, usersPart); + + // toolbar Composite bottom = new Composite(parent, SWT.NONE); bottom.setLayoutData(CmsSwtUtils.fillWidth()); bottom.setLayout(CmsSwtUtils.noSpaceGridLayout()); @@ -103,81 +211,78 @@ 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) { + HierarchyUnit hierarchyUnit = (HierarchyUnit) o; + usersPart.setInput(hierarchyUnit); + cmsView.sendEvent(SuiteEvent.refreshPart.topic(), + SuiteEvent.eventProperties(ContentUtils.hierarchyUnitToContent(contentSession, hierarchyUnit))); } }); - 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)); } }); addItem.addSelectionListener((Selected) (e) -> { - // SuiteUtils.getOrCreateUserNode(adminSession, userDn); - Wizard wizard = new NewUserWizard(null); - CmsWizardDialog dialog = new CmsWizardDialog(parent.getShell(), wizard); + 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 } }); - 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; } }