Skip to content

Commit f59f82b

Browse files
authored
fix fields types (#475)
1 parent 2a021a8 commit f59f82b

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

web/src/api/ipfix.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,17 @@ export interface Record {
1313
}
1414

1515
export const getRecordValue = (record: Record, fieldOrLabel: string, defaultValue?: string | number) => {
16+
/* TODO: fix following behavior:
17+
* Check if field exists first since /flow endpoint return fields as labels when using filters
18+
* This is mandatory to ensure fields types
19+
*/
20+
if (record.fields[fieldOrLabel as keyof Fields] !== undefined) {
21+
return record.fields[fieldOrLabel as keyof Fields];
22+
}
1623
// check if label exists
1724
if (record.labels[fieldOrLabel as keyof Labels] !== undefined) {
1825
return record.labels[fieldOrLabel as keyof Labels];
1926
}
20-
// check if field exists
21-
if (record.fields[fieldOrLabel as keyof Fields] !== undefined) {
22-
return record.fields[fieldOrLabel as keyof Fields];
23-
}
2427
// fallback on default
2528
return defaultValue;
2629
};

web/src/components/netflow-record/record-panel.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ export const RecordPanel: React.FC<RecordDrawerProps> = ({
302302
}, [record.labels._RecordType, t]);
303303

304304
const getSortedJSON = React.useCallback(() => {
305-
const flat = { ...record.fields, ...record.labels };
305+
const flat = { ...record.labels, ...record.fields };
306306
return JSON.stringify(flat, Object.keys(flat).sort(), 2);
307307
}, [record]);
308308

0 commit comments

Comments
 (0)