@qrvey/utils 1.1.0-9 → 1.1.2-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.
- package/.eslintignore +5 -0
- package/.eslintrc.json +37 -0
- package/README.md +474 -285
- package/bitbucket-pipelines.yml +25 -0
- package/dist/cjs/constants/COLUMN.js +0 -1
- package/dist/cjs/constants/COLUMN_PROPERTY.d.ts +6 -0
- package/dist/cjs/constants/COLUMN_PROPERTY.js +0 -1
- package/dist/cjs/constants/COLUMN_PROPERTY_VALUE.js +4 -1
- package/dist/cjs/date/constants/DATE_DAY_HOURS.d.ts +1 -0
- package/dist/cjs/date/constants/DATE_DAY_HOURS.js +29 -0
- package/dist/cjs/date/constants/DATE_HOUR_MINUTES.d.ts +1 -0
- package/dist/cjs/date/constants/DATE_HOUR_MINUTES.js +65 -0
- package/dist/cjs/date/constants/DATE_MINUTE_SECONDS.d.ts +1 -0
- package/dist/cjs/date/constants/DATE_MINUTE_SECONDS.js +5 -0
- package/dist/cjs/date/constants/DATE_MONTH_DAYS.d.ts +1 -0
- package/dist/cjs/date/constants/DATE_MONTH_DAYS.js +36 -0
- package/dist/cjs/date/constants/DATE_PROPERTY.js +0 -1
- package/dist/cjs/date/constants/DATE_PROPERTY_VALUE.d.ts +8 -0
- package/dist/cjs/date/constants/DATE_PROPERTY_VALUE.js +17 -0
- package/dist/cjs/date/constants/DATE_P_PROPERTIES.d.ts +2 -0
- package/dist/cjs/date/constants/DATE_P_PROPERTIES.js +11 -0
- package/dist/cjs/date/constants/DATE_P_VALUES.d.ts +6 -0
- package/dist/cjs/date/constants/DATE_P_VALUES.js +8 -0
- package/dist/cjs/date/constants/DATE_TIME_P_VALUES.d.ts +6 -0
- package/dist/cjs/date/constants/DATE_TIME_P_VALUES.js +8 -0
- package/dist/cjs/date/constants/DATE_TIME_VALUES.js +1 -1
- package/dist/cjs/date/constants/DATE_WEEK_DAYS.d.ts +1 -0
- package/dist/cjs/date/constants/DATE_WEEK_DAYS.js +6 -0
- package/dist/cjs/date/constants/DATE_YEAR_DAYS.d.ts +1 -0
- package/dist/cjs/date/constants/DATE_YEAR_DAYS.js +370 -0
- package/dist/cjs/date/constants/DATE_YEAR_MONTHS.d.ts +1 -0
- package/dist/cjs/date/constants/DATE_YEAR_MONTHS.js +4 -0
- package/dist/cjs/date/constants/DATE_YEAR_QUARTERS.d.ts +1 -0
- package/dist/cjs/date/constants/DATE_YEAR_QUARTERS.js +4 -0
- package/dist/cjs/date/constants/index.d.ts +12 -0
- package/dist/cjs/date/constants/index.js +12 -0
- package/dist/cjs/date/range/getDateRange.js +26 -21
- package/dist/cjs/date/relative/Adapter.js +1 -1
- package/dist/cjs/date/relative/constants/DATE_FORMATS.d.ts +1 -1
- package/dist/cjs/date/relative/constants/DATE_FORMATS.js +3 -3
- package/dist/cjs/date/relative/helpers/formatStatement.js +6 -6
- package/dist/cjs/filters/adapters/FDToFlatUI.js +5 -12
- package/dist/cjs/filters/adapters/FDToUI.js +2 -3
- package/dist/cjs/filters/adapters/UIToFlatUI.js +5 -12
- package/dist/cjs/filters/adapters/UIToOldLogic.js +9 -1
- package/dist/cjs/filters/adapters/adaptFilterData.js +1 -1
- package/dist/cjs/filters/adapters/flatUIToFD.js +3 -7
- package/dist/cjs/filters/adapters/flatUIToOldLogic.js +41 -62
- package/dist/cjs/filters/adapters/flatUIToUI.js +2 -7
- package/dist/cjs/filters/adapters/logicToFlatUI.js +89 -74
- package/dist/cjs/filters/adapters/transformFilters.d.ts +1 -1
- package/dist/cjs/filters/adapters/transformFilters.js +18 -25
- package/dist/cjs/filters/constants/backend/FILTER_BACKEND_VALIDATOR.js +0 -1
- package/dist/cjs/filters/constants/common/FILTER_GROUPED_COLUMN_OPERATOR.d.ts +2 -0
- package/dist/cjs/filters/constants/common/FILTER_GROUPED_COLUMN_OPERATOR.js +4 -0
- package/dist/cjs/filters/constants/common/FILTER_OPERATOR.js +0 -1
- package/dist/cjs/filters/constants/common/FILTER_VALIDATOR.js +0 -1
- package/dist/cjs/filters/constants/common/index.d.ts +1 -0
- package/dist/cjs/filters/constants/common/index.js +1 -0
- package/dist/cjs/filters/helpers/backend/buildExpression.d.ts +6 -0
- package/dist/cjs/filters/helpers/backend/buildExpression.js +9 -2
- package/dist/cjs/filters/helpers/backend/getBackendGroupValue.js +2 -1
- package/dist/cjs/filters/helpers/backend/getBackendProperty.js +7 -2
- package/dist/cjs/filters/helpers/backend/getBackendValues.js +34 -18
- package/dist/cjs/filters/helpers/common/arePropertiesDateP.d.ts +8 -0
- package/dist/cjs/filters/helpers/common/arePropertiesDateP.js +16 -0
- package/dist/cjs/filters/helpers/common/getFilterColumnLabel.js +1 -1
- package/dist/cjs/filters/helpers/common/getFilterid.js +1 -1
- package/dist/cjs/filters/helpers/common/getFiltersByParams.js +5 -5
- package/dist/cjs/filters/helpers/common/getFiltersByVisibility.js +1 -1
- package/dist/cjs/filters/helpers/common/getMergeFiltersSettings.d.ts +7 -0
- package/dist/cjs/filters/helpers/common/getMergeFiltersSettings.js +16 -0
- package/dist/cjs/filters/helpers/common/getParamsToGetFilterSettings.d.ts +5 -0
- package/dist/cjs/filters/helpers/common/getParamsToGetFilterSettings.js +11 -1
- package/dist/cjs/filters/helpers/common/index.d.ts +2 -0
- package/dist/cjs/filters/helpers/common/index.js +2 -0
- package/dist/cjs/filters/helpers/common/mergeFilters.d.ts +2 -1
- package/dist/cjs/filters/helpers/common/mergeFilters.js +27 -10
- package/dist/cjs/filters/helpers/common/resolveDatasetConditions.js +1 -1
- package/dist/cjs/filters/helpers/common/resolveFilterConditions.js +2 -3
- package/dist/cjs/filters/helpers/common/resolveScopeConditions.js +1 -1
- package/dist/cjs/filters/helpers/getAggFiltersFromFilterData.d.ts +1 -1
- package/dist/cjs/filters/helpers/getAggFiltersFromFilterData.js +18 -19
- package/dist/cjs/filters/helpers/getScopesByHierarchy.js +2 -2
- package/dist/cjs/filters/helpers/ui/excludeUIFlatFiltersByScopes.d.ts +1 -1
- package/dist/cjs/filters/helpers/ui/excludeUIFlatFiltersByScopes.js +1 -1
- package/dist/cjs/filters/helpers/ui/getUIFlatFilterByParams.d.ts +1 -1
- package/dist/cjs/filters/helpers/ui/getUIFlatFilterByParams.js +1 -1
- package/dist/cjs/filters/helpers/ui/getUIFlatFiltersByParams.d.ts +1 -1
- package/dist/cjs/filters/helpers/ui/getUIFlatFiltersByParams.js +1 -1
- package/dist/cjs/filters/helpers/ui/getUIFlatFiltersByScopes.d.ts +1 -1
- package/dist/cjs/filters/helpers/ui/getUIFlatFiltersByScopes.js +1 -1
- package/dist/cjs/filters/helpers/ui/getUIValues.js +6 -5
- package/dist/cjs/filters/interfaces/OLD_IFilterDetail.d.ts +3 -0
- package/dist/cjs/filters/interfaces/common/IFSFilterExtras.d.ts +3 -0
- package/dist/cjs/filters/interfaces/common/IFSFilterExtrasInfo.d.ts +4 -0
- package/dist/cjs/filters/interfaces/common/IFSFilterExtrasInfo.js +2 -0
- package/dist/cjs/filters/interfaces/common/IFSMergeFiltersSettings.d.ts +7 -0
- package/dist/cjs/filters/interfaces/common/IFSMergeFiltersSettings.js +2 -0
- package/dist/cjs/filters/interfaces/common/IFSParamsToGetFilter.d.ts +2 -1
- package/dist/cjs/filters/interfaces/common/IFSParamsToGetFilterEnableds.d.ts +9 -0
- package/dist/cjs/filters/interfaces/common/IFSParamsToGetFilterEnableds.js +2 -0
- package/dist/cjs/filters/interfaces/common/IFSParamsToGetFilterSettings.d.ts +5 -0
- package/dist/cjs/filters/interfaces/common/index.d.ts +3 -0
- package/dist/cjs/filters/interfaces/common/index.js +3 -0
- package/dist/cjs/filters/interfaces/panel/IFPSettingsFilterPanelBodyScopeScope.d.ts +1 -0
- package/dist/cjs/filters/interfaces/panel/IFPSettingsFilterPanelHeader.d.ts +1 -0
- package/dist/cjs/filters/interfaces/panel/IFPSettingsFilterPanelSettings.d.ts +4 -0
- package/dist/cjs/filters/interfaces/panel/IFPSettingsFilterPanelSettingsScope.d.ts +7 -0
- package/dist/cjs/filters/interfaces/panel/IFPSettingsFilterPanelSettingsScope.js +2 -0
- package/dist/cjs/filters/interfaces/panel/index.d.ts +1 -0
- package/dist/cjs/filters/interfaces/panel/index.js +1 -0
- package/dist/cjs/format/definition.d.ts +3 -2
- package/dist/cjs/format/format.d.ts +1 -1
- package/dist/cjs/format/format.js +25 -26
- package/dist/cjs/general/array/delete.d.ts +4 -4
- package/dist/cjs/general/array/delete.js +8 -6
- package/dist/cjs/general/array/filterNestedTree.js +1 -1
- package/dist/cjs/general/array/flattenDeep.d.ts +1 -1
- package/dist/cjs/general/array/flattenDeep.js +4 -2
- package/dist/cjs/general/array/getFirstIndexFromArray.d.ts +1 -1
- package/dist/cjs/general/array/getFirstIndexFromArray.js +7 -5
- package/dist/cjs/general/array/getLastIndexFromArray.d.ts +1 -1
- package/dist/cjs/general/array/getLastIndexFromArray.js +6 -4
- package/dist/cjs/general/function/debounce.d.ts +1 -1
- package/dist/cjs/general/function/throttled.d.ts +1 -1
- package/dist/cjs/general/function/throttled.js +1 -1
- package/dist/cjs/general/mix/importScripts.d.ts +1 -1
- package/dist/cjs/general/mix/isEmpty.d.ts +5 -4
- package/dist/cjs/general/mix/isEmpty.js +12 -6
- package/dist/cjs/general/mix/randomId.d.ts +1 -1
- package/dist/cjs/general/mix/randomId.js +1 -2
- package/dist/cjs/general/mix/size.d.ts +1 -1
- package/dist/cjs/general/object/cloneDeep.d.ts +4 -4
- package/dist/cjs/general/object/cloneDeep.js +14 -6
- package/dist/cjs/general/object/get.d.ts +47 -15
- package/dist/cjs/general/object/get.js +61 -37
- package/dist/cjs/general/object/getAttribute.d.ts +1 -1
- package/dist/cjs/general/object/hasProperty.d.ts +1 -1
- package/dist/cjs/general/object/hasProperty.js +1 -1
- package/dist/cjs/general/object/index.d.ts +1 -0
- package/dist/cjs/general/object/index.js +1 -0
- package/dist/cjs/general/object/isObject.d.ts +6 -0
- package/dist/cjs/general/object/isObject.js +12 -0
- package/dist/cjs/general/object/mapValues.d.ts +1 -1
- package/dist/cjs/general/object/mapValues.js +0 -1
- package/dist/cjs/general/object/omit.js +1 -1
- package/dist/cjs/general/object/pick.js +0 -1
- package/dist/cjs/index.d.ts +2 -0
- package/dist/cjs/index.js +2 -0
- package/dist/cjs/qrvey/getColumnsLabel.js +4 -4
- package/dist/cjs/qrvey/index.d.ts +3 -0
- package/dist/cjs/qrvey/index.js +15 -0
- package/dist/cjs/tokens/index.d.ts +1 -0
- package/dist/cjs/tokens/index.js +13 -0
- package/dist/cjs/tokens/isTokenLabel.d.ts +6 -0
- package/dist/cjs/tokens/isTokenLabel.js +16 -0
- package/dist/constants/COLUMN.js +0 -1
- package/dist/constants/COLUMN_PROPERTY.d.ts +6 -0
- package/dist/constants/COLUMN_PROPERTY.js +0 -1
- package/dist/constants/COLUMN_PROPERTY_VALUE.js +4 -1
- package/dist/date/constants/DATE_DAY_HOURS.d.ts +1 -0
- package/dist/date/constants/DATE_DAY_HOURS.js +26 -0
- package/dist/date/constants/DATE_HOUR_MINUTES.d.ts +1 -0
- package/dist/date/constants/DATE_HOUR_MINUTES.js +62 -0
- package/dist/date/constants/DATE_MINUTE_SECONDS.d.ts +1 -0
- package/dist/date/constants/DATE_MINUTE_SECONDS.js +2 -0
- package/dist/date/constants/DATE_MONTH_DAYS.d.ts +1 -0
- package/dist/date/constants/DATE_MONTH_DAYS.js +33 -0
- package/dist/date/constants/DATE_PROPERTY.js +0 -1
- package/dist/date/constants/DATE_PROPERTY_VALUE.d.ts +8 -0
- package/dist/date/constants/DATE_PROPERTY_VALUE.js +14 -0
- package/dist/date/constants/DATE_P_PROPERTIES.d.ts +2 -0
- package/dist/date/constants/DATE_P_PROPERTIES.js +8 -0
- package/dist/date/constants/DATE_P_VALUES.d.ts +6 -0
- package/dist/date/constants/DATE_P_VALUES.js +5 -0
- package/dist/date/constants/DATE_TIME_P_VALUES.d.ts +6 -0
- package/dist/date/constants/DATE_TIME_P_VALUES.js +5 -0
- package/dist/date/constants/DATE_TIME_VALUES.js +1 -1
- package/dist/date/constants/DATE_WEEK_DAYS.d.ts +1 -0
- package/dist/date/constants/DATE_WEEK_DAYS.js +3 -0
- package/dist/date/constants/DATE_YEAR_DAYS.d.ts +1 -0
- package/dist/date/constants/DATE_YEAR_DAYS.js +367 -0
- package/dist/date/constants/DATE_YEAR_MONTHS.d.ts +1 -0
- package/dist/date/constants/DATE_YEAR_MONTHS.js +1 -0
- package/dist/date/constants/DATE_YEAR_QUARTERS.d.ts +1 -0
- package/dist/date/constants/DATE_YEAR_QUARTERS.js +1 -0
- package/dist/date/constants/index.d.ts +12 -0
- package/dist/date/constants/index.js +12 -0
- package/dist/date/range/getDateRange.js +26 -21
- package/dist/date/relative/Adapter.js +2 -2
- package/dist/date/relative/constants/DATE_FORMATS.d.ts +1 -1
- package/dist/date/relative/constants/DATE_FORMATS.js +3 -3
- package/dist/date/relative/helpers/formatStatement.js +7 -7
- package/dist/filters/adapters/FDToFlatUI.js +5 -12
- package/dist/filters/adapters/FDToUI.js +2 -3
- package/dist/filters/adapters/UIToFlatUI.js +5 -12
- package/dist/filters/adapters/UIToOldLogic.js +9 -1
- package/dist/filters/adapters/adaptFilterData.js +1 -1
- package/dist/filters/adapters/flatUIToFD.js +3 -7
- package/dist/filters/adapters/flatUIToOldLogic.js +42 -63
- package/dist/filters/adapters/flatUIToUI.js +3 -8
- package/dist/filters/adapters/logicToFlatUI.js +91 -76
- package/dist/filters/adapters/transformFilters.d.ts +1 -1
- package/dist/filters/adapters/transformFilters.js +19 -26
- package/dist/filters/constants/backend/FILTER_BACKEND_VALIDATOR.js +0 -1
- package/dist/filters/constants/common/FILTER_GROUPED_COLUMN_OPERATOR.d.ts +2 -0
- package/dist/filters/constants/common/FILTER_GROUPED_COLUMN_OPERATOR.js +1 -0
- package/dist/filters/constants/common/FILTER_OPERATOR.js +0 -1
- package/dist/filters/constants/common/FILTER_VALIDATOR.js +0 -1
- package/dist/filters/constants/common/index.d.ts +1 -0
- package/dist/filters/constants/common/index.js +1 -0
- package/dist/filters/helpers/backend/buildExpression.d.ts +6 -0
- package/dist/filters/helpers/backend/buildExpression.js +9 -2
- package/dist/filters/helpers/backend/getBackendGroupValue.js +2 -1
- package/dist/filters/helpers/backend/getBackendProperty.js +8 -3
- package/dist/filters/helpers/backend/getBackendValues.js +34 -18
- package/dist/filters/helpers/common/arePropertiesDateP.d.ts +8 -0
- package/dist/filters/helpers/common/arePropertiesDateP.js +12 -0
- package/dist/filters/helpers/common/getFilterColumnLabel.js +1 -1
- package/dist/filters/helpers/common/getFilterid.js +1 -1
- package/dist/filters/helpers/common/getFiltersByParams.js +6 -6
- package/dist/filters/helpers/common/getFiltersByVisibility.js +1 -1
- package/dist/filters/helpers/common/getMergeFiltersSettings.d.ts +7 -0
- package/dist/filters/helpers/common/getMergeFiltersSettings.js +12 -0
- package/dist/filters/helpers/common/getParamsToGetFilterSettings.d.ts +5 -0
- package/dist/filters/helpers/common/getParamsToGetFilterSettings.js +11 -1
- package/dist/filters/helpers/common/index.d.ts +2 -0
- package/dist/filters/helpers/common/index.js +2 -0
- package/dist/filters/helpers/common/mergeFilters.d.ts +2 -1
- package/dist/filters/helpers/common/mergeFilters.js +27 -10
- package/dist/filters/helpers/common/resolveDatasetConditions.js +1 -1
- package/dist/filters/helpers/common/resolveFilterConditions.js +2 -3
- package/dist/filters/helpers/common/resolveScopeConditions.js +1 -1
- package/dist/filters/helpers/getAggFiltersFromFilterData.d.ts +1 -1
- package/dist/filters/helpers/getAggFiltersFromFilterData.js +18 -19
- package/dist/filters/helpers/getScopesByHierarchy.js +2 -2
- package/dist/filters/helpers/ui/excludeUIFlatFiltersByScopes.d.ts +1 -1
- package/dist/filters/helpers/ui/excludeUIFlatFiltersByScopes.js +1 -1
- package/dist/filters/helpers/ui/getUIFlatFilterByParams.d.ts +1 -1
- package/dist/filters/helpers/ui/getUIFlatFilterByParams.js +1 -1
- package/dist/filters/helpers/ui/getUIFlatFiltersByParams.d.ts +1 -1
- package/dist/filters/helpers/ui/getUIFlatFiltersByParams.js +1 -1
- package/dist/filters/helpers/ui/getUIFlatFiltersByScopes.d.ts +1 -1
- package/dist/filters/helpers/ui/getUIFlatFiltersByScopes.js +1 -1
- package/dist/filters/helpers/ui/getUIValues.js +6 -5
- package/dist/filters/interfaces/OLD_IFilterDetail.d.ts +3 -0
- package/dist/filters/interfaces/common/IFSFilterExtras.d.ts +3 -0
- package/dist/filters/interfaces/common/IFSFilterExtrasInfo.d.ts +4 -0
- package/dist/filters/interfaces/common/IFSFilterExtrasInfo.js +1 -0
- package/dist/filters/interfaces/common/IFSMergeFiltersSettings.d.ts +7 -0
- package/dist/filters/interfaces/common/IFSMergeFiltersSettings.js +1 -0
- package/dist/filters/interfaces/common/IFSParamsToGetFilter.d.ts +2 -1
- package/dist/filters/interfaces/common/IFSParamsToGetFilterEnableds.d.ts +9 -0
- package/dist/filters/interfaces/common/IFSParamsToGetFilterEnableds.js +1 -0
- package/dist/filters/interfaces/common/IFSParamsToGetFilterSettings.d.ts +5 -0
- package/dist/filters/interfaces/common/index.d.ts +3 -0
- package/dist/filters/interfaces/common/index.js +3 -0
- package/dist/filters/interfaces/panel/IFPSettingsFilterPanelBodyScopeScope.d.ts +1 -0
- package/dist/filters/interfaces/panel/IFPSettingsFilterPanelHeader.d.ts +1 -0
- package/dist/filters/interfaces/panel/IFPSettingsFilterPanelSettings.d.ts +4 -0
- package/dist/filters/interfaces/panel/IFPSettingsFilterPanelSettingsScope.d.ts +7 -0
- package/dist/filters/interfaces/panel/IFPSettingsFilterPanelSettingsScope.js +1 -0
- package/dist/filters/interfaces/panel/index.d.ts +1 -0
- package/dist/filters/interfaces/panel/index.js +1 -0
- package/dist/format/definition.d.ts +3 -2
- package/dist/format/format.d.ts +1 -1
- package/dist/format/format.js +12 -13
- package/dist/general/array/delete.d.ts +4 -4
- package/dist/general/array/delete.js +8 -6
- package/dist/general/array/filterNestedTree.js +1 -1
- package/dist/general/array/flattenDeep.d.ts +1 -1
- package/dist/general/array/flattenDeep.js +4 -2
- package/dist/general/array/getFirstIndexFromArray.d.ts +1 -1
- package/dist/general/array/getFirstIndexFromArray.js +7 -5
- package/dist/general/array/getLastIndexFromArray.d.ts +1 -1
- package/dist/general/array/getLastIndexFromArray.js +6 -4
- package/dist/general/function/debounce.d.ts +1 -1
- package/dist/general/function/throttled.d.ts +1 -1
- package/dist/general/function/throttled.js +1 -1
- package/dist/general/mix/importScripts.d.ts +1 -1
- package/dist/general/mix/isEmpty.d.ts +5 -4
- package/dist/general/mix/isEmpty.js +12 -6
- package/dist/general/mix/randomId.d.ts +1 -1
- package/dist/general/mix/randomId.js +1 -2
- package/dist/general/mix/size.d.ts +1 -1
- package/dist/general/object/cloneDeep.d.ts +4 -4
- package/dist/general/object/cloneDeep.js +14 -6
- package/dist/general/object/get.d.ts +47 -15
- package/dist/general/object/get.js +59 -34
- package/dist/general/object/getAttribute.d.ts +1 -1
- package/dist/general/object/hasProperty.d.ts +1 -1
- package/dist/general/object/hasProperty.js +1 -1
- package/dist/general/object/index.d.ts +1 -0
- package/dist/general/object/index.js +1 -0
- package/dist/general/object/isObject.d.ts +6 -0
- package/dist/general/object/isObject.js +8 -0
- package/dist/general/object/mapValues.d.ts +1 -1
- package/dist/general/object/mapValues.js +0 -1
- package/dist/general/object/omit.js +1 -1
- package/dist/general/object/pick.js +0 -1
- package/dist/index.d.ts +2 -0
- package/dist/index.js +2 -0
- package/dist/qrvey/getColumnsLabel.js +5 -5
- package/dist/qrvey/index.d.ts +3 -0
- package/dist/qrvey/index.js +3 -0
- package/dist/tokens/index.d.ts +1 -0
- package/dist/tokens/index.js +1 -0
- package/dist/tokens/isTokenLabel.d.ts +6 -0
- package/dist/tokens/isTokenLabel.js +12 -0
- package/package.json +17 -10
- package/prepareToPublish.js +52 -0
- package/src/constants/COLUMN.ts +1 -1
- package/src/constants/COLUMN_PROPERTY.ts +13 -2
- package/src/constants/COLUMN_PROPERTY_VALUE.ts +6 -1
- package/src/date/constants/DATE_DAY_HOURS.ts +27 -0
- package/src/date/constants/DATE_HOUR_MINUTES.ts +63 -0
- package/src/date/constants/DATE_MINUTE_SECONDS.ts +3 -0
- package/src/date/constants/DATE_MONTH_DAYS.ts +34 -0
- package/src/date/constants/DATE_PROPERTY.ts +1 -1
- package/src/date/constants/DATE_PROPERTY_VALUE.ts +16 -0
- package/src/date/constants/DATE_P_PROPERTIES.ts +10 -0
- package/src/date/constants/DATE_P_VALUES.ts +7 -0
- package/src/date/constants/DATE_TIME_PROPERTIES.ts +0 -1
- package/src/date/constants/DATE_TIME_P_VALUES.ts +7 -0
- package/src/date/constants/DATE_TIME_VALUES.ts +1 -1
- package/src/date/constants/DATE_WEEK_DAYS.ts +4 -0
- package/src/date/constants/DATE_YEAR_DAYS.ts +368 -0
- package/src/date/constants/DATE_YEAR_MONTHS.ts +2 -0
- package/src/date/constants/DATE_YEAR_QUARTERS.ts +1 -0
- package/src/date/constants/index.ts +12 -0
- package/src/date/range/getDateRange.ts +46 -42
- package/src/date/relative/Adapter.ts +2 -2
- package/src/date/relative/constants/DATE_FORMATS.ts +3 -4
- package/src/date/relative/constants/RELATIVE_CURSOR_VALUE.ts +1 -1
- package/src/date/relative/helpers/formatStatement.ts +8 -8
- package/src/date/relative/index.ts +1 -1
- package/src/filters/adapters/FDToFlatUI.ts +7 -3
- package/src/filters/adapters/FDToUI.ts +5 -6
- package/src/filters/adapters/UIToFD.ts +1 -1
- package/src/filters/adapters/UIToFlatUI.ts +9 -5
- package/src/filters/adapters/UIToOldLogic.ts +11 -3
- package/src/filters/adapters/adaptFilterData.ts +1 -1
- package/src/filters/adapters/flatUIToFD.ts +5 -1
- package/src/filters/adapters/flatUIToOldLogic.ts +57 -71
- package/src/filters/adapters/flatUIToUI.ts +4 -1
- package/src/filters/adapters/logicToFlatUI.ts +101 -77
- package/src/filters/adapters/transformFilters.ts +22 -30
- package/src/filters/constants/backend/FILTER_BACKEND_VALIDATOR.ts +1 -1
- package/src/filters/constants/common/FILTER_GROUPED_COLUMN_OPERATOR.ts +3 -0
- package/src/filters/constants/common/FILTER_OPERATOR.ts +1 -1
- package/src/filters/constants/common/FILTER_VALIDATOR.ts +1 -1
- package/src/filters/constants/common/index.ts +1 -0
- package/src/filters/helpers/backend/buildExpression.ts +11 -3
- package/src/filters/helpers/backend/buildFilters.ts +2 -2
- package/src/filters/helpers/backend/getBackendGroupValue.ts +2 -1
- package/src/filters/helpers/backend/getBackendProperty.ts +6 -3
- package/src/filters/helpers/backend/getBackendValues.ts +27 -23
- package/src/filters/helpers/builder/getFilterBuilderGeneralConfig.ts +1 -1
- package/src/filters/helpers/common/areFiltersEquals.ts +1 -1
- package/src/filters/helpers/common/arePropertiesDateP.ts +14 -0
- package/src/filters/helpers/common/excludeFiltersByParams.ts +1 -1
- package/src/filters/helpers/common/getFilterColumnLabel.ts +1 -1
- package/src/filters/helpers/common/getFilterLabel.ts +1 -1
- package/src/filters/helpers/common/getFilterid.ts +1 -1
- package/src/filters/helpers/common/getFiltersByAggregateColumn.ts +1 -1
- package/src/filters/helpers/common/getFiltersByParams.ts +6 -7
- package/src/filters/helpers/common/getFiltersByVisibility.ts +1 -1
- package/src/filters/helpers/common/getMergeFiltersSettings.ts +13 -0
- package/src/filters/helpers/common/getParamsToGetFilterSettings.ts +11 -1
- package/src/filters/helpers/common/index.ts +2 -0
- package/src/filters/helpers/common/isInValidator.ts +1 -1
- package/src/filters/helpers/common/mergeFilters.ts +30 -17
- package/src/filters/helpers/common/resolveDatasetConditions.ts +1 -1
- package/src/filters/helpers/common/resolveFilterConditions.ts +2 -3
- package/src/filters/helpers/common/resolveScopeConditions.ts +1 -1
- package/src/filters/helpers/getAggFiltersFromFilterData.ts +20 -23
- package/src/filters/helpers/getAvailableScopesIDsByConfig.ts +1 -1
- package/src/filters/helpers/getScopesByHierarchy.ts +2 -2
- package/src/filters/helpers/ui/excludeUIFlatFiltersByScopes.ts +2 -2
- package/src/filters/helpers/ui/getUIFlatFilterByParams.ts +1 -1
- package/src/filters/helpers/ui/getUIFlatFiltersByParams.ts +1 -1
- package/src/filters/helpers/ui/getUIFlatFiltersByScopes.ts +1 -1
- package/src/filters/helpers/ui/getUIValues.ts +9 -9
- package/src/filters/helpers/ui/resolveUIFlatFiltersByParams.ts +1 -1
- package/src/filters/interfaces/OLD_IFilterDetail.ts +4 -0
- package/src/filters/interfaces/backend/IFBExpression.ts +1 -1
- package/src/filters/interfaces/common/IFSFilterExtras.ts +4 -0
- package/src/filters/interfaces/common/IFSFilterExtrasInfo.ts +5 -0
- package/src/filters/interfaces/common/IFSMergeFiltersSettings.ts +8 -0
- package/src/filters/interfaces/common/IFSParamsToGetFilter.ts +2 -1
- package/src/filters/interfaces/common/IFSParamsToGetFilterEnableds.ts +9 -0
- package/src/filters/interfaces/common/IFSParamsToGetFilterSettings.ts +5 -0
- package/src/filters/interfaces/common/index.ts +3 -0
- package/src/filters/interfaces/panel/IFPSettingsFilterPanelBodyScopeScope.ts +1 -0
- package/src/filters/interfaces/panel/IFPSettingsFilterPanelHeader.ts +1 -0
- package/src/filters/interfaces/panel/IFPSettingsFilterPanelSettings.ts +4 -0
- package/src/filters/interfaces/panel/IFPSettingsFilterPanelSettingsScope.ts +7 -0
- package/src/filters/interfaces/panel/IFilterPanelConfig.ts +0 -2
- package/src/filters/interfaces/panel/index.ts +1 -0
- package/src/filters/interfaces/ui/IFUFilterExtras.ts +1 -1
- package/src/format/definition.ts +7 -8
- package/src/format/format.ts +19 -22
- package/src/general/array/delete.ts +10 -6
- package/src/general/array/filterNestedTree.ts +1 -1
- package/src/general/array/flattenDeep.ts +3 -2
- package/src/general/array/getFirstIndexFromArray.ts +8 -6
- package/src/general/array/getLastIndexFromArray.ts +7 -5
- package/src/general/function/debounce.ts +2 -2
- package/src/general/function/throttled.ts +3 -3
- package/src/general/mix/importScripts.ts +1 -1
- package/src/general/mix/isEmpty.ts +12 -7
- package/src/general/mix/isNull.ts +2 -2
- package/src/general/mix/randomId.ts +2 -2
- package/src/general/mix/size.ts +1 -1
- package/src/general/object/cloneDeep.ts +15 -6
- package/src/general/object/get.ts +59 -31
- package/src/general/object/getAttribute.ts +1 -1
- package/src/general/object/hasProperty.ts +1 -1
- package/src/general/object/index.ts +3 -2
- package/src/general/object/isObject.ts +8 -0
- package/src/general/object/mapValues.ts +2 -2
- package/src/general/object/omit.ts +2 -2
- package/src/general/object/pick.ts +1 -1
- package/src/general/string/capitalize.ts +1 -1
- package/src/index.ts +3 -1
- package/src/qrvey/getColumnsLabel.ts +5 -5
- package/src/qrvey/index.ts +3 -0
- package/src/qrvey/isComplexColumn.ts +1 -1
- package/src/qrvey/isDateColumn.ts +1 -1
- package/src/stencil/decorators/Config.ts +2 -2
- package/src/tokens/index.ts +1 -0
- package/src/tokens/isTokenLabel.ts +13 -0
- package/src/typescript/decorators/Debounce.ts +2 -2
- package/src/typescript/decorators/Throttled.ts +2 -2
- package/test/format.test.js +97 -5
- package/test/general/array/delete.test.js +64 -0
- package/test/general/array/flattenDeep.test.js +44 -0
- package/test/general/array/getFirstIndexFromArray.test.js +56 -0
- package/test/general/array/getLastIndexFromArray.test.js +56 -0
- package/test/general/mix/isEmpty.test.js +144 -0
- package/test/general/object/cloneDeep.test.js +152 -0
- package/test/general/object/get.test.js +247 -0
- package/test/relative.test.js +24 -24
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { IFProperty, IFSColumn, IFUColumn } from "../../interfaces";
|
|
2
|
+
/**
|
|
3
|
+
* Determines if the filter column and property is a distinct group dates type
|
|
4
|
+
* @param column The filter column
|
|
5
|
+
* @param property The filter property
|
|
6
|
+
* @returns True if the given property is included from distinct group dates type
|
|
7
|
+
*/
|
|
8
|
+
export declare function arePropertiesDateP(column: IFUColumn | IFSColumn, property: IFProperty): boolean;
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { DATE_P_PROPERTIES } from "../../../date";
|
|
2
|
+
import { isEmpty } from "../../../general";
|
|
3
|
+
import { isDateColumn } from "../../../qrvey/isDateColumn";
|
|
4
|
+
/**
|
|
5
|
+
* Determines if the filter column and property is a distinct group dates type
|
|
6
|
+
* @param column The filter column
|
|
7
|
+
* @param property The filter property
|
|
8
|
+
* @returns True if the given property is included from distinct group dates type
|
|
9
|
+
*/
|
|
10
|
+
export function arePropertiesDateP(column, property) {
|
|
11
|
+
return isDateColumn(column) && isEmpty(column.aggregate) && DATE_P_PROPERTIES.includes(property);
|
|
12
|
+
}
|
|
@@ -13,5 +13,5 @@ export function getFilterColumnLabel(column) {
|
|
|
13
13
|
labels.push(column.aggregate);
|
|
14
14
|
if (column.calculation != null)
|
|
15
15
|
labels.push(column.calculation);
|
|
16
|
-
return
|
|
16
|
+
return labels.length > 0 ? `(${labels.join(' - ')})` : '';
|
|
17
17
|
}
|
|
@@ -35,5 +35,5 @@ export function getFilterid(filter, index) {
|
|
|
35
35
|
filterid.push((_h = filter.column) === null || _h === void 0 ? void 0 : _h.calculation);
|
|
36
36
|
if (index != null)
|
|
37
37
|
filterid.push(index.toString());
|
|
38
|
-
return
|
|
38
|
+
return filterid.length > 0 ? filterid.join('|') : '';
|
|
39
39
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { cloneDeep, isEmpty } from "../../../general";
|
|
1
|
+
import { cloneDeep, isEmpty, _hasProperty } from "../../../general";
|
|
2
2
|
import { getParamsToGetFilterSettings } from "./getParamsToGetFilterSettings";
|
|
3
3
|
import { resolveDatasetConditions } from "./resolveDatasetConditions";
|
|
4
4
|
import { resolveFilterConditions } from "./resolveFilterConditions";
|
|
@@ -35,21 +35,21 @@ export function getFiltersByParams(filterData, params, settings) {
|
|
|
35
35
|
if (Array.isArray(value) && value.length > 0) {
|
|
36
36
|
const rankingValues = value;
|
|
37
37
|
rankingValues.map(rValue => {
|
|
38
|
-
if (params.enableds
|
|
38
|
+
if (!_hasProperty(params, 'enableds') || !_hasProperty(params.enableds, 'values') || params.enableds.values === rValue.enabled)
|
|
39
39
|
return rValue;
|
|
40
40
|
}).filter(Boolean);
|
|
41
41
|
}
|
|
42
42
|
else {
|
|
43
43
|
value = value;
|
|
44
|
-
if (params.enableds
|
|
44
|
+
if (!_hasProperty(params, 'enableds') || !_hasProperty(params.enableds, 'values') || params.enableds.values === value.enabled)
|
|
45
45
|
return value;
|
|
46
46
|
}
|
|
47
47
|
}).filter(Boolean) });
|
|
48
48
|
}
|
|
49
|
-
}).filter(filter => !isEmpty(filter) && filter.values.length > 0) });
|
|
49
|
+
}).filter(filter => !isEmpty(filter) && (!settings.filterEmptyArrays.filter || filter.values.length > 0)) });
|
|
50
50
|
}
|
|
51
|
-
}).filter(dataset => !isEmpty(dataset) && dataset.filters.length > 0) });
|
|
51
|
+
}).filter(dataset => !isEmpty(dataset) && (!settings.filterEmptyArrays.dataset || dataset.filters.length > 0)) });
|
|
52
52
|
}
|
|
53
|
-
}).filter(scope => !isEmpty(scope) && scope.datasets.length > 0);
|
|
53
|
+
}).filter(scope => !isEmpty(scope) && (!settings.filterEmptyArrays.scope || scope.datasets.length > 0));
|
|
54
54
|
return filterData.scopes.length > 0 ? filterData : undefined;
|
|
55
55
|
}
|
|
@@ -12,6 +12,6 @@ export function getFiltersByVisibility(filterData, scopes) {
|
|
|
12
12
|
return;
|
|
13
13
|
filterData = cloneDeep(filterData);
|
|
14
14
|
filterData = getFiltersByScopesIds(filterData, scopes);
|
|
15
|
-
filterData = getFiltersByParams(filterData, { enableds: true });
|
|
15
|
+
filterData = getFiltersByParams(filterData, { enableds: { datasets: true, scopes: true, values: true } }, { filterEmptyArrays: { filter: false } });
|
|
16
16
|
return filterData;
|
|
17
17
|
}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { IFSMergeFiltersSettings } from "../../interfaces/common/IFSMergeFiltersSettings";
|
|
2
|
+
/**
|
|
3
|
+
* Transforms the given MergeFilters settings object. Adds the missing properties if they do not exist.
|
|
4
|
+
* @param settings an object to the MergeFilters settings
|
|
5
|
+
* @returns a new MergeFilters settings object.
|
|
6
|
+
*/
|
|
7
|
+
export declare function getMergeFiltersSettings(settings?: IFSMergeFiltersSettings): IFSMergeFiltersSettings;
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Transforms the given MergeFilters settings object. Adds the missing properties if they do not exist.
|
|
3
|
+
* @param settings an object to the MergeFilters settings
|
|
4
|
+
* @returns a new MergeFilters settings object.
|
|
5
|
+
*/
|
|
6
|
+
export function getMergeFiltersSettings(settings) {
|
|
7
|
+
var _a, _b;
|
|
8
|
+
return {
|
|
9
|
+
overwriteValues: (_a = settings === null || settings === void 0 ? void 0 : settings.overwriteValues) !== null && _a !== void 0 ? _a : false,
|
|
10
|
+
setGroupedColumnOperator: (_b = settings === null || settings === void 0 ? void 0 : settings.setGroupedColumnOperator) !== null && _b !== void 0 ? _b : true
|
|
11
|
+
};
|
|
12
|
+
}
|
|
@@ -1,2 +1,7 @@
|
|
|
1
1
|
import { IFSParamsToGetFilterSettings } from "../../interfaces";
|
|
2
|
+
/**
|
|
3
|
+
* Transforms the given ParamsToGetFilter settings object. Adds the missing properties if they do not exist.
|
|
4
|
+
* @param settings an object to the ParamsToGetFilter settings
|
|
5
|
+
* @returns a new ParamsToGetFilter settings object.
|
|
6
|
+
*/
|
|
2
7
|
export declare function getParamsToGetFilterSettings(settings?: IFSParamsToGetFilterSettings): IFSParamsToGetFilterSettings;
|
|
@@ -1,5 +1,10 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Transforms the given ParamsToGetFilter settings object. Adds the missing properties if they do not exist.
|
|
3
|
+
* @param settings an object to the ParamsToGetFilter settings
|
|
4
|
+
* @returns a new ParamsToGetFilter settings object.
|
|
5
|
+
*/
|
|
1
6
|
export function getParamsToGetFilterSettings(settings) {
|
|
2
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
|
|
7
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
|
|
3
8
|
return {
|
|
4
9
|
letPassUndefinedParams: {
|
|
5
10
|
dataset: (_b = (_a = settings === null || settings === void 0 ? void 0 : settings.letPassUndefinedParams) === null || _a === void 0 ? void 0 : _a.dataset) !== null && _b !== void 0 ? _b : true,
|
|
@@ -10,6 +15,11 @@ export function getParamsToGetFilterSettings(settings) {
|
|
|
10
15
|
dataset: (_h = (_g = settings === null || settings === void 0 ? void 0 : settings.letPassUndefinedProperties) === null || _g === void 0 ? void 0 : _g.dataset) !== null && _h !== void 0 ? _h : false,
|
|
11
16
|
filter: (_k = (_j = settings === null || settings === void 0 ? void 0 : settings.letPassUndefinedProperties) === null || _j === void 0 ? void 0 : _j.filter) !== null && _k !== void 0 ? _k : false,
|
|
12
17
|
scope: (_m = (_l = settings === null || settings === void 0 ? void 0 : settings.letPassUndefinedProperties) === null || _l === void 0 ? void 0 : _l.scope) !== null && _m !== void 0 ? _m : false,
|
|
18
|
+
},
|
|
19
|
+
filterEmptyArrays: {
|
|
20
|
+
dataset: (_p = (_o = settings === null || settings === void 0 ? void 0 : settings.filterEmptyArrays) === null || _o === void 0 ? void 0 : _o.dataset) !== null && _p !== void 0 ? _p : true,
|
|
21
|
+
filter: (_r = (_q = settings === null || settings === void 0 ? void 0 : settings.filterEmptyArrays) === null || _q === void 0 ? void 0 : _q.filter) !== null && _r !== void 0 ? _r : true,
|
|
22
|
+
scope: (_t = (_s = settings === null || settings === void 0 ? void 0 : settings.filterEmptyArrays) === null || _s === void 0 ? void 0 : _s.scope) !== null && _t !== void 0 ? _t : true,
|
|
13
23
|
}
|
|
14
24
|
};
|
|
15
25
|
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export * from './areFiltersEquals';
|
|
2
|
+
export * from './arePropertiesDateP';
|
|
2
3
|
export * from './excludeFiltersByAggregateColumn';
|
|
3
4
|
export * from './excludeFiltersByParams';
|
|
4
5
|
export * from './excludeFiltersByScopes';
|
|
@@ -10,6 +11,7 @@ export * from './getFiltersByParams';
|
|
|
10
11
|
export * from './getFiltersByScopes';
|
|
11
12
|
export * from './getFiltersByScopesIds';
|
|
12
13
|
export * from './getFiltersByVisibility';
|
|
14
|
+
export * from './getMergeFiltersSettings';
|
|
13
15
|
export * from './getParamsToGetFilterSettings';
|
|
14
16
|
export * from './haveFiltersByDataset';
|
|
15
17
|
export * from './isBetweenValidator';
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export * from './areFiltersEquals';
|
|
2
|
+
export * from './arePropertiesDateP';
|
|
2
3
|
export * from './excludeFiltersByAggregateColumn';
|
|
3
4
|
export * from './excludeFiltersByParams';
|
|
4
5
|
export * from './excludeFiltersByScopes';
|
|
@@ -10,6 +11,7 @@ export * from './getFiltersByParams';
|
|
|
10
11
|
export * from './getFiltersByScopes';
|
|
11
12
|
export * from './getFiltersByScopesIds';
|
|
12
13
|
export * from './getFiltersByVisibility';
|
|
14
|
+
export * from './getMergeFiltersSettings';
|
|
13
15
|
export * from './getParamsToGetFilterSettings';
|
|
14
16
|
export * from './haveFiltersByDataset';
|
|
15
17
|
export * from './isBetweenValidator';
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { IFSData, IFUData } from "../../interfaces";
|
|
2
|
+
import { IFSMergeFiltersSettings } from "../../interfaces/common/IFSMergeFiltersSettings";
|
|
2
3
|
/**
|
|
3
4
|
* Merge filter data structures in a new one. The first Filter Data passed in the argument has the priority
|
|
4
5
|
* @param filterData1 The target filter data
|
|
@@ -6,4 +7,4 @@ import { IFSData, IFUData } from "../../interfaces";
|
|
|
6
7
|
* @param overwriteValues Flag to overwrite or not the filter values
|
|
7
8
|
* @returns a new filter data structure
|
|
8
9
|
*/
|
|
9
|
-
export declare function mergeFilters(filterData1: IFSData | IFUData, filterData2: IFSData | IFUData,
|
|
10
|
+
export declare function mergeFilters(filterData1: IFSData | IFUData, filterData2: IFSData | IFUData, settings?: IFSMergeFiltersSettings): IFSData | IFUData;
|
|
@@ -1,4 +1,8 @@
|
|
|
1
1
|
import { cloneDeep, isEmpty } from "../../../general";
|
|
2
|
+
import { FILTER_GROUPED_COLUMN_OPERATOR } from "../../constants/common/FILTER_GROUPED_COLUMN_OPERATOR";
|
|
3
|
+
import { getMergeFiltersSettings } from "./getMergeFiltersSettings";
|
|
4
|
+
import { isInValidator } from "./isInValidator";
|
|
5
|
+
import { isNullValidator } from "./isNullValidator";
|
|
2
6
|
import { isRangeValidator } from "./isRangeValidator";
|
|
3
7
|
import { isRegularValidator } from "./isRegularValidator";
|
|
4
8
|
import { resolveDatasetConditions } from "./resolveDatasetConditions";
|
|
@@ -11,7 +15,7 @@ import { resolveScopeConditions } from "./resolveScopeConditions";
|
|
|
11
15
|
* @param overwriteValues Flag to overwrite or not the filter values
|
|
12
16
|
* @returns a new filter data structure
|
|
13
17
|
*/
|
|
14
|
-
export function mergeFilters(filterData1, filterData2,
|
|
18
|
+
export function mergeFilters(filterData1, filterData2, settings) {
|
|
15
19
|
if (isEmpty(filterData1) || isEmpty(filterData1.scopes)) {
|
|
16
20
|
if (isEmpty(filterData2) || isEmpty(filterData2.scopes))
|
|
17
21
|
return;
|
|
@@ -21,9 +25,10 @@ export function mergeFilters(filterData1, filterData2, overwriteValues = false)
|
|
|
21
25
|
return filterData1;
|
|
22
26
|
filterData1 = cloneDeep(filterData1);
|
|
23
27
|
filterData2 = cloneDeep(filterData2);
|
|
28
|
+
settings = getMergeFiltersSettings(settings);
|
|
24
29
|
return {
|
|
25
30
|
enabled: filterData1.enabled,
|
|
26
|
-
scopes: mergeScopes(filterData1.scopes, filterData2.scopes,
|
|
31
|
+
scopes: mergeScopes(filterData1.scopes, filterData2.scopes, settings),
|
|
27
32
|
section: filterData1.section,
|
|
28
33
|
version: filterData1.version
|
|
29
34
|
};
|
|
@@ -35,11 +40,11 @@ export function mergeFilters(filterData1, filterData2, overwriteValues = false)
|
|
|
35
40
|
* @param overwriteValues Flag to overwrite or not the filter values
|
|
36
41
|
* @returns a new scope structure array
|
|
37
42
|
*/
|
|
38
|
-
function mergeScopes(scopes1 = [], scopes2 = [],
|
|
43
|
+
function mergeScopes(scopes1 = [], scopes2 = [], settings) {
|
|
39
44
|
let newScopes = scopes1.reduce((scopes, scope1) => {
|
|
40
45
|
const scope2Index = scopes2.findIndex(scope2 => resolveScopeConditions(scope2, { scope: scope1.scope, scopeid: scope1.scopeid }));
|
|
41
46
|
if (scope2Index > -1) {
|
|
42
|
-
scope1 = Object.assign(Object.assign({}, scope1), { datasets: mergeDatasets(scope1.datasets, scopes2[scope2Index].datasets,
|
|
47
|
+
scope1 = Object.assign(Object.assign({}, scope1), { datasets: mergeDatasets(scope1.datasets, scopes2[scope2Index].datasets, settings) });
|
|
43
48
|
scopes2.splice(scope2Index, 1);
|
|
44
49
|
}
|
|
45
50
|
scopes.push(scope1);
|
|
@@ -56,11 +61,11 @@ function mergeScopes(scopes1 = [], scopes2 = [], overwriteValues = false) {
|
|
|
56
61
|
* @param overwriteValues Flag to overwrite or not the filter values
|
|
57
62
|
* @returns a new dataset structure array
|
|
58
63
|
*/
|
|
59
|
-
function mergeDatasets(datasets1 = [], datasets2 = [],
|
|
64
|
+
function mergeDatasets(datasets1 = [], datasets2 = [], settings) {
|
|
60
65
|
let newDatasets = datasets1.reduce((datasets, dataset1) => {
|
|
61
66
|
const dataset2Index = datasets2.findIndex(dataset2 => resolveDatasetConditions(dataset2, { qrveyid: dataset1.qrveyid, linkid: dataset1.linkid }));
|
|
62
67
|
if (dataset2Index > -1) {
|
|
63
|
-
dataset1 = Object.assign(Object.assign({}, dataset1), { filters: mergeFilterss(dataset1.filters, datasets2[dataset2Index].filters,
|
|
68
|
+
dataset1 = Object.assign(Object.assign({}, dataset1), { filters: mergeFilterss(dataset1.filters, datasets2[dataset2Index].filters, settings) });
|
|
64
69
|
datasets2.splice(dataset2Index, 1);
|
|
65
70
|
}
|
|
66
71
|
datasets.push(dataset1);
|
|
@@ -77,13 +82,16 @@ function mergeDatasets(datasets1 = [], datasets2 = [], overwriteValues = false)
|
|
|
77
82
|
* @param overwriteValues Flag to overwrite or not the filter values
|
|
78
83
|
* @returns a new filter structure array
|
|
79
84
|
*/
|
|
80
|
-
function mergeFilterss(filters1 = [], filters2 = [],
|
|
85
|
+
function mergeFilterss(filters1 = [], filters2 = [], settings) {
|
|
81
86
|
let newFilters = filters1.reduce((filters, filter1) => {
|
|
82
87
|
const filter2Index = filters2.findIndex(filter2 => resolveFilterConditions(filter2, { column: filter1.column, dateSection: filter1.dateSection, panelid: filter1.extras.panelid, property: filter1.property, validator: filter1.validator }));
|
|
83
88
|
if (filter2Index > -1) {
|
|
84
|
-
filter1 = Object.assign(Object.assign({}, filter1), { values: mergeValues(filter1, filters2[filter2Index], overwriteValues) });
|
|
89
|
+
filter1 = Object.assign(Object.assign({}, filter1), { values: mergeValues(filter1, filters2[filter2Index], settings.overwriteValues) });
|
|
85
90
|
filters2.splice(filter2Index, 1);
|
|
86
91
|
}
|
|
92
|
+
else {
|
|
93
|
+
filter1 = Object.assign(Object.assign({}, filter1), { operator: settings.setGroupedColumnOperator ? FILTER_GROUPED_COLUMN_OPERATOR : filter1.operator });
|
|
94
|
+
}
|
|
87
95
|
filters.push(filter1);
|
|
88
96
|
return filters;
|
|
89
97
|
}, []);
|
|
@@ -103,7 +111,16 @@ function mergeValues(filter1, filter2, overwrite = false) {
|
|
|
103
111
|
return [];
|
|
104
112
|
let newValues = [];
|
|
105
113
|
if (!overwrite) {
|
|
106
|
-
if (
|
|
114
|
+
if (isInValidator(filter1.validator)) {
|
|
115
|
+
newValues = filter1.values.reduce((values, value1) => {
|
|
116
|
+
const value2Index = filter2.values.findIndex(value2 => value2.anchor === value1.anchor && value2.cursor === value1.cursor && value2.includeCurrent === value1.includeCurrent && value2.isCalendarDate === value1.isCalendarDate && value2.number === value1.number && value2.unit === value1.unit);
|
|
117
|
+
if (value2Index === -1) {
|
|
118
|
+
values.push(filter2.values[value2Index]);
|
|
119
|
+
}
|
|
120
|
+
return values;
|
|
121
|
+
}, filter1.values);
|
|
122
|
+
}
|
|
123
|
+
else if (isRangeValidator(filter1.validator)) {
|
|
107
124
|
newValues = filter1.values.reduce((values, value1) => {
|
|
108
125
|
const value2Index = filter2.values.findIndex(value2 => value2.max === value1.max && value2.min === value1.min);
|
|
109
126
|
if (value2Index === -1) {
|
|
@@ -112,7 +129,7 @@ function mergeValues(filter1, filter2, overwrite = false) {
|
|
|
112
129
|
return values;
|
|
113
130
|
}, filter1.values);
|
|
114
131
|
}
|
|
115
|
-
else if (isRegularValidator(filter1.validator)) {
|
|
132
|
+
else if (isRegularValidator(filter1.validator) || isNullValidator(filter1.validator)) {
|
|
116
133
|
newValues = filter1.values.reduce((values, value1) => {
|
|
117
134
|
const value2Index = filter2.values.findIndex(value2 => value2.imageUrl === value1.imageUrl && value2.value === value1.value);
|
|
118
135
|
if (value2Index === -1) {
|
|
@@ -8,7 +8,7 @@ import { isEmpty, _hasProperty } from "../../../general";
|
|
|
8
8
|
* @returns true: the condition is satisfied
|
|
9
9
|
*/
|
|
10
10
|
export function resolveDatasetConditions(dataset, params, letPassUndefinedProperties = false, letPassUndefinedParams = true) {
|
|
11
|
-
return (!_hasProperty(params, 'enableds') || (letPassUndefinedProperties && dataset.enabled == null) || (letPassUndefinedParams && params.enableds == null) || params.enableds === dataset.enabled) &&
|
|
11
|
+
return (!_hasProperty(params, 'enableds') || !_hasProperty(params.enableds, 'datasets') || (letPassUndefinedProperties && dataset.enabled == null) || (letPassUndefinedParams && params.enableds.datasets == null) || params.enableds.datasets === dataset.enabled) &&
|
|
12
12
|
(!_hasProperty(params, 'qrveyid') || (letPassUndefinedProperties && dataset.qrveyid == null) || (letPassUndefinedParams && isEmpty(params.qrveyid)) || params.qrveyid === dataset.qrveyid) &&
|
|
13
13
|
(!_hasProperty(params, 'linkid') || (letPassUndefinedProperties && dataset.linkid == null) || (letPassUndefinedParams && isEmpty(params.linkid)) || params.linkid === dataset.linkid) &&
|
|
14
14
|
dataset.filters.length > 0;
|
|
@@ -9,7 +9,7 @@ import { isEmpty, _hasProperty } from "../../../general";
|
|
|
9
9
|
*/
|
|
10
10
|
export function resolveFilterConditions(filter, params, letPassUndefinedProperties = false, letPassUndefinedParams = true) {
|
|
11
11
|
var _a, _b, _c, _d;
|
|
12
|
-
return (!_hasProperty(params, 'enableds') || (letPassUndefinedProperties && filter.enabled == null) || (letPassUndefinedParams && params.enableds == null) || params.enableds === filter.enabled) &&
|
|
12
|
+
return (!_hasProperty(params, 'enableds') || !_hasProperty(params.enableds, 'filters') || (letPassUndefinedProperties && filter.enabled == null) || (letPassUndefinedParams && params.enableds.filters == null) || params.enableds.filters === filter.enabled) &&
|
|
13
13
|
(!_hasProperty(params, 'dateSection') || (letPassUndefinedProperties && filter.dateSection == null) || (letPassUndefinedParams && isEmpty(params.dateSection)) || params.dateSection === filter.dateSection) &&
|
|
14
14
|
(!_hasProperty(params, 'panelid') || (letPassUndefinedProperties && filter.extras.panelid == null) || (letPassUndefinedParams && isEmpty(params.panelid)) || params.panelid === filter.extras.panelid) &&
|
|
15
15
|
(!_hasProperty(params, 'property') || (letPassUndefinedProperties && filter.property == null) || (letPassUndefinedParams && isEmpty(params.property)) || params.property === filter.property) &&
|
|
@@ -17,6 +17,5 @@ export function resolveFilterConditions(filter, params, letPassUndefinedProperti
|
|
|
17
17
|
(!_hasProperty(params, 'column') || (letPassUndefinedProperties && filter.column == null) || (letPassUndefinedParams && isEmpty(params.column)) || (((_a = params.column) === null || _a === void 0 ? void 0 : _a.id) === filter.column.id &&
|
|
18
18
|
((_b = params.column) === null || _b === void 0 ? void 0 : _b.qrveyid) === filter.column.qrveyid &&
|
|
19
19
|
((_c = params.column) === null || _c === void 0 ? void 0 : _c.linkid) === filter.column.linkid &&
|
|
20
|
-
((_d = params.column) === null || _d === void 0 ? void 0 : _d.aggregate) === filter.column.aggregate))
|
|
21
|
-
filter.values.length > 0;
|
|
20
|
+
((_d = params.column) === null || _d === void 0 ? void 0 : _d.aggregate) === filter.column.aggregate));
|
|
22
21
|
}
|
|
@@ -8,7 +8,7 @@ import { isEmpty, _hasProperty } from "../../../general";
|
|
|
8
8
|
* @returns true: the condition is satisfied
|
|
9
9
|
*/
|
|
10
10
|
export function resolveScopeConditions(scope, params, letPassUndefinedProperties = false, letPassUndefinedParams = true) {
|
|
11
|
-
return (!_hasProperty(params, 'enableds') || (letPassUndefinedProperties && scope.enabled == null) || (letPassUndefinedParams && params.enableds == null) || params.enableds === scope.enabled) &&
|
|
11
|
+
return (!_hasProperty(params, 'enableds') || !_hasProperty(params.enableds, 'scopes') || (letPassUndefinedProperties && scope.enabled == null) || (letPassUndefinedParams && params.enableds.scopes == null) || params.enableds.scopes === scope.enabled) &&
|
|
12
12
|
(!_hasProperty(params, 'scope') || (letPassUndefinedProperties && scope.scope == null) || (letPassUndefinedParams && isEmpty(params.scope)) || scope.scope === params.scope) &&
|
|
13
13
|
(!_hasProperty(params, 'scopeid') || (letPassUndefinedProperties && scope.scopeid == null) || (letPassUndefinedParams && isEmpty(params.scopeid)) || scope.scopeid === params.scopeid) &&
|
|
14
14
|
scope.datasets.filter.length > 0;
|
|
@@ -5,4 +5,4 @@ import { IFBFilterAggregate, IFSData } from "../interfaces";
|
|
|
5
5
|
* @param summaries
|
|
6
6
|
* @returns
|
|
7
7
|
*/
|
|
8
|
-
export declare function getAggFiltersFromFilterData(filterData: IFSData,
|
|
8
|
+
export declare function getAggFiltersFromFilterData(filterData: IFSData, _summaries: any[]): IFBFilterAggregate;
|
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
import { isEmpty } from "../../general";
|
|
2
|
-
import { getBackendValidator, getBackendValues } from "./backend";
|
|
3
2
|
import { getFiltersByAggregateColumn } from "./common";
|
|
4
|
-
import { FDToFlatUI } from "../adapters";
|
|
5
3
|
/**
|
|
6
4
|
*
|
|
7
5
|
* @param logics
|
|
@@ -9,26 +7,27 @@ import { FDToFlatUI } from "../adapters";
|
|
|
9
7
|
* @returns
|
|
10
8
|
*/
|
|
11
9
|
// [TODO: FILTERS - FIX AGGREGATE FILTERS]
|
|
12
|
-
export function getAggFiltersFromFilterData(filterData,
|
|
10
|
+
export function getAggFiltersFromFilterData(filterData, _summaries) {
|
|
13
11
|
filterData = Object.assign({}, getFiltersByAggregateColumn(filterData));
|
|
14
12
|
if (isEmpty(filterData))
|
|
15
13
|
return;
|
|
16
|
-
const uFilters = FDToFlatUI(filterData);
|
|
17
|
-
const aggFilters = uFilters.map(uFilter => {
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
}
|
|
31
|
-
|
|
14
|
+
// const uFilters = FDToFlatUI(filterData);
|
|
15
|
+
// const aggFilters: IFBExpressionAggregate[] = uFilters.map(uFilter => {
|
|
16
|
+
// const summaryIndex = summaries.findIndex(summary =>
|
|
17
|
+
// uFilter.column.id === summary.questionid &&
|
|
18
|
+
// uFilter.column.qrveyid === summary.qrveyid &&
|
|
19
|
+
// uFilter.column.linkid === summary.linkid &&
|
|
20
|
+
// uFilter.column.aggregate === summary.aggregate
|
|
21
|
+
// );
|
|
22
|
+
// if (summaryIndex > -1) {
|
|
23
|
+
// return {
|
|
24
|
+
// enabled: uFilter.enabled,
|
|
25
|
+
// summaryIndex,
|
|
26
|
+
// validationType: getBackendValidator(uFilter.validator),
|
|
27
|
+
// value: getBackendValues(uFilter),
|
|
28
|
+
// };
|
|
29
|
+
// }
|
|
30
|
+
// }).filter(Boolean);
|
|
32
31
|
// // [TODO: FILTERS - Adapt filter.validator and filter.values in the backend format]
|
|
33
32
|
// const aggFilters: IFBFilterAggregate[] = filterData.scopes.map((scope) => {
|
|
34
33
|
// scope.datasets.forEach(dataset => {
|
|
@@ -7,9 +7,9 @@
|
|
|
7
7
|
export function getScopesByHierarchy(scopes = [], currentScope = "GLOBAL" /* GLOBAL */) {
|
|
8
8
|
const scopeIndex = scopes.findIndex(s => s.label === currentScope);
|
|
9
9
|
const chartScopeIndex = scopes.findIndex(s => s.label === "CHART" /* CHART */);
|
|
10
|
-
return
|
|
10
|
+
return scopeIndex !== -1
|
|
11
11
|
? scopes.slice(0, scopeIndex)
|
|
12
|
-
:
|
|
12
|
+
: chartScopeIndex !== -1
|
|
13
13
|
? scopes.slice(0, chartScopeIndex)
|
|
14
14
|
: [];
|
|
15
15
|
}
|
|
@@ -5,4 +5,4 @@ import { IFScope, IFUFlattenedFilter } from "../../interfaces";
|
|
|
5
5
|
* @param scopes collection of scopes types
|
|
6
6
|
* @returns The new array of UI Flattened filters
|
|
7
7
|
*/
|
|
8
|
-
export declare function excludeUIFlatFiltersByScopes(uFilters
|
|
8
|
+
export declare function excludeUIFlatFiltersByScopes(uFilters?: IFUFlattenedFilter[], scopes?: IFScope[]): IFUFlattenedFilter[];
|
|
@@ -5,7 +5,7 @@ import { cloneDeep, isEmpty } from "../../../general";
|
|
|
5
5
|
* @param scopes collection of scopes types
|
|
6
6
|
* @returns The new array of UI Flattened filters
|
|
7
7
|
*/
|
|
8
|
-
export function excludeUIFlatFiltersByScopes(uFilters = [], scopes) {
|
|
8
|
+
export function excludeUIFlatFiltersByScopes(uFilters = [], scopes = []) {
|
|
9
9
|
if (isEmpty(uFilters))
|
|
10
10
|
return [];
|
|
11
11
|
uFilters = cloneDeep(uFilters);
|
|
@@ -11,4 +11,4 @@ import { IFUFlattenedFilter, IFUParamsToGetFilter } from "../../interfaces";
|
|
|
11
11
|
* - Property type
|
|
12
12
|
* @returns The index of the uFilter array or the Filter object s
|
|
13
13
|
*/
|
|
14
|
-
export declare function getUIFlatFilterByParams(uFilters
|
|
14
|
+
export declare function getUIFlatFilterByParams(uFilters?: IFUFlattenedFilter[], params?: IFUParamsToGetFilter, getIndex?: boolean): number | IFUFlattenedFilter;
|
|
@@ -12,7 +12,7 @@ import { resolveUIFlatFilterByParams } from "./resolveUIFlatFiltersByParams";
|
|
|
12
12
|
* - Property type
|
|
13
13
|
* @returns The index of the uFilter array or the Filter object s
|
|
14
14
|
*/
|
|
15
|
-
export function getUIFlatFilterByParams(uFilters = [], params, getIndex = false) {
|
|
15
|
+
export function getUIFlatFilterByParams(uFilters = [], params = {}, getIndex = false) {
|
|
16
16
|
if (isEmpty(params))
|
|
17
17
|
return;
|
|
18
18
|
uFilters = cloneDeep(uFilters);
|
|
@@ -12,4 +12,4 @@ import { IFUFlattenedFilter, IFUParamsToGetFilter } from "../../interfaces";
|
|
|
12
12
|
* - Enabled flags
|
|
13
13
|
* @returns The index of the uFilter array or the Filter object s
|
|
14
14
|
*/
|
|
15
|
-
export declare function getUIFlatFiltersByParams(uFilters
|
|
15
|
+
export declare function getUIFlatFiltersByParams(uFilters?: IFUFlattenedFilter[], params?: IFUParamsToGetFilter): IFUFlattenedFilter[];
|
|
@@ -13,7 +13,7 @@ import { resolveUIFlatFilterByParams } from "./resolveUIFlatFiltersByParams";
|
|
|
13
13
|
* - Enabled flags
|
|
14
14
|
* @returns The index of the uFilter array or the Filter object s
|
|
15
15
|
*/
|
|
16
|
-
export function getUIFlatFiltersByParams(uFilters = [], params) {
|
|
16
|
+
export function getUIFlatFiltersByParams(uFilters = [], params = {}) {
|
|
17
17
|
if (isEmpty(params))
|
|
18
18
|
return;
|
|
19
19
|
uFilters = cloneDeep(uFilters);
|