geolba/tethys.backend
2
0
Fork 1
Code Issues 7 Pull Requests Actions Packages Projects Releases Wiki Activity

- additional functionality for DatasetController.ts
All checks were successful
CI Pipeline / japa-tests (push) Successful in 47s
Details

Browse Source 
- additional validation rules like 'uniqueArray'
- additional Lucid models like BaseModel.ts for filling attributes, Title.ts, Description.ts
- npm updates for @adonisjs/core
This commit is contained in:
Kaimbacher 2023-06-22 17:20:04 +02:00
parent c4f4eff0d9
commit e0ff71b117
44 changed files with 2002 additions and 1556 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controllers/Http/Admin/HomeController.ts
View File

@ -1,4 +1,4 @@
import type { HttpContextContract } from '@ioc:Adonis/Core/HttpContext' import type { HttpContextContract } from '@ioc:Adonis/Core/HttpContext';
export default class HomeController { export default class HomeController {
public async index({}: HttpContextContract) {} public async index({}: HttpContextContract) {}

10
app/Controllers/Http/Admin/UsersController.ts
View File

@ -201,4 +201,14 @@ export default class UsersController {
return response.redirect().toRoute('admin.account.info'); return response.redirect().toRoute('admin.account.info');
//->with('message', __($message)); //->with('message', __($message));
} }
// private async syncRoles(userId: number, roleIds: Array<number>) {
// const user = await User.findOrFail(userId)
// // const roles: Role[] = await Role.query().whereIn('id', roleIds);
// // await user.roles().sync(roles.rows.map(role => role.id))
// await user.related("roles").sync(roleIds);
// return user
// }
} }

4
app/Controllers/Http/Api/AuthorsController.ts
View File

