- small adaption for OpenAire inside OaiController.ts

- validate abstratct for max 2500 characters
- small changes inside page for releasing a dataset
- npm updates
- adapted validating messages

app/Controllers/Http/Oai/OaiController.ts

@@ -216,6 +216,7 @@ export default class OaiController {
 
         const sets: { [key: string]: string } = {
             'open_access': 'Set for open access licenses',
+            'openaire_data': "OpenAIRE",
             'doc-type:ResearchData': 'Set for document type ResearchData',
             ...(await this.getSetsForDatasetTypes()),
             ...(await this.getSetsForCollections()),

app/Controllers/Http/Submitter/DatasetController.ts

@@ -202,7 +202,7 @@ export default class DatasetController {
             descriptions: vine
                 .array(
                     vine.object({
-                        value: vine.string().trim().minLength(3).maxLength(255),
+                        value: vine.string().trim().minLength(3).maxLength(2500),
                         type: vine.enum(Object.values(DescriptionTypes)),
                         language: vine
                             .string()
@@ -279,7 +279,7 @@ export default class DatasetController {
             descriptions: vine
                 .array(
                     vine.object({
-                        value: vine.string().trim().minLength(3).maxLength(255),
+                        value: vine.string().trim().minLength(3).maxLength(2500),
                         type: vine.enum(Object.values(DescriptionTypes)),
                         language: vine
                             .string()
@@ -635,6 +635,7 @@ export default class DatasetController {
         '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 {{ min }} characters long',
+        'descriptions.0.value.maxLength': 'Main Abstract  must be less than {{ max }} 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',
@@ -644,6 +645,7 @@ export default class DatasetController {
 
         'authors.array.minLength': 'at least {{ min }} author must be defined',
         'authors.distinct': 'The {{ field }} array must have unique values based on the {{ fields }} attribute.',
+        'authors.*.email.isUnique': 'the email of the new creator already exists in the database',
         'contributors.*.pivot_contributor_type.required': 'contributor type is required, if defined',
         'contributors.distinct': 'The {{ field }} array must have unique values based on the {{ fields }} attribute.',
 

app/middleware/normalize_newlines_middleware.ts

@@ -0,0 +1,43 @@
+/* 
+* This middleware class normalizes newlines in the request input data by replacing 
+* all occurrences of '\r\n' with '\n' recursively for strings, arrays, and objects.
+*/
+import type { HttpContext } from '@adonisjs/core/http';
+import type { NextFn } from '@adonisjs/core/types/http';
+
+export default class NormalizeNewlinesMiddleware {
+    async handle(ctx: HttpContext, next: NextFn) {
+        // Function to recursively normalize newlines
+        const normalizeNewlines = (input: any): any => {
+            if (typeof input === 'string') {
+                return input.replace(/\r\n/g, '\n');
+            } else if (Array.isArray(input)) {
+                return input.map((item) => normalizeNewlines(item));
+            } else if (typeof input === 'object' && input !== null) {
+                for (const key in input) {
+                    input[key] = normalizeNewlines(input[key]);
+                }
+                return input;
+            }
+            return input;
+        };
+        /**
+         * Middleware logic goes here (before the next call)
+         */
+        // console.log(ctx)
+        // Get all request input
+        const input = ctx.request.all();
+
+        // Normalize newlines in text inputs
+        const normalizedInput = normalizeNewlines(input);
+
+        // Replace request input with normalized data
+        ctx.request.updateBody(normalizedInput);
+
+        /**
+         * Call next method in the pipeline and return its output
+         */
+        const output = await next();
+        return output;
+    }
+}

app/validators/dataset.ts

@@ -43,7 +43,7 @@ export const createDatasetValidator = vine.compile(
         descriptions: vine
             .array(
                 vine.object({
-                    value: vine.string().trim().minLength(3).maxLength(255),
+                    value: vine.string().trim().minLength(3).maxLength(2500),
                     type: vine.enum(Object.values(DescriptionTypes)),
                     language: vine
                         .string()
@@ -164,7 +164,7 @@ export const updateDatasetValidator = vine.compile(
         titles: vine
             .array(
                 vine.object({
-                    value: vine.string().trim().minLength(3).maxLength(255),
+                    value: vine.string().trim().minLength(3).maxLength(2500),
                     type: vine.enum(Object.values(TitleTypes)),
                     language: vine
                         .string()
@@ -302,6 +302,7 @@ let messagesProvider = new SimpleMessagesProvider({
     '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 {{ min }} characters long',
+    'descriptions.0.value.maxLength': 'Main Abstract  must be less than {{ max }} 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',
@@ -311,6 +312,7 @@ let messagesProvider = new SimpleMessagesProvider({
 
     'authors.array.minLength': 'at least {{ min }} author must be defined',
     'authors.distinct': 'The {{ field }} array must have unique values based on the {{ fields }} attribute.',
+    'authors.*.email.isUnique': 'the email of the new creator already exists in the database',
     'contributors.*.pivot_contributor_type.required': 'contributor type is required, if defined',
     'contributors.distinct': 'The {{ field }} array must have unique values based on the {{ fields }} attribute.',
 

public/assets/manifest.json

@@ -85,5 +85,6 @@
   "assets/images/marker-icon.png": "http://localhost:8080/assets/images/marker-icon.2b3e1faf.png",
   "assets/images/layers-2x.png": "http://localhost:8080/assets/images/layers-2x.8f2c4d11.png",
   "assets/images/layers.png": "http://localhost:8080/assets/images/layers.416d9136.png",
-  "assets/images/Close.svg": "http://localhost:8080/assets/images/Close.e4887675.svg"
+  "assets/images/Close.svg": "http://localhost:8080/assets/images/Close.e4887675.svg",
+  "assets/vendors-node_modules_vue-facing-decorator_dist_esm_index_js-node_modules_vue-facing-decorator-818045.js": "http://localhost:8080/assets/vendors-node_modules_vue-facing-decorator_dist_esm_index_js-node_modules_vue-facing-decorator-818045.js"
 }

public/assets2/datasetxml2oai-pmh.xslt

@@ -374,6 +374,9 @@
             <setSpec>
                 <xsl:text>open_access</xsl:text>
             </setSpec>
+            <setSpec>
+                <xsl:text>openaire_data</xsl:text>
+            </setSpec>
             <setSpec>
                 <xsl:text>doc-type:ResearchData</xsl:text>
             </setSpec>            

resources/js/Components/FormControl.vue

@@ -43,6 +43,14 @@ const props = defineProps({
         type: [String, Number, Boolean, Array, Object],
         default: '',
     },
+    showCharCount: {
+        type: Boolean,
+        default: false,
+    },
+    maxInputLength: {
+        type: Number,
+        default: null,
+    },
     required: Boolean,
     borderless: Boolean,
     transparent: Boolean,
@@ -110,36 +118,25 @@ if (props.ctrlKFocus) {
 
 <template>
     <div class="relative">
-        <select v-if="computedType === 'select'" :id="id" v-model="computedValue" :name="name" :class="inputElClass" :disabled="isReadOnly">
+        <select v-if="computedType === 'select'" :id="id" v-model="computedValue" :name="name" :class="inputElClass"
+            :disabled="isReadOnly">
             <option v-if="placeholder" class="text-opacity-25" value="" disabled selected>{{ placeholder }}</option>
             <option v-for="(option, index) in options" :key="index" :value="option.value ?? index">
                 {{ option.label ?? option }}
             </option>
         </select>
-        <textarea
-            v-else-if="computedType === 'textarea'"
-            :id="id"
-            v-model="computedValue"
-            :class="inputElClass"           
-            :name="name"
-            :placeholder="placeholder"
-            :required="required"
-        />
-        <input
-            v-else
-            :id="id"
-            ref="inputEl"
-            v-model="computedValue"
-            :name="name"
-            :inputmode="inputmode"
-            :autocomplete="autocomplete"
-            :required="required"
-            :placeholder="placeholder"
-            :type="computedType"
-            :class="inputElClass"
-            :readonly="isReadOnly"
-        />
+        <textarea v-else-if="computedType === 'textarea'" :id="id" v-model="computedValue" :class="inputElClass"
+            :name="name" :placeholder="placeholder" :required="required" />
+        <input v-else :id="id" ref="inputEl" v-model="computedValue" :name="name" :inputmode="inputmode"
+            :autocomplete="autocomplete" :required="required" :placeholder="placeholder" :type="computedType"
+            :class="inputElClass" :readonly="isReadOnly" />
         <FormControlIcon v-if="icon" :icon="icon" :h="controlIconH" />
         <slot />
+        <span v-if="showCharCount" class="message-counter" :class="{ 'text-red-500': maxInputLength && maxInputLength < computedValue.length }">
+            {{ computedValue.length }}
+            <template v-if="maxInputLength">
+                / {{ maxInputLength }}
+            </template>
+        </span>
     </div>
 </template>

resources/js/Pages/Submitter/Dataset/Create.vue

@@ -669,7 +669,7 @@ Removes a selected keyword
                                     :class="{ 'text-red-400': form.errors['descriptions.0.value'] }"
                                     class="w-full mx-2 flex-1">
                                     <FormControl required v-model="form.descriptions[0].value" type="textarea"
-                                        placeholder="[enter main abstract]">
+                                        placeholder="[enter main abstract]" :show-char-count="true" :max-input-length="2500">
                                         <div class="text-red-400 text-sm"
                                             v-if="form.errors['descriptions.0.value'] && Array.isArray(form.errors['descriptions.0.value'])">
                                             {{ form.errors['descriptions.0.value'].join(', ') }}
@@ -701,7 +701,7 @@ Removes a selected keyword
                                             :class="{ 'text-red-400': form.errors[`descriptions.${index}.value`] }"
                                             class="w-full mx-2 flex-1">
                                             <FormControl required v-model="form.descriptions[index].value" type="text"
-                                                placeholder="[enter additional description]">
+                                                placeholder="[enter additional description]" :show-char-count="true" :max-input-length="2500">
                                                 <div class="text-red-400 text-sm" v-if="form.errors[`descriptions.${index}.value`] &&
                                                     Array.isArray(form.errors[`descriptions.${index}.value`])
                                                 ">

resources/js/Pages/Submitter/Dataset/Release.vue

@@ -66,14 +66,14 @@ const handleSubmit = async (e: Event) => {
             <CardBox form @submit.prevent="handleSubmit">
                 <FormValidationErrors v-bind:errors="errors" />
                 <div class="lex flex-col md:flex-row mb-3">                    
-                    <label for="elevation-option-one" class="pure-radio">
-                        <input id="elevation-option-one" type="radio" v-model="form.preferation" value="yes_preferation" />
-                        preferred reviewer
-                    </label>
                     <label for="elevation-option-two" class="pure-radio">
                         <input id="elevation-option-two" type="radio" v-model="form.preferation" value="no_preferation" />
                         no preferred reviewer
                     </label>
+                    <label for="elevation-option-one" class="pure-radio">
+                        <input id="elevation-option-one" type="radio" v-model="form.preferation" value="yes_preferation" />
+                        preferred reviewer
+                    </label>
                 </div>
                 <div v-if="isPreferationRequired == true">
                     <FormField label="preferred reviewer" :class="{ 'text-red-400': form.errors.preferred_reviewer }">

resources/js/app.ts

@@ -11,7 +11,7 @@ import { darkModeKey, styleKey } from '@/config';
 // import type { DefineComponent } from 'vue';
 // import { resolvePageComponent } from '@adonisjs/inertia/helpers';
 const pinia = createPinia();
-import i18n from './i18n';
+// import i18n from './i18n';
 import { EmitterPlugin } from '@/EmitterDirective';
 
 import { initRoutes } from '@eidellev/adonis-stardust/client/index.js';
@@ -63,7 +63,7 @@ createInertiaApp({
         createApp({ render: () => h(App, props) })
             .use(plugin)
             .use(pinia)
-            .use(i18n)
+            // .use(i18n)
             .use(EmitterPlugin)
             // .component('inertia-link', Link)
             .mount(el);

start/kernel.ts

@@ -37,7 +37,7 @@ router.use([
     // () => import('@adonisjs/inertia/inertia_middleware'),
     () => import('@adonisjs/auth/initialize_auth_middleware'),
     () => import('#middleware/stardust_middleware'),
-    // () => import('@eidellev/adonis-stardust/build/middleware/Stardust.js'),
+    () => import('#middleware/normalize_newlines_middleware'),
 ]);
 
 /**