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.

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

[Notification MDS]move constants to common folder, but when load page, the getServerFea… #188

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 23 additions & 0 deletions common/constants.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
export const BACKEND_CHANNEL_TYPE = Object.freeze({
SLACK: 'slack',
EMAIL: 'email',
CHIME: 'chime',
MICROSOFT_TEAMS: 'microsoft_teams',
CUSTOM_WEBHOOK: 'webhook',
SNS: 'sns',
});
export const CHANNEL_TYPE = Object.freeze({
[BACKEND_CHANNEL_TYPE.SLACK]: 'Slack',
[BACKEND_CHANNEL_TYPE.EMAIL]: 'Email',
[BACKEND_CHANNEL_TYPE.CHIME]: 'Chime',
[BACKEND_CHANNEL_TYPE.MICROSOFT_TEAMS]: 'Microsoft Teams',
[BACKEND_CHANNEL_TYPE.CUSTOM_WEBHOOK]: 'Custom webhook',
[BACKEND_CHANNEL_TYPE.SNS]: 'Amazon SNS',
}) as {
slack: string;
email: string;
chime: string;
microsoft_teams: string;
webhook: string;
sns: string;
};
4 changes: 2 additions & 2 deletions models/interfaces.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import { Direction } from '@elastic/eui';
import { WebhookMethodType } from '../public/pages/Channels/types';
import {
CHANNEL_TYPE,
ENCRYPTION_TYPE,
} from '../public/utils/constants';
} from '../common/constants';
import {ENCRYPTION_TYPE} from '../public/utils/constants'

