Merge branch 'CA-1456-make-domain-changeable' of https://github.com/intuitem/ciso-assistant-community into CA-1456-make-domain-changeable

Author: tchoumi313

backend/metrology/serializers.py

@@ -62,8 +62,8 @@ class MetricInstanceReadSerializer(BaseModelSerializer):
         ]
     )
     owner = IdRelatedField(many=True)
-    filtering_labels = IdRelatedField(["folder"], many=True)
     organisation_objectives = IdRelatedField(many=True)
+    filtering_labels = IdRelatedField(["folder"], many=True)
     status = serializers.CharField(source="get_status_display", read_only=True)
     collection_frequency = serializers.CharField(
         source="get_collection_frequency_display", read_only=True

backend/resilience/serializers.py

@@ -45,7 +45,7 @@ class AssetAssessmentReadSerializer(BaseModelSerializer):
     asset_folder = IdRelatedField(source="asset.folder")
     children_assets = IdRelatedField(source="asset.children_assets", many=True)
     folder = IdRelatedField()
-    
+
     asset_ref_id = serializers.CharField(
         source="asset.ref_id", read_only=True, allow_null=True
     )

frontend/src/lib/utils/crud.ts

@@ -1064,6 +1064,7 @@ export const URL_MODEL_MAP: ModelMap = {
 			{ field: 'assigned_to', urlModel: 'users', urlParams: 'is_third_party=false' },
 			{ field: 'associated_controls', urlModel: 'applied-controls' },
 			{ field: 'evidences', urlModel: 'evidences' },
+			// { field: 'nature', urlModel: 'processing-natures' },
 			{ field: 'filtering_labels', urlModel: 'filtering-labels' }
 		],
 		reverseForeignKeyFields: [

frontend/src/routes/(app)/(third-party)/compliance-assessments/[id=uuid]/+page.svelte

@@ -58,6 +58,7 @@
 		!compliance_assessment.folder
 		? undefined
 		:typeof compliance_assessment.folder === 'string'
+
 			? compliance_assessment.folder
 			: compliance_assessment.folder?.id;
 	const framework = data.framework ?? compliance_assessment.framework;