metadata_presenter 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e8dfc341688f7dccd859058844f7b475ecc93afb86ab46d1a4d72f89c8f8235
-  data.tar.gz: cfee59590ce4834a7c8eda109cd914f1b0b0157c2d48dc97e44351b552b943fe
+  metadata.gz: 5ac5fd51e02d3200c324282f394e5d8d3b11e0e440592e627290dfd7b6c767ba
+  data.tar.gz: bced641e349533c820815867b08bfca21f7d8c0bbd619ed19615e424edcaa2a6
 SHA512:
-  metadata.gz: 74d388b6e903201e9d42a71ae17f7457a748b4c7791a5604b8f9ac387b56f3a5f20953a55c84ce0a60efa53ea8ac9580d291001648fa781c0b01c5c56dd43dc1
-  data.tar.gz: b4ac8ca7c331b9a4a93acec7ad58036f42d7f73f5098b247cae77b054352bf588424832e615ebad4e76ee8ec4069723cd9edfdaee65a2ef7ae4f47aaca5369b0
+  metadata.gz: d38891660bc18dfe3472b43b84efc4a4752be370ba88decb17aad07aa47d779282214602bd52b10db043ad9aec8cc582e2010828deb8916f4b4b40fe069165d7
+  data.tar.gz: 289b34c930dd5c2322d6c32bb22d761c2d2f973e8ae8be7edd5104d3af2f429055ac5edbe76a56b9e78b63e48da5958e551f3e1b66a444eaa02572a41ee3febf

data/fixtures/branching.json

