Merge pull request #366 from OpenGeoscience/eslint

brianhelba · web-flow · commit 72c5ef13dd12 · 2026-03-20T13:12:21.000-04:00
Resolve some ESLint issues
diff --git a/web/eslint.config.ts b/web/eslint.config.ts
@@ -19,10 +19,7 @@ export default defineConfigWithVueTs(
       '@typescript-eslint/no-explicit-any': 'off',
       // Temporary ignores until rules can be fixed
       'vue/require-v-for-key': 'off',
-      'prefer-const': 'off',
-      '@typescript-eslint/no-unused-vars': 'off',
       'vue/valid-v-for': 'off',
-      '@typescript-eslint/ban-ts-comment': 'off',
       'vue/return-in-computed-property': 'off',
       'vue/no-ref-as-operand': 'off',
       'vue/no-side-effects-in-computed-properties': 'off',
diff --git a/web/src/components/ControlsBar.vue b/web/src/components/ControlsBar.vue
@@ -75,8 +75,6 @@ function createBasemapPreviews() {
         bounds,
       });
 
-      // Ignore typing due to "Type instantiation is excessively deep and possibly infinite"
-      // @ts-ignore
       preview.setStyle(basemap.style);
       basemapPreviews.value[basemap.id] = preview;
     })
diff --git a/web/src/components/map/LegacyMap.vue b/web/src/components/map/LegacyMap.vue
@@ -6,7 +6,6 @@ import "maplibre-gl/dist/maplibre-gl.css";
 
 import MapTooltip from "./MapTooltip.vue";
 import { oauthClient } from "@/api/auth";
-import { THEMES } from "@/themes";
 
 import { useAppStore, useMapStore, useLayerStore } from "@/store";
 const appStore = useAppStore();
