@qrvey/utils 1.2.9-9 → 1.2.10-2

package/src/qrvey/helpers/getDataAnswersByColumn.ts

@@ -0,0 +1,56 @@
+import { COLUMN } from "../../columns/constants/COLUMN";
+import { getDatasetColumn } from "../../columns/helpers/getDatasetColumn";
+import { getModelColumn } from "../../columns/helpers/getModelColumn";
+import { IColumn } from "../../columns/interfaces/IColumn";
+import { isEmpty } from "../../general/mix/isEmpty";
+import { IFunctionGetDataAnswersByColumn } from "../interfaces/IFunctionGetDataAnswersByColumn";
+import { IModelAnswer } from "../interfaces/IModelAnswer";
+import { getDropdownAnswers } from "./getDropdownAnswers";
+import { getExpressionAnswers } from "./getExpressionAnswers";
+import { getImageAnswers } from "./getImageAnswers";
+import { getLookupAnswers } from "./getLookupAnswers";
+import { getRatingAnswers } from "./getRatingAnswers";
+import { getSlidebarAnswers } from "./getSlidebarAnswers";
+import { getYesNoAnswers } from "./getYesNoAnswers";
+
+/**
+ * Get answers located in model object. If column exists in the model, answers will be gotten depending on column type.
+ * For Rating columns, needs a number sequence (From 1 to 5).
+ * For Expression columns, needs a property type attribute for categorizable ones; for non-categorizable expressions is not required this attribute.
+ * For the others columns, answers is located in the property of the same name.
+ * @param column Info of the column
+ * @param model The model object
+ * @param property Optional Attribute, especially for expression columns.
+ * @returns Formatted answers inside of answer property.
+ */
+export function getDataAnswersByColumn(settings: IFunctionGetDataAnswersByColumn): IModelAnswer[] {
+    if (isEmpty(settings)) return [];
+
+    const column = getColumnFromData(settings);
+
+    if (!isEmpty(column)) {
+        switch (column.type) {
+            case COLUMN.DROPDOWN:
+                return getDropdownAnswers(column);
+            case COLUMN.EXPRESSION:
+                return getExpressionAnswers(column, settings.property);
+            case COLUMN.IMAGE:
+                return getImageAnswers(column);
+            case COLUMN.RATING:
+                return getRatingAnswers();
+            case COLUMN.SLIDEBAR:
+                return getSlidebarAnswers(column);
+            case COLUMN.LOOKUP:
+                return getLookupAnswers(column, settings.property, settings.lookupDisplay);
+            case COLUMN.YES_NO:
+                return getYesNoAnswers(column);
+            default:
+                return (column.answers || []).map(answer => ({ ...answer, answerid: answer.answerid }));
+        }
+    }
+    return [];
+}
+
+function getColumnFromData(settings: IFunctionGetDataAnswersByColumn): IColumn {
+    return !isEmpty(settings.dataset) ? getDatasetColumn(settings.column, settings.dataset) : !isEmpty(settings.model) ? getModelColumn(settings.column, settings.model) : undefined;
+}

package/src/qrvey/helpers/getDropdownAnswers.ts

@@ -0,0 +1,13 @@
+import { IColumn } from "../../columns/interfaces/IColumn";
+import { IModelAnswer } from "../interfaces/IModelAnswer";
+
+/**
+ * Get the answers of dropdown columns.
+ * Answers is a direct array of strings so it is necessary to format them.
+ * @param question The column located inside the model object.
+ * @returns Formatted answers inside of an answer property.
+ */
+export function getDropdownAnswers(column: IColumn): IModelAnswer[] {
+    const answers = column?.answers || [];
+    return answers.map(answer => ({ answer }));
+}

package/src/qrvey/helpers/getExpressionAnswers.ts

