@insync-stageplayer/measurements 0.5.37 → 0.6.0

package/lib/hooks/useMeasurement.js

@@ -1,42 +1,42 @@
-import { useDispatch, useSelector } from "react-redux";
-import { useMeasurementsModule } from "./useMeasurementsModule";
-import { updateMeasurement } from "../redux/measurements.slice";
-/**
- * A hook to retrieve a single measurement by id. Returns an async result.
- *
- * Also returns actions to mutate a measurement.
- *
- * @param measurementId The id of the measurement we want to retrieve.
- * @returns
- */
-export const useMeasurement = (measurementId) => {
-    // Retrieve the selectors for the measurements module slice in redux.
-    const { selector, entitiesSelectors } = useMeasurementsModule();
-    const dispatch = useDispatch();
-    const { error, loading } = useSelector((s) => {
-        const state = selector(s);
-        return state;
-    });
-    const measurement = useSelector((s) => {
-        return measurementId
-            ? entitiesSelectors.measurements.selectById(s, measurementId)
-            : undefined;
-    });
-    const actions = {
-        updateMeasurement: (changes) => {
-            if (!measurementId)
-                return;
-            dispatch(updateMeasurement({
-                id: measurementId,
-                changes,
-            }));
-        },
-    };
-    return {
-        measurement,
-        loading,
-        error,
-        actions,
-    };
-};
+import { useDispatch, useSelector } from "react-redux";
+import { useMeasurementsModule } from "./useMeasurementsModule";
+import { updateMeasurement } from "../redux/measurements.slice";
+/**
+ * A hook to retrieve a single measurement by id. Returns an async result.
+ *
+ * Also returns actions to mutate a measurement.
+ *
+ * @param measurementId The id of the measurement we want to retrieve.
+ * @returns
+ */
+export const useMeasurement = (measurementId) => {
+    // Retrieve the selectors for the measurements module slice in redux.
+    const { selector, entitiesSelectors } = useMeasurementsModule();
+    const dispatch = useDispatch();
+    const { error, loading } = useSelector((s) => {
+        const state = selector(s);
+        return state;
+    });
+    const measurement = useSelector((s) => {
+        return measurementId
+            ? entitiesSelectors.measurements.selectById(s, measurementId)
+            : undefined;
+    });
+    const actions = {
+        updateMeasurement: (changes) => {
+            if (!measurementId)
+                return;
+            dispatch(updateMeasurement({
+                id: measurementId,
+                changes,
+            }));
+        },
+    };
+    return {
+        measurement,
+        loading,
+        error,
+        actions,
+    };
+};
 //# sourceMappingURL=useMeasurement.js.map

package/lib/hooks/useMeasurements.d.ts

@@ -1,12 +1,12 @@
-/**
- * A hook retrieve all measurements. Returns an async result.
- */
-export declare const useMeasurements: () => {
-    measurements: import("..").MeasurementsTypes.Measurement[];
-    loading: boolean;
-    error: Error | undefined;
-    didInvalidate: boolean;
-    globallyUniqueMeasurementColors: boolean;
-    dataScale: number;
-};
+/**
+ * A hook retrieve all measurements. Returns an async result.
+ */
+export declare const useMeasurements: () => {
+    measurements: import("..").MeasurementsTypes.Measurement[];
+    loading: boolean;
+    error: Error | undefined;
+    didInvalidate: boolean;
+    globallyUniqueMeasurementColors: boolean;
+    dataScale: number;
+};
 //# sourceMappingURL=useMeasurements.d.ts.map

package/lib/hooks/useMeasurements.js

