@qrvey/utils 1.4.4 → 1.5.0-1

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.
Files changed (118) hide show
  1. package/README.md +1 -1
  2. package/dist/cjs/column_format/constants/DURATION_PARTS_LIST.d.ts +1 -0
  3. package/dist/cjs/column_format/constants/DURATION_PARTS_LIST.js +12 -0
  4. package/dist/cjs/column_format/constants/index.d.ts +1 -0
  5. package/dist/cjs/column_format/constants/index.js +1 -0
  6. package/dist/cjs/column_format/helpers/defineXYChartFormat.js +4 -1
  7. package/dist/cjs/columns/interfaces/IColumn.d.ts +0 -1
  8. package/dist/cjs/filters/adapters/FDToFlatUI.js +2 -7
  9. package/dist/cjs/filters/adapters/FDToUI.js +2 -5
  10. package/dist/cjs/filters/adapters/UIToFD.js +0 -1
  11. package/dist/cjs/filters/adapters/UIToFlatUI.js +2 -7
  12. package/dist/cjs/filters/adapters/UIToOldLogic.js +0 -3
  13. package/dist/cjs/filters/adapters/flatUIToFD.js +0 -1
  14. package/dist/cjs/filters/adapters/flatUIToOldLogic.js +0 -2
  15. package/dist/cjs/filters/adapters/flatUIToUI.js +0 -4
  16. package/dist/cjs/filters/adapters/logicToFlatUI.js +10 -14
  17. package/dist/cjs/filters/adapters/transformFilters.js +0 -4
  18. package/dist/cjs/filters/constants/common/FILTER_TOKENS_STRUCTURE_TYPE.d.ts +8 -0
  19. package/dist/cjs/filters/constants/common/FILTER_TOKENS_STRUCTURE_TYPE.js +12 -0
  20. package/dist/cjs/filters/constants/common/index.d.ts +1 -0
  21. package/dist/cjs/filters/constants/common/index.js +1 -0
  22. package/dist/cjs/filters/helpers/OLD_getAggFilters.js +0 -1
  23. package/dist/cjs/filters/helpers/common/excludeFiltersByParams.js +3 -4
  24. package/dist/cjs/filters/helpers/common/mergeFilters.js +0 -1
  25. package/dist/cjs/filters/helpers/common/resolveDatasetConditions.js +0 -4
  26. package/dist/cjs/filters/helpers/common/resolveFilterConditions.js +3 -5
  27. package/dist/cjs/filters/helpers/filtersTokensToString.d.ts +7 -0
  28. package/dist/cjs/filters/helpers/filtersTokensToString.js +20 -0
  29. package/dist/cjs/filters/helpers/getTokensFromFilters.d.ts +10 -0
  30. package/dist/cjs/filters/helpers/getTokensFromFilters.js +111 -0
  31. package/dist/cjs/filters/helpers/getVerboseFilter.d.ts +9 -0
  32. package/dist/cjs/filters/helpers/getVerboseFilter.js +16 -0
  33. package/dist/cjs/filters/helpers/index.d.ts +3 -0
  34. package/dist/cjs/filters/helpers/index.js +3 -0
  35. package/dist/cjs/filters/helpers/ui/getUpdatedUIFilters.js +2 -3
  36. package/dist/cjs/filters/helpers/ui/resolveUIFlatFilterByParams.js +2 -3
  37. package/dist/cjs/filters/interfaces/IFFilterTokens.d.ts +5 -0
  38. package/dist/cjs/filters/interfaces/IFFilterTokens.js +2 -0
  39. package/dist/cjs/filters/interfaces/IFTokensFromFiltersSettings.d.ts +7 -0
  40. package/dist/cjs/filters/interfaces/IFTokensFromFiltersSettings.js +2 -0
  41. package/dist/cjs/filters/interfaces/OLD_IFilterExpression.d.ts +0 -1
  42. package/dist/cjs/filters/interfaces/common/IFSDataset.d.ts +0 -1
  43. package/dist/cjs/filters/interfaces/common/IFSParamsToGetFilter.d.ts +0 -1
  44. package/dist/cjs/filters/interfaces/index.d.ts +2 -0
  45. package/dist/cjs/filters/interfaces/index.js +2 -0
  46. package/dist/cjs/filters/services/UChartApi.js +1 -2
  47. package/dist/cjs/filters/services/UChartPaginationApi.js +1 -1
  48. package/dist/cjs/format/definition.d.ts +2 -1
  49. package/dist/cjs/format/format.js +4 -1
  50. package/dist/cjs/format/localization.js +18 -2
  51. package/dist/cjs/globalization/interfaces/chart_builder/II18nChartBuilderTableStyleOptions.d.ts +4 -0
  52. package/dist/cjs/globalization/labels/chart_builder/I18N_CHART_BUILDER_COMPARISION_OPTIONS.js +1 -1
  53. package/dist/cjs/globalization/labels/chart_builder/I18N_CHART_BUILDER_STYLE_OPTIONS.js +5 -1
  54. package/dist/cjs/globalization/service/i18nextBuilder.d.ts +7 -0
  55. package/dist/cjs/globalization/service/i18nextBuilder.js +25 -14
  56. package/dist/cjs/interfaces/format/IFormatOutputFormat.Interface.d.ts +1 -0
  57. package/dist/cjs/services/adapters/BColumnsToUIColumns.adapter.js +0 -2
  58. package/dist/cjs/services/adapters/BDatasetsToUIDatasets.adapter.js +0 -1
  59. package/dist/cjs/services/helpers/getDefaultQuestionListOptionsAttributes.js +0 -2
  60. package/dist/column_format/constants/DURATION_PARTS_LIST.d.ts +1 -0
  61. package/dist/column_format/constants/DURATION_PARTS_LIST.js +9 -0
  62. package/dist/column_format/constants/index.d.ts +1 -0
  63. package/dist/column_format/constants/index.js +1 -0
  64. package/dist/column_format/helpers/defineXYChartFormat.js +4 -1
  65. package/dist/columns/interfaces/IColumn.d.ts +0 -1
  66. package/dist/filters/adapters/FDToFlatUI.js +2 -7
  67. package/dist/filters/adapters/FDToUI.js +2 -5
  68. package/dist/filters/adapters/UIToFD.js +0 -1
  69. package/dist/filters/adapters/UIToFlatUI.js +2 -7
  70. package/dist/filters/adapters/UIToOldLogic.js +0 -3
  71. package/dist/filters/adapters/flatUIToFD.js +0 -1
  72. package/dist/filters/adapters/flatUIToOldLogic.js +0 -2
  73. package/dist/filters/adapters/flatUIToUI.js +0 -4
  74. package/dist/filters/adapters/logicToFlatUI.js +10 -14
  75. package/dist/filters/adapters/transformFilters.js +0 -4
  76. package/dist/filters/constants/common/FILTER_TOKENS_STRUCTURE_TYPE.d.ts +8 -0
  77. package/dist/filters/constants/common/FILTER_TOKENS_STRUCTURE_TYPE.js +9 -0
  78. package/dist/filters/constants/common/index.d.ts +1 -0
  79. package/dist/filters/constants/common/index.js +1 -0
  80. package/dist/filters/helpers/OLD_getAggFilters.js +0 -1
  81. package/dist/filters/helpers/common/excludeFiltersByParams.js +3 -4
  82. package/dist/filters/helpers/common/mergeFilters.js +0 -1
  83. package/dist/filters/helpers/common/resolveDatasetConditions.js +0 -4
  84. package/dist/filters/helpers/common/resolveFilterConditions.js +3 -5
  85. package/dist/filters/helpers/filtersTokensToString.d.ts +7 -0
  86. package/dist/filters/helpers/filtersTokensToString.js +16 -0
  87. package/dist/filters/helpers/getTokensFromFilters.d.ts +10 -0
  88. package/dist/filters/helpers/getTokensFromFilters.js +107 -0
  89. package/dist/filters/helpers/getVerboseFilter.d.ts +9 -0
  90. package/dist/filters/helpers/getVerboseFilter.js +12 -0
  91. package/dist/filters/helpers/index.d.ts +3 -0
  92. package/dist/filters/helpers/index.js +3 -0
  93. package/dist/filters/helpers/ui/getUpdatedUIFilters.js +2 -3
  94. package/dist/filters/helpers/ui/resolveUIFlatFilterByParams.js +2 -3
  95. package/dist/filters/interfaces/IFFilterTokens.d.ts +5 -0
  96. package/dist/filters/interfaces/IFFilterTokens.js +1 -0
  97. package/dist/filters/interfaces/IFTokensFromFiltersSettings.d.ts +7 -0
  98. package/dist/filters/interfaces/IFTokensFromFiltersSettings.js +1 -0
  99. package/dist/filters/interfaces/OLD_IFilterExpression.d.ts +0 -1
  100. package/dist/filters/interfaces/common/IFSDataset.d.ts +0 -1
  101. package/dist/filters/interfaces/common/IFSParamsToGetFilter.d.ts +0 -1
  102. package/dist/filters/interfaces/index.d.ts +2 -0
  103. package/dist/filters/interfaces/index.js +2 -0
  104. package/dist/filters/services/UChartApi.js +1 -2
  105. package/dist/filters/services/UChartPaginationApi.js +1 -1
  106. package/dist/format/definition.d.ts +2 -1
  107. package/dist/format/format.js +4 -1
  108. package/dist/format/localization.js +18 -2
  109. package/dist/globalization/interfaces/chart_builder/II18nChartBuilderTableStyleOptions.d.ts +4 -0
  110. package/dist/globalization/labels/chart_builder/I18N_CHART_BUILDER_COMPARISION_OPTIONS.js +1 -1
  111. package/dist/globalization/labels/chart_builder/I18N_CHART_BUILDER_STYLE_OPTIONS.js +5 -1
  112. package/dist/globalization/service/i18nextBuilder.d.ts +7 -0
  113. package/dist/globalization/service/i18nextBuilder.js +24 -14
  114. package/dist/interfaces/format/IFormatOutputFormat.Interface.d.ts +1 -0
  115. package/dist/services/adapters/BColumnsToUIColumns.adapter.js +0 -2
  116. package/dist/services/adapters/BDatasetsToUIDatasets.adapter.js +0 -1
  117. package/dist/services/helpers/getDefaultQuestionListOptionsAttributes.js +0 -2
  118. package/package.json +1 -1
