[Fleet] disable upgrade action when package does not have upgrade available #111510
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
|
|
||
| import React from 'react'; | ||
|
|
||
| import { act } from '@testing-library/react'; | ||
|
|
||
| import type { AgentPolicy, InMemoryPackagePolicy } from '../types'; | ||
| import { createIntegrationsTestRendererMock } from '../mock'; | ||
|
|
||
| import { PackagePolicyActionsMenu } from './package_policy_actions_menu'; | ||
|
|
||
| function renderMenu({ | ||
| agentPolicy, | ||
| packagePolicy, | ||
| showAddAgent = false, | ||
| isOpen = true, | ||
| }: { | ||
| agentPolicy: AgentPolicy; | ||
| packagePolicy: InMemoryPackagePolicy; | ||
| showAddAgent?: boolean; | ||
| isOpen?: boolean; | ||
| }) { | ||
| const renderer = createIntegrationsTestRendererMock(); | ||
|
|
||
| const utils = renderer.render( | ||
| <PackagePolicyActionsMenu | ||
| agentPolicy={agentPolicy} | ||
| packagePolicy={packagePolicy} | ||
| showAddAgent={showAddAgent} | ||
| upgradePackagePolicyHref="" | ||
| isOpen={isOpen} | ||
| key="test1" | ||
| /> | ||
| ); | ||
|
|
||
| return { utils }; | ||
| } | ||
|
|
||
| function createMockAgentPolicy(props: Partial<AgentPolicy> = {}): AgentPolicy { | ||
| return { | ||
| id: 'some-uuid1', | ||
| namespace: 'default', | ||
| monitoring_enabled: [], | ||
| name: 'Test Policy', | ||
| description: '', | ||
| is_default: false, | ||
| is_preconfigured: false, | ||
| status: 'active', | ||
| is_managed: false, | ||
| revision: 1, | ||
| updated_at: '', | ||
| updated_by: 'elastic', | ||
| package_policies: [], | ||
| ...props, | ||
| }; | ||
| } | ||
|
|
||
| function createMockPackagePolicy( | ||
| props: Partial<InMemoryPackagePolicy> = {} | ||
| ): InMemoryPackagePolicy { | ||
| return { | ||
| id: 'some-uuid2', | ||
| name: 'mock-package-policy', | ||
| description: '', | ||
| created_at: '', | ||
| created_by: '', | ||
| updated_at: '', | ||
| updated_by: '', | ||
| policy_id: '', | ||
| enabled: true, | ||
| output_id: '', | ||
| namespace: 'default', | ||
| inputs: [], | ||
| revision: 1, | ||
| hasUpgrade: false, | ||
| ...props, | ||
| }; | ||
| } | ||
|
|
||
| test('Should disable upgrade button if package does not have upgrade', async () => { | ||
|
There was a problem hiding this comment. @nchaulet these test were much simpler to write :D |
||
| const agentPolicy = createMockAgentPolicy(); | ||
| const packagePolicy = createMockPackagePolicy({ hasUpgrade: false }); | ||
| const { utils } = renderMenu({ agentPolicy, packagePolicy }); | ||
| await act(async () => { | ||
| const upgradeButton = utils.getByText('Upgrade package policy').closest('button'); | ||
| expect(upgradeButton).toBeDisabled(); | ||
| }); | ||
| }); | ||
|
|
||
| test('Should enable upgrade button if package does has upgrade', async () => { | ||
| const agentPolicy = createMockAgentPolicy(); | ||
| const packagePolicy = createMockPackagePolicy({ hasUpgrade: true }); | ||
| const { utils } = renderMenu({ agentPolicy, packagePolicy }); | ||
| await act(async () => { | ||
| const upgradeButton = utils.getByText('Upgrade package policy').closest('button'); | ||
| expect(upgradeButton).not.toBeDisabled(); | ||
| }); | ||
| }); | ||
|
|
||
| test('Should not be able to delete integration from a managed policy', async () => { | ||
| const agentPolicy = createMockAgentPolicy({ is_managed: true }); | ||
| const packagePolicy = createMockPackagePolicy(); | ||
| const { utils } = renderMenu({ agentPolicy, packagePolicy }); | ||
| await act(async () => { | ||
| expect(utils.queryByText('Delete integration')).toBeNull(); | ||
| }); | ||
| }); | ||
|
|
||
| test('Should be able to delete integration from a non-managed policy', async () => { | ||
| const agentPolicy = createMockAgentPolicy({ is_managed: false }); | ||
| const packagePolicy = createMockPackagePolicy(); | ||
| const { utils } = renderMenu({ agentPolicy, packagePolicy }); | ||
| await act(async () => { | ||
| expect(utils.queryByText('Delete integration')).not.toBeNull(); | ||
| }); | ||
| }); | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,13 +24,21 @@ export const PackagePolicyActionsMenu: React.FunctionComponent<{ | |
| packagePolicy: InMemoryPackagePolicy; | ||
| viewDataStep?: EuiStepProps; | ||
| showAddAgent?: boolean; | ||
| isOpen?: boolean; | ||
| upgradePackagePolicyHref: string; | ||
| }> = ({ | ||
| agentPolicy, | ||
| packagePolicy, | ||
| viewDataStep, | ||
| showAddAgent, | ||
| upgradePackagePolicyHref, | ||
| isOpen = false, | ||
|
There was a problem hiding this comment. I have added this isOpen prop to aid testing, I could've fired a click event but I didn't think it was unreasonable for the component to have this prop? There was a problem hiding this comment. @hop-dev nitpick what do you think of naming this |
||
| }) => { | ||
| const [isEnrollmentFlyoutOpen, setIsEnrollmentFlyoutOpen] = useState(false); | ||
| const { getHref } = useLink(); | ||
| const hasWriteCapabilities = useCapabilities().write; | ||
| const refreshAgentPolicy = useAgentPolicyRefresh(); | ||
| const [isActionsMenuOpen, setIsActionsMenuOpen] = useState(isOpen); | ||
|
|
||
| const onEnrollmentFlyoutClose = useMemo(() => { | ||
| return () => setIsEnrollmentFlyoutOpen(false); | ||
|
|
@@ -84,6 +92,7 @@ export const PackagePolicyActionsMenu: React.FunctionComponent<{ | |
| disabled={!packagePolicy.hasUpgrade} | ||
| icon="refresh" | ||
| href={upgradePackagePolicyHref} | ||
| key="packagePolicyUpgrade" | ||
|
There was a problem hiding this comment. a warning was being logged because this menu item didn't have a key |
||
| > | ||
| <FormattedMessage | ||
| id="xpack.fleet.policyDetails.packagePoliciesTable.upgradeActionTitle" | ||
|
|
@@ -135,7 +144,7 @@ export const PackagePolicyActionsMenu: React.FunctionComponent<{ | |
| <ContextMenuActions | ||
| isOpen={isActionsMenuOpen} | ||
| items={menuItems} | ||
| onChange={(open) => setIsActionsMenuOpen(open)} | ||
| /> | ||
| </> | ||
| ); | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is line is the fix to disable the button
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So policy_id was an incorrect field?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, updatableIntegration.policiesToUpgrade contains information about the agent policy (Default policy in this case) and the package policy (which has an upgrade available), where
idis the ID of the agent policy andpkgPolicyIdis the ID of the package policy.Previously we were incorrectly comparing the agent policy IDs so every package policy in an agent policy would show as needing to upgrade. I have changed it so that we compare the package policy ID so that only the out of date packages show as needing an upgrade.