@lightdash/common 2.458.1 → 2.458.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,4 +1,4 @@
1
1
  import { type DbtColumnLightdashMetric } from './dbt';
2
2
  import { type MetricFilterRule } from './filter';
3
- export declare const convertMetricFilterToDbt: (filters: MetricFilterRule[] | undefined) => DbtColumnLightdashMetric['filters'];
3
+ export declare const convertMetricFilterToDbt: (filters: MetricFilterRule[] | undefined, metricTable: string) => DbtColumnLightdashMetric['filters'];
4
4
  //# sourceMappingURL=filterGrammarConversion.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"filterGrammarConversion.d.ts","sourceRoot":"","sources":["../../../src/types/filterGrammarConversion.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,OAAO,CAAC;AAEtD,OAAO,EAKH,KAAK,gBAAgB,EACxB,MAAM,UAAU,CAAC;AAmGlB,eAAO,MAAM,wBAAwB,YACxB,gBAAgB,EAAE,GAAG,SAAS,KACxC,wBAAwB,CAAC,SAAS,CAmBpC,CAAC"}
1
+ {"version":3,"file":"filterGrammarConversion.d.ts","sourceRoot":"","sources":["../../../src/types/filterGrammarConversion.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,OAAO,CAAC;AAEtD,OAAO,EAKH,KAAK,gBAAgB,EACxB,MAAM,UAAU,CAAC;AAmGlB,eAAO,MAAM,wBAAwB,YACxB,gBAAgB,EAAE,GAAG,SAAS,eAC1B,MAAM,KACpB,wBAAwB,CAAC,SAAS,CAqBpC,CAAC"}
@@ -80,7 +80,7 @@ const convertFilterOperatorToDbt = (filter) => {
80
80
  }
81
81
  return [];
82
82
  };
83
- export const convertMetricFilterToDbt = (filters) => {
83
+ export const convertMetricFilterToDbt = (filters, metricTable) => {
84
84
  if (!filters)
85
85
  return undefined;
86
86
  return filters.reduce((acc, filter) => {
@@ -89,7 +89,9 @@ export const convertMetricFilterToDbt = (filters) => {
89
89
  return acc;
90
90
  const values = convertFilterOperatorToDbt(filter);
91
91
  const fieldRefParts = target.fieldRef.split('.');
92
- const fieldId = fieldRefParts.length > 1 ? fieldRefParts[1] : target.fieldRef;
92
+ const fieldId = fieldRefParts.length === 2 && fieldRefParts[0] === metricTable
93
+ ? fieldRefParts[1]
94
+ : target.fieldRef;
93
95
  const dbtFilters = {
94
96
  [fieldId]: values.length > 1 ? values : values[0],
95
97
  };
@@ -1 +1 @@
1
- {"version":3,"file":"filterGrammarConversion.js","sourceRoot":"","sources":["../../../src/types/filterGrammarConversion.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"filterGrammarConversion.js","sourceRoot":"","sources":["../../../src/types/filterGrammarConversion.ts"],"names":[],"mappings":"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"}
@@ -2,7 +2,7 @@ import { friendlyName } from '../types/field';
2
2
  import { convertMetricFilterToDbt } from '../types/filterGrammarConversion';
3
3
  import { getFormatExpression } from './formatting';
4
4
  export function convertCustomMetricToDbt(field) {
5
- const filters = convertMetricFilterToDbt(field.filters);
5
+ const filters = convertMetricFilterToDbt(field.filters, field.table);
6
6
  return {
7
7
  label: field.label || friendlyName(field.name),
8
8
  description: field.description,
@@ -1 +1 @@
1
- {"version":3,"file":"convertCustomMetricsToYaml.js","sourceRoot":"","sources":["../../../src/utils/convertCustomMetricsToYaml.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAE5E,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAEnD,MAAM,UAAU,wBAAwB,CACpC,KAAuB;IAEvB,MAAM,OAAO,GAAG,wBAAwB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACxD,OAAO;QACH,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC;QAC9C,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,MAAM,EAAE,mBAAmB,CAAC,KAAK,CAAC;QAClC,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,OAAO;KACV,CAAC;AACN,CAAC"}
1
+ {"version":3,"file":"convertCustomMetricsToYaml.js","sourceRoot":"","sources":["../../../src/utils/convertCustomMetricsToYaml.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAE5E,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAEnD,MAAM,UAAU,wBAAwB,CACpC,KAAuB;IAEvB,MAAM,OAAO,GAAG,wBAAwB,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACrE,OAAO;QACH,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC;QAC9C,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,MAAM,EAAE,mBAAmB,CAAC,KAAK,CAAC;QAClC,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,OAAO;KACV,CAAC;AACN,CAAC"}