From c64092294e40c1a58ebcce43b26c3e9704c57ca4 Mon Sep 17 00:00:00 2001 From: Werner Kramer Date: Tue, 16 Jan 2024 17:02:11 +0100 Subject: [PATCH 1/2] Fix regresion in useTimeSeries --- src/services/useTimeSeries/index.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/services/useTimeSeries/index.ts b/src/services/useTimeSeries/index.ts index 21629995a..559068c8d 100644 --- a/src/services/useTimeSeries/index.ts +++ b/src/services/useTimeSeries/index.ts @@ -4,7 +4,7 @@ import { type TimeSeriesFilter, type TimeSeriesEvent, } from '@deltares/fews-pi-requests' -import { onUnmounted, ref, shallowRef, toValue, watchEffect } from 'vue' +import { onUnmounted, ref, shallowRef, toValue, watch } from 'vue' import type { MaybeRefOrGetter, Ref } from 'vue' import { absoluteUrl } from '../../lib/utils/absoluteUrl' import { DateTime, Interval } from 'luxon' @@ -64,10 +64,9 @@ export function useTimeSeries( const error = shallowRef(undefined) const MAX_SERIES = 20 - watchEffect(() => { + watch([lastUpdated, requests, options], () => { controller.abort() controller = new AbortController() - toValue(lastUpdated) const piProvider = new PiWebserviceProvider(baseUrl, { transformRequestFn: createTransformRequestFn(controller), }) From 50f725cbd4db5a140c69a946a71a351867752806 Mon Sep 17 00:00:00 2001 From: Werner Kramer Date: Wed, 17 Jan 2024 08:52:15 +0100 Subject: [PATCH 2/2] Add missing geojson package --- package-lock.json | 16 ++++++++++++++++ package.json | 1 + 2 files changed, 17 insertions(+) diff --git a/package-lock.json b/package-lock.json index 7445beefd..68d96dd3a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -47,6 +47,7 @@ "eslint": "^8.52.0", "eslint-config-prettier": "^9.0.0", "eslint-plugin-vue": "^9.18.1", + "geojson": "^0.5.0", "prettier": "3.0.3", "sonarqube-scanner": "^3.1.0", "typescript": "^5.2.2", @@ -3254,6 +3255,15 @@ "node": ">= 0.6.0" } }, + "node_modules/geojson": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/geojson/-/geojson-0.5.0.tgz", + "integrity": "sha512-/Bx5lEn+qRF4TfQ5aLu6NH+UKtvIv7Lhc487y/c8BdludrCTpiWf9wyI0RTyqg49MFefIAvFDuEi5Dfd/zgNxQ==", + "dev": true, + "engines": { + "node": ">= 0.10" + } + }, "node_modules/geojson-vt": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/geojson-vt/-/geojson-vt-3.2.1.tgz", @@ -8131,6 +8141,12 @@ "integrity": "sha512-/gZffu4ykarLrCiP3Ygsa86UAo1E5vEVlvTrpkKywXSbP9Xhln3oSp9QSV57gEq3JFFpGJ4GZ+5zdEp3FcUh4w==", "peer": true }, + "geojson": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/geojson/-/geojson-0.5.0.tgz", + "integrity": "sha512-/Bx5lEn+qRF4TfQ5aLu6NH+UKtvIv7Lhc487y/c8BdludrCTpiWf9wyI0RTyqg49MFefIAvFDuEi5Dfd/zgNxQ==", + "dev": true + }, "geojson-vt": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/geojson-vt/-/geojson-vt-3.2.1.tgz", diff --git a/package.json b/package.json index 3d844e31e..259b3742d 100644 --- a/package.json +++ b/package.json @@ -55,6 +55,7 @@ "eslint": "^8.52.0", "eslint-config-prettier": "^9.0.0", "eslint-plugin-vue": "^9.18.1", + "geojson": "^0.5.0", "prettier": "3.0.3", "sonarqube-scanner": "^3.1.0", "typescript": "^5.2.2",