@@ -0,0 +1,21 @@
+import { COMPLEX_COLUMN_PROPERTY } from "../../columns/constants/COMPLEX_COLUMN_PROPERTY";
+import { IColumn } from "../../columns/interfaces/IColumn";
+import { IColumnPropertyType } from "../../columns/interfaces/IColumnPropertyType";
+import { isEmpty } from "../../general/mix/isEmpty";
+import { IModelAnswer } from "../interfaces/IModelAnswer";
+
+/**
+ * Get the answers of expression columns. Depends of the property attribute and if the column is categorizable.
+ * @param column The column located inside the model object.
+ * @param property Optional Attribute, especially for expression columns.
+ * @returns Formatted answers inside of an answer property.
+ */
+export function getExpressionAnswers(column: IColumn, property?: IColumnPropertyType): IModelAnswer[] {
+    if (isEmpty(column)) return [];
+
+    if (column.expressionCategory) {
+        return (COMPLEX_COLUMN_PROPERTY.EXPRESSION_NEGATIVE === property ? column.expressionNegative : COMPLEX_COLUMN_PROPERTY.EXPRESSION_POSITIVE === property ? column.expressionPositive : []).map(word => ({ answer: word.text }));
+    } else {
+        return (column.expressionWords || []).map(word => ({ answer: word.text }));
+    }
+}

package/src/qrvey/helpers/getImageAnswers.ts

@@ -0,0 +1,16 @@
+import { IColumn } from "../../columns/interfaces/IColumn";
+import { IModelAnswer } from "../interfaces/IModelAnswer";
+
+/**
+ * Get the answers of image columns.
+ * @param column The column located inside the model object.
+ * @returns Formatted answers inside of an answer property.
+ */
+export function getImageAnswers(column: IColumn): IModelAnswer[] {
+    const answers = column?.answers || [];
+    return answers.map(answer => ({
+        answer: answer.answer || '',
+        answerid: answer.answerid,
+        answerUrl: answer.imageUrl
+    }));
+}

package/src/qrvey/helpers/getImageUploadHasAnalysis.ts

@@ -0,0 +1,23 @@
+import { COLUMN_IMAGE_UPLOAD_OPTION } from "../../columns/constants/COLUMN_IMAGE_UPLOAD_OPTION";
+import { getDatasetColumn } from "../../columns/helpers/getDatasetColumn";
+import { IColumn } from "../../columns/interfaces/IColumn";
+import { _hasProperty } from "../../general/object/hasProperty";
+import { IDataset } from "../interfaces/IDataset";
+
+/**
+ * Special function for Image Upload
+ * This function returns if the current column has object or text analysis as property.
+ * @param column The column with info
+ * @param model The model object
+ * @returns true if this column has analysis. Otherwise false.
+ */
+export function getImageUploadHasAnalysis(column: IColumn, dataset: IDataset): boolean {
+    let imageUploadOption;
+    if (_hasProperty(column, 'imageUploadOption')) {
+        imageUploadOption = column.imageUploadOption;
+    }
+
+    const datasetColumn = getDatasetColumn(column, dataset);
+    imageUploadOption = datasetColumn?.imageUploadOption;
+    return imageUploadOption === COLUMN_IMAGE_UPLOAD_OPTION.OBJECT || imageUploadOption === COLUMN_IMAGE_UPLOAD_OPTION.TEXT;
+}

package/src/qrvey/helpers/getLookupAnswers.ts

@@ -0,0 +1,17 @@
+import { COLUMN_PROPERTY } from "../../columns/constants/COLUMN_PROPERTY";
+import { IBColumnAnswerLookupAnswer } from "../../columns/interfaces/IBColumnAnswerLookupAnswer";
+import { IBColumnAnswerLookupAnswerAnswer } from "../../columns/interfaces/IBColumnAnswerLookupAnswerAnswer";
+import { IBColumnAnswerLookupValueValue } from "../../columns/interfaces/IBColumnAnswerLookupValueValue";
+import { IColumn } from "../../columns/interfaces/IColumn";
+import { IColumnPropertyType } from "../../columns/interfaces/IColumnPropertyType";
+import { IModelAnswer } from "../interfaces/IModelAnswer";
+
+export function getLookupAnswers(column: IColumn, property: IColumnPropertyType, display: number): IModelAnswer[] {
+    if (property === COLUMN_PROPERTY.LOOKUP_VALUE) {
+      const valueItem = column.lookupValue || column.answers[0] as IBColumnAnswerLookupAnswer;
+      return ((valueItem as IBColumnAnswerLookupValueValue)?.valueInfo || (valueItem as IBColumnAnswerLookupAnswer)?.answer || []).map(_value => ({ ..._value, answerid: valueItem.answerid }));
+    } else {
+      const answerItem = column.answers[display];
+      return answerItem ? (answerItem.answer as IBColumnAnswerLookupAnswerAnswer[]).map(_answer => ({ ..._answer, answerid: answerItem.answerid })) : [];
+    }
+}

