incyclist-services 1.1.97 → 1.1.99

package/lib/base/cardlist/index.d.ts

@@ -17,7 +17,6 @@ export interface Card<T> {
 export declare class CardList<T> {
     protected id: string;
     protected title: string;
-    protected selected: Card<T>;
     protected hovered: Card<T>;
     protected cards: Array<Card<T>>;
     constructor(id: string, title: string);
@@ -25,8 +24,6 @@ export declare class CardList<T> {
     getId(): string;
     getTitle(): string;
     getCards(): Array<Card<T>>;
-    getSelected(): T;
-    select(card: Card<T>): void;
     getHovered(): Card<T>;
     hover(card: Card<T>): void;
     add(card: Card<T>): void;

package/lib/base/cardlist/index.js

@@ -19,12 +19,6 @@ class CardList {
     getCards() {
         return this.cards;
     }
-    getSelected() {
-        return this.selected.getData();
-    }
-    select(card) {
-        this.selected = card;
-    }
     getHovered() {
         return this.hovered;
     }
@@ -35,15 +29,10 @@ class CardList {
         this.cards.push(card);
     }
     remove(card) {
-        console.log('~~~ remove', this.cards);
         const idx = this.cards.findIndex(c => c.equals(card));
         if (idx !== -1) {
-            if (this.selected && card.equals(this.selected)) {
-                this.selected = undefined;
-            }
             this.cards.splice(idx, 1);
         }
-        console.log('~~~ remove done', this.cards);
     }
 }
 exports.CardList = CardList;

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

@@ -4,7 +4,7 @@ export interface IListService<T> {
     close(): void;
     getLists(): Array<CardList<T>>;
 }
-export type ListEvent = 'started' | 'stopped' | 'loaded' | 'updated' | 'selected';
+export type ListEvent = 'started' | 'stopped' | 'loaded' | 'updated' | 'selected' | 'loading';
 export declare class ListObserver<T> extends Observer {
     protected service: IListService<T>;
     constructor(service: IListService<T>);

package/lib/base/types/observer.js

@@ -58,8 +58,8 @@ class PromiseObserver extends Observer {
     }
     start() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield (0, utils_1.waitNextTick)();
-            return new Promise((resolve, reject) => {
+            return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+                yield (0, utils_1.waitNextTick)();
                 this.emitter.emit('started');
                 this.promise
                     .then((res) => {
@@ -67,10 +67,9 @@ class PromiseObserver extends Observer {
                     resolve(res);
                 })
                     .catch(err => {
-                    this.emitter.emit('error', err);
                     reject(err);
                 });
-            });
+            }));
         });
     }
     wait() {

package/lib/devices/configuration/service.js

@@ -352,29 +352,35 @@ class DeviceConfigurationService extends events_1.default {
         });
     }
     getDeviceConfigurationInfo() {
-        const { capabilities = [], devices = [] } = this.settings;
-        const { adapters } = this;
-        const info = capabilities.map(c => {
-            const ci = {
-                capability: c.capability,
-                disabled: c.disabled || false,
-                devices: c.devices.filter(udid => devices.find(d => d.udid === udid)).map(udid => {
-                    const adapter = adapters[udid];
-                    const device = devices.find(d => d.udid === udid);
-                    const mode = device.mode;
-                    const modeSetting = device.modes ? device.modes[mode] : undefined;
-                    const interfaceName = device.settings.interface;
-                    const name = (device === null || device === void 0 ? void 0 : device.displayName) || (adapter === null || adapter === void 0 ? void 0 : adapter.getUniqueName()) || (adapter === null || adapter === void 0 ? void 0 : adapter.getName());
-                    return { udid, name, interface: interfaceName, selected: udid === c.selected, mode, modeSetting };
-                })
-            };
-            return ci;
-        });
         const configuration = {};
-        info.forEach(ci => {
-            const c = ci.capability.toString();
-            configuration[c] = ci;
-        });
+        try {
+            const { capabilities = [], devices = [] } = this.settings;
+            const { adapters } = this;
+            const info = capabilities.map(c => {
+                var _a;
+                const ci = {
+                    capability: c.capability,
+                    disabled: c.disabled || false,
+                    devices: ((_a = c.devices) !== null && _a !== void 0 ? _a : []).filter(udid => devices.find(d => d.udid === udid)).map(udid => {
+                        const adapter = adapters[udid];
+                        const device = devices.find(d => d.udid === udid);
+                        const mode = device.mode;
+                        const modeSetting = device.modes ? device.modes[mode] : undefined;
+                        const interfaceName = device.settings.interface;
+                        const name = (device === null || device === void 0 ? void 0 : device.displayName) || (adapter === null || adapter === void 0 ? void 0 : adapter.getUniqueName()) || (adapter === null || adapter === void 0 ? void 0 : adapter.getName());
+                        return { udid, name, interface: interfaceName, selected: udid === c.selected, mode, modeSetting };
+                    })
+                };
+                return ci;
+            });
+            info.forEach(ci => {
+                const c = ci.capability.toString();
+                configuration[c] = ci;
+            });
+        }
+        catch (err) {
+            this.logError(err, 'getDeviceConfigurationInfo');
+        }
         return configuration;
     }
     emitCapabiltyChanged(capability) {

package/lib/settings/user/service.d.ts

@@ -31,6 +31,7 @@ export declare class UserSettingsService {
     updateSettings(data: any): Promise<boolean>;
     save(): Promise<void>;
     onAppClose(): Promise<void>;
+    protected reset(): void;
 }
 export declare const useUserSettings: () => UserSettingsService;
 export declare const initUserSettings: (binding: IUserSettingsBinding) => UserSettingsService;

package/lib/settings/user/service.js

@@ -194,6 +194,9 @@ class UserSettingsService {
             this.binding.save(this.settings, true);
         });
     }
