@qrvey/utils 1.3.0-7 → 1.3.0

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/globalization/labels/style_themes/I18N_STYLE_THEMES.ts

@@ -42,6 +42,7 @@ export const I18N_STYLE_THEMES: II18nStyleThemes = {
       qrvey_theme: 'Qrvey Theme',
       restore_to_default: 'Restore to Default',
       save_theme: 'Save Theme',
+      show_header: 'Show Header',
       show_title: 'Show Title',
       table_header_styles: 'Table Header Styles',
       text_styles: 'Text Styles',

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

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/test/filters/backend/getLogicByDatasetsColumns.test.js

@@ -0,0 +1,312 @@
+// const { buildUserFilters, getLogicByDatasetsColumns  } = require('../../../dist/cjs');
+
+// // 1- Buen questionid y qrveyid
+// const userFilters = {
+//     filters: [
+//       {
+//         operator: "AND",
+//         expressions: [
+//           {
+//                       questionid: "OTCK9KZe2",
+//             qrveyid: "mSdv9Qjm5",
+//             validationType: "BETWEEN",
+//             value: [
+//               {
+//                 lte: "15",
+//                 gte: "10"
+//               },
+//               {
+//                 lte: "30",
+//                 gte: "20"
+//               }
+//             ]
+//           }
+//         ]
+//       }
+//     ]
+//   };
+  
+//   // 2 - Buen questionid sin qrveyid
+//   const userFilters2 = {
+//     filters: [
+//       {
+//         operator: "AND",
+//         expressions: [
+//           {
+//                       questionid: "OTCK9KZe2",
+//             validationType: "BETWEEN",
+//             value: [
+//               {
+//                 lte: "15",
+//                 gte: "10"
+//               },
+//               {
+//                 lte: "30",
+//                 gte: "20"
+//               }
+//             ]
+//           }
+//         ]
+//       }
+//     ]
+//   };
+  
+//   // 3 - Buen questionid con mal qrveyid
+//   const userFilters3 = {
+//     filters: [
+//       {
+//         operator: "AND",
+//         expressions: [
+//           {
+//                       questionid: "OTCK9KZe2",
+//             qrveyid: "mSdv9Qjm55",
+//             validationType: "BETWEEN",
+//             value: [
+//               {
+//                 lte: "15",
+//                 gte: "10"
+//               },
+//               {
+//                 lte: "30",
+//                 gte: "20"
+//               }
+//             ]
+//           }
+//         ]
+//       }
+//     ]
+//   };
+  
+//   // 4 - Mal questionid con buen qrveyid
+//   const userFilters4 = {
+//     filters: [
+//       {
+//         operator: "AND",
+//         expressions: [
+//           {
+//                       questionid: "OTCK9KZe22",
+//             qrveyid: "mSdv9Qjm5",
+//             validationType: "BETWEEN",
+//             value: [
+//               {
+//                 lte: "15",
+//                 gte: "10"
+//               },
+//               {
+//                 lte: "30",
+//                 gte: "20"
+//               }
+//             ]
+//           }
+//         ]
+//       }
+//     ]
+//   };
+  
+//   // 5 - Mal questionid sin qrveyid
+//   const userFilters5 = {
+//     filters: [
+//       {
+//         operator: "AND",
+//         expressions: [
+//           {
+//                       questionid: "OTCK9KZe22",
+//             validationType: "BETWEEN",
+//             value: [
+//               {
+//                 lte: "15",
+//                 gte: "10"
+//               },
+//               {
+//                 lte: "30",
+//                 gte: "20"
+//               }
+//             ]
+//           }
+//         ]
+//       }
+//     ]
+//   };
+  
+//   // 6 - Mal questionid con mal qrveyid
+//   const userFilters6 = {
+//     filters: [
+//       {
+//         operator: "AND",
+//         expressions: [
+//           {
+//                       questionid: "OTCK9KZe22",
+//             qrveyid: "mSdv9Qjm55",
+//             validationType: "BETWEEN",
+//             value: [
+//               {
+//                 lte: "15",
+//                 gte: "10"
+//               },
+//               {
+//                 lte: "30",
+//                 gte: "20"
+//               }
+//             ]
+//           }
+//         ]
+//       }
+//     ]
+//   };
+  
+//   // 7 - Sin questionid con buen qrveyid
+//   const userFilters7 = {
+//     filters: [
+//       {
+//         operator: "AND",
+//         expressions: [
+//           {
+//             qrveyid: "mSdv9Qjm5",
+//             validationType: "BETWEEN",
+//             value: [
+//               {
+//                 lte: "15",
+//                 gte: "10"
+//               },
+//               {
+//                 lte: "30",
+//                 gte: "20"
+//               }
+//             ]
+//           }
+//         ]
+//       }
+//     ]
+//   };
+  
+//   // 8 - Sin questionid y sin qrveyid
+//   const userFilters8 = {
+//     filters: [
+//       {
+//         operator: "AND",
+//         expressions: [
+//           {
+//             validationType: "BETWEEN",
+//             value: [
+//               {
+//                 lte: "15",
+//                 gte: "10"
+//               },
+//               {
+//                 lte: "30",
+//                 gte: "20"
+//               }
+//             ]
+//           }
+//         ]
+//       }
+//     ]
+//   };
+  
+//   // 9 - Sin questionid con mal qrveyid
+//   const userFilters9 = {
+//     filters: [
+//       {
+//         operator: "AND",
+//         expressions: [
+//           {
+//             qrveyid: "mSdv9Qjm55",
+//             validationType: "BETWEEN",
+//             value: [
+//               {
+//                 lte: "15",
+//                 gte: "10"
+//               },
+//               {
+//                 lte: "30",
+//                 gte: "20"
+//               }
+//             ]
+//           }
+//         ]
+//       }
+//     ]
+//   };
+  
+//   const datasets = [
+//       {
+//           "qrveyid": "mSdv9Qjm5",
+//           "label": "SQL SELECT ALL - NewView   SELECT ALL",
+//           "options": [
+//               {
+//                   "id": "OTCK9KZe2",
+//                   "label": "id",
+//                   "outputFormat": {
+//                       "format": "Numeric",
+//                       "numericType": "INTEGER",
+//                       "type": "NUMERIC",
+//                       "decimals": "0"
+//                   },
+//                   "qrveyid": "mSdv9Qjm5",
+//                   "type": "NUMERIC"
+//               },
+//               {
+//                   "id": "pL4N25I67",
+//                   "label": "date_1",
+//                   "outputFormat": {
+//                       "type": "DATE",
+//                       "format": "MM/DD/YYYY"
+//                   },
+//                   "qrveyid": "mSdv9Qjm5",
+//                   "type": "DATE"
+//               },
+//               {
+//                   "id": "VvHNwFfjQ",
+//                   "label": "date_2_dt",
+//                   "outputFormat": {
+//                       "type": "DATE",
+//                       "format": "MM/DD/YYYY"
+//                   },
+//                   "qrveyid": "mSdv9Qjm5",
+//                   "type": "DATE"
+//               },
+//               {
+//                   "id": "Em6zxp2Ch",
+//                   "label": "country",
+//                   "qrveyid": "mSdv9Qjm5",
+//                   "type": "TEXT_LABEL"
+//               },
+//               {
+//                   "id": "J6Oq48t8F",
+//                   "label": "epoch",
+//                   "outputFormat": {
+//                       "type": "DATE",
+//                       "format": "MM/DD/YYYY"
+//                   },
+//                   "qrveyid": "mSdv9Qjm5",
+//                   "type": "DATE"
+//               }
+//           ]
+//       }
+//   ];
+  
+//   console.log('1 - Buen questionid y buen qrveyid');
+//   getLogicByDatasetsColumns(buildUserFilters(userFilters), datasets);
+//   console.log('2 - Buen questionid sin qrveyid');
+//   getLogicByDatasetsColumns(buildUserFilters(userFilters2), datasets);
+//   console.log('3 - Buen questionid con mal qrveyid');
+//   getLogicByDatasetsColumns(buildUserFilters(userFilters3), datasets);
+//   console.log('4 - Mal questionid con buen qrveyid');
+//   getLogicByDatasetsColumns(buildUserFilters(userFilters4), datasets);
+//   console.log('5 - Mal questionid sin qrveyid');
+//   getLogicByDatasetsColumns(buildUserFilters(userFilters5), datasets);
+//   console.log('6 - Mal questionid y mal qrveyid');
+//   getLogicByDatasetsColumns(buildUserFilters(userFilters6), datasets);
+//   console.log('7 - Sin questionid con buen qrveyid');
+//   getLogicByDatasetsColumns(buildUserFilters(userFilters7), datasets);
+//   console.log('8 - Sin questionid y sin qrveyid');
+//   getLogicByDatasetsColumns(buildUserFilters(userFilters8), datasets);
+//   console.log('9 - Sin questionid con mal qrveyid');
+//   getLogicByDatasetsColumns(buildUserFilters(userFilters9), datasets);
+
+
+describe('Dummy test', function () {
+	test('Dummy test #1', function () {
+		expect([]).toEqual([]);
+	});
+});