metadata_presenter 0.13.3 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f61c08ab0dfb4a0f2d07168015012f35efd105f2bcaea0d9ce547bd291eeabd5
-  data.tar.gz: b602b6f0043d681f73e09720c0fdc61b308a751536b7b5df11e4023fdbd470c9
+  metadata.gz: baead988b8948ffbff35fdd3b30b740953b339ff7d161ad08259e0a90949f81d
+  data.tar.gz: be77cea809e6b9b5680db1fb426d4333045efb06daa907e18477da9d72c14db6
 SHA512:
-  metadata.gz: c4a4278f4867f2edf69b87097f0bd384e37f85fcf059c56884c8e52ce19f2f045b9ee294ab173387e427d6dee022ceb6141970ce64ea1a35f15017fbd7a6a084
-  data.tar.gz: bace9ee8b5f8c5226819c5f61292612074b7fa140d51fdae77aaf6ea210b86953935c04e71300dda35239b5a1770d8df436bc8a44e635533fcd2b30b106c9134
+  metadata.gz: 942d95095d9b7a5a12286f286319b16cc4ae63e9c40b2eb4640ec07823f8f8ecc5f7fe35fadc4db3178446878c52f10aaeea85d9368979ac6b79ab0a0e07806f
+  data.tar.gz: 1ede80c50a8e03ba13a84b9ceba9bbfdb1d8c6908227a6791bba75b08d024e6e7e7f44e8f9e7bbbd77c55fd166b69143843cac693e8180be73f00e1676f2d541

data/README.md

@@ -48,6 +48,7 @@ that you need to write the following methods in your controller:
 1. save_user_data
 2. load_user_data
 3. editable?
+4. create_submission
 
 The user answers can be accessed via `params[:answers]`.
 
