Merge pull request #205 from CodeForPhilly/US-routing-improvements-from-participant-info-to-Queuetable

US-routing-improvements-from-PInfo-page

Author: medy-io

frontend/src/components/ParticipantInfo.js

@@ -20,6 +20,7 @@ import Button from "@material-ui/core/Button"
 import { observer } from "mobx-react-lite"
 import { useHistory } from "react-router-dom"
 import { format } from "date-fns"
+import { autorun } from "mobx"
 
 const useStyles = makeStyles(theme => ({
   paper: {
@@ -185,7 +186,11 @@ const ParticipantInfo = observer(() => {
     participantIndex > -1
       ? participantStore.updateParticipant()
       : participantStore.createParticipant()
-    history.push("/")
+    autorun(() => {
+      if (participantStore.routeToQueueTable) {
+        history.push("/")
+      }
+    })
   }
 
   const classes = useStyles()

frontend/src/stores/ParticipantStore.js

@@ -15,6 +15,7 @@ export class ParticipantStore {
   params = {}
   visit = {}
   visitList = []
+  @observable routeToQueueTable = false
 
   // Setters
   setParticipantsList = data => {
@@ -50,6 +51,9 @@ export class ParticipantStore {
   setVisitParticipantId = data => {
     this.visit.participant = data
   }
+  setRouteToQueue = data => {
+    this.routeToQueueTable = data
+  }
 
   // Getters
   getParticipantsList = () => {
@@ -135,13 +139,9 @@ export class ParticipantStore {
   })
 
   updateVisit = flow(function*() {
-    const { ok } = yield api.updateVisits(
-      toJS(this.visit.id),
-      toJS(this.participant)
-    )
+    const { ok } = yield api.updateVisits(toJS(this.visit.id), toJS(this.visit))
     if (ok) {
       this.setRouteToQueue(true)
-      this.routeToQueueTable()
     } else {
       // TODO: Handle errors
     }
@@ -156,17 +156,6 @@ export class ParticipantStore {
     }
   })
 
-  getFrontDeskStuff = flow(function*() {
-    const { ok } = yield api.getFrontDeskEvent({
-      participant: this.participant.id,
-    })
-    if (ok) {
-      // TODO: Handle sucess
-    } else {
-      // TODO: Handle errors
-    }
-  })
-
   updateFrontEndDeskEvent = flow(function*() {
     const { ok } = yield api.patchFrontDeskEvent()
     if (ok) {
@@ -182,7 +171,7 @@ export class ParticipantStore {
       event_type: "ARRIVED",
     })
     if (ok) {
-      // TODO: Handle sucess
+      this.setRouteToQueue(true)
     } else {
       // TODO: Handle errors
     }