union delete operations stats with delete result and resultStatus

Evolveum · Apr 6, 2020 · 0a325f9 · 0a325f9
1 parent fc20ded
commit 0a325f9
Showing 1 changed file with 13 additions and 18 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTask.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTask.java
@@ -3,10 +3,6 @@
 import java.io.InputStream;
 import java.util.Collection;
 import java.util.Collections;
-import com.evolveum.midpoint.web.component.prism.ValueStatus;
-
-import com.evolveum.midpoint.prism.path.ItemName;
-import com.evolveum.midpoint.web.component.prism.ValueStatus;
 
 import org.apache.wicket.Page;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -18,22 +14,21 @@
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 
 import com.evolveum.midpoint.gui.api.GuiStyleConstants;
+import com.evolveum.midpoint.gui.api.prism.ItemWrapper;
 import com.evolveum.midpoint.gui.api.prism.PrismObjectWrapper;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
 import com.evolveum.midpoint.gui.impl.component.AjaxCompositedIconButton;
 import com.evolveum.midpoint.gui.impl.component.icon.CompositedIcon;
 import com.evolveum.midpoint.gui.impl.component.icon.CompositedIconBuilder;
 import com.evolveum.midpoint.gui.impl.component.icon.IconCssStyle;
-import com.evolveum.midpoint.gui.impl.prism.PrismPropertyValueWrapper;
-import com.evolveum.midpoint.gui.impl.prism.PrismPropertyWrapper;
-import com.evolveum.midpoint.gui.impl.prism.PrismReferenceValueWrapperImpl;
-import com.evolveum.midpoint.gui.impl.prism.PrismReferenceWrapper;
+import com.evolveum.midpoint.gui.impl.prism.*;
 import com.evolveum.midpoint.model.api.authentication.GuiProfiledPrincipal;
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.prism.PrismProperty;
 import com.evolveum.midpoint.prism.Referencable;
 import com.evolveum.midpoint.prism.delta.ObjectDelta;
+import com.evolveum.midpoint.prism.path.ItemName;
 import com.evolveum.midpoint.prism.path.ItemPath;
 import com.evolveum.midpoint.report.api.ReportConstants;
 import com.evolveum.midpoint.schema.GetOperationOptions;
@@ -57,6 +52,7 @@
 import com.evolveum.midpoint.web.component.AjaxIconButton;
 import com.evolveum.midpoint.web.component.ObjectSummaryPanel;
 import com.evolveum.midpoint.web.component.objectdetails.AbstractObjectMainPanel;
+import com.evolveum.midpoint.web.component.prism.ValueStatus;
 import com.evolveum.midpoint.web.component.refresh.Refreshable;
 import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
@@ -354,12 +350,11 @@ private void createCleanupPerformanceButton(RepeatingView repeatingView) {
             @Override
             public void onClick(AjaxRequestTarget target) {
                 try {
-                    getObjectWrapper().findContainer(TaskType.F_OPERATION_STATS).getValue().setStatus(ValueStatus.DELETED);
+                    deleteItem(TaskType.F_OPERATION_STATS);
                 } catch (SchemaException e){
                     LOGGER.error("Cannot clear task results: {}", e.getMessage());
                 }
                 saveTaskChanges(target);
-                refresh(target);
             }
         };
         cleanupPerformance.add(AttributeAppender.append("class", "btn btn-default btn-margin-left btn-sm"));
@@ -374,8 +369,8 @@ private void createCleanupResultsButton(RepeatingView repeatingView) {
             @Override
             public void onClick(AjaxRequestTarget target) {
                 try {
-                    deleteProperty(TaskType.F_RESULT);
-                    deleteProperty(TaskType.F_RESULT_STATUS);
+                    deleteItem(TaskType.F_RESULT);
+                    deleteItem(TaskType.F_RESULT_STATUS);
                 } catch (SchemaException e){
                     LOGGER.error("Cannot clear task results: {}", e.getMessage());
                 }
@@ -387,18 +382,18 @@ public void onClick(AjaxRequestTarget target) {
         repeatingView.add(cleanupResults);
     }
 
-    private <T> void deleteProperty(ItemName propertyName) throws SchemaException {
-        PrismPropertyWrapper<T> property = getObjectWrapper().findProperty(propertyName);
-        if (property == null) {
+    private void deleteItem(ItemName itemName) throws SchemaException {
+        ItemWrapper<?, ?, ?, ?> item = getObjectWrapper().findItem(itemName, ItemWrapper.class);
+        if (item == null) {
             return;
         }
 
-        PrismPropertyValueWrapper<T> propertyValue = property.getValue();
-        if (propertyValue == null) {
+        PrismValueWrapper<?, ?> itemValue = item.getValue();
+        if (itemValue == null) {
             return;
         }
 
-        propertyValue.setStatus(ValueStatus.DELETED);
+        itemValue.setStatus(ValueStatus.DELETED);
 
     }