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 uninstall package validation accross space #188749

Merged
merged 8 commits into from
Jul 23, 2024
Merged

[Fleet] Fix uninstall package validation accross space #188749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0943e88
[Fleet] Fix uninstall package validation accross space
nchaulet Jul 19, 2024
db00999
fix UI
nchaulet Jul 19, 2024
a10e0b5
fix server side validation
nchaulet Jul 19, 2024
e81d02a
Add api TESTS
nchaulet Jul 19, 2024
e30f91d
fix tests
nchaulet Jul 23, 2024
8d22856
fix cypress tests
nchaulet Jul 23, 2024
de0ba52
fix typo
nchaulet Jul 23, 2024
e3fc43c
Merge branch 'main' into fix-uninstall-accros-space
elasticmachine Jul 23, 2024
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
4 changes: 4 additions & 0 deletions x-pack/plugins/fleet/common/types/models/epm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,6 +533,10 @@ export type PackageInfo =
| Installable<Merge<RegistryPackage, EpmPackageAdditions>>
| Installable<Merge<ArchivePackage, EpmPackageAdditions>>;

export interface PackageMetadata {
has_policies: true;
}

export type IntegrationCardReleaseLabel = 'beta' | 'preview' | 'ga' | 'rc';

export type PackageVerificationStatus = 'verified' | 'unverified' | 'unknown';
Expand Down
2 changes: 2 additions & 0 deletions x-pack/plugins/fleet/common/types/rest_spec/epm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import type {
SimpleSOAssetType,
AssetSOObject,
InstallResultStatus,
PackageMetadata,
} from '../models/epm';

export interface GetCategoriesRequest {
Expand Down Expand Up @@ -97,6 +98,7 @@ export interface GetInfoRequest {

export interface GetInfoResponse {
item: PackageInfo;
metadata?: PackageMetadata;
// deprecated in 8.0
response?: PackageInfo;
}
Expand Down
1 change: 1 addition & 0 deletions x-pack/plugins/fleet/cypress/e2e/install_assets.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ describe('Install unverified package assets', () => {
if (res.body?.item?.status) {
res.body.item.status = 'not_installed';
}
res.body.metadata = { has_policies: false };
});
});
});
Expand Down
7 changes: 6 additions & 1 deletion x-pack/plugins/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 @@ -210,6 +210,7 @@ export function Detail() {
pkgVersion,
{
prerelease: prereleaseIntegrationsEnabled,
withMetadata: true,
},
{
enabled: !authz.fleet.readSettings || !isSettingsInitialLoading, // Load only after settings are loaded
Expand Down Expand Up @@ -785,7 +786,11 @@ export function Detail() {
/>
</Route>
<Route path={INTEGRATIONS_ROUTING_PATHS.integration_details_settings}>
<SettingsPage packageInfo={packageInfo} startServices={services} />
<SettingsPage
packageInfo={packageInfo}
packageMetadata={packageInfoData?.metadata}
startServices={services}
/>
</Route>
<Route path={INTEGRATIONS_ROUTING_PATHS.integration_details_assets}>
<AssetsPage packageInfo={packageInfo} refetchPackageInfo={refetchPackageInfo} />
Expand Down
Loading
Loading