@@ -76,6 +77,9 @@ mountable app:
   end
 ```
 
+The `create_submission` is related to process the submission in a backend
+service.
+
 ## Generate documentation
 
 Run `rake doc` and open the doc/index.html

data/app/controllers/metadata_presenter/submissions_controller.rb

@@ -4,10 +4,22 @@ module MetadataPresenter
       @page = service.confirmation_page
 
       if @page
+        create_submission
         redirect_to_page @page.url
       else
         not_found
       end
     end
+
+    def create_submission
+      # The runner is the only app that sends the submission.
+      # and it is not needed on the editor app (editing & previewing).
+      # So in the Runner we defined the #create_submission in the parent
+      # controller and in the Editor we don't.
+      #
+      if defined? super
+        super
+      end
+    end
   end
 end

data/app/presenters/metadata_presenter/page_answers_presenter.rb

@@ -51,7 +51,7 @@ module MetadataPresenter
     end
 
     def checkboxes(value)
-      value.reject(&:blank?).join("<br>").html_safe
+      value.join("<br>").html_safe
     end
   end
 end

data/app/validators/metadata_presenter/base_validator.rb

@@ -63,12 +63,7 @@ module MetadataPresenter
     # @return [String] user answer for the specific component
     #
     def user_answer
-      value = page_answers.send(component.name)
-      if component.type == 'checkboxes'
-        Array(value).reject(&:blank?)
-      else
-        value
-      end
+      page_answers.send(component.name)
     end
 
     # The default error message will be look using the schema key.

data/app/views/metadata_presenter/component/_checkboxes.html.erb

@@ -5,5 +5,6 @@
     :name,
     :description,
     legend: { text: input_title },
-    hint: { text: component.hint }
+    hint: { text: component.hint },
+    include_hidden: false
 %>

data/app/views/metadata_presenter/component/_text.html.erb

@@ -1,6 +1,8 @@
-<%=
-  f.govuk_text_field component.id.to_sym,
-    label: { text: input_title },
-    hint: { text: component.hint },
-    name: "answers[#{component.name}]"
-%>
+<div class="fb-editable" data-fb-content-type="<%= component._type %>" data-fb-content-id="<%= component_id %>" data-fb-content-data="<%= component.to_json %>">
+  <%=
+    f.govuk_text_field component.id.to_sym,
+      label: { text: input_title },
+      hint: { text: component.hint },
+      name: "answers[#{component.name}]"
+  %>
+</div>

data/app/views/metadata_presenter/page/singlequestion.html.erb

@@ -3,9 +3,10 @@
     <div class="govuk-grid-column-two-thirds">
       <%= form_for @page_answers, as: :answers, url: @page.url, method: :post do |f| %>
         <%= f.govuk_error_summary %>
-        <% @page.components.each do |component| %>
+        <% @page.components.each_with_index do |component, index| %>
           <%= render partial: component, locals: {
             component: component,
+            component_id: "page[components[#{index}]]",
             f: f,
             input_title: main_h1(component) }
           %>

data/app/views/metadata_presenter/page/start.html.erb

@@ -1,33 +1,41 @@
-<div class="fb-main-grid-wrapper" data-block-id="<%= @page.id %>" data-block-type="page" data-block-pagetype="<%= @page.type %>">
+<div class="fb-main-grid-wrapper" data-fb-pagetype="<%= @page.type %>">
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
       <% if @page.section_heading -%>
-        <p class="govuk-caption-l fb-section_heading" data-block-id="<%= @page.id %>" data-block-property="section_heading">
+        <p class="fb-editable govuk-caption-l fb-section_heading"
+           data-fb-content-type="element"
+           data-fb-content-id="page[section_heading]">
           <%= @page.section_heading.html_safe %>
         </p>
       <%- end %>
 
       <% if @page.heading %>
-        <h1 class="<%= @page.heading_class %>" data-block-id="<%= @page.id %>" data-block-property="heading">
+        <h1 class="fb-editable <%= @page.heading_class %>"
+            data-fb-content-id="page[heading]"
+            data-fb-content-type="element">
           <%= @page.heading.html_safe %>
         </h1>
       <% end %>
 
       <% if @page.lede %>
-        <p class="govuk-body-l" data-block-id="<%= @page.id %>" data-block-property="lede">
+        <div class="fb-editable"
+             data-fb-content-id="page[lede]"
+             data-fb-content-type="content">
           <%= @page.lede.html_safe %>
-        </p>
+        </div>
       <%- end %>
 
       <% if @page.body %>
-        <p class="govuk-body-l" data-block-id="<%= @page.id %>" data-block-property="lede">
-        <%= to_markdown(@page.body) %>
-        </p>
+        <div class="fb-editable"
+             data-fb-content-id="page[body]"
+             data-fb-content-type="content">
+          <%= to_markdown(@page.body) %>
+        </div>
       <%- end %>
 
       <%= form_tag(root_path, method: :post) do %>
         <button <%= 'disabled' if editable? %> class='govuk-button govuk-button--start govuk-!-margin-top-2'>
-        Start
+          Start now
           <svg class="govuk-button__start-icon" xmlns="http://www.w3.org/2000/svg" width="17.5" height="19" viewBox="0 0 33 40" aria-hidden="true" focusable="false">
             <path fill="currentColor" d="M0 0h13l20 20-20 20H0l20-20z" />
           </svg>
@@ -35,9 +43,11 @@
       <% end %>
 
       <% if @page.before_you_start %>
-        <p class="govuk-body-l" data-block-id="<%= @page.id %>" data-block-property="before-you-start">
-        <%= to_markdown(@page.before_you_start) %>
-        </p>
+        <div class="fb-editable"
+             data-fb-content-id="page[before_you_start]"
+             data-fb-content-type="content">
+          <%= to_markdown(@page.before_you_start) %>
+        </div>
       <%- end %>
     </div>
   </div>

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '0.13.3'
+  VERSION = '0.14.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.14.0
 platform: ruby
 authors:
 - MoJ Online
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-16 00:00:00.000000000 Z
+date: 2021-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails