Use boolean for used counter for collections

For denoting the used collection we are using the number, this commit changes
that to boolean

Author: sudeeptarlekar

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

@@ -24,7 +24,7 @@ export interface ICollection {
     name: string;
     created: number;
     last: number;
-    used: number;
+    used: boolean;
     uuid: string;
     preset: boolean;
     relations: string[];
@@ -45,7 +45,7 @@ export class Collections implements EntryConvertable, Equal<Collections>, Empty
                     name: '-',
                     last: Date.now(),
                     created: Date.now(),
-                    used: 1,
+                    used: true,
                     uuid: smth.uuid(),
                     preset: false,
                     relations: [],
@@ -62,8 +62,8 @@ export class Collections implements EntryConvertable, Equal<Collections>, Empty
             // For older filters saved on the user machine we have the used value
             // set as a 1 by default. To fix the counter we need to reset it to 0
             // because user didn't use it yet.
-            if (def.used >= 1) {
-                def.used = 0;
+            if (def.used) {
+                def.used = false;
             }
             return new Collections(
                 `Collections:${def.uuid}`,
@@ -102,7 +102,7 @@ export class Collections implements EntryConvertable, Equal<Collections>, Empty
                 name: '-',
                 last: Date.now(),
                 created: Date.now(),
-                used: 1,
+                used: true,
                 uuid: uuid,
                 preset: false,
                 relations: [],
@@ -119,7 +119,7 @@ export class Collections implements EntryConvertable, Equal<Collections>, Empty
         return {
             name: obj.getAsNotEmptyString(src, 'n'),
             created: Date.now(),
-            used: obj.getAsValidNumber(src, 'u'),
+            used: obj.getAsValidBooleanFromNumber(src, 'u'),
             last: obj.getAsValidNumber(src, 'l'),
             preset: obj.getAsBool(src, 'p'),
             uuid: obj.getAsNotEmptyString(src, 'uu'),
@@ -133,7 +133,7 @@ export class Collections implements EntryConvertable, Equal<Collections>, Empty
 
     public name: string;
     public created: number;
-    public used: number;
+    public used: boolean;
     public last: number;
     public uuid: string;
     public preset: boolean;
@@ -200,6 +200,7 @@ export class Collections implements EntryConvertable, Equal<Collections>, Empty
         );
     }
 
+    // TODO: Remove this function as this is not used anywhere
     public copy(): Collections {
         const uuid = unique();
         return new Collections(
@@ -208,7 +209,7 @@ export class Collections implements EntryConvertable, Equal<Collections>, Empty
                 name: this.name,
                 last: Date.now(),
                 created: Date.now(),
-                used: 1,
+                used: true,
                 uuid,
                 preset: false,
                 relations: [],

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

@@ -115,7 +115,7 @@ export class HistorySession extends Subscriber {
             related: (): boolean => {
                 const related = this.find().related();
                 if (related !== undefined) {
-                    if (related.used === 0) {
+                    if (!related.used) {
                         this.storage.collections.used(related.uuid);
                     }
                     this.setCollection(related);
@@ -200,14 +200,12 @@ export class HistorySession extends Subscriber {
     }
 
     public apply(collection: Collections) {
+        this.storage.collections.ignoreAll();
         const storage_collection = this.storage.collections.get(collection.uuid);
 
         if (storage_collection === undefined) {
             this.storage.collections.insert(collection);
         } 
-        if (storage_collection !== undefined && storage_collection.used > 0) {
-            return;
-        }
         this.storage.collections.used(collection.uuid);
         this.setCollection(collection);
         this.definitions.list().forEach((def) => {

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

@@ -162,8 +162,14 @@ export class StorageCollections {
         if (collection === undefined) {
             return;
         }
-        collection.used += 1;
+        if (!collection.used) {
+            collection.used = true;
+        }
         collection.last = Date.now();
     }
+
+    public ignoreAll() {
+        this.collections.forEach((c) => (c.used = false));
+    }
 }
 export interface StorageCollections extends LoggerInterface {}

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

@@ -84,10 +84,14 @@ export class Preset extends ChangesDetector implements AfterContentInit {
                 this.collections.used
             })`;
         } else {
-            return `${this.collections.name}(${this.collections.used})`;
+            return `${this.collections.name}`;
         }
     }
 
+    public isUsed(): boolean {
+        return this.collections.used;
+    }
+
     public getValue(): string {
         return this.collections.name === '-' ? '' : this.collections.name;
     }

application/client/src/app/ui/views/toolbar/history/preset/styles.less

@@ -29,6 +29,9 @@
         &.no-left-margin {
             margin-left: 6px;
         }
+        &.used {
+            background: var(--scheme-color-3);
+        }
         &::hover {
             background: var(--scheme-color-4);
         }

application/client/src/app/ui/views/toolbar/history/preset/template.html

@@ -1,4 +1,4 @@
-<mat-card class="small-title">
+<mat-card class="small-title" [ngClass]="isUsed() ? 'used' : ''">
     <mat-card-title>
         <app-editable-field
             (changed)="onRename($event)"

application/platform/env/obj.ts

@@ -291,6 +291,14 @@ export function getAsValidNumber(
     return src[key];
 }
 
+export function getAsValidBooleanFromNumber(
+    src: any,
+    key: string
+): boolean {
+    const value = getAsValidNumber(src, key);
+    return value !== 0;
+}
+
 export function getAsValidNumberOrUndefined(
     src: any,
     key: string,