incyclist-services 1.3.50 → 1.3.51

package/lib/activities/base/repo/db.js

@@ -115,7 +115,7 @@ let ActivitiesRepository = (() => {
                     return;
                 const id = target.summary.id;
                 const idx = this.activities.findIndex(ai => ai.summary.id === id);
-                if (idx) {
+                if (idx !== -1) {
                     this.activities.splice(idx, 1);
                     this.write(true);
                 }
@@ -145,7 +145,8 @@ let ActivitiesRepository = (() => {
             });
         }
         search(criteria) {
-            let result = this.activities;
+            var _a;
+            let result = (_a = this.activities) === null || _a === void 0 ? void 0 : _a.filter(ai => ai.summary.rideTime > 30);
             result = this.checkIdFilter(result, criteria);
             result = this.checkHashFilter(result, criteria);
             result = this.checkStartPosFilter(result, criteria);
@@ -155,6 +156,9 @@ let ActivitiesRepository = (() => {
             result = this.checkUploadStatusFilter(result, criteria);
             result = this.checkTimeFilter(result, criteria);
             result = this.checkDistanceFilter(result, criteria);
+            if ((criteria === null || criteria === void 0 ? void 0 : criteria.maxValues) !== undefined && (result === null || result === void 0 ? void 0 : result.length) > criteria.maxValues) {
+                result = result.slice(0, criteria.maxValues - 1);
+            }
             return result;
         }
         checkIdFilter(result, criteria) {

package/lib/activities/base/repo/types.d.ts

@@ -9,4 +9,5 @@ export interface ActivitySearchCriteria {
     isSaved?: boolean;
     minTime?: number;
     minDistance?: number;
+    maxValues?: number;
 }

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

@@ -7,14 +7,30 @@ export declare class ActivityListService extends IncyclistService {
     protected initialized: boolean;
     protected repo: ActivitiesRepository;
     protected observer: Observer;
+    protected filter: ActivitySearchCriteria;
     constructor();
     preload(): PromiseObserver<void>;
-    getPastActivities(filter: ActivitySearchCriteria): Array<ActivityInfo>;
+    openList(): {
+        filter: ActivitySearchCriteria;
+        activities: ActivityInfo[];
+    };
+    getListObserver(): Observer;
+    closeList(): void;
+    isStillLoading(): boolean;
+    setFilter(filter: ActivitySearchCriteria): void;
+    protected getPastActivities(): Array<ActivityInfo>;
+    getActivityDetails(id: string): Observer;
+    delete(id: string): Promise<boolean>;
     getPastActivitiesWithDetails(filter: ActivitySearchCriteria): Promise<Array<ActivityInfo>>;
     protected loadActivities(): Promise<void>;
+    protected loadDetails(activity: any): Promise<void>;
     protected getRepo(): ActivitiesRepository;
     protected get activities(): Array<ActivityInfo>;
-    protected getListDisplayProperties(activities: Array<ActivityInfo>): ActivityInfo[];
+    protected getActivity(id: string): ActivityInfo;
+    protected getListDisplayProperties(): {
+        filter: ActivitySearchCriteria;
+        activities: ActivityInfo[];
+    };
     protected emitLists(event: 'loaded' | 'updated'): void;
 }
 export declare const useActivityList: () => ActivityListService;

package/lib/activities/list/service.js

@@ -46,11 +46,16 @@ var __setFunctionName = (this && this.__setFunctionName) || function (f, name, p
     if (typeof name === "symbol") name = name.description ? "[".concat(name.description, "]") : "";
     return Object.defineProperty(f, "name", { configurable: true, value: prefix ? "".concat(prefix, " ", name) : name });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getActivityList = exports.useActivityList = exports.ActivityListService = void 0;
 const service_1 = require("../../base/service");
 const types_1 = require("../../base/types");
 const observer_1 = require("../../base/types/observer");
+const utils_1 = require("../../utils");
+const clone_1 = __importDefault(require("../../utils/clone"));
 const base_1 = require("../base");
 let ActivityListService = (() => {
     let _classDecorators = [types_1.Singleton];
@@ -74,10 +79,15 @@ let ActivityListService = (() => {
                     this.preloadObserver.start()
                         .then(() => {
                         var _a;
-                        this.logEvent({ message: 'preload route list completed', cnt: (_a = this.activities) === null || _a === void 0 ? void 0 : _a.length });
-                        this.initialized = true;
-                        this.emitLists('loaded');
-                        process.nextTick(() => { delete this.preloadObserver; });
+                        const getDetails = ((_a = this.getRepo().search({})) !== null && _a !== void 0 ? _a : []).filter((a, i) => i < 20).map(a => this.loadDetails(a));
+                        Promise.allSettled(getDetails).then(() => {
+                            var _a;
+                            this.logEvent({ message: 'preload activity list completed', cnt: (_a = this.activities) === null || _a === void 0 ? void 0 : _a.length });
+                            console.log('~~~~ ACTIVITIES', (0, clone_1.default)(this.activities));
+                            this.initialized = true;
+                            this.emitLists('loaded');
+                            process.nextTick(() => { delete this.preloadObserver; });
+                        });
                     })
                         .catch((err) => {
                         this.logError(err, 'preload');
@@ -92,17 +102,77 @@ let ActivityListService = (() => {
             }
             return this.preloadObserver;
         }
-        getPastActivities(filter) {
+        openList() {
+            if (!this.observer)
+                this.observer = new observer_1.Observer();
+            return this.getListDisplayProperties();
+        }
+        getListObserver() {
+            if (!this.observer)
+                this.observer = new observer_1.Observer();
+            return this.observer;
+        }
+        closeList() {
+            if (this.observer) {
+                this.observer.stop();
+                delete this.observer;
+            }
+        }
+        isStillLoading() {
+            return !this.initialized;
+        }
+        setFilter(filter) {
+            this.filter = filter;
+        }
+        getPastActivities() {
             var _a;
             try {
-                const activities = (_a = this.getRepo().search(filter)) !== null && _a !== void 0 ? _a : [];
-                return activities;
+                const activities = (_a = this.getRepo().search(this.filter)) !== null && _a !== void 0 ? _a : [];
+                return activities.sort((a, b) => { var _a, _b; return ((_a = b.summary) === null || _a === void 0 ? void 0 : _a.startTime) - ((_b = a.summary) === null || _b === void 0 ? void 0 : _b.startTime); });
             }
             catch (err) {
                 this.logError(err, 'getPastActivities');
                 return [];
             }
         }
+        getActivityDetails(id) {
+            const observer = new observer_1.Observer();
+            try {
+                const activity = this.getActivity(id);
+                if (activity.details) {
+                    (0, utils_1.waitNextTick)().then(() => observer.emit('loaded', activity.details));
+                    return;
+                }
+                this.getRepo().getWithDetails(id).then(ai => {
+                    if (!ai)
+                        return;
+                    if (activity) {
+                        activity.details = ai.details;
+                    }
+                    observer.emit('loaded', activity.details);
+                })
+                    .catch(err => {
+                    this.logError(err, 'getActivityDetails#getWithDetails');
+                });
+            }
+            catch (err) {
+                this.logError(err, 'getActivityDetails');
+            }
+            return observer;
+        }
+        delete(id) {
+            return __awaiter(this, void 0, void 0, function* () {
+                try {
+                    yield this.getRepo().delete(id);
+                    this.emitLists('updated');
+                    return true;
+                }
+                catch (err) {
+                    this.logError(err, 'delete');
+                    return false;
+                }
+            });
+        }
         getPastActivitiesWithDetails(filter) {
             return __awaiter(this, void 0, void 0, function* () {
                 var _a;
@@ -130,6 +200,16 @@ let ActivityListService = (() => {
                 });
             });
         }
+        loadDetails(activity) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const ai = yield this.getRepo().getWithDetails(activity.summary.id);
+                if (!ai)
+                    return;
+                if (activity) {
+                    activity.details = ai.details;
+                }
+            });
+        }
         getRepo() {
             if (!this.repo)
                 this.repo = new base_1.ActivitiesRepository();
@@ -138,17 +218,22 @@ let ActivityListService = (() => {
         get activities() {
             return this.getRepo().getAll();
         }
-        getListDisplayProperties(activities) {
-            return activities;
+        getActivity(id) {
+            var _a;
+            return (_a = this.activities) === null || _a === void 0 ? void 0 : _a.find(a => a.summary.id === id);
+        }
+        getListDisplayProperties() {
+            const activities = this.getPastActivities();
+            const filter = this.filter;
+            return { filter, activities };
         }
         emitLists(event) {
             try {
-                const activities = this.getRepo().getAll();
                 if (this.observer)
-                    this.observer.emit(event, this.getListDisplayProperties(activities));
+                    this.observer.emit(event, this.getListDisplayProperties());
             }
             catch (err) {
-                this.logError(err, 'emitLists', event);
+                this.logError(err, 'emitLists', { event });
             }
         }
     };

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

@@ -1,2 +1,3 @@
 export * from "./singleton";
 export * from './lists';
+export * from './observer';

package/lib/base/types/index.js

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

package/lib/index.d.ts

@@ -9,3 +9,4 @@ export * from './activities';
 export { useUserSettings, initUserSettings, UserSettingsService, UserSettingsBinding, IUserSettingsBinding } from './settings';
 export * from './autoupdate';
 export * from './monitoring';
+export * from './base/types';

package/lib/index.js

@@ -30,3 +30,4 @@ Object.defineProperty(exports, "UserSettingsService", { enumerable: true, get: f
 Object.defineProperty(exports, "UserSettingsBinding", { enumerable: true, get: function () { return settings_1.UserSettingsBinding; } });
 __exportStar(require("./autoupdate"), exports);
 __exportStar(require("./monitoring"), exports);
+__exportStar(require("./base/types"), exports);

package/package.json

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