package/src/qrvey/helpers/getLookupDisplays.ts

@@ -0,0 +1,9 @@
+import { getDatasetColumn } from "../../columns/helpers/getDatasetColumn";
+import { IColumn } from "../../columns/interfaces/IColumn";
+import { IDataset } from "../interfaces/IDataset";
+import { IModelAnswer } from "../interfaces/IModelAnswer";
+
+export function getLookupDisplays(column: IColumn, dataset: IDataset): IModelAnswer[] {
+  const datasetColumn = getDatasetColumn(column, dataset);
+  return (datasetColumn?.answers || []).map(answer => ({ answer: answer.dataSelectedDisplay.text, answerid: answer.answerid }));
+}

package/src/qrvey/helpers/getRatingAnswers.ts

@@ -0,0 +1,10 @@
+import { IModelAnswer } from "../interfaces/IModelAnswer";
+
+/**
+ * Get the answers of rating columns.
+ * @param _question The column located inside the model object.
+ * @returns Formatted answers inside of an answer property
+ */
+export function getRatingAnswers(): IModelAnswer[] {
+    return ['1', '2', '3', '4', '5'].map(num => ({ answer: num }));
+}

package/src/qrvey/helpers/getSlidebarAnswers.ts

@@ -0,0 +1,16 @@
+import { IColumn } from "../../columns/interfaces/IColumn";
+import { IModelAnswer } from "../interfaces/IModelAnswer";
+
+/**
+ * Get the answers of slidebar columns. The quantity of answers depend on the steps chosen in maker.
+ * @param _question The column located inside the model object.
+ * @returns Formatted answers inside of an answer property
+ */
+export function getSlidebarAnswers(column: IColumn): IModelAnswer[] {
+    const answers: IModelAnswer[] = [];
+    const steps = column?.slidebarValue ?? 0;
+    for (let i = 0; i < steps; i++) {
+        answers.push({ answer: String(i + 1) });
+    }
+    return answers;
+}

package/src/qrvey/helpers/getSuffixTranslateByColumn.ts

@@ -0,0 +1,13 @@
+import { COLUMN } from "../../columns/constants/COLUMN";
+import { IColumn } from "../../columns/interfaces/IColumn";
+
+/**
+ * Gets a string of the translate structure by the given column 
+ * @param column the Info of the column
+ * @return a string of the translation structure where the label is located.
+ */
+ export function getSuffixTranslateByColumn(column: IColumn): string {
+    if (column.type === COLUMN.RATING) return 'common.column_types_suffixes.rating';
+    if (column.type === COLUMN.SLIDEBAR) return 'common.column_types_suffixes.slidebar';
+    return '';
+}

package/src/qrvey/helpers/getValueWithSuffixes.ts

@@ -0,0 +1,19 @@
+import { isEmpty } from "../../general/mix/isEmpty";
+import { isNaNV2 } from "../../general/mix/isNaNV2";
+import { IFunctionGetValueWithSuffixes } from "../interfaces/IFunctionGetValueWithSuffixes";
+
+/**
+ * Get a string value with suffixes if available.
+ * Add suffix into the value string. Prioritized for numeric values.
+ * @param value a number or string
+ * @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 {
+    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;
+    }
+    return value + (!isEmpty(suffix) ? ' ' + suffix : '');
+}

package/src/qrvey/helpers/getYesNoAnswers.ts

@@ -0,0 +1,12 @@
+import { IColumn } from "../../columns/interfaces/IColumn";
+import { IModelAnswer } from "../interfaces/IModelAnswer";
+
+/**
+ * Get the answers of Yes/No columns.
+ * Yes/No answers from model object are capitalized but the filters need values in lowercase.
+ * @param column The column located inside the model object.
+ * @returns Formatted answers inside of an answer property
+ */
+export function getYesNoAnswers(column: IColumn): IModelAnswer[] {
+    return (column?.answers || []).map(answer => ({ ...answer, answer: String(answer.answer).toLowerCase(), answerid: answer.answerid }));
+}

package/src/qrvey/helpers/index.ts