diff --git a/web/src/components/map/MapTooltip.vue b/web/src/components/map/MapTooltip.vue
@@ -74,7 +74,8 @@ const rasterValue = computed(() => {
       const data = mapStore.rasterTooltipDataCache[raster.id]?.data;
       if (data) {
         const { lng, lat } = clickedFeature.value.pos;
-        let { xmin, xmax, ymin, ymax, srs } = raster.metadata.bounds;
+        const { srs } = raster.metadata.bounds;
+        let { xmin, xmax, ymin, ymax } = raster.metadata.bounds;
         [xmin, ymin] = proj4(srs, "EPSG:4326", [xmin, ymin]);
         [xmax, ymax] = proj4(srs, "EPSG:4326", [xmax, ymax]);
         // Convert lat/lng to array indices
diff --git a/web/src/components/map/ToggleCompareMap.vue b/web/src/components/map/ToggleCompareMap.vue
@@ -7,7 +7,7 @@ import { ToggleCompare } from "vue-maplibre-compare";
 import { oauthClient } from "@/api/auth";
 import 'vue-maplibre-compare/dist/vue-maplibre-compare.css'
 import { addProtocol, AttributionControl, Popup } from "maplibre-gl";
-import type { StyleSpecification, Map, ResourceType } from "maplibre-gl";
+import type { StyleSpecification, Map } from "maplibre-gl";
 import { useTheme } from 'vuetify';
 import { Protocol } from "pmtiles";
 import { storeToRefs } from "pinia";
@@ -152,7 +152,7 @@ watch(() => appStore.openSidebars, () => {
   setAttributionControlStyle();
 });
 
-const transformRequest = (url: string, _resourceType?: ResourceType) => {
+const transformRequest = (url: string) => {
     // Only add auth headers to our own tile requests
     if (url.includes(import.meta.env.VITE_APP_API_ROOT)) {
         return {
@@ -163,7 +163,6 @@ const transformRequest = (url: string, _resourceType?: ResourceType) => {
     return { url };
 }
 
-// @ts-ignore for "Type instantiation is excessively deep and possibly infinite"
 const mapStyleA: Ref<StyleSpecification | string> = ref(mapStore.currentBasemap?.style as StyleSpecification);
 watch(isComparing, (newVal) => {
    if (!newVal && mapStore.map) {
diff --git a/web/src/components/projects/DatasetUpload.vue b/web/src/components/projects/DatasetUpload.vue
@@ -130,10 +130,10 @@ function submit() {
         }
         const layerOptions = await Promise.all(
             layers.value.map(async (l) => {
-                let fileValues = await Promise.all(
+                const fileValues = await Promise.all(
                     l.files.map(async (f) => await uploadFile(f))
                 )
-                let fileItems = await Promise.all(
+                const fileItems = await Promise.all(
                     l.files.map(async (f, i) => await createFileItem({
                         name: f.name,
                         file: fileValues[i],
diff --git a/web/src/components/projects/ProjectConfig.vue b/web/src/components/projects/ProjectConfig.vue
@@ -10,7 +10,7 @@ import {
   deleteProject,
   patchProject,
 } from "@/api/rest";
-import type { Project, Dataset, TaskResult } from "@/types";
+import type { Project, Dataset } from "@/types";
 
 import { useMapStore, useAppStore, useProjectStore } from "@/store";
 const projectStore = useProjectStore();
@@ -208,7 +208,7 @@ function handleEditFocus(focused: boolean) {
   }
 }
 
-function datasetUploaded(result: {dataset: Dataset, conversionTask: TaskResult}) {
+function datasetUploaded() {
   projectStore.refreshAllDatasets()
   refreshProjectDatasets(null)
 }
diff --git a/web/src/components/sidebars/CompareLayerStyle.vue b/web/src/components/sidebars/CompareLayerStyle.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-import { computed, onMounted, ref, watch } from 'vue';
+import { computed, ref, watch } from 'vue';
 import type { Ref } from 'vue';
 import type { Layer, LayerStyle, StyleSpec } from '@/types';
 import { getLayerStyles } from '@/api/rest';
 import SliderNumericInput from '../SliderNumericInput.vue';
 
 import { useStyleStore, usePanelStore, useLayerStore, useMapStore } from '@/store';
-import { cloneDeep, debounce, map } from 'lodash';
+import { cloneDeep } from 'lodash';
 import { useMapCompareStore } from '@/store/compare';
 const styleStore = useStyleStore();
 const panelStore = usePanelStore();
diff --git a/web/src/components/sidebars/FloatingPanel.vue b/web/src/components/sidebars/FloatingPanel.vue
@@ -27,7 +27,7 @@ function getPanelContainerClass() {
 }
 
 function getPanelContainerStyle() {
-  let styleObj: Record<string, string> = {};
+  const styleObj: Record<string, string> = {};
   styleObj.order = panel.value?.order.toString() || '0';
   if (!panel.value?.position) {
     if (panel.value?.height && !panel.value.collapsed) {
@@ -39,7 +39,7 @@ function getPanelContainerStyle() {
 }
 
 function getPanelStyle() {
-  let styleObj: Record<string, string> = {};
+  const styleObj: Record<string, string> = {};
   if (panel.value?.position) {
     styleObj["z-index"] = "2"; // above vuetify navigation drawer
     styleObj.visibility = "visible"; // prevent hiding when sidebar closes
diff --git a/web/src/components/sidebars/LayerStyle.vue b/web/src/components/sidebars/LayerStyle.vue
@@ -45,8 +45,8 @@ const colormaps = computed(() => styleStore.colormaps);
 
 const projectPermission = computed(() => {
     if (!projectStore.currentProject || !appStore.currentUser) return 'none'
-    let user = appStore.currentUser
-    let proj = projectStore.currentProject
+    const user = appStore.currentUser
+    const proj = projectStore.currentProject
     let perm = 'follower'
     if (proj.owner?.id === user.id || user.is_superuser ) {
         perm = "owner";
diff --git a/web/src/components/sidebars/LegendPanel.vue b/web/src/components/sidebars/LegendPanel.vue
@@ -26,12 +26,12 @@ function getColormapPreviews(layer: Layer) {
     )
     const vector = currentFrame?.vector
     return currentStyleSpec.colors.map((colorConfig) => {
-        let name = colorConfig.name
+        const name = colorConfig.name
         let discrete = false;
         let nColors = 1;
         let colorBy = undefined;
         let range: [number | undefined, number | undefined] = [undefined, undefined];
-        let useFeatureProps = vector && colorConfig.use_feature_props;
+        const useFeatureProps = vector && colorConfig.use_feature_props;
         let valueColors = undefined
         let colormap = styleStore.colormaps.find((cmap) => cmap.id === colorConfig.colormap?.id)
         if (colormap) {
diff --git a/web/src/components/sidebars/NodeAnimation.vue b/web/src/components/sidebars/NodeAnimation.vue
@@ -67,7 +67,7 @@ function rewind() {
 
 watch(currentTick, async () => {
   if (nodeChanges.value) {
-    let deactivated = nodeChanges.value[currentTick.value];
+    const deactivated = nodeChanges.value[currentTick.value];
     if (props.network) networkStore.setNetworkDeactivatedNodes(props.network, deactivated || [], true);
     if (props.additionalAnimationLayers) {
       props.additionalAnimationLayers.forEach((layer) => {
diff --git a/web/src/store/compare.ts b/web/src/store/compare.ts
@@ -1,7 +1,7 @@
 import { defineStore } from 'pinia';
-import { computed, ref, watch } from 'vue';
+import { ref, watch } from 'vue';
 import { useLayerStore } from './layer';
-import { cloneDeep, map } from 'lodash';
+import { cloneDeep } from 'lodash';
 import { useMapStore } from './map';
 import { useStyleStore } from './style';
 import type { MapLayerStyleRaw } from './style';
@@ -37,10 +37,10 @@ function findSourceDifferences(
     if (!existingStyle) {
         return { added: Object.keys(newStyle.sources), removed: [] };
     }
-    
+
     const existing = new Set(Object.keys(existingStyle.sources));
     const current = new Set(Object.keys(newStyle.sources));
-    
+
     return {
         added: Array.from(current).filter(id => !existing.has(id)),
         removed: Array.from(existing).filter(id => !current.has(id)),
@@ -58,10 +58,10 @@ function findLayerDifferences(
     if (!existingStyle) {
         return { added: newStyle.layers, removed: [] };
     }
-    
+
     const existing = new Set(existingStyle.layers.map((l: any) => l.id));
     const current = new Set(newStyle.layers.map((l: any) => l.id));
-    
+
     return {
         added: newStyle.layers.filter((l: any) => !existing.has(l.id)),
         removed: Array.from(existing).filter(id => !current.has(id)),
@@ -96,7 +96,7 @@ export const useMapCompareStore = defineStore('mapCompare', () => {
         A: {},
         B: {},
     });
-    
+
 
     const initializeComparing = () => {
         const map = mapStore.getMap();
@@ -161,7 +161,7 @@ export const useMapCompareStore = defineStore('mapCompare', () => {
         mapStats.value.center = event.center;
         mapStats.value.zoom = event.zoom;
         mapStats.value.bearing = event.bearing;
-        mapStats.value.pitch = event.pitch;  
+        mapStats.value.pitch = event.pitch;
     }
     function updateSlider(event: { percentage: number, position: number }) {
         sliderEnd.value = event;
@@ -222,7 +222,7 @@ export const useMapCompareStore = defineStore('mapCompare', () => {
         if (newVal) {
             initializeComparing();
         }
-    }); 
+    });
 
     /**
      * Reapply stored opacity values to all layers in compare mode
@@ -234,59 +234,59 @@ export const useMapCompareStore = defineStore('mapCompare', () => {
         // Process both map A and map B
         (['A', 'B'] as const).forEach((panel) => {
             const storedStyles = compareLayerStyles.value[panel];
-            
+
             // Iterate through all stored layer styles
             Object.entries(storedStyles).forEach(([styleKey, storedStyle]) => {
                 // Parse the style key to get layer id and copy_id
                 const [layerIdStr, copyIdStr] = styleKey.split('.');
                 const layerId = parseInt(layerIdStr);
                 const copyId = parseInt(copyIdStr);
-                
+
                 // Find the layer object
                 const layer = layerStore.selectedLayers.find(
                     (l) => l.id === layerId && l.copy_id === copyId
                 );
-                
+
                 if (!layer) return;
-                
+
                 // Get all map layer IDs for this layer
                 const mapLayerIds = layerStore.getMapLayersFromLayerObject(layer).flat();
-                
+
                 // Get the current frame
                 const frames = layerStore.layerFrames(layer);
                 const currentFrame = frames.find(
                     (f) => f.index === layer.current_frame_index
                 );
-                
+
                 if (!currentFrame) return;
-                
+
                 // Get the stored style spec with the stored opacity
                 const styleSpec = storedStyle.style?.style_spec;
                 if (!styleSpec) return;
-                
+
                 // Update the opacity in the style spec to match stored value
                 const styleSpecWithOpacity = cloneDeep(styleSpec);
                 styleSpecWithOpacity.opacity = storedStyle.opacity;
-                
+
                 // Apply the style to all map layers for this layer
                 mapLayerIds.forEach((mapLayerId) => {
                     // Check if the map layer exists in the main map (required for returnMapLayerStyle)
                     const mainMap = mapStore.getMap();
                     if (!mainMap || !mainMap.getLayer(mapLayerId)) {
                         return;
                     }
-                    
+
                     const visibileLayers = panel === 'A' ? mapLayersA.value : mapLayersB.value;
                     const visibility = visibileLayers.includes(mapLayerId) ? 'visible' : 'none';
-                    
+
                     const result = styleStore.returnMapLayerStyle(
                         mapLayerId,
                         styleSpecWithOpacity,
                         currentFrame,
                         currentFrame.vector,
                         visibility
                     );
-                    
+
                     if (result) {
                         updateMapLayerStyle(panel, mapLayerId, result);
                     }
@@ -298,19 +298,19 @@ export const useMapCompareStore = defineStore('mapCompare', () => {
     function updateCompareLayerStyle() {
         const compareMapAddedSources: {sourceId: string, sourceType: SourceSpecification['type']}[] = [];
         if (!isComparing.value) return compareMapAddedSources;
-        
+
         const newStyle = mapStore.getMap()?.getStyle();
         if (!newStyle || !mapAStyle.value || !mapBStyle.value) {
             mapAStyle.value = newStyle;
             mapBStyle.value = newStyle;
             return compareMapAddedSources;
         }
-        
+
         // Process both maps
         (['A', 'B'] as const).forEach((panel) => {
             const mapStyle = panel === 'A' ? mapAStyle.value : mapBStyle.value;
             if (!mapStyle) return;
-            
+
             // Handle sources
             const sourceDiff = findSourceDifferences(newStyle, mapStyle);
             sourceDiff.added.forEach((sourceId) => {
@@ -325,7 +325,7 @@ export const useMapCompareStore = defineStore('mapCompare', () => {
             sourceDiff.removed.forEach((sourceId) => {
                 delete mapStyle.sources[sourceId];
             });
-            
+
             // Handle layers
             const layerDiff = findLayerDifferences(newStyle, mapStyle);
             layerDiff.added.forEach((layer) => {
@@ -335,7 +335,7 @@ export const useMapCompareStore = defineStore('mapCompare', () => {
                 mapStyle.layers = mapStyle.layers.filter((l: any) => l.id !== layerId);
             });
         });
-        
+
         generateDisplayLayers();
         reapplyStoredOpacityValues();
         return compareMapAddedSources;
@@ -347,7 +347,7 @@ export const useMapCompareStore = defineStore('mapCompare', () => {
             if (isComparing.value && mapStore.compareMap) {
                 if (sourceType === 'vector') {
                     mapStore.setupVectorLayerClickHandlers(mapStore.compareMap, sourceId, mapStore.handleCompareLayerClick);
-                } 
+                }
             }
         });
     }, { deep: true });
diff --git a/web/src/store/map.ts b/web/src/store/map.ts
@@ -155,7 +155,6 @@ export const useMapStore = defineStore('map', () => {
 
   function setBasemapToDefault() {
     if (!currentBasemap.value || currentBasemap.value.name.toLowerCase().includes('basic')) {
-      // @ts-ignore for "Type instantiation is excessively deep and possibly infinite"
       currentBasemap.value = availableBasemaps.value.find((basemap) => {
         return basemap.name.toLowerCase() === 'basic ' + appStore.theme
       })
@@ -314,7 +313,7 @@ export const useMapStore = defineStore('map', () => {
 
     // Must collect all source Ids so they can be removed after all layers
     // have been removed, since multple layers may use the same source
-    let sourceIdsToRemove = new Set<string>();
+    const sourceIdsToRemove = new Set<string>();
     const updatedLayerIds: string[] = [];
     layerIds.forEach((id) => {
       // Rasters have implicit bounds layers that also need to be removed
@@ -520,7 +519,8 @@ export const useMapStore = defineStore('map', () => {
 
     const bounds = raster.metadata.bounds;
     const boundsSourceId = sourceId.replace('raster', 'bounds');
-    let { xmin, xmax, ymin, ymax, srs } = bounds;
+    const { srs } = bounds;
+    let { xmin, xmax, ymin, ymax } = bounds;
     [xmin, ymin] = proj4(srs, "EPSG:4326", [xmin, ymin]);
     [xmax, ymax] = proj4(srs, "EPSG:4326", [xmax, ymax]);
     map.addSource(boundsSourceId, {
diff --git a/web/src/store/network.ts b/web/src/store/network.ts
@@ -175,7 +175,7 @@ export const useNetworkStore = defineStore('network', () => {
     async function isNodeActive(nodeId: number, dataset: Dataset) {
         const network = await getNetwork(nodeId, dataset);
         if (network) {
-            let deactivated = Array.from(networkStates.value[network.id]?.deactivated?.nodes || []);
+            const deactivated = Array.from(networkStates.value[network.id]?.deactivated?.nodes || []);
             return !deactivated.includes(nodeId)
         }
     }
diff --git a/web/src/store/project.ts b/web/src/store/project.ts
diff --git a/web/src/store/style.ts b/web/src/store/style.ts

Original file line number	Diff line number	Diff line change
`@@ -130,10 +130,10 @@ function submit() {`
`130`	`130`	`}`
`131`	`131`	`const layerOptions = await Promise.all(`
`132`	`132`	`layers.value.map(async (l) => {`
`133`		`- let fileValues = await Promise.all(`
	`133`	`+ const fileValues = await Promise.all(`
`134`	`134`	`l.files.map(async (f) => await uploadFile(f))`
`135`	`135`	`)`
`136`		`- let fileItems = await Promise.all(`
	`136`	`+ const fileItems = await Promise.all(`
`137`	`137`	`l.files.map(async (f, i) => await createFileItem({`
`138`	`138`	`name: f.name,`
`139`	`139`	`file: fileValues[i],`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import {`
`10`	`10`	`deleteProject,`
`11`	`11`	`patchProject,`
`12`	`12`	`} from "@/api/rest";`
`13`		`-import type { Project, Dataset, TaskResult } from "@/types";`
	`13`	`+import type { Project, Dataset } from "@/types";`
`14`	`14`
`15`	`15`	`import { useMapStore, useAppStore, useProjectStore } from "@/store";`
`16`	`16`	`const projectStore = useProjectStore();`
`@@ -208,7 +208,7 @@ function handleEditFocus(focused: boolean) {`
`208`	`208`	`}`
`209`	`209`	`}`
`210`	`210`
`211`		`-function datasetUploaded(result: {dataset: Dataset, conversionTask: TaskResult}) {`
	`211`	`+function datasetUploaded() {`
`212`	`212`	`projectStore.refreshAllDatasets()`
`213`	`213`	`refreshProjectDatasets(null)`
`214`	`214`	`}`