Merge pull request #434 from EBISPOT/issue-428

issue-428: handle reified deprecation reason
EBISPOT · Jul 24, 2023 · bb74b49 · bb74b49
2 parents 709974a + 8b24435
commit bb74b49
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 22 deletions.
diff --git a/frontend/src/model/Entity.ts b/frontend/src/model/Entity.ts
@@ -22,16 +22,14 @@ export default abstract class Entity extends Thing {
     return this.properties["http://www.ebi.ac.uk/efo/obsoleted_in_version"];
   }
 
-  getDeprecationReason(): string {
-    return asArray(
+  getDeprecationReason(): Reified<any>[] {
+    return Reified.fromJson<any>(
       this.properties["http://purl.obolibrary.org/obo/IAO_0000231"]
-    )
-      .concat(
-        asArray(
-          this.properties["http://www.ebi.ac.uk/efo/reason_for_obsolescence"]
-        )
+    ).concat(
+      Reified.fromJson<any>(
+        this.properties["http://www.ebi.ac.uk/efo/reason_for_obsolescence"]
       )
-      .join(", ");
+    );
   }
 
   getDeprecationReplacement(): string {

diff --git a/frontend/src/pages/ontologies/entities/EntityPage.tsx b/frontend/src/pages/ontologies/entities/EntityPage.tsx
@@ -15,6 +15,7 @@ import LanguagePicker from "../../../components/LanguagePicker";
 import LoadingOverlay from "../../../components/LoadingOverlay";
 import SearchBox from "../../../components/SearchBox";
 import LinkedEntities from "../../../model/LinkedEntities";
+import Reified from "../../../model/Reified";
 import {
   getClassInstances,
   getEntityWithType,
@@ -36,6 +37,7 @@ import IndividualDifferentFromSection from "./entityPageSections/IndividualDiffe
 import IndividualPropertyAssertionsSection from "./entityPageSections/IndividualPropertyAssertionsSection";
 import IndividualSameAsSection from "./entityPageSections/IndividualSameAsSection";
 import IndividualTypesSection from "./entityPageSections/IndividualTypesSection";
+import MetadataTooltip from "./entityPageSections/MetadataTooltip";
 import PropertyChainSection from "./entityPageSections/PropertyChainSection";
 import PropertyCharacteristicsSection from "./entityPageSections/PropertyCharacteristicsSection";
 import PropertyInverseOfSection from "./entityPageSections/PropertyInverseOfSection";
@@ -246,20 +248,35 @@ export default function EntityPage({
                     </i>
                   </div>
                 )}
-                {entity.getDeprecationReason() && (
-                  <div>
-                    Reason:&thinsp;
-                    <i>
-                      {addLinksToText(
-                        entity.getDeprecationReason(),
-                        linkedEntities,
-                        ontologyId,
-                        entity,
-                        entityType
-                      )}
-                    </i>
-                  </div>
-                )}
+                {entity.getDeprecationReason() &&
+                  entity.getDeprecationReason().length > 0 && (
+                    <div>
+                      Reason:&thinsp;
+                      <i>
+                        {entity
+                          .getDeprecationReason()
+                          .map((reason: Reified<any>) => {
+                            return (
+                              <span key={reason.value.toString()}>
+                                {addLinksToText(
+                                  reason.value,
+                                  linkedEntities,
+                                  ontologyId,
+                                  entity,
+                                  entityType
+                                )}
+                                {reason.hasMetadata() ? (
+                                  <MetadataTooltip
+                                    metadata={reason.getMetadata()}
+                                    linkedEntities={linkedEntities}
+                                  />
+                                ) : null}
+                              </span>
+                            );
+                          })}
+                      </i>
+                    </div>
+                  )}
               </Banner>
             )}
             <div className="bg-gradient-to-r to-white rounded-lg p-8 mb-4 text-neutral-black from-neutral-light">