Merge branch 'main' into inspector

Author: nofurtherinformation

app/src/app/components/Toolbar/RecentMapsModal.tsx

@@ -52,7 +52,6 @@ export const RecentMapsModal: React.FC<{
   };
 
   const handleMapDocument = (data: DocumentObject) => {
-    setMapDocument(data);
     clear();
     const urlParams = new URLSearchParams(searchParams.toString());
     urlParams.set('document_id', data.document_id);

app/src/app/utils/ParquetWorker/parquetWorker.ts

@@ -204,7 +204,7 @@ const ParquetWorker: ParquetWorkerClass = {
     } as GeoJSON.FeatureCollection<GeoJSON.Point>;
   },
   async getDemography(mapDocument, brokenIds) {
-    const url = `${PARQUET_URL}/tabular/${mapDocument.districtr_map_slug}.parquet`;
+    const url = `${PARQUET_URL}/tabular/${mapDocument.gerrydb_table}.parquet`;
     const meta = await this.getMetaData(url);
     const ranges = this.mergeRanges(
       ['__parent', ...(brokenIds || [])].map(id =>

app/src/app/utils/api/apiHandlers/getAvailableDistrictrMaps.ts

@@ -10,7 +10,7 @@ interface AvailableDistrictrMapsParams {
 
 export const getAvailableDistrictrMaps = async ({
   group = 'states',
-  limit = 100,
+  limit = 1000,
   offset = 0,
 }: AvailableDistrictrMapsParams): Promise<DistrictrMap[]> => {
   return await axios

backend/app/core/dependencies.py

@@ -90,7 +90,7 @@ def get_document_public(
             literal(document_id).label("document_id"),
             Document.created_at,
             Document.districtr_map_slug,
-            Document.gerrydb_table,
+            DistrictrMap.gerrydb_table_name.label("gerrydb_table"),  # pyright: ignore
             Document.updated_at,
             Document.color_scheme,
             DistrictrMap.parent_layer.label("parent_layer"),  # pyright: ignore

backend/app/main.py

@@ -253,7 +253,7 @@ async def create_document(
             Document.document_id,
             Document.created_at,
             Document.districtr_map_slug,
-            Document.gerrydb_table,
+            DistrictrMap.gerrydb_table_name.label("gerrydb_table"),  # pyright: ignore
             Document.updated_at,
             DistrictrMap.uuid.label("map_uuid"),  # pyright: ignore
             DistrictrMap.parent_layer.label("parent_layer"),  # pyright: ignore
@@ -829,7 +829,7 @@ async def get_projects(
     session: Session = Depends(get_session),
     group: str = Query(default="states"),
     offset: int = Query(default=0, ge=0),
-    limit: int = Query(default=100, le=100),
+    limit: int = Query(default=100, le=1000),
 ):
     gerrydb_views = session.exec(
         select(DistrictrMap)

backend/app/utils.py

@@ -330,6 +330,22 @@ def add_districtr_map_to_map_group(
             DistrictrMap.districtr_map_slug == districtr_map_slug  # pyright: ignore
         )
     ).one()
+    existing_map_group = session.execute(
+        text("""
+        SELECT 1
+        FROM districtrmaps_to_groups
+        WHERE districtrmap_uuid = :uuid
+        AND group_slug = :slug
+    """),
+        {
+            "uuid": districtr_map.uuid,
+            "slug": group_slug,
+        },
+    ).one_or_none()
+
+    if existing_map_group:
+        session.rollback()
+        return
 
     group_stmt = text("""
         INSERT INTO districtrmaps_to_groups (group_slug, districtrmap_uuid)