- dark modus for geoera search (keywords)

- enum ContributorTypes
- add contributor types for creating a dataset
- npm updates
- tailwind styling for _table.css
- adapting migration code for dataset_11_subject.ts

app/Controllers/Http/Submitter/DatasetController.ts

@@ -23,6 +23,7 @@ import {
     ReferenceIdentifierTypes,
     RelationTypes,
     DatasetTypes,
+    SubjectTypes,
 } from 'Contracts/enums';
 import type { ModelQueryBuilderContract } from '@ioc:Adonis/Lucid/Orm';
 import DatasetReference from 'App/Models/DatasetReference';
@@ -131,6 +132,8 @@ export default class DatasetController {
             projects: projects,
             referenceIdentifierTypes: Object.entries(ReferenceIdentifierTypes).map(([key, value]) => ({ value: key, label: value })),
             relationTypes: Object.entries(RelationTypes).map(([key, value]) => ({ value: key, label: value })),
+            contributorTypes: ContributorTypes,
+            subjectTypes: SubjectTypes
         });
     }
 
@@ -190,7 +193,12 @@ export default class DatasetController {
                 }),
             ),
             authors: schema.array([rules.minLength(1)]).members(schema.object().members({ email: schema.string({ trim: true }) })),
-
+            contributors: schema.array.optional().members(
+                schema.object().members({
+                    email: schema.string({ trim: true }),
+                    pivot_contributor_type: schema.enum(Object.keys(ContributorTypes)),
+                }),
+            ),
             // project_id: schema.number(),
         });
 
@@ -240,6 +248,12 @@ export default class DatasetController {
                 }),
             ),
             authors: schema.array([rules.minLength(1)]).members(schema.object().members({ email: schema.string({ trim: true }) })),
+            contributors: schema.array.optional().members(
+                schema.object().members({
+                    email: schema.string({ trim: true }),
+                    pivot_contributor_type: schema.enum(Object.keys(ContributorTypes)),
+                }),
+            ),
             // third step
             project_id: schema.number.optional(),
             embargo_date: schema.date.optional({ format: 'yyyy-MM-dd' }, [rules.after(10, 'days')]),
@@ -481,31 +495,41 @@ export default class DatasetController {
 
     private async savePersons(dataset: Dataset, persons: any[], role: string, trx: TransactionClientContract) {
         for (const [key, person] of persons.entries()) {
-            const pivotData = { role: role, sort_order: key + 1 };
+            const pivotData = {
+                role: role,
+                sort_order: key + 1,
+                allow_email_contact: false,
+                ...this.extractPivotAttributes(person), // Merge pivot attributes here
+            };
 
             if (person.id !== undefined) {
                 await dataset
                     .useTransaction(trx)
                     .related('persons')
                     .attach({
-                        [person.id]: {
-                            role: pivotData.role,
-                            sort_order: pivotData.sort_order,
-                            allow_email_contact: false,
-                        },
+                        [person.id]: pivotData,
                     });
             } else {
                 const dataPerson = new Person();
                 dataPerson.fill(person);
-                await dataset.useTransaction(trx).related('persons').save(dataPerson, false, {
-                    role: pivotData.role,
-                    sort_order: pivotData.sort_order,
-                    allow_email_contact: false,
-                });
+                await dataset.useTransaction(trx).related('persons').save(dataPerson, false, pivotData);
             }
         }
     }
 
+    // Helper function to extract pivot attributes from a person object
+    private extractPivotAttributes(person: any) {
+        const pivotAttributes = {};
+        for (const key in person) {
+            if (key.startsWith('pivot_')) {
+                // pivotAttributes[key] = person[key];
+                const cleanKey = key.replace('pivot_', ''); // Remove 'pivot_' prefix
+                pivotAttributes[cleanKey] = person[key];
+            }
+        }
+        return pivotAttributes;
+    }
+
     public messages: CustomMessages = {
         'minLength': '{{ field }} must be at least {{ options.minLength }} characters long',
         'maxLength': '{{ field }} must be less then {{ options.maxLength }} characters long',
@@ -532,6 +556,7 @@ export default class DatasetController {
             'The language of the translated description must be different from the language of the dataset',
 
         'authors.minLength': 'at least {{ options.minLength }} author must be defined',
+        'contributors.*.pivot_contributor_type.required': 'contributor type is required, if defined',
 
         'after': `{{ field }} must be older than ${dayjs().add(10, 'day')}`,
 

app/Validators/CreateDatasetValidator.ts

@@ -1,7 +1,7 @@
 import { schema, CustomMessages, rules } from '@ioc:Adonis/Core/Validator';
 import type { HttpContextContract } from '@ioc:Adonis/Core/HttpContext';
 import dayjs from 'dayjs';
-import { TitleTypes, DescriptionTypes, RelationTypes, ReferenceIdentifierTypes } from 'Contracts/enums';
+import { TitleTypes, DescriptionTypes, RelationTypes, ReferenceIdentifierTypes, ContributorTypes } from 'Contracts/enums';
 
 export default class CreateDatasetValidator {
     constructor(protected ctx: HttpContextContract) {}
@@ -58,6 +58,12 @@ export default class CreateDatasetValidator {
             }),
         ),
         authors: schema.array([rules.minLength(1)]).members(schema.object().members({ email: schema.string({ trim: true }) })),
+        contributors: schema.array.optional().members(
+            schema.object().members({
+                email: schema.string({ trim: true }),
+                pivot_contributor_type: schema.enum(Object.keys(ContributorTypes)),
+            }),
+        ),
         // third step
         project_id: schema.number.optional(),
         embargo_date: schema.date.optional({ format: 'yyyy-MM-dd' }, [rules.after(10, 'days')]),
@@ -149,6 +155,7 @@ export default class CreateDatasetValidator {
             'The language of the translated description must be different from the language of the dataset',
 
         'authors.minLength': 'at least {{ options.minLength }} author must be defined',
+        'contributors.*.pivot_contributor_type.required': 'contributor type is required, if defined',
 
         'after': `{{ field }} must be older than ${dayjs().add(10, 'day')}`,