@lightdash/common 0.1389.0 → 0.1390.1

package/dist/utils/filters.d.ts

@@ -1,8 +1,9 @@
 import { type DashboardTile } from '../types/dashboard';
 import { type Table } from '../types/explore';
 import { type CompiledField, type CustomSqlDimension, type Dimension, type Field, type FilterableDimension, type FilterableField, type FilterableItem, type ItemsMap, type TableCalculation } from '../types/field';
-import { FilterOperator, FilterType, type AndFilterGroup, type DashboardFieldTarget, type DashboardFilterRule, type DashboardFilters, type FilterDashboardToRule, type FilterGroup, type FilterGroupItem, type FilterRule, type Filters, type MetricFilterRule, type OrFilterGroup } from '../types/filter';
+import { FilterOperator, FilterType, UnitOfTime, type AndFilterGroup, type DashboardFieldTarget, type DashboardFilterRule, type DashboardFilters, type FilterDashboardToRule, type FilterGroup, type FilterGroupItem, type FilterRule, type Filters, type MetricFilterRule, type OrFilterGroup } from '../types/filter';
 import { type MetricQuery } from '../types/metricQuery';
+import { TimeFrames } from '../types/timeFrames';
 export declare const getFilterRulesFromGroup: (filterGroup: FilterGroup | undefined) => FilterRule[];
 export declare const getTotalFilterRules: (filters: Filters) => FilterRule[];
 export declare const countTotalFilterRules: (filters: Filters) => number;
@@ -10,6 +11,7 @@ export declare const hasNestedGroups: (filters: Filters) => boolean;
 export declare const getItemsFromFilterGroup: (filterGroup: FilterGroup | undefined) => FilterGroupItem[];
 export declare const getFilterGroupItemsPropertyName: (filterGroup: FilterGroup | undefined) => 'and' | 'or';
 export declare const getFilterTypeFromItem: (item: FilterableField) => FilterType;
+export declare const timeframeToUnitOfTime: (timeframe: TimeFrames) => UnitOfTime | undefined;
 export declare const getFilterRuleWithDefaultValue: <T extends FilterRule<FilterOperator, import("../types/filter").FieldTarget, any, any>>(field: FilterableField, filterRule: T, values?: any[] | null) => T;
 export declare const createFilterRuleFromField: (field: FilterableField, value?: any) => FilterRule;
 export declare const matchFieldExact: (a: Field) => (b: Field) => boolean;

package/dist/utils/filters.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resetRequiredFilterRules = exports.reduceRequiredDimensionFiltersToFilterRules = exports.isFilterRuleInQuery = exports.createFilterRuleFromRequiredMetricRule = exports.addDashboardFiltersToMetricQuery = exports.overrideFilterGroupWithFilterRules = exports.overrideChartFilter = exports.addFiltersToMetricQuery = exports.getDashboardFiltersForTileAndTables = exports.getDashboardFilterRulesForTileAndTables = exports.getDashboardFilterRulesForTables = exports.getTabUuidsForFilterRules = exports.getDashboardFilterRulesForTile = exports.deleteFilterRuleFromGroup = exports.getFiltersFromGroup = exports.isDimensionValueInvalidDate = exports.addFilterRule = exports.createDashboardFilterRuleFromField = exports.applyDefaultTileTargets = exports.isTileFilterable = exports.matchFieldByType = exports.matchFieldByTypeAndName = exports.matchFieldExact = exports.createFilterRuleFromField = exports.getFilterRuleWithDefaultValue = exports.getFilterTypeFromItem = exports.getFilterGroupItemsPropertyName = exports.getItemsFromFilterGroup = exports.hasNestedGroups = exports.countTotalFilterRules = exports.getTotalFilterRules = exports.getFilterRulesFromGroup = void 0;
+exports.resetRequiredFilterRules = exports.reduceRequiredDimensionFiltersToFilterRules = exports.isFilterRuleInQuery = exports.createFilterRuleFromRequiredMetricRule = exports.addDashboardFiltersToMetricQuery = exports.overrideFilterGroupWithFilterRules = exports.overrideChartFilter = exports.addFiltersToMetricQuery = exports.getDashboardFiltersForTileAndTables = exports.getDashboardFilterRulesForTileAndTables = exports.getDashboardFilterRulesForTables = exports.getTabUuidsForFilterRules = exports.getDashboardFilterRulesForTile = exports.deleteFilterRuleFromGroup = exports.getFiltersFromGroup = exports.isDimensionValueInvalidDate = exports.addFilterRule = exports.createDashboardFilterRuleFromField = exports.applyDefaultTileTargets = exports.isTileFilterable = exports.matchFieldByType = exports.matchFieldByTypeAndName = exports.matchFieldExact = exports.createFilterRuleFromField = exports.getFilterRuleWithDefaultValue = exports.timeframeToUnitOfTime = exports.getFilterTypeFromItem = exports.getFilterGroupItemsPropertyName = exports.getItemsFromFilterGroup = exports.hasNestedGroups = exports.countTotalFilterRules = exports.getTotalFilterRules = exports.getFilterRulesFromGroup = void 0;
 const tslib_1 = require("tslib");
 const dayjs_1 = tslib_1.__importDefault(require("dayjs"));
 const moment_1 = tslib_1.__importDefault(require("moment"));
@@ -94,6 +94,31 @@ const getFilterTypeFromItem = (item) => {
     }
 };
 exports.getFilterTypeFromItem = getFilterTypeFromItem;
+const timeframeToUnitOfTime = (timeframe) => {
+    switch (timeframe) {
+        case timeFrames_1.TimeFrames.MILLISECOND:
+            return filter_1.UnitOfTime.milliseconds;
+        case timeFrames_1.TimeFrames.SECOND:
+            return filter_1.UnitOfTime.seconds;
+        case timeFrames_1.TimeFrames.MINUTE:
+            return filter_1.UnitOfTime.minutes;
+        case timeFrames_1.TimeFrames.HOUR:
+            return filter_1.UnitOfTime.hours;
+        case timeFrames_1.TimeFrames.DAY:
+            return filter_1.UnitOfTime.days;
+        case timeFrames_1.TimeFrames.WEEK:
+            return filter_1.UnitOfTime.weeks;
+        case timeFrames_1.TimeFrames.MONTH:
+            return filter_1.UnitOfTime.months;
+        case timeFrames_1.TimeFrames.QUARTER:
+            return filter_1.UnitOfTime.quarters;
+        case timeFrames_1.TimeFrames.YEAR:
+            return filter_1.UnitOfTime.years;
+        default:
+            return undefined;
+    }
+};
+exports.timeframeToUnitOfTime = timeframeToUnitOfTime;
 const getFilterRuleWithDefaultValue = (field, filterRule, values) => {
     const filterType = (0, exports.getFilterTypeFromItem)(field);
     const filterRuleDefaults = {};
@@ -113,9 +138,12 @@ const getFilterRuleWithDefaultValue = (field, filterRule, values) => {
                     const numberValue = value === undefined || typeof value !== 'number'
                         ? 1
                         : value;
+                    const defaultUnitOfTime = (0, field_1.isDimension)(field) && field.timeInterval
+                        ? (0, exports.timeframeToUnitOfTime)(field.timeInterval)
+                        : filter_1.UnitOfTime.days;
                     filterRuleDefaults.values = [numberValue];
                     filterRuleDefaults.settings = {
-                        unitOfTime: filter_1.UnitOfTime.days,
+                        unitOfTime: defaultUnitOfTime,
                         completed: false,
                     };
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@lightdash/common",
-    "version": "0.1389.0",
+    "version": "0.1390.1",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "files": [