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

Jump to bottom

[Fleet] Fix upgrade link in Fleet policy table #110228

Merged
merged 2 commits into from
Aug 27, 2021
Merged

[Fleet] Fix upgrade link in Fleet policy table #110228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d815e1
Fix upgrade link in Fleet policy table
kpollich Aug 26, 2021
ceb5ad8
Ensure upgrade page displays as upgrade even without from prop
kpollich Aug 26, 2021
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
2 changes: 1 addition & 1 deletion ...sections/agent_policy/details_page/components/package_policies/package_policies_table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ export const PackagePoliciesTable: React.FunctionComponent<Props> = ({
upgradePackagePolicyHref={`${getHref('upgrade_package_policy', {
policyId: agentPolicy.id,
packagePolicyId: packagePolicy.id,
})}`}
})}?from=fleet-policy-list`}
/>
);
},
Expand Down
6 changes: 2 additions & 4 deletions .../fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,9 @@ export const EditPackagePolicyPage = memo(() => {

export const EditPackagePolicyForm = memo<{
packagePolicyId: string;
isUpgrade?: boolean;
from?: EditPackagePolicyFrom;
}>(({ packagePolicyId, from = 'edit' }) => {
}>(({ packagePolicyId, isUpgrade = false, from = 'edit' }) => {
const { application, notifications } = useStartServices();
const {
agents: { enabled: isFleetEnabled },
Expand All @@ -99,9 +100,6 @@ export const EditPackagePolicyForm = memo<{
>();
const [dryRunData, setDryRunData] = useState<UpgradePackagePolicyDryRunResponse>();

const isUpgrade =
from === 'upgrade-from-fleet-policy-list' || from === 'upgrade-from-integrations-policy-list';

const policyId = agentPolicy?.id ?? '';

// Retrieve agent policy, package, and package policy info
Expand Down
2 changes: 1 addition & 1 deletion ...eet/public/applications/fleet/sections/agent_policy/upgrade_package_policy_page/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ export const UpgradePackagePolicyPage = memo(() => {
from = 'upgrade-from-integrations-policy-list';
}

return <EditPackagePolicyForm packagePolicyId={packagePolicyId} from={from} />;
return <EditPackagePolicyForm packagePolicyId={packagePolicyId} from={from} isUpgrade />;
});