@qrvey/filters 0.0.8 → 0.0.9

package/CHANGELOG.md

@@ -4,8 +4,16 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v0.0.9](https://bitbucket.org/qrvey/qrvey_filters/compare/v0.0.9..v0.0.8)
+
+- test: added test for FilterBuilder and adjusted code to fulfill expected results [`58490ed`](https://bitbucket.org/qrvey/qrvey_filters/commits/58490edf77af562ad3e74afa55a41beceaed6cf4)
+- refactor: changed some names for the UI_3 version filter structure [`e09a7d8`](https://bitbucket.org/qrvey/qrvey_filters/commits/e09a7d8e4fe0218a9853d758f4ca85ab95504b8a)
+- test: added more test to cover 100 lines on filter resources [`530b1b3`](https://bitbucket.org/qrvey/qrvey_filters/commits/530b1b3e462e5dd19a3e140d5667559d62ebe787)
+
 #### [v0.0.8](https://bitbucket.org/qrvey/qrvey_filters/compare/v0.0.8..v0.0.7)
 
+> 25 April 2024
+
 - test: created some unit tests for the Filter Builder [`aca85d3`](https://bitbucket.org/qrvey/qrvey_filters/commits/aca85d3e3e7f5aafd10be40937323d2474351dfd)
 - test: added unit tests for Filter Resources [`fcf91fc`](https://bitbucket.org/qrvey/qrvey_filters/commits/fcf91fc9f755bdc6f7a624a870de93ec4b971b47)
 - test: added unit tests for Filter Searcher [`d24ba73`](https://bitbucket.org/qrvey/qrvey_filters/commits/d24ba73aed877070c38d069a120d4c4efeecdef1)

package/dist/cjs/classes/FilterBuilder.d.ts

@@ -88,7 +88,7 @@ export declare class FilterBuilder implements IFilterBuilderAdd, IFilterBuilderA
      * @param indexes the index collection to search the value to remove
      * @returns the new filter collection
      */
-    deleteValues(id: string, indexes: number[]): IFilterBuilderMultipleReturn;
+    deleteValues(id: string, indexes: number[]): IFilterBuilderSingleReturn;
     /**
      * **************************************************************************************************
      ****************************************** Editing *************************************************
@@ -125,7 +125,7 @@ export declare class FilterBuilder implements IFilterBuilderAdd, IFilterBuilderA
      * @param indexes the index collection to edit
      * @returns the new filter collection
      */
-    editValues(id: string, values: IFilterValue[], indexes: number[]): IFilterBuilderMultipleReturn;
+    editValues(id: string, values: IFilterValue[], indexes: number[]): IFilterBuilderSingleReturn;
     /**
      * **************************************************************************************************
      ****************************************** Others **************************************************

package/dist/cjs/classes/FilterBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FilterBuilder.d.ts","sourceRoot":"","sources":["../../../src/classes/FilterBuilder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FilterBuilder.d.ts","sourceRoot":"","sources":["../../../src/classes/FilterBuilder.ts"],"names":[],"mappings":"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"}

package/dist/cjs/classes/FilterBuilder.js

@@ -182,11 +182,13 @@ class FilterBuilder {
      * @returns the new filter collection
      */
     deleteValue(id, index) {
+        if (!Number.isInteger(index))
+            return { resulting: this.filters };
         const filterIndex = this.searchEngine.findIndexByParams({ id });
         let affectedValues;
-        let affectedFilter = this.filters[index];
+        let affectedFilter = this.filters[filterIndex];
         if (filterIndex > -1) {
-            affectedValues = this.filters[index].values?.splice(index, 1);
+            affectedValues = this.filters[filterIndex].values?.splice(index, 1);
             affectedFilter = { ...affectedFilter, values: affectedValues };
         }
         this.sync();
@@ -201,12 +203,11 @@ class FilterBuilder {
     deleteValues(id, indexes) {
         if (!Array.isArray(indexes))
             return { resulting: this.filters };
+        const sortedIndex = indexes.reverse();
         const copiedFilters = (0, utils_1.objectCopy)(this.filters);
-        const affectedFilters = [];
         try {
-            indexes.forEach((index) => {
-                const resultingFilter = this.deleteValue(id, index);
-                affectedFilters.push(resultingFilter.affected);
+            sortedIndex.forEach((index) => {
+                this.deleteValue(id, index);
             });
         }
         catch (_error) {
@@ -214,7 +215,8 @@ class FilterBuilder {
             return { resulting: copiedFilters };
         }
         this.sync();
-        return { resulting: this.filters, affected: affectedFilters };
+        const affected = this.searchEngine.findByParams({ id });
+        return { resulting: this.filters, affected };
     }
     /**
      * **************************************************************************************************
@@ -304,11 +306,11 @@ class FilterBuilder {
         if ((0, utils_1.isEmpty)(values) || filterIndex < 0 || !Array.isArray(indexes))
             return { resulting: this.filters };
         const copiedFilters = (0, utils_1.objectCopy)(this.filters);
-        const affectedFilters = [];
+        let finalAffectedFilter;
         try {
             values.forEach((value, index) => {
                 const affectedFilter = this.editValue(id, value, indexes[index]);
-                affectedFilters.push(affectedFilter.affected);
+                finalAffectedFilter = affectedFilter.affected;
             });
         }
         catch (_error) {
@@ -316,7 +318,7 @@ class FilterBuilder {
             return { resulting: copiedFilters };
         }
         this.sync();
-        return { resulting: this.filters, affected: affectedFilters };
+        return { resulting: this.filters, affected: finalAffectedFilter };
     }
     /**
      * **************************************************************************************************

package/dist/cjs/helpers/filter-adapt.helpers.js

@@ -103,9 +103,9 @@ function buildScopes(filters = [], datasets = [], interactiveTable) {
         const uiFilter = buildFilter(filter, datasetInfo, interactiveTable);
         const uiDataset = buildDataset(filter, datasetInfo, interactiveTable);
         const uiScope = buildScope(filter, interactiveTable);
-        const scopeIndex = scopes.findIndex((sc) => sc.scope === filter.scope && sc.scopeId === filter.scopeId);
+        const scopeIndex = scopes.findIndex((sc) => sc.scope === filter.scope && sc.id === filter.scopeId);
         const datasetIndex = scopeIndex > -1
-            ? scopes[scopeIndex].datasets.findIndex((dt) => dt.datasetId === filter.datasetId)
+            ? scopes[scopeIndex].datasets.findIndex((dt) => dt.id === filter.datasetId)
             : -1;
         if (scopeIndex === -1) {
             scopes.push({
@@ -137,7 +137,7 @@ function buildScope(filter, interactiveTable) {
         displayed: displayed ?? true,
         enabled: enabled ?? true,
         scope: filter.scope,
-        scopeId: filter.scopeId,
+        id: filter.scopeId,
         section: filter.section,
     };
 }
@@ -152,8 +152,8 @@ function buildDataset(filter, dataset, interactiveTable) {
     const { collapsed, displayed, enabled } = interactiveTable?.datasets.find((interactive) => interactive.datasetId === filter.datasetId) ?? {};
     return {
         collapsed: collapsed ?? false,
-        datasetId: filter.datasetId,
-        datasetLabel: dataset?.label || "",
+        id: filter.datasetId,
+        label: dataset?.label || "",
         displayed: displayed ?? true,
         enabled: enabled ?? true,
         filters: [],

package/dist/cjs/helpers/getFilterId.d.ts

@@ -3,14 +3,12 @@ import { IFilter } from "../resources/filters.resources";
  * Get the Filter ID by the filter structure
  * The order of the epression ID is:
  * - Scope Type
- * - scopeid
- * - qrveyid
- * - panelid
- * - columnid
+ * - scope Id
+ * - dataset Id
+ * - column Id
  * - validator
- * - property
+ * - grouping
  * - Column Aggregate
- * - Column Calculation
  * - Optional Index
  * @param filter the filter structure
  * @param index an aditional number to add into the ID

package/dist/cjs/helpers/getFilterId.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getFilterId.d.ts","sourceRoot":"","sources":["../../../src/helpers/getFilterId.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAC;AAEzD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAenE"}
+{"version":3,"file":"getFilterId.d.ts","sourceRoot":"","sources":["../../../src/helpers/getFilterId.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAC;AAEzD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAenE"}

package/dist/cjs/helpers/getFilterId.js

@@ -6,14 +6,12 @@ const utils_1 = require("@qrvey/utils");
  * Get the Filter ID by the filter structure
  * The order of the epression ID is:
  * - Scope Type
- * - scopeid
- * - qrveyid
- * - panelid
- * - columnid
+ * - scope Id
+ * - dataset Id
+ * - column Id
  * - validator
- * - property
+ * - grouping
  * - Column Aggregate
- * - Column Calculation
  * - Optional Index
  * @param filter the filter structure
  * @param index an aditional number to add into the ID

package/dist/cjs/models/filter-builder.models.d.ts

@@ -75,7 +75,7 @@ export interface IFilterBuilderDeleteValue {
      * @param indexes the index collection to search the value to remove
      * @returns the new filter collection
      */
-    deleteValues: (id: string, indexes: number[]) => IFilterBuilderMultipleReturn;
+    deleteValues: (id: string, indexes: number[]) => IFilterBuilderSingleReturn;
 }
 /**
  * Structure module for the editing filters
@@ -117,7 +117,7 @@ export interface IFilterBuilderEditValue {
      * @param indexes the index collection to edit
      * @returns the new filter collection
      */
-    editValues: (id: string, values: IFilterValue[], indexes: number[]) => IFilterBuilderMultipleReturn;
+    editValues: (id: string, values: IFilterValue[], indexes: number[]) => IFilterBuilderSingleReturn;
 }
 /**
  * Structure module for the setting filters

package/dist/cjs/models/filter-builder.models.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filter-builder.models.d.ts","sourceRoot":"","sources":["../../../src/models/filter-builder.models.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"filter-builder.models.d.ts","sourceRoot":"","sources":["../../../src/models/filter-builder.models.ts"],"names":[],"mappings":"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"}

package/dist/cjs/resources/filter-visual.resources.d.ts

@@ -43,7 +43,7 @@ export interface IFilterVisualScope extends IFilterVisualGeneral {
     /**
      * The scope ID
      */
-    scopeId?: string;
+    id?: string;
     /**
      * The section of the filters
      */
@@ -60,11 +60,11 @@ export interface IFilterVisualDataset extends IFilterVisualGeneral {
     /**
      * Dataset ID
      */
-    datasetId: string;
+    id: string;
     /**
      * Dataset Label
      */
-    datasetLabel: string;
+    label: string;
 }
 /**
  * Structure for the visual filter items

package/dist/cjs/resources/filter-visual.resources.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filter-visual.resources.d.ts","sourceRoot":"","sources":["../../../src/resources/filter-visual.resources.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAkB,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9D;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,MAAM,EAAE,kBAAkB,EAAE,CAAC;CAC9B;AAED,UAAU,oBAAoB;IAC5B;;OAEG;IACH,SAAS,EAAE,OAAO,CAAC;IACnB;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,SAAS,EAAE,OAAO,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAmB,SAAQ,oBAAoB;IAC9D;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,QAAQ,EAAE,oBAAoB,EAAE,CAAC;IACjC;;OAEG;IACH,KAAK,EAAE,YAAY,CAAC;IACpB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,OAAO,EAAE,cAAc,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,oBAAqB,SAAQ,oBAAoB;IAChE;;OAEG;IACH,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;;GAGG;AACH,MAAM,WAAW,SAAU,SAAQ,OAAO;IACxC;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,eAAO,MAAM,iBAAiB,EAAE,SAK/B,CAAC"}
+{"version":3,"file":"filter-visual.resources.d.ts","sourceRoot":"","sources":["../../../src/resources/filter-visual.resources.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAkB,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9D;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,MAAM,EAAE,kBAAkB,EAAE,CAAC;CAC9B;AAED,UAAU,oBAAoB;IAC5B;;OAEG;IACH,SAAS,EAAE,OAAO,CAAC;IACnB;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,SAAS,EAAE,OAAO,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAmB,SAAQ,oBAAoB;IAC9D;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,QAAQ,EAAE,oBAAoB,EAAE,CAAC;IACjC;;OAEG;IACH,KAAK,EAAE,YAAY,CAAC;IACpB;;OAEG;IACH,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ;;OAEG;IACH,OAAO,EAAE,cAAc,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,oBAAqB,SAAQ,oBAAoB;IAChE;;OAEG;IACH,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IACX;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;GAGG;AACH,MAAM,WAAW,SAAU,SAAQ,OAAO;IACxC;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,eAAO,MAAM,iBAAiB,EAAE,SAK/B,CAAC"}

package/dist/classes/FilterBuilder.d.ts

@@ -88,7 +88,7 @@ export declare class FilterBuilder implements IFilterBuilderAdd, IFilterBuilderA
      * @param indexes the index collection to search the value to remove
      * @returns the new filter collection
      */
-    deleteValues(id: string, indexes: number[]): IFilterBuilderMultipleReturn;
+    deleteValues(id: string, indexes: number[]): IFilterBuilderSingleReturn;
     /**
      * **************************************************************************************************
      ****************************************** Editing *************************************************
@@ -125,7 +125,7 @@ export declare class FilterBuilder implements IFilterBuilderAdd, IFilterBuilderA
      * @param indexes the index collection to edit
      * @returns the new filter collection
      */
-    editValues(id: string, values: IFilterValue[], indexes: number[]): IFilterBuilderMultipleReturn;
+    editValues(id: string, values: IFilterValue[], indexes: number[]): IFilterBuilderSingleReturn;
     /**
      * **************************************************************************************************
      ****************************************** Others **************************************************

package/dist/classes/FilterBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FilterBuilder.d.ts","sourceRoot":"","sources":["../../src/classes/FilterBuilder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FilterBuilder.d.ts","sourceRoot":"","sources":["../../src/classes/FilterBuilder.ts"],"names":[],"mappings":"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"}

package/dist/classes/FilterBuilder.js

@@ -179,11 +179,13 @@ export class FilterBuilder {
      * @returns the new filter collection
      */
     deleteValue(id, index) {
+        if (!Number.isInteger(index))
+            return { resulting: this.filters };
         const filterIndex = this.searchEngine.findIndexByParams({ id });
         let affectedValues;
-        let affectedFilter = this.filters[index];
+        let affectedFilter = this.filters[filterIndex];
         if (filterIndex > -1) {
-            affectedValues = this.filters[index].values?.splice(index, 1);
+            affectedValues = this.filters[filterIndex].values?.splice(index, 1);
             affectedFilter = { ...affectedFilter, values: affectedValues };
         }
         this.sync();
@@ -198,12 +200,11 @@ export class FilterBuilder {
     deleteValues(id, indexes) {
         if (!Array.isArray(indexes))
             return { resulting: this.filters };
+        const sortedIndex = indexes.reverse();
         const copiedFilters = objectCopy(this.filters);
-        const affectedFilters = [];
         try {
-            indexes.forEach((index) => {
-                const resultingFilter = this.deleteValue(id, index);
-                affectedFilters.push(resultingFilter.affected);
+            sortedIndex.forEach((index) => {
+                this.deleteValue(id, index);
             });
         }
         catch (_error) {
@@ -211,7 +212,8 @@ export class FilterBuilder {
             return { resulting: copiedFilters };
         }
         this.sync();
-        return { resulting: this.filters, affected: affectedFilters };
+        const affected = this.searchEngine.findByParams({ id });
+        return { resulting: this.filters, affected };
     }
     /**
      * **************************************************************************************************
@@ -301,11 +303,11 @@ export class FilterBuilder {
         if (isEmpty(values) || filterIndex < 0 || !Array.isArray(indexes))
             return { resulting: this.filters };
         const copiedFilters = objectCopy(this.filters);
-        const affectedFilters = [];
+        let finalAffectedFilter;
         try {
             values.forEach((value, index) => {
                 const affectedFilter = this.editValue(id, value, indexes[index]);
-                affectedFilters.push(affectedFilter.affected);
+                finalAffectedFilter = affectedFilter.affected;
             });
         }
         catch (_error) {
@@ -313,7 +315,7 @@ export class FilterBuilder {
             return { resulting: copiedFilters };
         }
         this.sync();
-        return { resulting: this.filters, affected: affectedFilters };
+        return { resulting: this.filters, affected: finalAffectedFilter };
     }
     /**
      * **************************************************************************************************

package/dist/helpers/filter-adapt.helpers.js

@@ -97,9 +97,9 @@ function buildScopes(filters = [], datasets = [], interactiveTable) {
         const uiFilter = buildFilter(filter, datasetInfo, interactiveTable);
         const uiDataset = buildDataset(filter, datasetInfo, interactiveTable);
         const uiScope = buildScope(filter, interactiveTable);
-        const scopeIndex = scopes.findIndex((sc) => sc.scope === filter.scope && sc.scopeId === filter.scopeId);
+        const scopeIndex = scopes.findIndex((sc) => sc.scope === filter.scope && sc.id === filter.scopeId);
         const datasetIndex = scopeIndex > -1
-            ? scopes[scopeIndex].datasets.findIndex((dt) => dt.datasetId === filter.datasetId)
+            ? scopes[scopeIndex].datasets.findIndex((dt) => dt.id === filter.datasetId)
             : -1;
         if (scopeIndex === -1) {
             scopes.push({
@@ -131,7 +131,7 @@ function buildScope(filter, interactiveTable) {
         displayed: displayed ?? true,
         enabled: enabled ?? true,
         scope: filter.scope,
-        scopeId: filter.scopeId,
+        id: filter.scopeId,
         section: filter.section,
     };
 }
@@ -146,8 +146,8 @@ function buildDataset(filter, dataset, interactiveTable) {
     const { collapsed, displayed, enabled } = interactiveTable?.datasets.find((interactive) => interactive.datasetId === filter.datasetId) ?? {};
     return {
         collapsed: collapsed ?? false,
-        datasetId: filter.datasetId,
-        datasetLabel: dataset?.label || "",
+        id: filter.datasetId,
+        label: dataset?.label || "",
         displayed: displayed ?? true,
         enabled: enabled ?? true,
         filters: [],

package/dist/helpers/getFilterId.d.ts

@@ -3,14 +3,12 @@ import { IFilter } from "../resources/filters.resources";
  * Get the Filter ID by the filter structure
  * The order of the epression ID is:
  * - Scope Type
- * - scopeid
- * - qrveyid
- * - panelid
- * - columnid
+ * - scope Id
+ * - dataset Id
+ * - column Id
  * - validator
- * - property
+ * - grouping
  * - Column Aggregate
- * - Column Calculation
  * - Optional Index
  * @param filter the filter structure
  * @param index an aditional number to add into the ID

package/dist/helpers/getFilterId.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getFilterId.d.ts","sourceRoot":"","sources":["../../src/helpers/getFilterId.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAC;AAEzD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAenE"}
+{"version":3,"file":"getFilterId.d.ts","sourceRoot":"","sources":["../../src/helpers/getFilterId.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAC;AAEzD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAenE"}

package/dist/helpers/getFilterId.js

@@ -3,14 +3,12 @@ import { isEmpty, isObject } from "@qrvey/utils";
  * Get the Filter ID by the filter structure
  * The order of the epression ID is:
  * - Scope Type
- * - scopeid
- * - qrveyid
- * - panelid
- * - columnid
+ * - scope Id
+ * - dataset Id
+ * - column Id
  * - validator
- * - property
+ * - grouping
  * - Column Aggregate
- * - Column Calculation
  * - Optional Index
  * @param filter the filter structure
  * @param index an aditional number to add into the ID

package/dist/models/filter-builder.models.d.ts

@@ -75,7 +75,7 @@ export interface IFilterBuilderDeleteValue {
      * @param indexes the index collection to search the value to remove
      * @returns the new filter collection
      */
-    deleteValues: (id: string, indexes: number[]) => IFilterBuilderMultipleReturn;
+    deleteValues: (id: string, indexes: number[]) => IFilterBuilderSingleReturn;
 }
 /**
  * Structure module for the editing filters
@@ -117,7 +117,7 @@ export interface IFilterBuilderEditValue {
      * @param indexes the index collection to edit
      * @returns the new filter collection
      */
-    editValues: (id: string, values: IFilterValue[], indexes: number[]) => IFilterBuilderMultipleReturn;
+    editValues: (id: string, values: IFilterValue[], indexes: number[]) => IFilterBuilderSingleReturn;
 }
 /**
  * Structure module for the setting filters

package/dist/models/filter-builder.models.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filter-builder.models.d.ts","sourceRoot":"","sources":["../../src/models/filter-builder.models.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"filter-builder.models.d.ts","sourceRoot":"","sources":["../../src/models/filter-builder.models.ts"],"names":[],"mappings":"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"}

package/dist/resources/filter-visual.resources.d.ts

@@ -43,7 +43,7 @@ export interface IFilterVisualScope extends IFilterVisualGeneral {
     /**
      * The scope ID
      */
-    scopeId?: string;
+    id?: string;
     /**
      * The section of the filters
      */
@@ -60,11 +60,11 @@ export interface IFilterVisualDataset extends IFilterVisualGeneral {
     /**
      * Dataset ID
      */
-    datasetId: string;
+    id: string;
     /**
      * Dataset Label
      */
-    datasetLabel: string;
+    label: string;
 }
 /**
  * Structure for the visual filter items

package/dist/resources/filter-visual.resources.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filter-visual.resources.d.ts","sourceRoot":"","sources":["../../src/resources/filter-visual.resources.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAkB,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9D;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,MAAM,EAAE,kBAAkB,EAAE,CAAC;CAC9B;AAED,UAAU,oBAAoB;IAC5B;;OAEG;IACH,SAAS,EAAE,OAAO,CAAC;IACnB;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,SAAS,EAAE,OAAO,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAmB,SAAQ,oBAAoB;IAC9D;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,QAAQ,EAAE,oBAAoB,EAAE,CAAC;IACjC;;OAEG;IACH,KAAK,EAAE,YAAY,CAAC;IACpB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,OAAO,EAAE,cAAc,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,oBAAqB,SAAQ,oBAAoB;IAChE;;OAEG;IACH,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;;GAGG;AACH,MAAM,WAAW,SAAU,SAAQ,OAAO;IACxC;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,eAAO,MAAM,iBAAiB,EAAE,SAK/B,CAAC"}
+{"version":3,"file":"filter-visual.resources.d.ts","sourceRoot":"","sources":["../../src/resources/filter-visual.resources.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAkB,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9D;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,MAAM,EAAE,kBAAkB,EAAE,CAAC;CAC9B;AAED,UAAU,oBAAoB;IAC5B;;OAEG;IACH,SAAS,EAAE,OAAO,CAAC;IACnB;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,SAAS,EAAE,OAAO,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAmB,SAAQ,oBAAoB;IAC9D;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,QAAQ,EAAE,oBAAoB,EAAE,CAAC;IACjC;;OAEG;IACH,KAAK,EAAE,YAAY,CAAC;IACpB;;OAEG;IACH,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ;;OAEG;IACH,OAAO,EAAE,cAAc,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,oBAAqB,SAAQ,oBAAoB;IAChE;;OAEG;IACH,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IACX;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;GAGG;AACH,MAAM,WAAW,SAAU,SAAQ,OAAO;IACxC;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,eAAO,MAAM,iBAAiB,EAAE,SAK/B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qrvey/filters",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "Helpers and logic for Filtering Data in Qrvey app",
   "main": "dist/index.js",
   "engines": {

package/src/classes/FilterBuilder.ts

@@ -154,7 +154,10 @@ export class FilterBuilder
     let finalAffectedFilter: IFilter;
     try {
       values.forEach((value: IFilterValue) => {
-        const affectedFilter = this.addValue(id, value);
+        const affectedFilter: IFilterBuilderSingleReturn = this.addValue(
+          id,
+          value,
+        );
         finalAffectedFilter = affectedFilter.affected!;
       });
     } catch (_error) {
@@ -236,11 +239,13 @@ export class FilterBuilder
    * @returns the new filter collection
    */
   public deleteValue(id: string, index: number): IFilterBuilderSingleReturn {
+    if (!Number.isInteger(index)) return { resulting: this.filters };
+
     const filterIndex = this.searchEngine.findIndexByParams({ id });
     let affectedValues: IFilterValue[] | undefined;
-    let affectedFilter: IFilter = this.filters[index];
+    let affectedFilter: IFilter = this.filters[filterIndex];
     if (filterIndex > -1) {
-      affectedValues = this.filters[index].values?.splice(index, 1);
+      affectedValues = this.filters[filterIndex].values?.splice(index, 1);
       affectedFilter = { ...affectedFilter, values: affectedValues };
     }
 
@@ -257,18 +262,14 @@ export class FilterBuilder
   public deleteValues(
     id: string,
     indexes: number[],
-  ): IFilterBuilderMultipleReturn {
+  ): IFilterBuilderSingleReturn {
     if (!Array.isArray(indexes)) return { resulting: this.filters };
 
+    const sortedIndex = indexes.reverse();
     const copiedFilters = objectCopy(this.filters);
-    const affectedFilters: IFilter[] = [];
     try {
-      indexes.forEach((index: number) => {
-        const resultingFilter: IFilterBuilderSingleReturn = this.deleteValue(
-          id,
-          index,
-        );
-        affectedFilters.push(resultingFilter.affected!);
+      sortedIndex.forEach((index: number) => {
+        this.deleteValue(id, index);
       });
     } catch (_error) {
       this.filters = copiedFilters;
@@ -276,7 +277,8 @@ export class FilterBuilder
     }
 
     this.sync();
-    return { resulting: this.filters, affected: affectedFilters };
+    const affected = this.searchEngine.findByParams({ id });
+    return { resulting: this.filters, affected };
   }
 
   /**
@@ -393,17 +395,21 @@ export class FilterBuilder
     id: string,
     values: IFilterValue[],
     indexes: number[],
-  ): IFilterBuilderMultipleReturn {
+  ): IFilterBuilderSingleReturn {
     const filterIndex = this.searchEngine.findIndexByParams({ id });
     if (isEmpty(values) || filterIndex < 0 || !Array.isArray(indexes))
       return { resulting: this.filters };
 
     const copiedFilters = objectCopy(this.filters);
-    const affectedFilters: IFilter[] = [];
+    let finalAffectedFilter: IFilter;
     try {
       values.forEach((value: IFilterValue, index: number) => {
-        const affectedFilter = this.editValue(id, value, indexes[index]);
-        affectedFilters.push(affectedFilter.affected!);
+        const affectedFilter: IFilterBuilderSingleReturn = this.editValue(
+          id,
+          value,
+          indexes[index],
+        );
+        finalAffectedFilter = affectedFilter.affected!;
       });
     } catch (_error) {
       this.filters = copiedFilters;
@@ -411,7 +417,7 @@ export class FilterBuilder
     }
 
     this.sync();
-    return { resulting: this.filters, affected: affectedFilters };
+    return { resulting: this.filters, affected: finalAffectedFilter! };
   }
 
   /**

package/src/helpers/filter-adapt.helpers.ts

@@ -149,12 +149,12 @@ function buildScopes(
     const uiScope: IFilterVisualScope = buildScope(filter, interactiveTable);
 
     const scopeIndex = scopes.findIndex(
-      (sc) => sc.scope === filter.scope && sc.scopeId === filter.scopeId,
+      (sc) => sc.scope === filter.scope && sc.id === filter.scopeId,
     );
     const datasetIndex =
       scopeIndex > -1
         ? scopes[scopeIndex].datasets.findIndex(
-            (dt) => dt.datasetId === filter.datasetId,
+            (dt) => dt.id === filter.datasetId,
           )
         : -1;
 
@@ -196,7 +196,7 @@ function buildScope(
     displayed: displayed ?? true,
     enabled: enabled ?? true,
     scope: filter.scope,
-    scopeId: filter.scopeId,
+    id: filter.scopeId,
     section: filter.section,
   };
 }
@@ -219,8 +219,8 @@ function buildDataset(
     ) ?? {};
   return {
     collapsed: collapsed ?? false,
-    datasetId: filter.datasetId,
-    datasetLabel: dataset?.label || "",
+    id: filter.datasetId,
+    label: dataset?.label || "",
     displayed: displayed ?? true,
     enabled: enabled ?? true,
     filters: [],

package/src/helpers/getFilterId.ts

@@ -6,14 +6,12 @@ import { IFilter } from "../resources/filters.resources";
  * Get the Filter ID by the filter structure
  * The order of the epression ID is:
  * - Scope Type
- * - scopeid
- * - qrveyid
- * - panelid
- * - columnid
+ * - scope Id
+ * - dataset Id
+ * - column Id
  * - validator
- * - property
+ * - grouping
  * - Column Aggregate
- * - Column Calculation
  * - Optional Index
  * @param filter the filter structure
  * @param index an aditional number to add into the ID

package/src/models/filter-builder.models.ts

@@ -88,7 +88,7 @@ export interface IFilterBuilderDeleteValue {
    * @param indexes the index collection to search the value to remove
    * @returns the new filter collection
    */
-  deleteValues: (id: string, indexes: number[]) => IFilterBuilderMultipleReturn;
+  deleteValues: (id: string, indexes: number[]) => IFilterBuilderSingleReturn;
 }
 
 /**
@@ -148,7 +148,7 @@ export interface IFilterBuilderEditValue {
     id: string,
     values: IFilterValue[],
     indexes: number[],
-  ) => IFilterBuilderMultipleReturn;
+  ) => IFilterBuilderSingleReturn;
 }
 
 /**

package/src/resources/filter-visual.resources.ts

@@ -46,7 +46,7 @@ export interface IFilterVisualScope extends IFilterVisualGeneral {
   /**
    * The scope ID
    */
-  scopeId?: string;
+  id?: string;
   /**
    * The section of the filters
    */
@@ -64,11 +64,11 @@ export interface IFilterVisualDataset extends IFilterVisualGeneral {
   /**
    * Dataset ID
    */
-  datasetId: string;
+  id: string;
   /**
    * Dataset Label
    */
-  datasetLabel: string;
+  label: string;
 }
 
 /**

package/tests/classes/FilterBuilder.test.ts

@@ -1,6 +1,7 @@
 // import { AGGREGATE, COLUMN } from "@qrvey/utils";
 
 import { FilterBuilder } from "../../src/classes/FilterBuilder";
+import { FILTER_GROUPING } from "../../src/resources/filter-grouping.resources";
 import { IFilterValueRegular } from "../../src/resources/filter-values.resources";
 import { IFilter } from "../../src/resources/filters.resources";
 import {
@@ -9,7 +10,9 @@ import {
   __mockFilter3,
   __mockFilter4,
   __mockFilter5,
+  __mockFilter6,
   __mockFilters1,
+  __mockFilters2,
 } from "../mock/filters.mock";
 
 describe("Testing wrong arguments", () => {
@@ -105,6 +108,28 @@ describe("Testing Adding Filters - With Filters", () => {
     expect(builder.getFilters()).toEqual(resultingFilters);
   });
 
+  test("Adding single between items", () => {
+    const resulting = builder.addSingle(__mockFilter6);
+    const mockFilter6 = {
+      ...__mockFilter6,
+      id: "global|D123|C456|equals|week",
+    };
+
+    const resultingFilters = [
+      __mockFilter1,
+      __mockFilter2,
+      mockFilter6,
+      __mockFilter3,
+    ];
+
+    expect(resulting).toEqual({
+      resulting: resultingFilters,
+      affected: mockFilter6,
+    });
+
+    expect(builder.getFilters()).toEqual(resultingFilters);
+  });
+
   test("Adding Multiple", () => {
     const resulting = builder.addMutiple([__mockFilter4, __mockFilter5]);
     const mockFilter4 = { ...__mockFilter4, id: "page|D456|C134|greater_than" };
@@ -182,3 +207,116 @@ describe("Testing Adding Filters Values", () => {
     expect(builder.getFilters()).toEqual(resultingFilters);
   });
 });
+
+describe("Testing Deleting Filters", () => {
+  let builder: FilterBuilder;
+  beforeEach(() => {
+    builder = new FilterBuilder(__mockFilters1);
+  });
+
+  test("Deleting by Params", () => {
+    const resulting = builder.deleteByParams({
+      columnId: "C456",
+      grouping: FILTER_GROUPING.DAY,
+    });
+    const resultingFilters = [__mockFilter1, __mockFilter3];
+
+    expect(resulting).toEqual({
+      resulting: resultingFilters,
+      affected: [__mockFilter2],
+    });
+    expect(builder.getFilters()).toEqual(resultingFilters);
+  });
+
+  test("Deleting Single", () => {
+    const resulting = builder.deleteSingle("F123");
+    const resultingFilters = [__mockFilter2, __mockFilter3];
+
+    expect(resulting).toEqual({
+      resulting: resultingFilters,
+      affected: __mockFilter1,
+    });
+    expect(builder.getFilters()).toEqual(resultingFilters);
+  });
+
+  test("Deleting Multiple", () => {
+    const resulting = builder.deleteMutiple(["F123", "F789"]);
+    const resultingFilters = [__mockFilter2];
+
+    expect(resulting).toEqual({
+      resulting: resultingFilters,
+      affected: [__mockFilter1, __mockFilter3],
+    });
+    expect(builder.getFilters()).toEqual(resultingFilters);
+  });
+});
+
+describe("Testing Deleting Filters Values", () => {
+  test("Deleting Zero because of Empty values", () => {
+    const builder = new FilterBuilder(__mockFilters1);
+
+    const resulting = builder.deleteValue("F123", 1);
+
+    const resultingFilters: IFilter[] = [
+      __mockFilter1,
+      __mockFilter2,
+      __mockFilter3,
+    ];
+
+    expect(resulting).toEqual({
+      resulting: resultingFilters,
+      affected: __mockFilter1,
+    });
+    expect(builder.getFilters()).toEqual(resultingFilters);
+  });
+
+  test("Deleting One value", () => {
+    const builder = new FilterBuilder(__mockFilters1);
+
+    const resulting = builder.deleteValue("F789", 0);
+    const mockFilter3 = {
+      ...__mockFilter3,
+      values: [__mockFilter3.values![1]],
+    };
+    const affectedMockFilter3 = {
+      ...__mockFilter3,
+      values: [__mockFilter3.values![0]],
+    };
+    const resultingFilters: IFilter[] = [
+      __mockFilter1,
+      __mockFilter2,
+      mockFilter3,
+    ];
+
+    expect(resulting).toEqual({
+      resulting: resultingFilters,
+      affected: affectedMockFilter3,
+    });
+    expect(builder.getFilters()).toEqual(resultingFilters);
+  });
+
+  test("Deleting multiples values", () => {
+    const builder = new FilterBuilder(__mockFilters2);
+
+    const resulting = builder.deleteValues("F457", [0, 3]);
+    const resultingMockFilter6 = {
+      ...__mockFilter6,
+      values: [__mockFilter6.values![1], __mockFilter6.values![2]],
+    };
+    const affectedMockFilter4 = {
+      ...__mockFilter6,
+      values: [__mockFilter6.values![1], __mockFilter6.values![2]],
+    };
+    const resultingFilters: IFilter[] = [
+      __mockFilter4,
+      __mockFilter5,
+      resultingMockFilter6,
+    ];
+
+    expect(resulting).toEqual({
+      resulting: resultingFilters,
+      affected: affectedMockFilter4,
+    });
+    expect(builder.getFilters()).toEqual(resultingFilters);
+  });
+});

package/tests/classes/FilterResources.test.ts

@@ -32,6 +32,18 @@ describe("Testing Filter Resources - Grouping", () => {
     ).toBeUndefined();
   });
 
+  test("getGroupingInfoListByColumnType - Expression", () => {
+    expect(
+      FilterResources.getGroupingInfoListByColumnType(COLUMN.EXPRESSION),
+    ).toEqual([]);
+  });
+
+  test("getGroupingInfoListByColumnType - Date", () => {
+    expect(
+      FilterResources.getGroupingInfoListByColumnType(COLUMN.DATE_FORMULA),
+    ).toEqual(FILTER_GROUPING_INFO_BY_COLUMN_TYPE.DATE_FORMULA);
+  });
+
   test("getGroupingInfoListByColumnType - Name", () => {
     expect(
       FilterResources.getGroupingInfoListByColumnType(COLUMN.NAME),

package/tests/mock/filters.mock.ts

@@ -104,8 +104,46 @@ export const __mockFilter5: IFilter = {
   ],
 };
 
+export const __mockFilter6: IFilter = {
+  ...DEFAULT_FILTER,
+  columnId: "C456",
+  columnType: COLUMN.DATE,
+  datasetId: "D123",
+  enabled: false,
+  grouping: FILTER_GROUPING.WEEK,
+  id: "F457",
+  values: [
+    {
+      displayed: true,
+      enabled: true,
+      value: "Q1 2024",
+    },
+    {
+      displayed: true,
+      enabled: true,
+      value: "Q2 2024",
+    },
+    {
+      displayed: true,
+      enabled: true,
+      value: "Q3 2024",
+    },
+    {
+      displayed: true,
+      enabled: true,
+      value: "Q4 2024",
+    },
+  ],
+};
+
 export const __mockFilters1: IFilter[] = [
   __mockFilter1,
   __mockFilter2,
   __mockFilter3,
 ];
+
+export const __mockFilters2: IFilter[] = [
+  __mockFilter4,
+  __mockFilter5,
+  __mockFilter6,
+];