Merge pull request #104 from oarepo/mirekys/be-607-fix-multiple-reque…

…st-receivers-rendering

fix(receiver): fix multi-receiver labels

oarepo_requests/resolvers/ui.py

@@ -12,6 +12,7 @@
 import abc
 import contextlib
 import copy
+import json
 from typing import TYPE_CHECKING, Any, TypedDict, cast, override
 
 from flask import request
@@ -62,7 +63,18 @@ def resolve(identity: Identity, reference: dict[str, str]) -> UIResolvedReferenc
             return cache[(reference_type, reference_value)]
 
     entity_resolvers = current_oarepo_requests.entity_reference_ui_resolvers
-    if reference_type in entity_resolvers:
+
+    if reference_type == 'multiple':
+        # TODO(mirekys): add test coverage
+        resolved = []
+        reference_values_list = list(json.loads(reference_value))
+
+        for reference_values_item in reference_values_list:
+            for key, value in reference_values_item.items():
+                resolved.append(entity_resolvers[key].resolve_one(
+                    identity, value
+                ))
+    elif reference_type in entity_resolvers:
         resolved = entity_resolvers[reference_type].resolve_one(
             identity, reference_value
         )

oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/SideRequestInfo.jsx

@@ -3,6 +3,7 @@ import { i18next } from "@translations/oarepo_requests_ui/i18next";
 import { Icon, List } from "semantic-ui-react";
 import _has from "lodash/has";
 import _truncate from "lodash/truncate";
+import _isArray from "lodash/isArray";
 import { getRequestStatusIcon } from "@js/oarepo_requests_common";
 import PropTypes from "prop-types";
 
@@ -31,15 +32,16 @@ export const SideRequestInfo = ({ request }) => {
           </List.Content>
         </List.Item>
       )}
-      {request?.receiver && (
+      {(request?.receiver &&
+          !_isArray(request.receiver)) ? (
         <List.Item>
           <List.Header as="h3">{i18next.t("Receiver")}</List.Header>
           <List.Content>
             <Icon name="mail outline" />
             <span>
-              {_has(request, "links.receiver.self_html") ? (
+              {_has(request, "links.receiver_html") ? (
                 <a
-                  href={request.links.receiver.self_html}
+                  href={request.links.receiver_html}
                   target="_blank"
                   rel="noreferrer"
                 >
@@ -50,8 +52,32 @@ export const SideRequestInfo = ({ request }) => {
               )}
             </span>
           </List.Content>
+        </List.Item>) : (_isArray(request.receiver)) && (
+            <List.Item>
+          <List.Header as="h3">{i18next.t("Receiver")}</List.Header>
+          <List.Content>
+            <Icon name="mail outline" />
+              {request.receiver.map((receiverItem, index) => (
+                <span key={receiverItem.label}>
+                  {receiverItem.links.self_html ? (
+                    <a
+                      href={receiverItem.links.self_html}
+                      target="_blank"
+                      rel="noreferrer"
+                    >
+                      {receiverItem.label}
+                    </a>
+                  ) : (
+                    receiverItem.label
+                  )}
+                    { request.receiver.length - 1 !== index && ', ' }
+                </span>
+
+              ))}
+          </List.Content>
         </List.Item>
-      )}
+      )
+      }
       <List.Item>
         <List.Header as="h3">{i18next.t("Status")}</List.Header>
         <List.Content>

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = oarepo-requests
-version = 2.3.13
+version = 2.3.14
 description =
 authors = Ronald Krist <[email protected]>
 readme = README.md