feat: more nest viewing options

WatWowMap · Aug 19, 2024 · 959116d · 959116d
1 parent 51d3384
commit 959116d
Show file tree

Hide file tree

Showing 16 changed files with 190 additions and 118 deletions.
diff --git a/config/default.json b/config/default.json
@@ -474,7 +474,8 @@
       "allPokemon": true,
       "onlyShowAvailable": true,
       "avgFilter": [0, 100],
-      "avgSliderStep": 1
+      "avgSliderStep": 1,
+      "active": "active"
     },
     "pokestops": {
       "enabled": false,

diff --git a/package.json b/package.json
@@ -35,7 +35,7 @@
   "nodemonConfig": {
     "watch": [
       "server/src/**/*.js",
-      "server/src/configs/default.json",
+      "config/default.json",
       "packages/**/*"
     ],
     "ignore": [

diff --git a/server/src/filters/builder/base.js b/server/src/filters/builder/base.js
@@ -66,10 +66,11 @@ function buildDefaultFilters(perms) {
             enabled: defaultFilters.nests.enabled,
             onlyShowAvailable: defaultFilters.nests.onlyShowAvailable,
             pokemon: defaultFilters.nests.pokemon,
-            polygons: defaultFilters.nests.polygons,
             avgFilter: defaultFilters.nests.avgFilter,
+            polygons: defaultFilters.nests.polygons,
             standard: new BaseFilter(),
             filter: pokemon.nests,
+            active: defaultFilters.nests.active,
           }
         : undefined,
     pokestops:

diff --git a/server/src/models/Nest.js b/server/src/models/Nest.js
@@ -1,5 +1,4 @@
 // @ts-check
-/* eslint-disable no-nested-ternary */
 const { Model } = require('objection')
 const i18next = require('i18next')
 const config = require('@rm/config')
@@ -28,18 +27,29 @@ class Nest extends Model {
   static async getAll(perms, args, { polygon }) {
     const { areaRestrictions } = perms
     const { minLat, minLon, maxLat, maxLon, filters } = args
-    const pokemon = []
-    Object.keys(filters).forEach((pkmn) => {
-      if (!pkmn.startsWith('o')) {
-        pokemon.push(pkmn.split('-')[0])
-      }
-    })
     const query = this.query()
       .select(['*', 'nest_id AS id'])
-      .whereNotNull('pokemon_id')
+      // .whereNotNull('pokemon_id')
       .whereBetween('lat', [minLat, maxLat])
       .andWhereBetween('lon', [minLon, maxLon])
-      .whereIn('pokemon_id', pokemon)
+
+    const pokemon = []
+    if (filters.onlyPokemon) {
+      Object.keys(filters).forEach((pkmn) => {
+        if (!pkmn.startsWith('o')) {
+          pokemon.push(pkmn.split('-')[0])
+        }
+      })
+    }
+
+    if (pokemon.length) {
+      query.whereIn('pokemon_id', pokemon)
+    }
+    if (filters.onlyActive === 'inactive') {
+      query.where('active', false)
+    } else if (filters.onlyActive === 'active') {
+      query.where('active', true)
+    }
     if (
       !config
         .getSafe('defaultFilters.nests.avgFilter')
@@ -91,24 +101,27 @@ class Nest extends Model {
   static secondaryFilter(queryResults, filters, polygon) {
     const returnedResults = []
     queryResults.forEach((pkmn) => {
-      if (pkmn.pokemon_form == 0 || pkmn.pokemon_form === null) {
-        const formId =
-          state.event.masterfile.pokemon[pkmn.pokemon_id].defaultFormId
-        if (formId) pkmn.pokemon_form = formId
-      }
-      if (filters[`${pkmn.pokemon_id}-${pkmn.pokemon_form}`]) {
-        pkmn.polygon_path = polygon
-          ? typeof pkmn.polygon === 'string' && pkmn.polygon
-            ? pkmn.polygon
-            : JSON.stringify(
-                pkmn.polygon || { type: 'Polygon', coordinates: [] },
-              )
-          : JSON.stringify({
-              type: 'Polygon',
-              coordinates: JSON.parse(pkmn.polygon_path || '[]').map((line) =>
-                line.map((point) => [point[1], point[0]]),
-              ),
-            })
+      pkmn.polygon_path = polygon
+        ? typeof pkmn.polygon === 'string' && pkmn.polygon
+          ? pkmn.polygon
+          : JSON.stringify(pkmn.polygon || { type: 'Polygon', coordinates: [] })
+        : JSON.stringify({
+            type: 'Polygon',
+            coordinates: JSON.parse(pkmn.polygon_path || '[]').map((line) =>
+              line.map((point) => [point[1], point[0]]),
+            ),
+          })
+
+      if (pkmn.pokemon_id && filters.onlyPokemon) {
+        if (pkmn.pokemon_form == 0 || pkmn.pokemon_form === null) {
+          const formId =
+            state.event.masterfile.pokemon[pkmn.pokemon_id].defaultFormId
+          if (formId) pkmn.pokemon_form = formId
+        }
+        if (filters[`${pkmn.pokemon_id}-${pkmn.pokemon_form}`]) {
+          returnedResults.push(pkmn)
+        }
+      } else {
         returnedResults.push(pkmn)
       }
     })

diff --git a/server/src/services/DbCheck.js b/server/src/services/DbCheck.js
@@ -70,7 +70,7 @@ module.exports = class DbCheck extends Logger {
           this.endpoints[i] = schema
           return null
         }
-        const logger = new Logger('knex', schema.database)
+        const { log } = new Logger('knex', schema.database)
         return knex({
           client: 'mysql2',
           connection: {
@@ -88,12 +88,12 @@ module.exports = class DbCheck extends Logger {
               conn.query('SET time_zone="+00:00";', (err) => done(err, conn)),
           },
           log: {
-            warn: (message) => logger.warn(message),
-            error: (message) => logger.error(message),
+            warn: (message) => log.warn(message),
+            error: (message) => log.error(message),
             debug: (message) =>
-              logger[
-                config.getSafe('devOptions.queryDebug') ? 'info' : 'debug'
-              ](message),
+              log[config.getSafe('devOptions.queryDebug') ? 'info' : 'debug'](
+                message,
+              ),
             enableColors: true,
           },
         })

diff --git a/server/src/ui/primary.js b/server/src/ui/primary.js
@@ -34,7 +34,6 @@ function generateUi(req, perms) {
       perms.nests && state.db.models.Nest
         ? {
             pokemon: true,
-            polygons: true,
             sliders: {
               secondary: [
                 {
@@ -48,6 +47,8 @@ function generateUi(req, perms) {
                 },
               ],
             },
+            polygons: true,
+            active: true,
           }
         : BLOCKED,
     pokestops:

diff --git a/server/src/utils/reloadConfig.js b/server/src/utils/reloadConfig.js
@@ -81,15 +81,21 @@ async function reloadConfig() {
     const invalid = changed.filter((key) => NO_RELOAD.has(key))
 
     /** @param {string} key */
-    const print = (key) =>
-      log.info(
-        TAGS.config,
-        `'${key}' -`,
-        'old:',
-        dlv(oldWithoutAreas, key),
-        'new:',
-        newConfig.getSafe(key),
-      )
+    const print = (key) => {
+      let newValue
+      let oldValue
+      try {
+        oldValue = dlv(oldWithoutAreas, key)
+      } catch {
+        // do nothing
+      }
+      try {
+        newValue = newConfig.get(key)
+      } catch {
+        // do nothing
+      }
+      log.info(TAGS.config, `'${key}' -`, 'old:', oldValue, 'new:', newValue)
+    }
 
     if (valid.length) {
       log.info(TAGS.config, 'updating the following config values:')

diff --git a/src/components/inputs/MultiSelector.jsx b/src/components/inputs/MultiSelector.jsx
@@ -36,7 +36,7 @@ export function MultiSelector({ items, value, disabled, onClick, tKey }) {
  * @param {{
  *  field: T,
  *  defaultValue?: V,
- *  onClick?: (oldValue: ReturnType<typeof useDeepStore>[0], newValue: V) => void
+ *  onClick?: (oldValue: V, newValue: V) => void
  *  allowNone?: boolean
  * } & Omit<import('@rm/types').MultiSelectorProps<V>, 'value' | 'onClick'>} props
  * @returns
@@ -50,7 +50,7 @@ export function MultiSelectorStore({
 }) {
   const [value, setValue] = useDeepStore(field, defaultValue)
 
-  /** @type {(o: typeof value, n: V) => import('@mui/material').ButtonProps['onClick']} */
+  /** @type {(o: V, n: V) => import('@mui/material').ButtonProps['onClick']} */
   const onClickWrapper = React.useCallback(
     (oldValue, newValue) => () => {
       // @ts-ignore // TODO: fix this

diff --git a/src/features/drawer/S2Cells.jsx b/src/features/drawer/S2Cells.jsx
@@ -29,7 +29,7 @@ const S2Cells = () => {
         sx={{ mx: 'auto', width: '90%' }}
         value={safe}
         renderValue={(selected) =>
-          Array.isArray(selected) ? selected.join(', ') : selected
+          Array.isArray(selected) ? selected.join(', ') : `${selected}`
         }
         multiple
         onChange={({ target }) =>

diff --git a/src/features/drawer/components/Section.jsx b/src/features/drawer/components/Section.jsx
@@ -72,7 +72,10 @@ const DrawerSection = ({ category }) => {
                 category === 'wayfarer' || category === 'admin'
               return (
                 <React.Fragment key={`${category}${subItem}`}>
-                  {!(category === 'nests' && subItem === 'sliders') && (
+                  {!(
+                    category === 'nests' &&
+                    (subItem === 'sliders' || subItem === 'active')
+                  ) && (
                     <BoolToggle
                       // @ts-ignore
                       field={`filters.${

diff --git a/src/features/drawer/nests/ActiveNests.jsx b/src/features/drawer/nests/ActiveNests.jsx
@@ -0,0 +1,19 @@
+import * as React from 'react'
+import ListItem from '@mui/material/ListItem'
+
+import { MultiSelectorStore } from '@components/inputs/MultiSelector'
+import { useStorage } from '@store/useStorage'
+import { CollapsibleItem } from '../components/CollapsibleItem'
+
+const ITEMS = ['active', 'all', 'inactive']
+
+export function ActiveNests() {
+  const show = useStorage((s) => !!s.filters?.nests?.polygons)
+  return (
+    <CollapsibleItem open={show}>
+      <ListItem>
+        <MultiSelectorStore items={ITEMS} field="filters.nests.active" />
+      </ListItem>
+    </CollapsibleItem>
+  )
+}
diff --git a/src/features/drawer/nests/AvgSlider.jsx b/src/features/drawer/nests/AvgSlider.jsx
@@ -3,21 +3,25 @@ import * as React from 'react'
 import ListItem from '@mui/material/ListItem'
 
 import { useMemory } from '@store/useMemory'
-import { useDeepStore } from '@store/useStorage'
+import { useDeepStore, useStorage } from '@store/useStorage'
 import { SliderTile } from '@components/inputs/SliderTile'
+import { CollapsibleItem } from '../components/CollapsibleItem'
 
 const BaseNestSlider = () => {
   const slider = useMemory((s) => s.ui.nests?.sliders?.secondary?.[0])
+  const show = useStorage((s) => !!s.filters?.nests?.pokemon)
   const [filters, setFilters] = useDeepStore(`filters.nests.avgFilter`)
   if (!filters || !slider) return null
   return (
-    <ListItem>
-      <SliderTile
-        slide={slider}
-        handleChange={(_, values) => setFilters(values)}
-        values={filters}
-      />
-    </ListItem>
+    <CollapsibleItem open={show}>
+      <ListItem>
+        <SliderTile
+          slide={slider}
+          handleChange={(_, values) => setFilters(values)}
+          values={filters}
+        />
+      </ListItem>
+    </CollapsibleItem>
   )
 }
 

diff --git a/src/features/drawer/nests/index.jsx b/src/features/drawer/nests/index.jsx
@@ -3,13 +3,16 @@ import * as React from 'react'
 
 import { NestSlider } from './AvgSlider'
 import { NestQuickSelect } from './NestSelector'
+import { ActiveNests } from './ActiveNests'
 
 function BaseNestDrawer({ subItem }) {
   switch (subItem) {
     case 'sliders':
       return <NestSlider />
     case 'pokemon':
       return <NestQuickSelect />
+    case 'active':
+      return <ActiveNests />
     default:
       return null
   }