Merge pull request #627 from azavea/feature/asu/update-analysis-links

Parameterize and update URLs to analysis files

Author: aaronxsu

CHANGELOG.md

@@ -17,6 +17,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Upgrade Postgres from version 13 to version 17 [#616](https://github.com/azavea/echo-locator/pull/616)
 - Upgrade Django from version 3.2 to 5.2 [#616](https://github.com/azavea/echo-locator/pull/616) [#622](https://github.com/azavea/echo-locator/pull/622)
 - Update SSL cert resource creation with validation [#623](https://github.com/azavea/echo-locator/pull/623)
+- Parameterize and update URLs to analysis files [#627](https://github.com/azavea/echo-locator/pull/627)
 
 ### Fixed
 

scripts/bootstrap

@@ -18,7 +18,7 @@ function pull_env() {
             cp .env.sample .env
             echo "Copied environment variables file from .env.sample to .env for local development."
             echo "Please populate the fields in this file manually."
-        elif aws s3 cp "s3://${ECHOLOCATOR_SETTINGS_BUCKET}/.env" ".env"; then
+        elif aws s3 cp "s3://${ECHOLOCATOR_SETTINGS_BUCKET}/dotenv" ".env"; then
             echo "Updated environment variables file from ${ECHOLOCATOR_SETTINGS_BUCKET}"
         fi
     fi

src/frontend/src/actions/network.js

@@ -3,7 +3,7 @@ import lonlat from "@conveyal/lonlat";
 import fetch, { fetchMultiple } from "@conveyal/woonerf/fetch";
 import { isEmpty } from "lodash";
 
-import { retrieveConfig, storeConfig } from "../config";
+import { retrieveConfig, storeConfig, networks } from "../config";
 import { ACCESSIBILITY_IS_LOADING, ACCESSIBILITY_IS_EMPTY, TAUI_CONFIG_KEY } from "../constants";
 import type { LonLat } from "../types";
 import cacheURL from "../utils/cache-url";
@@ -78,7 +78,7 @@ export const initialize = (startCoordinate?: LonLat) => (dispatch, getState) =>
       console.error("Error parsing localStorage configuration " + TAUI_CONFIG_KEY, e);
     }
 
-    dispatch(loadDataset(config.networks, config.grids, config.pointsOfInterestUrl, start));
+    dispatch(loadDataset(networks, config.grids, config.pointsOfInterestUrl, start));
   }
 };
 

src/frontend/src/config.js

@@ -4,3 +4,26 @@ export const clearLocalStorage = () => window.localStorage.clear();
 export const retrieveConfig = (key) => JSON.parse(window.localStorage.getItem(key));
 export const storeConfig = (key, json) =>
   window.localStorage.setItem(key, JSON.stringify(json, null, "  "));
+
+export const networks = [
+  {
+    name: "Peak",
+    url: `${process.env.NETWORK_URL_ROOT}/peak`,
+    commuter: true,
+  },
+  {
+    name: "Off Peak",
+    url: `${process.env.NETWORK_URL_ROOT}/off-peak`,
+    commuter: true,
+  },
+  {
+    name: "Peak No Express",
+    url: `${process.env.NETWORK_URL_ROOT}/peak-no-express`,
+    commuter: false,
+  },
+  {
+    name: "Off Peak No Express",
+    url: `${process.env.NETWORK_URL_ROOT}/off-peak-no-express`,
+    commuter: false,
+  },
+];

src/frontend/src/config.json

@@ -6,27 +6,5 @@
       "url": "https://d2z7d5345ccuw9.cloudfront.net/5c9bdffa37ed813dbe27f8f1/Workers_with_earnings_1250_per_month_or_less.grid",
       "showOnMap": true
     }
-  ],
-  "networks": [
-    {
-      "name": "Peak",
-      "url": "https://d2z7d5345ccuw9.cloudfront.net/5c9bdffa37ed813dbe27f8f1",
-      "commuter": true
-    },
-    {
-      "name": "Off Peak",
-      "url": "https://d2z7d5345ccuw9.cloudfront.net/5c9be04737ed813dbe27f8f3",
-      "commuter": true
-    },
-    {
-      "name": "Peak No Express",
-      "url": "https://d2z7d5345ccuw9.cloudfront.net/5cb8ebc037ed813dbe29182e",
-      "commuter": false
-    },
-    {
-      "name": "Off Peak No Express",
-      "url": "https://d2z7d5345ccuw9.cloudfront.net/5cb8ebe437ed813dbe291830",
-      "commuter": false
-    }
   ]
 }

src/frontend/src/reducers/data.js

@@ -1,5 +1,7 @@
 // @flow
+
 import { handleActions } from "redux-actions";
+import { networks } from "../config";
 
 export default handleActions(
   {
@@ -159,6 +161,7 @@ export default handleActions(
     },
   },
   {
+    // TODO: grids are irrelevant and can be scrapped once we move away from Taui
     grids: [
       {
         name: "home locations",
@@ -167,28 +170,7 @@ export default handleActions(
         showOnMap: true,
       },
     ],
-    networks: [
-      {
-        name: "Peak",
-        url: "https://d2z7d5345ccuw9.cloudfront.net/5c9bdffa37ed813dbe27f8f1",
-        commuter: true,
-      },
-      {
-        name: "Off Peak",
-        url: "https://d2z7d5345ccuw9.cloudfront.net/5c9be04737ed813dbe27f8f3",
-        commuter: true,
-      },
-      {
-        name: "Peak No Express",
-        url: "https://d2z7d5345ccuw9.cloudfront.net/5cb8ebc037ed813dbe29182e",
-        commuter: false,
-      },
-      {
-        name: "Off Peak No Express",
-        url: "https://d2z7d5345ccuw9.cloudfront.net/5cb8ebe437ed813dbe291830",
-        commuter: false,
-      },
-    ],
+    networks,
     neighborhoods: {},
     neighborhoodBounds: {},
     page: 0,