incyclist-services 1.5.39 → 1.5.41

package/lib/devices/ride/service.js

@@ -125,11 +125,11 @@ let DeviceRideService = (() => {
             return this.data;
         }
         getSelectedAdapters() {
-            var _a, _b;
-            if (this.rideAdapters)
+            var _a, _b, _c;
+            if ((_a = this.rideAdapters) === null || _a === void 0 ? void 0 : _a.length)
                 return this.rideAdapters;
             this.rideAdapters = this.adapters = this.getConfiguredAdapters(true);
-            const controlDevice = (_b = (_a = this.adapters.find(d => d.capabilities.includes('control'))) !== null && _a !== void 0 ? _a : this.adapters.find(d => d.capabilities.includes('power'))) !== null && _b !== void 0 ? _b : this.adapters.find(d => d.capabilities.includes('speed'));
+            const controlDevice = (_c = (_b = this.adapters.find(d => d.capabilities.includes('control'))) !== null && _b !== void 0 ? _b : this.adapters.find(d => d.capabilities.includes('power'))) !== null && _c !== void 0 ? _c : this.adapters.find(d => d.capabilities.includes('speed'));
             if (controlDevice) {
                 this.rideAdapters.forEach(ai => {
                     ai.isControl = (ai.udid === controlDevice.udid);

package/lib/ride/base/base.d.ts

@@ -1,7 +1,7 @@
 import { DeviceData, UpdateRequest } from "incyclist-devices";
 import { Observer } from "../../base/types";
 import { ActiveWorkoutLimit } from "../../workouts";
-import { CurrentRideDisplayProps, ICurrentRideService, IRideModeService } from "./types";
+import { CurrentRideDisplayProps, ICurrentRideService, IRideModeService, IRideModeServiceDisplayProps } from "./types";
 import { IncyclistService } from "../../base/service";
 import { ActivityUpdate } from "../../activities/ride/types";
 import { ScreenShotInfo } from "../../activities";
@@ -23,7 +23,7 @@ export declare class RideModeService extends IncyclistService implements IRideMo
     resume(): void;
     stop(): Promise<void>;
     getStartOverlayProps(): {};
-    getDisplayProperties(props: CurrentRideDisplayProps): {};
+    getDisplayProperties(props: CurrentRideDisplayProps): IRideModeServiceDisplayProps;
     onActivityUpdate(activityPos: ActivityUpdate, data: any): void;
     onDeviceData(data: DeviceData, udid: string): void;
     onRideSettingsChanged(settings: object): void;
@@ -40,6 +40,7 @@ export declare class RideModeService extends IncyclistService implements IRideMo
     sendUpdate(request?: UpdateRequest): Promise<void>;
     protected processPowerDeltaRequest(request: UpdateRequest): void;
     protected getBikeLogProps(): object;
+    protected getDashboardColums(): number;
     protected getDeviceRide(): import("../../devices").DeviceRideService;
     protected getWorkoutRide(): import("../../workouts").WorkoutRide;
 }

package/lib/ride/base/base.js

@@ -91,7 +91,7 @@ let RideModeService = (() => {
                 return {};
             }
             getDisplayProperties(props) {
-                return {};
+                return { dbColumns: this.getDashboardColums() };
             }
             onActivityUpdate(activityPos, data) {
                 const limits = this.getWorkoutLimits();
@@ -170,7 +170,7 @@ let RideModeService = (() => {
                 send(request);
             }
             getBikeLogProps() {
-                var _b, _c;
+                var _b, _c, _d;
                 const device = this.getDeviceRide().getControlAdapter();
                 if (!device)
                     return {};
@@ -178,11 +178,14 @@ let RideModeService = (() => {
                 if ((mode === null || mode === void 0 ? void 0 : mode.getName()) === 'Simulator') {
                     return { bike: 'Simulator', interface: 'Simulator', mode: 'Simulator' };
                 }
-                return {
-                    bike: (_b = device.adapter) === null || _b === void 0 ? void 0 : _b.getDisplayName(),
-                    interface: (_c = device.adapter) === null || _c === void 0 ? void 0 : _c.getInterface(),
-                    bikeMode: mode === null || mode === void 0 ? void 0 : mode.getName()
-                };
+                const settings = (_b = mode === null || mode === void 0 ? void 0 : mode.getSettings()) !== null && _b !== void 0 ? _b : {};
+                return Object.assign({ bike: (_c = device.adapter) === null || _c === void 0 ? void 0 : _c.getDisplayName(), interface: (_d = device.adapter) === null || _d === void 0 ? void 0 : _d.getInterface(), bikeMode: mode === null || mode === void 0 ? void 0 : mode.getName() }, settings);
+            }
+            getDashboardColums() {
+                const mode = this.getDeviceRide().getCyclingMode();
+                const virtshift = mode === null || mode === void 0 ? void 0 : mode.getSetting('virtshift');
+                const enabled = virtshift !== undefined && virtshift !== null && virtshift !== 'Disabled';
+                return enabled ? 8 : 7;
             }
             getDeviceRide() {
                 return (0, devices_1.useDeviceRide)();

package/lib/ride/base/types.d.ts

@@ -24,6 +24,7 @@ export type CurrentRideDeviceInfo = {
     healthStatus?: HealthStatus;
 };
 export interface IRideModeServiceDisplayProps {
+    dbColumns?: number;
 }
 export interface WorkoutDisplayProps extends IRideModeServiceDisplayProps {
 }

package/lib/ride/route/FreeRideDisplayService.d.ts

@@ -67,6 +67,7 @@ export declare class FreeRideDisplayService extends GpxDisplayService {
     protected savePosition(): void;
     protected get route(): Route;
     protected get currentOptions(): FreeRideContinuation[] | undefined;
+    protected getDashboardColums(): number;
     getFreeRideService(): FreeRideService;
     getActivityRide(): ActivityRideService;
 }

package/lib/ride/route/FreeRideDisplayService.js

@@ -502,6 +502,10 @@ let FreeRideDisplayService = (() => {
             get currentOptions() {
                 return this.getFreeRideService().getOptions();
             }
+            getDashboardColums() {
+                const parent = super.getDashboardColums();
+                return parent - 1;
+            }
             getFreeRideService() {
                 return (0, free_ride_1.useFreeRideService)();
             }

package/lib/ride/route/RouteDisplayService.js

@@ -175,19 +175,15 @@ let RouteDisplayService = (() => {
             }
             getDisplayProperties(props) {
                 const { realityFactor, startPos, endPos } = this.startSettings;
+                const parent = super.getDisplayProperties(props);
                 const map = this.getOverlayProps('map', props);
                 const upcomingElevation = this.getOverlayProps('slope', props);
                 const totalElevation = this.getOverlayProps('elevation', props);
                 const nearbyRides = this.getNearbyRidesProps(props);
-                return {
-                    position: this.position, markers: this.getMarkers(props),
-                    sideViews: this.sideViews,
-                    route: this.getCurrentRoute(),
-                    realityFactor,
+                return Object.assign(Object.assign({}, parent), { position: this.position, markers: this.getMarkers(props), sideViews: this.sideViews, route: this.getCurrentRoute(), realityFactor,
                     startPos, endPos,
                     nearbyRides,
-                    map, upcomingElevation, totalElevation
-                };
+                    map, upcomingElevation, totalElevation });
             }
             getScreenshotInfo(fileName, time) {
                 const { lat, lng, routeDistance, elevation } = this.position;

package/lib/workouts/list/cards/ScheduledWorkoutCard.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ScheduledWorkoutCard = void 0;
+const model_1 = require("../../base/model");
 const WorkoutCard_1 = require("./WorkoutCard");
 class ScheduledWorkoutCard extends WorkoutCard_1.WorkoutCard {
     constructor(event) {
         var _a;
-        super(event.workout);
+        super(new model_1.Workout(event.workout));
         this.event = event;
         (_a = this.event.observer) === null || _a === void 0 ? void 0 : _a.on('updated', this.onUpdate.bind(this));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.5.39",
+  "version": "1.5.41",
   "peerDependencies": {
     "gd-eventlog": "^0.1.26"
   },
@@ -42,7 +42,7 @@
   },
   "dependencies": {
     "axios": "^1.8.2",
-    "incyclist-devices": "^2.3.31",
+    "incyclist-devices": "^2.3.32",
     "promise.any": "^2.0.6",
     "semver": "^7.6.3",
     "tcx-builder": "^1.1.1",