fix for MID-4744 GUI User Preview - Old Administrative Status in proj…

…ection always (unknown)

infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java

@@ -1178,10 +1178,29 @@ public void merge(ItemDelta<V,D> deltaToMerge) {
 				mergeValuesToDelete(PrismValue.cloneValues(deltaToMerge.valuesToDelete));
 			}
 		}
+
+		if (CollectionUtils.isNotEmpty(deltaToMerge.estimatedOldValues)) {
+			mergeOldValues(PrismValue.cloneValues(deltaToMerge.estimatedOldValues));
+		}
+
 		// We do not want to clean up the sets during merging (e.g. in removeValue methods) because the set
 		// may become empty and the a values may be added later. So just clean it up when all is done.
 		removeEmptySets();
 	}
+
+	private void mergeOldValues(Collection<V> oldValues) {
+		if (estimatedOldValues == null) {
+			estimatedOldValues = newValueCollection();
+		}
+
+		for (V oldValue : oldValues) {
+			if (containsEquivalentValue(estimatedOldValues, oldValue)) {
+				continue;
+			}
+
+			estimatedOldValues.add(oldValue);
+		}
+	}
 
 	private void removeEmptySets() {
 		// Do not remove replace set, even if it is empty.

model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.java

@@ -765,6 +765,7 @@ private <T, F extends FocusType> void reconcileOutboundValue(LensContext<F> cont
 				}
 			}
 
+			LensUtil.setDeltaOldValue(projCtx, targetItemDelta);
 			if (!targetItemDelta.isEmpty()) {
 				LOGGER.trace("Reconciliation delta:\n{}", targetItemDelta.debugDumpLazily(1));
 				projCtx.swallowToSecondaryDelta(targetItemDelta);