[8.x] [ResponseOps][Connectors]Preconfigured connectors of disabled t…

…ypes show as disabled, but are actually enabled (#198792) (#199157) # Backport This will backport the following commits from `main` to `8.x`: - [[ResponseOps][Connectors]Preconfigured connectors of disabled types show as disabled, but are actually enabled (#198792)](#198792)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  Co-authored-by: Georgiana-Andreea Onoleață <georgiana.onoleata@elastic.co>
elastic · Nov 6, 2024 · cd89eb9 · cd89eb9
1 parent 5194e64
commit cd89eb9
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 6 deletions.
diff --git a/packages/kbn-alerts-ui-shared/src/rule_form/utils/check_action_type_enabled.test.ts b/packages/kbn-alerts-ui-shared/src/rule_form/utils/check_action_type_enabled.test.ts
@@ -99,6 +99,26 @@ describe('checkActionTypeEnabled', () => {
           }
       `);
   });
+  test('checkActionTypeEnabled returns true when actionType is disabled by config', async () => {
+    const actionType: ActionType = {
+      id: '1',
+      minimumLicenseRequired: 'basic',
+      supportedFeatureIds: ['alerting'],
+      name: 'my action',
+      enabled: false,
+      enabledInConfig: false,
+      enabledInLicense: true,
+      isSystemActionType: false,
+    };
+
+    const isPreconfiguredConnector = true;
+
+    expect(checkActionTypeEnabled(actionType, isPreconfiguredConnector)).toMatchInlineSnapshot(`
+      Object {
+        "isEnabled": true,
+      }
+  `);
+  });
 });
 
 describe('checkActionFormActionTypeEnabled', () => {

diff --git a/packages/kbn-alerts-ui-shared/src/rule_form/utils/check_action_type_enabled.ts b/packages/kbn-alerts-ui-shared/src/rule_form/utils/check_action_type_enabled.ts
@@ -22,13 +22,14 @@ export interface IsDisabledResult {
 }
 
 export const checkActionTypeEnabled = (
-  actionType?: ActionType
+  actionType?: ActionType,
+  isPreconfiguredConnector: boolean = false
 ): IsEnabledResult | IsDisabledResult => {
   if (actionType?.enabledInLicense === false) {
     return getLicenseCheckResult(actionType);
   }
 
-  if (actionType?.enabledInConfig === false) {
+  if (actionType?.enabledInConfig === false && isPreconfiguredConnector === false) {
     return configurationCheckResult;
   }
 

diff --git a/.../application/sections/actions_connectors_list/components/actions_connectors_list.test.tsx b/.../application/sections/actions_connectors_list/components/actions_connectors_list.test.tsx
@@ -750,6 +750,12 @@ describe('actions_connectors_list', () => {
                 referencedByCount: 1,
                 config: {},
               },
+              {
+                id: '3',
+                actionTypeId: 'test3',
+                isPreconfigured: true,
+                isDeprecated: false,
+              },
             ] as ActionConnector[]
           }
           setActions={() => {}}
@@ -766,14 +772,21 @@ describe('actions_connectors_list', () => {
     it('renders table of connectors', async () => {
       await setup();
       expect(wrapper.find('EuiInMemoryTable')).toHaveLength(1);
-      expect(wrapper.find('EuiTableRow')).toHaveLength(2);
+      expect(wrapper.find('EuiTableRow')).toHaveLength(3);
       expect(wrapper.find('EuiTableRow').at(0).prop('className')).toEqual(
         'actConnectorsList__tableRowDisabled'
       );
       expect(wrapper.find('EuiTableRow').at(1).prop('className')).toEqual(
         'actConnectorsList__tableRowDisabled'
       );
     });
+
+    it('renders preconfigured connectors as enabled', async () => {
+      await setup();
+      expect(wrapper.find('EuiTableRow').at(2).prop('className')).not.toEqual(
+        'actConnectorsList__tableRowDisabled'
+      );
+    });
   });
 
   describe('component with deprecated connectors', () => {

diff --git a/...ublic/application/sections/actions_connectors_list/components/actions_connectors_list.tsx b/...ublic/application/sections/actions_connectors_list/components/actions_connectors_list.tsx
@@ -199,9 +199,9 @@ const ActionsConnectorsList = ({
       truncateText: true,
       render: (value: string, item: ActionConnectorTableItem) => {
         const checkEnabledResult = checkActionTypeEnabled(
-          actionTypesIndex && actionTypesIndex[item.actionTypeId]
+          actionTypesIndex && actionTypesIndex[item.actionTypeId],
+          item.isPreconfigured
         );
-
         /**
          * TODO: Remove when connectors can provide their own UX message.
          * Issue: https://github.com/elastic/kibana/issues/114507
@@ -363,7 +363,8 @@ const ActionsConnectorsList = ({
       columns={actionsTableColumns}
       rowProps={(item: ActionConnectorTableItem) => ({
         className:
-          !actionTypesIndex || !actionTypesIndex[item.actionTypeId]?.enabled
+          !item.isPreconfigured &&
+          (!actionTypesIndex || !actionTypesIndex[item.actionTypeId]?.enabled)
             ? 'actConnectorsList__tableRowDisabled'
             : '',
         'data-test-subj': 'connectors-row',