@cubejs-client/core - npm Package Compare versions

Comparing version 0.33.0 to 0.33.12

dist/cubejs-client-core.esm.js

@@ -406,2 +406,5 @@ import { v4 } from 'uuid';
     const {
+      query
+    } = this.loadResponses[0];
+    const {
       xValues = [],
@@ -441,5 +444,13 @@ yValues = []
         const range = dayRange(value, value).snapTo(granularity);
+        const originalTimeDimension = query.timeDimensions.find(td => td.dimension);
+        let dateRange = [range.start, range.end];
+
+        if (originalTimeDimension) {
+          const [originalStart, originalEnd] = originalTimeDimension.dateRange;
+          dateRange = [dayjs(originalStart) > range.start ? dayjs(originalStart) : range.start, dayjs(originalEnd) < range.end ? dayjs(originalEnd) : range.end];
+        }
+
         timeDimensions.push({
           dimension: [cubeName, dimension].join('.'),
-          dateRange: [range.start, range.end].map(dt => dt.format('YYYY-MM-DDTHH:mm:ss.SSS'))
+          dateRange: dateRange.map(dt => dt.format('YYYY-MM-DDTHH:mm:ss.SSS'))
         });
@@ -459,5 +470,2 @@ } else if (value == null) {
     });
-    const {
-      query
-    } = this.loadResponses[0];
 
@@ -464,0 +472,0 @@ if (timeDimensions.length === 0 && query.timeDimensions.length > 0 && query.timeDimensions[0].granularity == null) {

package.json

 {
   "name": "@cubejs-client/core",
-  "version": "0.33.0",
+  "version": "0.33.12",
   "engines": {},
@@ -48,3 +48,3 @@ "repository": {
   },
-  "gitHead": "2cd366915c99b15477142bf6fe4af52c0fc8d0c6"
+  "gitHead": "e2bd235cea14a77854ff635f88836731597934ec"
 }

src/ResultSet.js

@@ -130,2 +130,3 @@ import dayjs from 'dayjs';
 
+    const { query } = this.loadResponses[0];
     const { xValues = [], yValues = [] } = drillDownLocator;
@@ -165,9 +166,21 @@ const normalizedPivotConfig = this.normalizePivotConfig(pivotConfig);
           const range = dayRange(value, value).snapTo(granularity);
+          const originalTimeDimension = query.timeDimensions.find((td) => td.dimension);
+          
+          let dateRange = [
+            range.start,
+            range.end
+          ];
+          
+          if (originalTimeDimension) {
+            const [originalStart, originalEnd] = originalTimeDimension.dateRange;
+            
+            dateRange = [
+              dayjs(originalStart) > range.start ? dayjs(originalStart) : range.start,
+              dayjs(originalEnd) < range.end ? dayjs(originalEnd) : range.end,
+            ];
+          }
 
           timeDimensions.push({
             dimension: [cubeName, dimension].join('.'),
-            dateRange: [
-              range.start,
-              range.end
-            ].map((dt) => dt.format('YYYY-MM-DDTHH:mm:ss.SSS')),
+            dateRange: dateRange.map((dt) => dt.format('YYYY-MM-DDTHH:mm:ss.SSS')),
           });
@@ -187,4 +200,3 @@ } else if (value == null) {
       });
