Skip to content

Commit

Permalink
- more panels for task details
Browse files Browse the repository at this point in the history 
- better support for virtual containers - e.g merge virtual container not only by identifier, but also by path, implemented visibility override for virtual containers, fixing showing virtual containers only where explicitly defined
- separating code for adminGuiConfiguration merging.
  • Loading branch information
@katkav
katkav committed Aug 23, 2021
1 parent 1d58139 commit df148b7
Show file tree
Hide file tree
Showing 29 changed files with 1,510 additions and 295 deletions.
55 changes: 3 additions & 52 deletions ...dmin-gui/src/main/java/com/evolveum/midpoint/gui/api/DefaultGuiConfigurationCompiler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import javax.annotation.PostConstruct;
import javax.xml.namespace.QName;

import com.evolveum.midpoint.model.api.AdminGuiConfigurationMergeManager;
import com.evolveum.midpoint.prism.Containerable;
import com.evolveum.midpoint.prism.PrismContainerDefinition;
import com.evolveum.midpoint.prism.PrismContext;
Expand Down Expand Up @@ -39,6 +40,7 @@ public class DefaultGuiConfigurationCompiler implements GuiProfileCompilable {

@Autowired private GuiProfileCompilerRegistry registry;
@Autowired private PrismContext prismContext;
@Autowired private AdminGuiConfigurationMergeManager adminGuiConfigurationMergeManager;

private static final String[] PACKAGES_TO_SCAN = {
"com.evolveum.midpoint.web.component.objectdetails", //Old panels
Expand Down Expand Up @@ -75,7 +77,7 @@ public void postProcess(CompiledGuiProfile compiledGuiProfile) {
compiledGuiProfile.getObjectDetails().getObjectDetailsPage().add(defaultDetailsPage.cloneWithoutId());
continue;
}
List<ContainerPanelConfigurationType> mergedPanels = mergeConfigurations(defaultDetailsPage.getPanel(), compiledPageType.getPanel());
List<ContainerPanelConfigurationType> mergedPanels = adminGuiConfigurationMergeManager.mergeContainerPanelConfigurationType(defaultDetailsPage.getPanel(), compiledPageType.getPanel());
setupDefaultPanel(ObjectTypes.getObjectTypeClass(compiledPageType.getType()), mergedPanels);
compiledPageType.getPanel().clear();
compiledPageType.getPanel().addAll(CloneUtil.cloneCollectionMembersWithoutIds(mergedPanels));
Expand Down Expand Up @@ -277,55 +279,4 @@ private void sort(List<ContainerPanelConfigurationType> panels) {
return Integer.compare(displayOrder1, displayOrder2);
});
}

private List<ContainerPanelConfigurationType> mergeConfigurations(List<ContainerPanelConfigurationType> defaultPanels, List<ContainerPanelConfigurationType> configuredPanels) {
List<ContainerPanelConfigurationType> mergedPanels = new ArrayList<>(defaultPanels);
for (ContainerPanelConfigurationType configuredPanel : configuredPanels) {
mergePanelConfigurations(configuredPanel, defaultPanels, mergedPanels);
}
return mergedPanels;
}

private void mergePanelConfigurations(ContainerPanelConfigurationType configuredPanel, List<ContainerPanelConfigurationType> defaultPanels, List<ContainerPanelConfigurationType> mergedPanels) {
for (ContainerPanelConfigurationType defaultPanel : defaultPanels) {
if (defaultPanel.getIdentifier().equals(configuredPanel.getIdentifier())) {
mergePanels(defaultPanel, configuredPanel);
return;
}
}
mergedPanels.add(configuredPanel.cloneWithoutId());
}

