External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-26 21:35:01 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8150 from keithjgrant/7878-notification-websockets

Browse Source 
Update status after sending test notification

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-09-18 17:52:38 +00:00
committed by GitHub
parent 256123dc9d 3ed05e9d9b
commit deab7395f2
5 changed files with 45 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateList/NotificationTemplateListItem.jsx
View File

@@ -14,7 +14,7 @@ import {
Tooltip,
} from '@patternfly/react-core';
import { PencilAltIcon, BellIcon } from '@patternfly/react-icons';
import { NotificationTemplatesAPI } from '../../../api';
import { NotificationTemplatesAPI, NotificationsAPI } from '../../../api';
import DataListCell from '../../../components/DataListCell';
import StatusLabel from '../../../components/StatusLabel';
import useRequest from '../../../util/useRequest';
@@ -27,6 +27,9 @@ const DataListAction = styled(_DataListAction)`
grid-template-columns: 40px 40px;
`;
const NUM_RETRIES = 25;
const RETRY_TIMEOUT = 5000;
function NotificationTemplateListItem({
template,
detailUrl,
@@ -45,9 +48,29 @@ function NotificationTemplateListItem({
}, [latestStatus]);
const { request: sendTestNotification, isLoading, error } = useRequest(
useCallback(() => {
NotificationTemplatesAPI.test(template.id);
useCallback(async () => {
const request = NotificationTemplatesAPI.test(template.id);
setStatus('running');
let retries = NUM_RETRIES;
const {
data: { notification: notificationId },
} = await request;
async function pollForStatusChange() {
const { data: notification } = await NotificationsAPI.readDetail(
notificationId
);
if (notification.status !== 'pending') {
setStatus(notification.status);
return;
}
retries--;
if (retries > 0) {
setTimeout(pollForStatusChange, RETRY_TIMEOUT);
}
}
setTimeout(pollForStatusChange, RETRY_TIMEOUT);
}, [template.id])
);

4
awx/ui_next/src/screens/NotificationTemplate/NotificationTemplateList/NotificationTemplateListItem.test.jsx
View File

@@ -39,7 +39,9 @@ describe('<NotificationTemplateListItem />', () => {
});
test('should send test notification', async () => {
NotificationTemplatesAPI.test.mockResolvedValue({});
NotificationTemplatesAPI.test.mockResolvedValue({
data: { notification: 1 },
});
const wrapper = mountWithContexts(
<NotificationTemplateListItem