incyclist-services 1.7.103 → 1.7.104

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

@@ -48,6 +48,7 @@ const ActiveImportCard_1 = require("./cards/ActiveImportCard");
 const WorkoutCard_1 = require("./cards/WorkoutCard");
 const cards_1 = require("./cards");
 const db_1 = require("./loaders/db");
+const api_2 = require("./loaders/api");
 const decorators_1 = require("../../base/decorators");
 const calendar_1 = require("../calendar");
 const ScheduledWorkoutCard_1 = require("./cards/ScheduledWorkoutCard");
@@ -84,6 +85,7 @@ let WorkoutListService = (() => {
         preloadObserver;
         items;
         db;
+        api;
         screenProps;
         language;
         selectedWorkout;
@@ -102,6 +104,7 @@ let WorkoutListService = (() => {
             this.language = 'en';
             this.myWorkouts.add(new cards_1.WorkoutImportCard());
             this.myWorkouts.add(new cards_1.WorkoutCreateCard());
+            this.api = new api_2.WorkoutsApiLoader();
             this.registerUserChangeHandler();
             this.onUpdate = this.onScheduledWorkoutsUpdated.bind(this);
             this.getWorkoutCalendar().on('updated', this.onUpdate);
@@ -504,6 +507,11 @@ let WorkoutListService = (() => {
             });
         }
         async loadWorkouts() {
+            await this.loadWorkoutsFromRepo();
+            await this.loadWorkoutsFromApi();
+            this.logEvent({ message: 'loadWorkoutsFromApi done' });
+        }
+        async loadWorkoutsFromRepo() {
             return new Promise((done, reject) => {
                 try {
                     const observer = this.getRepo().load();
@@ -519,6 +527,17 @@ let WorkoutListService = (() => {
                 }
             });
         }
+        async loadWorkoutsFromApi() {
+            return new Promise((done) => {
+                this.logEvent({ message: 'loadWorkoutsFromApi start' });
+                const observer = this.api.load();
+                const add = this.addItem.bind(this);
+                const update = this.updateItem.bind(this);
+                observer.on('workout.added', add);
+                observer.on('workout.updated', update);
+                observer.on('done', done);
+            });
+        }
         addItem(item) {
             const list = this.selectList(item);
             let card;

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

@@ -45,6 +45,7 @@ import { ActiveImportCard } from "./cards/ActiveImportCard";
 import { WorkoutCard } from "./cards/WorkoutCard";
 import { WorkoutImportCard, WorkoutCreateCard } from './cards';
 import { WorkoutsDbLoader } from "./loaders/db";
+import { WorkoutsApiLoader } from "./loaders/api";
 import { Injectable } from "../../base/decorators";
 import { useWorkoutCalendar } from "../calendar";
 import { ScheduledWorkoutCard } from "./cards/ScheduledWorkoutCard";
@@ -81,6 +82,7 @@ let WorkoutListService = (() => {
         preloadObserver;
         items;
         db;
+        api;
         screenProps;
         language;
         selectedWorkout;
@@ -99,6 +101,7 @@ let WorkoutListService = (() => {
             this.language = 'en';
             this.myWorkouts.add(new WorkoutImportCard());
             this.myWorkouts.add(new WorkoutCreateCard());
+            this.api = new WorkoutsApiLoader();
             this.registerUserChangeHandler();
             this.onUpdate = this.onScheduledWorkoutsUpdated.bind(this);
             this.getWorkoutCalendar().on('updated', this.onUpdate);
@@ -501,6 +504,11 @@ let WorkoutListService = (() => {
             });
         }
         async loadWorkouts() {
+            await this.loadWorkoutsFromRepo();
+            await this.loadWorkoutsFromApi();
+            this.logEvent({ message: 'loadWorkoutsFromApi done' });
+        }
+        async loadWorkoutsFromRepo() {
             return new Promise((done, reject) => {
                 try {
                     const observer = this.getRepo().load();
@@ -516,6 +524,17 @@ let WorkoutListService = (() => {
                 }
             });
         }
+        async loadWorkoutsFromApi() {
+            return new Promise((done) => {
+                this.logEvent({ message: 'loadWorkoutsFromApi start' });
+                const observer = this.api.load();
+                const add = this.addItem.bind(this);
+                const update = this.updateItem.bind(this);
+                observer.on('workout.added', add);
+                observer.on('workout.updated', update);
+                observer.on('done', done);
+            });
+        }
         addItem(item) {
             const list = this.selectList(item);
             let card;

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

@@ -8,6 +8,7 @@ import { ActiveImportCard } from "./cards/ActiveImportCard";
 import { WorkoutCard } from "./cards/WorkoutCard";
 import { WorkoutSettings } from "./cards/types";
 import { WorkoutsDbLoader } from "./loaders/db";
+import { WorkoutsApiLoader } from "./loaders/api";
 import { WP, WorkoutSettingsDisplayProps } from "./types";
 import { ScheduledWorkout, WorkoutCalendarEntry } from "../calendar";
 export declare class WorkoutListService extends IncyclistService implements IListService<WP> {
@@ -18,6 +19,7 @@ export declare class WorkoutListService extends IncyclistService implements ILis
     protected preloadObserver: PromiseObserver<void>;
     protected items: Array<WP>;
     protected db: WorkoutsDbLoader;
+    protected api: WorkoutsApiLoader;
     protected screenProps: any;
     protected language: string;
     protected selectedWorkout: Workout;
@@ -65,6 +67,8 @@ export declare class WorkoutListService extends IncyclistService implements ILis
     protected resetLists(): void;
     protected resetCards(): void;
     protected loadWorkouts(): Promise<void>;
+    protected loadWorkoutsFromRepo(): Promise<void>;
+    protected loadWorkoutsFromApi(): Promise<void>;
     protected addItem(item: WP): Card<WP>;
     protected updateItem(item: WP): Promise<void>;
     protected selectList(item: WP): CardList<WP>;

package/package.json

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