fixed the notifier toast from always showing in progress in the patch… (

#4903) Co-authored-by: github username <github email address>
rubyforgood · Jun 23, 2023 · e13e7b0 · e13e7b0
1 parent a4c0fdb
commit e13e7b0
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 11 deletions.
diff --git a/app/javascript/src/all_casa_admin/patch_notes.js b/app/javascript/src/all_casa_admin/patch_notes.js
@@ -6,12 +6,6 @@ const patchNoteFunctions = {} // A hack to be able to alphabetize functions
 
 let pageNotifier
 
-jQuery.ajaxSetup({
-  beforeSend: function () {
-    pageNotifier.startAsyncOperation()
-  }
-})
-
 // Inserts a patch note display after the create patch note form in the patch note list and styles it as new
 //  @param    {number} patchNoteGroupId  The id of the group allowed to view the patch note
 //  @param    {jQuery} patchNoteList     A jQuery object representing the patch note list
@@ -69,10 +63,22 @@ patchNoteFunctions.createPatchNote = function (patchNoteGroupId, patchNoteText,
   TypeChecker.checkString(patchNoteText, 'patchNoteText')
 
   // Post request
-  return $.post(patchNotePath, {
-    note: patchNoteText,
-    patch_note_group_id: patchNoteGroupId,
-    patch_note_type_id: patchNoteTypeId
+  // return $.post(patchNotePath, {
+  //   note: patchNoteText,
+  //   patch_note_group_id: patchNoteGroupId,
+  //   patch_note_type_id: patchNoteTypeId
+  // })
+  return $.ajax({
+    url: patchNotePath,
+    type: 'POST',
+    data: {
+      note: patchNoteText,
+      patch_note_group_id: patchNoteGroupId,
+      patch_note_type_id: patchNoteTypeId
+    },
+    beforeSend: function () {
+      pageNotifier.startAsyncOperation()
+    }
   })
     .then(function (response, textStatus, jqXHR) {
       if (response.errors) {
@@ -100,7 +106,10 @@ patchNoteFunctions.deletePatchNote = function (patchNoteId) {
 
   return $.ajax({
     url: `${patchNotePath}/${patchNoteId}`,
-    type: 'DELETE'
+    type: 'DELETE',
+    beforeSend: function () {
+      pageNotifier.startAsyncOperation()
+    }
   })
     .then(function (response, textStatus, jqXHR) {
       if (response.errors) {
@@ -464,6 +473,9 @@ patchNoteFunctions.savePatchNote = function (patchNoteGroupId, patchNoteId, patc
       note: patchNoteText,
       patch_note_group_id: patchNoteGroupId,
       patch_note_type_id: patchNoteTypeId
+    },
+    beforeSend: function () {
+      pageNotifier.startAsyncOperation()
     }
   })
     .then(function (response, textStatus, jqXHR) {

diff --git a/app/models/casa_admin.rb b/app/models/casa_admin.rb
@@ -42,6 +42,7 @@ def change_to_supervisor!
 #  old_emails                  :string           default([]), is an Array
 #  phone_number                :string           default("")
 #  receive_email_notifications :boolean          default(TRUE)
+#  receive_reimbursement_email :boolean          default(FALSE)
 #  receive_sms_notifications   :boolean          default(FALSE), not null
 #  reset_password_sent_at      :datetime
 #  reset_password_token        :string

diff --git a/app/models/supervisor.rb b/app/models/supervisor.rb
@@ -69,6 +69,7 @@ def recently_unassigned_volunteers
 #  old_emails                  :string           default([]), is an Array
 #  phone_number                :string           default("")
 #  receive_email_notifications :boolean          default(TRUE)
+#  receive_reimbursement_email :boolean          default(FALSE)
 #  receive_sms_notifications   :boolean          default(FALSE), not null
 #  reset_password_sent_at      :datetime
 #  reset_password_token        :string

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -207,6 +207,7 @@ def normalize_phone_number
 #  old_emails                  :string           default([]), is an Array
 #  phone_number                :string           default("")
 #  receive_email_notifications :boolean          default(TRUE)
+#  receive_reimbursement_email :boolean          default(FALSE)
 #  receive_sms_notifications   :boolean          default(FALSE), not null
 #  reset_password_sent_at      :datetime
 #  reset_password_token        :string

diff --git a/app/models/volunteer.rb b/app/models/volunteer.rb
@@ -162,6 +162,7 @@ def cases_where_contact_made_in_days(num_days = CONTACT_MADE_IN_DAYS_NUM)
 #  old_emails                  :string           default([]), is an Array
 #  phone_number                :string           default("")
 #  receive_email_notifications :boolean          default(TRUE)
+#  receive_reimbursement_email :boolean          default(FALSE)
 #  receive_sms_notifications   :boolean          default(FALSE), not null
 #  reset_password_sent_at      :datetime
 #  reset_password_token        :string

diff --git a/db/schema.rb b/db/schema.rb
@@ -544,6 +544,7 @@
     t.datetime "confirmation_sent_at"
     t.string "unconfirmed_email"
     t.string "old_emails", default: [], array: true
+    t.boolean "receive_reimbursement_email", default: false
     t.index ["casa_org_id"], name: "index_users_on_casa_org_id"
     t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
     t.index ["email"], name: "index_users_on_email", unique: true