@@ -1,23 +1,23 @@
-import { useSelector } from "react-redux";
-import { useMeasurementsModule } from "./useMeasurementsModule";
-/**
- * A hook retrieve all measurements. Returns an async result.
- */
-export const useMeasurements = () => {
-    const { selector, entitiesSelectors } = useMeasurementsModule();
-    const { error, loading, didInvalidate, globallyUniqueMeasurementColors, dataScale, } = useSelector((s) => {
-        const state = selector(s);
-        return state;
-    });
-    // if (error) console.error(error);
-    const measurements = useSelector(entitiesSelectors.measurements.selectAll);
-    return {
-        measurements,
-        loading,
-        error,
-        didInvalidate,
-        globallyUniqueMeasurementColors,
-        dataScale,
-    };
-};
+import { useSelector } from "react-redux";
+import { useMeasurementsModule } from "./useMeasurementsModule";
+/**
+ * A hook retrieve all measurements. Returns an async result.
+ */
+export const useMeasurements = () => {
+    const { selector, entitiesSelectors } = useMeasurementsModule();
+    const { error, loading, didInvalidate, globallyUniqueMeasurementColors, dataScale, } = useSelector((s) => {
+        const state = selector(s);
+        return state;
+    });
+    // if (error) console.error(error);
+    const measurements = useSelector(entitiesSelectors.measurements.selectAll);
+    return {
+        measurements,
+        loading,
+        error,
+        didInvalidate,
+        globallyUniqueMeasurementColors,
+        dataScale,
+    };
+};
 //# sourceMappingURL=useMeasurements.js.map

package/lib/hooks/useMeasurementsModule.d.ts

@@ -1,21 +1,21 @@
-/**
- * Consumes the MeasurementsModuleContext and returns its value.
- * @returns
- **/
-export declare const useMeasurementsModule: () => {
-    client: import("..").MeasurementDataClient;
-    selector: (state: any) => import("@reduxjs/toolkit").EntityState<import("..").MeasurementsTypes.Measurement> & {
-        error: Error | undefined;
-        loading: boolean;
-        didInvalidate: boolean;
-        measurementScale: number;
-        files: import("../redux/measurements.slice").MeasurementsFile[];
-        colors: string[];
-        globallyUniqueMeasurementColors: boolean;
-        dataScale: number;
-    };
-    entitiesSelectors: {
-        measurements: import("@reduxjs/toolkit").EntitySelectors<import("..").MeasurementsTypes.Measurement, unknown>;
-    };
-};
+/**
+ * Consumes the MeasurementsModuleContext and returns its value.
+ * @returns
+ **/
+export declare const useMeasurementsModule: () => {
+    client: import("..").MeasurementDataClient;
+    selector: (state: any) => import("@reduxjs/toolkit").EntityState<import("..").MeasurementsTypes.Measurement, string> & {
+        files: import("../redux/measurements.slice").MeasurementsFile[];
+        measurementScale: number;
+        error: Error | undefined;
+        loading: boolean;
+        didInvalidate: boolean;
+        colors: string[];
+        globallyUniqueMeasurementColors: boolean;
+        dataScale: number;
+    };
+    entitiesSelectors: {
+        measurements: import("@reduxjs/toolkit").EntitySelectors<import("..").MeasurementsTypes.Measurement, unknown, string>;
+    };
+};
 //# sourceMappingURL=useMeasurementsModule.d.ts.map

package/lib/hooks/useMeasurementsModule.js

@@ -1,13 +1,13 @@
-import React from "react";
-import { MeasurementsModuleContext } from "..";
-/**
- * Consumes the MeasurementsModuleContext and returns its value.
- * @returns
- **/
-export const useMeasurementsModule = () => {
-    const context = React.useContext(MeasurementsModuleContext);
-    if (!context)
-        throw new Error("No MeasurementsModuleContext found, did you wrap these components in a MeasurementsModuleProvider?");
-    return context;
-};
+import React from "react";
+import { MeasurementsModuleContext } from "..";
+/**
+ * Consumes the MeasurementsModuleContext and returns its value.
+ * @returns
+ **/
+export const useMeasurementsModule = () => {
+    const context = React.useContext(MeasurementsModuleContext);
+    if (!context)
+        throw new Error("No MeasurementsModuleContext found, did you wrap these components in a MeasurementsModuleProvider?");
+    return context;
+};
 //# sourceMappingURL=useMeasurementsModule.js.map

package/lib/hooks/useOverlayMeasurementData.d.ts

@@ -1,2 +1,2 @@
-export declare const useOverlayMeasurementData: (props: any) => Promise<any> | undefined;
+export declare const useOverlayMeasurementData: (props: any) => Promise<any> | undefined;
 //# sourceMappingURL=useOverlayMeasurementData.d.ts.map