@ -25,9 +25,7 @@ export default class AuthorsController {
if (request.input('filter')) { if (request.input('filter')) {
// users = users.whereRaw('name like %?%', [request.input('search')]) // users = users.whereRaw('name like %?%', [request.input('search')])
const searchTerm = request.input('filter'); const searchTerm = request.input('filter');
authors authors.whereILike('first_name', `%${searchTerm}%`).orWhereILike('last_name', `%${searchTerm}%`);
.whereILike('first_name', `%${searchTerm}%`)
.orWhereILike('last_name', `%${searchTerm}%`);
// .orWhere('email', 'like', `%${searchTerm}%`); // .orWhere('email', 'like', `%${searchTerm}%`);
} }

10
app/Controllers/Http/Api/DatasetController.ts
View File

@ -4,20 +4,12 @@ import Dataset from 'App/Models/Dataset';
// node ace make:controller Author // node ace make:controller Author
export default class DatasetController { export default class DatasetController {
public async index({}: HttpContextContract) { public async index({}: HttpContextContract) {
// select * from gba.persons // select * from gba.persons
// where exists (select * from gba.documents inner join gba.link_documents_persons on "documents"."id" = "link_documents_persons"."document_id" // where exists (select * from gba.documents inner join gba.link_documents_persons on "documents"."id" = "link_documents_persons"."document_id"
// where ("link_documents_persons"."role" = 'author') and ("persons"."id" = "link_documents_persons"."person_id")); // where ("link_documents_persons"."role" = 'author') and ("persons"."id" = "link_documents_persons"."person_id"));
const datasets = await Dataset const datasets = await Dataset.query().where('server_state', 'published').orWhere('server_state', 'deleted');
.query()
.where('server_state', 'published')
.orWhere('server_state', 'deleted');
return datasets; return datasets;
} }
} }

8
app/Controllers/Http/Auth/AuthController.ts
View File

@ -17,15 +17,13 @@ export default class AuthController {
// grab uid and password values off request body // grab uid and password values off request body
// const { email, password } = request.only(['email', 'password']) // const { email, password } = request.only(['email', 'password'])
try { try {
// attempt to login // attempt to login
await auth.use("web").attempt(email, plainPassword); await auth.use('web').attempt(email, plainPassword);
} catch (error) { } catch (error) {
// if login fails, return vague form message and redirect back // if login fails, return vague form message and redirect back
session.flash('message', 'Your username, email, or password is incorrect') session.flash('message', 'Your username, email, or password is incorrect');
return response.redirect().back() return response.redirect().back();
} }
// otherwise, redirect todashboard // otherwise, redirect todashboard

268
app/Controllers/Http/Submitter/DatasetController.ts
View File

@ -1,33 +1,22 @@
import type { HttpContextContract } from '@ioc:Adonis/Core/HttpContext'; import type { HttpContextContract } from '@ioc:Adonis/Core/HttpContext';
// import User from 'App/Models/User'; import User from 'App/Models/User';
import Dataset from 'App/Models/Dataset';
// import Role from 'App/Models/Role'; // import Role from 'App/Models/Role';
// import Database from '@ioc:Adonis/Lucid/Database'; // import Database from '@ioc:Adonis/Lucid/Database';
import License from 'App/Models/License'; import License from 'App/Models/License';
import Project from 'App/Models/Project'; import Project from 'App/Models/Project';
// import type { ModelQueryBuilderContract } from '@ioc:Adonis/Lucid/Orm'; import Title from 'App/Models/Title';
import Description from 'App/Models/Description';
// import CreateUserValidator from 'App/Validators/CreateUserValidator'; // import CreateUserValidator from 'App/Validators/CreateUserValidator';
// import UpdateUserValidator from 'App/Validators/UpdateUserValidator'; // import UpdateUserValidator from 'App/Validators/UpdateUserValidator';
// import { RenderResponse } from '@ioc:EidelLev/Inertia';
import { schema, CustomMessages, rules } from '@ioc:Adonis/Core/Validator'; import { schema, CustomMessages, rules } from '@ioc:Adonis/Core/Validator';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
// import Application from '@ioc:Adonis/Core/Application'; import Person from 'App/Models/Person';
import Database from '@ioc:Adonis/Lucid/Database';
enum TitleTypes { import { TransactionClientContract } from '@ioc:Adonis/Lucid/Database';
Main = 'Main', import Subject from 'App/Models/Subject';
Sub = 'Sub', import CreateDatasetValidator from 'App/Validators/CreateDatasetValidator';
Alternative = 'Alternative', import { TitleTypes, DescriptionTypes } from 'Contracts/enums';
Translated = 'Translated',
Other = 'Other',
}
enum DescriptionTypes {
Abstract = 'Abstract',
Methods = 'Methods',
Series_information = 'Series_information',
Technical_info = 'Technical_info',
Translated = 'Translated',
Other = 'Other',
}
export default class DatasetController { export default class DatasetController {
public async create({ inertia }: HttpContextContract) { public async create({ inertia }: HttpContextContract) {
@ -190,7 +179,7 @@ export default class DatasetController {
depth_min: schema.number.optional([rules.requiredIfExists('depth_max')]), depth_min: schema.number.optional([rules.requiredIfExists('depth_max')]),
depth_max: schema.number.optional([rules.requiredIfExists('depth_min')]), depth_max: schema.number.optional([rules.requiredIfExists('depth_min')]),
}), }),
subjects: schema.array([rules.minLength(3)]).members( subjects: schema.array([rules.minLength(3), rules.uniqueArray('value')]).members(
schema.object().members({ schema.object().members({
value: schema.string({ trim: true }, [ value: schema.string({ trim: true }, [
rules.minLength(3), rules.minLength(3),
@ -214,98 +203,161 @@ export default class DatasetController {
} }
return response.redirect().back(); return response.redirect().back();
} }
public async store({ request, response, session }: HttpContextContract) { public async store({ auth, request, response, session }: HttpContextContract) {
const newDatasetSchema = schema.create({ // node ace make:validator CreateDataset
// first step
language: schema.string({ trim: true }, [
rules.regex(/^[a-zA-Z0-9-_]+$/), //Must be alphanumeric with hyphens or underscores
]),
licenses: schema.array([rules.minLength(1)]).members(schema.number()), // define at least one license for the new dataset
rights: schema.string([rules.equalTo('true')]),
// second step
type: schema.string({ trim: true }, [rules.minLength(3), rules.maxLength(255)]),
creating_corporation: schema.string({ trim: true }, [rules.minLength(3), rules.maxLength(255)]),
titles: schema.array([rules.minLength(1)]).members(
schema.object().members({
value: schema.string({ trim: true }, [rules.minLength(3), rules.maxLength(255)]),
type: schema.enum(Object.values(TitleTypes)),
language: schema.string({ trim: true }, [
rules.minLength(2),
rules.maxLength(255),
rules.translatedLanguage('/language', 'type'),
]),
}),
),
descriptions: schema.array([rules.minLength(1)]).members(
schema.object().members({
value: schema.string({ trim: true }, [rules.minLength(3), rules.maxLength(255)]),
type: schema.enum(Object.values(DescriptionTypes)),
language: schema.string({ trim: true }, [
rules.minLength(2),
rules.maxLength(255),
rules.translatedLanguage('/language', 'type'),
]),
}),
),
authors: schema.array([rules.minLength(1)]).members(schema.object().members({ email: schema.string({ trim: true }) })),
// third step
project_id: schema.number.optional(),
embargo_date: schema.date.optional({ format: 'yyyy-MM-dd' }, [rules.after(10, 'days')]),
coverage: schema.object().members({
x_min: schema.number(),
x_max: schema.number(),
y_min: schema.number(),
y_max: schema.number(),
elevation_absolut: schema.number.optional(),
elevation_min: schema.number.optional([rules.requiredIfExists('elevation_max')]),
elevation_max: schema.number.optional([rules.requiredIfExists('elevation_min')]),
depth_absolut: schema.number.optional(),
depth_min: schema.number.optional([rules.requiredIfExists('depth_max')]),
depth_max: schema.number.optional([rules.requiredIfExists('depth_min')]),
}),
subjects: schema.array([rules.minLength(3)]).members(
schema.object().members({
value: schema.string({ trim: true }, [
rules.minLength(3),
rules.maxLength(255),
// rules.unique({ table: 'dataset_subjects', column: 'value' }),
]),
// type: schema.enum(Object.values(TitleTypes)),
language: schema.string({ trim: true }, [rules.minLength(2), rules.maxLength(255)]),
}),
),
// file: schema.file({
// size: '100mb',
// extnames: ['jpg', 'gif', 'png'],
// }),
files: schema.array([rules.minLength(1)]).members(
schema.file({
size: '100mb',
extnames: ['jpg', 'gif', 'png'],
}),
),
// upload: schema.object().members({
// label: schema.string({ trim: true }, [rules.maxLength(255)]),
// // label: schema.string({ trim: true }, [
// // // rules.minLength(3),
// // // rules.maxLength(255),
// // ]),
// }),
});
// const coverImages = request.file('files');
// node ace make:validator CreateUser
try { try {
// Step 2 - Validate request body against the schema // Step 2 - Validate request body against the schema
// await request.validate(CreateUserValidator); // await request.validate(CreateUserValidator);
await request.validate({ schema: newDatasetSchema, messages: this.messages }); // await request.validate({ schema: newDatasetSchema, messages: this.messages });
await request.validate(CreateDatasetValidator);
// console.log({ payload }); // console.log({ payload });
} catch (error) { } catch (error) {
// Step 3 - Handle errors // Step 3 - Handle errors
// return response.badRequest(error.messages); // return response.badRequest(error.messages);
throw error; throw error;
} }
// const user = new User();
// user.email = 'example@example.com';
// user.password = 'password';
// await user.useTransaction(trx).save();
let trx: TransactionClientContract | null = null;
try {
trx = await Database.transaction();
const user = (await User.find(auth.user?.id)) as User;
// const dataset = await user.related('datasets').create({
// type: request.input('type'),
// creatingCorporation: request.input('creating_corporation'),
// language: request.input('language'),
// });
// Create a new instance of the Dataset model:
const dataset = new Dataset();
dataset.type = request.input('type');
dataset.creatingCorporation = request.input('creating_corporation');
dataset.language = request.input('language');
dataset.embargoDate = request.input('embargo_date');
//await dataset.related('user').associate(user); // speichert schon ab
// Dataset.$getRelation('user').boot();
// Dataset.$getRelation('user').setRelated(dataset, user);
// dataset.$setRelated('user', user);
await user.useTransaction(trx).related('datasets').save(dataset);
//store licenses:
const licenses: number[] = request.input('licenses', []);
dataset.useTransaction(trx).related('licenses').sync(licenses);
const authors = request.input('authors', []);
for (const [key, person] of authors.entries()) {
const pivotData = { role: 'author', sort_order: key + 1 };
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,
},
});
} else {
const dataPerson = new Person();
// use overwritten fill method
dataPerson.fill(person);
await dataset.useTransaction(trx).related('persons').save(dataPerson, false, {
role: pivotData.role,
sort_order: pivotData.sort_order,
allow_email_contact: false,
});
}
}
const contributors = request.input('contributors', []);
for (const [key, person] of contributors.entries()) {
const pivotData = { role: 'contributor', sort_order: key + 1 };
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,
},
});
} else {
const dataPerson = new Person();
// use overwritten fill method
dataPerson.fill(person);
await dataset.useTransaction(trx).related('persons').save(dataPerson, false, {
role: pivotData.role,
sort_order: pivotData.sort_order,
allow_email_contact: false,
});
}
}
//save main and additional titles
const titles = request.input('titles', []);
for (const titleData of titles) {
const title = new Title();
title.value = titleData.value;
title.language = titleData.language;
title.type = titleData.type;
await dataset.useTransaction(trx).related('titles').save(title);
}
//save abstract and additional descriptions
const descriptions = request.input('descriptions', []);
for (const descriptionData of descriptions) {
// $descriptionReference = new Description($description);
// $dataset->abstracts()->save($descriptionReference);
const description = new Description();
description.value = descriptionData.value;
description.language = descriptionData.language;
description.type = descriptionData.type;
await dataset.useTransaction(trx).related('descriptions').save(description);
}
//save keywords
const keywords = request.input('subjects', []);
for (const keywordData of keywords) {
// $dataKeyword = new Subject($keyword);
// $dataset->subjects()->save($dataKeyword);
const keyword = await Subject.firstOrNew({ value: keywordData.value, type: keywordData.type }, keywordData);
if (keyword.$isNew == true) {
await dataset.useTransaction(trx).related('subjects').save(keyword);
} else {
await dataset.useTransaction(trx).related('subjects').attach([keyword.id]);
}
}
// Dataset.$getRelation('persons').boot();
// Dataset.$getRelation('persons').pushRelated(dataset, person)
// dataset.$pushRelated('persons', person);
await trx.commit();
console.log('Users and posts created successfully');
} catch (error) {
if (trx !== null) {
await trx.rollback();
}
console.error('Failed to create dataset and related models:', error);
// Handle the error and exit the controller code accordingly
// session.flash('message', 'Failed to create dataset and relaed models');
// return response.redirect().back();
throw error;
}
// save data files:
const coverImage = request.files('files')[0]; const coverImage = request.files('files')[0];
if (coverImage) { if (coverImage) {
// clientName: 'Gehaltsschema.png' // clientName: 'Gehaltsschema.png'
@ -326,11 +378,6 @@ export default class DatasetController {
); );
// let path = coverImage.filePath; // let path = coverImage.filePath;
} }
// const user = await User.create(input);
// if (request.input('roles')) {
// const roles: Array<number> = request.input('roles');
// await user.related('roles').attach(roles);
// }
session.flash('message', 'Dataset has been created successfully'); session.flash('message', 'Dataset has been created successfully');
// return response.redirect().toRoute('user.index'); // return response.redirect().toRoute('user.index');
@ -367,6 +414,7 @@ export default class DatasetController {
'after': `{{ field }} must be older than ${dayjs().add(10, 'day')}`, 'after': `{{ field }} must be older than ${dayjs().add(10, 'day')}`,
'subjects.minLength': 'at least {{ options.minLength }} keywords must be defined', 'subjects.minLength': 'at least {{ options.minLength }} keywords must be defined',
'subjects.uniqueArray': 'The {{ options.array }} array must have unique values based on the {{ options.field }} attribute.',
'subjects.*.value.required': 'keyword value is required', 'subjects.*.value.required': 'keyword value is required',
'subjects.*.value.minLength': 'keyword value must be at least {{ options.minLength }} characters long', 'subjects.*.value.minLength': 'keyword value must be at least {{ options.minLength }} characters long',
'subjects.*.type.required': 'keyword type is required', 'subjects.*.type.required': 'keyword type is required',

2
app/Exceptions/Handler.ts
View File

@ -47,7 +47,7 @@ export default class ExceptionHandler extends HttpExceptionHandler {
if (request.header('X-Inertia') && [500, 503, 404, 403, 401].includes(response.getStatus())) { if (request.header('X-Inertia') && [500, 503, 404, 403, 401].includes(response.getStatus())) {
return inertia.render('Error', { return inertia.render('Error', {
status: response.getStatus(), status: response.getStatus(),
message: error.message message: error.message,
}); });
// ->toResponse($request) // ->toResponse($request)
// ->setStatusCode($response->status()); // ->setStatusCode($response->status());

16
app/Exceptions/InvalidCredentialException.ts
View File

@ -1,4 +1,4 @@
import { Exception } from "@adonisjs/core/build/standalone"; import { Exception } from '@adonisjs/core/build/standalone';
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -23,14 +23,14 @@ export default class InvalidCredentialException extends Exception {
* Unable to find user * Unable to find user
*/ */
static invalidUid() { static invalidUid() {
const error = new this("User not found", 400, "E_INVALID_AUTH_UID"); const error = new this('User not found', 400, 'E_INVALID_AUTH_UID');
return error; return error;
} }
/** /**
* Invalid user password * Invalid user password
*/ */
static invalidPassword() { static invalidPassword() {
const error = new this("Password mis-match", 400, "E_INVALID_AUTH_PASSWORD"); const error = new this('Password mis-match', 400, 'E_INVALID_AUTH_PASSWORD');
return error; return error;
} }
@ -41,18 +41,18 @@ export default class InvalidCredentialException extends Exception {
// if (!ctx.session) { // if (!ctx.session) {
// return ctx.response.status(this.status).send(this.responseText); // return ctx.response.status(this.status).send(this.responseText);
// } // }
ctx.session.flashExcept(["_csrf"]); ctx.session.flashExcept(['_csrf']);
ctx.session.flash("auth", { ctx.session.flash('auth', {
error: error, error: error,
/** /**
* Will be removed in the future * Will be removed in the future
*/ */
errors: { errors: {
uid: this.code === "E_INVALID_AUTH_UID" ? ["Invalid login id"] : null, uid: this.code === 'E_INVALID_AUTH_UID' ? ['Invalid login id'] : null,
password: this.code === "E_INVALID_AUTH_PASSWORD" ? ["Invalid password"] : null, password: this.code === 'E_INVALID_AUTH_PASSWORD' ? ['Invalid password'] : null,
}, },
}); });
ctx.response.redirect("back", true); ctx.response.redirect('back', true);
} }
/** /**

35
app/Middleware/Auth.ts
View File

@ -1,6 +1,6 @@
import { AuthenticationException } from '@adonisjs/auth/build/standalone' import { AuthenticationException } from '@adonisjs/auth/build/standalone';
import type { GuardsList } from '@ioc:Adonis/Addons/Auth' import type { GuardsList } from '@ioc:Adonis/Addons/Auth';
import type { HttpContextContract } from '@ioc:Adonis/Core/HttpContext' import type { HttpContextContract } from '@ioc:Adonis/Core/HttpContext';
/** /**
* Auth middleware is meant to restrict un-authenticated access to a given route * Auth middleware is meant to restrict un-authenticated access to a given route
@ -13,7 +13,7 @@ export default class AuthMiddleware {
/** /**
* The URL to redirect to when request is Unauthorized * The URL to redirect to when request is Unauthorized
*/ */
protected redirectTo = '/app/login' protected redirectTo = '/app/login';
/** /**
* Authenticates the current HTTP request against a custom set of defined * Authenticates the current HTTP request against a custom set of defined
@ -30,10 +30,10 @@ export default class AuthMiddleware {
* it can decide the correct response behavior based upon the guard * it can decide the correct response behavior based upon the guard
* driver * driver
*/ */
let guardLastAttempted: string | undefined let guardLastAttempted: string | undefined;
for (let guard of guards) { for (let guard of guards) {
guardLastAttempted = guard guardLastAttempted = guard;
if (await auth.use(guard).check()) { if (await auth.use(guard).check()) {
/** /**
@ -41,36 +41,27 @@ export default class AuthMiddleware {
* the rest of the request, since the user authenticated * the rest of the request, since the user authenticated
* succeeded here * succeeded here
*/ */
auth.defaultGuard = guard auth.defaultGuard = guard;
return true return true;
} }
} }
/** /**
* Unable to authenticate using any guard * Unable to authenticate using any guard
*/ */
throw new AuthenticationException( throw new AuthenticationException('Unauthorized access', 'E_UNAUTHORIZED_ACCESS', guardLastAttempted, this.redirectTo);
'Unauthorized access',
'E_UNAUTHORIZED_ACCESS',
guardLastAttempted,
this.redirectTo,
)
} }
/** /**
* Handle request * Handle request
*/ */
public async handle ( public async handle({ auth }: HttpContextContract, next: () => Promise<void>, customGuards: (keyof GuardsList)[]) {
{ auth }: HttpContextContract,
next: () => Promise<void>,
customGuards: (keyof GuardsList)[]
) {
/** /**
* Uses the user defined guards or the default guard mentioned in * Uses the user defined guards or the default guard mentioned in
* the config file * the config file
*/ */
const guards = customGuards.length ? customGuards : [auth.name] const guards = customGuards.length ? customGuards : [auth.name];
await this.authenticate(auth, guards) await this.authenticate(auth, guards);
await next() await next();
} }
} }

23
app/Middleware/Can.ts
View File

@ -18,11 +18,7 @@ export default class Can {
/** /**
* Handle request * Handle request
*/ */
public async handle( public async handle({ auth, response }: HttpContextContract, next: () => Promise<void>, permissionNames: string[]) {
{ auth, response }: HttpContextContract,
next: () => Promise<void>,
permissionNames: string[]
) {
/** /**
* Check if user is logged-in * Check if user is logged-in
*/ */
@ -71,13 +67,20 @@ export default class Can {
0: { permissioncount }, 0: { permissioncount },
}, },
} = await Database.rawQuery( } = await Database.rawQuery(
'SELECT count("p"."name") as permissionCount FROM ' + roleTable + 'SELECT count("p"."name") as permissionCount FROM ' +
' r INNER JOIN ' + userRoleTable + ' ur ON ur.role_id=r.id AND "ur"."account_id"=? ' + roleTable +
' INNER JOIN ' + rolePermissionTable + ' rp ON rp.role_id=r.id ' + ' r INNER JOIN ' +
' INNER JOIN ' + permissionTable + ' p ON rp.permission_id=p.id AND "p"."name" in ' + userRoleTable +
' ur ON ur.role_id=r.id AND "ur"."account_id"=? ' +
' INNER JOIN ' +
rolePermissionTable +
' rp ON rp.role_id=r.id ' +
' INNER JOIN ' +
permissionTable +
' p ON rp.permission_id=p.id AND "p"."name" in ' +
rolePlaceHolder + rolePlaceHolder +
' LIMIT 1', ' LIMIT 1',
[user.id, ...permissionNames] [user.id, ...permissionNames],
); );
return permissioncount > 0; return permissioncount > 0;

42
app/Middleware/Is.ts
View File

@ -1,11 +1,11 @@
import { HttpContextContract } from '@ioc:Adonis/Core/HttpContext' import { HttpContextContract } from '@ioc:Adonis/Core/HttpContext';
import Config from '@ioc:Adonis/Core/Config' import Config from '@ioc:Adonis/Core/Config';
import Database from '@ioc:Adonis/Lucid/Database' import Database from '@ioc:Adonis/Lucid/Database';
import User from 'App/Models/User' import User from 'App/Models/User';
// import { Exception } from '@adonisjs/core/build/standalone' // import { Exception } from '@adonisjs/core/build/standalone'
const roleTable = Config.get('rolePermission.role_table', 'roles') const roleTable = Config.get('rolePermission.role_table', 'roles');
const userRoleTable = Config.get('rolePermission.user_role_table', 'user_roles') const userRoleTable = Config.get('rolePermission.user_role_table', 'user_roles');
/** /**
* Role authentication to check if user has any of the specified roles * Role authentication to check if user has any of the specified roles
@ -16,35 +16,31 @@ export default class Is {
/** /**
* Handle request * Handle request
*/ */
public async handle( public async handle({ auth, response }: HttpContextContract, next: () => Promise<void>, roleNames: string[]) {
{ auth, response }: HttpContextContract,
next: () => Promise<void>,
roleNames: string[]
) {
/** /**
* Check if user is logged-in or not. * Check if user is logged-in or not.
*/ */
let user = await auth.user let user = await auth.user;
if (!user) { if (!user) {
return response.unauthorized({ error: 'Must be logged in' }) return response.unauthorized({ error: 'Must be logged in' });
} }
let hasRole = await this.checkHasRoles(user, roleNames) let hasRole = await this.checkHasRoles(user, roleNames);
if (!hasRole) { if (!hasRole) {
return response.unauthorized({ return response.unauthorized({
error: `Doesn't have required role(s): ${roleNames.join(',')}`, error: `Doesn't have required role(s): ${roleNames.join(',')}`,
}) });
// return new Exception(`Doesn't have required role(s): ${roleNames.join(',')}`, // return new Exception(`Doesn't have required role(s): ${roleNames.join(',')}`,
// 401, // 401,
// "E_INVALID_AUTH_UID"); // "E_INVALID_AUTH_UID");
} }
await next() await next();
} }
private async checkHasRoles(user: User, roleNames: Array<string>): Promise<boolean> { private async checkHasRoles(user: User, roleNames: Array<string>): Promise<boolean> {
let rolePlaceHolder = '(' let rolePlaceHolder = '(';
let placeholders = new Array(roleNames.length).fill('?') let placeholders = new Array(roleNames.length).fill('?');
rolePlaceHolder += placeholders.join(',') rolePlaceHolder += placeholders.join(',');
rolePlaceHolder += ')' rolePlaceHolder += ')';
let { let {
0: { 0: {
@ -58,9 +54,9 @@ export default class Is {
' r ON ur.role_id=r.id WHERE `ur`.`user_id`=? AND `r`.`name` in ' + ' r ON ur.role_id=r.id WHERE `ur`.`user_id`=? AND `r`.`name` in ' +
rolePlaceHolder + rolePlaceHolder +
' LIMIT 1', ' LIMIT 1',
[user.id, ...roleNames] [user.id, ...roleNames],
) );
return roleCount > 0 return roleCount > 0;
} }
} }

9
app/Middleware/Role.ts
View File

@ -7,15 +7,10 @@ import { Exception } from '@adonisjs/core/build/standalone';
const roleTable = Config.get('rolePermission.role_table', 'roles'); const roleTable = Config.get('rolePermission.role_table', 'roles');
const userRoleTable = Config.get('rolePermission.user_role_table', 'link_accounts_roles'); const userRoleTable = Config.get('rolePermission.user_role_table', 'link_accounts_roles');
// node ace make:middleware role // node ace make:middleware role
export default class Role { export default class Role {
// .middleware(['auth', 'role:admin,moderator']) // .middleware(['auth', 'role:admin,moderator'])
public async handle( public async handle({ auth, response }: HttpContextContract, next: () => Promise<void>, userRoles: string[]) {
{ auth, response }: HttpContextContract,
next: () => Promise<void>,
userRoles: string[]
) {
// Check if user is logged-in or not. // Check if user is logged-in or not.
// let expression = ""; // let expression = "";
// if (Array.isArray(args)) { // if (Array.isArray(args)) {
@ -75,7 +70,7 @@ export default class Role {
' ur ON r.id=ur.role_id WHERE "ur"."account_id"=? AND "r"."name" in ' + ' ur ON r.id=ur.role_id WHERE "ur"."account_id"=? AND "r"."name" in ' +
rolePlaceHolder + rolePlaceHolder +
' LIMIT 1', ' LIMIT 1',
[user.id, ...userRoles] [user.id, ...userRoles],
); );
return rolecount > 0; return rolecount > 0;

6
app/Middleware/SilentAuth.ts
View File

@ -1,4 +1,4 @@
import type { HttpContextContract } from '@ioc:Adonis/Core/HttpContext' import type { HttpContextContract } from '@ioc:Adonis/Core/HttpContext';
/** /**
* Silent auth middleware can be used as a global middleware to silent check * Silent auth middleware can be used as a global middleware to silent check
@ -15,7 +15,7 @@ export default class SilentAuthMiddleware {
* Check if user is logged-in or not. If yes, then `ctx.auth.user` will be * Check if user is logged-in or not. If yes, then `ctx.auth.user` will be
* set to the instance of the currently logged in user. * set to the instance of the currently logged in user.
*/ */
await auth.check() await auth.check();
await next() await next();
} }
} }

119
app/Models/BaseModel.ts Normal file
View File

@ -0,0 +1,119 @@
import { BaseModel as LucidBaseModel } from '@ioc:Adonis/Lucid/Orm';
// import { ManyToManyQueryClient } from '@ioc:Adonis/Lucid/Orm';
// export class CustomManyToManyQueryClient extends ManyToManyQueryClient {
// public attach(
// relatedIds: any | any[],
// pivotAttributes: any = {},
// trx?: ReturnType<typeof this.model.transaction>
// ) {
// return super.attach(relatedIds, (row) => {
// row.pivot.fill(pivotAttributes);
// }, trx);
// }
// }
/**
* Helper to find if value is a valid Object or
* not
*/
export function isObject(value: any): boolean {
return value !== null && typeof value === 'object' && !Array.isArray(value);
}
export default class BaseModel extends LucidBaseModel {
/**
* When `fill` method is called, then we may have a situation where it
* removed the values which exists in `original` and hence the dirty
* diff has to do a negative diff as well
*/
// private fillInvoked: boolean = false;
public static fillable: string[] = [];
public fill(attributes: any, allowExtraProperties: boolean = false): this {
this.$attributes = {};
// const Model = this.constructor as typeof BaseModel;
// for (const key in attributes) {
// if (Model.fillable.includes(key)) {
// const value = attributes[key];
// if (Model.$hasColumn(key)) {
// this[key] = value;
// }
// }
// }
this.mergeFillableAttributes(attributes, allowExtraProperties);
// this.fillInvoked = true;
return this;
}
/**
* Merge bulk attributes with existing attributes.
*
* 1. If key is unknown, it will be added to the `extras` object.
* 2. If key is defined as a relationship, it will be ignored and one must call `$setRelated`.
*/
public mergeFillableAttributes(values: any, allowExtraProperties: boolean = false): this {
const Model = this.constructor as typeof BaseModel;
/**
* Merge values with the attributes
*/
if (isObject(values)) {
// Object.keys(values).forEach((key) => {
for (const key in values) {
if (Model.fillable.includes(key)) {
const value = values[key];
/**
* Set as column
*/
if (Model.$hasColumn(key)) {
this[key] = value;
continue;
}
/**
* Resolve the attribute name from the column names. Since people
* usaully define the column names directly as well by
* accepting them directly from the API.
*/
const attributeName = Model.$keys.columnsToAttributes.get(key);
if (attributeName) {
this[attributeName] = value;
continue;
}
/**
* If key is defined as a relation, then ignore it, since one
* must pass a qualified model to `this.$setRelated()`
*/
if (Model.$relationsDefinitions.has(key)) {
continue;
}
/**
* If the property already exists on the model, then set it
* as it is vs defining it as an extra property
*/
if (this.hasOwnProperty(key)) {
this[key] = value;
continue;
}
/**
* Raise error when not instructed to ignore non-existing properties.
*/
if (!allowExtraProperties) {
throw new Error(`Cannot define "${key}" on "${Model.name}" model, since it is not defined as a model property`);
}
this.$extras[key] = value;
}
}
}
return this;
}
}

64
app/Models/Dataset.ts
View File

@ -2,13 +2,20 @@ import {
column, column,
BaseModel, BaseModel,
SnakeCaseNamingStrategy, SnakeCaseNamingStrategy,
// computed,
manyToMany, manyToMany,
ManyToMany, ManyToMany,
belongsTo,
BelongsTo,
hasMany,
HasMany,
} from '@ioc:Adonis/Lucid/Orm'; } from '@ioc:Adonis/Lucid/Orm';
import { DateTime } from 'luxon'; import { DateTime } from 'luxon';
import Person from './Person'; import Person from './Person';
import User from './User';
import Title from './Title';
import Description from './Description';
import License from './License';
import Subject from './Subject';
export default class Dataset extends BaseModel { export default class Dataset extends BaseModel {
public static namingStrategy = new SnakeCaseNamingStrategy(); public static namingStrategy = new SnakeCaseNamingStrategy();
@ -25,12 +32,20 @@ export default class Dataset extends BaseModel {
@column({}) @column({})
public publisherName: string; public publisherName: string;
@column({ columnName: 'creating_corporation' })
public creatingCorporation: string;
@column.dateTime({ columnName: 'embargo_date' }) @column.dateTime({ columnName: 'embargo_date' })
public embargoDate: DateTime; public embargoDate: DateTime;
@column({}) @column({})
public type: string; public type: string;
@column({})
public language: string;
@column({})
public account_id: number | null = null;
@column.dateTime({ columnName: 'server_date_published' }) @column.dateTime({ columnName: 'server_date_published' })
public serverDatePublished: DateTime; public serverDatePublished: DateTime;
@ -38,15 +53,56 @@ export default class Dataset extends BaseModel {
@column.dateTime({ autoCreate: true, columnName: 'created_at' }) @column.dateTime({ autoCreate: true, columnName: 'created_at' })
public createdAt: DateTime; public createdAt: DateTime;
@column.dateTime({ autoCreate: true, autoUpdate: true }) @column.dateTime({ autoCreate: true, autoUpdate: true, columnName: 'server_date_modified' })
public updatedAt: DateTime; public updatedAt: DateTime;
@manyToMany(() => Person, { @manyToMany(() => Person, {
pivotForeignKey: 'document_id', pivotForeignKey: 'document_id',
pivotRelatedForeignKey: 'person_id', pivotRelatedForeignKey: 'person_id',
pivotTable: 'link_documents_persons', pivotTable: 'link_documents_persons',
pivotColumns: ['role', 'sort_order', 'allow_email_contact'] pivotColumns: ['role', 'sort_order', 'allow_email_contact'],
}) })
public persons: ManyToMany<typeof Person>; public persons: ManyToMany<typeof Person>;
/**
* Get the account that the dataset belongs to
*/
@belongsTo(() => User, {
foreignKey: 'account_id',
})
public user: BelongsTo<typeof User>;
@hasMany(() => Title, {
foreignKey: 'document_id',
})
public titles: HasMany<typeof Title>;
@hasMany(() => Description, {
foreignKey: 'document_id',
})
public descriptions: HasMany<typeof Description>;
@manyToMany(() => License, {
pivotForeignKey: 'document_id',
pivotRelatedForeignKey: 'licence_id',
pivotTable: 'link_documents_licences',
})
public licenses: ManyToMany<typeof License>;
// public function subjects()
// {
// return $this->belongsToMany(\App\Models\Subject::class, 'link_dataset_subjects', 'document_id', 'subject_id');
// }
@manyToMany(() => Subject, {
pivotForeignKey: 'document_id',
pivotRelatedForeignKey: 'subject_id',
pivotTable: 'link_dataset_subjects',
})
public subjects: ManyToMany<typeof Subject>;
// async save(): Promise<this> {
// // Call the parent save method to persist changes to the database
// await super.save();
// return this;
// }
} }

28
app/Models/Description.ts Normal file
View File

@ -0,0 +1,28 @@
import { column, belongsTo, BelongsTo } from '@ioc:Adonis/Lucid/Orm';
import Dataset from './Dataset';
import BaseModel from './BaseModel';
export default class Description extends BaseModel {
public static primaryKey = 'id';
public static table = 'dataset_abstracts';
public static selfAssignPrimaryKey = false;
public static timestamps = false;
public static fillable: string[] = ['value', 'type', 'language'];
@column({})
public document_id: number;
@column()
public type: string;
@column()
public value: string;
@column()
public language: string;
@belongsTo(() => Dataset, {
foreignKey: 'document_id',
})
public dataset: BelongsTo<typeof Dataset>;
}

3
app/Models/File.ts
View File

@ -2,7 +2,8 @@ import { DateTime } from 'luxon';
import { import {
column, column,
BaseModel, BaseModel,
hasMany, HasMany, hasMany,
HasMany,
// manyToMany, // manyToMany,
// ManyToMany, // ManyToMany,
SnakeCaseNamingStrategy, SnakeCaseNamingStrategy,

15
app/Models/HashValue.ts
View File

@ -1,10 +1,4 @@
import { import { column, BaseModel, belongsTo, BelongsTo, SnakeCaseNamingStrategy } from '@ioc:Adonis/Lucid/Orm';
column,
BaseModel,
belongsTo,
BelongsTo,
SnakeCaseNamingStrategy,
} from '@ioc:Adonis/Lucid/Orm';
import File from './File'; import File from './File';
export default class HashValue extends BaseModel { export default class HashValue extends BaseModel {
@ -16,8 +10,8 @@ export default class HashValue extends BaseModel {
// return 'type, value' // return 'type, value'
// } // }
static get incrementing () { static get incrementing() {
return false return false;
} }
// @column({ // @column({
@ -36,6 +30,5 @@ export default class HashValue extends BaseModel {
public value: string; public value: string;
@belongsTo(() => File) @belongsTo(() => File)
public file: BelongsTo<typeof File> public file: BelongsTo<typeof File>;
} }

16
app/Models/License.ts
View File

@ -5,6 +5,22 @@ export default class License extends BaseModel {
public static primaryKey = 'id'; public static primaryKey = 'id';
public static table = 'document_licences'; public static table = 'document_licences';
public static selfAssignPrimaryKey = false; public static selfAssignPrimaryKey = false;
public static timestamps = false;
public static fillable: string[] = [
'name_long',
'name',
'language',
'link_licence',
'link_logo',
'desc_text',
'desc_markup',
'comment_internal',
'mime_type',
'sort_order',
'language',
'active',
'pod_allowed',
];
@column({ @column({
isPrimary: true, isPrimary: true,

10
app/Models/Permission.ts
View File

@ -1,12 +1,4 @@
import { import { column, BaseModel, manyToMany, ManyToMany, SnakeCaseNamingStrategy, beforeUpdate, beforeCreate } from '@ioc:Adonis/Lucid/Orm';
column,
BaseModel,
manyToMany,
ManyToMany,
SnakeCaseNamingStrategy,
beforeUpdate,
beforeCreate,
} from '@ioc:Adonis/Lucid/Orm';
import { DateTime } from 'luxon'; import { DateTime } from 'luxon';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import Role from 'App/Models/Role'; import Role from 'App/Models/Role';

22
app/Models/Person.ts
View File

@ -1,27 +1,23 @@
import { import { column, SnakeCaseNamingStrategy, computed, manyToMany, ManyToMany } from '@ioc:Adonis/Lucid/Orm';
column,
BaseModel,
SnakeCaseNamingStrategy,
computed,
manyToMany,
ManyToMany,
} from '@ioc:Adonis/Lucid/Orm';
import { DateTime } from 'luxon'; import { DateTime } from 'luxon';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import Dataset from './Dataset'; import Dataset from './Dataset';
import BaseModel from './BaseModel';
export default class Person extends BaseModel { export default class Person extends BaseModel {
public static namingStrategy = new SnakeCaseNamingStrategy(); public static namingStrategy = new SnakeCaseNamingStrategy();
public static primaryKey = 'id'; public static primaryKey = 'id';
public static table = 'persons'; public static table = 'persons';
public static selfAssignPrimaryKey = false; public static selfAssignPrimaryKey = false;
// only the academic_title, email, first_name, identifier_orcid, last_name and name_type attributes are allowed to be mass assigned.
public static fillable: string[] = ['academic_title', 'email', 'first_name', 'identifier_orcid', 'last_name', 'name_type'];
@column({ @column({
isPrimary: true, isPrimary: true,
}) })
public id: number; public id: number;
@column({}) @column({ columnName: 'academic_title' })
public academicTitle: string; public academicTitle: string;
@column() @column()
@ -51,7 +47,7 @@ export default class Person extends BaseModel {
public createdAt: DateTime; public createdAt: DateTime;
@computed({ @computed({
serializeAs: 'name' serializeAs: 'name',
}) })
public get fullName() { public get fullName() {
return `${this.firstName} ${this.lastName}`; return `${this.firstName} ${this.lastName}`;
@ -69,15 +65,15 @@ export default class Person extends BaseModel {
@computed() @computed()
public get datasetCount() { public get datasetCount() {
const stock = this.$extras.datasets_count //my pivot column name was "stock" const stock = this.$extras.datasets_count; //my pivot column name was "stock"
return stock return stock;
} }
@manyToMany(() => Dataset, { @manyToMany(() => Dataset, {
pivotForeignKey: 'person_id', pivotForeignKey: 'person_id',
pivotRelatedForeignKey: 'document_id', pivotRelatedForeignKey: 'document_id',
pivotTable: 'link_documents_persons', pivotTable: 'link_documents_persons',
pivotColumns: ['role', 'sort_order', 'allow_email_contact'] pivotColumns: ['role', 'sort_order', 'allow_email_contact'],
}) })
public datasets: ManyToMany<typeof Dataset>; public datasets: ManyToMany<typeof Dataset>;
} }

5
app/Models/Project.ts
View File

@ -12,7 +12,6 @@ export default class Project extends BaseModel {
}) })
public id: number; public id: number;
@column({}) @column({})
public label: string; public label: string;
@ -29,9 +28,7 @@ export default class Project extends BaseModel {
@column.dateTime({ @column.dateTime({
autoCreate: true, autoCreate: true,
autoUpdate: true autoUpdate: true,
}) })
public updated_at: DateTime; public updated_at: DateTime;
} }

12
app/Models/Role.ts
View File

@ -1,12 +1,4 @@
import { import { column, BaseModel, SnakeCaseNamingStrategy, manyToMany, ManyToMany, beforeCreate, beforeUpdate } from '@ioc:Adonis/Lucid/Orm';
column,
BaseModel,
SnakeCaseNamingStrategy,
manyToMany,
ManyToMany,
beforeCreate,
beforeUpdate,
} from '@ioc:Adonis/Lucid/Orm';
import { DateTime } from 'luxon'; import { DateTime } from 'luxon';
// import moment from 'moment'; // import moment from 'moment';
@ -48,7 +40,7 @@ export default class Role extends BaseModel {
return value ? dayjs(value).format('MMMM D YYYY HH:mm a') : value; return value ? dayjs(value).format('MMMM D YYYY HH:mm a') : value;
}, },
autoCreate: true, autoCreate: true,
autoUpdate: true autoUpdate: true,
}) })
public updated_at: DateTime; public updated_at: DateTime;

28
app/Models/Title.ts Normal file
View File

@ -0,0 +1,28 @@
import { column, belongsTo, BelongsTo } from '@ioc:Adonis/Lucid/Orm';
import Dataset from './Dataset';
import BaseModel from './BaseModel';
export default class Title extends BaseModel {
public static primaryKey = 'id';
public static table = 'dataset_titles';
public static selfAssignPrimaryKey = false;
public static timestamps = false;
public static fillable: string[] = ['value', 'type', 'language'];
@column({})
public document_id: number;
@column()
public type: string;
@column()
public value: string;
@column()
public language: string;
@belongsTo(() => Dataset, {
foreignKey: 'document_id',
})
public dataset: BelongsTo<typeof Dataset>;
}

10
app/Models/User.ts
View File

@ -1,9 +1,10 @@
import { DateTime } from 'luxon'; import { DateTime } from 'luxon';
import { BaseModel, column, beforeSave, manyToMany, ManyToMany } from '@ioc:Adonis/Lucid/Orm'; import { BaseModel, column, beforeSave, manyToMany, ManyToMany, hasMany, HasMany } from '@ioc:Adonis/Lucid/Orm';
import Hash from '@ioc:Adonis/Core/Hash'; import Hash from '@ioc:Adonis/Core/Hash';
import Role from './Role'; import Role from './Role';
import Database from '@ioc:Adonis/Lucid/Database'; import Database from '@ioc:Adonis/Lucid/Database';
import Config from '@ioc:Adonis/Core/Config'; import Config from '@ioc:Adonis/Core/Config';
import Dataset from './Dataset';
// export default interface IUser { // export default interface IUser {
// id: number; // id: number;
@ -56,6 +57,11 @@ export default class User extends BaseModel {
}) })
public roles: ManyToMany<typeof Role>; public roles: ManyToMany<typeof Role>;
@hasMany(() => Dataset, {
foreignKey: 'account_id',
})
public datasets: HasMany<typeof Dataset>;
// https://github.com/adonisjs/core/discussions/1872#discussioncomment-132289 // https://github.com/adonisjs/core/discussions/1872#discussioncomment-132289
public async getRoles(this: User): Promise<string[]> { public async getRoles(this: User): Promise<string[]> {
const test = await this.related('roles').query(); const test = await this.related('roles').query();
@ -93,7 +99,7 @@ export default class User extends BaseModel {
' p ON rp.permission_id=p.id AND "p"."name" in ' + ' p ON rp.permission_id=p.id AND "p"."name" in ' +
permissionPlaceHolder + permissionPlaceHolder +
' LIMIT 1', ' LIMIT 1',
[user.id, ...permissionNames] [user.id, ...permissionNames],
); );
return permissioncount > 0; return permissioncount > 0;

48
app/Models/UserRole.ts
View File

@ -1,56 +1,56 @@
import {column, BaseModel, belongsTo, BelongsTo, SnakeCaseNamingStrategy} from '@ioc:Adonis/Lucid/Orm' import { column, BaseModel, belongsTo, BelongsTo, SnakeCaseNamingStrategy } from '@ioc:Adonis/Lucid/Orm';
import User from 'App/Models/User' import User from 'App/Models/User';
import Role from 'App/Models/Role' import Role from 'App/Models/Role';
import { DateTime } from 'luxon' import { DateTime } from 'luxon';
// import moment from 'moment' // import moment from 'moment'
export default class UserRole extends BaseModel { export default class UserRole extends BaseModel {
public static namingStrategy = new SnakeCaseNamingStrategy() public static namingStrategy = new SnakeCaseNamingStrategy();
public static primaryKey = 'id' public static primaryKey = 'id';
public static table = 'user_roles' public static table = 'user_roles';
public static selfAssignPrimaryKey = false public static selfAssignPrimaryKey = false;
@column({ @column({
isPrimary: true, isPrimary: true,
}) })
public id: number public id: number;
@column({}) @column({})
public user_id: number public user_id: number;
@column({}) @column({})
public role_id: number public role_id: number;
@column({ @column({
// serialize: (value: DateTime | null) => { // serialize: (value: DateTime | null) => {
// return value ? moment(value).format('lll') : value // return value ? moment(value).format('lll') : value
// }, // },
}) })
public created_at: DateTime public created_at: DateTime;
@column({ @column({
// serialize: (value: DateTime | null) => { // serialize: (value: DateTime | null) => {
// return value ? moment(value).format('lll') : value // return value ? moment(value).format('lll') : value
// }, // },
}) })
public updated_at: DateTime public updated_at: DateTime;
public static boot() { public static boot() {
super.boot() super.boot();
this.before('create', async (_modelInstance) => { this.before('create', async (_modelInstance) => {
_modelInstance.created_at = this.formatDateTime(_modelInstance.created_at) _modelInstance.created_at = this.formatDateTime(_modelInstance.created_at);
_modelInstance.updated_at = this.formatDateTime(_modelInstance.updated_at) _modelInstance.updated_at = this.formatDateTime(_modelInstance.updated_at);
}) });
this.before('update', async (_modelInstance) => { this.before('update', async (_modelInstance) => {
_modelInstance.created_at = this.formatDateTime(_modelInstance.created_at) _modelInstance.created_at = this.formatDateTime(_modelInstance.created_at);
_modelInstance.updated_at = this.formatDateTime(_modelInstance.updated_at) _modelInstance.updated_at = this.formatDateTime(_modelInstance.updated_at);
}) });
} }
private static formatDateTime(datetime) { private static formatDateTime(datetime) {
let value = new Date(datetime) let value = new Date(datetime);
return datetime return datetime
? value.getFullYear() + ? value.getFullYear() +
'-' + '-' +
@ -63,12 +63,12 @@ export default class UserRole extends BaseModel {
value.getMinutes() + value.getMinutes() +
':' + ':' +
value.getSeconds() value.getSeconds()
: datetime : datetime;
} }
@belongsTo(() => User) @belongsTo(() => User)
public user: BelongsTo<typeof User> public user: BelongsTo<typeof User>;
@belongsTo(() => Role) @belongsTo(() => Role)
public role: BelongsTo<typeof Role> public role: BelongsTo<typeof Role>;
} }

157
app/Validators/CreateDatasetValidator.ts Normal file
View File

@ -0,0 +1,157 @@
import { schema, CustomMessages, rules } from '@ioc:Adonis/Core/Validator';
import type { HttpContextContract } from '@ioc:Adonis/Core/HttpContext';
import dayjs from 'dayjs';
import { TitleTypes, DescriptionTypes } from 'Contracts/enums';
export default class CreateDatasetValidator {
constructor(protected ctx: HttpContextContract) {}
/*
* Define schema to validate the "shape", "type", "formatting" and "integrity" of data.
*
* For example:
* 1. The username must be of data type string. But then also, it should
* not contain special characters or numbers.
* ```
* schema.string({}, [ rules.alpha() ])
* ```
*
* 2. The email must be of data type string, formatted as a valid
* email. But also, not used by any other user.
* ```
* schema.string({}, [
* rules.email(),
* rules.unique({ table: 'users', column: 'email' }),
* ])
* ```
*/
public schema = schema.create({
// first step
language: schema.string({ trim: true }, [
rules.regex(/^[a-zA-Z0-9-_]+$/), //Must be alphanumeric with hyphens or underscores
]),
licenses: schema.array([rules.minLength(1)]).members(schema.number()), // define at least one license for the new dataset
rights: schema.string([rules.equalTo('true')]),
// second step
type: schema.string({ trim: true }, [rules.minLength(3), rules.maxLength(255)]),
creating_corporation: schema.string({ trim: true }, [rules.minLength(3), rules.maxLength(255)]),
titles: schema.array([rules.minLength(1)]).members(
schema.object().members({
value: schema.string({ trim: true }, [rules.minLength(3), rules.maxLength(255)]),
type: schema.enum(Object.values(TitleTypes)),
language: schema.string({ trim: true }, [
rules.minLength(2),
rules.maxLength(255),
rules.translatedLanguage('/language', 'type'),
]),
}),
),
descriptions: schema.array([rules.minLength(1)]).members(
schema.object().members({
value: schema.string({ trim: true }, [rules.minLength(3), rules.maxLength(255)]),
type: schema.enum(Object.values(DescriptionTypes)),
language: schema.string({ trim: true }, [
rules.minLength(2),
rules.maxLength(255),
rules.translatedLanguage('/language', 'type'),
]),
}),
),
authors: schema.array([rules.minLength(1)]).members(schema.object().members({ email: schema.string({ trim: true }) })),
// third step
project_id: schema.number.optional(),
embargo_date: schema.date.optional({ format: 'yyyy-MM-dd' }, [rules.after(10, 'days')]),
coverage: schema.object().members({
x_min: schema.number(),
x_max: schema.number(),
y_min: schema.number(),
y_max: schema.number(),
elevation_absolut: schema.number.optional(),
elevation_min: schema.number.optional([rules.requiredIfExists('elevation_max')]),
elevation_max: schema.number.optional([rules.requiredIfExists('elevation_min')]),
depth_absolut: schema.number.optional(),
depth_min: schema.number.optional([rules.requiredIfExists('depth_max')]),
depth_max: schema.number.optional([rules.requiredIfExists('depth_min')]),
}),
subjects: schema.array([rules.minLength(3), rules.uniqueArray('value')]).members(
schema.object().members({
value: schema.string({ trim: true }, [
rules.minLength(3),
rules.maxLength(255),
// rules.unique({ table: 'dataset_subjects', column: 'value' }),
]),
// type: schema.enum(Object.values(TitleTypes)),
language: schema.string({ trim: true }, [rules.minLength(2), rules.maxLength(255)]),
}),
),
// file: schema.file({
// size: '100mb',
// extnames: ['jpg', 'gif', 'png'],
// }),
files: schema.array([rules.minLength(1)]).members(
schema.file({
size: '100mb',
extnames: ['jpg', 'gif', 'png'],
}),
),
// upload: schema.object().members({
// label: schema.string({ trim: true }, [rules.maxLength(255)]),
// // label: schema.string({ trim: true }, [
// // // rules.minLength(3),
// // // rules.maxLength(255),
// // ]),
// }),
});
/**
* Custom messages for validation failures. You can make use of dot notation `(.)`
* for targeting nested fields and array expressions `(*)` for targeting all
* children of an array. For example:
*
* {
* 'profile.username.required': 'Username is required',
* 'scores.*.number': 'Define scores as valid numbers'
* }
*
*/
public messages: CustomMessages = {
'minLength': '{{ field }} must be at least {{ options.minLength }} characters long',
'maxLength': '{{ field }} must be less then {{ options.maxLength }} characters long',
'required': '{{ field }} is required',
'unique': '{{ field }} must be unique, and this value is already taken',
// 'confirmed': '{{ field }} is not correct',
'licences.minLength': 'at least {{ options.minLength }} permission must be defined',
'licences.*.number': 'Define roles as valid numbers',
'rights.equalTo': 'you must agree to continue',
'titles.0.value.minLength': 'Main Title must be at least {{ options.minLength }} characters long',
'titles.0.value.required': 'Main Title is required',
'titles.*.value.required': 'Additional title is required, if defined',
'titles.*.type.required': 'Additional title type is required',
'titles.*.language.required': 'Additional title language is required',
'titles.*.language.translatedLanguage': 'The language of the translated title must be different from the language of the dataset',
'descriptions.0.value.minLength': 'Main Abstract must be at least {{ options.minLength }} characters long',
'descriptions.0.value.required': 'Main Abstract is required',
'descriptions.*.value.required': 'Additional description is required, if defined',
'descriptions.*.type.required': 'Additional description type is required',
'descriptions.*.language.required': 'Additional description language is required',
'descriptions.*.language.translatedLanguage':
'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',
'after': `{{ field }} must be older than ${dayjs().add(10, 'day')}`,
'subjects.minLength': 'at least {{ options.minLength }} keywords must be defined',
'subjects.uniqueArray': 'The {{ options.array }} array must have unique values based on the {{ options.field }} attribute.',
'subjects.*.value.required': 'keyword value is required',
'subjects.*.value.minLength': 'keyword value must be at least {{ options.minLength }} characters long',
'subjects.*.type.required': 'keyword type is required',
'subjects.*.language.required': 'language of keyword is required',
'files.*.size': 'file size is to big',
'files.extnames': 'file extension is not supported',
};
}

2
app/Validators/CreateUserValidator.ts
View File

@ -59,6 +59,6 @@ export default class CreateUserValidator {
'unique': '{{ field }} must be unique, and this value is already taken', 'unique': '{{ field }} must be unique, and this value is already taken',
'confirmed': '{{ field }} is not correct', 'confirmed': '{{ field }} is not correct',
'roles.minLength': 'at least {{ options.minLength }} role must be defined', 'roles.minLength': 'at least {{ options.minLength }} role must be defined',
'roles.*.number': 'Define roles as valid numbers' 'roles.*.number': 'Define roles as valid numbers',
}; };
} }

1
contracts/validator.ts
View File

@ -1,5 +1,6 @@
declare module '@ioc:Adonis/Core/Validator' { declare module '@ioc:Adonis/Core/Validator' {
interface Rules { interface Rules {
translatedLanguage(mainLanguageField: string, typeField: string): Rule; translatedLanguage(mainLanguageField: string, typeField: string): Rule;
uniqueArray(field: string): Rule;
} }
} }

2
database/migrations/dataset_4_titles.ts
View File

@ -12,7 +12,7 @@ export default class DatasetTitles extends BaseSchema {
.foreign('document_id', 'dataset_titles_document_id_foreign') .foreign('document_id', 'dataset_titles_document_id_foreign')
.references('id') .references('id')
.inTable('documents') .inTable('documents')
.onDelete('CASCADE') // delete this titke when document is deleted .onDelete('CASCADE') // delete this title when document is deleted
.onUpdate('CASCADE'); .onUpdate('CASCADE');
// table.string('type', 255).notNullable(); // table.string('type', 255).notNullable();
table.enum('type', Object.values(TitleTypes)).notNullable(); table.enum('type', Object.values(TitleTypes)).notNullable();

1
database/migrations/dataset_9_persons.ts
View File

@ -20,6 +20,7 @@ export default class Persons extends BaseSchema {
table.integer('registered_at'); table.integer('registered_at');
// table.string('name_type', 255); // table.string('name_type', 255);
table.enum('name_type', Object.values(PersonNameTypes)).notNullable(); table.enum('name_type', Object.values(PersonNameTypes)).notNullable();
table.timestamp('created_at', { useTz: false }).nullable();
}); });
} }

