@qrvey/utils 1.1.8 → 1.2.1

package/src/filters/adapters/logicToFD.ts

@@ -1,11 +1,14 @@
 // FROM Logic structure = Old logic structure (v2.0)
 // TO Logic structure = Cleaner logic structure
 
-import { isEmpty } from "../../general";
-import { FILTER_SECTION, FILTER_STRUCTURE_VERSION } from "../constants";
-import { IFSData, IFSection, OLD_IFilterLogic } from "../interfaces";
+import { isEmpty } from "../../general/mix/isEmpty";
+import { FILTER_STRUCTURE_VERSION } from "../constants/common/FILTER_STRUCTURE_VERSION";
+import { FILTER_SECTION } from "../constants/common/FILTER_SECTION";
+import { IFSection } from "../interfaces/IFSection";
+import { OLD_IFilterLogic } from "../interfaces/OLD_IFilterLogic";
 import { flatUIToFD } from "./flatUIToFD";
 import { logicToFlatUI } from "./logicToFlatUI";
+import { IFSData } from "../interfaces/common/IFSData";
 
 
 /**

package/src/filters/adapters/logicToFlatUI.ts

@@ -1,12 +1,23 @@
 // FROM Logic structure = Old logic structure (v2.0)
 // TO Logic structure = Cleaner logic structure
 
-import { adaptDateGroupingProperty } from ".";
-import { COLUMN } from "../../constants";
-import { isEmpty, _get, _hasProperty } from "../../general";
-import { FILTER_BACKEND_VALIDATOR, FILTER_SCOPE, FILTER_VALIDATOR_VALUE } from "../constants";
-import { getFilterid, getUIValues, isNullValidator, } from "../helpers";
-import { IFSValueRanking, IFUFlattenedFilter, OLD_IFilterDetail, OLD_IFilterExpression, OLD_IFilterLogic } from "../interfaces";
+import { adaptDateGroupingProperty } from "./adaptDateGroupingProperty";
+import { COLUMN } from "../../columns/constants/COLUMN";
+import { OLD_IFilterLogic } from "../interfaces/OLD_IFilterLogic";
+import { IFUFlattenedFilter } from "../interfaces/ui/IFUFlattenedFilter";
+import { isEmpty } from "../../general/mix/isEmpty";
+import { OLD_IFilterExpression } from "../interfaces/OLD_IFilterExpression";
+import { _hasProperty } from "../../general/object/hasProperty";
+import { FILTER_BACKEND_VALIDATOR } from "../constants/backend/FILTER_BACKEND_VALIDATOR";
+import { getFilterid } from "../helpers/common/getFilterid";
+import { FILTER_SCOPE } from "../constants/common/FILTER_SCOPE";
+import { _get } from "../../general/object/get";
+import { IFSValueRanking } from "../interfaces/common/IFSValueRanking";
+import { getUIValues } from "../helpers/ui/getUIValues";
+import { OLD_IFilterDetail } from "../interfaces/OLD_IFilterDetail";
+import { isNullValidator } from "../helpers/common/isNullValidator";
+import { FILTER_VALIDATOR_INFO } from "../constants/common/FILTER_VALIDATOR_INFO";
+
 
 /**
  * Adapts the Old logic structure (v2.0) to the flattened UI filter Structure.
@@ -62,9 +73,9 @@ function getFilterByExpression(expression: OLD_IFilterExpression, scopeItem: OLD
             linkid: uiExtras.column?.linkid,
             linked: uiExtras.column?.linked,
             qrveyid: uiExtras.column?.qrveyid,
-            aggregate: uiExtras.column?.aggregate?.label,
-            calculation: uiExtras.column?.calculation?.value,
-            label: uiExtras.column?.text,
+            aggregate: (uiExtras.column?.aggregate as any)?.label || uiExtras.column?.aggregate,
+            calculation: (uiExtras.column?.calculation as any)?.value || uiExtras.column?.calculation,
+            label: _get(uiExtras.column, 'text') || uiExtras.column?.label,
             property: uiExtras.column.property,
             sorting: uiExtras.column.sorting,
             outputFormat: uiExtras.column?.outputFormat,
@@ -93,7 +104,7 @@ function getFilterByExpression(expression: OLD_IFilterExpression, scopeItem: OLD
                 enabled: true,
                 displayed: true,
                 qrveyid: uiExtras.column?.qrveyid,
-                label: uiExtras.column?.dataset?.name,
+                label: _get( uiExtras.column?.dataset, 'name') || uiExtras.column?.dataset?.label,
                 linkid: uiExtras.column?.linkid,
             },
         },
@@ -110,7 +121,7 @@ function getFilterByExpression(expression: OLD_IFilterExpression, scopeItem: OLD
 
 function getValues(uiExtras: OLD_IFilterDetail) {
     if (isNullValidator(uiExtras.validator) && isEmpty(uiExtras.values)) {
-        return [{ value: FILTER_VALIDATOR_VALUE[uiExtras.validator].label, enabled: uiExtras.uiValue[0].enabled != null ? uiExtras.uiValue[0].enabled : true }];
+        return [{ value: FILTER_VALIDATOR_INFO[uiExtras.validator].label, enabled: uiExtras.uiValue[0].enabled != null ? uiExtras.uiValue[0].enabled : true }];
     }
     if (uiExtras.column.type !== COLUMN.RANKING || !isEmpty(uiExtras.column.aggregate)) {
         return uiExtras.values;

package/src/filters/adapters/logicToUI.ts

@@ -1,5 +1,8 @@
-import { FILTER_SECTION, FILTER_STRUCTURE_VERSION } from "../constants";
-import { IFSection, IFUData, OLD_IFilterLogic } from "../interfaces";
+import { FILTER_STRUCTURE_VERSION } from "../constants/common/FILTER_STRUCTURE_VERSION";
+import { FILTER_SECTION } from "../constants/common/FILTER_SECTION";
+import { IFUData } from "../interfaces/ui/IFUData";
+import { IFSection } from "../interfaces/IFSection";
+import { OLD_IFilterLogic } from "../interfaces/OLD_IFilterLogic";
 import { flatUIToUI } from "./flatUIToUI";
 import { logicToFlatUI } from "./logicToFlatUI";
 

package/src/filters/adapters/transformFilters.ts

@@ -1,6 +1,10 @@
-import { capitalize, _get } from '../../general/index';
 import { isTokenLabel } from '../../tokens/isTokenLabel';
-import { FILTER_BACKEND_VALIDATOR, FILTER_SCOPE, FILTER_SECTION, FILTER_VALIDATOR } from '../constants/index';
+import { FILTER_VALIDATOR } from '../constants/common/FILTER_VALIDATOR';
+import { FILTER_SCOPE } from '../constants/common/FILTER_SCOPE';
+import { FILTER_SECTION } from '../constants/common/FILTER_SECTION';
+import { FILTER_BACKEND_VALIDATOR } from '../constants/backend/FILTER_BACKEND_VALIDATOR';
+import { _get } from '../../general/object/get';
+import { capitalize } from '../../general/string/capitalize';
 
 
 /**

package/src/filters/constants/backend/FILTER_BACKEND_VALIDATOR.ts

@@ -1,4 +1,4 @@
-export const enum FILTER_BACKEND_VALIDATOR {
+export enum FILTER_BACKEND_VALIDATOR {
   EQUALS = 'EQUAL',
   NOT_EQUAL = 'NOT_EQUAL',
   CONTAINS = 'CONTAIN',

package/src/filters/constants/builder/COLUMNS_FOR_CONTAINS_VALIDATOR.ts

@@ -1,4 +1,4 @@
-import { COLUMN } from "../../../constants";
+import { COLUMN } from "../../../columns/constants/COLUMN";
 
 // COLUMNS TYPES FOR THE CONTAINS LAYOUT
 export const COLUMNS_FOR_CONTAINS_VALIDATOR = [

package/src/filters/constants/builder/COLUMNS_FOR_EQUALS_LAYOUT.ts

@@ -1,4 +1,4 @@
-import { COLUMN } from "../../../constants";
+import { COLUMN } from "../../../columns/constants/COLUMN";
 
 // COLUMNS TYPES FOR GETTING VALIDATORS THAT USE EQUAL LAYOUT
 export const COLUMNS_FOR_EQUALS_LAYOUT = [

package/src/filters/constants/builder/COLUMNS_FOR_EQUALS_NULL_LAYOUT.ts

@@ -1,4 +1,4 @@
-import { COLUMN } from "../../../constants";
+import { COLUMN } from "../../../columns/constants/COLUMN";
 
 // COLUMNS TYPES FOR GETTING VALIDATORS THAT USE EQUAL AND NULL LAYOUTS
 export const COLUMNS_FOR_EQUALS_NULL_LAYOUT = [

package/src/filters/constants/builder/COLUMNS_FOR_NULL_LAYOUT.ts

@@ -1,4 +1,4 @@
-import { COLUMN } from "../../../constants";
+import { COLUMN } from "../../../columns/constants/COLUMN";
 
 // COLUMNS TYPES FOR GETTING VALIDATORS THAT USE NULL LAYOUT
 export const COLUMNS_FOR_NULL_LAYOUT = [

package/src/filters/constants/builder/COLUMNS_FOR_TEXT_LAYOUT.ts

@@ -1,4 +1,4 @@
-import { COLUMN } from "../../../constants";
+import { COLUMN } from "../../../columns/constants/COLUMN";
 
 // QUESTION TYPES FOR GETTING VALIDATORS THAT USE TEXT LAYOUT
 export const COLUMNS_FOR_TEXT_LAYOUT = [

package/src/filters/constants/builder/FILTER_FLOW.ts

@@ -1,4 +1,4 @@
-export const enum FILTER_FLOW {
+export enum FILTER_FLOW {
     ADD = 'ADD',
     EDIT = 'EDIT'
 }

package/src/filters/constants/builder/STATIC_OPTION_COLUMNS.ts

@@ -1,4 +1,4 @@
-import { COLUMN } from "../../../constants";
+import { COLUMN } from "../../../columns/constants/COLUMN";
 
 // COLUMN TYPES FOR GETTING OPTION VALUES (i.e FROM MODEL OBJECT)
 export const STATIC_OPTION_COLUMNS = [

package/src/filters/constants/common/FILTER_DATE_SECTION.ts

@@ -1,4 +1,4 @@
-export const enum FILTER_DATE_SECTION {
+export enum FILTER_DATE_SECTION {
     RELATIVE = 'RELATIVE',
     ABSOLUTE = 'ABSOLUTE'
 }

package/src/filters/constants/common/FILTER_DATE_SECTIONS.ts

@@ -1,4 +1,6 @@
+import { FILTER_DATE_SECTION } from "./FILTER_DATE_SECTION";
+
 export const FILTER_DATE_SECTIONS = [
-  { label: 'Relative Dates', value: 'RELATIVE', display: true },
-  { label: 'Absolute Dates', value: 'ABSOLUTE', display: true }
+    FILTER_DATE_SECTION.RELATIVE,
+    FILTER_DATE_SECTION.ABSOLUTE,
 ];

package/src/filters/constants/common/FILTER_DATE_SECTION_INFO.ts

@@ -0,0 +1,8 @@
+import { IFDateSectionInfo } from "../../interfaces/IFDateSectionInfo";
+import { FILTER_DATE_SECTION } from "./FILTER_DATE_SECTION";
+import { FILTER_DATE_SECTION_LABEL } from "./FILTER_DATE_SECTION_LABEL";
+
+export const FILTER_DATE_SECTION_INFO: IFDateSectionInfo[] = [
+  { label: FILTER_DATE_SECTION_LABEL.RELATIVE, shortLabel: 'Relative', abbrLabel: 'REL', value: FILTER_DATE_SECTION.RELATIVE, displayed: true },
+  { label: FILTER_DATE_SECTION_LABEL.ABSOLUTE, shortLabel: 'Absolute', abbrLabel: 'ABS', value: FILTER_DATE_SECTION.ABSOLUTE, displayed: true },
+];

package/src/filters/constants/common/FILTER_DATE_SECTION_LABEL.ts

@@ -0,0 +1,4 @@
+export enum FILTER_DATE_SECTION_LABEL {
+    RELATIVE = 'Relative Dates',
+    ABSOLUTE = 'Absolute Dates',
+}

package/src/filters/constants/common/FILTER_OPERATOR.ts

@@ -1,4 +1,4 @@
-export const enum FILTER_OPERATOR {
+export enum FILTER_OPERATOR {
     AND = 'AND',
     OR = 'OR'
 }

package/src/filters/constants/common/FILTER_OPERATORS.ts

@@ -0,0 +1,6 @@
+import { FILTER_OPERATOR } from "./FILTER_OPERATOR";
+
+export const FILTER_OPERATORS = [
+    FILTER_OPERATOR.AND,
+    FILTER_OPERATOR.OR,
+];

package/src/filters/constants/common/FILTER_OPERATOR_LABEL.ts

@@ -0,0 +1,4 @@
+export enum FILTER_OPERATOR_LABEL {
+    AND = 'And',
+    OR = 'Or',
+}

package/src/filters/constants/common/FILTER_SCOPE.ts

@@ -1,4 +1,4 @@
-export const enum FILTER_SCOPE {
+export enum FILTER_SCOPE {
   ADMIN = 'ADMIN',      // Admin filters (TBD)
   DATA = 'DATA',        // User Management Filters a.k.a. Super Filters
   GLOBAL = 'GLOBAL',    // Analyze Filters | Filters for all pages on PB/EU

package/src/filters/constants/common/FILTER_SCOPES.ts

@@ -0,0 +1,12 @@
+import { FILTER_SCOPE } from "./FILTER_SCOPE";
+
+export const FILTER_SCOPES = [
+    FILTER_SCOPE.ADMIN,
+    FILTER_SCOPE.DATA,
+    FILTER_SCOPE.GLOBAL,
+    FILTER_SCOPE.PAGE,
+    FILTER_SCOPE.TAB,
+    FILTER_SCOPE.DEFAULT,
+    FILTER_SCOPE.CHART,
+    FILTER_SCOPE.ACTION,
+];

package/src/filters/constants/common/FILTER_SCOPE_INFO.ts

@@ -0,0 +1,14 @@
+import { IFScopeInfo } from "../../interfaces/IFScopeInfo";
+import { FILTER_SCOPE } from "./FILTER_SCOPE";
+import { FILTER_SCOPE_LABEL } from "./FILTER_SCOPE_LABEL";
+
+export const FILTER_SCOPE_INFO: IFScopeInfo[] = [
+    { label: FILTER_SCOPE_LABEL.ADMIN, shortLabel: 'Admin', abbrLabel: 'ADM', value: FILTER_SCOPE.ADMIN, displayed: true },
+    { label: FILTER_SCOPE_LABEL.DATA, shortLabel: 'Data', abbrLabel: 'DAT', value: FILTER_SCOPE.DATA, displayed: true },
+    { label: FILTER_SCOPE_LABEL.GLOBAL, shortLabel: 'Global', abbrLabel: 'GLB', value: FILTER_SCOPE.GLOBAL, displayed: true },
+    { label: FILTER_SCOPE_LABEL.PAGE, shortLabel: 'Page', abbrLabel: 'PAG', value: FILTER_SCOPE.PAGE, displayed: true },
+    { label: FILTER_SCOPE_LABEL.TAB, shortLabel: 'Tab', abbrLabel: 'TAB', value: FILTER_SCOPE.TAB, displayed: true },
+    { label: FILTER_SCOPE_LABEL.DEFAULT, shortLabel: 'Default', abbrLabel: 'DEF', value: FILTER_SCOPE.DEFAULT, displayed: true },
+    { label: FILTER_SCOPE_LABEL.CHART, shortLabel: 'Chart', abbrLabel: 'CRT', value: FILTER_SCOPE.CHART, displayed: true },
+    { label: FILTER_SCOPE_LABEL.ACTION, shortLabel: 'Action', abbrLabel: 'ACT', value: FILTER_SCOPE.ACTION, displayed: true },
+];

package/src/filters/constants/common/FILTER_SCOPE_LABEL.ts

@@ -1,12 +1,10 @@
-import { FILTER_SCOPE } from "./FILTER_SCOPE";
-
-export const FILTER_SCOPE_LABEL = {
-    [FILTER_SCOPE.ADMIN]: 'Admin',
-    [FILTER_SCOPE.DATA]: 'Data',
-    [FILTER_SCOPE.GLOBAL]: 'Global',
-    [FILTER_SCOPE.PAGE]: 'Page',
-    [FILTER_SCOPE.TAB]: 'Tab',
-    [FILTER_SCOPE.DEFAULT]: 'Default',
-    [FILTER_SCOPE.CHART]: 'Panel',
-    [FILTER_SCOPE.ACTION]: 'Action',
-};
+export enum FILTER_SCOPE_LABEL {
+    ADMIN = 'Admin',
+    DATA = 'Data',
+    GLOBAL = 'Global',
+    PAGE = 'Page',
+    TAB = 'Tab',
+    DEFAULT = 'Default',
+    CHART = 'Panel',
+    ACTION = 'Action',
+}

package/src/filters/constants/common/FILTER_SECTION.ts

@@ -1,4 +1,4 @@
-export const enum FILTER_SECTION {
+export enum FILTER_SECTION {
   ANYWHERE = 'ANYWHERE',
   ANALYZE = 'ANALYZE',
   FLOWS = 'FLOWS',

package/src/filters/constants/common/FILTER_STRUCTURE_TYPE.ts

@@ -1,5 +1,5 @@
 
-export const enum FILTER_STRUCTURE_TYPE {
+export enum FILTER_STRUCTURE_TYPE {
     STANDARD = 'STANDARD',
     UI = 'UI',
     FLATTEN_UI = 'FLATTEN_UI',

package/src/filters/constants/common/FILTER_VALIDATOR.ts

@@ -1,4 +1,4 @@
-export const enum FILTER_VALIDATOR {
+export enum FILTER_VALIDATOR {
   EQUALS = 'EQUALS',
   NOT_EQUAL = 'NOT_EQUAL',
   CONTAINS = 'CONTAINS',

package/src/filters/constants/common/FILTER_VALIDATOR_BY_TYPE.ts

@@ -1,55 +1,55 @@
-import { FILTER_VALIDATOR_VALUE } from "./FILTER_VALIDATOR_VALUE";
+import { FILTER_VALIDATOR_INFO } from "./FILTER_VALIDATOR_INFO";
 
 export const FILTER_VALIDATOR_BY_TYPE = {
     'DATE': [
-        FILTER_VALIDATOR_VALUE.IN,
-        FILTER_VALIDATOR_VALUE.BEFORE,
-        FILTER_VALIDATOR_VALUE.BEFORE_ON,
-        FILTER_VALIDATOR_VALUE.AFTER,
-        FILTER_VALIDATOR_VALUE.AFTER_ON,
-        FILTER_VALIDATOR_VALUE.EQUALS,
-        FILTER_VALIDATOR_VALUE.NOT_EQUAL,
-        FILTER_VALIDATOR_VALUE.BETWEEN_INCLUSIVE,
-        FILTER_VALIDATOR_VALUE.BETWEEN_EXCLUSIVE,
-        FILTER_VALIDATOR_VALUE.IS_NULL,
-        FILTER_VALIDATOR_VALUE.IS_NOT_NULL
+        FILTER_VALIDATOR_INFO.IN,
+        FILTER_VALIDATOR_INFO.BEFORE,
+        FILTER_VALIDATOR_INFO.BEFORE_ON,
+        FILTER_VALIDATOR_INFO.AFTER,
+        FILTER_VALIDATOR_INFO.AFTER_ON,
+        FILTER_VALIDATOR_INFO.EQUALS,
+        FILTER_VALIDATOR_INFO.NOT_EQUAL,
+        FILTER_VALIDATOR_INFO.BETWEEN_INCLUSIVE,
+        FILTER_VALIDATOR_INFO.BETWEEN_EXCLUSIVE,
+        FILTER_VALIDATOR_INFO.IS_NULL,
+        FILTER_VALIDATOR_INFO.IS_NOT_NULL
     ],
     'NUMERIC': [
-        FILTER_VALIDATOR_VALUE.EQUALS,
-        FILTER_VALIDATOR_VALUE.NOT_EQUAL,
-        FILTER_VALIDATOR_VALUE.LESS_THAN,
-        FILTER_VALIDATOR_VALUE.LESS_THAN_EQUAL,
-        FILTER_VALIDATOR_VALUE.GREATER_THAN,
-        FILTER_VALIDATOR_VALUE.GREATER_THAN_EQUAL,
-        FILTER_VALIDATOR_VALUE.BETWEEN_INCLUSIVE,
-        FILTER_VALIDATOR_VALUE.BETWEEN_EXCLUSIVE,
-        FILTER_VALIDATOR_VALUE.IS_NULL,
-        FILTER_VALIDATOR_VALUE.IS_NOT_NULL
+        FILTER_VALIDATOR_INFO.EQUALS,
+        FILTER_VALIDATOR_INFO.NOT_EQUAL,
+        FILTER_VALIDATOR_INFO.LESS_THAN,
+        FILTER_VALIDATOR_INFO.LESS_THAN_EQUAL,
+        FILTER_VALIDATOR_INFO.GREATER_THAN,
+        FILTER_VALIDATOR_INFO.GREATER_THAN_EQUAL,
+        FILTER_VALIDATOR_INFO.BETWEEN_INCLUSIVE,
+        FILTER_VALIDATOR_INFO.BETWEEN_EXCLUSIVE,
+        FILTER_VALIDATOR_INFO.IS_NULL,
+        FILTER_VALIDATOR_INFO.IS_NOT_NULL
     ],
     'TEXT': [
-        FILTER_VALIDATOR_VALUE.EQUALS,
-        FILTER_VALIDATOR_VALUE.NOT_EQUAL,
-        FILTER_VALIDATOR_VALUE.STARTS_WITH,
-        FILTER_VALIDATOR_VALUE.NOT_START_WITH,
-        FILTER_VALIDATOR_VALUE.CONTAINS,
-        FILTER_VALIDATOR_VALUE.NOT_CONTAIN,
-        FILTER_VALIDATOR_VALUE.ENDS_WITH,
-        FILTER_VALIDATOR_VALUE.NOT_END_WITH,
-        FILTER_VALIDATOR_VALUE.IS_NULL,
-        FILTER_VALIDATOR_VALUE.IS_NOT_NULL
+        FILTER_VALIDATOR_INFO.EQUALS,
+        FILTER_VALIDATOR_INFO.NOT_EQUAL,
+        FILTER_VALIDATOR_INFO.STARTS_WITH,
+        FILTER_VALIDATOR_INFO.NOT_START_WITH,
+        FILTER_VALIDATOR_INFO.CONTAINS,
+        FILTER_VALIDATOR_INFO.NOT_CONTAIN,
+        FILTER_VALIDATOR_INFO.ENDS_WITH,
+        FILTER_VALIDATOR_INFO.NOT_END_WITH,
+        FILTER_VALIDATOR_INFO.IS_NULL,
+        FILTER_VALIDATOR_INFO.IS_NOT_NULL
     ],
     'EQUAL': [
-        FILTER_VALIDATOR_VALUE.EQUALS,
-        FILTER_VALIDATOR_VALUE.NOT_EQUAL
+        FILTER_VALIDATOR_INFO.EQUALS,
+        FILTER_VALIDATOR_INFO.NOT_EQUAL
     ],
     'EQUAL_NULL': [
-        FILTER_VALIDATOR_VALUE.EQUALS,
-        FILTER_VALIDATOR_VALUE.NOT_EQUAL,
-        FILTER_VALIDATOR_VALUE.IS_NULL,
-        FILTER_VALIDATOR_VALUE.IS_NOT_NULL
+        FILTER_VALIDATOR_INFO.EQUALS,
+        FILTER_VALIDATOR_INFO.NOT_EQUAL,
+        FILTER_VALIDATOR_INFO.IS_NULL,
+        FILTER_VALIDATOR_INFO.IS_NOT_NULL
     ],
     'NULL': [
-        FILTER_VALIDATOR_VALUE.IS_NULL,
-        FILTER_VALIDATOR_VALUE.IS_NOT_NULL
+        FILTER_VALIDATOR_INFO.IS_NULL,
+        FILTER_VALIDATOR_INFO.IS_NOT_NULL
     ]
 };

package/src/filters/constants/common/FILTER_VALIDATOR_INFO.ts

@@ -0,0 +1,28 @@
+import { IFValidator } from "../../interfaces/IFValidator";
+import { IFValidatorInfo } from "../../interfaces/IFValidatorInfo";
+import { FILTER_VALIDATOR } from "./FILTER_VALIDATOR";
+import { FILTER_VALIDATOR_LABEL } from "./FILTER_VALIDATOR_LABEL";
+
+export const FILTER_VALIDATOR_INFO: { [key in IFValidator]: IFValidatorInfo } = {
+    [FILTER_VALIDATOR.EQUALS]: { label: FILTER_VALIDATOR_LABEL.EQUALS, shortLabel: 'Equals', abbrLabel: 'EQL', value: FILTER_VALIDATOR.EQUALS, displayed: true },
+    [FILTER_VALIDATOR.NOT_EQUAL]: { label: FILTER_VALIDATOR_LABEL.NOT_EQUAL, shortLabel: 'Not Equal', abbrLabel: 'NEQL', value: FILTER_VALIDATOR.NOT_EQUAL, displayed: true },
+    [FILTER_VALIDATOR.BEFORE]: { label: FILTER_VALIDATOR_LABEL.BEFORE, shortLabel: 'Before', abbrLabel: 'BFR', value: FILTER_VALIDATOR.BEFORE, displayed: true },
+    [FILTER_VALIDATOR.AFTER]: { label: FILTER_VALIDATOR_LABEL.AFTER, shortLabel: 'After', abbrLabel: 'AFT', value: FILTER_VALIDATOR.AFTER, displayed: true },
+    [FILTER_VALIDATOR.BEFORE_ON]: { label: FILTER_VALIDATOR_LABEL.BEFORE_ON, shortLabel: 'Before on', abbrLabel: 'BFRON', value: FILTER_VALIDATOR.BEFORE_ON, displayed: true },
+    [FILTER_VALIDATOR.AFTER_ON]: { label: FILTER_VALIDATOR_LABEL.AFTER_ON, shortLabel: 'After on', abbrLabel: 'AFTON', value: FILTER_VALIDATOR.AFTER_ON, displayed: true },
+    [FILTER_VALIDATOR.BETWEEN_INCLUSIVE]: { label: FILTER_VALIDATOR_LABEL.BETWEEN_INCLUSIVE, shortLabel: 'Between inclusive', abbrLabel: 'BTWIN', value: FILTER_VALIDATOR.BETWEEN_INCLUSIVE, displayed: true },
+    [FILTER_VALIDATOR.BETWEEN_EXCLUSIVE]: { label: FILTER_VALIDATOR_LABEL.BETWEEN_EXCLUSIVE, shortLabel: 'Between exclusive', abbrLabel: 'BTWEX', value: FILTER_VALIDATOR.BETWEEN_EXCLUSIVE, displayed: true },
+    [FILTER_VALIDATOR.IS_NULL]: { label: FILTER_VALIDATOR_LABEL.IS_NULL, shortLabel: 'Null', abbrLabel: 'NLL', value: FILTER_VALIDATOR.IS_NULL, displayed: true },
+    [FILTER_VALIDATOR.IS_NOT_NULL]: { label: FILTER_VALIDATOR_LABEL.IS_NOT_NULL, shortLabel: 'Not Null', abbrLabel: 'NNLL', value: FILTER_VALIDATOR.IS_NOT_NULL, displayed: true },
+    [FILTER_VALIDATOR.LESS_THAN]: { label: FILTER_VALIDATOR_LABEL.LESS_THAN, shortLabel: 'Less than', abbrLabel: 'LSS', value: FILTER_VALIDATOR.LESS_THAN, displayed: true },
+    [FILTER_VALIDATOR.LESS_THAN_EQUAL]: { label: FILTER_VALIDATOR_LABEL.LESS_THAN_EQUAL, shortLabel: 'Less equal', abbrLabel: 'LSSEQL', value: FILTER_VALIDATOR.LESS_THAN_EQUAL, displayed: true },
+    [FILTER_VALIDATOR.GREATER_THAN]: { label: FILTER_VALIDATOR_LABEL.GREATER_THAN, shortLabel: 'Greater than', abbrLabel: 'GRT', value: FILTER_VALIDATOR.GREATER_THAN, displayed: true },
+    [FILTER_VALIDATOR.GREATER_THAN_EQUAL]: { label: FILTER_VALIDATOR_LABEL.GREATER_THAN_EQUAL, shortLabel: 'Greater equal', abbrLabel: 'GRTEQL', value: FILTER_VALIDATOR.GREATER_THAN_EQUAL, displayed: true },
+    [FILTER_VALIDATOR.STARTS_WITH]: { label: FILTER_VALIDATOR_LABEL.STARTS_WITH, shortLabel: 'Starts with', abbrLabel: 'STR', value: FILTER_VALIDATOR.STARTS_WITH, displayed: true },
+    [FILTER_VALIDATOR.ENDS_WITH]: { label: FILTER_VALIDATOR_LABEL.ENDS_WITH, shortLabel: 'Ends with', abbrLabel: 'END', value: FILTER_VALIDATOR.ENDS_WITH, displayed: true },
+    [FILTER_VALIDATOR.CONTAINS]: { label: FILTER_VALIDATOR_LABEL.CONTAINS, shortLabel: 'Contains', abbrLabel: 'CTNS', value: FILTER_VALIDATOR.CONTAINS, displayed: true },
+    [FILTER_VALIDATOR.NOT_START_WITH]: { label: FILTER_VALIDATOR_LABEL.NOT_START_WITH, shortLabel: 'Not start', abbrLabel: 'NSTR', value: FILTER_VALIDATOR.NOT_START_WITH, displayed: true },
+    [FILTER_VALIDATOR.NOT_END_WITH]: { label: FILTER_VALIDATOR_LABEL.NOT_END_WITH, shortLabel: 'Not end', abbrLabel: 'NEND', value: FILTER_VALIDATOR.NOT_END_WITH, displayed: true },
+    [FILTER_VALIDATOR.NOT_CONTAIN]: { label: FILTER_VALIDATOR_LABEL.NOT_CONTAIN, shortLabel: 'Not contain', abbrLabel: 'NCTNS', value: FILTER_VALIDATOR.NOT_CONTAIN, displayed: true },
+    [FILTER_VALIDATOR.IN] : { label: FILTER_VALIDATOR_LABEL.IN, shortLabel: 'In', abbrLabel: 'IN', value: FILTER_VALIDATOR.IN, displayed: true }
+};

package/src/filters/constants/common/FILTER_VALIDATOR_LABEL.ts

@@ -0,0 +1,23 @@
+export enum FILTER_VALIDATOR_LABEL {
+    EQUALS = 'Equals',
+    NOT_EQUAL = 'Does not equal',
+    BEFORE = 'Before',
+    AFTER = 'After',
+    BEFORE_ON = 'Before or on',
+    AFTER_ON = 'After or on',
+    BETWEEN_INCLUSIVE = 'Between, Inclusive',
+    BETWEEN_EXCLUSIVE = 'Between, Exclusive',
+    IS_NULL = 'Is Null',
+    IS_NOT_NULL = 'Is Not Null',
+    LESS_THAN = 'Less than',
+    LESS_THAN_EQUAL = 'Less than or equal to',
+    GREATER_THAN = 'Greater than',
+    GREATER_THAN_EQUAL = 'Greater than or equal to',
+    STARTS_WITH = 'Starts with',
+    ENDS_WITH = 'Ends with',
+    CONTAINS = 'Contains',
+    NOT_START_WITH = 'Does not start with',
+    NOT_END_WITH = 'Does not end with',
+    NOT_CONTAIN = 'Does not contain',
+    IN = 'In',
+}

package/src/filters/constants/common/index.ts

@@ -1,12 +1,25 @@
+export * from './FILTER_DATE_SECTION_INFO';
+export * from './FILTER_DATE_SECTION_LABEL';
 export * from './FILTER_DATE_SECTION';
 export * from './FILTER_DATE_SECTIONS';
+
 export * from './FILTER_GROUPED_COLUMN_OPERATOR';
+
+export * from './FILTER_OPERATOR_LABEL';
 export * from './FILTER_OPERATOR';
+export * from './FILTER_OPERATORS';
+
+export * from './FILTER_SCOPE_INFO';
 export * from './FILTER_SCOPE_LABEL';
 export * from './FILTER_SCOPE';
+export * from './FILTER_SCOPES';
+
+export * from './FILTER_SECTION';
+
 export * from './FILTER_STRUCTURE_TYPE';
 export * from './FILTER_STRUCTURE_VERSION';
-export * from './FILTER_SECTION';
+
 export * from './FILTER_VALIDATOR_BY_TYPE';
-export * from './FILTER_VALIDATOR_VALUE';
+export * from './FILTER_VALIDATOR_INFO';
+export * from './FILTER_VALIDATOR_LABEL';
 export * from './FILTER_VALIDATOR';

package/src/filters/constants/panel/FILTER_PANEL_ACTION.ts

@@ -1,4 +1,4 @@
-export const enum FILTER_PANEL_ACTION {
+export enum FILTER_PANEL_ACTION {
     UI_INTERACTION = 'UI_INTERACTION',
     FILTER_INTERACTION =  'FILTER_INTERACTION',
     FILTER_UI_INTERACTION = 'FILTER_UI_INTERACTION',

package/src/filters/constants/panel/FILTER_PANEL_VIEW.ts

@@ -1,4 +1,4 @@
-export const enum FILTER_PANEL_VIEW {
+export enum FILTER_PANEL_VIEW {
     OPENED = 'OPENED',
     CLOSED =  'CLOSED',
 }

package/src/filters/helpers/applyHierarchyForAggFilters.ts

@@ -1,6 +1,9 @@
-import { filterNestedTree, isEmpty } from "../../general";
-import { FILTER_SCOPE } from "../constants";
-import { IFScope, IFSScopeID, IFUChartSettings } from "../interfaces";
+import { filterNestedTree } from "../../general/array/filterNestedTree";
+import { isEmpty } from "../../general/mix/isEmpty";
+import { FILTER_SCOPE } from "../constants/common/FILTER_SCOPE";
+import { IFSScopeID } from "../interfaces/common/IFSScopeID";
+import { IFScope } from "../interfaces/IFScope";
+import { IFUChartSettings } from "../interfaces/ui/IFUChartSettings";
 import { getScopesByHierarchy } from "./getScopesByHierarchy";
 
 /**

package/src/filters/helpers/backend/buildExpression.ts

@@ -1,4 +1,5 @@
-import { IFBExpression, IFSFilter } from "../../interfaces";
+import { IFBExpression } from "../../interfaces/backend/IFBExpression";
+import { IFSFilter } from "../../interfaces/common/IFSFilter";
 import { getBackendGroupValue } from "./getBackendGroupValue";
 import { getBackendProperty } from "./getBackendProperty";
 import { getBackendValidator } from "./getBackendValidator";

package/src/filters/helpers/backend/buildFilters.ts

@@ -1,6 +1,9 @@
-import { isEmpty, _hasProperty } from "../../../general";
-import { FILTER_OPERATOR } from "../../constants";
-import { IFBExpression, IFBFilter, IFSFilter } from "../../interfaces";
+import { isEmpty } from "../../../general/mix/isEmpty";
+import { _hasProperty } from "../../../general/object/hasProperty";
+import { FILTER_OPERATOR } from "../../constants/common/FILTER_OPERATOR";
+import { IFBExpression } from "../../interfaces/backend/IFBExpression";
+import { IFBFilter } from "../../interfaces/backend/IFBFilter";
+import { IFSFilter } from "../../interfaces/common/IFSFilter";
 import { buildExpression } from "./buildExpression";
 
 export function buildFilters(filters: IFSFilter[], groupColumns = false): IFBFilter[] {

package/src/filters/helpers/backend/buildUserFilters.ts

@@ -1,6 +1,8 @@
-import { isEmpty, _get } from "../../../general";
-import { FILTER_SCOPE } from "../../constants";
-import { IFBLogic, IFBUserFilters } from "../../interfaces";
+import { _get } from "../../../general/object/get";
+import { isEmpty } from "../../../general/mix/isEmpty";
+import { IFBLogic } from "../../interfaces/backend/IFBLogic";
+import { IFBUserFilters } from "../../interfaces/backend/IFBUserFilters";
+import { FILTER_SCOPE } from "../../constants/common/FILTER_SCOPE";
 
 /**
  * Transform user Filters array into Filter Logic structure

package/src/filters/helpers/backend/getAggFiltersBySummaryIndex.ts

@@ -1,5 +1,5 @@
-import { filterNestedTree } from "../../../general";
-import { IFBFilterAggregate } from "../../interfaces";
+import { filterNestedTree } from "../../../general/array/filterNestedTree";
+import { IFBFilterAggregate } from "../../interfaces/backend/IFBFilterAggregate";
 
 /**
  * 

package/src/filters/helpers/backend/getBackendGroupValue.ts

@@ -1,7 +1,8 @@
-import { adaptDateGroupingProperty } from "../..";
-import { isEmpty } from "../../../general";
-import { isDateColumn } from "../../../qrvey/isDateColumn";
-import { IFProperty, IFSFilter } from "../../interfaces";
+import { adaptDateGroupingProperty } from "../../adapters/adaptDateGroupingProperty";
+import { isDateColumn } from "../../../columns/helpers/isDateColumn";
+import { isEmpty } from "../../../general/mix/isEmpty";
+import { IFProperty } from "../../interfaces/IFProperty";
+import { IFSFilter } from "../../interfaces/common/IFSFilter";
 
 /**
  * Gets a group value for the backend logic structure

package/src/filters/helpers/backend/getBackendProperty.ts

@@ -1,8 +1,10 @@
-import { COLUMN, COLUMN_PROPERTY } from "../../../constants";
-import { isEmpty } from "../../../general";
-import { isDateColumn } from "../../../qrvey/isDateColumn";
-import { IFProperty, IFSFilter } from "../../interfaces";
-import { isNullValidator } from "../common";
+import { COLUMN } from "../../../columns/constants/COLUMN";
+import { COLUMN_PROPERTY } from "../../../columns/constants/COLUMN_PROPERTY";
+import { isDateColumn } from "../../../columns/helpers/isDateColumn";
+import { isEmpty } from "../../../general/mix/isEmpty";
+import { IFSFilter } from "../../interfaces/common/IFSFilter";
+import { IFProperty } from "../../interfaces/IFProperty";
+import { isNullValidator } from "../common/isNullValidator";
 
 /**
  * Gets a property for the logic structure

package/src/filters/helpers/backend/getBackendValidator.ts

@@ -1,5 +1,7 @@
-import { FILTER_BACKEND_VALIDATOR, FILTER_VALIDATOR } from "../../constants";
-import { IFBackendValidator, IFValidator } from "../../interfaces";
+import { FILTER_BACKEND_VALIDATOR } from "../../constants/backend/FILTER_BACKEND_VALIDATOR";
+import { FILTER_VALIDATOR } from "../../constants/common/FILTER_VALIDATOR";
+import { IFBackendValidator } from "../../interfaces/backend/IFBackendValidator";
+import { IFValidator } from "../../interfaces/IFValidator";
 
 /**
  * Gets the Validator that is used in requests