-
-    const { query } = this.loadResponses[0];
+    
     if (
@@ -191,0 +203,0 @@ timeDimensions.length === 0 &&

src/tests/drill-down.test.js

@@ -60,3 +60,7 @@ import 'jest';
         timeDimensions: {
-          'Orders.ts.day': { title: 'Orders Ts', shortTitle: 'Ts', type: 'time' },
+          'Orders.ts.day': {
+            title: 'Orders Ts',
+            shortTitle: 'Ts',
+            type: 'time',
+          },
           'Orders.ts': { title: 'Orders Ts', shortTitle: 'Ts', type: 'time' },
@@ -84,2 +88,135 @@ },
 
+const loadResponse2 = {
+  queryType: 'regularQuery',
+  results: [
+    {
+      query: {
+        measures: ['Orders.count'],
+        timeDimensions: [
+          {
+            dimension: 'Orders.createdAt',
+            granularity: 'week',
+            dateRange: ['2023-05-10T00:00:00.000', '2023-05-14T23:59:59.999'],
+          },
+        ],
+        limit: 10000,
+        timezone: 'UTC',
+        order: [],
+        filters: [],
+        dimensions: [],
+        rowLimit: 10000,
+        queryType: 'regularQuery',
+      },
+      data: [
+        {
+          'Orders.createdAt.week': '2023-05-08T00:00:00.000',
+          'Orders.createdAt': '2023-05-08T00:00:00.000',
+          'Orders.count': '21',
+        },
+      ],
+      lastRefreshTime: '2023-05-22T14:46:45.000Z',
+      usedPreAggregations: {
+        'prod_pre_aggregations.orders_main': {
+          targetTableName:
+            'prod_pre_aggregations.orders_main20230508_instgodu_ehgypjtt_1i6n02l',
+          refreshKeyValues: [[]],
+          lastUpdatedAt: 1684766805000,
+        },
+      },
+      transformedQuery: {
+        sortedDimensions: [],
+        sortedTimeDimensions: [['Orders.createdAt', 'day']],
+        timeDimensions: [['Orders.createdAt', 'week']],
+        measures: ['Orders.count'],
+        leafMeasureAdditive: true,
+        leafMeasures: ['Orders.count'],
+        measureToLeafMeasures: {
+          'Orders.count': [
+            { measure: 'Orders.count', additive: true, type: 'count' },
+          ],
+        },
+        hasNoTimeDimensionsWithoutGranularity: true,
+        allFiltersWithinSelectedDimensions: true,
+        isAdditive: true,
+        granularityHierarchies: {
+          year: [
+            'year',
+            'quarter',
+            'month',
+            'month',
+            'day',
+            'hour',
+            'minute',
+            'second',
+          ],
+          quarter: ['quarter', 'month', 'day', 'hour', 'minute', 'second'],
+          month: ['month', 'day', 'hour', 'minute', 'second'],
+          week: ['week', 'day', 'hour', 'minute', 'second'],
+          day: ['day', 'hour', 'minute', 'second'],
+          hour: ['hour', 'minute', 'second'],
+          minute: ['minute', 'second'],
+          second: ['second'],
+        },
+        hasMultipliedMeasures: false,
+        hasCumulativeMeasures: false,
+        windowGranularity: null,
+        filterDimensionsSingleValueEqual: {},
+        ownedDimensions: [],
+        ownedTimeDimensionsWithRollupGranularity: [['Orders.createdAt', 'day']],
+        ownedTimeDimensionsAsIs: [['Orders.createdAt', 'week']],
+      },
+      requestId: 'x',
+      annotation: {
+        measures: {
+          'Orders.count': {
+            title: 'Orders Count',
+            shortTitle: 'Count',
+            type: 'number',
+            drillMembers: ['Orders.id', 'Orders.createdAt'],
+            drillMembersGrouped: {
+              measures: [],
+              dimensions: ['Orders.id', 'Orders.createdAt'],
+            },
+          },
+        },
+        dimensions: {},
+        segments: {},
+        timeDimensions: {
+          'Orders.createdAt.week': {
+            title: 'Orders Created at',
+            shortTitle: 'Created at',
+            type: 'time',
+          },
+          'Orders.createdAt': {
+            title: 'Orders Created at',
+            shortTitle: 'Created at',
+            type: 'time',
+          },
+        },
+      },
+      dataSource: 'default',
+      dbType: 'postgres',
+      extDbType: 'cubestore',
+    },
+  ],
+  pivotQuery: {
+    measures: ['Orders.count'],
+    timeDimensions: [
+      {
+        dimension: 'Orders.createdAt',
+        granularity: 'week',
+        dateRange: ['2023-05-10T00:00:00.000', '2023-05-14T23:59:59.999'],
+      },
+    ],
+    limit: 10000,
+    timezone: 'UTC',
+    order: [],
+    filters: [],
+    dimensions: [],
+    rowLimit: 10000,
+    queryType: 'regularQuery',
+  },
+  slowQuery: false,
+};
+
 describe('drill down query', () => {
@@ -106,3 +243,3 @@ const resultSet1 = new ResultSet(loadResponse());
       dimensions: ['Statuses.potential'],
-      timeDimensions: []
+      timeDimensions: [],
     })
@@ -190,29 +327,47 @@ );
   });
-  
+
   it('handles null values', () => {
+    expect(resultSet4.drillDown({ xvalues: [null] })).toEqual({
+      measures: [],
+      segments: [],
+      dimensions: ['Orders.id', 'Orders.title'],
+      filters: [
+        {
+          member: 'Orders.count',
+          operator: 'measureFilter',
+        },
+        {
+          member: 'Statuses.potential',
+          operator: 'notSet',
+        },
+      ],
+      timeDimensions: [],
+      timezone: 'UTC',
+    });
+  });
+
+  it('respects the parent time dimension date range', () => {
+    const resultSet = new ResultSet(loadResponse2);
+
     expect(
-      resultSet4.drillDown({ xvalues: [null] })
-    ).toEqual(
-      {
-        measures: [],
-        segments: [],
-        dimensions: [
-          'Orders.id',
-          'Orders.title',
-        ],
-        filters: [
-          {
-            member: 'Orders.count',
-            operator: 'measureFilter',
-          },
-          {
-            member: 'Statuses.potential',
-            operator: 'notSet',
-          },
-        ],
-        timeDimensions: [],
-        timezone: 'UTC',
-      }
-    );
+      resultSet.drillDown({ xValues: ['2023-05-08T00:00:00.000'] })
+    ).toEqual({
+      measures: [],
+      segments: [],
+      dimensions: ['Orders.id', 'Orders.createdAt'],
+      filters: [
+        {
+          operator: 'measureFilter',
+          member: 'Orders.count',
+        },
+      ],
+      timeDimensions: [
+        {
+          dimension: 'Orders.createdAt',
+          dateRange: ['2023-05-10T00:00:00.000', '2023-05-14T23:59:59.999'],
+        },
+      ],
+      timezone: 'UTC'
+    });
   });
 });

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

1814061

increased by0.55%

Lines of code

21248

increased by0.89%

No dependency changes