metadata_presenter 1.8.0 → 2.0.1

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '1.8.0'.freeze
+  VERSION = '2.0.1'.freeze
 end

data/lib/tasks/metadata_presenter_tasks.rake

@@ -48,12 +48,12 @@ module MetadataPresenter
         flow_object = service.flow_object(id)
 
         if flow_object.branch?
-          full_description = flow_object.conditions.map.each_with_index do |condition, _index|
-            condition.criterias.map { |criteria|
-              criteria.service = service
+          full_description = flow_object.conditionals.map.each_with_index do |conditional, _index|
+            conditional.expressions.map { |expression|
+              expression.service = service
 
-              "#{criteria.criteria_component.humanised_title} #{criteria.operator} #{criteria.field_label}"
-            }.join(" #{condition.condition_type} ")
+              "#{expression.expression_component.humanised_title} #{expression.operator} #{expression.field_label}"
+            }.join(" #{conditional.type} ")
           end
           nodes[id] = @graphviz.add_nodes(full_description.flatten.join(' / '))
         else
@@ -72,9 +72,9 @@ module MetadataPresenter
         if flow_object.branch?
           @graphviz.add_edges(current_node, node_next, label: 'Conditions are not met', labelfontsize: 8) if node_next
 
-          flow_object.group_by_page.each do |page_uuid, _conditions|
-            conditions_node = nodes[page_uuid]
-            @graphviz.add_edges(current_node, conditions_node, label: 'Conditions are met', labelfontsize: 8) if conditions_node
+          flow_object.group_by_page.each do |page_uuid, _conditionals|
+            conditionals_node = nodes[page_uuid]
+            @graphviz.add_edges(current_node, conditionals_node, label: 'Conditions are met', labelfontsize: 8) if conditionals_node
           end
         elsif node_next
           @graphviz.add_edges(current_node, node_next)

data/schemas/definition/page.form.json

@@ -44,40 +44,6 @@
         "content"
       ]
     },
-    "steps_heading": {
-      "title": "Steps heading",
-      "description": "Name of section to use on step pages (if any)",
-      "type": "string",
-      "category": [
-        "content"
-      ]
-    },
-    "steps": {
-      "title": "Steps",
-      "description": "The ‘child’ pages that follow from this ‘parent’ page",
-      "type": "array",
-      "items": {
-        "type": "string"
-      }
-    },
-    "enable_steps": {
-      "title": "Enable steps",
-      "description": "Allow current page to have steps",
-      "type": "boolean"
-    },
-    "show_steps": {
-      "title": "Steps visibility",
-      "category": [
-        "logic"
-      ],
-      "description": "Whether to show or hide the page’s steps",
-      "oneOf": [
-        {
-          "$ref": "definition.conditional.boolean"
-        }
-      ],
-      "default": true
-    },
     "nextPage": {
       "$ref": "definition.next_page"
     }

data/schemas/flow/branch.json

@@ -15,20 +15,20 @@
         "default": {
           "type": "string"
         },