8
index.d.ts vendored
View File

@ -1,5 +1,5 @@
declare module '*.vue' { declare module '*.vue' {
import type { DefineComponent } from "vue" import type { DefineComponent } from 'vue';
const component: DefineComponent<{}, {}, any> const component: DefineComponent<{}, {}, any>;
export default component export default component;
} }

166
package-lock.json generated
View File

@ -9,7 +9,7 @@
"version": "1.0.0", "version": "1.0.0",
"dependencies": { "dependencies": {
"@adonisjs/auth": "^8.2.3", "@adonisjs/auth": "^8.2.3",
"@adonisjs/core": "^5.8.3", "@adonisjs/core": "^5.9.0",
"@adonisjs/lucid": "^18.3.0", "@adonisjs/lucid": "^18.3.0",
"@adonisjs/repl": "^3.1.11", "@adonisjs/repl": "^3.1.11",
"@adonisjs/session": "^6.4.0", "@adonisjs/session": "^6.4.0",
@ -571,9 +571,9 @@
} }
}, },
"node_modules/@adonisjs/shield": { "node_modules/@adonisjs/shield": {
"version": "7.1.0", "version": "7.1.1",
"resolved": "https://registry.npmjs.org/@adonisjs/shield/-/shield-7.1.0.tgz", "resolved": "https://registry.npmjs.org/@adonisjs/shield/-/shield-7.1.1.tgz",
"integrity": "sha512-+a4Z+LBcWd46gMh99Wf0+iJMowq4aKuD04kvYB4AgTV78ffn21AXq3bsnoklFACkidEJwZ3FlRfQfKE+z1vg+g==", "integrity": "sha512-y1YzXwravcS/A1yxcyfSD/UrRi2+H9v0ntX9NgVhLYvBF5eHuPzQKgv9sICVjmj2z7n94HzcTAio0Rc32EX51Q==",
"dependencies": { "dependencies": {
"@poppinss/utils": "^4.0.4", "@poppinss/utils": "^4.0.4",
"csrf": "^3.1.0", "csrf": "^3.1.0",
@ -2765,9 +2765,9 @@
} }
}, },
"node_modules/@eslint/js": { "node_modules/@eslint/js": {
"version": "8.42.0", "version": "8.43.0",
"resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.42.0.tgz", "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.43.0.tgz",
"integrity": "sha512-6SWlXpWU5AvId8Ac7zjzmIOqMOba/JWY8XZ4A7q7Gn1Vlfg/SFFIlrtHXt9nPn4op9ZPAkl91Jao+QQv3r/ukw==", "integrity": "sha512-s2UHCoiXfxMvmfzqoN+vrQ84ahUSYde9qNO1MdxmoEhyHWsfmwOpFlwYV+ePJEVc7gFnATGUi376WowX1N7tFg==",
"dev": true, "dev": true,
"engines": { "engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0" "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@ -4094,15 +4094,15 @@
"dev": true "dev": true
}, },
"node_modules/@typescript-eslint/eslint-plugin": { "node_modules/@typescript-eslint/eslint-plugin": {
"version": "5.59.11", "version": "5.60.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.11.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.60.0.tgz",
"integrity": "sha512-XxuOfTkCUiOSyBWIvHlUraLw/JT/6Io1365RO6ZuI88STKMavJZPNMU0lFcUTeQXEhHiv64CbxYxBNoDVSmghg==", "integrity": "sha512-78B+anHLF1TI8Jn/cD0Q00TBYdMgjdOn980JfAVa9yw5sop8nyTfVOQAv6LWywkOGLclDBtv5z3oxN4w7jxyNg==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@eslint-community/regexpp": "^4.4.0", "@eslint-community/regexpp": "^4.4.0",
"@typescript-eslint/scope-manager": "5.59.11", "@typescript-eslint/scope-manager": "5.60.0",
"@typescript-eslint/type-utils": "5.59.11", "@typescript-eslint/type-utils": "5.60.0",
"@typescript-eslint/utils": "5.59.11", "@typescript-eslint/utils": "5.60.0",
"debug": "^4.3.4", "debug": "^4.3.4",
"grapheme-splitter": "^1.0.4", "grapheme-splitter": "^1.0.4",
"ignore": "^5.2.0", "ignore": "^5.2.0",
@ -4128,14 +4128,14 @@
} }
}, },
"node_modules/@typescript-eslint/parser": { "node_modules/@typescript-eslint/parser": {
"version": "5.59.11", "version": "5.60.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.11.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.60.0.tgz",
"integrity": "sha512-s9ZF3M+Nym6CAZEkJJeO2TFHHDsKAM3ecNkLuH4i4s8/RCPnF5JRip2GyviYkeEAcwGMJxkqG9h2dAsnA1nZpA==", "integrity": "sha512-jBONcBsDJ9UoTWrARkRRCgDz6wUggmH5RpQVlt7BimSwaTkTjwypGzKORXbR4/2Hqjk9hgwlon2rVQAjWNpkyQ==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@typescript-eslint/scope-manager": "5.59.11", "@typescript-eslint/scope-manager": "5.60.0",
"@typescript-eslint/types": "5.59.11", "@typescript-eslint/types": "5.60.0",
"@typescript-eslint/typescript-estree": "5.59.11", "@typescript-eslint/typescript-estree": "5.60.0",
"debug": "^4.3.4" "debug": "^4.3.4"
}, },
"engines": { "engines": {
@ -4155,13 +4155,13 @@
} }
}, },
"node_modules/@typescript-eslint/scope-manager": { "node_modules/@typescript-eslint/scope-manager": {
"version": "5.59.11", "version": "5.60.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.11.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.60.0.tgz",
"integrity": "sha512-dHFOsxoLFtrIcSj5h0QoBT/89hxQONwmn3FOQ0GOQcLOOXm+MIrS8zEAhs4tWl5MraxCY3ZJpaXQQdFMc2Tu+Q==", "integrity": "sha512-hakuzcxPwXi2ihf9WQu1BbRj1e/Pd8ZZwVTG9kfbxAMZstKz8/9OoexIwnmLzShtsdap5U/CoQGRCWlSuPbYxQ==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@typescript-eslint/types": "5.59.11", "@typescript-eslint/types": "5.60.0",
"@typescript-eslint/visitor-keys": "5.59.11" "@typescript-eslint/visitor-keys": "5.60.0"
}, },
"engines": { "engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0" "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@ -4172,13 +4172,13 @@
} }
}, },
"node_modules/@typescript-eslint/type-utils": { "node_modules/@typescript-eslint/type-utils": {
"version": "5.59.11", "version": "5.60.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.11.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.60.0.tgz",
"integrity": "sha512-LZqVY8hMiVRF2a7/swmkStMYSoXMFlzL6sXV6U/2gL5cwnLWQgLEG8tjWPpaE4rMIdZ6VKWwcffPlo1jPfk43g==", "integrity": "sha512-X7NsRQddORMYRFH7FWo6sA9Y/zbJ8s1x1RIAtnlj6YprbToTiQnM6vxcMu7iYhdunmoC0rUWlca13D5DVHkK2g==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@typescript-eslint/typescript-estree": "5.59.11", "@typescript-eslint/typescript-estree": "5.60.0",
"@typescript-eslint/utils": "5.59.11", "@typescript-eslint/utils": "5.60.0",
"debug": "^4.3.4", "debug": "^4.3.4",
"tsutils": "^3.21.0" "tsutils": "^3.21.0"
}, },
@ -4199,9 +4199,9 @@
} }
}, },
"node_modules/@typescript-eslint/types": { "node_modules/@typescript-eslint/types": {
"version": "5.59.11", "version": "5.60.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.11.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.60.0.tgz",
"integrity": "sha512-epoN6R6tkvBYSc+cllrz+c2sOFWkbisJZWkOE+y3xHtvYaOE6Wk6B8e114McRJwFRjGvYdJwLXQH5c9osME/AA==", "integrity": "sha512-ascOuoCpNZBccFVNJRSC6rPq4EmJ2NkuoKnd6LDNyAQmdDnziAtxbCGWCbefG1CNzmDvd05zO36AmB7H8RzKPA==",
"dev": true, "dev": true,
"engines": { "engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0" "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@ -4212,13 +4212,13 @@
} }
}, },
"node_modules/@typescript-eslint/typescript-estree": { "node_modules/@typescript-eslint/typescript-estree": {
"version": "5.59.11", "version": "5.60.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.11.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.60.0.tgz",
"integrity": "sha512-YupOpot5hJO0maupJXixi6l5ETdrITxeo5eBOeuV7RSKgYdU3G5cxO49/9WRnJq9EMrB7AuTSLH/bqOsXi7wPA==", "integrity": "sha512-R43thAuwarC99SnvrBmh26tc7F6sPa2B3evkXp/8q954kYL6Ro56AwASYWtEEi+4j09GbiNAHqYwNNZuNlARGQ==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@typescript-eslint/types": "5.59.11", "@typescript-eslint/types": "5.60.0",
"@typescript-eslint/visitor-keys": "5.59.11", "@typescript-eslint/visitor-keys": "5.60.0",
"debug": "^4.3.4", "debug": "^4.3.4",
"globby": "^11.1.0", "globby": "^11.1.0",
"is-glob": "^4.0.3", "is-glob": "^4.0.3",
@ -4289,17 +4289,17 @@
} }
}, },
"node_modules/@typescript-eslint/utils": { "node_modules/@typescript-eslint/utils": {
"version": "5.59.11", "version": "5.60.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.11.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.60.0.tgz",
"integrity": "sha512-didu2rHSOMUdJThLk4aZ1Or8IcO3HzCw/ZvEjTTIfjIrcdd5cvSIwwDy2AOlE7htSNp7QIZ10fLMyRCveesMLg==", "integrity": "sha512-ba51uMqDtfLQ5+xHtwlO84vkdjrqNzOnqrnwbMHMRY8Tqeme8C2Q8Fc7LajfGR+e3/4LoYiWXUM6BpIIbHJ4hQ==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/eslint-utils": "^4.2.0",
"@types/json-schema": "^7.0.9", "@types/json-schema": "^7.0.9",
"@types/semver": "^7.3.12", "@types/semver": "^7.3.12",
"@typescript-eslint/scope-manager": "5.59.11", "@typescript-eslint/scope-manager": "5.60.0",
"@typescript-eslint/types": "5.59.11", "@typescript-eslint/types": "5.60.0",
"@typescript-eslint/typescript-estree": "5.59.11", "@typescript-eslint/typescript-estree": "5.60.0",
"eslint-scope": "^5.1.1", "eslint-scope": "^5.1.1",
"semver": "^7.3.7" "semver": "^7.3.7"
}, },
@ -4337,12 +4337,12 @@
} }
}, },
"node_modules/@typescript-eslint/visitor-keys": { "node_modules/@typescript-eslint/visitor-keys": {
"version": "5.59.11", "version": "5.60.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.11.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.60.0.tgz",
"integrity": "sha512-KGYniTGG3AMTuKF9QBD7EIrvufkB6O6uX3knP73xbKLMpH+QRPcgnCxjWXSHjMRuOxFLovljqQgQpR0c7GvjoA==", "integrity": "sha512-wm9Uz71SbCyhUKgcaPRauBdTegUyY/ZWl8gLwD/i/ybJqscrrdVSFImpvUz16BLPChIeKBK5Fa9s6KDQjsjyWw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@typescript-eslint/types": "5.59.11", "@typescript-eslint/types": "5.60.0",
"eslint-visitor-keys": "^3.3.0" "eslint-visitor-keys": "^3.3.0"
}, },
"engines": { "engines": {
@ -4723,9 +4723,9 @@
} }
}, },
"node_modules/acorn": { "node_modules/acorn": {
"version": "8.8.2", "version": "8.9.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.9.0.tgz",
"integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==", "integrity": "sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==",
"bin": { "bin": {
"acorn": "bin/acorn" "acorn": "bin/acorn"
}, },
@ -5741,9 +5741,9 @@
} }
}, },
"node_modules/browserslist": { "node_modules/browserslist": {
"version": "4.21.8", "version": "4.21.9",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.8.tgz", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.9.tgz",
"integrity": "sha512-j+7xYe+v+q2Id9qbBeCI8WX5NmZSRe8es1+0xntD/+gaWXznP8tFEkv5IgSaHf5dS1YwVMbX/4W6m937mj+wQw==", "integrity": "sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==",
"dev": true, "dev": true,
"funding": [ "funding": [
{ {
@ -5760,8 +5760,8 @@
} }
], ],
"dependencies": { "dependencies": {
"caniuse-lite": "^1.0.30001502", "caniuse-lite": "^1.0.30001503",
"electron-to-chromium": "^1.4.428", "electron-to-chromium": "^1.4.431",
"node-releases": "^2.0.12", "node-releases": "^2.0.12",
"update-browserslist-db": "^1.0.11" "update-browserslist-db": "^1.0.11"
}, },
@ -5943,9 +5943,9 @@
} }
}, },
"node_modules/caniuse-lite": { "node_modules/caniuse-lite": {
"version": "1.0.30001503", "version": "1.0.30001506",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001503.tgz", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001506.tgz",
"integrity": "sha512-Sf9NiF+wZxPfzv8Z3iS0rXM1Do+iOy2Lxvib38glFX+08TCYYYGR5fRJXk4d77C4AYwhUjgYgMsMudbh2TqCKw==", "integrity": "sha512-6XNEcpygZMCKaufIcgpQNZNf00GEqc7VQON+9Rd0K1bMYo8xhMZRAo5zpbnbMNizi4YNgIDAFrdykWsvY3H4Hw==",
"dev": true, "dev": true,
"funding": [ "funding": [
{ {
@ -7498,9 +7498,9 @@
} }
}, },
"node_modules/dotenv": { "node_modules/dotenv": {
"version": "16.1.4", "version": "16.3.1",
"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.1.4.tgz", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz",
"integrity": "sha512-m55RtE8AsPeJBpOIFKihEmqUcoVncQIwo7x9U8ZwLEZw9ZpXboz2c+rvog+jUaJvVrZ5kBOeYQBX5+8Aa/OZQw==", "integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==",
"engines": { "engines": {
"node": ">=12" "node": ">=12"
}, },
@ -7648,9 +7648,9 @@
"integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
}, },
"node_modules/electron-to-chromium": { "node_modules/electron-to-chromium": {
"version": "1.4.431", "version": "1.4.436",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.431.tgz", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.436.tgz",
"integrity": "sha512-m232JTVmCawA2vG+1azVxhKZ9Sv1Q//xxNv5PkP5rWxGgQE8c3CiZFrh8Xnp+d1NmNxlu3QQrGIfdeW5TtXX5w==", "integrity": "sha512-aktOxo8fnrMC8vOIBMVS3PXbT1nrPQ+SouUuN7Y0a+Rw3pOMrvIV92Ybnax7x4tugA+ZpYA5fOHTby7ama8OQQ==",
"dev": true "dev": true
}, },
"node_modules/emittery": { "node_modules/emittery": {
@ -7729,9 +7729,9 @@
} }
}, },
"node_modules/envinfo": { "node_modules/envinfo": {
"version": "7.8.1", "version": "7.9.0",
"resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz", "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.9.0.tgz",
"integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==", "integrity": "sha512-RODB4txU+xImYDemN5DqaKC0CHk05XSVkOX4pq0hK26Qx+1LChkuOyUDlGEjYb3ACr0n9qBhFjg37hQuJvpkRQ==",
"dev": true, "dev": true,
"peer": true, "peer": true,
"bin": { "bin": {
@ -7798,15 +7798,15 @@
} }
}, },
"node_modules/eslint": { "node_modules/eslint": {
"version": "8.42.0", "version": "8.43.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.42.0.tgz", "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.43.0.tgz",
"integrity": "sha512-ulg9Ms6E1WPf67PHaEY4/6E2tEn5/f7FXGzr3t9cBMugOmf1INYvuUwwh1aXQN4MfJ6a5K2iNwP3w4AColvI9A==", "integrity": "sha512-aaCpf2JqqKesMFGgmRPessmVKjcGXqdlAYLLC3THM8t5nBRZRQ+st5WM/hoJXkdioEXLLbXgclUpM0TXo5HX5Q==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/eslint-utils": "^4.2.0",
"@eslint-community/regexpp": "^4.4.0", "@eslint-community/regexpp": "^4.4.0",
"@eslint/eslintrc": "^2.0.3", "@eslint/eslintrc": "^2.0.3",
"@eslint/js": "8.42.0", "@eslint/js": "8.43.0",
"@humanwhocodes/config-array": "^0.11.10", "@humanwhocodes/config-array": "^0.11.10",
"@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/module-importer": "^1.0.1",
"@nodelib/fs.walk": "^1.2.8", "@nodelib/fs.walk": "^1.2.8",
@ -12641,9 +12641,9 @@
} }
}, },
"node_modules/pirates": { "node_modules/pirates": {
"version": "4.0.5", "version": "4.0.6",
"resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz", "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
"integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==", "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
"dev": true, "dev": true,
"engines": { "engines": {
"node": ">= 6" "node": ">= 6"
@ -14206,9 +14206,9 @@
} }
}, },
"node_modules/semver": { "node_modules/semver": {
"version": "7.5.1", "version": "7.5.2",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
"integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==", "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
"dependencies": { "dependencies": {
"lru-cache": "^6.0.0" "lru-cache": "^6.0.0"
}, },
@ -15477,9 +15477,9 @@
} }
}, },
"node_modules/terser": { "node_modules/terser": {
"version": "5.18.0", "version": "5.18.1",
"resolved": "https://registry.npmjs.org/terser/-/terser-5.18.0.tgz", "resolved": "https://registry.npmjs.org/terser/-/terser-5.18.1.tgz",
"integrity": "sha512-pdL757Ig5a0I+owA42l6tIuEycRuM7FPY4n62h44mRLRfnOxJkkOHd6i89dOpwZlpF6JXBwaAHF6yWzFrt+QyA==", "integrity": "sha512-j1n0Ao919h/Ai5r43VAnfV/7azUYW43GPxK7qSATzrsERfW7+y2QW9Cp9ufnRF5CQUWbnLSo7UJokSWCqg4tsQ==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@jridgewell/source-map": "^0.3.3", "@jridgewell/source-map": "^0.3.3",
@ -16408,9 +16408,9 @@
} }
}, },
"node_modules/webpack": { "node_modules/webpack": {
"version": "5.87.0", "version": "5.88.0",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.87.0.tgz", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.0.tgz",
"integrity": "sha512-GOu1tNbQ7p1bDEoFRs2YPcfyGs8xq52yyPBZ3m2VGnXGtV9MxjrkABHm4V9Ia280OefsSLzvbVoXcfLxjKY/Iw==", "integrity": "sha512-O3jDhG5e44qIBSi/P6KpcCcH7HD+nYIHVBhdWFxcLOcIGN8zGo5nqF3BjyNCxIh4p1vFdNnreZv2h2KkoAw3lw==",
"dev": true, "dev": true,
"peer": true, "peer": true,
"dependencies": { "dependencies": {

4
package.json
View File

@ -9,7 +9,7 @@
"start": "node server.js", "start": "node server.js",
"lint": "eslint . --ext=.ts", "lint": "eslint . --ext=.ts",
"format": "prettier --write .", "format": "prettier --write .",
"format-check": "prettier --check ./**/*.ts", "format-check": "prettier --check ./**/*.{ts,js}",
"test": "node ace test" "test": "node ace test"
}, },
"eslintConfig": { "eslintConfig": {
@ -74,7 +74,7 @@
}, },
"dependencies": { "dependencies": {
"@adonisjs/auth": "^8.2.3", "@adonisjs/auth": "^8.2.3",
"@adonisjs/core": "^5.8.3", "@adonisjs/core": "^5.9.0",
"@adonisjs/lucid": "^18.3.0", "@adonisjs/lucid": "^18.3.0",
"@adonisjs/repl": "^3.1.11", "@adonisjs/repl": "^3.1.11",
"@adonisjs/session": "^6.4.0", "@adonisjs/session": "^6.4.0",

2
postcss.config.js
View File

@ -3,4 +3,4 @@ module.exports = {
tailwindcss: {}, tailwindcss: {},
autoprefixer: {}, autoprefixer: {},
}, },
} };

33
resources/js/Dataset.ts
View File

@ -1,7 +1,17 @@
import { Ref } from 'vue'; import { Ref } from 'vue';
export interface Dataset { export interface Dataset {
[key: string]: string | Ref<string>| boolean | Array<Title> | Array<Description>| Array<Person> | number | (IErrorMessage | undefined) | Coverage | Array<File>; [key: string]:
| string
| Ref<string>
| boolean
| Array<Title>
| Array<Description>
| Array<Person>
| number
| (IErrorMessage | undefined)
| Coverage
| Array<File>;
language: Ref<string>; language: Ref<string>;
// licenses: Array<number>; // licenses: Array<number>;
rights: boolean; rights: boolean;
@ -12,23 +22,22 @@ export interface Dataset {
authors: Array<Person>; authors: Array<Person>;
contributors: Array<Person>; contributors: Array<Person>;
project_id?: number; project_id?: number;
embargo_date?: string, embargo_date?: string;
coverage: Coverage, coverage: Coverage;
errors?: IErrorMessage; errors?: IErrorMessage;
// async (user): Promise<void>; // async (user): Promise<void>;
subjects: Array<Subject>, subjects: Array<Subject>;
files: Array<TestFile> | undefined, files: Array<TestFile> | undefined;
// upload: TethysFile // upload: TethysFile
} }
/** Provides information about files and allows JavaScript in a web page to access their content. */ /** Provides information about files and allows JavaScript in a web page to access their content. */
export interface TestFile extends Blob { export interface TestFile extends Blob {
readonly lastModified: number; readonly lastModified: number;
readonly name: string; readonly name: string;
readonly webkitRelativePath: string; readonly webkitRelativePath: string;
label: string, label: string;
sorting: number, sorting: number;
} }
// export interface TethysFile { // export interface TethysFile {
@ -39,7 +48,7 @@ export interface TestFile extends Blob {
export interface Subject { export interface Subject {
// id: number; // id: number;
language: string language: string;
type: string; type: string;
value: string; value: string;
external_key?: string; external_key?: string;
@ -84,7 +93,7 @@ export interface Coverage {
depth_max?: number; depth_max?: number;
depth_absolut?: number; depth_absolut?: number;
time_min?: number, time_min?: number;
time_max?: number, time_max?: number;
time_absolut?: number time_absolut?: number;
} }

46
resources/js/styles.js
View File

@ -1,25 +1,25 @@
export const basic = { export const basic = {
aside: "bg-gray-800", aside: 'bg-gray-800',
asideScrollbars: "aside-scrollbars-gray", asideScrollbars: 'aside-scrollbars-gray',
asideBrand: "bg-gray-900 text-white", asideBrand: 'bg-gray-900 text-white',
asideMenuItem: "text-gray-300 hover:text-white", asideMenuItem: 'text-gray-300 hover:text-white',
asideMenuItemActive: "font-bold text-white", asideMenuItemActive: 'font-bold text-white',
asideMenuDropdown: "bg-gray-700/50", asideMenuDropdown: 'bg-gray-700/50',
navBarItemLabel: "text-black", navBarItemLabel: 'text-black',
navBarItemLabelHover: "hover:text-blue-500", navBarItemLabelHover: 'hover:text-blue-500',
navBarItemLabelActiveColor: "text-blue-600", navBarItemLabelActiveColor: 'text-blue-600',
overlay: "from-gray-700 via-gray-900 to-gray-700", overlay: 'from-gray-700 via-gray-900 to-gray-700',
}; };
export const white = { export const white = {
aside: "bg-white", aside: 'bg-white',
asideScrollbars: "aside-scrollbars-light", asideScrollbars: 'aside-scrollbars-light',
asideBrand: "", asideBrand: '',
asideMenuItem: "text-blue-600 hover:text-black dark:text-white", asideMenuItem: 'text-blue-600 hover:text-black dark:text-white',
asideMenuItemActive: "font-bold text-black dark:text-white", asideMenuItemActive: 'font-bold text-black dark:text-white',
asideMenuDropdown: "bg-gray-100/75", asideMenuDropdown: 'bg-gray-100/75',
navBarItemLabel: "text-blue-600", navBarItemLabel: 'text-blue-600',
navBarItemLabelHover: "hover:text-black", navBarItemLabelHover: 'hover:text-black',
navBarItemLabelActiveColor: "text-black", navBarItemLabelActiveColor: 'text-black',
overlay: "from-white via-gray-100 to-white", overlay: 'from-white via-gray-100 to-white',
}; };

28
start/validator.ts
View File

@ -11,6 +11,34 @@ https://issuehunt.io/r/adonisjs/validator/issues/84
// import { string } from '@ioc:Adonis/Core/Helpers'; // import { string } from '@ioc:Adonis/Core/Helpers';
import { validator } from '@ioc:Adonis/Core/Validator'; import { validator } from '@ioc:Adonis/Core/Validator';
validator.rule('uniqueArray', (dataArray, [field], { pointer, arrayExpressionPointer, errorReporter }) => {
const array = dataArray; //validator.helpers.getFieldValue(data, field, tip);
if (!Array.isArray(array)) {
throw new Error(`The ${pointer} must be an array.`);
}
const uniqueValues = new Set();
for (let i = 0; i < array.length; i++) {
const item = array[i];
const attributeValue = item[field]; // Extract the attribute value for uniqueness check
if (uniqueValues.has(attributeValue)) {
// throw new Error(`The ${field} array contains duplicate values for the ${field} attribute.`)
errorReporter.report(
pointer,
'uniqueArray', // Keep an eye on this
`The ${pointer} array contains duplicate values for the ${field} attribute.`,
arrayExpressionPointer,
{ field, array: pointer },
);
return;
}
uniqueValues.add(attributeValue);
}
});
validator.rule( validator.rule(
'translatedLanguage', 'translatedLanguage',
(value, [mainLanguageField, typeField], { root, tip, pointer, arrayExpressionPointer, errorReporter }) => { (value, [mainLanguageField, typeField], { root, tip, pointer, arrayExpressionPointer, errorReporter }) => {

12
tailwind.config.js
View File

@ -15,10 +15,10 @@ module.exports = {
'primary': '#22C55E', 'primary': '#22C55E',
'primary-dark': '#DCFCE7', 'primary-dark': '#DCFCE7',
}, },
// fontFamily: { fontFamily: {
// sans: ['Inter', ...defaultTheme.fontFamily.sans], sans: ['Inter', ...defaultTheme.fontFamily.sans],
// logo: ['Archivo Black', ...defaultTheme.fontFamily.sans], logo: ['Archivo Black', ...defaultTheme.fontFamily.sans],
// }, },
zIndex: { zIndex: {
'-1': '-1', '-1': '-1',
}, },
@ -61,9 +61,7 @@ module.exports = {
return { return {
'scrollbarWidth': 'thin', 'scrollbarWidth': 'thin',
'scrollbarColor': `${theme(`colors.${color}.${thumb}`)} ${theme( 'scrollbarColor': `${theme(`colors.${color}.${thumb}`)} ${theme(`colors.${color}.${track}`)}`,
`colors.${color}.${track}`,
)}`,
'&::-webkit-scrollbar': { '&::-webkit-scrollbar': {
width: '8px', width: '8px',
height: '8px', height: '8px',

35
webpack.config.js
View File

@ -278,27 +278,26 @@ Encore.addLoader({
cacheIdentifier: 'f930df3e', cacheIdentifier: 'f930df3e',
babelParserPlugins: ['jsx', 'classProperties', 'decorators-legacy'], babelParserPlugins: ['jsx', 'classProperties', 'decorators-legacy'],
}, },
}) }).addPlugin(new VueLoaderPlugin());
.addPlugin(new VueLoaderPlugin()) // .addAliases({
// .addAliases({ // vue$: 'vue/dist/vue.runtime.esm-bundler.js',
// vue$: 'vue/dist/vue.runtime.esm-bundler.js', // });
// });
Encore.addLoader(babelLoader) Encore.addLoader(babelLoader)
// Encore.enableTypeScriptLoader(config => { // Encore.enableTypeScriptLoader(config => {
// // Loader-specific options // // Loader-specific options
// config.configFile = 'tsconfig.vue.json'; // config.configFile = 'tsconfig.vue.json';
// config.appendTsSuffixTo = [/\.vue$/]; // config.appendTsSuffixTo = [/\.vue$/];
// config.transpileOnly = true; // config.transpileOnly = true;
// config.happyPackMode = false; // config.happyPackMode = false;
// }, { // }, {
// // Directly change the exclude rule // // Directly change the exclude rule
// exclude: /node_modules/, // exclude: /node_modules/,
// }) // })
.addAliases({ .addAliases({
'@': join(__dirname, 'resources/js'), '@': join(__dirname, 'resources/js'),
vue$: 'vue/dist/vue.runtime.esm-bundler.js' 'vue$': 'vue/dist/vue.runtime.esm-bundler.js',
}) })
.configureDefinePlugin((options) => { .configureDefinePlugin((options) => {
options['__VUE_OPTIONS_API__'] = true; options['__VUE_OPTIONS_API__'] = true;
@ -381,7 +380,7 @@ config.stats = 'errors-warnings';
// // // '@': path.resolve(__dirname, 'resources/js'), // // // '@': path.resolve(__dirname, 'resources/js'),
// // } // // }
// }; // };
config.resolve.extensions = [ '.tsx', '.ts', '.mjs', '.js', '.jsx', '.vue', '.json', '.wasm']; config.resolve.extensions = ['.tsx', '.ts', '.mjs', '.js', '.jsx', '.vue', '.json', '.wasm'];
// config.resolve = { // config.resolve = {
// // vue: 'vue/dist/vue.js' // // vue: 'vue/dist/vue.js'
@ -390,8 +389,6 @@ config.resolve.extensions = [ '.tsx', '.ts', '.mjs', '.js', '.jsx', '.vue', '.js
// } // }
// } // }
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Export config | Export config