Skip to content

Support any channel types from Notification #743

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

Merged
merged 3 commits into from
Oct 2, 2023
Merged

Support any channel types from Notification #743

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4326edf
Support any channel types from Notification
lezzago Sep 26, 2023
f92f42d
Remove unused CHANNEL_TYPES constant
lezzago Sep 27, 2023
10f590c
Return empty array if failed to get features
lezzago Oct 2, 2023
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
12 changes: 9 additions & 3 deletions public/pages/CreateTrigger/components/Action/Action.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ import {
} from '@elastic/eui';
import { FormikFieldText, FormikComboBox } from '../../../../components/FormControls';
import { isInvalid, hasError, validateActionName } from '../../../../utils/validate';
import { ActionsMap } from './utils/constants';
import { validateDestination } from './utils/validate';
import { DEFAULT_ACTION_TYPE, MANAGE_CHANNELS_PATH } from '../../utils/constants';
import NotificationsCallOut from '../NotificationsCallOut';
import MinimalAccordion from '../../../../components/FeatureAnywhereContextMenu/MinimalAccordion';
import Message from './actions';

const Action = ({
action,
Expand Down Expand Up @@ -60,8 +60,14 @@ const Action = ({
);
const type = _.get(selectedDestination, '0.type', DEFAULT_ACTION_TYPE);
const { name } = action;
const ActionComponent = ActionsMap[type].component;
const actionLabel = ActionsMap[type].label;
let ActionComponent;
const actionLabel = 'Notification';
if (type === 'webhook') {
ActionComponent = (props) => <Message isSubjectDisabled {...props} />;
} else {
ActionComponent = (props) => <Message {...props} />;
}

const manageChannelsUrl = httpClient.basePath.prepend(MANAGE_CHANNELS_PATH);
const isFirstAction = index !== undefined && index === 0;
const refreshDestinations = useMemo(() => {
Expand Down
30 changes: 0 additions & 30 deletions public/pages/CreateTrigger/components/Action/utils/constants.js
View file
Open in desktop

This file was deleted.

10 changes: 3 additions & 7 deletions public/pages/CreateTrigger/containers/ConfigureActions/ConfigureActions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@ import { EuiPanel, EuiText, EuiSpacer, EuiLoadingSpinner } from '@elastic/eui';
import Action from '../../components/Action';
import ActionEmptyPrompt from '../../components/ActionEmptyPrompt';
import AddActionButton from '../../components/AddActionButton';
import {
CHANNEL_TYPES,
DEFAULT_MESSAGE_SOURCE,
FORMIK_INITIAL_ACTION_VALUES,
} from '../../utils/constants';
import { getAllowList } from '../../../Destinations/utils/helpers';
import {
MAX_QUERY_RESULT_SIZE,
Expand Down Expand Up @@ -111,10 +106,11 @@ class ConfigureActions extends React.Component {
let channels = [];
let index = 0;
const getChannels = async () => {
const config_types = await this.props.notificationService.getServerFeatures();
const getChannelsQuery = {
from_index: index,
max_items: MAX_CHANNELS_RESULT_SIZE,
config_type: CHANNEL_TYPES,
config_type: config_types,
sort_field: 'name',
sort_order: 'asc',
};
Expand Down Expand Up @@ -172,7 +168,7 @@ class ConfigureActions extends React.Component {
let channels = await this.getChannels();

const destinationsAndChannels = destinations.concat(channels);
const channelOptionsByType = getChannelOptions(destinationsAndChannels, CHANNEL_TYPES);
const channelOptionsByType = getChannelOptions(destinationsAndChannels);
this.setState({
destinations: channelOptionsByType,
flattenedDestinations: destinationsAndChannels,
Expand Down
4 changes: 2 additions & 2 deletions public/pages/CreateTrigger/containers/DefineCompositeLevelTrigger/TriggerNotifications.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import {
} from '@elastic/eui';
import TriggerNotificationsContent from './TriggerNotificationsContent';
import { MAX_CHANNELS_RESULT_SIZE, OS_NOTIFICATION_PLUGIN } from '../../../../utils/constants';
import { CHANNEL_TYPES } from '../../utils/constants';
import { titleTemplate } from '../../../../utils/helpers';

const TriggerNotifications = ({
Expand Down Expand Up @@ -52,10 +51,11 @@ const TriggerNotifications = ({
let channels = [];
let index = 0;
const getChannels = async () => {
const config_types = await this.props.notificationService.getServerFeatures();
const getChannelsQuery = {
from_index: index,
max_items: MAX_CHANNELS_RESULT_SIZE,
config_type: CHANNEL_TYPES,
config_type: config_types,
sort_field: 'name',
sort_order: 'asc',
};
Expand Down
10 changes: 5 additions & 5 deletions public/pages/CreateTrigger/utils/helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ import {
import moment from 'moment';
import { formikToTrigger } from '../containers/CreateTrigger/utils/formikToTrigger';

export const getChannelOptions = (channels, allowedTypes) =>
allowedTypes.map((type) => ({
key: type,
label: type,
export const getChannelOptions = (channels) =>
channels.map((channel) => ({
key: channel.type,
label: channel.type,
options: channels
.filter((channel) => channel.type === type)
.filter((local_channel) => local_channel.type === channel.type)
.map((option) => ({ key: option.value, ...option })),
}));

Expand Down
13 changes: 13 additions & 0 deletions public/services/NotificationService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ const NODE_API_BASE_PATH = '/api/notifications';
const NODE_API = Object.freeze({
GET_CONFIGS: `${NODE_API_BASE_PATH}/get_configs`,
GET_CONFIG: `${NODE_API_BASE_PATH}/get_config`,
GET_AVAILABLE_FEATURES: `${NODE_API_BASE_PATH}/features`,
});

export default class NotificationService {
Expand All @@ -25,6 +26,18 @@ export default class NotificationService {
this.httpClient = httpClient;
}

getServerFeatures = async (): Promise<Array<String>> => {
try {
const response = await this.httpClient.get(
NODE_API.GET_AVAILABLE_FEATURES
);
return response.allowed_config_type_list as Array<String>;
} catch (error) {
console.error('error fetching available features', error);
return null;
Copy link
Collaborator

@AWSHurneyt AWSHurneyt Oct 2, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are there any concerns with receiving a null pointer exception somewhere by returning null here? Would it be worthwhile to instead return []?

Copy link
Member Author

@lezzago lezzago Oct 2, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good point, that would be more robust.

}
};

getConfigs = async (queryObject: HttpFetchQuery) => {
return this.httpClient.get<ConfigsResponse>(NODE_API.GET_CONFIGS, {
query: queryObject,
Expand Down