+    reset() {
+        delete UserSettingsService._instance;
+    }
 }
 exports.UserSettingsService = UserSettingsService;
 const useUserSettings = () => UserSettingsService.getInstance();

package/lib/workouts/list/cards/ActiveImportCard.d.ts

@@ -1,6 +1,5 @@
 import { FileInfo } from "../../../api";
 import { Card } from "../../../base/cardlist";
-import { ImportFilter } from "../../../base/cardlist/types";
 import { PromiseObserver } from "../../../base/types/observer";
 import { AppStatus } from "../../../routes/base/types";
 import { WP } from "../types";
@@ -13,16 +12,16 @@ export declare class ActiveImportCard extends BaseCard implements Card<WP> {
     protected deleteObserver: PromiseObserver<void>;
     constructor(file: FileInfo);
     setVisible(): void;
+    canDelete(): boolean;
     canStart(status: AppStatus): boolean;
     delete(): PromiseObserver<boolean>;
     setError(error: Error): void;
-    setData(): void;
-    emitUpdate(): void;
     getData(): any;
     getCardType(): WorkoutCardType;
     getId(): string;
-    getFilters(): Array<ImportFilter>;
     getTitle(): string;
     getDisplayProperties(): ActiveImportProps;
     retry(): void;
+    protected emitUpdate(): void;
+    protected getWorkoutList(): import("../service").WorkoutListService;
 }

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

