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] Use "Integrations" breadcrumb in "Add integrations" #103227

Merged
merged 3 commits into from
Jun 24, 2021
Merged

[Fleet] Use "Integrations" breadcrumb in "Add integrations" #103227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e46e50
update the UI breadcrumbs in create policy package to always look lik…
jloleysens Jun 24, 2021
265aa63
added comment about the removal of a path from fleet
jloleysens Jun 24, 2021
f144b80
Merge branch 'master' into fleet/fix-create-policy-package-breadcrumb
kibanamachine Jun 24, 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
26 changes: 7 additions & 19 deletions ...leet/public/applications/fleet/sections/agent_policy/create_package_policy_page/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,17 +495,13 @@ export const CreatePackagePolicyPage: React.FunctionComponent = () => {
onCancel={() => setFormState('VALID')}
/>
)}
{from === 'package'
? packageInfo && (
<IntegrationBreadcrumb
pkgTitle={integrationInfo?.title || packageInfo.title}
pkgkey={pkgKeyFromPackageInfo(packageInfo)}
integration={integrationInfo?.name}
/>
)
: agentPolicy && (
<PolicyBreadcrumb policyName={agentPolicy.name} policyId={agentPolicy.id} />
)}
{packageInfo && (
<IntegrationBreadcrumb
pkgTitle={integrationInfo?.title || packageInfo.title}
pkgkey={pkgKeyFromPackageInfo(packageInfo)}
integration={integrationInfo?.name}
/>
)}
<StepsWithLessPadding steps={steps} />
<EuiSpacer size="xl" />
<EuiSpacer size="xl" />
Expand Down Expand Up @@ -559,14 +555,6 @@ export const CreatePackagePolicyPage: React.FunctionComponent = () => {
);
};

const PolicyBreadcrumb: React.FunctionComponent<{
policyName: string;
policyId: string;
}> = ({ policyName, policyId }) => {
useBreadcrumbs('add_integration_from_policy', { policyName, policyId });
return null;
};

const IntegrationBreadcrumb: React.FunctionComponent<{
pkgTitle: string;
pkgkey: string;
Expand Down
1 change: 1 addition & 0 deletions x-pack/plugins/fleet/public/constants/page_paths.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ export const FLEET_ROUTING_PATHS = {
policy_details: '/policies/:policyId/:tabId?',
policy_details_settings: '/policies/:policyId/settings',
edit_integration: '/policies/:policyId/edit-integration/:packagePolicyId',
// TODO: Review uses and remove if it is no longer used or linked to in any UX flows
add_integration_from_policy: '/policies/:policyId/add-integration',
enrollment_tokens: '/enrollment-tokens',
data_streams: '/data-streams',
Expand Down