Release: merge develop for v2.1.0

nerge latest hotfix updates from develop branch into master branch

app/Controllers/Http/Editor/DatasetController.ts

@@ -619,7 +619,7 @@ export default class DatasetsController {
         });
     }
 
-    public async doiStore({ request, response, session, auth }: HttpContext) {
+    public async doiStore({ request, response, auth }: HttpContext) {
         const dataId = request.param('publish_id');
         const user = auth.user;
         if (!user) {
@@ -627,7 +627,10 @@ export default class DatasetsController {
         }
 
         // Load dataset with minimal required relationships
-        const dataset = await Dataset.query().where('editor_id', user.id).where('publish_id', dataId).firstOrFail();
+        const dataset = await Dataset.query()
+            .where('editor_id', user.id) // Ensure the user is the editor of the dataset
+            .where('publish_id', dataId)
+            .firstOrFail();
 
         const prefix = process.env.DATACITE_PREFIX || '';
         const base_domain = process.env.BASE_DOMAIN || '';
@@ -636,10 +639,9 @@ export default class DatasetsController {
         const xmlMeta = (await Index.getDoiRegisterString(dataset)) as string;
 
         // Prepare DOI registration data
-        const doiValue = `${prefix}/tethys.${dataset.publish_id}`;
+        const doiValue = `${prefix}/tethys.${dataset.publish_id}`; //'10.21388/tethys.213'
-        const landingPageUrl = `https://doi.${getDomain(base_domain)}/${prefix}/tethys.${dataset.publish_id}`;
+        const landingPageUrl = `https://doi.${getDomain(base_domain)}/${prefix}/tethys.${dataset.publish_id}`; //https://doi.dev.tethys.at/10.21388/tethys.213
 
-        try {
         // Register DOI with DataCite
         const doiClient = new DoiClient();
         const dataciteResponse = await doiClient.registerDoi(doiValue, xmlMeta, landingPageUrl);
@@ -650,30 +652,17 @@ export default class DatasetsController {
         }
 
         // DOI registration successful - persist and index
+        try {
+            // Save identifier
             await this.persistDoiAndIndex(dataset, doiValue);
 
-            return response
+            return response.toRoute('editor.dataset.list').flash('message', 'You have successfully created a DOI for the dataset!');
-                .flash('message', 'You have successfully created a DOI for the dataset!')
-                .redirect()
-                .toRoute('editor.dataset.list');
         } catch (error) {
-            // logger.error(`${__filename}: DOI registration failed for dataset ${dataset.id}: ${error.message}`);
+            logger.error(`${__filename}: Failed to persist DOI and index dataset ${dataset.id}: ${error.message}`);
-
+            throw new HttpException(error.message);
-            if (error instanceof DoiClientException) {
-                // Flash error for Inertia to pick up
-                session.flash('errors', {
-                    doi: `DOI registration failed: ${error.message}`,
-                });
-                // Optionally also flash a warning for your warning display
-                session.flash('warning', error.message);
-            } else {
-                session.flash('errors', {
-                    general: `An unexpected error occurred: ${error.message}`,
-                });
         }
 
-            return response.redirect().back();
+        // return response.toRoute('editor.dataset.list').flash('message', xmlMeta);
-        }
     }
 
     /**

app/Library/Utils/Index.ts

@@ -17,7 +17,7 @@ interface XslTParameter {
 }
 export default {
     // opensearchNode: process.env.OPENSEARCH_HOST || 'localhost',
-    client: new Client({ node: `${process.env.OPENSEARCH_HOST || 'localhost'}` }), // replace with your OpenSearch endpoint
+    client: new Client({ node: `http://${process.env.OPENSEARCH_HOST || 'localhost'}` }), // replace with your OpenSearch endpoint
 
     async getDoiRegisterString(dataset: Dataset): Promise<string | undefined> {
         try {

public/assets2/doi_datacite.xslt

@@ -62,19 +62,15 @@
             </xsl:choose>
             
             <!--<datacite:creator>-->
-            <xsl:if test="PersonAuthor[normalize-space(concat(@FirstName, @LastName)) != '']">
             <creators>
                 <xsl:apply-templates select="PersonAuthor" mode="oai_datacite">
                     <xsl:sort select="@SortOrder"/>               
                 </xsl:apply-templates>
             </creators>
-            </xsl:if>
-            <xsl:if test="TitleMain[normalize-space(@Value) != ''] or TitleAdditional[normalize-space(@Value) != '']">
             <titles>
                 <xsl:apply-templates select="TitleMain" mode="oai_datacite" />
                 <xsl:apply-templates select="TitleAdditional" mode="oai_datacite" />
             </titles>
-            </xsl:if>
             <publisher>
                 <!-- <xsl:value-of select="@PublisherName" /> -->
                 <xsl:value-of select="@CreatingCorporation" />
@@ -82,26 +78,22 @@
             <publicationYear>
                 <xsl:value-of select="ServerDatePublished/@Year" />
             </publicationYear>
-            <xsl:if test="Subject[normalize-space(@Value) != '']">
             <subjects>
                 <xsl:apply-templates select="Subject" mode="oai_datacite" />
             </subjects>
-            </xsl:if>
             <language>
                 <xsl:value-of select="@Language" />
             </language>
-            <xsl:if test="PersonContributor[normalize-space(concat(@FirstName, @LastName)) != '']">
+            <xsl:if test="PersonContributor">
                 <contributors>
                     <xsl:apply-templates select="PersonContributor" mode="oai_datacite">
                         <xsl:sort select="@SortOrder"/>               
                     </xsl:apply-templates>
                 </contributors>
             </xsl:if>
-            <xsl:if test="(EmbargoDate and ($unixTimestamp &lt; EmbargoDate/@UnixTimestamp)) or CreatedAt">
             <dates>
                 <xsl:call-template name="RdrDate2" />
             </dates>
-            </xsl:if>
             <version>
                 <xsl:choose>
                     <xsl:when test="@Version">
@@ -117,46 +109,42 @@
                 <!-- <xsl:value-of select="@Type" /> -->
             </resourceType>
             
-            <xsl:if test="normalize-space(@landingpage) != ''">
             <alternateIdentifiers>
                 <xsl:call-template name="AlternateIdentifier" />
             </alternateIdentifiers>
-            </xsl:if>
             
-            <xsl:if test="Reference[normalize-space(@Type) != '' and normalize-space(@Relation) != '']">
+            <xsl:if test="Reference">
                 <relatedIdentifiers>
                     <xsl:apply-templates select="Reference" mode="oai_datacite" />
                 </relatedIdentifiers>
             </xsl:if>
-            <xsl:if test="Licence[normalize-space(@Name) != '' or normalize-space(@Url) != '']">
             <rightsList>
                 <xsl:apply-templates select="Licence" mode="oai_datacite" />
             </rightsList>
-            </xsl:if>
-            <xsl:if test="File">
             <sizes>
                 <size>
                     <xsl:value-of select="count(File)" />
                     <xsl:text> datasets</xsl:text>
                 </size>
             </sizes>
-            </xsl:if>
-            <xsl:if test="File[normalize-space(@MimeType) != '']">
             <formats>
                 <xsl:apply-templates select="File/@MimeType" mode="oai_datacite" />
             </formats>
-            </xsl:if>         
-            <xsl:if test="TitleAbstract[normalize-space(@Value) != ''] or TitleAbstractAdditional[normalize-space(@Value) != '']">
             <descriptions>
                 <xsl:apply-templates select="TitleAbstract" mode="oai_datacite" />
                 <xsl:apply-templates select="TitleAbstractAdditional" mode="oai_datacite" />
             </descriptions>
-            </xsl:if>
-            <xsl:if test="Coverage[normalize-space(@XMin) != '' and normalize-space(@XMax) != '' and normalize-space(@YMin) != '' and normalize-space(@YMax) != '']">
             <geoLocations>
                 <xsl:apply-templates select="Coverage" mode="oai_datacite" />
+                <!-- <geoLocation>
+                     <geoLocationBox>
+                     <westBoundLongitude>6.58987</westBoundLongitude>
+                     <eastBoundLongitude>6.83639</eastBoundLongitude>
+                     <southBoundLatitude>50.16</southBoundLatitude>
+                     <northBoundLatitude>50.18691</northBoundLatitude>
+                     </geoLocationBox>
+                     </geoLocation> -->
              </geoLocations>
-            </xsl:if>
         </resource>
     </xsl:template>
     
@@ -188,40 +176,41 @@
     
     <xsl:template match="Coverage" mode="oai_datacite"
                   xmlns="http://datacite.org/schema/kernel-4">
-        <xsl:if test="normalize-space(@XMin) != '' and normalize-space(@XMax) != '' and normalize-space(@YMin) != '' and normalize-space(@YMax) != ''">
         <geoLocation>
             <geoLocationBox>
-                    <westBoundLongitude><xsl:value-of select="@XMin" /></westBoundLongitude>
+                <westBoundLongitude>
-                    <eastBoundLongitude><xsl:value-of select="@XMax" /></eastBoundLongitude>
+                    <xsl:value-of select="@XMin" />
-                    <southBoundLatitude><xsl:value-of select="@YMin" /></southBoundLatitude>
+                </westBoundLongitude>
-                    <northBoundLatitude><xsl:value-of select="@YMax" /></northBoundLatitude>
+                <eastBoundLongitude>
+                    <xsl:value-of select="@XMax" />
+                </eastBoundLongitude>
+                <southBoundLatitude>
+                    <xsl:value-of select="@YMin" />
+                </southBoundLatitude>
+                <northBoundLatitude>
+                    <xsl:value-of select="@YMax" />
+                </northBoundLatitude>
             </geoLocationBox>
         </geoLocation>
-        </xsl:if>
     </xsl:template>
     
-    <!-- TitleAbstract template -->
     <xsl:template match="TitleAbstract" mode="oai_datacite"
                   xmlns="http://datacite.org/schema/kernel-4">
-        <xsl:if test="normalize-space(@Value) != ''">
         <description>
             <xsl:attribute name="xml:lang">
                 <xsl:value-of select="@Language" />
             </xsl:attribute>
             <xsl:if test="@Type != ''">
                 <xsl:attribute name="descriptionType">
+                    <!-- <xsl:value-of select="@Type" /> -->
                     <xsl:text>Abstract</xsl:text>
                 </xsl:attribute>
             </xsl:if>
             <xsl:value-of select="@Value" />
         </description>
-        </xsl:if>
     </xsl:template>
-    
-    <!-- TitleAbstractAdditional template -->
     <xsl:template match="TitleAbstractAdditional" mode="oai_datacite"
                   xmlns="http://datacite.org/schema/kernel-4">
-        <xsl:if test="normalize-space(@Value) != ''">
         <description>
             <xsl:attribute name="xml:lang">
                 <xsl:value-of select="@Language" />
@@ -235,7 +224,6 @@
             </xsl:if>
             <xsl:value-of select="@Value" />
         </description>
-        </xsl:if>
     </xsl:template>
     
     <xsl:template name="CamelCaseWord">
@@ -268,7 +256,6 @@
     
     <xsl:template match="TitleMain" mode="oai_datacite"
                   xmlns="http://datacite.org/schema/kernel-4">
-        <xsl:if test="normalize-space(@Value) != ''">
         <title>
             <xsl:if test="@Language != ''">
                 <xsl:attribute name="xml:lang">
@@ -282,12 +269,9 @@
             </xsl:if>
             <xsl:value-of select="@Value" />
         </title>
-        </xsl:if>
     </xsl:template>
-    
     <xsl:template match="TitleAdditional" mode="oai_datacite"
                   xmlns="http://datacite.org/schema/kernel-4">
-        <xsl:if test="normalize-space(@Value) != ''">
         <title>
             <xsl:if test="@Language != ''">
                 <xsl:attribute name="xml:lang">
@@ -310,12 +294,10 @@
             </xsl:choose>
             <xsl:value-of select="@Value" />
         </title>
-        </xsl:if>
     </xsl:template>
     
     <xsl:template match="Subject" mode="oai_datacite"
                   xmlns="http://datacite.org/schema/kernel-4">
-        <xsl:if test="normalize-space(@Value) != ''">
         <subject>
             <xsl:if test="@Language != ''">
                 <xsl:attribute name="xml:lang">
@@ -324,24 +306,21 @@
             </xsl:if>
             <xsl:value-of select="@Value" />
         </subject>
-        </xsl:if>
     </xsl:template>
     
     <xsl:template name="AlternateIdentifier" match="AlternateIdentifier" mode="oai_datacite"
                   xmlns="http://datacite.org/schema/kernel-4">
-        <xsl:if test="normalize-space(@landingpage) != ''">
         <alternateIdentifier>
             <xsl:attribute name="alternateIdentifierType">
                 <xsl:text>url</xsl:text>
             </xsl:attribute>
+            <!-- <xsl:variable name="identifier" select="concat($repURL, '/dataset/', @Id)" /> -->
             <xsl:value-of select="@landingpage" />
         </alternateIdentifier>
-        </xsl:if>
     </xsl:template>
     
     <xsl:template match="Reference" mode="oai_datacite"
                   xmlns="http://datacite.org/schema/kernel-4">
-        <xsl:if test="normalize-space(@Type) != '' and normalize-space(@Relation) != ''">
         <relatedIdentifier>
             <xsl:attribute name="relatedIdentifierType">
                 <xsl:value-of select="@Type" />
@@ -351,13 +330,10 @@
             </xsl:attribute>
             <xsl:value-of select="@Value" />
         </relatedIdentifier>
-        </xsl:if>
     </xsl:template>
     
-    <!-- PersonContributor template -->
     <xsl:template match="PersonContributor" mode="oai_datacite"
                   xmlns="http://datacite.org/schema/kernel-4">
-        <xsl:if test="normalize-space(concat(@FirstName, @LastName)) != ''">
         <contributor>
             <xsl:if test="@ContributorType != ''">
                 <xsl:attribute name="contributorType">
@@ -370,10 +346,9 @@
                      <xsl:value-of select="@NameType" />
                      </xsl:attribute>
                      </xsl:if> -->
-                    <xsl:value-of select="concat(@FirstName, ' ', @LastName)" />
+                <xsl:value-of select="concat(@FirstName, ' ',@LastName)" />
             </contributorName>
         </contributor>
-        </xsl:if>
     </xsl:template>
     
     <xsl:template match="PersonAuthor" mode="oai_datacite"
@@ -428,11 +403,9 @@
     
     <xsl:template match="File/@MimeType" mode="oai_datacite"
                   xmlns="http://datacite.org/schema/kernel-4">
-        <xsl:if test="normalize-space(.) != ''">
         <format>            
             <xsl:value-of select="." />            
         </format>
-        </xsl:if>
     </xsl:template>
     
     <xsl:template match="Licence" mode="oai_datacite"

resources/js/Pages/Editor/Dataset/Doi.vue

@@ -51,11 +51,6 @@ const handleSubmit = async (e) => {
             </SectionTitleLineWithButton>
             <CardBox form @submit.prevent="handleSubmit">
                 <FormValidationErrors v-bind:errors="errors" />
-                <!-- Your existing warning display will show the warning -->
-               
-                <!-- <div v-if="flash && flash.warning">
-                    <p>{{ flash.warning }}</p>
-                </div> -->
 
                 <!-- <div class="flex flex-col md:flex-row items-center"> -->
                 <!-- <div class="w-full">