incyclist-services 1.7.101 → 1.7.103

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

@@ -151,15 +151,14 @@ let ActivitiesPageService = (() => {
             }
         }
         getActivityDetailsProps(activityId) {
-            const comboEnabled = this.isWorkoutComboEnabled();
             try {
                 const workout = this.getWorkoutList().getSelected();
                 const attachedWorkout = workout ? { id: workout.id, title: workout.name } : null;
-                return { activityId, attachedWorkout, comboEnabled };
+                return { activityId, attachedWorkout };
             }
             catch (err) {
                 this.logError(err, 'getActivityDetailsProps');
-                return { activityId, attachedWorkout: null, comboEnabled };
+                return { activityId, attachedWorkout: null };
             }
         }
         onClearWorkoutSelection() {

package/lib/cjs/base/pages/service.js

@@ -122,17 +122,6 @@ let IncyclistPageService = (() => {
         getAppState() {
             return (0, appstate_1.useAppState)();
         }
-        isWorkoutComboEnabled() {
-            try {
-                const appState = this.getAppState();
-                return appState.hasFeature('MOBILE_WORKOUTS')
-                    && appState.hasFeature('MOBILE_WORKOUT_ROUTE_COMBO');
-            }
-            catch (err) {
-                this.logError(err, 'isWorkoutComboEnabled');
-                return false;
-            }
-        }
     };
 })();
 exports.IncyclistPageService = IncyclistPageService;

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

