@qrvey/utils 1.3.0-7 → 1.3.0-8

package/src/filters/helpers/ui/transformFilterValues.ts

@@ -1,30 +1,29 @@
 import { isEmpty } from "../../../general/mix/isEmpty";
 import { transformValue } from "../../../qrvey/helpers/transformValue";
+import { IFSFilter } from "../../interfaces/common/IFSFilter";
 import { IFSValue } from "../../interfaces/common/IFSValue";
 import { IFSValueRange } from "../../interfaces/common/IFSValueRange";
 import { IFValue } from "../../interfaces/IFValue";
-import { IFUFilter } from "../../interfaces/ui/IFUFilter";
 import { IFUTransformFilterValuesSettings } from "../../interfaces/ui/IFUTransformFilterValuesSettings";
 import { isRangeValidator } from "../common/isRangeValidator";
 import { isRegularValidator } from "../common/isRegularValidator";
 
-export function transformFilterValues(filter: IFUFilter, settings: IFUTransformFilterValuesSettings): IFValue[] {
+export function transformFilterValues(filter: IFSFilter, settings: IFUTransformFilterValuesSettings): IFValue[] {
     const transformValueSettings = { ...settings, column: filter.column, property: filter.property };
     if (isEmpty(filter)) return [];
 
-    const values = filter.values || [];
     if (isRegularValidator(filter.validator)) {
-        return (values as IFSValue[]).map((value: IFSValue) => ({
+        return (filter.values as IFSValue[]).map((value: IFSValue) => ({
             ...value,
             value: transformValue(value.value, transformValueSettings),
          }));
     } else if (isRangeValidator(filter.validator)) {
-        return (values as IFSValueRange[]).map((value: IFSValueRange) => ({
+        return (filter.values as IFSValueRange[]).map((value: IFSValueRange) => ({
             ...value,
             min: transformValue(value.min, transformValueSettings),
             max: transformValue(value.max, transformValueSettings)
          }));
     } else {
-        return values;
+        return filter.values;
     }
 }

package/src/filters/index.ts

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

package/src/filters/interfaces/OLD_IFilterDetail.ts

@@ -12,14 +12,13 @@ import { IFUChartSettings } from "./ui/IFUChartSettings";
 import { IFUValue } from "./ui/IFUValue";
 
 export interface OLD_IFilterDetail {
-    column?: Omit<IColumn, 'label'> & { dataset: IDataset } & { text: string };
+    column?: IColumn & { dataset: IDataset };
     dateSection?: IFDateSection;
     enabled?: boolean;
     lookupDisplayIndex?: number;
     nullValues?: boolean;
     operator?: IFOperator;
     property?: IFProperty;
-    selectAll?: boolean;
     validator?: IFValidator;
     values?: IFValue[];
   

package/src/filters/interfaces/backend/index.ts

@@ -16,8 +16,6 @@
 export * from './IFBackendExpressionValue';
 export * from './IFBackendValidator';
 
-export * from './IFBData';
-
 export * from './IFBExpression';
 export * from './IFBExpressionAggregate';
 export * from './IFBExpressionRelativeDate';

package/src/filters/interfaces/builder/IFilterBuilderConfig.ts

@@ -1,6 +1,5 @@
 import { IFBLogic } from "../backend/IFBLogic";
 import { IFBUserFilters } from "../backend/IFBUserFilters";
-import { IFilterConfig } from "../common/IFilterConfig";
 import { IFSColumn } from "../common/IFSColumn";
 import { IFSData } from "../common/IFSData";
 import { IFProperty } from "../IFProperty";
@@ -9,13 +8,14 @@ import { IFSection } from "../IFSection";
 import { IFValidator } from "../IFValidator";
 import { OLD_IFilterData } from "../OLD_IFilterData";
 import { IFUData } from "../ui/IFUData";
+import { IFilterBuilderGeneralConfig } from "./IFilterBuilderGeneralConfig";
 import { IFilterBuilderSettings } from "./IFilterBuilderSettings";
 
 /**
  * Structure for the configuration of the Filter Builder
  */
 export interface IFilterBuilderConfig {
-    datasets?: string[]; // Qrvey IDs for displaying their columns in the colum selector. If there is not qrveyids, the column list will not render
+    datasets?: string[]; // Qrvey IDs for displaying their columns in the colum selector. No qrveyids, the column list is not render
     filterData?: IFSData; // The Filter Data structure
     filterLabel?: string; // A label for the filter. If filterLabel is provided the old filterLabel is replaced by the new one
     onApplied?: (filter: IFSData | IFUData | OLD_IFilterData | IFBLogic[]) => void;
@@ -31,5 +31,5 @@ export interface IFilterBuilderConfig {
     tokenBoxConfig?: any; // Configuration for the TokenBox.
     userFilters?: IFBUserFilters; // Backend Filter structure assinged by users
     validator?: IFValidator; // Filter Validator type
-    widgetConfig: IFilterConfig; // General config for the Filter Builder Widget
+    widgetConfig: IFilterBuilderGeneralConfig; // General config for the Filter Builder Widget
 }

package/src/filters/interfaces/builder/IFilterBuilderGeneralConfig.ts

@@ -0,0 +1,14 @@
+import { II18nConfig } from "../../../globalization/interfaces/II18nConfig";
+
+/**
+ * Structure for the Fiter Builder General config
+ */
+export interface IFilterBuilderGeneralConfig {
+    apiKey?: string; // Api Key to get access from servers. Optional if qv_token is set
+    appid: string; // App ID
+    domain: string; // The domain of the environment
+    qv_token?: string; // Qrvey Token for RLS
+    timezoneControl?: string; // Offset number for Timezone
+    i18n?: II18nConfig; // The i18n configuration;
+    userid: string; // User ID
+}

package/src/filters/interfaces/builder/index.ts

@@ -14,5 +14,6 @@
  */
 
 export * from './IFilterBuilderConfig';
+export * from './IFilterBuilderGeneralConfig';
 export * from './IFilterBuilderSettings';
 export * from './IFilterBuilderSettingsScopes';

package/src/filters/interfaces/common/IFSColumn.ts

@@ -1,3 +1,3 @@
 import { IColumn } from "../../../columns/interfaces/IColumn";
 
-export type IFSColumn = Omit<IColumn, 'expressionCategory' | 'expressionNegative' | 'expressionPositive' | 'expressionWords' | 'label' | 'lookupValue' | 'slidebarValue'>;
+export type IFSColumn = IColumn;

package/src/filters/interfaces/common/IFSFilter.ts

@@ -21,7 +21,6 @@ export interface IFSFilter {
   nullValues: boolean; // True: Add values including Null Values; False: Not including Null values.
   operator: IFOperator; // Related operator for this filter. i.e: F1 AND...
   property?: IFProperty; // Related property for some columns (Date group|Complex Data types).
-  selectAll?: boolean; // Flag to determine the complete selection of the data
   validator: IFValidator; // Related Validator for this filter.
-  values?: IFValue[]; // Values structure. Depending on the selected validator it changes. Activated Select All could recieve an empty or undefined values
+  values: IFValue[]; // Values structure. Depending on the selected validator it changes.
 }

package/src/filters/interfaces/common/IFSFilterExtras.ts

@@ -1,6 +1,5 @@
 import { IFScope } from "../IFScope";
 import { IFSection } from "../IFSection";
-import { IFUChartSettings } from "../ui/IFUChartSettings";
 import { IFSFilterExtrasInfo } from "./IFSFilterExtrasInfo";
 
 /**
@@ -13,7 +12,6 @@ export interface IFSFilterExtras {
     scopeid?: string; // The scope ID. This is set depending on the scope type. Global: undefined; Tab: tabid; Page: pageid; DATA: qrveyid
     section?: IFSection; // The section when the filter is applied.
     info?: IFSFilterExtrasInfo; // Extra filter info
-    chart?: IFUChartSettings; // Chart Settings
 
     [x: string]: any; // Specific case for those filters that need to store something else
 }

package/src/filters/interfaces/common/IFSMergeFiltersSettings.ts

@@ -0,0 +1,8 @@
+
+/**
+ * Structure for MergeFilters property settings
+ */
+export interface IFSMergeFiltersSettings {
+    overwriteValues?: boolean;
+    setGroupedColumnOperator?: boolean;
+}

package/src/filters/interfaces/common/IFSParamsToGetFilter.ts

@@ -2,7 +2,6 @@ import { IFDateSection } from "../IFDateSection";
 import { IFProperty } from "../IFProperty";
 import { IFScope } from "../IFScope";
 import { IFValidator } from "../IFValidator";
-import { IFUChartSettings } from "../ui/IFUChartSettings";
 import { IFSColumn } from "./IFSColumn";
 import { IFSParamsToGetFilterEnableds } from "./IFSParamsToGetFilterEnableds";
 
@@ -13,7 +12,6 @@ export interface IFSParamsToGetFilter {
     column?: Partial<IFSColumn>;
     dateSection?: IFDateSection;
     enableds?: IFSParamsToGetFilterEnableds;
-    chart?: IFUChartSettings;
     linkid?: string;
     panelid?: string;
     property?: IFProperty;

package/src/filters/interfaces/{functions/IFFiltersParamsToGetFilter.ts → common/IFSParamsToGetFilterSettings.ts}

@@ -1,7 +1,7 @@
 /**
  * Structure for filter properties
  */
- export interface IFFiltersParamsToGetFilter {
+ export interface IFSParamsToGetFilterSettings {
     letPassUndefinedProperties?: {
         scope?: boolean;
         dataset?: boolean;

package/src/filters/interfaces/common/IFSValue.ts

@@ -2,7 +2,6 @@
  * Structure for the value of the filter. Common structure.
  */
 export interface IFSValue {
-    displayed?: boolean; // True: The value is display; False: the value is hidden
     enabled?: boolean; // True: the value is enabled; False: the value is disabled
     imageUrl?: string; // URL for a image. This is common for images column type.
     value?: string; // The value to filter

package/src/filters/interfaces/common/IFSValueRange.ts

@@ -2,7 +2,6 @@
  * Structure for filters values with ranges.
  */
 export interface IFSValueRange {
-    displayed?: boolean; // True: The value is display; False: the value is hidden
     enabled?: boolean; // True: the value is enabled; False: the value is disabled
     min?: string; // The min value of the range
     max?: string; // The max value of the range

package/src/filters/interfaces/common/IFSValueRanking.ts

@@ -4,7 +4,6 @@ import { IFSValue } from "./IFSValue";
  * Structure for filters values with ranks. For Ranking column type.
  */
 export interface IFSValueRanking {
-    displayed?: boolean; // True: The value is display; False: the value is hidden
     enabled?: boolean; // True: the value is enabled; False: the value is disabled
     position: number; // The position in the rank
     value: IFSValue; // The value to filter

package/src/filters/interfaces/common/IFSValueRelativeDate.ts

@@ -1,3 +1,3 @@
 import { RelativeStatement } from "../../../dates/relative/interfaces/RelativeStatement";
 
-export type IFSValueRelativeDate = { displayed?: boolean; enabled?: boolean; } & RelativeStatement;
+export type IFSValueRelativeDate = { enabled?: boolean; } & RelativeStatement;

package/src/filters/interfaces/common/index.ts

@@ -13,7 +13,6 @@
  * IFP-: Structures to Filter Panel
  */
  
-export * from './IFilterConfig';
 export * from './IFSAvailableScope';
 export * from './IFSColumn';
 export * from './IFSData';
@@ -22,9 +21,10 @@ export * from './IFSDataStore';
 export * from './IFSFilter';
 export * from './IFSFilterExtras';
 export * from './IFSFilterExtrasInfo';
-export * from './IFSGetDataValues';
+export * from './IFSMergeFiltersSettings';
 export * from './IFSParamsToGetFilter';
 export * from './IFSParamsToGetFilterEnableds';
+export * from './IFSParamsToGetFilterSettings';
 export * from './IFSScope';
 export * from './IFSScopeID';
 export * from './IFSValue';

package/src/filters/interfaces/ui/IFUColumn.ts

@@ -1,9 +1,9 @@
-import { IColumn } from "../../../columns/interfaces/IColumn";
+import { IFSColumn } from "../common/IFSColumn";
 
 /**
  * Structure for visualizing a column.
  */
-export interface IFUColumn extends IColumn {
+export interface IFUColumn extends IFSColumn {
     label: string; // The label/name of the column
     uniqueid?: string; // The unique ID for this column.
 }

package/src/filters/interfaces/ui/IFUValue.ts

@@ -2,7 +2,6 @@
  * Structure for Displaying Value
  */
 export interface IFUValue {
-    displayed?: boolean; // True: The value is display; False: the value is hidden
     enabled?: boolean; // Optional flag to enabled the value
     imageUrl?: string; // URL from Image type
     value?: string; // A string value

package/src/filters/interfaces/ui/index.ts

@@ -14,8 +14,8 @@
 export * from './IFUChartSettings';
 export * from './IFUColumn';
 export * from './IFUData';
-export * from './IFUDataset';
 export * from './IFUDataStore';
+export * from './IFUDataset';
 export * from './IFUFilter';
 export * from './IFUFilterExtras';
 export * from './IFUFlattenedFilter';

package/src/general/array/index.ts

@@ -1,7 +1,6 @@
 export * from './addPropertyToArrayOfObjects';
 export * from './delete';
 export * from './flattenDeep';
-export * from './getArrayByProperty';
 export * from './filterNestedTree';
 export * from './getFirstIndexFromArray';
 export * from './getLastIndexFromArray';

package/src/general/object/get.ts

@@ -42,3 +42,25 @@ function validateToReturnDefaultValue(baseObject: any, path: string | string[]):
     path == null ||
     (typeof path !== 'string' && !Array.isArray(path));
 }
+
+
+/**
+ * 
+ * /**
+ * Like lodash _.get.
+ * Gets the value at path of object. If the resolved value is undefined, the defaultValue is returned in its place.
+ * @param baseObject The object to query
+ * @param path The path of the property to get.
+ * @param defaultValue The value returned for undefined resolved values.
+ * @returns the resolved value.
+ export function get(baseObject: any, path: string, defaultValue?: any): any {
+  function fn() {
+    try {
+      const value = eval(`this.${path}`.replace('.[', '['));
+      return typeof value !== 'undefined' ? value : defaultValue;
+    } catch (e) { return defaultValue; }
+  }
+  return fn.apply(baseObject, null);
+}
+
+ */

package/src/globalization/interfaces/filters/II18nFilterPanel.ts

@@ -9,9 +9,6 @@ export interface II18nFilterPanel {
     aggregated_filters_label: string;
     aggregated_filters_tooltip: string;
     card_action: II18nFilterPanelCardAction;
-    card_all_except: string;
-    card_all_selected: string;
-    card_none_selected: string;
     collapsed_title: string;
     delete_dialog: II18nFilterPanelDeleteDialog;
     empty_state: II18nFilterPanelEmptyState;

package/src/globalization/interfaces/filters/II18nValueContainer.ts

@@ -1,9 +1,8 @@
 import { II18nValueContainerSearchInput } from "./II18nValueContainerSearchInput";
 
 export interface II18nValueContainer {
-    all_except: string;
-    all_selected: string;
+    search_input: II18nValueContainerSearchInput;
     no_label: string;
     no_records_message: string;
-    search_input: II18nValueContainerSearchInput;
+    select_all: string;
 }

package/src/globalization/labels/chart_builder/I18N_CHART_BUILDER.ts

@@ -1,4 +1,4 @@
-import { II18nChartBuilder } from "../../interfaces/chart_builder/II18nChartBuilder";
+import { II18nChartBuilder } from "../../interfaces";
 import { I18N_CHART_BUILDER_COMPARISION_OPTIONS } from "./I18N_CHART_BUILDER_COMPARISION_OPTIONS";
 import { I18N_CHART_BUILDER_FORMAT_OPTIONS } from "./I18N_CHART_BUILDER_FORMAT_OPTIONS";
 import { I18N_CHART_BUILDER_GENERAL } from "./I18N_CHART_BUILDER_GENERAL";

package/src/globalization/labels/chart_builder/I18N_CHART_BUILDER_COMPARISION_OPTIONS.ts

@@ -1,4 +1,4 @@
-import { II18nChartBuilder } from "../../interfaces/chart_builder/II18nChartBuilder";
+import { II18nChartBuilder } from "../..";
 
 export const I18N_CHART_BUILDER_COMPARISION_OPTIONS: Pick<II18nChartBuilder, 'comparison_options'> = {
     comparison_options: {

package/src/globalization/labels/chart_builder/I18N_CHART_BUILDER_FORMAT_OPTIONS.ts

@@ -1,4 +1,4 @@
-import { II18nChartBuilder } from "../../interfaces/chart_builder/II18nChartBuilder";
+import { II18nChartBuilder } from "../..";
 
 type FormatOptions = 'small_multiples' | 'conditional_formatting';
 

package/src/globalization/labels/chart_builder/I18N_CHART_BUILDER_GENERAL_OPTIONS.ts

@@ -1,5 +1,4 @@
-import { II18nChartBuilder } from "../../interfaces/chart_builder/II18nChartBuilder";
-
+import { II18nChartBuilder } from "../..";
 type GeneralOptions = 'aggregated_formula' | 'general_options' | 'totals' | 'legends' | 'menu_actions' | 'sorting' | 'table_calculations' | 'tooltip_settings';
 
 export const I18N_CHART_BUILDER_GENERAL_OPTIONS: Pick<II18nChartBuilder, GeneralOptions> = {

package/src/globalization/labels/chart_builder/I18N_CHART_BUILDER_LAYER_OPTIONS.ts

@@ -1,4 +1,4 @@
-import { II18nChartBuilder } from "../../interfaces/chart_builder/II18nChartBuilder";
+import { II18nChartBuilder } from "../..";
 
 type LayerOptions = 'trends_line' | 'references_line';
 export const I18N_CHART_BUILDER_LAYER_OPTIONS: Pick<II18nChartBuilder, LayerOptions> = {

package/src/globalization/labels/chart_builder/I18N_CHART_BUILDER_STYLE_OPTIONS.ts

@@ -1,4 +1,4 @@
-import { II18nChartBuilder } from "../../interfaces/chart_builder/II18nChartBuilder";
+import { II18nChartBuilder } from "../..";
 
 type StyleOptions = 'style_options' | 'color_settings' | 'color_by_values' | 'chart_orientation'
     | 'axis_style' | 'bar_types' | 'line_style_options' | 'symbol_style_options' | 'chart_mode' | 'category_labels'

package/src/globalization/labels/filters/I18N_FILTER_PANEL.ts

@@ -4,9 +4,6 @@ export const I18N_FILTER_PANEL: II18nFilterPanel = {
     collapsed_title: 'Filters',
     aggregated_filters_label: 'Aggregated Filters',
     aggregated_filters_tooltip: 'Logic is not editable for aggregated filters',
-    card_all_except: 'All Except:',
-    card_all_selected: 'All Selected',
-    card_none_selected: 'None',
     empty_state: {
         description: 'No filters added',
         action: 'Add Filter',

package/src/globalization/labels/filters/I18N_VALUE_CONTAINER.ts

@@ -1,8 +1,6 @@
 import { II18nValueContainer } from "../../interfaces/filters/II18nValueContainer";
 
 export const I18N_VALUE_CONTAINER: II18nValueContainer = {
-    all_except: 'All Except:',
-    all_selected: 'All Selected',
     no_label: 'No Label',
     no_records_message: 'No records found',
     search_input: {
@@ -11,4 +9,5 @@ export const I18N_VALUE_CONTAINER: II18nValueContainer = {
         enter_value_third_label: "to Insert",
         placeholder: 'Search or type values separated by commas. Use {{ for tokens.',
     },
+    select_all: 'Select All',
 };

package/src/interfaces/Qrvey.Interface.ts

@@ -1,6 +1,32 @@
 import { CALCULATION_ABBREVIATION } from "../qrvey/constants/CALCULATION_ABBREVIATION";
 import { CALCULATION_LABEL } from "../qrvey/constants/CALCULATION_LABEL";
 
+// export interface IQrveyColumn {
+//     aggregate?: IColumnAggregate;
+//     calculation?: IColumnCalculation;
+//     property?: any;
+//     dataset?: IQrveyDataset;
+//     formulaType?: IFormulaType;
+//     id: string;
+//     linked?: boolean;
+//     linkid?: string;
+//     qrveyid: string;
+//     sorting?: ISortingOptions;
+//     text: string;
+//     type: IColumnType;
+//     outputFormat?: IOutputFormat;
+// }
+
+// export interface IQrveyDataset {
+//     appType?: string;
+//     linkid?: string;
+//     name: string;
+//     qrveyid: string; //Qrvey ID or qrveyid
+//     appStatus?: string;
+    
+//     options?: any[];
+// }
+  
 export interface IColumnCalculation {
     abbreviation: IColumnCalculationAbbreviation;
     id: string;
@@ -16,4 +42,4 @@ export interface IColumnCalculation {
 // }
 
 export type IColumnCalculationLabel = CALCULATION_LABEL;
-export type IColumnCalculationAbbreviation = CALCULATION_ABBREVIATION;
+export type IColumnCalculationAbbreviation = CALCULATION_ABBREVIATION;

package/src/interfaces/general/IGeneralWidgetConfig.ts

@@ -0,0 +1,12 @@
+export interface IGeneralWidgetConfig {
+    domain?: string;
+    apiKey?: string;
+    qrveyid?: string;
+    qv_token?: string;
+    locale?: string;
+    timezoneControl?: string;
+    isFromAN?: boolean;
+    appid: string;
+    userid: string;
+    lang?: string;
+}

package/src/interfaces/general/index.ts

@@ -1,2 +1,2 @@
 export * from './IGeneralInfo';
-export * from './IWidgetConfig';
+export * from './IGeneralWidgetConfig';

package/src/qrvey/constants/index.ts

@@ -1,10 +1,4 @@
-export * from './APP_DATASET_TYPE_LIST';
-export * from './APP_FORM_TYPE_LIST';
-export * from './APP_STATUS';
-export * from './APP_STATUS_LIST';
-export * from './APP_TYPE';
 export * from './CALCULATION_ABBREVIATION';
 export * from './CALCULATION_INFO_LIST';
-export * from './CALCULATION_INFO';
 export * from './CALCULATION_LABEL';
 export * from './CALCULATION';

package/src/{columns → qrvey}/helpers/getColumnsLabel.ts

@@ -1,7 +1,6 @@
 // import { isEmpty, _get } from "../..";
 // import { isComplexColumn } from "./isComplexColumn";
-
-import { IColumn } from "../interfaces/IColumn";
+import { IColumn } from "../../columns/interfaces/IColumn";
 
 /**
  * Get an string of the properties of the given column.

package/src/qrvey/helpers/getValueWithSuffixes.ts

@@ -1,6 +1,6 @@
 import { isEmpty } from "../../general/mix/isEmpty";
 import { isNaNV2 } from "../../general/mix/isNaNV2";
-import { IFunctionGetValueWithSuffixes } from "../interfaces/IFunctionGetValueWithSuffixes";
+import { IGetValueWithSuffixesSettings } from "../interfaces/IGetValueWithSuffixesSettings";
 
 /**
  * Get a string value with suffixes if available.
@@ -9,11 +9,11 @@ import { IFunctionGetValueWithSuffixes } from "../interfaces/IFunctionGetValueWi
  * @param suffixes An object with singular or plural suffix string.
  * @returns a string value with suffix
  */
-export function getValueWithSuffixes(value: string | number, settings: IFunctionGetValueWithSuffixes): string {
+export function getValueWithSuffixes(value: string | number, settings: IGetValueWithSuffixesSettings): string {
     let suffix = '';
     if (!isNaNV2(value)) {
         if (!isEmpty(settings.suffixTranslateLabel) && !isEmpty(settings.translate)) suffix = settings.translate(settings.suffixTranslateLabel, { count: +value });
-        if (!isEmpty(settings.suffixes)) suffix = +value > 1 || +value === 0 ? settings.suffixes.plural : settings.suffixes.singular;
+        if (!isEmpty(settings.suffixes)) suffix = (+value > 1 || +value === 0) ? settings.suffixes.plural : settings.suffixes.singular;
     }
     return value + (!isEmpty(suffix) ? ' ' + suffix : '');
 }

package/src/qrvey/helpers/index.ts

@@ -1,18 +1,4 @@
-export * from './areStaticColumnValues';
-export * from './getCategorizableExpression';
-export * from './getDataAnswersByColumn';
-export * from './getDropdownAnswers';
-export * from './getExpressionAnswers';
-export * from './getImageAnswers';
-export * from './getImageUploadHasAnalysis';
-export * from './getLookupAnswers';
-export * from './getLookupDisplays';
+export * from './getColumnsLabel';
 export * from './getPropertyLabel';
-export * from './getRatingAnswers';
-export * from './getSlidebarAnswers';
-export * from './getSuffixTranslateByColumn';
 export * from './getValueWithSuffixes';
-export * from './getYesNoAnswers';
-export * from './isDataset';
-export * from './isForm';
 export * from './transformValue';

package/src/qrvey/interfaces/IDataset.ts

@@ -4,7 +4,7 @@ import { IBDataset } from "./IBDataset";
 /**
  * Structure for Dataset in the frontend side of Qrvey App
  */
-export interface IDataset extends Omit<IBDataset, "name" | "options"> {
+export interface IDataset extends Omit<IBDataset, "name" | "options">{
     label?: string;
     options?: IColumn[];
 }

package/src/qrvey/interfaces/{IFunctionGetValueWithSuffixes.ts → IGetValueWithSuffixesSettings.ts}

@@ -1,12 +1,12 @@
 import { II18nServiceTranslate } from "../../globalization/interfaces/II18nServiceTranslate";
 
-export interface IFunctionGetValueWithSuffixes {
+export interface IGetValueWithSuffixesSettings {
     translate?: II18nServiceTranslate; // Function for getting translations
     suffixTranslateLabel?: string; // Label of the i18n path for translations
-    suffixes?: IFunctionGetValueWithSuffixesSuffixes; // Manual suffixes to add if the translate and the suffixes translate label is not present
+    suffixes?: IGetValueWithSuffixesSettingsSuffixes; // Manual suffixes to add if the translate and the suffixes translate label is not present
 }
 
-interface IFunctionGetValueWithSuffixesSuffixes {
+interface IGetValueWithSuffixesSettingsSuffixes {
     singular: string;
     plural: string;
 }

package/src/qrvey/interfaces/index.ts

@@ -1,25 +1,7 @@
-export * from './IAppStatus';
-export * from './IAppType';
-
 export * from './IBDataset';
-
-export * from './IBModel';
-export * from './IBModelBranchesMapBranch';
-export * from './IBModelData';
-
 export * from './ICalculation';
 export * from './ICalculationInfo';
 export * from './ICalculationType';
-
 export * from './IDataset';
-
-export * from './IFunctionGetDataAnswersByColumn';
-export * from './IFunctionGetValueWithSuffixes';
-
-export * from './IModel';
-export * from './IModelAnswer';
-export * from './IBModelBranchesMap';
-export * from './IModelColumn';
-export * from './IModelDataset';
-
+export * from './IGetValueWithSuffixesSettings';
 export * from './ITransformValueSettings';

package/src/services/adapters/BColumnsToUIColumns.adapter.ts

@@ -3,26 +3,18 @@ import { IColumn } from "../../columns/interfaces/IColumn";
 import { IBDataset } from "../../qrvey/interfaces/IBDataset";
 
 export function BColumnsToUIColumns(columns: IBColumn[] = [], dataset?: IBDataset): IColumn[] {
-    return columns.map<IColumn>(column => ({
-      answers: column.answers,
+    return columns.map(column => ({
       bucketid: column.bucketId,
-      expressionCategory: column.activeCat,
-      expressionNegative: column.negative,
-      expressionPositive: column.positive,
-      expressionWords: column.words,
       formulaid: column.formulaId,
       formulaType: column.formulaType,
       geogroup: column.geogroup,
       id: column.id,
-      imageUploadOption: column.imageUploadOption,
       label: column.text,
       linked: column.linked,
       linkid: dataset?.linkid || column.linkid,
       outputFormat: column.outputFormat,
       property: column.property,
       qrveyid: dataset?.qrveyid || column.qrveyid,
-      slidebarValue: column.sliderVal,
-      lookupValue: column.value,
       type: column.type,
     }));
 }

package/src/services/adapters/BDatasetsToUIDatasets.adapter.ts

@@ -4,9 +4,9 @@ import { BColumnsToUIColumns } from "./BColumnsToUIColumns.adapter";
 
 export function BDatasetsToUIDatasets(datasets: IBDataset[] = []): IDataset[] {
     return datasets.map(dataset => ({
-        qrveyid: dataset.qrveyid,
-        label: dataset.name,
-        linkid: dataset.linkid,
-        options: BColumnsToUIColumns(dataset.options, dataset),
+      qrveyid: dataset.qrveyid,
+      label: dataset.name,
+      linkid: dataset.linkid,
+      options: BColumnsToUIColumns(dataset.options, dataset),
     }));
 }