incyclist-services 1.7.78 → 1.7.80

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

@@ -74,8 +74,8 @@ let WorkoutListPageService = (() => {
             __runInitializers(_classThis, _classExtraInitializers);
         }
         groupFilter = (__runInitializers(this, _instanceExtraInitializers), null);
+        detailWorkoutId = null;
         importPhase;
-        importGroup;
         importingFileName;
         importResult;
         importError;
@@ -132,7 +132,7 @@ let WorkoutListPageService = (() => {
                 const workouts = groups.selected ? allWorkouts.filter(w => w.group === groups.selected) : allWorkouts;
                 const selectedId = service.getSelected()?.id ?? null;
                 const isEmpty = allWorkouts.length === 0;
-                return { pageType: 'list', loading, upcoming, groups, workouts, selectedId, isEmpty };
+                return { pageType: 'list', loading, upcoming, groups, workouts, selectedId, isEmpty, detailWorkoutId: this.detailWorkoutId };
             }
             catch (err) {
                 this.logError(err, 'getPageDisplayProps');
@@ -174,8 +174,7 @@ let WorkoutListPageService = (() => {
             try {
                 const phase = this.importPhase ?? 'landing';
                 const knownGroups = this.getKnownGroups();
-                const group = this.importGroup ?? this.getLastUsedImportGroup();
-                const props = { phase, group, knownGroups };
+                const props = { phase, knownGroups };
                 if (phase === 'importing')
                     props.importing = { fileName: this.importingFileName };
                 if (phase === 'result')
@@ -186,7 +185,7 @@ let WorkoutListPageService = (() => {
             }
             catch (err) {
                 this.logError(err, 'getImportDisplayProps');
-                return { phase: 'landing', group: DEFAULT_IMPORT_GROUP, knownGroups: [] };
+                return { phase: 'landing', knownGroups: [] };
             }
         }
         onSelectGroup(group) {
@@ -199,10 +198,24 @@ let WorkoutListPageService = (() => {
             }
         }
         onOpenDetails(id) {
-            this.logEvent({ message: 'details opened', id });
+            try {
+                this.detailWorkoutId = id;
+                this.logEvent({ message: 'details opened', id });
+                this.emitPageUpdate();
+            }
+            catch (err) {
+                this.logError(err, 'onOpenDetails');
+            }
         }
         onCloseDetails() {
-            this.logEvent({ message: 'details closed' });
+            try {
+                this.detailWorkoutId = null;
+                this.logEvent({ message: 'details closed' });
+                this.emitPageUpdate();
+            }
+            catch (err) {
+                this.logError(err, 'onCloseDetails');
+            }
         }
         onSetFtp(ftp) {
             try {
@@ -284,7 +297,6 @@ let WorkoutListPageService = (() => {
         onImportOpen() {
             try {
                 this.importPhase = 'landing';
-                this.importGroup = this.getLastUsedImportGroup();
                 delete this.importError;
                 delete this.importResult;
                 this.emitImportUpdate();
@@ -293,29 +305,17 @@ let WorkoutListPageService = (() => {
                 this.logError(err, 'onImportOpen');
             }
         }
-        onImportGroupChange(name) {
-            try {
-                this.importGroup = name;
-                this.emitImportUpdate();
-            }
-            catch (err) {
-                this.logError(err, 'onImportGroupChange');
-            }
-        }
         onImportFile(file) {
             const observer = new observer_1.Observer();
             try {
-                const group = this.importGroup;
                 this.importPhase = 'importing';
                 this.importingFileName = file?.name;
                 this.emitImportUpdate();
                 this.getWorkoutList().import(file, { showImportCards: false })
                     .then(([card]) => {
-                    if (group && group !== DEFAULT_IMPORT_GROUP)
-                        card.move(group);
-                    this.persistLastUsedImportGroup(group);
+                    const group = this.getLastUsedImportGroup();
                     this.importPhase = 'result';
-                    this.importResult = { workoutName: card.getTitle(), group };
+                    this.importResult = { id: card.getId(), workoutName: card.getTitle(), group };
                     observer.emit('success');
                     this.emitImportUpdate();
                 })
@@ -331,6 +331,19 @@ let WorkoutListPageService = (() => {
             }
             return observer;
         }
+        onImportSetGroup(id, group) {
+            try {
+                const card = this.findWorkoutCard(id);
+                card?.move(group);
+                this.persistLastUsedImportGroup(group);
+                if (this.importResult)
+                    this.importResult = { ...this.importResult, group };
+                this.emitImportUpdate();
+            }
+            catch (err) {
+                this.logError(err, 'onImportSetGroup');
+            }
+        }
         onImportClose() {
             try {
                 delete this.importPhase;

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

@@ -71,8 +71,8 @@ let WorkoutListPageService = (() => {
             __runInitializers(_classThis, _classExtraInitializers);
         }
         groupFilter = (__runInitializers(this, _instanceExtraInitializers), null);
+        detailWorkoutId = null;
         importPhase;
-        importGroup;
         importingFileName;
         importResult;
         importError;
@@ -129,7 +129,7 @@ let WorkoutListPageService = (() => {
                 const workouts = groups.selected ? allWorkouts.filter(w => w.group === groups.selected) : allWorkouts;
                 const selectedId = service.getSelected()?.id ?? null;
                 const isEmpty = allWorkouts.length === 0;
-                return { pageType: 'list', loading, upcoming, groups, workouts, selectedId, isEmpty };
+                return { pageType: 'list', loading, upcoming, groups, workouts, selectedId, isEmpty, detailWorkoutId: this.detailWorkoutId };
             }
             catch (err) {
                 this.logError(err, 'getPageDisplayProps');
@@ -171,8 +171,7 @@ let WorkoutListPageService = (() => {
             try {
                 const phase = this.importPhase ?? 'landing';
                 const knownGroups = this.getKnownGroups();
-                const group = this.importGroup ?? this.getLastUsedImportGroup();
-                const props = { phase, group, knownGroups };
+                const props = { phase, knownGroups };
                 if (phase === 'importing')
                     props.importing = { fileName: this.importingFileName };
                 if (phase === 'result')
@@ -183,7 +182,7 @@ let WorkoutListPageService = (() => {
             }
             catch (err) {
                 this.logError(err, 'getImportDisplayProps');
-                return { phase: 'landing', group: DEFAULT_IMPORT_GROUP, knownGroups: [] };
+                return { phase: 'landing', knownGroups: [] };
             }
         }
         onSelectGroup(group) {
@@ -196,10 +195,24 @@ let WorkoutListPageService = (() => {
             }
         }
         onOpenDetails(id) {
-            this.logEvent({ message: 'details opened', id });
+            try {
+                this.detailWorkoutId = id;
+                this.logEvent({ message: 'details opened', id });
+                this.emitPageUpdate();
+            }
+            catch (err) {
+                this.logError(err, 'onOpenDetails');
+            }
         }
         onCloseDetails() {
-            this.logEvent({ message: 'details closed' });
+            try {
+                this.detailWorkoutId = null;
+                this.logEvent({ message: 'details closed' });
+                this.emitPageUpdate();
+            }
+            catch (err) {
+                this.logError(err, 'onCloseDetails');
+            }
         }
         onSetFtp(ftp) {
             try {
@@ -281,7 +294,6 @@ let WorkoutListPageService = (() => {
         onImportOpen() {
             try {
                 this.importPhase = 'landing';
-                this.importGroup = this.getLastUsedImportGroup();
                 delete this.importError;
                 delete this.importResult;
                 this.emitImportUpdate();
@@ -290,29 +302,17 @@ let WorkoutListPageService = (() => {
                 this.logError(err, 'onImportOpen');
             }
         }
-        onImportGroupChange(name) {
-            try {
-                this.importGroup = name;
-                this.emitImportUpdate();
-            }
-            catch (err) {
-                this.logError(err, 'onImportGroupChange');
-            }
-        }
         onImportFile(file) {
             const observer = new Observer();
             try {
-                const group = this.importGroup;
                 this.importPhase = 'importing';
                 this.importingFileName = file?.name;
                 this.emitImportUpdate();
                 this.getWorkoutList().import(file, { showImportCards: false })
                     .then(([card]) => {
-                    if (group && group !== DEFAULT_IMPORT_GROUP)
-                        card.move(group);
-                    this.persistLastUsedImportGroup(group);
+                    const group = this.getLastUsedImportGroup();
                     this.importPhase = 'result';
-                    this.importResult = { workoutName: card.getTitle(), group };
+                    this.importResult = { id: card.getId(), workoutName: card.getTitle(), group };
                     observer.emit('success');
                     this.emitImportUpdate();
                 })
@@ -328,6 +328,19 @@ let WorkoutListPageService = (() => {
             }
             return observer;
         }
+        onImportSetGroup(id, group) {
+            try {
+                const card = this.findWorkoutCard(id);
+                card?.move(group);
+                this.persistLastUsedImportGroup(group);
+                if (this.importResult)
+                    this.importResult = { ...this.importResult, group };
+                this.emitImportUpdate();
+            }
+            catch (err) {
+                this.logError(err, 'onImportSetGroup');
+            }
+        }
         onImportClose() {
             try {
                 delete this.importPhase;

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

@@ -6,10 +6,11 @@ import { WorkoutListService } from "../list/service";
 import { GroupFilterProps, IWorkoutListPageService, UpcomingTrainingProps, WorkoutDetailsProps, WorkoutImportDisplayProps, WorkoutListItemProps, WorkoutListPageDisplayProps } from "./types";
 export declare class WorkoutListPageService extends IncyclistPageService implements IWorkoutListPageService {
     protected groupFilter: string | null;
+    protected detailWorkoutId: string | null;
     protected importPhase: 'landing' | 'importing' | 'result' | 'error' | undefined;
-    protected importGroup: string;
     protected importingFileName: string;
     protected importResult: {
+        id: string;
         workoutName: string;
         group: string;
     };
@@ -36,8 +37,8 @@ export declare class WorkoutListPageService extends IncyclistPageService impleme
     onMarkForRoute(id: string): void;
     onClearSelection(): void;
     onImportOpen(): void;
-    onImportGroupChange(name: string): void;
     onImportFile(file: FileInfo): IObserver;
+    onImportSetGroup(id: string, group: string): void;
     onImportClose(): void;
     protected getUpcomingTrainingProps(): UpcomingTrainingProps | null;
     protected getGroupFilterProps(): GroupFilterProps;

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

@@ -12,6 +12,7 @@ export interface WorkoutListContentProps {
     workouts: WorkoutListItemProps[];
     selectedId: string | null;
     isEmpty: boolean;
+    detailWorkoutId: string | null;
 }
 export interface UpcomingTrainingProps {
     items: ScheduledWorkoutItemProps[];
@@ -59,12 +60,12 @@ export interface WorkoutDetailsProps {
 }
 export interface WorkoutImportDisplayProps {
     phase: 'landing' | 'importing' | 'result' | 'error';
-    group: string;
     knownGroups: string[];
     importing?: {
         fileName: string;
     };
     result?: {
+        id: string;
         workoutName: string;
         group: string;
     };
@@ -84,8 +85,8 @@ export interface WorkoutListPageCallbacks {
     onMarkForRoute?: (id: string) => void;
     onClearSelection: () => void;
     onImportOpen: () => void;
-    onImportGroupChange: (name: string) => void;
     onImportFile: (file: FileInfo) => IObserver;
+    onImportSetGroup: (id: string, group: string) => void;
     onImportClose: () => void;
 }
 export interface IWorkoutListPageService extends WorkoutListPageCallbacks {

package/package.json

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