Merge pull request #816 from intuitem/fix/risk_scenario_tag_translation

Fix risk scenario tag translation
intuitem · Sep 12, 2024 · a816212 · a816212
2 parents 4cd2173 + fb6a4b0
commit a816212
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/backend/app_tests/api/test_api_risk_scenarios.py b/backend/app_tests/api/test_api_risk_scenarios.py
@@ -110,8 +110,8 @@
     "description": "acceptable risk",
     "hexcolor": "#00FF00",
 }
-RISK_SCENARIO_TREATMENT_STATUS = ("accept", "Accept")
-RISK_SCENARIO_TREATMENT_STATUS2 = ("mitigate", "Mitigate")
+RISK_SCENARIO_TREATMENT_STATUS = ("accept", "accept")
+RISK_SCENARIO_TREATMENT_STATUS2 = ("mitigate", "mitigate")
 RISK_SCENARIO_JUSTIFICATION = "Test justification"
 
 

diff --git a/backend/core/serializers.py b/backend/core/serializers.py
@@ -275,7 +275,7 @@ class RiskScenarioReadSerializer(RiskScenarioWriteSerializer):
     threats = FieldsRelatedField(many=True)
     assets = FieldsRelatedField(many=True)
 
-    treatment = serializers.CharField(source="get_treatment_display")
+    treatment = serializers.CharField()
 
     current_proba = serializers.JSONField(source="get_current_proba")
     current_impact = serializers.JSONField(source="get_current_impact")

diff --git a/frontend/src/lib/utils/crud.ts b/frontend/src/lib/utils/crud.ts
@@ -510,11 +510,11 @@ export const FIELD_COLORED_TAG_MAP: FieldColoredTagMap = {
 		name: {
 			key: 'treatment',
 			values: {
-				Open: { text: 'open', cssClasses: 'badge bg-green-300' },
-				Mitigate: { text: 'mitigate', cssClasses: 'badge bg-lime-200' },
-				Accept: { text: 'accept', cssClasses: 'badge bg-green-200' },
-				Avoid: { text: 'avoid', cssClasses: 'badge bg-red-200' },
-				Transfer: { text: 'transfer', cssClasses: 'badge bg-yellow-300' }
+				open: { text: 'open', cssClasses: 'badge bg-green-300' },
+				mitigate: { text: 'mitigate', cssClasses: 'badge bg-lime-200' },
+				accept: { text: 'accept', cssClasses: 'badge bg-green-200' },
+				avoid: { text: 'avoid', cssClasses: 'badge bg-red-200' },
+				transfer: { text: 'transfer', cssClasses: 'badge bg-yellow-300' }
 			}
 		}
 	},

diff --git a/frontend/src/routes/(app)/risk-assessments/[id=uuid]/remediation-plan/+page.svelte b/frontend/src/routes/(app)/risk-assessments/[id=uuid]/remediation-plan/+page.svelte
@@ -17,7 +17,7 @@
 			avoid: 'bg-red-200',
 			transfer: 'bg-violet-200'
 		};
-		return map[status.toLowerCase()] ?? 'bg-gray-200';
+		return map[status] ?? 'bg-gray-200';
 	};
 
 	const measureStatusColorMap = (treatment: string) => {
@@ -68,7 +68,7 @@
 							href="/risk-scenarios/{scenario.id}">{scenario.name}</a
 						>
 						<span class="badge {scenarioTreatmentColorMap(scenario.treatment)}"
-							>{scenario.treatment}</span
+							>{safeTranslate(scenario.treatment)}</span
 						>
 					</td>
 				</tr>