openchs-models 1.33.40 → 1.33.42

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.
@@ -14,8 +14,8 @@ jobs:
14
14
 
15
15
  - restore_cache:
16
16
  keys:
17
- - v2-dependencies-{{ checksum "package.json" }}
18
- - v2-dependencies-
17
+ - v3-dependencies-{{ checksum "yarn.lock" }}
18
+ - v3-dependencies-
19
19
 
20
20
  - run: yarn install
21
21
 
@@ -29,12 +29,12 @@ jobs:
29
29
 
30
30
  - run:
31
31
  name: Run Tests
32
- command: yarn test
32
+ command: yarn test-ci
33
33
 
34
34
  - save_cache:
35
35
  paths:
36
36
  - node_modules
37
- key: v2-dependencies-{{ checksum "package.json" }}
37
+ key: v3-dependencies-{{ checksum "yarn.lock" }}
38
38
 
39
39
  - persist_to_workspace:
40
40
  root: ~/repo
@@ -204,7 +204,7 @@ class FormElement extends _BaseEntity.default {
204
204
  getAnswers() {
205
205
  const allAnswers = this.concept.getAnswers();
206
206
  if (!_lodash.default.isEmpty(this.answersToShow)) {
207
- return _lodash.default.filter(allAnswers, allConceptAnswer => _lodash.default.find(this.answersToShow, conceptAnswer => conceptAnswer === allConceptAnswer.name));
207
+ return _lodash.default.filter(allAnswers, allConceptAnswer => _lodash.default.includes(this.answersToShow, allConceptAnswer.concept.name));
208
208
  } else {
209
209
  const excludedAnswers = this.excludedAnswers().map(conceptName => ({
210
210
  concept: {
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "openchs-models",
3
3
  "description": "OpenCHS data model to be used by front end clients",
4
- "version": "1.33.40",
4
+ "version": "1.33.42",
5
5
  "private": false,
6
6
  "repository": {
7
7
  "type": "git",