@qrvey/utils 1.2.10-8 → 1.3.0-1

package/dist/cjs/services/api/getDatasetColumns.api.js

@@ -7,18 +7,17 @@ exports.getDatasetColumns = void 0;
 const CHART_ENDPOINT_1 = require("../constants/CHART_ENDPOINT");
 const Request_1 = __importDefault(require("../helpers/Request"));
 const BDatasetsToUIDatasets_adapter_1 = require("../adapters/BDatasetsToUIDatasets.adapter");
-const getDefaultQuestionListOptionsAttributes_1 = require("../helpers/getDefaultQuestionListOptionsAttributes");
-const localization_1 = require("../../format/localization");
+const __1 = require("../..");
 /**
    * Get a dataset by Qrvey ID
    * @param qrveyid The Qrvey ID
    * @returns a promise
    */
 function getDatasetColumns(config, qrveyid) {
-    const lang = (0, localization_1.chooseLang)(config);
+    const lang = (0, __1.chooseLang)(config);
     return Request_1.default.post(Object.assign(Object.assign({}, config), { qrveyid, endpoint: CHART_ENDPOINT_1.CHART_ENDPOINT }), '/question/list', {
-        optionsAttributes: (0, getDefaultQuestionListOptionsAttributes_1.getDefaultQuestionListOptionsAttributes)(),
-        extend: true,
+        'optionsAttributes': ['id', 'text', 'type', 'property', 'linked', 'linkid', 'qrveyid', 'bucketId', 'formulaId', 'formulaType', 'geogroup', 'outputFormat'],
+        'extend': true
     }, { lang })
         .then(BDatasetsToUIDatasets_adapter_1.BDatasetsToUIDatasets)
         .catch(_e => []);

package/dist/cjs/services/api/index.d.ts

@@ -1,5 +1,3 @@
 export * from './getAllDatasets.api';
 export * from './getAllQrveys.api';
 export * from './getDatasetColumns.api';
-export * from './getDatasetsByIds.api';
-export * from './getModel.api';

package/dist/cjs/services/api/index.js

@@ -17,5 +17,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./getAllDatasets.api"), exports);
 __exportStar(require("./getAllQrveys.api"), exports);
 __exportStar(require("./getDatasetColumns.api"), exports);
-__exportStar(require("./getDatasetsByIds.api"), exports);
-__exportStar(require("./getModel.api"), exports);

package/dist/cjs/services/constants/index.d.ts

@@ -1,6 +1,2 @@
 export * from './CHART_ENDPOINT';
-export * from './MODEL_ENDPOINT';
 export * from './QRVEY_ENDPOINT';
-export * from './QUESTION_LIST_BULK_ENDPOINT';
-export * from './UCHART_ENDPOINT';
-export * from './UCHART_PAGINATION_ENDPOINT';

package/dist/cjs/services/constants/index.js

@@ -15,8 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./CHART_ENDPOINT"), exports);
-__exportStar(require("./MODEL_ENDPOINT"), exports);
 __exportStar(require("./QRVEY_ENDPOINT"), exports);
-__exportStar(require("./QUESTION_LIST_BULK_ENDPOINT"), exports);
-__exportStar(require("./UCHART_ENDPOINT"), exports);
-__exportStar(require("./UCHART_PAGINATION_ENDPOINT"), exports);

package/dist/cjs/services/helpers/index.d.ts

@@ -1,2 +1 @@
-export * from './getDefaultQuestionListOptionsAttributes';
 export * from './Request';

package/dist/cjs/services/helpers/index.js

@@ -14,5 +14,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./getDefaultQuestionListOptionsAttributes"), exports);
 __exportStar(require("./Request"), exports);

package/dist/columns/constants/COLUMN_LABEL.d.ts

@@ -30,6 +30,7 @@ export declare const COLUMN_LABEL: {
     CHECKLIST: string;
     NPS_SCORE: string;
     NPS_FEEDBACK: string;
+    TEXT: string;
     TEXT_LABEL: string;
     TEXT_CATEGORY: string;
     LOOKUP: string;

package/dist/columns/constants/COLUMN_LABEL.js

@@ -1,4 +1,4 @@
 import { COMPLEX_COLUMN_LABEL } from "./COMPLEX_COLUMN_LABEL";
 import { COMPOUND_COLUMN_LABEL } from "./COMPOUND_COLUMN_LABEL";
 import { NUMERICAL_COLUMN_LABEL } from "./NUMERICAL_COLUMN_LABEL";
-export const COLUMN_LABEL = Object.assign(Object.assign(Object.assign({ SINGLE_CHOICE: 'Single Choice', MULTIPLE_CHOICE: 'Multiple Choice', YES_NO: 'Yes No', RANKING: 'Ranking', DATE: 'Date', SIGNATURE: 'Signature', DROPDOWN: 'Dropdown', IMAGE: 'Image', EMAIL_FORM: 'Email Form', PHONE: 'Phone', PASSWORD: 'Password', CHECKLIST: 'Check List', NPS_SCORE: 'NPS Score', NPS_FEEDBACK: 'NPS Feedback', TEXT_LABEL: 'Text Label', TEXT_CATEGORY: 'Text Category', LOOKUP: 'Lookup', HEADLINE: 'Headline', SECTION: 'Section', FORMULA: 'Formula', AGGREGATED_FORMULA: 'Aggregated Formula', BUCKET: 'Bucket', STRING: 'String' }, NUMERICAL_COLUMN_LABEL), COMPOUND_COLUMN_LABEL), COMPLEX_COLUMN_LABEL);
+export const COLUMN_LABEL = Object.assign(Object.assign(Object.assign({ SINGLE_CHOICE: 'Single Choice', MULTIPLE_CHOICE: 'Multiple Choice', YES_NO: 'Yes No', RANKING: 'Ranking', DATE: 'Date', SIGNATURE: 'Signature', DROPDOWN: 'Dropdown', IMAGE: 'Image', EMAIL_FORM: 'Email Form', PHONE: 'Phone', PASSWORD: 'Password', CHECKLIST: 'Check List', NPS_SCORE: 'NPS Score', NPS_FEEDBACK: 'NPS Feedback', TEXT: 'Text', TEXT_LABEL: 'Text Label', TEXT_CATEGORY: 'Text Category', LOOKUP: 'Lookup', HEADLINE: 'Headline', SECTION: 'Section', FORMULA: 'Formula', AGGREGATED_FORMULA: 'Aggregated Formula', BUCKET: 'Bucket', STRING: 'String' }, NUMERICAL_COLUMN_LABEL), COMPOUND_COLUMN_LABEL), COMPLEX_COLUMN_LABEL);

package/dist/columns/constants/COLUMN_PROPERTY_INFO.js

@@ -8,7 +8,7 @@ import { DATE_GROUPING_TIME_PROPERTY_INFO_LIST } from "../../dates/constants/DAT
 import { DATE_DISTINCT_TIME_PROPERTY_INFO_LIST } from "../../dates/constants/DATE_DISTINCT_TIME_PROPERTY_INFO_LIST";
 export const COLUMN_PROPERTY_INFO = Object.assign(Object.assign({ [COLUMN.LOOKUP]: [
         { value: COLUMN_PROPERTY.LOOKUP_DISPLAY, label: 'Display', shortLabel: 'Display', abbrLabel: 'DSY', displayed: true, i18nLabelPath: 'common.properties.lookup_display_label' },
-        { value: COLUMN_PROPERTY.LOOKUP_VALUE, label: 'Value', shortLabel: 'Value', abbrLabel: 'Val', displayed: true, i18nLabelPath: 'common.properties.lookup_display_value' }
+        { value: COLUMN_PROPERTY.LOOKUP_VALUE, label: 'Value', shortLabel: 'Value', abbrLabel: 'Val', displayed: true, i18nLabelPath: 'common.properties.lookup_value_label' }
     ], [COLUMN.DATE]: [
         ...DATE_GROUPING_PROPERTY_INFO_LIST,
         ...DATE_GROUPING_TIME_PROPERTY_INFO_LIST,

package/dist/columns/constants/index.d.ts

@@ -1,11 +1,7 @@
-export * from './COLUMN_IMAGE_UPLOAD_OPTION_LIST';
-export * from './COLUMN_IMAGE_UPLOAD_OPTION';
 export * from './COLUMN_INFO_LIST';
 export * from './COLUMN_INFO';
-export * from './COLUMN_LABEL';
 export * from './COLUMN_PROPERTIES';
 export * from './COLUMN_PROPERTY_INFO';
-export * from './COLUMN_PROPERTY_LABEL';
 export * from './COLUMN_PROPERTY';
 export * from './COLUMN';
 export * from './COLUMNS';

package/dist/columns/constants/index.js

@@ -1,11 +1,7 @@
-export * from './COLUMN_IMAGE_UPLOAD_OPTION_LIST';
-export * from './COLUMN_IMAGE_UPLOAD_OPTION';
 export * from './COLUMN_INFO_LIST';
 export * from './COLUMN_INFO';
-export * from './COLUMN_LABEL';
 export * from './COLUMN_PROPERTIES';
 export * from './COLUMN_PROPERTY_INFO';
-export * from './COLUMN_PROPERTY_LABEL';
 export * from './COLUMN_PROPERTY';
 export * from './COLUMN';
 export * from './COLUMNS';

package/dist/columns/helpers/index.d.ts

@@ -1,8 +1,3 @@
-export * from './getColumnsLabel';
-export * from './getDatasetByColumn';
-export * from './getDatasetColumn';
-export * from './getDatasetColumnyDatasets';
-export * from './getModelColumn';
 export * from './isComplexColumn';
 export * from './isDateColumn';
 export * from './isNumericalColumn';

package/dist/columns/helpers/index.js

@@ -1,8 +1,3 @@
-export * from './getColumnsLabel';
-export * from './getDatasetByColumn';
-export * from './getDatasetColumn';
-export * from './getDatasetColumnyDatasets';
-export * from './getModelColumn';
 export * from './isComplexColumn';
 export * from './isDateColumn';
 export * from './isNumericalColumn';

package/dist/columns/interfaces/IBColumn.d.ts

@@ -1,28 +1,21 @@
 import { IFormulaType } from "../../formulas/interfaces/IFormulaType";
-import { IBColumAnswer } from "./IBColumAnswer";
-import { IBColumnAnswerExpression } from "./IBColumnAnswerExpression";
-import { IBColumnAnswerExpressionCategory } from "./IBColumnAnswerExpressionCategory";
-import { IBColumnAnswerLookupValue } from "./IBColumnAnswerLookupValue";
-import { IBColumnAnswerSlidebar } from "./IBColumnAnswerSlidebar";
-import { IColumnImageUploadOption } from "./IColumnImageUploadOption";
 import { IColumnOutputFormatSettings } from "./IColumnOutputFormatSettings";
 import { IColumnPropertyType } from "./IColumnPropertyType";
 import { IColumnType } from "./IColumnType";
 /**
- * Structure for columns received in the question/list, model endpoints
+ * Structure for columns used in the  App frontend side
  */
-export interface IBColumn extends Partial<IBColumAnswer>, Partial<IBColumnAnswerExpression>, Partial<IBColumnAnswerExpressionCategory>, Partial<IBColumnAnswerSlidebar>, Partial<IBColumnAnswerLookupValue> {
+export interface IBColumn {
     bucketId?: string;
     formulaId?: string;
     formulaType?: IFormulaType;
     geogroup?: boolean;
     id: string;
-    imageUploadOption?: IColumnImageUploadOption;
+    text: string;
     linked?: boolean;
     linkid?: string;
     outputFormat?: IColumnOutputFormatSettings;
     property?: IColumnPropertyType;
     qrveyid: string;
-    text: string;
     type: IColumnType;
 }

package/dist/columns/interfaces/IColumn.d.ts

@@ -3,24 +3,16 @@ import { IColumnPropertyType } from "./IColumnPropertyType";
 import { IColumnSortingSettings } from "./IColumnSortingSettings";
 import { IBColumn } from "./IBColumn";
 import { IAggregateType } from "../../charts/interfaces/IAggregateType";
-import { IBColumnAnswerExpressionWord } from "./IBColumnAnswerExpressionWord";
-import { IBColumnAnswerLookupValueValue } from "./IBColumnAnswerLookupValueValue";
 /**
  * Structure for columns used in the  App frontend side
  */
-export interface IColumn extends Omit<IBColumn, "text" | "bucketId" | "formulaId" | "sliderVal" | "value" | "words" | "negative" | "positive" | "activeCat"> {
+export interface IColumn extends Omit<IBColumn, "text" | "bucketId" | "formulaId"> {
     bucketid?: string;
     aggregate?: IAggregateType;
     calculation?: IColumnCalculationType;
-    expressionCategory?: boolean;
-    expressionNegative?: IBColumnAnswerExpressionWord[];
-    expressionPositive?: IBColumnAnswerExpressionWord[];
-    expressionWords?: IBColumnAnswerExpressionWord[];
     formulaid?: string;
     label?: string;
     linkid?: string;
-    lookupValue?: IBColumnAnswerLookupValueValue;
     property?: IColumnPropertyType;
-    slidebarValue?: number;
     sorting?: IColumnSortingSettings;
 }

package/dist/columns/interfaces/index.d.ts

@@ -1,16 +1,5 @@
-export * from './IBColumAnswer';
 export * from './IBColumn';
-export * from './IBColumnAnswerExpression';
-export * from './IBColumnAnswerExpressionCategory';
-export * from './IBColumnAnswerExpressionWord';
-export * from './IBColumnAnswerGeneral';
-export * from './IBColumnAnswerImages';
-export * from './IBColumnAnswerLookupAnswer';
-export * from './IBColumnAnswerLookupAnswerAnswer';
-export * from './IBColumnAnswerLookupValueValue';
-export * from './IBColumnAnswerSlidebar';
 export * from './IColumn';
-export * from './IColumnImageUploadOption';
 export * from './IColumnInfo';
 export * from './IColumnOutputFormatSettings';
 export * from './IColumnPropertyInfo';

package/dist/columns/interfaces/index.js

@@ -1,16 +1,5 @@
-export * from './IBColumAnswer';
 export * from './IBColumn';
-export * from './IBColumnAnswerExpression';
-export * from './IBColumnAnswerExpressionCategory';
-export * from './IBColumnAnswerExpressionWord';
-export * from './IBColumnAnswerGeneral';
-export * from './IBColumnAnswerImages';
-export * from './IBColumnAnswerLookupAnswer';
-export * from './IBColumnAnswerLookupAnswerAnswer';
-export * from './IBColumnAnswerLookupValueValue';
-export * from './IBColumnAnswerSlidebar';
 export * from './IColumn';
-export * from './IColumnImageUploadOption';
 export * from './IColumnInfo';
 export * from './IColumnOutputFormatSettings';
 export * from './IColumnPropertyInfo';

package/dist/dates/constants/DATE_REGULAR_EXPRESSION.js

@@ -22,7 +22,7 @@ export const DATE_REGULAR_EXPRESSION = {
     SECOND: `^${YEAR_MONTH_NUMBER}/${MONTH_DAY}/${YEAR} ${DAY_TIME}$`,
     MONTH_DAY: `^${MONTH_DAY}$`,
     YEAR_MONTH: `^${YEAR_MONTH}$`,
-    YEAR_MONTH_NUMBER: `${YEAR_MONTH_NUMBER}`,
+    YEAR_MONTH_NUMBER: `^${YEAR_MONTH_NUMBER}$`,
     YEAR_QUARTER: `^${YEAR_QUARTER}$`,
     YEAR_WEEK: `^${YEAR_WEEK}$`,
     DAY_HOUR: `^${DAY_HOUR}$`,

package/dist/dates/constants/index.d.ts

@@ -26,7 +26,6 @@ export * from './DATE_HOUR_MINUTES';
 export * from './DATE_MINUTE_SECONDS';
 export * from './DATE_MONTH_DAYS';
 export * from './DATE_REGULAR_EXPRESSION';
-export * from './DATE_WEEK_DAYS_DDDD';
 export * from './DATE_WEEK_DAYS';
 export * from './DATE_YEAR_DAYS';
 export * from './DATE_YEAR_MONTHS';

package/dist/dates/constants/index.js

@@ -26,7 +26,6 @@ export * from './DATE_HOUR_MINUTES';
 export * from './DATE_MINUTE_SECONDS';
 export * from './DATE_MONTH_DAYS';
 export * from './DATE_REGULAR_EXPRESSION';
-export * from './DATE_WEEK_DAYS_DDDD';
 export * from './DATE_WEEK_DAYS';
 export * from './DATE_YEAR_DAYS';
 export * from './DATE_YEAR_MONTHS';

package/dist/dates/helpers/getSeparatorByDateFormat.js

@@ -5,7 +5,7 @@ import { DATE_FORMAT } from "../constants/DATE_FORMAT";
  * @returns a separator string
  */
 export function getSeparatorByDateFormat(format = DATE_FORMAT.DAY) {
-    return format === DATE_FORMAT.YEAR || format === DATE_FORMAT.DAY_TIME || format === DATE_FORMAT.MONTH_DAY || format === DATE_FORMAT.YEAR_MONTH || format === DATE_FORMAT.YEAR_QUARTER || format === DATE_FORMAT.YEAR_WEEK || format === DATE_FORMAT.DAY_HOUR || format === DATE_FORMAT.HOUR_MINUTE || format === DATE_FORMAT.MINUTE_SECOND ? '' :
+    return format === DATE_FORMAT.YEAR || format === DATE_FORMAT.DAY_TIME || format === DATE_FORMAT.MONTH_DAY || format === DATE_FORMAT.YEAR_MONTH || format === DATE_FORMAT.YEAR_QUARTER || format === DATE_FORMAT.YEAR_WEEK || format === DATE_FORMAT.DAY_HOUR || format === DATE_FORMAT.HOUR_MINUTE || format === DATE_FORMAT.MINUTE_SECOND ? ' ' :
         format === DATE_FORMAT.MONTH || format === DATE_FORMAT.QUARTER || format === DATE_FORMAT.WEEK || format === DATE_FORMAT.HOUR || format === DATE_FORMAT.MINUTE || format === DATE_FORMAT.SECOND ? ' ' :
             '/';
 }

package/dist/dates/helpers/index.d.ts

@@ -1,4 +1,3 @@
-export * from './getDateByDateFormat';
 export * from './getDateFormatByProperty';
 export * from './getDateFormatRegularExpressionInArray';
 export * from './getSeparatorByDateFormat';

package/dist/dates/helpers/index.js

@@ -1,4 +1,3 @@
-export * from './getDateByDateFormat';
 export * from './getDateFormatByProperty';
 export * from './getDateFormatRegularExpressionInArray';
 export * from './getSeparatorByDateFormat';

package/dist/dates/index.d.ts

@@ -1,4 +1,3 @@
-export * from './adapters/index';
 export * from './constants/index';
 export * from './helpers/index';
 export * from './interfaces/index';

package/dist/dates/index.js

@@ -1,4 +1,3 @@
-export * from './adapters/index';
 export * from './constants/index';
 export * from './helpers/index';
 export * from './interfaces/index';

package/dist/dates/relative/constants/RELATIVE_CURSOR_INFO_LIST.d.ts

@@ -1,4 +1,4 @@
-import { IRelativeCursorInfo } from "../interfaces/IRelativeCursorInfo";
+import { IRelativeCursorInfo } from "..";
 /**
  * @description Key/array of compound relative cursor info
  */

package/dist/filters/adapters/FDToFlatUI.js

@@ -80,7 +80,6 @@ function FD21ToFlatUI(scopes = [], datasetsInfo = []) {
                             nullValues: filter.nullValues,
                             operator: filter.operator,
                             property: property,
-                            selectAll: filter.selectAll,
                             validator: filter.validator,
                             values: adaptFilterValues(filter),
                         };

package/dist/filters/adapters/UIToFD.js

@@ -20,10 +20,9 @@ export function UIToFD(uFilterData) {
 }
 /**
  * Builds the Fitler Data structure from UI filter data
- * @private
  * @param uFilterData The UI filter Data object
  * @param version the version of the structure
- * @returns a Filter Data structure
+ * @returns
  */
 function UI21ToFD(uFilterData, version) {
     return {

package/dist/filters/adapters/UIToFlatUI.js

@@ -78,7 +78,6 @@ function UI21ToFlatUI(scopes = [], datasetsInfo = []) {
                             nullValues: filter.nullValues,
                             operator: filter.operator,
                             property,
-                            selectAll: filter.selectAll,
                             validator: filter.validator,
                             values: adaptFilterValues(filter),
                         };

package/dist/filters/adapters/UIToOldLogic.js

@@ -65,7 +65,6 @@ function buildFilters(datasetSection, scope) {
 }
 function buildExpressions(filterSection, scope, dataset) {
     return filterSection.reduce((expressions, filter) => {
-        var _a;
         const expression = {
             enabled: filter.enabled,
             formulaType: filter.column.formulaType,
@@ -75,11 +74,11 @@ function buildExpressions(filterSection, scope, dataset) {
             qrveyid: filter.column.qrveyid,
             questionType: filter.column.type,
             questionid: filter.column.id,
-            validationType: getBackendValidator(filter),
+            validationType: getBackendValidator(filter.validator),
             value: getBackendValues(filter),
             uiExtras: getFilterDetail(filter, scope, dataset),
         };
-        expression['enabled'] = filter.selectAll || ((_a = expression.value) === null || _a === void 0 ? void 0 : _a.length) > 0 ? filter.enabled : false;
+        expression['enabled'] = expression.value.length > 0 ? filter.enabled : false;
         expressions.push(expression);
         return expressions;
     }, []);
@@ -120,7 +119,7 @@ const getFilterDetail = (filter, scope, dataset) => {
             },
             id: filter.column.id,
             qrveyid: filter.column.qrveyid,
-            text: filter.column.label,
+            label: filter.column.label,
             type: filter.column.type,
             aggregate: filter.column.aggregate,
             calculation: filter.column.calculation,
@@ -145,7 +144,6 @@ const getFilterDetail = (filter, scope, dataset) => {
         panelid: filter.extras.panelid,
         panelName: filter.extras.filterLabel,
         section: filter.extras.section,
-        selectAll: filter.selectAll,
         uiValue: getUIValues(filter, { addEnableds: true }),
         validator: filter.validator,
         values: adaptFilterValues(filter)

package/dist/filters/adapters/adaptDateGroupingProperty.d.ts

@@ -2,7 +2,7 @@ import { IFProperty } from "../interfaces/IFProperty";
 /**
  * [TODO: For 2022, eliminate this adapter]
  * Get the new property base on the old date grouping properties
- * @param property the property to be adapted
- * @returns a adapted property
+ * @param property
+ * @returns
  */
 export declare function adaptDateGroupingProperty(property: IFProperty | any): IFProperty;

package/dist/filters/adapters/adaptDateGroupingProperty.js

@@ -3,8 +3,8 @@ import { DATE_DISTINCT_TIME_PROPERTY } from "../../dates/constants/DATE_DISTINCT
 /**
  * [TODO: For 2022, eliminate this adapter]
  * Get the new property base on the old date grouping properties
- * @param property the property to be adapted
- * @returns a adapted property
+ * @param property
+ * @returns
  */
 export function adaptDateGroupingProperty(property) {
     return property === 'p&quarter' ? DATE_DISTINCT_PROPERTY.YEAR_QUARTER :

package/dist/filters/adapters/adaptFilterValues.js

@@ -9,7 +9,7 @@ import { COLUMN } from "../../columns/constants/COLUMN";
 export function adaptFilterValues(filter) {
     const setValue = value => (Object.assign(Object.assign({}, value), { value: isEmpty(value.value) ? undefined : value.value, enabled: isEmpty(value.enabled) ? true : value.enabled }));
     if (filter.column.type === COLUMN.RANKING && isEmpty(filter.column.aggregate)) {
-        return (filter.values || []).map(rValues => rValues.map(setValue));
+        return filter.values.map(rValues => rValues.map(setValue));
     }
-    return ((filter.values || []) || []).map(setValue);
+    return filter.values.map(setValue);
 }

package/dist/filters/adapters/flatUIToFD.js

@@ -103,7 +103,6 @@ function buildFilter(uFilter) {
         nullValues: uFilter.nullValues,
         operator: uFilter.operator,
         property,
-        selectAll: uFilter.selectAll,
         validator: uFilter.validator,
         values: adaptFilterValues(uFilter),
     };

package/dist/filters/adapters/flatUIToOldLogic.js

@@ -86,7 +86,6 @@ const flatUIToOldFilterDetail = (uFilters = []) => {
             panelid: filter.extras.panelid,
             panelName: filter.extras.filterLabel,
             section: filter.extras.section,
-            selectAll: filter.selectAll,
             uiValue: getUIValues(filter, { addEnableds: true }),
             validator: filter.validator,
             values: filter.values,
@@ -148,14 +147,13 @@ export function getExpressionId(props) {
     return `${props.column && props.column.id}|${props.scopeid}|${props.panelid || ''}`;
 }
 function getRankingExpressions(props) {
-    const values = props.values || [];
+    const values = props.values;
     return values.map((_value, index) => {
-        const expression = Object.assign(Object.assign({}, getRegularExpression(Object.assign(Object.assign({}, props), { values: [props.values[index]] }))), { validationType: getBackendValidator(props) });
+        const expression = Object.assign(Object.assign({}, getRegularExpression(Object.assign(Object.assign({}, props), { values: [props.values[index]] }))), { validationType: getBackendValidator(props.validator) });
         return Object.assign(Object.assign({}, expression), { value: getValues(props, index), uiExtras: Object.assign(Object.assign({}, expression.uiExtras), { uiValue: getUIValuess(props, index) }) });
     });
 }
 function getRegularExpression(props) {
-    var _a;
     const uiValue = getUIValuess(props);
     const expression = {
         groupValue: getBackendGroupValue(props),
@@ -165,11 +163,11 @@ function getRegularExpression(props) {
         questionid: props.column.id,
         questionType: props.column.type,
         formulaType: props.column.formulaType,
-        validationType: getBackendValidator(props),
+        validationType: getBackendValidator(props.validator),
         value: getValues(props),
         uiExtras: Object.assign(Object.assign({}, props), { uiValue })
     };
-    expression['enabled'] = props.selectAll || ((_a = expression.value) === null || _a === void 0 ? void 0 : _a.length) > 0 ? props.enabled : false;
+    expression['enabled'] = expression.value.length > 0 ? props.enabled : false;
     return expression;
 }
 // function getGroupValue(props: OLD_IFilterDetail): IFProperty {
@@ -248,86 +246,72 @@ function getNullValueExpression(props) {
 function getValues(props, rankingGroupIndex) {
     // const isDateProperty = !!(isDateColumn(props.column) && props.property && isEmpty(props.column.aggregate));
     // const dateFormat = getDateFormatByProperty(props.property);
-    const values = props.values || [];
     switch (props.validator) {
         case FILTER_VALIDATOR.EQUALS:
         case FILTER_VALIDATOR.NOT_EQUAL:
             if (props.column.type === COLUMN.RANKING && isEmpty(props.column.aggregate))
-                return getRankingValues(values, rankingGroupIndex);
-            return getResultValues(values, props);
+                return getRankingValues(props.values, rankingGroupIndex);
+            return getResultValues(props.values, props);
         case FILTER_VALIDATOR.CONTAINS:
         case FILTER_VALIDATOR.NOT_CONTAIN:
         case FILTER_VALIDATOR.STARTS_WITH:
         case FILTER_VALIDATOR.NOT_START_WITH:
         case FILTER_VALIDATOR.ENDS_WITH:
         case FILTER_VALIDATOR.NOT_END_WITH:
-            return values.map(value => value.enabled ? value.value : undefined);
+            return props.values.map(value => value.enabled ? value.value : undefined);
         case FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
-            return values.map(value => value.enabled ?
-                { lte: value.max, gte: value.min }
-                : undefined).filter(Boolean);
+            return props.values.map(value => value.enabled ? ({ lte: value.max, gte: value.min }) : undefined).filter(Boolean);
         case FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
-            return values.map(value => value.enabled ?
-                { lt: value.max, gt: value.min }
-                : undefined).filter(Boolean);
+            return props.values.map(value => value.enabled ? ({ lt: value.max, gt: value.min }) : undefined).filter(Boolean);
         case FILTER_VALIDATOR.BEFORE:
         case FILTER_VALIDATOR.LESS_THAN:
-            return values.map(value => value.enabled ?
-                { lt: value.max }
-                : undefined).filter(Boolean);
+            return props.values.map(value => value.enabled ? ({ lt: value.max }) : undefined).filter(Boolean);
         case FILTER_VALIDATOR.BEFORE_ON:
         case FILTER_VALIDATOR.LESS_THAN_EQUAL:
-            return values.map(value => value.enabled ?
-                { lte: value.max }
-                : undefined).filter(Boolean);
+            return props.values.map(value => value.enabled ? ({ lte: value.max }) : undefined).filter(Boolean);
         case FILTER_VALIDATOR.AFTER:
         case FILTER_VALIDATOR.GREATER_THAN:
-            return values.map(value => value.enabled ?
-                { gt: value.min }
-                : undefined).filter(Boolean);
+            return props.values.map(value => value.enabled ? ({ gt: value.min }) : undefined).filter(Boolean);
         case FILTER_VALIDATOR.AFTER_ON:
         case FILTER_VALIDATOR.GREATER_THAN_EQUAL:
-            return values.map(value => value.enabled ?
-                { gte: value.min }
-                : undefined).filter(Boolean);
+            return props.values.map(value => value.enabled ? ({ gte: value.min }) : undefined).filter(Boolean);
         case FILTER_VALIDATOR.IS_NULL:
         case FILTER_VALIDATOR.IS_NOT_NULL: {
-            const addValue = values.length > 0 && values.every(value => value.enabled);
+            const addValue = props.values.length > 0 && props.values.every(value => value.enabled);
             return addValue ? [FILTER_VALIDATOR_INFO[props.validator].label] : [];
         }
         case FILTER_VALIDATOR.IN:
-            return values.map(value => value.enabled ? value : undefined).filter(Boolean);
+            return props.values.map(value => value.enabled ? value : undefined).filter(Boolean);
         default:
             return [];
     }
 }
 function getUIValuess(props, rankingGroupIndex) {
     var _a, _b;
-    const values = props.values || [];
     switch (props.validator) {
         case FILTER_VALIDATOR.AFTER:
         case FILTER_VALIDATOR.GREATER_THAN:
         case FILTER_VALIDATOR.AFTER_ON:
         case FILTER_VALIDATOR.GREATER_THAN_EQUAL:
-            return values.map(value => (Object.assign(Object.assign({}, value), { value: value.min, enabled: value.enabled != null ? value.enabled : true })));
+            return props.values.map(value => (Object.assign(Object.assign({}, value), { value: value.min, enabled: value.enabled != null ? value.enabled : true })));
         case FILTER_VALIDATOR.BEFORE_ON:
         case FILTER_VALIDATOR.LESS_THAN_EQUAL:
         case FILTER_VALIDATOR.BEFORE:
         case FILTER_VALIDATOR.LESS_THAN:
-            return values.map(value => (Object.assign(Object.assign({}, value), { value: value.max, enabled: value.enabled != null ? value.enabled : true })));
+            return props.values.map(value => (Object.assign(Object.assign({}, value), { value: value.max, enabled: value.enabled != null ? value.enabled : true })));
         case FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
         case FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
-            return values.map(value => (Object.assign(Object.assign({}, value), { value: `${value.min} - ${value.max}`, enabled: value.enabled != null ? value.enabled : true })));
+            return props.values.map(value => (Object.assign(Object.assign({}, value), { value: `${value.min} - ${value.max}`, enabled: value.enabled != null ? value.enabled : true })));
         case FILTER_VALIDATOR.IS_NULL:
         case FILTER_VALIDATOR.IS_NOT_NULL:
-            return [{ value: FILTER_VALIDATOR_INFO[props.validator].label, enabled: (_b = (_a = values[0]) === null || _a === void 0 ? void 0 : _a.enabled) !== null && _b !== void 0 ? _b : props.enabled }];
+            return [{ value: FILTER_VALIDATOR_INFO[props.validator].label, enabled: (_b = (_a = props.values[0]) === null || _a === void 0 ? void 0 : _a.enabled) !== null && _b !== void 0 ? _b : props.enabled }];
         case FILTER_VALIDATOR.IN:
-            return values.map(value => (Object.assign(Object.assign({}, value), { value: `${RELATIVE_CURSOR_INFO[value.cursor].label} ${value.cursor !== RELATIVE_CURSOR.THIS && value.number > 1 ? value.number : ''} ${getValueUiUnitRelativeDate(value)} ${value.cursor !== RELATIVE_CURSOR.THIS ? `from ${value.anchor || 'current date'}` : ''}`, enabled: props.enabled })));
+            return props.values.map(value => (Object.assign(Object.assign({}, value), { value: `${RELATIVE_CURSOR_INFO[value.cursor].label} ${value.cursor !== RELATIVE_CURSOR.THIS && value.number > 1 ? value.number : ''} ${getValueUiUnitRelativeDate(value)} ${value.cursor !== RELATIVE_CURSOR.THIS ? `from ${value.anchor || 'current date'}` : ''}`, enabled: props.enabled })));
         default:
             if (props.column.type === COLUMN.RANKING && isEmpty(props.column.aggregate)) {
-                return getRankingUIValues(values, rankingGroupIndex);
+                return getRankingUIValues(props.values, rankingGroupIndex);
             }
-            return values.map(val => (Object.assign(Object.assign({}, val), { enabled: val.enabled != null ? val.enabled : true })));
+            return (props.values || []).map(val => (Object.assign(Object.assign({}, val), { enabled: val.enabled != null ? val.enabled : true })));
     }
 }
 function getValueUiUnitRelativeDate(relative) {
@@ -335,10 +319,10 @@ function getValueUiUnitRelativeDate(relative) {
 }
 function getRankingValues(values, rankingGroupIndex) {
     const flattenValues = isNull(rankingGroupIndex) ? flattenDeep(values) : values[rankingGroupIndex];
-    return flattenValues.map(rankingValue => rankingValue.enabled ? {
+    return flattenValues.map(rankingValue => rankingValue.enabled ? ({
         position: rankingValue.position - 1,
         value: rankingValue.value.value
-    } : undefined).filter(Boolean);
+    }) : undefined).filter(Boolean);
 }
 function getRankingUIValues(values, rankingGroupIndex) {
     const flattenValues = isNull(rankingGroupIndex) ? flattenDeep(values) : values[rankingGroupIndex];
@@ -350,7 +334,7 @@ function getRankingUIValues(values, rankingGroupIndex) {
     }));
 }
 function getResultValues(values, props) {
-    return (values || []).map((value) => {
+    return values.map((value) => {
         if (value.enabled) {
             if (props.column.type === COLUMN.IMAGE) {
                 return value.valueid || value.imageUrl || value.value;

package/dist/filters/adapters/flatUIToUI.js

@@ -117,7 +117,6 @@ function buildFilter(uFilter) {
         nullValues: uFilter.nullValues,
         operator: uFilter.operator,
         property,
-        selectAll: uFilter.selectAll,
         validator: uFilter.validator,
         values: adaptFilterValues(uFilter),
     };

package/dist/filters/adapters/index.d.ts

@@ -1,8 +1,6 @@
 export * from './transformFilters';
-export * from './modelAnswerToFilterValue';
 export * from './adaptDateGroupingProperty';
 export * from './adaptFilterData';
-export * from './adaptFilterValues';
 export * from './FDToFlatUI';
 export * from './FDToLogic';
 export * from './FDToUI';

package/dist/filters/adapters/index.js

@@ -1,8 +1,6 @@
 export * from './transformFilters';
-export * from './modelAnswerToFilterValue';
 export * from './adaptDateGroupingProperty';
 export * from './adaptFilterData';
-export * from './adaptFilterValues';
 export * from './FDToFlatUI';
 export * from './FDToLogic';
 export * from './FDToUI';