feat: Integrate official drive_provider, update user profile features & UI improvements
All checks were successful
CI / container-job (push) Successful in 41s

- adonisrc.ts: Load official drive_provider and unload custom driver_provider.
- packages.json: Add @headlessui/vue dependency for tab components.
- AvatarController.ts: Rewrite avatar generation logic to always return the same avatar per user.
- auth/UserController.ts: Add profile and profileUpdate methods to support user profile editing.
- Submitter/datasetController.ts & app/models/file.ts: Adapt code to use the official drive_provider.
- app/models/user.ts: Introduce “isAdmin” getter.
- config/drive.ts: Create new configuration for the official drive_provider.
- providers/vinejs_provider.ts: Adapt allowedExtensions control to use provided options or database enabled extensions.
- resource/js/app.ts: Load default Head and Link components.
- resources/js/menu.ts: Add settings-profile.edit menu point.
- resources/js/Components/action-message.vue: Add new component for improved user feedback after form submissions.
- New avatar-input.vue component: Enable profile picture selection.
- Components/CardBox.vue: Alter layout to optionally show HeaderIcon in title bar.
- FormControl.vue: Define a readonly prop for textareas.
- Improve overall UI with updates to NavBar.vue, UserAvatar.vue, UserAvatarCurrentUser.vue, and add v-model support to password-meter.vue.
- Remove profile editing logic from AccountInfo.vue and introduce new profile components (show.vue, update-password-form.vue, update-profile-information.vue).
- app.edge: Modify page (add @inertiaHead tag) for better meta management.
- routes.ts: Add new routes for editing user profiles.
- General npm updates.
This commit is contained in:
Kaimbacher 2025-02-27 16:24:25 +01:00
parent a41b091214
commit 36cd7a757b
34 changed files with 1396 additions and 407 deletions

View file

@ -33,7 +33,9 @@ import File from '#models/file';
import ClamScan from 'clamscan';
// import { ValidationException } from '@adonisjs/validator';
// import Drive from '@ioc:Adonis/Core/Drive';
import drive from '#services/drive';
// import drive from '#services/drive';
import drive from '@adonisjs/drive/services/main';
import path from 'path';
import { Exception } from '@adonisjs/core/exceptions';
import { MultipartFile } from '@adonisjs/core/types/bodyparser';
import * as crypto from 'crypto';
@ -532,11 +534,18 @@ export default class DatasetController {
const fileName = this.generateFilename(file.extname as string);
const mimeType = file.headers['content-type'] || 'application/octet-stream'; // Fallback to a default MIME type
const datasetFolder = `files/${dataset.id}`;
const datasetFullPath = path.join(`${datasetFolder}`, fileName);
// const size = file.size;
await file.move(drive.makePath(datasetFolder), {
// await file.move(drive.makePath(datasetFolder), {
// name: fileName,
// overwrite: true, // overwrite in case of conflict
// });
await file.moveToDisk(datasetFullPath, 'local', {
name: fileName,
overwrite: true, // overwrite in case of conflict
disk: 'local',
});
// save file metadata into db
const newFile = new File();
newFile.pathName = `${datasetFolder}/${fileName}`;
@ -1031,10 +1040,16 @@ export default class DatasetController {
// move to disk:
const fileName = `file-${cuid()}.${fileData.extname}`; //'file-ls0jyb8xbzqtrclufu2z2e0c.pdf'
const datasetFolder = `files/${dataset.id}`; // 'files/307'
const datasetFullPath = path.join(`${datasetFolder}`, fileName);
// await fileData.moveToDisk(datasetFolder, { name: fileName, overwrite: true }, 'local');
await fileData.move(drive.makePath(datasetFolder), {
// await fileData.move(drive.makePath(datasetFolder), {
// name: fileName,
// overwrite: true, // overwrite in case of conflict
// });
await fileData.moveToDisk(datasetFullPath, {
name: fileName,
overwrite: true, // overwrite in case of conflict
driver: 'local',
});
//save to db:
@ -1161,31 +1176,32 @@ export default class DatasetController {
if (validStates.includes(dataset.server_state)) {
if (dataset.files && dataset.files.length > 0) {
for (const file of dataset.files) {
// overwritten delete method also delets file on filespace
// overwritten delete method also delets file on filespace and db object
await file.delete();
}
}
const datasetFolder = `files/${params.id}`;
const folderExists = await drive.exists(datasetFolder);
if (folderExists) {
const dirListing = drive.list(datasetFolder);
const folderContents = await dirListing.toArray();
if (folderContents.length === 0) {
await drive.delete(datasetFolder);
}
// const folderExists = await drive.use('local').exists(datasetFolder);
// if (folderExists) {
// const dirListing = drive.list(datasetFolder);
// const folderContents = await dirListing.toArray();
// if (folderContents.length === 0) {
// await drive.delete(datasetFolder);
// }
await drive.use('local').deleteAll(datasetFolder);
// delete dataset wirh relation in 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! Invalid server_state: "${dataset.server_state}"!`,
// });
return response
.flash({ warning: `You cannot delete this dataset! Dataset folder "${datasetFolder}" doesn't exist!` })
.redirect()
.back();
}
// } else {
// // session.flash({
// // warning: `You cannot delete this dataset! Invalid server_state: "${dataset.server_state}"!`,
// // });
// return response
// .flash({ warning: `You cannot delete this dataset! Dataset folder "${datasetFolder}" doesn't exist!` })
// .redirect()
// .back();
// }
}
} catch (error) {
if (error instanceof errors.E_VALIDATION_ERROR) {
@ -1193,7 +1209,8 @@ export default class DatasetController {
throw error;
} else if (error instanceof Exception) {
// General exception handling
return response.flash('errors', error.message).redirect().back();
session.flash({ error: error.message});
return response.redirect().back();
} else {
session.flash({ error: 'An error occurred while deleting the dataset.' });
return response.redirect().back();