@qrvey/utils 1.3.0-13 → 1.3.0-16

package/dist/cjs/columns/helpers/getDatasetColumnByDatasets.d.ts

@@ -0,0 +1,10 @@
+import { IDataset } from "../../qrvey/interfaces/IDataset";
+import { IColumn } from "../interfaces/IColumn";
+/**
+ * Gets a column from a dataset.
+ * Recieves a partial column object and received a full column object from the Dataset
+ * @param column a partial column object
+ * @param datasets the datasets to look for the colun
+ * @returns the Column object
+ */
+export declare function getDatasetColumnByDatasets(column: Partial<IColumn>, datasets: IDataset[]): IColumn;

package/dist/cjs/columns/helpers/{getDatasetColumnyDatasets.js → getDatasetColumnByDatasets.js}

@@ -3,6 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDatasetColumnByDatasets = void 0;
 const isEmpty_1 = require("../../general/mix/isEmpty");
 const getDatasetColumn_1 = require("./getDatasetColumn");
+/**
+ * Gets a column from a dataset.
+ * Recieves a partial column object and received a full column object from the Dataset
+ * @param column a partial column object
+ * @param datasets the datasets to look for the colun
+ * @returns the Column object
+ */
 function getDatasetColumnByDatasets(column, datasets) {
     if ((0, isEmpty_1.isEmpty)(column) || (0, isEmpty_1.isEmpty)(datasets))
         return;

package/dist/cjs/columns/helpers/index.d.ts

@@ -1,7 +1,6 @@
 export * from './getColumnsLabel';
-export * from './getDatasetByColumn';
 export * from './getDatasetColumn';
-export * from './getDatasetColumnyDatasets';
+export * from './getDatasetColumnByDatasets';
 export * from './getModelColumn';
 export * from './isComplexColumn';
 export * from './isDateColumn';

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

@@ -15,9 +15,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./getColumnsLabel"), exports);
-__exportStar(require("./getDatasetByColumn"), exports);
 __exportStar(require("./getDatasetColumn"), exports);
-__exportStar(require("./getDatasetColumnyDatasets"), exports);
+__exportStar(require("./getDatasetColumnByDatasets"), exports);
 __exportStar(require("./getModelColumn"), exports);
 __exportStar(require("./isComplexColumn"), exports);
 __exportStar(require("./isDateColumn"), exports);

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

@@ -12,7 +12,9 @@ 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 => {
+    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 => {
@@ -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/filters/helpers/getAvailableScopes.js

@@ -17,18 +17,18 @@ function getAvailableScopes(config) {
     if (!(0, isEmpty_1.isEmpty)(config.predefinedScopes))
         scopes = config.predefinedScopes;
     scopes = [...scopes, { label: FILTER_SCOPE_1.FILTER_SCOPE.GLOBAL, id: undefined }];
-    if (config.tabid != null || config.pageid != null) {
+    if (config.tabid != null || config.pageid != null || config.panelid != null) {
         if (config.pageid)
             scopes = [...scopes, { label: FILTER_SCOPE_1.FILTER_SCOPE.PAGE, id: config.pageid }];
         if (config.tabid)
             scopes = [...scopes, { label: FILTER_SCOPE_1.FILTER_SCOPE.TAB, id: config.tabid }];
         if (config.defaultid)
             scopes = [...scopes, { label: FILTER_SCOPE_1.FILTER_SCOPE.DEFAULT, id: config.defaultid }];
-        scopes = [...scopes, { label: FILTER_SCOPE_1.FILTER_SCOPE.CHART, id: config.tabid || config.pageid }];
+        if (config.panelid || config.tabid || config.pageid)
+            scopes = [...scopes, { label: FILTER_SCOPE_1.FILTER_SCOPE.CHART, id: config.panelid || config.tabid || config.pageid }];
     }
-    else {
-        if (config.defaultid)
-            scopes = [...scopes, { label: FILTER_SCOPE_1.FILTER_SCOPE.DEFAULT, id: config.defaultid }];
+    else if (config.defaultid) {
+        scopes = [...scopes, { label: FILTER_SCOPE_1.FILTER_SCOPE.DEFAULT, id: config.defaultid }];
     }
     return scopes;
 }

package/dist/cjs/filters/interfaces/common/IFSAvailableScope.d.ts

@@ -9,6 +9,7 @@ export interface IFSAvailableScope {
     qrveyid?: string;
     tabid?: string;
     pageid?: string;
+    panelid?: string;
     defaultid?: string;
     predefinedScopes?: IFSScopeID[];
 }

package/dist/cjs/filters/interfaces/functions/IFFiltersGetData.d.ts

@@ -6,7 +6,7 @@ import { IFUChartSettings } from "../ui/IFUChartSettings";
 import { IFUFlattenedFilter } from "../ui/IFUFlattenedFilter";
 export interface IFFiltersGetData {
     chartRequest?: IFUChartSettings;
-    dataset: IDataset;
+    datasets: IDataset[];
     filterData?: IFSData;
     filter: IFUFlattenedFilter;
     pageid?: string;

package/dist/cjs/filters/interfaces/index.d.ts

@@ -15,6 +15,7 @@
 export * from './backend/index';
 export * from './builder/index';
 export * from './common/index';
+export * from './functions/index';
 export * from './panel/index';
 export * from './ui/index';
 export * from './IFDateProperty';

package/dist/cjs/filters/interfaces/index.js

@@ -31,6 +31,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./backend/index"), exports);
 __exportStar(require("./builder/index"), exports);
 __exportStar(require("./common/index"), exports);
+__exportStar(require("./functions/index"), exports);
 __exportStar(require("./panel/index"), exports);
 __exportStar(require("./ui/index"), exports);
 __exportStar(require("./IFDateProperty"), exports);

package/dist/cjs/filters/services/Filters.api.js

@@ -31,6 +31,7 @@ const getModel_api_1 = require("../../services/api/getModel.api");
 const areStaticColumnValues_1 = require("../../qrvey/helpers/areStaticColumnValues");
 const getValuesFromDataset_1 = require("../helpers/common/getValuesFromDataset");
 const getFiltersByDatasetsColumns_1 = require("../helpers/common/getFiltersByDatasetsColumns");
+const getDatasetByColumn_1 = require("../../qrvey/helpers/getDatasetByColumn");
 class FiltersApi {
     constructor(cfg) {
         this.setConfig(cfg);
@@ -58,14 +59,14 @@ class FiltersApi {
     //   return DataTokensApi.getAll(config);
     // }
     getData(config, resetApi = false) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         let promise;
         if ((0, areStaticColumnValues_1.areStaticColumnValues)((_a = config.filter) === null || _a === void 0 ? void 0 : _a.column) && (0, isEmpty_1.isEmpty)((_b = config.filter) === null || _b === void 0 ? void 0 : _b.column.aggregate)) {
             promise = (0, getValuesFromDataset_1.getValuesFromDataset)({
                 column: (_c = config.filter) === null || _c === void 0 ? void 0 : _c.column,
                 property: (_d = config.filter) === null || _d === void 0 ? void 0 : _d.property,
                 lookupDisplay: (_e = config.filter) === null || _e === void 0 ? void 0 : _e.lookupDisplayIndex,
-                dataset: config.dataset,
+                dataset: (0, getDatasetByColumn_1.getDatasetByColumn)((_f = config.filter) === null || _f === void 0 ? void 0 : _f.column, config.datasets),
                 value: config.valueText,
             });
         }
@@ -99,7 +100,7 @@ class FiltersApi {
         var _a;
         const scopes = this.getAvailableScopeIds(config);
         let filterData = (0, getFiltersByVisibility_1.getFiltersByVisibility)(config.filterData, scopes);
-        filterData = (0, getFiltersByDatasetsColumns_1.getFiltersByDatasetsColumns)(filterData, [config.dataset]);
+        filterData = (0, getFiltersByDatasetsColumns_1.getFiltersByDatasetsColumns)(filterData, config.datasets);
         filterData = (0, excludeFiltersByAggregateColumn_1.excludeFiltersByAggregateColumn)(filterData);
         const logics = (0, FDToLogic_1.FDToLogic)(filterData);
         const hierarchyLogic = (0, getLogicByScopesHierarchy_1.getLogicByScopesHierarchy)(logics, scopes, (_a = config.filter) === null || _a === void 0 ? void 0 : _a.extras.scope);
@@ -121,9 +122,9 @@ class FiltersApi {
     * @returns a collection of the pair Scopes and Scope IDs
     */
     getAvailableScopeIds(config) {
-        var _a, _b, _c, _d, _e, _f, _g;
-        return (0, getAvailableScopes_1.getAvailableScopes)(Object.assign(Object.assign({}, (0, getAvailableScopesIDsByConfig_1.getAvailableScopesIDsByConfig)(config)), { qrveyid: (_b = (_a = config.filter) === null || _a === void 0 ? void 0 : _a.column) === null || _b === void 0 ? void 0 : _b.qrveyid, defaultid: [FILTER_SCOPE_1.FILTER_SCOPE.DEFAULT, FILTER_SCOPE_1.FILTER_SCOPE.CHART].includes((_c = config.filter) === null || _c === void 0 ? void 0 : _c.extras.scope) && ((_e = (_d = config.filter) === null || _d === void 0 ? void 0 : _d.column) === null || _e === void 0 ? void 0 : _e.qrveyid), scope: undefined, predefinedScopes: [
-                { label: FILTER_SCOPE_1.FILTER_SCOPE.DATA, id: (_g = (_f = config.filter) === null || _f === void 0 ? void 0 : _f.column) === null || _g === void 0 ? void 0 : _g.qrveyid }
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        return (0, getAvailableScopes_1.getAvailableScopes)(Object.assign(Object.assign({}, (0, getAvailableScopesIDsByConfig_1.getAvailableScopesIDsByConfig)(config)), { panelid: FILTER_SCOPE_1.FILTER_SCOPE.CHART === ((_a = config.filter) === null || _a === void 0 ? void 0 : _a.extras.scope) ? (_b = config.filter) === null || _b === void 0 ? void 0 : _b.extras.scopeid : undefined, scopeid: (_c = config.filter) === null || _c === void 0 ? void 0 : _c.extras.scopeid, qrveyid: (_e = (_d = config.filter) === null || _d === void 0 ? void 0 : _d.column) === null || _e === void 0 ? void 0 : _e.qrveyid, defaultid: [FILTER_SCOPE_1.FILTER_SCOPE.DEFAULT].includes((_f = config.filter) === null || _f === void 0 ? void 0 : _f.extras.scope) ? (_h = (_g = config.filter) === null || _g === void 0 ? void 0 : _g.column) === null || _h === void 0 ? void 0 : _h.qrveyid : undefined, scope: undefined, predefinedScopes: [
+                { label: FILTER_SCOPE_1.FILTER_SCOPE.DATA, id: (_k = (_j = config.filter) === null || _j === void 0 ? void 0 : _j.column) === null || _k === void 0 ? void 0 : _k.qrveyid }
             ] }));
     }
     /**

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/qrvey/helpers/getDatasetByColumn.d.ts

@@ -0,0 +1,9 @@
+import { IColumn } from "../../columns/interfaces/IColumn";
+import { IDataset } from "../interfaces/IDataset";
+/**
+ * Gets a dataset by a given partial column
+ * @param column the partial column
+ * @param datasets the collection of dataset to look for one.
+ * @returns the found dataset or undefined
+ */
+export declare function getDatasetByColumn(column: Partial<IColumn>, datasets?: IDataset[]): IDataset;

package/dist/cjs/{columns → qrvey}/helpers/getDatasetByColumn.js

@@ -2,9 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDatasetByColumn = void 0;
 const isEmpty_1 = require("../../general/mix/isEmpty");
-function getDatasetByColumn(column, datasets) {
+/**
+ * Gets a dataset by a given partial column
+ * @param column the partial column
+ * @param datasets the collection of dataset to look for one.
+ * @returns the found dataset or undefined
+ */
+function getDatasetByColumn(column, datasets = []) {
     if ((0, isEmpty_1.isEmpty)(column) || (0, isEmpty_1.isEmpty)(datasets))
         return;
-    return datasets.find(dataset => dataset.qrveyid === column.qrveyid && dataset.linkid === column.linkid);
+    return datasets.find(dataset => dataset.qrveyid === column.qrveyid);
 }
 exports.getDatasetByColumn = getDatasetByColumn;

package/dist/cjs/qrvey/helpers/index.d.ts

@@ -1,6 +1,7 @@
 export * from './areStaticColumnValues';
 export * from './getCategorizableExpression';
 export * from './getDataAnswersByColumn';
+export * from './getDatasetByColumn';
 export * from './getDropdownAnswers';
 export * from './getExpressionAnswers';
 export * from './getImageAnswers';

package/dist/cjs/qrvey/helpers/index.js

@@ -17,6 +17,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./areStaticColumnValues"), exports);
 __exportStar(require("./getCategorizableExpression"), exports);
 __exportStar(require("./getDataAnswersByColumn"), exports);
+__exportStar(require("./getDatasetByColumn"), exports);
 __exportStar(require("./getDropdownAnswers"), exports);
 __exportStar(require("./getExpressionAnswers"), exports);
 __exportStar(require("./getImageAnswers"), exports);

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/cjs/services/adapters/BModelToUIModel.adapter.js

@@ -12,7 +12,7 @@ function BModelToUIModel(model) {
         appid: model.appid,
         branchesMap: (0, BBranchesMapToUIBranchesMap_adapter_1.BBranchesMapToUIBranchesMap)(model.branchesMap),
         columnOrder: model.questionOrder,
-        columns: (0, BColumnsToUIColumns_adapter_1.BColumnsToUIColumns)(model.questions.data),
+        columns: (0, BColumnsToUIColumns_adapter_1.BColumnsToUIColumns)(model.questions.data, { qrveyid: model.qrveyid }),
         createDate: model.createDate,
         datalinkInfo: model.datalinkInfo,
         modifyDate: model.modifyDate,

package/dist/columns/helpers/getDatasetColumnByDatasets.d.ts

@@ -0,0 +1,10 @@
+import { IDataset } from "../../qrvey/interfaces/IDataset";
+import { IColumn } from "../interfaces/IColumn";
+/**
+ * Gets a column from a dataset.
+ * Recieves a partial column object and received a full column object from the Dataset
+ * @param column a partial column object
+ * @param datasets the datasets to look for the colun
+ * @returns the Column object
+ */
+export declare function getDatasetColumnByDatasets(column: Partial<IColumn>, datasets: IDataset[]): IColumn;

package/dist/columns/helpers/{getDatasetColumnyDatasets.js → getDatasetColumnByDatasets.js}

@@ -1,5 +1,12 @@
 import { isEmpty } from "../../general/mix/isEmpty";
 import { getDatasetColumn } from "./getDatasetColumn";
+/**
+ * Gets a column from a dataset.
+ * Recieves a partial column object and received a full column object from the Dataset
+ * @param column a partial column object
+ * @param datasets the datasets to look for the colun
+ * @returns the Column object
+ */
 export function getDatasetColumnByDatasets(column, datasets) {
     if (isEmpty(column) || isEmpty(datasets))
         return;

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

@@ -1,7 +1,6 @@
 export * from './getColumnsLabel';
-export * from './getDatasetByColumn';
 export * from './getDatasetColumn';
-export * from './getDatasetColumnyDatasets';
+export * from './getDatasetColumnByDatasets';
 export * from './getModelColumn';
 export * from './isComplexColumn';
 export * from './isDateColumn';

package/dist/columns/helpers/index.js

@@ -1,7 +1,6 @@
 export * from './getColumnsLabel';
-export * from './getDatasetByColumn';
 export * from './getDatasetColumn';
-export * from './getDatasetColumnyDatasets';
+export * from './getDatasetColumnByDatasets';
 export * from './getModelColumn';
 export * from './isComplexColumn';
 export * from './isDateColumn';

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

@@ -9,7 +9,9 @@ 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 => {
+    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 => {
@@ -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/filters/helpers/getAvailableScopes.js

@@ -14,18 +14,18 @@ export function getAvailableScopes(config) {
     if (!isEmpty(config.predefinedScopes))
         scopes = config.predefinedScopes;
     scopes = [...scopes, { label: FILTER_SCOPE.GLOBAL, id: undefined }];
-    if (config.tabid != null || config.pageid != null) {
+    if (config.tabid != null || config.pageid != null || config.panelid != null) {
         if (config.pageid)
             scopes = [...scopes, { label: FILTER_SCOPE.PAGE, id: config.pageid }];
         if (config.tabid)
             scopes = [...scopes, { label: FILTER_SCOPE.TAB, id: config.tabid }];
         if (config.defaultid)
             scopes = [...scopes, { label: FILTER_SCOPE.DEFAULT, id: config.defaultid }];
-        scopes = [...scopes, { label: FILTER_SCOPE.CHART, id: config.tabid || config.pageid }];
+        if (config.panelid || config.tabid || config.pageid)
+            scopes = [...scopes, { label: FILTER_SCOPE.CHART, id: config.panelid || config.tabid || config.pageid }];
     }
-    else {
-        if (config.defaultid)
-            scopes = [...scopes, { label: FILTER_SCOPE.DEFAULT, id: config.defaultid }];
+    else if (config.defaultid) {
+        scopes = [...scopes, { label: FILTER_SCOPE.DEFAULT, id: config.defaultid }];
     }
     return scopes;
 }

package/dist/filters/interfaces/common/IFSAvailableScope.d.ts

@@ -9,6 +9,7 @@ export interface IFSAvailableScope {
     qrveyid?: string;
     tabid?: string;
     pageid?: string;
+    panelid?: string;
     defaultid?: string;
     predefinedScopes?: IFSScopeID[];
 }

package/dist/filters/interfaces/functions/IFFiltersGetData.d.ts

@@ -6,7 +6,7 @@ import { IFUChartSettings } from "../ui/IFUChartSettings";
 import { IFUFlattenedFilter } from "../ui/IFUFlattenedFilter";
 export interface IFFiltersGetData {
     chartRequest?: IFUChartSettings;
-    dataset: IDataset;
+    datasets: IDataset[];
     filterData?: IFSData;
     filter: IFUFlattenedFilter;
     pageid?: string;

package/dist/filters/interfaces/index.d.ts

@@ -15,6 +15,7 @@
 export * from './backend/index';
 export * from './builder/index';
 export * from './common/index';
+export * from './functions/index';
 export * from './panel/index';
 export * from './ui/index';
 export * from './IFDateProperty';

package/dist/filters/interfaces/index.js

@@ -15,6 +15,7 @@
 export * from './backend/index';
 export * from './builder/index';
 export * from './common/index';
+export * from './functions/index';
 export * from './panel/index';
 export * from './ui/index';
 export * from './IFDateProperty';

package/dist/filters/services/Filters.api.js

@@ -25,6 +25,7 @@ import { getModel } from '../../services/api/getModel.api';
 import { areStaticColumnValues } from '../../qrvey/helpers/areStaticColumnValues';
 import { getValuesFromDataset } from '../helpers/common/getValuesFromDataset';
 import { getFiltersByDatasetsColumns } from '../helpers/common/getFiltersByDatasetsColumns';
+import { getDatasetByColumn } from '../../qrvey/helpers/getDatasetByColumn';
 export class FiltersApi {
     constructor(cfg) {
         this.setConfig(cfg);
@@ -52,14 +53,14 @@ export class FiltersApi {
     //   return DataTokensApi.getAll(config);
     // }
     getData(config, resetApi = false) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         let promise;
         if (areStaticColumnValues((_a = config.filter) === null || _a === void 0 ? void 0 : _a.column) && isEmpty((_b = config.filter) === null || _b === void 0 ? void 0 : _b.column.aggregate)) {
             promise = getValuesFromDataset({
                 column: (_c = config.filter) === null || _c === void 0 ? void 0 : _c.column,
                 property: (_d = config.filter) === null || _d === void 0 ? void 0 : _d.property,
                 lookupDisplay: (_e = config.filter) === null || _e === void 0 ? void 0 : _e.lookupDisplayIndex,
-                dataset: config.dataset,
+                dataset: getDatasetByColumn((_f = config.filter) === null || _f === void 0 ? void 0 : _f.column, config.datasets),
                 value: config.valueText,
             });
         }
@@ -93,7 +94,7 @@ export class FiltersApi {
         var _a;
         const scopes = this.getAvailableScopeIds(config);
         let filterData = getFiltersByVisibility(config.filterData, scopes);
-        filterData = getFiltersByDatasetsColumns(filterData, [config.dataset]);
+        filterData = getFiltersByDatasetsColumns(filterData, config.datasets);
         filterData = excludeFiltersByAggregateColumn(filterData);
         const logics = FDToLogic(filterData);
         const hierarchyLogic = getLogicByScopesHierarchy(logics, scopes, (_a = config.filter) === null || _a === void 0 ? void 0 : _a.extras.scope);
@@ -115,9 +116,9 @@ export class FiltersApi {
     * @returns a collection of the pair Scopes and Scope IDs
     */
     getAvailableScopeIds(config) {
-        var _a, _b, _c, _d, _e, _f, _g;
-        return getAvailableScopes(Object.assign(Object.assign({}, getAvailableScopesIDsByConfig(config)), { qrveyid: (_b = (_a = config.filter) === null || _a === void 0 ? void 0 : _a.column) === null || _b === void 0 ? void 0 : _b.qrveyid, defaultid: [FILTER_SCOPE.DEFAULT, FILTER_SCOPE.CHART].includes((_c = config.filter) === null || _c === void 0 ? void 0 : _c.extras.scope) && ((_e = (_d = config.filter) === null || _d === void 0 ? void 0 : _d.column) === null || _e === void 0 ? void 0 : _e.qrveyid), scope: undefined, predefinedScopes: [
-                { label: FILTER_SCOPE.DATA, id: (_g = (_f = config.filter) === null || _f === void 0 ? void 0 : _f.column) === null || _g === void 0 ? void 0 : _g.qrveyid }
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        return getAvailableScopes(Object.assign(Object.assign({}, getAvailableScopesIDsByConfig(config)), { panelid: FILTER_SCOPE.CHART === ((_a = config.filter) === null || _a === void 0 ? void 0 : _a.extras.scope) ? (_b = config.filter) === null || _b === void 0 ? void 0 : _b.extras.scopeid : undefined, scopeid: (_c = config.filter) === null || _c === void 0 ? void 0 : _c.extras.scopeid, qrveyid: (_e = (_d = config.filter) === null || _d === void 0 ? void 0 : _d.column) === null || _e === void 0 ? void 0 : _e.qrveyid, defaultid: [FILTER_SCOPE.DEFAULT].includes((_f = config.filter) === null || _f === void 0 ? void 0 : _f.extras.scope) ? (_h = (_g = config.filter) === null || _g === void 0 ? void 0 : _g.column) === null || _h === void 0 ? void 0 : _h.qrveyid : undefined, scope: undefined, predefinedScopes: [
+                { label: FILTER_SCOPE.DATA, id: (_k = (_j = config.filter) === null || _j === void 0 ? void 0 : _j.column) === null || _k === void 0 ? void 0 : _k.qrveyid }
             ] }));
     }
     /**

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/qrvey/helpers/getDatasetByColumn.d.ts

@@ -0,0 +1,9 @@
+import { IColumn } from "../../columns/interfaces/IColumn";
+import { IDataset } from "../interfaces/IDataset";
+/**
+ * Gets a dataset by a given partial column
+ * @param column the partial column
+ * @param datasets the collection of dataset to look for one.
+ * @returns the found dataset or undefined
+ */
+export declare function getDatasetByColumn(column: Partial<IColumn>, datasets?: IDataset[]): IDataset;

package/dist/qrvey/helpers/getDatasetByColumn.js

@@ -0,0 +1,12 @@
+import { isEmpty } from "../../general/mix/isEmpty";
+/**
+ * Gets a dataset by a given partial column
+ * @param column the partial column
+ * @param datasets the collection of dataset to look for one.
+ * @returns the found dataset or undefined
+ */
+export function getDatasetByColumn(column, datasets = []) {
+    if (isEmpty(column) || isEmpty(datasets))
+        return;
+    return datasets.find(dataset => dataset.qrveyid === column.qrveyid);
+}

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

@@ -1,6 +1,7 @@
 export * from './areStaticColumnValues';
 export * from './getCategorizableExpression';
 export * from './getDataAnswersByColumn';
+export * from './getDatasetByColumn';
 export * from './getDropdownAnswers';
 export * from './getExpressionAnswers';
 export * from './getImageAnswers';

package/dist/qrvey/helpers/index.js

@@ -1,6 +1,7 @@
 export * from './areStaticColumnValues';
 export * from './getCategorizableExpression';
 export * from './getDataAnswersByColumn';
+export * from './getDatasetByColumn';
 export * from './getDropdownAnswers';
 export * from './getExpressionAnswers';
 export * from './getImageAnswers';

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/dist/services/adapters/BModelToUIModel.adapter.js

@@ -9,7 +9,7 @@ export function BModelToUIModel(model) {
         appid: model.appid,
         branchesMap: BBranchesMapToUIBranchesMap(model.branchesMap),
         columnOrder: model.questionOrder,
-        columns: BColumnsToUIColumns(model.questions.data),
+        columns: BColumnsToUIColumns(model.questions.data, { qrveyid: model.qrveyid }),
         createDate: model.createDate,
         datalinkInfo: model.datalinkInfo,
         modifyDate: model.modifyDate,

package/package.json

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

package/src/columns/helpers/{getDatasetColumnyDatasets.ts → getDatasetColumnByDatasets.ts}

@@ -3,6 +3,14 @@ import { IDataset } from "../../qrvey/interfaces/IDataset";
 import { IColumn } from "../interfaces/IColumn";
 import { getDatasetColumn } from "./getDatasetColumn";
 
+
+/**
+ * Gets a column from a dataset.
+ * Recieves a partial column object and received a full column object from the Dataset
+ * @param column a partial column object
+ * @param datasets the datasets to look for the colun
+ * @returns the Column object
+ */
 export function getDatasetColumnByDatasets(column: Partial<IColumn>, datasets: IDataset[]): IColumn {
     if (isEmpty(column) || isEmpty(datasets)) return;
 

package/src/columns/helpers/index.ts

@@ -1,7 +1,6 @@
 export * from './getColumnsLabel';
-export * from './getDatasetByColumn';
 export * from './getDatasetColumn';
-export * from './getDatasetColumnyDatasets';
+export * from './getDatasetColumnByDatasets';
 export * from './getModelColumn';
 export * from './isComplexColumn';
 export * from './isDateColumn';

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

@@ -11,8 +11,9 @@ 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,
@@ -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/filters/helpers/getAvailableScopes.ts

@@ -17,13 +17,13 @@ export function getAvailableScopes(config: IFSAvailableScope): IFSScopeID[] {
     if (!isEmpty(config.predefinedScopes)) scopes = config.predefinedScopes;
     scopes = [ ...scopes, { label: FILTER_SCOPE.GLOBAL, id: undefined } ];
 
-    if (config.tabid != null || config.pageid != null) {
+    if (config.tabid != null || config.pageid != null || config.panelid != null) {
         if (config.pageid) scopes = [...scopes, { label: FILTER_SCOPE.PAGE, id: config.pageid }];
         if (config.tabid) scopes = [ ...scopes, { label: FILTER_SCOPE.TAB, id: config.tabid }];
         if (config.defaultid) scopes = [...scopes, { label: FILTER_SCOPE.DEFAULT, id: config.defaultid }];
-        scopes = [...scopes, { label: FILTER_SCOPE.CHART, id: config.tabid || config.pageid }];
-    } else {
-        if (config.defaultid) scopes = [...scopes, { label: FILTER_SCOPE.DEFAULT, id: config.defaultid }];
+        if (config.panelid || config.tabid || config.pageid) scopes = [...scopes, { label: FILTER_SCOPE.CHART, id: config.panelid || config.tabid || config.pageid }];
+    } else if (config.defaultid) {
+        scopes = [...scopes, { label: FILTER_SCOPE.DEFAULT, id: config.defaultid }];
     }
     return scopes;
 }

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

@@ -10,6 +10,7 @@ export interface IFSAvailableScope {
     qrveyid?: string; // Qrvey ID
     tabid?: string; // Tab ID
     pageid?: string; // Page ID
+    panelid?: string; // The ID for Panel Filters
     defaultid?: string; // Default ID
     predefinedScopes?: IFSScopeID[]; // Predefined Scopes 
 }

package/src/filters/interfaces/functions/IFFiltersGetData.ts

@@ -7,7 +7,7 @@ import { IFUFlattenedFilter } from "../ui/IFUFlattenedFilter";
 
 export interface IFFiltersGetData {
     chartRequest?: IFUChartSettings;
-    dataset: IDataset;
+    datasets: IDataset[];
     filterData?: IFSData;
     filter: IFUFlattenedFilter;
     pageid?: string;

package/src/filters/interfaces/index.ts

@@ -16,6 +16,7 @@
 export * from './backend/index';
 export * from './builder/index';
 export * from './common/index';
+export * from './functions/index';
 export * from './panel/index';
 export * from './ui/index';
 

package/src/filters/services/Filters.api.ts

@@ -27,6 +27,7 @@ import { getValuesFromDataset } from '../helpers/common/getValuesFromDataset';
 import { IFFiltersGetData } from '../interfaces/functions/IFFiltersGetData';
 import { getFiltersByDatasetsColumns } from '../helpers/common/getFiltersByDatasetsColumns';
 import { IFUData } from '../interfaces/ui/IFUData';
+import { getDatasetByColumn } from '../../qrvey/helpers/getDatasetByColumn';
 
 
 interface IFilterApiConfig extends IFilterConfig {
@@ -76,7 +77,7 @@ export class FiltersApi {
         column: config.filter?.column,
         property: config.filter?.property,
         lookupDisplay: config.filter?.lookupDisplayIndex,
-        dataset: config.dataset,
+        dataset: getDatasetByColumn(config.filter?.column, config.datasets),
         value: config.valueText,
       });
     } else {
@@ -108,7 +109,7 @@ export class FiltersApi {
   private getLogic(config: IFSGetDataValues) {
     const scopes = this.getAvailableScopeIds(config);
     let filterData = getFiltersByVisibility(config.filterData, scopes);
-    filterData = getFiltersByDatasetsColumns(filterData as IFUData, [config.dataset]);
+    filterData = getFiltersByDatasetsColumns(filterData as IFUData, config.datasets);
     filterData = excludeFiltersByAggregateColumn(filterData);
     const logics = FDToLogic(filterData);
     const hierarchyLogic = getLogicByScopesHierarchy(logics, scopes, config.filter?.extras.scope);
@@ -135,8 +136,10 @@ export class FiltersApi {
   private getAvailableScopeIds(config: IFFiltersGetData): IFSScopeID[] {
     return getAvailableScopes({
         ...getAvailableScopesIDsByConfig(config),
+        panelid: FILTER_SCOPE.CHART === config.filter?.extras.scope ? config.filter?.extras.scopeid : undefined,
+        scopeid: config.filter?.extras.scopeid,
         qrveyid: config.filter?.column?.qrveyid,
-        defaultid: [FILTER_SCOPE.DEFAULT, FILTER_SCOPE.CHART].includes(config.filter?.extras.scope) && config.filter?.column?.qrveyid,
+        defaultid: [FILTER_SCOPE.DEFAULT].includes(config.filter?.extras.scope) ? config.filter?.column?.qrveyid : undefined,
         scope: undefined,
         predefinedScopes: [
           { label: FILTER_SCOPE.DATA, id: config.filter?.column?.qrveyid }

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/qrvey/helpers/getDatasetByColumn.ts

@@ -0,0 +1,15 @@
+import { IColumn } from "../../columns/interfaces/IColumn";
+import { isEmpty } from "../../general/mix/isEmpty";
+import { IDataset } from "../interfaces/IDataset";
+
+/**
+ * Gets a dataset by a given partial column
+ * @param column the partial column
+ * @param datasets the collection of dataset to look for one.
+ * @returns the found dataset or undefined
+ */
+export function getDatasetByColumn(column: Partial<IColumn>, datasets: IDataset[] = []): IDataset {
+    if (isEmpty(column) || isEmpty(datasets)) return;
+    
+    return datasets.find(dataset => dataset.qrveyid === column.qrveyid);
+}

package/src/qrvey/helpers/index.ts

@@ -1,6 +1,7 @@
 export * from './areStaticColumnValues';
 export * from './getCategorizableExpression';
 export * from './getDataAnswersByColumn';
+export * from './getDatasetByColumn';
 export * from './getDropdownAnswers';
 export * from './getExpressionAnswers';
 export * from './getImageAnswers';

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),
     }));
 }

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

@@ -12,7 +12,7 @@ export function BModelToUIModel(model: IBModel): IModel {
       appid: model.appid,
       branchesMap: BBranchesMapToUIBranchesMap(model.branchesMap),
       columnOrder: model.questionOrder,
-      columns: BColumnsToUIColumns(model.questions.data),
+      columns: BColumnsToUIColumns(model.questions.data, { qrveyid: model.qrveyid }),
       createDate: model.createDate,
       datalinkInfo: model.datalinkInfo,
       modifyDate: model.modifyDate,

package/dist/cjs/columns/helpers/getDatasetByColumn.d.ts

@@ -1,3 +0,0 @@
-import { IDataset } from "../../qrvey/interfaces/IDataset";
-import { IColumn } from "../interfaces/IColumn";
-export declare function getDatasetByColumn(column: IColumn, datasets: IDataset[]): IDataset;

package/dist/cjs/columns/helpers/getDatasetColumnyDatasets.d.ts

@@ -1,3 +0,0 @@
-import { IDataset } from "../../qrvey/interfaces/IDataset";
-import { IColumn } from "../interfaces/IColumn";
-export declare function getDatasetColumnByDatasets(column: Partial<IColumn>, datasets: IDataset[]): IColumn;

package/dist/columns/helpers/getDatasetByColumn.d.ts

@@ -1,3 +0,0 @@
-import { IDataset } from "../../qrvey/interfaces/IDataset";
-import { IColumn } from "../interfaces/IColumn";
-export declare function getDatasetByColumn(column: IColumn, datasets: IDataset[]): IDataset;

package/dist/columns/helpers/getDatasetByColumn.js

@@ -1,6 +0,0 @@
-import { isEmpty } from "../../general/mix/isEmpty";
-export function getDatasetByColumn(column, datasets) {
-    if (isEmpty(column) || isEmpty(datasets))
-        return;
-    return datasets.find(dataset => dataset.qrveyid === column.qrveyid && dataset.linkid === column.linkid);
-}

package/dist/columns/helpers/getDatasetColumnyDatasets.d.ts

@@ -1,3 +0,0 @@
-import { IDataset } from "../../qrvey/interfaces/IDataset";
-import { IColumn } from "../interfaces/IColumn";
-export declare function getDatasetColumnByDatasets(column: Partial<IColumn>, datasets: IDataset[]): IColumn;

package/src/columns/helpers/getDatasetByColumn.ts

@@ -1,9 +0,0 @@
-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);
-}