finish responding to PR feedback

kqualters-elastic · Oct 11, 2024 · bff940f · bff940f
1 parent 8ec412d
commit bff940f
Show file tree

Hide file tree

Showing 41 changed files with 299 additions and 196 deletions.
diff --git a/x-pack/packages/security-solution/features/src/cases/kibana_sub_features.ts b/x-pack/packages/security-solution/features/src/cases/kibana_sub_features.ts
@@ -18,8 +18,8 @@ import type { CasesFeatureParams } from './types';
 export const getCasesBaseKibanaSubFeatureIds = (): CasesSubFeatureId[] => [
   CasesSubFeatureId.deleteCases,
   CasesSubFeatureId.casesSettings,
-  CasesSubFeatureId.addComment,
-  CasesSubFeatureId.reopenCases,
+  CasesSubFeatureId.createComment,
+  CasesSubFeatureId.reopenCase,
 ];
 
 /**
@@ -131,9 +131,9 @@ export const getCasesSubFeaturesMap = ({
       },
     ],
   };
-  const casesReopenCasesSubFeature: SubFeatureConfig = {
+  const casesreopenCaseubFeature: SubFeatureConfig = {
     name: i18n.translate(
-      'securitySolutionPackages.features.featureRegistry.reopenCasesSubFeatureName',
+      'securitySolutionPackages.features.featureRegistry.reopenCaseubFeatureName',
       {
         defaultMessage: 'Reopen Closed Cases',
       }
@@ -144,9 +144,9 @@ export const getCasesSubFeaturesMap = ({
         privileges: [
           {
             api: apiTags.all,
-            id: 'reopen_cases',
+            id: 'case_reopen',
             name: i18n.translate(
-              'securitySolutionPackages.features.featureRegistry.reopenCasesSubFeatureDetails',
+              'securitySolutionPackages.features.featureRegistry.reopenCaseubFeatureDetails',
               {
                 defaultMessage: 'Reopen closed cases',
               }
@@ -157,9 +157,9 @@ export const getCasesSubFeaturesMap = ({
               read: [],
             },
             cases: {
-              reopenCases: [APP_ID],
+              reopenCase: [APP_ID],
             },
-            ui: uiCapabilities.reopenCases,
+            ui: uiCapabilities.reopenCase,
           },
         ],
       },
@@ -169,7 +169,7 @@ export const getCasesSubFeaturesMap = ({
   return new Map<CasesSubFeatureId, SubFeatureConfig>([
     [CasesSubFeatureId.deleteCases, deleteCasesSubFeature],
     [CasesSubFeatureId.casesSettings, casesSettingsCasesSubFeature],
-    [CasesSubFeatureId.addComment, casesAddCommentsCasesSubFeature],
-    [CasesSubFeatureId.reopenCases, casesReopenCasesSubFeature],
+    [CasesSubFeatureId.createComment, casesAddCommentsCasesSubFeature],
+    [CasesSubFeatureId.reopenCase, casesreopenCaseubFeature],
   ]);
 };
diff --git a/x-pack/packages/security-solution/features/src/product_features_keys.ts b/x-pack/packages/security-solution/features/src/product_features_keys.ts
@@ -148,8 +148,8 @@ export enum SecuritySubFeatureId {
 export enum CasesSubFeatureId {
   deleteCases = 'deleteCasesSubFeature',
   casesSettings = 'casesSettingsSubFeature',
-  addComment = 'addCommentSubFeature',
-  reopenCases = 'reopenCasesSubFeature',
+  createComment = 'createCommentSubFeature',
+  reopenCase = 'reopenCaseubFeature',
 }
 
 /** Sub-features IDs for Security Assistant */

diff --git a/...ck/packages/security/authorization_core/src/privileges/feature_privilege_builder/cases.ts b/...ck/packages/security/authorization_core/src/privileges/feature_privilege_builder/cases.ts
@@ -22,7 +22,7 @@ export type CasesSupportedOperations = (typeof allOperations)[number];
  */
 
 const pushOperations = ['pushCase'] as const;
