Production deploy -- 435f5eb

hubmapconsortium · Sep 8, 2022 · c745908 · c745908
1 parent 3adaa4c
commit c745908
Show file tree

Hide file tree

Showing 22 changed files with 65 additions and 27 deletions.
diff --git a/404.html b/404.html
@@ -5,7 +5,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="favicon.ico">
   <style type="text/css">@font-face{font-family:'Inter';font-style:normal;font-weight:300;font-display:swap;src:url(https://fonts.gstatic.com/s/inter/v12/UcCO3FwrK3iLTeHuS_fvQtMwCp50KnMw2boKoduKmMEVuOKfMZs.woff) format('woff');}@font-face{font-family:'Inter';font-style:normal;font-weight:400;font-display:swap;src:url(https://fonts.gstatic.com/s/inter/v12/UcCO3FwrK3iLTeHuS_fvQtMwCp50KnMw2boKoduKmMEVuLyfMZs.woff) format('woff');}@font-face{font-family:'Inter';font-style:normal;font-weight:500;font-display:swap;src:url(https://fonts.gstatic.com/s/inter/v12/UcCO3FwrK3iLTeHuS_fvQtMwCp50KnMw2boKoduKmMEVuI6fMZs.woff) format('woff');}@font-face{font-family:'Inter';font-style:normal;font-weight:300;font-display:swap;src:url(https://fonts.gstatic.com/s/inter/v12/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2JL7W0Q5n-wU.woff2) format('woff2');unicode-range:U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;}@font-face{font-family:'Inter';font-style:normal;font-weight:300;font-display:swap;src:url(https://fonts.gstatic.com/s/inter/v12/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa0ZL7W0Q5n-wU.woff2) format('woff2');unicode-range:U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;}@font-face{font-family:'Inter';font-style:normal;font-weight:300;font-display:swap;src:url(https://fonts.gstatic.com/s/inter/v12/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2ZL7W0Q5n-wU.woff2) format('woff2');unicode-range:U+1F00-1FFF;}@font-face{font-family:'Inter';font-style:normal;font-weight:300;font-display:swap;src:url(https://fonts.gstatic.com/s/inter/v12/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa1pL7W0Q5n-wU.woff2) format('woff2');unicode-range:U+0370-03FF;}@font-face{font-family:'Inter';font-style:normal;font-weight:300;font-display:swap;src:url(https://fonts.gstatic.com/s/inter/v12/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2pL7W0Q5n-wU.woff2) format('woff2');unicode-range:U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;}@font-face{font-family:'Inter';font-style:normal;font-weight:300;font-display:swap;src:url(https://fonts.gstatic.com/s/inter/v12/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa25L7W0Q5n-wU.woff2) format('woff2');unicode-range:U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;}@font-face{font-family:'Inter';font-style:normal;font-weight:300;font-display:swap;src:url(https://fonts.gstatic.com/s/inter/v12/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa1ZL7W0Q5nw.woff2) format('woff2');unicode-range:U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;}@font-face{font-family:'Inter';font-style:normal;font-weight:400;font-display:swap;src:url(https://fonts.gstatic.com/s/inter/v12/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2JL7W0Q5n-wU.woff2) format('woff2');unicode-range:U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;}@font-face{font-family:'Inter';font-style:normal;font-weight:400;font-display:swap;src:url(https://fonts.gstatic.com/s/inter/v12/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa0ZL7W0Q5n-wU.woff2) format('woff2');unicode-range:U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;}@font-face{font-family:'Inter';font-style:normal;font-weight:400;font-display:swap;src:url(https://fonts.gstatic.com/s/inter/v12/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2ZL7W0Q5n-wU.woff2) format('woff2');unicode-range:U+1F00-1FFF;}@font-face{font-family:'Inter';font-style:normal;font-weight:400;font-display:swap;src:url(https://fonts.gstatic.com/s/inter/v12/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa1pL7W0Q5n-wU.woff2) format('woff2');unicode-range:U+0370-03FF;}@font-face{font-family:'Inter';font-style:normal;font-weight:400;font-display:swap;src:url(https://fonts.gstatic.com/s/inter/v12/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2pL7W0Q5n-wU.woff2) format('woff2');unicode-range:U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;}@font-face{font-family:'Inter';font-style:normal;font-weight:400;font-display:swap;src:url(https://fonts.gstatic.com/s/inter/v12/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa25L7W0Q5n-wU.woff2) format('woff2');unicode-range:U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;}@font-face{font-family:'Inter';font-style:normal;font-weight:400;font-display:swap;src:url(https://fonts.gstatic.com/s/inter/v12/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa1ZL7W0Q5nw.woff2) format('woff2');unicode-range:U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;}@font-face{font-family:'Inter';font-style:normal;font-weight:500;font-display:swap;src:url(https://fonts.gstatic.com/s/inter/v12/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2JL7W0Q5n-wU.woff2) format('woff2');unicode-range:U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;}@font-face{font-family:'Inter';font-style:normal;font-weight:500;font-display:swap;src:url(https://fonts.gstatic.com/s/inter/v12/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa0ZL7W0Q5n-wU.woff2) format('woff2');unicode-range:U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;}@font-face{font-family:'Inter';font-style:normal;font-weight:500;font-display:swap;src:url(https://fonts.gstatic.com/s/inter/v12/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2ZL7W0Q5n-wU.woff2) format('woff2');unicode-range:U+1F00-1FFF;}@font-face{font-family:'Inter';font-style:normal;font-weight:500;font-display:swap;src:url(https://fonts.gstatic.com/s/inter/v12/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa1pL7W0Q5n-wU.woff2) format('woff2');unicode-range:U+0370-03FF;}@font-face{font-family:'Inter';font-style:normal;font-weight:500;font-display:swap;src:url(https://fonts.gstatic.com/s/inter/v12/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa2pL7W0Q5n-wU.woff2) format('woff2');unicode-range:U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;}@font-face{font-family:'Inter';font-style:normal;font-weight:500;font-display:swap;src:url(https://fonts.gstatic.com/s/inter/v12/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa25L7W0Q5n-wU.woff2) format('woff2');unicode-range:U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;}@font-face{font-family:'Inter';font-style:normal;font-weight:500;font-display:swap;src:url(https://fonts.gstatic.com/s/inter/v12/UcC73FwrK3iLTeHuS_fvQtMwCp50KnMa1ZL7W0Q5nw.woff2) format('woff2');unicode-range:U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;}</style>
-  <style type="text/css">@font-face{font-family:'Material Icons';font-style:normal;font-weight:400;src:url(https://fonts.gstatic.com/s/materialicons/v138/flUhRq6tzZclQEJ-Vdg-IuiaDsNa.woff) format('woff');}@font-face{font-family:'Material Icons Outlined';font-style:normal;font-weight:400;src:url(https://fonts.gstatic.com/s/materialiconsoutlined/v108/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUcY.woff) format('woff');}.material-icons{font-family:'Material Icons';font-weight:normal;font-style:normal;font-size:24px;line-height:1;letter-spacing:normal;text-transform:none;display:inline-block;white-space:nowrap;word-wrap:normal;direction:ltr;font-feature-settings:'liga';}.material-icons-outlined{font-family:'Material Icons Outlined';font-weight:normal;font-style:normal;font-size:24px;line-height:1;letter-spacing:normal;text-transform:none;display:inline-block;white-space:nowrap;word-wrap:normal;direction:ltr;font-feature-settings:'liga';}@font-face{font-family:'Material Icons';font-style:normal;font-weight:400;src:url(https://fonts.gstatic.com/s/materialicons/v138/flUhRq6tzZclQEJ-Vdg-IuiaDsNcIhQ8tQ.woff2) format('woff2');}@font-face{font-family:'Material Icons Outlined';font-style:normal;font-weight:400;src:url(https://fonts.gstatic.com/s/materialiconsoutlined/v108/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUcel5euIg.woff2) format('woff2');}.material-icons{font-family:'Material Icons';font-weight:normal;font-style:normal;font-size:24px;line-height:1;letter-spacing:normal;text-transform:none;display:inline-block;white-space:nowrap;word-wrap:normal;direction:ltr;-webkit-font-feature-settings:'liga';-webkit-font-smoothing:antialiased;}.material-icons-outlined{font-family:'Material Icons Outlined';font-weight:normal;font-style:normal;font-size:24px;line-height:1;letter-spacing:normal;text-transform:none;display:inline-block;white-space:nowrap;word-wrap:normal;direction:ltr;-webkit-font-feature-settings:'liga';-webkit-font-smoothing:antialiased;}</style>
+  <style type="text/css">@font-face{font-family:'Material Icons';font-style:normal;font-weight:400;src:url(https://fonts.gstatic.com/s/materialicons/v139/flUhRq6tzZclQEJ-Vdg-IuiaDsNa.woff) format('woff');}@font-face{font-family:'Material Icons Outlined';font-style:normal;font-weight:400;src:url(https://fonts.gstatic.com/s/materialiconsoutlined/v108/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUcY.woff) format('woff');}.material-icons{font-family:'Material Icons';font-weight:normal;font-style:normal;font-size:24px;line-height:1;letter-spacing:normal;text-transform:none;display:inline-block;white-space:nowrap;word-wrap:normal;direction:ltr;font-feature-settings:'liga';}.material-icons-outlined{font-family:'Material Icons Outlined';font-weight:normal;font-style:normal;font-size:24px;line-height:1;letter-spacing:normal;text-transform:none;display:inline-block;white-space:nowrap;word-wrap:normal;direction:ltr;font-feature-settings:'liga';}@font-face{font-family:'Material Icons';font-style:normal;font-weight:400;src:url(https://fonts.gstatic.com/s/materialicons/v139/flUhRq6tzZclQEJ-Vdg-IuiaDsNcIhQ8tQ.woff2) format('woff2');}@font-face{font-family:'Material Icons Outlined';font-style:normal;font-weight:400;src:url(https://fonts.gstatic.com/s/materialiconsoutlined/v108/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUcel5euIg.woff2) format('woff2');}.material-icons{font-family:'Material Icons';font-weight:normal;font-style:normal;font-size:24px;line-height:1;letter-spacing:normal;text-transform:none;display:inline-block;white-space:nowrap;word-wrap:normal;direction:ltr;-webkit-font-feature-settings:'liga';-webkit-font-smoothing:antialiased;}.material-icons-outlined{font-family:'Material Icons Outlined';font-weight:normal;font-style:normal;font-size:24px;line-height:1;letter-spacing:normal;text-transform:none;display:inline-block;white-space:nowrap;word-wrap:normal;direction:ltr;-webkit-font-feature-settings:'liga';-webkit-font-smoothing:antialiased;}</style>
 <style>:root{--swiper-theme-color:#007aff;}:root{--swiper-navigation-size:44px;}.mat-typography{font:500 1rem/1.5rem Inter,sans-serif;letter-spacing:normal;}html{box-sizing:border-box;}*,:after,:before{box-sizing:inherit;}body,html{height:100%;}body{margin:0;padding:0;font-family:Inter,sans-serif;background-color:#fff;}</style><link rel="stylesheet" href="styles.css" media="print" onload="this.media='all'"><noscript><link rel="stylesheet" href="styles.css"></noscript></head>
 
 <body class="mat-typography">

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/interfaces/SearchResultJson.html b/docs/ccf-database/interfaces/SearchResultJson.html
@@ -154,13 +154,32 @@ <h3 id="inputs">Properties</h3>
 
 
 // Reduce this value if including more data fields
-const PER_API_SEARCH_REQUEST_COUNT &#x3D; 50;
+const PER_API_SEARCH_REQUEST_COUNT &#x3D; 250;
 
 const INCLUDED_DATA_FIELDS &#x3D; [
   &#x27;uuid&#x27;, &#x27;entity_type&#x27;,
   &#x27;group_uuid&#x27;, &#x27;group_name&#x27;,
   &#x27;last_modified_timestamp&#x27;, &#x27;created_by_user_displayname&#x27;,
-  &#x27;ancestors&#x27;, &#x27;descendants&#x27;,
+  &#x27;ancestors.entity_type&#x27;,
+  &#x27;ancestors.description&#x27;,
+  &#x27;ancestors.metadata.organ_donor_data.preferred_term&#x27;,
+  &#x27;ancestors.metadata.organ_donor_data.data_value&#x27;,
+  &#x27;ancestors.last_modified_timestamp&#x27;,
+  &#x27;ancestors.group_uuid&#x27;,
+  &#x27;ancestors.group_name&#x27;,
+  &#x27;ancestors.created_by_user_displayname&#x27;,
+  &#x27;ancestors.uuid&#x27;,
+  &#x27;descendants.entity_type&#x27;,
+  &#x27;descendants.ingest_metadata.metadata.tissue_id&#x27;,
+  &#x27;descendants.last_modified_timestamp&#x27;,
+  &#x27;descendants.group_uuid&#x27;,
+  &#x27;descendants.group_name&#x27;,
+  &#x27;descendants.created_by_user_displayname&#x27;,
+  &#x27;descendants.uuid&#x27;,
+  &#x27;descendants.data_types&#x27;,
+  &#x27;descendants.ingest_metadata.metadata.assay_type&#x27;,
+  &#x27;descendants.thumbnail_file&#x27;,
+  &#x27;descendants.metadata.files.rel_path&#x27;,
   &#x27;rui_location&#x27;, &#x27;specimen_type&#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
@@ -1170,7 +1170,26 @@ <h3></h3>    <table class="table table-sm table-bordered">
   &#x27;uuid&#x27;, &#x27;entity_type&#x27;,
   &#x27;group_uuid&#x27;, &#x27;group_name&#x27;,
   &#x27;last_modified_timestamp&#x27;, &#x27;created_by_user_displayname&#x27;,
-  &#x27;ancestors&#x27;, &#x27;descendants&#x27;,
+  &#x27;ancestors.entity_type&#x27;,
+  &#x27;ancestors.description&#x27;,
+  &#x27;ancestors.metadata.organ_donor_data.preferred_term&#x27;,
+  &#x27;ancestors.metadata.organ_donor_data.data_value&#x27;,
+  &#x27;ancestors.last_modified_timestamp&#x27;,
+  &#x27;ancestors.group_uuid&#x27;,
+  &#x27;ancestors.group_name&#x27;,
+  &#x27;ancestors.created_by_user_displayname&#x27;,
+  &#x27;ancestors.uuid&#x27;,
+  &#x27;descendants.entity_type&#x27;,
+  &#x27;descendants.ingest_metadata.metadata.tissue_id&#x27;,
+  &#x27;descendants.last_modified_timestamp&#x27;,
+  &#x27;descendants.group_uuid&#x27;,
+  &#x27;descendants.group_name&#x27;,
+  &#x27;descendants.created_by_user_displayname&#x27;,
+  &#x27;descendants.uuid&#x27;,
+  &#x27;descendants.data_types&#x27;,
+  &#x27;descendants.ingest_metadata.metadata.assay_type&#x27;,
+  &#x27;descendants.thumbnail_file&#x27;,
+  &#x27;descendants.metadata.files.rel_path&#x27;,
   &#x27;rui_location&#x27;, &#x27;specimen_type&#x27;
 ]</code>
                     </td>
@@ -1198,7 +1217,7 @@ <h3></h3>    <table class="table table-sm table-bordered">
                 </tr>
                 <tr>
                     <td class="col-md-4">
-                        <i>Default value : </i><code>50</code>
+                        <i>Default value : </i><code>250</code>
                     </td>
                 </tr>
 

diff --git a/docs/ccf-rui/injectables/ReferenceDataState.html b/docs/ccf-rui/injectables/ReferenceDataState.html
@@ -696,7 +696,7 @@ <h3 id="methods">
     }
 
     const name &#x3D; entity.label ?? &#x27;&#x27;;
-    const organ &#x3D; ALL_ORGANS.find(info &#x3D;&gt; name.endsWith(info.organ));
+    const organ &#x3D; ALL_ORGANS.find(info &#x3D;&gt; name.endsWith(info.organ) &amp;&amp; (!entity.side || entity.side.toLowerCase() &#x3D;&#x3D;&#x3D; info.side));
     if (!organ) {
       return undefined;
     }

diff --git a/docs/ccf-rui/interfaces/OrganData.html b/docs/ccf-rui/interfaces/OrganData.html
@@ -389,7 +389,7 @@ <h3 id="inputs">Properties</h3>
     }
 
     const name &#x3D; entity.label ?? &#x27;&#x27;;
-    const organ &#x3D; ALL_ORGANS.find(info &#x3D;&gt; name.endsWith(info.organ));
+    const organ &#x3D; ALL_ORGANS.find(info &#x3D;&gt; name.endsWith(info.organ) &amp;&amp; (!entity.side || entity.side.toLowerCase() &#x3D;&#x3D;&#x3D; info.side));
     if (!organ) {
       return undefined;
     }

diff --git a/docs/ccf-rui/interfaces/ReferenceDataStateModel.html b/docs/ccf-rui/interfaces/ReferenceDataStateModel.html
@@ -533,7 +533,7 @@ <h3 id="inputs">Properties</h3>
     }
 
     const name &#x3D; entity.label ?? &#x27;&#x27;;
-    const organ &#x3D; ALL_ORGANS.find(info &#x3D;&gt; name.endsWith(info.organ));
+    const organ &#x3D; ALL_ORGANS.find(info &#x3D;&gt; name.endsWith(info.organ) &amp;&amp; (!entity.side || entity.side.toLowerCase() &#x3D;&#x3D;&#x3D; info.side));
     if (!organ) {
       return undefined;
     }

diff --git a/docs/ccf-rui/js/search/search_index.js b/docs/ccf-rui/js/search/search_index.js