Skip to content

Commit 6caf0ac

Browse files
Merge pull request #627 from bcgsc/bugfix/DEVSU-2623-cancer-pred-fix
Bugfix/devsu 2623 cancer pred fix
2 parents cd96ddd + a22308e commit 6caf0ac

File tree

2 files changed

+11
-11
lines changed
  • app
    • components/DataTable/components/ArrayCellRenderer
    • views/ReportView/components/CancerPredisposition

2 files changed

+11
-11
lines changed

app/components/DataTable/components/ArrayCellRenderer/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ const RenderArrayCell = (fieldPath: string, isLink: boolean = false): (cellParam
2525
let link = firstVal;
2626
let validLink = false;
2727

28-
if (firstVal.match(/^\d+$/)) {
28+
if (firstVal?.match(/^\d+$/)) {
2929
link = `https://ncbi.nlm.nih.gov/pubmed/${firstVal}`;
3030
validLink = true;
3131
} else if (urlRegex.test(firstVal)) {
3232
validLink = true;
3333
}
3434

35-
let linkComponent = firstVal;
35+
let linkComponent = firstVal || '';
3636

3737
if (validLink) {
3838
linkComponent = (

app/views/ReportView/components/CancerPredisposition/columnDefs.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,54 +56,54 @@ const columnDefs: ColDef[] = [{
5656
colId: 'disease',
5757
field: 'disease',
5858
hide: false,
59-
cellRendererFramework: ArrayCell('disease', false),
59+
cellRendererFramework: ArrayCell('kbMatchedStatements.disease', false),
6060
},
6161
{
6262
headerName: 'Association',
6363
colId: 'relevance',
6464
field: 'relevance',
65-
cellRendererFramework: ArrayCell('relevance', false),
65+
cellRendererFramework: ArrayCell('kbMatchedStatements.relevance', false),
6666
hide: false,
6767
},
6868
{
6969
headerName: 'Context',
7070
colId: 'context',
7171
field: 'context',
72-
cellRendererFramework: ArrayCell('context', false),
72+
cellRendererFramework: ArrayCell('kbMatchedStatements.context', false),
7373
hide: false,
7474
},
7575
{
7676
headerName: 'PMID',
7777
colId: 'reference',
7878
field: 'reference',
7979
hide: false,
80-
cellRendererFramework: ArrayCell('reference', true),
80+
cellRendererFramework: ArrayCell('kbMatchedStatements.reference', true),
8181
},
8282
{
8383
headerName: 'Category',
8484
colId: 'category',
8585
field: 'category',
86-
cellRendererFramework: ArrayCell('category', false),
86+
cellRendererFramework: ArrayCell('kbMatchedStatements.category', false),
8787
hide: true,
8888
},
8989
{
9090
headerName: 'Evidence Level',
9191
colId: 'evidenceLevel',
9292
field: 'evidenceLevel',
93-
cellRendererFramework: ArrayCell('evidenceLevel', false),
93+
cellRendererFramework: ArrayCell('kbMatchedStatements.evidenceLevel', false),
9494
hide: false,
9595
},
9696
{
9797
headerName: 'IPR Evidence Level',
9898
colId: 'iprEvidenceLevel',
9999
field: 'iprEvidenceLevel',
100-
cellRendererFramework: ArrayCell('iprEvidenceLevel', false),
100+
cellRendererFramework: ArrayCell('kbMatchedStatements.iprEvidenceLevel', false),
101101
hide: false,
102102
},
103103
{
104104
headerName: 'Matched Cancer',
105105
field: 'matchedCancer',
106-
cellRendererFramework: ArrayCell('matchedCancer', false),
106+
cellRendererFramework: ArrayCell('kbMatchedStatements.matchedCancer', false),
107107
hide: true,
108108
},
109109
{
@@ -115,7 +115,7 @@ const columnDefs: ColDef[] = [{
115115
{
116116
headerName: 'Sample',
117117
field: 'sample',
118-
cellRendererFramework: ArrayCell('sample', false),
118+
cellRendererFramework: ArrayCell('kbMatchedStatements.sample', false),
119119
hide: false,
120120
},
121121
{

0 commit comments

Comments
 (0)