Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fleet] Fix hide enrollment key tooltip #123188

Merged
merged 3 commits into from
Jan 18, 2022
Merged

[Fleet] Fix hide enrollment key tooltip #123188

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15ae5d4
[Fleet] Fix hide key tooltip
nchaulet Jan 17, 2022
c74c73e
Fix loading state
nchaulet Jan 17, 2022
7fe9b00
Refacto loading condition
nchaulet Jan 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions ...gins/fleet/public/applications/fleet/sections/agents/enrollment_token_list_page/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ const ApiKeyField: React.FunctionComponent<{ apiKeyId: string }> = ({ apiKeyId }
})
}
color="text"
isDisabled={state === 'LOADING'}
onClick={toggleKey}
iconType={state === 'VISIBLE' ? 'eyeClosed' : 'eye'}
/>
Expand Down Expand Up @@ -312,10 +311,14 @@ export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => {
</EuiFlexGroup>
<EuiSpacer size="m" />
<EuiBasicTable<EnrollmentAPIKey>
loading={enrollmentAPIKeysRequest.isLoading && enrollmentAPIKeysRequest.isInitialRequest}
loading={
(enrollmentAPIKeysRequest.isLoading && enrollmentAPIKeysRequest.isInitialRequest) ||
(agentPoliciesRequest.isLoading && agentPoliciesRequest.isInitialRequest)
}
hasActions={true}
noItemsMessage={
enrollmentAPIKeysRequest.isLoading && enrollmentAPIKeysRequest.isInitialRequest ? (
(enrollmentAPIKeysRequest.isLoading && enrollmentAPIKeysRequest.isInitialRequest) ||
(agentPoliciesRequest.isLoading && agentPoliciesRequest.isInitialRequest) ? (
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: this condition is used twice, could be extracted to a const

<FormattedMessage
id="xpack.fleet.enrollemntAPIKeyList.loadingTokensMessage"
defaultMessage="Loading enrollment tokens..."
Expand Down