- added LicenseController.ts and MimetypeController for enabling mime_types and licences

- add new authors and contributors only by unique email addresses
- allow multiple file upload
- added validation rule for validating length of uploaded files
- modified Dockerfile for starting "bin/server.js" instead of *server.js"
- npm updates

app/Controllers/Http/Admin/AdminuserController.ts

@@ -134,7 +134,7 @@ export default class AdminuserController {
         // validate update form
         await request.validateUsing(updateUserValidator, {
             meta: {
-                userId: user.id,
+                objId: user.id,
             },
         });
 
@@ -166,8 +166,8 @@ export default class AdminuserController {
         return response.redirect().toRoute('settings.user.index');
     }
 
-    // private async syncRoles(userId: number, roleIds: Array<number>) {
-    // 	const user = await User.findOrFail(userId)
+    // private async syncRoles(objId: number, roleIds: Array<number>) {
+    // 	const user = await User.findOrFail(objId)
     // 	// const roles: Role[] = await Role.query().whereIn('id', roleIds);
 
     // 	// await user.roles().sync(roles.rows.map(role => role.id))

app/Controllers/Http/Admin/LicenseController.ts

@@ -0,0 +1,51 @@
+import type { HttpContext } from '@adonisjs/core/http';
+import License from '#models/license';
+
+export default class LicenseController {
+    public async index({ auth, inertia }: HttpContext) {
+        const direction = 'asc'; // or 'desc'
+        const licenses = await License.query().orderBy('sort_order', direction).exec();
+
+        return inertia.render('Admin/License/Index', {
+            licenses: licenses,
+            can: {
+                edit: await auth.user?.can(['settings']),
+            },
+        });
+    }
+
+    public async down({ request, response }: HttpContext) {
+        const id = request.param('id');
+        const license = await License.findOrFail(id);
+        license.active = false;
+        await license.save();
+
+        // session.flash({ message: 'person has been deactivated!' });
+        return response.flash('person has been deactivated!', 'message').toRoute('settings.license.index')
+    }
+
+    public async up({ request, response }: HttpContext) {
+        const id = request.param('id');
+        const license = await License.findOrFail(id);
+        license.active = true;
+        await license.save();
+
+        // session.flash({ message: 'person has been activated!' });
+        return response.flash('person has been activated!', 'message').toRoute('settings.license.index');
+    }
+
+    // public async edit({ request, inertia }: HttpContext) {
+    //     const id = request.param('id');
+    //     const license = await License.query().where('id', id).firstOrFail();
+
+    //     // const permissions = await Permission.query().pluck('name', 'id');
+    //     // // const userHasRoles = user.roles;
+    //     // const rolerHasPermissions = await role.related('permissions').query().orderBy('name').pluck('id');
+
+    //     return inertia.render('Admin/License/Edit', {
+    //         // permissions: permissions,
+    //         license: license,
+    //         // roleHasPermissions: Object.keys(rolerHasPermissions).map((key) => rolerHasPermissions[key]), //convert object to array with role ids
+    //     });
+    // }
+}

app/Controllers/Http/Admin/MimetypeController.ts

@@ -0,0 +1,51 @@
+import type { HttpContext } from '@adonisjs/core/http';
+import MimeType from '#models/mime_type';
+
+export default class MimetypeController {
+    public async index({ auth, inertia }: HttpContext) {
+        const direction = 'asc'; // or 'desc'
+        const mimetypes  = await MimeType.query().orderBy('name', direction).exec();
+
+        return inertia.render('Admin/Mimetype/Index', {
+            mimetypes: mimetypes,
+            can: {
+                edit: await auth.user?.can(['settings']),
+            },
+        });
+    }
+
+    public async down({ request, response }: HttpContext) {
+        const id = request.param('id');
+        const mimetype  = await MimeType.findOrFail(id);
+        mimetype.enabled = false;
+        await mimetype .save();
+
+        // session.flash({ message: 'person has been deactivated!' });
+        return response.flash('mimetype  has been deactivated!', 'message').toRoute('settings.mimetype.index')
+    }
+
+    public async up({ request, response }: HttpContext) {
+        const id = request.param('id');
+        const mimetype  = await MimeType.findOrFail(id);
+        mimetype.enabled = true;
+        await mimetype .save();
+
+        // session.flash({ message: 'person has been activated!' });
+        return response.flash('mimetype  has been activated!', 'message').toRoute('settings.mimetype.index');
+    }
+
+    // public async edit({ request, inertia }: HttpContext) {
+    //     const id = request.param('id');
+    //     const license = await License.query().where('id', id).firstOrFail();
+
+    //     // const permissions = await Permission.query().pluck('name', 'id');
+    //     // // const userHasRoles = user.roles;
+    //     // const rolerHasPermissions = await role.related('permissions').query().orderBy('name').pluck('id');
+
+    //     return inertia.render('Admin/License/Edit', {
+    //         // permissions: permissions,
+    //         license: license,
+    //         // roleHasPermissions: Object.keys(rolerHasPermissions).map((key) => rolerHasPermissions[key]), //convert object to array with role ids
+    //     });
+    // }
+}

app/Controllers/Http/Submitter/DatasetController.ts

@@ -216,18 +216,24 @@ export default class DatasetController {
             authors: vine
                 .array(
                     vine.object({
-                        email: vine.string().trim().maxLength(255).email().normalizeEmail(),
+                        email: vine.string().trim().maxLength(255).email().normalizeEmail().isUniquePerson({ table: 'persons', column: 'email', idField: 'id' }),
+                        first_name: vine.string().trim().minLength(3).maxLength(255),
+                        last_name: vine.string().trim().minLength(3).maxLength(255),
                     }),
                 )
-                .minLength(1),
+                .minLength(1)
+                .distinct('email'),
             contributors: vine
                 .array(
                     vine.object({
-                        email: vine.string().trim().maxLength(255).email().normalizeEmail(),
+                        email: vine.string().trim().maxLength(255).email().normalizeEmail().isUniquePerson({ table: 'persons', column: 'email', idField: 'id' }),
+                        first_name: vine.string().trim().minLength(3).maxLength(255),
+                        last_name: vine.string().trim().minLength(3).maxLength(255),
                         pivot_contributor_type: vine.enum(Object.keys(ContributorTypes)),
                     }),
                 )
-                .optional(),
+                .distinct('email')
+                .optional(),        
             project_id: vine.number().optional(),
         });
 
