Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[8.x] [ResponseOps][Connectors]Preconfigured connectors of disabled types show as disabled, but are actually enabled (#198792) #199157

Merged
merged 1 commit into from
Nov 6, 2024
Merged

[8.x] [ResponseOps][Connectors]Preconfigured connectors of disabled types show as disabled, but are actually enabled (#198792) #199157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions packages/kbn-alerts-ui-shared/src/rule_form/utils/check_action_type_enabled.test.ts
View file
Open in desktop
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
5 changes: 3 additions & 2 deletions packages/kbn-alerts-ui-shared/src/rule_form/utils/check_action_type_enabled.ts
View file
Open in desktop
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
15 changes: 14 additions & 1 deletion .../application/sections/actions_connectors_list/components/actions_connectors_list.test.tsx
View file
Open in desktop
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
7 changes: 4 additions & 3 deletions ...ublic/application/sections/actions_connectors_list/components/actions_connectors_list.tsx
View file
Open in desktop
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