From e45ee6d8933d887a8f8af7a727aea4c5c08e817c Mon Sep 17 00:00:00 2001
From: cainan <c.whelchel@gmail.com>
Date: Sun, 19 Jan 2025 22:16:23 -0500
Subject: [PATCH] Region filter adjustments.

Regions now stored by the back end and returned to the front end.
This allows it to be manipulated easier. Also allows the regions to
exists for all current spots even if filtered out.

Fies #47
---
 src/@types/Spots.d.ts                    |  3 ++-
 src/api.py                               |  9 +++++++
 src/components/FilterBar/FilterBar.tsx   |  6 +++--
 src/components/SpotViewer/SpotViewer.tsx | 33 +++++++++++++++++-------
 src/db/db.py                             | 12 +++++++++
 5 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/src/@types/Spots.d.ts b/src/@types/Spots.d.ts
index d6ada96..de2f507 100644
--- a/src/@types/Spots.d.ts
+++ b/src/@types/Spots.d.ts
@@ -26,5 +26,6 @@ export interface SpotRow {
     loc_total: number,
     is_qrt: boolean,
     act_cmts: string,
-    cw_wpm: number
+    cw_wpm: number,
+    spot_source: string
 };
diff --git a/src/api.py b/src/api.py
index 03b64fa..a0f2a02 100644
--- a/src/api.py
+++ b/src/api.py
@@ -559,6 +559,15 @@ def import_park_data(self) -> str:
 
         return self._response(
             True, "Park data imported successfully", persist=True)
+    
+    def get_seen_regions(self) -> str:
+        '''
+        Gets a sorted list of distinct regions (POTA) and associations (SOTA)
+        that are in the current set of spots.
+        '''
+        x = self.db.seen_regions
+        # logging.debug(f"return seen regions: {x}")
+        return self._response(True, '', seen_regions=x)
 
     def _do_update(self):
         '''
diff --git a/src/components/FilterBar/FilterBar.tsx b/src/components/FilterBar/FilterBar.tsx
index 39fa6e9..0c9e779 100644
--- a/src/components/FilterBar/FilterBar.tsx
+++ b/src/components/FilterBar/FilterBar.tsx
@@ -22,7 +22,7 @@ export const FilterBar = (props: IFilterBarPros) => {
     const [mode, setMode] = React.useState('');
     const [band, setBand] = React.useState('');
     const [region, setRegion] = React.useState('');
-    const [location, setLocation] = React.useState('');
+    const [loc, setLocation] = React.useState('');
     const [sig, setSig] = React.useState('');
     const [qrt, setQrt] = React.useState(true);
     const [hunted, setHunted] = React.useState(false);
@@ -129,6 +129,8 @@ export const FilterBar = (props: IFilterBarPros) => {
             onlyNew: false
         };
         setData(next);
+
+        location.reload();
     };
 
     function handleQrtSwitch(event: any, checked: boolean): void {
@@ -327,7 +329,7 @@ export const FilterBar = (props: IFilterBarPros) => {
                     <Select
                         labelId="location-lbl"
                         id="location"
-                        value={location}
+                        value={loc}
                         variant='standard'
                         sx={{ minWidth: 100 }}
                         onChange={handleLocationChange}
diff --git a/src/components/SpotViewer/SpotViewer.tsx b/src/components/SpotViewer/SpotViewer.tsx
index e536465..aec1a42 100644
--- a/src/components/SpotViewer/SpotViewer.tsx
+++ b/src/components/SpotViewer/SpotViewer.tsx
@@ -21,6 +21,7 @@ import SpotTimeCell from './SpotTime';
 import { SpotComments } from '../../@types/SpotComments';
 import { getSummitInfo } from '../../pota';
 import { Summit } from '../../@types/Summit';
+import { checkApiResponse } from '../../util';
 
 // https://mui.com/material-ui/react-table/
 
@@ -165,23 +166,35 @@ export default function SpotViewer() {
 
     // when [spots] are set, update regions
     React.useEffect(() => {
-        // parse the current spots and pull out the region specifier from each
-        // location
+        // the backend will parse out the regions for pota and sota (US, CA, W7)
+        // and we will just set the available regions directly in the context.
+        // however, we still parse the current spots and pull out the
+        // location specifier (US-GA, CA-ON) for POTA spots only
+
         if (contextData.locationFilter === "")
             contextData.locations = [];
 
-        spots.map((spot) => {
-            let region = spot.locationDesc.substring(0, 2);
-            if (!contextData.regions.includes(region))
-                contextData.regions.push(region);
+        if (window.pywebview === undefined) {
+            return;
+        }
 
-            let location = spot.locationDesc.substring(0, 5);
-            if (!contextData.locations.includes(location))
-                contextData.locations.push(location);
+        const p = window.pywebview.api.get_seen_regions();
+        p.then((x: string) => {
+            let json = checkApiResponse(x, contextData, setData);
+            if (json.success) {
+                contextData.regions = json.seen_regions;
+                setData(contextData);
+            }
         });
 
+        spots.map((spot) => {
+            if (spot.spot_source == 'POTA') {
+                let location = spot.locationDesc.substring(0, 5);
+                if (!contextData.locations.includes(location))
+                    contextData.locations.push(location);
+            }
+        });
         contextData.locations.sort();
-        setData(contextData);
     }, [spots]);
 
     async function getOtherOps(spotId: number): Promise<string> {
diff --git a/src/db/db.py b/src/db/db.py
index d482336..64fd304 100644
--- a/src/db/db.py
+++ b/src/db/db.py
@@ -103,6 +103,7 @@ def __init__(self):
         self._sq.delete_all_spots()
         self._iq.init_config()
 
+        self.seen_regions = []
         self.band_filter = Bands.NOBAND
         self.region_filter = None
         self.location_filter = None
@@ -175,6 +176,8 @@ def update_all_spots(self, spots_json, sota_spots):
 
         # self._sq.insert_test_spot()  # testing code
 
+        regions = list[str]()
+
         for s in spots_json:
             to_add: Spot = schema.load(s, session=self.session)
             to_add.spot_source = 'POTA'
@@ -189,6 +192,7 @@ def update_all_spots(self, spots_json, sota_spots):
                 x, y = self._lq.get_location_hunts(to_add.locationDesc)
                 to_add.loc_hunts = x
                 to_add.loc_total = y
+                regions.append(to_add.locationDesc[0:2])
 
             to_add.is_qrt = False
 
@@ -207,6 +211,9 @@ def update_all_spots(self, spots_json, sota_spots):
             sota_to_add = Spot()
             sota_to_add.init_from_sota(sota)
 
+            # this is sota association code
+            regions.append(sota_to_add.locationDesc)
+
             statement = sa.select(Spot) \
                 .filter_by(activator=sota['activatorCallsign']) \
                 .filter_by(spot_source='SOTA') \
@@ -227,6 +234,11 @@ def update_all_spots(self, spots_json, sota_spots):
 
         self.session.commit()
 
+        # set regions list to be used by filter front end
+        regions = list(set(regions))
+        regions.sort()
+        self.seen_regions = regions
+
     def update_spot(self, spot_id: int, call: str, ref: str):
         logging.info(f"doing single spot update {spot_id}")
         to_mod: Spot = self.spots.get_spot(spot_id)