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.SuiteEvent;
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.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;
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;
SashForm sashForm = new SashForm(parent, SWT.VERTICAL);
CmsSwtUtils.fill(sashForm);
- // MODEL
-// List<UserDirectory> directories = new ArrayList<>();
-// // List<User> orgs = cmsUserManager.listGroups(null, true, false);
-// for (UserDirectory directory : cmsUserManager.getUserDirectories()) {
-// if (CurrentUser.implies(CmsRole.userAdmin, directory.getContext())) {
-// directories.add(directory);
-// }
-//
-// }
-
// VIEW
HierarchicalPart<HierarchyUnit> hierarchyPart = new AbstractHierarchicalPart<>() {
public List<HierarchyUnit> getChildren(HierarchyUnit parent) {
List<HierarchyUnit> 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)) {
- // 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
+ if (CurrentUser.implies(CmsRole.userAdmin, directory.getBase())) {
+ visible.add(directory);
}
for (HierarchyUnit hu : directory.getDirectHierarchyUnits(true)) {
if (CurrentUser.implies(CmsRole.userAdmin, hu.getBase())) {
@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;
}
};
- SwtTreeView<HierarchyUnit> directoriesView = new SwtTreeView<>(sashForm, SWT.NONE, hierarchyPart);
+ SwtTreeView<HierarchyUnit> directoriesView = new SwtTreeView<>(sashForm, SWT.BORDER, hierarchyPart);
DefaultTabularPart<HierarchyUnit, Content> usersPart = new DefaultTabularPart<>() {
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);
}
}
@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;
}
});
- usersPart.addColumn((Column<Content>) (role) -> role.attr(LdapAttrs.mail.qName()));
+// usersPart.addColumn((Column<Content>) (role) -> role.attr(LdapAttrs.mail));
+ usersPart.addColumn(new Column<Content>() {
- SwtTableView<HierarchyUnit, Content> usersView = new SwtTableView<>(sashForm, SWT.NONE, 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(SuiteEvent.refreshPart.topic(),
- SuiteEvent.eventProperties(ContentUtils.hierarchyUnitToContent(contentSession, hierarchyUnit)));
+ addItem.setEnabled(true);
+// cmsView.sendEvent(SuiteUxEvent.refreshPart.topic(), SuiteUxEvent
+// .eventProperties(ContentUtils.hierarchyUnitToContent(contentSession, hierarchyUnit)));
}
});
usersPart.onSelected((o) -> {
Content user = (Content) o;
if (user != null) {
- cmsView.sendEvent(SuiteEvent.refreshPart.topic(), SuiteEvent.eventProperties(user));
+ cmsView.sendEvent(SuiteUxEvent.refreshPart.topic(), SuiteUxEvent.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));
+ cmsView.sendEvent(SuiteUxEvent.openNewPart.topic(), SuiteUxEvent.eventProperties(user));
}
});
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();
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;
}
projects / gpl / argeo-suite.git / blobdiff