- update to AdonisJS 6

app/Controllers/Http/Reviewer/DatasetController.ts

@@ -1,14 +1,19 @@
-import type { HttpContextContract } from '@ioc:Adonis/Core/HttpContext';
-import User from 'App/Models/User';
-import Dataset from 'App/Models/Dataset';
-import type { ModelQueryBuilderContract } from '@ioc:Adonis/Lucid/Orm';
-import Field from 'App/Library/Field';
-import BaseModel from 'App/Models/BaseModel';
+import type { HttpContext } from '@adonisjs/core/http';
+import User from '#app/Models/User';
+import Dataset from '#app/Models/Dataset';
+import Field from '#app/Library/Field';
+import BaseModel from '#app/Models/BaseModel';
 import { DateTime } from 'luxon';
-import { schema, rules } from '@ioc:Adonis/Core/Validator';
+import { schema, rules } from '@adonisjs/validator';
+import { ModelQueryBuilderContract } from "@adonisjs/lucid/types/model";
+
+interface Dictionary {
+    [index: string]: string;
+}
+
 
 export default class DatasetsController {
-    public async index({ auth, request, inertia }: HttpContextContract) {
+    public async index({ auth, request, inertia }: HttpContext) {
         const user = (await User.find(auth.user?.id)) as User;
         const page = request.input('page', 1);
         let datasets: ModelQueryBuilderContract<typeof Dataset, Dataset> = Dataset.query();
@@ -55,7 +60,7 @@ export default class DatasetsController {
         });
     }
 
-    public async review({ request, inertia, response }: HttpContextContract) {
+    public async review({ request, inertia, response }: HttpContext) {
         const id = request.param('id');
         const dataset = await Dataset.query()
             .where('id', id)
@@ -79,7 +84,7 @@ export default class DatasetsController {
         }
 
         const fieldnames: Array<string> = await dataset.describe();
-        const fields = {};
+        const fields: Dictionary = {};
         for (const fieldName of fieldnames) {
             const field: Field = dataset.getField(fieldName) as Field;
             const modelClass = field.getValueModelClass();
@@ -154,7 +159,7 @@ export default class DatasetsController {
         });
     }
 
-    public async reviewUpdate({ request, response }) {
+    public async reviewUpdate({ request, response }: HttpContext) {
         const id = request.param('id');
         // const { id } = params;
         const dataset = await Dataset.findOrFail(id);
@@ -185,7 +190,7 @@ export default class DatasetsController {
         }
     }
 
-    public async reject({ request, inertia, response }: HttpContextContract) {
+    public async reject({ request, inertia, response }: HttpContext) {
         const id = request.param('id');
         const dataset = await Dataset.query()
             .where('id', id)
@@ -213,7 +218,7 @@ export default class DatasetsController {
         });
     }
 
-    public async rejectUpdate({ request, response }) {
+    public async rejectUpdate({ request, response }: HttpContext) {
         const id = request.param('id');
         const dataset = await Dataset.query()
             .where('id', id)