incyclist-services 1.4.6 → 1.4.8

package/lib/devices/pairing/service.js

@@ -713,31 +713,36 @@ class DevicePairingService extends service_2.IncyclistService {
         this.emitStateChange({ capabilities });
     }
     onDeviceDetected(deviceSettings) {
-        const udid = this.configuration.add(deviceSettings, { legacy: false });
-        this.logEvent({ message: 'device detected', device: deviceSettings, udid });
-        if (!udid) {
-            this.logEvent({ message: 'device could not be added', reason: 'add() failed' });
-            return;
-        }
-        const adapter = this.configuration.getAdapter(udid);
-        if (adapter) {
-            adapter.onScanStart();
-            this.markConnected(adapter, udid);
-            if (this.isScanning()) {
-                if (this.state.scan.adapters.find(a => a.udid === udid) === undefined) {
-                    const handler = (deviceSettings, data) => {
-                        this.onDeviceData(data, udid);
-                    };
-                    adapter.on('data', handler);
-                    this.state.scan.adapters.push({ udid, adapter, handler });
+        try {
+            const udid = this.configuration.add(deviceSettings, { legacy: false });
+            this.logEvent({ message: 'device detected', device: deviceSettings, udid });
+            if (!udid) {
+                this.logEvent({ message: 'device could not be added', reason: 'add() failed' });
+                return;
+            }
+            const adapter = this.configuration.getAdapter(udid);
+            if (adapter) {
+                adapter.onScanStart();
+                this.markConnected(adapter, udid);
+                if (this.isScanning() && this.state.scan.adapters) {
+                    if (this.state.scan.adapters.find(a => a.udid === udid) === undefined) {
+                        const handler = (deviceSettings, data) => {
+                            this.onDeviceData(data, udid);
+                        };
+                        adapter.on('data', handler);
+                        this.state.scan.adapters.push({ udid, adapter, handler });
+                    }
                 }
+                this.checkCanStart();
             }
-            this.checkCanStart();
+            else {
+                this.logEvent({ message: 'Could not get adapter', deviceSettings });
+            }
+            this.onPairingSuccess(udid);
         }
-        else {
-            this.logEvent({ message: 'Could not get adapter', deviceSettings });
+        catch (err) {
+            this.logError(err, 'onDeviceDetected');
         }
-        this.onPairingSuccess(udid);
     }
     markConnected(adapter, udid) {
         const capabilites = adapter.getCapabilities();

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

@@ -0,0 +1,21 @@
+import { Card } from "../../../base/cardlist";
+import { ImportFilter } from "../../../base/cardlist/types";
+import { PromiseObserver } from "../../../base/types/observer";
+import { AppStatus } from "../../../routes/base/types";
+import { Workout } from "../../base/model/Workout";
+import { BaseCard } from "./base";
+import { WorkoutCardType, WorkoutCreateProps } from "./types";
+export declare class WorkoutCreateCard extends BaseCard implements Card<Workout> {
+    setVisible(): void;
+    canDelete(): boolean;
+    canStart(status: AppStatus): boolean;
+    delete(): PromiseObserver<boolean>;
+    getData(): any;
+    getCardType(): WorkoutCardType;
+    getId(): string;
+    getFilters(): Array<ImportFilter>;
+    getTitle(): string;
+    getDisplayProperties(): WorkoutCreateProps;
+    markAsSeen(): void;
+    getUserSettings(): import("../../../settings").UserSettingsService;
+}

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

@@ -0,0 +1,102 @@
+"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.WorkoutCreateCard = void 0;
+const decorators_1 = require("../../../base/decorators");
+const observer_1 = require("../../../base/types/observer");
+const settings_1 = require("../../../settings");
+const base_1 = require("./base");
+const DEFAULT_TITLE = "Create Workout";
+const DEFAULT_LINK = 'https://zwofactory.com/';
+let WorkoutCreateCard = (() => {
+    var _a;
+    let _classSuper = base_1.BaseCard;
+    let _instanceExtraInitializers = [];
+    let _getUserSettings_decorators;
+    return _a = class WorkoutCreateCard extends _classSuper {
+            setVisible() {
+                this.visible = true;
+            }
+            canDelete() {
+                return false;
+            }
+            canStart(status) {
+                return false;
+            }
+            delete() {
+                return observer_1.PromiseObserver.alwaysReturning(false);
+            }
+            getData() {
+                return undefined;
+            }
+            getCardType() {
+                return 'WorkoutCreate';
+            }
+            getId() {
+                return 'Create';
+            }
+            getFilters() {
+                return [];
+            }
+            getTitle() {
+                return DEFAULT_TITLE;
+            }
+            getDisplayProperties() {
+                const title = this.getTitle();
+                const firstTime = this.getUserSettings().get('state.createWorkoutSeen', false) === false;
+                return { title, visible: true, link: DEFAULT_LINK, firstTime };
+            }
+            markAsSeen() {
+                this.getUserSettings().set('state.createWorkoutSeen', true);
+            }
+            getUserSettings() {
+                return (0, settings_1.useUserSettings)();
+            }
+            constructor() {
+                super(...arguments);
+                __runInitializers(this, _instanceExtraInitializers);
+            }
+        },
+        (() => {
+            var _b;
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create((_b = _classSuper[Symbol.metadata]) !== null && _b !== void 0 ? _b : null) : void 0;
+            _getUserSettings_decorators = [decorators_1.Injectable];
+            __esDecorate(_a, 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);
+            if (_metadata) Object.defineProperty(_a, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+        })(),
+        _a;
+})();
+exports.WorkoutCreateCard = WorkoutCreateCard;

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

@@ -0,0 +1,19 @@
+import { Card } from "../../../base/cardlist";
+import { ImportFilter } from "../../../base/cardlist/types";
+import { PromiseObserver } from "../../../base/types/observer";
+import { AppStatus } from "../../../routes/base/types";
+import { Workout } from "../../base/model/Workout";
+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>;
+    getData(): any;
+    getCardType(): WorkoutCardType;
+    getId(): string;
+    getFilters(): Array<ImportFilter>;
+    getTitle(): string;
+    getDisplayProperties(): WorkoutImportProps;
+}

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

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WorkoutImportCard = void 0;
+const observer_1 = require("../../../base/types/observer");
+const base_1 = require("./base");
+const types_1 = require("./types");
+class WorkoutImportCard extends base_1.BaseCard {
+    setVisible() {
+        this.visible = true;
+    }
+    canDelete() {
+        return false;
+    }
+    canStart(status) {
+        return false;
+    }
+    delete() {
+        return observer_1.PromiseObserver.alwaysReturning(false);
+    }
+    getData() {
+        return undefined;
+    }
+    getCardType() {
+        return 'WorkoutImport';
+    }
+    getId() {
+        return 'Import';
+    }
+    getFilters() {
+        return types_1.DEFAULT_FILTERS;
+    }
+    getTitle() {
+        return types_1.DEFAULT_TITLE;
+    }
+    getDisplayProperties() {
+        const title = this.getTitle();
+        const filters = this.getFilters();
+        return { title, filters, visible: true };
+    }
+}
+exports.WorkoutImportCard = WorkoutImportCard;

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

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

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

@@ -14,6 +14,7 @@ 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("./WorkoutCreateCard"), exports);
 __exportStar(require("./WorkoutImportCard"), exports);
+__exportStar(require("./WorkoutCard"), exports);
 __exportStar(require("./types"), exports);

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

@@ -1,7 +1,7 @@
 import { ImportFilter } from "../../../base/cardlist/types";
 import { Observer } from "../../../base/types/observer";
 import { Workout } from "../../base/model";
-export type WorkoutCardType = 'WorkoutImport' | 'Workout' | 'ActiveWorkoutImport';
+export type WorkoutCardType = 'WorkoutImport' | 'Workout' | 'ActiveWorkoutImport' | 'WorkoutCreate';
 export declare const DEFAULT_TITLE = "Import Workout";
 export declare const DEFAULT_FILTERS: {
     name: string;
@@ -12,6 +12,12 @@ export interface WorkoutImportProps {
     filters: Array<ImportFilter>;
     visible: boolean;
 }
+export interface WorkoutCreateProps {
+    title: string;
+    visible: boolean;
+    link?: string;
+    firstTime?: boolean;
+}
 export interface ActiveImportProps {
     name: string;
     error?: Error;

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

@@ -37,6 +37,7 @@ export declare class WorkoutListService extends IncyclistService implements ILis
     onCarouselInitialized(list: CardList<WP>, item: any, itemsInSlide: any): void;
     onCarouselUpdated(list: any, item: any, itemsInSlide: any): void;
     preload(): PromiseObserver<void>;
+    isStillLoading(): boolean;
     import(info: FileInfo | Array<FileInfo>, props: {
         card?: ActiveImportCard;
         showImportCards?: boolean;

package/lib/workouts/list/service.js

@@ -59,7 +59,7 @@ const valid_1 = require("../../utils/valid");
 const parsers_1 = require("../base/parsers");
 const ActiveImportCard_1 = require("./cards/ActiveImportCard");
 const WorkoutCard_1 = require("./cards/WorkoutCard");
-const WorkoutImportCard_1 = require("./cards/WorkoutImportCard");
+const cards_1 = require("./cards");
 const db_1 = require("./loaders/db");
 let WorkoutListService = (() => {
     let _classDecorators = [types_1.Singleton];
@@ -75,7 +75,8 @@ let WorkoutListService = (() => {
             this.lists = [this.myWorkouts];
             this.items = [];
             this.language = 'en';
-            this.myWorkouts.add(new WorkoutImportCard_1.WorkoutImportCard());
+            this.myWorkouts.add(new cards_1.WorkoutImportCard());
+            this.myWorkouts.add(new cards_1.WorkoutCreateCard());
             this.registerUserChangeHandler();
         }
         getSelected() { return this.selectedWorkout; }
@@ -224,6 +225,9 @@ let WorkoutListService = (() => {
             }
             return this.preloadObserver;
         }
+        isStillLoading() {
+            return this.preloadObserver !== undefined && !this.initialized;
+        }
         import(info, props) {
             return __awaiter(this, void 0, void 0, function* () {
                 try {
@@ -342,7 +346,7 @@ let WorkoutListService = (() => {
         }
         createSettingsList() {
             const list = new cardlist_1.CardList('settings', 'Workouts');
-            list.add(new WorkoutImportCard_1.WorkoutImportCard());
+            list.add(new cards_1.WorkoutImportCard());
             this.items
                 .sort((a, b) => a.name > b.name ? 1 : -1);
             this.items.forEach(i => {

package/package.json

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