@@ -1,8 +1,10 @@
1
+ import { i18n } from "i18next";
1
2
  import { II18nResource } from "../interfaces/II18nResource";
2
3
  import { II18nServiceTranslateOption } from "../interfaces/II18nServiceTranslateOption";
3
4
  export declare class I18nServiceBuilder {
4
5
  static buildI18n(i18nDefault: II18nResource, i18nResource: II18nResource): Promise<I18nService>;
5
6
  private static _initI18n;
7
+ static getI18nInstance(i18nDefault: II18nResource, i18nResource: II18nResource, _i18next?: i18n): Promise<i18n>;
6
8
  static setTranslations(i18nDefault: any, i18nResource: II18nResource): II18nResource;
7
9
  }
8
10
  /**
@@ -17,3 +19,8 @@ export declare abstract class I18nService {
17
19
  */
18
20
  abstract translate(key: string, options?: II18nServiceTranslateOption): string;
19
21
  }
22
+ export declare class I18nServiceConcrete extends I18nService {
23
+ _i18next: any;
24
+ constructor(i18nInstance: any);
25
+ translate(key: string, options?: II18nServiceTranslateOption): any;
26
+ }
@@ -16,23 +16,33 @@ export class I18nServiceBuilder {
16
16
  static _initI18n(i18nDefault, i18nResource) {
17
17
  return __awaiter(this, void 0, void 0, function* () {
18
18
  if (!i18next.isInitialized) {
19
- yield i18next.init({
20
- lng: "en",
21
- debug: false,
22
- nsSeparator: false,
23
- keySeparator: ".",
24
- fallbackLng: false,
25
- defaultNS: "translation",
26
- resources: {
27
- en: {
28
- translation: this.setTranslations(i18nDefault, i18nResource),
29
- },
30
- },
31
- });
19
+ yield this.getI18nInstance(i18nDefault, i18nResource, i18next);
32
20
  }
33
21
  return new I18nServiceConcrete(i18next);
34
22
  });
35
23
  }
24
+ static getI18nInstance(i18nDefault, i18nResource, _i18next) {
25
+ return __awaiter(this, void 0, void 0, function* () {
26
+ let __i18next = _i18next;
27
+ if (!__i18next) {
28
+ __i18next = i18next.createInstance();
29
+ }
30
+ yield __i18next.init({
31
+ lng: "en",
32
+ debug: false,
33
+ nsSeparator: false,
34
+ keySeparator: ".",
35
+ fallbackLng: false,
36
+ defaultNS: "translation",
37
+ resources: {
38
+ en: {
39
+ translation: this.setTranslations(i18nDefault, i18nResource),
40
+ },
41
+ },
42
+ });
43
+ return __i18next;
44
+ });
45
+ }
36
46
  static setTranslations(i18nDefault, i18nResource) {
37
47
  return mergeDeep(i18nResource, i18nDefault, { mergeExistingValues: false });
38
48
  }
@@ -42,7 +52,7 @@ export class I18nServiceBuilder {
42
52
  */
43
53
  export class I18nService {
44
54
  }
45
- class I18nServiceConcrete extends I18nService {
55
+ export class I18nServiceConcrete extends I18nService {
46
56
  constructor(i18nInstance) {
47
57
  super();
48
58
  this._i18next = i18nInstance;
@@ -4,4 +4,5 @@ export interface IFormatOutputFormat extends IFormatDefaultFormat {
4
4
  currency?: IFormatCurrency;
5
5
  backup_currency?: IFormatCurrency;
6
6
  originalFormat?: IFormatOutputFormat;
7
+ template?: string;
7
8
  }
@@ -13,8 +13,6 @@ export function BColumnsToUIColumns(columns = [], dataset) {
13
13
  id: column.id,
14
14
  imageUploadOption: column.imageUploadOption,
15
15
  label: column.text,
16
- linked: column.linked,
17
- linkid: getAttribute(dataset, "link_id") || getAttribute(column, "link_id"),
18
16
  outputFormat: column.outputFormat,
19
17
  property: column.property,
20
18
  qrveyid: getAttribute(dataset, "qrvey_id") || getAttribute(column, "qrvey_id"),
@@ -4,7 +4,6 @@ export function BDatasetsToUIDatasets(datasets = []) {
4
4
  return datasets.map((dataset) => ({
5
5
  qrveyid: getAttribute(dataset, "qrvey_id"),
6
6
  label: dataset.name,
7
- linkid: getAttribute(dataset, "link_id"),
8
7
  options: BColumnsToUIColumns(dataset.options, dataset),
9
8
  }));
10
9
  }
@@ -4,8 +4,6 @@ export function getDefaultQuestionListOptionsAttributes() {
4
4
  "text",
5
5
  "type",
6
6
  "property",
7
- "linked",
8
- "linkid",
9
7
  "qrveyid",
10
8
  "bucketId",
11
9
  "formulaId",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@qrvey/utils",
3
- "version": "1.4.4",
3
+ "version": "1.5.0-1",
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",