incyclist-services 1.7.116 → 1.7.118

package/lib/cjs/activities/base/repo/db.js

@@ -223,7 +223,7 @@ let ActivitiesRepository = (() => {
             return info;
         }
         search(criteria) {
-            let result = this.activities?.filter(ai => ai.summary.rideTime > 30);
+            let result = this.activities;
             result = this.checkIdFilter(result, criteria);
             result = this.checkHashFilter(result, criteria);
             result = this.checkStartPosFilter(result, criteria);

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

@@ -41,6 +41,7 @@ const pages_1 = require("../../base/pages");
 const list_1 = require("../list");
 const sleep_1 = require("../../utils/sleep");
 const workouts_1 = require("../../workouts");
+const devices_1 = require("../../devices");
 let ActivitiesPageService = (() => {
     let _classDecorators = [decorators_1.Singleton];
     let _classDescriptor;
@@ -50,14 +51,17 @@ let ActivitiesPageService = (() => {
     let _instanceExtraInitializers = [];
     let _getActivityList_decorators;
     let _getWorkoutList_decorators;
+    let _getDevicePairing_decorators;
     var ActivitiesPageService = class extends _classSuper {
         static { _classThis = this; }
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
             _getActivityList_decorators = [decorators_1.Injectable];
             _getWorkoutList_decorators = [decorators_1.Injectable];
+            _getDevicePairing_decorators = [decorators_1.Injectable];
             __esDecorate(this, null, _getActivityList_decorators, { kind: "method", name: "getActivityList", static: false, private: false, access: { has: obj => "getActivityList" in obj, get: obj => obj.getActivityList }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getWorkoutList_decorators, { kind: "method", name: "getWorkoutList", static: false, private: false, access: { has: obj => "getWorkoutList" in obj, get: obj => obj.getWorkoutList }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _getDevicePairing_decorators, { kind: "method", name: "getDevicePairing", static: false, private: false, access: { has: obj => "getDevicePairing" in obj, get: obj => obj.getDevicePairing }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             ActivitiesPageService = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
@@ -161,6 +165,18 @@ let ActivitiesPageService = (() => {
                 return { activityId, attachedWorkout: null };
             }
         }
+        onRideAgain(route) {
+            try {
+                const pairing = this.getDevicePairing();
+                const readyToStart = pairing.isReadyToStart();
+                this.logEvent({ message: 'Attempting to start a ride again', id: route?.id, title: route?.title, readyToStart });
+                const next = readyToStart ? '/rideDeviceOK' : '/pairingStart';
+                this.moveTo(next);
+            }
+            catch (err) {
+                this.logError(err, 'onRideAgain');
+            }
+        }
         onClearWorkoutSelection() {
             try {
                 this.getWorkoutList().unselect();
@@ -170,10 +186,21 @@ let ActivitiesPageService = (() => {
                 this.logError(err, 'onClearWorkoutSelection');
             }
         }
+        async onDeleteActivity(id) {
+            try {
+                return await this.getActivityList().delete(id);
+            }
+            catch (err) {
+                this.logError(err, 'onDeleteActivity');
+                return false;
+            }
+        }
         updatePageDisplay() {
             this.getPageObserver()?.emit('page-update');
         }
-        onStateUpdate() {
+        onStateUpdate(state) {
+            if (state)
+                this.listState = state;
             this.updatePageDisplay();
         }
         startEventListener() {
@@ -196,6 +223,9 @@ let ActivitiesPageService = (() => {
         getWorkoutList() {
             return (0, workouts_1.useWorkoutList)();
         }
+        getDevicePairing() {
+            return (0, devices_1.useDevicePairing)();
+        }
     };
     return ActivitiesPageService = _classThis;
 })();

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

@@ -534,8 +534,7 @@ let ActivityRideService = (() => {
             if (this.state === 'idle' || !this.observer)
                 return;
             if (this.state !== 'completed') {
-                this.stop();
-                await new Promise(done => { this.observer.on('completed', done); });
+                await this.stop();
             }
             this.getRepo().delete(this.activity.id);
             this.state = 'idle';

package/lib/esm/activities/base/repo/db.js

@@ -220,7 +220,7 @@ let ActivitiesRepository = (() => {
             return info;
         }
         search(criteria) {
-            let result = this.activities?.filter(ai => ai.summary.rideTime > 30);
+            let result = this.activities;
             result = this.checkIdFilter(result, criteria);
             result = this.checkHashFilter(result, criteria);
             result = this.checkStartPosFilter(result, criteria);

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

@@ -38,6 +38,7 @@ import { IncyclistPageService } from "../../base/pages";
 import { useActivityList } from "../list";
 import { sleep } from "../../utils/sleep";
 import { useWorkoutList } from "../../workouts";
+import { useDevicePairing } from "../../devices";
 let ActivitiesPageService = (() => {
     let _classDecorators = [Singleton];
     let _classDescriptor;
@@ -47,14 +48,17 @@ let ActivitiesPageService = (() => {
     let _instanceExtraInitializers = [];
     let _getActivityList_decorators;
     let _getWorkoutList_decorators;
+    let _getDevicePairing_decorators;
     var ActivitiesPageService = class extends _classSuper {
         static { _classThis = this; }
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
             _getActivityList_decorators = [Injectable];
             _getWorkoutList_decorators = [Injectable];
+            _getDevicePairing_decorators = [Injectable];
             __esDecorate(this, null, _getActivityList_decorators, { kind: "method", name: "getActivityList", static: false, private: false, access: { has: obj => "getActivityList" in obj, get: obj => obj.getActivityList }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getWorkoutList_decorators, { kind: "method", name: "getWorkoutList", static: false, private: false, access: { has: obj => "getWorkoutList" in obj, get: obj => obj.getWorkoutList }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _getDevicePairing_decorators, { kind: "method", name: "getDevicePairing", static: false, private: false, access: { has: obj => "getDevicePairing" in obj, get: obj => obj.getDevicePairing }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             ActivitiesPageService = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
@@ -158,6 +162,18 @@ let ActivitiesPageService = (() => {
                 return { activityId, attachedWorkout: null };
             }
         }
+        onRideAgain(route) {
+            try {
+                const pairing = this.getDevicePairing();
+                const readyToStart = pairing.isReadyToStart();
+                this.logEvent({ message: 'Attempting to start a ride again', id: route?.id, title: route?.title, readyToStart });
+                const next = readyToStart ? '/rideDeviceOK' : '/pairingStart';
+                this.moveTo(next);
+            }
+            catch (err) {
+                this.logError(err, 'onRideAgain');
+            }
+        }
         onClearWorkoutSelection() {
             try {
                 this.getWorkoutList().unselect();
@@ -167,10 +183,21 @@ let ActivitiesPageService = (() => {
                 this.logError(err, 'onClearWorkoutSelection');
             }
         }
+        async onDeleteActivity(id) {
+            try {
+                return await this.getActivityList().delete(id);
+            }
+            catch (err) {
+                this.logError(err, 'onDeleteActivity');
+                return false;
+            }
+        }
         updatePageDisplay() {
             this.getPageObserver()?.emit('page-update');
         }
-        onStateUpdate() {
+        onStateUpdate(state) {
+            if (state)
+                this.listState = state;
             this.updatePageDisplay();
         }
         startEventListener() {
@@ -193,6 +220,9 @@ let ActivitiesPageService = (() => {
         getWorkoutList() {
             return useWorkoutList();
         }
+        getDevicePairing() {
+            return useDevicePairing();
+        }
     };
     return ActivitiesPageService = _classThis;
 })();

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

@@ -528,8 +528,7 @@ let ActivityRideService = (() => {
             if (this.state === 'idle' || !this.observer)
                 return;
             if (this.state !== 'completed') {
-                this.stop();
-                await new Promise(done => { this.observer.on('completed', done); });
+                await this.stop();
             }
             this.getRepo().delete(this.activity.id);
             this.state = 'idle';

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

@@ -2,6 +2,7 @@ import { IncyclistPageService } from "../../base/pages";
 import { ActivitiesPageDisplayProps, ActivityDetailsProps, IActivitiesPageService } from "./types";
 import { IObserver } from "../../types";
 import { ActivityListDisplayProperties } from "../list";
+import { RouteInfo } from "../../routes/base/types";
 export declare class ActivitiesPageService extends IncyclistPageService implements IActivitiesPageService {
     protected updateStateHandler: any;
     protected listState: ActivityListDisplayProperties | undefined;
@@ -16,12 +17,15 @@ export declare class ActivitiesPageService extends IncyclistPageService implemen
     onOpenActivity(id: string | null): void;
     onCloseActivity(): void;
     getActivityDetailsProps(activityId: string): ActivityDetailsProps;
+    onRideAgain(route?: RouteInfo): void;
     onClearWorkoutSelection(): void;
+    onDeleteActivity(id: string): Promise<boolean>;
     protected updatePageDisplay(): void;
-    protected onStateUpdate(): void;
+    protected onStateUpdate(state?: ActivityListDisplayProperties): void;
     protected startEventListener(): void;
     protected stopEventListener(final?: boolean): void;
     getActivityList(): import("../list").ActivityListService;
     protected getWorkoutList(): import("../../workouts").WorkoutListService;
+    protected getDevicePairing(): import("../../devices").DevicePairingService;
 }
 export declare const getActivitiesPageService: () => ActivitiesPageService;

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

@@ -1,6 +1,7 @@
 import { IPageService } from "../../base/pages";
 import { ActivityInfoUI } from "../base";
 import { AttachedWorkoutProps } from "../../routes/page/types";
+import { RouteInfo } from "../../routes/base/types";
 export interface ActivitiesPageDisplayProps {
     loading: boolean;
     activities?: Array<ActivityInfoUI>;
@@ -15,4 +16,6 @@ export interface IActivitiesPageService extends IPageService {
     getPageDisplayProps(): ActivitiesPageDisplayProps;
     getActivityDetailsProps(activityId: string): ActivityDetailsProps;
     onClearWorkoutSelection(): void;
+    onRideAgain(route?: RouteInfo): void;
+    onDeleteActivity(id: string): Promise<boolean>;
 }

package/package.json

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