ui: refactored and generalized OrganizationsList

0einstein0 · Nov 29, 2024 · be062d5 · be062d5
1 parent 95ab2b5
commit be062d5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/..._communities/assets/semantic-ui/js/invenio_communities/organizations/OrganizationsList.js b/..._communities/assets/semantic-ui/js/invenio_communities/organizations/OrganizationsList.js
@@ -15,18 +15,18 @@ const OrganizationsList = ({ organizations }) => {
             <i className="building outline icon" aria-hidden="true" />
             {organizations[0].id ? (
               <a
-                href={`https://ror.org/${organizations[0].id}`}
-                aria-label={`${organizations[0].name}'s ROR profile`}
-                title={`${organizations[0].name}'s ROR profile`}
+                href={organizations[0].url}
+                aria-label={`${organizations[0].name}'s ${organizations[0].label} profile`}
+                title={`${organizations[0].name}'s ${organizations[0].label} profile`}
                 target="_blank"
                 rel="noreferrer"
               >
                 {organizations[0].name}
                 <span>&nbsp;</span>
                 <img
                   className="inline-id-icon"
-                  src="/static/images/ror-icon.svg"
-                  alt={`${organizations[0].name}'s ROR profile`}
+                  src={organizations[0].icon}
+                  alt={`${organizations[0].name}'s ${organizations[0].label} profile`}
                 />
               </a>
             ) : (
@@ -50,18 +50,18 @@ const OrganizationsList = ({ organizations }) => {
                       <div key={org.id || org.name} className="inline-computer mt-5">
                         {org.id ? (
                           <a
-                            href={`https://ror.org/${org.id}`}
-                            aria-label={`${org.name}'s ROR profile`}
-                            title={`${org.name}'s ROR profile`}
+                            href={org.url}
+                            aria-label={`${org.name}'s ${org.label} profile`}
+                            title={`${org.name}'s ${org.label} profile`}
                             target="_blank"
                             rel="noreferrer"
                           >
                             {org.name}
                             <span>&nbsp;</span>
                             <img
                               className="inline-id-icon"
-                              src="/static/images/ror-icon.svg"
-                              alt={`${organizations[0].name}'s ROR profile`}
+                              src={org.icon}
+                              alt={`${org.name}'s ${org.label} profile`}
                             />
                           </a>
                         ) : (
@@ -89,6 +89,9 @@ OrganizationsList.propTypes = {
     PropTypes.shape({
       id: PropTypes.string,
       name: PropTypes.string.isRequired,
+      label: PropTypes.string,
+      icon: PropTypes.string,
+      url: PropTypes.string,
     })
   ).isRequired,
 };

diff --git a/invenio_communities/communities/resources/ui_schema.py b/invenio_communities/communities/resources/ui_schema.py
@@ -118,7 +118,7 @@ def get_organizations(self, obj):
         organizations = obj.get("metadata", {}).get("organizations", [])
 
         for org in organizations:
-            if org["identifiers"]:
+            if "id" in org:
                 scheme = detect_identifier_schemes(org["id"])[0]
                 org["icon"] = f"/static/images/{scheme}-icon.svg"
                 org["url"] = to_url(org["id"], scheme)