issue#9: delete events

Author: nursoltan-s

src/shared/containers/timeline-wall/index.jsx

@@ -106,6 +106,7 @@ function TimelineWallContainer(props) {
   const deleteEvent = (id) => {
     deleteEventById(authToken, id, () => {
       getPendingApprovals(authToken);
+      getTimelineEvents();
     });
   };
 
@@ -115,9 +116,15 @@ function TimelineWallContainer(props) {
     });
   };
 
-  const removeEvent = (id, body) => {
-    rejectEventById(authToken, id, body, () => {
+  const removeEvent = (event = {}, body) => {
+    const rejectBody = body;
+    const id = event.id ? event.id : event;
+    if (!body.reason) {
+      rejectBody.reason = 'Deleted by admin.';
+    }
+    rejectEventById(authToken, id, rejectBody, () => {
       getPendingApprovals(authToken);
+      getTimelineEvents();
     });
   };
 
@@ -188,6 +195,7 @@ function TimelineWallContainer(props) {
             getAvatar={getAvatar}
             userAvatars={userAvatars}
             uploading={uploading}
+            deleteEvent={deleteEvent}
           />
           <React.Fragment>
             {

src/shared/containers/timeline-wall/timeline-events/events/event-item/index.jsx

@@ -16,7 +16,7 @@ import './styles.scss';
 import { DEFAULT_AVATAR_URL } from '../../../../../utils/url';
 
 function EventItem({
-  className, isLeft, eventItem, removeEvent, isAdmin, userAvatars,
+  className, isLeft, eventItem, removeEvent, deleteEvent, isAdmin, userAvatars,
 }) {
   const [isExpanded, setIsExpanded] = useState(false);
   const [showModalPhoto, setShowModalPhoto] = useState(false);
@@ -112,13 +112,15 @@ function EventItem({
 
       {showModalDelete ? (
         <ModalDeleteConfirmation
+          id={eventItem.id}
           eventItem={showModalDelete}
           onClose={(result) => {
             if (result === true) {
               removeEvent(showModalDelete);
             }
             setShowModalDelete(false);
           }}
+          deleteEvent={deleteEvent}
         />
       ) : null}
     </div>
@@ -150,6 +152,7 @@ EventItem.propTypes = {
   removeEvent: PT.func,
   isAdmin: PT.bool,
   userAvatars: PT.shape(),
+  deleteEvent: PT.func.isRequired,
 };
 
 export default EventItem;

src/shared/containers/timeline-wall/timeline-events/events/index.jsx

@@ -6,7 +6,7 @@ import EventItem from './event-item';
 const colors = ['green', 'red', 'purple'];
 
 function Events({
-  events, removeEvent, isAuthenticated, getAvatar, userAvatars,
+  events, removeEvent, isAuthenticated, getAvatar, userAvatars, isAdmin, deleteEvent,
 }) {
   const [leftItems, setLeftItems] = useState([]);
   const [rightItems, setRightItems] = useState([]);
@@ -65,6 +65,8 @@ function Events({
             }}
             getAvatar={getAvatar}
             userAvatars={userAvatars}
+            isAdmin={isAdmin}
+            deleteEvent={deleteEvent}
           />
         ))}
       </div>
@@ -80,6 +82,8 @@ function Events({
             }}
             getAvatar={getAvatar}
             userAvatars={userAvatars}
+            isAdmin={isAdmin}
+            deleteEvent={deleteEvent}
           />
         ))}
       </div>
@@ -95,6 +99,8 @@ function Events({
             }}
             getAvatar={getAvatar}
             userAvatars={userAvatars}
+            isAdmin={isAdmin}
+            deleteEvent={deleteEvent}
           />
         ))}
       </div>
@@ -110,6 +116,7 @@ Events.defaultProps = {
   removeEvent: () => { },
   isAuthenticated: false,
   userAvatars: {},
+  isAdmin: false,
 };
 
 /**
@@ -121,6 +128,8 @@ Events.propTypes = {
   isAuthenticated: PT.bool,
   getAvatar: PT.func.isRequired,
   userAvatars: PT.shape(),
+  isAdmin: PT.bool,
+  deleteEvent: PT.func.isRequired,
 };
 
 export default Events;

src/shared/containers/timeline-wall/timeline-events/index.jsx

@@ -22,6 +22,7 @@ function TimelineEvents({
   userAvatars,
   onDoneAddEvent,
   uploading,
+  deleteEvent,
 }) {
   return (
     <div className={className} styleName="container">
@@ -44,6 +45,7 @@ function TimelineEvents({
             }}
             getAvatar={getAvatar}
             userAvatars={userAvatars}
+            deleteEvent={deleteEvent}
           />
         )
           : null}
@@ -112,6 +114,7 @@ TimelineEvents.propTypes = {
   onDoneAddEvent: PT.func.isRequired,
   userAvatars: PT.shape(),
   uploading: PT.bool,
+  deleteEvent: PT.func.isRequired,
 };
 
 export default TimelineEvents;