@@ -1,2 +1,18 @@
-export * from './getColumnsLabel';
+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 './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/helpers/isDataset.ts

@@ -0,0 +1,6 @@
+import { APP_DATASET_TYPE_LIST } from "../constants/APP_DATASET_TYPE_LIST";
+import { IAppType } from "../interfaces/IAppType";
+
+export function isDataset(appType: IAppType): boolean {
+    return APP_DATASET_TYPE_LIST.includes(appType);
+}

package/src/qrvey/helpers/isForm.ts

@@ -0,0 +1,6 @@
+import { APP_FORM_TYPE_LIST } from "../constants/APP_FORM_TYPE_LIST";
+import { IAppType } from "../interfaces/IAppType";
+
+export function isForm(appType: IAppType): boolean {
+    return APP_FORM_TYPE_LIST.includes(appType);
+}

package/src/qrvey/helpers/transformValue.ts

@@ -0,0 +1,49 @@
+import { isDateColumn } from "../../columns/helpers/isDateColumn";
+import { isNumericalColumn } from "../../columns/helpers/isNumericalColumn";
+import { IDateColumnPropertyType } from "../../columns/interfaces/IDateColumnPropertyType";
+import { DATE_GROUPING_PROPERTY } from "../../dates/constants/DATE_GROUPING_PROPERTY";
+import { DATE_GROUPING_TIME_PROPERTY } from "../../dates/constants/DATE_GROUPING_TIME_PROPERTY";
+import { addFormat } from "../../format/format";
+import { getI18nDateGroupLabel } from "../../globalization/helpers/getI18nDateGroupLabel";
+import { ITransformValueSettings } from "../interfaces/ITransformValueSettings";
+import { getValueWithSuffixes } from "./getValueWithSuffixes";
+
+/**
+ * Transforms a value depending of localization/globalization and extras settings.
+ * @param value A value to transform
+ * @param settings The settings of the transformValue function
+ * @returns A transformed value
+ */
+export function transformValue(value: string, settings: ITransformValueSettings): string {
+    const valueWithI18n = getI18nDateGroupLabel(value, settings.property as IDateColumnPropertyType, settings.translate);
+
+    const valueWithLocalization = addFormat(valueWithI18n, getOutputFormat(settings), getFormatConfig(settings));
+    return getValueWithSuffixes(valueWithLocalization, { suffixTranslateLabel: settings.suffixTranslateLabel, translate: settings.translate });
+}
+
+/**
+ * Gets the outputformat settings
+ * @param settings The settings of the transformValue function
+ * @returns the outputformat settings
+ */
+function getOutputFormat(settings: ITransformValueSettings) {
+    let type, format;
+    const isDateTime = [DATE_GROUPING_TIME_PROPERTY.HOUR, DATE_GROUPING_TIME_PROPERTY.MINUTE, DATE_GROUPING_TIME_PROPERTY.SECOND].includes(settings.property as any);
+    const isDate = [DATE_GROUPING_PROPERTY.DAY].includes(settings.property as any);
+    if (isDateColumn(settings.column) && (isDate || isDateTime)) {
+        type = 'DATE';
+        format = 'Default';
+    } else if (isNumericalColumn(settings.column)) {
+        type = 'NUMERIC';
+    }
+    return { type, format, originalFormat: isDateTime ? settings.column.outputFormat : undefined };
+}
+
+/**
+ * Gets the format config
+ * @param settings The settings of the transformValue function
+ * @returns the format config
+ */
+function getFormatConfig(settings: ITransformValueSettings) {
+    return { lang: settings.i18n?.locale };
+}

package/src/qrvey/interfaces/IAppStatus.ts

@@ -0,0 +1,3 @@
+import { APP_STATUS } from "../constants/APP_STATUS";
+
+export type IAppStatus = APP_STATUS;

package/src/qrvey/interfaces/IAppType.ts

@@ -0,0 +1,3 @@
+import { APP_TYPE } from "../constants/APP_TYPE";
+
+export type IAppType = APP_TYPE;

package/src/qrvey/interfaces/IBModel.ts

