invenio-app-rdm 13.0.0b1.dev27__py2.py3-none-any.whl → 13.0.0b1.dev28__py2.py3-none-any.whl

invenio_app_rdm/__init__.py

@@ -17,6 +17,6 @@
 #
 # See PEP 0440 for details - https://www.python.org/dev/peps/pep-0440
 
-__version__ = "13.0.0b1.dev27"
+__version__ = "13.0.0b1.dev28"
 
 __all__ = ("__version__",)

invenio_app_rdm/records_ui/views/decorators.py

@@ -403,3 +403,24 @@ def secret_link_or_login_required():
         return view
 
     return decorator
+
+
+def no_cache_response(f):
+    """Add appropriate response headers to force no caching.
+
+    This decorator is used to prevent caching of the response in the browser. This is needed
+    in the deposit form as we initialize the form with the record metadata included in the html page
+    and we don't want the browser to cache this page so that the user always gets the latest version of the record.
+    """
+
+    @wraps(f)
+    def view(*args, **kwargs):
+        response = make_response(f(*args, **kwargs))
+
+        response.cache_control.no_cache = True
+        response.cache_control.no_store = True
+        response.cache_control.must_revalidate = True
+
+        return response
+
+    return view

invenio_app_rdm/records_ui/views/deposits.py

@@ -23,6 +23,7 @@ from invenio_i18n.ext import current_i18n
 from invenio_rdm_records.proxies import current_rdm_records
 from invenio_rdm_records.records.api import get_files_quota
 from invenio_rdm_records.resources.serializers import UIJSONSerializer
+from invenio_rdm_records.services.components.pids import _get_optional_doi_transitions
 from invenio_rdm_records.services.schemas import RDMRecordSchema
 from invenio_rdm_records.services.schemas.utils import dump_empty
 from invenio_records_resources.services.errors import PermissionDeniedError
