Skip to content

Commit c894a83

Browse files
MillenniumFalconMechanicMillenniumFalconMechanic
authored
feat: removed data modality #4444 (#4447)
* feat: removed data modality #4444 * feat: removed data modality from dataset detail #4444 * fix: updated anvil tests #4444
1 parent b323967 commit c894a83

File tree

8 files changed

+7
-74
lines changed

8 files changed

+7
-74
lines changed

‎app/apis/azul/anvil-cmg/common/transformers.ts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,6 @@ export function getDatasetDetails(
105105
stringifyValues(getAggregatedOrganismTypes(response))
106106
);
107107
details.set("Diagnosis", stringifyValues(getAggregatedDiagnoses(response)));
108-
details.set(
109-
"Data modality",
110-
stringifyValues(getAggregatedActivityDataModalities(response))
111-
);
112108
details.set(
113109
"Phenotypic sex",
114110
stringifyValues(getAggregatedPhenotypicSexes(response))

‎e2e/anvil/anvil-filters.spec.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,12 @@ import {
1515
BIOSAMPLE_TYPE_INDEX,
1616
CONSENT_GROUP_INDEX,
1717
DATASET_INDEX,
18-
DATA_MODALITY_INDEX,
1918
DIAGNOSIS_INDEX,
2019
FILE_FORMAT_INDEX,
2120
REPORTED_ETHNICITY_INDEX,
2221
} from "./anvil-tabs";
2322

2423
const FILTER_INDEX_LIST = [
25-
DATA_MODALITY_INDEX,
2624
DATASET_INDEX,
2725
DIAGNOSIS_INDEX,
2826
REPORTED_ETHNICITY_INDEX,

‎e2e/anvil/anvil-tabs.ts‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ export const ANVIL_FILTER_NAMES: string[] = [
2323
"Anatomical Site",
2424
"BioSample Type",
2525
"Consent Group",
26-
"Data Modality",
2726
"Dataset",
2827
"Diagnosis",
2928
"File Format",
@@ -35,14 +34,13 @@ export const ANVIL_FILTER_NAMES: string[] = [
3534
export const ANATOMICAL_SITE_INDEX = 0;
3635
export const BIOSAMPLE_TYPE_INDEX = 1;
3736
export const CONSENT_GROUP_INDEX = 2;
38-
export const DATA_MODALITY_INDEX = 3;
39-
export const DATASET_INDEX = 4;
40-
export const DIAGNOSIS_INDEX = 5;
41-
export const FILE_FORMAT_INDEX = 6;
42-
export const IDENTIFIER_INDEX = 7;
43-
export const ORGANISM_TYPE_INDEX = 8;
44-
export const PHENOTYPIC_SEX_INDEX = 9;
45-
export const REPORTED_ETHNICITY_INDEX = 10;
37+
export const DATASET_INDEX = 3;
38+
export const DIAGNOSIS_INDEX = 4;
39+
export const FILE_FORMAT_INDEX = 5;
40+
export const IDENTIFIER_INDEX = 6;
41+
export const ORGANISM_TYPE_INDEX = 7;
42+
export const PHENOTYPIC_SEX_INDEX = 8;
43+
export const REPORTED_ETHNICITY_INDEX = 9;
4644

4745
const ANVIL_CMG_SEARCH_FILTERS_PLACEHOLDER_TEXT = "Search all filters...";
4846

@@ -125,13 +123,6 @@ export const ANVIL_TABS: AnvilCMGTabCollection = {
125123
],
126124
name: ANVIL_DATASETS_BACKPAGE_HEADER_NAMES.DIAGNOSIS,
127125
},
128-
{
129-
correspondingColumn:
130-
ANVIL_DATASETS_PRESELECTED_COLUMNS_BY_NAME[
131-
ANVIL_COLUMN_NAMES.DATA_MODALITY
132-
],
133-
name: ANVIL_DATASETS_BACKPAGE_HEADER_NAMES.DATA_MODALITY,
134-
},
135126
{
136127
correspondingColumn:
137128
ANVIL_DATASETS_SELECTABLE_COLUMNS_BY_NAME[

‎e2e/anvil/constants.ts‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { ColumnDescription } from "e2e/testInterfaces";
33
export const ANVIL_DATASETS_BACKPAGE_HEADER_NAMES = {
44
CONSENT_GROUP: "Consent group",
55
DATASET_ID: "Dataset Id",
6-
DATA_MODALITY: "Data modality",
76
DIAGNOSIS: "Diagnosis",
87
ORGANISM_TYPE: "Organism type",
98
PHENOTYPIC_SEX: "Phenotypic sex",
@@ -18,7 +17,6 @@ export const ANVIL_COLUMN_NAMES = {
1817
BIOSAMPLE_TYPE: "BioSample Type",
1918
CONSENT_GROUP: "Consent Group",
2019
DATASET: "Dataset",
21-
DATA_MODALITY: "Data Modality",
2220
DIAGNOSIS: "Diagnosis",
2321
DOCUMENT_ID: "Document Id",
2422
DONOR_ID: "Donor Id",
@@ -34,7 +32,6 @@ export const ANVIL_COLUMN_NAMES = {
3432

3533
export const PLURALIZED_METADATA_LABEL = {
3634
[ANVIL_COLUMN_NAMES.DIAGNOSIS]: "diagnoses",
37-
[ANVIL_COLUMN_NAMES.DATA_MODALITY]: "data modalities",
3835
[ANVIL_COLUMN_NAMES.DATASET]: "dataset names",
3936
[ANVIL_COLUMN_NAMES.CONSENT_GROUP]: "consent codes",
4037
[ANVIL_COLUMN_NAMES.ORGANISM_TYPE]: "organism types",
@@ -52,12 +49,6 @@ export const ANVIL_DATASETS_PRESELECTED_COLUMNS_BY_NAME = {
5249
pluralizedLabel: PLURALIZED_METADATA_LABEL[ANVIL_COLUMN_NAMES.DIAGNOSIS],
5350
sortable: true,
5451
},
55-
[ANVIL_COLUMN_NAMES.DATA_MODALITY]: {
56-
name: ANVIL_COLUMN_NAMES.DATA_MODALITY,
57-
pluralizedLabel:
58-
PLURALIZED_METADATA_LABEL[ANVIL_COLUMN_NAMES.DATA_MODALITY],
59-
sortable: true,
60-
},
6152
[ANVIL_COLUMN_NAMES.DATASET]: {
6253
name: ANVIL_COLUMN_NAMES.DATASET,
6354
pluralizedLabel: PLURALIZED_METADATA_LABEL[ANVIL_COLUMN_NAMES.DATASET],
@@ -113,12 +104,6 @@ export const ANVIL_ACTIVITIES_PRESELECTED_COLUMNS_BY_NAME = {
113104
PLURALIZED_METADATA_LABEL[ANVIL_COLUMN_NAMES.ACTIVITY_TYPE],
114105
sortable: true,
115106
},
116-
[ANVIL_COLUMN_NAMES.DATA_MODALITY]: {
117-
name: ANVIL_COLUMN_NAMES.DATA_MODALITY,
118-
pluralizedLabel:
119-
PLURALIZED_METADATA_LABEL[ANVIL_COLUMN_NAMES.DATA_MODALITY],
120-
sortable: true,
121-
},
122107
[ANVIL_COLUMN_NAMES.BIOSAMPLE_TYPE]: {
123108
name: ANVIL_COLUMN_NAMES.BIOSAMPLE_TYPE,
124109
pluralizedLabel:
@@ -263,12 +248,6 @@ export const ANVIL_FILES_PRESELECTED_COLUMNS_BY_NAME = {
263248
name: ANVIL_COLUMN_NAMES.DRS_URI,
264249
sortable: false,
265250
},
266-
[ANVIL_COLUMN_NAMES.DATA_MODALITY]: {
267-
name: ANVIL_COLUMN_NAMES.DATA_MODALITY,
268-
pluralizedLabel:
269-
PLURALIZED_METADATA_LABEL[ANVIL_COLUMN_NAMES.DATA_MODALITY],
270-
sortable: true,
271-
},
272251
[ANVIL_COLUMN_NAMES.ORGANISM_TYPE]: {
273252
name: ANVIL_COLUMN_NAMES.ORGANISM_TYPE,
274253
pluralizedLabel:

‎site-config/anvil-cmg/dev/config.ts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,6 @@ export function makeConfig(
5454
key: ANVIL_CMG_CATEGORY_KEY.DATASET_REGISTERED_ID,
5555
label: ANVIL_CMG_CATEGORY_LABEL.DATASET_REGISTERED_ID,
5656
},
57-
{
58-
key: ANVIL_CMG_CATEGORY_KEY.ACTIVITY_DATA_MODALITY,
59-
label: ANVIL_CMG_CATEGORY_LABEL.ACTIVITY_DATA_MODALITY,
60-
},
6157
{
6258
key: ANVIL_CMG_CATEGORY_KEY.DATASET_CONSENT_GROUP,
6359
label: ANVIL_CMG_CATEGORY_LABEL.DATASET_CONSENT_GROUP,

‎site-config/anvil-cmg/dev/index/activitiesEntityConfig.ts‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,6 @@ export const activitiesEntityConfig: EntityConfig<ActivitiesResponse> = {
4949
id: ANVIL_CMG_CATEGORY_KEY.ACTIVITY_ACTIVITY_TYPE,
5050
width: { max: "1fr", min: "200px" },
5151
},
52-
{
53-
componentConfig: {
54-
component: C.NTagCell,
55-
viewBuilder: V.buildDataModality,
56-
} as ComponentConfig<typeof C.NTagCell>,
57-
header: ANVIL_CMG_CATEGORY_LABEL.ACTIVITY_DATA_MODALITY,
58-
id: ANVIL_CMG_CATEGORY_KEY.ACTIVITY_DATA_MODALITY,
59-
width: { max: "1fr", min: "200px" },
60-
},
6152
{
6253
componentConfig: {
6354
component: C.BasicCell,

‎site-config/anvil-cmg/dev/index/datasetsEntityConfig.ts‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -121,15 +121,6 @@ export const datasetsEntityConfig: EntityConfig<DatasetsResponse> = {
121121
id: ANVIL_CMG_CATEGORY_KEY.DIAGNOSE_DISEASE,
122122
width: { max: "1fr", min: "200px" },
123123
},
124-
{
125-
componentConfig: {
126-
component: C.NTagCell,
127-
viewBuilder: V.buildDataModality,
128-
} as ComponentConfig<typeof C.NTagCell>,
129-
header: ANVIL_CMG_CATEGORY_LABEL.ACTIVITY_DATA_MODALITY,
130-
id: ANVIL_CMG_CATEGORY_KEY.ACTIVITY_DATA_MODALITY,
131-
width: { max: "1fr", min: "148px" },
132-
},
133124
],
134125
tableOptions: {
135126
initialState: {

‎site-config/anvil-cmg/dev/index/filesEntityConfig.ts‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,6 @@ export const filesEntityConfig: EntityConfig<FilesResponse> = {
8383
id: ANVIL_CMG_CATEGORY_KEY.DRS_URI,
8484
width: { max: "1fr", min: "120px" },
8585
},
86-
{
87-
componentConfig: {
88-
component: C.NTagCell,
89-
viewBuilder: V.buildFileDataModality,
90-
} as ComponentConfig<typeof C.NTagCell>,
91-
header: ANVIL_CMG_CATEGORY_LABEL.ACTIVITY_DATA_MODALITY,
92-
id: ANVIL_CMG_CATEGORY_KEY.ACTIVITY_DATA_MODALITY,
93-
width: { max: "1fr", min: "140px" },
94-
},
9586
{
9687
componentConfig: {
9788
component: C.NTagCell,

0 commit comments

Comments
 (0)