@@ -0,0 +1,20 @@
+import { IAppStatus } from "./IAppStatus";
+import { IBModelBranchesMap } from "./IBModelBranchesMap";
+import { IBModelData } from "./IBModelData";
+import { IAppType } from "./IAppType";
+
+export interface IBModel {
+    appType: IAppType;
+    appid: string;
+    branchesMap?: IBModelBranchesMap[];
+    createDate: string;
+    datalinkInfo?: any[]; // Deprecated
+    modifyDate: string;
+    name: string;
+    numResponses: number;
+    qrveyid: string;
+    questionOrder: string[];
+    questions: IBModelData;
+    status: IAppStatus;
+    userid: string;
+}

package/src/qrvey/interfaces/IBModelBranchesMap.ts

@@ -0,0 +1,6 @@
+import { IBModelBranchesMapBranch } from "./IBModelBranchesMapBranch";
+
+export interface IBModelBranchesMap {
+    questionid: string;
+    branches: IBModelBranchesMapBranch[];
+}

package/src/qrvey/interfaces/IBModelBranchesMapBranch.ts

@@ -0,0 +1,5 @@
+import { IBModelData } from "./IBModelData";
+
+export interface IBModelBranchesMapBranch {
+    questions: IBModelData;
+}

package/src/qrvey/interfaces/IBModelData.ts

@@ -0,0 +1,5 @@
+import { IBColumn } from "../../columns/interfaces/IBColumn";
+
+export interface IBModelData {
+    data: IBColumn[];
+}

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/IFunctionGetDataAnswersByColumn.ts

@@ -0,0 +1,12 @@
+import { IColumn } from "../../columns/interfaces/IColumn";
+import { IColumnPropertyType } from "../../columns/interfaces/IColumnPropertyType";
+import { IDataset } from "./IDataset";
+import { IModel } from "./IModel";
+
+export interface IFunctionGetDataAnswersByColumn {
+    column: IColumn;
+    dataset?: IDataset;
+    model?: IModel;
+    property?: IColumnPropertyType;
+    lookupDisplay?: number;
+}

package/src/qrvey/interfaces/IFunctionGetValueWithSuffixes.ts

@@ -0,0 +1,12 @@
+import { II18nServiceTranslate } from "../../globalization/interfaces/II18nServiceTranslate";
+
+export interface IFunctionGetValueWithSuffixes {
+    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
+}
+
+interface IFunctionGetValueWithSuffixesSuffixes {
+    singular: string;
+    plural: string;
+}

package/src/qrvey/interfaces/IModel.ts

@@ -0,0 +1,11 @@
+import { IColumn } from "../../columns/interfaces/IColumn";
+import { IBModel } from "./IBModel";
+import { IModelBranchesMap } from "./IModelBranchesMap";
+
+export interface IModel extends Omit<IBModel, 'questions' | 'branchesMap' | 'name' | 'numResponses' | 'questionOrder'> {
+    columns: IColumn[]; // Alias for questions
+    columnOrder: string[];
+    branchesMap: IModelBranchesMap[];
+    label: string; // Alias for name
+    totalRecords: number;
+}

package/src/qrvey/interfaces/IModelAnswer.ts

@@ -0,0 +1,5 @@
+export interface IModelAnswer {
+    answer?: string;
+    answerid?: string;
+    answerUrl?: string;
+}

package/src/qrvey/interfaces/IModelBranchesMap.ts

@@ -0,0 +1,6 @@
+import { IBModelBranchesMap } from "./IBModelBranchesMap";
+import { IModelBranchesMapBranch } from "./IModelBranchesMapBranch";
+
+export interface IModelBranchesMap extends Omit<IBModelBranchesMap, 'branches'> {
+    branches: IModelBranchesMapBranch[];
+}

package/src/qrvey/interfaces/IModelBranchesMapBranch.ts

@@ -0,0 +1,5 @@
+import { IColumn } from "../../columns/interfaces/IColumn";
+
+export interface IModelBranchesMapBranch {
+    columns: IColumn[];
+}

package/src/qrvey/interfaces/IModelColumn.ts

@@ -0,0 +1,25 @@
+import { IColumnOutputFormatSettings } from "../../columns/interfaces/IColumnOutputFormatSettings";
+import { IColumnType } from "../../columns/interfaces/IColumnType";
+import { IModelDataset } from "./IModelDataset";
+
+export interface IModelColumn {
+    id: string;
+    qid: string;
+    text: string;
+    name: string;
+    typeLabel?: string;
+    type: IColumnType;
+    answers?: any[];
+    archived?: boolean;
+    linked?: string;
+    bucketType?: string;
+    formulaType?: string;
+    property?: string;
+    calculation?: any;
+    dataset?: IModelDataset;
+    label?: string;
+    outputFormat?: IColumnOutputFormatSettings;
+
+    activeCat?: boolean;
+    words?: any[];
+}

