Production deploy -- 332cbcf

hubmapconsortium · Jan 8, 2024 · 195a87f · 195a87f
1 parent d3082ee
commit 195a87f
Show file tree

Hide file tree

Showing 74 changed files with 478 additions and 486 deletions.
diff --git a/body-ui/main.js b/body-ui/main.js
diff --git a/body-ui/wc.js b/body-ui/wc.js
diff --git a/docs/ccf-database/classes/HuBMAPTissueBlock.html b/docs/ccf-database/classes/HuBMAPTissueBlock.html
@@ -780,8 +780,8 @@ <h3 id="methods">
 
                     <tr>
                         <td class="col-md-4">
-                            <div class="io-line">Defined in <a href="" data-line="287"
-                                    class="link-to-prism">projects/ccf-database/src/lib/xconsortia/xconsortia-data.ts:287</a></div>
+                            <div class="io-line">Defined in <a href="" data-line="284"
+                                    class="link-to-prism">projects/ccf-database/src/lib/xconsortia/xconsortia-data.ts:284</a></div>
                         </td>
                     </tr>
 
@@ -859,8 +859,8 @@ <h3 id="methods">
 
                     <tr>
                         <td class="col-md-4">
-                            <div class="io-line">Defined in <a href="" data-line="315"
-                                    class="link-to-prism">projects/ccf-database/src/lib/xconsortia/xconsortia-data.ts:315</a></div>
+                            <div class="io-line">Defined in <a href="" data-line="312"
+                                    class="link-to-prism">projects/ccf-database/src/lib/xconsortia/xconsortia-data.ts:312</a></div>
                         </td>
                     </tr>
 
@@ -926,8 +926,8 @@ <h3 id="methods">
 
                     <tr>
                         <td class="col-md-4">
-                            <div class="io-line">Defined in <a href="" data-line="390"
-                                    class="link-to-prism">projects/ccf-database/src/lib/xconsortia/xconsortia-data.ts:390</a></div>
+                            <div class="io-line">Defined in <a href="" data-line="387"
+                                    class="link-to-prism">projects/ccf-database/src/lib/xconsortia/xconsortia-data.ts:387</a></div>
                         </td>
                     </tr>
 
@@ -1084,8 +1084,8 @@ <h3 id="methods">
 
                     <tr>
                         <td class="col-md-4">
-                            <div class="io-line">Defined in <a href="" data-line="426"
-                                    class="link-to-prism">projects/ccf-database/src/lib/xconsortia/xconsortia-data.ts:426</a></div>
+                            <div class="io-line">Defined in <a href="" data-line="423"
+                                    class="link-to-prism">projects/ccf-database/src/lib/xconsortia/xconsortia-data.ts:423</a></div>
                         </td>
                     </tr>
 
@@ -1121,8 +1121,8 @@ <h3 id="methods">
 
                     <tr>
                         <td class="col-md-4">
-                            <div class="io-line">Defined in <a href="" data-line="430"
-                                    class="link-to-prism">projects/ccf-database/src/lib/xconsortia/xconsortia-data.ts:430</a></div>
+                            <div class="io-line">Defined in <a href="" data-line="427"
+                                    class="link-to-prism">projects/ccf-database/src/lib/xconsortia/xconsortia-data.ts:427</a></div>
                         </td>
                     </tr>
 
@@ -1390,24 +1390,21 @@ <h3 id="methods">
     const groupName &#x3D; GROUP_UUID_MAPPING[dataset.group_uuid as string] || dataset.group_name as string;
     const creator &#x3D; dataset.created_by_user_displayname;
 
