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

[APM] Ensure loading indicator stops in Safari (#67695)

Browse source 
The combination of using object destructuring and numeric object keys in the reducer for LoadingIndicatorContext caused it so the loading indicator would not disappear in 7.8 in Safari even though there were no more loading statuses.

Optimization changes between 7.8 and master may be why this is only appears on 7.8.

Update this reducer to stringify the key and `lodash.pick` only the true values so the only pairs in the object are ones with `true` as the value.

Fixes #67334.
This commit is contained in:
Nathan L Smith 2020-05-28 17:46:43 -05:00 committed by GitHub
parent 957915b7e5
commit 92d5fcdc1c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
x-pack/plugins/apm/public/context/LoadingIndicatorContext.tsx
View file

@ -4,12 +4,13 @@
* you may not use this file except in compliance with the Elastic License.
*/
import { EuiPortal, EuiProgress } from '@elastic/eui';
import { pick } from 'lodash';
import React, { Fragment, useMemo, useReducer } from 'react';
import { useDelayedVisibility } from '../components/shared/useDelayedVisibility';
export const LoadingIndicatorContext = React.createContext({
statuses: {},
dispatchStatus: (action: Action) => undefined as void,
dispatchStatus: (action: Action) => {},
});
interface State {
@ -22,14 +23,13 @@ interface Action {
}
function reducer(statuses: State, action: Action) {
// add loading status
if (action.isLoading) {
return { ...statuses, [action.id]: true };
}
// remove loading status
const { [action.id]: statusToRemove, ...restStatuses } = statuses;
return restStatuses;
// Return an object with only the ids with `true` as their value, so that ids
// that previously had `false` are removed and do not remain hanging around in
// the object.
return pick(
{ ...statuses, [action.id.toString()]: action.isLoading },
Boolean
);
}
function getIsAnyLoading(statuses: State) {