18257: Adds checks to array values thay may be null or undefined.

[arvados-workbench2.git] / src / components / chips / chips.tsx

diff --git a/src/components/chips/chips.tsx b/src/components/chips/chips.tsx
index 2a6fafc3991e415ff38e52095f2a518deb540b62..c4724d1bb1a8d9b0ffcb3c79b6127c1a1fddd6c1 100644 (file)
--- a/src/components/chips/chips.tsx
+++ b/src/components/chips/chips.tsx
@@ -38,15 +38,18 @@ export const Chips = withStyles(styles)(
         render() {
             const { values, filler } = this.props;
             return <Grid container spacing={8} className={this.props.classes.root}>
-                {values.map(this.renderChip)}
+                {values && values.map(this.renderChip)}
                 {filler && <Grid item xs>{filler}</Grid>}
             </Grid>;
         }
 
-        renderChip = (value: Value, index: number) =>
-            <Grid item key={index}>
-                <this.chip {...{ value }} />
+        renderChip = (value: Value, index: number) => {
+            const { deletable, getLabel } = this.props;
+            return <Grid item key={index}>
+                <Chip onDelete={deletable ? this.deleteValue(value) : undefined}
+                    label={getLabel !== undefined ? getLabel(value) : value} />
             </Grid>
+        }
 
         type = 'chip';
 
@@ -132,4 +135,4 @@ interface CollectedProps {
 
 interface DraggableChipProps<Value> {
     value: Value;
-}
\ No newline at end of file
+}