MID-8970:fix for saving empty activation container for resource objec…

…t type
Evolveum · Aug 22, 2023 · aeb697c · aeb697c
1 parent 0d084cb
commit aeb697c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebPrismUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebPrismUtil.java
@@ -246,9 +246,7 @@ private static <C extends Containerable> boolean isUseAsEmptyValue(Item item) {
     }
 
     private static <C extends Containerable> boolean isUseAsEmptyValue(Class<?> typeClass) {
-        return typeClass != null &&
-                (AbstractSynchronizationActionType.class.isAssignableFrom(typeClass)
-                        || AbstractPredefinedActivationMappingType.class.isAssignableFrom(typeClass));
+        return typeClass != null && AbstractSynchronizationActionType.class.isAssignableFrom(typeClass);
     }
 
     public static <C extends Containerable> PrismContainerValue<C> cleanupEmptyContainerValue(PrismContainerValue<C> value) {

diff --git a/...age/admin/resource/component/wizard/objectType/activation/ActivationMappingTileTable.java b/...age/admin/resource/component/wizard/objectType/activation/ActivationMappingTileTable.java
@@ -16,6 +16,8 @@
 import com.evolveum.midpoint.prism.Containerable;
 import com.evolveum.midpoint.prism.path.ItemName;
 import com.evolveum.midpoint.prism.path.ItemPath;
+import com.evolveum.midpoint.schema.constants.SchemaConstants;
+import com.evolveum.midpoint.util.exception.SchemaException;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.web.model.ContainerValueWrapperFromObjectWrapperModel;
@@ -27,6 +29,8 @@
 
 public abstract class ActivationMappingTileTable extends AbstractSpecificMappingTileTable<ResourceActivationDefinitionType> {
 
+    private static final Trace LOGGER = TraceManager.getTrace(ActivationMappingTileTable.class);
+
     public ActivationMappingTileTable(
             String id,
             IModel<PrismContainerWrapper<ResourceActivationDefinitionType>> containerModel,
@@ -58,6 +62,11 @@ protected <T extends PrismContainerValueWrapper<? extends Containerable>> void s
                 if (valueModel.getObject().getItems().size() == 1) {
                     @NotNull ItemName itemName = valueModel.getObject().getItems().iterator().next().getItemName();
                     if (itemName.equivalent(MappingType.F_LIFECYCLE_STATE)) {
+                        try {
+                            valueModel.getObject().findProperty(itemName).getValue().setRealValue(SchemaConstants.LIFECYCLE_ACTIVE);
+                        } catch (SchemaException e) {
+                            LOGGER.error("Couldn't find property for " + itemName);
+                        }
                         refresh(target);
                         return;
                     }