@@ -34,6 +35,7 @@ from sqlalchemy.orm import load_only
 
 from ..utils import set_default_value
 from .decorators import (
+    no_cache_response,
     pass_draft,
     pass_draft_community,
     pass_draft_files,
@@ -45,7 +47,7 @@ from .filters import get_scheme_label
 #
 # Helpers
 #
-def get_form_pids_config():
+def get_form_pids_config(record=None):
     """Prepare configuration for the pids field.
 
     Currently supporting only doi.
@@ -55,17 +57,45 @@ def get_form_pids_config():
     # FIXME: User provider.is_managed() requires tiny fix in config
     can_be_managed = True
     can_be_unmanaged = True
+    # We initialize the optional doi to empty to indicate that there is no restriction on the transitions
+    # This is valid for new uploads and when the DOI is required in an instance
+    optional_doi_transitions = []
     for scheme in service.config.pids_providers.keys():
         if not scheme == "doi":
             continue
+
         record_pid_config = current_app.config["RDM_PERSISTENT_IDENTIFIERS"]
         scheme_label = record_pid_config.get(scheme, {}).get("label", scheme)
         is_doi_required = record_pid_config.get(scheme, {}).get("required")
         default_selected = (
             record_pid_config.get(scheme, {}).get("ui", {}).get("default_selected")
         )
+        if record is not None and not is_doi_required:
+            sitename = current_app.config.get("THEME_SITENAME", "this repository")
+            previous_published_record = (
+                service.record_cls.get_latest_published_by_parent(record.parent)
+            )
+            optional_doi_transitions = _get_optional_doi_transitions(
+                previous_published_record
+            )
+            if optional_doi_transitions:
+                optional_doi_transitions["message"] = optional_doi_transitions.get(
+                    "message"
+                ).format(sitename=sitename)
+                if set(optional_doi_transitions.get("allowed_providers", [])) - set(
+                    ["external", "not_needed"]
+                ):
+                    # In case we have locally managed provider as an allowed one, we need to
+                    # select it by default. That is relevant for the case when the
+                    # user creates a new version of the record and the previous version
+                    # had a datacite DOI.
+                    default_selected = "no"
+
+        # if the DOI is required but the default selected is not_needed then we set it to yes
+        # to force the user to mint a DOI
         if is_doi_required and default_selected == "not_needed":
             default_selected = "yes"
+
         pids_provider = {
             "scheme": scheme,
             "field_label": "Digital Object Identifier",
@@ -89,6 +119,7 @@ def get_form_pids_config():
                 "unambiguously cited. Example: 10.1234/foo.bar"
             ).format(scheme_label=scheme_label),
             "default_selected": default_selected,
+            "optional_doi_transitions": optional_doi_transitions,
         }
         pids_providers.append(pids_provider)
 
@@ -332,6 +363,8 @@ def get_form_config(**kwargs):
     if record_quota:
         quota["maxStorage"] = record_quota["quota_size"]
 
+    record = kwargs.pop("record", None)
+
     return dict(
         vocabularies=VocabulariesOptions().dump(),
         autocomplete_names=conf.get(
@@ -339,7 +372,7 @@ def get_form_config(**kwargs):
         ),
         current_locale=str(current_i18n.locale),
         default_locale=conf.get("BABEL_DEFAULT_LOCALE", "en"),
-        pids=get_form_pids_config(),
+        pids=get_form_pids_config(record=record),
         quota=quota,
         decimal_size_display=conf.get("APP_RDM_DISPLAY_DECIMAL_FILE_SIZES", True),
         links=dict(
@@ -390,6 +423,7 @@ def new_record():
 # Views
 #
 @login_required
+@no_cache_response
 @pass_draft_community
 def deposit_create(community=None):
     """Create a new deposit."""
@@ -441,6 +475,7 @@ def deposit_create(community=None):
 @secret_link_or_login_required()
 @pass_draft(expand=True)
 @pass_draft_files
+@no_cache_response
 def deposit_edit(pid_value, draft=None, draft_files=None, files_locked=True):
     """Edit an existing deposit."""
     # don't show draft's deposit form if the user can't edit it
@@ -490,6 +525,7 @@ def deposit_edit(pid_value, draft=None, draft_files=None, files_locked=True):
         # hide react community component
         hide_community_selection=community_use_jinja_header,
         is_doi_required=is_doi_required,
+        record=draft._record,
     )
 
     if is_doi_required and not record.get("pids", {}).get("doi"):

invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/deposit/RDMDepositForm.js

@@ -211,6 +211,7 @@ export class RDMDepositForm extends Component {
                             btnLabelGetPID={pid.btn_label_get_pid}
                             canBeManaged={pid.can_be_managed}
                             canBeUnmanaged={pid.can_be_unmanaged}
+                            optionalDOItransitions={pid.optional_doi_transitions}
                             fieldPath={`pids.${pid.scheme}`}
                             fieldLabel={pid.field_label}
                             isEditingPublishedRecord={

{invenio_app_rdm-13.0.0b1.dev27.dist-info → invenio_app_rdm-13.0.0b1.dev28.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: invenio-app-rdm
-Version: 13.0.0b1.dev27
+Version: 13.0.0b1.dev28
 Summary: Invenio Research Data Management.
 Home-page: https://github.com/inveniosoftware/invenio-app-rdm
 Author: CERN

{invenio_app_rdm-13.0.0b1.dev27.dist-info → invenio_app_rdm-13.0.0b1.dev28.dist-info}/RECORD

@@ -1,4 +1,4 @@
-invenio_app_rdm/__init__.py,sha256=3elnS9VtcHsQ4M7ZRFrjQGSNiWRk1S21ENs8rGFwtjw,700
+invenio_app_rdm/__init__.py,sha256=7HyqB4G_tTbpxQtOpkBwfja70Zk-A_5X9H2lYM8V5UE,700
 invenio_app_rdm/cli.py,sha256=G6QqNU2W6n6ICtTMnpeKFXIsdorncDmVXwwwsGH5F2k,2746
 invenio_app_rdm/config.py,sha256=huHWP7FzjvRb7r_VOL33A9LQWKdmkUVJyEJaibKp3d4,50265
 invenio_app_rdm/ext.py,sha256=PkZhATGJDgYqBJQh41NdvBZWR83mgI3Eej6rj10UVJE,5278
@@ -80,8 +80,8 @@ invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/macros/
 invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/macros/stats_popup.html,sha256=5SVzfIS15Aro2Itd2BiaLbMXm0cvvwk6ZCdYjuSwhBw,625
 invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/macros/version.html,sha256=JpE4e6RpbSR2pQD1rOsfvzD2ur584aRfBWUUap2IMBA,688
 invenio_app_rdm/records_ui/views/__init__.py,sha256=4NxQNADuvMsblEsGd3zkKXSNR5_4eLMcFEFYvc6NxVc,5718
-invenio_app_rdm/records_ui/views/decorators.py,sha256=eEBxGr0QPDNTXMumqymkoV_MLG0B3UhHgjOvR4e5eok,12673
-invenio_app_rdm/records_ui/views/deposits.py,sha256=4qEffCx0CL-qcWZ5nxV487IbSMDUwD05ILe4NXEozQs,19568
+invenio_app_rdm/records_ui/views/decorators.py,sha256=_TYUGedQAHvEugusIG8xk8xPWHxfw9v4HZR_0dL-tH0,13371
+invenio_app_rdm/records_ui/views/deposits.py,sha256=ZQSlYugqZX1jnS0GFNtJQVq2_KyDS_ECzp1S26qDGAs,21337
 invenio_app_rdm/records_ui/views/filters.py,sha256=Rm55fXJv97cqq8B_6KCe-3PxxHUH4VRu-jd9fTea6r4,6994
 invenio_app_rdm/records_ui/views/records.py,sha256=60pWASXnJS6t6yisq3QqnsNGCOaMDFPgCgErxXPUKuE,15455
 invenio_app_rdm/redirector/__init__.py,sha256=AYCTGmfbmkHW3YJXMqXlWBXcBrUsta-QmL9ULX2bjwA,243
@@ -156,7 +156,7 @@ invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/components/CopyButto
 invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/components/DisplayPartOfCommunities.js,sha256=bSmhuwSWk4CW80mqa4ZZbjfa-_NsiJ1IxQ9veDy6sAM,2751
 invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/components/DisplayVerifiedCommunity.js,sha256=m3rT8jJ3440ZX22zZog8bHatWltYXwvmw_tu6tJUM9k,1506
 invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/components/RecordsResultsListItem.js,sha256=H_3OJBlknDGsk4zJXUv1Ow9ZYpcL_yQZHsX4WM4yuCY,6344
-invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/deposit/RDMDepositForm.js,sha256=UlfRF935tRVAf2rfcEidBv_BOrnCz2M8tOdYRz9_Eb4,29057
+invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/deposit/RDMDepositForm.js,sha256=7Sotq28SBmJE6j59Z7K786LRQxld-dVSmebaFKwhaok,29139
 invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/deposit/ShareDraftButton.js,sha256=ICMV4Ixe-nTe6q7COZ0oyAQf2nVp2cez_-iUZobwUD0,1998
 invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/deposit/index.js,sha256=gA0BaUFpaJr9nkmHSWoxuwKDfSD3JUTPcadj2TKHN24,1587
 invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/frontpage/RecordsList.js,sha256=PkLpiCl7sNSlQoCo7xxZ_H6QvWqK_TydoseIiKvtuMw,4176
@@ -519,9 +519,9 @@ invenio_app_rdm/users_ui/views/__init__.py,sha256=SMdY2NJj9GICfr3Xuok7qdNYVtA2bJ
 invenio_app_rdm/users_ui/views/dashboard.py,sha256=iUn2PrODAwb8ugmMosJKAjPhUzjCiWiAWoXQr9RUFuc,1793
 invenio_app_rdm/users_ui/views/ui.py,sha256=W_eXM8dLVIrNHQB2UEh37C9BYoHauft6RyvcDNFHovA,1742
 invenio_app_rdm/utils/files.py,sha256=CruDyO2gDVadSlWEJD-WHpWHeOQ0juh-Ei9jz3D9yjc,3923
-invenio_app_rdm-13.0.0b1.dev27.dist-info/LICENSE,sha256=AZXFHRrZa5s4m9DV7zZr4bPGTMUvcEPCodeV_AmFI8k,1204
-invenio_app_rdm-13.0.0b1.dev27.dist-info/METADATA,sha256=7o7ejauUNinc7T-e4HlkdyT-1JzcQE1eVOyPs7fYxmw,9272
-invenio_app_rdm-13.0.0b1.dev27.dist-info/WHEEL,sha256=9Hm2OB-j1QcCUq9Jguht7ayGIIZBRTdOXD1qg9cCgPM,109
-invenio_app_rdm-13.0.0b1.dev27.dist-info/entry_points.txt,sha256=r1vTqYNABeWqRMWitzyR9FnBsAy-KYZKZCp95IziyLY,2070
-invenio_app_rdm-13.0.0b1.dev27.dist-info/top_level.txt,sha256=quZejDUw2vLfKQboNIuVLJ9fxZifdnCT_s2PNf1dfmk,16
-invenio_app_rdm-13.0.0b1.dev27.dist-info/RECORD,,
+invenio_app_rdm-13.0.0b1.dev28.dist-info/LICENSE,sha256=AZXFHRrZa5s4m9DV7zZr4bPGTMUvcEPCodeV_AmFI8k,1204
+invenio_app_rdm-13.0.0b1.dev28.dist-info/METADATA,sha256=ZeW18bcqUAiGhh73TMovpEsFGQLXuUrUrA2GtTpPSp8,9272
+invenio_app_rdm-13.0.0b1.dev28.dist-info/WHEEL,sha256=9Hm2OB-j1QcCUq9Jguht7ayGIIZBRTdOXD1qg9cCgPM,109
+invenio_app_rdm-13.0.0b1.dev28.dist-info/entry_points.txt,sha256=r1vTqYNABeWqRMWitzyR9FnBsAy-KYZKZCp95IziyLY,2070
+invenio_app_rdm-13.0.0b1.dev28.dist-info/top_level.txt,sha256=quZejDUw2vLfKQboNIuVLJ9fxZifdnCT_s2PNf1dfmk,16
+invenio_app_rdm-13.0.0b1.dev28.dist-info/RECORD,,