incyclist-services 1.7.72 → 1.7.73

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

@@ -53,6 +53,7 @@ const monitoring_1 = require("../../../monitoring");
 const geo_1 = require("../../../utils/geo");
 const i18n_1 = require("../../../i18n");
 const decorators_1 = require("../../../base/decorators");
+const appstate_1 = require("../../../appstate");
 exports.DEFAULT_TITLE = 'Import Route';
 exports.DEFAULT_FILTERS = [
     { name: 'Routes', extensions: ['gpx', 'epm', 'xml', 'rlv', 'pgmf'] },
@@ -79,13 +80,16 @@ let RouteCard = (() => {
     let _instanceExtraInitializers = [];
     let _getBindings_decorators;
     let _getOnlineStatusMonitoring_decorators;
+    let _getAppState_decorators;
     return class RouteCard extends _classSuper {
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
             _getBindings_decorators = [decorators_1.Injectable];
             _getOnlineStatusMonitoring_decorators = [decorators_1.Injectable];
+            _getAppState_decorators = [decorators_1.Injectable];
             __esDecorate(this, null, _getBindings_decorators, { kind: "method", name: "getBindings", static: false, private: false, access: { has: obj => "getBindings" in obj, get: obj => obj.getBindings }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getOnlineStatusMonitoring_decorators, { kind: "method", name: "getOnlineStatusMonitoring", static: false, private: false, access: { has: obj => "getOnlineStatusMonitoring" in obj, get: obj => obj.getOnlineStatusMonitoring }, 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);
             if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
         }
         downloadObserver = __runInitializers(this, _instanceExtraInitializers);
@@ -370,11 +374,14 @@ let RouteCard = (() => {
             }
             let showLoopOverwrite, showNextOverwrite;
             let hasWorkout = true;
+            let showWorkoutOption = false;
             try {
                 showLoopOverwrite = this.route?.description?.isLoop;
                 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;
                 if (showNextOverwrite) {
                     const card = (0, service_1.getRouteList)().getCard(next);
                     const route = card?.getData();
@@ -392,7 +399,7 @@ let RouteCard = (() => {
             const totalElevation = { value: C(this.route.description.elevation, 'elevation', { digits: 0 }), unit: uEl };
             const xScale = { value: C(1, 'distance'), unit: uDist };
             const yScale = { value: C(1, 'elevation'), unit: uEl };
-            return { settings: uiSettings, totalDistance, totalElevation, showLoopOverwrite, showNextOverwrite, hasWorkout, canStart, videoChecking, videoMissing,
+            return { settings: uiSettings, totalDistance, totalElevation, showLoopOverwrite, showNextOverwrite, hasWorkout, showWorkoutOption, canStart, videoChecking, videoMissing,
                 xScale, yScale,
                 updateStartPos: this.updateStartPos.bind(this),
                 updateMarkers: this.updateMarkers.bind(this)
@@ -909,6 +916,9 @@ let RouteCard = (() => {
         getOnlineStatusMonitoring() {
             return (0, monitoring_1.useOnlineStatusMonitoring)();
         }
+        getAppState() {
+            return (0, appstate_1.useAppState)();
+        }
         getRouteDownload() {
             return (0, service_2.useRouteDownload)();
         }

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

@@ -16,3 +16,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./service"), exports);
 __exportStar(require("./cards"), exports);
+__exportStar(require("./pageService"), exports);

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

@@ -0,0 +1,98 @@
+"use strict";
+var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
+    var useValue = arguments.length > 2;
+    for (var i = 0; i < initializers.length; i++) {
+        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+    }
+    return useValue ? value : void 0;
+};
+var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+    function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
+    var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+    var _, done = false;
+    for (var i = decorators.length - 1; i >= 0; i--) {
+        var context = {};
+        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
+        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
+        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
+        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+        if (kind === "accessor") {
+            if (result === void 0) continue;
+            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+            if (_ = accept(result.get)) descriptor.get = _;
+            if (_ = accept(result.set)) descriptor.set = _;
+            if (_ = accept(result.init)) initializers.unshift(_);
+        }
+        else if (_ = accept(result)) {
+            if (kind === "field") initializers.unshift(_);
+            else descriptor[key] = _;
+        }
+    }
+    if (target) Object.defineProperty(target, contextIn.name, descriptor);
+    done = true;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+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");
+let WorkoutListPageService = (() => {
+    let _classDecorators = [types_1.Singleton];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    let _classSuper = pages_1.IncyclistPageService;
+    let _instanceExtraInitializers = [];
+    let _getAppState_decorators;
+    var WorkoutListPageService = class extends _classSuper {
+        static { _classThis = this; }
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            _getAppState_decorators = [decorators_1.Injectable];
+            __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 });
+            __runInitializers(_classThis, _classExtraInitializers);
+        }
+        constructor() {
+            super('WorkoutListPage');
+            __runInitializers(this, _instanceExtraInitializers);
+        }
+        openPage() {
+            try {
+                super.openPage();
+                this.logEvent({ message: 'page shown', page: 'Workouts' });
+                return this.getPageObserver();
+            }
+            catch (err) {
+                this.logError(err, 'openPage');
+            }
+        }
+        closePage() {
+            try {
+                this.logEvent({ message: 'page closed', page: 'Workouts' });
+                super.closePage();
+            }
+            catch (err) {
+                this.logError(err, 'closePage');
+            }
+        }
+        getPageDisplayProps() {
+            if (!this.getAppState().hasFeature('MOBILE_WORKOUTS')) {
+                return { pageType: 'placeholder' };
+            }
+            return { pageType: 'list' };
+        }
+        getAppState() {
+            return (0, appstate_1.useAppState)();
+        }
+    };
+    return WorkoutListPageService = _classThis;
+})();
+exports.WorkoutListPageService = WorkoutListPageService;
+const getWorkoutListPageService = () => new WorkoutListPageService();
+exports.getWorkoutListPageService = getWorkoutListPageService;

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

@@ -50,6 +50,7 @@ import { useOnlineStatusMonitoring } from "../../../monitoring";
 import { distanceBetween } from "../../../utils/geo";
 import { getUnitConversionShortcuts } from "../../../i18n";
 import { Injectable } from "../../../base/decorators";
+import { useAppState } from "../../../appstate";
 export const DEFAULT_TITLE = 'Import Route';
 export const DEFAULT_FILTERS = [
     { name: 'Routes', extensions: ['gpx', 'epm', 'xml', 'rlv', 'pgmf'] },
@@ -76,13 +77,16 @@ let RouteCard = (() => {
     let _instanceExtraInitializers = [];
     let _getBindings_decorators;
     let _getOnlineStatusMonitoring_decorators;
+    let _getAppState_decorators;
     return class RouteCard extends _classSuper {
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
             _getBindings_decorators = [Injectable];
             _getOnlineStatusMonitoring_decorators = [Injectable];
+            _getAppState_decorators = [Injectable];
             __esDecorate(this, null, _getBindings_decorators, { kind: "method", name: "getBindings", static: false, private: false, access: { has: obj => "getBindings" in obj, get: obj => obj.getBindings }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getOnlineStatusMonitoring_decorators, { kind: "method", name: "getOnlineStatusMonitoring", static: false, private: false, access: { has: obj => "getOnlineStatusMonitoring" in obj, get: obj => obj.getOnlineStatusMonitoring }, 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);
             if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
         }
         downloadObserver = __runInitializers(this, _instanceExtraInitializers);
@@ -367,11 +371,14 @@ let RouteCard = (() => {
             }
             let showLoopOverwrite, showNextOverwrite;
             let hasWorkout = true;
+            let showWorkoutOption = false;
             try {
                 showLoopOverwrite = this.route?.description?.isLoop;
                 const next = getNextVideoId(this.route);
                 showNextOverwrite = !!next;
                 hasWorkout = valid(workouts.getSelected());
+                const workoutsEnabled = this.isMobile() ? this.getAppState().hasFeature('MOBILE_WORKOUTS') : true;
+                showWorkoutOption = workoutsEnabled && !hasWorkout;
                 if (showNextOverwrite) {
                     const card = getRouteList().getCard(next);
                     const route = card?.getData();
@@ -389,7 +396,7 @@ let RouteCard = (() => {
             const totalElevation = { value: C(this.route.description.elevation, 'elevation', { digits: 0 }), unit: uEl };
             const xScale = { value: C(1, 'distance'), unit: uDist };
             const yScale = { value: C(1, 'elevation'), unit: uEl };
-            return { settings: uiSettings, totalDistance, totalElevation, showLoopOverwrite, showNextOverwrite, hasWorkout, canStart, videoChecking, videoMissing,
+            return { settings: uiSettings, totalDistance, totalElevation, showLoopOverwrite, showNextOverwrite, hasWorkout, showWorkoutOption, canStart, videoChecking, videoMissing,
                 xScale, yScale,
                 updateStartPos: this.updateStartPos.bind(this),
                 updateMarkers: this.updateMarkers.bind(this)
@@ -906,6 +913,9 @@ let RouteCard = (() => {
         getOnlineStatusMonitoring() {
             return useOnlineStatusMonitoring();
         }
+        getAppState() {
+            return useAppState();
+        }
         getRouteDownload() {
             return useRouteDownload();
         }

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

@@ -1,2 +1,3 @@
 export * from './service';
 export * from './cards';
+export * from './pageService';

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

@@ -0,0 +1,94 @@
+var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
+    var useValue = arguments.length > 2;
+    for (var i = 0; i < initializers.length; i++) {
+        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+    }
+    return useValue ? value : void 0;
+};
+var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+    function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
+    var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+    var _, done = false;
+    for (var i = decorators.length - 1; i >= 0; i--) {
+        var context = {};
+        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
+        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
+        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
+        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+        if (kind === "accessor") {
+            if (result === void 0) continue;
+            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+            if (_ = accept(result.get)) descriptor.get = _;
+            if (_ = accept(result.set)) descriptor.set = _;
+            if (_ = accept(result.init)) initializers.unshift(_);
+        }
+        else if (_ = accept(result)) {
+            if (kind === "field") initializers.unshift(_);
+            else descriptor[key] = _;
+        }
+    }
+    if (target) Object.defineProperty(target, contextIn.name, descriptor);
+    done = true;
+};
+import { Singleton } from "../../base/types";
+import { IncyclistPageService } from "../../base/pages";
+import { Injectable } from "../../base/decorators";
+import { useAppState } from "../../appstate";
+let WorkoutListPageService = (() => {
+    let _classDecorators = [Singleton];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    let _classSuper = IncyclistPageService;
+    let _instanceExtraInitializers = [];
+    let _getAppState_decorators;
+    var WorkoutListPageService = class extends _classSuper {
+        static { _classThis = this; }
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            _getAppState_decorators = [Injectable];
+            __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 });
+            __runInitializers(_classThis, _classExtraInitializers);
+        }
+        constructor() {
+            super('WorkoutListPage');
+            __runInitializers(this, _instanceExtraInitializers);
+        }
+        openPage() {
+            try {
+                super.openPage();
+                this.logEvent({ message: 'page shown', page: 'Workouts' });
+                return this.getPageObserver();
+            }
+            catch (err) {
+                this.logError(err, 'openPage');
+            }
+        }
+        closePage() {
+            try {
+                this.logEvent({ message: 'page closed', page: 'Workouts' });
+                super.closePage();
+            }
+            catch (err) {
+                this.logError(err, 'closePage');
+            }
+        }
+        getPageDisplayProps() {
+            if (!this.getAppState().hasFeature('MOBILE_WORKOUTS')) {
+                return { pageType: 'placeholder' };
+            }
+            return { pageType: 'list' };
+        }
+        getAppState() {
+            return useAppState();
+        }
+    };
+    return WorkoutListPageService = _classThis;
+})();
+export { WorkoutListPageService };
+export const getWorkoutListPageService = () => new WorkoutListPageService();

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

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

package/lib/types/routes/list/cards/RouteCard.d.ts

@@ -114,6 +114,7 @@ export declare class RouteCard extends BaseCard implements Card<Route> {
     protected isMobile(): boolean;
     protected getBindings(): import("../../../api").IncyclistBindings;
     protected getOnlineStatusMonitoring(): import("../../../monitoring").OnlineStateMonitoringService;
+    protected getAppState(): import("../../../appstate").AppStateService;
     protected getRouteDownload(): import("../../download/service").RouteDownloadService;
 }
 export {};

package/lib/types/routes/list/cards/types.d.ts

@@ -76,6 +76,7 @@ export type RouteCardProps = {
     showLoopOverwrite: boolean;
     showNextOverwrite: boolean;
     hasWorkout?: boolean;
+    showWorkoutOption?: boolean;
     canStart?: boolean;
     videoMissing?: Promise<boolean>;
     videoChecking?: boolean;

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

@@ -1,2 +1,3 @@
 export * from './service';
 export * from './cards';
+export * from './pageService';

package/lib/types/workouts/list/pageService.d.ts

@@ -0,0 +1,18 @@
+import { IncyclistPageService } from "../../base/pages";
+import { IObserver } from "../../types";
+export type WorkoutListPageDisplayProps = {
+    pageType: 'placeholder';
+} | {
+    pageType: 'list';
+};
+export interface IWorkoutListPageService {
+    getPageDisplayProps(): WorkoutListPageDisplayProps;
+}
+export declare class WorkoutListPageService extends IncyclistPageService implements IWorkoutListPageService {
+    constructor();
+    openPage(): IObserver;
+    closePage(): void;
+    getPageDisplayProps(): WorkoutListPageDisplayProps;
+    protected getAppState(): import("../../appstate").AppStateService;
+}
+export declare const getWorkoutListPageService: () => WorkoutListPageService;

package/package.json

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