package/src/qrvey/interfaces/IModelDataset.ts

@@ -0,0 +1,7 @@
+export interface IModelDataset {
+    sourceid: string;
+    qrveyid: string;
+    name: string;
+    text: string;
+    linkid: string;
+}

package/src/qrvey/interfaces/ITransformValueSettings.ts

@@ -0,0 +1,13 @@
+import { IColumn } from "../../columns/interfaces/IColumn";
+import { IColumnPropertyType } from "../../columns/interfaces/IColumnPropertyType";
+import { II18nConfig } from "../../globalization/interfaces/II18nConfig";
+import { II18nServiceTranslate } from "../../globalization/interfaces/II18nServiceTranslate";
+
+export interface ITransformValueSettings {
+    column: IColumn;
+    property: IColumnPropertyType;
+
+    translate: II18nServiceTranslate; // Function for getting translations
+    i18n: II18nConfig; // The i18n configuration;
+    suffixTranslateLabel?: string // The i18n label for the suffix values.
+}

package/src/qrvey/interfaces/index.ts

@@ -1,5 +1,25 @@
+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 './ITransformValueSettings';

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

@@ -0,0 +1,20 @@
+import { isEmpty } from "../../general/mix/isEmpty";
+import { IBModelBranchesMap } from "../../qrvey/interfaces/IBModelBranchesMap";
+import { IModelBranchesMap } from "../../qrvey/interfaces/IModelBranchesMap";
+import { BColumnsToUIColumns } from "./BColumnsToUIColumns.adapter";
+
+/**
+ * 
+ * @param branchesMap 
+ * @returns 
+ */
+export function BBranchesMapToUIBranchesMap(branchesMap: IBModelBranchesMap[]): IModelBranchesMap[] {
+    if (isEmpty(branchesMap)) return [];
+  
+    return branchesMap.map(branchesMap => ({
+      questionid: branchesMap.questionid,
+      branches: branchesMap.branches.map(branch => ({
+        columns: BColumnsToUIColumns(branch.questions.data)
+      }))
+    }));
+}

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

@@ -3,18 +3,26 @@ import { IColumn } from "../../columns/interfaces/IColumn";
 import { IBDataset } from "../../qrvey/interfaces/IBDataset";
 
 export function BColumnsToUIColumns(columns: IBColumn[] = [], dataset?: IBDataset): IColumn[] {
-    return columns.map(column => ({
+    return columns.map<IColumn>(column => ({
+      answers: column.answers,
       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),
     }));
 }

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

@@ -0,0 +1,25 @@
+import { isEmpty } from "../../general/mix/isEmpty";
+import { IBModel } from "../../qrvey/interfaces/IBModel";
+import { IModel } from "../../qrvey/interfaces/IModel";
+import { BBranchesMapToUIBranchesMap } from "./BBranchesMapToUIBranchesMap.adapter";
+import { BColumnsToUIColumns } from "./BColumnsToUIColumns.adapter";
+
+export function BModelToUIModel(model: IBModel): IModel {
+    if (isEmpty(model)) return;
+  
+    return {
+      appType: model.appType,
+      appid: model.appid,
+      branchesMap: BBranchesMapToUIBranchesMap(model.branchesMap),
+      columnOrder: model.questionOrder,
+      columns: BColumnsToUIColumns(model.questions.data),
+      createDate: model.createDate,
+      datalinkInfo: model.datalinkInfo,
+      modifyDate: model.modifyDate,
+      label: model.name,
+      totalRecords: model.numResponses,
+      qrveyid: model.qrveyid,
+      status: model.status,
+      userid: model.userid,
+    };
+}

package/src/services/adapters/index.ts

@@ -1,2 +1,3 @@
+export * from './BBranchesMapToUIBranchesMap.adapter';
 export * from './BDatasetsToUIDatasets.adapter';
 export * from './BColumnsToUIColumns.adapter';