PyPI - invenio-app-rdm - Versions diffs - 14.0.0b2.dev2__tar.gz → 14.0.0b2.dev4__tar.gz - Mend

@@ -10,6 +10,15 @@
 Changes
 =======
+Version v14.0.0b2.dev4 (released 2025-11-05)
+- refactor(config): Update DataCite serializer for schema v4.5
+Version v14.0.0b2.dev3 (released 2025-11-04)
+- feat(share links): handle optional/required expiration date
+- feat(form): rename creators to authors and help text
 Version v14.0.0b2.dev2 (released 2025-10-24)
 - upgrade_scripts: v14: optimize scan to avoid scroll context overhead

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: invenio-app-rdm
-Version: 14.0.0b2.dev2
+Version: 14.0.0b2.dev4
 Summary: Invenio Research Data Management.
 Home-page: https://github.com/inveniosoftware/invenio-app-rdm
 Author: CERN
@@ -101,6 +101,15 @@ https://inveniordm.docs.cern.ch
 Changes
 =======
+Version v14.0.0b2.dev4 (released 2025-11-05)
+- refactor(config): Update DataCite serializer for schema v4.5
+Version v14.0.0b2.dev3 (released 2025-11-04)
+- feat(share links): handle optional/required expiration date
+- feat(form): rename creators to authors and help text
 Version v14.0.0b2.dev2 (released 2025-10-24)
 - upgrade_scripts: v14: optimize scan to avoid scroll context overhead

@@ -17,6 +17,6 @@
 #
 # See PEP 0440 for details - https://www.python.org/dev/peps/pep-0440
-__version__ = "14.0.0b2.dev2"
+__version__ = "14.0.0b2.dev4"
 __all__ = ("__version__",)

