visibility improvements for task tabs

Evolveum · Mar 4, 2020 · 0fb8b5e · 0fb8b5e
1 parent aadf48c
commit 0fb8b5e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
@@ -195,7 +195,7 @@ && getObjectWrapper().getObject().asObjectable() instanceof AssignmentHolderType
         return getCompileTimeClass().getSimpleName();
     }
 
-    private boolean isAdd() {
+    public boolean isAdd() {
         return !isOidParameterExists() && !editingFocus;
     }
 

diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskTabsVisibility.java b/...min-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskTabsVisibility.java
@@ -69,7 +69,10 @@ public boolean computeCleanupPolicyVisible(){
     public boolean computeSubtasksAndThreadsVisible(PageTask parentPage, PrismObjectWrapper<TaskType> taskWrapper) {
         boolean isThreadsReadable = isTaskItemReadable(taskWrapper, ItemPath.create(TaskType.F_EXTENSION, SchemaConstants.MODEL_EXTENSION_WORKER_THREADS));
         TaskType task = taskWrapper.getObject().asObjectable();
-        if (parentPage.isEditingFocus() && !WebComponentUtil.isWorkflowTask(taskWrapper.getObject().asObjectable())) {
+
+        if (parentPage.isEditingFocus()) {
+            subtasksAndThreadsVisible = configuresWorkerThreads(task) && isThreadsReadable;
+        } else if (!parentPage.isAdd() && !WebComponentUtil.isWorkflowTask(taskWrapper.getObject().asObjectable())) {
             subtasksAndThreadsVisible = configuresWorkerThreads(task) && isThreadsReadable
                     || !CollectionUtils.isNotEmpty(task.getSubtask());
         } else {
@@ -85,15 +88,15 @@ public boolean configuresWorkerThreads(TaskType task) {
 
     public boolean computeEnvironmentalPerformanceVisible(PageTask parentPage, PrismObjectWrapper<TaskType> taskWrapper) {
         final OperationStatsType operationStats = taskWrapper.getObject().asObjectable().getOperationStats();
-        environmentalPerformanceVisible = !parentPage.isEditingFocus()
+        environmentalPerformanceVisible = !parentPage.isAdd() && !parentPage.isEditingFocus()
                 && isTaskItemReadable(taskWrapper, TaskType.F_OPERATION_STATS)
                 && operationStats != null
                 && !StatisticsUtil.isEmpty(operationStats.getEnvironmentalPerformanceInformation());
         return environmentalPerformanceVisible;
     }
 
     public boolean computeInternalPerformanceVisible(PageTask parentPage, PrismObjectWrapper<TaskType> taskWrapper) {
-        internalPerformanceVisible = !parentPage.isEditingFocus()
+        internalPerformanceVisible = !parentPage.isAdd() &&!parentPage.isEditingFocus()
                 && isTaskItemReadable(taskWrapper, TaskType.F_OPERATION_STATS)
                 && taskWrapper.getObject().asObjectable().getOperationStats() != null;
         return internalPerformanceVisible;
@@ -106,22 +109,22 @@ public boolean computeOperationVisible(PageTask parentPage, PrismObjectWrapper<T
         } catch (SchemaException ex){
             LOGGER.warn("Unable to find modelOperationContext in task {}", taskWrapper.getObject().asObjectable());
         }
-        operationVisible = !parentPage.isEditingFocus()
+        operationVisible = !parentPage.isAdd() && !parentPage.isEditingFocus()
                 && isTaskItemReadable(taskWrapper, TaskType.F_MODEL_OPERATION_CONTEXT)
                 && lensContext != null && !lensContext.isEmpty()
                 && !WebComponentUtil.isWorkflowTask(taskWrapper.getObject().asObjectable());
         return operationVisible;
     }
 
     public boolean computeResultVisible(PageTask parentPage, PrismObjectWrapper<TaskType> taskWrapper) {
-        resultVisible = !parentPage.isEditingFocus()
+        resultVisible = !parentPage.isAdd() && !parentPage.isEditingFocus()
                 && isTaskItemReadable(taskWrapper, TaskType.F_RESULT)
                 && !WebComponentUtil.isWorkflowTask(taskWrapper.getObject().asObjectable());
         return resultVisible;
     }
 
     public boolean computeErrorsVisible(PageTask parentPage, TaskType task) {
-        errorsVisible = !parentPage.isEditingFocus()
+        errorsVisible = !parentPage.isAdd() && !parentPage.isEditingFocus()
                 && !WebComponentUtil.isWorkflowTask(task);
         return errorsVisible;
     }
@@ -134,6 +137,7 @@ public void computeAll(PageTask parentPage, PrismObjectWrapper<TaskType> taskWra
         computeSubtasksAndThreadsVisible(parentPage, taskWrapper);
         computeProgressVisible(parentPage);
         computeEnvironmentalPerformanceVisible(parentPage, taskWrapper);
+        computeInternalPerformanceVisible(parentPage, taskWrapper);
         computeOperationVisible(parentPage, taskWrapper);
         computeResultVisible(parentPage, taskWrapper);
         computeErrorsVisible(parentPage, taskWrapper.getObject().asObjectable());