From 1869cffe4af7622617e05efc427eb6084c71c3c4 Mon Sep 17 00:00:00 2001 From: Katarina Valalikova Date: Wed, 1 Apr 2020 22:53:24 +0200 Subject: [PATCH] create task improvements. --- .../impl/factory/TaskHandlerWrapperFactory.java | 2 +- .../web/page/admin/server/TaskBasicTabPanel.java | 15 ++++++++++----- .../admin/server/TaskHandlerSelectorPanel.java | 2 +- .../schema/constants/SchemaConstants.java | 1 + 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/TaskHandlerWrapperFactory.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/TaskHandlerWrapperFactory.java index 615559c890a..7f9bf297df6 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/TaskHandlerWrapperFactory.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/TaskHandlerWrapperFactory.java @@ -112,7 +112,7 @@ protected PrismPropertyWrapper createWrapper(PrismContainerValueWrapper< private String normalizeHandler(String handler) { handler = StringUtils.remove(handler, "-3"); - handler = StringUtils.removeStart(handler, "http://").replace("-", "/").replace("#", "/"); + handler = StringUtils.removeStart(handler, "http://midpoint.evolveum.com/xml/ns/public/").replace("-", "/").replace("#", "/"); String[] split = handler.split("/"); handler = "TaskHandlerSelector." + StringUtils.join(split, "."); return handler; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskBasicTabPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskBasicTabPanel.java index 18434e765bb..0dff1748ffb 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskBasicTabPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskBasicTabPanel.java @@ -198,7 +198,14 @@ private ItemVisibility getBasicTabVisibility(ItemPath path) { SchemaConstants.PATH_MODEL_EXTENSION_EXECUTE_OPTIONS, ItemPath.create(TaskType.F_EXTENSION, SchemaConstants.MODEL_EXTENSION_WORKER_THREADS)); } else if (taskHandler.endsWith("task/jdbc-ping/handler-3")) { - //TODO + pathsToShow = Arrays.asList(ItemPath.create(TaskType.F_EXTENSION, SchemaConstants.JDBC_PING_TESTS_QNAME), + ItemPath.create(TaskType.F_EXTENSION, SchemaConstants.JDBC_PING_INTERVAL_QNAME), + ItemPath.create(TaskType.F_EXTENSION, SchemaConstants.JDBC_PING_TEST_QUERY_QNAME), + ItemPath.create(TaskType.F_EXTENSION, SchemaConstants.JDBC_PING_DRIVER_CLASS_NAME_QNAME), + ItemPath.create(TaskType.F_EXTENSION, SchemaConstants.JDBC_PING_JDBC_URL_QNAME), + ItemPath.create(TaskType.F_EXTENSION, SchemaConstants.JDBC_PING_JDBC_USERNAME_QNAME), + ItemPath.create(TaskType.F_EXTENSION, SchemaConstants.JDBC_PING_JDBC_PASSWORD_QNAME), + ItemPath.create(TaskType.F_EXTENSION, SchemaConstants.JDBC_PING_LOG_ON_INFO_LEVEL_QNAME)); } else if (taskHandler.endsWith("model/auditReindex/handler-3")) { //no extension attributes } else if (taskHandler.endsWith("task/lightweight-partitioning/handler-3") @@ -211,8 +218,7 @@ private ItemVisibility getBasicTabVisibility(ItemPath path) { } else if (taskHandler.endsWith("task/workers-restart/handler-3")) { //no attributes } else if (taskHandler.endsWith("model/synchronization/task/delete-not-updated-shadow/handler-3")) { - pathsToShow = Arrays.asList(ItemPath.create(TaskType.F_EXTENSION, SchemaConstants.MODEL_EXTENSION_WORKER_THREADS), - //TODO notUpdatesShadowsDurtion + pathsToShow = Arrays.asList(ItemPath.create(TaskType.F_EXTENSION, SchemaConstants.MODEL_EXTENSION_NOT_UPDATED_SHADOW_DURATION), ItemPath.create(TaskType.F_EXTENSION, SchemaConstants.MODEL_EXTENSION_WORKER_THREADS), TaskType.F_OBJECT_REF); } else if (taskHandler.endsWith("model/shadowRefresh/handler-3")) { @@ -238,10 +244,9 @@ private ItemVisibility getBasicTabVisibility(ItemPath path) { } else if (taskHandler.endsWith("model/trigger/scanner/handler-3")) { pathsToShow = Arrays.asList(ItemPath.create(TaskType.F_EXTENSION, SchemaConstants.MODEL_EXTENSION_LAST_SCAN_TIMESTAMP_PROPERTY_NAME), ItemPath.create(TaskType.F_EXTENSION, SchemaConstants.MODEL_EXTENSION_WORKER_THREADS)); - } else if (taskHandler.endsWith("model/focus-validity-scanner/handler-3model/partitioned-focus-validity-scanner/handler-3#1") + } else if (taskHandler.endsWith("model/focus-validity-scanner/handler-3") || taskHandler.endsWith("model/partitioned-focus-validity-scanner/handler-3#1") || taskHandler.endsWith("model/partitioned-focus-validity-scanner/handler-3#2")) { pathsToShow = Arrays.asList(ItemPath.create(TaskType.F_EXTENSION, SchemaConstants.MODEL_EXTENSION_LAST_SCAN_TIMESTAMP_PROPERTY_NAME), - // TODO policyRule ItemPath.create(TaskType.F_EXTENSION, SchemaConstants.PO), SchemaConstants.PATH_MODEL_EXTENSION_OBJECT_TYPE, ItemPath.create(TaskType.F_EXTENSION, SchemaConstants.MODEL_EXTENSION_WORKER_THREADS)); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskHandlerSelectorPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskHandlerSelectorPanel.java index 8d08809a7fd..5c24326e511 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskHandlerSelectorPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskHandlerSelectorPanel.java @@ -30,7 +30,7 @@ public class TaskHandlerSelectorPanel extends PrismPropertyPanel { public TaskHandlerSelectorPanel(String id, IModel> model, ItemPanelSettings settings) { super(id, model, settings); - Label label = new Label(ID_TASK_SPECIFICATION, createStringResource("TaskHandlerSelectorPanel.seletor.header")); + Label label = new Label(ID_TASK_SPECIFICATION, createStringResource("TaskHandlerSelectorPanel.selector.header")); add(label); label.setOutputMarkupId(true); } diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java index bf6e021c887..5f32b88a2d9 100644 --- a/infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java +++ b/infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java @@ -292,6 +292,7 @@ public abstract class SchemaConstants { public static final ItemName MODEL_EXTENSION_TRACING_PROFILE = new ItemName(NS_MODEL_EXTENSION, "tracingProfile"); public static final ItemName MODEL_EXTENSION_TRACING_ROOT = new ItemName(NS_MODEL_EXTENSION, "tracingRoot"); public static final ItemName MODEL_EXTENSION_TRACING = new ItemName(NS_MODEL_EXTENSION, "tracing"); + public static final ItemName MODEL_EXTENSION_NOT_UPDATED_SHADOW_DURATION = new ItemName(NS_MODEL_EXTENSION, "notUpdatedShadowsDuration"); public static final String NS_MODEL_DISABLE_REASON = NS_MODEL + "/disableReason"; public static final String MODEL_DISABLE_REASON_EXPLICIT =