-const createOperations = ['createCase', 'createComment'] as const;
+const createOperations = ['createCase'] as const;
 const readOperations = [
   'getCase',
   'getComment',
@@ -31,11 +31,12 @@ const readOperations = [
   'getUserActions',
   'findConfigurations',
 ] as const;
+// Update operations do not currently include the ability to re-open a case
 const updateOperations = ['updateCase', 'updateComment'] as const;
 const deleteOperations = ['deleteCase', 'deleteComment'] as const;
 const settingsOperations = ['createConfiguration', 'updateConfiguration'] as const;
 const createCommentOperations = ['createComment'] as const;
-const reopenOperations = ['reopenCases'] as const;
+const reopenOperations = ['reopenCase'] as const;
 const allOperations = [
   ...pushOperations,
   ...createOperations,
@@ -69,7 +70,7 @@ export class FeaturePrivilegeCasesBuilder extends BaseFeaturePrivilegeBuilder {
       ...getCasesPrivilege(deleteOperations, privilegeDefinition.cases?.delete),
       ...getCasesPrivilege(settingsOperations, privilegeDefinition.cases?.settings),
       ...getCasesPrivilege(createCommentOperations, privilegeDefinition.cases?.createComment),
-      ...getCasesPrivilege(reopenOperations, privilegeDefinition.cases?.reopenCases),
+      ...getCasesPrivilege(reopenOperations, privilegeDefinition.cases?.reopenCase),
     ]);
   }
 }
diff --git a/x-pack/plugins/cases/common/constants/index.ts b/x-pack/plugins/cases/common/constants/index.ts
@@ -171,7 +171,7 @@ export const DELETE_CASES_CAPABILITY = 'delete_cases' as const;
 export const PUSH_CASES_CAPABILITY = 'push_cases' as const;
 export const CASES_SETTINGS_CAPABILITY = 'cases_settings' as const;
 export const CASES_CONNECTORS_CAPABILITY = 'cases_connectors' as const;
