mirror of
https://github.com/ansible/awx.git
synced 2026-05-17 06:17:36 -02:30
Merge pull request #5103 from mabashian/proj-notifs
Hook up notifications tab on projects Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
@@ -1,7 +1,8 @@
|
|||||||
import Base from '../Base';
|
import Base from '../Base';
|
||||||
|
import NotificationsMixin from '../mixins/Notifications.mixin';
|
||||||
import LaunchUpdateMixin from '../mixins/LaunchUpdate.mixin';
|
import LaunchUpdateMixin from '../mixins/LaunchUpdate.mixin';
|
||||||
|
|
||||||
class Projects extends LaunchUpdateMixin(Base) {
|
class Projects extends LaunchUpdateMixin(NotificationsMixin(Base)) {
|
||||||
constructor(http) {
|
constructor(http) {
|
||||||
super(http);
|
super(http);
|
||||||
this.baseUrl = '/api/v2/projects/';
|
this.baseUrl = '/api/v2/projects/';
|
||||||
|
|||||||
@@ -11,11 +11,11 @@ import styled from 'styled-components';
|
|||||||
import CardCloseButton from '@components/CardCloseButton';
|
import CardCloseButton from '@components/CardCloseButton';
|
||||||
import RoutedTabs from '@components/RoutedTabs';
|
import RoutedTabs from '@components/RoutedTabs';
|
||||||
import ContentError from '@components/ContentError';
|
import ContentError from '@components/ContentError';
|
||||||
|
import NotificationList from '@components/NotificationList';
|
||||||
import ProjectAccess from './ProjectAccess';
|
import ProjectAccess from './ProjectAccess';
|
||||||
import ProjectDetail from './ProjectDetail';
|
import ProjectDetail from './ProjectDetail';
|
||||||
import ProjectEdit from './ProjectEdit';
|
import ProjectEdit from './ProjectEdit';
|
||||||
import ProjectJobTemplates from './ProjectJobTemplates';
|
import ProjectJobTemplates from './ProjectJobTemplates';
|
||||||
import ProjectNotifications from './ProjectNotifications';
|
|
||||||
import ProjectSchedules from './ProjectSchedules';
|
import ProjectSchedules from './ProjectSchedules';
|
||||||
import { OrganizationsAPI, ProjectsAPI } from '@api';
|
import { OrganizationsAPI, ProjectsAPI } from '@api';
|
||||||
|
|
||||||
@@ -229,9 +229,10 @@ class Project extends Component {
|
|||||||
<Route
|
<Route
|
||||||
path="/projects/:id/notifications"
|
path="/projects/:id/notifications"
|
||||||
render={() => (
|
render={() => (
|
||||||
<ProjectNotifications
|
<NotificationList
|
||||||
id={Number(match.params.id)}
|
id={Number(match.params.id)}
|
||||||
canToggleNotifications={canToggleNotifications}
|
canToggleNotifications={canToggleNotifications}
|
||||||
|
apiModel={ProjectsAPI}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -1,10 +0,0 @@
|
|||||||
import React, { Component } from 'react';
|
|
||||||
import { CardBody } from '@patternfly/react-core';
|
|
||||||
|
|
||||||
class ProjectNotifications extends Component {
|
|
||||||
render() {
|
|
||||||
return <CardBody>Coming soon :)</CardBody>;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export default ProjectNotifications;
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
export { default } from './ProjectNotifications';
|
|
||||||
Reference in New Issue
Block a user