@qrvey/utils 1.2.9-8 → 1.2.10-1

package/dist/services/adapters/BBranchesMapToUIBranchesMap.adapter.js

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

package/dist/services/adapters/BColumnsToUIColumns.adapter.js

@@ -1,16 +1,24 @@
 export function BColumnsToUIColumns(columns = [], dataset) {
     return columns.map(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 === null || dataset === void 0 ? void 0 : dataset.linkid) || column.linkid,
         outputFormat: column.outputFormat,
         property: column.property,
         qrveyid: (dataset === null || dataset === void 0 ? void 0 : dataset.qrveyid) || column.qrveyid,
+        slidebarValue: column.sliderVal,
+        lookupValue: column.value,
         type: column.type,
     }));
 }

package/dist/services/adapters/BModelToUIModel.adapter.d.ts

@@ -0,0 +1,3 @@
+import { IBModel } from "../../qrvey/interfaces/IBModel";
+import { IModel } from "../../qrvey/interfaces/IModel";
+export declare function BModelToUIModel(model: IBModel): IModel;

package/dist/services/adapters/BModelToUIModel.adapter.js

@@ -0,0 +1,22 @@
+import { isEmpty } from "../../general/mix/isEmpty";
+import { BBranchesMapToUIBranchesMap } from "./BBranchesMapToUIBranchesMap.adapter";
+import { BColumnsToUIColumns } from "./BColumnsToUIColumns.adapter";
+export function BModelToUIModel(model) {
+    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/dist/services/adapters/index.d.ts

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

package/dist/services/adapters/index.js

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

package/dist/services/api/Charts.api.d.ts

@@ -0,0 +1,15 @@
+export interface IFieldsConfig {
+    type: string;
+    column?: any;
+    qrvey_id?: string;
+    showBuckets?: boolean;
+    showLinkedDatasets?: boolean;
+}
+export default class ChartsApi {
+    config: any;
+    abortCtrl: AbortController;
+    constructor(config: any);
+    createSignal(): AbortSignal;
+    getResults(data: any, ignoreSignal?: boolean, newEndpoint?: boolean): Promise<any>;
+    getResultsPagination(data: any, ignoreSignal?: boolean): Promise<any>;
+}

package/dist/services/api/Charts.api.js

@@ -0,0 +1,31 @@
+import Request from "../helpers/Request";
+import { CHART_ENDPOINT } from "../constants/CHART_ENDPOINT";
+import { UCHART_ENDPOINT } from "../constants/UCHART_ENDPOINT";
+import { UCHART_PAGINATION_ENDPOINT } from "../constants/UCHART_PAGINATION_ENDPOINT";
+export default class ChartsApi {
+    constructor(config) {
+        this.config = config;
+        this.config = Object.assign(Object.assign({}, config), { endpoint: CHART_ENDPOINT });
+    }
+    createSignal() {
+        this.abortCtrl && this.abortCtrl.abort();
+        this.abortCtrl = new AbortController();
+        return this.abortCtrl.signal;
+    }
+    getResults(data, ignoreSignal = false, newEndpoint = false) {
+        const signal = ignoreSignal ? undefined : this.createSignal();
+        if (data.filters) {
+            data.logic = data.filters;
+            delete data.filters;
+        }
+        return Request.post(Object.assign(Object.assign({}, this.config), { endpoint: newEndpoint ? UCHART_ENDPOINT : CHART_ENDPOINT, signal }), '/results', data);
+    }
+    getResultsPagination(data, ignoreSignal = false) {
+        const signal = ignoreSignal ? undefined : this.createSignal();
+        if (data.filters) {
+            data.logic = data.filters;
+            delete data.filters;
+        }
+        return Request.post(Object.assign(Object.assign({}, this.config), { endpoint: UCHART_PAGINATION_ENDPOINT, signal }), '', data);
+    }
+}

package/dist/services/api/getAllDatasets.api.d.ts

@@ -1,8 +1,13 @@
-import { IGeneralWidgetConfig } from "../../interfaces/general/IGeneralWidgetConfig";
+import { IWidgetConfig } from "../../interfaces/general/IWidgetConfig";
 import { IDataset } from "../../qrvey/interfaces/IDataset";
 /**
  * Get a dataset list from a collection of Qrvey IDs
- * @param qrveyids Collection of Qrvey IDs
- * @returns a promise
+ * Considerations for qrveyids second argument:
+ * - If it is a undefined argument, the function will return all available datasets of the app
+ * - If it is a empty array argument, the function will return an empty dataset list. (A request will not be executed)
+ * - If it is a non-empty array argument, the function will return a set of available datasets
+ * @param config the widget config. Includes general configuration properties
+ * @param qrveyids Collection of Qrvey IDs for returning a set of available datasets
+ * @returns a promise that if it is resolved displays a collection of dataset info.
  */
-export declare function getAllDatasets(config: IGeneralWidgetConfig, pickDatasets?: string[]): Promise<IDataset[]>;
+export declare function getAllDatasets(config: IWidgetConfig, qrveyids?: string[]): Promise<IDataset[]>;

package/dist/services/api/getAllDatasets.api.js

@@ -1,20 +1,29 @@
-import { flattenDeep, isEmpty } from "../../general";
+import { getArrayByProperty } from "../../general/array/getArrayByProperty";
+import { isEmpty } from "../../general/mix/isEmpty";
 import { getAllQrveys } from "./getAllQrveys.api";
-import { getDatasetColumns } from "./getDatasetColumns.api";
+import { getDatasetsByIds } from "./getDatasetsByIds.api";
 /**
  * Get a dataset list from a collection of Qrvey IDs
- * @param qrveyids Collection of Qrvey IDs
- * @returns a promise
+ * Considerations for qrveyids second argument:
+ * - If it is a undefined argument, the function will return all available datasets of the app
+ * - If it is a empty array argument, the function will return an empty dataset list. (A request will not be executed)
+ * - If it is a non-empty array argument, the function will return a set of available datasets
+ * @param config the widget config. Includes general configuration properties
+ * @param qrveyids Collection of Qrvey IDs for returning a set of available datasets
+ * @returns a promise that if it is resolved displays a collection of dataset info.
  */
-export function getAllDatasets(config, pickDatasets = []) {
-    return getAllQrveys(Object.assign({}, config), { status: ['RUNNING', 'FINISHED', 'PAUSED'], loadAll: true })
-        .then((qrveys) => {
-        let datasets = qrveys.Items.filter(filterSupportedDatasets);
-        if (!isEmpty(pickDatasets))
-            datasets = datasets.filter(item => pickDatasets.includes(item.qrveyid));
-        return Promise.all(datasets.map(dataset => getDatasetColumns(config, dataset.qrveyid))).then(response => flattenDeep(response));
-    }).catch(_e => Promise.all([]));
-}
-function filterSupportedDatasets(dataset) {
-    return !['NPS', 'CHECKLIST'].includes(dataset.appType.toUpperCase());
+export function getAllDatasets(config, qrveyids) {
+    if (Array.isArray(qrveyids) && isEmpty(qrveyids)) {
+        return Promise.resolve([]);
+    }
+    else if (Array.isArray(qrveyids) && !isEmpty(qrveyids)) {
+        return getDatasetsByIds(config, qrveyids);
+    }
+    else {
+        return getAllQrveys(Object.assign({}, config), { status: ['RUNNING', 'FINISHED', 'PAUSED'], loadAll: true })
+            .then((qrveys) => {
+            const datasets = qrveys.Items.filter(item => !['NPS', 'CHECKLIST'].includes(item.appType.toUpperCase()));
+            return getDatasetsByIds(config, getArrayByProperty(datasets, 'qrveyid'));
+        }).catch(_e => []);
+    }
 }

package/dist/services/api/getAllQrveys.api.d.ts

@@ -1,6 +1,6 @@
 import IPayloadQrveyAll from "../interfaces/IPayloadQrveyAll";
 /**
-  * POST Request for getting Qrveys such as Web Forms and Datasets. Use params for getting precise data
+  * Request function for getting Qrveys such as Web Forms and Datasets. Use params for getting precise data
   * @param config Configuration
   * @param params  Object for getting precise data
   */

package/dist/services/api/getAllQrveys.api.js

@@ -1,7 +1,7 @@
 import { QRVEY_ENDPOINT } from "../constants/QRVEY_ENDPOINT";
 import Request from "../helpers/Request";
 /**
-  * POST Request for getting Qrveys such as Web Forms and Datasets. Use params for getting precise data
+  * Request function for getting Qrveys such as Web Forms and Datasets. Use params for getting precise data
   * @param config Configuration
   * @param params  Object for getting precise data
   */

package/dist/services/api/getDatasetColumns.api.d.ts

@@ -1,8 +1,8 @@
-import { IGeneralWidgetConfig } from "../../interfaces/general/IGeneralWidgetConfig";
-import { IDataset } from "../../qrvey/interfaces/IDataset";
+import { IDataset } from '../../qrvey/interfaces/IDataset';
+import { IWidgetConfig } from '../../interfaces/general/IWidgetConfig';
 /**
    * Get a dataset by Qrvey ID
    * @param qrveyid The Qrvey ID
    * @returns a promise
    */
-export declare function getDatasetColumns(config: IGeneralWidgetConfig, qrveyid?: string): Promise<IDataset[]>;
+export declare function getDatasetColumns(config: IWidgetConfig, qrveyid?: string): Promise<IDataset[]>;

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

@@ -1,16 +1,19 @@
-import { CHART_ENDPOINT } from "../constants/CHART_ENDPOINT";
-import Request from "../helpers/Request";
-import { BDatasetsToUIDatasets } from "../adapters/BDatasetsToUIDatasets.adapter";
+import { CHART_ENDPOINT } from '../constants/CHART_ENDPOINT';
+import Request from '../helpers/Request';
+import { BDatasetsToUIDatasets } from '../adapters/BDatasetsToUIDatasets.adapter';
+import { getDefaultQuestionListOptionsAttributes } from '../helpers/getDefaultQuestionListOptionsAttributes';
+import { chooseLang } from '../../format/localization';
 /**
    * Get a dataset by Qrvey ID
    * @param qrveyid The Qrvey ID
    * @returns a promise
    */
 export function getDatasetColumns(config, qrveyid) {
+    const lang = chooseLang(config);
     return Request.post(Object.assign(Object.assign({}, config), { qrveyid, endpoint: CHART_ENDPOINT }), '/question/list', {
-        'optionsAttributes': ['id', 'text', 'type', 'property', 'linked', 'linkid', 'qrveyid', 'bucketId', 'formulaId', 'formulaType', 'geogroup', 'outputFormat'],
-        'extend': true
-    })
+        optionsAttributes: getDefaultQuestionListOptionsAttributes(),
+        extend: true,
+    }, { lang })
         .then(BDatasetsToUIDatasets)
         .catch(_e => []);
 }

