merge: sync with origin/main, take upstream on conflicts

# Conflicts:
#	admin-compliance/lib/sdk/types.ts
#	admin-compliance/lib/sdk/vendor-compliance/types.ts

backend-compliance/tests/test_vvt_tenant_isolation.py

@@ -144,8 +144,22 @@ def _make_activity(tenant_id, vvt_id="VVT-001", name="Test", **kwargs):
     act.next_review_at = None
     act.created_by = "system"
     act.dsfa_id = None
-    act.created_at = datetime.now(timezone.utc)
-    act.updated_at = datetime.now(timezone.utc)
+    # Library refs (added in later migrations)
+    act.purpose_refs = None
+    act.legal_basis_refs = None
+    act.data_subject_refs = None
+    act.data_category_refs = None
+    act.recipient_refs = None
+    act.retention_rule_ref = None
+    act.transfer_mechanism_refs = None
+    act.tom_refs = None
+    act.source_template_id = None
+    act.risk_score = None
+    act.linked_loeschfristen_ids = None
+    act.linked_tom_measure_ids = None
+    act.art30_completeness = None
+    act.created_at = datetime.utcnow()
+    act.updated_at = datetime.utcnow()
     return act