deposit: passed checks errors to form on draft edit

Author: 0einstein0

invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/deposit.html

@@ -31,6 +31,11 @@
            value='{{ files_locked | tojson }}'>
   {%- endif %}
 
+  {%- if errors %}
+  <input id="deposits-errors" type="hidden" name="deposits-errors"
+         value='{{ errors | tojson }}'>
+  {%- endif %}
+
   {%- if preselectedCommunity %}
     <input id="deposits-draft-community" type="hidden" name="deposits-draft-community"
            value='{{ preselectedCommunity | tojson }}'>
@@ -54,6 +59,7 @@
     <input type="hidden" name="deposits-config"
            value='{{ forms_config | tojson }}'>
   {%- endif %}
+  
 
   {%- if permissions %}
     <input id="deposits-record-permissions" type="hidden"

invenio_app_rdm/records_ui/views/deposits.py

@@ -15,12 +15,13 @@
 
 from flask import current_app, g, redirect
 from flask_login import login_required
+from invenio_checks.utils import resolve_checks
 from invenio_communities.errors import CommunityDeletedError
 from invenio_communities.proxies import current_communities
 from invenio_communities.views.communities import render_community_theme_template
 from invenio_i18n import lazy_gettext as _
 from invenio_i18n.ext import current_i18n
-from invenio_rdm_records.proxies import current_rdm_records
+from invenio_rdm_records.proxies import current_rdm_records, current_rdm_records_service
 from invenio_rdm_records.records.api import get_files_quota
 from invenio_rdm_records.resources.serializers import UIJSONSerializer
 from invenio_rdm_records.services.schemas import RDMRecordSchema
@@ -548,11 +549,25 @@ def deposit_edit(pid_value, draft=None, draft_files=None, files_locked=True):
             if doi_provider_config:
                 doi_provider_config[0]["default_selected"] = "no"
 
