Merge branch 'release/1.10.0'

Author: maurizi

CHANGELOG.md

@@ -10,6 +10,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 ### Fixed
 
+## [1.10.0] - 2021-09-28
+### Added
+- Add support for uploading reference layers to a project [#902](https://github.com/PublicMapping/districtbuilder/pull/902)
+- Show / delete reference layers for a project [#999](https://github.com/PublicMapping/districtbuilder/pull/999)
+- Copy project template reference layers to project [#1018](https://github.com/PublicMapping/districtbuilder/pull/1018)
+
+### Changed
+- Support extra demographic fields on metrics viewer [#984](https://github.com/PublicMapping/districtbuilder/pull/984)
+- Sort region configs by region code [#1004](https://github.com/PublicMapping/districtbuilder/pull/1004)
+- Fix mini-maps for DC and other small regions [#1009](https://github.com/PublicMapping/districtbuilder/pull/1009)
+
 ## [1.9.0] - 2021-08-30
 
 ### Changed
@@ -32,6 +43,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Add levers to tune LB health check configuration [#950](https://github.com/PublicMapping/districtbuilder/pull/950)
 
+
 ### Changed
 - Parameterize `max_old_space_size` [#942](https://github.com/PublicMapping/districtbuilder/pull/942)
 - Don't define container-level CPU reservation [#942](https://github.com/PublicMapping/districtbuilder/pull/942)
@@ -322,7 +334,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial release.
 
-[unreleased]: https://github.com/publicmapping/districtbuilder/compare/1.9.0...HEAD
+[unreleased]: https://github.com/publicmapping/districtbuilder/compare/1.10.0...HEAD
+[1.10.0]: https://github.com/publicmapping/districtbuilder/compare/1.9.0...1.10.0
 [1.9.0]: https://github.com/publicmapping/districtbuilder/compare/1.8.0...1.9.0
 [1.8.0]: https://github.com/publicmapping/districtbuilder/compare/1.7.2...1.8.0
 [1.7.2]: https://github.com/publicmapping/districtbuilder/compare/1.7.1...1.7.2

deployment/README.md

@@ -113,12 +113,27 @@ This will attempt to apply the plan assembled in the previous step using Amazon'
 
 ## Restart services
 
-After updating TopoJSON assets using the `update-region` command, you will need to restart the ECS services to refresh the cached TopoJSON assets.
+### Starting new tasks
 
-To do so, go to the [ECS task definition](https://console.aws.amazon.com/ecs/home?region=us-east-1#/taskDefinitions) and force a new deployment for the environment (select either `StagingApp_EC2LaunchType` or `ProductionApp_EC2LaunchType` as appropriate).
+After updating TopoJSON assets using the `update-region` command, updating data in S3 directly, or updating the `region_config` table in the staging / production database, you will need to restart the ECS services to refresh the cached TopoJSON assets.
 
-On the next screen, ensure "Force new deployment" is checked and that the selected cluster matches the selected task definition:
-![image](https://user-images.githubusercontent.com/4432106/120369867-e4fabd80-c2e1-11eb-9679-c0a7fa76868d.png)
+Go to the [auto scaling group](https://console.aws.amazon.com/ec2autoscaling/home?region=us-east-1#/details) for the environment you are interested in. Click the Edit button for "Group Details" and set the desired group capacity to be equal to the maximum capacity.
 
-For the next two screens ("Configure network" and "Set Auto Scaling") use the defaults.
+Next, go to the [Staging](https://console.aws.amazon.com/ecs/home?region=us-east-1#/clusters/ecsStagingCluster/services/StagingApp_EC2LaunchType/details) or [Production](https://console.aws.amazon.com/ecs/home?region=us-east-1#/clusters/ecsProductionCluster/services/ProductionApp_EC2LaunchType/details) "EC2LaunchType" service and click "Update".
 
+On the next screen, increase the "Number of tasks" to match the amount you set for the auto-scaling group, and leave everything else as-is.
+
+It will take some time (approx. 20-25 mins) for the new tasks to finish loading all TopoJSON data. You can monitor the progress by looking for `HealthCheckService` logs in the [`logStagingApp` / `logProductionApp` Cloudwatch logs](https://console.aws.amazon.com/cloudwatch/home?region=us-east-1#logsV2:log-groups) or by looking at the number of healthy hosts in the [appropriate target group](https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#TargetGroups:).
+
+### Stopping old tasks
+
+Once all the new tasks are healthy, you will need to stop the old tasks.
+Go to the task list for [staging](https://console.aws.amazon.com/ecs/home?region=us-east-1#/clusters/ecsStagingCluster/tasks) / [production](https://console.aws.amazon.com/ecs/home?region=us-east-1#/clusters/ecsProductionCluster/tasks) and stop any tasks whose "Started At" date is from before increasing the auto scaling group / number of desired tasks (this should be as many tasks as there were before you increased the total).
+
+Next, revert your changes to the [Staging](https://console.aws.amazon.com/ecs/home?region=us-east-1#/clusters/ecsStagingCluster/services/StagingApp_EC2LaunchType/details) or [Production](https://console.aws.amazon.com/ecs/home?region=us-east-1#/clusters/ecsProductionCluster/services/ProductionApp_EC2LaunchType/details) "EC2LaunchType" service to bring the desired number of tasks back down to the previous amount.
+
+The auto-scaling group will automatically reduce in size over time until it is back at the minimum amount again - there is no need to revert the changes to it.
+
+### Updating cache keys
+
+After all of the old tasks have been stopped, you need to update the `region_config.version` column in the database for every region that was updated, in order to trigger updates to cached data for maps in those regions. If you didn't update any existing regions, only added new ones, you can skip this step.

package.json

@@ -20,7 +20,7 @@
     "@szhsin/react-menu": "^1.9.1",
     "@theme-ui/color": "0.4.0-rc.1",
     "@tippyjs/react": "^4.1.0",
-    "@turf/bbox": "^6.0.1",
+    "@turf/bbox": "^6.5.0",
     "@turf/boolean-intersects": "^6.4.0",
     "@turf/circle": "^6.4.0",
     "@turf/distance": "^6.4.0",
@@ -33,14 +33,15 @@
     "@visx/group": "^1.7.0",
     "@visx/responsive": "^1.10.1",
     "@visx/scale": "^1.14.0",
-    "axios": "0.21.1",
+    "axios": "0.21.2",
     "date-fns": "^2.19.0",
     "file-saver": "2.0.1",
     "json-stable-stringify": "^1.0.1",
     "jwt-decode": "2.2.0",
     "lodash": "^4.17.21",
     "mapbox-gl": "1.6.1",
     "memoizee": "0.4.14",
+    "papaparse": "^5.3.1",
     "polylabel": "^1.1.0",
     "prop-types": "15.7.2",
     "query-string": "^7.0.1",
@@ -52,6 +53,7 @@
     "react-dom": "16.11.0",
     "react-file-drop": "3.1.2",
     "react-joyride": "^2.2.1",
+    "react-papaparse": "^3.17.1",
     "react-redux": "7.1.3",
     "react-router": "5.1.2",
     "react-router-dom": "5.1.2",

scripts/load-dev-data

@@ -38,7 +38,7 @@ if [ "${BASH_SOURCE[0]}" = "${0}" ]; then
                 'Dane County',
                 'US',
                 'WI',
-                's3://global-districtbuilder-dev-us-east-1/regions/US/WI/2021-02-08T15:19:22.145Z/',
+                's3://global-districtbuilder-dev-us-east-1/regions/US/WI/2021-09-02T18:57:17.123Z/',
                 DEFAULT,
                 TRUE,
                 DEFAULT
@@ -68,7 +68,7 @@ if [ "${BASH_SOURCE[0]}" = "${0}" ]; then
                 's3://global-districtbuilder-dev-us-east-1/regions/US/DE/2020-09-09T19:50:10.921Z/',
                 DEFAULT,
                 DEFAULT,
-                FALSE
+                TRUE
               ), (
                 '411c5908-2a83-40e9-863b-303931a1c119',
                 'Delaware',
@@ -77,7 +77,7 @@ if [ "${BASH_SOURCE[0]}" = "${0}" ]; then
                 's3://global-districtbuilder-dev-us-east-1/regions/US/DE/2021-06-11T23:03:36.938Z/',
                 DEFAULT,
                 DEFAULT,
-                TRUE
+                FALSE
              )
               ON CONFLICT DO NOTHING;
             "

src/client/actions/districtDrawing.ts

@@ -1,5 +1,5 @@
 import { createAction } from "typesafe-actions";
-import { DistrictId, GeoUnits } from "../../shared/entities";
+import { DistrictId, GeoUnits, ReferenceLayerId } from "../../shared/entities";
 import { SavingState, ElectionYear, EvaluateMetricWithValue } from "../types";
 
 export enum SelectionTool {
@@ -79,6 +79,11 @@ export const selectEvaluationMetric = createAction("Select evaluation metric")<
   EvaluateMetricWithValue | undefined
 >();
 
+export const toggleReferenceLayer = createAction("Show or hide reference layer on map")<{
+  readonly id: ReferenceLayerId;
+  readonly show: boolean;
+}>();
+
 export const saveDistrictsDefinition = createAction("Save districts definition")();
 
 export const setSavingState = createAction("Set saving state")<SavingState>();

src/client/actions/projectData.ts

@@ -3,15 +3,16 @@ import { ProjectVisibility } from "../../shared/constants";
 import {
   DistrictsDefinition,
   IProject,
+  IReferenceLayer,
   LockedDistricts,
-  MetricField,
-  ProjectId
+  ProjectId,
+  ReferenceLayerId
 } from "../../shared/entities";
 import { DynamicProjectData, StaticProjectData } from "../types";
 import { ResourceFailure } from "../resource";
 
 interface PinnedMetrics {
-  readonly pinnedMetricFields: readonly MetricField[];
+  readonly pinnedMetricFields: readonly string[];
   readonly isReadOnly: boolean;
 }
 
@@ -27,6 +28,28 @@ export const projectDataFetchFailure = createAction("Project data fetch failure"
   ResourceFailure
 >();
 
+export const projectReferenceLayersFetch = createAction("Project reference layers fetch")<
+  ProjectId
+>();
+export const projectReferenceLayersFetchSuccess = createAction(
+  "Project reference layers fetch success"
+)<readonly IReferenceLayer[]>();
+export const projectReferenceLayersFetchFailure = createAction(
+  "Project reference layers fetch failure"
+)<ResourceFailure>();
+
+export const referenceLayerDelete = createAction("Reference layer delete")<ReferenceLayerId>();
+export const referenceLayerDeleteSuccess = createAction("Reference layer delete success")<
+  ReferenceLayerId
+>();
+export const referenceLayerDeleteFailure = createAction("Reference layer delete failure")<
+  ResourceFailure
+>();
+
+export const setDeleteReferenceLayer = createAction(
+  "Set the id for the delete reference layer modal"
+)<IReferenceLayer | undefined>();
+
 export const staticDataFetchSuccess = createAction("Static data fetch success")<
   StaticProjectData
 >();
@@ -74,6 +97,8 @@ export const duplicateProject = createAction("Duplicate project")<IProject>();
 export const duplicateProjectSuccess = createAction("Duplicate project success")<IProject>();
 export const duplicateProjectFailure = createAction("Duplicate project failure")<string>();
 
+export const toggleReferenceLayersModal = createAction("Toggle reference layers modal")();
+
 export const clearDuplicationState = createAction("Clear duplication state")();
 
 export const exportCsv = createAction("Export project CSV")<IProject>();

src/client/api.ts

@@ -17,9 +17,17 @@ import {
   RegionConfigId,
   ProjectNest,
   DistrictsImportApiResponse,
-  PlanScoreAPIResponse
+  PlanScoreAPIResponse,
+  IReferenceLayer,
+  ReferenceLayerId,
+  CreateReferenceLayerData
 } from "../shared/entities";
-import { DistrictsGeoJSON, DynamicProjectData, PaginatedResponse } from "./types";
+import {
+  DistrictsGeoJSON,
+  DynamicProjectData,
+  PaginatedResponse,
+  ReferenceLayerWithGeojson
+} from "./types";
 import { getJWT, setJWT } from "./jwt";
 
 const apiAxios = axios.create();
@@ -124,26 +132,10 @@ export async function resetPassword(token: string, password: string): Promise<vo
   });
 }
 
-export async function createProject({
-  name,
-  numberOfDistricts,
-  chamber,
-  regionConfig,
-  districtsDefinition,
-  projectTemplate,
-  populationDeviation
-}: CreateProjectData): Promise<IProject> {
+export async function createProject(data: CreateProjectData): Promise<IProject> {
   return new Promise((resolve, reject) => {
     apiAxios
-      .post("/api/projects", {
-        name,
-        numberOfDistricts,
-        regionConfig,
-        districtsDefinition,
-        chamber,
-        populationDeviation,
-        projectTemplate
-      })
+      .post("/api/projects", data)
       .then(response => resolve(response.data))
       .catch(error => reject(error.response?.data || error));
   });
@@ -187,6 +179,17 @@ export async function fetchProjectGeoJson(id: ProjectId): Promise<DistrictsGeoJS
   });
 }
 
+export async function fetchProjectReferenceLayers(
+  id: ProjectId
+): Promise<readonly IReferenceLayer[]> {
+  return new Promise((resolve, reject) => {
+    apiAxios
+      .get(`/api/reference-layer/project/${id}`)
+      .then(response => resolve(response.data))
+      .catch(error => reject(error.response.data));
+  });
+}
+
 export async function fetchProjects(
   page: number,
   limit: number
@@ -228,7 +231,9 @@ export async function fetchRegionConfigs(): Promise<IRegionConfig> {
   return new Promise((resolve, reject) => {
     apiAxios
       .get("/api/region-configs?sort=name,ASC")
-      .then(response => resolve(response.data))
+      .then(response => {
+        resolve(response.data);
+      })
       .catch(error => reject(error.message));
   });
 }
@@ -319,6 +324,30 @@ export async function importCsv(file: Blob): Promise<DistrictsImportApiResponse>
   });
 }
 
+export async function createReferenceLayer(
+  referenceLayer: CreateReferenceLayerData
+): Promise<ReferenceLayerWithGeojson> {
+  return new Promise((resolve, reject) => {
+    apiAxios
+      .post(`/api/reference-layer/`, referenceLayer)
+      .then(response => {
+        return resolve(response.data);
+      })
+      .catch(error => reject(error.message));
+  });
+}
+
+export async function deleteReferenceLayer(
+  referenceLayerId: ReferenceLayerId
+): Promise<ReferenceLayerId> {
+  return new Promise((resolve, reject) => {
+    apiAxios
+      .delete(`/api/reference-layer/${referenceLayerId}`)
+      .then(() => resolve(referenceLayerId))
+      .catch(error => reject(error.message));
+  });
+}
+
 export async function fetchOrganization(slug: OrganizationSlug): Promise<IOrganization> {
   return new Promise((resolve, reject) => {
     apiAxios