@qrvey/utils 1.3.0-14 → 1.3.0-17

package/.eslintrc.json

@@ -20,7 +20,9 @@
         "comma-spacing": "off",
         "semi": "off",
         "no-unused-vars": "off",
+        "no-shadow": "off",
 
+        "@typescript-eslint/no-shadow": ["error"],
         "@typescript-eslint/no-inferrable-types": "warn",
         "@typescript-eslint/object-curly-spacing": ["warn", "always"],
         "@typescript-eslint/no-extra-semi": ["warn"],

package/dist/cjs/columns/helpers/getDatasetColumnByDatasets.js

@@ -13,7 +13,7 @@ const getDatasetColumn_1 = require("./getDatasetColumn");
 function getDatasetColumnByDatasets(column, datasets) {
     if ((0, isEmpty_1.isEmpty)(column) || (0, isEmpty_1.isEmpty)(datasets))
         return;
-    const dataset = datasets.find(dataset => dataset.qrveyid === column.qrveyid);
+    const dataset = datasets.find(_dataset => _dataset.qrveyid === column.qrveyid);
     return (0, getDatasetColumn_1.getDatasetColumn)(column, dataset);
 }
 exports.getDatasetColumnByDatasets = getDatasetColumnByDatasets;

package/dist/cjs/filters/adapters/FDToLogic.js