@@ -15,14 +15,18 @@ class ActiveImportCard extends base_1.BaseCard {
     setVisible() {
         this.visible = true;
     }
+    canDelete() {
+        return true;
+    }
     canStart(status) {
         return false;
     }
     delete() {
-        const list = (0, service_1.useWorkoutList)().getLists().find(l => l.getId() === 'myRoutes');
+        const listService = this.getWorkoutList();
+        const list = listService.getLists().find(l => l.getId() === 'myWorkouts');
         if (list) {
             list.remove(this);
-            (0, service_1.useWorkoutList)().emitLists('updated');
+            listService.emitLists('updated');
         }
         return observer_1.PromiseObserver.alwaysReturning(true);
     }
@@ -30,11 +34,6 @@ class ActiveImportCard extends base_1.BaseCard {
         this.error = error;
         this.emitUpdate();
     }
-    setData() {
-    }
-    emitUpdate() {
-        this.cardObserver.emit('update', this.getDisplayProperties());
-    }
     getData() {
         return undefined;
     }
@@ -45,9 +44,6 @@ class ActiveImportCard extends base_1.BaseCard {
         const { type, url, filename, name } = this.file || {};
         return type === 'file' ? filename || name : url;
     }
-    getFilters() {
-        return types_1.DEFAULT_FILTERS;
-    }
     getTitle() {
         return types_1.DEFAULT_TITLE;
     }
@@ -60,7 +56,13 @@ class ActiveImportCard extends base_1.BaseCard {
     retry() {
         this.error = null;
         this.emitUpdate();
-        (0, service_1.useWorkoutList)().import(this.file, this);
+        this.getWorkoutList().import(this.file, { card: this });
+    }
+    emitUpdate() {
+        this.cardObserver.emit('update', this.getDisplayProperties());
+    }
+    getWorkoutList() {
+        return (0, service_1.useWorkoutList)();
     }
 }
 exports.ActiveImportCard = ActiveImportCard;

package/lib/workouts/list/cards/WorkoutCard.d.ts

@@ -3,7 +3,7 @@ import { Card, CardList } from "../../../base/cardlist";
 import { Observer, PromiseObserver } from "../../../base/types/observer";
 import { Workout } from "../../base/model/Workout";
 import { BaseCard } from "./base";
-import { WorkoutCardType, WorkoutSettings } from "./types";
+import { WorkoutCardDisplayProperties, WorkoutCardType, WorkoutSettings, WorkoutSettingsDisplayProps } from "./types";
 import { WorkoutsDbLoader } from "../loaders/db";
 export declare class WorkoutCard extends BaseCard implements Card<Workout> {
     protected workout: Workout;
@@ -15,39 +15,22 @@ export declare class WorkoutCard extends BaseCard implements Card<Workout> {
     constructor(workout: Workout, props?: {
         list?: CardList<Workout>;
     });
-    openSettings(): {
-        settings: any;
-        ftpRequired: any;
-        canStart: any;
-        duration: any;
-        categories: any[];
-        category: any;
-    };
+    openSettings(): WorkoutSettingsDisplayProps;
     select(settings?: WorkoutSettings): void;
     unselect(): void;
     move(targetListName: string): void;
     save(): Promise<void>;
-    setList(list: CardList<Workout>): void;
     delete(): PromiseObserver<boolean>;
-    protected _delete(): Promise<boolean>;
     getId(): string;
+    getTitle(): string;
     update(workout: Workout): void;
     getData(): Workout;
-    setData(data: Workout): void;
     getCardType(): WorkoutCardType;
-    getDisplayProperties(): {
-        title: string;
-        workout: Workout;
-        ftp: any;
-        duration: string;
-        canDelete: boolean;
-        visible: boolean;
-        selected: boolean;
-        observer: Observer;
-    };
+    getDisplayProperties(): WorkoutCardDisplayProperties;
     enableDelete(enabled?: boolean): void;
     canDelete(): boolean;
     setVisible(visible: boolean): void;
+    protected _delete(): Promise<boolean>;
     protected calculateDuration(): string;
     protected deleteFromUIList(): void;
     protected logError(err: Error, fn: string): void;

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

@@ -25,12 +25,12 @@ class WorkoutCard extends base_1.BaseCard {
         const { list } = props || {};
         this.workout = workout;
         this.list = list;
-        this.deleteable = false;
+        this.deleteable = true;
         this.initialized = false;
         this.logger = new gd_eventlog_1.EventLogger('WorkoutCard');
     }
     openSettings() {
-        var _a;
+        var _a, _b;
         let settings, canStart, duration, ftpRequired, categories = [], category;
         try {
             const service = (0, service_1.useWorkoutList)();
@@ -41,8 +41,8 @@ class WorkoutCard extends base_1.BaseCard {
                 return (s.type == 'step' && ((_a = s.power) === null || _a === void 0 ? void 0 : _a.type) === 'pct of FTP') ||
                     (s.type == 'segment' && (s === null || s === void 0 ? void 0 : s.steps.find(s => { var _a; return (s.type == 'step' && ((_a = s.power) === null || _a === void 0 ? void 0 : _a.type) === 'pct of FTP'); })));
             }));
-            settings = service.getStartSettings();
-            categories = ((_a = service.getLists()) !== null && _a !== void 0 ? _a : []).map(l => l.getTitle());
+            settings = (_a = service.getStartSettings()) !== null && _a !== void 0 ? _a : {};
+            categories = ((_b = service.getLists()) !== null && _b !== void 0 ? _b : []).map(l => l.getTitle());
             category = this.list.getTitle();
         }
         catch (err) {
@@ -67,8 +67,9 @@ class WorkoutCard extends base_1.BaseCard {
             return;
         const service = (0, service_1.getWorkoutList)();
         const newList = service.moveCard(this, this.list, targetListName);
-        if (newList)
+        if (newList) {
             this.list = newList;
+        }
         this.workout.category = { name: targetListName, index: newList === null || newList === void 0 ? void 0 : newList.length };
         this.save();
     }
@@ -82,9 +83,6 @@ class WorkoutCard extends base_1.BaseCard {
             }
         });
     }
-    setList(list) {
-        this.list = list;
-    }
     delete() {
         try {
             const service = (0, service_1.getWorkoutList)();
@@ -98,39 +96,15 @@ class WorkoutCard extends base_1.BaseCard {
             this.logError(err, 'delete');
         }
     }
-    _delete() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield (0, utils_1.waitNextTick)();
-            let deleted = false;
-            try {
-                this.deleteObserver.emit('started');
-                this.emitUpdate();
-                if (this.list.getId() === 'myWorkouts') {
-                    yield this.getRepo().delete(this.workout);
-                }
-                else {
-                }
-                this.deleteFromUIList();
-                (0, service_1.getWorkoutList)().emitLists('updated');
-                deleted = true;
-            }
-            catch (err) {
-                deleted = false;
-            }
-            finally {
-                this.deleteObserver.emit('done', deleted);
-                (0, utils_1.waitNextTick)().then(() => {
-                    delete this.deleteObserver;
-                    this.emitUpdate();
-                });
-            }
-            return deleted;
-        });
-    }
     getId() {
         return this.workout.id;
     }
