From 6fa22aad9b1d58c499f666dd94eb4113524d16ff Mon Sep 17 00:00:00 2001
From: Arno Kaimbacher <arno.kaimbacher@geosphere.at>
Date: Tue, 5 Sep 2023 18:18:42 +0200
Subject: [PATCH] - prettier format checking - added the possibility to delete
 'inprogress' dataset again for the submitter - concat run commands insider
 Dockerfile for better docker image - npm updates - add own Exception classes
 HttpException.ts and InternalServerException.ts

---
 Dockerfile                                    |  14 +-
 app/Controllers/Http/Api/DatasetController.ts |   2 +-
 app/Controllers/Http/Api/HomeController.ts    |  10 +-
 .../Http/Submitter/DatasetController.ts       | 119 ++++--
 app/Exceptions/HttpException.ts               |  12 +
 app/Exceptions/InternalServerException.ts     |  10 +
 app/Models/Dataset.ts                         |   2 +-
 app/Models/DatasetIdentifier.ts               |   2 +-
 app/Models/DatasetReference.ts                |   2 -
 components.d.ts                               |   4 +-
 contracts/enums.ts                            |  15 +-
 database/migrations/dataset_2_documents.ts    |   2 +-
 package-lock.json                             | 348 +++++++++---------
 resources/js/Components/TablePersons.vue      |   4 +
 resources/js/Dataset.ts                       |   2 +-
 .../js/Pages/Submitter/Dataset/Delete.vue     | 131 +++++++
 .../js/Pages/Submitter/Dataset/Index.vue      |  41 +--
 start/routes.ts                               |   4 +
 18 files changed, 473 insertions(+), 251 deletions(-)
 create mode 100644 app/Exceptions/HttpException.ts
 create mode 100644 app/Exceptions/InternalServerException.ts
 create mode 100644 resources/js/Pages/Submitter/Dataset/Delete.vue

diff --git a/Dockerfile b/Dockerfile
index 4c0b66d..128ed11 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,11 @@ RUN apt update \
     && mkdir -p /home/node/app && chown node:node /home/node/app \
     &&  mkdir -p /var/lib/clamav \
     && mkdir /usr/local/share/clamav \
-    && chown -R node:clamav /var/lib/clamav /usr/local/share/clamav /etc/clamav
+    && chown -R node:clamav /var/lib/clamav /usr/local/share/clamav /etc/clamav \
+    # permissions
+    && mkdir /var/run/clamav \
+    && chown node:clamav /var/run/clamav \
+    && chmod 750 /var/run/clamav
 # -----------------------------------------------
 # --- ClamAV & FeshClam -------------------------
 # -----------------------------------------------
