@qrvey/utils 1.5.0-1 → 1.5.0-2

package/README.md

@@ -1,4 +1,4 @@
-# [@qrvey/utils](https://bitbucket.org/qrvey/qrvey_utils/wiki/Home) *1.5.0-1*
+# [@qrvey/utils](https://bitbucket.org/qrvey/qrvey_utils/wiki/Home) *1.5.0-2*
 
 > Helper, Utils for all Qrvey Projects
 

package/dist/cjs/filters/helpers/getTokensFromFilters.js

@@ -12,7 +12,7 @@ const isEmpty_1 = require("../../general/mix/isEmpty");
  * @returns {IFFilterTokens[]} An array of tokens that represents the filters object
  */
 function getTokensFromFilters(filters, options) {
-    var _a, _b;
+    var _a, _b, _c;
     const tokens = [];
     const i18nService = options.i18nService;
     const settings = {
@@ -48,16 +48,21 @@ function getTokensFromFilters(filters, options) {
                 });
             }
             for (const [index, filter] of Object.entries(database.filters)) {
-                if (!(filter === null || filter === void 0 ? void 0 : filter.enabled))
+                if (!(filter === null || filter === void 0 ? void 0 : filter.enabled)) {
+                    if (((_a = tokens[tokens.length - 1]) === null || _a === void 0 ? void 0 : _a.type) ===
+                        FILTER_TOKENS_STRUCTURE_TYPE_1.FILTER_TOKENS_STRUCTURE_TYPE.LOGICAL_OPERATOR) {
+                        tokens.pop();
+                    }
                     continue;
+                }
                 const values = (0, getUIValues_1.getUIValues)(filter, settings);
                 if (!thereIsFiltersWithValues)
                     thereIsFiltersWithValues = true;
                 let columnLabel = filter.column.label;
-                if ((_a = filter === null || filter === void 0 ? void 0 : filter.column) === null || _a === void 0 ? void 0 : _a.aggregate) {
+                if ((_b = filter === null || filter === void 0 ? void 0 : filter.column) === null || _b === void 0 ? void 0 : _b.aggregate) {
                     columnLabel +=
                         " (" +
-                            i18nService.translate(`common.aggregate_labels.${(_b = filter === null || filter === void 0 ? void 0 : filter.column) === null || _b === void 0 ? void 0 : _b.aggregate.toLowerCase()}`) +
+                            i18nService.translate(`common.aggregate_labels.${(_c = filter === null || filter === void 0 ? void 0 : filter.column) === null || _c === void 0 ? void 0 : _c.aggregate.toLowerCase()}`) +
                             ")";
                 }
                 tokens.push({

package/dist/cjs/globalization/interfaces/II18nResource.d.ts

@@ -11,6 +11,7 @@ import { II18nBucketBuilder } from "./bucket_builder/II18nBucketBuilder";
 import { II18nCrossTabs } from "./cross_tabs";
 import { II18nChartBuilder } from ".";
 import { II18nStyleThemes } from "./style_themes/II18nStyleThemes";
+import { II18nTabularView } from './tabular_view/II18nTabularView';
 export interface II18nResource {
     bucket_builder?: II18nBucketBuilder;
     chart_builder?: II18nChartBuilder;
@@ -25,4 +26,5 @@ export interface II18nResource {
     panel?: II18nPanel;
     style_themes?: II18nStyleThemes;
     table_charts?: II18nTableCharts;
+    tabular_view?: II18nTabularView;
 }

package/dist/cjs/globalization/interfaces/chart_builder/II18nChartBuilderFormatValues.d.ts

@@ -14,4 +14,5 @@ export interface II18nChartBuilderFormatValues {
     custom: string;
     date_format: string;
     value_format: string;
+    duration: string;
 }

package/dist/cjs/globalization/interfaces/common/II18nCommon.d.ts

@@ -16,5 +16,6 @@ export interface II18nCommon {
     no_data_found: string;
     properties: II18nColumnProperties;
     search: string;
+    sort: string;
     units: II18nUnits;
 }

package/dist/cjs/globalization/interfaces/tabular_view/II18nTabularView.d.ts

@@ -0,0 +1,4 @@
+export interface II18nTabularView {
+    all: string;
+    select_columns: string;
+}

package/dist/cjs/globalization/interfaces/tabular_view/II18nTabularView.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/cjs/globalization/labels/I18N_DEFAULT.js

@@ -11,6 +11,7 @@ const formula_builder_1 = require("./formula_builder");
 const I18N_FILTER_PANEL_1 = require("./filters/I18N_FILTER_PANEL");
 const I18N_FILTER_DISPLAY_1 = require("./filters/I18N_FILTER_DISPLAY");
 const I18N_BUCKET_BUILDER_1 = require("./bucket_builder/I18N_BUCKET_BUILDER");
+const I18N_TABULAR_VIEW_1 = require("./tabular_view/I18N_TABULAR_VIEW");
 const cross_tabs_1 = require("./cross_tabs");
 const chart_builder_1 = require("./chart_builder");
 const style_themes_1 = require("./style_themes");
@@ -28,4 +29,5 @@ exports.I18N_DEFAULT = {
     panel: I18N_PANEL_1.I18N_PANEL,
     style_themes: style_themes_1.I18N_STYLE_THEMES,
     table_charts: table_charts_1.I18N_TABLE_CHARTS,
+    tabular_view: I18N_TABULAR_VIEW_1.I18N_TABULAR_VIEW
 };

package/dist/cjs/globalization/labels/chart_builder/I18N_CHART_BUILDER.js

@@ -26,6 +26,7 @@ exports.I18N_CHART_BUILDER = Object.assign(Object.assign(Object.assign(Object.as
         custom: "Custom Format",
         date_format: "Date Format",
         value_format: "Value Format",
+        duration: "Duration",
     }, chart_names: {
         bar: "Bar",
         line: "Line",

package/dist/cjs/globalization/labels/common/I18N_COMMON.js

@@ -23,6 +23,7 @@ exports.I18N_COMMON = {
     no_data_found: "No Data Found",
     properties: I18N_COLUMN_PROPERTY_LABEL_1.I18N_COLUMN_PROPERTY_LABEL,
     search: "Search",
+    sort: "Sort",
     units: {
         day: RELATIVE_UNIT_INFO_1.RELATIVE_UNIT_INFO.DAY.label,
         month: RELATIVE_UNIT_INFO_1.RELATIVE_UNIT_INFO.MONTH.label,

package/dist/cjs/globalization/labels/tabular_view/I18N_TABULAR_VIEW.d.ts

@@ -0,0 +1,2 @@
+import { II18nTabularView } from "../../interfaces/tabular_view/II18nTabularView";
+export declare const I18N_TABULAR_VIEW: II18nTabularView;

package/dist/cjs/globalization/labels/tabular_view/I18N_TABULAR_VIEW.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.I18N_TABULAR_VIEW = void 0;
+exports.I18N_TABULAR_VIEW = {
+    all: "Todas",
+    select_columns: "Select Columns",
+};

package/dist/filters/helpers/getTokensFromFilters.js

@@ -9,7 +9,7 @@ import { isEmpty } from "../../general/mix/isEmpty";
  * @returns {IFFilterTokens[]} An array of tokens that represents the filters object
  */
 export function getTokensFromFilters(filters, options) {
-    var _a, _b;
+    var _a, _b, _c;
     const tokens = [];
     const i18nService = options.i18nService;
     const settings = {
@@ -45,16 +45,21 @@ export function getTokensFromFilters(filters, options) {
                 });
             }
             for (const [index, filter] of Object.entries(database.filters)) {
-                if (!(filter === null || filter === void 0 ? void 0 : filter.enabled))
+                if (!(filter === null || filter === void 0 ? void 0 : filter.enabled)) {
+                    if (((_a = tokens[tokens.length - 1]) === null || _a === void 0 ? void 0 : _a.type) ===
+                        FILTER_TOKENS_STRUCTURE_TYPE.LOGICAL_OPERATOR) {
+                        tokens.pop();
+                    }
                     continue;
+                }
                 const values = getUIValues(filter, settings);
                 if (!thereIsFiltersWithValues)
                     thereIsFiltersWithValues = true;
                 let columnLabel = filter.column.label;
-                if ((_a = filter === null || filter === void 0 ? void 0 : filter.column) === null || _a === void 0 ? void 0 : _a.aggregate) {
+                if ((_b = filter === null || filter === void 0 ? void 0 : filter.column) === null || _b === void 0 ? void 0 : _b.aggregate) {
                     columnLabel +=
                         " (" +
-                            i18nService.translate(`common.aggregate_labels.${(_b = filter === null || filter === void 0 ? void 0 : filter.column) === null || _b === void 0 ? void 0 : _b.aggregate.toLowerCase()}`) +
+                            i18nService.translate(`common.aggregate_labels.${(_c = filter === null || filter === void 0 ? void 0 : filter.column) === null || _c === void 0 ? void 0 : _c.aggregate.toLowerCase()}`) +
                             ")";
                 }
                 tokens.push({

package/dist/globalization/interfaces/II18nResource.d.ts

@@ -11,6 +11,7 @@ import { II18nBucketBuilder } from "./bucket_builder/II18nBucketBuilder";
 import { II18nCrossTabs } from "./cross_tabs";
 import { II18nChartBuilder } from ".";
 import { II18nStyleThemes } from "./style_themes/II18nStyleThemes";
+import { II18nTabularView } from './tabular_view/II18nTabularView';
 export interface II18nResource {
     bucket_builder?: II18nBucketBuilder;
     chart_builder?: II18nChartBuilder;
@@ -25,4 +26,5 @@ export interface II18nResource {
     panel?: II18nPanel;
     style_themes?: II18nStyleThemes;
     table_charts?: II18nTableCharts;
+    tabular_view?: II18nTabularView;
 }

package/dist/globalization/interfaces/chart_builder/II18nChartBuilderFormatValues.d.ts

@@ -14,4 +14,5 @@ export interface II18nChartBuilderFormatValues {
     custom: string;
     date_format: string;
     value_format: string;
+    duration: string;
 }

package/dist/globalization/interfaces/common/II18nCommon.d.ts

@@ -16,5 +16,6 @@ export interface II18nCommon {
     no_data_found: string;
     properties: II18nColumnProperties;
     search: string;
+    sort: string;
     units: II18nUnits;
 }

package/dist/globalization/interfaces/tabular_view/II18nTabularView.d.ts

@@ -0,0 +1,4 @@
+export interface II18nTabularView {
+    all: string;
+    select_columns: string;
+}

package/dist/globalization/interfaces/tabular_view/II18nTabularView.js

@@ -0,0 +1 @@
+export {};

package/dist/globalization/labels/I18N_DEFAULT.js

@@ -8,6 +8,7 @@ import { I18N_FORMULA_BUILDER } from "./formula_builder";
 import { I18N_FILTER_PANEL } from "./filters/I18N_FILTER_PANEL";
 import { I18N_FILTER_DISPLAY } from "./filters/I18N_FILTER_DISPLAY";
 import { I18N_BUCKET_BUILDER } from "./bucket_builder/I18N_BUCKET_BUILDER";
+import { I18N_TABULAR_VIEW } from './tabular_view/I18N_TABULAR_VIEW';
 import { I18N_CROSS_TABS } from "./cross_tabs";
 import { I18N_CHART_BUILDER } from "./chart_builder";
 import { I18N_STYLE_THEMES } from "./style_themes";
@@ -25,4 +26,5 @@ export const I18N_DEFAULT = {
     panel: I18N_PANEL,
     style_themes: I18N_STYLE_THEMES,
     table_charts: I18N_TABLE_CHARTS,
+    tabular_view: I18N_TABULAR_VIEW
 };

package/dist/globalization/labels/chart_builder/I18N_CHART_BUILDER.js

@@ -23,6 +23,7 @@ export const I18N_CHART_BUILDER = Object.assign(Object.assign(Object.assign(Obje
         custom: "Custom Format",
         date_format: "Date Format",
         value_format: "Value Format",
+        duration: "Duration",
     }, chart_names: {
         bar: "Bar",
         line: "Line",

package/dist/globalization/labels/common/I18N_COMMON.js

@@ -20,6 +20,7 @@ export const I18N_COMMON = {
     no_data_found: "No Data Found",
     properties: I18N_COLUMN_PROPERTY_LABEL,
     search: "Search",
+    sort: "Sort",
     units: {
         day: RELATIVE_UNIT_INFO.DAY.label,
         month: RELATIVE_UNIT_INFO.MONTH.label,

package/dist/globalization/labels/tabular_view/I18N_TABULAR_VIEW.d.ts

@@ -0,0 +1,2 @@
+import { II18nTabularView } from "../../interfaces/tabular_view/II18nTabularView";
+export declare const I18N_TABULAR_VIEW: II18nTabularView;

package/dist/globalization/labels/tabular_view/I18N_TABULAR_VIEW.js

@@ -0,0 +1,4 @@
+export const I18N_TABULAR_VIEW = {
+    all: "Todas",
+    select_columns: "Select Columns",
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qrvey/utils",
-  "version": "1.5.0-1",
+  "version": "1.5.0-2",
   "description": "Helper, Utils for all Qrvey Projects",
   "homepage": "https://bitbucket.org/qrvey/qrvey_utils/wiki/Home",
   "main": "dist/index.js",