feat: Enhance dataset management and improve frontend components
Some checks failed
CI Pipeline / japa-tests (push) Failing after 1m0s

- Added preloads 'allowed_extensions_mimetypes' and 'dependent_array_min_length' in adonisrc.ts
- Updated @symfony/webpack-encore from ^4.6.1 to ^5.0.1
- AdminuserController: Implemented pagination for 10 records in index method
- Enabled reviewers to reject datasets to editors with email notifications (DatasetController.ts)
- Submitter DatasetController: Files now loaded in ascending order (sort_order) in edit mode
- file.ts: Removed serialization of fileData due to browser issues
- Modified FileUpload.vue to mark already uploaded files as deleted
- Improved keyword search in SearchCategoryAutocomplete.vue
- Started development on Category.vue for submitters to categorize DDC
- Added new route /dataset/categorize in routes.ts
- Introduced 2 new rules in start/rules: allowed_extensions_mimetypes.ts and dependent_array_min_length.ts
- Performed npm updates
This commit is contained in:
Kaimbacher 2024-11-29 15:46:26 +01:00
parent 49bd96ee77
commit f67b736a88
23 changed files with 2392 additions and 2759 deletions

View file

@ -0,0 +1,91 @@
<template>
<div class="flex flex-col h-screen p-4 bg-gray-100">
<header class="flex justify-between items-center mb-4">
<h1 class="text-xl font-bold">SKOS Browser</h1>
<div class="flex space-x-2">
<button @click="updateApp" title="Update the application">
<img src="/Resources/Images/refresh.png" alt="Update" class="w-4 h-4" />
</button>
<button @click="showInfo" title="Info">
<img src="/Resources/Images/info.png" alt="Info" class="w-4 h-4" />
</button>
</div>
</header>
<div class="bg-white shadow-md rounded-lg p-4 mb-6">
<h2 class="text-lg font-semibold">GBA-Thesaurus</h2>
<label class="block text-sm font-medium">Aktueller Endpoint:</label>
<!-- <TreeView :items="endpoints" @select="onEndpointSelected" /> -->
</div>
<div class="bg-white shadow-md rounded-lg p-4">
<h2 class="text-lg font-semibold">Konzept-Suche</h2>
<!-- <Autocomplete v-model="selectedConcept" :items="concepts" placeholder="Search for a concept" @change="onConceptSelected" /> -->
<div class="mt-4">
<h3 class="text-md font-medium">Ausgewähltes Konzept</h3>
<p>{{ selectedConcept.title }}</p>
<a :href="selectedConcept.uri" target="_blank" class="text-blue-500">URI</a>
<textarea
v-model="selectedConcept.description"
class="mt-2 w-full h-24 border rounded"
placeholder="Description"
></textarea>
</div>
<div class="mt-4">
<h3 class="text-md font-medium">Untergeordnete Konzepte</h3>
<!-- <LinkLabelList :items="narrowerConcepts" /> -->
</div>
<div class="mt-4">
<h3 class="text-md font-medium">Übergeordnete Konzepte</h3>
<!-- <LinkLabelList :items="broaderConcepts" /> -->
</div>
<div class="mt-4">
<h3 class="text-md font-medium">Verwandte Konzepte</h3>
<!-- <LinkLabelList :items="relatedConcepts" /> -->
</div>
</div>
</div>
</template>
<script>
// import TreeView from './TreeView.vue'; // Assuming you have a TreeView component
// import Autocomplete from './Autocomplete.vue'; // Assuming you have an Autocomplete component
// import LinkLabelList from './LinkLabelList.vue'; // Assuming you have a LinkLabelList component
export default {
components: {
// TreeView,
// Autocomplete,
// LinkLabelList,
},
data() {
return {
endpoints: [], // This should be populated with your data
concepts: [], // This should be populated with your data
selectedConcept: {},
narrowerConcepts: [], // Populate with data
broaderConcepts: [], // Populate with data
relatedConcepts: [], // Populate with data
};
},
methods: {
updateApp() {
// Handle app update logic
},
showInfo() {
// Handle showing information
},
onEndpointSelected(endpoint) {
// Handle endpoint selection
},
onConceptSelected(concept) {
this.selectedConcept = concept;
// Handle concept selection logic, e.g., fetching related concepts
},
},
};
</script>
<style scoped>
/* Add your styles here */
</style>

View file

@ -965,6 +965,11 @@ Removes a selected keyword
<CardBox class="mb-6 shadow" has-table title="Dataset References" :header-icon="mdiPlusCircle"
v-on:header-icon-click="addReference">
<!-- Message when no references exist -->
<div v-if="form.references.length === 0" class="text-center py-4">
<p class="text-gray-600">No references added yet.</p>
<p class="text-gray-400">Click the plus icon above to add a new reference.</p>
</div>
<table class="table-fixed border-green-900" v-if="form.references.length">
<thead>
<tr>

View file

@ -440,7 +440,7 @@
</select> -->
</div>
<FileUploadComponent :files="form.files"></FileUploadComponent>
<FileUploadComponent v-model:files="form.files" v-model:filesToDelete="form.filesToDelete"></FileUploadComponent>
<div class="text-red-400 text-sm" v-if="form.errors['file'] && Array.isArray(form.errors['files'])">
{{ form.errors['files'].join(', ') }}
@ -482,9 +482,6 @@
import LayoutAuthenticated from '@/Layouts/LayoutAuthenticated.vue';
import { useForm, Head, usePage } from '@inertiajs/vue3';
import { computed, ComputedRef } from 'vue';
// import { ref } from 'vue';
// import { MainService } from '@/Stores/main';
// import FormInput from '@/Components/FormInput.vue'; // @/Components/FormInput.vue'
import { Dataset, Title, Subject, TethysFile, Person, License } from '@/Dataset';
import { stardust } from '@eidellev/adonis-stardust/client';
@ -620,6 +617,7 @@ const mapId = 'test';
// // });
// }
props.dataset.filesToDelete = [];
let form = useForm<Dataset>(props.dataset as Dataset);
// const mainService = MainService();
@ -681,10 +679,17 @@ const submit = async (): Promise<void> => {
// return MultipartFile for file upload
const options: FilePropertyBag = {
type: obj.type,
lastModified: obj.lastModified
lastModified: obj.lastModified,
sortOrder: obj.sort_order,
};
// let file = new File([obj.blob], `${obj.label}?sortOrder=${obj.sort_order}`, options);
let file = new File([obj.blob], `${obj.label}`, options);
// const file = new File([obj.blob], `${obj.label}?sortOrder=${obj.sort_order}`, options);
// const metadata = JSON.stringify({ sort_order: obj.sort_order });
// const metadataBlob = new Blob([metadata + '\n'], { type: 'application/json' });
const file = new File([obj.blob], `${obj.label}`, options,);
// const file = new File([obj.blob], `${obj.label}`, options);
// fileUploads[obj.sort_order] = file;
fileUploads.push(file);
} else {
@ -716,7 +721,17 @@ const submit = async (): Promise<void> => {
rights: 'true',
}))
.put(route);
// .put(route);
.put(route, {
onSuccess: () => {
// console.log(form.data());
// mainService.setDataset(form.data());
// formStep.value++;
// form.filesToDelete = [];
// Clear the array using splice
form.filesToDelete?.splice(0, form.filesToDelete.length);
},
});
};
const hasIdAttribute = (obj: License | number): obj is License => {