Skip to content

Commit

Permalink
[ResponseOps][Connectors]Preconfigured connectors of disabled types s…
Browse files Browse the repository at this point in the history
…how as disabled, but are actually enabled (#198792)

Closes #190420

## Summary

- the preconfigured connectors should be displayed as enabled and not
have the tooltip icon even if the xpack.actions.enabledActionTypes: []
setting is present in the kibana.yml (to disable all the connector
types)

![Screenshot 2024-11-04 at 14 38
10](https://github.com/user-attachments/assets/ee817087-a079-481b-bf82-b7247f3ea923)

---------

Co-authored-by: Antonio <[email protected]>
  • Loading branch information
georgianaonoleata1904 and adcoelho authored Nov 6, 2024
1 parent deeb9fe commit 56b0ac2
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -750,6 +750,12 @@ describe('actions_connectors_list', () => {
referencedByCount: 1,
config: {},
},
{
id: '3',
actionTypeId: 'test3',
isPreconfigured: true,
isDeprecated: false,
},
] as ActionConnector[]
}
setActions={() => {}}
Expand All @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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',
Expand Down

0 comments on commit 56b0ac2

Please sign in to comment.