+    errors = []
+    record_uuid = current_rdm_records_service.draft_cls.pid.resolve(
+        pid_value, registered_only=False
+    ).id
+    request = draft.data.get("parent", {}).get("review")
+    if request and record_uuid:
+        checks = resolve_checks(record_uuid, request) or []
+        errors = [
+            err
+            for check in checks
+            for err in (check.result.get("errors") if check.result else [])
+        ]
+
     return render_community_theme_template(
         current_app.config["APP_RDM_DEPOSIT_FORM_TEMPLATE"],
         theme=community_theme,
         forms_config=form_config,
         record=record,
+        errors=errors,
         community=community,
         community_use_jinja_header=community_use_jinja_header,
         files=files_dict,

invenio_app_rdm/requests_ui/views/requests.py

@@ -11,9 +11,10 @@
 
 from flask import current_app, g, render_template
 from flask_login import current_user, login_required
+from invenio_checks.utils import resolve_checks
 from invenio_communities.config import COMMUNITIES_ROLES
 from invenio_communities.members.services.request import CommunityInvitation
-from invenio_communities.proxies import current_communities, current_identities_cache
+from invenio_communities.proxies import current_identities_cache
 from invenio_communities.subcommunities.services.request import (
     SubCommunityInvitationRequest,
     SubCommunityRequest,
@@ -31,7 +32,6 @@
 from invenio_requests.resolvers.registry import ResolverRegistry
 from invenio_requests.views.decorators import pass_request
 from invenio_users_resources.proxies import current_user_resources
-from sqlalchemy import case
 from sqlalchemy.orm.exc import NoResultFound
 
 from ...records_ui.utils import get_external_resources
@@ -174,72 +174,6 @@ def _resolve_record_or_draft_media_files(record, request):
     return None
 
 
-def _resolve_checks(record_uuid, request, community=None):
-    """Resolve the checks for this draft/record related to the community and the request."""
-    # FIXME: Move this logic to invenio-checks
-
-    # Early exit if checks are not enabled.
-    enabled = current_app.config.get("CHECKS_ENABLED", False)
-
-    if not enabled:
-        return None
-
-    # Early exit if not draft submission nor record inclusion
-    request_type = request["type"]
-    is_draft_submission = request_type == CommunitySubmission.type_id
-    is_record_inclusion = request_type == CommunityInclusion.type_id
-
-    if not is_draft_submission and not is_record_inclusion:
-        return None
-
-    # Early exit if there is no record UUID (for instance for some closed requests)
-    if not record_uuid:
-        return None
-
-    # Resolve the target community from the request if the community was not passed as an argument
-    if not community:
-        community_uuid = request["receiver"]["community"]
-        community = current_communities.service.read(
-            id_=community_uuid, identity=g.identity
-        )
-
-    # Collect the community UUID and the potential parent community UUID
-    communities = []
-    community_parent_id = community.to_dict().get("parent", {}).get("id")
-    if community_parent_id:
-        # Add the parent community first for later ordering of check configs
-        communities.append(community_parent_id)
-    communities.append(community.id)
-
-    # Early exit if no check config found for the communities
-    from invenio_checks.models import CheckConfig, CheckRun
-
-    check_configs = (
-        CheckConfig.query.filter(CheckConfig.community_id.in_(communities))
-        .order_by(
-            # Order by the communities (parent first if any) and then by check IDs for deterministic ordering
-            case((CheckConfig.community_id == communities[0], 0), else_=1),
-            CheckConfig.check_id,
-        )
-        .all()
-    )
-
-    if not check_configs:
-        return None
-
-    # Find check runs for the given check configs
-    check_config_ids = [check_config.id for check_config in check_configs]
-    checks = CheckRun.query.filter(
-        CheckRun.config_id.in_(check_config_ids),
-        CheckRun.record_id == record_uuid,
-    ).all()
-    # For a given record, there is one check run corresponding to one check config
-    # Order the check runs by the same order as the check configs for deterministic ordering
-    checks = sorted(checks, key=lambda check: check_config_ids.index(check.config_id))
-
-    return checks
-
-
 @login_required
 @pass_request(expand=True)
 def user_dashboard_request_view(request, **kwargs):
@@ -261,7 +195,7 @@ def user_dashboard_request_view(request, **kwargs):
         record = topic["record"]
         record_uuid = topic["record_uuid"]
         is_draft = record_ui["is_draft"] if record_ui else False
-        checks = _resolve_checks(record_uuid, request)
+        checks = resolve_checks(record_uuid, request)
 
         files = _resolve_record_or_draft_files(record_ui, request)
         media_files = _resolve_record_or_draft_media_files(record_ui, request)
@@ -341,7 +275,7 @@ def community_dashboard_request_view(request, community, community_ui, **kwargs)
         record = topic["record"]
         record_uuid = topic["record_uuid"]
         is_draft = record_ui["is_draft"] if record_ui else False
-        checks = _resolve_checks(record_uuid, request, community)
+        checks = resolve_checks(record_uuid, request, community)
 
         permissions.update(topic["permissions"])
         files = _resolve_record_or_draft_files(record_ui, request)

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

@@ -52,7 +52,6 @@ export class RDMDepositForm extends Component {
     super(props);
     this.config = props.config || {};
     const { files, record } = this.props;
-
     // TODO: Make ALL vocabulary be generated by backend.
     // Currently, some vocabulary is generated by backend and some is
     // generated by frontend here. Iteration is faster and abstractions can be
@@ -106,6 +105,7 @@ export class RDMDepositForm extends Component {
     const {
       config,
       record,
+      errors,
       files,
       permissions,
       preselectedCommunity,
@@ -126,6 +126,7 @@ export class RDMDepositForm extends Component {
       <Overridable
         id="InvenioAppRdm.Deposit.RDMDepositForm.layout"
         record={record}
+        errors={errors}
         files={files}
         config={config}
         permissions={permissions}
@@ -143,6 +144,7 @@ export class RDMDepositForm extends Component {
           preselectedCommunity={preselectedCommunity}
           files={files}
           permissions={permissions}
+          errors={errors}
         >
           <Overridable
             id="InvenioAppRdm.Deposit.FormFeedback.container"
@@ -760,6 +762,7 @@ RDMDepositForm.propTypes = {
   recordRestrictionGracePeriod: PropTypes.number.isRequired,
   allowRecordRestriction: PropTypes.bool.isRequired,
   record: PropTypes.object.isRequired,
+  errors: PropTypes.object,
   preselectedCommunity: PropTypes.object,
   files: PropTypes.object,
   permissions: PropTypes.object,

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

@@ -18,6 +18,7 @@ ReactDOM.render(
   <OverridableContext.Provider value={overriddenComponents}>
     <RDMDepositForm
       record={getInputFromDOM("deposits-record")}
+      errors={getInputFromDOM("deposits-errors")}
       preselectedCommunity={getInputFromDOM("deposits-draft-community")}
       files={getInputFromDOM("deposits-record-files")}
       config={getInputFromDOM("deposits-config")}