Skip to content

[Fleet] Keep the query params returnAppId and returnPath when switching tabs the integration details page #216094

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

Merged
kgeller merged 2 commits into from
Mar 27, 2025
Merged

[Fleet] Keep the query params returnAppId and returnPath when switching tabs the integration details page #216094

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
d88d26b
keep the query params for routing back across tabs on the integration…
kgeller Mar 26, 2025
136a3ec
refactoring params to an object
kgeller Mar 27, 2025
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
43 changes: 15 additions & 28 deletions ...ugins/shared/fleet/public/applications/integrations/sections/epm/screens/detail/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,6 +618,12 @@ export function Detail() {
return [];
}
const packageInfoKey = pkgKeyFromPackageInfo(packageInfo);
const pathValues = {
pkgkey: packageInfoKey,
...(integration ? { integration } : {}),
...(returnAppId ? { returnAppId } : {}),
...(returnPath ? { returnPath } : {}),
};

const tabs: WithHeaderLayoutProps['tabs'] = [
{
Expand All @@ -630,10 +636,7 @@ export function Detail() {
),
isSelected: panel === 'overview',
'data-test-subj': `tab-overview`,
href: getHref('integration_details_overview', {
pkgkey: packageInfoKey,
...(integration ? { integration } : {}),
}),
href: getHref('integration_details_overview', pathValues),
},
];

Expand All @@ -648,10 +651,7 @@ export function Detail() {
),
isSelected: panel === 'policies',
'data-test-subj': `tab-policies`,
href: getHref('integration_details_policies', {
pkgkey: packageInfoKey,
...(integration ? { integration } : {}),
}),
href: getHref('integration_details_policies', pathValues),
});
}

Expand All @@ -672,10 +672,7 @@ export function Detail() {
),
isSelected: panel === 'assets',
'data-test-subj': `tab-assets`,
href: getHref('integration_details_assets', {
pkgkey: packageInfoKey,
...(integration ? { integration } : {}),
}),
href: getHref('integration_details_assets', pathValues),
});
}

Expand All @@ -690,10 +687,7 @@ export function Detail() {
),
isSelected: panel === 'settings',
'data-test-subj': `tab-settings`,
href: getHref('integration_details_settings', {
pkgkey: packageInfoKey,
...(integration ? { integration } : {}),
}),
href: getHref('integration_details_settings', pathValues),
});
}

Expand All @@ -708,10 +702,7 @@ export function Detail() {
),
isSelected: panel === 'configs',
'data-test-subj': `tab-configs`,
href: getHref('integration_details_configs', {
pkgkey: packageInfoKey,
...(integration ? { integration } : {}),
}),
href: getHref('integration_details_configs', pathValues),
});
}

Expand All @@ -726,10 +717,7 @@ export function Detail() {
),
isSelected: panel === 'custom',
'data-test-subj': `tab-custom`,
href: getHref('integration_details_custom', {
pkgkey: packageInfoKey,
...(integration ? { integration } : {}),
}),
href: getHref('integration_details_custom', pathValues),
});
}

Expand All @@ -744,16 +732,15 @@ export function Detail() {
),
isSelected: panel === 'api-reference',
'data-test-subj': `tab-api-reference`,
href: getHref('integration_details_api_reference', {
pkgkey: packageInfoKey,
...(integration ? { integration } : {}),
}),
href: getHref('integration_details_api_reference', pathValues),
});
}

return tabs;
}, [
packageInfo,
returnAppId,
returnPath,
panel,
getHref,
integration,
Expand Down
58 changes: 32 additions & 26 deletions x-pack/platform/plugins/shared/fleet/public/constants/page_paths.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,34 +155,40 @@ export const pagePathGetters: {
return [INTEGRATIONS_BASE_PATH, `/installed/updates_available${categoryPath}${queryParams}`];
},
integration_create: () => [INTEGRATIONS_BASE_PATH, `/create`],
integration_details_overview: ({ pkgkey, integration }) => [
INTEGRATIONS_BASE_PATH,
`/detail/${pkgkey}/overview${integration ? `?integration=${integration}` : ''}`,
],
integration_details_policies: ({ pkgkey, integration, addAgentToPolicyId }) => {
const qs = stringify({ integration, addAgentToPolicyId });
integration_details_overview: ({ pkgkey, integration, returnAppId, returnPath }) => {
const qs = stringify({ integration, returnAppId, returnPath });
return [INTEGRATIONS_BASE_PATH, `/detail/${pkgkey}/overview${qs ? `?${qs}` : ''}`];
},
integration_details_policies: ({
pkgkey,
integration,
addAgentToPolicyId,
returnAppId,
returnPath,
}) => {
const qs = stringify({ integration, addAgentToPolicyId, returnAppId, returnPath });
return [INTEGRATIONS_BASE_PATH, `/detail/${pkgkey}/policies${qs ? `?${qs}` : ''}`];
},
integration_details_assets: ({ pkgkey, integration }) => [
INTEGRATIONS_BASE_PATH,
`/detail/${pkgkey}/assets${integration ? `?integration=${integration}` : ''}`,
],
integration_details_settings: ({ pkgkey, integration }) => [
INTEGRATIONS_BASE_PATH,
`/detail/${pkgkey}/settings${integration ? `?integration=${integration}` : ''}`,
],
integration_details_configs: ({ pkgkey, integration }) => [
INTEGRATIONS_BASE_PATH,
`/detail/${pkgkey}/configs${integration ? `?integration=${integration}` : ''}`,
],
integration_details_custom: ({ pkgkey, integration }) => [
INTEGRATIONS_BASE_PATH,
`/detail/${pkgkey}/custom${integration ? `?integration=${integration}` : ''}`,
],
integration_details_api_reference: ({ pkgkey, integration }) => [
INTEGRATIONS_BASE_PATH,
`/detail/${pkgkey}/api-reference${integration ? `?integration=${integration}` : ''}`,
],
integration_details_assets: ({ pkgkey, integration, returnAppId, returnPath }) => {
const qs = stringify({ integration, returnAppId, returnPath });
return [INTEGRATIONS_BASE_PATH, `/detail/${pkgkey}/assets${qs ? `?${qs}` : ''}`];
},
integration_details_settings: ({ pkgkey, integration, returnAppId, returnPath }) => {
const qs = stringify({ integration, returnAppId, returnPath });
return [INTEGRATIONS_BASE_PATH, `/detail/${pkgkey}/settings${qs ? `?${qs}` : ''}`];
},
integration_details_configs: ({ pkgkey, integration, returnAppId, returnPath }) => {
const qs = stringify({ integration, returnAppId, returnPath });
return [INTEGRATIONS_BASE_PATH, `/detail/${pkgkey}/configs${qs ? `?${qs}` : ''}`];
},
integration_details_custom: ({ pkgkey, integration, returnAppId, returnPath }) => {
const qs = stringify({ integration, returnAppId, returnPath });
return [INTEGRATIONS_BASE_PATH, `/detail/${pkgkey}/custom${qs ? `?${qs}` : ''}`];
},
integration_details_api_reference: ({ pkgkey, integration, returnAppId, returnPath }) => {
const qs = stringify({ integration, returnAppId, returnPath });
return [INTEGRATIONS_BASE_PATH, `/detail/${pkgkey}/api-reference${qs ? `?${qs}` : ''}`];
},
integration_policy_edit: ({ packagePolicyId }) => [
INTEGRATIONS_BASE_PATH,
`/edit-integration/${packagePolicyId}`,
Expand Down
Loading