0.279.0

GSA · Dec 19, 2023 · c27228a · c27228a
2 parents ed3250a + 7f9b19c
commit c27228a
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 14 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -105,7 +105,7 @@ GEM
     aes_key_wrap (1.1.0)
     ast (2.4.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.864.0)
+    aws-partitions (1.869.0)
     aws-record (2.13.0)
       aws-sdk-dynamodb (~> 1, >= 1.85.0)
     aws-sdk-core (3.190.0)
@@ -116,7 +116,7 @@ GEM
     aws-sdk-dynamodb (1.98.0)
       aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.74.0)
+    aws-sdk-kms (1.75.0)
       aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-rails (3.9.0)
@@ -134,8 +134,8 @@ GEM
     aws-sdk-ses (1.58.0)
       aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sesv2 (1.41.0)
-      aws-sdk-core (~> 3, >= 3.184.0)
+    aws-sdk-sesv2 (1.43.0)
+      aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-sqs (1.69.0)
       aws-sdk-core (~> 3, >= 3.188.0)
@@ -147,7 +147,7 @@ GEM
       aws-eventstream (~> 1, >= 1.0.2)
     base64 (0.2.0)
     bcrypt (3.1.20)
-    bigdecimal (3.1.4)
+    bigdecimal (3.1.5)
     bindata (2.4.15)
     bindex (0.8.1)
     bootsnap (1.17.0)
@@ -300,7 +300,7 @@ GEM
     method_source (1.0.0)
     mime-types (3.5.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.1003)
+    mime-types-data (3.2023.1205)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
@@ -351,7 +351,7 @@ GEM
     paper_trail (15.1.0)
       activerecord (>= 6.1)
       request_store (~> 1.4)
-    parallel (1.23.0)
+    parallel (1.24.0)
     parser (3.2.2.4)
       ast (~> 2.4.1)
       racc
@@ -420,7 +420,7 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdoc (6.6.1)
+    rdoc (6.6.2)
       psych (>= 4.0.0)
     redis (5.0.8)
       redis-client (>= 0.17.0)
@@ -474,7 +474,7 @@ GEM
       rubocop (~> 1.41)
     rubocop-factory_bot (2.24.0)
       rubocop (~> 1.33)
-    rubocop-rails (2.22.2)
+    rubocop-rails (2.23.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)

diff --git a/app/controllers/api/v1/cx_collection_details_controller.rb b/app/controllers/api/v1/cx_collection_details_controller.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Api
+  module V1
+    class CxCollectionDetailsController < ::ApiController
+      def index
+        respond_to do |format|
+          format.json do
+            render json: CxCollectionDetail.all.order(:id), each_serializer: CxCollectionDetailSerializer
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/app/views/admin/questions/_success_text.html.erb b/app/views/admin/questions/_success_text.html.erb
@@ -1,6 +1,6 @@
 <%= form_with(model: form, url: (form.persisted? ? admin_form_path(form) : admin_forms_path), local: true) do |f| %>
   <div class="grid-row grid-gap-md">
-    <div class="grid-col-6">
+    <div class="grid-col-12">
       <div class="field">
         <%= f.label :success_text_heading, "SUCCESS TEXT HEADING", class: "usa-label text-uppercase font-body-3xs" %>
         <%= f.text_field :success_text_heading, class: "usa-input success_text", data_url:  admin_form_path(form) %>
@@ -38,5 +38,13 @@
         $('.usa-hint.save-notice.survey-success-text').fadeOut(2000);
       });
     });
+
+    $("#form_success_text_heading").on("keyup", function(event, b) {
+      $(".fba-alert.usa-alert--success h3.usa-alert__heading").text(event.target.value)
+    });
+
+    $("#form_success_text").on("keyup", function(event, b) {
+      $(".fba-alert.usa-alert--success .usa-alert__text").html(event.target.value)
+    });
   })
 </script>
diff --git a/app/views/components/forms/_flash.html.erb b/app/views/components/forms/_flash.html.erb
@@ -3,9 +3,9 @@
     <h3 class="usa-alert__heading">
       <%= form.success_text_heading %>
     </h3>
-    <p class="usa-alert__text">
+    <div class="usa-alert__text">
       <%= sanitize(form.success_text) %>
-    </p>
+    </div>
   </div>
 </div>
 <div class="fba-alert-error usa-alert usa-alert--error" role="alert" hidden>

diff --git a/app/views/components/forms/edit/_builder.html.erb b/app/views/components/forms/edit/_builder.html.erb
@@ -78,16 +78,30 @@
   </div>
 </div>
 <br>
+
 <hr style="border: none; border-top: 1px solid #E5E5E5;">
-<div id="success_text_div">
-  <%= render "admin/questions/success_text", {form: form} %>
+
+<div class="grid-row grid-gap-lg">
+  <div class="grid-col-5">
+    <div id="success_text_div">
+      <%= render "admin/questions/success_text", {form: form} %>
+    </div>
+  </div>
+  <div class="grid-col-7">
+    <br>
+    <br>
+    <%= render "components/forms/flash", form: form %>
+  </div>
 </div>
+
 <br>
 
 <script>
 $(function() {
   $(".question-option-edit").hide();
 
+  $(".fba-alert").attr("hidden", false);
+
   <%- if form_permissions?(form: form) %>
     $('.survey-title-input').on("blur", function(event) {
       event.preventDefault();

diff --git a/app/views/components/forms/question_types/_big_thumbs_up_down_buttons.html.erb b/app/views/components/forms/question_types/_big_thumbs_up_down_buttons.html.erb
@@ -20,10 +20,12 @@
           <%= radio_button_tag(option_id, option[:value], nil, { id: option_id, name: question.answer_field, class: "usa-radio__input usa-radio__input--tile", required: question.is_required  }) %>
           <%= label_tag(option_id, nil, class: "usa-radio__label font-sans-3xl text-center") do %>
             <%- if option[:value] == 1 %>
+              <span class="usa-sr-only">Thumbs-up</span>
               <svg class="usa-icon margin-top-2" aria-hidden="true" focusable="false" role="img">
                 <use xlink:href="<%= asset_path "sprite.svg#thumb_up_alt" %>"></use>
               </svg>
             <% elsif option[:value] == 0 %>
+              <span class="usa-sr-only">Thumbs-down</span>
               <svg class="usa-icon margin-top-2" aria-hidden="true" focusable="false" role="img">
                 <use xlink:href="<%= asset_path "sprite.svg#thumb_down_alt" %>"></use>
               </svg>

diff --git a/app/views/components/widget/_widget.css.erb b/app/views/components/widget/_widget.css.erb
@@ -4583,4 +4583,10 @@
 /* Override */
 .touchpoint-form .usa-form--large {
   max-width: 35rem;
+}
+
+.fba-modal-dialog .usa-sr-only{
+  position:absolute;
+  left:-999em;
+  right:auto;
 }
diff --git a/config/routes.rb b/config/routes.rb
@@ -42,6 +42,7 @@
       resources :organizations, only: [:index]
       resources :collections, only: [:index]
       resources :cx_collections, only: [:index]
+      resources :cx_collection_details, only: [:index]
       resources :omb_cx_reporting_collections, only: [:index]
       resources :forms, only: %i[index show]
       resources :websites, only: [:index]