-    const types &#x3D; [
-      ...dataset.data_types as string[],
-      get(dataset, [&#x27;ingest_metadata&#x27;, &#x27;metadata&#x27;, &#x27;assay_type&#x27;], &#x27;&#x27;)
-    ];
-    const typesSearch &#x3D; types.join(&#x27;|&#x27;).toLowerCase();
+    const types &#x3D; (dataset.dataset_type ?? &#x27;&#x27;) as string;
+    const typesSearch &#x3D; types.toLowerCase();
 
     let technology: string;
     let thumbnail &#x3D; &#x27;assets/icons/ico-unknown.svg&#x27;;
     if (typesSearch.indexOf(&#x27;10x&#x27;) !&#x3D;&#x3D; -1) {
       technology &#x3D; &#x27;10x&#x27;;
       thumbnail &#x3D; &#x27;assets/icons/ico-bulk-10x.svg&#x27;;
-    } else if (typesSearch.indexOf(&#x27;af&#x27;) !&#x3D;&#x3D; -1) {
+    } else if (typesSearch.indexOf(&#x27;af&#x27;) !&#x3D;&#x3D; -1 || typesSearch.indexOf(&#x27;auto-fluorescence&#x27;) !&#x3D;&#x3D; -1) {
       technology &#x3D; &#x27;AF&#x27;;
       thumbnail &#x3D; &#x27;assets/icons/ico-spatial-af.svg&#x27;;
     } else if (typesSearch.indexOf(&#x27;codex&#x27;) !&#x3D;&#x3D; -1) {
       technology &#x3D; &#x27;CODEX&#x27;;
       thumbnail &#x3D; &#x27;assets/icons/ico-spatial-codex.svg&#x27;;
-    } else if (typesSearch.indexOf(&#x27;imc&#x27;) !&#x3D;&#x3D; -1) {
+    } else if (typesSearch.indexOf(&#x27;imc&#x27;) !&#x3D;&#x3D; -1 || typesSearch.indexOf(&#x27;imaging mass cytometry&#x27;) !&#x3D;&#x3D; -1) {
       technology &#x3D; &#x27;IMC&#x27;;
       thumbnail &#x3D; &#x27;assets/icons/ico-spatial-imc.svg&#x27;;
     } else if ((typesSearch.indexOf(&#x27;lc&#x27;) !&#x3D;&#x3D; -1) &amp;&amp; (typesSearch.indexOf(&#x27;af&#x27;) &#x3D;&#x3D;&#x3D; -1)) {
@@ -1418,15 +1415,15 @@ <h3 id="methods">
     } else if (typesSearch.indexOf(&#x27;pas&#x27;) !&#x3D;&#x3D; -1) {
       technology &#x3D; &#x27;PAS&#x27;;
     } else {
-      technology &#x3D; &#x27;OTHER&#x27;;
+      technology &#x3D; types.split(/ \[/)[0];
     }
     thumbnail &#x3D; this.getDatasetThumbnail(dataset, serviceToken) ?? thumbnail;
 
     return {
       &#x27;@id&#x27;: this.portal.idPrefix + dataset.uuid,
       &#x27;@type&#x27;: &#x27;Dataset&#x27;,
       label: &#x60;Registered ${dateEntered}, ${creator}, ${groupName}&#x60;,
-      description: &#x60;Data/Assay Types: ${types.join(&#x27;, &#x27;)}&#x60;,
+      description: &#x60;Dataset Type: ${types}&#x60;,
       link: &#x60;${this.portal.portal}dataset${this.portal.portalParams}${dataset.uuid}&#x60;,
       technology,
       thumbnail

diff --git a/docs/ccf-database/interfaces/Portal.html b/docs/ccf-database/interfaces/Portal.html
@@ -542,24 +542,21 @@ <h3 id="inputs">Properties</h3>
     const groupName &#x3D; GROUP_UUID_MAPPING[dataset.group_uuid as string] || dataset.group_name as string;
     const creator &#x3D; dataset.created_by_user_displayname;
 
-    const types &#x3D; [
-      ...dataset.data_types as string[],
-      get(dataset, [&#x27;ingest_metadata&#x27;, &#x27;metadata&#x27;, &#x27;assay_type&#x27;], &#x27;&#x27;)
-    ];
-    const typesSearch &#x3D; types.join(&#x27;|&#x27;).toLowerCase();
+    const types &#x3D; (dataset.dataset_type ?? &#x27;&#x27;) as string;
+    const typesSearch &#x3D; types.toLowerCase();
 
     let technology: string;
     let thumbnail &#x3D; &#x27;assets/icons/ico-unknown.svg&#x27;;
     if (typesSearch.indexOf(&#x27;10x&#x27;) !&#x3D;&#x3D; -1) {
       technology &#x3D; &#x27;10x&#x27;;
       thumbnail &#x3D; &#x27;assets/icons/ico-bulk-10x.svg&#x27;;
-    } else if (typesSearch.indexOf(&#x27;af&#x27;) !&#x3D;&#x3D; -1) {
+    } else if (typesSearch.indexOf(&#x27;af&#x27;) !&#x3D;&#x3D; -1 || typesSearch.indexOf(&#x27;auto-fluorescence&#x27;) !&#x3D;&#x3D; -1) {
       technology &#x3D; &#x27;AF&#x27;;
       thumbnail &#x3D; &#x27;assets/icons/ico-spatial-af.svg&#x27;;
     } else if (typesSearch.indexOf(&#x27;codex&#x27;) !&#x3D;&#x3D; -1) {
       technology &#x3D; &#x27;CODEX&#x27;;
       thumbnail &#x3D; &#x27;assets/icons/ico-spatial-codex.svg&#x27;;
-    } else if (typesSearch.indexOf(&#x27;imc&#x27;) !&#x3D;&#x3D; -1) {
+    } else if (typesSearch.indexOf(&#x27;imc&#x27;) !&#x3D;&#x3D; -1 || typesSearch.indexOf(&#x27;imaging mass cytometry&#x27;) !&#x3D;&#x3D; -1) {
       technology &#x3D; &#x27;IMC&#x27;;
       thumbnail &#x3D; &#x27;assets/icons/ico-spatial-imc.svg&#x27;;
     } else if ((typesSearch.indexOf(&#x27;lc&#x27;) !&#x3D;&#x3D; -1) &amp;&amp; (typesSearch.indexOf(&#x27;af&#x27;) &#x3D;&#x3D;&#x3D; -1)) {
@@ -570,15 +567,15 @@ <h3 id="inputs">Properties</h3>
     } else if (typesSearch.indexOf(&#x27;pas&#x27;) !&#x3D;&#x3D; -1) {
       technology &#x3D; &#x27;PAS&#x27;;
     } else {
-      technology &#x3D; &#x27;OTHER&#x27;;
+      technology &#x3D; types.split(/ \[/)[0];
     }
     thumbnail &#x3D; this.getDatasetThumbnail(dataset, serviceToken) ?? thumbnail;
 
     return {
       &#x27;@id&#x27;: this.portal.idPrefix + dataset.uuid,
       &#x27;@type&#x27;: &#x27;Dataset&#x27;,
       label: &#x60;Registered ${dateEntered}, ${creator}, ${groupName}&#x60;,
-      description: &#x60;Data/Assay Types: ${types.join(&#x27;, &#x27;)}&#x60;,
+      description: &#x60;Dataset Type: ${types}&#x60;,
       link: &#x60;${this.portal.portal}dataset${this.portal.portalParams}${dataset.uuid}&#x60;,
       technology,
       thumbnail

diff --git a/docs/ccf-database/interfaces/SearchResultJson.html b/docs/ccf-database/interfaces/SearchResultJson.html
@@ -175,8 +175,7 @@ <h3 id="inputs">Properties</h3>
   &#x27;descendants.uuid&#x27;,
   &#x27;descendants.hubmap_id&#x27;,
   &#x27;descendants.sennet_id&#x27;,
-  &#x27;descendants.data_types&#x27;,
-  &#x27;descendants.ingest_metadata.metadata.assay_type&#x27;,
+  &#x27;descendants.dataset_type&#x27;,
   &#x27;descendants.thumbnail_file&#x27;,
   &#x27;descendants.metadata.files.rel_path&#x27;,
   &#x27;rui_location&#x27;, &#x27;sample_category&#x27;

diff --git a/docs/ccf-database/js/search/search_index.js b/docs/ccf-database/js/search/search_index.js
diff --git a/docs/ccf-database/miscellaneous/variables.html b/docs/ccf-database/miscellaneous/variables.html
@@ -1477,8 +1477,7 @@ <h3></h3>    <table class="table table-sm table-bordered">
   &#x27;descendants.uuid&#x27;,
   &#x27;descendants.hubmap_id&#x27;,
   &#x27;descendants.sennet_id&#x27;,
-  &#x27;descendants.data_types&#x27;,
-  &#x27;descendants.ingest_metadata.metadata.assay_type&#x27;,
+  &#x27;descendants.dataset_type&#x27;,
   &#x27;descendants.thumbnail_file&#x27;,
   &#x27;descendants.metadata.files.rel_path&#x27;,
   &#x27;rui_location&#x27;, &#x27;sample_category&#x27;

diff --git a/docs/ccf-organ-info/js/search/search_index.js b/docs/ccf-organ-info/js/search/search_index.js
diff --git a/docs/ccf-organ-info/modules/LinkCardsModule.html b/docs/ccf-organ-info/modules/LinkCardsModule.html
@@ -66,14 +66,14 @@
 <title>cluster_LinkCardsModule</title>
 <polygon fill="none" stroke="black" stroke-dasharray="1,5" points="160,-70 160,-268 336,-268 336,-70 160,-70"/>
 </g>
-<g id="clust2" class="cluster">
-<title>cluster_LinkCardsModule_declarations</title>
-<polygon fill="none" stroke="black" points="170,-78 170,-130 326,-130 326,-78 170,-78"/>
-</g>
 <g id="clust5" class="cluster">
 <title>cluster_LinkCardsModule_exports</title>
 <polygon fill="none" stroke="black" points="168,-208 168,-260 328,-260 328,-208 168,-208"/>
 </g>
+<g id="clust2" class="cluster">
+<title>cluster_LinkCardsModule_declarations</title>
+<polygon fill="none" stroke="black" points="170,-78 170,-130 326,-130 326,-78 170,-78"/>
+</g>
 <!-- LinkCardsComponent -->
 <g id="node1" class="node">
 <title>LinkCardsComponent</title>

diff --git a/docs/ccf-organ-info/modules/LinkCardsModule/dependencies.svg b/docs/ccf-organ-info/modules/LinkCardsModule/dependencies.svg
diff --git a/docs/ccf-organ-info/modules/SlideToggleModule.html b/docs/ccf-organ-info/modules/SlideToggleModule.html
@@ -66,14 +66,14 @@
 <title>cluster_SlideToggleModule</title>
 <polygon fill="none" stroke="black" stroke-dasharray="1,5" points="155,-70 155,-268 341,-268 341,-70 155,-70"/>
 </g>
-<g id="clust5" class="cluster">
-<title>cluster_SlideToggleModule_exports</title>
-<polygon fill="none" stroke="black" points="163,-208 163,-260 333,-260 333,-208 163,-208"/>
-</g>
 <g id="clust2" class="cluster">
 <title>cluster_SlideToggleModule_declarations</title>
 <polygon fill="none" stroke="black" points="165,-78 165,-130 331,-130 331,-78 165,-78"/>
 </g>
+<g id="clust5" class="cluster">
+<title>cluster_SlideToggleModule_exports</title>
+<polygon fill="none" stroke="black" points="163,-208 163,-260 333,-260 333,-208 163,-208"/>
+</g>
 <!-- SlideToggleComponent -->
 <g id="node1" class="node">
 <title>SlideToggleComponent</title>

diff --git a/docs/ccf-organ-info/modules/SlideToggleModule/dependencies.svg b/docs/ccf-organ-info/modules/SlideToggleModule/dependencies.svg
diff --git a/docs/ccf-rui/js/search/search_index.js b/docs/ccf-rui/js/search/search_index.js
diff --git a/docs/ccf-rui/modules/DrawerModule.html b/docs/ccf-rui/modules/DrawerModule.html
@@ -66,14 +66,14 @@
 <title>cluster_DrawerModule</title>
 <polygon fill="none" stroke="black" stroke-dasharray="1,5" points="8,-70 8,-268 638,-268 638,-70 8,-70"/>
 </g>
-<g id="clust8" class="cluster">
-<title>cluster_DrawerModule_exports</title>
-<polygon fill="none" stroke="black" points="82,-208 82,-260 563,-260 563,-208 82,-208"/>
-</g>
 <g id="clust2" class="cluster">
 <title>cluster_DrawerModule_declarations</title>
 <polygon fill="none" stroke="black" points="16,-78 16,-130 630,-130 630,-78 16,-78"/>
 </g>
+<g id="clust8" class="cluster">
+<title>cluster_DrawerModule_exports</title>
+<polygon fill="none" stroke="black" points="82,-208 82,-260 563,-260 563,-208 82,-208"/>
+</g>
 <!-- ContainerComponent -->
 <g id="node1" class="node">
 <title>ContainerComponent</title>

diff --git a/docs/ccf-rui/modules/DrawerModule/dependencies.svg b/docs/ccf-rui/modules/DrawerModule/dependencies.svg
diff --git a/docs/ccf-rui/modules/ExtractionSetDropdownModule.html b/docs/ccf-rui/modules/ExtractionSetDropdownModule.html
@@ -66,14 +66,14 @@
 <title>cluster_ExtractionSetDropdownModule</title>
 <polygon fill="none" stroke="black" stroke-dasharray="1,5" points="122,-70 122,-268 374,-268 374,-70 122,-70"/>
 </g>
-<g id="clust2" class="cluster">
-<title>cluster_ExtractionSetDropdownModule_declarations</title>
-<polygon fill="none" stroke="black" points="131,-78 131,-130 365,-130 365,-78 131,-78"/>
-</g>
 <g id="clust5" class="cluster">
 <title>cluster_ExtractionSetDropdownModule_exports</title>
 <polygon fill="none" stroke="black" points="130,-208 130,-260 366,-260 366,-208 130,-208"/>
 </g>
+<g id="clust2" class="cluster">
+<title>cluster_ExtractionSetDropdownModule_declarations</title>
+<polygon fill="none" stroke="black" points="131,-78 131,-130 365,-130 365,-78 131,-78"/>
+</g>
 <!-- ExtractionSetDropdownComponent -->
 <g id="node1" class="node">
 <title>ExtractionSetDropdownComponent</title>

diff --git a/docs/ccf-rui/modules/ExtractionSetDropdownModule/dependencies.svg b/docs/ccf-rui/modules/ExtractionSetDropdownModule/dependencies.svg
diff --git a/docs/ccf-rui/modules/HeaderModule.html b/docs/ccf-rui/modules/HeaderModule.html
@@ -66,14 +66,14 @@
 <title>cluster_HeaderModule</title>
 <polygon fill="none" stroke="black" stroke-dasharray="1,5" points="169,-70 169,-268 327,-268 327,-70 169,-70"/>
 </g>
-<g id="clust5" class="cluster">
-<title>cluster_HeaderModule_exports</title>
-<polygon fill="none" stroke="black" points="177,-208 177,-260 319,-260 319,-208 177,-208"/>
-</g>
 <g id="clust2" class="cluster">
 <title>cluster_HeaderModule_declarations</title>
 <polygon fill="none" stroke="black" points="179,-78 179,-130 317,-130 317,-78 179,-78"/>
 </g>
+<g id="clust5" class="cluster">
+<title>cluster_HeaderModule_exports</title>
+<polygon fill="none" stroke="black" points="177,-208 177,-260 319,-260 319,-208 177,-208"/>
+</g>
 <!-- HeaderComponent -->
 <g id="node1" class="node">
 <title>HeaderComponent</title>

diff --git a/docs/ccf-rui/modules/HeaderModule/dependencies.svg b/docs/ccf-rui/modules/HeaderModule/dependencies.svg
diff --git a/docs/ccf-rui/modules/JsonFileReaderModule.html b/docs/ccf-rui/modules/JsonFileReaderModule.html
@@ -66,14 +66,14 @@
 <title>cluster_JsonFileReaderModule</title>
 <polygon fill="none" stroke="black" stroke-dasharray="1,5" points="146,-70 146,-268 350,-268 350,-70 146,-70"/>
 </g>
-<g id="clust2" class="cluster">
-<title>cluster_JsonFileReaderModule_declarations</title>
-<polygon fill="none" stroke="black" points="156,-78 156,-130 340,-130 340,-78 156,-78"/>
-</g>
 <g id="clust5" class="cluster">
 <title>cluster_JsonFileReaderModule_exports</title>
 <polygon fill="none" stroke="black" points="154,-208 154,-260 342,-260 342,-208 154,-208"/>
 </g>
+<g id="clust2" class="cluster">
+<title>cluster_JsonFileReaderModule_declarations</title>
+<polygon fill="none" stroke="black" points="156,-78 156,-130 340,-130 340,-78 156,-78"/>
+</g>
 <!-- JsonFileReaderComponent -->
 <g id="node1" class="node">
 <title>JsonFileReaderComponent</title>

diff --git a/docs/ccf-rui/modules/JsonFileReaderModule/dependencies.svg b/docs/ccf-rui/modules/JsonFileReaderModule/dependencies.svg