@@ -388,7 +388,7 @@ let RidePageService = (() => {
         }
         getCornerWidget() {
             try {
-                if (!this.isWorkoutAttached() || !this.isWorkoutComboEnabled())
+                if (!this.isWorkoutAttached())
                     return undefined;
                 return this.getUserSettings().get(CORNER_WIDGET_SETTING_KEY, 'elevation');
             }
@@ -764,8 +764,6 @@ let RidePageService = (() => {
                     return true;
                 if (!this.isRideType('Video', 'GPX'))
                     return false;
-                if (!this.isWorkoutComboEnabled())
-                    return false;
                 return this.getWorkoutRide().inUse();
             }
             catch (err) {

package/lib/cjs/routes/list/cards/RouteCard.js

@@ -383,8 +383,7 @@ let RouteCard = (() => {
                 const next = (0, route_1.getNextVideoId)(this.route);
                 showNextOverwrite = !!next;
                 hasWorkout = (0, valid_1.valid)(workouts.getSelected());
-                const workoutsEnabled = this.isMobile() ? this.getAppState().hasFeature('MOBILE_WORKOUTS') : true;
-                showWorkoutOption = workoutsEnabled && !hasWorkout;
+                showWorkoutOption = !hasWorkout;
                 if (showNextOverwrite) {
                     const card = (0, service_1.getRouteList)().getCard(next);
                     const route = card?.getData();

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

@@ -321,13 +321,12 @@ let RoutesPageService = (() => {
             }
         }
         getRouteDetailsProps(routeId) {
-            const comboEnabled = this.isWorkoutComboEnabled();
             try {
-                return { routeId, attachedWorkout: this.getAttachedWorkoutProps(), comboEnabled };
+                return { routeId, attachedWorkout: this.getAttachedWorkoutProps() };
             }
             catch (err) {
                 this.logError(err, 'getRouteDetailsProps');
-                return { routeId, attachedWorkout: null, comboEnabled };
+                return { routeId, attachedWorkout: null };
             }
         }
         getAttachedWorkoutProps() {

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

@@ -407,12 +407,11 @@ let WorkoutListService = (() => {
                 this.getAppState().setState('scheduledToday', null);
                 return;
             }
-            if (!this.selectedCard) {
-                return;
+            if (this.selectedCard) {
+                const card = this.selectedCard;
+                delete this.selectedCard;
+                card.unselect();
             }
-            const card = this.selectedCard;
-            delete this.selectedCard;
-            card.unselect();
             this.selectedWorkout = null;
             this.getAppState().setState('scheduledToday', null);
         }

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

@@ -38,7 +38,6 @@ exports.getWorkoutListPageService = exports.WorkoutListPageService = void 0;
 const types_1 = require("../../base/types");
 const pages_1 = require("../../base/pages");
 const decorators_1 = require("../../base/decorators");
-const appstate_1 = require("../../appstate");
 const observer_1 = require("../../base/types/observer");
 const settings_1 = require("../../settings");
 const calendar_1 = require("../calendar");
@@ -59,7 +58,6 @@ let WorkoutListPageService = (() => {
     let _getRouteList_decorators;
     let _getWorkoutCalendar_decorators;
     let _getUserSettings_decorators;
-    let _getAppState_decorators;
     var WorkoutListPageService = class extends _classSuper {
         static { _classThis = this; }
         static {
@@ -69,13 +67,11 @@ let WorkoutListPageService = (() => {
             _getRouteList_decorators = [decorators_1.Injectable];
             _getWorkoutCalendar_decorators = [decorators_1.Injectable];
             _getUserSettings_decorators = [decorators_1.Injectable];
-            _getAppState_decorators = [decorators_1.Injectable];
             __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(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, _getRouteList_decorators, { kind: "method", name: "getRouteList", static: false, private: false, access: { has: obj => "getRouteList" in obj, get: obj => obj.getRouteList }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getWorkoutCalendar_decorators, { kind: "method", name: "getWorkoutCalendar", static: false, private: false, access: { has: obj => "getWorkoutCalendar" in obj, get: obj => obj.getWorkoutCalendar }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getUserSettings_decorators, { kind: "method", name: "getUserSettings", static: false, private: false, access: { has: obj => "getUserSettings" in obj, get: obj => obj.getUserSettings }, metadata: _metadata }, null, _instanceExtraInitializers);
-            __esDecorate(this, null, _getAppState_decorators, { kind: "method", name: "getAppState", static: false, private: false, access: { has: obj => "getAppState" in obj, get: obj => obj.getAppState }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             WorkoutListPageService = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
@@ -97,11 +93,7 @@ let WorkoutListPageService = (() => {
         openPage() {
             try {
                 super.openPage();
-                let pageType;
-                if (!this.getAppState().hasFeature('MOBILE_WORKOUTS')) {
-                    pageType = 'placeholder';
-                }
-                this.logEvent({ message: 'page shown', page: 'Workouts', pageType });
+                this.logEvent({ message: 'page shown', page: 'Workouts' });
                 const { observer } = this.getWorkoutList().open();
                 this.listObserver = observer;
                 this.listObserver?.on('started', this.listUpdateHandler);
@@ -134,9 +126,6 @@ let WorkoutListPageService = (() => {
         }
         getPageDisplayProps() {
             try {
-                if (!this.getAppState().hasFeature('MOBILE_WORKOUTS')) {
-                    return { pageType: 'placeholder' };
-                }
                 const service = this.getWorkoutList();
                 const loading = service.isStillLoading();
                 const upcoming = this.getUpcomingTrainingProps();
@@ -176,8 +165,7 @@ let WorkoutListPageService = (() => {
                     canDelete: card.canDelete(),
                     isScheduled,
                     date: isScheduled ? settingsProps.date : undefined,
-                    attachedRoute: this.getAttachedRouteProps(),
-                    comboEnabled: this.isWorkoutComboEnabled()
+                    attachedRoute: this.getAttachedRouteProps()
                 };
             }
             catch (err) {
@@ -312,6 +300,7 @@ let WorkoutListPageService = (() => {
                     return;
                 const settings = this.getWorkoutList().getStartSettings();
                 card.select({ ...settings, noRoute: false });
+                this.detailWorkoutId = null;
                 this.emitPageUpdate();
             }
             catch (err) {
@@ -525,9 +514,6 @@ let WorkoutListPageService = (() => {
         getUserSettings() {
             return (0, settings_1.useUserSettings)();
         }
-        getAppState() {
-            return (0, appstate_1.useAppState)();
-        }
     };
     return WorkoutListPageService = _classThis;
 })();

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

@@ -148,15 +148,14 @@ let ActivitiesPageService = (() => {
             }
         }
         getActivityDetailsProps(activityId) {
-            const comboEnabled = this.isWorkoutComboEnabled();
             try {
                 const workout = this.getWorkoutList().getSelected();
                 const attachedWorkout = workout ? { id: workout.id, title: workout.name } : null;
-                return { activityId, attachedWorkout, comboEnabled };
+                return { activityId, attachedWorkout };
             }
             catch (err) {
                 this.logError(err, 'getActivityDetailsProps');
-                return { activityId, attachedWorkout: null, comboEnabled };
+                return { activityId, attachedWorkout: null };
             }
         }
         onClearWorkoutSelection() {

package/lib/esm/base/pages/service.js

@@ -119,17 +119,6 @@ let IncyclistPageService = (() => {
         getAppState() {
             return useAppState();
         }
-        isWorkoutComboEnabled() {
-            try {
-                const appState = this.getAppState();
-                return appState.hasFeature('MOBILE_WORKOUTS')
-                    && appState.hasFeature('MOBILE_WORKOUT_ROUTE_COMBO');
-            }
-            catch (err) {
-                this.logError(err, 'isWorkoutComboEnabled');
-                return false;
-            }
-        }
     };
 })();
 export { IncyclistPageService };

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

@@ -385,7 +385,7 @@ let RidePageService = (() => {
         }
         getCornerWidget() {
             try {
-                if (!this.isWorkoutAttached() || !this.isWorkoutComboEnabled())
+                if (!this.isWorkoutAttached())
                     return undefined;
                 return this.getUserSettings().get(CORNER_WIDGET_SETTING_KEY, 'elevation');
             }
@@ -761,8 +761,6 @@ let RidePageService = (() => {
                     return true;
                 if (!this.isRideType('Video', 'GPX'))
                     return false;
-                if (!this.isWorkoutComboEnabled())
-                    return false;
                 return this.getWorkoutRide().inUse();
             }
             catch (err) {

package/lib/esm/routes/list/cards/RouteCard.js

@@ -380,8 +380,7 @@ let RouteCard = (() => {
                 const next = getNextVideoId(this.route);
                 showNextOverwrite = !!next;
                 hasWorkout = valid(workouts.getSelected());
-                const workoutsEnabled = this.isMobile() ? this.getAppState().hasFeature('MOBILE_WORKOUTS') : true;
-                showWorkoutOption = workoutsEnabled && !hasWorkout;
+                showWorkoutOption = !hasWorkout;
                 if (showNextOverwrite) {
                     const card = getRouteList().getCard(next);
                     const route = card?.getData();

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

@@ -318,13 +318,12 @@ let RoutesPageService = (() => {
             }
         }
         getRouteDetailsProps(routeId) {
-            const comboEnabled = this.isWorkoutComboEnabled();
             try {
-                return { routeId, attachedWorkout: this.getAttachedWorkoutProps(), comboEnabled };
+                return { routeId, attachedWorkout: this.getAttachedWorkoutProps() };
             }
             catch (err) {
                 this.logError(err, 'getRouteDetailsProps');
-                return { routeId, attachedWorkout: null, comboEnabled };
+                return { routeId, attachedWorkout: null };
             }
         }
         getAttachedWorkoutProps() {

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

@@ -404,12 +404,11 @@ let WorkoutListService = (() => {
                 this.getAppState().setState('scheduledToday', null);
                 return;
             }
-            if (!this.selectedCard) {
-                return;
+            if (this.selectedCard) {
+                const card = this.selectedCard;
+                delete this.selectedCard;
+                card.unselect();
             }
-            const card = this.selectedCard;
-            delete this.selectedCard;
-            card.unselect();
             this.selectedWorkout = null;
             this.getAppState().setState('scheduledToday', null);
         }

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

@@ -35,7 +35,6 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
 import { Singleton } from "../../base/types";
 import { IncyclistPageService } from "../../base/pages";
 import { Injectable } from "../../base/decorators";
-import { useAppState } from "../../appstate";
 import { Observer } from "../../base/types/observer";
 import { useUserSettings } from "../../settings";
 import { useWorkoutCalendar } from "../calendar";
@@ -56,7 +55,6 @@ let WorkoutListPageService = (() => {
     let _getRouteList_decorators;
     let _getWorkoutCalendar_decorators;
     let _getUserSettings_decorators;
-    let _getAppState_decorators;
     var WorkoutListPageService = class extends _classSuper {
         static { _classThis = this; }
         static {
@@ -66,13 +64,11 @@ let WorkoutListPageService = (() => {
             _getRouteList_decorators = [Injectable];
             _getWorkoutCalendar_decorators = [Injectable];
             _getUserSettings_decorators = [Injectable];
-            _getAppState_decorators = [Injectable];
             __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(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, _getRouteList_decorators, { kind: "method", name: "getRouteList", static: false, private: false, access: { has: obj => "getRouteList" in obj, get: obj => obj.getRouteList }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getWorkoutCalendar_decorators, { kind: "method", name: "getWorkoutCalendar", static: false, private: false, access: { has: obj => "getWorkoutCalendar" in obj, get: obj => obj.getWorkoutCalendar }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getUserSettings_decorators, { kind: "method", name: "getUserSettings", static: false, private: false, access: { has: obj => "getUserSettings" in obj, get: obj => obj.getUserSettings }, metadata: _metadata }, null, _instanceExtraInitializers);
-            __esDecorate(this, null, _getAppState_decorators, { kind: "method", name: "getAppState", static: false, private: false, access: { has: obj => "getAppState" in obj, get: obj => obj.getAppState }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             WorkoutListPageService = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
@@ -94,11 +90,7 @@ let WorkoutListPageService = (() => {
         openPage() {
             try {
                 super.openPage();
-                let pageType;
-                if (!this.getAppState().hasFeature('MOBILE_WORKOUTS')) {
-                    pageType = 'placeholder';
-                }
-                this.logEvent({ message: 'page shown', page: 'Workouts', pageType });
+                this.logEvent({ message: 'page shown', page: 'Workouts' });
                 const { observer } = this.getWorkoutList().open();
                 this.listObserver = observer;
                 this.listObserver?.on('started', this.listUpdateHandler);
@@ -131,9 +123,6 @@ let WorkoutListPageService = (() => {
         }
         getPageDisplayProps() {
             try {
-                if (!this.getAppState().hasFeature('MOBILE_WORKOUTS')) {
-                    return { pageType: 'placeholder' };
-                }
                 const service = this.getWorkoutList();
                 const loading = service.isStillLoading();
                 const upcoming = this.getUpcomingTrainingProps();
@@ -173,8 +162,7 @@ let WorkoutListPageService = (() => {
                     canDelete: card.canDelete(),
                     isScheduled,
                     date: isScheduled ? settingsProps.date : undefined,
-                    attachedRoute: this.getAttachedRouteProps(),
-                    comboEnabled: this.isWorkoutComboEnabled()
+                    attachedRoute: this.getAttachedRouteProps()
                 };
             }
             catch (err) {
@@ -309,6 +297,7 @@ let WorkoutListPageService = (() => {
                     return;
                 const settings = this.getWorkoutList().getStartSettings();
                 card.select({ ...settings, noRoute: false });
+                this.detailWorkoutId = null;
                 this.emitPageUpdate();
             }
             catch (err) {
@@ -522,9 +511,6 @@ let WorkoutListPageService = (() => {
         getUserSettings() {
             return useUserSettings();
         }
-        getAppState() {
-            return useAppState();
-        }
     };
     return WorkoutListPageService = _classThis;
 })();

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

@@ -10,7 +10,6 @@ export type { AttachedWorkoutProps };
 export interface ActivityDetailsProps {
     activityId: string;
     attachedWorkout: AttachedWorkoutProps | null;
-    comboEnabled: boolean;
 }
 export interface IActivitiesPageService extends IPageService {
     getPageDisplayProps(): ActivitiesPageDisplayProps;

package/lib/types/appstate/types.d.ts

@@ -1,4 +1,4 @@
-export type FeatureToggle = 'NEW_SEARCH_UI' | 'CONTROLLERS' | 'MOBILE_WORKOUTS' | 'WEBBLE_WINDOWS' | 'MOBILE_NEXT_VIDEO' | 'MOBILE_WORKOUT_ROUTE_COMBO';
+export type FeatureToggle = 'NEW_SEARCH_UI' | 'CONTROLLERS' | 'WEBBLE_WINDOWS' | 'MOBILE_NEXT_VIDEO';
 export type Interfaces = 'ant' | 'ble' | 'serial' | 'wifi' | 'tcpip';
 export type BLEFeatures = {
     services: Array<string>;

package/lib/types/base/pages/service.d.ts

@@ -20,5 +20,4 @@ export declare class IncyclistPageService extends IncyclistService implements IP
     protected getUIBinding(): import("../../api").INativeUI;
     protected getBindings(): import("../../api").IncyclistBindings;
     protected getAppState(): import("../../appstate").AppStateService;
-    protected isWorkoutComboEnabled(): boolean;
 }

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

@@ -41,7 +41,6 @@ export interface AttachedWorkoutProps {
 export interface RouteDetailsProps {
     routeId: string;
     attachedWorkout: AttachedWorkoutProps | null;
-    comboEnabled: boolean;
 }
 export type DownloadStatus = 'downloading' | 'done' | 'failed' | 'required';
 export interface DownloadRowDisplayProps {

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

@@ -60,6 +60,5 @@ export declare class WorkoutListPageService extends IncyclistPageService impleme
     protected getRouteList(): import("../../routes").RouteListService;
     protected getWorkoutCalendar(): import("../calendar").WorkoutCalendarService;
     protected getUserSettings(): import("../../settings").UserSettingsService;
-    protected getAppState(): import("../../appstate").AppStateService;
 }
 export declare const getWorkoutListPageService: () => WorkoutListPageService;

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

@@ -1,9 +1,6 @@
 import { FileInfo, IObserver } from "../../types";
 import { Workout } from "../base/model";
-export type WorkoutListPageDisplayProps = WorkoutListPlaceholderProps | WorkoutListContentProps;
-export interface WorkoutListPlaceholderProps {
-    pageType: 'placeholder';
-}
+export type WorkoutListPageDisplayProps = WorkoutListContentProps;
 export interface WorkoutListContentProps {
     pageType: 'list';
     loading: boolean;
@@ -62,7 +59,6 @@ export interface WorkoutDetailsProps {
     isScheduled: boolean;
     date?: Date;
     attachedRoute: AttachedRouteProps | null;
-    comboEnabled: boolean;
 }
 export interface WorkoutImportDisplayProps {
     phase: 'landing' | 'importing' | 'result' | 'error';

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "incyclist-services",
-  "version": "1.7.101",
+  "version": "1.7.103",
   "peerDependencies": {
     "gd-eventlog": "^0.1.27"
   },
   "dependencies": {
     "@garmin/fitsdk": "^21.200.0",
     "axios": "^1.15.2",
-    "incyclist-devices": "^3.0.32",
+    "incyclist-devices": "^3.0.33",
     "promise.any": "^2.0.6",
     "semver": "^7.7.4",
     "tcx-builder": "^1.1.1",