private void mergePanels(ContainerPanelConfigurationType mergedPanel, ContainerPanelConfigurationType configuredPanel) {
if (configuredPanel.getPanelType() != null) {
mergedPanel.setPanelType(configuredPanel.getPanelType());
}

if (configuredPanel.getPath() != null) {
mergedPanel.setPath(configuredPanel.getPath());
}

if (configuredPanel.getListView() != null) {
mergedPanel.setListView(configuredPanel.getListView().cloneWithoutId());
}

if (!configuredPanel.getContainer().isEmpty()) {
mergedPanel.getContainer().addAll(CloneUtil.cloneCollectionMembersWithoutIds(configuredPanel.getContainer()));
}

if (configuredPanel.getType() != null) {
mergedPanel.setType(configuredPanel.getType());
}

if (configuredPanel.getVisibility() != null) {
mergedPanel.setVisibility(configuredPanel.getVisibility());
}

if (!configuredPanel.getPanel().isEmpty()) {
List<ContainerPanelConfigurationType> mergedConfigs = mergeConfigurations(mergedPanel.getPanel(), configuredPanel.getPanel());
mergedPanel.getPanel().clear();
mergedPanel.getPanel().addAll(mergedConfigs);
}
}

}
6 changes: 6 additions & 0 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,8 @@ public abstract class PageBase extends WebPage implements ModelServiceLocator {

@SpringBean private ClusterExecutionHelper clusterExecutionHelper;

@SpringBean private AdminGuiConfigurationMergeManager adminGuiConfigurationMergeManager;

private List<Breadcrumb> breadcrumbs;

private boolean initialized = false;
Expand Down Expand Up @@ -509,6 +511,10 @@ public CacheDispatcher getCacheDispatcher() {
return cacheDispatcher;
}

public AdminGuiConfigurationMergeManager getAdminGuiConfigurationMergeManager() {
return adminGuiConfigurationMergeManager;
}

@NotNull
@Override
public CompiledGuiProfile getCompiledGuiProfile() {
Expand Down
2 changes: 1 addition & 1 deletion ...m/evolveum/midpoint/gui/impl/factory/wrapper/NoEmptyValueContainerWrapperFactoryImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
*/
package com.evolveum.midpoint.gui.impl.factory.wrapper;

import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerWrapper;
import com.evolveum.midpoint.xml.ns._public.common.common_3.CollectionRefSpecificationType;

import org.springframework.stereotype.Component;
Expand Down Expand Up @@ -44,7 +45,6 @@ protected PrismContainerValue<C> createNewValue(PrismContainer<C> item) {
throw new UnsupportedOperationException("New value for multi-value container should not be created while creating wrappers.");
}


@Override
protected boolean shouldCreateEmptyValue(PrismContainer<C> item, WrapperContext context) {
return false;
Expand Down
13 changes: 10 additions & 3 deletions ...java/com/evolveum/midpoint/gui/impl/factory/wrapper/PrismContainerWrapperFactoryImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,9 @@ public PrismContainerValueWrapper<C> createValueWrapper(PrismContainerWrapper<C>
containerValueWrapper.addItems(children);
}
containerValueWrapper.setVirtualContainerItems(context.getVirtualItemSpecification());
if (parent != null) {
parent.setVirtual(context.getVirtualItemSpecification() != null || virtualContainerSpec != null);
if (parent != null && context.getVirtualItemSpecification() != null) {
parent.setVirtual(true);
parent.setShowInVirtualContainer(true);
}
return containerValueWrapper;
}
Expand Down Expand Up @@ -157,7 +158,13 @@ protected PrismContainerValue<C> createNewValue(PrismContainer<C> item) {
protected PrismContainerWrapper<C> createWrapperInternal(PrismContainerValueWrapper<?> parent, PrismContainer<C> childContainer,
ItemStatus status, WrapperContext ctx) {

return new PrismContainerWrapperImpl<>(parent, childContainer, status);
PrismContainerWrapper<C> containerWrapper = new PrismContainerWrapperImpl<>(parent, childContainer, status);
VirtualContainersSpecificationType virtualContainerSpec = ctx.findVirtualContainerConfiguration(containerWrapper.getPath());
if (virtualContainerSpec != null) {
containerWrapper.setVirtual(true);
containerWrapper.setShowInVirtualContainer(true);
}
return containerWrapper;
}

@Override
Expand Down
8 changes: 0 additions & 8 deletions ...va/com/evolveum/midpoint/gui/impl/factory/wrapper/VirtualContainerWrapperFactoryImpl.java
View file

This file was deleted.

128 changes: 97 additions & 31 deletions ...admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/AbstractPageObject.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@
import java.time.Duration;
import java.util.Collection;
import java.util.List;
import java.util.Optional;

import com.evolveum.midpoint.gui.api.GuiStyleConstants;
import com.evolveum.midpoint.schema.util.ObjectTypeUtil;
import com.evolveum.midpoint.web.component.AjaxButton;
import com.evolveum.midpoint.web.component.AjaxIconButton;
import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
Expand All @@ -27,7 +29,9 @@
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.string.StringValue;

Expand Down Expand Up @@ -67,16 +71,60 @@ public abstract class AbstractPageObject<O extends ObjectType> extends PageBase
private static final String ID_SUMMARY = "summary";
private static final String ID_BUTTONS = "buttons";

private LoadableModel<PageObjectModel<O>> pageModel;

private LoadableModel<PrismObjectWrapper<O>> model;
private GuiObjectDetailsPageType detailsPageConfiguration;
private IModel<GuiObjectDetailsPageType> detailsPageConfiguration;

public AbstractPageObject(PageParameters pageParameters) {
super(pageParameters);
model = createPageModel();
detailsPageConfiguration = getCompiledGuiProfile().findObjectDetailsConfiguration(getType());

pageModel = createPageModel();
model = new LoadableModel<>(false) {
@Override
protected PrismObjectWrapper<O> load() {
return pageModel.getObject().getWrapper();
}
};
detailsPageConfiguration = new PropertyModel<>(pageModel, "detailsPageConfiguration");
initLayout();
}

private LoadableModel<PageObjectModel<O>> createPageModel() {
return new LoadableModel<>(false) {

@Override
protected PageObjectModel<O> load() {
PrismObject<O> prismUser = loadPrismObject();

PageObjectModel<O> pageModel = new PageObjectModel<>();
GuiObjectDetailsPageType detailsPageConfig = loadPageConfiguration(prismUser);
pageModel.setDetailsPageConfiguration(detailsPageConfig);

PrismObjectWrapperFactory<O> factory = findObjectWrapperFactory(prismUser.getDefinition());
Task task = createSimpleTask("createWrapper");
OperationResult result = task.getResult();
WrapperContext ctx = new WrapperContext(task, result);
ctx.setCreateIfEmpty(true);
ctx.setContainerPanelConfigurationType(detailsPageConfig.getPanel());
try {
PrismObjectWrapper<O> wrapper = factory.createObjectWrapper(prismUser, isEditUser()? ItemStatus.NOT_CHANGED : ItemStatus.ADDED, ctx);
pageModel.setWrapper(wrapper);
} catch (SchemaException e) {
//TODO:
return null;
}


return pageModel;
}
};
}

protected GuiObjectDetailsPageType loadPageConfiguration(PrismObject<O> prismObject) {
return getCompiledGuiProfile().findObjectDetailsConfiguration(getType());
}

private void initLayout() {
initSummaryPanel();
initButtons();
Expand Down Expand Up @@ -205,7 +253,7 @@ public void refresh(AjaxRequestTarget target) {
public void refresh(AjaxRequestTarget target, boolean soft) {

if (isEditUser()) {
model.reset();
pageModel.reset();
}
target.add(getSummaryPanel());
target.add(getOperationalButtonsPanel());
Expand All @@ -227,8 +275,12 @@ public void refresh(AjaxRequestTarget target, boolean soft) {

private ContainerPanelConfigurationType findDefaultConfiguration() {
//TODO support for second level panel as a default, e.g. assignment -> role
ContainerPanelConfigurationType basicPanelConfig = getPanelConfigurations().stream().filter(panel -> BooleanUtils.isTrue(panel.isDefault())).findFirst().get();
return basicPanelConfig;
Optional<ContainerPanelConfigurationType> basicPanelConfig = getPanelConfigurations().getObject().stream().filter(panel -> BooleanUtils.isTrue(panel.isDefault())).findFirst();
if (basicPanelConfig.isPresent()) {
return basicPanelConfig.get();
}

return getPanelConfigurations().getObject().stream().findFirst().get();
}

private void initMainPanel(ContainerPanelConfigurationType panelConfig, MidpointForm form) {
Expand All @@ -249,9 +301,9 @@ private void initNavigation() {

}

private DetailsNavigationPanel createNavigationPanel(String id, List<ContainerPanelConfigurationType> panels) {
private DetailsNavigationPanel createNavigationPanel(String id, IModel<List<ContainerPanelConfigurationType>> panels) {

DetailsNavigationPanel panel = new DetailsNavigationPanel(id, model, Model.ofList(panels)) {
DetailsNavigationPanel panel = new DetailsNavigationPanel(id, model, panels) {
@Override
protected void onClickPerformed(ContainerPanelConfigurationType config, AjaxRequestTarget target) {
MidpointForm form = getMainForm();
Expand All @@ -264,28 +316,29 @@ protected void onClickPerformed(ContainerPanelConfigurationType config, AjaxRequ



private LoadableModel<PrismObjectWrapper<O>> createPageModel() {
return new LoadableModel<>(false) {
@Override
protected PrismObjectWrapper<O> load() {
PrismObject<O> prismUser = loadPrismObject();

PrismObjectWrapperFactory<O> factory = findObjectWrapperFactory(prismUser.getDefinition());
Task task = createSimpleTask("createWrapper");
OperationResult result = task.getResult();
WrapperContext ctx = new WrapperContext(task, result);
ctx.setCreateIfEmpty(true);
ctx.setContainerPanelConfigurationType(getPanelConfigurations());
// private LoadableModel<PrismObjectWrapper<O>> createPageModel() {
// return new LoadableModel<>(false) {
// @Override
// protected PrismObjectWrapper<O> load() {
// PrismObject<O> prismUser = loadPrismObject();
//
// PrismObjectWrapperFactory<O> factory = findObjectWrapperFactory(prismUser.getDefinition());
// Task task = createSimpleTask("createWrapper");
// OperationResult result = task.getResult();
// WrapperContext ctx = new WrapperContext(task, result);
// ctx.setCreateIfEmpty(true);
// ctx.setContainerPanelConfigurationType(getPanelConfigurations().getObject());
//
// try {
// return factory.createObjectWrapper(prismUser, isEditUser()? ItemStatus.NOT_CHANGED : ItemStatus.ADDED, ctx);
// } catch (SchemaException e) {
// //TODO:
// return null;
// }
// }
// };
// }

try {
return factory.createObjectWrapper(prismUser, isEditUser()? ItemStatus.NOT_CHANGED : ItemStatus.ADDED, ctx);
} catch (SchemaException e) {
//TODO:
return null;
}
}
};
}
private PrismObject<O> loadPrismObject() {
Task task = createSimpleTask(OPERATION_LOAD_USER);
OperationResult result = task.getResult();
Expand Down Expand Up @@ -332,8 +385,21 @@ protected String getObjectOidParameter() {
return oid;
}

public List<ContainerPanelConfigurationType> getPanelConfigurations() {
return detailsPageConfiguration.getPanel();
// protected IModel<GuiObjectDetailsPageType> createPageConfigurationModel() {
// return new LoadableModel<>() {
// @Override
// protected GuiObjectDetailsPageType load() {
// return getCompiledGuiProfile().findObjectDetailsConfiguration(getType());
// }
// };
// }

protected IModel<PrismObjectWrapper<O>> getModel() {
return model;
}

public IModel<List<ContainerPanelConfigurationType>> getPanelConfigurations() {
return new PropertyModel<>(detailsPageConfiguration, GuiObjectDetailsPageType.F_PANEL.getLocalPart());
}

protected abstract Class<O> getType();
Expand Down
4 changes: 2 additions & 2 deletions ...n-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/DetailsNavigationPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ public class DetailsNavigationPanel<O extends ObjectType> extends BasePanel<List
private static final String ID_COUNT = "count";
private static final String ID_NAVIGATION_DETAILS = "navLinkStyle";

private LoadableModel<PrismObjectWrapper<O>> objectModel;
private IModel<PrismObjectWrapper<O>> objectModel;

public DetailsNavigationPanel(String id, LoadableModel<PrismObjectWrapper<O>> objectModel, IModel<List<ContainerPanelConfigurationType>> model) {
public DetailsNavigationPanel(String id, IModel<PrismObjectWrapper<O>> objectModel, IModel<List<ContainerPanelConfigurationType>> model) {
super(id, model);
this.objectModel = objectModel;
}
Expand Down

0 comments on commit df148b7

Please sign in to comment.