Merge remote-tracking branch 'origin/main' into feature/6501-case-contact-new-design-add-new-case-button

Author: cliftonmcintosh

app/controllers/case_contacts/case_contacts_new_design_controller.rb

@@ -10,7 +10,7 @@ def index
   def datatable
     authorize CaseContact
     case_contacts = policy_scope(current_organization.case_contacts)
-    datatable = CaseContactDatatable.new case_contacts, params
+    datatable = CaseContactDatatable.new(case_contacts, params, current_user)
 
     render json: datatable
   end

app/controllers/case_contacts/followups_controller.rb

@@ -7,7 +7,10 @@ def create
     note = simple_followup_params[:note]
     FollowupService.create_followup(case_contact, current_user, note)
 
-    redirect_to casa_case_path(case_contact.casa_case)
+    respond_to do |format|
+      format.html { redirect_to casa_case_path(case_contact.casa_case) }
+      format.json { head :no_content }
+    end
   end
 
   def resolve
@@ -17,7 +20,10 @@ def resolve
     @followup.resolved!
     create_notification
 
-    redirect_to casa_case_path(@followup.case_contact.casa_case)
+    respond_to do |format|
+      format.html { redirect_to casa_case_path(@followup.case_contact.casa_case) }
+      format.json { head :no_content }
+    end
   end
 
   private

app/controllers/case_contacts_controller.rb

@@ -44,8 +44,14 @@ def destroy
     authorize @case_contact
 
     @case_contact.destroy
-    flash[:notice] = "Contact is successfully deleted."
-    redirect_to request.referer
+
+    respond_to do |format|
+      format.html do
+        flash[:notice] = "Contact is successfully deleted."
+        redirect_to request.referer
+      end
+      format.json { head :no_content }
+    end
   end
 
   def restore

app/controllers/followup_reports_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class FollowupReportsController < ApplicationController
   after_action :verify_authorized
 

app/controllers/mileage_reports_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "csv"
 
 class MileageReportsController < ApplicationController

app/datatables/case_contact_datatable.rb

@@ -8,10 +8,20 @@ class CaseContactDatatable < ApplicationDatatable
     duration_minutes
   ].freeze
 
+  def initialize(base_relation, params, current_user)
+    super(base_relation, params)
+    @current_user = current_user
+  end
+
   private
 
+  attr_reader :current_user
+
   def data
     records.map do |case_contact|
+      policy = CaseContactPolicy.new(current_user, case_contact)
+      requested_followup = case_contact.followups.find(&:requested?)
+
       {
         id: case_contact.id,
         occurred_at: I18n.l(case_contact.occurred_at, format: :full, default: nil),
@@ -35,7 +45,11 @@ def data
           .map { |a| {question: a.contact_topic&.question, value: a.value} },
         notes: case_contact.notes.presence,
         is_draft: !case_contact.active?,
-        has_followup: case_contact.followups.any?(&:requested?)
+        has_followup: requested_followup.present?,
+        can_edit: policy.update?,
+        can_destroy: policy.destroy?,
+        edit_path: Rails.application.routes.url_helpers.edit_case_contact_path(case_contact),
+        followup_id: requested_followup&.id
       }
     end
   end
@@ -49,6 +63,7 @@ def raw_records
       .joins("INNER JOIN users creators ON creators.id = case_contacts.creator_id")
       .left_joins(:casa_case)
       .includes(:casa_case, :contact_types, :contact_topics, :followups, :creator, contact_topic_answers: :contact_topic)
+      .preload(:casa_org, :creator_casa_org)
       .order(order_clause)
       .order(:id)
   end

app/javascript/__tests__/dashboard.test.js

@@ -3,7 +3,17 @@
  * @jest-environment jsdom
  */
 
+import Swal from 'sweetalert2'
 import { defineCaseContactsTable } from '../src/dashboard'
+import { fireSwalFollowupAlert } from '../src/case_contact'
+jest.mock('sweetalert2', () => ({
+  __esModule: true,
+  default: { fire: jest.fn() }
+}))
+
+jest.mock('../src/case_contact', () => ({
+  fireSwalFollowupAlert: jest.fn()
+}))
 
 // Mock DataTable
 const mockDataTable = jest.fn()
