@qrvey/utils 1.3.3 → 1.4.0-2

package/src/filters/adapters/flatUIToOldLogic.ts

@@ -1,443 +0,0 @@
-import { FILTER_SECTION } from "../constants/common/FILTER_SECTION";
-import { OLD_IFilterData } from "../interfaces/OLD_IFilterData";
-import { IFSection } from "../interfaces/IFSection";
-import { IFUFlattenedFilter } from "../interfaces/ui/IFUFlattenedFilter";
-import { isEmpty } from "../../general/mix/isEmpty";
-import { cloneDeep } from "../../general/object/cloneDeep";
-import { OLD_IFilterDetail } from "../interfaces/OLD_IFilterDetail";
-import { getUIValues } from "../helpers/ui/getUIValues";
-import { OLD_IFilterLogic } from "../interfaces/OLD_IFilterLogic";
-import { FILTER_OPERATOR } from "../constants/common/FILTER_OPERATOR";
-import { _get } from "../../general/object/get";
-import { OLD_IFilterExpression } from "../interfaces/OLD_IFilterExpression";
-import { COLUMN } from "../../columns/constants/COLUMN";
-import { IFSValueRanking } from "../interfaces/common/IFSValueRanking";
-import { IFValue } from "../interfaces/IFValue";
-import { getBackendValidator } from "../helpers/backend/getBackendValidator";
-import { FILTER_VALIDATOR } from "../constants/common/FILTER_VALIDATOR";
-import { IFBackendExpressionValue } from "../interfaces/backend/IFBackendExpressionValue";
-import { IFSValue } from "../interfaces/common/IFSValue";
-import { IFSValueRange } from "../interfaces/common/IFSValueRange";
-import { FILTER_VALIDATOR_INFO } from "../constants/common/FILTER_VALIDATOR_INFO";
-import { IFBExpressionRelativeDate } from "../interfaces/backend/IFBExpressionRelativeDate";
-import { IFSValueRelativeDate } from "../interfaces/common/IFSValueRelativeDate";
-import { RELATIVE_CURSOR_INFO } from "../../dates/relative/constants/RELATIVE_CURSOR_INFO";
-import { RELATIVE_CURSOR } from "../../dates/relative/constants/RELATIVE_CURSOR";
-import { isNull } from "../../general/mix/isNull";
-import { flattenDeep } from "../../general/array/flattenDeep";
-import { getBackendGroupValue } from "../helpers/backend/getBackendGroupValue";
-import { getBackendProperty } from "../helpers/backend/getBackendProperty";
-
-/**
- * Generates a Logic structure from flattened UI filters
- * @param uFilters Array of flat filters from UI
- * @returns The logic structure
- */
-export function flatUIToOldLogic(uFilters: IFUFlattenedFilter[], section: IFSection = FILTER_SECTION.ANYWHERE): OLD_IFilterData {
-    let oldFilterData: OLD_IFilterData;
-    if (isEmpty(uFilters)) return oldFilterData;
-    uFilters = cloneDeep(uFilters);
-
-    const filterDetails = flatUIToOldFilterDetail(uFilters);
-    return {
-        collapsed: false,
-        enabled: true,
-        section,
-        logic: getLogicBody(filterDetails),
-    };
-}
-
-const flatUIToOldFilterDetail = (uFilters: IFUFlattenedFilter[] = []): OLD_IFilterDetail[] => {
-  return uFilters.map<OLD_IFilterDetail>(filter => {
-    // let aggregate, calculation;
-    // if (filter.column.aggregate != null) {
-    //     aggregate = {
-    //         abbreviation: undefined, // CANNOT ADD AT THIS SCOPE
-    //         id: undefined, // CANNOT ADD AT THIS SCOPE
-    //         label: filter.column.aggregate,
-    //         text: undefined, // CANNOT ADD AT THIS SCOPE
-    //     };
-    // }
-    // if (filter.column.calculation != null) {
-    //     calculation = {
-    //         abbreviation: undefined, // CANNOT ADD AT THIS SCOPE
-    //         id: undefined, // CANNOT ADD AT THIS SCOPE
-    //         text: undefined,
-    //         type: undefined,
-    //         value: filter.column.calculation,
-    //     };
-    // }
-    return {
-      collapsed: filter.collapsed,
-      column: {
-          dataset: {
-            name: filter.extras.dataset.label,
-            qrveyid: filter.extras.dataset.qrveyid,
-          },
-          id: filter.column.id,
-          qrveyid: filter.column.qrveyid,
-          text: filter.column.label,
-          type: filter.column.type,
-          aggregate: filter.column.aggregate,
-          calculation: filter.column.calculation,
-          formulaType: filter.column.formulaType,
-          linked: undefined,
-          linkid: filter.column.linkid,
-          outputFormat: filter.column.outputFormat,
-          property: filter.column.property,
-          sorting: filter.column.sorting,
-      },
-      dateSection: filter.dateSection,
-      enabled: filter.enabled,
-      extras: filter.extras,
-      lookupDisplayIndex: filter.lookupDisplayIndex,
-      info: filter.extras.info,
-      nullValues: filter.nullValues,
-      operator: filter.operator,
-      property: filter.property,
-      scope: filter.extras.scope,
-      scopeid: filter.extras.scopeid,
-      scopeEnabled: filter.extras.scopeInfo.enabled,
-      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,
-      _newFilters: { ...filter }
-    };
-  });
-};
-
-
-
-export function getLogicBody(uFilters: OLD_IFilterDetail[]): OLD_IFilterLogic[] {
-  return uFilters.reduce((scopes: OLD_IFilterLogic[], props: OLD_IFilterDetail) => {
-    const scopeIndex = scopes.findIndex(sc => sc.scope === props.scope && sc.uiExtras.scopeid === props.scopeid);
-    const expId = getExpressionId(props);
-    const filterItem = {
-      operator: props.operator,
-      expressions: [
-        {
-          uiExtras: { expressionid: expId },
-          operator: FILTER_OPERATOR.OR,
-          expressions: getExpressions(props)
-        }
-      ]
-    };
-    if (scopeIndex === -1) {
-      scopes.push({
-        enabled: props.scopeEnabled != null ? props.scopeEnabled : true,
-        scope: props.scope,
-        filters: [filterItem],
-        uiExtras: {
-          scopeid: props.scopeid,
-          collapsed: _get(props, '_newFilters.extras.scopeInfo.collapsed', false),
-        }
-      });
-    } else {
-      const filterIndex = scopes[scopeIndex].filters.findIndex(f => _get(f.expressions[0], 'uiExtras.expressionid') === expId);
-      if (filterIndex === -1) {
-        scopes[scopeIndex].filters.push(filterItem);
-      } else {
-        scopes[scopeIndex].filters[filterIndex].expressions[0].expressions.push(...getExpressions(props) as any);
-      }
-    }
-    return scopes;
-  }, [] as OLD_IFilterLogic[]);
-}
-
-function getExpressions(props: OLD_IFilterDetail): OLD_IFilterExpression[] {
-  let expressions: OLD_IFilterExpression[] = [];
-  if (props.column.type === COLUMN.RANKING && isEmpty(props.column.aggregate)) {
-    expressions = expressions.concat(getRankingExpressions(props));
-  } else {
-    expressions.push(getRegularExpression(props));
-  }
-  if (props.nullValues) {
-    expressions.push(getNullValueExpression({ ...props }));
-  }
-  return expressions;
-}
-
-export function getExpressionId(props: OLD_IFilterDetail): string {
-  return `${props.column && props.column.id}|${props.scopeid}|${props.panelid || ''}`;
-}
-
-function getRankingExpressions(props: OLD_IFilterDetail): OLD_IFilterExpression[] {
-  const values = props.values as IFSValueRanking[][] || [];
-  return values.map((_value, index) => {
-    const expression: OLD_IFilterExpression = {
-      ...getRegularExpression({ ...props, values: [props.values[index]] as IFValue[] }), // Each uiExtras.value array in each expression of Ranking. For editing, removing and disabling values.
-      validationType: getBackendValidator(props as any)
-    };
-    return {
-      ...expression,
-      value: getValues(props, index),
-      uiExtras: { ...expression.uiExtras, uiValue: getUIValuess(props, index) }
-    };
-  });
-}
-
-function getRegularExpression(props: OLD_IFilterDetail): OLD_IFilterExpression {
-  const uiValue = getUIValuess(props);
-  const expression = {
-    groupValue: getBackendGroupValue(props as any),
-    linkid: props.column.linkid,
-    property: getBackendProperty(props as any),
-    qrveyid: props.column.qrveyid,
-    questionid: props.column.id,
-    questionType: props.column.type,
-    formulaType: props.column.formulaType,
-    validationType: getBackendValidator(props as any),
-    value: getValues(props),
-    uiExtras: {
-      ...props,
-      uiValue
-    }
-  };
-  expression['enabled'] = props.selectAll || expression.value?.length > 0 ? props.enabled : false;
-
-  return expression;
-}
-
-// function getGroupValue(props: OLD_IFilterDetail): IFProperty {
-//   if (!isDateDistinctProperty(props.column as any, props.property) && isEmpty(props.column.aggregate) && isDateColumn(props.column) && props.property) {
-//     return props.property;
-//   }
-// }
-
-// function getProperty(props: OLD_IFilterDetail) {
-//   if (isEmpty(props.column.aggregate)) {
-//     if (isNullValidator(props.validator) || isDateColumn(props.column as any)) {
-//       return undefined;
-//     } else if (props.column.type === COLUMN.EXPRESSION && props.property != null) {
-//         return undefined;
-//     } else if (props.column.type === COLUMN.LOOKUP && props.property === COLUMN_PROPERTY.LOOKUP_DISPLAY && props.lookupDisplayIndex != null) {
-//       return props.property.concat('_').concat(props.lookupDisplayIndex.toString()) as any;
-//     } else if (props.column.type === COLUMN.IMAGE) {
-//       return COLUMN_PROPERTY.IMAGE_ANSWER_ID;
-//     }
-//   }
-//   return props.property;
-// }
-
-// function getValidationType(props: OLD_IFilterDetail): IFBackendValidator {
-//   // if (isDateColumn(props.column) && props.property && isEmpty(props.column.aggregate) && !isNullValidator(props.validator) && PROPERTY_TYPE.DATE_SECOND !== props.property) {
-//   //   return props.validator === VALIDATORS_TYPE.NOT_EQUAL
-//   //     ? BACKEND_VALIDATORS_TYPE.NOT_RANGE
-//   //     : BACKEND_VALIDATORS_TYPE.RANGE;
-//   // }
-//   switch (props.validator) {
-//     case FILTER_VALIDATOR.EQUALS:
-//       return FILTER_BACKEND_VALIDATOR.EQUALS;
-//     case FILTER_VALIDATOR.NOT_EQUAL:
-//       return FILTER_BACKEND_VALIDATOR.NOT_EQUAL;
-//     case FILTER_VALIDATOR.CONTAINS:
-//       return FILTER_BACKEND_VALIDATOR.CONTAINS;
-//     case FILTER_VALIDATOR.NOT_CONTAIN:
-//       return FILTER_BACKEND_VALIDATOR.NOT_CONTAIN;
-//     case FILTER_VALIDATOR.ENDS_WITH:
-//       return FILTER_BACKEND_VALIDATOR.ENDS_WITH;
-//     case FILTER_VALIDATOR.NOT_END_WITH:
-//       return FILTER_BACKEND_VALIDATOR.NOT_END_WITH;
-//     case FILTER_VALIDATOR.STARTS_WITH:
-//       return FILTER_BACKEND_VALIDATOR.STARTS_WITH;
-//     case FILTER_VALIDATOR.NOT_START_WITH:
-//       return FILTER_BACKEND_VALIDATOR.NOT_START_WITH;
-//     case FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
-//     case FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
-//     case FILTER_VALIDATOR.LESS_THAN:
-//     case FILTER_VALIDATOR.BEFORE:
-//     case FILTER_VALIDATOR.LESS_THAN_EQUAL:
-//     case FILTER_VALIDATOR.BEFORE_ON:
-//     case FILTER_VALIDATOR.GREATER_THAN:
-//     case FILTER_VALIDATOR.AFTER:
-//     case FILTER_VALIDATOR.GREATER_THAN_EQUAL:
-//     case FILTER_VALIDATOR.AFTER_ON:
-//       return FILTER_BACKEND_VALIDATOR.RANGE;
-//     case FILTER_VALIDATOR.IS_NULL:
-//       return FILTER_BACKEND_VALIDATOR.IS_NULL;
-//     case FILTER_VALIDATOR.IS_NOT_NULL:
-//       return FILTER_BACKEND_VALIDATOR.IS_NOT_NULL;
-//     case FILTER_VALIDATOR.IN:
-//       // Validate with backend if this will always be the validator type
-//       return FILTER_BACKEND_VALIDATOR.RELATIVE;
-//     default:
-//       return FILTER_BACKEND_VALIDATOR.EQUALS;
-//   }
-// }
-
-function getNullValueExpression(props: OLD_IFilterDetail): OLD_IFilterExpression {
-  delete props.property;
-  delete props.lookupDisplayIndex;
-  delete props.values;
-
-  props.enabled = true;
-  props.validator = FILTER_VALIDATOR.IS_NULL;
-  props.uiHidden = true;
-  return getRegularExpression(props);
-}
-
-function getValues(props: OLD_IFilterDetail, rankingGroupIndex?: number): IFBackendExpressionValue[] {
-  // 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 as IFSValueRanking[][], rankingGroupIndex);
-      return getResultValues(values as IFSValue[], 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 as IFSValue[]).map(value => value.enabled ? value.value : undefined);
-    case FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
-      return (values as IFSValueRange[]).map(value => value.enabled ?
-        { lte: value.max, gte: value.min }
-      : undefined).filter(Boolean);
-    case FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
-      return (values as IFSValueRange[]).map(value => value.enabled ?
-        { lt: value.max, gt: value.min }
-      : undefined).filter(Boolean);
-    case FILTER_VALIDATOR.BEFORE:
-    case FILTER_VALIDATOR.LESS_THAN:
-      return (values as IFSValueRange[]).map(value => value.enabled ?
-        { lt: value.max }
-      : undefined).filter(Boolean);
-    case FILTER_VALIDATOR.BEFORE_ON:
-    case FILTER_VALIDATOR.LESS_THAN_EQUAL:
-      return (values as IFSValueRange[]).map(value => value.enabled ?
-        { lte: value.max }
-      : undefined).filter(Boolean);
-    case FILTER_VALIDATOR.AFTER:
-    case FILTER_VALIDATOR.GREATER_THAN:
-      return (values as IFSValueRange[]).map(value => value.enabled ?
-        { gt: value.min }
-      : undefined).filter(Boolean);
-    case FILTER_VALIDATOR.AFTER_ON:
-    case FILTER_VALIDATOR.GREATER_THAN_EQUAL:
-      return (values as IFSValueRange[]).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 as IFSValue[]).every(value => value.enabled);
-        return addValue ? [FILTER_VALIDATOR_INFO[props.validator].label] : [];
-      }
-    case FILTER_VALIDATOR.IN:
-      return (values as IFBExpressionRelativeDate[]).map(value => value.enabled ? value : undefined).filter(Boolean);
-    default:
-      return [];
-  }
-}
-
-function getUIValuess(props: OLD_IFilterDetail, rankingGroupIndex?: number) {
-  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 as IFSValueRange[]).map(value => ({
-        ...value,
-        value: value.min,
-        displayed: value.displayed != null ? value.displayed : true,
-        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 as IFSValueRange[]).map(value => ({
-        ...value,
-        value: value.max,
-        displayed: value.displayed != null ? value.displayed : true,
-        enabled: value.enabled != null ? value.enabled : true
-      }));
-    case FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
-    case FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
-      return (values as IFSValueRange[]).map(value => ({
-        ...value,
-        value: `${value.min} - ${value.max}`,
-        displayed: value.displayed != null ? value.displayed : true,
-        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: (values as IFSValue[])[0]?.enabled ?? props.enabled }];
-    case FILTER_VALIDATOR.IN:
-      return (values as IFSValueRelativeDate[]).map(value => ({
-        ...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'}`: ''}`,
-        displayed: value.displayed != null ? value.displayed : true,
-        enabled: props.enabled
-      }));
-    default:
-      if (props.column.type === COLUMN.RANKING && isEmpty(props.column.aggregate)) {
-        return getRankingUIValues(values as IFSValueRanking[][], rankingGroupIndex);
-      }
-      return (values as IFSValue[]).map(val => ({ ...val, enabled: val.enabled != null ? val.enabled : true }));
-  }
-}
-
-function getValueUiUnitRelativeDate(relative: IFSValueRelativeDate) {
-  return relative.cursor !== RELATIVE_CURSOR.THIS && relative.number > 1 ? `${relative.unit}s`: relative.unit;
-}
-
-function getRankingValues(values: IFSValueRanking[][], rankingGroupIndex?: number) {
-    const flattenValues = isNull(rankingGroupIndex) ? flattenDeep(values) : values[rankingGroupIndex];
-    return flattenValues.map(rankingValue => rankingValue.enabled ? {
-      position: rankingValue.position - 1,
-      value: rankingValue.value.value
-    } : undefined).filter(Boolean);
-  }
-  
-  function getRankingUIValues(values: IFSValueRanking[][], rankingGroupIndex?: number) {
-    const flattenValues = isNull(rankingGroupIndex) ? flattenDeep(values) : values[rankingGroupIndex];
-    return flattenValues.map((rankingValue) => ({
-      rankingIndex: rankingGroupIndex,
-      displayed: rankingValue.displayed != null ? rankingValue.displayed : true,
-      value: `${rankingValue.value.value} - ${rankingValue.position}`,
-      valueid: rankingValue.value.valueid,
-      enabled: rankingValue.enabled
-    }));
-  }
-
-  function getResultValues(values: IFSValue[], props: OLD_IFilterDetail) {
-    return (values || []).map((value: IFSValue) => {
-      if (value.enabled) {
-          if (props.column.type === COLUMN.IMAGE) {
-              return value.valueid || value.imageUrl || value.value;
-          } else {
-              return value.value;
-          }
-      }
-    }).filter(Boolean);
-  // return values.map((value: IFBResultValue) => {
-  //   if (!isEmpty(props.column.aggregate)) {
-  //     return value.value || '';
-  //   } else {
-  //     if (isDateColumn(props.column) && props.property && ![PROPERTY_TYPE.DATE_SECOND].includes(props.property)) {
-  //       const range = getDateRange(value.value, props.property);
-  //       return {
-  //         gte: range.from,
-  //         lte: range.to
-  //       };
-  //     } else if (props.column.type === QUESTIONS_TYPES.IMAGE) {
-  //       return value.valueid;
-  //     }
-  //     return value.value || '';
-  //   }
-  // }) as any;
-}
-

package/src/filters/adapters/flatUIToUI.ts

@@ -1,145 +0,0 @@
-import { adaptDateGroupingProperty } from "./adaptDateGroupingProperty";
-import { adaptFilterValues } from "./adaptFilterValues";
-import { IFUFlattenedFilter } from "../interfaces/ui/IFUFlattenedFilter";
-import { IFSection } from "../interfaces/IFSection";
-import { FILTER_SECTION } from "../constants/common/FILTER_SECTION";
-import { FILTER_STRUCTURE_VERSION } from "../constants/common/FILTER_STRUCTURE_VERSION";
-import { IFUData } from "../interfaces/ui/IFUData";
-import { IFUScope } from "../interfaces/ui/IFUScope";
-import { IFUFilter } from "../interfaces/ui/IFUFilter";
-import { IFUDataset } from "../interfaces/ui/IFUDataset";
-import { getLastIndexFromArray } from "../../general/array/getLastIndexFromArray";
-import { isEmpty } from "../../general/mix/isEmpty";
-import { cloneDeep } from "../../general/object/cloneDeep";
-
-/**
- * Generates a UI filter data structure from the flatttened UI filters.
- * @param uFilters Array of flattened filters from UI
- * @param version Tag for the version of the filter data structure
- * @returns a UI Filter Data.
- */
-export function flatUIToUI(uFilters: IFUFlattenedFilter[] = [], section: IFSection = FILTER_SECTION.ANYWHERE, enabled = true, version = FILTER_STRUCTURE_VERSION): IFUData {
-    return {
-        enabled,
-        section, 
-        version,
-        scopes: buildScopes(uFilters)
-    };
-}
-
-/**
- * Gets an array of scopes structure for the UI filter data. The scopes is organized by scope types and scope IDs
- * Also, adds and organizes filters by datasets
- * @param fbFilters Array of flat filters from UI
- * @returns an array of scopes structure.
- */
-function buildScopes(uFilters: IFUFlattenedFilter[]): IFUScope[] {
-    return uFilters.reduce((scopes: IFUScope[], uFilter: IFUFlattenedFilter) => {
-        const uiFilter: IFUFilter = buildFilter(uFilter);
-        const uiDataset: IFUDataset = buildDataset(uFilter);
-        const uiScope: IFUScope = buildScope(uFilter);
-
-        const scopeIndex = scopes.findIndex(sc => sc.scope === uFilter.extras.scope && sc.scopeid === uFilter.extras.scopeid);
-        const datasetIndex = scopeIndex > -1 ? scopes[scopeIndex].datasets.findIndex(dt => dt.qrveyid === uFilter.extras.dataset.qrveyid) : -1;
-        const lastUiFilterIndex = datasetIndex > -1 ? getLastIndexFromArray(scopes[scopeIndex].datasets[datasetIndex].filters, uf => uf.column.id === uiFilter.column.id && uf.column.linkid === uFilter.column.linkid && uf.column.qrveyid === uFilter.column.qrveyid) : -1;
-
-        if (scopeIndex === -1) {
-            scopes.push({ ...uiScope, datasets: [{ ...uiDataset, filters: [uiFilter] }] });
-        } else if (datasetIndex === -1) {
-            scopes[scopeIndex].datasets.push({ ...uiDataset, filters: [uiFilter] });
-        } else if (lastUiFilterIndex === -1){
-            scopes[scopeIndex].datasets[datasetIndex].filters.push(uiFilter);
-        } else {
-            scopes[scopeIndex].datasets[datasetIndex].filters.splice(lastUiFilterIndex + 1, 0, uiFilter);
-        }
-
-        return scopes;
-    }, [] as IFUScope[]);
-}
-
-/**
- * Gets an scope structure for the UI filter data
- * @param uFilter UI structure filter
- * @returns an scope structure
- */
-function buildScope(uFilter: IFUFlattenedFilter): IFUScope {
-    return {
-        collapsed: uFilter.extras.scopeInfo.collapsed,
-        enabled: uFilter.extras.scopeInfo.enabled,
-        datasets: undefined,
-        displayed: uFilter.extras.scopeInfo.displayed,
-        label: uFilter.extras.scopeInfo.label,
-        scope: uFilter.extras.scope,
-        scopeid: uFilter.extras.scopeid,
-    };
-}
-
-/**
- * Gets an dataset structure for the UI filter data
- * @param uFilter a UI structure filter
- * @returns an dataset structure
- */
-function buildDataset(uFilter: IFUFlattenedFilter): IFUDataset {
-    return {
-        qrveyid: uFilter.extras.dataset.qrveyid,
-        collapsed: uFilter.extras.dataset.collapsed,
-        enabled: uFilter.extras.dataset.enabled,
-        displayed: uFilter.extras.dataset.displayed,
-        filters: undefined,
-        label: uFilter.extras.dataset.label,
-        linkid: uFilter.extras.dataset.linkid,
-    };
-}
-
-/**
- * Gets an filter structure for the UI filter data
- * @param uFilter a UI structure filter
- * @returns an filter structure
- */
-function buildFilter(uFilter: IFUFlattenedFilter): IFUFilter {
-    uFilter = cloneDeep(uFilter);
-
-    const info = !isEmpty(uFilter.extras.info) ? { icon: uFilter.extras.info.icon, label: uFilter.extras.info.label } : undefined;
-    const property = adaptDateGroupingProperty(uFilter.property);
-
-    delete uFilter.extras.scopeInfo;
-    delete uFilter.extras.dataset;
-    return {
-        collapsed: uFilter.collapsed,
-        column: {
-            aggregate: uFilter.column.aggregate,
-            calculation: uFilter.column.calculation,
-            formulaType: uFilter.column.formulaType,
-            id: uFilter.column.id,
-            label: uFilter.column.label,
-            linked: uFilter.column.linked,
-            linkid: uFilter.column.linkid,
-            outputFormat: uFilter.column.outputFormat,
-            property: uFilter.column.property,
-            qrveyid: uFilter.column.qrveyid,
-            sorting: uFilter.column.sorting,
-            uniqueid: uFilter.column.uniqueid,
-            type: uFilter.column.type,
-        },
-        dateSection: uFilter.dateSection,
-        displayed: uFilter.displayed,
-        filterid: uFilter.filterid,
-        enabled: uFilter.enabled,
-        extras: {
-            ...uFilter.extras,
-            panelid: uFilter.extras.panelid,
-            filterLabel: uFilter.extras.filterLabel,
-            info,
-            scope: uFilter.extras.scope,
-            scopeid: uFilter.extras.scopeid,
-            section: uFilter.extras.section,
-        },
-        lookupDisplayIndex: uFilter.lookupDisplayIndex,
-        nullValues: uFilter.nullValues,
-        operator: uFilter.operator,
-        property,
-        selectAll: uFilter.selectAll,
-        validator: uFilter.validator,
-        values: adaptFilterValues(uFilter),
-    };
-}

package/src/filters/adapters/index.ts

@@ -1,26 +0,0 @@
-export * from './transformFilters';
-
-export * from './modelAnswerToFilterValue';
-
-export * from './adaptDateGroupingProperty';
-export * from './adaptFilterData';
-export * from './adaptFilterValues';
-
-export * from './FDToFlatUI';
-export * from './FDToLogic';
-export * from './FDToUI';
-
-export * from './flatUIToFD';
-export * from './flatUIToLogic';
-export * from './flatUIToUI';
-export * from './flatUIToOldLogic';
-
-export * from './logicToFD';
-export * from './logicToFlatUI';
-export * from './logicToUI';
-
-export * from './UIToFD';
-export * from './UIToFlatUI';
-// export * from './UIToLogic';
-export * from './UIToOldLogic';
-

package/src/filters/adapters/logicToFD.ts

@@ -1,26 +0,0 @@
-// FROM Logic structure = Old logic structure (v2.0)
-// TO Logic structure = Cleaner logic structure
-
-import { isEmpty } from "../../general/mix/isEmpty";
-import { FILTER_STRUCTURE_VERSION } from "../constants/common/FILTER_STRUCTURE_VERSION";
-import { FILTER_SECTION } from "../constants/common/FILTER_SECTION";
-import { IFSection } from "../interfaces/IFSection";
-import { OLD_IFilterLogic } from "../interfaces/OLD_IFilterLogic";
-import { flatUIToFD } from "./flatUIToFD";
-import { logicToFlatUI } from "./logicToFlatUI";
-import { IFSData } from "../interfaces/common/IFSData";
-
-
-/**
- * Generates a filter data structure from the old logic structure (v2.0).
- * @param filterData The old filter data structure with logic (v2.0)
- * @param version Tag for the version of the filter data structure
- * @returns a Filter Data.
- */
- export function logicToFD(logics: OLD_IFilterLogic[] = [], section: IFSection = FILTER_SECTION.ANYWHERE, enabled = true, version = FILTER_STRUCTURE_VERSION): IFSData {
-    if (isEmpty(logics) || !Array.isArray(logics)) return;
-
-    const builderFilter = logicToFlatUI(logics);
-    const uiFilters = flatUIToFD(builderFilter, section, enabled, version);
-    return uiFilters;
-}