From acdad3e50b5872d093776a01ca49e73e8ecaac9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Loi=CC=88c=20Correnson?= <loic.correnson@cea.fr>
Date: Wed, 17 Jun 2020 18:33:47 +0200
Subject: [PATCH] [ivette] more permissive column getters
---
ivette/src/dome/src/renderer/table/views.tsx | 2 +-
ivette/src/renderer/Properties.tsx | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ivette/src/dome/src/renderer/table/views.tsx b/ivette/src/dome/src/renderer/table/views.tsx
index b638a02a152..953cdbdf590 100644
--- a/ivette/src/dome/src/renderer/table/views.tsx
+++ b/ivette/src/dome/src/renderer/table/views.tsx
@@ -105,7 +105,7 @@ export interface ColumnProps<Row, Cell> {
/**
Data getter for this column.
*/
- getter?: (row: Row, dataKey: string) => Cell;
+ getter?: (row: Row, dataKey: string) => Cell | undefined;
/**
Override table by-fields cell renderers.
*/
diff --git a/ivette/src/renderer/Properties.tsx b/ivette/src/renderer/Properties.tsx
index bae920cf1a7..a9d19d85b85 100644
--- a/ivette/src/renderer/Properties.tsx
+++ b/ivette/src/renderer/Properties.tsx
@@ -162,8 +162,8 @@ const renderCode: Renderer<string> =
interface Tag { name: string; label: string; descr: string }
-const renderTag: Renderer<Tag | undefined> =
- (d?: Tag) => (d ? <Label label={d.label} title={d.descr} /> : null);
+const renderTag: Renderer<Tag> =
+ (d: Tag) => <Label label={d.label} title={d.descr} />;
const renderNames: Renderer<string[]> =
(names: string[]) => {
@@ -185,7 +185,7 @@ function ColumnCode<Row>(props: ColumnProps<Row, string>) {
return <Column render={renderCode} {...props} />;
}
-function ColumnTag<Row>(props: ColumnProps<Row, Tag | undefined>) {
+function ColumnTag<Row>(props: ColumnProps<Row, Tag>) {
return <Column render={renderTag} {...props} />;
}
--
GitLab