Make tasks page displayable

Replaced calls to deprecated functionality with new ones. (Not quite working for now, though.)
Evolveum · Jun 23, 2021 · c4296a9 · c4296a9
1 parent d7b7904
commit c4296a9
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 67 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -23,7 +23,7 @@
 import javax.xml.datatype.XMLGregorianCalendar;
 import javax.xml.namespace.QName;
 
-import com.evolveum.midpoint.schema.util.task.BucketingUtil;
+import com.evolveum.midpoint.schema.util.task.*;
 
 import com.evolveum.midpoint.web.component.util.SelectableBean;
 
@@ -115,8 +115,6 @@
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.schema.result.OperationResultStatus;
 import com.evolveum.midpoint.schema.util.*;
-import com.evolveum.midpoint.schema.util.task.TaskPartProgressInformation;
-import com.evolveum.midpoint.schema.util.task.TaskProgressInformation;
 import com.evolveum.midpoint.security.api.AuthorizationConstants;
 import com.evolveum.midpoint.security.api.MidPointPrincipal;
 import com.evolveum.midpoint.task.api.Task;
@@ -5048,22 +5046,19 @@ public static Long getTimestampAsLong(XMLGregorianCalendar cal, boolean currentI
     }
 
     public static String getTaskProgressInformation(TaskType taskType, boolean longForm, PageBase pageBase) {
-        TaskProgressInformation progress = TaskProgressInformation.fromTaskTree(taskType);
-        TaskPartProgressInformation partProgress = progress.getCurrentPartInformation();
-        if (partProgress == null) {
-            return null;
-        }
-        String partProgressHumanReadable = partProgress.toHumanReadableString(longForm);
+        ActivityProgressInformation progress = ActivityProgressInformation.fromRootTask(taskType, TaskResolver.empty());
+        String partProgressHumanReadable = progress.toHumanReadableString(longForm);
 
         if (longForm) {
             partProgressHumanReadable = StringUtils.replaceOnce(partProgressHumanReadable, "of", pageBase.getString("TaskSummaryPanel.progress.of"));
             partProgressHumanReadable = StringUtils.replaceOnce(partProgressHumanReadable, "buckets", pageBase.getString("TaskSummaryPanel.progress.buckets"));
         }
 
-        if (progress.getAllPartsCount() > 1) {
-            String rv = pageBase.getString("TaskSummaryPanel.progress.info." + (longForm ? "long" : "short"), partProgressHumanReadable, progress.getCurrentPartNumber(), progress.getAllPartsCount());
-            return rv;
-        }
+        // TODO
+//        if (progress.getAllPartsCount() > 1) {
+//            String rv = pageBase.getString("TaskSummaryPanel.progress.info." + (longForm ? "long" : "short"), partProgressHumanReadable, progress.getCurrentPartNumber(), progress.getAllPartsCount());
+//            return rv;
+//        }
 
         return partProgressHumanReadable;
     }

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/util/GuiDisplayNameUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/util/GuiDisplayNameUtil.java
@@ -220,22 +220,23 @@ public static String getDisplayName(TaskErrorHandlingStrategyEntryType taskError
 
     //TODO improve
     public static String getDisplayName(ActivityDefinitionType partitionDefinition) {
-        Integer index = partitionDefinition.getIndex();
-        WorkDistributionType workManagementType = partitionDefinition.getWorkManagement();
-
-        String string = "";
-        if (index != null) {
-            string += "Partition " + index;
-        }
-
-        // FIXME
+//        Integer index = partitionDefinition.getIndex();
+//        WorkDistributionType workManagementType = partitionDefinition.getWorkManagement();
+//
+//        String string = "";
+//        if (index != null) {
+//            string += "Partition " + index;
+//        }
+//
+//        // FIXME
 //        if (workManagementType != null) {
 //            TaskKindType taskKindType = workManagementType.getTaskKind();
 //            if (taskKindType != null) {
 //                string = appendKind(string, taskKindType);
 //            }
 //        }
-        return string;
+//        return string;
+        return "";
     }
 
     private static String appendKind(String string, TaskKindType taskKindType) {

diff --git a/...ain/java/com/evolveum/midpoint/web/page/admin/server/TaskInternalPerformanceTabPanel.java b/...ain/java/com/evolveum/midpoint/web/page/admin/server/TaskInternalPerformanceTabPanel.java
@@ -137,12 +137,12 @@ private String getStatistics() {
                             options, iterations, seconds))
                     .append("\n");
         }
