From 638f8eae21a637922c306b34336d7f5740a58747 Mon Sep 17 00:00:00 2001 From: mabashian Date: Thu, 24 Oct 2019 15:48:12 -0400 Subject: [PATCH] Hook up notifications tab on projects --- awx/ui_next/src/api/models/Projects.js | 3 ++- awx/ui_next/src/screens/Project/Project.jsx | 5 +++-- .../ProjectNotifications/ProjectNotifications.jsx | 10 ---------- .../src/screens/Project/ProjectNotifications/index.js | 1 - 4 files changed, 5 insertions(+), 14 deletions(-) delete mode 100644 awx/ui_next/src/screens/Project/ProjectNotifications/ProjectNotifications.jsx delete mode 100644 awx/ui_next/src/screens/Project/ProjectNotifications/index.js diff --git a/awx/ui_next/src/api/models/Projects.js b/awx/ui_next/src/api/models/Projects.js index 55ab141df6..3af665f2cb 100644 --- a/awx/ui_next/src/api/models/Projects.js +++ b/awx/ui_next/src/api/models/Projects.js @@ -1,7 +1,8 @@ import Base from '../Base'; +import NotificationsMixin from '../mixins/Notifications.mixin'; import LaunchUpdateMixin from '../mixins/LaunchUpdate.mixin'; -class Projects extends LaunchUpdateMixin(Base) { +class Projects extends LaunchUpdateMixin(NotificationsMixin(Base)) { constructor(http) { super(http); this.baseUrl = '/api/v2/projects/'; diff --git a/awx/ui_next/src/screens/Project/Project.jsx b/awx/ui_next/src/screens/Project/Project.jsx index 03f0fae85e..362fb3d22c 100644 --- a/awx/ui_next/src/screens/Project/Project.jsx +++ b/awx/ui_next/src/screens/Project/Project.jsx @@ -11,11 +11,11 @@ import styled from 'styled-components'; import CardCloseButton from '@components/CardCloseButton'; import RoutedTabs from '@components/RoutedTabs'; import ContentError from '@components/ContentError'; +import NotificationList from '@components/NotificationList'; import ProjectAccess from './ProjectAccess'; import ProjectDetail from './ProjectDetail'; import ProjectEdit from './ProjectEdit'; import ProjectJobTemplates from './ProjectJobTemplates'; -import ProjectNotifications from './ProjectNotifications'; import ProjectSchedules from './ProjectSchedules'; import { OrganizationsAPI, ProjectsAPI } from '@api'; @@ -229,9 +229,10 @@ class Project extends Component { ( - )} /> diff --git a/awx/ui_next/src/screens/Project/ProjectNotifications/ProjectNotifications.jsx b/awx/ui_next/src/screens/Project/ProjectNotifications/ProjectNotifications.jsx deleted file mode 100644 index 32312cc920..0000000000 --- a/awx/ui_next/src/screens/Project/ProjectNotifications/ProjectNotifications.jsx +++ /dev/null @@ -1,10 +0,0 @@ -import React, { Component } from 'react'; -import { CardBody } from '@patternfly/react-core'; - -class ProjectNotifications extends Component { - render() { - return Coming soon :); - } -} - -export default ProjectNotifications; diff --git a/awx/ui_next/src/screens/Project/ProjectNotifications/index.js b/awx/ui_next/src/screens/Project/ProjectNotifications/index.js deleted file mode 100644 index 61e2ce96bf..0000000000 --- a/awx/ui_next/src/screens/Project/ProjectNotifications/index.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from './ProjectNotifications';