diff --git a/src/components/EngagementDataGrid/EngagementColumns.tsx b/src/components/EngagementDataGrid/EngagementColumns.tsx index 45cf17b02..b32a187f5 100644 --- a/src/components/EngagementDataGrid/EngagementColumns.tsx +++ b/src/components/EngagementDataGrid/EngagementColumns.tsx @@ -38,11 +38,11 @@ import { Link } from '../Routing'; import { EngagementDataGridRowFragment as Engagement } from './engagementDataGridRow.graphql'; export const EngagementColumns: Array> = [ - ProjectNameColumn({ + ProjectNameColumn({ field: 'project.name', valueGetter: (_, p) => p.project, }), - IDColumn({ + IDColumn({ field: 'Engagement', valueGetter: (_, p) => p, title: 'Engagement', @@ -185,7 +185,7 @@ export const EngagementColumns: Array> = [ }, filterable: false, }, - SensitivityColumn({ + SensitivityColumn({ field: 'project.sensitivity', valueGetter: (_, p) => p.project, }), diff --git a/src/components/ProjectDataGrid/ProjectColumns.tsx b/src/components/ProjectDataGrid/ProjectColumns.tsx index 17cf64afc..ce8ab89cc 100644 --- a/src/components/ProjectDataGrid/ProjectColumns.tsx +++ b/src/components/ProjectDataGrid/ProjectColumns.tsx @@ -30,7 +30,7 @@ import { SensitivityColumn } from '../Grid/Columns/SensitivityColumn'; import { ProjectDataGridRowFragment as Project } from './projectDataGridRow.graphql'; export const ProjectColumns: Array> = [ - ProjectNameColumn({ + ProjectNameColumn({ field: 'name', headerName: 'Name', valueGetter: (_, p) => p, @@ -86,7 +86,7 @@ export const ProjectColumns: Array> = [ ...dateColumn(), valueGetter: dateColumn.valueGetter((_, { mouEnd }) => mouEnd.value), }, - SensitivityColumn({ + SensitivityColumn({ field: 'sensitivity', valueGetter: (_, p) => p, }), diff --git a/src/scenes/Dashboard/ProgressReportsWidget/ProgressReportsGrid.tsx b/src/scenes/Dashboard/ProgressReportsWidget/ProgressReportsGrid.tsx index b594d161d..d11546f74 100644 --- a/src/scenes/Dashboard/ProgressReportsWidget/ProgressReportsGrid.tsx +++ b/src/scenes/Dashboard/ProgressReportsWidget/ProgressReportsGrid.tsx @@ -42,11 +42,11 @@ export const ExpansionMarker = 'expandable'; export const ProgressReportIdsColumnMap = { project: ProjectNameColumn({ - field: 'engagement.project.name', + field: 'parent.engagement.project.name', valueGetter: (_, p) => p.parent.project, }), language: LanguageNameColumn({ - field: 'engagement.language.name', + field: 'parent.engagement.language.name', valueGetter: (_, p) => p.parent.language.value!, }), viewReport: IDColumn({