mirror of
https://github.com/elastic/kibana.git
synced 2025-04-23 17:28:26 -04:00
(cherry picked from commit 8ac8d6910c
)
Co-authored-by: Nicolas Chaulet <nicolas.chaulet@elastic.co>
This commit is contained in:
parent
5d35ae52cb
commit
999b27aca7
1 changed files with 6 additions and 3 deletions
|
@ -96,7 +96,6 @@ const ApiKeyField: React.FunctionComponent<{ apiKeyId: string }> = ({ apiKeyId }
|
|||
})
|
||||
}
|
||||
color="text"
|
||||
isDisabled={state === 'LOADING'}
|
||||
onClick={toggleKey}
|
||||
iconType={state === 'VISIBLE' ? 'eyeClosed' : 'eye'}
|
||||
/>
|
||||
|
@ -269,6 +268,10 @@ export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => {
|
|||
},
|
||||
];
|
||||
|
||||
const isLoading =
|
||||
(enrollmentAPIKeysRequest.isLoading && enrollmentAPIKeysRequest.isInitialRequest) ||
|
||||
(agentPoliciesRequest.isLoading && agentPoliciesRequest.isInitialRequest);
|
||||
|
||||
return (
|
||||
<DefaultLayout section="enrollment_tokens">
|
||||
{isModalOpen && (
|
||||
|
@ -312,10 +315,10 @@ export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => {
|
|||
</EuiFlexGroup>
|
||||
<EuiSpacer size="m" />
|
||||
<EuiBasicTable<EnrollmentAPIKey>
|
||||
loading={enrollmentAPIKeysRequest.isLoading && enrollmentAPIKeysRequest.isInitialRequest}
|
||||
loading={isLoading}
|
||||
hasActions={true}
|
||||
noItemsMessage={
|
||||
enrollmentAPIKeysRequest.isLoading && enrollmentAPIKeysRequest.isInitialRequest ? (
|
||||
isLoading ? (
|
||||
<FormattedMessage
|
||||
id="xpack.fleet.enrollemntAPIKeyList.loadingTokensMessage"
|
||||
defaultMessage="Loading enrollment tokens..."
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue