metadata_presenter 3.2.10 → 3.3.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (28) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/metadata_presenter/engine_controller.rb +13 -29
  3. data/app/controllers/metadata_presenter/pages_controller.rb +10 -1
  4. data/app/models/metadata_presenter/component.rb +6 -0
  5. data/app/models/metadata_presenter/evaluate_content_conditionals.rb +68 -22
  6. data/app/models/metadata_presenter/page.rb +43 -2
  7. data/app/models/metadata_presenter/service.rb +26 -9
  8. data/app/views/metadata_presenter/component/_components.html.erb +5 -1
  9. data/app/views/metadata_presenter/component/_conditional_component_banner.html.erb +5 -0
  10. data/app/views/metadata_presenter/page/checkanswers.html.erb +3 -0
  11. data/app/views/metadata_presenter/page/confirmation.html.erb +55 -50
  12. data/app/views/metadata_presenter/page/content.html.erb +2 -0
  13. data/app/views/metadata_presenter/page/exit.html.erb +3 -0
  14. data/app/views/metadata_presenter/page/multiplequestions.html.erb +2 -0
  15. data/config/locales/en.yml +2 -0
  16. data/default_metadata/component/content.json +1 -0
  17. data/fixtures/conditional.json +461 -0
  18. data/fixtures/conditional_content.json +313 -384
  19. data/fixtures/conditional_content_2.json +1208 -0
  20. data/lib/metadata_presenter/version.rb +1 -1
  21. data/schemas/component/content.json +8 -0
  22. data/schemas/definition/expression_item.json +2 -0
  23. data/schemas/definition/fieldset.json +0 -3
  24. data/schemas/definition/name.json +1 -1
  25. data/schemas/page/confirmation.json +0 -3
  26. data/schemas/page/start.json +0 -3
  27. data/schemas/service/base.json +3 -0
  28. metadata +9 -6
data/lib/metadata_presenter/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module MetadataPresenter
2
- VERSION = '3.2.10'.freeze
2
+ VERSION = '3.3.0'.freeze
3
3
  end
data/schemas/component/content.json CHANGED
@@ -18,6 +18,14 @@
18
18
  "content": true,
19
19
  "multiline": true
20
20
  },
21
+ "display": {
22
+ "type": "string",
23
+ "enum": [
24
+ "always",
25
+ "conditional",
26
+ "never"
27
+ ]
28
+ },
21
29
  "conditionals": {
22
30
  "$ref": "#/definitions/conditionals"
23
31
  }
data/schemas/definition/expression_item.json CHANGED
@@ -10,6 +10,8 @@
10
10
  "enum": [
11
11
  "is",
12
12
  "is_not",
13
+ "contains",
14
+ "does_not_contain",
13
15
  "is_answered",
14
16
  "is_not_answered"
15
17
  ],
data/schemas/definition/fieldset.json CHANGED
@@ -9,9 +9,6 @@
9
9
  "fieldset"
10
10
  ],
11
11
  "properties": {
12
- "_type": {
13
- "const": "fieldset"
14
- },
15
12
  "legend": {
16
13
  "title": "Legend",
17
14
  "description": "Text to use in fieldset legend",
data/schemas/definition/name.json CHANGED
@@ -8,7 +8,7 @@
8
8
  "title": "Input name",
9
9
  "description": "Used by system to identify user's answer - also used as the component's HTML name property.",
10
10
  "type": "string",
11
- "pattern": "^[a-zA-Z0-9-_]+$",
11
+ "pattern": "^[a-zA-Z0-9_-]+$",
12
12
  "processInput": true,
13
13
  "category": [
14
14
  "userinput"
data/schemas/page/confirmation.json CHANGED
@@ -5,9 +5,6 @@
5
5
  "description": "Confirm to users that they’ve completed their answers",
6
6
  "type": "object",
7
7
  "properties": {
8
- "_id": {
9
- "const": "page.confirmation"
10
- },
11
8
  "_type": {
12
9
  "const": "page.confirmation"
13
10
  },
data/schemas/page/start.json CHANGED
@@ -5,9 +5,6 @@
5
5
  "description": "Let users start using a service",
6
6
  "type": "object",
7
7
  "properties": {
8
- "_id": {
9
- "const": "page.start"
10
- },
11
8
  "_type": {
12
9
  "const": "page.start"
13
10
  },
data/schemas/service/base.json CHANGED
@@ -42,6 +42,9 @@
42
42
  {
43
43
  "$ref": "page.start"
44
44
  },
45
+ {
46
+ "$ref": "page.exit"
47
+ },
45
48
  {
46
49
  "$ref": "page.checkanswers"
47
50
  },
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metadata_presenter
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.2.10
4
+ version: 3.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - MoJ Forms
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-08-31 00:00:00.000000000 Z
11
+ date: 2023-11-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: govuk_design_system_formbuilder
@@ -28,16 +28,16 @@ dependencies:
28
28
  name: json-schema
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - '='
31
+ - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 2.8.1
33
+ version: 4.1.1
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - '='
38
+ - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: 2.8.1
40
+ version: 4.1.1
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: kramdown
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -415,6 +415,7 @@ files:
415
415
  - app/views/metadata_presenter/component/_autocomplete.html.erb
416
416
  - app/views/metadata_presenter/component/_checkboxes.html.erb
417
417
  - app/views/metadata_presenter/component/_components.html.erb
418
+ - app/views/metadata_presenter/component/_conditional_component_banner.html.erb
418
419
  - app/views/metadata_presenter/component/_content.html.erb
419
420
  - app/views/metadata_presenter/component/_date.html.erb
420
421
  - app/views/metadata_presenter/component/_email.html.erb
@@ -537,7 +538,9 @@ files:
537
538
  - fixtures/branching_8.png
538
539
  - fixtures/branching_9.json
539
540
  - fixtures/branching_9.png
541
+ - fixtures/conditional.json
540
542
  - fixtures/conditional_content.json
543
+ - fixtures/conditional_content_2.json
541
544
  - fixtures/countries.json
542
545
  - fixtures/exit_only_service.json
543
546
  - fixtures/invalid_content_page.json