Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Evolveum/midpoint
Browse files Browse the repository at this point in the history 
* 'master' of github.com:Evolveum/midpoint:
  MID-8658 provenance metadata (_metadata), displayable via popup in delta viewer, work in progress. Metadata still not displayed correctly
  MID-8658 provenance metadata (_metadata), displayable via popup in delta viewer, work in progress.
  MID-8737:allow edit mapping after setting of mandatory attributes
  MID-8748:fix for style of construction resource mappings step panel
  MID-8747:fix for NPE on resource object type wizard panel when schema missing in resource
  MID-8738:fix for redirect back from wizard to details panel
  Re-fix missing data in "focus identification" auth
  Fix authentication failure reporting
  MID-8750:fix for saving ref for construction attribute
  • Loading branch information
@katkav
katkav committed Apr 5, 2023
2 parents cde059d + 0b9356f commit 839ad91
Show file tree
Hide file tree
Showing 43 changed files with 520 additions and 162 deletions.
3 changes: 3 additions & 0 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3824,6 +3824,9 @@ public static ResourceObjectDefinition getResourceObjectDefinition(ConstructionT
}

ResourceSchema schema = ResourceSchemaFactory.getCompleteSchema(resource);
if (schema == null) {
return null;
}
ResourceObjectDefinition oc = schema.findDefinitionForConstruction(construction);
return oc;
}
Expand Down
59 changes: 38 additions & 21 deletions ...in-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/ContainerableListPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@
import com.evolveum.midpoint.web.component.util.SelectableRow;
import com.evolveum.midpoint.web.component.util.SerializableSupplier;
import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
import com.evolveum.midpoint.web.session.PageStorage;
import com.evolveum.midpoint.web.session.UserProfileStorage;
import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
Expand Down Expand Up @@ -434,7 +433,7 @@ private List<IColumn<PO, String>> createColumns() {
InlineMenuButtonColumn<PO> actionsColumn = new InlineMenuButtonColumn<>(menuItems, getPageBase()) {
@Override
public String getCssClass() {
return "inline-menu-column ";
return getInlineMenuCssClass();
}

@Override
Expand All @@ -448,6 +447,10 @@ protected boolean isButtonMenuItemEnabled(IModel<PO> rowModel) {
return columns;
}

protected String getInlineMenuCssClass() {
return "inline-menu-column ";
}

protected boolean isMenuItemVisible(IModel<PO> rowModel) {
return true;
}
Expand Down Expand Up @@ -1158,28 +1161,42 @@ public ContainerPanelConfigurationType getPanelConfiguration() {
public boolean isValidFormComponents(AjaxRequestTarget target) {
AtomicReference<Boolean> valid = new AtomicReference<>(true);
getTable().visitChildren(SelectableDataTable.SelectableRowItem.class, (row, object) -> {
((SelectableDataTable.SelectableRowItem) row).visitChildren(FormComponent.class, (baseFormComponent, object2) -> {
if (!baseFormComponent.hasErrorMessage()) {
baseFormComponent.getBehaviors().stream()
.filter(behaviour -> behaviour instanceof ValidatorAdapter
&& ((ValidatorAdapter) behaviour).getValidator() instanceof NotNullValidator)
.map(adapter -> ((ValidatorAdapter) adapter).getValidator())
.forEach(validator -> ((NotNullValidator) validator).setUseModel(true));
((FormComponent) baseFormComponent).validate();
}
if (baseFormComponent.hasErrorMessage()) {
valid.set(false);
if (target != null) {
target.add(baseFormComponent);
InputPanel inputParent = baseFormComponent.findParent(InputPanel.class);
if (inputParent != null && inputParent.getParent() != null) {
target.addChildren(inputParent.getParent(), FeedbackLabels.class);
}
validateRow((SelectableDataTable.SelectableRowItem) row, valid, target);
});
return valid.get();
}

public boolean isValidFormComponentsOfRow(IModel<PO> rowModel, AjaxRequestTarget target) {
AtomicReference<Boolean> valid = new AtomicReference<>(true);
getTable().visitChildren(SelectableDataTable.SelectableRowItem.class, (row, object) -> {
if (((SelectableDataTable.SelectableRowItem) row).getModel().equals(rowModel)) {
validateRow((SelectableDataTable.SelectableRowItem) row, valid, target);
}
});
return valid.get();
}

private void validateRow(SelectableDataTable.SelectableRowItem row, AtomicReference<Boolean> valid, AjaxRequestTarget target) {
row.visitChildren(FormComponent.class, (baseFormComponent, object2) -> {
if (!baseFormComponent.hasErrorMessage()) {
baseFormComponent.getBehaviors().stream()
.filter(behaviour -> behaviour instanceof ValidatorAdapter
&& ((ValidatorAdapter) behaviour).getValidator() instanceof NotNullValidator)
.map(adapter -> ((ValidatorAdapter) adapter).getValidator())
.forEach(validator -> ((NotNullValidator) validator).setUseModel(true));
((FormComponent) baseFormComponent).validate();
}
if (baseFormComponent.hasErrorMessage()) {
valid.set(false);
if (target != null) {
target.add(baseFormComponent);
InputPanel inputParent = baseFormComponent.findParent(InputPanel.class);
if (inputParent != null && inputParent.getParent() != null) {
target.addChildren(inputParent.getParent(), FeedbackLabels.class);
}
}
});
}
});
return valid.get();
}

public boolean isValidFormComponents() {
Expand Down
4 changes: 4 additions & 0 deletions ...n/java/com/evolveum/midpoint/gui/impl/factory/panel/ResourceAttributeRefPanelFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
import com.evolveum.midpoint.util.QNameUtil;
import com.evolveum.midpoint.util.exception.ConfigurationException;

import com.evolveum.midpoint.web.page.admin.configuration.component.EmptyOnBlurAjaxFormUpdatingBehaviour;

import org.apache.wicket.model.IModel;
import org.springframework.stereotype.Component;

Expand Down Expand Up @@ -70,6 +72,8 @@ public Collection<ItemName> loadChoices() {
}
};

autoCompleteTextPanel.getBaseFormComponent().add(new EmptyOnBlurAjaxFormUpdatingBehaviour());

return autoCompleteTextPanel;
}

Expand Down
81 changes: 43 additions & 38 deletions ...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/ObjectDetailsModels.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ protected O load() {
};
}

public WrapperContext createWrapperContext(){
public WrapperContext createWrapperContext() {
Task task = getModelServiceLocator().createSimpleTask("createWrapper");
OperationResult result = task.getResult();
WrapperContext context = createWrapperContext(task, result);
Expand All @@ -133,6 +133,7 @@ public List<? extends ContainerPanelConfigurationType> getPanelConfigurations()
}
return detailsPage.getPanel();
}

private void loadParentOrgs(PrismObject<O> object) {
Task task = getModelServiceLocator().createSimpleTask(OPERATION_LOAD_PARENT_ORG);
OperationResult subResult = task.getResult();
Expand Down Expand Up @@ -169,7 +170,6 @@ private void loadParentOrgs(PrismObject<O> object) {
subResult.computeStatus();
}


protected PageBase getPageBase() {
return (PageBase) getModelServiceLocator();
}
Expand Down Expand Up @@ -206,51 +206,51 @@ private Collection<ObjectDelta<? extends ObjectType>> collectDeltasFromObject(Op
WebComponentUtil.encryptCredentials(delta, true, modelServiceLocator);
switch (objectWrapper.getStatus()) {
case ADDED:
PrismObject<O> objectToAdd = delta.getObjectToAdd();
PrismObject<O> objectToAdd = delta.getObjectToAdd();
// WebComponentUtil.encryptCredentials(objectToAdd, true, modelServiceLocator);
prepareObjectForAdd(objectToAdd);
getPrismContext().adopt(objectToAdd, objectWrapper.getCompileTimeClass());
if (LOGGER.isTraceEnabled()) {
LOGGER.trace("Delta before add user:\n{}", delta.debugDump(3));
}
prepareObjectForAdd(objectToAdd);
getPrismContext().adopt(objectToAdd, objectWrapper.getCompileTimeClass());
if (LOGGER.isTraceEnabled()) {
LOGGER.trace("Delta before add user:\n{}", delta.debugDump(3));
}

if (!delta.isEmpty()) {
delta.revive(getPrismContext());
if (!delta.isEmpty()) {
delta.revive(getPrismContext());

final Collection<ObjectDelta<? extends ObjectType>> deltas = MiscUtil.createCollection(delta);
validationErrors = performCustomValidation(objectToAdd, deltas);
return deltas;
final Collection<ObjectDelta<? extends ObjectType>> deltas = MiscUtil.createCollection(delta);
validationErrors = performCustomValidation(objectToAdd, deltas);
return deltas;

// if (checkValidationErrors(target, validationErrors)) {
// return null;
// }
}
}
break;

case NOT_CHANGED:
// WebComponentUtil.encryptCredentials(delta, true, modelServiceLocator);
prepareObjectDeltaForModify(delta); //preparing of deltas for projections (ADD, DELETE, UNLINK)
prepareObjectDeltaForModify(delta); //preparing of deltas for projections (ADD, DELETE, UNLINK)

if (LOGGER.isTraceEnabled()) {
LOGGER.trace("Delta before modify user:\n{}", delta.debugDump(3));
}
if (LOGGER.isTraceEnabled()) {
LOGGER.trace("Delta before modify user:\n{}", delta.debugDump(3));
}

Collection<ObjectDelta<? extends ObjectType>> deltas = new ArrayList<>();
if (!delta.isEmpty()) {
delta.revive(getPrismContext());
deltas.add(delta);
}
Collection<ObjectDelta<? extends ObjectType>> deltas = new ArrayList<>();
if (!delta.isEmpty()) {
delta.revive(getPrismContext());
deltas.add(delta);
}

List<ObjectDelta<? extends ObjectType>> additionalDeltas = getAdditionalModifyDeltas(result);
if (additionalDeltas != null) {
for (ObjectDelta additionalDelta : additionalDeltas) {
if (!additionalDelta.isEmpty()) {
additionalDelta.revive(getPrismContext());
deltas.add(additionalDelta);
}
List<ObjectDelta<? extends ObjectType>> additionalDeltas = getAdditionalModifyDeltas(result);
if (additionalDeltas != null) {
for (ObjectDelta additionalDelta : additionalDeltas) {
if (!additionalDelta.isEmpty()) {
additionalDelta.revive(getPrismContext());
deltas.add(additionalDelta);
}
}
return deltas;
}
return deltas;
// support for add/delete containers (e.g. delete credentials)
default:
throw new UnsupportedOperationException("Unsupported state");
Expand Down Expand Up @@ -311,7 +311,6 @@ protected List<ObjectDelta<? extends ObjectType>> getAdditionalModifyDeltas(Oper
return new ArrayList<>();
}


public void reset() {
prismObjectModel.detach();
objectWrapperModel.reset();
Expand Down Expand Up @@ -348,7 +347,7 @@ public void reloadPrismObjectModel(@NotNull PrismObject<O> newObject) {
savedDeltas.forEach(delta -> {
try {
if (delta.isAdd()) {
if (newObject.isEmpty()) {
if (newObject.getOid() == null) {
newObject.getValue().mergeContent(delta.getObjectToAdd().getValue(), List.of());
}
} else {
Expand All @@ -359,7 +358,7 @@ public void reloadPrismObjectModel(@NotNull PrismObject<O> newObject) {
}
});
}
prismObjectModel = new LoadableDetachableModel<>(){
prismObjectModel = new LoadableDetachableModel<>() {

@Override
protected PrismObject<O> load() {
Expand Down Expand Up @@ -442,10 +441,16 @@ private void mergeDeltas(
.findFirst();
if (match.isPresent()) {
ObjectDelta<? extends ObjectType> newDelta = delta.clone();
newDelta.merge(match.get());
if (newDelta.getOid() == null) {
newDelta.setOid(match.get().getOid());
newDelta.setChangeType(match.get().getChangeType());
if (match.get().isAdd() && match.get().getOid() == null
&& delta.isAdd() && delta.getOid() == null) {
newDelta = match.get().clone();
} else {
newDelta.merge(match.get());

if (newDelta.getOid() == null) {
newDelta.setOid(match.get().getOid());
newDelta.setChangeType(match.get().getChangeType());
}
}
if (!newDelta.isEmpty()) {
retDeltas.add(newDelta);
Expand Down
10 changes: 0 additions & 10 deletions ...m/evolveum/midpoint/gui/impl/page/admin/assignmentholder/PageAssignmentHolderDetails.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -389,18 +389,8 @@ public OperationResult onSaveObjectPerformed(AjaxRequestTarget target) {
}

private void backToDetailsFromWizard(AjaxRequestTarget target) {
//TODO change it and use parameter, when it will be implemented
ObjectDetailsStorage storage =
getSessionStorage().getObjectDetailsStorage("details" + ResourceType.class.getSimpleName());
ContainerPanelConfigurationType defaultConfig = null;
if (storage != null) {
defaultConfig = storage.getDefaultConfiguration();
}
DetailsFragment detailsFragment = createDetailsFragment();
PageAssignmentHolderDetails.this.addOrReplace(detailsFragment);
if (defaultConfig != null) {
replacePanel(defaultConfig, target);
}
target.add(detailsFragment);

getFeedbackPanel().setVisible(true);
Expand Down
31 changes: 31 additions & 0 deletions ...e/admin/resource/component/wizard/objectType/attributeMapping/AttributeMappingsTable.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@
import com.evolveum.midpoint.util.exception.SchemaException;
import com.evolveum.midpoint.util.logging.Trace;
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.web.component.AjaxIconButton;
import com.evolveum.midpoint.web.component.data.column.CheckBoxHeaderColumn;
import com.evolveum.midpoint.web.component.prism.ValueStatus;
import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
import com.evolveum.midpoint.xml.ns._public.common.common_3.*;

import org.apache.wicket.Component;
Expand All @@ -36,6 +38,7 @@
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;

import java.util.ArrayList;
import java.util.Collection;
Expand Down Expand Up @@ -205,6 +208,11 @@ private void createVirtualItemInMapping(
}
}

@Override
protected String getInlineMenuCssClass() {
return "";
}

@Override
protected List<IColumn<PrismContainerValueWrapper<MappingType>, String>> createDefaultColumns() {
List<IColumn<PrismContainerValueWrapper<MappingType>, String>> columns = new ArrayList<>();
Expand Down Expand Up @@ -255,4 +263,27 @@ protected PrismContainerDefinition<MappingType> load() {
}
};
}

@Override
protected List<Component> createToolbarButtonsList(String idButton) {
List<Component> buttons = new ArrayList<>();
AjaxIconButton newObjectSimpleButton = new AjaxIconButton(
idButton,
new Model<>("fa fa-circle-plus"),
createStringResource(getKeyOfTitleForNewObjectButton())) {

private static final long serialVersionUID = 1L;

@Override
public void onClick(AjaxRequestTarget target) {
newItemPerformed(target, null);
}
};
newObjectSimpleButton.add(AttributeAppender.append("class", "btn btn-default btn-sm ml-3"));
newObjectSimpleButton.add(new VisibleBehaviour(this::isCreateNewObjectSimpleVisible));
newObjectSimpleButton.showTitleAsLabel(true);
buttons.add(newObjectSimpleButton);

return buttons;
}
}
8 changes: 6 additions & 2 deletions ...ource/component/wizard/objectType/attributeMapping/AttributeMappingsTableWizardPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,9 @@ protected void editItemPerformed(
AjaxRequestTarget target,
IModel<PrismContainerValueWrapper<MappingType>> rowModel,
List<PrismContainerValueWrapper<MappingType>> listItems) {
inEditInboundValue(rowModel, target);
if (isValidFormComponentsOfRow(rowModel, target)) {
inEditInboundValue(rowModel, target);
}
}
};
}
Expand Down Expand Up @@ -159,7 +161,9 @@ protected void editItemPerformed(
AjaxRequestTarget target,
IModel<PrismContainerValueWrapper<MappingType>> rowModel,
List<PrismContainerValueWrapper<MappingType>> listItems) {
inEditOutboundValue(rowModel, target);
if (isValidFormComponentsOfRow(rowModel, target)) {
inEditOutboundValue(rowModel, target);
}
}
};
}
Expand Down
4 changes: 2 additions & 2 deletions .../resource/component/wizard/objectType/attributeMapping/InboundAttributeMappingsTable.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ protected DisplayType getIconDisplayType(IModel<PrismContainerValueWrapper<Mappi

@Override
public String getCssClass() {
return "px-1";
return "px-0";
}
});

Expand All @@ -93,7 +93,7 @@ protected DisplayType getIconDisplayType(IModel<PrismContainerValueWrapper<Mappi

@Override
public String getCssClass() {
return "px-1";
return "px-0";
}
});

Expand Down

0 comments on commit 839ad91

Please sign in to comment.