@qrvey/utils 1.3.0 → 1.3.1

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.
Files changed (7) hide show
  1. package/README.md +1 -1
  2. package/bitbucket-pipelines.yml +19 -1
  3. package/dist/cjs/filters/helpers/common/mergeFilters.js +1 -1
  4. package/dist/filters/helpers/common/mergeFilters.js +1 -1
  5. package/package.json +1 -1
  6. package/sonar-project.properties +1 -0
  7. package/src/filters/helpers/common/mergeFilters.ts +1 -0
package/README.md CHANGED
@@ -1,4 +1,4 @@
1
- # [@qrvey/utils](https://bitbucket.org/qrvey/qrvey_utils/wiki/Home) *1.3.0*
1
+ # [@qrvey/utils](https://bitbucket.org/qrvey/qrvey_utils/wiki/Home) *1.3.1*
2
2
 
3
3
  > Helper, Utils for all Qrvey Projects
4
4
 
package/bitbucket-pipelines.yml CHANGED
@@ -1,8 +1,23 @@
1
- image: node:lts-gallium
1
+ image: node:fermium
2
2
 
3
3
  options:
4
4
  max-time: 6
5
5
 
6
+ definitions:
7
+ steps:
8
+ - step: &build-step
9
+ name: SonarQube analysis
10
+ script:
11
+ - pipe: sonarsource/sonarqube-scan:1.0.0
12
+ variables:
13
+ SONAR_HOST_URL: ${SONAR_HOST_URL} # Get the value from the repository/workspace variable.
14
+ SONAR_TOKEN: ${SONAR_TOKEN} # Get the value from the repository/workspace variable. You shouldn't set secret in clear text here.
15
+ caches:
16
+ sonar: ~/.sonar
17
+
18
+ clone:
19
+ depth: full
20
+
6
21
  pipelines:
7
22
  default:
8
23
  - step:
@@ -31,3 +46,6 @@ pipelines:
31
46
  script:
32
47
  - npm run test --verbose --forceExit
33
48
  - echo "Fanfare!"
49
+ branches:
50
+ '{master}': # or the name of your main branch
51
+ - step: *build-step
package/dist/cjs/filters/helpers/common/mergeFilters.js CHANGED
@@ -114,7 +114,7 @@ function mergeFilterss(filters1 = [], filters2 = [], settings) {
114
114
  function mergeFilterProps(filter1, filter2, settings) {
115
115
  var _a, _b, _c;
116
116
  if (settings.overwriteFilterProps) {
117
- filter1 = Object.assign(Object.assign({}, filter1), { collapsed: (_a = filter2.collapsed) !== null && _a !== void 0 ? _a : filter1.collapsed, displayed: (_b = filter2.displayed) !== null && _b !== void 0 ? _b : filter1.displayed, dateSection: filter2.dateSection, extras: filter2.extras, enabled: (_c = filter2.enabled) !== null && _c !== void 0 ? _c : filter1.enabled, filterid: filter2.filterid, lookupDisplayIndex: filter2.lookupDisplayIndex, nullValues: filter2.nullValues, selectAll: filter2.selectAll });
117
+ filter1 = Object.assign(Object.assign({}, filter1), { collapsed: (_a = filter2.collapsed) !== null && _a !== void 0 ? _a : filter1.collapsed, displayed: (_b = filter2.displayed) !== null && _b !== void 0 ? _b : filter1.displayed, dateSection: filter2.dateSection, extras: filter2.extras, enabled: (_c = filter2.enabled) !== null && _c !== void 0 ? _c : filter1.enabled, operator: filter2.operator || filter1.operator, filterid: filter2.filterid, lookupDisplayIndex: filter2.lookupDisplayIndex, nullValues: filter2.nullValues, selectAll: filter2.selectAll });
118
118
  }
119
119
  return filter1;
120
120
  }
package/dist/filters/helpers/common/mergeFilters.js CHANGED
@@ -110,7 +110,7 @@ function mergeFilterss(filters1 = [], filters2 = [], settings) {
110
110
  function mergeFilterProps(filter1, filter2, settings) {
111
111
  var _a, _b, _c;
112
112
  if (settings.overwriteFilterProps) {
113
- filter1 = Object.assign(Object.assign({}, filter1), { collapsed: (_a = filter2.collapsed) !== null && _a !== void 0 ? _a : filter1.collapsed, displayed: (_b = filter2.displayed) !== null && _b !== void 0 ? _b : filter1.displayed, dateSection: filter2.dateSection, extras: filter2.extras, enabled: (_c = filter2.enabled) !== null && _c !== void 0 ? _c : filter1.enabled, filterid: filter2.filterid, lookupDisplayIndex: filter2.lookupDisplayIndex, nullValues: filter2.nullValues, selectAll: filter2.selectAll });
113
+ filter1 = Object.assign(Object.assign({}, filter1), { collapsed: (_a = filter2.collapsed) !== null && _a !== void 0 ? _a : filter1.collapsed, displayed: (_b = filter2.displayed) !== null && _b !== void 0 ? _b : filter1.displayed, dateSection: filter2.dateSection, extras: filter2.extras, enabled: (_c = filter2.enabled) !== null && _c !== void 0 ? _c : filter1.enabled, operator: filter2.operator || filter1.operator, filterid: filter2.filterid, lookupDisplayIndex: filter2.lookupDisplayIndex, nullValues: filter2.nullValues, selectAll: filter2.selectAll });
114
114
  }
115
115
  return filter1;
116
116
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@qrvey/utils",
3
- "version": "1.3.0",
3
+ "version": "1.3.1",
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",
package/sonar-project.properties ADDED
@@ -0,0 +1 @@
1
+ sonar.projectKey=qrvey_qrvey_utils_AYEGzUgVVubH37beJEAg
package/src/filters/helpers/common/mergeFilters.ts CHANGED
@@ -132,6 +132,7 @@ function mergeFilterProps(filter1: IFSFilter, filter2: IFSFilter, settings?: IFF
132
132
  dateSection: filter2.dateSection,
133
133
  extras: filter2.extras,
134
134
  enabled: filter2.enabled ?? filter1.enabled,
135
+ operator: filter2.operator || filter1.operator,
135
136
  filterid: filter2.filterid,
136
137
  lookupDisplayIndex: filter2.lookupDisplayIndex,
137
138
  nullValues: filter2.nullValues,