package/lib/hooks/useOverlayMeasurementData.js

@@ -1,24 +1,24 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import { useMeasurementsModule } from "./useMeasurementsModule";
-export const useOverlayMeasurementData = (props) => {
-    const { apiReqSent, overlayData, dataType } = props;
-    const { client } = useMeasurementsModule();
-    if (!apiReqSent) {
-        return client
-            .fetchOverlayData({ overlayData, dataType })
-            .then((overlays) => __awaiter(void 0, void 0, void 0, function* () {
-            if (overlays.code === 200) {
-                return overlays.overlayData;
-            }
-        }));
-    }
-};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { useMeasurementsModule } from "./useMeasurementsModule";
+export const useOverlayMeasurementData = (props) => {
+    const { apiReqSent, overlayData, dataType } = props;
+    const { client } = useMeasurementsModule();
+    if (!apiReqSent) {
+        return client
+            .fetchOverlayData({ overlayData, dataType })
+            .then((overlays) => __awaiter(void 0, void 0, void 0, function* () {
+            if (overlays.code === 200) {
+                return overlays.overlayData;
+            }
+        }));
+    }
+};
 //# sourceMappingURL=useOverlayMeasurementData.js.map

package/lib/hooks/useTimedMeasurementData.d.ts

@@ -1,27 +1,27 @@
-import { MeasurementsTypes } from "../types";
-import { Timer } from "@insync-stageplayer/time";
-import { NumberRange } from "@insync-stageplayer/common";
-import { AsyncState } from "../AsyncSubject";
-import { CreateMeasurementDataObservableArgs } from "../client";
-/**
- * Options for the useTimedMeasurementData hook.
- */
-export declare type UseTimedMeasurementDataOptions = Omit<CreateMeasurementDataObservableArgs, "file" | "time$"> & {
-    /**
-     * A timer emitting times. The files will be offset to this timer.
-     */
-    timer: Timer;
-};
-declare type StateValue = {
-    measurementData: MeasurementsTypes.DataMap;
-    range: NumberRange;
-};
-/**
- * Returns measurement data for a time. The current time is provided by options.timer which is
- * an instance of a Timer defined in @insync-stageplayer/time.
- * @param options
- * @returns
- */
-export declare const useTimedMeasurementData: (options: UseTimedMeasurementDataOptions) => AsyncState<StateValue>;
-export {};
+import { MeasurementsTypes } from "../types";
+import { Timer } from "@insync-stageplayer/time";
+import { NumberRange } from "@insync-stageplayer/common";
+import { AsyncState } from "../AsyncSubject";
+import { CreateMeasurementDataObservableArgs } from "../client";
+/**
+ * Options for the useTimedMeasurementData hook.
+ */
+export declare type UseTimedMeasurementDataOptions = Omit<CreateMeasurementDataObservableArgs, "file" | "time$"> & {
+    /**
+     * A timer emitting times. The files will be offset to this timer.
+     */
+    timer: Timer;
+};
+declare type StateValue = {
+    measurementData: MeasurementsTypes.DataMap;
+    range: NumberRange;
+};
+/**
+ * Returns measurement data for a time. The current time is provided by options.timer which is
+ * an instance of a Timer defined in @insync-stageplayer/time.
+ * @param options
+ * @returns
+ */
+export declare const useTimedMeasurementData: (options: UseTimedMeasurementDataOptions) => AsyncState<StateValue>;
+export {};
 //# sourceMappingURL=useTimedMeasurementData.d.ts.map