package/dist/services/api/getDatasetsByIds.api.d.ts

@@ -0,0 +1,8 @@
+import { IDataset } from '../../qrvey/interfaces/IDataset';
+import { IWidgetConfig } from '../../interfaces/general/IWidgetConfig';
+/**
+   * Get a dataset by Qrvey ID
+   * @param qrveyid The Qrvey ID
+   * @returns a promise
+   */
+export declare function getDatasetsByIds(config: IWidgetConfig, qrveyids?: string[]): Promise<IDataset[]>;

package/dist/services/api/getDatasetsByIds.api.js

@@ -0,0 +1,23 @@
+import Request from '../helpers/Request';
+import { BDatasetsToUIDatasets } from '../adapters/BDatasetsToUIDatasets.adapter';
+import { isEmpty } from '../../general/mix/isEmpty';
+import { chooseLang } from '../../format/localization';
+import { getDefaultQuestionListOptionsAttributes } from '../helpers/getDefaultQuestionListOptionsAttributes';
+import { QUESTION_LIST_BULK_ENDPOINT } from '../constants/QUESTION_LIST_BULK_ENDPOINT';
+/**
+   * Get a dataset by Qrvey ID
+   * @param qrveyid The Qrvey ID
+   * @returns a promise
+   */
+export function getDatasetsByIds(config, qrveyids = []) {
+    if (Array.isArray(qrveyids) && !isEmpty(qrveyids)) {
+        const lang = chooseLang(config);
+        return Request.post(Object.assign(Object.assign({}, config), { endpoint: QUESTION_LIST_BULK_ENDPOINT }), '', {
+            optionsAttributes: getDefaultQuestionListOptionsAttributes(),
+            qrveyids
+        }, { lang })
+            .then(response => BDatasetsToUIDatasets((response === null || response === void 0 ? void 0 : response.data) || []))
+            .catch(_e => []);
+    }
+    return Promise.resolve([]);
+}

