@qrvey/utils 1.2.6 → 1.2.7

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.
@@ -161,8 +161,7 @@ function getRankingExpressions(props) {
161
161
  }
162
162
  function getRegularExpression(props) {
163
163
  const uiValue = getUIValuess(props);
164
- return {
165
- enabled: props.enabled,
164
+ const expression = {
166
165
  groupValue: (0, getBackendGroupValue_1.getBackendGroupValue)(props),
167
166
  linkid: props.column.linkid,
168
167
  property: (0, getBackendProperty_1.getBackendProperty)(props),
@@ -174,6 +173,8 @@ function getRegularExpression(props) {
174
173
  value: getValues(props),
175
174
  uiExtras: Object.assign(Object.assign({}, props), { uiValue })
176
175
  };
176
+ expression['enabled'] = expression.value.length > 0 ? props.enabled : false;
177
+ return expression;
177
178
  }
178
179
  // function getGroupValue(props: OLD_IFilterDetail): IFProperty {
179
180
  // if (!isDateDistinctProperty(props.column as any, props.property) && isEmpty(props.column.aggregate) && isDateColumn(props.column) && props.property) {
@@ -80,7 +80,7 @@ function getFilterByExpression(expression, scopeItem) {
80
80
  },
81
81
  dateSection: uiExtras.dateSection,
82
82
  displayed: true,
83
- enabled: expression.enabled,
83
+ enabled: uiExtras.enabled,
84
84
  extras: Object.assign(Object.assign({}, uiExtras.extras), { panelid: uiExtras.panelid, filterLabel: uiExtras.panelName, info,
85
85
  scopeid, scope: scopeItem.scope, section: uiExtras.section, scopeInfo: {
86
86
  collapsed: (_q = scopeItem.uiExtras) === null || _q === void 0 ? void 0 : _q.collapsed,
@@ -155,8 +155,7 @@ function getRankingExpressions(props) {
155
155
  }
156
156
  function getRegularExpression(props) {
157
157
  const uiValue = getUIValuess(props);
158
- return {
159
- enabled: props.enabled,
158
+ const expression = {
160
159
  groupValue: getBackendGroupValue(props),
161
160
  linkid: props.column.linkid,
162
161
  property: getBackendProperty(props),
@@ -168,6 +167,8 @@ function getRegularExpression(props) {
168
167
  value: getValues(props),
169
168
  uiExtras: Object.assign(Object.assign({}, props), { uiValue })
170
169
  };
170
+ expression['enabled'] = expression.value.length > 0 ? props.enabled : false;
171
+ return expression;
171
172
  }
172
173
  // function getGroupValue(props: OLD_IFilterDetail): IFProperty {
173
174
  // if (!isDateDistinctProperty(props.column as any, props.property) && isEmpty(props.column.aggregate) && isDateColumn(props.column) && props.property) {
@@ -76,7 +76,7 @@ function getFilterByExpression(expression, scopeItem) {
76
76
  },
77
77
  dateSection: uiExtras.dateSection,
78
78
  displayed: true,
79
- enabled: expression.enabled,
79
+ enabled: uiExtras.enabled,
80
80
  extras: Object.assign(Object.assign({}, uiExtras.extras), { panelid: uiExtras.panelid, filterLabel: uiExtras.panelName, info,
81
81
  scopeid, scope: scopeItem.scope, section: uiExtras.section, scopeInfo: {
82
82
  collapsed: (_q = scopeItem.uiExtras) === null || _q === void 0 ? void 0 : _q.collapsed,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@qrvey/utils",
3
- "version": "1.2.6",
3
+ "version": "1.2.7",
4
4
  "description": "Helper, Utils for all Qrvey Projects",
5
5
  "homepage": "https://bitbucket.org/qrvey/qrvey_utils/wiki/Home",
6
6
  "main": "dist/index.js",
@@ -181,8 +181,7 @@ function getRankingExpressions(props: OLD_IFilterDetail): OLD_IFilterExpression[
181
181
 
182
182
  function getRegularExpression(props: OLD_IFilterDetail): OLD_IFilterExpression {
183
183
  const uiValue = getUIValuess(props);
184
- return {
185
- enabled: props.enabled,
184
+ const expression = {
186
185
  groupValue: getBackendGroupValue(props as any),
187
186
  linkid: props.column.linkid,
188
187
  property: getBackendProperty(props as any),
@@ -197,6 +196,9 @@ function getRegularExpression(props: OLD_IFilterDetail): OLD_IFilterExpression {
197
196
  uiValue
198
197
  }
199
198
  };
199
+ expression['enabled'] = expression.value.length > 0 ? props.enabled : false;
200
+
201
+ return expression;
200
202
  }
201
203
 
202
204
  // function getGroupValue(props: OLD_IFilterDetail): IFProperty {
@@ -83,7 +83,7 @@ function getFilterByExpression(expression: OLD_IFilterExpression, scopeItem: OLD
83
83
  },
84
84
  dateSection: uiExtras.dateSection,
85
85
  displayed: true,
86
- enabled: expression.enabled,
86
+ enabled: uiExtras.enabled,
87
87
  extras: {
88
88
  ...uiExtras.extras,
89
89
  panelid: uiExtras.panelid,