clean up labels

Author: miles-grant-ibigroup

lib/editor/actions/editor.js

@@ -511,9 +511,11 @@ export function fetchBaseGtfs ({
             id
             from_leg_group_id
             to_leg_group_id
+            fare_product_id
           }
           fare_leg_rule (limit: -1) {
             fare_product_id
+            leg_group_id
             id
           }
           routes (limit: -1) {

lib/editor/util/gtfs.js

@@ -244,7 +244,16 @@ export function getEntityName (entity: any): string {
     nameKey = 'description'
   } else if (typeof entity.fare_id !== 'undefined') {
     nameKey = 'fare_id'
+  } else if (typeof entity.fare_product_id !== 'undefined' && typeof entity.fare_media_id !== 'undefined') {
+    nameKey = 'fare_product_id'
+  } else if (typeof entity.fare_media_id !== 'undefined') {
+    nameKey = 'fare_media_id'
+  } else if (typeof entity.from_leg_group_id !== 'undefined' && typeof entity.to_leg_group_id !== 'undefined' && entity.fare_product_id !== 'undefined') {
+    nameKey = 'fare_transfer_rule_id' // FARE-TODO: fare_media_name? Some combo?
+  } else if (typeof entity.fare_product_id !== 'undefined' && typeof entity.leg_group_id !== 'undefined') {
+    nameKey = 'fare_leg_rule_id' // FARE-TODO: fare_media_name? Some combo?
   }
+
   // FARE-TODO: what to do with fare_transfer_rules.txt?
   // FARE-TODO: what to do with fare_leg_rules.txt?
   if (typeof entity.exemplar !== 'undefined') {
@@ -281,6 +290,15 @@ export function getEntityName (entity: any): string {
       return `${serviceCalendar.service_id} ${serviceCalendar.description
         ? `(${serviceCalendar.description})`
         : ''}`
+    case 'fare_product_id':
+      // FARE-TODO: type!
+      return `${entity.fare_product_id} (${entity.fare_media_id})`
+    case 'fare_transfer_rule_id':
+      // FARE-TODO: type!
+      return `${entity.from_leg_group_id} ➡️ ${entity.to_leg_group_id} (${entity.fare_product_id})`
+    case 'fare_leg_rule_id':
+      // FARE-TODO: type!
+      return `${entity.fare_product_id} (${entity.leg_group_id})`
     default:
       const otherEntityType: any = entity
       return otherEntityType[nameKey] || NO_NAME

lib/editor/util/objects.js

@@ -1,13 +1,20 @@
 // @flow
 import {ENTITY} from '../constants'
 import {camelCaseKeys, snakeCaseKeys} from '../../common/util/map-keys'
-
 import type {Entity} from '../../types'
 
 export function componentToText (component: string): string {
   switch (component) {
     case 'scheduleexception':
       return 'exception'
+    case 'fareproduct':
+      return 'product'
+    case 'faremedia':
+      return 'media'
+    case 'faretransferrule':
+      return 'transfer rule'
+    case 'farelegrule':
+      return 'leg rule'
     default:
       return component
   }

lib/editor/util/ui.js

@@ -80,31 +80,31 @@ export const GTFS_ICONS = [
     icon: 'shopping-cart',
     addable: true,
     title: 'FARE PRODUCT TEST TITLE',
-    label: 'FARE PRODUCT TEST LABEL'
+    label: 'V2: Products'
   },
   {
     id: 'faremedia',
     tableName: 'faremedia',
     icon: 'id-card',
     addable: true,
     title: 'FARE MEDIA TEST TITLE',
-    label: 'FARE MEDIA TEST LABEL'
+    label: 'V2: Media'
   },
   {
     id: 'faretransferrule',
     tableName: 'faretransferrule',
     icon: 'link',
     addable: true,
     title: 'FARE TRANSFER RULE TEST TITLE',
-    label: 'FARE TRANSFER RULE TEST LABEL'
+    label: 'V2: Transfer Rules'
   },
   {
     id: 'farelegrule',
     tableName: 'farelegrule',
     icon: 'book',
     addable: true,
     title: 'FARE LEG RULE TEST TITLE',
-    label: 'FARE LEG RULE TEST LABEL'
+    label: 'V2: Leg Rules'
   }
 ]