package/dist/services/api/getModel.api.d.ts

@@ -0,0 +1 @@
+export declare function getModel(config: any, params?: any): Promise<import("../..").IModel>;

package/dist/services/api/getModel.api.js

@@ -0,0 +1,9 @@
+import Request from "../helpers/Request";
+import { chooseLang } from "../../format/localization";
+import { ANALYTIQ_ENDPOINT } from "../constants/MODEL_ENDPOINT";
+import { BModelToUIModel } from "../adapters/BModelToUIModel.adapter";
+export function getModel(config, params) {
+    const lang = chooseLang(config);
+    const data = { lang, logic: config.logic || [] };
+    return Request.post(Object.assign(Object.assign({}, config), { endpoint: ANALYTIQ_ENDPOINT }), '', data, Object.assign(Object.assign({}, params), { lang })).then(BModelToUIModel);
+}

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

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

package/dist/services/api/index.js

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

package/dist/services/constants/MODEL_ENDPOINT.d.ts

@@ -0,0 +1,2 @@
+import { IEndpointConfig } from "../interfaces/IEndpointConfig";
+export declare const ANALYTIQ_ENDPOINT: IEndpointConfig;

package/dist/services/constants/MODEL_ENDPOINT.js

@@ -0,0 +1,4 @@
+export const ANALYTIQ_ENDPOINT = {
+    uri: '/app/:app_id/qrvey/:qrvey_id/analytiq/model',
+    version: 4
+};

