From e07978c55d0db5a22ea2edd62a7129e3b912cbe4 Mon Sep 17 00:00:00 2001
From: Nikolay Akhmetov <nick.akhmetov@gmail.com>
Date: Fri, 11 Oct 2024 09:40:35 -0400
Subject: [PATCH] NickAkhmetov/CAT-948 restore missing columns in derived
 entities tables (#3567)

---
 CHANGELOG-cat-948.md                                  |  1 +
 .../components/detailPage/derivedEntities/columns.ts  |  5 +++--
 ...itySearchHits.js => useDerivedEntitySearchHits.ts} | 11 ++++++-----
 3 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100644 CHANGELOG-cat-948.md
 rename context/app/static/js/hooks/{useDerivedEntitySearchHits.js => useDerivedEntitySearchHits.ts} (77%)

diff --git a/CHANGELOG-cat-948.md b/CHANGELOG-cat-948.md
new file mode 100644
index 0000000000..f9996b96c8
--- /dev/null
+++ b/CHANGELOG-cat-948.md
@@ -0,0 +1 @@
+- Restore missing columns to derived entities section.
diff --git a/context/app/static/js/components/detailPage/derivedEntities/columns.ts b/context/app/static/js/components/detailPage/derivedEntities/columns.ts
index 14af94cf1a..c00b2c4964 100644
--- a/context/app/static/js/components/detailPage/derivedEntities/columns.ts
+++ b/context/app/static/js/components/detailPage/derivedEntities/columns.ts
@@ -22,7 +22,8 @@ const lastModifiedTimestampCol: Column = {
 const organCol: Column = {
   id: 'origin_samples_unique_mapped_organs',
   label: 'Organ',
-  renderColumnCell: (entity) => (isDataset(entity) ? entity.origin_samples_unique_mapped_organs.join(', ') : ''),
+  renderColumnCell: (entity) =>
+    isDataset(entity) || isSample(entity) ? entity.origin_samples_unique_mapped_organs.join(', ') : '',
 };
 
 const dataTypesCol: Column = {
@@ -34,7 +35,7 @@ const dataTypesCol: Column = {
 const statusCol: Column = {
   id: 'mapped_status',
   label: 'Status',
-  renderColumnCell: ({ mapped_status }) => mapped_status ?? '',
+  renderColumnCell: ({ mapped_status, status }) => mapped_status ?? status ?? '',
 };
 
 const derivedSamplesColumns: Column[] = [
diff --git a/context/app/static/js/hooks/useDerivedEntitySearchHits.js b/context/app/static/js/hooks/useDerivedEntitySearchHits.ts
similarity index 77%
rename from context/app/static/js/hooks/useDerivedEntitySearchHits.js
rename to context/app/static/js/hooks/useDerivedEntitySearchHits.ts
index 4f5705220b..09babbc9dc 100644
--- a/context/app/static/js/hooks/useDerivedEntitySearchHits.js
+++ b/context/app/static/js/hooks/useDerivedEntitySearchHits.ts
@@ -1,8 +1,9 @@
 import { useMemo } from 'react';
 
 import { useSearchHits } from 'js/hooks/useSearchData';
+import { Dataset, Sample } from 'js/components/types';
 
-function getTypeQuery(ancestorUUID, type) {
+function getTypeQuery(ancestorUUID: string, type: string) {
   return {
     bool: {
       filter: [
@@ -21,7 +22,7 @@ function getTypeQuery(ancestorUUID, type) {
   };
 }
 
-function useDerivedDatasetSearchHits(ancestorUUID) {
+function useDerivedDatasetSearchHits(ancestorUUID: string) {
   const query = useMemo(
     () => ({
       query: getTypeQuery(ancestorUUID, 'dataset'),
@@ -39,10 +40,10 @@ function useDerivedDatasetSearchHits(ancestorUUID) {
     [ancestorUUID],
   );
 
-  return useSearchHits(query);
+  return useSearchHits<Dataset>(query);
 }
 
-function useDerivedSampleSearchHits(ancestorUUID) {
+function useDerivedSampleSearchHits(ancestorUUID: string) {
   const query = useMemo(
     () => ({
       query: getTypeQuery(ancestorUUID, 'sample'),
@@ -59,7 +60,7 @@ function useDerivedSampleSearchHits(ancestorUUID) {
     }),
     [ancestorUUID],
   );
-  return useSearchHits(query);
+  return useSearchHits<Sample>(query);
 }
 
 export { useDerivedDatasetSearchHits, useDerivedSampleSearchHits };