github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 17:59:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

[APM] Don't show "no services" message if data is not fully loaded (#130234)

Browse source
This commit is contained in:
Dario Gieselaar 2022-04-14 13:39:49 +02:00 • committed by GitHub
parent 3fb2ab6713
commit 3af9f04ff4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
x-pack/plugins/apm/public/components/app/service_inventory/index.tsx
View file

@ -141,11 +141,21 @@ export function ServiceInventory() {
!userHasDismissedCallout &&
shouldDisplayMlCallout(anomalyDetectionSetupState);
const isLoading =
sortedAndFilteredServicesFetch.status === FETCH_STATUS.LOADING ||
(sortedAndFilteredServicesFetch.status === FETCH_STATUS.SUCCESS &&
sortedAndFilteredServicesFetch.data?.services.length === 0 &&
mainStatisticsFetch.status === FETCH_STATUS.LOADING);
const useOptimizedSorting = useKibana().services.uiSettings?.get<boolean>(
apmServiceInventoryOptimizedSorting
);
let isLoading: boolean;
if (useOptimizedSorting) {
isLoading =
sortedAndFilteredServicesFetch.status === FETCH_STATUS.LOADING ||
(sortedAndFilteredServicesFetch.status === FETCH_STATUS.SUCCESS &&
sortedAndFilteredServicesFetch.data?.services.length === 0 &&
mainStatisticsFetch.status === FETCH_STATUS.LOADING);
} else {
isLoading = mainStatisticsFetch.status === FETCH_STATUS.LOADING;
}
const isFailure = mainStatisticsFetch.status === FETCH_STATUS.FAILURE;
const noItemsMessage = (
@ -169,9 +179,7 @@ export function ServiceInventory() {
...preloadedServices,
].some((item) => 'healthStatus' in item);
const tiebreakerField = useKibana().services.uiSettings?.get<boolean>(
apmServiceInventoryOptimizedSorting
)
const tiebreakerField = useOptimizedSorting
? ServiceInventoryFieldName.ServiceName
: ServiceInventoryFieldName.Throughput;