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

Added redirect option after Entity CSV upload #197937

Merged
merged 2 commits into from
Oct 28, 2024
Merged

Added redirect option after Entity CSV upload #197937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09c390b
Added redirect option after Entity CSV upload
jaredburgettelastic Oct 28, 2024
f910ff6
Merge branch 'main' into entity-store-management-redirect
elasticmachine Oct 28, 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
17 changes: 14 additions & 3 deletions ...ic/entity_analytics/components/asset_criticality_file_uploader/components/result_step.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import {
EuiButtonEmpty,
EuiButton,
EuiCallOut,
EuiCodeBlock,
EuiFlexGroup,
Expand All @@ -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';

Expand Down Expand Up @@ -61,17 +63,26 @@ 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"
/>
}
color="success"
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 />
Expand Down
2 changes: 1 addition & 1 deletion ...plugins/security_solution/public/entity_analytics/components/entity_store/translations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.',
}
);

Expand Down
2 changes: 1 addition & 1 deletion .../plugins/security_solution/public/entity_analytics/pages/entity_store_management_page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 />}
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/security_solution/public/management/links.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel the three copies of the same info text can be moved into x-pack/plugins/security_solution/public/translations.ts.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @ashokaditya !

I agree that the current duplication doesn't sit well, very soon in 8.18 we will be having upcoming changes where these strings will likely diverge from one another, as we will be introducing other entity types, and in some workflows we may not enable all of those types together. Meaning, these strings will likely not be copies of one another very soon.

}),
landingIcon: IconAssetCriticality,
path: ENTITY_ANALYTICS_ENTITY_STORE_MANAGEMENT_PATH,
Expand Down