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

[ML] DF Analytics list: ensure job messages and jobs load correctly (#75676)

Browse source 
* ensure messages load on first open

* ensure analytics management list does not load infinitely
This commit is contained in:
Melissa Alvarez 2020-08-24 11:46:18 -04:00 committed by GitHub
parent 4ffef0a481
commit 33d3f4090a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/analytics_list.tsx
View file

@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
import React, { FC, useState, useEffect } from 'react';
import React, { FC, useCallback, useState, useEffect } from 'react';
import { i18n } from '@kbn/i18n';
@ -119,11 +119,13 @@ export const DataFrameAnalyticsList: FC<Props> = ({
}
}, [selectedIdFromUrlInitialized, analytics]);
const getAnalyticsCallback = useCallback(() => getAnalytics(true), []);
// Subscribe to the refresh observable to trigger reloading the analytics list.
useRefreshAnalyticsList(
{
isLoading: setIsLoading,
onRefresh: () => getAnalytics(true),
onRefresh: getAnalyticsCallback,
},
isManagementTable
);

53
x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/expanded_row_messages_pane.tsx
View file

@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
import React, { FC, useState } from 'react';
import React, { FC, useState, useEffect, useCallback } from 'react';
import { i18n } from '@kbn/i18n';
import { ml } from '../../../../../services/ml_api_service';
import { useRefreshAnalyticsList } from '../../../../common';
@ -20,45 +20,34 @@ export const ExpandedRowMessagesPane: FC<Props> = ({ analyticsId }) => {
const [isLoading, setIsLoading] = useState(false);
const [errorMessage, setErrorMessage] = useState('');
const getMessagesFactory = () => {
let concurrentLoads = 0;
return async function getMessages() {
try {
concurrentLoads++;
const getMessages = useCallback(async () => {
try {
setIsLoading(true);
const messagesResp = await ml.dataFrameAnalytics.getAnalyticsAuditMessages(analyticsId);
setIsLoading(false);
setMessages(messagesResp);
} catch (error) {
setIsLoading(false);
setErrorMessage(
i18n.translate('xpack.ml.dfAnalyticsList.analyticsDetails.messagesPane.errorMessage', {
defaultMessage: 'Messages could not be loaded',
})
);
}
}, []);
if (concurrentLoads > 1) {
return;
}
useEffect(() => {
getMessages();
}, []);
setIsLoading(true);
const messagesResp = await ml.dataFrameAnalytics.getAnalyticsAuditMessages(analyticsId);
setIsLoading(false);
setMessages(messagesResp);
concurrentLoads--;
if (concurrentLoads > 0) {
concurrentLoads = 0;
getMessages();
}
} catch (error) {
setIsLoading(false);
setErrorMessage(
i18n.translate('xpack.ml.dfAnalyticsList.analyticsDetails.messagesPane.errorMessage', {
defaultMessage: 'Messages could not be loaded',
})
);
}
};
};
useRefreshAnalyticsList({ onRefresh: getMessagesFactory() });
useRefreshAnalyticsList({ onRefresh: getMessages });
return (
<JobMessages
messages={messages}
loading={isLoading}
error={errorMessage}
refreshMessage={getMessagesFactory()}
refreshMessage={getMessages}
/>
);
};