@qrvey/utils 1.4.0-1 → 1.4.0-2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/charts/helpers/isSimpleTableChart.js +2 -1
- package/dist/cjs/charts/helpers/isSimpleTableChart.js +2 -1
- package/dist/cjs/column_format/helpers/defineTableChartFormat.js +7 -13
- package/dist/cjs/column_format/helpers/defineXYChartFormat.js +7 -11
- package/dist/cjs/columns/constants/COLUMN_INFO.js +23 -49
- package/dist/cjs/columns/constants/COLUMN_LABEL.js +1 -29
- package/dist/cjs/columns/constants/COLUMN_PROPERTY_INFO.js +3 -8
- package/dist/cjs/columns/constants/COLUMN_PROPERTY_LABEL.js +1 -11
- package/dist/cjs/columns/helpers/getDatasetColumn.js +1 -1
- package/dist/cjs/dates/relative/RelativeStatementAdapter.js +6 -24
- package/dist/cjs/filters/adapters/FDToFlatUI.js +8 -18
- package/dist/cjs/filters/adapters/FDToLogic.js +1 -1
- package/dist/cjs/filters/adapters/FDToUI.js +12 -24
- package/dist/cjs/filters/adapters/UIToFlatUI.js +4 -14
- package/dist/cjs/filters/adapters/UIToOldLogic.js +2 -1
- package/dist/cjs/filters/adapters/adaptFilterValues.js +1 -6
- package/dist/cjs/filters/adapters/flatUIToFD.js +3 -14
- package/dist/cjs/filters/adapters/flatUIToOldLogic.js +15 -49
- package/dist/cjs/filters/adapters/flatUIToUI.js +3 -14
- package/dist/cjs/filters/adapters/logicToFlatUI.js +20 -32
- package/dist/cjs/filters/adapters/transformFilters.js +4 -19
- package/dist/cjs/filters/classes/FilterInputErrorHandler.js +0 -8
- package/dist/cjs/filters/helpers/applyHierarchyForAggFilters.js +2 -11
- package/dist/cjs/filters/helpers/backend/buildExpression.js +2 -1
- package/dist/cjs/filters/helpers/backend/buildFilters.js +2 -1
- package/dist/cjs/filters/helpers/backend/getAggFiltersBySummaryIndex.js +1 -4
- package/dist/cjs/filters/helpers/backend/getLogicByDatasets.js +5 -7
- package/dist/cjs/filters/helpers/backend/getLogicByDatasetsColumns.js +6 -8
- package/dist/cjs/filters/helpers/common/areFiltersEquals.js +3 -2
- package/dist/cjs/filters/helpers/common/excludeFiltersByParams.js +17 -22
- package/dist/cjs/filters/helpers/common/getFilterid.js +9 -8
- package/dist/cjs/filters/helpers/common/getFiltersByDatasetsColumns.js +7 -16
- package/dist/cjs/filters/helpers/common/getFiltersByParams.js +12 -18
- package/dist/cjs/filters/helpers/common/getMergeFiltersSettings.js +4 -3
- package/dist/cjs/filters/helpers/common/getMergeValuesSettings.js +2 -1
- package/dist/cjs/filters/helpers/common/getParamsToGetFilterSettings.js +10 -9
- package/dist/cjs/filters/helpers/common/mergeFilters.js +7 -30
- package/dist/cjs/filters/helpers/common/mergeValues.js +9 -6
- package/dist/cjs/filters/helpers/common/resolveFilterConditions.js +9 -8
- package/dist/cjs/filters/helpers/getAggFiltersFromFilterData.js +1 -1
- package/dist/cjs/filters/helpers/ui/getUIValues.js +14 -12
- package/dist/cjs/filters/helpers/ui/getUpdatedUIFilters.js +1 -1
- package/dist/cjs/filters/helpers/ui/resolveUIFlatFilterByParams.js +5 -4
- package/dist/cjs/filters/helpers/ui/transformFilterValues.js +3 -14
- package/dist/cjs/filters/interfaces/builder/IFilterBuilderSettings.d.ts +2 -0
- package/dist/cjs/filters/services/Filters.api.js +44 -45
- package/dist/cjs/filters/services/UChartApi.js +246 -257
- package/dist/cjs/filters/services/UChartPaginationApi.js +289 -301
- package/dist/cjs/format/duration/durationFormatter.js +7 -12
- package/dist/cjs/format/format.js +8 -7
- package/dist/cjs/format/localization.d.ts +2 -1
- package/dist/cjs/format/localization.js +8 -7
- package/dist/cjs/general/array/addPropertyToArrayOfObjects.js +1 -1
- package/dist/cjs/general/object/getAttribute.js +2 -6
- package/dist/cjs/general/object/mergeDeep.js +3 -2
- package/dist/cjs/globalization/labels/chart_builder/I18N_CHART_BUILDER.js +6 -21
- package/dist/cjs/globalization/service/i18nextBuilder.js +31 -19
- package/dist/cjs/globalization/service/initI18n.js +13 -2
- package/dist/cjs/qrvey/helpers/getCategorizableExpression.js +2 -1
- package/dist/cjs/qrvey/helpers/getDataAnswersByColumn.js +1 -4
- package/dist/cjs/qrvey/helpers/getDropdownAnswers.js +1 -1
- package/dist/cjs/qrvey/helpers/getImageAnswers.js +1 -1
- package/dist/cjs/qrvey/helpers/getImageUploadHasAnalysis.js +1 -1
- package/dist/cjs/qrvey/helpers/getLookupAnswers.js +4 -4
- package/dist/cjs/qrvey/helpers/getLookupDisplays.js +1 -1
- package/dist/cjs/qrvey/helpers/getSlidebarAnswers.js +2 -1
- package/dist/cjs/qrvey/helpers/getYesNoAnswers.js +1 -5
- package/dist/cjs/qrvey/helpers/transformValue.js +2 -1
- package/dist/cjs/services/api/Charts.api.js +3 -9
- package/dist/cjs/services/api/getAllDatasets.api.js +1 -1
- package/dist/cjs/services/api/getAllQrveys.api.js +1 -1
- package/dist/cjs/services/api/getDatasetColumns.api.js +1 -1
- package/dist/cjs/services/api/getDatasetsByIds.api.js +2 -2
- package/dist/cjs/services/api/getModel.api.js +1 -4
- package/dist/cjs/services/helpers/Request.js +16 -5
- package/dist/column_format/helpers/defineTableChartFormat.js +7 -13
- package/dist/column_format/helpers/defineXYChartFormat.js +7 -11
- package/dist/columns/constants/COLUMN_INFO.js +23 -49
- package/dist/columns/constants/COLUMN_LABEL.js +1 -29
- package/dist/columns/constants/COLUMN_PROPERTY_INFO.js +3 -8
- package/dist/columns/constants/COLUMN_PROPERTY_LABEL.js +1 -11
- package/dist/columns/helpers/getDatasetColumn.js +1 -1
- package/dist/dates/relative/RelativeStatementAdapter.js +6 -24
- package/dist/filters/adapters/FDToFlatUI.js +8 -18
- package/dist/filters/adapters/FDToLogic.js +1 -1
- package/dist/filters/adapters/FDToUI.js +12 -24
- package/dist/filters/adapters/UIToFlatUI.js +4 -14
- package/dist/filters/adapters/UIToOldLogic.js +2 -1
- package/dist/filters/adapters/adaptFilterValues.js +1 -6
- package/dist/filters/adapters/flatUIToFD.js +3 -14
- package/dist/filters/adapters/flatUIToOldLogic.js +15 -49
- package/dist/filters/adapters/flatUIToUI.js +3 -14
- package/dist/filters/adapters/logicToFlatUI.js +20 -32
- package/dist/filters/adapters/transformFilters.js +4 -19
- package/dist/filters/classes/FilterInputErrorHandler.js +0 -8
- package/dist/filters/helpers/applyHierarchyForAggFilters.js +2 -11
- package/dist/filters/helpers/backend/buildExpression.js +2 -1
- package/dist/filters/helpers/backend/buildFilters.js +2 -1
- package/dist/filters/helpers/backend/getAggFiltersBySummaryIndex.js +1 -4
- package/dist/filters/helpers/backend/getLogicByDatasets.js +5 -7
- package/dist/filters/helpers/backend/getLogicByDatasetsColumns.js +6 -8
- package/dist/filters/helpers/common/areFiltersEquals.js +3 -2
- package/dist/filters/helpers/common/excludeFiltersByParams.js +17 -22
- package/dist/filters/helpers/common/getFilterid.js +9 -8
- package/dist/filters/helpers/common/getFiltersByDatasetsColumns.js +7 -16
- package/dist/filters/helpers/common/getFiltersByParams.js +12 -18
- package/dist/filters/helpers/common/getMergeFiltersSettings.js +4 -3
- package/dist/filters/helpers/common/getMergeValuesSettings.js +2 -1
- package/dist/filters/helpers/common/getParamsToGetFilterSettings.js +10 -9
- package/dist/filters/helpers/common/mergeFilters.js +7 -30
- package/dist/filters/helpers/common/mergeValues.js +9 -6
- package/dist/filters/helpers/common/resolveFilterConditions.js +9 -8
- package/dist/filters/helpers/getAggFiltersFromFilterData.js +1 -1
- package/dist/filters/helpers/ui/getUIValues.js +14 -12
- package/dist/filters/helpers/ui/getUpdatedUIFilters.js +1 -1
- package/dist/filters/helpers/ui/resolveUIFlatFilterByParams.js +5 -4
- package/dist/filters/helpers/ui/transformFilterValues.js +3 -14
- package/dist/filters/interfaces/builder/IFilterBuilderSettings.d.ts +2 -0
- package/dist/filters/services/Filters.api.js +44 -45
- package/dist/filters/services/UChartApi.js +246 -257
- package/dist/filters/services/UChartPaginationApi.js +289 -301
- package/dist/format/duration/durationFormatter.js +7 -12
- package/dist/format/format.js +8 -7
- package/dist/format/localization.d.ts +2 -1
- package/dist/format/localization.js +7 -6
- package/dist/general/array/addPropertyToArrayOfObjects.js +1 -1
- package/dist/general/object/getAttribute.js +2 -6
- package/dist/general/object/mergeDeep.js +3 -2
- package/dist/globalization/labels/chart_builder/I18N_CHART_BUILDER.js +6 -21
- package/dist/globalization/service/i18nextBuilder.js +31 -19
- package/dist/globalization/service/initI18n.js +13 -2
- package/dist/qrvey/helpers/getCategorizableExpression.js +2 -1
- package/dist/qrvey/helpers/getDataAnswersByColumn.js +1 -4
- package/dist/qrvey/helpers/getDropdownAnswers.js +1 -1
- package/dist/qrvey/helpers/getImageAnswers.js +1 -1
- package/dist/qrvey/helpers/getImageUploadHasAnalysis.js +1 -1
- package/dist/qrvey/helpers/getLookupAnswers.js +4 -4
- package/dist/qrvey/helpers/getLookupDisplays.js +1 -1
- package/dist/qrvey/helpers/getSlidebarAnswers.js +2 -1
- package/dist/qrvey/helpers/getYesNoAnswers.js +1 -5
- package/dist/qrvey/helpers/transformValue.js +2 -1
- package/dist/services/api/Charts.api.js +3 -9
- package/dist/services/api/getAllDatasets.api.js +1 -1
- package/dist/services/api/getAllQrveys.api.js +1 -1
- package/dist/services/api/getDatasetColumns.api.js +1 -1
- package/dist/services/api/getDatasetsByIds.api.js +2 -2
- package/dist/services/api/getModel.api.js +1 -4
- package/dist/services/helpers/Request.js +16 -5
- package/package.json +3 -3
package/dist/format/format.js
CHANGED
|
@@ -24,7 +24,7 @@ export function formatDate(dateString, format) {
|
|
|
24
24
|
return dateString;
|
|
25
25
|
if (!isValidDateString(dateString))
|
|
26
26
|
return dateString;
|
|
27
|
-
const dateValue = dateString
|
|
27
|
+
const dateValue = dateString === null || dateString === void 0 ? void 0 : dateString.replace(/Z$/i, "");
|
|
28
28
|
return dayjs(dateValue.split(".")[0]).format(format
|
|
29
29
|
.replace("HH24:", "HH:")
|
|
30
30
|
.replace("MI:SS", "mm:ss")
|
|
@@ -91,20 +91,21 @@ export function formatFileSize(bytes) {
|
|
|
91
91
|
: `${Math.round(megaBytes)} MB`;
|
|
92
92
|
}
|
|
93
93
|
export const addFormat = (value, outputFormat = "None", config) => {
|
|
94
|
+
var _a, _b;
|
|
94
95
|
if (isEmpty(value) || (typeof value === "object" && isEmpty(value[0])))
|
|
95
96
|
return value;
|
|
96
97
|
switch (outputFormat.type) {
|
|
97
98
|
case "DATE":
|
|
98
99
|
case "DATETIME":
|
|
99
|
-
return config
|
|
100
|
+
return (config === null || config === void 0 ? void 0 : config.lang) && outputFormat.format === "Default"
|
|
100
101
|
? formatWithLocale(value, outputFormat, config)
|
|
101
|
-
: formatDate(value, outputFormat
|
|
102
|
-
outputFormat
|
|
103
|
-
? outputFormat
|
|
104
|
-
: outputFormat
|
|
102
|
+
: formatDate(value, (outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.format) === "Default" &&
|
|
103
|
+
((_a = outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.originalFormat) === null || _a === void 0 ? void 0 : _a.format)
|
|
104
|
+
? (_b = outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.originalFormat) === null || _b === void 0 ? void 0 : _b.format
|
|
105
|
+
: outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.format);
|
|
105
106
|
case "NUMERIC": {
|
|
106
107
|
const parse = parseFloat(value);
|
|
107
|
-
const withLocale = outputFormat !== "None" && config
|
|
108
|
+
const withLocale = outputFormat !== "None" && (config === null || config === void 0 ? void 0 : config.lang);
|
|
108
109
|
return isNaN(parse)
|
|
109
110
|
? value
|
|
110
111
|
: withLocale
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { IFormatConfig
|
|
1
|
+
import { IFormatConfig } from "../interfaces/format/IFormatConfig.Interface";
|
|
2
|
+
import { IFormatOutputFormat } from "../interfaces/format/IFormatOutputFormat.Interface";
|
|
2
3
|
export declare const getLang: (locale: string | Record<string, any>) => Record<string, any>;
|
|
3
4
|
export declare const chooseLang: (config: Record<string, any>) => string;
|
|
4
5
|
export declare const formatWithLocale: (value: any, outputFormat: IFormatOutputFormat, config?: IFormatConfig) => any;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { DATETIME_COLUMN_FORMAT } from "
|
|
1
|
+
import { DATETIME_COLUMN_FORMAT } from "../dates/constants/DATETIME_COLUMN_FORMAT";
|
|
2
2
|
import { isEmpty } from "../general/mix/isEmpty";
|
|
3
3
|
import { currencyISO, LANG_DEFAULT, CURRENCY_DEFAULT, DATETIME_OPTIONS, } from "./definition";
|
|
4
4
|
export const getLang = (locale) => {
|
|
@@ -10,8 +10,9 @@ export const getLang = (locale) => {
|
|
|
10
10
|
return { lang: locale === "browser" ? window.navigator.language : locale };
|
|
11
11
|
};
|
|
12
12
|
export const chooseLang = (config) => {
|
|
13
|
-
|
|
14
|
-
|
|
13
|
+
var _a;
|
|
14
|
+
const lang = ((_a = config === null || config === void 0 ? void 0 : config.i18n) === null || _a === void 0 ? void 0 : _a.lang) || config.lang;
|
|
15
|
+
return (lang === null || lang === void 0 ? void 0 : lang.lang) || lang || LANG_DEFAULT;
|
|
15
16
|
};
|
|
16
17
|
export const formatWithLocale = (value, outputFormat, config = {}) => {
|
|
17
18
|
switch (outputFormat.type) {
|
|
@@ -25,10 +26,10 @@ export const formatWithLocale = (value, outputFormat, config = {}) => {
|
|
|
25
26
|
const DATE_FORMAT_CACHE = [];
|
|
26
27
|
function formatLocaleDate(value, outputFormat, config) {
|
|
27
28
|
const { lang = LANG_DEFAULT, options } = config;
|
|
28
|
-
const dateValue = value
|
|
29
|
+
const dateValue = value === null || value === void 0 ? void 0 : value.replace(/Z$/i, "");
|
|
29
30
|
const dateParam = new Date(dateValue);
|
|
30
31
|
let langOpts = options;
|
|
31
|
-
if (outputFormat
|
|
32
|
+
if (outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.originalFormat) {
|
|
32
33
|
const { format } = outputFormat.originalFormat;
|
|
33
34
|
if (DATETIME_COLUMN_FORMAT.includes(format))
|
|
34
35
|
langOpts = DATETIME_OPTIONS;
|
|
@@ -52,7 +53,7 @@ const NUMBER_FORMAT_CACHE = [];
|
|
|
52
53
|
function formatLocaleNumber(value, outputFormat, config) {
|
|
53
54
|
const { lang = LANG_DEFAULT, options } = config;
|
|
54
55
|
const langOpts = options || getLocaleOptions(outputFormat);
|
|
55
|
-
const valueToFormat = outputFormat
|
|
56
|
+
const valueToFormat = (outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.format) === "Percentage" /* LOCALE_FORMATS.PERCENTAGE */ ? value / 100 : value;
|
|
56
57
|
try {
|
|
57
58
|
const key = lang + JSON.stringify(langOpts);
|
|
58
59
|
let formatter = NUMBER_FORMAT_CACHE[key];
|
|
@@ -22,7 +22,7 @@ export function addPropertyToArrayOfObjects(obj) {
|
|
|
22
22
|
if (Array.isArray(array)) {
|
|
23
23
|
if (isEmpty(array) || isEmpty(property))
|
|
24
24
|
return array;
|
|
25
|
-
return array.map((element) => ({
|
|
25
|
+
return array.map((element) => (Object.assign(Object.assign({}, element), { [property]: value })));
|
|
26
26
|
}
|
|
27
27
|
return [];
|
|
28
28
|
}
|
|
@@ -17,6 +17,7 @@ import { isEmpty } from "../mix/isEmpty";
|
|
|
17
17
|
* getAttribute(obj, 'snake_case') //it search for: obj.snake_case || obj.snakeCase || obj.SnakeCase || obj.snakecase || obj.SNAKECASE
|
|
18
18
|
*/
|
|
19
19
|
export function getAttribute(obj, key) {
|
|
20
|
+
var _a, _b, _c, _d, _e;
|
|
20
21
|
if (!isValid(obj, key))
|
|
21
22
|
return;
|
|
22
23
|
const snake = getSnakeCase(key);
|
|
@@ -24,12 +25,7 @@ export function getAttribute(obj, key) {
|
|
|
24
25
|
const pascal = getPascalCase(camel);
|
|
25
26
|
const lower = getLowerCase(pascal);
|
|
26
27
|
const upper = getUpperCase(lower);
|
|
27
|
-
return (obj[key]
|
|
28
|
-
obj[snake] ??
|
|
29
|
-
obj[camel] ??
|
|
30
|
-
obj[pascal] ??
|
|
31
|
-
obj[lower] ??
|
|
32
|
-
obj[upper]);
|
|
28
|
+
return ((_e = (_d = (_c = (_b = (_a = obj[key]) !== null && _a !== void 0 ? _a : obj[snake]) !== null && _b !== void 0 ? _b : obj[camel]) !== null && _c !== void 0 ? _c : obj[pascal]) !== null && _d !== void 0 ? _d : obj[lower]) !== null && _e !== void 0 ? _e : obj[upper]);
|
|
33
29
|
}
|
|
34
30
|
function getSnakeCase(key) {
|
|
35
31
|
return key.replace(/[A-Z]/g, (a, i) => i == 0 ? a.toLowerCase() : "_" + a.toLowerCase());
|
|
@@ -45,8 +45,9 @@ function isValid(obj1, obj2) {
|
|
|
45
45
|
* @returns a new settings object with all set parameters.
|
|
46
46
|
*/
|
|
47
47
|
function getParamsToMergeDeep(settings) {
|
|
48
|
+
var _a, _b;
|
|
48
49
|
return {
|
|
49
|
-
mergeExistingValues: settings
|
|
50
|
-
mergeMissingProperties: settings
|
|
50
|
+
mergeExistingValues: (_a = settings === null || settings === void 0 ? void 0 : settings.mergeExistingValues) !== null && _a !== void 0 ? _a : true,
|
|
51
|
+
mergeMissingProperties: (_b = settings === null || settings === void 0 ? void 0 : settings.mergeMissingProperties) !== null && _b !== void 0 ? _b : true,
|
|
51
52
|
};
|
|
52
53
|
}
|
|
@@ -7,8 +7,7 @@ import { I18N_CHART_BUILDER_OPERATORS } from "./I18N_CHART_BUILDER_OPERATORS";
|
|
|
7
7
|
import { I18N_CHART_BUILDER_STYLE_OPTIONS } from "./I18N_CHART_BUILDER_STYLE_OPTIONS";
|
|
8
8
|
import { I18N_CHART_BUILDER_THRESHOLD } from "./I18N_CHART_BUILDER_THRESHOLD";
|
|
9
9
|
import { I18N_CHART_BUILDER_TIME_PERIOD } from "./I18N_CHART_BUILDER_TIME_PERIOD";
|
|
10
|
-
export const I18N_CHART_BUILDER = {
|
|
11
|
-
format_values: {
|
|
10
|
+
export const I18N_CHART_BUILDER = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ format_values: {
|
|
12
11
|
title: "Values Format",
|
|
13
12
|
decimal_places: "Decimal places",
|
|
14
13
|
default: "Default",
|
|
@@ -24,8 +23,7 @@ export const I18N_CHART_BUILDER = {
|
|
|
24
23
|
custom: "Custom Format",
|
|
25
24
|
date_format: "Date Format",
|
|
26
25
|
value_format: "Value Format",
|
|
27
|
-
},
|
|
28
|
-
chart_names: {
|
|
26
|
+
}, chart_names: {
|
|
29
27
|
bar: "Bar",
|
|
30
28
|
line: "Line",
|
|
31
29
|
symbol: "Symbol",
|
|
@@ -48,24 +46,11 @@ export const I18N_CHART_BUILDER = {
|
|
|
48
46
|
choropleth_map: "Choropleth Map",
|
|
49
47
|
boxwhisker: "Box and Whisker",
|
|
50
48
|
wordcloud: "Word Cloud",
|
|
51
|
-
},
|
|
52
|
-
filters_options: {
|
|
49
|
+
}, filters_options: {
|
|
53
50
|
add: "Add Filters",
|
|
54
|
-
},
|
|
55
|
-
word_cloud: {
|
|
51
|
+
}, word_cloud: {
|
|
56
52
|
value: "Value",
|
|
57
|
-
},
|
|
58
|
-
box_whisker: {
|
|
53
|
+
}, box_whisker: {
|
|
59
54
|
largest: "Largest",
|
|
60
55
|
smallest: "Smallest",
|
|
61
|
-
},
|
|
62
|
-
...I18N_CHART_BUILDER_GENERAL,
|
|
63
|
-
...I18N_CHART_BUILDER_GENERAL_OPTIONS,
|
|
64
|
-
...I18N_CHART_BUILDER_STYLE_OPTIONS,
|
|
65
|
-
...I18N_CHART_BUILDER_LAYER_OPTIONS,
|
|
66
|
-
...I18N_CHART_BUILDER_FORMAT_OPTIONS,
|
|
67
|
-
...I18N_CHART_BUILDER_OPERATORS,
|
|
68
|
-
...I18N_CHART_BUILDER_COMPARISION_OPTIONS,
|
|
69
|
-
...I18N_CHART_BUILDER_THRESHOLD,
|
|
70
|
-
...I18N_CHART_BUILDER_TIME_PERIOD,
|
|
71
|
-
};
|
|
56
|
+
} }, I18N_CHART_BUILDER_GENERAL), I18N_CHART_BUILDER_GENERAL_OPTIONS), I18N_CHART_BUILDER_STYLE_OPTIONS), I18N_CHART_BUILDER_LAYER_OPTIONS), I18N_CHART_BUILDER_FORMAT_OPTIONS), I18N_CHART_BUILDER_OPERATORS), I18N_CHART_BUILDER_COMPARISION_OPTIONS), I18N_CHART_BUILDER_THRESHOLD), I18N_CHART_BUILDER_TIME_PERIOD);
|
|
@@ -1,26 +1,39 @@
|
|
|
1
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
+
});
|
|
9
|
+
};
|
|
1
10
|
import i18next from "i18next";
|
|
2
11
|
import { mergeDeep } from "../../general/object/mergeDeep";
|
|
3
12
|
export class I18nServiceBuilder {
|
|
4
|
-
static
|
|
5
|
-
return
|
|
13
|
+
static buildI18n(i18nDefault, i18nResource) {
|
|
14
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
15
|
+
return yield this._initI18n(i18nDefault, i18nResource);
|
|
16
|
+
});
|
|
6
17
|
}
|
|
7
|
-
static
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
18
|
+
static _initI18n(i18nDefault, i18nResource) {
|
|
19
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
20
|
+
if (!i18next.isInitialized) {
|
|
21
|
+
yield i18next.init({
|
|
22
|
+
lng: "en",
|
|
23
|
+
debug: false,
|
|
24
|
+
nsSeparator: false,
|
|
25
|
+
keySeparator: ".",
|
|
26
|
+
fallbackLng: false,
|
|
27
|
+
defaultNS: "translation",
|
|
28
|
+
resources: {
|
|
29
|
+
en: {
|
|
30
|
+
translation: this.setTranslations(i18nDefault, i18nResource),
|
|
31
|
+
},
|
|
19
32
|
},
|
|
20
|
-
}
|
|
21
|
-
}
|
|
22
|
-
|
|
23
|
-
|
|
33
|
+
});
|
|
34
|
+
}
|
|
35
|
+
return new I18nServiceConcrete(i18next);
|
|
36
|
+
});
|
|
24
37
|
}
|
|
25
38
|
static setTranslations(i18nDefault, i18nResource) {
|
|
26
39
|
return mergeDeep(i18nResource, i18nDefault, { mergeExistingValues: false });
|
|
@@ -32,7 +45,6 @@ export class I18nServiceBuilder {
|
|
|
32
45
|
export class I18nService {
|
|
33
46
|
}
|
|
34
47
|
class I18nServiceConcrete extends I18nService {
|
|
35
|
-
_i18next;
|
|
36
48
|
constructor(i18nInstance) {
|
|
37
49
|
super();
|
|
38
50
|
this._i18next = i18nInstance;
|
|
@@ -1,4 +1,15 @@
|
|
|
1
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
+
});
|
|
9
|
+
};
|
|
1
10
|
import { I18nServiceBuilder } from "../service/i18nextBuilder";
|
|
2
|
-
export
|
|
3
|
-
return
|
|
11
|
+
export function initI18n(i18nConfig = {}, i18nDefault = {}) {
|
|
12
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
13
|
+
return yield I18nServiceBuilder.buildI18n(i18nDefault, i18nConfig);
|
|
14
|
+
});
|
|
4
15
|
}
|
|
@@ -9,9 +9,10 @@ import { _hasProperty } from "../../general/object/hasProperty";
|
|
|
9
9
|
* @returns true if expression column is categorizable; otherwise not. If does not exist, undefined is sent.
|
|
10
10
|
*/
|
|
11
11
|
export function getCategorizableExpression(column, dataset) {
|
|
12
|
+
var _a;
|
|
12
13
|
if (_hasProperty(column, "expressionCategory")) {
|
|
13
14
|
return column.expressionCategory;
|
|
14
15
|
}
|
|
15
16
|
const datasetColumn = getDatasetColumn(column, dataset);
|
|
16
|
-
return datasetColumn
|
|
17
|
+
return (_a = datasetColumn === null || datasetColumn === void 0 ? void 0 : datasetColumn.expressionCategory) !== null && _a !== void 0 ? _a : false;
|
|
17
18
|
}
|
|
@@ -40,10 +40,7 @@ export function getDataAnswersByColumn(settings) {
|
|
|
40
40
|
case COLUMN.YES_NO:
|
|
41
41
|
return getYesNoAnswers(column);
|
|
42
42
|
default:
|
|
43
|
-
return (column.answers || []).map((answer) => ({
|
|
44
|
-
...answer,
|
|
45
|
-
answerid: answer.answerid,
|
|
46
|
-
}));
|
|
43
|
+
return (column.answers || []).map((answer) => (Object.assign(Object.assign({}, answer), { answerid: answer.answerid })));
|
|
47
44
|
}
|
|
48
45
|
}
|
|
49
46
|
return [];
|
|
@@ -5,6 +5,6 @@
|
|
|
5
5
|
* @returns Formatted answers inside of an answer property.
|
|
6
6
|
*/
|
|
7
7
|
export function getDropdownAnswers(column) {
|
|
8
|
-
const answers = column
|
|
8
|
+
const answers = (column === null || column === void 0 ? void 0 : column.answers) || [];
|
|
9
9
|
return answers.map((answer) => ({ answer }));
|
|
10
10
|
}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* @returns Formatted answers inside of an answer property.
|
|
5
5
|
*/
|
|
6
6
|
export function getImageAnswers(column) {
|
|
7
|
-
const answers = column
|
|
7
|
+
const answers = (column === null || column === void 0 ? void 0 : column.answers) || [];
|
|
8
8
|
return answers.map((answer) => ({
|
|
9
9
|
answer: answer.answer || "",
|
|
10
10
|
answerid: answer.answerid,
|
|
@@ -14,7 +14,7 @@ export function getImageUploadHasAnalysis(column, dataset) {
|
|
|
14
14
|
imageUploadOption = column.imageUploadOption;
|
|
15
15
|
}
|
|
16
16
|
const datasetColumn = getDatasetColumn(column, dataset);
|
|
17
|
-
imageUploadOption = datasetColumn
|
|
17
|
+
imageUploadOption = datasetColumn === null || datasetColumn === void 0 ? void 0 : datasetColumn.imageUploadOption;
|
|
18
18
|
return (imageUploadOption === COLUMN_IMAGE_UPLOAD_OPTION.OBJECT ||
|
|
19
19
|
imageUploadOption === COLUMN_IMAGE_UPLOAD_OPTION.TEXT);
|
|
20
20
|
}
|
|
@@ -2,14 +2,14 @@ import { COLUMN_PROPERTY } from "../../columns/constants/COLUMN_PROPERTY";
|
|
|
2
2
|
export function getLookupAnswers(column, property, display) {
|
|
3
3
|
if (property === COLUMN_PROPERTY.LOOKUP_VALUE) {
|
|
4
4
|
const valueItem = column.lookupValue || column.answers[0];
|
|
5
|
-
return (valueItem
|
|
6
|
-
valueItem
|
|
7
|
-
[]).map((_value) => ({
|
|
5
|
+
return ((valueItem === null || valueItem === void 0 ? void 0 : valueItem.valueInfo) ||
|
|
6
|
+
(valueItem === null || valueItem === void 0 ? void 0 : valueItem.answer) ||
|
|
7
|
+
[]).map((_value) => (Object.assign(Object.assign({}, _value), { answerid: valueItem.answerid })));
|
|
8
8
|
}
|
|
9
9
|
else {
|
|
10
10
|
const answerItem = column.answers[display];
|
|
11
11
|
return answerItem
|
|
12
|
-
? answerItem.answer.map((_answer) => ({
|
|
12
|
+
? answerItem.answer.map((_answer) => (Object.assign(Object.assign({}, _answer), { answerid: answerItem.answerid })))
|
|
13
13
|
: [];
|
|
14
14
|
}
|
|
15
15
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { getDatasetColumn } from "../../columns/helpers/getDatasetColumn";
|
|
2
2
|
export function getLookupDisplays(column, dataset) {
|
|
3
3
|
const datasetColumn = getDatasetColumn(column, dataset);
|
|
4
|
-
return (datasetColumn
|
|
4
|
+
return ((datasetColumn === null || datasetColumn === void 0 ? void 0 : datasetColumn.answers) || []).map((answer) => ({
|
|
5
5
|
answer: answer.dataSelectedDisplay.text,
|
|
6
6
|
answerid: answer.answerid,
|
|
7
7
|
}));
|
|
@@ -4,8 +4,9 @@
|
|
|
4
4
|
* @returns Formatted answers inside of an answer property
|
|
5
5
|
*/
|
|
6
6
|
export function getSlidebarAnswers(column) {
|
|
7
|
+
var _a;
|
|
7
8
|
const answers = [];
|
|
8
|
-
const steps = column
|
|
9
|
+
const steps = (_a = column === null || column === void 0 ? void 0 : column.slidebarValue) !== null && _a !== void 0 ? _a : 0;
|
|
9
10
|
for (let i = 0; i < steps; i++) {
|
|
10
11
|
answers.push({ answer: String(i + 1) });
|
|
11
12
|
}
|
|
@@ -5,9 +5,5 @@
|
|
|
5
5
|
* @returns Formatted answers inside of an answer property
|
|
6
6
|
*/
|
|
7
7
|
export function getYesNoAnswers(column) {
|
|
8
|
-
return (column
|
|
9
|
-
...answer,
|
|
10
|
-
answer: String(answer.answer).toLowerCase(),
|
|
11
|
-
answerid: answer.answerid,
|
|
12
|
-
}));
|
|
8
|
+
return ((column === null || column === void 0 ? void 0 : column.answers) || []).map((answer) => (Object.assign(Object.assign({}, answer), { answer: String(answer.answer).toLowerCase(), answerid: answer.answerid })));
|
|
13
9
|
}
|
|
@@ -3,11 +3,9 @@ import { CHART_ENDPOINT } from "../constants/CHART_ENDPOINT";
|
|
|
3
3
|
import { UCHART_ENDPOINT } from "../constants/UCHART_ENDPOINT";
|
|
4
4
|
import { UCHART_PAGINATION_ENDPOINT } from "../constants/UCHART_PAGINATION_ENDPOINT";
|
|
5
5
|
export default class ChartsApi {
|
|
6
|
-
config;
|
|
7
|
-
abortCtrl;
|
|
8
6
|
constructor(config) {
|
|
9
7
|
this.config = config;
|
|
10
|
-
this.config = {
|
|
8
|
+
this.config = Object.assign(Object.assign({}, config), { endpoint: CHART_ENDPOINT });
|
|
11
9
|
}
|
|
12
10
|
createSignal() {
|
|
13
11
|
this.abortCtrl && this.abortCtrl.abort();
|
|
@@ -20,11 +18,7 @@ export default class ChartsApi {
|
|
|
20
18
|
data.logic = data.filters;
|
|
21
19
|
delete data.filters;
|
|
22
20
|
}
|
|
23
|
-
return Request.post({
|
|
24
|
-
...this.config,
|
|
25
|
-
endpoint: newEndpoint ? UCHART_ENDPOINT : CHART_ENDPOINT,
|
|
26
|
-
signal,
|
|
27
|
-
}, "/results", data);
|
|
21
|
+
return Request.post(Object.assign(Object.assign({}, this.config), { endpoint: newEndpoint ? UCHART_ENDPOINT : CHART_ENDPOINT, signal }), "/results", data);
|
|
28
22
|
}
|
|
29
23
|
getResultsPagination(data, ignoreSignal = false) {
|
|
30
24
|
const signal = ignoreSignal ? undefined : this.createSignal();
|
|
@@ -32,6 +26,6 @@ export default class ChartsApi {
|
|
|
32
26
|
data.logic = data.filters;
|
|
33
27
|
delete data.filters;
|
|
34
28
|
}
|
|
35
|
-
return Request.post({
|
|
29
|
+
return Request.post(Object.assign(Object.assign({}, this.config), { endpoint: UCHART_PAGINATION_ENDPOINT, signal }), "", data);
|
|
36
30
|
}
|
|
37
31
|
}
|
|
@@ -20,7 +20,7 @@ export function getAllDatasets(config, qrveyids) {
|
|
|
20
20
|
return getDatasetsByIds(config, qrveyids);
|
|
21
21
|
}
|
|
22
22
|
else {
|
|
23
|
-
return getAllQrveys({
|
|
23
|
+
return getAllQrveys(Object.assign({}, config), { status: ["RUNNING", "FINISHED", "PAUSED"], loadAll: true })
|
|
24
24
|
.then((qrveys) => {
|
|
25
25
|
const datasets = qrveys.Items.filter((item) => !["NPS", "CHECKLIST"].includes(item.appType.toUpperCase()));
|
|
26
26
|
return getDatasetsByIds(config, getArrayByProperty(datasets, "qrveyid"));
|
|
@@ -6,5 +6,5 @@ import Request from "../helpers/Request";
|
|
|
6
6
|
* @param params Object for getting precise data
|
|
7
7
|
*/
|
|
8
8
|
export function getAllQrveys(config, params) {
|
|
9
|
-
return Request.post({
|
|
9
|
+
return Request.post(Object.assign(Object.assign({}, config), { endpoint: QRVEY_ENDPOINT }), "/all", params);
|
|
10
10
|
}
|
|
@@ -10,7 +10,7 @@ import { chooseLang } from "../../format/localization";
|
|
|
10
10
|
*/
|
|
11
11
|
export function getDatasetColumns(config, qrveyid) {
|
|
12
12
|
const lang = chooseLang(config);
|
|
13
|
-
return Request.post({
|
|
13
|
+
return Request.post(Object.assign(Object.assign({}, config), { qrveyid, endpoint: CHART_ENDPOINT }), "/question/list", {
|
|
14
14
|
optionsAttributes: getDefaultQuestionListOptionsAttributes(),
|
|
15
15
|
extend: true,
|
|
16
16
|
}, { lang })
|
|
@@ -12,11 +12,11 @@ import { QUESTION_LIST_BULK_ENDPOINT } from "../constants/QUESTION_LIST_BULK_END
|
|
|
12
12
|
export function getDatasetsByIds(config, qrveyids = []) {
|
|
13
13
|
if (Array.isArray(qrveyids) && !isEmpty(qrveyids)) {
|
|
14
14
|
const lang = chooseLang(config);
|
|
15
|
-
return Request.post({
|
|
15
|
+
return Request.post(Object.assign(Object.assign({}, config), { endpoint: QUESTION_LIST_BULK_ENDPOINT }), "", {
|
|
16
16
|
optionsAttributes: getDefaultQuestionListOptionsAttributes(),
|
|
17
17
|
qrveyids,
|
|
18
18
|
}, { lang })
|
|
19
|
-
.then((response) => BDatasetsToUIDatasets(response
|
|
19
|
+
.then((response) => BDatasetsToUIDatasets((response === null || response === void 0 ? void 0 : response.data) || []))
|
|
20
20
|
.catch((_e) => []);
|
|
21
21
|
}
|
|
22
22
|
return Promise.resolve([]);
|
|
@@ -5,8 +5,5 @@ import { BModelToUIModel } from "../adapters/BModelToUIModel.adapter";
|
|
|
5
5
|
export function getModel(config, params) {
|
|
6
6
|
const lang = chooseLang(config);
|
|
7
7
|
const data = { lang, logic: config.logic || [] };
|
|
8
|
-
return Request.post({
|
|
9
|
-
...params,
|
|
10
|
-
lang,
|
|
11
|
-
}).then(BModelToUIModel);
|
|
8
|
+
return Request.post(Object.assign(Object.assign({}, config), { endpoint: ANALYTIQ_ENDPOINT }), "", data, Object.assign(Object.assign({}, params), { lang })).then(BModelToUIModel);
|
|
12
9
|
}
|
|
@@ -1,11 +1,22 @@
|
|
|
1
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
+
});
|
|
9
|
+
};
|
|
1
10
|
import { getAttribute } from "../../general/object/getAttribute";
|
|
2
11
|
import { serialize } from "../../general/object/serialize";
|
|
3
12
|
import { parseUrl } from "../../general/string/parseUrl";
|
|
4
13
|
export default class Request {
|
|
5
|
-
static
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
14
|
+
static checkStatus(response) {
|
|
15
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
16
|
+
if (!response.ok)
|
|
17
|
+
throw yield response.json();
|
|
18
|
+
return response;
|
|
19
|
+
});
|
|
9
20
|
}
|
|
10
21
|
static hasQvToken(config) {
|
|
11
22
|
return !!this.getQvToken(config);
|
|
@@ -36,7 +47,6 @@ export default class Request {
|
|
|
36
47
|
}
|
|
37
48
|
return this.parseUrl(url, config);
|
|
38
49
|
}
|
|
39
|
-
static parseUrl = (url, config) => parseUrl(url, (key) => getAttribute(config, key));
|
|
40
50
|
static requestConfig(reqData) {
|
|
41
51
|
const cfg = {
|
|
42
52
|
method: reqData.type,
|
|
@@ -84,3 +94,4 @@ export default class Request {
|
|
|
84
94
|
return this.resolveRequest({ config, url, type: "POST", data, params });
|
|
85
95
|
}
|
|
86
96
|
}
|
|
97
|
+
Request.parseUrl = (url, config) => parseUrl(url, (key) => getAttribute(config, key));
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@qrvey/utils",
|
|
3
|
-
"version": "1.4.0-
|
|
3
|
+
"version": "1.4.0-2",
|
|
4
4
|
"description": "Helper, Utils for all Qrvey Projects",
|
|
5
5
|
"homepage": "https://bitbucket.org/qrvey/qrvey_utils/wiki/Home",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
"lint": "eslint src --quiet --exit-on-fatal-error --ext .ts,.js",
|
|
13
13
|
"lint-dev": "eslint src --debug --ext .ts,.tsx",
|
|
14
14
|
"prepare": "husky install",
|
|
15
|
-
"precommit": "prettier --write . && git
|
|
15
|
+
"precommit": "prettier --write . && git update-index --again && npm run build && npm run lint",
|
|
16
16
|
"publishing-old": "node ./scripts/prepare-publish && np",
|
|
17
17
|
"publishing-prerelease-old": "node ./scripts/prepare-publish && np --any-branch --tag=$npm_config_tag",
|
|
18
18
|
"publishing-beta-1": "node ./scripts/publishing --np-new-version=$npm_config_np_new_version --np-any-branch=$npm_config_np_any_branch --np-tag=$npm_config_np_tag",
|
|
@@ -34,7 +34,7 @@
|
|
|
34
34
|
"np": "7.6.1",
|
|
35
35
|
"prettier": "2.6.2",
|
|
36
36
|
"ts-jest": "28.0.3",
|
|
37
|
-
"typescript": "4.7.
|
|
37
|
+
"typescript": "4.7.3"
|
|
38
38
|
},
|
|
39
39
|
"dependencies": {
|
|
40
40
|
"d3": "6.3.1",
|