incyclist-services 1.7.42 → 1.7.43

package/lib/cjs/activities/list/service.js

@@ -42,10 +42,10 @@ const types_1 = require("../../base/types");
 const observer_1 = require("../../base/types/observer");
 const i18n_1 = require("../../i18n");
 const routes_1 = require("../../routes");
-const utils_1 = require("../../utils");
+const sleep_1 = require("../../utils/sleep");
 const base_1 = require("../base");
 const upload_1 = require("../upload");
-const utils_2 = require("./utils");
+const utils_1 = require("./utils");
 let ActivityListService = (() => {
     let _classDecorators = [types_1.Singleton];
     let _classDescriptor;
@@ -104,13 +104,13 @@ let ActivityListService = (() => {
                             this.logEvent({ message: 'preload activity list completed', cnt: this.activities?.length });
                             this.initialized = true;
                             this.emitLists('loaded');
-                            process.nextTick(() => { delete this.observers.preload; });
+                            (0, sleep_1.sleep)(5).then(() => { delete this.observers.preload; });
                         });
                     })
                         .catch((err) => {
                         this.logError(err, 'preload');
                         this.initialized = false;
-                        process.nextTick(() => { delete this.observers.preload; });
+                        (0, sleep_1.sleep)(5).then(() => { delete this.observers.preload; });
                     });
                 }
                 else {
@@ -162,7 +162,7 @@ let ActivityListService = (() => {
             try {
                 const activity = this.getActivity(id);
                 if (activity.details) {
-                    (0, utils_1.waitNextTick)().then(() => observer.emit('loaded', activity.details));
+                    (0, sleep_1.sleep)(5).then(() => observer.emit('loaded', activity.details));
                     return observer;
                 }
                 this.getRepo().getWithDetails(id).then(ai => {
@@ -375,12 +375,12 @@ let ActivityListService = (() => {
             const loading = this.isStillLoading();
             const observer = loading ? this.getListObserver() : undefined;
             const activities = loading ? undefined : this.getPastActivities();
-            const activitiesUI = activities === undefined ? undefined : activities.map(utils_2.createUIActivityInfo);
+            const activitiesUI = activities === undefined ? undefined : activities.map(utils_1.createUIActivityInfo);
             const filter = this.filter;
             return { filter, activities: activitiesUI, loading, observer };
         }
         getSelectedActivityDisplayProps() {
-            const activity = (0, utils_2.createUIActivityDetails)(this.selected.details);
+            const activity = (0, utils_1.createUIActivityDetails)(this.selected.details);
             const [C, U] = this.getUnitConverter().getUnitConversionShortcuts();
             const logs = activity?.logs ?? [];
             const points = logs.map(p => ({ lat: p.lat, lng: p.lng ?? p.lon }));

package/lib/cjs/activities/list/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createUIActivityDetails = exports.createUIActivitySummary = exports.createUIActivityInfo = void 0;
+exports._createUIActivityDetails = exports.createUIActivityDetails = exports.createUIActivitySummary = exports.createUIActivityInfo = void 0;
 const i18n_1 = require("../../i18n");
 const createUIActivityInfo = (a) => {
     if (!a)
@@ -8,7 +8,7 @@ const createUIActivityInfo = (a) => {
     const { summary, details } = a;
     return {
         summary: (0, exports.createUIActivitySummary)(summary),
-        details: (0, exports.createUIActivityDetails)(details)
+        details: undefined
     };
 };
 exports.createUIActivityInfo = createUIActivityInfo;
@@ -25,6 +25,38 @@ const createUIActivitySummary = (summary) => {
 };
 exports.createUIActivitySummary = createUIActivitySummary;
 const createUIActivityDetails = (details) => {
+    if (!details)
+        return details;
+    const ui = { ...details };
+    const [C, U] = (0, i18n_1.getUnitConversionShortcuts)();
+    const formatSpeed = (v) => {
+        return { value: C(v, 'speed', { digits: 1 }), unit: U('speed') };
+    };
+    if (details.stats?.speed) {
+        ui.stats = {
+            ...details.stats,
+            speed: { ...details.stats.speed }
+        };
+        const fields = ['min', 'max', 'avg'];
+        for (const field of fields) {
+            ui.stats.speed[field] = formatSpeed(ui.stats.speed[field]);
+        }
+    }
+    ui.distance = { value: C(details.distance, 'distance', { digits: 1 }), unit: U('distance') };
+    ui.totalElevation = { value: C(details.totalElevation, 'elevation', { digits: 0 }), unit: U('elevation') };
+    ui.logs = (details.logs ?? []).map(log => {
+        const { speed, distance, elevation } = log;
+        return {
+            ...log,
+            speed: C(speed, 'speed', { digits: 1 }),
+            distance: C(distance, 'distance', { digits: 2 }),
+            elevation: C(elevation, 'elevation', { digits: 0 }),
+        };
+    });
+    return ui;
+};
+exports.createUIActivityDetails = createUIActivityDetails;
+const _createUIActivityDetails = (details) => {
     if (!details)
         return details;
     const ui = structuredClone(details);
@@ -53,4 +85,4 @@ const createUIActivityDetails = (details) => {
     }
     return ui;
 };
-exports.createUIActivityDetails = createUIActivityDetails;
+exports._createUIActivityDetails = _createUIActivityDetails;

package/lib/cjs/activities/page/service.js

@@ -62,17 +62,23 @@ let ActivitiesPageService = (() => {
         updateStateHandler = (__runInitializers(this, _instanceExtraInitializers), this.onStateUpdate.bind(this));
         listState;
         detailActivityId;
+        isOpen = false;
         constructor() {
             super('ActivitiesPage');
         }
         openPage() {
+            if (this.isOpen) {
+                this.getActivityList().closeList();
+                this.stopEventListener();
+            }
             try {
-                this.logEvent({ message: 'page shown', page: 'Routes' });
-                gd_eventlog_1.EventLogger.setGlobalConfig('page', 'Routes');
+                this.logEvent({ message: 'page shown', page: 'Activities' });
+                gd_eventlog_1.EventLogger.setGlobalConfig('page', 'Activities');
                 super.openPage();
                 const service = this.getActivityList();
                 this.listState = service.openList();
                 this.startEventListener();
+                this.isOpen = true;
                 (0, sleep_1.sleep)(5).then(() => {
                     this.updatePageDisplay();
                 });
@@ -85,9 +91,10 @@ let ActivitiesPageService = (() => {
         closePage() {
             try {
                 gd_eventlog_1.EventLogger.setGlobalConfig('page', null);
-                this.logEvent({ message: 'page closed', page: 'Routes' });
+                this.logEvent({ message: 'page closed', page: 'Activities' });
                 this.getActivityList().closeList();
                 this.stopEventListener();
+                this.isOpen = false;
                 super.closePage();
             }
             catch (err) {
@@ -122,6 +129,7 @@ let ActivitiesPageService = (() => {
         }
         onOpenActivity(id) {
             try {
+                this.getActivityList().select(id);
                 this.detailActivityId = id === null ? undefined : id;
                 this.updatePageDisplay();
             }
@@ -131,7 +139,7 @@ let ActivitiesPageService = (() => {
         }
         onCloseActivity() {
             try {
-                delete this.detailActivityId;
+                this.detailActivityId = null;
                 this.updatePageDisplay();
             }
             catch (err) {

package/lib/cjs/devices/ride/service.js

@@ -631,7 +631,7 @@ let DeviceRideService = (() => {
                     if (modes.length > 0) {
                         mode = new modes[0](bike);
                         const modeInfo = config.getModeSettings(ai.udid, mode);
-                        settings = modeInfo.settings;
+                        settings = modeInfo?.settings;
                     }
                 }
                 if (!isControlDisabled) {

package/lib/esm/activities/list/service.js

@@ -39,7 +39,7 @@ import { Singleton } from "../../base/types";
 import { Observer, PromiseObserver } from "../../base/types/observer";
 import { useUnitConverter } from "../../i18n";
 import { useRouteList } from "../../routes";
-import { waitNextTick } from "../../utils";
+import { sleep } from "../../utils/sleep";
 import { ActivitiesRepository, Activity } from "../base";
 import { ActivityUploadFactory } from "../upload";
 import { createUIActivityDetails, createUIActivityInfo } from "./utils";
@@ -101,13 +101,13 @@ let ActivityListService = (() => {
                             this.logEvent({ message: 'preload activity list completed', cnt: this.activities?.length });
                             this.initialized = true;
                             this.emitLists('loaded');
-                            process.nextTick(() => { delete this.observers.preload; });
+                            sleep(5).then(() => { delete this.observers.preload; });
                         });
                     })
                         .catch((err) => {
                         this.logError(err, 'preload');
                         this.initialized = false;
-                        process.nextTick(() => { delete this.observers.preload; });
+                        sleep(5).then(() => { delete this.observers.preload; });
                     });
                 }
                 else {
@@ -159,7 +159,7 @@ let ActivityListService = (() => {
             try {
                 const activity = this.getActivity(id);
                 if (activity.details) {
-                    waitNextTick().then(() => observer.emit('loaded', activity.details));
+                    sleep(5).then(() => observer.emit('loaded', activity.details));
                     return observer;
                 }
                 this.getRepo().getWithDetails(id).then(ai => {

package/lib/esm/activities/list/utils.js

@@ -5,7 +5,7 @@ export const createUIActivityInfo = (a) => {
     const { summary, details } = a;
     return {
         summary: createUIActivitySummary(summary),
-        details: createUIActivityDetails(details)
+        details: undefined
     };
 };
 export const createUIActivitySummary = (summary) => {
@@ -20,6 +20,37 @@ export const createUIActivitySummary = (summary) => {
     return ui;
 };
 export const createUIActivityDetails = (details) => {
+    if (!details)
+        return details;
+    const ui = { ...details };
+    const [C, U] = getUnitConversionShortcuts();
+    const formatSpeed = (v) => {
+        return { value: C(v, 'speed', { digits: 1 }), unit: U('speed') };
+    };
+    if (details.stats?.speed) {
+        ui.stats = {
+            ...details.stats,
+            speed: { ...details.stats.speed }
+        };
+        const fields = ['min', 'max', 'avg'];
+        for (const field of fields) {
+            ui.stats.speed[field] = formatSpeed(ui.stats.speed[field]);
+        }
+    }
+    ui.distance = { value: C(details.distance, 'distance', { digits: 1 }), unit: U('distance') };
+    ui.totalElevation = { value: C(details.totalElevation, 'elevation', { digits: 0 }), unit: U('elevation') };
+    ui.logs = (details.logs ?? []).map(log => {
+        const { speed, distance, elevation } = log;
+        return {
+            ...log,
+            speed: C(speed, 'speed', { digits: 1 }),
+            distance: C(distance, 'distance', { digits: 2 }),
+            elevation: C(elevation, 'elevation', { digits: 0 }),
+        };
+    });
+    return ui;
+};
+export const _createUIActivityDetails = (details) => {
     if (!details)
         return details;
     const ui = structuredClone(details);

package/lib/esm/activities/page/service.js

@@ -59,17 +59,23 @@ let ActivitiesPageService = (() => {
         updateStateHandler = (__runInitializers(this, _instanceExtraInitializers), this.onStateUpdate.bind(this));
         listState;
         detailActivityId;
+        isOpen = false;
         constructor() {
             super('ActivitiesPage');
         }
         openPage() {
+            if (this.isOpen) {
+                this.getActivityList().closeList();
+                this.stopEventListener();
+            }
             try {
-                this.logEvent({ message: 'page shown', page: 'Routes' });
-                EventLogger.setGlobalConfig('page', 'Routes');
+                this.logEvent({ message: 'page shown', page: 'Activities' });
+                EventLogger.setGlobalConfig('page', 'Activities');
                 super.openPage();
                 const service = this.getActivityList();
                 this.listState = service.openList();
                 this.startEventListener();
+                this.isOpen = true;
                 sleep(5).then(() => {
                     this.updatePageDisplay();
                 });
@@ -82,9 +88,10 @@ let ActivitiesPageService = (() => {
         closePage() {
             try {
                 EventLogger.setGlobalConfig('page', null);
-                this.logEvent({ message: 'page closed', page: 'Routes' });
+                this.logEvent({ message: 'page closed', page: 'Activities' });
                 this.getActivityList().closeList();
                 this.stopEventListener();
+                this.isOpen = false;
                 super.closePage();
             }
             catch (err) {
@@ -119,6 +126,7 @@ let ActivitiesPageService = (() => {
         }
         onOpenActivity(id) {
             try {
+                this.getActivityList().select(id);
                 this.detailActivityId = id === null ? undefined : id;
                 this.updatePageDisplay();
             }
@@ -128,7 +136,7 @@ let ActivitiesPageService = (() => {
         }
         onCloseActivity() {
             try {
-                delete this.detailActivityId;
+                this.detailActivityId = null;
                 this.updatePageDisplay();
             }
             catch (err) {

package/lib/esm/devices/ride/service.js

@@ -625,7 +625,7 @@ let DeviceRideService = (() => {
                     if (modes.length > 0) {
                         mode = new modes[0](bike);
                         const modeInfo = config.getModeSettings(ai.udid, mode);
-                        settings = modeInfo.settings;
+                        settings = modeInfo?.settings;
                     }
                 }
                 if (!isControlDisabled) {

package/lib/types/activities/list/utils.d.ts

@@ -2,3 +2,4 @@ import { ActivityDetails, ActivityDetailsUI, ActivityInfo, ActivityInfoUI, Activ
 export declare const createUIActivityInfo: (a: ActivityInfo) => ActivityInfoUI;
 export declare const createUIActivitySummary: (summary: ActivitySummary) => ActivitySummaryUI;
 export declare const createUIActivityDetails: (details: ActivityDetails) => ActivityDetailsUI;
+export declare const _createUIActivityDetails: (details: ActivityDetails) => ActivityDetailsUI;

package/lib/types/activities/page/service.d.ts

@@ -6,6 +6,7 @@ export declare class ActivitiesPageService extends IncyclistPageService implemen
     protected updateStateHandler: any;
     protected listState: ActivityListDisplayProperties | undefined;
     protected detailActivityId: string | undefined;
+    protected isOpen: boolean;
     constructor();
     openPage(): IObserver;
     closePage(): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.7.42",
+  "version": "1.7.43",
   "peerDependencies": {
     "gd-eventlog": "^0.1.27"
   },