-        "conditions": {
-          "$ref": "#/definitions/conditions"
+        "conditionals": {
+          "$ref": "#/definitions/conditionals"
         }
       }
     }
   },
   "additionalProperties": false,
   "definitions": {
-    "conditions": {
+    "conditionals": {
       "type": "array",
       "items": {
         "type": "object",
         "properties": {
-          "condition_type": {
+          "_type": {
             "type": "string",
             "enum": [
               "if",
@@ -39,13 +39,13 @@
           "next": {
             "type": "string"
           },
-          "criterias": {
-            "$ref": "#/definitions/criterias"
+          "expressions": {
+            "$ref": "#/definitions/expressions"
           }
         }
       }
     },
-    "criterias": {
+    "expressions": {
       "type": "array",
       "items": {
         "type": "object",

data/schemas/page/start.json

@@ -15,9 +15,6 @@
       "title": "Before you start",
       "description": "A body of text that goes after the Start button"
     },
-    "enable_steps": {
-      "const": true
-    },
     "components": {
       "accepts": [
         "content"
@@ -37,7 +34,6 @@
     ]
   },
   "required": [
-    "heading",
-    "steps"
+    "heading"
   ]
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 2.0.1
 platform: ruby
 authors:
 - MoJ Online
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-08 00:00:00.000000000 Z
+date: 2021-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder
@@ -277,10 +277,10 @@ files:
 - app/helpers/metadata_presenter/default_text.rb
 - app/jobs/metadata_presenter/application_job.rb
 - app/models/metadata_presenter/component.rb
-- app/models/metadata_presenter/condition.rb
-- app/models/metadata_presenter/criteria.rb
+- app/models/metadata_presenter/conditional.rb
 - app/models/metadata_presenter/date_field.rb
-- app/models/metadata_presenter/evaluate_conditions.rb
+- app/models/metadata_presenter/evaluate_conditionals.rb
+- app/models/metadata_presenter/expression.rb
 - app/models/metadata_presenter/file_uploader.rb
 - app/models/metadata_presenter/flow.rb
 - app/models/metadata_presenter/item.rb
@@ -359,8 +359,8 @@ files:
 - default_metadata/definition/checkbox.json
 - default_metadata/definition/radio.json
 - default_metadata/flow/branch.json
-- default_metadata/flow/condition.json
-- default_metadata/flow/criteria.json
+- default_metadata/flow/conditional.json
+- default_metadata/flow/expression.json
 - default_metadata/flow/page.json
 - default_metadata/page/checkanswers.json
 - default_metadata/page/confirmation.json
@@ -385,7 +385,9 @@ files:
 - fixtures/no_flow_service.json
 - fixtures/non_finished_service.json
 - fixtures/service.json
+- fixtures/service_with_flow.json
 - fixtures/version.json
+- fixtures/version_with_flow.json
 - lib/metadata_presenter.rb
 - lib/metadata_presenter/engine.rb
 - lib/metadata_presenter/test_helpers.rb

data/app/models/metadata_presenter/condition.rb

@@ -1,13 +0,0 @@
-module MetadataPresenter
-  class Condition < MetadataPresenter::Metadata
-    def ==(other)
-      metadata.to_h.deep_symbolize_keys == other.metadata.to_h.deep_symbolize_keys
-    end
-
-    def criterias
-      Array(metadata.criterias).map do |criteria|
-        MetadataPresenter::Criteria.new(criteria)
-      end
-    end
-  end
-end

data/app/models/metadata_presenter/criteria.rb

@@ -1,25 +0,0 @@
-module MetadataPresenter
-  class Criteria < MetadataPresenter::Metadata
-    attr_accessor :service
-
-    def ==(other)
-      metadata == other.metadata
-    end
-
-    def criteria_page
-      service.find_page_by_uuid(page)
-    end
-
-    def criteria_component
-      criteria_page.find_component_by_uuid(component)
-    end
-
-    def criteria_field
-      criteria_component.find_item_by_uuid(field)
-    end
-
-    def field_label
-      criteria_field['label'] if criteria_field
-    end
-  end
-end

data/app/models/metadata_presenter/evaluate_conditions.rb

@@ -1,37 +0,0 @@
-module MetadataPresenter
-  class EvaluateConditions
-    include ActiveModel::Model
-    attr_accessor :service, :flow, :user_data
-
-    def page
-      evaluated_page_uuid = page_uuid || flow.default_next
-
-      service.find_page_by_uuid(evaluated_page_uuid)
-    end
-
-    def page_uuid
-      @results ||= conditions.map do |condition|
-        evaluated_criterias = condition.criterias.map do |criteria|
-          criteria.service = service
-
-          Operator.new(
-            criteria.operator
-          ).evaluate(
-            criteria.field_label,
-            user_data[criteria.criteria_component.id]
-          )
-        end
-
-        if condition.condition_type == 'or' && evaluated_criterias.any?
-          condition.next
-        elsif evaluated_criterias.all?
-          condition.next
-        end
-      end
-
-      @results.flatten.compact.first
-    end
-
-    delegate :conditions, to: :flow
-  end
-end

data/default_metadata/flow/condition.json

@@ -1,5 +0,0 @@
-{
-  "condition_type": "",
-  "next": "",
-  "criterias": []
-}