Skip to content

Commit

Permalink
resolving conflicts after cherry picking optimizations for MID-6593
Browse files Browse the repository at this point in the history
  • Loading branch information
@katkav
katkav committed Dec 15, 2020
1 parent 9e23cc7 commit 53f5278
Show file tree
Hide file tree
Showing 12 changed files with 143 additions and 95 deletions.
3 changes: 3 additions & 0 deletions ...dmin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/PendingOperationPanel.java
View file
Expand Up @@ -7,10 +7,12 @@
package com.evolveum.midpoint.gui.api.component;

import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
import com.evolveum.midpoint.web.util.InfoTooltipBehavior;
import com.evolveum.midpoint.xml.ns._public.common.common_3.OperationResultStatusType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.PendingOperationExecutionStatusType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.PendingOperationType;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.WebMarkupContainer;
Expand Down Expand Up @@ -39,6 +41,7 @@ protected void onInitialize() {
super.onInitialize();

initLayout();
add(new VisibleBehaviour(() -> CollectionUtils.isNotEmpty(getModelObject())));
}

private void initLayout() {
Expand Down
24 changes: 3 additions & 21 deletions ...ui/src/main/java/com/evolveum/midpoint/gui/impl/component/ProjectionDisplayNamePanel.java
View file
Expand Up @@ -18,6 +18,7 @@
import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
import com.evolveum.midpoint.xml.ns._public.common.common_3.PendingOperationType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType;
import org.apache.wicket.model.PropertyModel;

/**
* @author skublik
Expand All @@ -43,27 +44,8 @@ protected void onInitialize(){

private void initLayout() {
WebMarkupContainer pendingOperationContainer = new WebMarkupContainer(ID_PENDING_OPERATION_CONTAINER);
List<PendingOperationType> pendingOperations = getModelObject().getPendingOperation();
if(pendingOperations != null
&& !pendingOperations.isEmpty()) {

pendingOperationContainer.add(new PendingOperationPanel(ID_PENDING_OPERATION, new IModel<List<PendingOperationType>>() {

@Override
public List<PendingOperationType> getObject() {
return pendingOperations;
}

}));
} else {
pendingOperationContainer.add(new WebMarkupContainer(ID_PENDING_OPERATION));
pendingOperationContainer.add(new VisibleEnableBehaviour() {
@Override
public boolean isVisible() {
return false;
}
});
}

pendingOperationContainer.add(new PendingOperationPanel(ID_PENDING_OPERATION, new PropertyModel<>(getModel(), ShadowType.F_PENDING_OPERATION.getLocalPart())));
add(pendingOperationContainer);
}

Expand Down
1 change: 1 addition & 0 deletions ...rc/main/java/com/evolveum/midpoint/gui/impl/factory/PrismContainerWrapperFactoryImpl.java
View file
Expand Up @@ -71,6 +71,7 @@ public PrismContainerValueWrapper<C> createValueWrapper(PrismContainerWrapper<C>
containerValueWrapper.setVirtualContainerItems(context.getVirtualItemSpecification());
parent.setVirtual(context.getVirtualItemSpecification() != null);
containerValueWrapper.setExpanded(shouldBeExpanded(parent, value, context));

return containerValueWrapper;
}

Expand Down
5 changes: 0 additions & 5 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ItemHeaderPanel.html
View file
Expand Up @@ -14,11 +14,6 @@

<span wicket:id="required" style="color: #f00; font-weight: bold;"
wicket:message="title:prismPropertyPanel.required">*</span>
<!-- <span wicket:id="hasOutbound" style="color: #8080ff; font-weight: bold;" -->
<!-- wicket:message="title:prismPropertyPanel.hasOutbound"><i class="fa fa-sign-out"></i></span> -->
<!-- <span wicket:id="hasPendingModification" style="color: #f0f; font-weight: bold;" -->
<!-- wicket:message="title:prismPropertyPanel.hasPendingModification">*</span> -->
<!-- <i class="helpTextIcon" wicket:id="help"/> -->
<i class="helpTextIcon" wicket:id="help"/>
<i class="helpTextIcon" wicket:id="deprecated"/>
<i class="helpTextIcon" wicket:id="experimental"/>
Expand Down
2 changes: 1 addition & 1 deletion ...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismContainerValuePanel.html
View file
Expand Up @@ -32,7 +32,7 @@
</div>
<div class="prism-properties">
<div wicket:id="propertiesLabel">
<div wicket:id="properties">
<div class="property-stripe" wicket:id="properties">
<div class="row prism-property" wicket:id="property"/>
</div>
</div>
Expand Down
37 changes: 7 additions & 30 deletions ...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismContainerValuePanel.java
View file
Expand Up @@ -255,34 +255,6 @@ public List<IW> getObject() {
private <IW extends ItemWrapper<?,?,?,?>> List<IW> getNonContainerWrappers() {
CVW containerValueWrapper = getModelObject();
List<? extends ItemWrapper<?, ?, ?, ?>> nonContainers = containerValueWrapper.getNonContainers();

Locale locale = WebModelServiceUtils.getLocale();
if (locale == null) {
locale = Locale.getDefault();
}
Collator collator = Collator.getInstance(locale);
collator.setStrength(Collator.SECONDARY); // e.g. "a" should be different from "á"
collator.setDecomposition(Collator.FULL_DECOMPOSITION);
ItemWrapperComparator<?> comparator = new ItemWrapperComparator<>(collator, getModelObject().isSorted());
if (CollectionUtils.isNotEmpty(nonContainers)) {
nonContainers.sort((Comparator) comparator);

int visibleProperties = 0;

for (ItemWrapper<?,?,?,?> item : nonContainers) {
if (item.isVisible(containerValueWrapper, getVisibilityHandler())) {
visibleProperties++;
}

if (visibleProperties % 2 == 0) {
item.setStripe(false);
} else {
item.setStripe(true);
}

}
}

return (List<IW>) nonContainers;
}

Expand Down Expand Up @@ -333,7 +305,7 @@ private <IW extends ItemWrapper<?,?,?,?>> void populateNonContainer(ListItem<IW>
.showOnTopLevel(isShowOnTopLevel());
Panel panel = getPageBase().initItemPanel("property", typeName, item.getModel(), builder.build());
panel.setOutputMarkupId(true);
panel.add(new VisibleEnableBehaviour() {
item.add(new VisibleEnableBehaviour() {

private static final long serialVersionUID = 1L;

Expand Down Expand Up @@ -363,6 +335,11 @@ private void populateContainer(ListItem<PrismContainerWrapper<?>> container) {
try {
Panel panel = getPageBase().initItemPanel("container", itemWrapper.getTypeName(), container.getModel(), settings);
panel.setOutputMarkupId(true);
container.add(new VisibleBehaviour(() -> {
CVW parent = PrismContainerValuePanel.this.getModelObject();
return container.getModelObject().isVisible(parent, getVisibilityHandler());
}));

container.add(panel);
} catch (SchemaException e) {
throw new SystemException("Cannot instantiate panel for: " + itemWrapper.getDisplayName());
Expand Down Expand Up @@ -531,7 +508,7 @@ private void prepareNewContainers(AjaxRequestTarget target, List<PrismContainerD
try {
ItemWrapper iw = getPageBase().createItemWrapper(container, getModelObject(), ctx);
if (iw != null) {
((List) getModelObject().getItems()).add(iw);
getModelObject().addItem(iw);
}
} catch (SchemaException e) {
OperationResult result = ctx.getResult();
Expand Down
5 changes: 5 additions & 0 deletions ...in-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismContainerValueWrapper.java
View file
Expand Up @@ -6,6 +6,7 @@
*/
package com.evolveum.midpoint.gui.impl.prism;

import java.util.Collection;
import java.util.List;

import com.evolveum.midpoint.gui.api.prism.ItemWrapper;
Expand Down Expand Up @@ -83,4 +84,8 @@ public interface PrismContainerValueWrapper<C extends Containerable> extends Pri
void setVirtualContainerItems(List<VirtualContainerItemSpecificationType> virtualItems);
boolean isVirtual();


void addItem(ItemWrapper<?, ?, ?, ?> iw);
void clearItems();
void addItems(Collection<ItemWrapper<?, ?, ?, ?>> items);
}
112 changes: 84 additions & 28 deletions ...ui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismContainerValueWrapperImpl.java
View file
Expand Up @@ -20,6 +20,7 @@
import com.evolveum.midpoint.gui.api.prism.ItemWrapper;
import com.evolveum.midpoint.gui.api.prism.PrismContainerWrapper;
import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
import com.evolveum.midpoint.gui.api.util.WebPrismUtil;
import com.evolveum.midpoint.prism.delta.ItemDelta;
import com.evolveum.midpoint.prism.path.ItemName;
Expand All @@ -31,6 +32,14 @@
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.web.component.prism.ContainerStatus;
import com.evolveum.midpoint.web.component.prism.ValueStatus;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ExtensionType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.MetadataType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.VirtualContainerItemSpecificationType;
import org.apache.commons.collections4.CollectionUtils;
import java.text.Collator;
import java.util.*;


