feat: filter feared-events in ro/to

intuitem · Dec 13, 2024 · 9f08593 · 9f08593
1 parent dc05c89
commit 9f08593
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/frontend/src/lib/utils/crud.ts b/frontend/src/lib/utils/crud.ts
@@ -105,6 +105,7 @@ interface ForeignKeyField {
 	urlModel: urlModel;
 	endpointUrl?: string;
 	urlParams?: string;
+	detail?: boolean;
 }
 
 interface Field {
@@ -624,7 +625,7 @@ export const URL_MODEL_MAP: ModelMap = {
 		verboseNamePlural: 'Feared events',
 		foreignKeyFields: [
 			{ field: 'ebios_rm_study', urlModel: 'ebios-rm', endpointUrl: 'ebios-rm/studies' },
-			{ field: 'assets', urlModel: 'assets', urlParams: 'ebios_rm_studies=' },
+			{ field: 'assets', urlModel: 'assets', urlParams: 'ebios_rm_studies=', detail: true },
 			{ field: 'qualifications', urlModel: 'qualifications' }
 		],
 		selectFields: [{ field: 'gravity', valueType: 'number', detail: true }]
@@ -638,7 +639,7 @@ export const URL_MODEL_MAP: ModelMap = {
 		verboseNamePlural: 'Ro to',
 		foreignKeyFields: [
 			{ field: 'ebios_rm_study', urlModel: 'ebios-rm', endpointUrl: 'ebios-rm/studies' },
-			{ field: 'feared_events', urlModel: 'feared-events', endpointUrl: 'ebios-rm/feared-events' }
+			{ field: 'feared_events', urlModel: 'feared-events', endpointUrl: 'ebios-rm/feared-events', urlParams: 'ebios_rm_study=', detail: true }
 		],
 		selectFields: [
 			{ field: 'risk-origin' },

diff --git a/...src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/feared-events/+page.server.ts b/...src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/feared-events/+page.server.ts
@@ -49,13 +49,10 @@ export const load: PageServerLoad = async ({ params, fetch }) => {
 
 	for (const keyField of foreignKeyFields) {
 		const model = getModelInfo(keyField.urlModel);
-		const queryParams = keyField.urlParams ? `?${keyField.urlParams}` : '';
+		const queryParams = keyField.urlParams ? `?${keyField.urlParams}${keyField.detail ? params.id : ''}` : '';
 		let url = model.endpointUrl
 			? `${BASE_API_URL}/${model.endpointUrl}/${queryParams}`
 			: `${BASE_API_URL}/${model.urlModel}/${queryParams}`;
-		if (model.urlModel === 'assets') {
-			url = `${BASE_API_URL}/${model.urlModel}/${queryParams}${params.id}`;
-		}
 		const response = await fetch(url);
 		if (response.ok) {
 			foreignKeys[keyField.field] = await response.json().then((data) => data.results);

diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-two/ro-to/+page.server.ts b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-two/ro-to/+page.server.ts
@@ -32,7 +32,7 @@ export const load: PageServerLoad = async ({ params, fetch }) => {
 
 	for (const keyField of foreignKeyFields) {
 		const keyModel = getModelInfo(keyField.urlModel);
-		const queryParams = keyField.urlParams ? `?${keyField.urlParams}` : '';
+		const queryParams = keyField.urlParams ? `?${keyField.urlParams}${keyField.detail ? params.id : ''}` : '';
 		const url = `${BASE_API_URL}/${keyModel.endpointUrl ?? keyModel.urlModel}/${queryParams}`;
 		const response = await fetch(url);
 		if (response.ok) {

diff --git a/frontend/src/routes/(app)/(internal)/ro-to/[id=uuid]/edit/+page.server.ts b/frontend/src/routes/(app)/(internal)/ro-to/[id=uuid]/edit/+page.server.ts
@@ -22,7 +22,7 @@ export const load: PageServerLoad = async (event) => {
 
 	if (foreignKeyFields) {
 		for (const keyField of foreignKeyFields) {
-			const queryParams = keyField.urlParams ? `?${keyField.urlParams}` : '';
+			const queryParams = keyField.urlParams ? `?${keyField.urlParams}${keyField.detail ? object.ebios_rm_study : ''}` : '';
 			const url = `${BASE_API_URL}/${keyField.endpointUrl || keyField.urlModel}/${queryParams}`;
 			const response = await event.fetch(url);
 			if (response.ok) {