@@ -28,10 +32,10 @@ RUN apt update \
 # Configure Clam AV...
 COPY --chown=node:clamav ./*.conf /etc/clamav/
 
-# permissions
-RUN mkdir /var/run/clamav && \
-    chown node:clamav /var/run/clamav && \
-    chmod 750 /var/run/clamav
+# # permissions
+# RUN mkdir /var/run/clamav && \
+#     chown node:clamav /var/run/clamav && \
+#     chmod 750 /var/run/clamav
 # Setting the working directory
 WORKDIR /home/node/app
 # Changing the current active user to "node"
diff --git a/app/Controllers/Http/Api/DatasetController.ts b/app/Controllers/Http/Api/DatasetController.ts
index e4d10c3..5245c26 100644
--- a/app/Controllers/Http/Api/DatasetController.ts
+++ b/app/Controllers/Http/Api/DatasetController.ts
@@ -14,7 +14,7 @@ export default class DatasetController {
         return datasets;
     }
 
-    public async findAll({ response }: HttpContextContract) {       
+    public async findAll({ response }: HttpContextContract) {
         try {
             const datasets = await Dataset.query()
                 .where('server_state', 'published')
diff --git a/app/Controllers/Http/Api/HomeController.ts b/app/Controllers/Http/Api/HomeController.ts
index f4947c9..6f15773 100644
--- a/app/Controllers/Http/Api/HomeController.ts
+++ b/app/Controllers/Http/Api/HomeController.ts
@@ -18,15 +18,7 @@ export default class HomeController {
             //     .orderBy('server_date_published');
 
             const datasets = await Database.from('documents as doc')
-                .select([                   
-                    'publish_id',
-                    'server_date_published',
-                    Database.raw(`date_part('year', server_date_published) as pub_year`)
-                ],
-                    // Database
-                    //   .raw('select "ip_address" from "user_logins" where "users.id" = "user_logins.user_id" limit 1')
-                    //   .wrap('(', ')')
-                )
+                .select(['publish_id', 'server_date_published', Database.raw(`date_part('year', server_date_published) as pub_year`)])
                 .where('server_state', serverState)
                 .innerJoin('link_documents_persons as ba', 'doc.id', 'ba.document_id')
                 .andWhereRaw(`date_part('year', server_date_published) = ?`, [from])
diff --git a/app/Controllers/Http/Submitter/DatasetController.ts b/app/Controllers/Http/Submitter/DatasetController.ts
index 1922005..70d19ce 100644
--- a/app/Controllers/Http/Submitter/DatasetController.ts
+++ b/app/Controllers/Http/Submitter/DatasetController.ts
@@ -8,8 +8,6 @@ import Description from 'App/Models/Description';
 import Language from 'App/Models/Language';
 import Coverage from 'App/Models/Coverage';
 import Collection from 'App/Models/Collection';
-// import CreateUserValidator from 'App/Validators/CreateUserValidator';
-// import UpdateUserValidator from 'App/Validators/UpdateUserValidator';
 import { schema, CustomMessages, rules } from '@ioc:Adonis/Core/Validator';
 import dayjs from 'dayjs';
 import Person from 'App/Models/Person';
@@ -17,13 +15,23 @@ import Database from '@ioc:Adonis/Lucid/Database';
 import { TransactionClientContract } from '@ioc:Adonis/Lucid/Database';
 import Subject from 'App/Models/Subject';
 import CreateDatasetValidator from 'App/Validators/CreateDatasetValidator';
-import { TitleTypes, DescriptionTypes, ContributorTypes, PersonNameTypes, ReferenceIdentifierTypes, RelationTypes } from 'Contracts/enums';
+import {
+    TitleTypes,
+    DescriptionTypes,
+    ContributorTypes,
+    PersonNameTypes,
+    ReferenceIdentifierTypes,
+    RelationTypes,
+    DatasetTypes,
+} from 'Contracts/enums';
 import type { ModelQueryBuilderContract } from '@ioc:Adonis/Lucid/Orm';
 import DatasetReference from 'App/Models/DatasetReference';
 import { cuid } from '@ioc:Adonis/Core/Helpers';
 import File from 'App/Models/File';
 import ClamScan from 'clamscan';
 import { ValidationException } from '@ioc:Adonis/Core/Validator';
+import Drive from '@ioc:Adonis/Core/Drive';
+import { Exception } from '@adonisjs/core/build/standalone';
 
 export default class DatasetController {
     public async index({ auth, request, inertia }: HttpContextContract) {
@@ -98,30 +106,21 @@ export default class DatasetController {
 
         const projects = await Project.query().pluck('label', 'id');
 
-        const doctypes = {
-            analysisdata: { label: 'Analysis', value: 'analysisdata' },
-            measurementdata: { label: 'Measurements', value: 'measurementdata' },
-            monitoring: 'Monitoring',
-            remotesensing: 'Remote Sensing',
-            gis: 'GIS',
-            models: 'Models',
-            mixedtype: 'Mixed Type',
-            vocabulary: 'Vocabulary'
-        };
-
-        // const titletypes = {
-        //     Sub: 'Sub',
-        //     Alternative: 'Alternative',
-        //     Translated: 'Translated',
-        //     Other: 'Other',
+        // const doctypes = {
+        //     analysisdata: { label: 'Analysis', value: 'analysisdata' },
+        //     measurementdata: { label: 'Measurements', value: 'measurementdata' },
+        //     monitoring: 'Monitoring',
+        //     remotesensing: 'Remote Sensing',
+        //     gis: 'GIS',
+        //     models: 'Models',
+        //     mixedtype: 'Mixed Type',
+        //     vocabulary: 'Vocabulary',
         // };
 
-        // let test = Object.entries(TitleTypes).map(([key, value]) => ({id: key, value: value}))
-
         // const languages = await Database.from('languages').select('*').where('active', true);
         return inertia.render('Submitter/Dataset/Create', {
             licenses: licenses,
-            doctypes: doctypes,
+            doctypes: DatasetTypes,
             titletypes: Object.entries(TitleTypes)
                 .filter(([value]) => value !== 'Main')
                 .map(([key, value]) => ({ value: key, label: value })),
@@ -293,7 +292,6 @@ export default class DatasetController {
         // node ace make:validator CreateDataset
         try {
             //  Step 2 - Validate request body against  the schema
-            // await request.validate(CreateUserValidator);
             // await request.validate({ schema: newDatasetSchema, messages: this.messages });
             await request.validate(CreateDatasetValidator);
             // console.log({ payload });
@@ -755,4 +753,79 @@ export default class DatasetController {
             doctypes,
         });
     }
+
+    public async delete({ request, inertia, response, session }) {
+        const id = request.param('id');
+        try {
+            const dataset = await Dataset.query()
+                .preload('user', (builder) => {
+                    builder.select('id', 'login');
+                })
+                .preload('files')
+                .where('id', id)
+                .firstOrFail();
+            const validStates = ['inprogress', 'rejected_editor'];
+            if (!validStates.includes(dataset.server_state)) {
+                // session.flash('errors', 'Invalid server state!');
+                return response
+                    .flash(
+                        'warning',
+                        `Invalid server state. Dataset with id ${id} cannot be deleted. Datset has server state ${dataset.server_state}.`,
+                    )
+                    .redirect()
+                    .toRoute('dataset.list');
+            }
+            return inertia.render('Submitter/Dataset/Delete', {
+                dataset,
+            });
+        } catch (error) {
+            if (error.code == 'E_ROW_NOT_FOUND') {
+                session.flash({ warning: 'Dataset is not found in database' });
+            } else {
+                session.flash({ warning: 'general error occured, you cannot delete the dataset' });
+            }
+            return response.redirect().toRoute('dataset.list');
+        }
+    }
+
+    public async deleteUpdate({ params, session, response }) {
+        try {
+            const dataset = await Dataset.query().where('id', params.id).preload('files').firstOrFail();
+
+            const validStates = ['inprogress', 'rejected_editor'];
+            if (validStates.includes(dataset.server_state)) {
+                if (dataset.files && dataset.files.length > 0) {
+                    for (const file of dataset.files) {
+                        if (file.pathName) {
+                            // delete file from filesystem
+                            await Drive.delete(file.pathName);
+                        }
+                    }
+                }
+                // delete dataset wirh relation from db
+                await dataset.delete();
+                session.flash({ message: 'You have deleted 1 dataset!' });
+                return response.redirect().toRoute('dataset.list');
+            } else {
+                session.flash({
+                    warning: `You cannot delete this dataset! The status of this dataset is "${dataset.server_state}"!`,
+                });
+                return response.redirect().back();
+            }
+        } catch (error) {
+            if (error instanceof ValidationException) {
+                // Validation exception handling
+                throw error;
+            } else if (error instanceof Exception) {
+                // General exception handling
+                return response
+                    .flash({ errors: { error: error.message } })
+                    .redirect()
+                    .back();
+            } else {
+                session.flash({ error: 'An error occurred while deleting the dataset.' });
+                return response.redirect().back();
+            }
+        }
+    }
 }
diff --git a/app/Exceptions/HttpException.ts b/app/Exceptions/HttpException.ts
new file mode 100644
index 0000000..7bad1b0
--- /dev/null
+++ b/app/Exceptions/HttpException.ts
@@ -0,0 +1,12 @@
+class HTTPException extends Error {
+    public status: number;
+    public message: string;
+
+    constructor(status: number, message: string) {
+        super(message);
+        this.status = status;
+        this.message = message;
+    }
+}
+
+export default HTTPException;
diff --git a/app/Exceptions/InternalServerException.ts b/app/Exceptions/InternalServerException.ts
new file mode 100644
index 0000000..a1c5bfb
--- /dev/null
+++ b/app/Exceptions/InternalServerException.ts
@@ -0,0 +1,10 @@
+import { StatusCodes } from 'http-status-codes';
+import HTTPException from './HttpException';
+
+class InternalServerErrorException extends HTTPException {
+    constructor(message?: string) {
+        super(StatusCodes.INTERNAL_SERVER_ERROR, message || 'Server Error');
+        this.stack = '';
+    }
+}
+export default InternalServerErrorException;
diff --git a/app/Models/Dataset.ts b/app/Models/Dataset.ts
index 57f68f2..1e94850 100644
--- a/app/Models/Dataset.ts
+++ b/app/Models/Dataset.ts
@@ -197,7 +197,7 @@ export default class Dataset extends BaseModel {
         },
     })
     public authors: ManyToMany<typeof Person>;
-   
+
     @manyToMany(() => Person, {
         pivotForeignKey: 'document_id',
         pivotRelatedForeignKey: 'person_id',
diff --git a/app/Models/DatasetIdentifier.ts b/app/Models/DatasetIdentifier.ts
index e3b68d6..5654f08 100644
--- a/app/Models/DatasetIdentifier.ts
+++ b/app/Models/DatasetIdentifier.ts
@@ -14,7 +14,7 @@ export default class DatasetIdentifier extends BaseModel {
     public id: number;
 
     @column({})
-    public dataset_id: number; 
+    public dataset_id: number;
 
     @column({})
     public type: string;
diff --git a/app/Models/DatasetReference.ts b/app/Models/DatasetReference.ts
index a97aee4..ee51d4b 100644
--- a/app/Models/DatasetReference.ts
+++ b/app/Models/DatasetReference.ts
@@ -56,6 +56,4 @@ export default class DatasetReference extends BaseModel {
         foreignKey: 'related_document_id',
     })
     public new_dataset: BelongsTo<typeof Dataset>;
-
-
 }
diff --git a/components.d.ts b/components.d.ts
index afc1906..3834bf1 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -7,7 +7,7 @@ export {};
 
 declare module '@vue/runtime-core' {
     export interface GlobalComponents {
-        NButton: typeof import('naive-ui')['NButton'];
-        NInput: typeof import('naive-ui')['NInput'];
+        NButton: (typeof import('naive-ui'))['NButton'];
+        NInput: (typeof import('naive-ui'))['NInput'];
     }
 }
diff --git a/contracts/enums.ts b/contracts/enums.ts
index 917e7db..018affd 100644
--- a/contracts/enums.ts
+++ b/contracts/enums.ts
@@ -1,13 +1,14 @@
 // ./contracts/enums.ts
 
 export enum DatasetTypes {
-    analysisdata = 'analysisdata',
-    measurementdata = 'measurementdata',
-    monitoring = 'monitoring',
-    remotesensing = 'remotesensing',
-    gis = 'gis',
-    models = 'models',
-    mixedtype = 'mixedtype',
+    analysisdata = 'Analysis',
+    measurementdata = 'Measurements',
+    monitoring = 'Monitoring',
+    remotesensing = 'Remote Sensing',
+    gis = 'GIS',
+    models = 'Models',
+    mixedtype = 'Mixed Type',
+    vocabulary = 'Vocabulary',
 }
 
 export enum ServerStates {
diff --git a/database/migrations/dataset_2_documents.ts b/database/migrations/dataset_2_documents.ts
index f6e293e..b813d1f 100644
--- a/database/migrations/dataset_2_documents.ts
+++ b/database/migrations/dataset_2_documents.ts
@@ -31,7 +31,7 @@ export default class Documents extends BaseSchema {
                 .foreign('account_id', 'documents_account_id_foreign')
                 .references('id')
                 .inTable('accounts')
-                .onDelete('NO ACTION') // don't delete this when account is deleted
+                .onDelete('NO ACTION') // don't delete this doc when account is deleted
                 .onUpdate('NO ACTION');
             table.integer('editor_id');
             table.integer('reviewer_id');
diff --git a/package-lock.json b/package-lock.json
index 3072d79..084a17f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -784,21 +784,21 @@
             }
         },
         "node_modules/@babel/core": {
-            "version": "7.22.11",
-            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.11.tgz",
-            "integrity": "sha512-lh7RJrtPdhibbxndr6/xx0w8+CVlY5FJZiaSz908Fpy+G0xkBFTvwLcKJFF4PJxVfGhVWNebikpWGnOoC71juQ==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.15.tgz",
+            "integrity": "sha512-PtZqMmgRrvj8ruoEOIwVA3yoF91O+Hgw9o7DAUTNBA6Mo2jpu31clx9a7Nz/9JznqetTR6zwfC4L3LAjKQXUwA==",
             "dev": true,
             "dependencies": {
                 "@ampproject/remapping": "^2.2.0",
-                "@babel/code-frame": "^7.22.10",
-                "@babel/generator": "^7.22.10",
-                "@babel/helper-compilation-targets": "^7.22.10",
-                "@babel/helper-module-transforms": "^7.22.9",
-                "@babel/helpers": "^7.22.11",
-                "@babel/parser": "^7.22.11",
-                "@babel/template": "^7.22.5",
-                "@babel/traverse": "^7.22.11",
-                "@babel/types": "^7.22.11",
+                "@babel/code-frame": "^7.22.13",
+                "@babel/generator": "^7.22.15",
+                "@babel/helper-compilation-targets": "^7.22.15",
+                "@babel/helper-module-transforms": "^7.22.15",
+                "@babel/helpers": "^7.22.15",
+                "@babel/parser": "^7.22.15",
+                "@babel/template": "^7.22.15",
+                "@babel/traverse": "^7.22.15",
+                "@babel/types": "^7.22.15",
                 "convert-source-map": "^1.7.0",
                 "debug": "^4.1.0",
                 "gensync": "^1.0.0-beta.2",
@@ -823,12 +823,12 @@
             }
         },
         "node_modules/@babel/generator": {
-            "version": "7.22.10",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.10.tgz",
-            "integrity": "sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.15.tgz",
+            "integrity": "sha512-Zu9oWARBqeVOW0dZOjXc3JObrzuqothQ3y/n1kUtrjCoCPLkXUwMvOo/F/TCfoHMbWIFlWwpZtkZVb9ga4U2pA==",
             "dev": true,
             "dependencies": {
-                "@babel/types": "^7.22.10",
+                "@babel/types": "^7.22.15",
                 "@jridgewell/gen-mapping": "^0.3.2",
                 "@jridgewell/trace-mapping": "^0.3.17",
                 "jsesc": "^2.5.1"
@@ -850,25 +850,25 @@
             }
         },
         "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-            "version": "7.22.10",
-            "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.10.tgz",
-            "integrity": "sha512-Av0qubwDQxC56DoUReVDeLfMEjYYSN1nZrTUrWkXd7hpU73ymRANkbuDm3yni9npkn+RXy9nNbEJZEzXr7xrfQ==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz",
+            "integrity": "sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==",
             "dev": true,
             "dependencies": {
-                "@babel/types": "^7.22.10"
+                "@babel/types": "^7.22.15"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-compilation-targets": {
-            "version": "7.22.10",
-            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.10.tgz",
-            "integrity": "sha512-JMSwHD4J7SLod0idLq5PKgI+6g/hLD/iuWBq08ZX49xE14VpVEojJ5rHWptpirV2j020MvypRLAXAO50igCJ5Q==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz",
+            "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==",
             "dev": true,
             "dependencies": {
                 "@babel/compat-data": "^7.22.9",
-                "@babel/helper-validator-option": "^7.22.5",
+                "@babel/helper-validator-option": "^7.22.15",
                 "browserslist": "^4.21.9",
                 "lru-cache": "^5.1.1",
                 "semver": "^6.3.1"
@@ -887,15 +887,15 @@
             }
         },
         "node_modules/@babel/helper-create-class-features-plugin": {
-            "version": "7.22.11",
-            "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.11.tgz",
-            "integrity": "sha512-y1grdYL4WzmUDBRGK0pDbIoFd7UZKoDurDzWEoNMYoj1EL+foGRQNyPWDcC+YyegN5y1DUsFFmzjGijB3nSVAQ==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.15.tgz",
+            "integrity": "sha512-jKkwA59IXcvSaiK2UN45kKwSC9o+KuoXsBDvHvU/7BecYIp8GQ2UwrVvFgJASUT+hBnwJx6MhvMCuMzwZZ7jlg==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-annotate-as-pure": "^7.22.5",
                 "@babel/helper-environment-visitor": "^7.22.5",
                 "@babel/helper-function-name": "^7.22.5",
-                "@babel/helper-member-expression-to-functions": "^7.22.5",
+                "@babel/helper-member-expression-to-functions": "^7.22.15",
                 "@babel/helper-optimise-call-expression": "^7.22.5",
                 "@babel/helper-replace-supers": "^7.22.9",
                 "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
@@ -919,9 +919,9 @@
             }
         },
         "node_modules/@babel/helper-create-regexp-features-plugin": {
-            "version": "7.22.9",
-            "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.9.tgz",
-            "integrity": "sha512-+svjVa/tFwsNSG4NEy1h85+HQ5imbT92Q5/bgtS7P0GTQlP8WuFdqsiABmQouhiFGyV66oGxZFpeYHza1rNsKw==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz",
+            "integrity": "sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-annotate-as-pure": "^7.22.5",
@@ -995,40 +995,40 @@
             }
         },
         "node_modules/@babel/helper-member-expression-to-functions": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz",
-            "integrity": "sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.15.tgz",
+            "integrity": "sha512-qLNsZbgrNh0fDQBCPocSL8guki1hcPvltGDv/NxvUoABwFq7GkKSu1nRXeJkVZc+wJvne2E0RKQz+2SQrz6eAA==",
             "dev": true,
             "dependencies": {
-                "@babel/types": "^7.22.5"
+                "@babel/types": "^7.22.15"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-module-imports": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz",
-            "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
+            "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
             "dev": true,
             "dependencies": {
-                "@babel/types": "^7.22.5"
+                "@babel/types": "^7.22.15"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-module-transforms": {
-            "version": "7.22.9",
-            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz",
-            "integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.15.tgz",
+            "integrity": "sha512-l1UiX4UyHSFsYt17iQ3Se5pQQZZHa22zyIXURmvkmLCD4t/aU+dvNWHatKac/D9Vm9UES7nvIqHs4jZqKviUmQ==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-environment-visitor": "^7.22.5",
-                "@babel/helper-module-imports": "^7.22.5",
+                "@babel/helper-module-imports": "^7.22.15",
                 "@babel/helper-simple-access": "^7.22.5",
                 "@babel/helper-split-export-declaration": "^7.22.6",
-                "@babel/helper-validator-identifier": "^7.22.5"
+                "@babel/helper-validator-identifier": "^7.22.15"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -1138,18 +1138,18 @@
             }
         },
         "node_modules/@babel/helper-validator-identifier": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
-            "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.15.tgz",
+            "integrity": "sha512-4E/F9IIEi8WR94324mbDUMo074YTheJmd7eZF5vITTeYchqAi6sYXRLHUVsmkdmY4QjfKTcB2jB7dVP3NaBElQ==",
             "dev": true,
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-validator-option": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz",
-            "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz",
+            "integrity": "sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==",
             "dev": true,
             "engines": {
                 "node": ">=6.9.0"
@@ -1170,14 +1170,14 @@
             }
         },
         "node_modules/@babel/helpers": {
-            "version": "7.22.11",
-            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.11.tgz",
-            "integrity": "sha512-vyOXC8PBWaGc5h7GMsNx68OH33cypkEDJCHvYVVgVbbxJDROYVtexSk0gK5iCF1xNjRIN2s8ai7hwkWDq5szWg==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.15.tgz",
+            "integrity": "sha512-7pAjK0aSdxOwR+CcYAqgWOGy5dcfvzsTIfFTb2odQqW47MDfv14UaJDY6eng8ylM2EaeKXdxaSWESbkmaQHTmw==",
             "dev": true,
             "dependencies": {
-                "@babel/template": "^7.22.5",
-                "@babel/traverse": "^7.22.11",
-                "@babel/types": "^7.22.11"
+                "@babel/template": "^7.22.15",
+                "@babel/traverse": "^7.22.15",
+                "@babel/types": "^7.22.15"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -1198,9 +1198,9 @@
             }
         },
         "node_modules/@babel/parser": {
-            "version": "7.22.14",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.14.tgz",
-            "integrity": "sha512-1KucTHgOvaw/LzCVrEOAyXkr9rQlp0A1HiHRYnSUE9dmb8PvPW7o5sscg+5169r54n3vGlbx6GevTE/Iw/P3AQ==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.15.tgz",
+            "integrity": "sha512-RWmQ/sklUN9BvGGpCDgSubhHWfAx24XDTDObup4ffvxaYsptOg2P3KG0j+1eWKLxpkX0j0uHxmpq2Z1SP/VhxA==",
             "bin": {
                 "parser": "bin/babel-parser.js"
             },
@@ -1209,9 +1209,9 @@
             }
         },
         "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz",
-            "integrity": "sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15.tgz",
+            "integrity": "sha512-FB9iYlz7rURmRJyXRKEnalYPPdn87H5no108cyuQQyMwlpJ2SJtpIUBI27kdTin956pz+LPypkPVPUTlxOmrsg==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.22.5"
@@ -1224,14 +1224,14 @@
             }
         },
         "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz",
-            "integrity": "sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15.tgz",
+            "integrity": "sha512-Hyph9LseGvAeeXzikV88bczhsrLrIZqDPxO+sSmAunMPaGrBGhfMWzCPYTtiW9t+HzSE2wtV8e5cc5P6r1xMDQ==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.22.5",
                 "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-                "@babel/plugin-transform-optional-chaining": "^7.22.5"
+                "@babel/plugin-transform-optional-chaining": "^7.22.15"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -1258,12 +1258,12 @@
             }
         },
         "node_modules/@babel/plugin-proposal-decorators": {
-            "version": "7.22.10",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.22.10.tgz",
-            "integrity": "sha512-KxN6TqZzcFi4uD3UifqXElBTBNLAEH1l3vzMQj6JwJZbL2sZlThxSViOKCYY+4Ah4V4JhQ95IVB7s/Y6SJSlMQ==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.22.15.tgz",
+            "integrity": "sha512-kc0VvbbUyKelvzcKOSyQUSVVXS5pT3UhRB0e3c9An86MvLqs+gx0dN4asllrDluqSa3m9YyooXKGOFVomnyFkg==",
             "dev": true,
             "dependencies": {
-                "@babel/helper-create-class-features-plugin": "^7.22.10",
+                "@babel/helper-create-class-features-plugin": "^7.22.15",
                 "@babel/helper-plugin-utils": "^7.22.5",
                 "@babel/helper-replace-supers": "^7.22.9",
                 "@babel/helper-split-export-declaration": "^7.22.6",
@@ -1584,9 +1584,9 @@
             }
         },
         "node_modules/@babel/plugin-transform-async-generator-functions": {
-            "version": "7.22.11",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.11.tgz",
-            "integrity": "sha512-0pAlmeRJn6wU84zzZsEOx1JV1Jf8fqO9ok7wofIJwUnplYo247dcd24P+cMJht7ts9xkzdtB0EPHmOb7F+KzXw==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.15.tgz",
+            "integrity": "sha512-jBm1Es25Y+tVoTi5rfd5t1KLmL8ogLKpXszboWOTTtGFGz2RKnQe2yn7HbZ+kb/B8N0FVSGQo874NSlOU1T4+w==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-environment-visitor": "^7.22.5",
@@ -1634,9 +1634,9 @@
             }
         },
         "node_modules/@babel/plugin-transform-block-scoping": {
-            "version": "7.22.10",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.10.tgz",
-            "integrity": "sha512-1+kVpGAOOI1Albt6Vse7c8pHzcZQdQKW+wJH+g8mCaszOdDVwRXa/slHPqIw+oJAJANTKDMuM2cBdV0Dg618Vg==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.15.tgz",
+            "integrity": "sha512-G1czpdJBZCtngoK1sJgloLiOHUnkb/bLZwqVZD8kXmq0ZnVfTTWUcs9OWtp0mBtYJ+4LQY1fllqBkOIPhXmFmw==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.22.5"
@@ -1682,18 +1682,18 @@
             }
         },
         "node_modules/@babel/plugin-transform-classes": {
-            "version": "7.22.6",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.6.tgz",
-            "integrity": "sha512-58EgM6nuPNG6Py4Z3zSuu0xWu2VfodiMi72Jt5Kj2FECmaYk1RrTXA45z6KBFsu9tRgwQDwIiY4FXTt+YsSFAQ==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.15.tgz",
+            "integrity": "sha512-VbbC3PGjBdE0wAWDdHM9G8Gm977pnYI0XpqMd6LrKISj8/DJXEsWqgRuTYaNE9Bv0JGhTZUzHDlMk18IpOuoqw==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-annotate-as-pure": "^7.22.5",
-                "@babel/helper-compilation-targets": "^7.22.6",
+                "@babel/helper-compilation-targets": "^7.22.15",
                 "@babel/helper-environment-visitor": "^7.22.5",
                 "@babel/helper-function-name": "^7.22.5",
                 "@babel/helper-optimise-call-expression": "^7.22.5",
                 "@babel/helper-plugin-utils": "^7.22.5",
-                "@babel/helper-replace-supers": "^7.22.5",
+                "@babel/helper-replace-supers": "^7.22.9",
                 "@babel/helper-split-export-declaration": "^7.22.6",
                 "globals": "^11.1.0"
             },
@@ -1721,9 +1721,9 @@
             }
         },
         "node_modules/@babel/plugin-transform-destructuring": {
-            "version": "7.22.10",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.10.tgz",
-            "integrity": "sha512-dPJrL0VOyxqLM9sritNbMSGx/teueHF/htMKrPT7DNxccXxRDPYqlgPFFdr8u+F+qUZOkZoXue/6rL5O5GduEw==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.15.tgz",
+            "integrity": "sha512-HzG8sFl1ZVGTme74Nw+X01XsUTqERVQ6/RLHo3XjGRzm7XD6QTtfS3NJotVgCGy8BzkDqRjRBD8dAyJn5TuvSQ==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.22.5"
@@ -1815,9 +1815,9 @@
             }
         },
         "node_modules/@babel/plugin-transform-for-of": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz",
-            "integrity": "sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.15.tgz",
+            "integrity": "sha512-me6VGeHsx30+xh9fbDLLPi0J1HzmeIIyenoOQHuw2D4m2SAU3NrspX5XxJLBpqn5yrLzrlw2Iy3RA//Bx27iOA==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.22.5"
@@ -1925,12 +1925,12 @@
             }
         },
         "node_modules/@babel/plugin-transform-modules-commonjs": {
-            "version": "7.22.11",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.11.tgz",
-            "integrity": "sha512-o2+bg7GDS60cJMgz9jWqRUsWkMzLCxp+jFDeDUT5sjRlAxcJWZ2ylNdI7QQ2+CH5hWu7OnN+Cv3htt7AkSf96g==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.15.tgz",
+            "integrity": "sha512-jWL4eh90w0HQOTKP2MoXXUpVxilxsB2Vl4ji69rSjS3EcZ/v4sBmn+A3NpepuJzBhOaEBbR7udonlHHn5DWidg==",
             "dev": true,
             "dependencies": {
-                "@babel/helper-module-transforms": "^7.22.9",
+                "@babel/helper-module-transforms": "^7.22.15",
                 "@babel/helper-plugin-utils": "^7.22.5",
                 "@babel/helper-simple-access": "^7.22.5"
             },
@@ -2039,16 +2039,16 @@
             }
         },
         "node_modules/@babel/plugin-transform-object-rest-spread": {
-            "version": "7.22.11",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.11.tgz",
-            "integrity": "sha512-nX8cPFa6+UmbepISvlf5jhQyaC7ASs/7UxHmMkuJ/k5xSHvDPPaibMo+v3TXwU/Pjqhep/nFNpd3zn4YR59pnw==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.15.tgz",
+            "integrity": "sha512-fEB+I1+gAmfAyxZcX1+ZUwLeAuuf8VIg67CTznZE0MqVFumWkh8xWtn58I4dxdVf080wn7gzWoF8vndOViJe9Q==",
             "dev": true,
             "dependencies": {
                 "@babel/compat-data": "^7.22.9",
-                "@babel/helper-compilation-targets": "^7.22.10",
+                "@babel/helper-compilation-targets": "^7.22.15",
                 "@babel/helper-plugin-utils": "^7.22.5",
                 "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-                "@babel/plugin-transform-parameters": "^7.22.5"
+                "@babel/plugin-transform-parameters": "^7.22.15"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -2090,9 +2090,9 @@
             }
         },
         "node_modules/@babel/plugin-transform-optional-chaining": {
-            "version": "7.22.12",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.12.tgz",
-            "integrity": "sha512-7XXCVqZtyFWqjDsYDY4T45w4mlx1rf7aOgkc/Ww76xkgBiOlmjPkx36PBLHa1k1rwWvVgYMPsbuVnIamx2ZQJw==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.15.tgz",
+            "integrity": "sha512-ngQ2tBhq5vvSJw2Q2Z9i7ealNkpDMU0rGWnHPKqRZO0tzZ5tlaoz4hDvhXioOoaE0X2vfNss1djwg0DXlfu30A==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.22.5",
@@ -2107,9 +2107,9 @@
             }
         },
         "node_modules/@babel/plugin-transform-parameters": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz",
-            "integrity": "sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.15.tgz",
+            "integrity": "sha512-hjk7qKIqhyzhhUvRT683TYQOFa/4cQKwQy7ALvTpODswN40MljzNDa0YldevS6tGbxwaEKVn502JmY0dP7qEtQ==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.22.5"
@@ -2202,12 +2202,12 @@
             }
         },
         "node_modules/@babel/plugin-transform-runtime": {
-            "version": "7.22.10",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.10.tgz",
-            "integrity": "sha512-RchI7HePu1eu0CYNKHHHQdfenZcM4nz8rew5B1VWqeRKdcwW5aQ5HeG9eTUbWiAS1UrmHVLmoxTWHt3iLD/NhA==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.15.tgz",
+            "integrity": "sha512-tEVLhk8NRZSmwQ0DJtxxhTrCht1HVo8VaMzYT4w6lwyKBuHsgoioAUA7/6eT2fRfc5/23fuGdlwIxXhRVgWr4g==",
             "dev": true,
             "dependencies": {
-                "@babel/helper-module-imports": "^7.22.5",
+                "@babel/helper-module-imports": "^7.22.15",
                 "@babel/helper-plugin-utils": "^7.22.5",
                 "babel-plugin-polyfill-corejs2": "^0.4.5",
                 "babel-plugin-polyfill-corejs3": "^0.8.3",
@@ -2307,13 +2307,13 @@
             }
         },
         "node_modules/@babel/plugin-transform-typescript": {
-            "version": "7.22.11",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.11.tgz",
-            "integrity": "sha512-0E4/L+7gfvHub7wsbTv03oRtD69X31LByy44fGmFzbZScpupFByMcgCJ0VbBTkzyjSJKuRoGN8tcijOWKTmqOA==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.15.tgz",
+            "integrity": "sha512-1uirS0TnijxvQLnlv5wQBwOX3E1wCFX7ITv+9pBV2wKEk4K+M5tqDaoNXnTH8tjEIYHLO98MwiTWO04Ggz4XuA==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-annotate-as-pure": "^7.22.5",
-                "@babel/helper-create-class-features-plugin": "^7.22.11",
+                "@babel/helper-create-class-features-plugin": "^7.22.15",
                 "@babel/helper-plugin-utils": "^7.22.5",
                 "@babel/plugin-syntax-typescript": "^7.22.5"
             },
@@ -2388,17 +2388,17 @@
             }
         },
         "node_modules/@babel/preset-env": {
-            "version": "7.22.14",
-            "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.14.tgz",
-            "integrity": "sha512-daodMIoVo+ol/g+//c/AH+szBkFj4STQUikvBijRGL72Ph+w+AMTSh55DUETe8KJlPlDT1k/mp7NBfOuiWmoig==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.15.tgz",
+            "integrity": "sha512-tZFHr54GBkHk6hQuVA8w4Fmq+MSPsfvMG0vPnOYyTnJpyfMqybL8/MbNCPRT9zc2KBO2pe4tq15g6Uno4Jpoag==",
             "dev": true,
             "dependencies": {
                 "@babel/compat-data": "^7.22.9",
-                "@babel/helper-compilation-targets": "^7.22.10",
+                "@babel/helper-compilation-targets": "^7.22.15",
                 "@babel/helper-plugin-utils": "^7.22.5",
-                "@babel/helper-validator-option": "^7.22.5",
-                "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5",
-                "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.5",
+                "@babel/helper-validator-option": "^7.22.15",
+                "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.15",
+                "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.15",
                 "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
                 "@babel/plugin-syntax-async-generators": "^7.8.4",
                 "@babel/plugin-syntax-class-properties": "^7.12.13",
@@ -2419,39 +2419,39 @@
                 "@babel/plugin-syntax-top-level-await": "^7.14.5",
                 "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
                 "@babel/plugin-transform-arrow-functions": "^7.22.5",
-                "@babel/plugin-transform-async-generator-functions": "^7.22.11",
+                "@babel/plugin-transform-async-generator-functions": "^7.22.15",
                 "@babel/plugin-transform-async-to-generator": "^7.22.5",
                 "@babel/plugin-transform-block-scoped-functions": "^7.22.5",
-                "@babel/plugin-transform-block-scoping": "^7.22.10",
+                "@babel/plugin-transform-block-scoping": "^7.22.15",
                 "@babel/plugin-transform-class-properties": "^7.22.5",
                 "@babel/plugin-transform-class-static-block": "^7.22.11",
-                "@babel/plugin-transform-classes": "^7.22.6",
+                "@babel/plugin-transform-classes": "^7.22.15",
                 "@babel/plugin-transform-computed-properties": "^7.22.5",
-                "@babel/plugin-transform-destructuring": "^7.22.10",
+                "@babel/plugin-transform-destructuring": "^7.22.15",
                 "@babel/plugin-transform-dotall-regex": "^7.22.5",
                 "@babel/plugin-transform-duplicate-keys": "^7.22.5",
                 "@babel/plugin-transform-dynamic-import": "^7.22.11",
                 "@babel/plugin-transform-exponentiation-operator": "^7.22.5",
                 "@babel/plugin-transform-export-namespace-from": "^7.22.11",
-                "@babel/plugin-transform-for-of": "^7.22.5",
+                "@babel/plugin-transform-for-of": "^7.22.15",
                 "@babel/plugin-transform-function-name": "^7.22.5",
                 "@babel/plugin-transform-json-strings": "^7.22.11",
                 "@babel/plugin-transform-literals": "^7.22.5",
                 "@babel/plugin-transform-logical-assignment-operators": "^7.22.11",
                 "@babel/plugin-transform-member-expression-literals": "^7.22.5",
                 "@babel/plugin-transform-modules-amd": "^7.22.5",
-                "@babel/plugin-transform-modules-commonjs": "^7.22.11",
+                "@babel/plugin-transform-modules-commonjs": "^7.22.15",
                 "@babel/plugin-transform-modules-systemjs": "^7.22.11",
                 "@babel/plugin-transform-modules-umd": "^7.22.5",
                 "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
                 "@babel/plugin-transform-new-target": "^7.22.5",
                 "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.11",
                 "@babel/plugin-transform-numeric-separator": "^7.22.11",
-                "@babel/plugin-transform-object-rest-spread": "^7.22.11",
+                "@babel/plugin-transform-object-rest-spread": "^7.22.15",
                 "@babel/plugin-transform-object-super": "^7.22.5",
                 "@babel/plugin-transform-optional-catch-binding": "^7.22.11",
-                "@babel/plugin-transform-optional-chaining": "^7.22.12",
-                "@babel/plugin-transform-parameters": "^7.22.5",
+                "@babel/plugin-transform-optional-chaining": "^7.22.15",
+                "@babel/plugin-transform-parameters": "^7.22.15",
                 "@babel/plugin-transform-private-methods": "^7.22.5",
                 "@babel/plugin-transform-private-property-in-object": "^7.22.11",
                 "@babel/plugin-transform-property-literals": "^7.22.5",
@@ -2467,7 +2467,7 @@
                 "@babel/plugin-transform-unicode-regex": "^7.22.5",
                 "@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
                 "@babel/preset-modules": "0.1.6-no-external-plugins",
-                "@babel/types": "^7.22.11",
+                "@babel/types": "^7.22.15",
                 "babel-plugin-polyfill-corejs2": "^0.4.5",
                 "babel-plugin-polyfill-corejs3": "^0.8.3",
                 "babel-plugin-polyfill-regenerator": "^0.5.2",
@@ -2505,16 +2505,16 @@
             }
         },
         "node_modules/@babel/preset-typescript": {
-            "version": "7.22.11",
-            "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.22.11.tgz",
-            "integrity": "sha512-tWY5wyCZYBGY7IlalfKI1rLiGlIfnwsRHZqlky0HVv8qviwQ1Uo/05M6+s+TcTCVa6Bmoo2uJW5TMFX6Wa4qVg==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.22.15.tgz",
+            "integrity": "sha512-HblhNmh6yM+cU4VwbBRpxFhxsTdfS1zsvH9W+gEjD0ARV9+8B4sNfpI6GuhePti84nuvhiwKS539jKPFHskA9A==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.22.5",
-                "@babel/helper-validator-option": "^7.22.5",
+                "@babel/helper-validator-option": "^7.22.15",
                 "@babel/plugin-syntax-jsx": "^7.22.5",
-                "@babel/plugin-transform-modules-commonjs": "^7.22.11",
-                "@babel/plugin-transform-typescript": "^7.22.11"
+                "@babel/plugin-transform-modules-commonjs": "^7.22.15",
+                "@babel/plugin-transform-typescript": "^7.22.15"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -2530,9 +2530,9 @@
             "dev": true
         },
         "node_modules/@babel/runtime": {
-            "version": "7.22.11",
-            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.11.tgz",
-            "integrity": "sha512-ee7jVNlWN09+KftVOu9n7S8gQzD/Z6hN/I8VBRXW4P1+Xe7kJGXMwu8vds4aGIMHZnNbdpSWCfZZtinytpcAvA==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.15.tgz",
+            "integrity": "sha512-T0O+aa+4w0u06iNmapipJXMV4HoUir03hpx3/YqXXhu9xim3w+dVphjFWl1OH8NbZHw5Lbm9k45drDkgq2VNNA==",
             "dev": true,
             "dependencies": {
                 "regenerator-runtime": "^0.14.0"
@@ -2542,33 +2542,33 @@
             }
         },
         "node_modules/@babel/template": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz",
-            "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+            "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
             "dev": true,
             "dependencies": {
-                "@babel/code-frame": "^7.22.5",
-                "@babel/parser": "^7.22.5",
-                "@babel/types": "^7.22.5"
+                "@babel/code-frame": "^7.22.13",
+                "@babel/parser": "^7.22.15",
+                "@babel/types": "^7.22.15"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/traverse": {
-            "version": "7.22.11",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.11.tgz",
-            "integrity": "sha512-mzAenteTfomcB7mfPtyi+4oe5BZ6MXxWcn4CX+h4IRJ+OOGXBrWU6jDQavkQI9Vuc5P+donFabBfFCcmWka9lQ==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.15.tgz",
+            "integrity": "sha512-DdHPwvJY0sEeN4xJU5uRLmZjgMMDIvMPniLuYzUVXj/GGzysPl0/fwt44JBkyUIzGJPV8QgHMcQdQ34XFuKTYQ==",
             "dev": true,
             "dependencies": {
-                "@babel/code-frame": "^7.22.10",
-                "@babel/generator": "^7.22.10",
+                "@babel/code-frame": "^7.22.13",
+                "@babel/generator": "^7.22.15",
                 "@babel/helper-environment-visitor": "^7.22.5",
                 "@babel/helper-function-name": "^7.22.5",
                 "@babel/helper-hoist-variables": "^7.22.5",
                 "@babel/helper-split-export-declaration": "^7.22.6",
-                "@babel/parser": "^7.22.11",
-                "@babel/types": "^7.22.11",
+                "@babel/parser": "^7.22.15",
+                "@babel/types": "^7.22.15",
                 "debug": "^4.1.0",
                 "globals": "^11.1.0"
             },
@@ -2577,13 +2577,13 @@
             }
         },
         "node_modules/@babel/types": {
-            "version": "7.22.11",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.11.tgz",
-            "integrity": "sha512-siazHiGuZRz9aB9NpHy9GOs9xiQPKnMzgdr493iI1M67vRXpnEq8ZOOKzezC5q7zwuQ6sDhdSp4SD9ixKSqKZg==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.15.tgz",
+            "integrity": "sha512-X+NLXr0N8XXmN5ZsaQdm9U2SSC3UbIYq/doL++sueHOTisgZHoKaQtZxGuV2cUPQHMfjKEfg/g6oy7Hm6SKFtA==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-string-parser": "^7.22.5",
-                "@babel/helper-validator-identifier": "^7.22.5",
+                "@babel/helper-validator-identifier": "^7.22.15",
                 "to-fast-properties": "^2.0.0"
             },
             "engines": {
@@ -3810,15 +3810,15 @@
             "integrity": "sha512-lOGyCnw+2JVPKU3wIV0srU0NyALwTBJlVSx5DfMQOFuuohA8y9S8orImpuIQikZ0uIQ8gehrRjxgQC1rLRi11w=="
         },
         "node_modules/@types/chai": {
-            "version": "4.3.5",
-            "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.5.tgz",
-            "integrity": "sha512-mEo1sAde+UCE6b2hxn332f1g1E8WfYRu6p5SvTKr2ZKC1f7gFJXk4h5PyGP9Dt6gCaG8y8XhwnXWC6Iy2cmBng==",
+            "version": "4.3.6",
+            "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.6.tgz",
+            "integrity": "sha512-VOVRLM1mBxIRxydiViqPcKn6MIxZytrbMpd6RJLIWKxUNr3zux8no0Oc7kJx0WAPIitgZ0gkrDS+btlqQpubpw==",
             "dev": true
         },
         "node_modules/@types/clamscan": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/@types/clamscan/-/clamscan-2.0.4.tgz",
-            "integrity": "sha512-NpD+EmE+ZK5WRJOAmeDuSYJIv15BUnc4PxQA+m3QNkutaPBZ7bmLDTvqBu2iDchs7YKQjiEQEwEMvsdwtdtImA==",
+            "version": "2.0.5",
+            "resolved": "https://registry.npmjs.org/@types/clamscan/-/clamscan-2.0.5.tgz",
+            "integrity": "sha512-bFqdscswqBia3yKEJZVVWELOVvWKHUR1dCmH4xshYwu0T9YSfZd35Q8Z9jYW0ygxqGlHjLXMb2/7C6CJITbDgg==",
             "dev": true,
             "dependencies": {
                 "@types/node": "*",
@@ -3835,18 +3835,18 @@
             }
         },
         "node_modules/@types/connect": {
-            "version": "3.4.35",
-            "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
-            "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==",
+            "version": "3.4.36",
+            "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.36.tgz",
+            "integrity": "sha512-P63Zd/JUGq+PdrM1lv0Wv5SBYeA2+CORvbrXbngriYY0jzLUWfQMQQxOhjONEz/wlHOAxOdY7CY65rgQdTjq2w==",
             "dev": true,
             "dependencies": {
                 "@types/node": "*"
             }
         },
         "node_modules/@types/connect-history-api-fallback": {
-            "version": "1.5.0",
-            "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz",
-            "integrity": "sha512-4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig==",
+            "version": "1.5.1",
+            "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.1.tgz",
+            "integrity": "sha512-iaQslNbARe8fctL5Lk+DsmgWOM83lM+7FzP0eQUJs1jd3kBE8NWqBTIT2S8SqQOJjxvt2eyIjpOuYeRXq2AdMw==",
             "dev": true,
             "dependencies": {
                 "@types/express-serve-static-core": "*",
@@ -6082,9 +6082,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001525",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001525.tgz",
-            "integrity": "sha512-/3z+wB4icFt3r0USMwxujAqRvaD/B7rvGTsKhbhSQErVrJvkZCLhgNLJxU8MevahQVH6hCU9FsHdNUFbiwmE7Q==",
+            "version": "1.0.30001527",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001527.tgz",
+            "integrity": "sha512-YkJi7RwPgWtXVSgK4lG9AHH57nSzvvOp9MesgXmw4Q7n0C3H04L0foHqfxcmSAm5AcWb8dW9AYj2tR7/5GnddQ==",
             "dev": true,
             "funding": [
                 {
@@ -6752,9 +6752,9 @@
             "dev": true
         },
         "node_modules/cosmiconfig": {
-            "version": "8.3.3",
-            "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.3.tgz",
-            "integrity": "sha512-/VY+0IvFoE47hwgKHu8feeBFIb1Z1mcJFiLrNwaJpLoLa9qwLVquMGMr2OUwQmhpJDtsSQSasg/TMv1imec9xA==",
+            "version": "8.3.4",
+            "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.4.tgz",
+            "integrity": "sha512-SF+2P8+o/PTV05rgsAjDzL4OFdVXAulSfC/L19VaeVT7+tpOOSscCt2QLxDZ+CLxF2WOiq6y1K5asvs8qUJT/Q==",
             "dev": true,
             "dependencies": {
                 "import-fresh": "^3.3.0",
@@ -15962,9 +15962,9 @@
             }
         },
         "node_modules/terser": {
-            "version": "5.19.3",
-            "resolved": "https://registry.npmjs.org/terser/-/terser-5.19.3.tgz",
-            "integrity": "sha512-pQzJ9UJzM0IgmT4FAtYI6+VqFf0lj/to58AV0Xfgg0Up37RyPG7Al+1cepC6/BVuAxR9oNb41/DL4DEoHJvTdg==",
+            "version": "5.19.4",
+            "resolved": "https://registry.npmjs.org/terser/-/terser-5.19.4.tgz",
+            "integrity": "sha512-6p1DjHeuluwxDXcuT9VR8p64klWJKo1ILiy19s6C9+0Bh2+NWTX6nD9EPppiER4ICkHDVB1RkVpin/YW2nQn/g==",
             "dev": true,
             "dependencies": {
                 "@jridgewell/source-map": "^0.3.3",
diff --git a/resources/js/Components/TablePersons.vue b/resources/js/Components/TablePersons.vue
index 9e711ae..ffbfdff 100644
--- a/resources/js/Components/TablePersons.vue
+++ b/resources/js/Components/TablePersons.vue
@@ -3,6 +3,8 @@ import { computed, ref } from 'vue';
 // import { MainService } from '@/Stores/main';
 import { StyleService } from '@/Stores/style';
 import { mdiTrashCan } from '@mdi/js';
+import { mdiDragVariant } from '@mdi/js';
+import BaseIcon from '@/Components/BaseIcon.vue';
 // import CardBoxModal from '@/Components/CardBoxModal.vue';
 // import TableCheckboxCell from '@/Components/TableCheckboxCell.vue';
 import BaseLevel from '@/Components/BaseLevel.vue';
@@ -118,6 +120,7 @@ const removeAuthor = (key) => {
         <thead>
             <tr>
                 <!-- <th v-if="checkable" /> -->
+                <th /> 
                 <th scope="col">Sort</th>
                 <th class="hidden lg:table-cell"></th>
                 <th>Name</th>
@@ -133,6 +136,7 @@ const removeAuthor = (key) => {
         <draggable id="galliwasery" tag="tbody" v-model="items" item-key="id">
             <template #item="{ index, element }">
                 <tr>
+                    <td class="drag-icon"><BaseIcon :path="mdiDragVariant"/></td>
                     <td scope="row">{{ index + 1 }}</td>
                     <!-- <TableCheckboxCell v-if="checkable" @checked="checked($event, client)" /> -->
                     <td class="border-b-0 lg:w-6 before:hidden hidden lg:table-cell">
diff --git a/resources/js/Dataset.ts b/resources/js/Dataset.ts
index 0ef2a69..9e490ed 100644
--- a/resources/js/Dataset.ts
+++ b/resources/js/Dataset.ts
@@ -56,7 +56,7 @@ export interface Subject {
     external_key?: string;
 }
 export interface DatasetReference {
-    // id: number; 
+    // id: number;
     value: string;
     label: string;
     type: string;
diff --git a/resources/js/Pages/Submitter/Dataset/Delete.vue b/resources/js/Pages/Submitter/Dataset/Delete.vue
new file mode 100644
index 0000000..04fb406
--- /dev/null
+++ b/resources/js/Pages/Submitter/Dataset/Delete.vue
@@ -0,0 +1,131 @@
+<script setup lang="ts">
+import LayoutAuthenticated from '@/Layouts/LayoutAuthenticated.vue';
+import SectionMain from '@/Components/SectionMain.vue';
+import SectionTitleLineWithButton from '@/Components/SectionTitleLineWithButton.vue';
+import { useForm, Head, usePage } from '@inertiajs/vue3';
+import { computed, Ref } from 'vue';
+import CardBox from '@/Components/CardBox.vue';
+import BaseButton from '@/Components/BaseButton.vue';
+import BaseButtons from '@/Components/BaseButtons.vue';
+import { stardust } from '@eidellev/adonis-stardust/client';
+import { mdiArrowLeftBoldOutline, mdiDeleteForever, mdiTrashCan } from '@mdi/js';
+import FormValidationErrors from '@/Components/FormValidationErrors.vue';
+
+const props = defineProps({
+    dataset: {
+        type: Object,
+        default: () => ({}),
+    },
+});
+const flash: Ref<any> = computed(() => {
+    return usePage().props.flash;
+});
+const errors: Ref<any> = computed(() => {
+    return usePage().props.errors;
+});
+const form = useForm({
+    preferred_reviewer: '',
+    preferred_reviewer_email: '',
+    preferation: 'yes_preferation',
+
+    // preferation: '',
+    // isPreferationRequired: false,
+});
+
+const handleSubmit = async (e) => {
+    e.preventDefault();
+
+    await form.put(stardust.route('dataset.deleteUpdate', [props.dataset.id]));
+};
+</script>
+
+<template>
+    <LayoutAuthenticated>
+
+        <Head title="Delete dataset" />
+        <SectionMain>
+            <SectionTitleLineWithButton :icon="mdiDeleteForever" title="Delete Dataset" main>
+                <BaseButton :route-name="stardust.route('dataset.list')" :icon="mdiArrowLeftBoldOutline" label="Back"
+                    color="white" rounded-full small />
+            </SectionTitleLineWithButton>
+            <CardBox form @submit.prevent="handleSubmit">
+                <FormValidationErrors v-bind:errors="errors" />
+
+                <!-- Modal Content -->
+                <div class="modal-content py-4 text-left px-6">
+                    <!-- Modal Title -->
+                    <div class="text-xl font-bold mb-4">Confirm Deletion</div>
+                    <!-- Modal Body -->
+                    <p>Are you sure you want to delete the dataset from Tethys Data Research Repository?
+                        Also the following files will be deleted:
+                    </p>
+
+                    <ul class="mt-4 space-y-4 text-left text-gray-500 dark:text-gray-400">
+                        <li class="flex items-center space-x-3" v-for="file in dataset.files" :key="file.id">
+                            <svg class="flex-shrink-0 w-3.5 h-3.5 text-green-500 dark:text-green-400" aria-hidden="true"
+                                xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 12">
+                                <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                                    d="M1 5.917 5.724 10.5 15 1.5" />
+                            </svg>
+                            <span>{{ file.label }} with mime-type
+                                <span class="font-semibold text-gray-900 dark:text-white">
+                                     {{ file.mime_type }}
+                                </span>
+                            </span>
+                        </li>
+                        <!-- <li class="flex items-center space-x-3">
+                            <svg class="flex-shrink-0 w-3.5 h-3.5 text-green-500 dark:text-green-400" aria-hidden="true"
+                                xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 12">
+                                <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                                    d="M1 5.917 5.724 10.5 15 1.5" />
+                            </svg>
+                            <span>No setup, or hidden fees</span>
+                        </li>
+                        <li class="flex items-center space-x-3">
+                            <svg class="flex-shrink-0 w-3.5 h-3.5 text-green-500 dark:text-green-400" aria-hidden="true"
+                                xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 12">
+                                <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                                    d="M1 5.917 5.724 10.5 15 1.5" />
+                            </svg>
+                            <span>Team size: <span class="font-semibold text-gray-900 dark:text-white">1
+                                    developer</span></span>
+                        </li>
+                        <li class="flex items-center space-x-3">
+                            <svg class="flex-shrink-0 w-3.5 h-3.5 text-green-500 dark:text-green-400" aria-hidden="true"
+                                xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 12">
+                                <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                                    d="M1 5.917 5.724 10.5 15 1.5" />
+                            </svg>
+                            <span>Premium support: <span class="font-semibold text-gray-900 dark:text-white">6
+                                    months</span></span>
+                        </li>
+                        <li class="flex items-center space-x-3">
+                            <svg class="flex-shrink-0 w-3.5 h-3.5 text-green-500 dark:text-green-400" aria-hidden="true"
+                                xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 12">
+                                <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                                    d="M1 5.917 5.724 10.5 15 1.5" />
+                            </svg>
+                            <span>Free updates: <span class="font-semibold text-gray-900 dark:text-white">6
+                                    months</span></span>
+                        </li> -->
+                    </ul>
+
+                </div>
+
+                <div v-if="flash && flash.warning" class="flex flex-col mt-6 animate-fade-in">
+                    <div class="bg-yellow-500 border-l-4 border-orange-400 text-white p-4" role="alert">
+                        <p class="font-bold">Be Warned</p>
+                        <p>{{ flash.warning }}</p>
+                    </div>
+                </div>
+
+                <template #footer>
+                    <BaseButtons>
+                        <BaseButton type="submit" color="danger" :icon="mdiTrashCan" :small="true"
+                            :class="{ 'opacity-25': form.processing }" :disabled="form.processing" label="Confirm Delete" />
+                    </BaseButtons>
+                </template>
+            </CardBox>
+        </SectionMain>
+    </LayoutAuthenticated>
+</template>
diff --git a/resources/js/Pages/Submitter/Dataset/Index.vue b/resources/js/Pages/Submitter/Dataset/Index.vue
index 4057791..762134d 100644
--- a/resources/js/Pages/Submitter/Dataset/Index.vue
+++ b/resources/js/Pages/Submitter/Dataset/Index.vue
@@ -64,6 +64,7 @@ const flash: ComputedRef<any> = computed(() => {
 
 <template>
     <LayoutAuthenticated>
+
         <Head title="Submit Dataset" />
         <SectionMain>
             <!-- <FormValidationErrors v-bind:errors="errors" /> -->
@@ -85,9 +86,9 @@ const flash: ComputedRef<any> = computed(() => {
                             </th>
                             <th>
                                 <!-- <Sort label="Email" attribute="email" :search="form.search" /> -->
-                                <th>Server State</th>
+                            <th>Server State</th>
                             </th>
-                            <th>Date of last modification</th> 
+                            <th>Date of last modification</th>
                             <th v-if="can.edit || can.delete">Actions</th>
                         </tr>
                     </thead>
@@ -101,36 +102,28 @@ const flash: ComputedRef<any> = computed(() => {
                                 </Link> -->
                                 <!-- {{ user.id }} -->
                                 {{ dataset.main_title }}
-                            </td>                        
+                            </td>
                             <td>
                                 {{ dataset.server_state }}
-                             </td>
-                        
+                            </td>
+
                             <td data-label="Created" class="lg:w-1 whitespace-nowrap">
-                                <small class="text-gray-500 dark:text-slate-400" :title="dataset.server_date_modified">{{ dataset.updated_at }}</small>
+                                <small class="text-gray-500 dark:text-slate-400" :title="dataset.server_date_modified">{{
+                                    dataset.updated_at }}</small>
                             </td>
                             <td v-if="can.edit || can.delete" class="before:hidden lg:w-1 whitespace-nowrap">
                                 <BaseButtons type="justify-start lg:justify-end" no-wrap>
-                                      <!-- release created dataset -->
-                                    <BaseButton
-                                        v-if="can.edit"                                       
-                                        :route-name="stardust.route('dataset.release', [dataset.id])"                                      
-                                        color="info"
-                                        :icon="mdiLockOpen"
-                                        :label="'Release'"
-                                        small
-                                    />
+                                    <!-- release created dataset -->
+                                    <BaseButton v-if="can.edit"
+                                        :route-name="stardust.route('dataset.release', [dataset.id])" color="info"
+                                        :icon="mdiLockOpen" :label="'Release'" small />
                                     <!-- && (dataset.server_state === 'inprogress' || dataset.server_state === 'rejected_editor')"   -->
-                                    <BaseButton
-                                        v-if="can.edit"                                      
-                                        :route-name="stardust.route('dataset.edit', [dataset.id])"                                      
-                                        color="info"
-                                        :icon="mdiSquareEditOutline"
-                                        :label="'Edit'"
-                                        small
-                                    />
+                                    <BaseButton v-if="can.edit" :route-name="stardust.route('dataset.edit', [dataset.id])"
+                                        color="info" :icon="mdiSquareEditOutline" :label="'Edit'" small />
                                     <!-- @click="destroy(dataset.id)" -->
-                                    <BaseButton v-if="can.delete" color="danger" :icon="mdiTrashCan" small  />
+                                    <BaseButton v-if="can.delete" color="danger"
+                                        :route-name="stardust.route('dataset.delete', [dataset.id])" :icon="mdiTrashCan"
+                                        small />
                                 </BaseButtons>
                             </td>
                         </tr>
diff --git a/start/routes.ts b/start/routes.ts
index b029dc8..f292ae0 100644
--- a/start/routes.ts
+++ b/start/routes.ts
@@ -168,6 +168,10 @@ Route.group(() => {
         .as('dataset.edit')
         .where('id', Route.matchers.number())
         .middleware(['auth', 'can:dataset-submit']);
+    Route.get('/dataset/:id/delete', 'DatasetController.delete').as('dataset.delete').middleware(['auth', 'can:dataset-delete']);
+    Route.put('/dataset/:id/deleteupdate', 'DatasetController.deleteUpdate')
+        .as('dataset.deleteUpdate')
+        .middleware(['auth', 'can:dataset-delete']);
 
     // Route.get('/user/:id', 'UsersController.show').as('user.show').where('id', Route.matchers.number());
     // Route.get('/user/:id/edit', 'UsersController.edit').as('user.edit').where('id', Route.matchers.number());