incyclist-services 1.7.103 → 1.7.105

package/lib/cjs/workouts/base/model/Workout.js

@@ -11,6 +11,8 @@ class Workout extends Segment_1.Segment {
     name;
     description;
     category;
+    isLocal;
+    isDeleted;
     explicitId;
     constructor(opts) {
         super(opts, true);
@@ -21,6 +23,8 @@ class Workout extends Segment_1.Segment {
         this.repeat = 1;
         this.type = 'workout';
         this.category = opts.category;
+        this.isLocal = opts.isLocal;
+        this.isDeleted = opts.isDeleted;
         this.steps = [];
         this.start = this.end = this.duration = 0;
         opts.steps?.forEach(s => {

package/lib/cjs/workouts/base/parsers/incyclist/Json.js

@@ -17,7 +17,7 @@ class JsonParser {
             const str = await this.getData(file, data);
             const parsedData = JSON.parse(str);
             const { name, description, category, steps, type = 'workout' } = parsedData;
-            const workout = new Workout_1.Workout({ type, name, description, category });
+            const workout = new Workout_1.Workout({ type, name, description, category, isLocal: true });
             steps.forEach(step => {
                 if (step.type === 'step') {
                     workout.addStep(step);

package/lib/cjs/workouts/base/parsers/intervals/parser.js

@@ -77,7 +77,7 @@ let IntervalsJsonParser = (() => {
         }
         fromJSON(data, fileName) {
             const name = fileName?.replace(/\.json$/i, '');
-            const workout = new model_1.Workout({ type: 'workout', name, description: data.description });
+            const workout = new model_1.Workout({ type: 'workout', name, description: data.description, isLocal: true });
             data.steps.forEach(s => {
                 if (s.reps !== undefined && s.reps !== null) {
                     const segment = this.convertSegment(s, data);

package/lib/cjs/workouts/base/parsers/zwo/zwo.js

@@ -46,7 +46,7 @@ class ZwoParser {
         xml.expectScheme('workout_file');
         const name = (0, utils_1.ignoreEmpty)(xml.json['name']) ?? fileName;
         const description = (0, utils_1.ignoreEmpty)(xml.json['description']);
-        const workout = new Workout_1.Workout({ type: 'workout', name, description });
+        const workout = new Workout_1.Workout({ type: 'workout', name, description, isLocal: true });
         return this.parse(str, workout);
     }
     supportsExtension(extension) {

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

@@ -133,6 +133,10 @@ let WorkoutCard = (() => {
                 this.logError(err, 'save');
             }
         }
+        async markDeleted() {
+            this.workout.isDeleted = true;
+            await this.getRepo().save(this.workout, true);
+        }
         delete() {
             try {
                 const service = this.getWorkoutList();
@@ -206,7 +210,12 @@ let WorkoutCard = (() => {
             let deleted;
             try {
                 this.deleteObserver.emit('started');
-                await this.getRepo().delete(this.workout);
+                if (this.workout.isLocal) {
+                    await this.getRepo().delete(this.workout);
+                }
+                else {
+                    await this.markDeleted();
+                }
                 this.deleteFromUIList();
                 this.getWorkoutList().emitLists('updated');
                 deleted = true;

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,7 +527,22 @@ 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) {
+            this.items.push(item);
+            if (item.isDeleted) {
+                return undefined;
+            }
             const list = this.selectList(item);
             let card;
             if (item.type === 'workout') {
@@ -529,7 +552,6 @@ let WorkoutListService = (() => {
             }
             list.add(card);
             card.enableDelete(true);
-            this.items.push(item);
             this.emitLists('updated');
             return card;
         }

package/lib/esm/workouts/base/model/Workout.js

@@ -8,6 +8,8 @@ export class Workout extends Segment {
     name;
     description;
     category;
+    isLocal;
+    isDeleted;
     explicitId;
     constructor(opts) {
         super(opts, true);
@@ -18,6 +20,8 @@ export class Workout extends Segment {
         this.repeat = 1;
         this.type = 'workout';
         this.category = opts.category;
+        this.isLocal = opts.isLocal;
+        this.isDeleted = opts.isDeleted;
         this.steps = [];
         this.start = this.end = this.duration = 0;
         opts.steps?.forEach(s => {

package/lib/esm/workouts/base/parsers/incyclist/Json.js

@@ -14,7 +14,7 @@ export class JsonParser {
             const str = await this.getData(file, data);
             const parsedData = JSON.parse(str);
             const { name, description, category, steps, type = 'workout' } = parsedData;
-            const workout = new Workout({ type, name, description, category });
+            const workout = new Workout({ type, name, description, category, isLocal: true });
             steps.forEach(step => {
                 if (step.type === 'step') {
                     workout.addStep(step);

package/lib/esm/workouts/base/parsers/intervals/parser.js

@@ -74,7 +74,7 @@ let IntervalsJsonParser = (() => {
         }
         fromJSON(data, fileName) {
             const name = fileName?.replace(/\.json$/i, '');
-            const workout = new Workout({ type: 'workout', name, description: data.description });
+            const workout = new Workout({ type: 'workout', name, description: data.description, isLocal: true });
             data.steps.forEach(s => {
                 if (s.reps !== undefined && s.reps !== null) {
                     const segment = this.convertSegment(s, data);

package/lib/esm/workouts/base/parsers/zwo/zwo.js

@@ -40,7 +40,7 @@ export class ZwoParser {
         xml.expectScheme('workout_file');
         const name = ignoreEmpty(xml.json['name']) ?? fileName;
         const description = ignoreEmpty(xml.json['description']);
-        const workout = new Workout({ type: 'workout', name, description });
+        const workout = new Workout({ type: 'workout', name, description, isLocal: true });
         return this.parse(str, workout);
     }
     supportsExtension(extension) {

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

@@ -130,6 +130,10 @@ let WorkoutCard = (() => {
                 this.logError(err, 'save');
             }
         }
+        async markDeleted() {
+            this.workout.isDeleted = true;
+            await this.getRepo().save(this.workout, true);
+        }
         delete() {
             try {
                 const service = this.getWorkoutList();
@@ -203,7 +207,12 @@ let WorkoutCard = (() => {
             let deleted;
             try {
                 this.deleteObserver.emit('started');
-                await this.getRepo().delete(this.workout);
+                if (this.workout.isLocal) {
+                    await this.getRepo().delete(this.workout);
+                }
+                else {
+                    await this.markDeleted();
+                }
                 this.deleteFromUIList();
                 this.getWorkoutList().emitLists('updated');
                 deleted = true;

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,7 +524,22 @@ 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) {
+            this.items.push(item);
+            if (item.isDeleted) {
+                return undefined;
+            }
             const list = this.selectList(item);
             let card;
             if (item.type === 'workout') {
@@ -526,7 +549,6 @@ let WorkoutListService = (() => {
             }
             list.add(card);
             card.enableDelete(true);
-            this.items.push(item);
             this.emitLists('updated');
             return card;
         }

package/lib/types/workouts/base/model/Workout.d.ts

@@ -6,6 +6,8 @@ export declare class Workout extends Segment implements WorkoutDefinition {
     name: string;
     description: string;
     category?: Category;
+    isLocal?: boolean;
+    isDeleted?: boolean;
     protected explicitId: boolean;
     constructor(opts: WorkoutDefinition);
     get hash(): string;

package/lib/types/workouts/base/model/types.d.ts

@@ -46,6 +46,8 @@ export interface WorkoutDefinition extends SegmentDefinition {
     name?: string;
     description?: string;
     category?: Category;
+    isLocal?: boolean;
+    isDeleted?: boolean;
 }
 export interface ScheduledWorkout {
     week: number;

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

@@ -20,6 +20,7 @@ export declare class WorkoutCard extends BaseCard implements Card<Workout> {
     unselect(): void;
     move(targetListName: string): void;
     save(enforce?: boolean): Promise<void>;
+    protected markDeleted(): Promise<void>;
     delete(): PromiseObserver<boolean>;
     getId(): string;
     getTitle(): string;

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.105",
   "peerDependencies": {
     "gd-eventlog": "^0.1.27"
   },