maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[DataViews] Fix redundant fields requests that cause errors (#109702) (#109845)

Browse source 
Co-authored-by: Anton Dosov <anton.dosov@elastic.co>
This commit is contained in:
Kibana Machine 2021-08-24 12:30:32 -04:00 committed by GitHub
parent ee46f33668
commit 7467f58ead
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx
View file

@ -120,6 +120,7 @@ const IndexPatternEditorFlyoutContentComponent = ({
const [timestampFieldOptions, setTimestampFieldOptions] = useState<TimestampOption[]>([]);
const [isLoadingTimestampFields, setIsLoadingTimestampFields] = useState<boolean>(false);
const currentLoadingTimestampFieldsRef = useRef(0);
const [isLoadingMatchedIndices, setIsLoadingMatchedIndices] = useState<boolean>(false);
const currentLoadingMatchedIndicesRef = useRef(0);
const [allSources, setAllSources] = useState<MatchedItem[]>([]);
@ -192,9 +193,12 @@ const IndexPatternEditorFlyoutContentComponent = ({
const loadTimestampFieldOptions = useCallback(
async (query: string) => {
const currentLoadingTimestampFieldsIdx = ++currentLoadingTimestampFieldsRef.current;
let timestampOptions: TimestampOption[] = [];
const isValidResult =
!existingIndexPatterns.includes(query) && matchedIndices.exactMatchedIndices.length > 0;
!existingIndexPatterns.includes(query) &&
matchedIndices.exactMatchedIndices.length > 0 &&
!isLoadingMatchedIndices;
if (isValidResult) {
setIsLoadingTimestampFields(true);
const getFieldsOptions: GetFieldsOptions = {
@ -210,7 +214,10 @@ const IndexPatternEditorFlyoutContentComponent = ({
);
timestampOptions = extractTimeFields(fields, requireTimestampField);
}
if (isMounted.current) {
if (
isMounted.current &&
currentLoadingTimestampFieldsIdx === currentLoadingTimestampFieldsRef.current
) {
setIsLoadingTimestampFields(false);
setTimestampFieldOptions(timestampOptions);
}
@ -223,13 +230,14 @@ const IndexPatternEditorFlyoutContentComponent = ({
rollupIndex,
type,
matchedIndices.exactMatchedIndices,
isLoadingMatchedIndices,
]
);
useEffect(() => {
loadTimestampFieldOptions(title);
getFields().timestampField?.setValue('');
}, [matchedIndices, loadTimestampFieldOptions, title, getFields]);
}, [loadTimestampFieldOptions, title, getFields]);
const reloadMatchedIndices = useCallback(
async (newTitle: string) => {