invenio-app-ils 4.6.0__py2.py3-none-any.whl → 5.0.0__py2.py3-none-any.whl

invenio_app_ils/__init__.py

@@ -7,6 +7,6 @@
 
 """invenio-app-ils."""
 
-__version__ = "4.6.0"
+__version__ = "5.0.0"
 
 __all__ = ("__version__",)

invenio_app_ils/assets/semantic-ui/less/theme.config

@@ -0,0 +1,103 @@
+/*
+
+ WARNING: THIS FILE IS NOT ACTUALLY USED (IT IS A REFERENCE EXAMPLE ONLY)
+
+ This file (theme.config) should be provided by your Invenio instance.
+ Examples of how this should be done can be found in
+ cookiecutter-invenio-instance and cookiecutter-invenio-rdm.
+
+*/
+/*
+
+████████╗██╗  ██╗███████╗███╗   ███╗███████╗███████╗
+╚══██╔══╝██║  ██║██╔════╝████╗ ████║██╔════╝██╔════╝
+   ██║   ███████║█████╗  ██╔████╔██║█████╗  ███████╗
+   ██║   ██╔══██║██╔══╝  ██║╚██╔╝██║██╔══╝  ╚════██║
+   ██║   ██║  ██║███████╗██║ ╚═╝ ██║███████╗███████║
+   ╚═╝   ╚═╝  ╚═╝╚══════╝╚═╝     ╚═╝╚══════╝╚══════╝
+
+*/
+
+/*******************************
+        Theme Selection
+*******************************/
+
+/* To override a theme for an individual element
+   specify theme name below
+*/
+
+/* Global */
+@site        : 'default';
+@reset       : 'default';
+
+/* Elements */
+@button      : 'default';
+@container   : 'default';
+@divider     : 'default';
+@flag        : 'default';
+@header      : 'default';
+@icon        : 'default';
+@image       : 'default';
+@input       : 'default';
+@label       : 'default';
+@list        : 'default';
+@loader      : 'default';
+@placeholder : 'default';
+@rail        : 'default';
+@reveal      : 'default';
+@segment     : 'default';
+@step        : 'default';
+
+/* Collections */
+@breadcrumb  : 'default';
+@form        : 'default';
+@grid        : 'default';
+@menu        : 'default';
+@message     : 'default';
+@table       : 'default';
+
+/* Modules */
+@accordion   : 'default';
+@checkbox    : 'default';
+@dimmer      : 'default';
+@dropdown    : 'default';
+@embed       : 'default';
+@modal       : 'default';
+@nag         : 'default';
+@popup       : 'default';
+@progress    : 'default';
+@rating      : 'default';
+@search      : 'default';
+@shape       : 'default';
+@sidebar     : 'default';
+@sticky      : 'default';
+@tab         : 'default';
+@transition  : 'default';
+
+/* Views */
+@ad          : 'default';
+@card        : 'default';
+@comment     : 'default';
+@feed        : 'default';
+@item        : 'default';
+@statistic   : 'default';
+
+/*******************************
+            Folders
+*******************************/
+
+/* Path to theme packages */
+@themesFolder : '~semantic-ui-less/themes';
+
+/* Path to site override folder */
+@siteFolder  : '../../less/invenio_theme/theme';
+
+/*******************************
+         Import Theme
+*******************************/
+
+@import (multiple) "themes/invenio/theme.less";
+
+@fontPath : "../../../themes/@{theme}/assets/fonts";
+
+/* End Config */

invenio_app_ils/circulation/api.py

@@ -26,6 +26,9 @@ from invenio_db import db
 from invenio_pidstore.models import PIDStatus
 from invenio_pidstore.providers.recordid_v2 import RecordIdProviderV2
 
+from invenio_app_ils.circulation.notifications.api import (
+    send_dates_updated_notification,
+)
 from invenio_app_ils.circulation.search import (
     get_all_expiring_or_overdue_loans_by_patron_pid,
 )
@@ -375,14 +378,12 @@ def update_dates_loan(
 ):
     """Updates the dates of a loan."""
     state = record["state"]