package/dist/services/constants/QUESTION_LIST_BULK_ENDPOINT.d.ts

@@ -0,0 +1,2 @@
+import { IEndpointConfig } from "../interfaces/IEndpointConfig";
+export declare const QUESTION_LIST_BULK_ENDPOINT: IEndpointConfig;

package/dist/services/constants/QUESTION_LIST_BULK_ENDPOINT.js

@@ -0,0 +1,4 @@
+export const QUESTION_LIST_BULK_ENDPOINT = {
+    uri: '/app/:app_id/analytiq/chart/question/list/bulk',
+    version: 4
+};

package/dist/services/constants/UCHART_ENDPOINT.d.ts

@@ -0,0 +1,2 @@
+import { IEndpointConfig } from "../interfaces/IEndpointConfig";
+export declare const UCHART_ENDPOINT: IEndpointConfig;

package/dist/services/constants/UCHART_ENDPOINT.js

@@ -0,0 +1,4 @@
+export const UCHART_ENDPOINT = {
+    uri: '/app/:app_id/qrvey/:qrvey_id/analytiq/uchart',
+    version: 4
+};

package/dist/services/constants/UCHART_PAGINATION_ENDPOINT.d.ts

@@ -0,0 +1,2 @@
+import { IEndpointConfig } from "../interfaces/IEndpointConfig";
+export declare const UCHART_PAGINATION_ENDPOINT: IEndpointConfig;

package/dist/services/constants/UCHART_PAGINATION_ENDPOINT.js

@@ -0,0 +1,4 @@
+export const UCHART_PAGINATION_ENDPOINT = {
+    uri: '/app/:app_id/qrvey/:qrvey_id/analytiq/uchart/results/pagination',
+    version: 4
+};

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

@@ -1,2 +1,6 @@
 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/services/constants/index.js

@@ -1,2 +1,6 @@
 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/services/helpers/getDefaultQuestionListOptionsAttributes.d.ts

@@ -0,0 +1 @@
+export declare function getDefaultQuestionListOptionsAttributes(): string[];

package/dist/services/helpers/getDefaultQuestionListOptionsAttributes.js

