Skip to content

Commit

Permalink
MID-8896: overwrite of object name for delta in visualization panel
Browse files Browse the repository at this point in the history
  • Loading branch information
skublik committed Sep 25, 2023
1 parent 244fcb9 commit dc40980
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
import java.util.List;
import java.util.Objects;

import com.evolveum.midpoint.prism.polystring.PolyString;

import org.jetbrains.annotations.NotNull;

import com.evolveum.midpoint.gui.api.page.PageBase;
Expand All @@ -36,6 +38,8 @@ public class VisualizationDto implements Serializable {

private String boxClassOverride;

private PolyString nameOverwrite;

private final List<VisualizationItemDto> items = new ArrayList<>();
private final List<VisualizationDto> partialVisualizations = new ArrayList<>();

Expand Down Expand Up @@ -65,6 +69,10 @@ public void setMinimized(boolean minimized) {
this.minimized = minimized;
}

public void setNameOverwrite(PolyString nameOverwrite) {
this.nameOverwrite = nameOverwrite;
}

public List<VisualizationDto> getPartialVisualizations() {
return partialVisualizations;
}
Expand All @@ -86,6 +94,10 @@ public List<VisualizationItemDto> getItems() {
}

public String getName() {
if (nameOverwrite != null) {
return LocalizationUtil.translatePolyString(nameOverwrite);
}

Name nameObject = visualization.getName();
if (nameObject == null) {
return LocalizationUtil.translate("SceneDto.unnamed");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
import java.util.Collections;
import java.util.List;

import com.evolveum.midpoint.prism.delta.ChangeType;

import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
Expand Down Expand Up @@ -201,7 +203,15 @@ private List<VisualizationDto> loadVisualizationForDelta() throws SchemaExceptio
throw e;
}

return Collections.singletonList(new VisualizationDto(visualization));
ObjectDeltaOperationType deltaOperation = model.getObject();

VisualizationDto dto = new VisualizationDto(visualization);

if (deltaOperation.getObjectName() != null && ChangeType.DELETE == dto.getChangeType()) {
dto.setNameOverwrite(deltaOperation.getObjectName().toPolyString());
}

return Collections.singletonList(dto);
}
}
}

0 comments on commit dc40980

Please sign in to comment.