@@ -382,10 +392,259 @@ describe('defineCaseContactsTable', () => {
         expect(columns[10].searchable).toBe(false)
       })
 
-      it('renders ellipsis icon', () => {
-        const rendered = columns[10].render(null, 'display', {})
+      it('renders a button toggle with aria-label containing the contact date', () => {
+        const row = { id: '1', occurred_at: 'July 01, 2024', can_edit: 'true', can_destroy: 'true', edit_path: '/case_contacts/1/edit', followup_id: '' }
+        const rendered = columns[10].render(null, 'display', row)
+
+        expect(rendered).toContain('class="fas fa-ellipsis-v"')
+        expect(rendered).toContain('aria-label="Actions for case contact on July 01, 2024"')
+        expect(rendered).toContain('type="button"')
+      })
+
+      it('renders the ellipsis icon as aria-hidden', () => {
+        const row = { id: '1', occurred_at: 'July 01, 2024', can_edit: 'true', can_destroy: 'true', edit_path: '/case_contacts/1/edit', followup_id: '' }
+        const rendered = columns[10].render(null, 'display', row)
+
+        expect(rendered).toContain('aria-hidden="true"')
+      })
+
+      it('renders Edit item when can_edit is "true"', () => {
+        const row = { id: '1', occurred_at: 'July 01, 2024', can_edit: 'true', can_destroy: 'false', edit_path: '/case_contacts/1/edit', followup_id: '' }
+        const rendered = columns[10].render(null, 'display', row)
+
+        expect(rendered).toContain('href="/case_contacts/1/edit"')
+        expect(rendered).toContain('Edit')
+      })
+
+      it('renders Edit as disabled when can_edit is "false"', () => {
+        const row = { id: '1', occurred_at: 'July 01, 2024', can_edit: 'false', can_destroy: 'false', edit_path: '/case_contacts/1/edit', followup_id: '' }
+        const rendered = columns[10].render(null, 'display', row)
+
+        expect(rendered).toContain('Edit')
+        expect(rendered).toContain('disabled')
+        expect(rendered).toContain('aria-disabled="true"')
+        expect(rendered).not.toContain('href="/case_contacts/1/edit"')
+      })
+
+      it('renders Delete item when can_destroy is "true"', () => {
+        const row = { id: '1', occurred_at: 'July 01, 2024', can_edit: 'false', can_destroy: 'true', edit_path: '/case_contacts/1/edit', followup_id: '' }
+        const rendered = columns[10].render(null, 'display', row)
+
+        expect(rendered).toContain('cc-delete-action')
+        expect(rendered).toContain('data-id="1"')
+        expect(rendered).toContain('Delete')
+      })
+
+      it('renders Delete as disabled when can_destroy is "false"', () => {
+        const row = { id: '1', occurred_at: 'July 01, 2024', can_edit: 'false', can_destroy: 'false', edit_path: '/case_contacts/1/edit', followup_id: '' }
+        const rendered = columns[10].render(null, 'display', row)
+
+        expect(rendered).toContain('Delete')
+        expect(rendered).toContain('disabled')
+        expect(rendered).toContain('aria-disabled="true"')
+        expect(rendered).not.toContain('cc-delete-action')
+      })
+
+      it('renders Set Reminder when followup_id is empty', () => {
+        const row = { id: '1', occurred_at: 'July 01, 2024', can_edit: 'false', can_destroy: 'false', edit_path: '/case_contacts/1/edit', followup_id: '' }
+        const rendered = columns[10].render(null, 'display', row)
+
+        expect(rendered).toContain('cc-set-reminder-action')
+        expect(rendered).toContain('Set Reminder')
+        expect(rendered).not.toContain('Resolve Reminder')
+      })
+
+      it('renders Resolve Reminder when followup_id is present', () => {
+        const row = { id: '1', occurred_at: 'July 01, 2024', can_edit: 'false', can_destroy: 'false', edit_path: '/case_contacts/1/edit', followup_id: '42' }
+        const rendered = columns[10].render(null, 'display', row)
+
+        expect(rendered).toContain('cc-resolve-reminder-action')
+        expect(rendered).toContain('data-followup-id="42"')
+        expect(rendered).toContain('Resolve Reminder')
+        expect(rendered).not.toContain('Set Reminder')
+      })
+
+      it('always renders the reminder menu item', () => {
+        const row = { id: '1', occurred_at: 'July 01, 2024', can_edit: 'false', can_destroy: 'false', edit_path: '/case_contacts/1/edit', followup_id: '' }
+        const rendered = columns[10].render(null, 'display', row)
+
+        expect(rendered).toMatch(/Set Reminder|Resolve Reminder/)
+      })
+    })
+  })
+
+  describe('click handlers', () => {
+    let mockAjaxReload
+    let mockTableInstance
+
+    const clickActionButton = (action, attrs = {}) => {
+      const dataAttrs = Object.entries(attrs).map(([k, v]) => `data-${k}="${v}"`).join(' ')
+      $('table#case_contacts tbody').append(
+        `<tr><td><button class="cc-${action}-action" ${dataAttrs}>${action}</button></td></tr>`
+      )
+      $(`.cc-${action}-action`).trigger('click')
+    }
+
+    beforeEach(() => {
+      mockAjaxReload = jest.fn()
+      mockTableInstance = { ajax: { reload: mockAjaxReload } }
+      mockDataTable.mockReturnValue(mockTableInstance)
+
+      // Add CSRF meta tag
+      document.head.innerHTML = '<meta name="csrf-token" content="test-csrf-token">'
+
+      defineCaseContactsTable()
+    })
+
+    afterEach(() => {
+      Swal.fire.mockReset()
+      fireSwalFollowupAlert.mockReset()
+    })
+
+    describe('Delete action', () => {
+      it('shows a SweetAlert confirmation dialog when cc-delete-action is clicked', () => {
+        Swal.fire.mockResolvedValue({ isConfirmed: false })
+
+        clickActionButton('delete', { id: '42' })
+
+        expect(Swal.fire).toHaveBeenCalled()
+      })
+
+      it('sends DELETE request when confirmed', async () => {
+        Swal.fire.mockResolvedValue({ isConfirmed: true })
+        const ajaxSpy = jest.spyOn($, 'ajax').mockImplementation(({ success }) => success && success())
+
+        clickActionButton('delete', { id: '42' })
+
+        await Promise.resolve()
+
+        expect(ajaxSpy).toHaveBeenCalledWith(expect.objectContaining({
+          url: '/case_contacts/42',
+          type: 'DELETE',
+          headers: { 'X-CSRF-Token': 'test-csrf-token', Accept: 'application/json' }
+        }))
+        expect(ajaxSpy.mock.calls[0][0]).not.toHaveProperty('dataType')
+
+        ajaxSpy.mockRestore()
+      })
+
+      it('does not send DELETE request when cancelled', async () => {
+        Swal.fire.mockResolvedValue({ isConfirmed: false })
+        const ajaxSpy = jest.spyOn($, 'ajax').mockImplementation()
+
+        clickActionButton('delete', { id: '42' })
+
+        await Promise.resolve()
+
+        expect(ajaxSpy).not.toHaveBeenCalled()
+
+        ajaxSpy.mockRestore()
+      })
+
+      it('reloads the DataTable without resetting pagination after successful delete', async () => {
+        Swal.fire.mockResolvedValue({ isConfirmed: true })
+        jest.spyOn($, 'ajax').mockImplementation(({ success }) => success && success())
+
+        clickActionButton('delete', { id: '42' })
+
+        await Promise.resolve()
+
+        expect(mockAjaxReload).toHaveBeenCalledWith(null, false)
+      })
+    })
+
+    describe('Set Reminder action', () => {
+      it('calls fireSwalFollowupAlert when cc-set-reminder-action is clicked', () => {
+        fireSwalFollowupAlert.mockResolvedValue({ isConfirmed: false })
+
+        clickActionButton('set-reminder', { id: '5' })
+
+        expect(fireSwalFollowupAlert).toHaveBeenCalled()
+      })
+
+      it('posts to the followups endpoint with CSRF header when confirmed without a note', async () => {
+        fireSwalFollowupAlert.mockResolvedValue({ value: '', isConfirmed: true })
+        const ajaxSpy = jest.spyOn($, 'ajax').mockImplementation(({ success }) => success && success())
+
+        clickActionButton('set-reminder', { id: '5' })
+
+        await Promise.resolve()
+
+        expect(ajaxSpy).toHaveBeenCalledWith(expect.objectContaining({
+          url: '/case_contacts/5/followups',
+          type: 'POST',
+          data: {},
+          headers: { 'X-CSRF-Token': 'test-csrf-token', Accept: 'application/json' }
+        }))
+
+        ajaxSpy.mockRestore()
+      })
+
+      it('posts with note when confirmed with a note', async () => {
+        fireSwalFollowupAlert.mockResolvedValue({ value: 'My note', isConfirmed: true })
+        const ajaxSpy = jest.spyOn($, 'ajax').mockImplementation(({ success }) => success && success())
+
+        clickActionButton('set-reminder', { id: '5' })
+
+        await Promise.resolve()
+
+        expect(ajaxSpy).toHaveBeenCalledWith(expect.objectContaining({
+          url: '/case_contacts/5/followups',
+          type: 'POST',
+          data: { note: 'My note' },
+          headers: { 'X-CSRF-Token': 'test-csrf-token', Accept: 'application/json' }
+        }))
+
+        ajaxSpy.mockRestore()
+      })
+
+      it('does not post when cancelled', async () => {
+        fireSwalFollowupAlert.mockResolvedValue({ isConfirmed: false })
+        const ajaxSpy = jest.spyOn($, 'ajax').mockImplementation()
+
+        clickActionButton('set-reminder', { id: '5' })
+
+        await Promise.resolve()
+
+        expect(ajaxSpy).not.toHaveBeenCalled()
+
+        ajaxSpy.mockRestore()
+      })
+
+      it('reloads the DataTable without resetting pagination after creating a reminder', async () => {
+        fireSwalFollowupAlert.mockResolvedValue({ value: '', isConfirmed: true })
+        jest.spyOn($, 'ajax').mockImplementation(({ success }) => success && success())
+
+        clickActionButton('set-reminder', { id: '5' })
+
+        await Promise.resolve()
+
+        expect(mockAjaxReload).toHaveBeenCalledWith(null, false)
+      })
+    })
+
+    describe('Resolve Reminder action', () => {
+      it('sends PATCH request when cc-resolve-reminder-action is clicked', () => {
+        const ajaxSpy = jest.spyOn($, 'ajax').mockImplementation(({ success }) => success && success())
+
+        clickActionButton('resolve-reminder', { id: '5', 'followup-id': '42' })
+
+        expect(ajaxSpy).toHaveBeenCalledWith(expect.objectContaining({
+          url: '/followups/42/resolve',
+          type: 'PATCH',
+          headers: { 'X-CSRF-Token': 'test-csrf-token', Accept: 'application/json' }
+        }))
+        expect(ajaxSpy.mock.calls[0][0]).not.toHaveProperty('dataType')
+
+        ajaxSpy.mockRestore()
+      })
+
+      it('reloads the DataTable without resetting pagination after resolving a reminder', () => {
+        jest.spyOn($, 'ajax').mockImplementation(({ success }) => success && success())
+
+        clickActionButton('resolve-reminder', { id: '5', 'followup-id': '42' })
 
-        expect(rendered).toBe('<i class="fas fa-ellipsis-v"></i>')
+        expect(mockAjaxReload).toHaveBeenCalledWith(null, false)
       })
     })
   })

app/javascript/src/case_contact.js

@@ -54,5 +54,6 @@ $(() => { // JQuery's callback for the DOM loading
 })
 
 export {
-  convertDateToSystemTimeZone
+  convertDateToSystemTimeZone,
+  fireSwalFollowupAlert
 }