+    getTitle() {
+        return this.workout.name;
+    }
     update(workout) {
+        if (!(0, valid_1.valid)(workout))
+            return;
         try {
             this.workout = workout;
             this.save();
@@ -143,20 +117,18 @@ class WorkoutCard extends base_1.BaseCard {
     getData() {
         return this.workout;
     }
-    setData(data) {
-        try {
-            this.workout = data;
-        }
-        catch (err) {
-            this.logError(err, 'setData');
-        }
-    }
     getCardType() {
         return "Workout";
     }
     getDisplayProperties() {
         const userSettings = (0, settings_1.useUserSettings)();
-        const user = userSettings.get('user', {});
+        let user;
+        try {
+            user = userSettings.get('user', {});
+        }
+        catch (_a) {
+            user = {};
+        }
         const duration = this.calculateDuration();
         return { title: this.workout.name, workout: this.workout, ftp: user === null || user === void 0 ? void 0 : user.ftp, duration,
             canDelete: this.deleteable, visible: this.visible, selected: this.isSelected(),
@@ -179,6 +151,29 @@ class WorkoutCard extends base_1.BaseCard {
             this.logError(err, 'setVisible');
         }
     }
+    _delete() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield (0, utils_1.waitNextTick)();
+            let deleted = false;
+            try {
+                this.deleteObserver.emit('started');
+                yield this.getRepo().delete(this.workout);
+                this.deleteFromUIList();
+                (0, service_1.getWorkoutList)().emitLists('updated');
+                deleted = true;
+            }
+            catch (err) {
+                deleted = false;
+            }
+            finally {
+                this.deleteObserver.emit('done', deleted);
+                (0, utils_1.waitNextTick)().then(() => {
+                    delete this.deleteObserver;
+                });
+            }
+            return deleted;
+        });
+    }
     calculateDuration() {
         const { duration } = this.workout;
         if (duration < 120)
@@ -215,6 +210,7 @@ class WorkoutCard extends base_1.BaseCard {
         const selectedWorkout = service.getSelected();
         if ((selectedWorkout === null || selectedWorkout === void 0 ? void 0 : selectedWorkout.id) === this.workout.id)
             return true;
+        return false;
     }
 }
 exports.WorkoutCard = WorkoutCard;

package/lib/workouts/list/cards/WorkoutImportCard.d.ts

@@ -7,9 +7,9 @@ import { BaseCard } from "./base";
 import { WorkoutCardType, WorkoutImportProps } from "./types";
 export declare class WorkoutImportCard extends BaseCard implements Card<Workout> {
     setVisible(): void;
+    canDelete(): boolean;
     canStart(status: AppStatus): boolean;
     delete(): PromiseObserver<boolean>;
-    setData(): void;
     getData(): any;
     getCardType(): WorkoutCardType;
     getId(): string;

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

@@ -8,14 +8,15 @@ class WorkoutImportCard extends base_1.BaseCard {
     setVisible() {
         this.visible = true;
     }
+    canDelete() {
+        return false;
+    }
     canStart(status) {
         return false;
     }
     delete() {
         return observer_1.PromiseObserver.alwaysReturning(false);
     }
-    setData() {
-    }
     getData() {
         return undefined;
     }

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

@@ -0,0 +1,3 @@
+export * from './WorkoutCard';
+export * from './WorkoutImportCard';
+export * from './types';

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

@@ -0,0 +1,19 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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 });
+__exportStar(require("./WorkoutCard"), exports);
+__exportStar(require("./WorkoutImportCard"), exports);
+__exportStar(require("./types"), exports);

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

@@ -1,5 +1,6 @@
 import { ImportFilter } from "../../../base/cardlist/types";
 import { Observer } from "../../../base/types/observer";
+import { Workout } from "../../base/model";
 export type WorkoutCardType = 'WorkoutImport' | 'Workout' | 'ActiveWorkoutImport';
 export declare const DEFAULT_TITLE = "Import Workout";
 export declare const DEFAULT_FILTERS: {
@@ -21,3 +22,21 @@ export interface WorkoutSettings {
     ftp?: number;
     useErgMode?: boolean;
 }
+export interface WorkoutSettingsDisplayProps {
+    settings: WorkoutSettings;
+    ftpRequired: boolean;
+    canStart: boolean;
+    duration: string;
+    categories: string[];
+    category: string;
+}
+export interface WorkoutCardDisplayProperties {
+    title: string;
+    workout: Workout;
+    ftp: number;
+    duration: string;
+    canDelete: boolean;
+    visible: boolean;
+    selected: boolean;
+    observer: Observer;
+}

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

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

package/lib/workouts/list/index.js

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

package/lib/workouts/list/service.d.ts

@@ -5,9 +5,10 @@ import { IListService, ListObserver } from "../../base/types";
 import { PromiseObserver } from "../../base/types/observer";
 import { Plan, Workout } from "../base/model/Workout";
 import { ActiveImportCard } from "./cards/ActiveImportCard";
+import { WorkoutCard } from "./cards/WorkoutCard";
 import { WorkoutSettings } from "./cards/types";
 import { WorkoutsDbLoader } from "./loaders/db";
-import { WP } from "./types";
+import { WP, WorkoutSettingsDisplayProps } from "./types";
 export declare class WorkoutListService extends IncyclistService implements IListService<Workout | Plan> {
     protected myWorkouts: CardList<WP>;
     protected lists: Array<CardList<WP>>;
@@ -19,30 +20,27 @@ export declare class WorkoutListService extends IncyclistService implements ILis
     protected screenProps: any;
     protected language: string;
     protected selectedWorkout: Workout;
-    protected startSettings: WorkoutSettings;
+    protected ftp: number;
     constructor();
-    setLanguage(language: string): void;
-    getLanguage(): string;
     getSelected(): Workout;
     setScreenProps(props: any): void;
     getScreenProps(): any;
-    getStartSettings(): WorkoutSettings;
-    setStartSettings(settings: WorkoutSettings): void;
     open(): {
         observer: ListObserver<WP>;
         lists: Array<CardList<WP>>;
     };
-    openSettings(): {
-        observer: ListObserver<WP>;
-        workouts: CardList<Workout>;
-    };
     close(): void;
+    openSettings(): WorkoutSettingsDisplayProps;
+    getStartSettings(): WorkoutSettings;
+    setStartSettings(settings: WorkoutSettings): void;
     onResize(): void;
     onCarouselInitialized(list: CardList<WP>, item: any, itemsInSlide: any): void;
     onCarouselUpdated(list: any, item: any, itemsInSlide: any): void;
     preload(): PromiseObserver<void>;
-    import(info: FileInfo | Array<FileInfo>, retry?: ActiveImportCard): void;
-    importSingle(info: FileInfo): Promise<Workout>;
+    import(info: FileInfo | Array<FileInfo>, props: {
+        card?: ActiveImportCard;
+        showImportCards?: boolean;
+    }): Promise<void>;
     addList(name: string): CardList<WP>;
     getLists(forUi?: boolean): Array<CardList<WP>>;
     emitLists(event: 'loaded' | 'updated'): void;
@@ -52,10 +50,11 @@ export declare class WorkoutListService extends IncyclistService implements ILis
     unselectCard(card: Card<WP>): void;
     moveCard(card: Card<WP>, source: CardList<WP>, target: string | CardList<WP>): CardList<WP>;
     canDisplayStart(): boolean;
+    protected createSettingsList(): CardList<WP>;
     protected resetLists(): void;
     protected resetCards(): void;
     protected loadWorkouts(): Promise<void>;
-    protected addItem(item: WP): void;
+    protected addItem(item: WP): Card<WP>;
     protected updateItem(item: WP): Promise<void>;
     protected selectList(item: WP): CardList<WP>;
     protected findCard(target: WP | string): {
@@ -63,9 +62,18 @@ export declare class WorkoutListService extends IncyclistService implements ILis
         list: CardList<WP>;
     };
     protected addImportCard(file: FileInfo): ActiveImportCard;
-    protected initStartSettings(): void;
-    protected updateStartSettings(): void;
-    createSettingsList(): CardList<WP>;
+    protected _import(info: FileInfo): Promise<WorkoutCard>;
+    protected parse(info: FileInfo): Promise<Workout>;
+    protected addImportCards(retry: ActiveImportCard, files: FileInfo[]): ActiveImportCard[];
+    protected registerUserChangeHandler(): void;
+    protected onUserUpdate(update: any): void;
+    protected emitStartEvent(): void;
+    protected emitLoadingEvent(): void;
+    protected emitLoadedEvent(): void;
+    protected getUserSettings(): import("../../settings").UserSettingsService;
+    protected getRouteList(): import("../../routes").RouteListService;
+    protected getInitTimeout(): number;
+    protected getRepo(): WorkoutsDbLoader;
 }
 export declare const useWorkoutList: () => WorkoutListService;
 export declare const getWorkoutList: () => WorkoutListService;

package/lib/workouts/list/service.js

@@ -54,6 +54,7 @@ const types_1 = require("../../base/types");
 const observer_1 = require("../../base/types/observer");
 const routes_1 = require("../../routes");
 const settings_1 = require("../../settings");
+const utils_1 = require("../../utils");
 const valid_1 = require("../../utils/valid");
 const parsers_1 = require("../base/parsers");
 const ActiveImportCard_1 = require("./cards/ActiveImportCard");
@@ -72,85 +73,88 @@ let WorkoutListService = (() => {
             this.initialized = false;
             this.myWorkouts = new cardlist_1.CardList('myWorkouts', 'My Workouts');
             this.lists = [this.myWorkouts];
-            this.db = new db_1.WorkoutsDbLoader();
             this.items = [];
+            this.language = 'en';
             this.myWorkouts.add(new WorkoutImportCard_1.WorkoutImportCard());
+            this.registerUserChangeHandler();
         }
-        setLanguage(language) { this.language = language; }
-        getLanguage() { return this.language; }
         getSelected() { return this.selectedWorkout; }
         setScreenProps(props) { this.screenProps = props; }
         getScreenProps() { return this.screenProps; }
-        getStartSettings() {
-            if (!this.startSettings) {
-                this.initStartSettings();
-            }
-            return this.startSettings;
-        }
-        setStartSettings(settings) {
-            this.startSettings = settings;
-            this.updateStartSettings();
-        }
         open() {
-            var _a;
+            let lists = null;
             try {
                 this.logEvent({ message: 'open workout list' });
-                const hasLists = ((_a = this.getLists()) === null || _a === void 0 ? void 0 : _a.length) > 0;
-                const emitStartEvent = () => __awaiter(this, void 0, void 0, function* () {
-                    process.nextTick(() => {
-                        var _a;
-                        (_a = this.observer) === null || _a === void 0 ? void 0 : _a.emit('started');
-                    });
-                });
-                const emitLoadedEvent = () => __awaiter(this, void 0, void 0, function* () {
-                    process.nextTick(() => {
-                        this.emitLists('loaded');
-                    });
-                });
+                lists = this.getLists();
                 this.resetLists();
                 if (!this.observer) {
                     this.observer = new types_1.ListObserver(this);
-                    emitStartEvent();
+                    this.emitStartEvent();
                 }
-                if (!this.initialized && !this.preloadObserver) {
-                    this.preload();
+                if (!this.initialized) {
+                    if (!this.preloadObserver)
+                        this.preload();
+                    return { observer: this.observer, lists: null };
                 }
-                if (this.initialized && !hasLists)
-                    emitLoadedEvent();
-                else
+                (0, utils_1.waitNextTick)().then(() => {
                     this.emitLists('updated');
+                });
             }
             catch (err) {
                 this.logError(err, 'open');
             }
-            return { observer: this.observer, lists: this.getLists() };
+            return { observer: this.observer, lists };
+        }
+        close() {
         }
         openSettings() {
             let workouts;
+            let settings;
+            let selected;
             try {
                 this.logEvent({ message: 'open workout settings' });
-                const emitStartEvent = () => __awaiter(this, void 0, void 0, function* () {
-                    process.nextTick(() => {
-                        var _a;
-                        (_a = this.observer) === null || _a === void 0 ? void 0 : _a.emit('started');
-                    });
-                });
                 if (!this.observer) {
                     this.observer = new types_1.ListObserver(this);
-                    emitStartEvent();
+                    this.emitStartEvent();
                 }
-                if (!this.initialized && !this.preloadObserver) {
-                    this.preload();
+                if (!this.initialized) {
+                    if (!this.preloadObserver)
+                        this.preload();
+                    return { observer: this.observer, workouts: null };
                 }
                 workouts = this.createSettingsList();
+                selected = this.getSelected();
+                settings = this.getStartSettings();
             }
             catch (err) {
                 this.logError(err, 'openSettings');
             }
-            console.log('~~~ returning', { observer: this.observer, workouts });
-            return { observer: this.observer, workouts };
+            return { observer: this.observer, workouts, selected, settings };
         }
-        close() {
+        getStartSettings() {
+            var _a, _b, _c;
+            let ftp = (_a = this.ftp) !== null && _a !== void 0 ? _a : 200;
+            let useErgMode = true;
+            try {
+                const userSettings = this.getUserSettings();
+                useErgMode = userSettings.get('preferences.useErgMode', true);
+                const user = userSettings.get('user', undefined);
+                ftp = (_c = (_b = this.ftp) !== null && _b !== void 0 ? _b : user === null || user === void 0 ? void 0 : user.ftp) !== null && _c !== void 0 ? _c : 200;
+            }
+            catch (err) {
+                this.logError(err, 'getStartSettings');
+            }
+            return { ftp, useErgMode };
+        }
+        setStartSettings(settings) {
+            try {
+                const userSettings = this.getUserSettings();
+                userSettings.set('preferences.useErgMode', settings === null || settings === void 0 ? void 0 : settings.useErgMode);
+                this.ftp = settings === null || settings === void 0 ? void 0 : settings.ftp;
+            }
+            catch (err) {
+                this.logError(err, 'setStartSettings');
+            }
         }
         onResize() {
             try {
@@ -161,22 +165,28 @@ let WorkoutListService = (() => {
             }
         }
         onCarouselInitialized(list, item, itemsInSlide) {
+            var _a;
+            if (list === undefined || list === null)
+                return;
             try {
-                list.getCards().forEach((card, idx) => {
+                const cards = (_a = list.getCards()) !== null && _a !== void 0 ? _a : [];
+                cards.forEach((card, idx) => {
                     card.setInitialized(true);
                     if (idx < item + itemsInSlide + 2) {
                         card.setVisible(true);
                     }
                 });
-                setTimeout(() => { this.onCarouselUpdated(list, item, itemsInSlide); }, 1000);
+                setTimeout(() => { this.onCarouselUpdated(list, item, itemsInSlide); }, this.getInitTimeout());
             }
             catch (err) {
                 this.logError(err, 'onCarouselInitialized');
             }
         }
         onCarouselUpdated(list, item, itemsInSlide) {
+            var _a;
             try {
-                list.getCards().forEach((card, idx) => {
+                const cards = (_a = list.getCards()) !== null && _a !== void 0 ? _a : [];
+                cards.forEach((card, idx) => {
                     if (idx >= item && idx < item + itemsInSlide + 10 && !card.isVisible()) {
                         card.setVisible(true);
                     }
@@ -189,6 +199,7 @@ let WorkoutListService = (() => {
         preload() {
             try {
                 this.logEvent({ message: 'preload workout list' });
+                this.emitLoadingEvent();
                 if (!this.preloadObserver) {
                     const promise = this.loadWorkouts();
                     this.preloadObserver = new observer_1.PromiseObserver(promise);
@@ -204,6 +215,7 @@ let WorkoutListService = (() => {
                     })
                         .catch((err) => {
                         this.logError(err, 'preload');
+                        process.nextTick(() => { delete this.preloadObserver; });
                     });
                 }
             }
@@ -212,67 +224,43 @@ let WorkoutListService = (() => {
             }
             return this.preloadObserver;
         }
-        import(info, retry) {
-            try {
-                const files = Array.isArray(info) ? info : [info];
-                const importCards = [];
-                if (!retry) {
-                    files.forEach((file) => {
+        import(info, props) {
+            return __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const { card, showImportCards = true } = props !== null && props !== void 0 ? props : {};
+                    const files = Array.isArray(info) ? info : [info];
+                    const importCards = showImportCards ? this.addImportCards(card, files) : [];
+                    const doImport = (file, idx) => __awaiter(this, void 0, void 0, function* () {
                         if (!file)
                             return;
-                        const card = this.addImportCard(file);
-                        importCards.push(card);
-                        this.emitLists('updated');
-                    });
-                }
-                else {
-                    importCards.push(retry);
-                }
-                files.forEach((file, idx) => __awaiter(this, void 0, void 0, function* () {
-                    if (!file)
-                        return;
-                    const importCard = importCards[idx];
-                    try {
-                        const workout = yield parsers_1.WorkoutParser.parse(file);
-                        const existing = this.findCard(workout);
-                        if (existing) {
-                            existing.list.remove(existing.card);
+                        const importCard = showImportCards ? importCards[idx] : null;
+                        try {
+                            yield this._import(file);
+                            this.myWorkouts.remove(importCard);
+                            this.emitLists('updated');
                         }
-                        else {
-                            this.items.push(workout);
+                        catch (err) {
+                            if (importCard)
+                                importCard.setError(err);
+                            else
+                                throw err;
                         }
-                        const card = new WorkoutCard_1.WorkoutCard(workout, { list: this.myWorkouts });
-                        card.save();
-                        card.enableDelete();
-                        this.myWorkouts.add(card);
-                        this.myWorkouts.remove(importCard);
-                        card.enableDelete(true);
-                        this.emitLists('updated');
-                    }
-                    catch (err) {
-                        importCard.setError(err);
+                    });
+                    const promises = [];
+                    files.forEach((file, idx) => __awaiter(this, void 0, void 0, function* () {
+                        promises.push(doImport(file, idx));
+                    }));
+                    const res = yield Promise.allSettled(promises);
+                    const rejected = res.filter(pr => pr.status === 'rejected');
+                    if (rejected) {
+                        throw (rejected[0].reason);
                     }
-                }));
-            }
-            catch (err) {
-                this.logError(err, 'import', info);
-            }
-        }
-        importSingle(info) {
-            return __awaiter(this, void 0, void 0, function* () {
-                const workout = yield parsers_1.WorkoutParser.parse(info);
-                const existing = this.findCard(workout);
-                if (existing) {
-                    existing.list.remove(existing.card);
                 }
-                else {
-                    this.items.push(workout);
+                catch (err) {
+                    if ((props === null || props === void 0 ? void 0 : props.showImportCards) === false)
+                        throw err;
+                    this.logError(err, 'import', info);
                 }
-                const card = new WorkoutCard_1.WorkoutCard(workout, { list: this.myWorkouts });
-                card.save();
-                card.enableDelete(true);
-                this.myWorkouts.add(card);
-                return workout;
             });
         }
         addList(name) {
@@ -328,7 +316,6 @@ let WorkoutListService = (() => {
         }
         moveCard(card, source, target) {
             try {
-                source.remove(card);
                 let targetList;
                 if (typeof target === 'string') {
                     targetList = this.lists.find(l => l.getTitle() === target);
@@ -338,6 +325,7 @@ let WorkoutListService = (() => {
                 else {
                     targetList = target;
                 }
+                source.remove(card);
                 targetList.add(card);
                 this.emitLists('updated');
                 return targetList;
@@ -347,9 +335,22 @@ let WorkoutListService = (() => {
             }
         }
         canDisplayStart() {
-            const routes = (0, routes_1.getRouteList)();
+            const routes = this.getRouteList();
             return (0, valid_1.valid)(routes.getSelected());
         }
+        createSettingsList() {
+            const list = new cardlist_1.CardList('settings', 'Workouts');
+            list.add(new WorkoutImportCard_1.WorkoutImportCard());
+            const sorted = this.items
+                .sort((a, b) => a.name > b.name ? 1 : -1);
+            sorted.forEach(i => {
+                if (i.type === 'workout') {
+                    const card = new WorkoutCard_1.WorkoutCard(i, { list });
+                    list.add(card);
+                }
+            });
+            return list;
+        }
         resetLists() {
             var _a;
             (_a = this.getLists(false)) === null || _a === void 0 ? void 0 : _a.forEach(list => {
@@ -362,8 +363,12 @@ let WorkoutListService = (() => {
             });
         }
         resetCards() {
-            this.getLists().forEach(list => {
-                list.getCards().forEach((card) => {
+            var _a;
+            const lists = (_a = this.getLists(false)) !== null && _a !== void 0 ? _a : [];
+            lists.forEach(list => {
+                var _a;
+                const cards = (_a = list.getCards()) !== null && _a !== void 0 ? _a : [];
+                cards.forEach((card) => {
                     card.reset();
                 });
             });
@@ -372,7 +377,7 @@ let WorkoutListService = (() => {
             return __awaiter(this, void 0, void 0, function* () {
                 return new Promise((done, reject) => {
                     try {
-                        const observer = this.db.load();
+                        const observer = this.getRepo().load();
                         const add = this.addItem.bind(this);
                         const update = this.updateItem.bind(this);
                         observer.on('workout.added', add);
@@ -381,7 +386,6 @@ let WorkoutListService = (() => {
                     }
                     catch (err) {
                         reject(err);
-                        console.log('~~~ ERROR', err);
                     }
                 });
             });
@@ -398,6 +402,7 @@ let WorkoutListService = (() => {
             card.enableDelete(true);
             this.items.push(item);
             this.emitLists('updated');
+            return card;
         }
         updateItem(item) {
             return __awaiter(this, void 0, void 0, function* () {
@@ -464,30 +469,87 @@ let WorkoutListService = (() => {
             this.emitLists('updated');
             return card;
         }
-        initStartSettings() {
-            var _a;
-            const userSettings = (0, settings_1.useUserSettings)();
-            const useErgMode = userSettings.get('preferences.useErgMode', true);
-            const ftp = (_a = userSettings.get('user', undefined)) === null || _a === void 0 ? void 0 : _a.ftp;
-            this.startSettings = { ftp, useErgMode };
+        _import(info) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const workout = yield this.parse(info);
+                const existing = this.findCard(workout);
+                if (existing) {
+                    existing.list.remove(existing.card);
+                }
+                else {
+                    this.items.push(workout);
+                }
+                const card = new WorkoutCard_1.WorkoutCard(workout, { list: this.myWorkouts });
+                card.save();
+                card.enableDelete(true);
+                this.myWorkouts.add(card);
+                return card;
+            });
         }
-        updateStartSettings() {
-            var _a;
-            const userSettings = (0, settings_1.useUserSettings)();
-            userSettings.set('preferences.useErgMode', (_a = this.startSettings) === null || _a === void 0 ? void 0 : _a.useErgMode);
+        parse(info) {
+            return __awaiter(this, void 0, void 0, function* () {
+                return yield parsers_1.WorkoutParser.parse(info);
+            });
         }
-        createSettingsList() {
-            const list = new cardlist_1.CardList('settings', 'Workouts');
-            list.add(new WorkoutImportCard_1.WorkoutImportCard());
-            const sorted = this.items
-                .sort((a, b) => a.name > b.name ? 1 : -1);
-            sorted.forEach(i => {
-                if (i.type === 'workout') {
-                    const card = new WorkoutCard_1.WorkoutCard(i, { list });
-                    list.add(card);
-                }
+        addImportCards(retry, files) {
+            const importCards = [];
+            if (!retry) {
+                files.forEach((file) => {
+                    if (!file)
+                        return;
+                    const card = this.addImportCard(file);
+                    importCards.push(card);
+                    this.emitLists('updated');
+                });
+            }
+            else {
+                importCards.push(retry);
+            }
+            return importCards;
+        }
+        registerUserChangeHandler() {
+            const userSettings = this.getUserSettings();
+            if (userSettings) {
+                const observer = userSettings.requestNotifyOnChange('workouts', 'user');
+                observer === null || observer === void 0 ? void 0 : observer.on('changed', (update) => {
+                    this.onUserUpdate(update);
+                });
+            }
+        }
+        onUserUpdate(update) {
+            if (this.ftp !== (update === null || update === void 0 ? void 0 : update.ftp) && (0, valid_1.valid)(update === null || update === void 0 ? void 0 : update.ftp))
+                this.ftp = update.ftp;
+        }
+        emitStartEvent() {
+            process.nextTick(() => {
+                var _a;
+                (_a = this.observer) === null || _a === void 0 ? void 0 : _a.emit('started');
             });
-            return list;
+        }
+        emitLoadingEvent() {
+            process.nextTick(() => {
+                var _a;
+                (_a = this.observer) === null || _a === void 0 ? void 0 : _a.emit('loading');
+            });
+        }
+        emitLoadedEvent() {
+            process.nextTick(() => {
+                this.emitLists('loaded');
+            });
+        }
+        getUserSettings() {
+            return (0, settings_1.useUserSettings)();
+        }
+        getRouteList() {
+            return (0, routes_1.useRouteList)();
+        }
+        getInitTimeout() {
+            return 1000;
+        }
+        getRepo() {
+            if (!this.db)
+                this.db = new db_1.WorkoutsDbLoader();
+            return this.db;
         }
     };
     __setFunctionName(_classThis, "WorkoutListService");

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

@@ -1,2 +1,11 @@
+import { CardList } from "../../base/cardlist";
+import { ListObserver } from "../../base/types";
 import { Workout, Plan } from "../base/model";
+import { WorkoutSettings } from "./cards";
 export type WP = Workout | Plan;
+export interface WorkoutSettingsDisplayProps {
+    observer: ListObserver<WP>;
+    workouts: CardList<Workout>;
+    selected?: Workout;
+    settings?: WorkoutSettings;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.1.97",
+  "version": "1.1.99",
   "peerDependencies": {
     "gd-eventlog": "^0.1.26"
   },