invenio-app-rdm 8.0.0.dev9__py2.py3-none-any.whl → 14.0.0b4.dev4__py2.py3-none-any.whl

invenio_app_rdm/requests_ui/templates/semantic-ui/invenio_requests/subcommunity/index.html

@@ -0,0 +1,49 @@
+{# -*- coding: utf-8 -*-
+
+  This file is part of Invenio.
+  Copyright (C) 2016-2024 CERN.
+
+  Invenio is free software; you can redistribute it and/or modify it
+  under the terms of the MIT License; see LICENSE file for more details.
+#}
+
+{#
+  Renders the request details page when requesting a subcommunity
+#}
+
+{% extends "invenio_requests/details/index.html" %}
+
+{% set active_dashboard_menu_item = 'requests' %}
+{% set active_community_header_menu_item = 'requests' %}
+
+{%- block request_header %}
+ {% if permissions.can_search_requests %}
+  {% set back_button_url = url_for("invenio_communities.communities_requests", pid_value=community.slug) %}
+ {% endif %}
+  {% from "invenio_requests/macros/request_header.html" import inclusion_request_header %}
+  {{ inclusion_request_header(
+      request=invenio_request,
+      record=record,
+      accepted=request_is_accepted,
+      back_button_url=back_button_url,
+      back_button_text=_("Back to requests")
+    ) }}
+{%- endblock request_header %}
+
+{% block request_timeline %}
+  <div
+    class="ui container rdm-tab-container fluid rel-pt-2 ml-0-mobile mr-0-mobile"
+    id="request-community-submission-tab-container"
+  >
+    <div
+      class="ui bottom attached tab segment active borderless p-0"
+      data-tab="conversation"
+      role="tabpanel"
+      aria-labelledby="conversation-tab"
+      id="conversation-tab-panel"
+    >
+      {{ super() }}
+    </div>
+
+  </div>
+{% endblock request_timeline %}

invenio_app_rdm/requests_ui/templates/semantic-ui/invenio_requests/subcommunity-invitation/index.html

@@ -0,0 +1,49 @@
+{# -*- coding: utf-8 -*-
+
+  This file is part of Invenio.
+  Copyright (C) 2024 CERN.
+
+  Invenio is free software; you can redistribute it and/or modify it
+  under the terms of the MIT License; see LICENSE file for more details.
+#}
+
+{#
+  Renders the request details page when requesting a subcommunity
+#}
+
+{% extends "invenio_requests/details/index.html" %}
+
+{% set active_dashboard_menu_item = 'requests' %}
+{% set active_community_header_menu_item = 'requests' %}
+
+{%- block request_header %}
+ {% if permissions.can_search_requests %}
+  {% set back_button_url = url_for("invenio_communities.communities_requests", pid_value=community.slug) %}
+ {% endif %}
+  {% from "invenio_requests/macros/request_header.html" import inclusion_request_header %}
+  {{ inclusion_request_header(
+      request=invenio_request,
+      record=record,
+      accepted=request_is_accepted,
+      back_button_url=back_button_url,
+      back_button_text=_("Back to requests")
+    ) }}
+{%- endblock request_header %}
+
+{% block request_timeline %}
+  <div
+    class="ui container rdm-tab-container fluid rel-pt-2 ml-0-mobile mr-0-mobile"
+    id="request-community-submission-tab-container"
+  >
+    <div
+      class="ui bottom attached tab segment active borderless p-0"
+      data-tab="conversation"
+      role="tabpanel"
+      aria-labelledby="conversation-tab"
+      id="conversation-tab-panel"
+    >
+      {{ super() }}
+    </div>
+
+  </div>
+{% endblock request_timeline %}

invenio_app_rdm/requests_ui/templates/semantic-ui/invenio_requests/user-access-request/index.html

@@ -0,0 +1,59 @@
+{# -*- coding: utf-8 -*-
+
+  This file is part of Invenio.
+  Copyright (C) 2023 TU Wien.
+
+  Invenio is free software; you can redistribute it and/or modify it
+  under the terms of the MIT License; see LICENSE file for more details.
+#}
+{% set title = invenio_request.title %}
+{% extends "invenio_requests/details/index.html" %}
+{% from "invenio_requests/macros/request_header.html" import inclusion_request_header %}
+
+{% block page_body %}
+  {%- if not (current_user and current_user.is_authenticated) %}
+    <div class=rel-mt-2>
+      {{ super.super() }}
+    </div>
+  {% else %}
+    {{ super.super() }}
+  {% endif %}
+  {%- block request_body %}
+    <div class="ui container request-detail-page">
+
+      {% block request_header %}
+        {% set back_button_url = url_for("invenio_app_rdm_users.requests") %}
+        {{ inclusion_request_header(
+      back_button_url=back_button_url,
+      back_button_text=_("Back to requests"),
+      request=invenio_request,
+      accepted=request_is_accepted
+    ) }}
+
+        <div>
+          <p>
+            <strong>Access level:</strong>
+            {{ invenio_request.payload.permission }}
+          </p>
+          <p>
+            <strong>Record:</strong>
+            <a
+              href="{{ url_for('invenio_app_rdm_records.record_detail', pid_value=invenio_request.topic.record) }}"
+              rel="noopener noreferrer" target="_blank"
+              title="{{ _('Opens in new tab') }}"
+            >
+              {{ invenio_request.topic.record }}
+            </a>
+          </p>
+        </div>
+      {% endblock %}
+      {%- block request_timeline %}
+        {{ super() }}
+      {%- endblock request_timeline %}
+
+    </div>
+  {% endblock request_body %}
+{% endblock page_body %}
+
+
+{% set active_dashboard_menu_item = 'requests' %}

invenio_app_rdm/requests_ui/views/__init__.py

@@ -10,6 +10,4 @@
 
 from .ui import create_ui_blueprint
 
-__all__ = (
-    'create_ui_blueprint',
-)
+__all__ = ("create_ui_blueprint",)

invenio_app_rdm/requests_ui/views/requests.py

@@ -1,82 +1,374 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2019-2022 CERN.
+# Copyright (C) 2019-2025 CERN.
 # Copyright (C) 2019-2022 Northwestern University.
 # Copyright (C)      2022 TU Wien.
 #
 # 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.
+
 """Request views module."""
 
-from flask import g, render_template
-from flask_login import login_required
+from flask import current_app, g, render_template
+from flask_login import current_user, login_required
+from invenio_checks.api import ChecksAPI
+from invenio_communities.config import COMMUNITIES_ROLES
+from invenio_communities.members.services.request import CommunityInvitation
+from invenio_communities.proxies import current_identities_cache
+from invenio_communities.subcommunities.services.request import (
+    SubCommunityInvitationRequest,
+    SubCommunityRequest,
+)
+from invenio_communities.utils import identity_cache_key
+from invenio_communities.views.communities import render_community_theme_template
+from invenio_communities.views.decorators import pass_community
+from invenio_i18n.ext import current_i18n
+from invenio_pidstore.errors import PIDDoesNotExistError
 from invenio_rdm_records.proxies import current_rdm_records_service
+from invenio_rdm_records.requests import CommunityInclusion, CommunitySubmission
 from invenio_rdm_records.resources.serializers import UIJSONSerializer
+from invenio_rdm_records.services.errors import RecordDeletedException
+from invenio_rdm_records.services.generators import CommunityInclusionNeed
+from invenio_records_resources.services.errors import PermissionDeniedError
+from invenio_requests.customizations import AcceptAction
+from invenio_requests.resolvers.registry import ResolverRegistry
 from invenio_requests.views.decorators import pass_request
-from jinja2 import TemplateNotFound
+from invenio_users_resources.proxies import current_user_resources
+from invenio_vocabularies.proxies import current_service as vocabulary_service
+from marshmallow_utils.fields.babel import gettext_from_dict
 from sqlalchemy.orm.exc import NoResultFound
 
+from ...records_ui.utils import get_external_resources
+from ...records_ui.views.decorators import (
+    draft_files_service,
+    draft_media_files_service,
+    files_service,
+    media_files_service,
+)
+from ...records_ui.views.deposits import (
+    get_user_communities_memberships,
+    load_custom_fields,
+)
 
-@login_required
-@pass_request
-def requests_detail(request=None, pid_value=None):
-    """Community detail page."""
-    request_dict = request.to_dict()
 
-    # temporarily, until serializers and avatars implemented
+def _resolve_topic_record(request):
+    """Resolve the record in the topic, when it is a draft or a published record."""
+    creator_id = request["expanded"].get("created_by", {}).get("id", None)
+    user_owns_request = str(creator_id) == str(current_user.id)
+
+    if request["is_closed"] and not user_owns_request:
+        return dict(permissions={}, record_ui=None, record=None)
+
+    record = None
+    # parse the topic field to get the draft/record pid `record:abcd-efgh`
+    entity = ResolverRegistry.resolve_entity_proxy(request["topic"])
+    pid = entity._parse_ref_dict_id()
+
+    request_type = request["type"]
+    is_record_inclusion = request_type == CommunityInclusion.type_id
+
     try:
-        user_email = request_dict["created_by"]["user"]
-        request_dict["created_by"].update({
-            "avatar": "/static/images/placeholder.png",
-            "full_name": user_email
-        })
-    except KeyError:
-        request_dict["created_by"].update({
-            "avatar": "/static/images/placeholder.png",
-            "full_name": request_dict["created_by"]["community"]
-        })
-
-    topic_record = None
-    is_draft = None
-    permissions = []
-
-    is_topic_record_type = 'record' in request_dict["topic"]
-
-    if is_topic_record_type:
+        if is_record_inclusion:
+            community = request["receiver"]["community"]
+            # Get the roles that can curate and in consequence should be able to see the record of the inclusion request
+            can_curate_roles = {
+                role["name"]
+                for role in COMMUNITIES_ROLES
+                if role.get("can_curate", False)
+            }
+            cache_key = identity_cache_key(g.identity)
+            user_community_roles = current_identities_cache.get(cache_key)
+            for community_id, role in user_community_roles:
+                if community_id == community and role in can_curate_roles:
+                    # This need should not be reused, see CommunityInclusionReviewers generator docstring for more info
+                    community_inclusion_need = CommunityInclusionNeed(
+                        pid
+                    )  # pid is the record pid
+                    g.identity.provides.add(community_inclusion_need)
+                    break
+            # read published record
+            record = current_rdm_records_service.read(g.identity, pid, expand=True)
+        else:
+            # read draft
+            record = current_rdm_records_service.read_draft(
+                g.identity, pid, expand=True
+            )
+    except (NoResultFound, PIDDoesNotExistError, RecordDeletedException):
+        # We catch PIDDoesNotExistError because a published record with
+        # a soft-deleted draft will raise this error. The lines below
+        # will catch the case that a id does not exists and raise a
+        # PIDDoesNotExistError that can be handled as 404 in the resource
+        # layer.
+        try:
+            # read published record
+            record = current_rdm_records_service.read(g.identity, pid, expand=True)
+        except (NoResultFound, RecordDeletedException):
+            # record tab not displayed when the record is not found
+            # the request is probably not open anymore
+            pass
+
+    if record:
+        record_ui = UIJSONSerializer().dump_obj(record.to_dict())
+        permissions = record.has_permissions_to(
+            [
+                "edit",
+                "new_version",
+                "manage",
+                "update_draft",
+                "read_files",
+                "review",
+                "read",
+            ]
+        )
+        return dict(
+            permissions=permissions,
+            record_ui=record_ui,
+            record=record,
+        )
+
+    return dict(permissions={}, record_ui=None, record=None)
+
+
+def _resolve_record_or_draft_files(record, request):
+    """Resolve the record's or draft's files."""
+    request_type = request["type"]
+    is_record_inclusion = request_type == CommunityInclusion.type_id
+    if record and record["files"]["enabled"]:
+        record_pid = record["id"]
         try:
-            topic_record = current_rdm_records_service.read_draft(
-                id_=request_dict["topic"]["record"], identity=g.identity)
+            if is_record_inclusion:
+                files = files_service().list_files(id_=record_pid, identity=g.identity)
+            else:
+                files = draft_files_service().list_files(
+                    id_=record_pid, identity=g.identity
+                )
+        except NoResultFound:
+            files = files_service().list_files(id_=record_pid, identity=g.identity)
+        return files.to_dict()
+    return None
 
+
+def _resolve_record_or_draft_media_files(record, request):
+    """Resolve the record's or draft's media files."""
+    request_type = request["type"]
+    is_record_inclusion = request_type == CommunityInclusion.type_id
+    if record and record["media_files"]["enabled"]:
+        record_pid = record["id"]
+        try:
+            if is_record_inclusion:
+                media_files = media_files_service().list_files(
+                    id_=record_pid, identity=g.identity
+                )
+            else:
+                media_files = draft_media_files_service().list_files(
+                    id_=record_pid, identity=g.identity
+                )
         except NoResultFound:
-            topic_record = current_rdm_records_service.read(
-                id_=request_dict["topic"]["record"], identity=g.identity)
+            media_files = media_files_service().list_files(
+                id_=record_pid, identity=g.identity
+            )
+        return media_files.to_dict()
+    return None
+
 
-        permissions = topic_record.has_permissions_to(
-            ['edit', 'new_version', 'manage',
-             'update_draft', 'read_files'])
-        topic_record = UIJSONSerializer().serialize_object_to_dict(
-            topic_record.data)
-        is_draft = topic_record["is_draft"]
-        request_dict["topic"] = topic_record
+@login_required
+@pass_request(expand=True)
+def user_dashboard_request_view(request, **kwargs):
+    """User dashboard request details view."""
+    avatar = current_user_resources.users_service.links_item_tpl.expand(
+        g.identity, current_user
+    )["avatar"]
 
-    # end temporary block
+    request_type = request["type"]
+    request_is_accepted = request["status"] == AcceptAction.status_to
+
+    has_topic = request["topic"] is not None
+    has_record_topic = has_topic and "record" in request["topic"]
+    has_community_topic = has_topic and "community" in request["topic"]
+    is_record_inclusion = request_type == CommunityInclusion.type_id
+    request_permissions = request.has_permissions_to(
+        ["action_accept", "lock_request", "create_comment", "reply_comment"]
+    )
+
+    if has_record_topic:
+        topic = _resolve_topic_record(request)
+        record_ui = topic["record_ui"]
+        record = topic["record"]
+        is_draft = record_ui["is_draft"] if record_ui else False
+        is_published = record_ui["is_published"] if record_ui else False
+        has_draft = record._record.has_draft if record else False
+
+        files = _resolve_record_or_draft_files(record_ui, request)
+        media_files = _resolve_record_or_draft_media_files(record_ui, request)
+
+        checks = None
+        if current_app.config.get("CHECKS_ENABLED", False) and record:
+            if is_record_inclusion and has_draft:
+                checks = ChecksAPI.get_runs(record._record, is_draft=True)
+            else:
+                checks = ChecksAPI.get_runs(record._record)
+
+        if request_type == "record-deletion":
+            reason_title = vocabulary_service.read(
+                g.identity,
+                ("removalreasons", request["payload"]["reason"]),
+            ).to_dict()
+            request["payload"]["reason_label"] = gettext_from_dict(
+                reason_title["title"],
+                current_i18n.locale,
+                current_app.config.get("BABEL_DEFAULT_LOCALE", "en"),
+            )
 
-    try:
         return render_template(
-            f"invenio_requests/{request_dict['type']}/index.html",
-            # TODO: implement and use request UI serializer
-            request=request_dict,
-            record=topic_record,
-            is_preview=True,
+            f"invenio_requests/{request_type}/index.html",
+            base_template="invenio_app_rdm/users/base.html",
+            user_avatar=avatar,
+            invenio_request=request.to_dict(),
+            record_ui=record_ui,
+            record=record,
+            checks=checks,
+            permissions={**topic["permissions"], **request_permissions},
+            is_preview=is_draft,  # preview only when draft
             is_draft=is_draft,
-            permissions=permissions,
-            files=[]
+            is_published=is_published,
+            has_draft=has_draft,
+            request_is_accepted=request_is_accepted,
+            files=files,
+            media_files=media_files,
+            is_user_dashboard=True,
+            custom_fields_ui=load_custom_fields()["ui"],
+            user_communities_memberships=get_user_communities_memberships(),
+            external_resources=get_external_resources(record),
+            include_deleted=False,
         )
 
-    except TemplateNotFound:
+    elif has_community_topic or not has_topic:
         return render_template(
-            "invenio_requests/details/index.html",
-            # TODO: implement and use request UI serializer
-            request=request_dict,
-            record=topic_record,
+            f"invenio_requests/{request_type}/user_dashboard.html",
+            base_template="invenio_app_rdm/users/base.html",
+            user_avatar=avatar,
+            invenio_request=request.to_dict(),
+            request_is_accepted=request_is_accepted,
+            permissions={**request_permissions},
+            include_deleted=False,
+        )
+
+    topic = _resolve_topic_record(request)
+    record_ui = topic["record_ui"]
+
+    return render_template(
+        f"invenio_requests/{request_type}/index.html",
+        base_template="invenio_app_rdm/users/base.html",
+        user_avatar=avatar,
+        record=record,
+        record_ui=record_ui,
+        permissions={**topic["permissions"], **request_permissions},
+        invenio_request=request.to_dict(),
+        request_is_accepted=request_is_accepted,
+        include_deleted=False,
+    )
+
+
+@login_required
+@pass_request(expand=True)
+@pass_community(serialize=True)
+def community_dashboard_request_view(request, community, community_ui, **kwargs):
+    """Community dashboard requests details view."""
+    avatar = current_user_resources.users_service.links_item_tpl.expand(
+        g.identity, current_user
+    )["avatar"]
+
+    request_type = request["type"]
+
+    is_draft_submission = request_type == CommunitySubmission.type_id
+    is_record_inclusion = request_type == CommunityInclusion.type_id
+    is_member_invitation = request_type == CommunityInvitation.type_id
+    is_subcommunity_request = request_type == SubCommunityRequest.type_id
+    is_subcommunity_invitation_request = (
+        request_type == SubCommunityInvitationRequest.type_id
+    )
+    request_is_accepted = request["status"] == AcceptAction.status_to
+
+    permissions = community.has_permissions_to(
+        ["update", "read", "search_requests", "search_invites", "submit_record"]
+    )
+    request_permissions = request.has_permissions_to(
+        ["action_accept", "lock_request", "create_comment", "reply_comment"]
+    )
+    # Add request specific permissions so that reviewers can be selected from community curators
+    permissions.update(request_permissions)
+
+    if is_draft_submission or is_record_inclusion:
+        topic = _resolve_topic_record(request)
+        record_ui = topic["record_ui"]
+        record = topic["record"]
+        is_draft = record_ui["is_draft"] if record_ui else False
+        is_published = record_ui["is_published"] if record_ui else False
+        has_draft = record._record.has_draft if record else False
+        permissions.update(topic["permissions"])
+
+        files = _resolve_record_or_draft_files(record_ui, request)
+        media_files = _resolve_record_or_draft_media_files(record_ui, request)
+
+        checks = None
+        if current_app.config.get("CHECKS_ENABLED", False) and record:
+            if is_record_inclusion and has_draft:
+                checks = ChecksAPI.get_runs(record._record, is_draft=True)
+            else:
+                checks = ChecksAPI.get_runs(record._record)
+
+        return render_community_theme_template(
+            f"invenio_requests/{request_type}/index.html",
+            theme=community.to_dict().get("theme", {}),
+            base_template="invenio_communities/details/base.html",
+            invenio_request=request.to_dict(),
+            record=record,
+            record_ui=record_ui,
+            community=community,
+            community_ui=community_ui,
+            checks=checks,
+            permissions=permissions,
+            is_preview=is_draft,  # preview only when draft
+            is_draft=is_draft,
+            has_draft=has_draft,
+            is_published=is_published,
+            request_is_accepted=request_is_accepted,
+            files=files,
+            media_files=media_files,
+            user_avatar=avatar,
+            custom_fields_ui=load_custom_fields()["ui"],
+            user_communities_memberships=get_user_communities_memberships(),
+            external_resources=get_external_resources(record),
+            include_deleted=False,
+        )
+
+    elif is_member_invitation:
+        if not permissions["can_search_invites"]:
+            raise PermissionDeniedError()
+
+        return render_community_theme_template(
+            f"invenio_requests/{request_type}/community_dashboard.html",
+            theme=community.to_dict().get("theme", {}),
+            base_template="invenio_communities/details/members/base.html",
+            invenio_request=request.to_dict(),
+            community=community,
+            community_ui=community_ui,
+            permissions=permissions,
+            request_is_accepted=request_is_accepted,
+            user_avatar=avatar,
+            include_deleted=False,
+        )
+
+    elif is_subcommunity_request or is_subcommunity_invitation_request:
+        return render_community_theme_template(
+            f"invenio_requests/{request_type}/index.html",
+            theme=community.to_dict().get("theme", {}),
+            base_template="invenio_communities/details/base.html",
+            invenio_request=request.to_dict(),
+            community=community,
+            community_ui=community_ui,
+            permissions=permissions,
+            request_is_accepted=request_is_accepted,
+            user_avatar=avatar,
+            include_deleted=False,
         )

invenio_app_rdm/requests_ui/views/ui.py

@@ -10,11 +10,20 @@
 
 from flask import Blueprint
 from invenio_pidstore.errors import PIDDeletedError, PIDDoesNotExistError
+from invenio_rdm_records.access_requests_ui.views import (
+    read_request,
+    verify_access_request_token,
+)
 from invenio_records_resources.services.errors import PermissionDeniedError
-from invenio_requests.views.ui import not_found_error, \
-    record_permission_denied_error, record_tombstone_error
+from invenio_requests.views.ui import (
+    not_found_error,
+    record_permission_denied_error,
+    record_tombstone_error,
+)
+from sqlalchemy.exc import NoResultFound
 
-from invenio_app_rdm.requests_ui.views.requests import requests_detail
+from ...records_ui.searchapp import search_app_context
+from .requests import community_dashboard_request_view, user_dashboard_request_view
 
 
 def create_ui_blueprint(app):
@@ -25,19 +34,39 @@ def create_ui_blueprint(app):
         "invenio_app_rdm_requests",
         __name__,
         template_folder="../templates",
-        static_folder='../static'
+        static_folder="../static",
     )
 
     blueprint.add_url_rule(
-        routes["user-dashboard-community-submission"],
-        view_func=requests_detail,
+        routes["user-dashboard-request-details"],
+        view_func=user_dashboard_request_view,
+    )
+
+    blueprint.add_url_rule(
+        routes["community-dashboard-request-details"],
+        view_func=community_dashboard_request_view,
+    )
+
+    blueprint.add_url_rule(
+        routes["community-dashboard-invitation-details"],
+        view_func=community_dashboard_request_view,
+    )
+
+    blueprint.add_url_rule(
+        "/access/requests/confirm", view_func=verify_access_request_token
+    )
+    blueprint.add_url_rule(
+        "/access/requests/<request_pid_value>", view_func=read_request
     )
 
     # Register error handlers
     blueprint.register_error_handler(
-        PermissionDeniedError, record_permission_denied_error)
-    blueprint.register_error_handler(PIDDeletedError,
-                                     record_tombstone_error)
+        PermissionDeniedError, record_permission_denied_error
+    )
+    blueprint.register_error_handler(PIDDeletedError, record_tombstone_error)
     blueprint.register_error_handler(PIDDoesNotExistError, not_found_error)
+    # due to requests found by ID, not PID (check service read method)
+    blueprint.register_error_handler(NoResultFound, not_found_error)
+    blueprint.app_context_processor(search_app_context)
 
     return blueprint