oarepo-runtime 1.5.93__py3-none-any.whl → 1.5.95__py3-none-any.whl

oarepo_runtime/services/schema/ui.py

@@ -5,6 +5,12 @@ import marshmallow as ma
 from babel.dates import format_date
 from babel_edtf import format_edtf
 from flask import current_app
+from invenio_rdm_records.records.systemfields.access.field.record import (
+    AccessStatusEnum,
+)
+from invenio_rdm_records.resources.serializers.ui.fields import (
+    UIObjectAccessStatus as InvenioUIObjectAccessStatus,
+)
 from marshmallow_utils.fields import (
     BabelGettextDictField,
     FormatDate,
@@ -15,6 +21,9 @@ from marshmallow_utils.fields import (
 from marshmallow_utils.fields.babel import BabelFormatField
 
 from oarepo_runtime.i18n import gettext
+from oarepo_runtime.i18n import lazy_gettext as _
+
+from .marshmallow import RDMBaseRecordSchema
 
 
 def current_default_locale():
@@ -131,3 +140,52 @@ class InvenioUISchema(ma.Schema):
     links = ma.fields.Raw(dump_only=True)
     revision_id = ma.fields.Integer(dump_only=True)
     expanded = ma.fields.Raw(dump_only=True)
+
+
+# seems not possible to avoid, as they have this hardcoded in their object,
+# and translation keys are i.e. open, which gets translated to otevret
+class UIObjectAccessStatus(InvenioUIObjectAccessStatus):
+    @property
+    def title(self):
+        """Access status title."""
+        return {
+            AccessStatusEnum.OPEN: _("access.status.open"),
+            AccessStatusEnum.EMBARGOED: _("access.status.embargoed"),
+            AccessStatusEnum.RESTRICTED: _("access.status.restricted"),
+            AccessStatusEnum.METADATA_ONLY: _("access.status.metadata-only"),
+        }.get(self.access_status)
+
+
+class AccessStatusField(ma.fields.Field):
+    """Record access status."""
+
+    def _serialize(self, value, attr, obj, **kwargs):
+        """Serialise access status."""
+        record_access_dict = obj.get("access")
+        _files = obj.get("files", {})
+        has_files = _files is not None and _files.get("enabled", False)
+        if record_access_dict:
+            record_access_status_ui = UIObjectAccessStatus(
+                record_access_dict, has_files
+            )
+            return {
+                "id": record_access_status_ui.id,
+                "title_l10n": record_access_status_ui.title,
+                "description_l10n": record_access_status_ui.description,
+                "icon": record_access_status_ui.icon,
+                "embargo_date_l10n": record_access_status_ui.embargo_date,
+                "message_class": record_access_status_ui.message_class,
+            }
+
+
+class InvenioRDMUISchema(InvenioUISchema, RDMBaseRecordSchema):
+    is_draft = ma.fields.Boolean(dump_only=True)
+    access_status = AccessStatusField(attribute="access", dump_only=True)
+
+    def hide_tombstone(self, data):
+        """Hide tombstone info if the record isn't deleted and metadata if it is."""
+        return data
+
+    def default_nested(self, data):
+        """Serialize fields as empty dict for partial drafts."""
+        return data

oarepo_runtime/services/search.py

@@ -5,9 +5,7 @@ from typing import List
 from invenio_rdm_records.services.config import (
     RDMSearchDraftsOptions as BaseRDMSearchDraftsOptions,
 )
-from invenio_rdm_records.services.config import (
-    RDMSearchOptions as BaseRDMSearchOptions,
-)
+from invenio_rdm_records.services.config import RDMSearchOptions as BaseRDMSearchOptions
 from invenio_records_resources.proxies import current_service_registry
 from invenio_records_resources.services.records import (
     SearchOptions as InvenioSearchOptions,
@@ -86,6 +84,35 @@ class SearchOptionsMixin:
     }
 
 
+class SearchOptionsDraftMixin(SearchOptionsMixin):
+    sort_options = {
+        "bestmatch": dict(
+            title=_("Best match"),
+            fields=["_score"],  # search defaults to desc on `_score` field
+        ),
+        "updated-desc": dict(
+            title=_("Recently updated"),
+            fields=["-updated"],
+        ),
+        "updated-asc": dict(
+            title=_("Least recently updated"),
+            fields=["updated"],
+        ),
+        "newest": dict(
+            title=_("Newest"),
+            fields=["-created"],
+        ),
+        "oldest": dict(
+            title=_("Oldest"),
+            fields=["created"],
+        ),
+        "version": dict(
+            title=_("Version"),
+            fields=["-versions.index"],
+        ),
+    }
+
+
 class SearchOptions(SearchOptionsMixin, InvenioSearchOptions):
     # TODO: should be changed
     params_interpreters_cls = [
@@ -100,7 +127,7 @@ class RDMSearchOptions(SearchOptionsMixin, BaseRDMSearchOptions):
     pass
 
 
-class RDMSearchDraftsOptions(SearchOptionsMixin, BaseRDMSearchDraftsOptions):
+class RDMSearchDraftsOptions(SearchOptionsDraftMixin, BaseRDMSearchDraftsOptions):
     pass
 
 

oarepo_runtime/translations/cs/LC_MESSAGES/messages.po

@@ -51,3 +51,19 @@ msgstr "Ne"
 #, python-format
 msgid "Invalid value %(identifier)s of identifier type %(type)s"
 msgstr "%(type)s: Neplatná hodnota '%(identifier)s'"
+
+#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/schema/ui.py:152
+msgid "access.status.open"
+msgstr "otevřený přístup"
+
+#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/schema/ui.py:153
+msgid "access.status.embargoed"
+msgstr "odložené zpřístupnění"
+
+#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/schema/ui.py:154
+msgid "access.status.restricted"
+msgstr "omezený přístup"
+
+#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/schema/ui.py:155
+msgid "access.status.metadata-only"
+msgstr "pouze metadata"

oarepo_runtime/translations/en/LC_MESSAGES/messages.po

@@ -50,3 +50,19 @@ msgstr ""
 #, python-format
 msgid "Invalid value %(identifier)s of identifier type %(type)s"
 msgstr ""
+
+#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/schema/ui.py:152
+msgid "access.status.open"
+msgstr "open access"
+
+#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/schema/ui.py:153
+msgid "access.status.embargoed"
+msgstr "embargoed access"
+
+#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/schema/ui.py:154
+msgid "access.status.restricted"
+msgstr "restricted access"
+
+#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/schema/ui.py:155
+msgid "access.status.metadata-only"
+msgstr "metadata only access"

oarepo_runtime/translations/messages.pot

@@ -1,56 +1,72 @@
 # Translations template for PROJECT.
-# Copyright (C) 2024 ORGANIZATION
+# Copyright (C) 2025 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2025.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-11-28 10:16+0100\n"
+"POT-Creation-Date: 2025-02-17 10:27+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.15.0\n"
+"Generated-By: Babel 2.17.0\n"
 
-#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/search.py:60
-#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/search.py:146
+#: /home/dusanst/Projects/oarepo-runtime/oarepo_runtime/services/search.py:71
+#: /home/dusanst/Projects/oarepo-runtime/oarepo_runtime/services/search.py:175
 msgid "By Title"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/search.py:64
-#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/translations/default_translations.py:5
+#: /home/dusanst/Projects/oarepo-runtime/oarepo_runtime/services/search.py:75
+#: /home/dusanst/Projects/oarepo-runtime/oarepo_runtime/translations/default_translations.py:5
 msgid "Best match"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/search.py:68
-#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/translations/default_translations.py:3
+#: /home/dusanst/Projects/oarepo-runtime/oarepo_runtime/services/search.py:79
+#: /home/dusanst/Projects/oarepo-runtime/oarepo_runtime/translations/default_translations.py:3
 msgid "Newest"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/search.py:72
-#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/translations/default_translations.py:4
+#: /home/dusanst/Projects/oarepo-runtime/oarepo_runtime/services/search.py:83
+#: /home/dusanst/Projects/oarepo-runtime/oarepo_runtime/translations/default_translations.py:4
 msgid "Oldest"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/schema/ui.py:123
+#: /home/dusanst/Projects/oarepo-runtime/oarepo_runtime/services/schema/ui.py:132
 msgid "True"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/schema/ui.py:123
+#: /home/dusanst/Projects/oarepo-runtime/oarepo_runtime/services/schema/ui.py:132
 msgid "False"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/services/schema/validation.py:19
+#: /home/dusanst/Projects/oarepo-runtime/oarepo_runtime/services/schema/ui.py:152
+msgid "access.status.open"
+msgstr ""
+
+#: /home/dusanst/Projects/oarepo-runtime/oarepo_runtime/services/schema/ui.py:153
+msgid "access.status.embargoed"
+msgstr ""
+
+#: /home/dusanst/Projects/oarepo-runtime/oarepo_runtime/services/schema/ui.py:154
+msgid "access.status.restricted"
+msgstr ""
+
+#: /home/dusanst/Projects/oarepo-runtime/oarepo_runtime/services/schema/ui.py:155
+msgid "access.status.metadata-only"
+msgstr ""
+
+#: /home/dusanst/Projects/oarepo-runtime/oarepo_runtime/services/schema/validation.py:31
 #, python-format
 msgid "Invalid value %(identifier)s of identifier type %(type)s"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-runtime/oarepo_runtime/translations/default_translations.py:6
+#: /home/dusanst/Projects/oarepo-runtime/oarepo_runtime/translations/default_translations.py:6
 msgid "Contact"
 msgstr ""
 

{oarepo_runtime-1.5.93.dist-info → oarepo_runtime-1.5.95.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: oarepo-runtime
-Version: 1.5.93
+Version: 1.5.95
 Summary: A set of runtime extensions of Invenio repository
 Description-Content-Type: text/markdown
 License-File: LICENSE

{oarepo_runtime-1.5.93.dist-info → oarepo_runtime-1.5.95.dist-info}/RECORD

@@ -76,7 +76,7 @@ oarepo_runtime/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 oarepo_runtime/services/components.py,sha256=h7oQNPueuPqBD6mCRCIr7ZuNvzeliXinHjOyVV3FBvw,10775
 oarepo_runtime/services/generators.py,sha256=j87HitHA_w2awsz0C5IAAJ0qjg9JMtvdO3dvh6FQyfg,250
 oarepo_runtime/services/results.py,sha256=Ap2mUJHl3V4BSduTrBWPuco0inQVq0QsuCbVhez48uY,5705
-oarepo_runtime/services/search.py,sha256=exCEfRAWlajVfQBZ1Qf1usYEF7Fwp5H8Lb_usOiLRS8,7422
+oarepo_runtime/services/search.py,sha256=mUycojDo26p54ZZPqXcXmdhUrzAP_eKCWls2XYJSM6c,8186
 oarepo_runtime/services/config/__init__.py,sha256=559w4vphVAipa420OwTsxGUP-b7idoqSIX13FSJyVz0,783
 oarepo_runtime/services/config/link_conditions.py,sha256=evPRd5XU76Ok4J-08bBfplbHZ019rl74FpJmO8iM5yg,3298
 oarepo_runtime/services/config/permissions_presets.py,sha256=YF99Vjh1fGqSEXNw7qIfcUQFvzpE54_BafqkO6wlYHk,6668
@@ -120,14 +120,14 @@ oarepo_runtime/services/schema/marshmallow_to_json_schema.py,sha256=VYLnVWHOoaxW
 oarepo_runtime/services/schema/oneofschema.py,sha256=GnWH4Or_G5M0NgSmCoqMI6PBrJg5AC9RHrcB5QDKRq0,6661
 oarepo_runtime/services/schema/polymorphic.py,sha256=bAbUoTIeDBiJPYPhpLEKKZekEdkHlpqkmNxk1hN3PDw,564
 oarepo_runtime/services/schema/rdm.py,sha256=4gi44LIMWS9kWcZfEoHaJSq585qfZfMuUYM5IvL1nQo,531
-oarepo_runtime/services/schema/ui.py,sha256=xQgW-zLyZoHldGw47uVtXQj-5LexVNKTholyq4MiBZo,3777
+oarepo_runtime/services/schema/ui.py,sha256=qS9ZnKlo1xib8VJe3uFEff8mCQF5qtjoyOqfa0xOT70,6055
 oarepo_runtime/services/schema/validation.py,sha256=VFOKSxQLHwFb7bW8BJAFXWe_iTAZFOfqOnb2Ko_Yxxc,2085
 oarepo_runtime/translations/default_translations.py,sha256=060GBlA1ghWxfeumo6NqxCCZDb-6OezOuF6pr-_GEOQ,104
-oarepo_runtime/translations/messages.pot,sha256=jyC7mRH5P9uwVVqz9ycvn-T8gcohr62x__O0sC6g2w4,1846
-oarepo_runtime/translations/cs/LC_MESSAGES/messages.mo,sha256=cSTRnVoi8DxfrXD-ImHYUmxdnNQMnxIn2yFRTObwRzI,801
-oarepo_runtime/translations/cs/LC_MESSAGES/messages.po,sha256=bzO7bZlnifHU0E7khXePmP12lGmzYXudjAWVDb87KrE,1508
-oarepo_runtime/translations/en/LC_MESSAGES/messages.mo,sha256=b4cLKr5VojJPSuCeQ9T1lJKYMM_o80IgiNNL-iQUL8E,445
-oarepo_runtime/translations/en/LC_MESSAGES/messages.po,sha256=akMJzNcvoZmF9j06Cd_oyQX-tMOfYjG1yRAP7tNDhGA,1370
+oarepo_runtime/translations/messages.pot,sha256=wr1vDKjsngqS9e5zQmSAsF3qUAtpQ41SUXwzEKRCnWw,2406
+oarepo_runtime/translations/cs/LC_MESSAGES/messages.mo,sha256=mhVcQhLPW0QG_l4sYDiaiKc67oEVWVVYlwBxeQyDZdY,1044
+oarepo_runtime/translations/cs/LC_MESSAGES/messages.po,sha256=WZwTlVNrA9Ifr4NFL2c9X9mshltvy6ovRcj29i3kgeM,2067
+oarepo_runtime/translations/en/LC_MESSAGES/messages.mo,sha256=tq5pTCpH7cuzdwrQlpTMjS1jlnoV0dWDlK9mGcKT338,673
+oarepo_runtime/translations/en/LC_MESSAGES/messages.po,sha256=7-5S3iINOSFSI5gVdRvT5S2rbGScrheJiUJQH_fqXmY,1914
 oarepo_runtime/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oarepo_runtime/utils/functools.py,sha256=gKS9YZtlIYcDvdNA9cmYO00yjiXBYV1jg8VpcRUyQyg,1324
 oarepo_runtime/utils/path.py,sha256=V1NVyk3m12_YLbj7QHYvUpE1wScO78bYsX1LOLeXDkI,3108
@@ -135,9 +135,9 @@ tests/marshmallow_to_json/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 tests/marshmallow_to_json/test_datacite_ui_schema.py,sha256=82iLj8nW45lZOUewpWbLX3mpSkpa9lxo-vK-Qtv_1bU,48552
 tests/marshmallow_to_json/test_simple_schema.py,sha256=izZN9p0v6kovtSZ6AdxBYmK_c6ZOti2_z_wPT_zXIr0,1500
 tests/pkg_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oarepo_runtime-1.5.93.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-1.5.93.dist-info/METADATA,sha256=utgiMZHHRhAFIpjCSNUAgZYwr2lwKD_BqHQfvKt7jJo,4720
-oarepo_runtime-1.5.93.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-oarepo_runtime-1.5.93.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
-oarepo_runtime-1.5.93.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.5.93.dist-info/RECORD,,
+oarepo_runtime-1.5.95.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.5.95.dist-info/METADATA,sha256=vWqmdskxhbS-TLvIf-ZgenwVMTWx3nZgu5XThZVFqdo,4720
+oarepo_runtime-1.5.95.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+oarepo_runtime-1.5.95.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
+oarepo_runtime-1.5.95.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.5.95.dist-info/RECORD,,