Skip to content

Commit 3af3e7f

Browse files
committed
Unwrap secure date columns by default
1 parent 106a8ee commit 3af3e7f

File tree

4 files changed

+2
-7
lines changed

4 files changed

+2
-7
lines changed

src/components/EngagementDataGrid/EngagementColumns.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,14 +183,12 @@ export const EngagementColumns: Array<GridColDef<Engagement>> = [
183183
headerName: 'MOU Start',
184184
field: 'startDate',
185185
...dateColumn(),
186-
valueGetter: dateColumn.valueGetter((_, { startDate }) => startDate.value),
187186
filterable: false,
188187
},
189188
{
190189
headerName: 'MOU End',
191190
field: 'endDate',
192191
...dateColumn(),
193-
valueGetter: dateColumn.valueGetter((_, { endDate }) => endDate.value),
194192
filterable: false,
195193
},
196194
{

src/components/Grid/ColumnTypes/dateColumn.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
import { Nil } from '@seedcompany/common';
99
import { DateTime } from 'luxon';
1010
import { DateFilter } from '~/api/schema.graphql';
11-
import { CalendarDate, ISOString } from '~/common';
11+
import { CalendarDate, ISOString, unwrapSecured } from '~/common';
1212
import { GridHeaderAddFilterButton } from '../GridHeaderAddFilterButton';
1313
import { column, RowLike } from './definition.types';
1414

@@ -57,7 +57,7 @@ dateColumn.valueGetter =
5757
return value;
5858
};
5959
const defaultValueGetter: DateValueGetterInput = (_, row, column) =>
60-
row[column.field];
60+
unwrapSecured(row[column.field]);
6161

6262
const filterOpNameMap: Record<string, keyof DateFilter> = {
6363
after: 'after',

src/components/PartnersDataGrid/PartnerColumns.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ export const PartnerColumns: Array<GridColDef<Partner>> = [
4141
headerName: 'Start Date',
4242
field: 'startDate',
4343
...dateColumn(),
44-
valueGetter: dateColumn.valueGetter((_, { startDate }) => startDate.value),
4544
width: 130,
4645
},
4746
{

src/components/ProjectDataGrid/ProjectColumns.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,11 @@ export const ProjectColumns: Array<GridColDef<Project>> = [
7878
headerName: 'MOU Start',
7979
field: 'mouStart',
8080
...dateColumn(),
81-
valueGetter: dateColumn.valueGetter((_, { mouStart }) => mouStart.value),
8281
},
8382
{
8483
headerName: 'MOU End',
8584
field: 'mouEnd',
8685
...dateColumn(),
87-
valueGetter: dateColumn.valueGetter((_, { mouEnd }) => mouEnd.value),
8886
},
8987
SensitivityColumn({}),
9088
{

0 commit comments

Comments
 (0)