@@ -29,8 +29,9 @@ exports.FDToLogic = FDToLogic;
  * @returns a filter logic array
  */
 function getLogicBodyFromFD21(filterData) {
-    let logics = [];
-    logics = filterData.scopes.reduce((logics, scope) => {
+    if ((0, isEmpty_1.isEmpty)(filterData))
+        return [];
+    return filterData.scopes.reduce((logics, scope) => {
         const logic = buildLogic(scope);
         let filters = [];
         if (scope.datasets.length > 0) {
@@ -42,7 +43,6 @@ function getLogicBodyFromFD21(filterData) {
         logics.push(Object.assign(Object.assign({}, logic), { filters }));
         return logics;
     }, []);
-    return logics;
 }
 function buildLogic(scopeSection) {
     return {

package/dist/cjs/filters/helpers/common/getFiltersByDatasetsColumns.js

@@ -12,8 +12,10 @@ const isEmpty_1 = require("../../../general/mix/isEmpty");
 function getFiltersByDatasetsColumns(data, datasets = []) {
     if ((0, isEmpty_1.isEmpty)(data) || (0, isEmpty_1.isEmpty)(data.scopes))
         return;
-    return Object.assign(Object.assign({}, data), { scopes: data.scopes.map(scope => (Object.assign(Object.assign({}, scope), { datasets: scope.datasets.map(filterDataset => {
-                const dataset = datasets.find(data => data.qrveyid === filterDataset.qrveyid);
+    if ((0, isEmpty_1.isEmpty)(datasets))
+        return data;
+    const newData = Object.assign(Object.assign({}, data), { scopes: data.scopes.map(scope => (Object.assign(Object.assign({}, scope), { datasets: scope.datasets.map(filterDataset => {
+                const dataset = datasets.find(_data => _data.qrveyid === filterDataset.qrveyid);
                 if (!(0, isEmpty_1.isEmpty)(dataset)) {
                     return Object.assign(Object.assign({}, filterDataset), { filters: filterDataset.filters.map(filter => {
                             const column = (dataset.options || []).find(cInfo => cInfo.id === filter.column.id && cInfo.qrveyid === filter.column.qrveyid);
@@ -23,5 +25,8 @@ function getFiltersByDatasetsColumns(data, datasets = []) {
                         }).filter(Boolean) });
                 }
             }).filter(dataset => !(0, isEmpty_1.isEmpty)(dataset) && dataset.filters.length > 0) }))).filter(scope => !(0, isEmpty_1.isEmpty)(scope) && scope.datasets.length > 0) });
+    if (!(0, isEmpty_1.isEmpty)(newData) && newData.scopes.length > 0) {
+        return newData;
+    }
 }
 exports.getFiltersByDatasetsColumns = getFiltersByDatasetsColumns;

package/dist/cjs/globalization/helpers/getI18nDateGroupLabel.js

@@ -29,7 +29,7 @@ function getI18nMonthLabel(label, translate) {
 }
 function getI18nYearMonthLabel(label, translate) {
     if (!(0, isTokenLabel_1.isTokenLabel)(label) && !(0, isEmpty_1.isEmpty)(translate)) {
-        const month = getI18nMonthPropertyByIndex(DATE_YEAR_MONTHS_1.DATE_YEAR_MONTHS.findIndex(month => month === label));
+        const month = getI18nMonthPropertyByIndex(DATE_YEAR_MONTHS_1.DATE_YEAR_MONTHS.findIndex(_month => _month === label));
         if (!(0, isEmpty_1.isEmpty)(month))
             label = translate('common.date_grouping.' + month + '_mmm');
     }

package/dist/cjs/globalization/interfaces/chart_builder/II18nChartBuilderStyleOptions.d.ts

@@ -11,6 +11,16 @@ export interface II18nChartBuilderStyleOptions {
     chart_type_disabled_message: string;
     comparision_color: string;
     data_labels_check: string;
+    data_labels_clustering: string;
+    data_labels_format: string;
+    data_labels_position: string;
+    data_labels_position_inside: string;
+    data_labels_position_outside: string;
+    data_labels_show_as: string;
+    data_labels_show_as_category: string;
+    data_labels_show_as_percentage: string;
+    data_labels_show_as_placeholder: string;
+    data_labels_show_as_value: string;
     default_format_title: string;
     display_outliers_check: string;
     line_opacity: string;

package/dist/cjs/globalization/labels/chart_builder/I18N_CHART_BUILDER_STYLE_OPTIONS.js

@@ -15,6 +15,16 @@ exports.I18N_CHART_BUILDER_STYLE_OPTIONS = {
         chart_type_disabled_message: '<i>Type</i> selection is disabled because stacked type configuration is in use.',
         comparision_color: 'Comparision Color',
         data_labels_check: 'Data Labels',
+        data_labels_clustering: '<i>Clustering</i> is inactive, enable it to use <i>{{text}}</i>.',
+        data_labels_format: '<i>% Difference</i> is active, disable it to set a different formatting.',
+        data_labels_position: 'Label Position',
+        data_labels_position_inside: 'Inside',
+        data_labels_position_outside: 'Outside',
+        data_labels_show_as: 'Show as',
+        data_labels_show_as_category: 'Category',
+        data_labels_show_as_percentage: 'Percentage',
+        data_labels_show_as_placeholder: 'Select Option',
+        data_labels_show_as_value: 'Value',
         default_format_title: 'Format',
         display_outliers_check: 'Display Outliers',
         line_opacity: 'Line Opacity',

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

@@ -11,9 +11,9 @@ const BColumnsToUIColumns_adapter_1 = require("./BColumnsToUIColumns.adapter");
 function BBranchesMapToUIBranchesMap(branchesMap) {
     if ((0, isEmpty_1.isEmpty)(branchesMap))
         return [];
-    return branchesMap.map(branchesMap => ({
-        questionid: branchesMap.questionid,
-        branches: branchesMap.branches.map(branch => ({
+    return branchesMap.map(branchMap => ({
+        questionid: branchMap.questionid,
+        branches: branchMap.branches.map(branch => ({
             columns: (0, BColumnsToUIColumns_adapter_1.BColumnsToUIColumns)(branch.questions.data)
         }))
     }));

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

@@ -1,25 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BColumnsToUIColumns = void 0;
+const getAttribute_1 = require("../../general/object/getAttribute");
 function BColumnsToUIColumns(columns = [], dataset) {
     return columns.map(column => ({
         answers: column.answers,
-        bucketid: column.bucketId,
+        bucketid: (0, getAttribute_1.getAttribute)(column, 'bucket_id'),
         expressionCategory: column.activeCat,
         expressionNegative: column.negative,
         expressionPositive: column.positive,
         expressionWords: column.words,
-        formulaid: column.formulaId,
+        formulaid: (0, getAttribute_1.getAttribute)(column, 'formula_id'),
         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,
+        linkid: (0, getAttribute_1.getAttribute)(dataset, 'link_id') || (0, getAttribute_1.getAttribute)(column, 'link_id'),
         outputFormat: column.outputFormat,
         property: column.property,
-        qrveyid: (dataset === null || dataset === void 0 ? void 0 : dataset.qrveyid) || column.qrveyid,
+        qrveyid: (0, getAttribute_1.getAttribute)(dataset, 'qrvey_id') || (0, getAttribute_1.getAttribute)(column, 'qrvey_id'),
         slidebarValue: column.sliderVal,
         lookupValue: column.value,
         type: column.type,

package/dist/cjs/services/adapters/BDatasetsToUIDatasets.adapter.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BDatasetsToUIDatasets = void 0;
+const getAttribute_1 = require("../../general/object/getAttribute");
 const BColumnsToUIColumns_adapter_1 = require("./BColumnsToUIColumns.adapter");
 function BDatasetsToUIDatasets(datasets = []) {
     return datasets.map(dataset => ({
-        qrveyid: dataset.qrveyid,
+        qrveyid: (0, getAttribute_1.getAttribute)(dataset, 'qrvey_id'),
         label: dataset.name,
-        linkid: dataset.linkid,
+        linkid: (0, getAttribute_1.getAttribute)(dataset, 'link_id'),
         options: (0, BColumnsToUIColumns_adapter_1.BColumnsToUIColumns)(dataset.options, dataset),
     }));
 }

package/dist/columns/helpers/getDatasetColumnByDatasets.js

@@ -10,6 +10,6 @@ import { getDatasetColumn } from "./getDatasetColumn";
 export function getDatasetColumnByDatasets(column, datasets) {
     if (isEmpty(column) || isEmpty(datasets))
         return;
-    const dataset = datasets.find(dataset => dataset.qrveyid === column.qrveyid);
+    const dataset = datasets.find(_dataset => _dataset.qrveyid === column.qrveyid);
     return getDatasetColumn(column, dataset);
 }

package/dist/filters/adapters/FDToLogic.js

@@ -25,8 +25,9 @@ export function FDToLogic(filterData) {
  * @returns a filter logic array
  */
 function getLogicBodyFromFD21(filterData) {
-    let logics = [];
-    logics = filterData.scopes.reduce((logics, scope) => {
+    if (isEmpty(filterData))
+        return [];
+    return filterData.scopes.reduce((logics, scope) => {
         const logic = buildLogic(scope);
         let filters = [];
         if (scope.datasets.length > 0) {
@@ -38,7 +39,6 @@ function getLogicBodyFromFD21(filterData) {
         logics.push(Object.assign(Object.assign({}, logic), { filters }));
         return logics;
     }, []);
-    return logics;
 }
 function buildLogic(scopeSection) {
     return {

package/dist/filters/helpers/common/getFiltersByDatasetsColumns.js

@@ -9,8 +9,10 @@ import { isEmpty } from "../../../general/mix/isEmpty";
 export function getFiltersByDatasetsColumns(data, datasets = []) {
     if (isEmpty(data) || isEmpty(data.scopes))
         return;
-    return Object.assign(Object.assign({}, data), { scopes: data.scopes.map(scope => (Object.assign(Object.assign({}, scope), { datasets: scope.datasets.map(filterDataset => {
-                const dataset = datasets.find(data => data.qrveyid === filterDataset.qrveyid);
+    if (isEmpty(datasets))
+        return data;
+    const newData = Object.assign(Object.assign({}, data), { scopes: data.scopes.map(scope => (Object.assign(Object.assign({}, scope), { datasets: scope.datasets.map(filterDataset => {
+                const dataset = datasets.find(_data => _data.qrveyid === filterDataset.qrveyid);
                 if (!isEmpty(dataset)) {
                     return Object.assign(Object.assign({}, filterDataset), { filters: filterDataset.filters.map(filter => {
                             const column = (dataset.options || []).find(cInfo => cInfo.id === filter.column.id && cInfo.qrveyid === filter.column.qrveyid);
@@ -20,4 +22,7 @@ export function getFiltersByDatasetsColumns(data, datasets = []) {
                         }).filter(Boolean) });
                 }
             }).filter(dataset => !isEmpty(dataset) && dataset.filters.length > 0) }))).filter(scope => !isEmpty(scope) && scope.datasets.length > 0) });
+    if (!isEmpty(newData) && newData.scopes.length > 0) {
+        return newData;
+    }
 }

package/dist/globalization/helpers/getI18nDateGroupLabel.js

@@ -25,7 +25,7 @@ function getI18nMonthLabel(label, translate) {
 }
 function getI18nYearMonthLabel(label, translate) {
     if (!isTokenLabel(label) && !isEmpty(translate)) {
-        const month = getI18nMonthPropertyByIndex(DATE_YEAR_MONTHS.findIndex(month => month === label));
+        const month = getI18nMonthPropertyByIndex(DATE_YEAR_MONTHS.findIndex(_month => _month === label));
         if (!isEmpty(month))
             label = translate('common.date_grouping.' + month + '_mmm');
     }

package/dist/globalization/interfaces/chart_builder/II18nChartBuilderStyleOptions.d.ts

@@ -11,6 +11,16 @@ export interface II18nChartBuilderStyleOptions {
     chart_type_disabled_message: string;
     comparision_color: string;
     data_labels_check: string;
+    data_labels_clustering: string;
+    data_labels_format: string;
+    data_labels_position: string;
+    data_labels_position_inside: string;
+    data_labels_position_outside: string;
+    data_labels_show_as: string;
+    data_labels_show_as_category: string;
+    data_labels_show_as_percentage: string;
+    data_labels_show_as_placeholder: string;
+    data_labels_show_as_value: string;
     default_format_title: string;
     display_outliers_check: string;
     line_opacity: string;

package/dist/globalization/labels/chart_builder/I18N_CHART_BUILDER_STYLE_OPTIONS.js

@@ -12,6 +12,16 @@ export const I18N_CHART_BUILDER_STYLE_OPTIONS = {
         chart_type_disabled_message: '<i>Type</i> selection is disabled because stacked type configuration is in use.',
         comparision_color: 'Comparision Color',
         data_labels_check: 'Data Labels',
+        data_labels_clustering: '<i>Clustering</i> is inactive, enable it to use <i>{{text}}</i>.',
+        data_labels_format: '<i>% Difference</i> is active, disable it to set a different formatting.',
+        data_labels_position: 'Label Position',
+        data_labels_position_inside: 'Inside',
+        data_labels_position_outside: 'Outside',
+        data_labels_show_as: 'Show as',
+        data_labels_show_as_category: 'Category',
+        data_labels_show_as_percentage: 'Percentage',
+        data_labels_show_as_placeholder: 'Select Option',
+        data_labels_show_as_value: 'Value',
         default_format_title: 'Format',
         display_outliers_check: 'Display Outliers',
         line_opacity: 'Line Opacity',

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

@@ -8,9 +8,9 @@ import { BColumnsToUIColumns } from "./BColumnsToUIColumns.adapter";
 export function BBranchesMapToUIBranchesMap(branchesMap) {
     if (isEmpty(branchesMap))
         return [];
-    return branchesMap.map(branchesMap => ({
-        questionid: branchesMap.questionid,
-        branches: branchesMap.branches.map(branch => ({
+    return branchesMap.map(branchMap => ({
+        questionid: branchMap.questionid,
+        branches: branchMap.branches.map(branch => ({
             columns: BColumnsToUIColumns(branch.questions.data)
         }))
     }));

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

@@ -1,22 +1,23 @@
+import { getAttribute } from "../../general/object/getAttribute";
 export function BColumnsToUIColumns(columns = [], dataset) {
     return columns.map(column => ({
         answers: column.answers,
-        bucketid: column.bucketId,
+        bucketid: getAttribute(column, 'bucket_id'),
         expressionCategory: column.activeCat,
         expressionNegative: column.negative,
         expressionPositive: column.positive,
         expressionWords: column.words,
-        formulaid: column.formulaId,
+        formulaid: getAttribute(column, 'formula_id'),
         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,
+        linkid: getAttribute(dataset, 'link_id') || getAttribute(column, 'link_id'),
         outputFormat: column.outputFormat,
         property: column.property,
-        qrveyid: (dataset === null || dataset === void 0 ? void 0 : dataset.qrveyid) || column.qrveyid,
+        qrveyid: getAttribute(dataset, 'qrvey_id') || getAttribute(column, 'qrvey_id'),
         slidebarValue: column.sliderVal,
         lookupValue: column.value,
         type: column.type,

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

@@ -1,9 +1,10 @@
+import { getAttribute } from "../../general/object/getAttribute";
 import { BColumnsToUIColumns } from "./BColumnsToUIColumns.adapter";
 export function BDatasetsToUIDatasets(datasets = []) {
     return datasets.map(dataset => ({
-        qrveyid: dataset.qrveyid,
+        qrveyid: getAttribute(dataset, 'qrvey_id'),
         label: dataset.name,
-        linkid: dataset.linkid,
+        linkid: getAttribute(dataset, 'link_id'),
         options: BColumnsToUIColumns(dataset.options, dataset),
     }));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qrvey/utils",
-  "version": "1.3.0-14",
+  "version": "1.3.0-17",
   "description": "Helper, Utils for all Qrvey Projects",
   "homepage": "https://bitbucket.org/qrvey/qrvey_utils/wiki/Home",
   "main": "dist/index.js",

package/src/columns/helpers/getDatasetColumnByDatasets.ts

@@ -14,6 +14,6 @@ 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);
+    const dataset = datasets.find(_dataset => _dataset.qrveyid === column.qrveyid);
     return getDatasetColumn(column, dataset);
 }

package/src/filters/adapters/FDToLogic.ts

@@ -33,8 +33,9 @@ export function FDToLogic(filterData: IFSData): IFBLogic[] {
  * @returns a filter logic array
  */
 function getLogicBodyFromFD21(filterData: IFSData): IFBLogic[] {
-    let logics = [];
-    logics = filterData.scopes.reduce((logics: IFBLogic[], scope: IFSScope) => {
+    if (isEmpty(filterData)) return [];
+
+    return filterData.scopes.reduce((logics: IFBLogic[], scope: IFSScope) => {
         const logic: IFBLogic = buildLogic(scope);
         let filters: IFBFilter[] = [];
         if (scope.datasets.length > 0) {
@@ -45,9 +46,8 @@ function getLogicBodyFromFD21(filterData: IFSData): IFBLogic[] {
         }
         logics.push({ ...logic, filters });
         return logics;
-        }, [] as IFBLogic[]);
-    return logics;
-  }
+    }, [] as IFBLogic[]);
+}
 
 function buildLogic(scopeSection: IFSScope): IFBLogic {
     return {

package/src/filters/helpers/common/getFiltersByDatasetsColumns.ts

@@ -11,13 +11,14 @@ import { IFUData } from "../../interfaces/ui/IFUData";
  */
 export function getFiltersByDatasetsColumns(data: IFUData, datasets: IDataset[] = []): IFUData {
     if (isEmpty(data) || isEmpty(data.scopes)) return;
+    if (isEmpty(datasets)) return data;
 
-    return {
+    const newData = {
         ...data,
         scopes: data.scopes.map(scope => ({
             ...scope,
             datasets: scope.datasets.map(filterDataset => {
-                const dataset = datasets.find(data => data.qrveyid === filterDataset.qrveyid);
+                const dataset = datasets.find(_data => _data.qrveyid === filterDataset.qrveyid);
                 if (!isEmpty(dataset)) {
                     return {
                         ...filterDataset,
@@ -32,4 +33,8 @@ export function getFiltersByDatasetsColumns(data: IFUData, datasets: IDataset[]
             }).filter(dataset => !isEmpty(dataset) && dataset.filters.length > 0)
         })).filter(scope => !isEmpty(scope) && scope.datasets.length > 0)
     };
+
+    if (!isEmpty(newData) && newData.scopes.length > 0) {
+        return newData;
+    }
 }

package/src/globalization/helpers/getI18nDateGroupLabel.ts

@@ -30,7 +30,7 @@ function getI18nMonthLabel(label: string, translate?: II18nServiceTranslate): st
 
 function getI18nYearMonthLabel(label: string, translate?: II18nServiceTranslate): string {
     if (!isTokenLabel(label) && !isEmpty(translate)) {
-        const month = getI18nMonthPropertyByIndex(DATE_YEAR_MONTHS.findIndex(month => month === label));
+        const month = getI18nMonthPropertyByIndex(DATE_YEAR_MONTHS.findIndex(_month => _month === label));
         if (!isEmpty(month)) label = translate('common.date_grouping.' + month + '_mmm');
     }
     return label;

package/src/globalization/interfaces/chart_builder/II18nChartBuilderStyleOptions.ts

@@ -11,6 +11,16 @@ export interface II18nChartBuilderStyleOptions {
     chart_type_disabled_message: string;
     comparision_color: string;
     data_labels_check: string;
+    data_labels_clustering: string;
+    data_labels_format: string;
+    data_labels_position: string;
+    data_labels_position_inside: string;
+    data_labels_position_outside: string;
+    data_labels_show_as: string;
+    data_labels_show_as_category: string;
+    data_labels_show_as_percentage: string;
+    data_labels_show_as_placeholder: string;
+    data_labels_show_as_value: string;
     default_format_title: string;
     display_outliers_check: string;
     line_opacity: string;

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

@@ -18,6 +18,16 @@ export const I18N_CHART_BUILDER_STYLE_OPTIONS: Pick<II18nChartBuilder, StyleOpti
         chart_type_disabled_message: '<i>Type</i> selection is disabled because stacked type configuration is in use.',
         comparision_color: 'Comparision Color',
         data_labels_check: 'Data Labels',
+        data_labels_clustering: '<i>Clustering</i> is inactive, enable it to use <i>{{text}}</i>.',
+        data_labels_format: '<i>% Difference</i> is active, disable it to set a different formatting.',
+        data_labels_position: 'Label Position',
+        data_labels_position_inside: 'Inside',
+        data_labels_position_outside: 'Outside',
+        data_labels_show_as: 'Show as',
+        data_labels_show_as_category: 'Category',
+        data_labels_show_as_percentage: 'Percentage',
+        data_labels_show_as_placeholder: 'Select Option',
+        data_labels_show_as_value: 'Value',
         default_format_title: 'Format',
         display_outliers_check: 'Display Outliers',
         line_opacity: 'Line Opacity',

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

@@ -11,9 +11,9 @@ import { BColumnsToUIColumns } from "./BColumnsToUIColumns.adapter";
 export function BBranchesMapToUIBranchesMap(branchesMap: IBModelBranchesMap[]): IModelBranchesMap[] {
     if (isEmpty(branchesMap)) return [];
   
-    return branchesMap.map(branchesMap => ({
-      questionid: branchesMap.questionid,
-      branches: branchesMap.branches.map(branch => ({
+    return branchesMap.map(branchMap => ({
+      questionid: branchMap.questionid,
+      branches: branchMap.branches.map(branch => ({
         columns: BColumnsToUIColumns(branch.questions.data)
       }))
     }));

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

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

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

@@ -1,12 +1,13 @@
+import { getAttribute } from "../../general/object/getAttribute";
 import { IBDataset } from "../../qrvey/interfaces/IBDataset";
 import { IDataset } from "../../qrvey/interfaces/IDataset";
 import { BColumnsToUIColumns } from "./BColumnsToUIColumns.adapter";
 
 export function BDatasetsToUIDatasets(datasets: IBDataset[] = []): IDataset[] {
     return datasets.map(dataset => ({
-        qrveyid: dataset.qrveyid,
+        qrveyid: getAttribute(dataset, 'qrvey_id'),
         label: dataset.name,
-        linkid: dataset.linkid,
+        linkid: getAttribute(dataset, 'link_id'),
         options: BColumnsToUIColumns(dataset.options, dataset),
     }));
 }