-        BucketManagementStatisticsType buckets = statistics.getWorkBucketManagementPerformanceInformation();
-        if (buckets != null && !buckets.getOperation().isEmpty()) {
-            sb.append("Work buckets management performance information\n\n")
-                    .append(ActivityBucketManagementStatisticsUtil.format(buckets, options, iterations, seconds))
-                    .append("\n");
-        }
+//        BucketManagementStatisticsType buckets = statistics.getWorkBucketManagementPerformanceInformation();
+//        if (buckets != null && !buckets.getOperation().isEmpty()) {
+//            sb.append("Work buckets management performance information\n\n")
+//                    .append(ActivityBucketManagementStatisticsUtil.format(buckets, options, iterations, seconds))
+//                    .append("\n");
+//        }
         if (statistics.getCachesPerformanceInformation() != null) {
             sb.append("Cache performance information\n\n")
                     .append(CachePerformanceInformationUtil.format(statistics.getCachesPerformanceInformation(), options))
@@ -156,16 +156,16 @@ private String getStatistics() {
         }
         sb.append("\n-------------------------------------------------------------------------------------------------------------------------------------------------------------------\n");
         sb.append("Other performance-related information that is shown elsewhere (provided here just for completeness):\n\n");
-        if (statistics.getIterativeTaskInformation() != null) {
-            sb.append("Iterative task information\n\n")
-                    .append(IterationInformation.format(statistics.getIterativeTaskInformation(), options))
-                    .append("\n");
-        }
-        if (statistics.getActionsExecutedInformation() != null) {
-            sb.append("Actions executed:\n")
-                    .append(ActionsExecutedInformationUtil.format(statistics.getActionsExecutedInformation()))
-                    .append("\n");
-        }
+//        if (statistics.getIterativeTaskInformation() != null) {
+//            sb.append("Iterative task information\n\n")
+//                    .append(IterationInformation.format(statistics.getIterativeTaskInformation(), options))
+//                    .append("\n");
+//        }
+//        if (statistics.getActionsExecutedInformation() != null) {
+//            sb.append("Actions executed:\n")
+//                    .append(ActionsExecutedInformationUtil.format(statistics.getActionsExecutedInformation()))
+//                    .append("\n");
+//        }
         if (statistics.getEnvironmentalPerformanceInformation() != null) {
             sb.append("Environmental performance information:\n")
                     .append(EnvironmentalPerformanceInformation.format(statistics.getEnvironmentalPerformanceInformation()))

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskMainPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskMainPanel.java
@@ -141,26 +141,27 @@ public boolean isVisible() {
                 return super.isVisible() && parentPage.getTaskTabVisibilty().isWorkManagementVisible(getTask());
             }
         };
-        tabs.add(new PanelTab(parentPage.createStringResource("pageTask.workManagement.title"), workManagementTabVisibility) {
-            private static final long serialVersionUID = 1L;
-
-            @Override
-            public WebMarkupContainer createPanel(String panelId) {
-                // TODO FIX THIS after task schema change
-                return new SingleContainerPanel<WorkDistributionType>(panelId, PrismContainerWrapperModel.fromContainerWrapper(getObjectModel(), TaskType.F_PARTS), WorkDistributionType.COMPLEX_TYPE) {
-
-                    @Override
-                    protected ItemVisibility getVisibility(ItemWrapper itemWrapper) {
-                        return getWorkManagementVisibility(itemWrapper.getPath());
-                    }
-
-                    @Override
-                    protected ItemEditabilityHandler getEditabilityHandler() {
-                        return getTaskEditabilityHandler();
-                    }
-                };
-            }
-        });
+//        tabs.add(new PanelTab(parentPage.createStringResource("pageTask.workManagement.title"), workManagementTabVisibility) {
+//            private static final long serialVersionUID = 1L;
+//
+//            @Override
+//            public WebMarkupContainer createPanel(String panelId) {
+//                // TODO FIX THIS after task schema change
+//                return new SingleContainerPanel<WorkDistributionType>(panelId,
+//                        PrismContainerWrapperModel.fromContainerWrapper(getObjectModel(), TaskType.F_PARTS), WorkDistributionType.COMPLEX_TYPE) {
+//
+//                    @Override
+//                    protected ItemVisibility getVisibility(ItemWrapper itemWrapper) {
+//                        return getWorkManagementVisibility(itemWrapper.getPath());
+//                    }
+//
+//                    @Override
+//                    protected ItemEditabilityHandler getEditabilityHandler() {
+//                        return getTaskEditabilityHandler();
+//                    }
+//                };
+//            }
+//        });
     }
 
     private void createExecutionConstraintsTab(List<ITab> tabs, PageTask parentPage) {

diff --git a/...ema/src/main/java/com/evolveum/midpoint/schema/util/task/ActivityProgressInformation.java b/...ema/src/main/java/com/evolveum/midpoint/schema/util/task/ActivityProgressInformation.java
@@ -11,6 +11,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.jetbrains.annotations.NotNull;
+
 import com.evolveum.midpoint.util.DebugDumpable;
 import com.evolveum.midpoint.util.DebugUtil;
 import com.evolveum.midpoint.util.exception.ObjectNotFoundException;
@@ -20,8 +22,6 @@
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 
-import org.jetbrains.annotations.NotNull;
-
 /**
  * Summarized representation of a progress of an activity and its sub-activities.
  *
@@ -85,18 +85,24 @@ private ActivityProgressInformation(String activityIdentifier, @NotNull Activity
     /**
      * Prepares the information from a root task. The task may or may not have its children resolved.
      */
-    public static ActivityProgressInformation fromRootTask(@NotNull TaskType task, @NotNull TaskResolver resolver) {
+    public static @NotNull ActivityProgressInformation fromRootTask(@NotNull TaskType task, @NotNull TaskResolver resolver) {
         return fromTask(task, ActivityPath.empty(), resolver);
     }
 
-    public static ActivityProgressInformation fromTask(@NotNull TaskType task, @NotNull ActivityPath activityPath,
+    public static @NotNull ActivityProgressInformation fromTask(@NotNull TaskType task, @NotNull ActivityPath activityPath,
             @NotNull TaskResolver resolver) {
         TaskActivityStateType globalState = task.getActivityState();
+        if (globalState == null) {
+            return unknown(null, activityPath); // TODO or "no progress"?
+        }
         ActivityStateType rootActivityState = globalState.getActivity();
+        if (rootActivityState == null) {
+            return unknown(null, activityPath); // TODO or "no progress"?
+        }
         return fromDelegatableActivityState(rootActivityState, activityPath, task, resolver);
     }
 
-    private static ActivityProgressInformation fromDelegatableActivityState(@NotNull ActivityStateType state,
+    private static @NotNull ActivityProgressInformation fromDelegatableActivityState(@NotNull ActivityStateType state,
             @NotNull ActivityPath activityPath, @NotNull TaskType task, @NotNull TaskResolver resolver) {
         if (ActivityStateUtil.isDelegated(state)) {
             return fromDelegatedActivityState(state.getIdentifier(), activityPath, getDelegatedTaskRef(state), task, resolver);
@@ -110,7 +116,7 @@ private static ObjectReferenceType getDelegatedTaskRef(ActivityStateType state)
         return workState instanceof DelegationWorkStateType ? ((DelegationWorkStateType) workState).getTaskRef() : null;
     }
 
-    private static ActivityProgressInformation fromDelegatedActivityState(String activityIdentifier,
+    private static @NotNull ActivityProgressInformation fromDelegatedActivityState(String activityIdentifier,
             @NotNull ActivityPath activityPath, ObjectReferenceType delegateTaskRef,
             @NotNull TaskType task, @NotNull TaskResolver resolver) {
         TaskType delegateTask = getSubtask(delegateTaskRef, task, resolver);
@@ -138,7 +144,7 @@ private static TaskType getSubtask(ObjectReferenceType subtaskRef, TaskType task
         }
     }
 
-    private static ActivityProgressInformation fromNotDelegatedActivityState(@NotNull ActivityStateType state,
+    private static @NotNull ActivityProgressInformation fromNotDelegatedActivityState(@NotNull ActivityStateType state,
             @NotNull ActivityPath activityPath, @NotNull TaskType task, @NotNull TaskResolver resolver) {
         String identifier = state.getIdentifier();
         RealizationState realizationState = getRealizationState(state);

diff --git a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestThresholds.java b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestThresholds.java
@@ -289,7 +289,7 @@ protected void adapTaskConfig(Task task, OperationResult result) throws Exceptio
     int getFailureCount(Task taskAfter) {
         // TODO separate the statistics dump
         OperationStatsType stats = taskAfter.getStoredOperationStatsOrClone();
-        displayValue("Iterative statistics", IterationInformation.format(stats.getIterativeTaskInformation()));
+//        displayValue("Iterative statistics", IterationInformation.format(stats.getIterativeTaskInformation()));
         return TaskOperationStatsUtil.getItemsProcessedWithFailure(stats);
     }
 }