/**
* @author katka
Expand All @@ -53,6 +62,8 @@ public class PrismContainerValueWrapperImpl<C extends Containerable> extends Pri
private List<VirtualContainerItemSpecificationType> virtualItems;
private List<ItemWrapper<?, ?, ?,?>> items = new ArrayList<>();

private List<ItemWrapper<?, ?, ?, ?>> nonContainers = new ArrayList<>();

public PrismContainerValueWrapperImpl(PrismContainerWrapper<C> parent, PrismContainerValue<C> pcv, ValueStatus status) {
super(parent, pcv, status);
}
Expand Down Expand Up @@ -235,7 +246,10 @@ public <T extends Containerable> List<PrismContainerWrapper<T>> getContainers()

@Override
public List<? extends ItemWrapper<?,?,?,?>> getNonContainers() {
List<? extends ItemWrapper<?,?,?,?>> nonContainers = new ArrayList<>();
// List<? extends ItemWrapper<?,?,?,?>> nonContainers = new ArrayList<>();
if (!nonContainers.isEmpty()) {
return nonContainers;
}
for (ItemWrapper<?,?,?,?> item : items) {

collectExtensionItems(item, false, nonContainers);
Expand All @@ -245,48 +259,73 @@ public List<? extends ItemWrapper<?,?,?,?>> getNonContainers() {
}
}

if (getVirtualItems() == null) {
return nonContainers;
}

if (getParent() == null) {
LOGGER.trace("Parent null, skipping virtual items");
return nonContainers;
}

PrismObjectWrapper objectWrapper = getParent().findObjectWrapper();
if (objectWrapper == null) {
LOGGER.trace("No object wrapper found. Skipping virtual items.");
return nonContainers;
}
PrismObjectWrapper<?> objectWrapper = getObjectWrapperForVirtualContainers();
if (objectWrapper != null) {

for (VirtualContainerItemSpecificationType virtualItem : getVirtualItems()) {
try {
ItemPath virtualItemPath = getVirtualItemPath(virtualItem);
ItemWrapper itemWrapper = objectWrapper.findItem(virtualItemPath, ItemWrapper.class);
if (itemWrapper == null) {
LOGGER.warn("No wrapper found for {}", virtualItemPath);
for (VirtualContainerItemSpecificationType virtualItem : getVirtualItems()) {
if (objectWrapper == null) {
//should not happen, if happens it means something veeery strange happened
continue;
}
try {
ItemPath virtualItemPath = getVirtualItemPath(virtualItem);
ItemWrapper itemWrapper = objectWrapper.findItem(virtualItemPath, ItemWrapper.class);
if (itemWrapper == null) {
LOGGER.warn("No wrapper found for {}", virtualItemPath);
continue;
}

if (itemWrapper instanceof PrismContainerWrapper) {
continue;
}
if (itemWrapper instanceof PrismContainerWrapper) {
continue;
}

if (checkContainerInclusion(itemWrapper)) {
((List)nonContainers).add(itemWrapper);
if (checkContainerInclusion(itemWrapper)) {
((List) nonContainers).add(itemWrapper);
}
} catch (SchemaException e) {
LOGGER.error("Cannot find wrapper with path {}, error occured {}", virtualItem, e.getMessage(), e);
}
} catch (SchemaException e) {
LOGGER.error("Cannot find wrapper with path {}, error occured {}", virtualItem, e.getMessage(), e);
}
}

Locale locale = WebModelServiceUtils.getLocale();
if (locale == null) {
locale = Locale.getDefault();
}
Collator collator = Collator.getInstance(locale);
collator.setStrength(Collator.SECONDARY); // e.g. "a" should be different from "á"
collator.setDecomposition(Collator.FULL_DECOMPOSITION);
ItemWrapperComparator<?> comparator = new ItemWrapperComparator<>(collator, sorted);
if (CollectionUtils.isNotEmpty(nonContainers)) {
nonContainers.sort((Comparator) comparator);
}
return nonContainers;
}


public boolean checkContainerInclusion(ItemWrapper<?, ?, ?, ?> itemWrapper) {
return true;
}

private PrismObjectWrapper<?> getObjectWrapperForVirtualContainers() {
if (getVirtualItems() == null) {
LOGGER.trace("Skipping processing of virtual containers, no virtual container definition found");
return null;
}

if (getParent() == null) {
LOGGER.trace("Parent null, skipping virtual items");
return null;
}

PrismObjectWrapper objectWrapper = getParent().findObjectWrapper();
if (objectWrapper == null) {
LOGGER.trace("No object wrapper found. Skipping virtual items.");
return null;
}
return objectWrapper;
}

private ItemPath getVirtualItemPath(VirtualContainerItemSpecificationType virtualItem) throws SchemaException {
ItemPathType itemPathType = virtualItem.getPath();
if (itemPathType == null) {
Expand Down Expand Up @@ -472,4 +511,21 @@ public List<VirtualContainerItemSpecificationType> getVirtualItems() {
public boolean isVirtual() {
return virtualItems != null;
}

public void addItem(ItemWrapper<?, ?, ?, ?> iw) {
items.add(iw);
nonContainers.clear();
}

@Override
public void clearItems() {
items.clear();
nonContainers.clear();
}

@Override
public void addItems(Collection<ItemWrapper<?,?,?,?>> items) {
items.addAll(items);
nonContainers.clear();
}
}
14 changes: 11 additions & 3 deletions ...ain/java/com/evolveum/midpoint/gui/impl/prism/ResourceAttributeDefinitionHeaderPanel.java
View file
Expand Up @@ -46,9 +46,17 @@ private IModel<ResourceAttributeWrapper<T>> getResourceAttributeDefinitionModel(
}

private boolean hasOutboundMapping() {
return getResourceAttributeDefinitionModel() != null &&
getResourceAttributeDefinitionModel().getObject() != null &&
getResourceAttributeDefinitionModel().getObject().hasOutboundMapping();
IModel<ResourceAttributeWrapper<T>> model = getResourceAttributeDefinitionModel();
if (model == null) {
return false;
}

ResourceAttributeWrapper<T> modelObject = model.getObject();
if (modelObject == null) {
return false;
}

return modelObject.hasOutboundMapping();
}

}
26 changes: 21 additions & 5 deletions ...main/java/com/evolveum/midpoint/web/component/objectdetails/FocusProjectionsTabPanel.java
View file
Expand Up @@ -220,11 +220,7 @@ public void itemPerformedForDefaultAction(AjaxRequestTarget target,
IModel<PrismContainerValueWrapper<ShadowType>> rowModel,
List<PrismContainerValueWrapper<ShadowType>> listItems) {

if(rowModel != null && rowModel.getObject() != null
&& ((ShadowWrapper)rowModel.getObject().getParent()).isLoadWithNoFetch()) {
((PageAdminFocus) getPage()).loadFullShadow((PrismObjectValueWrapper)rowModel.getObject(), target);
}

loadShadowIfNeeded(rowModel, target);
if(listItems != null) {
listItems.forEach(value -> {
if(((ShadowWrapper)value.getParent()).isLoadWithNoFetch()) {
Expand Down Expand Up @@ -255,6 +251,26 @@ protected MultivalueContainerDetailsPanel<ShadowType> getMultivalueContainerDeta
setOutputMarkupId(true);
}

private void loadShadowIfNeeded(IModel<PrismContainerValueWrapper<ShadowType>> rowModel, AjaxRequestTarget target) {
if (rowModel == null) {
return;
}

PrismContainerValueWrapper<ShadowType> shadow = rowModel.getObject();
if (shadow == null) {
return;
}

ShadowWrapper shadowWrapper = shadow.getParent();
if (shadowWrapper == null) {
return;
}

if (shadowWrapper.isLoadWithNoFetch()) {
((PageAdminFocus) getPage()).loadFullShadow((PrismObjectValueWrapper)rowModel.getObject(), target);
}
}

private void initPaging() {
getPageBase().getSessionStorage().getFocusProjectionTableStorage().setPaging(
getPrismContext().queryFactory().createPaging(0, (int) ((PageBase)getPage()).getItemsPerPage(UserProfileStorage.TableId.FOCUS_PROJECTION_TABLE)));
Expand Down

0 comments on commit 53f5278

Please sign in to comment.