@@ -0,0 +1,24 @@
+export function getDefaultQuestionListOptionsAttributes() {
+    return [
+        'id',
+        'text',
+        'type',
+        'property',
+        'linked',
+        'linkid',
+        'qrveyid',
+        'bucketId',
+        'formulaId',
+        'formulaType',
+        'geogroup',
+        'outputFormat',
+        'answers',
+        'imageUploadOption',
+        'sliderVal',
+        'value',
+        'activeCat',
+        'words',
+        'negative',
+        'positive' // For Expressions with enabled categories
+    ];
+}

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

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

package/dist/services/helpers/index.js

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

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@qrvey/utils",
-  "version": "1.2.9-8",
+  "version": "1.2.10-1",
   "description": "Helper, Utils for all Qrvey Projects",
   "homepage": "https://bitbucket.org/qrvey/qrvey_utils/wiki/Home",
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc && tsc -m commonjs --outDir dist/cjs",
-    "publish": "node prepareToPublish.js && npm login && np",
-    "publish-prerelease": "node prepareToPublish.js && npm login && np --any-branch --tag=$npm_config_tag",
+    "publishing": "node prepareToPublish.js && np",
+    "publishing-prerelease": "node prepareToPublish.js && np --any-branch --tag=$npm_config_tag",
     "test": "jest test",
     "test:watch": "jest --watch test",
     "lint": "eslint src --quiet --exit-on-fatal-error --ext .ts,.js",
@@ -19,7 +19,7 @@
     "@types/jest": "27.0.2",
     "doxdox": "3.0.0",
     "jest": "27.2.5",
-    "np": "7.4.0",
+    "np": "7.6.0",
     "ts-jest": "27.0.5",
     "typedoc": "0.22.5",
     "typescript": "4.4.4",
@@ -27,9 +27,6 @@
     "@typescript-eslint/parser": "5.3.0",
     "eslint": "8.1.0"
   },
