metadata_presenter 3.3.21 → 3.3.22

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e7869bdd57e746b2c7b56f867ab22bc87a46704420f5dde6549ea28179385c20
4
- data.tar.gz: 87b1dd8f6b236889a9057b5fe7505b7a6812bb02d2889335397186680a1343b9
3
+ metadata.gz: 04f348f4f53e3272bc416e845f9970aa6851ac22b7d069fbd52f9309f63e820c
4
+ data.tar.gz: a20ab803b0750532425e02d698adaf87c4b89f96aae65542777b46c3d240bb9e
5
5
  SHA512:
6
- metadata.gz: 100550a87338f2cc5a2b6028362a004e0c128bd26b49662ee26c026e41061630a4e7091afd6f7401063290ad82b0b6a7a6920b81d9b48895dd7904fff016a89d
7
- data.tar.gz: 0b0c439a4a1c93939fcfee1ded176a6a4a38ad635ebdef89f21f3b4828c0faa2efd43ca8cce5338871ecca0dd2b3f833055e77735169339e779a67d87304e155
6
+ metadata.gz: 802a3624e3953dc7bd7d2596fcc7d462e3e9ee950186e58b90c1d408fcc3a9ca308ba42b5bdded8172d4895462a67ceb0b83a674b85b5115a1316a98bd8c2a8c
7
+ data.tar.gz: 07b914afe2a8a241add444452f19e5dec3bc46da8792c1d38f840d5e7084d1a8230d2c823066677f0608b44ffbe4610efd67e9548a20a9f93913b56cce946997
@@ -22,26 +22,20 @@ module MetadataPresenter
22
22
 
23
23
  def uuid_to_include?(candidate_component)
24
24
  evaluation_conditions = []
25
- if candidate_component.conditionals.count == 1
26
- # if there are only and rules or the particular case where there is only one condition
25
+
26
+ if candidate_component.conditionals.count > 1
27
+ candidate_component.conditionals.each do |conditional|
28
+ evaluation_conditions << if conditional[:_type] == 'and'
29
+ evaluate_condition(conditional).flatten.all?
30
+ else
31
+ evaluate_condition(conditional)
32
+ end
33
+ end
34
+
35
+ candidate_component.uuid if evaluation_conditions.flatten.any?
36
+ else
27
37
  evaluation_conditions << evaluate_condition(candidate_component.conditionals[0])
28
38
  candidate_component.uuid if evaluation_conditions.flatten.all?
29
- elsif candidate_component.conditionals.count > 1
30
- # if there are or rule
31
- if candidate_component.conditionals[0][:_type] == 'and'
32
- # if there are 'and' in conditions between the 'or' rule
33
- candidate_component.conditionals.map do |conditional|
34
- evaluation_conditions << evaluate_condition(conditional).flatten.all?
35
- end
36
- return candidate_component.uuid if evaluation_conditions.flatten.any?
37
- end
38
- if candidate_component.conditionals[0][:_type] == 'if'
39
- # then this is an 'or' condition between conditionals
40
- candidate_component.conditionals.map do |conditional|
41
- evaluation_conditions << evaluate_condition(conditional)
42
- end
43
- candidate_component.uuid if evaluation_conditions.flatten.any?
44
- end
45
39
  end
46
40
  end
47
41
 
@@ -1,3 +1,3 @@
1
1
  module MetadataPresenter
2
- VERSION = '3.3.21'.freeze
2
+ VERSION = '3.3.22'.freeze
3
3
  end
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.3.21
4
+ version: 3.3.22
5
5
  platform: ruby
6
6
  authors:
7
7
  - MoJ Forms
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2024-02-29 00:00:00.000000000 Z
11
+ date: 2024-03-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: govuk_design_system_formbuilder