review I

elastic · Aug 24, 2021 · 4b2943c · 4b2943c
1 parent dd832c0
commit 4b2943c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 16 deletions.
diff --git a/x-pack/plugins/observability/public/pages/alerts/alerts_table_t_grid.tsx b/x-pack/plugins/observability/public/pages/alerts/alerts_table_t_grid.tsx
@@ -291,7 +291,7 @@ export function AlertsTableTGrid(props: AlertsTableTGridProps) {
 
   const casePermissions = useGetUserCasesPermissions();
 
-  const hasAlertsPermissions = useCallback(
+  const hasAlertsCrudPermissions = useCallback(
     (featureId: string) => {
       return getAlertsPermissions(capabilities, featureId).crud;
     },
@@ -337,7 +337,7 @@ export function AlertsTableTGrid(props: AlertsTableTGridProps) {
       defaultCellActions: getDefaultCellActions({ addToQuery }),
       end: rangeTo,
       filters: [],
-      hasAlertsPermissions,
+      hasAlertsCrudPermissions,
       indexNames,
       itemsPerPage: 10,
       itemsPerPageOptions: [10, 25, 50],
@@ -375,7 +375,7 @@ export function AlertsTableTGrid(props: AlertsTableTGridProps) {
     casePermissions,
     addToQuery,
     rangeTo,
-    hasAlertsPermissions,
+    hasAlertsCrudPermissions,
     indexNames,
     workflowStatus,
     kuery,

diff --git a/x-pack/plugins/timelines/public/components/t_grid/body/index.tsx b/x-pack/plugins/timelines/public/components/t_grid/body/index.tsx
@@ -104,7 +104,7 @@ interface OwnProps {
   trailingControlColumns?: ControlColumnProps[];
   unit?: (total: number) => React.ReactNode;
   hasAlertsCrud?: boolean;
-  hasAlertsPermissions?: (featureId: string) => boolean;
+  hasAlertsCrudPermissions?: (featureId: string) => boolean;
   totalSelectAllAlerts?: number;
 }
 
@@ -146,7 +146,7 @@ const transformControlColumns = ({
   theme,
   setEventsLoading,
   setEventsDeleted,
-  hasAlertsPermissions,
+  hasAlertsCrudPermissions,
 }: {
   actionColumnsWidth: number;
   columnHeaders: ColumnHeaderOptions[];
@@ -167,7 +167,7 @@ const transformControlColumns = ({
   theme: EuiTheme;
   setEventsLoading: SetEventsLoading;
   setEventsDeleted: SetEventsDeleted;
-  hasAlertsPermissions?: (featureId: string) => boolean;
+  hasAlertsCrudPermissions?: (featureId: string) => boolean;
 }): EuiDataGridControlColumn[] =>
   controlColumns.map(
     ({ id: columnId, headerCellRender = EmptyHeaderCellRender, rowCellRender, width }, i) => ({
@@ -206,11 +206,11 @@ const transformControlColumns = ({
       }: EuiDataGridCellValueElementProps) => {
         addBuildingBlockStyle(data[rowIndex].ecs, theme, setCellProps);
         let disabled = false;
-        if (columnId === 'checkbox-control-column' && hasAlertsPermissions != null) {
+        if (columnId === 'checkbox-control-column' && hasAlertsCrudPermissions != null) {
           const alertConsumers =
             data[rowIndex].data.find((d) => d.field === ALERT_RULE_CONSUMER)?.value ?? [];
           disabled = alertConsumers.reduce<boolean>(
-            (acc, consumer) => acc || !hasAlertsPermissions(consumer),
+            (acc, consumer) => acc || !hasAlertsCrudPermissions(consumer),
             false
           );
         }
@@ -290,7 +290,7 @@ export const BodyComponent = React.memo<StatefulBodyProps>(
     trailingControlColumns = EMPTY_CONTROL_COLUMNS,
     unit = defaultUnit,
     hasAlertsCrud,
-    hasAlertsPermissions,
+    hasAlertsCrudPermissions,
     totalSelectAllAlerts,
   }) => {
     const dispatch = useDispatch();
@@ -563,7 +563,7 @@ export const BodyComponent = React.memo<StatefulBodyProps>(
           theme,
           setEventsLoading,
           setEventsDeleted,
-          hasAlertsPermissions,
+          hasAlertsCrudPermissions,
         })
       );
     }, [
@@ -586,7 +586,7 @@ export const BodyComponent = React.memo<StatefulBodyProps>(
       theme,
       setEventsLoading,
       setEventsDeleted,
-      hasAlertsPermissions,
+      hasAlertsCrudPermissions,
     ]);
 
     const columnsWithCellActions: EuiDataGridColumn[] = useMemo(

diff --git a/x-pack/plugins/timelines/public/components/t_grid/standalone/index.tsx b/x-pack/plugins/timelines/public/components/t_grid/standalone/index.tsx
@@ -94,7 +94,7 @@ export interface TGridStandaloneProps {
   filters: Filter[];
   footerText: React.ReactNode;
   filterStatus: AlertStatus;
-  hasAlertsPermissions: (featureId: string) => boolean;
+  hasAlertsCrudPermissions: (featureId: string) => boolean;
   height?: number;
   indexNames: string[];
   itemsPerPage: number;
@@ -127,7 +127,7 @@ const TGridStandaloneComponent: React.FC<TGridStandaloneProps> = ({
   filters,
   footerText,
   filterStatus,
-  hasAlertsPermissions,
+  hasAlertsCrudPermissions,
   indexNames,
   itemsPerPage,
   itemsPerPageOptions,
@@ -231,7 +231,7 @@ const TGridStandaloneComponent: React.FC<TGridStandaloneProps> = ({
       totalSelectAllAlerts: number;
     }>(
       (acc, [featureId, nbrAlerts]) => {
-        const featureHasPermission = hasAlertsPermissions(featureId);
+        const featureHasPermission = hasAlertsCrudPermissions(featureId);
         return {
           hasAlertsCrud: featureHasPermission || acc.hasAlertsCrud,
           totalSelectAllAlerts: featureHasPermission
@@ -244,7 +244,7 @@ const TGridStandaloneComponent: React.FC<TGridStandaloneProps> = ({
         totalSelectAllAlerts: 0,
       }
     );
-  }, [consumers, hasAlertsPermissions]);
+  }, [consumers, hasAlertsCrudPermissions]);
 
   const totalCountMinusDeleted = useMemo(
     () => (totalCount > 0 ? totalCount - deletedEventIds.length : 0),
@@ -349,7 +349,7 @@ const TGridStandaloneComponent: React.FC<TGridStandaloneProps> = ({
                     defaultCellActions={defaultCellActions}
                     filterQuery={filterQuery}
                     hasAlertsCrud={hasAlertsCrud}
-                    hasAlertsPermissions={hasAlertsPermissions}
+                    hasAlertsCrudPermissions={hasAlertsCrudPermissions}
                     id={STANDALONE_ID}
                     indexNames={indexNames}
                     isEventViewer={true}

diff --git a/...est/plugin_functional/plugins/timelines_test/public/applications/timelines_test/index.tsx b/...est/plugin_functional/plugins/timelines_test/public/applications/timelines_test/index.tsx
@@ -54,6 +54,8 @@ const AppRoot = React.memo(
       refetch.current = _refetch;
     }, []);
 
+    const hasAlertsCrudPermissions = useCallback(() => true, []);
+
     return (
       <I18nProvider>
         <Router history={parameters.history}>
@@ -73,6 +75,7 @@ const AppRoot = React.memo(
                 end: '',
                 footerText: 'Events',
                 filters: [],
+                hasAlertsCrudPermissions,
                 itemsPerPage: 50,
                 itemsPerPageOptions: [1, 2, 3],
                 loadingText: 'Loading events',