From 15fe135ce79d2136208f36b9f08b06f32cf20d2b Mon Sep 17 00:00:00 2001
From: iozeey <zeeshan.za.ahmad@gmail.com>
Date: Tue, 28 Nov 2023 16:36:35 +0500
Subject: [PATCH] stabilizing redact required behavior

---
 app/javascript/template_builder/area.vue    | 2 +-
 app/javascript/template_builder/builder.vue | 3 +++
 app/javascript/template_builder/field.vue   | 2 +-
 app/javascript/template_builder/fields.vue  | 4 +++-
 app/views/submit_form/show.html.erb         | 3 ++-
 app/views/templates/show.html.erb           | 1 +
 6 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/javascript/template_builder/area.vue b/app/javascript/template_builder/area.vue
index 46e0af36..91d07c65 100644
--- a/app/javascript/template_builder/area.vue
+++ b/app/javascript/template_builder/area.vue
@@ -68,7 +68,7 @@
         @blur="onNameBlur"
       >{{ optionIndexText }} {{ field.name || defaultName }}</span>
       <div
-        v-if="isNameFocus && !['checkbox', 'phone'].includes(field.type)"
+        v-if="isNameFocus && !['checkbox', 'phone', 'redact'].includes(field.type)"
         class="flex items-center ml-1.5"
       >
         <input
diff --git a/app/javascript/template_builder/builder.vue b/app/javascript/template_builder/builder.vue
index bc7ea149..b6e91240 100644
--- a/app/javascript/template_builder/builder.vue
+++ b/app/javascript/template_builder/builder.vue
@@ -611,6 +611,9 @@ export default {
         ...this.dragField
       }
 
+      if (['redact'].includes(field.type)) {
+        field.required = 'false'
+      }
       if (['select', 'multiple', 'radio'].includes(field.type)) {
         field.options = [{ value: '', uuid: v4() }]
       }
diff --git a/app/javascript/template_builder/field.vue b/app/javascript/template_builder/field.vue
index 8dc2739d..17ef7775 100644
--- a/app/javascript/template_builder/field.vue
+++ b/app/javascript/template_builder/field.vue
@@ -31,7 +31,7 @@
           />
         </div>
         <div
-          v-if="isNameFocus"
+          v-if="isNameFocus && !['redact'].includes(field.type)"
           class="flex items-center relative"
         >
           <template v-if="field.type != 'phone'">
diff --git a/app/javascript/template_builder/fields.vue b/app/javascript/template_builder/fields.vue
index 793120d7..e86967ab 100644
--- a/app/javascript/template_builder/fields.vue
+++ b/app/javascript/template_builder/fields.vue
@@ -250,7 +250,9 @@ export default {
         submitter_uuid: this.selectedSubmitter.uuid,
         type
       }
-
+      if (['redact'].includes(type)) {
+        field.required = 'false'
+      }
       if (['select', 'multiple', 'radio'].includes(type)) {
         field.options = [{ value: '', uuid: v4() }]
       }
diff --git a/app/views/submit_form/show.html.erb b/app/views/submit_form/show.html.erb
index 8b7f9c0c..e1e060ba 100644
--- a/app/views/submit_form/show.html.erb
+++ b/app/views/submit_form/show.html.erb
@@ -9,7 +9,8 @@
       <%= render 'banner' %>
       <% (@submitter.submission.template_schema || @submitter.submission.template.schema).each do |item| %>
         <% document = @submitter.submission.template_schema_documents.find { |a| a.uuid == item['attachment_uuid'] } %>
-        <% document_annots_index = document.metadata.dig('pdf', 'annotations')&.group_by { |e| e['page'] } || {} %>        
+        <% document_annots_index = document.metadata.dig('pdf', 'annotations')&.group_by { |e| e['page'] } || {} %> 
+        <% document.preview_secured_images.load %>
         <% preview_images_index = document.preview_secured_images.loaded? ? document.preview_secured_images.index_by { |e| e.filename.base.to_i } : {} %>
         <% lazyload_metadata = document.preview_secured_images.last.metadata %>
         <% (document.metadata.dig('pdf', 'number_of_pages') || (document.preview_secured_images.loaded? ? preview_images_index.size : document.preview_secured_images.size)).times do |index| %>
diff --git a/app/views/templates/show.html.erb b/app/views/templates/show.html.erb
index 47a16a00..3fcabd80 100644
--- a/app/views/templates/show.html.erb
+++ b/app/views/templates/show.html.erb
@@ -117,6 +117,7 @@
       const template = this.getAttribute('data-template')
       setTimeout(function () {
         window.location.href = template
+        document.getElementById('loader').style.display = 'none'
       }, 3000)
     })
   }