{#if closeModal}
diff --git a/frontend/src/lib/components/Forms/ModelForm/RoToForm.svelte b/frontend/src/lib/components/Forms/ModelForm/RoToForm.svelte
new file mode 100644
index 000000000..683e6accd
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/RoToForm.svelte
@@ -0,0 +1,93 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/frontend/src/lib/utils/crud.ts b/frontend/src/lib/utils/crud.ts
index 49f30e7ab..b0e762ebe 100644
--- a/frontend/src/lib/utils/crud.ts
+++ b/frontend/src/lib/utils/crud.ts
@@ -623,6 +623,24 @@ export const URL_MODEL_MAP: ModelMap = {
{ field: 'qualifications', urlModel: 'qualifications' }
],
selectFields: [{ field: 'gravity', valueType: 'number', detail: true }]
+ },
+ 'ro-to': {
+ endpointUrl: 'ebios-rm/ro-to',
+ name: 'roto',
+ localName: 'roto',
+ localNamePlural: 'roto',
+ verboseName: 'Ro to',
+ verboseNamePlural: 'Ro to',
+ foreignKeyFields: [
+ { field: 'ebios_rm_study', urlModel: 'ebios-rm' },
+ { field: 'feared_events', urlModel: 'feared-events' }
+ ],
+ selectFields: [
+ { field: 'risk-origin' },
+ { field: 'motivation', valueType: 'number' },
+ { field: 'resources', valueType: 'number' },
+ { field: 'pertinence', valueType: 'number' }
+ ]
}
};
diff --git a/frontend/src/lib/utils/schemas.ts b/frontend/src/lib/utils/schemas.ts
index 413d7c45c..ed65b698d 100644
--- a/frontend/src/lib/utils/schemas.ts
+++ b/frontend/src/lib/utils/schemas.ts
@@ -413,6 +413,19 @@ export const fearedEventsSchema = z.object({
qualifications: z.string().optional().array().optional()
});
+export const roToSchema = z.object({
+ ebios_rm_study: z.string(),
+ feared_events: z.string().uuid().array(),
+ risk_origin: z.string(),
+ target_objective: z.string(),
+ motivation: z.number().default(0).optional(),
+ resources: z.number().default(0).optional(),
+ pertinence: z.number().default(0).optional(),
+ activity: z.number().min(0).max(4).optional().default(0),
+ is_selected: z.boolean().optional().default(false),
+ justification: z.string().optional()
+});
+
const SCHEMA_MAP: Record
= {
folders: FolderSchema,
projects: ProjectSchema,
@@ -439,7 +452,8 @@ const SCHEMA_MAP: Record = {
vulnerabilities: vulnerabilitySchema,
'filtering-labels': FilteringLabelSchema,
'ebios-rm': ebiosRMSchema,
- 'feared-events': fearedEventsSchema
+ 'feared-events': fearedEventsSchema,
+ 'ro-to': roToSchema
};
export const modelSchema = (model: string) => {
diff --git a/frontend/src/lib/utils/table.ts b/frontend/src/lib/utils/table.ts
index a02b1c270..07e8f9bc3 100644
--- a/frontend/src/lib/utils/table.ts
+++ b/frontend/src/lib/utils/table.ts
@@ -555,5 +555,23 @@ export const listViewFields: ListViewFieldsConfig = {
'feared-events': {
head: ['selected', 'assets', 'fearedEvent', 'qualifications', 'gravity'],
body: ['is_selected', 'assets', 'description', 'qualifications', 'gravity']
+ },
+ 'ro-to': {
+ head: [
+ 'isSelected',
+ 'riskOrigin',
+ 'targetObjective',
+ 'motivation',
+ 'fearedEvents',
+ 'pertinence'
+ ],
+ body: [
+ 'is_selected',
+ 'risk_origin',
+ 'target_objective',
+ 'motivation',
+ 'feared_events',
+ 'pertinence'
+ ]
}
};
diff --git a/frontend/src/lib/utils/types.ts b/frontend/src/lib/utils/types.ts
index 14c7c0356..0e1dde450 100644
--- a/frontend/src/lib/utils/types.ts
+++ b/frontend/src/lib/utils/types.ts
@@ -52,7 +52,8 @@ export const URL_MODEL = [
'representatives',
'vulnerabilities',
'filtering-labels',
- 'feared-events'
+ 'feared-events',
+ 'ro-to'
// 'ebios-rm',
] as const;
diff --git a/frontend/src/routes/(app)/(internal)/[model=urlmodel]/+page.server.ts b/frontend/src/routes/(app)/(internal)/[model=urlmodel]/+page.server.ts
index fe10f5bf2..2b5f03185 100644
--- a/frontend/src/routes/(app)/(internal)/[model=urlmodel]/+page.server.ts
+++ b/frontend/src/routes/(app)/(internal)/[model=urlmodel]/+page.server.ts
@@ -27,7 +27,10 @@ export const load: PageServerLoad = async ({ params, fetch }) => {
for (const keyField of foreignKeyFields) {
const queryParams = keyField.urlParams ? `?${keyField.urlParams}` : '';
- const url = `${BASE_API_URL}/${keyField.urlModel}/${queryParams}`;
+ const keyModel = getModelInfo(keyField.urlModel);
+ const url = keyModel.endpointUrl
+ ? `${BASE_API_URL}/${keyModel.endpointUrl}/${queryParams}`
+ : `${BASE_API_URL}/${keyField.urlModel}/${queryParams}`;
const response = await fetch(url);
if (response.ok) {
foreignKeys[keyField.field] = await response.json().then((data) => data.results);
@@ -42,7 +45,9 @@ export const load: PageServerLoad = async ({ params, fetch }) => {
for (const selectField of selectFields) {
if (selectField.detail) continue;
- const url = `${BASE_API_URL}/${params.model}/${selectField.field}/`;
+ const url = model.endpointUrl
+ ? `${BASE_API_URL}/${model.endpointUrl}/${selectField.field}/`
+ : `${BASE_API_URL}/${params.model}/${selectField.field}/`;
const response = await fetch(url);
if (response.ok) {
selectOptions[selectField.field] = await response.json().then((data) =>
diff --git a/frontend/src/routes/(app)/(internal)/[model=urlmodel]/[id=uuid]/+page.server.ts b/frontend/src/routes/(app)/(internal)/[model=urlmodel]/[id=uuid]/+page.server.ts
index 699a98520..a1d709195 100644
--- a/frontend/src/routes/(app)/(internal)/[model=urlmodel]/[id=uuid]/+page.server.ts
+++ b/frontend/src/routes/(app)/(internal)/[model=urlmodel]/[id=uuid]/+page.server.ts
@@ -26,8 +26,11 @@ export const load: PageServerLoad = async (event) => {
if (modelInfo.foreignKeyFields) {
await Promise.all(
modelInfo.foreignKeyFields.map(async (keyField) => {
+ const keyModel = getModelInfo(keyField.urlModel);
const queryParams = keyField.urlParams ? `?${keyField.urlParams}` : '';
- const url = `${BASE_API_URL}/${keyField.urlModel}/${queryParams}`;
+ const url = keyModel.endpointUrl
+ ? `${BASE_API_URL}/${keyModel.endpointUrl}/${queryParams}`
+ : `${BASE_API_URL}/${keyField.urlModel}/${queryParams}`;
const response = await event.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]/+page.svelte b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
index 21df4f60f..4929466a5 100644
--- a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
@@ -34,9 +34,21 @@
}
],
ws2: [
- { title: safeTranslate(m.ebiosWs2_1()), status: 'to_do', href: '#' },
- { title: safeTranslate(m.ebiosWs2_2()), status: 'to_do', href: '#' },
- { title: safeTranslate(m.ebiosWs2_3()), status: 'to_do', href: '#' }
+ {
+ title: safeTranslate(m.ebiosWs2_1()),
+ status: 'to_do',
+ href: `${$page.url.pathname}/workshop-two/ro-to?next=${$page.url.pathname}`
+ },
+ {
+ title: safeTranslate(m.ebiosWs2_2()),
+ status: 'to_do',
+ href: `${$page.url.pathname}/workshop-two/ro-to?next=${$page.url.pathname}`
+ },
+ {
+ title: safeTranslate(m.ebiosWs2_3()),
+ status: 'to_do',
+ href: `${$page.url.pathname}/workshop-two/ro-to?next=${$page.url.pathname}`
+ }
],
ws3: [
{ title: safeTranslate(m.ebiosWs3_1()), status: 'to_do', href: '#' },
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
new file mode 100644
index 000000000..fdad14f79
--- /dev/null
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-two/ro-to/+page.server.ts
@@ -0,0 +1,103 @@
+import { defaultDeleteFormAction, defaultWriteFormAction } from '$lib/utils/actions';
+import { BASE_API_URL } from '$lib/utils/constants';
+import {
+ getModelInfo,
+ urlParamModelForeignKeyFields,
+ urlParamModelSelectFields
+} from '$lib/utils/crud';
+import { modelSchema } from '$lib/utils/schemas';
+import type { ModelInfo, urlModel } from '$lib/utils/types';
+import { type Actions } from '@sveltejs/kit';
+import { superValidate } from 'sveltekit-superforms';
+import { zod } from 'sveltekit-superforms/adapters';
+import { z } from 'zod';
+import type { PageServerLoad } from './$types';
+import { listViewFields } from '$lib/utils/table';
+import { tableSourceMapper, type TableSource } from '@skeletonlabs/skeleton';
+
+export const load: PageServerLoad = async ({ params, fetch }) => {
+ const schema = z.object({ id: z.string().uuid() });
+ const deleteForm = await superValidate(zod(schema));
+ const URLModel = 'ro-to';
+ const createSchema = modelSchema(URLModel);
+ const initialData = {
+ ebios_rm_study: params.id
+ };
+ const createForm = await superValidate(initialData, zod(createSchema), { errors: false });
+ const model: ModelInfo = getModelInfo(URLModel);
+ const foreignKeyFields = urlParamModelForeignKeyFields(URLModel);
+ const selectFields = urlParamModelSelectFields(URLModel);
+
+ const foreignKeys: Record = {};
+
+ for (const keyField of foreignKeyFields) {
+ const keyModel = getModelInfo(keyField.urlModel);
+ const queryParams = keyField.urlParams ? `?${keyField.urlParams}` : '';
+ const url = `${BASE_API_URL}/${keyModel.endpointUrl ?? keyModel.urlModel}/${queryParams}`;
+ const response = await fetch(url);
+ if (response.ok) {
+ foreignKeys[keyField.field] = await response.json().then((data) => data.results);
+ } else {
+ console.error(`Failed to fetch data for ${keyField.field}: ${response.statusText}`);
+ }
+ }
+
+ model['foreignKeys'] = foreignKeys;
+
+ const selectOptions: Record = {};
+
+ for (const selectField of selectFields) {
+ if (selectField.detail) continue;
+ const url = `${BASE_API_URL}/${model.endpointUrl ?? model.urlModel}/${selectField.field}/`;
+ const response = await fetch(url);
+ if (response.ok) {
+ selectOptions[selectField.field] = await response.json().then((data) =>
+ Object.entries(data).map(([key, value]) => ({
+ label: value,
+ value: selectField.valueType === 'number' ? parseInt(key) : key
+ }))
+ );
+ } else {
+ console.error(`Failed to fetch data for ${selectField.field}: ${response.statusText}`);
+ }
+ }
+
+ model['selectOptions'] = selectOptions;
+
+ const endpoint = `${BASE_API_URL}/${model.endpointUrl}?ebios_rm_study=${params.id}`;
+ const res = await fetch(endpoint);
+ const data = await res.json().then((res) => res.results);
+
+ const bodyData = tableSourceMapper(data, listViewFields[URLModel as urlModel].body);
+
+ const headData: Record = listViewFields[URLModel as urlModel].body.reduce(
+ (obj, key, index) => {
+ obj[key] = listViewFields[URLModel as urlModel].head[index];
+ return obj;
+ },
+ {}
+ );
+
+ const table: TableSource = {
+ head: headData,
+ body: bodyData,
+ meta: data // metaData
+ };
+
+ return { createForm, deleteForm, model, URLModel, table };
+};
+
+export const actions: Actions = {
+ create: async (event) => {
+ // const redirectToWrittenObject = Boolean(event.params.model === 'entity-assessments');
+ return defaultWriteFormAction({
+ event,
+ urlModel: 'ro-to',
+ action: 'create'
+ // redirectToWrittenObject: redirectToWrittenObject
+ });
+ },
+ delete: async (event) => {
+ return defaultDeleteFormAction({ event, urlModel: 'ro-to' });
+ }
+};
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-two/ro-to/+page.svelte b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-two/ro-to/+page.svelte
new file mode 100644
index 000000000..08ebedae8
--- /dev/null
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-two/ro-to/+page.svelte
@@ -0,0 +1,67 @@
+
+
+
+
+
+
+
+
+