export interface ChannelStatus {
config_id: string;
Expand Down
3 changes: 2 additions & 1 deletion public/pages/Channels/Channels.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ import { CoreServicesContext } from '../../components/coreServices';
import { NotificationService } from '../../services';
import {
BREADCRUMBS,
CHANNEL_TYPE,
ROUTES,
} from '../../utils/constants';
import { CHANNEL_TYPE } from '../../../common/constants'
import { getErrorMessage } from '../../utils/helpers';
import { DEFAULT_PAGE_SIZE_OPTIONS } from '../Notifications/utils/constants';
import { ChannelActions } from './components/ChannelActions';
Expand Down Expand Up @@ -107,6 +107,7 @@ export class Channels extends Component<ChannelsProps, ChannelsState> {
}

async componentDidMount() {
console.log("in channle this.context", this.context )
this.context.chrome.setBreadcrumbs([
BREADCRUMBS.NOTIFICATIONS,
BREADCRUMBS.CHANNELS,
Expand Down
5 changes: 4 additions & 1 deletion public/pages/Channels/components/ChannelControls.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import _ from 'lodash';
import React, { useContext, useEffect, useState } from 'react';
import {
CHANNEL_TYPE,
} from '../../../../public/utils/constants';
} from '../../../../common/constants';
import { MainContext } from '../../Main/Main';
import { ChannelFiltersType } from '../types';

Expand All @@ -28,19 +28,22 @@ interface ChannelControlsProps {

export const ChannelControls = (props: ChannelControlsProps) => {
const mainStateContext = useContext(MainContext)!;

const [isStatePopoverOpen, setIsStatePopoverOpen] = useState(false);
const [stateItems, setStateItems] = useState([
{ field: 'true', display: 'Active', checked: 'off' },
{ field: 'false', display: 'Muted', checked: 'off' },
]);
const [isTypePopoverOpen, setIsTypePopoverOpen] = useState(false);

const [typeItems, setTypeItems] = useState(
Object.entries(mainStateContext.availableChannels).map(([key, value]) => ({
field: key,
display: value,
checked: 'off',
}))
);
console.log("typeItems", typeItems)

useEffect(() => {
const newItems = typeItems.filter(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { EuiLink } from '@elastic/eui';
import React from 'react';
import { ChannelItemType } from '../../../../../models/interfaces';
import { ModalConsumer } from '../../../../components/Modal';
import { BACKEND_CHANNEL_TYPE, CHANNEL_TYPE } from '../../../../utils/constants';
import { BACKEND_CHANNEL_TYPE, CHANNEL_TYPE } from '../../../../../common/constants';
import {
deconstructEmailObject,
deconstructWebhookObject,
Expand Down
3 changes: 1 addition & 2 deletions public/pages/CreateChannel/CreateChannel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,11 @@ import { ContentPanel } from '../../components/ContentPanel';
import { CoreServicesContext } from '../../components/coreServices';
import { ServicesContext } from '../../services';
import {
BACKEND_CHANNEL_TYPE,
BREADCRUMBS,
CHANNEL_TYPE,
CUSTOM_WEBHOOK_ENDPOINT_TYPE,
ROUTES,
} from '../../utils/constants';
import {BACKEND_CHANNEL_TYPE,CHANNEL_TYPE } from '../../../common/constants'
import { getErrorMessage } from '../../utils/helpers';
import { HeaderItemType, WebhookHttpType, WebhookMethodType } from '../Channels/types';
import { MainContext } from '../Main/Main';
Expand Down
3 changes: 2 additions & 1 deletion public/pages/Main/Main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ import { CoreServicesConsumer } from '../../components/coreServices';
import { ModalProvider, ModalRoot } from '../../components/Modal';
import { BrowserServices } from '../../models/interfaces';
import { ServicesConsumer, ServicesContext } from '../../services/services';
import { CHANNEL_TYPE, ROUTES } from '../../utils/constants';
import { ROUTES } from '../../utils/constants';
import { CHANNEL_TYPE } from '../../../common/constants'
import { Channels } from '../Channels/Channels';
import { ChannelDetails } from '../Channels/components/details/ChannelDetails';
import { CreateChannel } from '../CreateChannel/CreateChannel';
Expand Down
24 changes: 0 additions & 24 deletions public/utils/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,30 +48,6 @@ export const BREADCRUMBS = Object.freeze({
EDIT_RECIPIENT_GROUP: { text: 'Edit recipient group' },
});

export const BACKEND_CHANNEL_TYPE = Object.freeze({
SLACK: 'slack',
EMAIL: 'email',
CHIME: 'chime',
MICROSOFT_TEAMS: 'microsoft_teams',
CUSTOM_WEBHOOK: 'webhook',
SNS: 'sns',
});

export const CHANNEL_TYPE = Object.freeze({
[BACKEND_CHANNEL_TYPE.SLACK]: 'Slack',
[BACKEND_CHANNEL_TYPE.EMAIL]: 'Email',
[BACKEND_CHANNEL_TYPE.CHIME]: 'Chime',
[BACKEND_CHANNEL_TYPE.MICROSOFT_TEAMS]: 'Microsoft Teams',
[BACKEND_CHANNEL_TYPE.CUSTOM_WEBHOOK]: 'Custom webhook',
[BACKEND_CHANNEL_TYPE.SNS]: 'Amazon SNS',
}) as {
slack: string;
email: string;
chime: string;
microsoft_teams: string;
webhook: string;
sns: string;
};

export const ENCRYPTION_TYPE = Object.freeze({
ssl: 'SSL/TLS',
Expand Down
7 changes: 5 additions & 2 deletions server/routes/configRoutes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
import { NODE_API } from '../../common';
import { joinRequestParams } from '../utils/helper';
import _ from 'lodash';
import { CHANNEL_TYPE } from '../../public/utils/constants';
import { CHANNEL_TYPE } from '../../common/constants';

export function configRoutes(router: IRouter) {
router.get(
Expand Down Expand Up @@ -212,17 +212,20 @@ export function configRoutes(router: IRouter) {
const resp = await client.callAsCurrentUser(
'notifications.getServerFeatures'
);

const config_type_list = resp.allowed_config_type_list as Array<
keyof typeof CHANNEL_TYPE
>;

const channelTypes: Partial<typeof CHANNEL_TYPE> = {};

for (let channel of config_type_list) {
if (CHANNEL_TYPE[channel]) {
channelTypes[channel] = CHANNEL_TYPE[channel]
}
}


const availableFeature = {
availableChannels: channelTypes,
availableConfigTypes: config_type_list as string[],
Expand Down
Loading