From 332cbcf7cca411cfdf1b7a2bce141d112a517c67 Mon Sep 17 00:00:00 2001
From: "Bruce W. Herr II" <bherr@indiana.edu>
Date: Mon, 8 Jan 2024 15:09:56 -0500
Subject: [PATCH] Use dataaset_type and remove data_types and assay_type

---
 .../src/lib/xconsortia/xconsortia-data-import.ts  |  3 +--
 .../src/lib/xconsortia/xconsortia-data.ts         | 15 ++++++---------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/projects/ccf-database/src/lib/xconsortia/xconsortia-data-import.ts b/projects/ccf-database/src/lib/xconsortia/xconsortia-data-import.ts
index 13a244fac..868b82d61 100644
--- a/projects/ccf-database/src/lib/xconsortia/xconsortia-data-import.ts
+++ b/projects/ccf-database/src/lib/xconsortia/xconsortia-data-import.ts
@@ -30,8 +30,7 @@ const INCLUDED_DATA_FIELDS = [
   'descendants.uuid',
   'descendants.hubmap_id',
   'descendants.sennet_id',
-  'descendants.data_types',
-  'descendants.ingest_metadata.metadata.assay_type',
+  'descendants.dataset_type',
   'descendants.thumbnail_file',
   'descendants.metadata.files.rel_path',
   'rui_location', 'sample_category'
diff --git a/projects/ccf-database/src/lib/xconsortia/xconsortia-data.ts b/projects/ccf-database/src/lib/xconsortia/xconsortia-data.ts
index 9524ebb55..006a671a4 100644
--- a/projects/ccf-database/src/lib/xconsortia/xconsortia-data.ts
+++ b/projects/ccf-database/src/lib/xconsortia/xconsortia-data.ts
@@ -241,24 +241,21 @@ export class HuBMAPTissueBlock {
     const groupName = GROUP_UUID_MAPPING[dataset.group_uuid as string] || dataset.group_name as string;
     const creator = dataset.created_by_user_displayname;
 
-    const types = [
-      ...dataset.data_types as string[],
-      get(dataset, ['ingest_metadata', 'metadata', 'assay_type'], '')
-    ];
-    const typesSearch = types.join('|').toLowerCase();
+    const types = (dataset.dataset_type ?? '') as string;
+    const typesSearch = types.toLowerCase();
 
     let technology: string;
     let thumbnail = 'assets/icons/ico-unknown.svg';
     if (typesSearch.indexOf('10x') !== -1) {
       technology = '10x';
       thumbnail = 'assets/icons/ico-bulk-10x.svg';
-    } else if (typesSearch.indexOf('af') !== -1) {
+    } else if (typesSearch.indexOf('af') !== -1 || typesSearch.indexOf('auto-fluorescence') !== -1) {
       technology = 'AF';
       thumbnail = 'assets/icons/ico-spatial-af.svg';
     } else if (typesSearch.indexOf('codex') !== -1) {
       technology = 'CODEX';
       thumbnail = 'assets/icons/ico-spatial-codex.svg';
-    } else if (typesSearch.indexOf('imc') !== -1) {
+    } else if (typesSearch.indexOf('imc') !== -1 || typesSearch.indexOf('imaging mass cytometry') !== -1) {
       technology = 'IMC';
       thumbnail = 'assets/icons/ico-spatial-imc.svg';
     } else if ((typesSearch.indexOf('lc') !== -1) && (typesSearch.indexOf('af') === -1)) {
@@ -269,7 +266,7 @@ export class HuBMAPTissueBlock {
     } else if (typesSearch.indexOf('pas') !== -1) {
       technology = 'PAS';
     } else {
-      technology = 'OTHER';
+      technology = types.split(/ \[/)[0];
     }
     thumbnail = this.getDatasetThumbnail(dataset, serviceToken) ?? thumbnail;
 
@@ -277,7 +274,7 @@ export class HuBMAPTissueBlock {
       '@id': this.portal.idPrefix + dataset.uuid,
       '@type': 'Dataset',
       label: `Registered ${dateEntered}, ${creator}, ${groupName}`,
-      description: `Data/Assay Types: ${types.join(', ')}`,
+      description: `Dataset Type: ${types}`,
       link: `${this.portal.portal}dataset${this.portal.portalParams}${dataset.uuid}`,
       technology,
       thumbnail