refactor(auth): drop stale area compat

Author: Mygod

server/src/utils/areaPerms.js

@@ -564,6 +564,7 @@ function normalizeAreaRestrictions(areaRestrictions, req) {
       usesGlobalAreaLookup ? globalAreas : requestAreas,
       usesGlobalAreaLookup ? globalAreaMaps : requestAreaMaps,
       false,
+      'key',
     )
   })
 

src/components/Config.jsx

@@ -13,10 +13,6 @@ import { deepMerge } from '@utils/deepMerge'
 import { useHideElement } from '@hooks/useHideElement'
 import { getGlowRules } from '@utils/getGlowRules'
 import { useScannerSessionStorage } from '@features/scanner'
-import {
-  getScanAreaMenuFeatures,
-  migrateLegacyAreaKeys,
-} from '@features/scanArea/utils'
 import { timeCheck } from '@utils/timeCheck'
 import { analytics } from '@utils/analytics'
 import { checkHoliday } from '@features/holiday'
@@ -53,15 +49,6 @@ export function Config({ children }) {
       const localState = JSON.parse(
         localStorage.getItem('local-state') || '{ "state": {} }',
       )
-      const selectedAreas = localState?.state?.filters?.scanAreas?.filter?.areas
-      const migratedAreas =
-        selectedAreas?.length && data.scanAreasMenu?.length
-          ? migrateLegacyAreaKeys(
-              getScanAreaMenuFeatures(data.scanAreasMenu),
-              selectedAreas,
-              data.user?.perms?.areaRestrictions || [],
-            )
-          : null
 
       /**
        * @template T
@@ -114,20 +101,6 @@ export function Config({ children }) {
       useScannerSessionStorage.setState((prev) => ({
         cooldown: Math.max(prev.cooldown, data.user.cooldown || 0),
       }))
-      if (migratedAreas) {
-        useStorage.setState((prev) => ({
-          filters: {
-            ...prev.filters,
-            scanAreas: {
-              ...prev.filters.scanAreas,
-              filter: {
-                ...prev.filters.scanAreas?.filter,
-                areas: migratedAreas,
-              },
-            },
-          },
-        }))
-      }
       useMemory.setState({
         auth: {
           strategy: data.user?.strategy || '',

src/features/scanArea/ScanAreaTile.jsx

@@ -8,7 +8,7 @@ import { useWebhookStore, handleClick } from '@store/useWebhookStore'
 import { useMemory } from '@store/useMemory'
 import { useStorage } from '@store/useStorage'
 import { getProperName } from '@utils/strings'
-import { getAreaKeys, getValidAreaKeys, migrateLegacyAreaKeys } from './utils'
+import { getAreaKeys, getValidAreaKeys } from './utils'
 
 /**
  *
@@ -28,19 +28,9 @@ function ScanArea(featureCollection) {
     (s) => s.auth.perms.areaRestrictions || [],
   )
   const webhook = useWebhookStore((s) => !!s.mode)
-  const migratedAreas = React.useMemo(
-    () =>
-      migrateLegacyAreaKeys(
-        featureCollection.features,
-        selectedAreas,
-        accessibleAreaKeys,
-      ),
-    [accessibleAreaKeys, featureCollection.features, selectedAreas],
-  )
-  const effectiveSelectedAreas = migratedAreas || selectedAreas
   const selectionKey = React.useMemo(
-    () => [...effectiveSelectedAreas].sort().join(','),
-    [effectiveSelectedAreas],
+    () => [...selectedAreas].sort().join(','),
+    [selectedAreas],
   )
   const orderedFeatureCollection = React.useMemo(
     () => ({
@@ -90,9 +80,9 @@ function ScanArea(featureCollection) {
             )
             const { setAreas } = useStorage.getState()
             const hasAll = areaKeys.every((area) =>
-              effectiveSelectedAreas.includes(area),
+              selectedAreas.includes(area),
             )
-            const legacyGroupKey = layer.feature.properties.parent
+            const groupKey = layer.feature.properties.parent
               ? featureCollection.features.find(
                   (feature) =>
                     !feature.properties.manual &&
@@ -105,7 +95,7 @@ function ScanArea(featureCollection) {
             let nextAreaKeys = areaKeys
             let unselectAll = hasAll
 
-            if (legacyGroupKey && selectedAreas.includes(legacyGroupKey)) {
+            if (groupKey && selectedAreas.includes(groupKey)) {
               const siblingAreaKeys = featureCollection.features
                 .filter(
                   (feature) =>
@@ -116,7 +106,7 @@ function ScanArea(featureCollection) {
                 )
                 .map((feature) => feature.properties.key)
               nextAreaKeys = [
-                legacyGroupKey,
+                groupKey,
                 ...(selectedAreas.includes(layer.feature.properties.key)
                   ? [layer.feature.properties.key]
                   : []),
@@ -127,7 +117,7 @@ function ScanArea(featureCollection) {
               unselectAll = false
             } else if (areaKeys.length > 1 && !hasAll) {
               nextAreaKeys = areaKeys.filter(
-                (area) => !effectiveSelectedAreas.includes(area),
+                (area) => !selectedAreas.includes(area),
               )
             }
 
@@ -145,7 +135,7 @@ function ScanArea(featureCollection) {
             accessibleAreaKeys,
           )
           const isSelected = areaKeys.length
-            ? areaKeys.every((area) => effectiveSelectedAreas.includes(area))
+            ? areaKeys.every((area) => selectedAreas.includes(area))
             : false
           const popupContent = getProperName(name)
           if (layer instanceof Polygon) {

src/features/scanArea/utils.js

@@ -1,16 +1,5 @@
 // @ts-check
 
-/**
- * @param {import('@rm/types').Config['areas']['scanAreasMenu']} scanAreasMenu
- * @returns {Pick<import('@rm/types').RMFeature, 'properties'>[]}
- */
-export function getScanAreaMenuFeatures(scanAreasMenu = []) {
-  return scanAreasMenu.flatMap((parent) => [
-    ...(parent?.details ? [parent.details] : []),
-    ...(parent?.children || []),
-  ])
-}
-
 /**
  * @param {Pick<import('@rm/types').RMFeature, 'properties'>[]} features
  * @param {Pick<import('@rm/types').RMFeature, 'properties'>} feature
@@ -65,35 +54,3 @@ export function getValidAreaKeys(features, accessibleAreaKeys = []) {
     ),
   ]
 }
-
-/**
- * @param {Pick<import('@rm/types').RMFeature, 'properties'>[]} features
- * @param {string[]} selectedAreas
- * @param {string[]} [accessibleAreaKeys]
- * @returns {string[] | null}
- */
-export function migrateLegacyAreaKeys(
-  features,
-  selectedAreas,
-  accessibleAreaKeys = [],
-) {
-  const migrated = new Set(selectedAreas)
-  let changed = false
-
-  features.forEach((feature) => {
-    if (!feature.properties?.key || !migrated.has(feature.properties.key)) {
-      return
-    }
-
-    const areaKeys = getAreaKeys(features, feature, accessibleAreaKeys)
-    if (areaKeys.length === 1 && areaKeys[0] === feature.properties.key) {
-      return
-    }
-
-    migrated.delete(feature.properties.key)
-    areaKeys.forEach((area) => migrated.add(area))
-    changed = true
-  })
-
-  return changed ? [...migrated] : null
-}

src/store/useStorage.js

@@ -7,6 +7,8 @@ import { persist, createJSONStorage } from 'zustand/middleware'
 
 import { setDeep } from '@utils/setDeep'
 
+const SCAN_AREA_FILTER_RESET_VERSION = 1
+
 /**
  * @typedef {{
  *   darkMode: boolean,
@@ -174,6 +176,30 @@ export const useStorage = create(
     {
       name: 'local-state',
       storage: createJSONStorage(() => localStorage),
+      version: SCAN_AREA_FILTER_RESET_VERSION,
+      migrate: (persistedState, version) => {
+        if (
+          !persistedState ||
+          version >= SCAN_AREA_FILTER_RESET_VERSION ||
+          !persistedState.filters?.scanAreas?.filter?.areas
+        ) {
+          return persistedState
+        }
+
+        return {
+          ...persistedState,
+          filters: {
+            ...persistedState.filters,
+            scanAreas: {
+              ...persistedState.filters.scanAreas,
+              filter: {
+                ...persistedState.filters.scanAreas.filter,
+                areas: [],
+              },
+            },
+          },
+        }
+      },
     },
   ),
 )