package/lib/hooks/useTimedMeasurementData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useTimedMeasurementData.d.ts","sourceRoot":"","sources":["../../src/hooks/useTimedMeasurementData.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAE7C,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAIzD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,mCAAmC,EAAE,MAAM,WAAW,CAAC;AAKhE;;GAEG;AACH,oBAAY,8BAA8B,GAAG,IAAI,CAC/C,mCAAmC,EACnC,MAAM,GAAG,OAAO,CACjB,GAAG;IACF;;OAEG;IACH,KAAK,EAAE,KAAK,CAAC;CACd,CAAC;AAEF,aAAK,UAAU,GAAG;IAChB,eAAe,EAAE,iBAAiB,CAAC,OAAO,CAAC;IAC3C,KAAK,EAAE,WAAW,CAAC;CACpB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,YACzB,8BAA8B,2BAuKxC,CAAC"}
+{"version":3,"file":"useTimedMeasurementData.d.ts","sourceRoot":"","sources":["../../src/hooks/useTimedMeasurementData.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAU7C,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAIzD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,mCAAmC,EAAE,MAAM,WAAW,CAAC;AAKhE;;GAEG;AACH,oBAAY,8BAA8B,GAAG,IAAI,CAC/C,mCAAmC,EACnC,MAAM,GAAG,OAAO,CACjB,GAAG;IACF;;OAEG;IACH,KAAK,EAAE,KAAK,CAAC;CACd,CAAC;AAEF,aAAK,UAAU,GAAG;IAChB,eAAe,EAAE,iBAAiB,CAAC,OAAO,CAAC;IAC3C,KAAK,EAAE,WAAW,CAAC;CACpB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,YACzB,8BAA8B,2BAuKxC,CAAC"}

package/lib/hooks/useTimedMeasurementData.js

@@ -1,126 +1,126 @@
-import { useEffect, useState, useMemo } from "react";
-import { filter, groupBy, map, scan, switchMap, toArray } from "rxjs/operators";
-import { useMeasurements } from "./useMeasurements";
-import { from } from "rxjs";
-import { useSelector } from "react-redux";
-import { useMeasurementsModule } from "./useMeasurementsModule";
-/**
- * Returns measurement data for a time. The current time is provided by options.timer which is
- * an instance of a Timer defined in @insync-stageplayer/time.
- * @param options
- * @returns
- */
-export const useTimedMeasurementData = (options) => {
-    const { client, selector } = useMeasurementsModule();
-    const { rows, measurements, limit, timer, unit } = options;
-    /**
-     * Create a map with files, we need these to get the start time of a file. So that we can create a timer with an offset.
-     */
-    const files = useSelector((s) => selector(s).files);
-    const filesById = useMemo(() => {
-        return files.reduce((acc, c) => (Object.assign(Object.assign({}, acc), { [c.path]: c })), {});
-    }, [files]);
-    /**
-     * The scale of the model for which the measurement data was recorded.
-     */
-    const measurementScale = useSelector((s) => selector(s).measurementScale);
-    const dataScale = useSelector((s) => selector(s).dataScale);
-    const { measurements: allMeasurements, loading, didInvalidate, } = useMeasurements();
-    const [state, setState] = useState({
-        loading: false,
-    });
-    useEffect(() => {
-        if (loading || didInvalidate)
-            return;
-        const observable$ = from(allMeasurements).pipe(filter((m) => measurements.includes(m)), 
-        // Request are on a per file basis.
-        groupBy((m) => m.file), switchMap((grouped) => grouped.pipe(toArray(), switchMap((allMeasurements) => {
-            //
-            // The measurements in the app have an ID like (ROOT:/32322/WAVE) that
-            // is incompatible with the IDs of the API (just WAVE). So we keep track of a map
-            // that contains the mapping from the IDs used by the API to the ones used in the
-            // app so we can map them back later.
-            //
-            const nameIdMap = allMeasurements.reduce((acc, c) => {
-                return Object.assign(Object.assign({}, acc), { [c.name]: c.id });
-            }, {});
-            // Retrieve the file in which theses measurements are stored.
-            const fileObj = filesById[grouped.key];
-            const start = fileObj.timing.start;
-            // We'll map the timer to have an offset and for the time to be scaled using the measurement scale.
-            const time$ = timer.state.pipe(map((timerState) => {
-                const offset = timerState.time - start;
-                const time = offset * Math.sqrt(measurementScale / dataScale);
-                return time;
-            }));
-            return client
-                .createMeasurementDataObservable({
-                rows,
-                limit,
-                measurements,
-                time$,
-                unit,
-                file: grouped.key,
-            })
-                .pipe(
-            // This is where we map back the IDs
-            map((v) => {
-                var _a;
-                return (Object.assign(Object.assign({}, v), { 
-                    // We add a file property so we can retrieve for which file this loading is.
-                    file: grouped.key, data: Object.assign(Object.assign({}, v.data), { measurementData: ((_a = v.data) === null || _a === void 0 ? void 0 : _a.measurementData)
-                            ? Object.keys(v.data.measurementData).reduce((acc, c) => {
-                                var _a, _b;
-                                if ((_a = v.data) === null || _a === void 0 ? void 0 : _a.measurementData[c]) {
-                                    return Object.assign(Object.assign({}, acc), { [nameIdMap[c]]: (_b = v.data) === null || _b === void 0 ? void 0 : _b.measurementData[c] });
-                                }
-                                return acc;
-                            }, {})
-                            : undefined }) }));
-            }));
-        }))), 
-        // We accumulate the data from all the files here.
-        scan((acc, c) => {
-            var _a, _b;
-            const loadingFiles = c.loading
-                ? [...acc.loadingFiles, c.file]
-                : acc.loadingFiles.filter((f) => f !== c.file);
-            return {
-                loadingFiles,
-                data: Object.assign(Object.assign(Object.assign({}, acc.data), c.data), { 
-                    // We'll only return the new range if all files have finished loading.
-                    range: loadingFiles.length > 0 || !c.data.range
-                        ? acc.data.range
-                        : c.data.range, measurementData: Object.assign(Object.assign({}, (_a = acc.data) === null || _a === void 0 ? void 0 : _a.measurementData), (_b = c.data) === null || _b === void 0 ? void 0 : _b.measurementData) }),
-                error: c.error,
-            };
-        }, {
-            loadingFiles: [],
-            data: {},
-        }), 
-        // We should not retrieve measurement data if still loading. So we clear the data here if some file is still loading.
-        map((state) => {
-            const loading = state.loadingFiles.length > 0;
-            return Object.assign(Object.assign({}, state), { loading, data: state.data });
-        }));
-        const subscription = observable$.subscribe(setState);
-        return () => {
-            subscription.unsubscribe();
-        };
-    }, [
-        measurements,
-        allMeasurements,
-        client,
-        rows,
-        limit,
-        filesById,
-        timer,
-        measurementScale,
-        dataScale,
-        unit,
-        loading,
-        didInvalidate,
-    ]);
-    return state;
-};
+import { useEffect, useState, useMemo } from "react";
+import { filter, groupBy, map, scan, mergeMap, switchMap, toArray, } from "rxjs/operators";
+import { useMeasurements } from "./useMeasurements";
+import { from } from "rxjs";
+import { useSelector } from "react-redux";
+import { useMeasurementsModule } from "./useMeasurementsModule";
+/**
+ * Returns measurement data for a time. The current time is provided by options.timer which is
+ * an instance of a Timer defined in @insync-stageplayer/time.
+ * @param options
+ * @returns
+ */
+export const useTimedMeasurementData = (options) => {
+    const { client, selector } = useMeasurementsModule();
+    const { rows, measurements, limit, timer, unit } = options;
+    /**
+     * Create a map with files, we need these to get the start time of a file. So that we can create a timer with an offset.
+     */
+    const files = useSelector((s) => selector(s).files);
+    const filesById = useMemo(() => {
+        return files.reduce((acc, c) => (Object.assign(Object.assign({}, acc), { [c.path]: c })), {});
+    }, [files]);
+    /**
+     * The scale of the model for which the measurement data was recorded.
+     */
+    const measurementScale = useSelector((s) => selector(s).measurementScale);
+    const dataScale = useSelector((s) => selector(s).dataScale);
+    const { measurements: allMeasurements, loading, didInvalidate, } = useMeasurements();
+    const [state, setState] = useState({
+        loading: false,
+    });
+    useEffect(() => {
+        if (loading || didInvalidate)
+            return;
+        const observable$ = from(allMeasurements).pipe(filter((m) => measurements.includes(m)), 
+        // Request are on a per file basis.
+        groupBy((m) => m.file), mergeMap((grouped) => grouped.pipe(toArray(), switchMap((allMeasurements) => {
+            //
+            // The measurements in the app have an ID like (ROOT:/32322/WAVE) that
+            // is incompatible with the IDs of the API (just WAVE). So we keep track of a map
+            // that contains the mapping from the IDs used by the API to the ones used in the
+            // app so we can map them back later.
+            //
+            const nameIdMap = allMeasurements.reduce((acc, c) => {
+                return Object.assign(Object.assign({}, acc), { [c.index.join("/")]: c.id });
+            }, {});
+            // Retrieve the file in which theses measurements are stored.
+            const fileObj = filesById[grouped.key];
+            const start = fileObj.timing.start;
+            // We'll map the timer to have an offset and for the time to be scaled using the measurement scale.
+            const time$ = timer.state.pipe(map((timerState) => {
+                const offset = timerState.time - start;
+                const time = offset * Math.sqrt(measurementScale / dataScale);
+                return time;
+            }));
+            return client
+                .createMeasurementDataObservable({
+                rows,
+                limit,
+                measurements,
+                time$,
+                unit,
+                file: grouped.key,
+            })
+                .pipe(
+            // This is where we map back the IDs
+            map((v) => {
+                var _a;
+                return (Object.assign(Object.assign({}, v), { 
+                    // We add a file property so we can retrieve for which file this loading is.
+                    file: grouped.key, data: Object.assign(Object.assign({}, v.data), { measurementData: ((_a = v.data) === null || _a === void 0 ? void 0 : _a.measurementData)
+                            ? Object.keys(v.data.measurementData).reduce((acc, c) => {
+                                var _a, _b;
+                                if ((_a = v.data) === null || _a === void 0 ? void 0 : _a.measurementData[c]) {
+                                    return Object.assign(Object.assign({}, acc), { [nameIdMap[c]]: (_b = v.data) === null || _b === void 0 ? void 0 : _b.measurementData[c] });
+                                }
+                                return acc;
+                            }, {})
+                            : undefined }) }));
+            }));
+        }))), 
+        // We accumulate the data from all the files here.
+        scan((acc, c) => {
+            var _a, _b;
+            const loadingFiles = c.loading
+                ? [...acc.loadingFiles, c.file]
+                : acc.loadingFiles.filter((f) => f !== c.file);
+            return {
+                loadingFiles,
+                data: Object.assign(Object.assign(Object.assign({}, acc.data), c.data), { 
+                    // We'll only return the new range if all files have finished loading.
+                    range: loadingFiles.length > 0 || !c.data.range
+                        ? acc.data.range
+                        : c.data.range, measurementData: Object.assign(Object.assign({}, (_a = acc.data) === null || _a === void 0 ? void 0 : _a.measurementData), (_b = c.data) === null || _b === void 0 ? void 0 : _b.measurementData) }),
+                error: c.error,
+            };
+        }, {
+            loadingFiles: [],
+            data: {},
+        }), 
+        // We should not retrieve measurement data if still loading. So we clear the data here if some file is still loading.
+        map((state) => {
+            const loading = state.loadingFiles.length > 0;
+            return Object.assign(Object.assign({}, state), { loading, data: state.data });
+        }));
+        const subscription = observable$.subscribe(setState);
+        return () => {
+            subscription.unsubscribe();
+        };
+    }, [
+        measurements,
+        client,
+        allMeasurements,
+        rows,
+        limit,
+        filesById,
+        timer,
+        measurementScale,
+        unit,
+        loading,
+        didInvalidate,
+        dataScale,
+    ]);
+    return state;
+};
 //# sourceMappingURL=useTimedMeasurementData.js.map

package/lib/hooks/useTimedMeasurementData.js.map

@@ -1 +1 @@
-{"version":3,"file":"useTimedMeasurementData.js","sourceRoot":"","sources":["../../src/hooks/useTimedMeasurementData.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useTimedMeasurementData.js","sourceRoot":"","sources":["../../src/hooks/useTimedMeasurementData.ts"],"names":[],"mappings":"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"}