[7.10] [Security Solution][Endpoint] Task/policy save modal text chan…

…ge, remove duplicate policy details text (#73130) (#83470) * [Security Solution][Endpoint] Task/policy save modal text change, remove duplicate policy details text (#73130) [Security Solution][Endpoint] updates policy details text # Conflicts: # x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.test.tsx # x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.tsx * Removed unused labels to fix the build. Co-authored-by: Candace Park <56409205+parkiino@users.noreply.github.com>
elastic · Nov 17, 2020 · e56c737 · e56c737
1 parent c0c7c5b
commit e56c737
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 38 deletions.
diff --git a/...lugins/security_solution/public/management/pages/policy/view/policy_forms/config_form.tsx b/...lugins/security_solution/public/management/pages/policy/view/policy_forms/config_form.tsx
@@ -34,17 +34,10 @@ export const ConfigForm: React.FC<{
    */
   supportedOss: React.ReactNode;
   children: React.ReactNode;
-  /**
-   * A description for the component.
-   */
-  description: string;
-  /**
-   * The `data-test-subj` attribute to append to a certain child element.
-   */
   dataTestSubj: string;
   /** React Node to be put on the right corner of the card */
   rightCorner: React.ReactNode;
-}> = React.memo(({ type, supportedOss, children, dataTestSubj, rightCorner, description }) => {
+}> = React.memo(({ type, supportedOss, children, dataTestSubj, rightCorner }) => {
   const typeTitle = useMemo(() => {
     return (
       <EuiFlexGroup direction="row" gutterSize="none" alignItems="center">
@@ -85,12 +78,7 @@ export const ConfigForm: React.FC<{
 
   return (
     <PolicyDetailCard>
-      <EuiCard
-        description={description}
-        data-test-subj={dataTestSubj}
-        textAlign="left"
-        title={typeTitle}
-      >
+      <EuiCard description data-test-subj={dataTestSubj} textAlign="left" title={typeTitle}>
         <EuiHorizontalRule margin="m" />
         {children}
       </EuiCard>

diff --git a/...ugins/security_solution/public/management/pages/policy/view/policy_forms/events/linux.tsx b/...ugins/security_solution/public/management/pages/policy/view/policy_forms/events/linux.tsx
@@ -102,12 +102,6 @@ export const LinuxEvents = React.memo(() => {
       type={i18n.translate('xpack.securitySolution.endpoint.policy.details.eventCollection', {
         defaultMessage: 'Event Collection',
       })}
-      description={i18n.translate(
-        'xpack.securitySolution.endpoint.policy.details.eventCollectionLabel',
-        {
-          defaultMessage: 'Event Collection',
-        }
-      )}
       supportedOss={i18n.translate('xpack.securitySolution.endpoint.policy.details.linux', {
         defaultMessage: 'Linux',
       })}

diff --git a/...plugins/security_solution/public/management/pages/policy/view/policy_forms/events/mac.tsx b/...plugins/security_solution/public/management/pages/policy/view/policy_forms/events/mac.tsx
@@ -102,12 +102,6 @@ export const MacEvents = React.memo(() => {
       type={i18n.translate('xpack.securitySolution.endpoint.policy.details.eventCollection', {
         defaultMessage: 'Event Collection',
       })}
-      description={i18n.translate(
-        'xpack.securitySolution.endpoint.policy.details.eventCollectionLabel',
-        {
-          defaultMessage: 'Event Collection',
-        }
-      )}
       supportedOss={i18n.translate('xpack.securitySolution.endpoint.policy.details.mac', {
         defaultMessage: 'Mac',
       })}

diff --git a/...ins/security_solution/public/management/pages/policy/view/policy_forms/events/windows.tsx b/...ins/security_solution/public/management/pages/policy/view/policy_forms/events/windows.tsx
@@ -142,9 +142,6 @@ export const WindowsEvents = React.memo(() => {
       type={i18n.translate('xpack.securitySolution.endpoint.policy.details.eventCollection', {
         defaultMessage: 'Event Collection',
       })}
-      description={i18n.translate('xpack.securitySolution.endpoint.policy.details.windowsLabel', {
-        defaultMessage: 'Windows',
-      })}
       supportedOss={i18n.translate('xpack.securitySolution.endpoint.policy.details.windows', {
         defaultMessage: 'Windows',
       })}

diff --git a/...ecurity_solution/public/management/pages/policy/view/policy_forms/protections/malware.tsx b/...ecurity_solution/public/management/pages/policy/view/policy_forms/protections/malware.tsx
@@ -185,9 +185,6 @@ export const MalwareProtections = React.memo(() => {
         defaultMessage: 'Windows, Mac',
       })}
       dataTestSubj="malwareProtectionsForm"
-      description={i18n.translate('xpack.securitySolution.endpoint.policy.details.malwareLabel', {
-        defaultMessage: 'Malware',
-      })}
       rightCorner={protectionSwitch}
     >
       {radioButtons}

diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
@@ -17583,12 +17583,10 @@
     "xpack.securitySolution.endpoint.policy.details.detectionRulesLink": "関連する検出ルール",
     "xpack.securitySolution.endpoint.policy.details.detectionRulesMessage": "{detectionRulesLink}を表示します。事前構築済みルールは、［検出ルール］ページで「Elastic」というタグが付けられています。",
     "xpack.securitySolution.endpoint.policy.details.eventCollection": "イベント収集",
-    "xpack.securitySolution.endpoint.policy.details.eventCollectionLabel": "イベント収集",
     "xpack.securitySolution.endpoint.policy.details.eventCollectionsEnabled": "{selected} / {total}件のイベント収集が有効です",
     "xpack.securitySolution.endpoint.policy.details.linux": "Linux",
     "xpack.securitySolution.endpoint.policy.details.mac": "Mac",
     "xpack.securitySolution.endpoint.policy.details.malware": "マルウェア",
-    "xpack.securitySolution.endpoint.policy.details.malwareLabel": "マルウェア",
     "xpack.securitySolution.endpoint.policy.details.malwareProtectionsEnabled": "マルウェア保護{mode, select, true {有効} false {無効}}",
     "xpack.securitySolution.endpoint.policy.details.prevent": "防御",
     "xpack.securitySolution.endpoint.policy.details.protections": "保護",
@@ -17604,7 +17602,6 @@
     "xpack.securitySolution.endpoint.policy.details.updateSuccessTitle": "成功！",
     "xpack.securitySolution.endpoint.policy.details.windows": "Windows",
     "xpack.securitySolution.endpoint.policy.details.windowsAndMac": "Windows、Mac",
-    "xpack.securitySolution.endpoint.policy.details.windowsLabel": "Windows",
     "xpack.securitySolution.endpoint.policyDetailOS": "オペレーティングシステム",
     "xpack.securitySolution.endpoint.policyDetails.agentsSummary.errorTitle": "エラー",
     "xpack.securitySolution.endpoint.policyDetails.agentsSummary.offlineTitle": "オフライン",

diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
@@ -17601,12 +17601,10 @@
     "xpack.securitySolution.endpoint.policy.details.detectionRulesLink": "相关检测规则",
     "xpack.securitySolution.endpoint.policy.details.detectionRulesMessage": "请查看{detectionRulesLink}。在“检测规则”页面上，预置规则标记有“Elastic”。",
     "xpack.securitySolution.endpoint.policy.details.eventCollection": "事件收集",
-    "xpack.securitySolution.endpoint.policy.details.eventCollectionLabel": "事件收集",
     "xpack.securitySolution.endpoint.policy.details.eventCollectionsEnabled": "{selected} / {total} 事件收集已启用",
     "xpack.securitySolution.endpoint.policy.details.linux": "Linux",
     "xpack.securitySolution.endpoint.policy.details.mac": "Mac",
     "xpack.securitySolution.endpoint.policy.details.malware": "恶意软件",
-    "xpack.securitySolution.endpoint.policy.details.malwareLabel": "恶意软件",
     "xpack.securitySolution.endpoint.policy.details.malwareProtectionsEnabled": "恶意软件防护{mode, select, true {已启用} false {已禁用}}",
     "xpack.securitySolution.endpoint.policy.details.prevent": "防御",
     "xpack.securitySolution.endpoint.policy.details.protections": "防护",
@@ -17623,7 +17621,6 @@
     "xpack.securitySolution.endpoint.policy.details.updateSuccessTitle": "成功！",
     "xpack.securitySolution.endpoint.policy.details.windows": "Windows",
     "xpack.securitySolution.endpoint.policy.details.windowsAndMac": "Windows、Mac",
-    "xpack.securitySolution.endpoint.policy.details.windowsLabel": "Windows",
     "xpack.securitySolution.endpoint.policyDetailOS": "操作系统",
     "xpack.securitySolution.endpoint.policyDetails.agentsSummary.errorTitle": "错误",
     "xpack.securitySolution.endpoint.policyDetails.agentsSummary.offlineTitle": "脱机",