-  "peerDependencies": {
-    "np": "^6.2.3"
-  },
   "dependencies": {
     "d3": "6.3.1",
     "dayjs": "1.10.7",

package/src/charts/constants/AGGREGATE_LABEL.ts

@@ -1,5 +1,5 @@
 export enum AGGREGATE_LABEL {
-    NONE = 'None',
+    NONE = 'No Aggregate',
     AVG = 'Average',
     MEDIAN = 'Median',
     MIN = 'Minimum',

package/src/charts/constants/index.ts

@@ -1,4 +1,5 @@
 export * from './AGGREGATE_ABBREVIATION';
+export * from './AGGREGATE_GENERAL';
 export * from './AGGREGATE_INFO_LIST';
 export * from './AGGREGATE_INFO';
 export * from './AGGREGATE_LABEL';

package/src/columns/constants/COLUMN_IMAGE_UPLOAD_OPTION.ts

@@ -0,0 +1,5 @@
+export enum COLUMN_IMAGE_UPLOAD_OPTION {
+    NONE = 'None',
+    OBJECT = 'Object',
+    TEXT = 'Text',
+}

package/src/columns/constants/COLUMN_IMAGE_UPLOAD_OPTION_LIST.ts

@@ -0,0 +1,7 @@
+import { COLUMN_IMAGE_UPLOAD_OPTION } from "./COLUMN_IMAGE_UPLOAD_OPTION";
+
+export const COLUMN_IMAGE_UPLOAD_OPTION_LIST = [
+    COLUMN_IMAGE_UPLOAD_OPTION.NONE,
+    COLUMN_IMAGE_UPLOAD_OPTION.OBJECT,
+    COLUMN_IMAGE_UPLOAD_OPTION.TEXT,
+];

package/src/columns/constants/index.ts

@@ -1,7 +1,12 @@
+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/src/{qrvey → columns}/helpers/getColumnsLabel.ts

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

package/src/columns/helpers/getDatasetByColumn.ts

@@ -0,0 +1,9 @@
+import { isEmpty } from "../../general/mix/isEmpty";
+import { IDataset } from "../../qrvey/interfaces/IDataset";
+import { IColumn } from "../interfaces/IColumn";
+
+export function getDatasetByColumn(column: IColumn, datasets: IDataset[]) {
+    if (isEmpty(column) || isEmpty(datasets)) return;
+
+    return datasets.find(dataset => dataset.qrveyid === column.qrveyid && dataset.linkid === column.linkid);
+}

package/src/columns/helpers/getDatasetColumn.ts

@@ -0,0 +1,15 @@
+import { isEmpty } from "../../general/mix/isEmpty";
+import { IDataset } from "../../qrvey/interfaces/IDataset";
+import { IColumn } from "../interfaces/IColumn";
+
+export function getDatasetColumn(column: Partial<IColumn>, dataset: IDataset): IColumn {
+    if (isEmpty(column) || isEmpty(dataset)) return;
+
+    const columns = getDatasetColumns(dataset);
+    if (isEmpty(column)) return;
+    return columns.find(c => c.id === column.id);
+}
+
+function getDatasetColumns(dataset: IDataset): IColumn[] {
+    return dataset?.options || [];
+}

package/src/columns/helpers/getDatasetColumnyDatasets.ts

@@ -0,0 +1,11 @@
+import { isEmpty } from "../../general/mix/isEmpty";
+import { IDataset } from "../../qrvey/interfaces/IDataset";
+import { IColumn } from "../interfaces/IColumn";
+import { getDatasetColumn } from "./getDatasetColumn";
+
+export function getDatasetColumnByDatasets(column: Partial<IColumn>, datasets: IDataset[]): IColumn {
+    if (isEmpty(column) || isEmpty(datasets)) return;
+
+    const dataset = datasets.find(dataset => dataset.qrveyid === column.qrveyid);
+    return getDatasetColumn(column, dataset);
+}

package/src/columns/helpers/getModelColumn.ts

@@ -0,0 +1,29 @@
+import { isEmpty } from "../../general/mix/isEmpty";
+import { _get } from "../../general/object/get";import { IModel } from "../../qrvey/interfaces/IModel";
+import { IColumn } from "../interfaces/IColumn";
+
+/**
+ * Get a model question by column id.
+ * @param column The column with info
+ * @param model The model object
+ * @returns the model question
+ */
+export function getModelColumn(column: Partial<IColumn>, model: IModel): IColumn {
+    if (isEmpty(column) || isEmpty(model)) return;
+  
+    const questions = getQuestionData(model);
+    if (isEmpty(questions)) return;
+    
+    return questions.find(q => q.id === column.id);
+}
+
+/**
+ * [TODO: Change the question.data access path. IModel structure is different]
+ * Get the question data array from model object
+ * @param model The model object
+ * @returns the question data array from model object
+ */
+function getQuestionData(model: IModel): IColumn[] {
+    debugger
+    return _get(model, 'questions.data', []);
+}

package/src/columns/helpers/index.ts

@@ -1,3 +1,8 @@
+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/src/columns/interfaces/IBColumAnswer.ts

@@ -0,0 +1,7 @@
+import { IBColumnAnswerGeneral } from "./IBColumnAnswerGeneral";
+import { IBColumnAnswerImages } from "./IBColumnAnswerImages";
+import { IBColumnAnswerLookupAnswer } from "./IBColumnAnswerLookupAnswer";
+
+export interface IBColumAnswer {
+    answers: IBColumnAnswerGeneral[] | IBColumnAnswerImages[] | IBColumnAnswerLookupAnswer[]
+}

package/src/columns/interfaces/IBColumn.ts

@@ -1,22 +1,29 @@
 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 used in the  App frontend side
+ * Structure for columns received in the question/list, model endpoints
  */
-export interface IBColumn {
+export interface IBColumn extends Partial<IBColumAnswer>, Partial<IBColumnAnswerExpression>, Partial<IBColumnAnswerExpressionCategory>, Partial<IBColumnAnswerSlidebar>, Partial<IBColumnAnswerLookupValue> {
     bucketId?: string; //Same as id
     formulaId?: string; //Same as id
     formulaType?: IFormulaType;
     geogroup?: boolean;
     id: string;
-    text: string;
+    imageUploadOption?: IColumnImageUploadOption; 
     linked?: boolean;
     linkid?: string;
     outputFormat?: IColumnOutputFormatSettings;
     property?: IColumnPropertyType;
     qrveyid: string;
+    text: string;
     type: IColumnType;
 }