@@ -287,18 +293,24 @@ export default class DatasetController {
             authors: vine
                 .array(
                     vine.object({
-                        email: vine.string().trim().maxLength(255).email().normalizeEmail(),
+                        email: vine.string().trim().maxLength(255).email().normalizeEmail().isUniquePerson({ table: 'persons', column: 'email', idField: 'id' }),
+                        first_name: vine.string().trim().minLength(3).maxLength(255),
+                        last_name: vine.string().trim().minLength(3).maxLength(255),
                     }),
                 )
-                .minLength(1),
+                .minLength(1)
+                .distinct('email'),
             contributors: vine
                 .array(
                     vine.object({
-                        email: vine.string().trim().maxLength(255).email().normalizeEmail(),
+                        email: vine.string().trim().maxLength(255).email().normalizeEmail().isUniquePerson({ table: 'persons', column: 'email', idField: 'id' }),
+                        first_name: vine.string().trim().minLength(3).maxLength(255),
+                        last_name: vine.string().trim().minLength(3).maxLength(255),
                         pivot_contributor_type: vine.enum(Object.keys(ContributorTypes)),
                     }),
                 )
-                .optional(),
+                .distinct('email')
+                .optional(),                
             // third step
             project_id: vine.number().optional(),
             // embargo_date: schema.date.optional({ format: 'yyyy-MM-dd' }, [rules.after(10, 'days')]),
@@ -631,7 +643,9 @@ export default class DatasetController {
             'The language of the translated description must be different from the language of the dataset',
 
         'authors.array.minLength': 'at least {{ min }} author must be defined',
+        'authors.distinct': 'The {{ field }} array must have unique values based on the {{ fields }} attribute.',
         'contributors.*.pivot_contributor_type.required': 'contributor type is required, if defined',
+        'contributors.distinct': 'The {{ field }} array must have unique values based on the {{ fields }} attribute.',
 
         'after': `{{ field }} must be older than ${dayjs().add(10, 'day')}`,
 

app/validators/dataset.ts

@@ -55,18 +55,24 @@ export const createDatasetValidator = vine.compile(
         authors: vine
             .array(
                 vine.object({
-                    email: vine.string().trim().maxLength(255).email().normalizeEmail(),
+                    email: vine.string().trim().maxLength(255).email().normalizeEmail().isUniquePerson({ table: 'persons', column: 'email', idField: 'id' }),
+                    first_name: vine.string().trim().minLength(3).maxLength(255),
+                    last_name: vine.string().trim().minLength(3).maxLength(255),
                 }),
             )
-            .minLength(1),
+            .minLength(1)
+            .distinct('email'),
         contributors: vine
             .array(
                 vine.object({
-                    email: vine.string().trim().maxLength(255).email().normalizeEmail(),
+                    email: vine.string().trim().maxLength(255).email().normalizeEmail().isUniquePerson({ table: 'persons', column: 'email', idField: 'id' }),
+                    first_name: vine.string().trim().minLength(3).maxLength(255),
+                    last_name: vine.string().trim().minLength(3).maxLength(255),
                     pivot_contributor_type: vine.enum(Object.keys(ContributorTypes)),
                 }),
             )
-            .optional(),
+            .distinct('email')
+            .optional(),  
         // third step
         project_id: vine.number().optional(),
         // embargo_date: schema.date.optional({ format: 'yyyy-MM-dd' }, [rules.after(10, 'days')]),
@@ -114,10 +120,10 @@ export const createDatasetValidator = vine.compile(
         // last step
         files: vine
             .array(
-                vine.file({
+                vine.myfile({                  
                     size: '512mb',
                     extnames: extensions,
-                }),
+                }).filenameLength({ clientNameSizeLimit : 100 }),
             )
             .minLength(1),
     }),
@@ -169,17 +175,23 @@ export const updateDatasetValidator = vine.compile(
         authors: vine
             .array(
                 vine.object({
-                    email: vine.string().trim().maxLength(255).email().normalizeEmail(),
+                    email: vine.string().trim().maxLength(255).email().normalizeEmail().isUniquePerson({ table: 'persons', column: 'email', idField: 'id' }),
+                    first_name: vine.string().trim().minLength(3).maxLength(255),
+                    last_name: vine.string().trim().minLength(3).maxLength(255),
                 }),
             )
-            .minLength(1),
+            .minLength(1)
+            .distinct('email'),
         contributors: vine
             .array(
                 vine.object({
-                    email: vine.string().trim().maxLength(255).email().normalizeEmail(),
+                    email: vine.string().trim().maxLength(255).email().normalizeEmail().isUniquePerson({ table: 'persons', column: 'email', idField: 'id' }),
+                    first_name: vine.string().trim().minLength(3).maxLength(255),
+                    last_name: vine.string().trim().minLength(3).maxLength(255),
                     pivot_contributor_type: vine.enum(Object.keys(ContributorTypes)),
                 }),
             )
+            .distinct('email')
             .optional(),
         // third step
         project_id: vine.number().optional(),
@@ -228,7 +240,7 @@ export const updateDatasetValidator = vine.compile(
         // last step
         files: vine
             .array(
-                vine.file({
+                vine.myfile({
                     size: '512mb',
                     extnames: extensions,
                 }),
@@ -270,7 +282,9 @@ let messagesProvider = new SimpleMessagesProvider({
         'The language of the translated description must be different from the language of the dataset',
 
     'authors.array.minLength': 'at least {{ min }} author must be defined',
+    'authors.distinct': 'The {{ field }} array must have unique values based on the {{ fields }} attribute.',
     'contributors.*.pivot_contributor_type.required': 'contributor type is required, if defined',
+    'contributors.distinct': 'The {{ field }} array must have unique values based on the {{ fields }} attribute.',
 
     'after': `{{ field }} must be older than ${dayjs().add(10, 'day')}`,
 

app/validators/user.ts

@@ -23,21 +23,21 @@ export const createUserValidator = vine.compile(
  * Validates the role's update action
  * node ace make:validator user
  */
-export const updateUserValidator = vine.withMetaData<{ userId: number }>().compile(
+export const updateUserValidator = vine.withMetaData<{ objId: number }>().compile(
     vine.object({
         login: vine
             .string()
             .trim()
             .minLength(3)
             .maxLength(20)
-            .isUnique({ table: 'accounts', column: 'login', whereNot: (field) => field.meta.userId })
+            .isUnique({ table: 'accounts', column: 'login', whereNot: (field) => field.meta.objId })
             .regex(/^[a-zA-Z0-9]+$/), //Must be alphanumeric with hyphens or underscores
         email: vine
             .string()
             .maxLength(255)
             .email()
             .normalizeEmail()
-            .isUnique({ table: 'accounts', column: 'email', whereNot: (field) => field.meta.userId }),
+            .isUnique({ table: 'accounts', column: 'email', whereNot: (field) => field.meta.objId }),
         password: vine.string().confirmed().trim().minLength(3).maxLength(60),
         roles: vine.array(vine.number()).minLength(1), // define at least one role for the new user
     }),