incyclist-services 1.7.83 → 1.7.84

package/lib/cjs/workouts/index.js

@@ -14,8 +14,12 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.useWorkoutCalendar = exports.WorkoutCalendarService = void 0;
 __exportStar(require("./list"), exports);
 __exportStar(require("./ride"), exports);
 __exportStar(require("./base/model"), exports);
 __exportStar(require("./base/graph"), exports);
 __exportStar(require("./page"), exports);
+var calendar_1 = require("./calendar");
+Object.defineProperty(exports, "WorkoutCalendarService", { enumerable: true, get: function () { return calendar_1.WorkoutCalendarService; } });
+Object.defineProperty(exports, "useWorkoutCalendar", { enumerable: true, get: function () { return calendar_1.useWorkoutCalendar; } });

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

@@ -83,6 +83,7 @@ let WorkoutListPageService = (() => {
         importingFileName;
         importResult;
         importError;
+        importGeneration = 0;
         listObserver;
         listUpdateHandler = this.emitPageUpdate.bind(this);
         calendarUpdateHandler = this.emitPageUpdate.bind(this);
@@ -317,6 +318,7 @@ let WorkoutListPageService = (() => {
         }
         onImportFile(file) {
             const observer = new observer_1.Observer();
+            const generation = this.importGeneration = Date.now();
             try {
                 this.importPhase = 'importing';
                 this.importingFileName = file?.name;
@@ -324,17 +326,21 @@ let WorkoutListPageService = (() => {
                 this.getWorkoutList().import(file, { showImportCards: false })
                     .then(([card]) => {
                     const group = this.getLastUsedImportGroup();
+                    observer.emit('success');
+                    if (generation !== this.importGeneration)
+                        return;
                     if (group !== DEFAULT_IMPORT_GROUP)
                         card.move(group);
                     this.importPhase = 'result';
                     this.importResult = { id: card.getId(), workoutName: card.getTitle(), group };
-                    observer.emit('success');
                     this.emitImportUpdate();
                 })
                     .catch((err) => {
+                    observer.emit('error', err);
+                    if (generation !== this.importGeneration)
+                        return;
                     this.importPhase = 'error';
                     this.importError = err?.message;
-                    observer.emit('error', err);
                     this.emitImportUpdate();
                 });
             }
@@ -358,6 +364,7 @@ let WorkoutListPageService = (() => {
         }
         onImportClose() {
             try {
+                this.importGeneration = Date.now();
                 delete this.importPhase;
                 delete this.importingFileName;
                 delete this.importResult;

package/lib/cjs/workouts/ride/page/service.js

@@ -48,6 +48,7 @@ const BACKGROUND_PAUSE_TIMEOUT_MS = 300000;
 const UPCOMING_STEPS_COUNT = 3;
 const DEFAULT_LOAD_INCREMENT = 1;
 const HINTS_WORKOUT_GESTURES_KEY = 'hints.workoutRideGestures';
+const LOAD_INCREMENT_SETTING_KEY = 'preferences.workouts.loadIncrement';
 let WorkoutRidePageService = (() => {
     let _classDecorators = [types_1.Singleton];
     let _classDescriptor;
@@ -170,7 +171,8 @@ let WorkoutRidePageService = (() => {
                     graph: this.buildGraphPlan(current, wo.ftp),
                     steps: this.buildUpcomingSteps(current, wo.ftp),
                     dashboard: this.buildDashboardLine(wo),
-                    gestureHint: this.buildGestureHint(base.startOverlayProps === null)
+                    gestureHint: this.buildGestureHint(base.startOverlayProps === null),
+                    loadIncrement: this.getLoadIncrement()
                 };
             }
             catch (err) {
@@ -270,6 +272,15 @@ let WorkoutRidePageService = (() => {
         onDecreaseLoad() {
             this.adjustLoad(-DEFAULT_LOAD_INCREMENT);
         }
+        onSetLoadIncrement(value) {
+            try {
+                this.getUserSettings().set(LOAD_INCREMENT_SETTING_KEY, value);
+                this.updatePageDisplay();
+            }
+            catch (err) {
+                this.logError(err, 'onSetLoadIncrement');
+            }
+        }
         onRetryStart() {
             try {
                 this.getRideDisplay().retryStart();
@@ -389,6 +400,9 @@ let WorkoutRidePageService = (() => {
         getCurrentCadence() {
             return this.getActivityRide().getCurrentValues?.()?.cadence ?? 0;
         }
+        getLoadIncrement() {
+            return this.getUserSettings().get(LOAD_INCREMENT_SETTING_KEY, DEFAULT_LOAD_INCREMENT);
+        }
         buildGraphPlan(current, ftp) {
             if (!current) {
                 return { bars: [], ftp: ftp ?? 0, ftpLine: ftp ?? 0, domain: { x: [0, 0], y: [0, 0] } };
@@ -484,7 +498,8 @@ let WorkoutRidePageService = (() => {
                 graph: { bars: [], ftp: 0, ftpLine: 0, domain: { x: [0, 0], y: [0, 0] } },
                 steps: { previous: null, current: null, upcoming: [], hasMore: false },
                 dashboard: { text: '', mode: null },
-                gestureHint: null
+                gestureHint: null,
+                loadIncrement: DEFAULT_LOAD_INCREMENT
             };
         }
         updatePageDisplay() {

package/lib/esm/workouts/index.js

@@ -3,3 +3,4 @@ export * from './ride';
 export * from './base/model';
 export * from './base/graph';
 export * from './page';
+export { WorkoutCalendarService, useWorkoutCalendar } from './calendar';

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

@@ -80,6 +80,7 @@ let WorkoutListPageService = (() => {
         importingFileName;
         importResult;
         importError;
+        importGeneration = 0;
         listObserver;
         listUpdateHandler = this.emitPageUpdate.bind(this);
         calendarUpdateHandler = this.emitPageUpdate.bind(this);
@@ -314,6 +315,7 @@ let WorkoutListPageService = (() => {
         }
         onImportFile(file) {
             const observer = new Observer();
+            const generation = this.importGeneration = Date.now();
             try {
                 this.importPhase = 'importing';
                 this.importingFileName = file?.name;
@@ -321,17 +323,21 @@ let WorkoutListPageService = (() => {
                 this.getWorkoutList().import(file, { showImportCards: false })
                     .then(([card]) => {
                     const group = this.getLastUsedImportGroup();
+                    observer.emit('success');
+                    if (generation !== this.importGeneration)
+                        return;
                     if (group !== DEFAULT_IMPORT_GROUP)
                         card.move(group);
                     this.importPhase = 'result';
                     this.importResult = { id: card.getId(), workoutName: card.getTitle(), group };
-                    observer.emit('success');
                     this.emitImportUpdate();
                 })
                     .catch((err) => {
+                    observer.emit('error', err);
+                    if (generation !== this.importGeneration)
+                        return;
                     this.importPhase = 'error';
                     this.importError = err?.message;
-                    observer.emit('error', err);
                     this.emitImportUpdate();
                 });
             }
@@ -355,6 +361,7 @@ let WorkoutListPageService = (() => {
         }
         onImportClose() {
             try {
+                this.importGeneration = Date.now();
                 delete this.importPhase;
                 delete this.importingFileName;
                 delete this.importResult;

package/lib/esm/workouts/ride/page/service.js

@@ -45,6 +45,7 @@ const BACKGROUND_PAUSE_TIMEOUT_MS = 300000;
 const UPCOMING_STEPS_COUNT = 3;
 const DEFAULT_LOAD_INCREMENT = 1;
 const HINTS_WORKOUT_GESTURES_KEY = 'hints.workoutRideGestures';
+const LOAD_INCREMENT_SETTING_KEY = 'preferences.workouts.loadIncrement';
 let WorkoutRidePageService = (() => {
     let _classDecorators = [Singleton];
     let _classDescriptor;
@@ -167,7 +168,8 @@ let WorkoutRidePageService = (() => {
                     graph: this.buildGraphPlan(current, wo.ftp),
                     steps: this.buildUpcomingSteps(current, wo.ftp),
                     dashboard: this.buildDashboardLine(wo),
-                    gestureHint: this.buildGestureHint(base.startOverlayProps === null)
+                    gestureHint: this.buildGestureHint(base.startOverlayProps === null),
+                    loadIncrement: this.getLoadIncrement()
                 };
             }
             catch (err) {
@@ -267,6 +269,15 @@ let WorkoutRidePageService = (() => {
         onDecreaseLoad() {
             this.adjustLoad(-DEFAULT_LOAD_INCREMENT);
         }
+        onSetLoadIncrement(value) {
+            try {
+                this.getUserSettings().set(LOAD_INCREMENT_SETTING_KEY, value);
+                this.updatePageDisplay();
+            }
+            catch (err) {
+                this.logError(err, 'onSetLoadIncrement');
+            }
+        }
         onRetryStart() {
             try {
                 this.getRideDisplay().retryStart();
@@ -386,6 +397,9 @@ let WorkoutRidePageService = (() => {
         getCurrentCadence() {
             return this.getActivityRide().getCurrentValues?.()?.cadence ?? 0;
         }
+        getLoadIncrement() {
+            return this.getUserSettings().get(LOAD_INCREMENT_SETTING_KEY, DEFAULT_LOAD_INCREMENT);
+        }
         buildGraphPlan(current, ftp) {
             if (!current) {
                 return { bars: [], ftp: ftp ?? 0, ftpLine: ftp ?? 0, domain: { x: [0, 0], y: [0, 0] } };
@@ -481,7 +495,8 @@ let WorkoutRidePageService = (() => {
                 graph: { bars: [], ftp: 0, ftpLine: 0, domain: { x: [0, 0], y: [0, 0] } },
                 steps: { previous: null, current: null, upcoming: [], hasMore: false },
                 dashboard: { text: '', mode: null },
-                gestureHint: null
+                gestureHint: null,
+                loadIncrement: DEFAULT_LOAD_INCREMENT
             };
         }
         updatePageDisplay() {

package/lib/types/workouts/index.d.ts

@@ -3,3 +3,4 @@ export * from './ride';
 export * from './base/model';
 export * from './base/graph';
 export * from './page';
+export { WorkoutCalendarService, useWorkoutCalendar } from './calendar';

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

@@ -15,6 +15,7 @@ export declare class WorkoutListPageService extends IncyclistPageService impleme
         group: string;
     };
     protected importError: string;
+    protected importGeneration: number;
     protected listObserver: IObserver;
     protected listUpdateHandler: any;
     protected calendarUpdateHandler: any;

package/lib/types/workouts/ride/page/service.d.ts

@@ -30,6 +30,7 @@ export declare class WorkoutRidePageService extends IncyclistPageService impleme
     onStepForward(): void;
     onIncreaseLoad(): void;
     onDecreaseLoad(): void;
+    onSetLoadIncrement(value: number): void;
     onRetryStart(): void;
     onIgnoreStart(): void;
     onGestureHintDismissed({ dontShowAgain }: {
@@ -53,6 +54,7 @@ export declare class WorkoutRidePageService extends IncyclistPageService impleme
     };
     protected buildGestureHint(startOverlayCleared: boolean): WorkoutGestureHint | null;
     protected getCurrentCadence(): number;
+    protected getLoadIncrement(): number;
     protected buildGraphPlan(current: Workout | undefined, ftp: number): WorkoutGraphPlan;
     protected buildUpcomingSteps(current: Workout | undefined, ftp: number): WorkoutUpcomingSteps;
     protected buildDashboardLine(wo: WorkoutDisplayProperties): WorkoutDashboardLine;

package/lib/types/workouts/ride/page/types.d.ts

@@ -52,6 +52,7 @@ export interface WorkoutRidePageDisplayProps extends RidePageDisplayProps {
     dashboard: WorkoutDashboardLine;
     title: string;
     gestureHint: WorkoutGestureHint | null;
+    loadIncrement: number;
 }
 export interface WorkoutRidePageCallbacks {
     onMenuOpen(): void;
@@ -63,6 +64,7 @@ export interface WorkoutRidePageCallbacks {
     onStepForward(): void;
     onIncreaseLoad(): void;
     onDecreaseLoad(): void;
+    onSetLoadIncrement(value: number): void;
     onRetryStart(): void;
     onIgnoreStart(): void;
     onCancelStart(): void;

package/package.json

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