-export const REOPEN_CASES_CAPABILITY = 'reopen_cases' as const;
+export const CASES_REOPEN_CAPABILITY = 'case_reopen' as const;
 export const CREATE_COMMENT_CAPABILITY = 'create_comment' as const;
 
 /**

diff --git a/x-pack/plugins/cases/common/index.ts b/x-pack/plugins/cases/common/index.ts
@@ -56,7 +56,7 @@ export {
   GET_CONNECTORS_CONFIGURE_API_TAG,
   CASES_SETTINGS_CAPABILITY,
   CREATE_COMMENT_CAPABILITY,
-  REOPEN_CASES_CAPABILITY,
+  CASES_REOPEN_CAPABILITY,
 } from './constants';
 
 export type { AttachmentAttributes } from './types/domain';

diff --git a/x-pack/plugins/cases/common/ui/types.ts b/x-pack/plugins/cases/common/ui/types.ts
@@ -12,7 +12,7 @@ import type {
   READ_CASES_CAPABILITY,
   UPDATE_CASES_CAPABILITY,
   CREATE_COMMENT_CAPABILITY,
-  REOPEN_CASES_CAPABILITY,
+  CASES_REOPEN_CAPABILITY,
 } from '..';
 import type {
   CASES_CONNECTORS_CAPABILITY,
@@ -307,7 +307,7 @@ export interface CasesPermissions {
   push: boolean;
   connectors: boolean;
   settings: boolean;
-  reopenCases: boolean;
+  reopenCase: boolean;
   createComment: boolean;
 }
 
@@ -320,5 +320,5 @@ export interface CasesCapabilities {
   [CASES_CONNECTORS_CAPABILITY]: boolean;
   [CASES_SETTINGS_CAPABILITY]: boolean;
   [CREATE_COMMENT_CAPABILITY]: boolean;
-  [REOPEN_CASES_CAPABILITY]: boolean;
+  [CASES_REOPEN_CAPABILITY]: boolean;
 }
diff --git a/x-pack/plugins/cases/common/utils/capabilities.test.tsx b/x-pack/plugins/cases/common/utils/capabilities.test.tsx
@@ -28,8 +28,8 @@ describe('createUICapabilities', () => {
           "read_cases",
           "cases_connectors",
         ],
-        "reopenCases": Array [
-          "reopen_cases",
+        "reopenCase": Array [
+          "case_reopen",
         ],
         "settings": Array [
           "cases_settings",

diff --git a/x-pack/plugins/cases/common/utils/capabilities.ts b/x-pack/plugins/cases/common/utils/capabilities.ts
@@ -13,7 +13,7 @@ import {
   READ_CASES_CAPABILITY,
   UPDATE_CASES_CAPABILITY,
   CASES_SETTINGS_CAPABILITY,
-  REOPEN_CASES_CAPABILITY,
+  CASES_REOPEN_CAPABILITY,
   CREATE_COMMENT_CAPABILITY,
 } from '../constants';
 
@@ -22,7 +22,7 @@ export interface CasesUiCapabilities {
   read: readonly string[];
   delete: readonly string[];
   settings: readonly string[];
-  reopenCases: readonly string[];
+  reopenCase: readonly string[];
   createComment: readonly string[];
 }
 /**
@@ -40,6 +40,6 @@ export const createUICapabilities = (): CasesUiCapabilities => ({
   read: [READ_CASES_CAPABILITY, CASES_CONNECTORS_CAPABILITY] as const,
   delete: [DELETE_CASES_CAPABILITY] as const,
   settings: [CASES_SETTINGS_CAPABILITY] as const,
-  reopenCases: [REOPEN_CASES_CAPABILITY] as const,
+  reopenCase: [CASES_REOPEN_CAPABILITY] as const,
   createComment: [CREATE_COMMENT_CAPABILITY] as const,
 });
diff --git a/x-pack/plugins/cases/public/client/helpers/can_use_cases.ts b/x-pack/plugins/cases/public/client/helpers/can_use_cases.ts
@@ -42,7 +42,7 @@ export const canUseCases =
         acc.push = acc.push || userCapabilitiesForOwner.push;
         acc.connectors = acc.connectors || userCapabilitiesForOwner.connectors;
         acc.settings = acc.settings || userCapabilitiesForOwner.settings;
-        acc.reopenCases = acc.reopenCases || userCapabilitiesForOwner.reopenCases;
+        acc.reopenCase = acc.reopenCase || userCapabilitiesForOwner.reopenCase;
         acc.createComment = acc.createComment || userCapabilitiesForOwner.createComment;
 
         const allFromAcc =
@@ -53,7 +53,7 @@ export const canUseCases =
           acc.push &&
           acc.connectors &&
           acc.settings &&
-          acc.reopenCases &&
+          acc.reopenCase &&
           acc.createComment;
 
         acc.all = acc.all || userCapabilitiesForOwner.all || allFromAcc;
@@ -69,7 +69,7 @@ export const canUseCases =
         push: false,
         connectors: false,
         settings: false,
-        reopenCases: false,
+        reopenCase: false,
         createComment: false,
       }
     );

diff --git a/x-pack/plugins/cases/public/client/helpers/capabilities.test.ts b/x-pack/plugins/cases/public/client/helpers/capabilities.test.ts
@@ -18,7 +18,7 @@ describe('getUICapabilities', () => {
         "delete": false,
         "push": false,
         "read": false,
-        "reopenCases": false,
+        "reopenCase": false,
         "settings": false,
         "update": false,
       }
@@ -35,7 +35,7 @@ describe('getUICapabilities', () => {
         "delete": false,
         "push": false,
         "read": false,
-        "reopenCases": false,
+        "reopenCase": false,
         "settings": false,
         "update": false,
       }
@@ -52,7 +52,7 @@ describe('getUICapabilities', () => {
         "delete": false,
         "push": false,
         "read": false,
-        "reopenCases": false,
+        "reopenCase": false,
         "settings": false,
         "update": false,
       }
@@ -78,7 +78,7 @@ describe('getUICapabilities', () => {
         "delete": false,
         "push": false,
         "read": false,
-        "reopenCases": false,
+        "reopenCase": false,
         "settings": false,
         "update": false,
       }
@@ -95,7 +95,7 @@ describe('getUICapabilities', () => {
         "delete": false,
         "push": false,
         "read": false,
-        "reopenCases": false,
+        "reopenCase": false,
         "settings": false,
         "update": false,
       }
@@ -121,7 +121,7 @@ describe('getUICapabilities', () => {
         "delete": true,
         "push": true,
         "read": true,
-        "reopenCases": false,
+        "reopenCase": false,
         "settings": false,
         "update": true,
       }
@@ -148,7 +148,7 @@ describe('getUICapabilities', () => {
         "delete": true,
         "push": true,
         "read": true,
-        "reopenCases": false,
+        "reopenCase": false,
         "settings": true,
         "update": true,
       }
@@ -175,7 +175,7 @@ describe('getUICapabilities', () => {
         "delete": true,
         "push": true,
         "read": true,
-        "reopenCases": false,
+        "reopenCase": false,
         "settings": false,
         "update": true,
       }
@@ -192,7 +192,7 @@ describe('getUICapabilities', () => {
         "delete": false,
         "push": false,
         "read": false,
-        "reopenCases": false,
+        "reopenCase": false,
         "settings": true,
         "update": false,
       }

diff --git a/x-pack/plugins/cases/public/client/helpers/capabilities.ts b/x-pack/plugins/cases/public/client/helpers/capabilities.ts
@@ -14,7 +14,7 @@ import {
   PUSH_CASES_CAPABILITY,
   READ_CASES_CAPABILITY,
   UPDATE_CASES_CAPABILITY,
-  REOPEN_CASES_CAPABILITY,
+  CASES_REOPEN_CAPABILITY,
   CREATE_COMMENT_CAPABILITY,
 } from '../../../common/constants';
 
@@ -28,7 +28,7 @@ export const getUICapabilities = (
   const push = !!featureCapabilities?.[PUSH_CASES_CAPABILITY];
   const connectors = !!featureCapabilities?.[CASES_CONNECTORS_CAPABILITY];
   const settings = !!featureCapabilities?.[CASES_SETTINGS_CAPABILITY];
-  const reopenCases = !!featureCapabilities?.[REOPEN_CASES_CAPABILITY];
+  const reopenCase = !!featureCapabilities?.[CASES_REOPEN_CAPABILITY];
   const createComment = !!featureCapabilities?.[CREATE_COMMENT_CAPABILITY];
 
   const all =
@@ -39,7 +39,7 @@ export const getUICapabilities = (
     push &&
     connectors &&
     settings &&
-    reopenCases &&
+    reopenCase &&
     createComment;
 
   return {
@@ -51,7 +51,7 @@ export const getUICapabilities = (
     push,
     connectors,
     settings,
-    reopenCases,
+    reopenCase,
     createComment,
   };
 };
diff --git a/x-pack/plugins/cases/public/common/lib/kibana/hooks.ts b/x-pack/plugins/cases/public/common/lib/kibana/hooks.ts
@@ -193,7 +193,7 @@ export const useApplicationCapabilities = (): UseApplicationCapabilities => {
         push: permissions.push,
         connectors: permissions.connectors,
         settings: permissions.settings,
-        reopenCases: permissions.reopenCases,
+        reopenCase: permissions.reopenCase,
         createComment: permissions.createComment,
       },
       visualize: { crud: !!capabilities.visualize?.save, read: !!capabilities.visualize?.show },
@@ -217,7 +217,7 @@ export const useApplicationCapabilities = (): UseApplicationCapabilities => {
       permissions.push,
       permissions.connectors,
       permissions.settings,
-      permissions.reopenCases,
+      permissions.reopenCase,
       permissions.createComment,
     ]
   );