[8.x] Updated EnablementModalCallout name to AdditionalChargesMessage (…

…#203061) (#210417) # Backport This will backport the following commits from `main` to `8.x`: - [Updated EnablementModalCallout name to AdditionalChargesMessage (#203061)](#203061)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport)
elastic · Feb 13, 2025 · a834d9c · a834d9c
1 parent 1f2cf4f
commit a834d9c
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 7 deletions.
diff --git a/x-pack/solutions/security/plugins/security_solution/public/contract_components.ts b/x-pack/solutions/security/plugins/security_solution/public/contract_components.ts
@@ -11,7 +11,7 @@ import type { Observable } from 'rxjs';
 export type ContractComponents = Partial<{
   GetStarted: React.ComponentType<{ indicesExist?: boolean }>;
   DashboardsLandingCallout: React.ComponentType<{}>;
-  EnablementModalCallout: React.ComponentType<{}>;
+  AdditionalChargesMessage: React.ComponentType<{}>;
 }>;
 
 export type SetComponents = (components: ContractComponents) => void;

diff --git a/...tion/public/entity_analytics/components/entity_store/components/enablement_modal.test.tsx b/...tion/public/entity_analytics/components/entity_store/components/enablement_modal.test.tsx
@@ -182,9 +182,9 @@ describe('EntityStoreEnablementModal', () => {
     });
 
     it('should render additional charges message when available', async () => {
-      const EnablementModalCalloutMock = () => <span data-test-subj="enablement-modal-test" />;
+      const AdditionalChargesMessageMock = () => <span data-test-subj="enablement-modal-test" />;
       mockUseContractComponents.mockReturnValue({
-        EnablementModalCallout: EnablementModalCalloutMock,
+        AdditionalChargesMessage: AdditionalChargesMessageMock,
       });
 
       await renderComponent();

diff --git a/..._solution/public/entity_analytics/components/entity_store/components/enablement_modal.tsx b/..._solution/public/entity_analytics/components/entity_store/components/enablement_modal.tsx
@@ -70,7 +70,7 @@ export const EntityStoreEnablementModal: React.FC<EntityStoreEnablementModalProp
     useEntityEnginePrivileges();
   const riskEnginePrivileges = useMissingRiskEnginePrivileges();
   const enablementOptions = enablements.riskScore || enablements.entityStore;
-  const { EnablementModalCallout } = useContractComponents();
+  const { AdditionalChargesMessage } = useContractComponents();
 
   if (!visible) {
     return null;
@@ -99,7 +99,7 @@ export const EntityStoreEnablementModal: React.FC<EntityStoreEnablementModalProp
 
       <EuiModalBody>
         <EuiFlexGroup direction="column">
-          <EuiFlexItem>{EnablementModalCallout && <EnablementModalCallout />}</EuiFlexItem>
+          <EuiFlexItem>{AdditionalChargesMessage && <AdditionalChargesMessage />}</EuiFlexItem>
           <EuiFlexItem>
             <EuiSwitch
               label={

diff --git a/...on_serverless/public/components/additional_charges_message/additional_charges_message.tsx b/...on_serverless/public/components/additional_charges_message/additional_charges_message.tsx
@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { EuiText } from '@elastic/eui';
+import { ADDITIONAL_CHARGES_MESSAGE } from '../../upselling/translations';
+
+export const AdditionalChargesMessage: React.FC = () => {
+  return (
+    <div>
+      <EuiText>{ADDITIONAL_CHARGES_MESSAGE}</EuiText>
+    </div>
+  );
+};
+
+// eslint-disable-next-line import/no-default-export
+export default AdditionalChargesMessage;
diff --git a/...ugins/security_solution_serverless/public/components/additional_charges_message/index.tsx b/...ugins/security_solution_serverless/public/components/additional_charges_message/index.tsx
@@ -0,0 +1,19 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import React from 'react';
+import type { Services } from '../../common/services';
+import { ServicesProvider } from '../../common/services';
+import { AdditionalChargesMessage } from './lazy';
+
+export const getAdditionalChargesMessage = (services: Services): React.ComponentType =>
+  function AdditionalChargesMessageComponent() {
+    return (
+      <ServicesProvider services={services}>
+        <AdditionalChargesMessage />
+      </ServicesProvider>
+    );
+  };
diff --git a/...lugins/security_solution_serverless/public/components/additional_charges_message/lazy.tsx b/...lugins/security_solution_serverless/public/components/additional_charges_message/lazy.tsx
@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { lazy, Suspense } from 'react';
+import { EuiLoadingSpinner } from '@elastic/eui';
+
+const AdditionalChargesMessageLazy = lazy(() => import('./additional_charges_message'));
+
+export const AdditionalChargesMessage = () => (
+  <Suspense fallback={<EuiLoadingSpinner size="s" />}>
+    <AdditionalChargesMessageLazy />
+  </Suspense>
+);
diff --git a/x-pack/solutions/security/plugins/security_solution_serverless/public/plugin.ts b/x-pack/solutions/security/plugins/security_solution_serverless/public/plugin.ts
@@ -23,7 +23,7 @@ import {
   type ExperimentalFeatures,
 } from '../common/experimental_features';
 import { setOnboardingSettings } from './onboarding';
-import { getEnablementModalCallout } from './components/enablement_modal_callout';
+import { getAdditionalChargesMessage } from './components/additional_charges_message';
 
 export class SecuritySolutionServerlessPlugin
   implements
@@ -70,7 +70,7 @@ export class SecuritySolutionServerlessPlugin
 
     securitySolution.setComponents({
       DashboardsLandingCallout: getDashboardsLandingCallout(services),
-      EnablementModalCallout: getEnablementModalCallout(services),
+      AdditionalChargesMessage: getAdditionalChargesMessage(services),
     });
 
     setOnboardingSettings(services);