@@ -219,7 +219,7 @@
     "84a347fc-8d4b-486a-9996-6a86fa9544c5": {
       "_type": "branch",
       "next": {
-        "default": "e337070b-f636-49a3-a65c-f506675265f0",
+        "default": "48357db5-7c06-4e85-94b1-5e1c9d8f39eb",
         "conditions": [
           {
             "condition_type": "or",
@@ -263,10 +263,84 @@
     "2cc66e51-2c14-4023-86bf-ded49887cdb2": {
       "_type": "page",
       "next": {
-        "default": "e337070b-f636-49a3-a65c-f506675265f0"
+        "default": "48357db5-7c06-4e85-94b1-5e1c9d8f39eb"
       }
     },
     "f6c51f88-7be8-4cb7-bbfc-6c905727a051": {
+      "_type": "page",
+      "next": {
+        "default": "48357db5-7c06-4e85-94b1-5e1c9d8f39eb"
+      }
+    },
+    "48357db5-7c06-4e85-94b1-5e1c9d8f39eb": {
+      "_type": "page",
+      "next": {
+        "default": "1079b5b8-abd0-4bf6-aaac-1f01e69e3b39"
+      }
+    },
+    "1079b5b8-abd0-4bf6-aaac-1f01e69e3b39": {
+      "_type": "branch",
+      "next": {
+        "default": "941137d7-a1da-43fd-994a-98a4f9ea6d46",
+        "conditions": [
+          {
+            "condition_type": "and",
+            "next": "56e80942-d0a4-405a-85cd-bd1b100013d6",
+            "criterias": [
+              {
+                "operator": "is",
+                "page": "48357db5-7c06-4e85-94b1-5e1c9d8f39eb",
+                "component": "3a430712-a75f-4412-836d-4ec7b2cb1ac9",
+                "field": "30258b55-ec04-4278-86b7-8382cbd34bea"
+              },
+              {
+                "operator": "is",
+                "page": "48357db5-7c06-4e85-94b1-5e1c9d8f39eb",
+                "component": "3a430712-a75f-4412-836d-4ec7b2cb1ac9",
+                "field": "9339d86e-b53c-42c0-ab6e-1ab3e2340873"
+              },
+              {
+                "operator": "is",
+                "page": "48357db5-7c06-4e85-94b1-5e1c9d8f39eb",
+                "component": "3a430712-a75f-4412-836d-4ec7b2cb1ac9",
+                "field": "5d650e5d-57ac-42a1-9348-c1b93248753a"
+              }
+            ]
+          },
+          {
+            "condition_type": "or",
+            "next": "6324cca4-7770-4765-89b9-1cdc41f49c8b",
+            "criterias": [
+              {
+                "operator": "is",
+                "page": "48357db5-7c06-4e85-94b1-5e1c9d8f39eb",
+                "component": "3a430712-a75f-4412-836d-4ec7b2cb1ac9",
+                "field": "6b82b4e4-6dfd-4b3c-b6ed-2d71be0980bf"
+              },
+              {
+                "operator": "is",
+                "page": "48357db5-7c06-4e85-94b1-5e1c9d8f39eb",
+                "component": "3a430712-a75f-4412-836d-4ec7b2cb1ac9",
+                "field": "8c2c6161-7309-4e4f-9f3c-9fa629bcb459"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "941137d7-a1da-43fd-994a-98a4f9ea6d46": {
+      "_type": "page",
+      "next": {
+        "default": "e337070b-f636-49a3-a65c-f506675265f0"
+      }
+    },
+    "56e80942-d0a4-405a-85cd-bd1b100013d6": {
+      "_type": "page",
+      "next": {
+        "default": "e337070b-f636-49a3-a65c-f506675265f0"
+      }
+    },
+    "6324cca4-7770-4765-89b9-1cdc41f49c8b": {
       "_type": "page",
       "next": {
         "default": "e337070b-f636-49a3-a65c-f506675265f0"
@@ -482,6 +556,7 @@
       "url": "favourite-fruit",
       "_type": "page.singlequestion",
       "_uuid": "0b297048-aa4d-49b6-ac74-18e069118185",
+      "heading": "",
       "components": [
         {
           "_id": "favourite-fruit_radios_1",
@@ -525,6 +600,7 @@
       "url": "apple-juice",
       "_type": "page.singlequestion",
       "_uuid": "d4342dfd-0d09-4a91-a0ea-d7fd67e706cc",
+      "heading": "",
       "components": [
         {
           "_id": "apple-juice_radios_1",
@@ -561,6 +637,7 @@
       "url": "orange-juice",
       "_type": "page.singlequestion",
       "_uuid": "91e9f7c6-2f75-4b7d-9eb5-0cf352f7be66",
+      "heading": "",
       "components": [
         {
           "_id": "orange-juice_radios_1",
@@ -597,6 +674,7 @@
       "url": "favourite-band",
       "_type": "page.singlequestion",
       "_uuid": "05c3306c-0a39-42d2-9e0f-93fd49248f4e",
+      "heading": "",
       "components": [
         {
           "_id": "favourite-band_radios_1",
@@ -633,6 +711,7 @@
       "url": "music-app",
       "_type": "page.singlequestion",
       "_uuid": "8002df6e-29ab-4cdf-b520-1d7bb931a28f",
+      "heading": "",
       "components": [
         {
           "_id": "music-app_radios_1",
@@ -669,6 +748,7 @@
       "url": "best-formbuilder",
       "_type": "page.singlequestion",
       "_uuid": "ef2cafe3-37e2-4533-9b0c-09a970cd38d4",
+      "heading": "",
       "components": [
         {
           "_id": "best-formbuilder_radios_1",
@@ -840,6 +920,7 @@
       "url": "marvel-series",
       "_type": "page.singlequestion",
       "_uuid": "dc7454f9-4186-48d7-b055-684d57bbcdc7",
+      "heading": "",
       "components": [
         {
           "_id": "marvel-series_radios_1",
@@ -937,6 +1018,127 @@
       ],
       "section_heading": ""
     },
+    {
+      "_id": "page.best-arnold-quote",
+      "url": "best-arnold-quote",
+      "body": "Body section",
+      "lede": "",
+      "_type": "page.singlequestion",
+      "_uuid": "48357db5-7c06-4e85-94b1-5e1c9d8f39eb",
+      "heading": "Question",
+      "components": [
+        {
+          "_id": "best-arnold-quote_checkboxes_1",
+          "hint": "",
+          "name": "best-arnold-quote_checkboxes_1",
+          "_type": "checkboxes",
+          "_uuid": "3a430712-a75f-4412-836d-4ec7b2cb1ac9",
+          "items": [
+            {
+              "_id": "best-arnold-quote_checkboxes_1_item_1",
+              "hint": "",
+              "name": "best-arnold-quote_checkboxes_1",
+              "_type": "checkbox",
+              "_uuid": "30258b55-ec04-4278-86b7-8382cbd34bea",
+              "label": "You are not you. You are me"
+            },
+            {
+              "_id": "best-arnold-quote_checkboxes_1_item_2",
+              "hint": "",
+              "name": "best-arnold-quote_checkboxes_1",
+              "_type": "checkbox",
+              "_uuid": "9339d86e-b53c-42c0-ab6e-1ab3e2340873",
+              "label": "Get to the chopper"
+            },
+            {
+              "_id": "best-arnold-quote_checkboxes_1_item_3",
+              "hint": "",
+              "name": "best-arnold-quote_checkboxes_1",
+              "_type": "checkbox",
+              "_uuid": "5d650e5d-57ac-42a1-9348-c1b93248753a",
+              "label": "You have been terminated"
+            },
+            {
+              "_id": "best-arnold-quote_checkboxes_1_item_4",
+              "hint": "",
+              "name": "best-arnold-quote_checkboxes_1",
+              "_type": "checkbox",
+              "_uuid": "6b82b4e4-6dfd-4b3c-b6ed-2d71be0980bf",
+              "label": "I am GROOT"
+            },
+            {
+              "_id": "best-arnold-quote_checkboxes_1_item_5",
+              "hint": "",
+              "name": "best-arnold-quote_checkboxes_1",
+              "_type": "checkbox",
+              "_uuid": "8c2c6161-7309-4e4f-9f3c-9fa629bcb459",
+              "label": "Dance Off, Bro."
+            }
+          ],
+          "legend": "Select all Arnold Schwarzenegger quotes",
+          "validation": {
+            "required": true
+          }
+        }
+      ]
+    },
+    {
+      "_id": "page.arnold-right-answers",
+      "url": "arnold-right-answers",
+      "body": "You are right! Now, talk to the hand!",
+      "lede": "",
+      "_type": "page.content",
+      "_uuid": "56e80942-d0a4-405a-85cd-bd1b100013d6",
+      "heading": "You are right",
+      "components": [
+        {
+          "_id": "arnold-right-answers_content_1",
+          "name": "arnold-right-answers_content_1",
+          "_type": "content",
+          "_uuid": "9a7948f1-9e9a-4273-b52e-e2917c79f37c",
+          "content": "You are right! Now, talk to the hand!"
+        }
+      ],
+      "section_heading": ""
+    },
+    {
+      "_id": "page.arnold-wrong-answers",
+      "url": "arnold-wrong-answers",
+      "body": "You are wrong! These are from the Guardians of the Galaxy!",
+      "lede": "",
+      "_type": "page.content",
+      "_uuid": "6324cca4-7770-4765-89b9-1cdc41f49c8b",
+      "heading": "You are wrong",
+      "components": [
+        {
+          "_id": "arnold-wrong-answers_content_1",
+          "name": "arnold-wrong-answers_content_1",
+          "_type": "content",
+          "_uuid": "3bd3ca1d-fed7-43b0-ab90-b4425b634203",
+          "content": "You need to master the ability of standing so incredibly still, that you become invisible to the eye."
+        }
+      ],
+      "section_heading": ""
+    },
+    {
+      "_id": "page.arnold-incomplete-answers",
+      "url": "arnold-incomplete-answers",
+      "body": "You are wrong! The answers are incomplete.",
+      "lede": "",
+      "_type": "page.content",
+      "_uuid": "941137d7-a1da-43fd-994a-98a4f9ea6d46",
+      "heading": "You are wrong",
+      "components": [
+        {
+          "_id": "arnold-incomplete-answers_content_1",
+          "name": "arnold-incomplete-answers_content_1",
+          "_type": "content",
+          "_uuid": "16252a29-8e00-4247-b47f-3e94c863a540",
+          "content": "The answers are incomplete. You need to remember Arnold saying 'I will be back'. So go back to answer correctly."
+        }
+      ],
+      "section_heading": ""
+    },
     {
       "_id": "page.check-answers",
       "url": "check-answers",

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '1.7.1'.freeze
+  VERSION = '1.7.2'.freeze
 end

data/lib/tasks/metadata_presenter_tasks.rake

@@ -48,14 +48,14 @@ module MetadataPresenter
         flow_object = service.flow(id)
 
         if flow_object.branch?
-          full_description = flow_object.conditions.map do |condition|
-            condition.criterias.map do |criteria|
+          full_description = flow_object.conditions.map.each_with_index do |condition, _index|
+            condition.criterias.map { |criteria|
               criteria.service = service
 
-              "if #{criteria.criteria_component.humanised_title} #{criteria.operator} #{criteria.field_label}"
-            end
+              "#{criteria.criteria_component.humanised_title} #{criteria.operator} #{criteria.field_label}"
+            }.join(" #{condition.condition_type} ")
           end
-          nodes[id] = @graphviz.add_nodes(full_description.flatten.join(' - '))
+          nodes[id] = @graphviz.add_nodes(full_description.flatten.join(' / '))
         else
           current_page = find_page_by_uuid(id)
           nodes[id] = @graphviz.add_nodes(current_page.url)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - MoJ Online