feat: extra settings to enable mail notifications and matrix aggregation (#1434)

Author: ab-smith

backend/global_settings/serializers.py

@@ -8,6 +8,8 @@
     "ebios_radar_green_zone_radius",
     "ebios_radar_yellow_zone_radius",
     "ebios_radar_red_zone_radius",
+    "interface_agg_scenario_matrix",
+    "notifications_enable_mailing",
 ]
 
 

backend/global_settings/views.py

@@ -65,6 +65,8 @@ def object(self, request, pk=None):
             "ebios_radar_green_zone_radius": 0.2,
             "ebios_radar_yellow_zone_radius": 0.9,
             "ebios_radar_red_zone_radius": 2.5,
+            "notifications_enable_mailing": False,
+            "interface_agg_scenario_matrix": False,
         }
 
         settings, created = GlobalSettings.objects.get_or_create(name="general")
@@ -102,6 +104,24 @@ def ebios_radar_parameters(self, request):
         }
         return Response(ebios_rm_parameters)
 
+    @action(detail=True, name="Get notifications settings")
+    def notifications_settings(self, request):
+        notifications_settings = {
+            "notifications_enable_mailing": self.get_object().value.get(
+                "notifications_enable_mailing"
+            ),
+        }
+        return Response(notifications_settings)
+
+    @action(detail=True, name="Get interface settings")
+    def interface_settings(self, request):
+        interface_settings = {
+            "interface_agg_scenario_matrix": self.get_object().value.get(
+                "interface_agg_scenario_matrix"
+            ),
+        }
+        return Response(interface_settings)
+
 
 @api_view(["GET"])
 @permission_classes([permissions.AllowAny])

frontend/messages/en.json

@@ -606,6 +606,10 @@
 	"secret": "Secret",
 	"key": "Key",
 	"settings": "Settings",
+	"settingsInterface": "Interface",
+	"settingsAggregateMatrix": "Aggregate scenarios on risk matrices",
+	"settingsNotifications": "Notifications settings",
+	"settingsNotificationsMail": "Enable email notifications",
 	"identityProvider": "Identity provider",
 	"identityProviders": "Identity providers",
 	"clientIDHelpText": "App ID, or consumer key",

frontend/messages/fr.json

@@ -606,6 +606,10 @@
 	"secret": "Secret",
 	"key": "Clé",
 	"settings": "Paramètres",
+	"settingsInterface": "Interface",
+	"settingsAggregateMatrix": "Agréger les scénarios sur les matrices",
+	"settingsNotifications": "Paramètres de notifications",
+	"settingsNotificationsMail": "Activer les emails",
 	"identityProvider": "Fournisseur d'identité",
 	"identityProviders": "Fournisseurs d'identité",
 	"clientIDHelpText": "ID d'application ou clé consommateur",

frontend/src/lib/components/Forms/ModelForm/GeneralSettingForm.svelte

@@ -5,7 +5,7 @@
 	import type { CacheLock, ModelInfo } from '$lib/utils/types';
 	import type { SuperForm } from 'sveltekit-superforms';
 	import { Accordion, AccordionItem } from '@skeletonlabs/skeleton';
-
+	import Checkbox from '$lib/components/Forms/Checkbox.svelte';
 	export let form: SuperForm<any>;
 	export let model: ModelInfo;
 	export let cacheLocks: Record<string, CacheLock> = {};
@@ -14,7 +14,36 @@
 
 <Accordion regionControl="font-bold">
 	<AccordionItem open>
-		<svelte:fragment slot="summary"><i class="fa-solid fa-gem mr-2"></i>{m.asset()}</svelte:fragment
+		<svelte:fragment slot="summary"
+			><i class="fa-solid fa-bell mr-2"></i>{m.settingsNotifications()}</svelte:fragment
+		>
+		<svelte:fragment slot="content">
+			<div class="p-4">
+				<Checkbox
+					{form}
+					field="notifications_enable_mailing"
+					label={m.settingsNotificationsMail()}
+				/>
+			</div>
+		</svelte:fragment>
+	</AccordionItem>
+	<AccordionItem open>
+		<svelte:fragment slot="summary">
+			<i class="fa-solid fa-asterisk mr-2" />{m.settingsInterface()}
+		</svelte:fragment>
+		<svelte:fragment slot="content">
+			<div class="p-4">
+				<Checkbox
+					{form}
+					field="interface_agg_scenario_matrix"
+					label={m.settingsAggregateMatrix()}
+				/>
+			</div>
+		</svelte:fragment>
+	</AccordionItem>
+	<AccordionItem>
+		<svelte:fragment slot="summary"
+			><i class="fa-solid fa-gem mr-2"></i>{m.assets()}</svelte:fragment
 		>
 		<svelte:fragment slot="content">
 			<Select
@@ -28,7 +57,7 @@
 			/>
 		</svelte:fragment>
 	</AccordionItem>
-	<AccordionItem open>
+	<AccordionItem>
 		<svelte:fragment slot="summary"
 			><i class="fa-solid fa-gopuram mr-2"></i>{m.ebiosRadarParameters()}</svelte:fragment
 		>

frontend/src/lib/utils/schemas.ts

@@ -297,7 +297,9 @@ export const GeneralSettingsSchema = z.object({
 	ebios_radar_max: z.number(),
 	ebios_radar_green_zone_radius: z.number(),
 	ebios_radar_yellow_zone_radius: z.number(),
-	ebios_radar_red_zone_radius: z.number()
+	ebios_radar_red_zone_radius: z.number(),
+	notifications_enable_mailing: z.boolean().optional(),
+	interface_agg_scenario_matrix: z.boolean().optional()
 });
 
 export const SSOSettingsSchema = z.object({

frontend/src/routes/(app)/(internal)/risk-assessments/[id=uuid]/+layout.server.ts

@@ -20,6 +20,10 @@ export const load: LayoutServerLoad = async ({ fetch, params }) => {
 		`${BASE_API_URL}/risk-matrices/${risk_assessment.risk_matrix.id}/`
 	).then((res) => res.json());
 
+	const interface_settings = await fetch(`${BASE_API_URL}/settings/general/object`).then((res) =>
+		res.json()
+	);
+
 	const headFields = [
 		'ref_id',
 		'name',
@@ -146,6 +150,7 @@ export const load: LayoutServerLoad = async ({ fetch, params }) => {
 		scenarioCreateForm,
 		riskAssessmentDuplicateForm,
 		riskAssessmentModel,
-		title: risk_assessment.str
+		title: risk_assessment.str,
+		useBubbles: interface_settings.interface_agg_scenario_matrix
 	};
 };

frontend/src/routes/(app)/(internal)/risk-assessments/[id=uuid]/+page.svelte

@@ -21,7 +21,7 @@
 
 	export let data;
 	const showRisks = true;
-	const useBubbles = true;
+	const useBubbles = data.useBubbles;
 	const risk_assessment = data.risk_assessment;
 
 	const modalStore: ModalStore = getModalStore();