@softwear/latestcollectioncore 1.0.198 → 1.0.199

package/dist/articleStatus.js

@@ -159,10 +159,14 @@ function aggregator({ beginTimestamp, endTimestamp, filterExpression, aggregatio
             .filter((join) => filterExpression.includes(join[0] + '.'))
             .map((join) => join[1]);
     }
-    const aggregationEvaluator = buildAggregationEvaluator(aggregationExpression);
-    const aggregationGranularity = Object.entries(globalJoinableTables)
-        .filter((join) => aggregationExpression.includes(join[0] + '.'))
-        .map((join) => join[1]);
+    // Empty aggregation expression = no groupers → only the totals row
+    const totalsOnly = !aggregationExpression;
+    const aggregationEvaluator = totalsOnly ? undefined : buildAggregationEvaluator(aggregationExpression);
+    const aggregationGranularity = totalsOnly
+        ? []
+        : Object.entries(globalJoinableTables)
+            .filter((join) => aggregationExpression.includes(join[0] + '.'))
+            .map((join) => join[1]);
     const aggregationTrieRoot = {};
     return function (transaction) {
         if (filter) {
@@ -175,11 +179,6 @@ function aggregator({ beginTimestamp, endTimestamp, filterExpression, aggregatio
                     return;
             }
         }
-        const aggregateKeyLeaf = getTrieLeaf(aggregationTrieRoot, transaction, aggregationGranularity);
-        if (!aggregateKeyLeaf.aggregateKey) {
-            aggregateKeyLeaf.aggregateKey = aggregationEvaluator(transaction);
-        }
-        const aggregateKey = aggregateKeyLeaf.aggregateKey;
         // Prepare joined values for derived fields
         if (transaction.type == types_1.transactionTypeE.SALE) {
             const sku = globalRelations['sku'][transaction.ean];
@@ -194,8 +193,16 @@ function aggregator({ beginTimestamp, endTimestamp, filterExpression, aggregatio
             v[AMOUNT_SOLD_MAX] = (0, index_1.round2)((((sku === null || sku === void 0 ? void 0 : sku.price) || 0) / ((100 + (transaction.vat || (sku === null || sku === void 0 ? void 0 : sku.vat) || 21)) / 100)) * v[QTY_SOLD]);
             v[AMOUNT_SOLD_DISCOUNT] = (0, index_1.round2)(v[AMOUNT_SOLD_MAX] - v[AMOUNT_SOLD_EXCL]);
         }
-        if (totals)
+        if (totals || totalsOnly)
             addTransactionToAggregations(beginTimestamp, endTimestamp, '** TOTAL **', rawAggregations, transaction, maxRows);
+        // No detail/subtotal rows when there are no groupers
+        if (totalsOnly)
+            return;
+        const aggregateKeyLeaf = getTrieLeaf(aggregationTrieRoot, transaction, aggregationGranularity);
+        if (!aggregateKeyLeaf.aggregateKey) {
+            aggregateKeyLeaf.aggregateKey = aggregationEvaluator(transaction);
+        }
+        const aggregateKey = aggregateKeyLeaf.aggregateKey;
         // Single subtotals are subtotals for first grouper level
         // Example: for 4 groupers we have rows like
         // g0 g1 g2 g3 <- normal row with no subtotal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@softwear/latestcollectioncore",
-  "version": "1.0.198",
+  "version": "1.0.199",
   "description": "Core functions for LatestCollections applications",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/articleStatus.ts

@@ -242,10 +242,14 @@ function aggregator({
       .filter((join) => filterExpression.includes(join[0] + '.'))
       .map((join) => join[1])
   }
-  const aggregationEvaluator = buildAggregationEvaluator(aggregationExpression)
-  const aggregationGranularity = Object.entries(globalJoinableTables)
-    .filter((join) => aggregationExpression.includes(join[0] + '.'))
-    .map((join) => join[1])
+  // Empty aggregation expression = no groupers → only the totals row
+  const totalsOnly = !aggregationExpression
+  const aggregationEvaluator = totalsOnly ? undefined : buildAggregationEvaluator(aggregationExpression)
+  const aggregationGranularity = totalsOnly
+    ? []
+    : Object.entries(globalJoinableTables)
+        .filter((join) => aggregationExpression.includes(join[0] + '.'))
+        .map((join) => join[1])
   const aggregationTrieRoot: AggregateKeyTrieNode = {}
 
   return function (transaction: TransactionI): void {
@@ -257,11 +261,6 @@ function aggregator({
         if (filterLeaf.filterResult === -1) return
       }
     }
-    const aggregateKeyLeaf = getTrieLeaf<AggregateKeyTrieNode>(aggregationTrieRoot, transaction, aggregationGranularity)
-    if (!aggregateKeyLeaf.aggregateKey) {
-      aggregateKeyLeaf.aggregateKey = aggregationEvaluator(transaction) as string
-    }
-    const aggregateKey = aggregateKeyLeaf.aggregateKey as string
     // Prepare joined values for derived fields
     if (transaction.type == transactionTypeE.SALE) {
       const sku = globalRelations['sku'][transaction.ean]
@@ -276,7 +275,16 @@ function aggregator({
       v[AMOUNT_SOLD_DISCOUNT] = round2(v[AMOUNT_SOLD_MAX] - v[AMOUNT_SOLD_EXCL])
     }
 
-    if (totals) addTransactionToAggregations(beginTimestamp, endTimestamp, '** TOTAL **', rawAggregations, transaction, maxRows)
+    if (totals || totalsOnly) addTransactionToAggregations(beginTimestamp, endTimestamp, '** TOTAL **', rawAggregations, transaction, maxRows)
+
+    // No detail/subtotal rows when there are no groupers
+    if (totalsOnly) return
+
+    const aggregateKeyLeaf = getTrieLeaf<AggregateKeyTrieNode>(aggregationTrieRoot, transaction, aggregationGranularity)
+    if (!aggregateKeyLeaf.aggregateKey) {
+      aggregateKeyLeaf.aggregateKey = aggregationEvaluator!(transaction) as string
+    }
+    const aggregateKey = aggregateKeyLeaf.aggregateKey as string
 
     // Single subtotals are subtotals for first grouper level
     // Example: for 4 groupers we have rows like

package/test/articleStatus.spec.js

@@ -178,6 +178,29 @@ describe('articleStatus', () => {
       expect(result[2].vector[articleStatus.VALUE_AVG_STOCK]).toBe(84.15000000000002)
     })
 
+    it('should calculate only the totals row when no groupers are selected', () => {
+      const rawAggregations = {}
+      articleStatus.runQuery(
+        { beginTimeStamp: 1569316408000, endTimeStamp: 1569316409000 + msYear },
+        rawAggregations,
+        true,
+        TRANSACTIONS,
+        [],
+        SKUS,
+        {},
+        {},
+        false,
+        'transaction.ean=="000558000143"',
+        false
+      )
+
+      expect(Object.keys(rawAggregations)).toEqual(['** TOTAL **'])
+      const vector = [].slice.call(rawAggregations['** TOTAL **'])
+      articleStatus.postAgg(vector, msYear)
+      expect(vector[articleStatus.QTY_STOCK]).toBe(18)
+      expect(vector[articleStatus.QTY_END_STOCK]).toBe(17)
+    })
+
     it('should calculate aggregations', () => {
       const rawAggregations = {}
       articleStatus.runQuery(