-    is_active_or_completed = (
-        state in CIRCULATION_STATES_LOAN_ACTIVE
-        or state in CIRCULATION_STATES_LOAN_COMPLETED
-    )
+    is_active = state in CIRCULATION_STATES_LOAN_ACTIVE
+    is_completed = state in CIRCULATION_STATES_LOAN_COMPLETED
 
     data = copy(record)
 
-    if is_active_or_completed:
+    if is_active or is_completed:
         today = date.today().strftime("%Y-%m-%d")
         if request_start_date or request_expire_date:
             raise IlsException(
@@ -417,6 +418,9 @@ def update_dates_loan(
     db.session.commit()
     current_circulation.loan_indexer().index(record)
 
+    if is_active:
+        send_dates_updated_notification(record)
+
     return record
 
 

invenio_app_ils/circulation/config.py

@@ -81,6 +81,7 @@ ILS_CIRCULATION_LOAN_WILL_EXPIRE_DAYS = 7
 #: Optional delivery methods when requesting a new loan. Set to empty object to
 # disable it
 ILS_CIRCULATION_DELIVERY_METHODS = {
+    "NOT-SPECIFIED": "Not specified",
     "PICKUP": "Pick it up at the library desk",
     "DELIVERY": "Have it delivered to my office",
     "SELF-CHECKOUT": "Self-checkout",

invenio_app_ils/circulation/loaders/schemas/json/loan_checkout.py

@@ -26,7 +26,7 @@ class LoanCheckoutSchemaV1(LoanBaseSchemaV1):
     item_pid = fields.Nested(LoanItemPIDSchemaV1, required=True)
     start_date = DateString()
     end_date = DateString()
-    force = fields.Bool(missing=False)
+    force = fields.Bool(load_default=False)
 
     @validates("force")
     def validate_force(self, value, **kwargs):

invenio_app_ils/circulation/loaders/schemas/json/loan_request.py

@@ -107,8 +107,8 @@ class LoanRequestSchemaV1(LoanBaseSchemaV1):
     """Loan request schema."""
 
     delivery = fields.Nested(LoanRequestDeliverySchemaV1)
-    request_expire_date = DateString(missing=request_expire_date_default)
-    request_start_date = DateString(missing=request_start_date_default)
+    request_expire_date = DateString(load_default=request_expire_date_default)
+    request_start_date = DateString(load_default=request_start_date_default)
 
     @validates_schema()
     def validates_schema(self, data, **kwargs):

invenio_app_ils/circulation/notifications/api.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2021 CERN.
+# Copyright (C) 2021-2025 CERN.
 #
 # invenio-app-ils is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
@@ -64,6 +64,14 @@ def send_expiring_loan_reminder_notification(loan, expiring_in_days):
     )
 
 
+def send_dates_updated_notification(loan):
+    """Send reminder notification."""
+    send_loan_notification(
+        action="update_dates",
+        loan=loan,
+    )
+
+
 def send_bulk_extend_notification(
     extended_loans,
     not_extended_loans,

invenio_app_ils/circulation/notifications/messages.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2021 CERN.
+# Copyright (C) 2021-2025 CERN.
 #
 # invenio-app-ils is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
@@ -29,6 +29,7 @@ class NotificationLoanMsg(NotificationMsg):
         checkin="checkin.html",
         extend="extend.html",
         cancel="cancel.html",
+        update_dates="update_dates.html",
         overdue_reminder="overdue_reminder.html",
         expiring_reminder="will_expire_in_reminder.html",
         bulk_extend="bulk_extend.html",

invenio_app_ils/circulation/templates/invenio_app_ils_circulation/notifications/update_dates.html

@@ -0,0 +1,19 @@
+{% block title %}
+InvenioILS: loan dates changed for "{{ document.title|safe }}"
+{% endblock %}
+
+{% block body_plain %}
+Dear {{ patron.name }},
+
+The dates of your loan for "{{ document.full_title }}" <{{ spa_routes.HOST }}{{ spa_routes.PATHS['literature']|format(pid=document.pid) }}> have been changed.
+
+The new dates are {{ loan.start_date }} to {{ loan.end_date }}.
+{% endblock %}
+
+{% block body_html %}
+Dear {{ patron.name }}, <br/><br/>
+
+The dates of your loan for <a href="{{ spa_routes.HOST }}{{ spa_routes.PATHS['literature']|format(pid=document.pid) }}">"{{ document.full_title }}"</a> have been <b>changed</b>. <br/>
+
+The new dates are <b>{{ loan.start_date }}</b> to <b>{{ loan.end_date }}</b>.<br/>
+{% endblock %}

invenio_app_ils/cli.py

@@ -7,6 +7,7 @@
 
 """CLI for Invenio App ILS."""
 
+import importlib.resources
 import json
 import os
 import pathlib
@@ -18,19 +19,20 @@ from random import randint
 import arrow
 import click
 import lorem
-import pkg_resources
 from flask import current_app
 from flask.cli import with_appcontext
+from invenio_access.permissions import system_identity
 from invenio_accounts.models import User
 from invenio_circulation.api import Loan
 from invenio_circulation.pidstore.pids import CIRCULATION_LOAN_PID_TYPE
 from invenio_db import db
+from invenio_i18n.proxies import current_i18n
 from invenio_indexer.api import RecordIndexer
-from invenio_pages import Page
+from invenio_pages.proxies import current_pages_service
+from invenio_pages.records.errors import PageNotFoundError
 from invenio_pidstore.models import PersistentIdentifier, PIDStatus
 from invenio_pidstore.providers.recordid_v2 import RecordIdProviderV2
 from invenio_search import current_search
-from invenio_userprofiles.models import UserProfile
 from lorem.text import TextLorem
 
 from invenio_app_ils.errors import RecordRelationsError
@@ -1308,21 +1310,42 @@ def data(
     _run_command("roles create librarian", verbose)
 
     # Create users
-    _run_command("users create patron1@test.ch -a --password=123456", verbose)  # ID 1
-    create_userprofile_for("patron1@test.ch", "patron1", "Yannic Vilma")
-    _run_command("users create patron2@test.ch -a --password=123456", verbose)  # ID 2
-    create_userprofile_for("patron2@test.ch", "patron2", "Diana Adi")
-
-    _run_command("users create librarian@test.ch -a --password=123456", verbose)  # ID 3
-    create_userprofile_for("librarian@test.ch", "librarian", "Hector Nabu")
-    _run_command("users create patron3@test.ch -a --password=123456", verbose)  # ID 4
-    create_userprofile_for("patron3@test.ch", "patron3", "Medrod Tara")
-    _run_command("users create patron4@test.ch -a --password=123456", verbose)  # ID 5
-    create_userprofile_for("patron4@test.ch", "patron4", "Devi Cupid")
+    patron1_profile = {"full_name": "Yannic Vilma"}
+    _run_command(
+        f"users create patron1@test.ch -a --password=123456 --profile '{json.dumps(patron1_profile)}'",
+        verbose,
+    )
+
+    patron2_profile = {"full_name": "Diana Adi"}
+    _run_command(
+        f"users create patron2@test.ch -a --password=123456 --profile '{json.dumps(patron2_profile)}'",
+        verbose,
+    )
+
+    librarian_profile = {"full_name": "Hector Nabu"}
+    _run_command(
+        f"users create librarian@test.ch -a --password=123456 --profile '{json.dumps(librarian_profile)}'",
+        verbose,
+    )
+
+    patron3_profile = {"full_name": "Medrod Tara"}
+    _run_command(
+        f"users create patron3@test.ch -a --password=123456 --profile '{json.dumps(patron3_profile)}'",
+        verbose,
+    )
+
+    patron4_profile = {"full_name": "Devi Cupid"}
+    _run_command(
+        f"users create patron4@test.ch -a --password=123456 --profile '{json.dumps(patron4_profile)}'",
+        verbose,
+    )
 
     if not skip_admin:
-        _run_command("users create admin@test.ch -a --password=123456", verbose)  # ID 6
-        create_userprofile_for("admin@test.ch", "admin", "Zeki Ryoichi")
+        admin_profile = {"full_name": "Zeki Ryoichi"}
+        _run_command(
+            f"users create admin@test.ch -a --password=123456 --profile '{json.dumps(admin_profile)}'",
+            verbose,
+        )
         _run_command("roles add admin@test.ch admin", verbose)
 
     # assign roles
@@ -1512,17 +1535,6 @@ def data(
     current_search.flush_and_refresh(index="*")
 
 
-def create_userprofile_for(email, username, full_name):
-    """Create a fake user profile."""
-    user = User.query.filter_by(email=email).one_or_none()
-    if user:
-        profile = UserProfile(user_id=int(user.get_id()))
-        profile.username = username
-        profile.full_name = full_name
-        db.session.add(profile)
-        db.session.commit()
-
-
 def _run_command(command, verbose, catch_exceptions=False):
     from invenio_base.app import create_cli
 
@@ -1587,42 +1599,58 @@ def fixtures():
 def pages():
     """Register static pages."""
 
-    def page_data(page):
-        return (
-            pkg_resources.resource_stream(
-                "invenio_app_ils", os.path.join("static_pages", page)
-            )
-            .read()
-            .decode("utf8")
-        )
+    def get_page_content(page):
+        with importlib.resources.files("invenio_app_ils").joinpath(
+            "static_pages", page
+        ).open("rb") as f:
+            return f.read().decode("utf8")
 
-    pages = [
-        Page(
-            url="/about",
-            title="About",
-            description="About",
-            content="InvenioILS about page",
-            template_name="invenio_pages/default.html",
-        ),
-        Page(
-            url="/contact",
-            title="Contact",
-            description="Contact",
-            content="You can contact InvenioILS developers on "
-            '<a href="https://gitter.im/inveniosoftware/invenio">'
-            "our chatroom</a>",
-            template_name="invenio_pages/default.html",
-        ),
-        Page(
-            url="/guide/search",
-            title="Search guide",
-            description="Search guide",
-            content=page_data("search_guide.html"),
-            template_name="invenio_pages/default.html",
-        ),
+    pages_data = [
+        {
+            "url": "/about",
+            "title": "About",
+            "description": "About",
+            "content": "InvenioILS about page",
+        },
+        {
+            "url": "/contact",
+            "title": "Contact",
+            "description": "Contact",
+            "content": (
+                "You can contact InvenioILS developers on "
+                '<a href="https://gitter.im/inveniosoftware/invenio">'
+                "our chatroom</a>"
+            ),
+        },
+        {
+            "url": "/guide/search",
+            "title": "Search guide",
+            "description": "Search guide",
+            "template": "search_guide.html",
+        },
     ]
-    with db.session.begin_nested():
-        Page.query.delete()
-        db.session.add_all(pages)
-    db.session.commit()
-    click.echo("static pages created :)")
+
+    supported_languages = current_i18n.get_languages()
+
+    for entry in pages_data:
+        url = entry["url"]
+        for lang in supported_languages:
+            lang_code = lang[0]
+            try:
+                current_pages_service.read_by_url(system_identity, url, lang_code)
+            except PageNotFoundError:
+                page = {
+                    "url": url,
+                    "title": entry.get("title", ""),
+                    "description": entry.get("description", ""),
+                    "lang": lang_code,
+                    "template_name": current_app.config["PAGES_DEFAULT_TEMPLATE"],
+                    "content": (
+                        get_page_content(entry["template"])
+                        if entry.get("template")
+                        else entry.get("content", "")
+                    ),
+                }
+                current_pages_service.create(system_identity, page)
+
+    click.echo("Static pages created :)")

invenio_app_ils/config.py

@@ -125,7 +125,7 @@ DEBUG_TB_INTERCEPT_REDIRECTS = False
 # Rate limiting
 ###############################################################################
 #: Storage for rate limiter.
-RATELIMIT_STORAGE_URL = "redis://localhost:6379/3"
+RATELIMIT_STORAGE_URI = "redis://localhost:6379/3"
 #: Rate limit for logged in users.
 RATELIMIT_AUTHENTICATED_USER = "5000 per hour;150 per minute"
 #: Rate limit for non logged in users.
@@ -299,7 +299,7 @@ SESSION_COOKIE_SAMESITE = "Lax"
 #: provided, the allowed hosts variable is set to localhost. In production it
 #: should be set to the correct host and it is strongly recommended to only
 #: route correct hosts to the application.
-APP_ALLOWED_HOSTS = ["localhost", "127.0.0.1"]
+TRUSTED_HOSTS = ["localhost", "127.0.0.1"]
 
 #: Single Page Application host and routes, useful in templates/emails
 SPA_HOST = "https://127.0.0.1:3000"
@@ -1075,3 +1075,11 @@ DB_VERSIONING_USER_MODEL = None
 
 # Feature Toggles
 ILS_SELF_CHECKOUT_ENABLED = False
+
+# Use default frontpage
+THEME_FRONTPAGE = False
+
+# Default template to render.
+PAGES_DEFAULT_TEMPLATE = "invenio_pages/default.html"
+# default app theme
+APP_THEME = ["semantic-ui"]

invenio_app_ils/documents/loaders/jsonschemas/document.py

@@ -237,7 +237,7 @@ class DocumentSchemaV1(RecordMetadataSchemaJSONV1):
     physical_description = fields.Str()
     publication_info = fields.List(fields.Nested(PublicationInfoSchema))
     publication_year = fields.Str(required=True)
-    restricted = fields.Bool(missing=False)
+    restricted = fields.Bool(load_default=False)
     source = fields.Str()
     subjects = fields.List(fields.Nested(SubjectSchema))
     table_of_content = fields.List(fields.Str())

invenio_app_ils/eitems/loaders/jsonschemas/eitems.py

@@ -27,7 +27,7 @@ class URLSchema(Schema):
         unknown = EXCLUDE
 
     description = fields.Str()
-    login_required = fields.Bool(missing=True)
+    login_required = fields.Bool(load_default=True)
     value = fields.URL(required=True)
 
 
@@ -63,7 +63,7 @@ class EItemSchemaV1(RecordMetadataSchemaJSONV1):
     files = fields.List(fields.Nested(FileSchema))
     identifiers = fields.List(fields.Nested(IdentifierSchema))
     internal_notes = fields.Str()
-    open_access = fields.Bool(missing=True)
+    open_access = fields.Bool(load_default=True)
     source = fields.Str()
     urls = fields.List(fields.Nested(URLSchema))
 

invenio_app_ils/patrons/anonymization.py

@@ -60,7 +60,6 @@ def get_patron_activity(patron_pid):
     patron_loans = dump(get_loans_by_patron_pid(patron_pid))
 
     patron_profile = UserProfile.get_by_userid(patron_pid).__dict__
-    del patron_profile["_sa_instance_state"]
 
     patron_data = {
         "patron": patron,
@@ -254,9 +253,6 @@ def delete_user_account(patron_pid):
             )
             dropped += ra.delete() or 0
 
-        dropped += (
-            UserProfile.query.filter(UserProfile.user_id == patron_pid).delete() or 0
-        )
         dropped += (
             LoginInformation.query.filter(
                 LoginInformation.user_id == patron_pid

invenio_app_ils/series/loaders/jsonschemas/series.py

@@ -40,7 +40,7 @@ class AccessUrlSchema(Schema):
     description = fields.Str()
     open_access = fields.Bool()
     value = fields.URL()
-    login_required = fields.Bool(missing=False)
+    login_required = fields.Bool(load_default=False)
 
 
 class PhysicalVolumes(Schema):

invenio_app_ils/webpack.py

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2025 CERN.
+#
+# Invenio App RDM is free software; you can redistribute it and/or modify it
+# under the terms of the MIT License; see LICENSE file for more details.
+
+"""JS/CSS Webpack bundles for theme."""
+
+from invenio_assets.webpack import WebpackThemeBundle
+
+theme = WebpackThemeBundle(
+    __name__,
+    "assets",
+    default="semantic-ui",
+    themes={
+        "semantic-ui": dict(
+            aliases={
+                # Define Semantic-UI theme configuration needed by
+                # Invenio-Theme in order to build Semantic UI (in theme.js
+                # entry point)
+                # This is a workaround for invenio-app-ils until a better solution is found
+                "../../theme.config$": "less/theme.config",
+            },
+        ),
+    },
+)