Skip to content

Commit 48a55e8

Browse files
committed
Add histogram icon, fix types showing for hidden fields
1 parent bbd6137 commit 48a55e8

File tree

3 files changed

+21
-13
lines changed

3 files changed

+21
-13
lines changed

x-pack/plugins/data_visualizer/public/application/common/components/field_type_icon/field_type_icon.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,12 @@ export const FieldTypeIcon: FC<FieldTypeIconProps> = ({
6969
color = 'euiColorVis0';
7070
break;
7171
case JOB_FIELD_TYPES.NUMBER:
72-
case JOB_FIELD_TYPES.HISTOGRAM:
7372
iconType = 'tokenNumber';
7473
color = fieldName !== undefined ? 'euiColorVis1' : 'euiColorVis2';
7574
break;
75+
case JOB_FIELD_TYPES.HISTOGRAM:
76+
iconType = 'tokenHistogram';
77+
color = 'euiColorVis7';
7678
case JOB_FIELD_TYPES.UNKNOWN:
7779
// Use defaults
7880
break;

x-pack/plugins/data_visualizer/public/application/common/util/field_types_utils.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@ export function kbnTypeToJobType(field: IndexPatternField) {
7878
case KBN_FIELD_TYPES.GEO_SHAPE:
7979
type = JOB_FIELD_TYPES.GEO_SHAPE;
8080
break;
81+
case KBN_FIELD_TYPES.HISTOGRAM:
82+
type = JOB_FIELD_TYPES.HISTOGRAM;
83+
break;
8184

8285
default:
8386
break;

x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ import { useDataVisualizerKibana } from '../../../kibana_context';
5656
import { FieldCountPanel } from '../../../common/components/field_count_panel';
5757
import { DocumentCountContent } from '../../../common/components/document_count_content';
5858
import { DataLoader } from '../../data_loader/data_loader';
59-
import { JOB_FIELD_TYPES } from '../../../../../common';
59+
import { JOB_FIELD_TYPES, OMIT_FIELDS } from '../../../../../common';
6060
import { useTimefilter } from '../../hooks/use_time_filter';
6161
import { kbnTypeToJobType } from '../../../common/util/field_types_utils';
6262
import { SearchPanel } from '../search_panel';
@@ -204,18 +204,21 @@ export const IndexDataVisualizerView: FC<IndexDataVisualizerViewProps> = (dataVi
204204
}
205205
}, [currentIndexPattern, toasts]);
206206

207-
// Obtain the list of non metric field types which appear in the index pattern.
208-
let indexedFieldTypes: JobFieldType[] = [];
209207
const indexPatternFields: IndexPatternField[] = currentIndexPattern.fields;
210-
indexPatternFields.forEach((field) => {
211-
if (field.scripted !== true) {
212-
const dataVisualizerType: JobFieldType | undefined = kbnTypeToJobType(field);
213-
if (dataVisualizerType !== undefined && !indexedFieldTypes.includes(dataVisualizerType)) {
214-
indexedFieldTypes.push(dataVisualizerType);
208+
209+
const fieldTypes = useMemo(() => {
210+
// Obtain the list of non metric field types which appear in the index pattern.
211+
const indexedFieldTypes: JobFieldType[] = [];
212+
indexPatternFields.forEach((field) => {
213+
if (!OMIT_FIELDS.includes(field.name) && field.scripted !== true) {
214+
const dataVisualizerType: JobFieldType | undefined = kbnTypeToJobType(field);
215+
if (dataVisualizerType !== undefined && !indexedFieldTypes.includes(dataVisualizerType)) {
216+
indexedFieldTypes.push(dataVisualizerType);
217+
}
215218
}
216-
}
217-
});
218-
indexedFieldTypes = indexedFieldTypes.sort();
219+
});
220+
return indexedFieldTypes.sort();
221+
}, [indexPatternFields]);
219222

220223
const defaults = getDefaultPageState();
221224

@@ -859,7 +862,7 @@ export const IndexDataVisualizerView: FC<IndexDataVisualizerViewProps> = (dataVi
859862
samplerShardSize={samplerShardSize}
860863
setSamplerShardSize={setSamplerShardSize}
861864
overallStats={overallStats}
862-
indexedFieldTypes={indexedFieldTypes}
865+
indexedFieldTypes={fieldTypes}
863866
setVisibleFieldTypes={setVisibleFieldTypes}
864867
visibleFieldTypes={visibleFieldTypes}
865868
visibleFieldNames={visibleFieldNames}

0 commit comments

Comments
 (0)