@qrvey/utils 1.3.0-15 → 1.3.0-18

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

@@ -14,8 +14,8 @@ function getFiltersByDatasetsColumns(data, datasets = []) {
         return;
     if ((0, isEmpty_1.isEmpty)(datasets))
         return data;
-    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);
+    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);
@@ -25,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/services/Filters.api.js

@@ -100,7 +100,8 @@ 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.datasets);
+        const dataset = config.datasets.find(d => { var _a; return d.qrveyid === ((_a = config.filter) === null || _a === void 0 ? void 0 : _a.column.qrveyid); });
+        filterData = (0, getFiltersByDatasetsColumns_1.getFiltersByDatasetsColumns)(filterData, (0, isEmpty_1.isEmpty)(dataset) ? [] : [dataset]);
         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);

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/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/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

@@ -11,8 +11,8 @@ export function getFiltersByDatasetsColumns(data, datasets = []) {
         return;
     if (isEmpty(datasets))
         return data;
-    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);
+    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);
@@ -22,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/services/Filters.api.js

@@ -94,7 +94,8 @@ export class FiltersApi {
         var _a;
         const scopes = this.getAvailableScopeIds(config);
         let filterData = getFiltersByVisibility(config.filterData, scopes);
-        filterData = getFiltersByDatasetsColumns(filterData, config.datasets);
+        const dataset = config.datasets.find(d => { var _a; return d.qrveyid === ((_a = config.filter) === null || _a === void 0 ? void 0 : _a.column.qrveyid); });
+        filterData = getFiltersByDatasetsColumns(filterData, isEmpty(dataset) ? [] : [dataset]);
         filterData = excludeFiltersByAggregateColumn(filterData);
         const logics = FDToLogic(filterData);
         const hierarchyLogic = getLogicByScopesHierarchy(logics, scopes, (_a = config.filter) === null || _a === void 0 ? void 0 : _a.extras.scope);

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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qrvey/utils",
-  "version": "1.3.0-15",
+  "version": "1.3.0-18",
   "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

@@ -13,12 +13,12 @@ export function getFiltersByDatasetsColumns(data: IFUData, datasets: IDataset[]
     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,
@@ -33,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/services/Filters.api.ts

@@ -109,7 +109,8 @@ export class FiltersApi {
   private getLogic(config: IFSGetDataValues) {
     const scopes = this.getAvailableScopeIds(config);
     let filterData = getFiltersByVisibility(config.filterData, scopes);
-    filterData = getFiltersByDatasetsColumns(filterData as IFUData, config.datasets);
+    const dataset = config.datasets.find(d => d.qrveyid === config.filter?.column.qrveyid);
+    filterData = getFiltersByDatasetsColumns(filterData as IFUData, isEmpty(dataset) ? [] : [dataset]);
     filterData = excludeFiltersByAggregateColumn(filterData);
     const logics = FDToLogic(filterData);
     const hierarchyLogic = getLogicByScopesHierarchy(logics, scopes, config.filter?.extras.scope);

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