From 04cc48a3897bf0afac4cb072a88127ccb3ed6eed Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Tue, 29 Oct 2024 09:40:22 +1100
Subject: [PATCH] [8.x] Added redirect option after Entity CSV upload (#197937)
 (#198092)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Backport

This will backport the following commits from `main` to `8.x`:
- [Added redirect option after Entity CSV upload
(#197937)](https://github.com/elastic/kibana/pull/197937)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Jared
Burgett","email":"147995946+jaredburgettelastic@users.noreply.github.com"},"sourceCommit":{"committedDate":"2024-10-28T21:00:06Z","message":"Added
redirect option after Entity CSV upload (#197937)\n\n##
Summary\r\n\r\nAdded a redirect button to view Entities after a
successful Asset\r\nCriticality CSV file upload
process\r\n\r\nAdditionally, made some small changes to the copy for the
Entity Store\r\nmanagement workflows\r\n\r\n<img width=\"1490\"
alt=\"Screenshot 2024-10-27 at 9 49
17 PM\"\r\nsrc=\"https://github.com/user-attachments/assets/77b587b7-8300-40ae-adc2-5119aa5f39ab\">\r\n\r\nCo-authored-by:
Elastic Machine
<elasticmachine@users.noreply.github.com>","sha":"be6708bffcb0a264bee29c029c7945ff22fa6761","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","v8.16.0","backport:version","v8.17.0"],"title":"Added
redirect option after Entity CSV
upload","number":197937,"url":"https://github.com/elastic/kibana/pull/197937","mergeCommit":{"message":"Added
redirect option after Entity CSV upload (#197937)\n\n##
Summary\r\n\r\nAdded a redirect button to view Entities after a
successful Asset\r\nCriticality CSV file upload
process\r\n\r\nAdditionally, made some small changes to the copy for the
Entity Store\r\nmanagement workflows\r\n\r\n<img width=\"1490\"
alt=\"Screenshot 2024-10-27 at 9 49
17 PM\"\r\nsrc=\"https://github.com/user-attachments/assets/77b587b7-8300-40ae-adc2-5119aa5f39ab\">\r\n\r\nCo-authored-by:
Elastic Machine
<elasticmachine@users.noreply.github.com>","sha":"be6708bffcb0a264bee29c029c7945ff22fa6761"}},"sourceBranch":"main","suggestedTargetBranches":["8.16","8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/197937","number":197937,"mergeCommit":{"message":"Added
redirect option after Entity CSV upload (#197937)\n\n##
Summary\r\n\r\nAdded a redirect button to view Entities after a
successful Asset\r\nCriticality CSV file upload
process\r\n\r\nAdditionally, made some small changes to the copy for the
Entity Store\r\nmanagement workflows\r\n\r\n<img width=\"1490\"
alt=\"Screenshot 2024-10-27 at 9 49
17 PM\"\r\nsrc=\"https://github.com/user-attachments/assets/77b587b7-8300-40ae-adc2-5119aa5f39ab\">\r\n\r\nCo-authored-by:
Elastic Machine
<elasticmachine@users.noreply.github.com>","sha":"be6708bffcb0a264bee29c029c7945ff22fa6761"}},{"branch":"8.16","label":"v8.16.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.x","label":"v8.17.0","branchLabelMappingKey":"^v8.17.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Jared Burgett <147995946+jaredburgettelastic@users.noreply.github.com>
---
 .../components/result_step.tsx                  | 17 ++++++++++++++---
 .../components/entity_store/translations.ts     |  2 +-
 .../pages/entity_store_management_page.tsx      |  2 +-
 .../public/management/links.ts                  |  2 +-
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/x-pack/plugins/security_solution/public/entity_analytics/components/asset_criticality_file_uploader/components/result_step.tsx b/x-pack/plugins/security_solution/public/entity_analytics/components/asset_criticality_file_uploader/components/result_step.tsx
index 3a71b48055fcc..07629b2c6e0b6 100644
--- a/x-pack/plugins/security_solution/public/entity_analytics/components/asset_criticality_file_uploader/components/result_step.tsx
+++ b/x-pack/plugins/security_solution/public/entity_analytics/components/asset_criticality_file_uploader/components/result_step.tsx
@@ -7,6 +7,7 @@
 
 import {
   EuiButtonEmpty,
+  EuiButton,
   EuiCallOut,
   EuiCodeBlock,
   EuiFlexGroup,
@@ -17,7 +18,8 @@ import {
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { css } from '@emotion/react';
-import type { BulkUpsertAssetCriticalityRecordsResponse } from '../../../../../common/entity_analytics/asset_criticality/types';
+import { SecurityPageName } from '@kbn/deeplinks-security';
+import type { BulkUpsertAssetCriticalityRecordsResponse } from '../../../../../common/api/entity_analytics';
 import { buildAnnotationsFromError } from '../helpers';
 import { ScheduleRiskEngineCallout } from './schedule_risk_engine_callout';
 
@@ -61,7 +63,7 @@ export const AssetCriticalityResultStep: React.FC<{
           data-test-subj="asset-criticality-result-step-success"
           title={
             <FormattedMessage
-              defaultMessage="success"
+              defaultMessage="Success"
               id="xpack.securitySolution.entityAnalytics.assetCriticalityResultStep.successTitle"
             />
           }
@@ -69,9 +71,18 @@ export const AssetCriticalityResultStep: React.FC<{
           iconType="checkInCircleFilled"
         >
           <FormattedMessage
-            defaultMessage="Your asset criticality levels have been assigned."
+            defaultMessage="Your asset criticality levels have been assigned. Note that your assignments can take a few moments to populate."
             id="xpack.securitySolution.entityAnalytics.assetCriticalityResultStep.successMessage"
           />
+          <EuiSpacer size="s" />
+          <EuiButton href={SecurityPageName.entityAnalytics} color="success" isDisabled={false}>
+            {
+              <FormattedMessage
+                defaultMessage="View asset criticality assignments."
+                id="xpack.securitySolution.entityAnalytics.assetCriticalityResultStep.viewAssetCriticalityAssignments"
+              />
+            }
+          </EuiButton>
         </EuiCallOut>
         <EuiSpacer size="s" />
         <ScheduleRiskEngineCallout />
diff --git a/x-pack/plugins/security_solution/public/entity_analytics/components/entity_store/translations.ts b/x-pack/plugins/security_solution/public/entity_analytics/components/entity_store/translations.ts
index 127ff5c88506b..4c113dd533acb 100644
--- a/x-pack/plugins/security_solution/public/entity_analytics/components/entity_store/translations.ts
+++ b/x-pack/plugins/security_solution/public/entity_analytics/components/entity_store/translations.ts
@@ -51,7 +51,7 @@ export const ENABLEMENT_DESCRIPTION_RISK_ENGINE_ONLY = i18n.translate(
 export const ENABLEMENT_DESCRIPTION_ENTITY_STORE_ONLY = i18n.translate(
   'xpack.securitySolution.entityAnalytics.entityStore.enablement.description.store',
   {
-    defaultMessage: "Allows comprehensive monitoring of your system's hosts and users.",
+    defaultMessage: 'Store host and user entities observed in events.',
   }
 );
 
diff --git a/x-pack/plugins/security_solution/public/entity_analytics/pages/entity_store_management_page.tsx b/x-pack/plugins/security_solution/public/entity_analytics/pages/entity_store_management_page.tsx
index 8b2292448b13d..1ca2b0e2b02da 100644
--- a/x-pack/plugins/security_solution/public/entity_analytics/pages/entity_store_management_page.tsx
+++ b/x-pack/plugins/security_solution/public/entity_analytics/pages/entity_store_management_page.tsx
@@ -290,7 +290,7 @@ export const EntityStoreManagementPage = () => {
       <EuiText>
         <FormattedMessage
           id="xpack.securitySolution.entityAnalytics.entityStoreManagementPage.subTitle"
-          defaultMessage="Allows comprehensive monitoring of your system's hosts and users."
+          defaultMessage="Store host and user entities observed in events."
         />
       </EuiText>
       {isEntityStoreFeatureFlagDisabled && <EntityStoreFeatureFlagNotAvailableCallout />}
diff --git a/x-pack/plugins/security_solution/public/management/links.ts b/x-pack/plugins/security_solution/public/management/links.ts
index 27b5b62eac6f8..d033fdf491ce8 100644
--- a/x-pack/plugins/security_solution/public/management/links.ts
+++ b/x-pack/plugins/security_solution/public/management/links.ts
@@ -198,7 +198,7 @@ export const links: LinkItem = {
       id: SecurityPageName.entityAnalyticsEntityStoreManagement,
       title: ENTITY_STORE,
       description: i18n.translate('xpack.securitySolution.appLinks.entityStoreDescription', {
-        defaultMessage: "Allows comprehensive monitoring of your system's hosts and users.",
+        defaultMessage: 'Store host and user entities observed in events.',
       }),
       landingIcon: IconAssetCriticality,
       path: ENTITY_ANALYTICS_ENTITY_STORE_MANAGEMENT_PATH,