@@ -651,7 +651,7 @@ OAISERVER_METADATA_FORMATS = {
     },
     "datacite": {
         "serializer": "invenio_rdm_records.oai:datacite_etree",
-        "schema": "http://schema.datacite.org/meta/kernel-4.3/metadata.xsd",
+        "schema": "http://schema.datacite.org/meta/kernel-4.5/metadata.xsd",
         "namespace": "http://datacite.org/schema/kernel-4",
     },
     "oai_datacite": {
@@ -661,7 +661,7 @@ OAISERVER_METADATA_FORMATS = {
     },
     "datacite4": {
         "serializer": "invenio_rdm_records.oai:datacite_etree",
-        "schema": "http://schema.datacite.org/meta/kernel-4.3/metadata.xsd",
+        "schema": "http://schema.datacite.org/meta/kernel-4.5/metadata.xsd",
         "namespace": "http://datacite.org/schema/kernel-4",
     },
     "oai_datacite4": {
@@ -840,7 +840,7 @@ APP_RDM_RECORD_EXPORTERS = {
     "datacite-json": {
         "name": _("DataCite JSON"),
         "serializer": (
-            "invenio_rdm_records.resources.serializers:DataCite43JSONSerializer"
+            "invenio_rdm_records.resources.serializers:DataCite45JSONSerializer"
         ),
         "params": {"options": {"indent": 2, "sort_keys": True}},
         "content-type": "application/vnd.datacite.datacite+json",
@@ -849,7 +849,7 @@ APP_RDM_RECORD_EXPORTERS = {
     "datacite-xml": {
         "name": _("DataCite XML"),
         "serializer": (
-            "invenio_rdm_records.resources.serializers:DataCite43XMLSerializer"
+            "invenio_rdm_records.resources.serializers:DataCite45XMLSerializer"
         ),
         "params": {},
         "content-type": "application/vnd.datacite.datacite+xml",

@@ -69,6 +69,9 @@
            value='{{ permissions | tojson }}'>
   {%- endif %}
+<input type="hidden" id="deposits-share-btn-require-link-expiration"
+        data-share-btn-require-link-expiration='{{ config.RDM_RECORDS_REQUIRE_SECRET_LINKS_EXPIRATION | tojson }}'>
   <div id="deposit-form"></div>
 {%- endblock page_body %}

@@ -48,6 +48,9 @@
 {%- block page_body %}
+<span id="detail-share-btn-require-link-expiration"
+        data-share-btn-require-link-expiration='{{ config.RDM_RECORDS_REQUIRE_SECRET_LINKS_EXPIRATION | tojson }}'>
   <section id="banners" class="banners" aria-label="{{ _('Information banner') }}">
     <!-- COMMUNITY HEADER: hide it when displaying the submission request -->
     {% if not is_preview_submission_request %}
@@ -262,13 +265,13 @@
             {# Title #}
             {%- block record_title -%}
               <section id="record-title-section"
-                       aria-label="{{ _('Record title and creators') }}">
+                       aria-label="{{ _('Record title, authors and contributors') }}">
                 <h1 id="record-title"
                     class="wrap-overflowing-text">{{ metadata.title }}</h1>
                 {% if record_ui["ui"]["creators"] or record_ui["ui"]["contributors"] %}
                   <section id="creatibutors"
-                           aria-label="{{ _('Creators and contributors') }}">
+                           aria-label="{{ _('Authors and contributors') }}">
                     {%- include "invenio_app_rdm/records/details/creatibutors.html" %}
                   </section>
                 {% endif %}

@@ -13,7 +13,7 @@
   {% if record_ui["ui"]["creators"] and record_ui["ui"]["creators"]["creators"] %}
     <div class="row ui accordion affiliations">
       <div class="sixteen wide mobile twelve wide tablet thirteen wide computer column">
-          <h3 class="sr-only">{{ _('Creators') }}</h3>
+          <h3 class="sr-only">{{ _('Authors/Creators') }}</h3>
           <ul class="creatibutors">
             {{ show_creatibutors(record_ui["ui"]["creators"]["creators"], show_affiliations=True, show_role=True) }}
           </ul>

@@ -303,8 +303,11 @@ export class RDMDepositForm extends Component {
                       fieldPath="metadata.creators"
                     >
                       <CreatibutorsField
-                        label={i18next.t("Creators")}
+                        label={i18next.t("Authors/Creators")}
                         labelIcon="user"
+                        addButtonHelpText={i18next.t(
+                          "Use the Authors/Creators field for names that should appear in the citation. Use the Contributors field below for other names."
+                        )}
                         fieldPath="metadata.creators"
                         roleOptions={this.vocabularies.metadata.creators.role}
                         schema="creators"
@@ -423,6 +426,9 @@ export class RDMDepositForm extends Component {
                     >
                       <CreatibutorsField
                         addButtonLabel={i18next.t("Add contributor")}
+                        addButtonHelpText={i18next.t(
+                          "Contributors are not included in the citation, but are shown on the record page."
+                        )}
                         label={i18next.t("Contributors")}
                         labelIcon="user plus"
                         fieldPath="metadata.contributors"

@@ -25,7 +25,17 @@ export class CreateAccessLink extends Component {
   render() {
     const { permission, expiresAt, description } = this.state;
-    const { handleCreation, loading, dropdownOptions } = this.props;
+    const {
+      hasLinkExpirationError,
+      handleCreation,
+      loading,
+      dropdownOptions,
+      isAccessLinksExpirationRequired,
+    } = this.props;
+    const linkExpirationDateHelptext =
+      isAccessLinksExpirationRequired === true
+        ? i18next.t("Expiration date: YYYY-MM-DD (required).")
+        : i18next.t("Expiration date: YYYY-MM-DD or never if blank (optional).");
     return (
       <Table.Row>
         <Table.Cell width={16}>
@@ -45,6 +55,7 @@ export class CreateAccessLink extends Component {
             </Grid.Column>
             <Grid.Column width={4}>
               <Input
+                className={`${hasLinkExpirationError ? "error" : ""}`}
                 id="access-request-expires-at"
                 onChange={(e, data) => {
                   this.setState({ expiresAt: data.value });
@@ -56,7 +67,7 @@ export class CreateAccessLink extends Component {
                 htmlFor="access-request-expires-at"
                 className="helptext mb-0 mt-10"
               >
-                {i18next.t("Expiration date: YYYY-MM-DD or never if blank (optional).")}
+                {linkExpirationDateHelptext}
               </label>
             </Grid.Column>
             <Grid.Column width={4}>
@@ -95,4 +106,6 @@ CreateAccessLink.propTypes = {
   loading: PropTypes.bool.isRequired,
   dropdownOptions: PropTypes.array.isRequired,
   record: PropTypes.object.isRequired,
+  hasLinkExpirationError: PropTypes.bool.isRequired,
+  isAccessLinksExpirationRequired: PropTypes.bool.isRequired,
 };

@@ -140,9 +140,26 @@ export class LinksSearchResultContainer extends Component {
     return options;
   };
+  checkIfLinkExpirationError = (error) => {
+    const response = error?.response;
+    const data = response?.data;
+    const errors = data?.errors;
+    const hasExpirationError = errors?.some(
+      (errorObject) => errorObject?.field === "expires_at"
+    );
+    return hasExpirationError;
+  };
   render() {
-    const { results, record, onItemAddedOrDeleted, onPermissionChanged } = this.props;
+    const {
+      results,
+      record,
+      onItemAddedOrDeleted,
+      onPermissionChanged,
+      isAccessLinksExpirationRequired,
+    } = this.props;
     const { loading, error } = this.state;
+    const hasLinkExpirationDateError = this.checkIfLinkExpirationError(error);
     return (
       <>
         {error && this.errorMessage()}
@@ -197,10 +214,12 @@ export class LinksSearchResultContainer extends Component {
         <Table color="green">
           <CreateAccessLink
+            hasLinkExpirationError={hasLinkExpirationDateError}
             handleCreation={this.handleCreation}
             loading={loading}
             record={record}
             dropdownOptions={this.generateDropdownOptions()}
+            isAccessLinksExpirationRequired={isAccessLinksExpirationRequired}
           />
         </Table>
       </>
@@ -213,4 +232,5 @@ LinksSearchResultContainer.propTypes = {
   record: PropTypes.object.isRequired,
   onItemAddedOrDeleted: PropTypes.func.isRequired,
   onPermissionChanged: PropTypes.func.isRequired,
+  isAccessLinksExpirationRequired: PropTypes.bool.isRequired,
 };

@@ -68,7 +68,7 @@ export class LinksTab extends Component {
   };
   render() {
-    const { record, results } = this.props;
+    const { record, results, isAccessLinksExpirationRequired } = this.props;
     const { loading, error } = this.state;
     return (
       <>
@@ -89,6 +89,7 @@ export class LinksTab extends Component {
               record={record}
               onItemAddedOrDeleted={this.onLinksAddedOrDeleted}
               onPermissionChanged={this.onPermissionChanged}
+              isAccessLinksExpirationRequired={isAccessLinksExpirationRequired}
             />
           )}
         </Modal.Content>
@@ -101,4 +102,5 @@ LinksTab.propTypes = {
   record: PropTypes.string.isRequired,
   results: PropTypes.array.isRequired,
   updateLinksState: PropTypes.func.isRequired,
+  isAccessLinksExpirationRequired: PropTypes.bool.isRequired,
 };

@@ -72,19 +72,24 @@ export class AccessRequestsTab extends Component {
   };
   initFormValues = () => {
-    const { record } = this.props;
+    const { record, isAccessLinksExpirationRequired } = this.props;
     const settings = record.parent.access.settings;
     if (!_has(settings, "secret_link_expiration")) {
       settings["secret_link_expiration"] = 0;
+    } else if (
+      settings["secret_link_expiration"] === 0 &&
+      isAccessLinksExpirationRequired
+    ) {
+      settings["secret_link_expiration"] = 30;
     }
     return { ...settings };
   };
   render() {
     const { loading, error, actionSuccess } = this.state;
-    const { handleClose } = this.props;
+    const { handleClose, isAccessLinksExpirationRequired } = this.props;
     return (
       <Formik
         onSubmit={this.handleSubmit}
@@ -175,6 +180,9 @@ export class AccessRequestsTab extends Component {
                             <AccessRequestExpirationSelect
                               inline
                               value={values.secret_link_expiration}
+                              isAccessLinksExpirationRequired={
+                                isAccessLinksExpirationRequired
+                              }
                             />
                           </Form.Field>
                         </Grid.Column>
@@ -227,4 +235,5 @@ AccessRequestsTab.propTypes = {
   record: PropTypes.string.isRequired,
   successCallback: PropTypes.func.isRequired,
   handleClose: PropTypes.func.isRequired,
+  isAccessLinksExpirationRequired: PropTypes.bool.isRequired,
 };

@@ -85,9 +85,21 @@ export class ShareModal extends Component {
     this.setState({ record: updatedRecord });
   };
+  checkIfIsAccessLinksExpirationRequired = () => {
+    return (
+      document.getElementById("deposits-share-btn-require-link-expiration")?.dataset
+        ?.shareBtnRequireLinkExpiration === "true" ||
+      document.getElementById("detail-share-btn-require-link-expiration")?.dataset
+        ?.shareBtnRequireLinkExpiration === "true" ||
+      false
+    );
+  };
   panes = (record, permissions) => {
     const { handleClose, groupsEnabled } = this.props;
     const { linksResults, groupsResults, usersResults } = this.state;
+    const isAccessLinksExpirationRequired =
+      this.checkIfIsAccessLinksExpirationRequired();
     let numUsers = 0;
     let numGroups = 0;
@@ -161,6 +173,7 @@ export class ShareModal extends Component {
               results={linksResults}
               record={record}
               updateLinksState={this.updateLinksState}
+              isAccessLinksExpirationRequired={isAccessLinksExpirationRequired}
             />
           </Tab.Pane>
         ),
@@ -178,6 +191,7 @@ export class ShareModal extends Component {
               record={record}
               handleClose={handleClose}
               successCallback={this.handleRecordUpdate}
+              isAccessLinksExpirationRequired={isAccessLinksExpirationRequired}
             />
           </Tab.Pane>
         ),

@@ -6,8 +6,10 @@ import { SelectField } from "react-invenio-forms";
 export class AccessRequestExpirationSelect extends Component {
   constructor(props) {
     super(props);
-    const { expirationOptions } = props;
-    this.expirationOptions = expirationOptions;
+    const { expirationOptions, isAccessLinksExpirationRequired } = props;
+    this.expirationOptions = isAccessLinksExpirationRequired
+      ? expirationOptions.filter((option) => option.value !== "0")
+      : expirationOptions;
   }
   handleOnChange = ({ data, formikProps }) => {
@@ -16,7 +18,9 @@ export class AccessRequestExpirationSelect extends Component {
   render() {
     const { inline, expirationOptions, value } = this.props;
-    const expirationSetting = value ? value.toString() : expirationOptions[0].value;
+    const expirationSetting = value
+      ? value.toString()
+      : this.expirationOptions[0].value;
     return (
       <SelectField
         label={i18next.t("Link expiration")}
@@ -41,6 +45,7 @@ AccessRequestExpirationSelect.propTypes = {
   ),
   inline: PropTypes.bool,
   value: PropTypes.string,
+  isAccessLinksExpirationRequired: PropTypes.bool.isRequired,
 };
 AccessRequestExpirationSelect.defaultProps = {

invenio-app-rdm 14.0.0b2.dev2__tar.gz → 14.0.0b2.dev4__tar.gz

invenio-app-rdm 14.0.0b2.dev2tar.gz → 14.0.0b2.dev4tar.gz