implements issue 477

Author: nqviet

config/dev.js

@@ -5,6 +5,7 @@ module.exports = {
     TC_NOTIFICATION_URL: "https://api.topcoder-dev.com/v5/notifications",
     CONNECT_DOMAIN: "https://connect.topcoder-dev.com",
     COMMUNITY_DOMAIN: "https://www.topcoder-dev.com",
+    TAAS_APP: "https://platform.topcoder-dev.com/taas/myteams",
   },
   API: {
     V3: "https://api.topcoder-dev.com/v3",

config/prod.js

@@ -5,6 +5,7 @@ module.exports = {
     TC_NOTIFICATION_URL: "https://api.topcoder.com/v5/notifications",
     CONNECT_DOMAIN: "https://connect.topcoder.com",
     COMMUNITY_DOMAIN: "https://www.topcoder.com",
+    TAAS_APP: "https://platform.topcoder.com/taas/myteams",
   },
   API: {
     V3: "https://api.topcoder.com/v3",

src/actions/notifications.js

@@ -19,7 +19,6 @@ import {
   NOTIFICATIONS_PENDING,
   SET_NOTIFICATION_PLATFORM,
   RESET_NOTIFICATIONS,
-  RESET_COMMUNITY_NOTIFICATIONS,
 } from "../constants/notifications";
 import notificationsService from "../services/notifications";
 import {
@@ -83,6 +82,25 @@ export const getNotifications = () => (dispatch) => {
     });
 };
 
+export const getTaaSNotifications = () => (dispatch) => {
+  dispatch({ type: GET_NOTIFICATIONS_PENDING });
+  notificationsService
+    .getTaaSNotifications()
+    .then((notifications) => {
+      dispatch({
+        type: GET_NOTIFICATIONS_SUCCESS,
+        payload: notifications,
+      });
+    })
+    .catch((err) => {
+      dispatch({
+        type: GET_NOTIFICATIONS_FAILURE,
+        payload: err,
+      });
+      console.error(`Failed to load notifications. ${err.message}`);
+    });
+};
+
 export const getCommunityNotifications = () => (dispatch) => {
   dispatch({ type: GET_COMMUNITY_NOTIFICATIONS_PENDING });
   notificationsService
@@ -243,10 +261,6 @@ export const resetNotifications = () => (dispatch) => {
   dispatch({ type: RESET_NOTIFICATIONS });
 };
 
-export const resetCommunityNotifications = () => (dispatch) => {
-  dispatch({ type: RESET_COMMUNITY_NOTIFICATIONS });
-};
-
 export default {
   getNotifications,
   getCommunityNotifications,
@@ -262,5 +276,4 @@ export default {
   markNotificationsRead,
   setNotificationPlatform,
   resetNotifications,
-  resetCommunityNotifications,
 };

src/components/Notifications/NotificationsEmpty/index.jsx

@@ -8,7 +8,7 @@ import Bell from "../../../assets/icons/bell.svg";
 
 const NotificationsEmpty = ({
   children,
-  message = "Good job! You�re all caught up",
+  message = "Good job! You’re all caught up",
 }) => (
   <div className="notifications-empty">
     <div className="icon">

src/constants/notifications.js

@@ -23,7 +23,6 @@ export const NOTIFICATIONS_PENDING = "NOTIFICATIONS_PENDING";
 export const MARK_NOTIFICATIONS_READ = "MARK_NOTIFICATIONS_READ";
 export const SET_NOTIFICATION_PLATFORM = "SET_NOTIFICATION_PLATFORM";
 export const RESET_NOTIFICATIONS = "RESET_NOTIFICATIONS";
-export const RESET_COMMUNITY_NOTIFICATIONS = "RESET_COMMUNITY_NOTIFICATIONS";
 
 /*
  * Project member role
@@ -76,7 +75,7 @@ export const NOTIFICATIONS_LIMIT = 1000;
 export const PLATFORM = {
   CONNECT: "connect",
   COMMUNITY: "community",
-  BOTH: "connect+community",
+  TAAS: "taas",
 };
 
 // Notifications event types
@@ -141,6 +140,11 @@ export const EVENT_TYPE = {
     COMPLETED: "challenge.notification.completed",
   },
   BROADCAST: "admin.notification.broadcast",
+  TAAS: {
+    POST_INTERVIEW_ACTION_REQUIRED: 'taas.notification.post-interview-action-required',
+    RESOURCE_BOOKING_EXPIRATION: 'taas.notification.resource-booking-expiration',
+    RESOURCE_BOOKING_PLACED: 'taas.notification.resource-booking-placed',
+  },
 };
 
 export const NOTIFICATION_TYPE = {
@@ -152,6 +156,7 @@ export const NOTIFICATION_TYPE = {
   MEMBER_ADDED: "member-added",
   CHALLENGE: "challenge",
   BROADCAST: "broadcast",
+  TAAS: "taas",
 };
 
 /*
@@ -169,6 +174,8 @@ export const GOTO = {
   PHASE: `${config.URL.CONNECT_DOMAIN}/projects/{{projectId}}/plan#phase-{{phaseId}}`,
   TOPCODER_TEAM: `${config.URL.CONNECT_DOMAIN}/projects/{{projectId}}#manageTopcoderTeam`,
   CHALLENGE: `${config.URL.COMMUNITY_DOMAIN}/challenges/{{id}}`,
+  TAAS_CANDIDATES_INTERVIEWS: `${config.URL.TAAS_APP}/{{projectId}}/positions/{{jobId}}/candidates/interviews`,
+  TAAS_PROJECT: `${config.URL.TAAS_APP}/{{projectId}}`
 };
 
 // each notification can be displayed differently depend on WHO see them
@@ -1226,6 +1233,8 @@ export const NOTIFICATIONS = [
     ],
   },
 
+  /// Community notification rules
+
   {
     eventType: EVENT_TYPE.CHALLENGE.ACTIVE,
     type: NOTIFICATION_TYPE.CHALLENGE,
@@ -1258,6 +1267,47 @@ export const NOTIFICATIONS = [
       },
     ],
   },
+
+  /// TaaS notification rules
+
+  {
+    version: 1,
+    eventType: EVENT_TYPE.TAAS.POST_INTERVIEW_ACTION_REQUIRED,
+    type: NOTIFICATION_TYPE.TAAS,
+    rules: [
+      {
+        text: "Candidate action required for <strong>{{userHandle}}</strong> in job <strong>{{jobTitle}}</strong> of the team <strong>{{teamName}}</strong>",
+        shouldBundle: false,
+        goTo: GOTO.TAAS_CANDIDATES_INTERVIEWS,
+      }
+    ],
+  },
+
+  {
+    version: 1,
+    eventType: EVENT_TYPE.TAAS.RESOURCE_BOOKING_EXPIRATION,
+    type: NOTIFICATION_TYPE.TAAS,
+    rules: [
+      {
+        text: "{{numOfExpiringResourceBookings}} resource booking{{s}} {{be}} expiring in the team <strong>{{teamName}}</strong>",
+        shouldBundle: false,
+        goTo: GOTO.TAAS_PROJECT,
+      }
+    ],
+  },
+
+  {
+    version: 1,
+    eventType: EVENT_TYPE.TAAS.RESOURCE_BOOKING_PLACED,
+    type: NOTIFICATION_TYPE.TAAS,
+    rules: [
+      {
+        text: "Resource <strong>{{userHandle}}</strong> is placed for the job <strong>{{jobTitle}}</strong> of the team <strong>{{teamName}}</strong>",
+        shouldBundle: false,
+        goTo: GOTO.TAAS_PROJECT,
+      }
+    ],
+  },
 ];
 
 // list of ignored notifications

src/containers/NotificationsContainer/index.jsx

@@ -279,7 +279,7 @@ class NotificationsContainer extends Component {
   render() {
     const { notifications, communityNotifications, ...restProps } = this.props;
     const preRenderedNotifications = preRenderNotifications(notifications);
-    const preRenderedNotifications2 = preRenderCommunityNotifications(
+    const preRenderedCommunityNotifications = preRenderCommunityNotifications(
       communityNotifications
     );
 
@@ -288,7 +288,7 @@ class NotificationsContainer extends Component {
         {...{
           ...restProps,
           notifications: preRenderedNotifications,
-          communityNotifications: preRenderedNotifications2,
+          communityNotifications: preRenderedCommunityNotifications,
         }}
       />
     );

src/containers/NotificationsDropdownContainer/index.jsx

@@ -11,6 +11,7 @@ import { TransitionGroup, Transition } from "react-transition-group";
 import {
   getNotifications,
   getCommunityNotifications,
+  getTaaSNotifications,
   toggleNotificationSeen,
   markAllNotificationsRead,
   markAllNotificationsSeen,
@@ -19,7 +20,6 @@ import {
   viewOlderNotifications,
   hideOlderNotifications,
   resetNotifications,
-  resetCommunityNotifications,
 } from "../../actions/notifications";
 import {
   splitNotificationsBySources,
@@ -70,6 +70,7 @@ const NotificationsDropdownContainerView = (props) => {
     toggleNotificationsDropdownMobile,
     toggleNotificationsDropdownWeb,
     markAllNotificationsSeen,
+    platform,
   } = props;
   if (
     (!initialized && isLoading) ||
@@ -154,8 +155,9 @@ const NotificationsDropdownContainerView = (props) => {
     </NotificationsEmpty>
   );
   if (
-    (!isLoading && !initialized) ||
-    (!isCommunityLoading && !communityInitialized)
+    (!isLoading && !initialized && platform == PLATFORM.CONNECT) ||
+    (!isLoading && !initialized && platform == PLATFORM.TAAS) ||
+    (!isCommunityLoading && !communityInitialized && platform == PLATFORM.COMMUNITY)
   ) {
     notificationsEmpty = (
       <NotificationsEmpty message="Fail to load notifications">
@@ -543,10 +545,14 @@ class NotificationsDropdownContainer extends React.Component {
   }
 
   componentWillReceiveProps(nextProps) {
-    const { platform: oldPlatform } = this.props;
+    const {
+      platform: oldPlatform,
+      resetNotifications,
+    } = this.props;
     const { platform } = nextProps;
 
     if (platform !== oldPlatform) {
+      resetNotifications();
       this.getPlatformNotifications(platform);
     }
   }
@@ -555,23 +561,17 @@ class NotificationsDropdownContainer extends React.Component {
     const {
       getNotifications,
       getCommunityNotifications,
+      getTaaSNotifications,
       platform,
-      resetNotifications,
-      resetCommunityNotifications,
     } = this.props;
 
     p = p || platform;
 
-    if (p === PLATFORM.BOTH) {
-      resetNotifications();
-      resetCommunityNotifications();
-      getNotifications();
-      getCommunityNotifications();
-    } else if (p === PLATFORM.CONNECT) {
-      resetCommunityNotifications();
+    if (p === PLATFORM.CONNECT) {
       getNotifications();
+    } else if (p === PLATFORM.TAAS) {
+      getTaaSNotifications();
     } else {
-      resetNotifications();
       getCommunityNotifications();
     }
   }
@@ -619,6 +619,7 @@ const mapStateToProps = ({ notifications }) => notifications;
 const mapDispatchToProps = {
   getNotifications,
   getCommunityNotifications,
+  getTaaSNotifications,
   toggleNotificationSeen,
   markAllNotificationsRead,
   markAllNotificationsSeen,
@@ -627,7 +628,6 @@ const mapDispatchToProps = {
   viewOlderNotifications,
   hideOlderNotifications,
   resetNotifications,
-  resetCommunityNotifications,
 };
 
 export default connect(

src/reducers/notifications.js

@@ -20,7 +20,6 @@ import {
   SET_NOTIFICATION_PLATFORM,
   PLATFORM,
   RESET_NOTIFICATIONS,
-  RESET_COMMUNITY_NOTIFICATIONS,
 } from "../constants/notifications";
 import _ from "lodash";
 import { getActiveAndBroadcastNotifications } from "../utils/notifications";
@@ -266,14 +265,10 @@ export default (state = initialState, action) => {
     case RESET_NOTIFICATIONS:
       return {
         ...state,
+        filterBy: "",
         notifications: [],
-        sources: [],
-      };
-
-    case RESET_COMMUNITY_NOTIFICATIONS:
-      return {
-        ...state,
         communityNotifications: [],
+        sources: [],
         communitySources: [],
       };
 

src/services/notifications.js

@@ -5,6 +5,7 @@ import { URL } from "../../config";
 import {
   prepareNotifications,
   prepareCommunityNotifications,
+  prepareTaaSNotifications,
 } from "../utils/notifications";
 
 const logger = console;
@@ -51,6 +52,14 @@ const getNotifications = () => {
     .then((resp) => prepareNotifications(resp.data.items));
 };
 
+const getTaaSNotifications = () => {
+  return axiosInstance
+    .get(
+      `${URL.TC_NOTIFICATION_URL}/list?read=false&platform=taas&per_page=${NOTIFICATIONS_LIMIT}`
+    )
+    .then((resp) => prepareTaaSNotifications(resp.data.items));
+};
+
 const getCommunityNotifications = () => {
   return axiosInstance
     .get(
@@ -64,4 +73,5 @@ export default {
   getCommunityNotifications,
   markNotificationsRead,
   markNotificationsSeen,
+  getTaaSNotifications,
 };