use useForceConfirmForceInstall for add integration pages

elastic · Jul 20, 2022 · b7c998d · b7c998d
1 parent 7944899
commit b7c998d
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 26 deletions.
diff --git a/...cy/create_package_policy_page/multi_page_layout/components/page_steps/add_integration.tsx b/...cy/create_package_policy_page/multi_page_layout/components/page_steps/add_integration.tsx
@@ -12,14 +12,16 @@ import { safeLoad } from 'js-yaml';
 
 import { i18n } from '@kbn/i18n';
 
+import { useConfirmForceInstall } from '../../../../../../../integrations/hooks';
+
 import { isVerificationError } from '../../../../../../../../services';
 
 import type { MultiPageStepLayoutProps } from '../../types';
 import type { PackagePolicyFormState } from '../../../types';
 import type { NewPackagePolicy } from '../../../../../../types';
 import { sendCreatePackagePolicy, useStartServices } from '../../../../../../hooks';
 import type { RequestError } from '../../../../../../hooks';
-import { Error, ConfirmForceInstallModal } from '../../../../../../components';
+import { Error } from '../../../../../../components';
 import { sendGeneratePackagePolicy } from '../../hooks';
 import { CreatePackagePolicyBottomBar, StandaloneModeWarningCallout } from '..';
 import type { PackagePolicyValidationResults } from '../../../services';
@@ -85,7 +87,7 @@ export const AddIntegrationPageStep: React.FC<MultiPageStepLayoutProps> = (props
   const { notifications } = useStartServices();
   const [formState, setFormState] = useState<PackagePolicyFormState>('VALID');
   const [validationResults, setValidationResults] = useState<PackagePolicyValidationResults>();
-
+  const confirmForceInstall = useConfirmForceInstall();
   const [packagePolicy, setPackagePolicy] = useState<NewPackagePolicy>({
     name: '',
     description: '',
@@ -164,7 +166,13 @@ export const AddIntegrationPageStep: React.FC<MultiPageStepLayoutProps> = (props
       const { error } = await savePackagePolicy({ newPackagePolicy: packagePolicy, force });
       if (error) {
         if (isVerificationError(error)) {
-          setFormState('CONFIRM_FAILED_VERIFICATION');
+          const forceInstall = await confirmForceInstall(packageInfo);
+
+          if (forceInstall) {
+            onSubmit({ force: true });
+          } else {
+            setFormState('VALID');
+          }
           return;
         }
         notifications.toasts.addError(error, {
@@ -175,7 +183,15 @@ export const AddIntegrationPageStep: React.FC<MultiPageStepLayoutProps> = (props
         onNext();
       }
     },
-    [validationResults, formState, packagePolicy, notifications.toasts, onNext]
+    [
+      validationResults,
+      formState,
+      packagePolicy,
+      notifications.toasts,
+      confirmForceInstall,
+      packageInfo,
+      onNext,
+    ]
   );
 
   useEffect(() => {
@@ -212,13 +228,6 @@ export const AddIntegrationPageStep: React.FC<MultiPageStepLayoutProps> = (props
 
   return (
     <>
-      {formState === 'CONFIRM_FAILED_VERIFICATION' && agentPolicy && packageInfo && (
-        <ConfirmForceInstallModal
-          onConfirm={() => onSubmit({ force: true })}
-          onCancel={() => setFormState('VALID')}
-          pkg={packageInfo}
-        />
-      )}
       {isManaged ? null : <StandaloneModeWarningCallout setIsManaged={setIsManaged} />}
       <EuiSpacer size={'l'} />
       <StepConfigurePackagePolicy

diff --git a/...tions/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/index.tsx b/...tions/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/index.tsx
@@ -26,6 +26,7 @@ import { safeLoad } from 'js-yaml';
 import { useCancelAddPackagePolicy, useOnSaveNavigate } from '../hooks';
 import type { CreatePackagePolicyRequest } from '../../../../../../../common';
 import { dataTypes, FLEET_SYSTEM_PACKAGE, splitPkgKey } from '../../../../../../../common';
+import { useConfirmForceInstall } from '../../../../../integrations/hooks';
 import type {
   AgentPolicy,
   NewAgentPolicy,
@@ -40,7 +41,7 @@ import {
   useGetPackageInfoByKey,
   sendCreateAgentPolicy,
 } from '../../../../hooks';
-import { Loading, Error, ExtensionWrapper, ConfirmForceInstallModal } from '../../../../components';
+import { Loading, Error, ExtensionWrapper } from '../../../../components';
 
 import { agentPolicyFormValidation, ConfirmDeployAgentPolicyModal } from '../../components';
 import { useUIExtension } from '../../../../hooks';
@@ -153,6 +154,9 @@ export const CreatePackagePolicySinglePage: CreatePackagePolicyParams = ({
 
   const navigateAddAgentHelp = (policy?: PackagePolicy) =>
     onSaveNavigate(policy, ['showAddAgentHelp']);
+
+  const confirmForceInstall = useConfirmForceInstall();
+
   // Validation state
   const [validationResults, setValidationResults] = useState<PackagePolicyValidationResults>();
   const [hasAgentPolicyError, setHasAgentPolicyError] = useState<boolean>(false);
@@ -391,7 +395,13 @@ export const CreatePackagePolicySinglePage: CreatePackagePolicyParams = ({
         });
       } else {
         if (isVerificationError(error)) {
-          setFormState('CONFIRM_FAILED_VERIFICATION');
+          const forceInstall = await confirmForceInstall(packagePolicy.package!);
+
+          if (forceInstall) {
+            onSubmit({ force: true });
+          } else {
+            setFormState('VALID');
+          }
           return;
         }
         notifications.toasts.addError(error, {
@@ -404,13 +414,14 @@ export const CreatePackagePolicySinglePage: CreatePackagePolicyParams = ({
       formState,
       hasErrors,
       agentCount,
+      selectedPolicyTab,
       savePackagePolicy,
-      onSaveNavigate,
-      agentPolicy,
-      notifications.toasts,
       packagePolicy,
-      selectedPolicyTab,
       createAgentPolicy,
+      notifications.toasts,
+      agentPolicy,
+      onSaveNavigate,
+      confirmForceInstall,
     ]
   );
 
@@ -563,14 +574,6 @@ export const CreatePackagePolicySinglePage: CreatePackagePolicyParams = ({
             onCancel={() => setFormState('VALID')}
           />
         )}
-
-        {formState === 'CONFIRM_FAILED_VERIFICATION' && agentPolicy && packageInfo && (
-          <ConfirmForceInstallModal
-            onConfirm={() => onSubmit({ force: true })}
-            onCancel={() => setFormState('VALID')}
-            pkg={packageInfo}
-          />
-        )}
         {formState === 'SUBMITTED_NO_AGENTS' && agentPolicy && packageInfo && (
           <PostInstallAddAgentModal
             packageInfo={packageInfo}

diff --git a/...fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/types.ts b/...fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/types.ts
@@ -19,7 +19,6 @@ export type PackagePolicyFormState =
   | 'VALID'
   | 'INVALID'
   | 'CONFIRM'
-  | 'CONFIRM_FAILED_VERIFICATION'
   | 'LOADING'
   | 'SUBMITTED'
   | 'SUBMITTED_NO_AGENTS';