fix(alerts): fix issue with alert ID type mismatch

fix #459
ibi-group · Jul 29, 2019 · e034d4e · e034d4e
1 parent 2edad94
commit e034d4e
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 10 deletions.
diff --git a/lib/alerts/actions/alerts.js b/lib/alerts/actions/alerts.js
@@ -96,7 +96,7 @@ export function deleteAlert (alert: Alert) {
   }
 }
 
-export function setActiveAlert (alertId: number) {
+function setActiveAlert (alertId: string) {
   return function (dispatch: dispatchFn, getState: getStateFn) {
     const alert = getState().alerts.all.find(a => a.id === alertId)
     if (alert) {
@@ -202,7 +202,7 @@ export function onAlertEditorMount (
         if (!alertId) {
           dispatch(createAlert())
         } else {
-          dispatch(setActiveAlert(+alertId))
+          dispatch(setActiveAlert(alertId))
         }
         if (permissionFilter !== 'edit-alert') {
           dispatch(updatePermissionFilter('edit-alert'))

diff --git a/lib/alerts/components/AlertEditor.js b/lib/alerts/components/AlertEditor.js
@@ -36,7 +36,6 @@ type Props = ContainerProps & {
   project: Project,
   publishableFeeds: Array<Feed>,
   saveAlert: typeof alertActions.saveAlert,
-  setActiveAlert: typeof alertActions.setActiveAlert,
   setActiveProperty: typeof activeAlertActions.setActiveProperty,
   setActivePublished: typeof activeAlertActions.setActivePublished,
   updateActiveEntity: typeof activeAlertActions.updateActiveEntity,

diff --git a/lib/alerts/containers/ActiveAlertEditor.js b/lib/alerts/containers/ActiveAlertEditor.js
@@ -6,8 +6,7 @@ import {
   createAlert,
   deleteAlert,
   onAlertEditorMount,
-  saveAlert,
-  setActiveAlert
+  saveAlert
 } from '../actions/alerts'
 import {
   setActiveProperty,
@@ -44,7 +43,6 @@ const mapDispatchToProps = {
   deleteAlert,
   onAlertEditorMount,
   saveAlert,
-  setActiveAlert,
   setActiveProperty,
   setActivePublished,
   updateActiveEntity

diff --git a/lib/alerts/reducers/alerts.js b/lib/alerts/reducers/alerts.js
@@ -93,7 +93,6 @@ const alerts = (
     case 'RECEIVED_RTD_ALERTS': {
       const entityList = []
       const {project, rtdAlerts} = action.payload
-      // console.log(rtdAlerts)
       const filteredAlerts = rtdAlerts
         ? rtdAlerts
           // For MTC, filter out all alerts that were created with the TRAMS tool,
@@ -107,6 +106,10 @@ const alerts = (
           if (alert && alert.ServiceAlertEntities && alert.ServiceAlertEntities.length > 0) {
             for (var j = 0; j < alert.ServiceAlertEntities.length; j++) {
               const entity = alert.ServiceAlertEntities[j]
+              // FIXME: Cast IDs to strings until RTD updates its types.
+              // See https://github.com/ibi-group/datatools-ui/issues/459
+              entity.Id = `${entity.Id}`
+              entity.AlertId = `${entity.AlertId}`
               if (entity.StopId) {
                 entityList.push({type: 'stop', entity, gtfs: {}})
               }

diff --git a/lib/alerts/util/index.js b/lib/alerts/util/index.js
@@ -153,7 +153,9 @@ function mapRtdEntity (rtdEntity: RtdEntity, project: Project): AlertEntity {
     type = 'MODE'
   }
   return {
-    id,
+    // FIXME: For now RTD incorrectly returns id as an int.
+    // See https://github.com/ibi-group/datatools-ui/issues/459
+    id: `${id}`,
     agency,
     type,
     mode,

diff --git a/lib/gtfs/components/gtfs-search.js b/lib/gtfs/components/gtfs-search.js
@@ -123,6 +123,10 @@ class GtfsSearch extends Component<Props, State> {
         // FIXME: Need to filter on selected feeds?
         .filter(feed => feed.publishedVersionId)
         .map(feed => searchEntitiesWithString(input, feed.publishedVersionId, entities, filterByRoute, filterByStop, user))
+      if (queries.length === 0) {
+        console.warn('No queries to process (there are likely no published feeds).')
+        return
+      }
     }
     return Promise
       .all(queries)

diff --git a/lib/types/index.js b/lib/types/index.js
@@ -757,7 +757,7 @@ export type ZoneInfo = {
 
 export type AlertEntity = {
   agency: ?Feed,
-  id: number,
+  id: string,
   mode?: ?any,
   route?: GtfsRoute & {feed_id: string},
   route_id?: ?string,
@@ -772,7 +772,7 @@ export type Alert = {
   description: string,
   effect: string,
   end: number,
-  id: number,
+  id: string,
   published: boolean,
   start: number,
   title: string,