From 869e8a6a1206c311e80d71bba1549e9ca28f0495 Mon Sep 17 00:00:00 2001 From: Sean Rathier Date: Mon, 3 Feb 2025 10:47:20 -0500 Subject: [PATCH 1/2] fix showing agent-based deployment options when on-prem --- .../create_package_policy_page/single_page_layout/index.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/x-pack/platform/plugins/shared/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/index.tsx b/x-pack/platform/plugins/shared/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/index.tsx index 6c230cf606eb6..7cf48333c9725 100644 --- a/x-pack/platform/plugins/shared/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/index.tsx +++ b/x-pack/platform/plugins/shared/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/index.tsx @@ -358,7 +358,7 @@ export const CreatePackagePolicySinglePage: CreatePackagePolicyParams = ({ "'package-policy-create' and 'package-policy-replace-define-step' cannot both be registered as UI extensions" ); } - const { isAgentlessIntegration } = useAgentless(); + const { isAgentlessIntegration, isAgentlessEnabled } = useAgentless(); const replaceStepConfigurePackagePolicy = replaceDefineStepView && packageInfo?.name ? ( @@ -471,7 +471,8 @@ export const CreatePackagePolicySinglePage: CreatePackagePolicyParams = ({ children: replaceStepConfigurePackagePolicy || stepConfigurePackagePolicy, headingElement: 'h2', }, - ...(selectedSetupTechnology !== SetupTechnology.AGENTLESS + ...(!isAgentlessEnabled || + (isAgentlessEnabled && selectedSetupTechnology !== SetupTechnology.AGENTLESS) ? [ { title: i18n.translate('xpack.fleet.createPackagePolicy.stepSelectAgentPolicyTitle', { From 436b16bd095aeafd73eb0e7383a6798e15f6ede8 Mon Sep 17 00:00:00 2001 From: Sean Rathier Date: Mon, 3 Feb 2025 11:21:12 -0500 Subject: [PATCH 2/2] change --- .../single_page_layout/hooks/setup_technology.ts | 7 ++++--- .../single_page_layout/index.tsx | 5 ++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/x-pack/platform/plugins/shared/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/setup_technology.ts b/x-pack/platform/plugins/shared/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/setup_technology.ts index eab5f3ccecac5..0ff4a2e07e431 100644 --- a/x-pack/platform/plugins/shared/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/setup_technology.ts +++ b/x-pack/platform/plugins/shared/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/setup_technology.ts @@ -100,13 +100,14 @@ export function useSetupTechnology({ ); useEffect(() => { const shouldBeDefault = - isOnlyAgentlessIntegration(packageInfo, integrationToEnable) || - isAgentlessSetupDefault(packageInfo, integrationToEnable) + isAgentlessEnabled && + (isOnlyAgentlessIntegration(packageInfo, integrationToEnable) || + isAgentlessSetupDefault(packageInfo, integrationToEnable)) ? SetupTechnology.AGENTLESS : SetupTechnology.AGENT_BASED; setDefaultSetupTechnology(shouldBeDefault); setSelectedSetupTechnology(shouldBeDefault); - }, [packageInfo, integrationToEnable]); + }, [isAgentlessEnabled, packageInfo, integrationToEnable]); const agentlessPolicyName = getAgentlessAgentPolicyNameFromPackagePolicyName(packagePolicy.name); diff --git a/x-pack/platform/plugins/shared/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/index.tsx b/x-pack/platform/plugins/shared/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/index.tsx index 7cf48333c9725..6c230cf606eb6 100644 --- a/x-pack/platform/plugins/shared/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/index.tsx +++ b/x-pack/platform/plugins/shared/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/index.tsx @@ -358,7 +358,7 @@ export const CreatePackagePolicySinglePage: CreatePackagePolicyParams = ({ "'package-policy-create' and 'package-policy-replace-define-step' cannot both be registered as UI extensions" ); } - const { isAgentlessIntegration, isAgentlessEnabled } = useAgentless(); + const { isAgentlessIntegration } = useAgentless(); const replaceStepConfigurePackagePolicy = replaceDefineStepView && packageInfo?.name ? ( @@ -471,8 +471,7 @@ export const CreatePackagePolicySinglePage: CreatePackagePolicyParams = ({ children: replaceStepConfigurePackagePolicy || stepConfigurePackagePolicy, headingElement: 'h2', }, - ...(!isAgentlessEnabled || - (isAgentlessEnabled && selectedSetupTechnology !== SetupTechnology.AGENTLESS) + ...(selectedSetupTechnology !== SetupTechnology.AGENTLESS ? [ { title: i18n.translate('xpack.fleet.createPackagePolicy.stepSelectAgentPolicyTitle', {