Show recently added filters after import (close #2148)

esrlabs · Nov 20, 2024 · 8d020fc · 8d020fc
1 parent 5f9f013
commit 8d020fc
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 1 deletion.
diff --git a/application/client/src/app/service/history/collections.ts b/application/client/src/app/service/history/collections.ts
@@ -112,7 +112,7 @@ export class Collections implements EntryConvertable, Equal<Collections>, Empty
     static fromMinifiedStr(src: { [key: string]: number | string }): ICollection {
         return {
             name: obj.getAsNotEmptyString(src, 'n'),
-            created: obj.getAsValidNumber(src, 'c'),
+            created: Date.now(),
             used: obj.getAsValidNumber(src, 'u'),
             last: obj.getAsValidNumber(src, 'l'),
             preset: obj.getAsBool(src, 'p'),
@@ -264,6 +264,10 @@ export class Collections implements EntryConvertable, Equal<Collections>, Empty
         return this.name !== '' && this.name !== '-';
     }
 
+    public filterByDateTime(tm: number): boolean {
+        return this.created > tm;
+    }
+
     public isSame(collections: Collections): boolean {
         return (
             this.collections.filters.isSame(collections.collections.filters) &&

diff --git a/application/client/src/app/service/history/session.ts b/application/client/src/app/service/history/session.ts
@@ -173,6 +173,7 @@ export class HistorySession extends Subscriber {
         suitable(): Suitable;
         all(): Collections[];
         named(): Collections[];
+        byTimeStamp(tm: number): Collections[];
     } {
         return {
             related: (): Collections | undefined => {
@@ -189,6 +190,9 @@ export class HistorySession extends Subscriber {
             named: (): Collections[] => {
                 return this.storage.collections.find().named();
             },
+            byTimeStamp: (tm: number): Collections[] => {
+                return this.storage.collections.find().byTimeStamp(tm);
+            },
         };
     }
 

diff --git a/application/client/src/app/service/history/storage.collections.ts b/application/client/src/app/service/history/storage.collections.ts
@@ -112,6 +112,7 @@ export class StorageCollections {
         suitable(): Suitable;
         named(): Collections[];
         all(): Collections[];
+        byTimeStamp(tm: number): Collections[];
     } {
         return {
             related: (): Collections[] => {
@@ -146,6 +147,9 @@ export class StorageCollections {
             all: (): Collections[] => {
                 return Array.from(this.collections.values());
             },
+            byTimeStamp: (tm: number): Collections[] => {
+                return Array.from(this.collections.values()).filter((c) => c.filterByDateTime(tm));
+            },
         };
     }
 

diff --git a/application/client/src/app/ui/views/toolbar/history/state.ts b/application/client/src/app/ui/views/toolbar/history/state.ts
@@ -15,6 +15,7 @@ export interface Selection {
 
 export class State {
     protected parent!: IlcInterface & ChangesDetector;
+    protected recentImport: number | undefined = undefined;
 
     public history!: HistorySession;
     public groups: SuitableGroup[] = [];
@@ -104,10 +105,12 @@ export class State {
                 if (files.length !== 1) {
                     return;
                 }
+                this.recentImport = Date.now();
                 this.parent
                     .ilc()
                     .services.system.history.import(files[0].filename)
                     .then(() => {
+                        this.filtered = -4;
                         this.list().update();
                         this.parent.detectChanges();
                     })
@@ -139,6 +142,17 @@ export class State {
     public update(): State {
         const groups: SuitableGroup[] = (() => {
             switch (this.filtered) {
+                case -4:
+                    return [
+                        {
+                            caption: 'Recently Added',
+                            rank: 0,
+                            collections:
+                                this.recentImport !== undefined
+                                    ? this.history.find().byTimeStamp(this.recentImport)
+                                    : this.history.find().all(),
+                        },
+                    ];
                 case -3:
                     return [{ caption: 'All', rank: 0, collections: this.history.find().all() }];
                 case -2:
@@ -185,6 +199,7 @@ export class State {
         const suitable = this.history.find().suitable();
         const groups = suitable.asGroups();
         this.filters = [
+            ...(this.recentImport === undefined ? [] : [{ caption: 'Recently Added', value: -4 }]),
             { caption: 'All', value: -3 },
             { caption: 'All Suitable', value: -2 },
             { caption: 'Named Presets', value: -1 },