Fix used counter in presets view (#2432)

* Add fix for counter issue

* Change applied collection from array to set

* Clear the session id before adding one

* Fix linting issue

* Change function name

* Add check to verify session ids in set are string

Author: sudeeptarlekar

application/client/src/app/service/history/collections.ts

@@ -26,6 +26,7 @@ export interface ICollection {
     last: number;
     used: number;
     uuid: string;
+    applied_sessions: Set<string>;
     preset: boolean;
     relations: string[];
     entries: JsonSet;
@@ -47,6 +48,7 @@ export class Collections implements EntryConvertable, Equal<Collections>, Empty
                     created: Date.now(),
                     used: 1,
                     uuid: smth.uuid(),
+                    applied_sessions: new Set([smth.uuid()]),
                     preset: false,
                     relations: [],
                     origin: undefined,
@@ -98,6 +100,7 @@ export class Collections implements EntryConvertable, Equal<Collections>, Empty
                 created: Date.now(),
                 used: 1,
                 uuid: uuid,
+                applied_sessions: new Set(),
                 preset: false,
                 relations: [],
                 origin: undefined,
@@ -117,6 +120,7 @@ export class Collections implements EntryConvertable, Equal<Collections>, Empty
             last: obj.getAsValidNumber(src, 'l'),
             preset: obj.getAsBool(src, 'p'),
             uuid: obj.getAsNotEmptyString(src, 'uu'),
+            applied_sessions: obj.getAsSetOfStringsOrEmpty(src, 'as'),
             relations: obj.getAsArray(src, 'r'),
             origin: obj.getAsNotEmptyStringOrAsUndefined(src, 'o'),
             entries: obj.getAsObj(src, 'e'),
@@ -130,6 +134,7 @@ export class Collections implements EntryConvertable, Equal<Collections>, Empty
     public used: number;
     public last: number;
     public uuid: string;
+    public applied_sessions: Set<string>;
     public preset: boolean;
     public relations: string[];
     public origin: string | undefined;
@@ -156,6 +161,7 @@ export class Collections implements EntryConvertable, Equal<Collections>, Empty
         this.last = definition.last;
         this.created = definition.created;
         this.uuid = definition.uuid;
+        this.applied_sessions = definition.applied_sessions;
         this.relations = definition.relations;
         this.origin = definition.origin;
         this.preset = definition.preset;
@@ -182,6 +188,7 @@ export class Collections implements EntryConvertable, Equal<Collections>, Empty
                 used: this.used,
                 created: this.created,
                 uuid: this.uuid,
+                applied_sessions: this.applied_sessions,
                 relations: this.relations,
                 preset: this.preset,
                 last: this.last,
@@ -194,27 +201,6 @@ export class Collections implements EntryConvertable, Equal<Collections>, Empty
         );
     }
 
-    public copy(): Collections {
-        const uuid = unique();
-        return new Collections(
-            `Collections:${uuid}`,
-            {
-                name: this.name,
-                last: Date.now(),
-                created: Date.now(),
-                used: 1,
-                uuid,
-                preset: false,
-                relations: [],
-                origin: undefined,
-                entries: this.asCollectionsArray()
-                    .map((c) => c.as().jsonSet())
-                    .flat(),
-            },
-            this.storage,
-        );
-    }
-
     public delete() {
         this.storage.delete(this);
     }
@@ -290,6 +276,7 @@ export class Collections implements EntryConvertable, Equal<Collections>, Empty
         this.last = definition.last;
         this.created = definition.created;
         this.uuid = definition.uuid;
+        this.applied_sessions = definition.applied_sessions;
         this.relations = definition.relations;
         this.origin = definition.origin;
         this.preset = definition.preset;

application/client/src/app/service/history/session.ts

@@ -153,6 +153,8 @@ export class HistorySession extends Subscriber {
         this.unsubscribe();
         this.collections = collections;
         this.collections.subscribe(this, this.session);
+        this.storage.collections.clearSession(this.session.uuid());
+        this.collections.applied_sessions.add(this.session.uuid());
         this.register(
             this.collections.updated.subscribe(() => {
                 this.collections.updateUuid(this.storage.collections.update(this.collections));
@@ -163,6 +165,7 @@ export class HistorySession extends Subscriber {
     }
 
     public destroy() {
+        this.collections.applied_sessions.delete(this.session.uuid());
         this.unsubscribe();
         this.globals.unsubscribe();
         this.subjects.destroy();

application/client/src/app/service/history/storage.collections.ts

@@ -64,6 +64,12 @@ export class StorageCollections {
         await this.save();
     }
 
+    public clearSession(session_id: string): void {
+        this.collections.forEach((collection, _key, _map) => {
+            collection.applied_sessions.delete(session_id);
+        });
+    }
+
     public update(collections: Collections): string {
         const existed = Array.from(this.collections.values()).find((c) => c.isSame(collections));
         if (this.collections.has(collections.uuid) || existed === undefined) {

application/client/src/app/ui/views/toolbar/history/preset/component.ts

@@ -81,10 +81,10 @@ export class Preset extends ChangesDetector implements AfterContentInit {
     public getName(): string {
         if (this.collections.name === '-') {
             return `${new Date(this.collections.last).toLocaleDateString('en-US')} (${
-                this.collections.used
+                this.collections.applied_sessions.size
             })`;
         } else {
-            return `${this.collections.name}(${this.collections.used})`;
+            return `${this.collections.name}(${this.collections.applied_sessions.size})`;
         }
     }
 

application/platform/env/obj.ts

@@ -416,3 +416,19 @@ export function objToStringMap(obj: {
     });
     return output;
 }
+
+export function getAsSetOfStringsOrEmpty(src: any, key: string): Set<string> {
+    const target = src[key];
+
+    if (!(target instanceof Set)) {
+         return new Set();
+    }
+
+    target.forEach((el: any) => {
+        if (typeof el !== 'string') {
+            throw new Error(`Parameter "${key}" must be a Set of strings. Found a non-string value.`);
+        }
+    });
+
+    return target as Set<string>;
+}