Libpitt/1638 dataset type hierarchy

src/components/custom/TableResultsEntities.jsx

@@ -145,7 +145,7 @@ function TableResultsEntities({children, filters, onRowClicked, currentColumns,
             name: 'Dataset Type',
             id: 'dataset_type',
             selector: row => {
-                let val = raw(row.dataset_type)
+                let val = raw(row.dataset_type_hierarchy)?.second_level || raw(row.dataset_type)
                 if (val) {
                     return Array.isArray(val) ? getUBKGFullName(val[0]) : val
                 } else {

src/components/custom/entities/dataset/CreationActionRelationship.jsx

@@ -1,7 +1,7 @@
 import React, {useContext, useEffect, useState} from 'react'
 import PropTypes from 'prop-types'
 import SenNetAccordion from "../../layout/SenNetAccordion";
-import {getCreationActionRelationName} from "../../js/functions";
+import {getCreationActionRelationName, getDatasetTypeDisplay} from "../../js/functions";
 import Tab from 'react-bootstrap/Tab';
 import Tabs from 'react-bootstrap/Tabs';
 import DataTable from "react-data-table-component";
@@ -36,7 +36,7 @@ function CreationActionRelationship({ entity, data }) {
         },
         {
             name: 'Dataset Type',
-            selector: row => row.dataset_type,
+            selector: row => getDatasetTypeDisplay(row),
             sortable: true,
         },
         {

src/components/custom/js/functions.js

@@ -143,6 +143,10 @@ const normalizedNames = {
     "frozen in liquid nitrogen": "Frozen in Liquid Nitrogen",
 }
 
+export const getDatasetTypeDisplay = (data) => {
+    return data.dataset_type_hierarchy?.second_level || data.display_subtype || data.dataset_type
+}
+
 function getNormalizedName(term) {
     if (term && normalizedNames.hasOwnProperty(term.toLowerCase())) {
         return normalizedNames[term.toLowerCase()]

src/components/custom/layout/entity/ViewHeaderBadges.jsx

@@ -7,7 +7,14 @@ import AppContext from "@/context/AppContext";
 import Link from "next/link";
 import PropTypes from "prop-types";
 import { Fragment, useContext } from "react";
-import { displayBodyHeader, eq, getStatusColor, getStatusDefinition, getUBKGFullName } from "../../js/functions";
+import {
+    getDatasetTypeDisplay,
+    displayBodyHeader,
+    eq,
+    getStatusColor,
+    getStatusDefinition,
+    getUBKGFullName
+} from "../../js/functions";
 
 function ViewHeaderBadges({data, uniqueHeader, uniqueHeaderUrl, isMetadataHeader, hasWritePrivilege}) {
     const {cache} = useContext(AppContext)
@@ -54,7 +61,7 @@ function ViewHeaderBadges({data, uniqueHeader, uniqueHeaderUrl, isMetadataHeader
                     ) : (
                         <h5 className={"title_badge"}>
                             <span className="badge bg-secondary me-2">
-                                    {getUBKGFullName(data.dataset_type)}
+                                    {getUBKGFullName(getDatasetTypeDisplay(data))}
                             </span>
                         </h5>
                     )

src/config/search/entities.js

@@ -57,11 +57,11 @@ export const SEARCH_ENTITIES = {
             dataset_type: {
                 label: 'Dataset Type',
                 type: 'value',
-                field: 'dataset_type.keyword',
+                field: 'dataset_type_hierarchy.second_level.keyword',
                 isExpanded: false,
                 filterType: 'any',
                 isFilterable: false,
-                groupBy: 'dataset_type_hierarchy.keyword',
+                groupBy: 'dataset_type_hierarchy.first_level.keyword',
                 groupAll: true,
             },
             'sources.source_type': {
@@ -247,6 +247,7 @@ export const SEARCH_ENTITIES = {
             'organ',
             'title',
             'description',
+            'dataset_type_hierarchy'
         ]
     },
     initialState: {

src/pages/dataset.jsx

@@ -2,6 +2,7 @@ import dynamic from "next/dynamic";
 import React, {useContext, useEffect, useState} from "react";
 import log from "loglevel";
 import {
+    getDatasetTypeDisplay,
     datasetIs,
     fetchDataCite,
     getCreationActionRelationName,
@@ -227,9 +228,9 @@ function ViewDataset() {
                                     <SidebarBtn/>
 
                                     <EntityViewHeader data={data}
-                                                      uniqueHeader={data.display_subtype || data.dataset_type}
+                                                      uniqueHeader={getDatasetTypeDisplay(data)}
                                                       entity={cache.entities.dataset.toLowerCase()}
-                                                      hasWritePrivilege={hasWritePrivilege}/>
+                                                      hasWritePrivilege={hasWritePrivilege || false}/>
 
                                     <div className="row">
                                         <div className="col-12">