@resolveio/server-lib 4.4.23 → 4.4.24

package/methods/report-builder.js

@@ -187,7 +187,7 @@ function loadReportBuilderMethods(methodManager) {
                 if (date_field === void 0) { date_field = ''; }
                 if (date_interval === void 0) { date_interval = ''; }
                 return new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
-                    var _a, _b, uniqueSelectedFieldCollections, modelCollection, queryMatchCondition, queryLookups, queryUnwindCollectionPaths, queryGroupUnwindCollectionPaths, queryGroups, queryGroupUnwind, queryGroup_1, correctSort_1, _loop_1, i, queryProjection, queryTotals, query, queryMatchConditionLookup, tmpProj_1, tmpAnds_1, res, err_1;
+                    var _a, _b, uniqueSelectedFieldCollections, modelCollection, queryMatchCondition, queryLookups, queryGroupUnwindCollectionPaths, queryUnwindCollectionPaths, queryGroups, queryGroupUnwind, queryGroup_1, correctSort_1, _loop_1, i, queryProjection, queryTotals, query, queryMatchConditionLookup, tmpProj_1, tmpAnds_1, res, err_1;
                     var _this = this;
                     return __generator(this, function (_c) {
                         switch (_c.label) {
@@ -244,25 +244,25 @@ function loadReportBuilderMethods(methodManager) {
                                         }
                                     });
                                 });
-                                queryUnwindCollectionPaths = [];
-                                selectedFields.filter(function (a) { return a.fieldPath.includes('$'); }).forEach(function (field) {
-                                    var arrayPartData = field.fieldPath.split('.$');
+                                queryGroupUnwindCollectionPaths = [];
+                                groupsRow.filter(function (a) { return a.treeItem.fieldPath.includes('$'); }).forEach(function (field) {
+                                    var arrayPartData = field.treeItem.fieldPath.split('.$');
                                     var path = '$';
                                     for (var i = 0; i < arrayPartData.length - 1; i++) {
                                         path += arrayPartData[i];
-                                        if (!queryUnwindCollectionPaths.filter(function (a) { return a === path; })[0]) {
-                                            queryUnwindCollectionPaths.push(path);
+                                        if (!queryGroupUnwindCollectionPaths.filter(function (a) { return a === path; })[0]) {
+                                            queryGroupUnwindCollectionPaths.push(path);
                                         }
                                     }
                                 });
-                                queryGroupUnwindCollectionPaths = [];
-                                groupsRow.filter(function (a) { return a.treeItem.fieldPath.includes('$'); }).forEach(function (field) {
-                                    var arrayPartData = field.treeItem.fieldPath.split('.$');
+                                queryUnwindCollectionPaths = [];
+                                selectedFields.filter(function (a) { return a.fieldPath.includes('$'); }).forEach(function (field) {
+                                    var arrayPartData = field.fieldPath.split('.$');
                                     var path = '$';
                                     for (var i = 0; i < arrayPartData.length - 1; i++) {
                                         path += arrayPartData[i];
-                                        if (!queryGroupUnwindCollectionPaths.filter(function (a) { return a === path; })[0]) {
-                                            queryGroupUnwindCollectionPaths.push(path);
+                                        if (!queryUnwindCollectionPaths.some(function (a) { return a === path; }) && !queryGroupUnwindCollectionPaths.some(function (a) { return a === path; })) {
+                                            queryUnwindCollectionPaths.push(path);
                                         }
                                     }
                                 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@resolveio/server-lib",
-  "version": "4.4.23",
+  "version": "4.4.24",
   "description": "",
   "main": "index.ts",
   "scripts": {