Merge pull request #3876 from kids-first/feat/SKFP-898-remove-tissue-…

…type feat(tissue): SKFP-898 remove tissue type and text
kids-first · Jan 11, 2024 · dd117cd · dd117cd
2 parents 15704cd + d90cbc4
commit dd117cd
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 30 deletions.
diff --git a/src/views/DataExploration/components/PageContent/tabs/Biospecimens/index.tsx b/src/views/DataExploration/components/PageContent/tabs/Biospecimens/index.tsx
@@ -203,20 +203,20 @@ const getDefaultColumns = (): ProColumnType<any>[] => [
     defaultHidden: true,
     render: (anatomy_site) => anatomy_site || TABLE_EMPTY_PLACE_HOLDER,
   },
-  {
-    key: 'ncit_id_tissue_type',
-    title: intl.get('entities.biospecimen.ncit_id_tissue_type'),
-    dataIndex: 'ncit_id_tissue_type',
-    defaultHidden: true,
-    render: (ncit_id_tissue_type) => ncit_id_tissue_type || TABLE_EMPTY_PLACE_HOLDER,
-  },
-  {
-    key: 'tissue_type_source_text',
-    title: intl.get('entities.biospecimen.tissue_type_source_text'),
-    dataIndex: 'tissue_type_source_text',
-    defaultHidden: true,
-    render: (tissue_type_source_text) => tissue_type_source_text || TABLE_EMPTY_PLACE_HOLDER,
-  },
+  // {
+  //   key: 'ncit_id_tissue_type',
+  //   title: intl.get('entities.biospecimen.ncit_id_tissue_type'),
+  //   dataIndex: 'ncit_id_tissue_type',
+  //   defaultHidden: true,
+  //   render: (ncit_id_tissue_type) => ncit_id_tissue_type || TABLE_EMPTY_PLACE_HOLDER,
+  // },
+  // {
+  //   key: 'tissue_type_source_text',
+  //   title: intl.get('entities.biospecimen.tissue_type_source_text'),
+  //   dataIndex: 'tissue_type_source_text',
+  //   defaultHidden: true,
+  //   render: (tissue_type_source_text) => tissue_type_source_text || TABLE_EMPTY_PLACE_HOLDER,
+  // },
   {
     key: 'diagnosis_ncit',
     title: intl.get('entities.biospecimen.diagnoses.diagnosis_ncit'),

diff --git a/src/views/DataExploration/index.tsx b/src/views/DataExploration/index.tsx
@@ -131,8 +131,6 @@ const filterGroups: {
           'diagnoses__source_text',
           'diagnoses__source_text_tumor_location',
           'collection_method_of_sample_procurement',
-          'ncit_id_tissue_type',
-          'tissue_type_source_text',
           'diagnoses__source_text_tumor_descriptor',
         ],
       },

diff --git a/src/views/ParticipantEntity/utils/biospecimens.tsx b/src/views/ParticipantEntity/utils/biospecimens.tsx
@@ -60,20 +60,20 @@ export const getBiospecimensDefaultColumns = (): ProColumnType[] => [
     render: (biospecimen: IBiospecimenEntity) =>
       biospecimen?.collection_anatomy_site || TABLE_EMPTY_PLACE_HOLDER,
   },
-  {
-    key: 'ncit_id_tissue_type',
-    title: intl.get('entities.biospecimen.ncit_id_tissue_type'),
-    dataIndex: 'ncit_id_tissue_type',
-    defaultHidden: true,
-    render: (ncit_id_tissue_type) => ncit_id_tissue_type || TABLE_EMPTY_PLACE_HOLDER,
-  },
-  {
-    key: 'tissue_type_source_text',
-    title: intl.get('entities.biospecimen.tissue_type_source_text'),
-    dataIndex: 'tissue_type_source_text',
-    defaultHidden: true,
-    render: (tissue_type_source_text) => tissue_type_source_text || TABLE_EMPTY_PLACE_HOLDER,
-  },
+  // {
+  //   key: 'ncit_id_tissue_type',
+  //   title: intl.get('entities.biospecimen.ncit_id_tissue_type'),
+  //   dataIndex: 'ncit_id_tissue_type',
+  //   defaultHidden: true,
+  //   render: (ncit_id_tissue_type) => ncit_id_tissue_type || TABLE_EMPTY_PLACE_HOLDER,
+  // },
+  // {
+  //   key: 'tissue_type_source_text',
+  //   title: intl.get('entities.biospecimen.tissue_type_source_text'),
+  //   dataIndex: 'tissue_type_source_text',
+  //   defaultHidden: true,
+  //   render: (tissue_type_source_text) => tissue_type_source_text || TABLE_EMPTY_PLACE_HOLDER,
+  // },
   {
     key: 'source_text_tumor_descriptor',
     title: intl.get('entities.biospecimen.diagnoses.source_text_tumor_descriptor'),