Close the webhook authentication modal upon selection of cancel or close

* Close the webhook authentication modal upon selection of cancel or close Fixes #1351 --------- Co-authored-by: benedictus-yevu <[email protected]> Co-authored-by: Stuart Corbishley <[email protected]>
OpenFn · Dec 4, 2023 · eeb080c · eeb080c
1 parent bf82b13
commit eeb080c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,7 +21,11 @@ and this project adheres to
   [#1430](https://github.com/OpenFn/Lightning/issues/1430)
 - Allow users to retry work orders that failed before their first run was
   created [#1417](https://github.com/OpenFn/Lightning/issues/1417)
-
+- Fix to ensure webhook auth modal is closed when cancel or close are selected.
+  [#1508](https://github.com/OpenFn/Lightning/issues/1508)
+- Enable user to reauthorize and obtain a new refresh token.
+  [#1495](https://github.com/OpenFn/Lightning/issues/1495)
+
 ## [v0.10.5] - 2023-12-03
 
 ### Added
@@ -65,8 +69,6 @@ and this project adheres to
   [#1145](https://github.com/OpenFn/Lightning/issues/1145)
 - Fix for adding ellipses on credential info on job editor heading
   [#1428](https://github.com/OpenFn/Lightning/issues/1428)
-- Enable user to reauthorize and obtain a new refresh token.
-  [#1495](https://github.com/OpenFn/Lightning/issues/1495)
 
 
 ## [v0.10.3] - 2023-11-28

diff --git a/lib/lightning_web/live/workflow_live/webhook_auth_method_form_component.ex b/lib/lightning_web/live/workflow_live/webhook_auth_method_form_component.ex
@@ -442,7 +442,10 @@ defmodule LightningWeb.WorkflowLive.WebhookAuthMethodFormComponent do
       ~H"""
       <button
         type="button"
-        phx-click="close_webhook_modal"
+        phx-click={
+          JS.hide(to: "#webhooks_auth_method_modal")
+          |> JS.push("close_webhook_modal")
+        }
         phx-target="#webhooks_auth_method_modal-container"
         class="mt-3 inline-flex w-full justify-center rounded-md bg-white px-3 py-2 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50 sm:mt-0 sm:w-auto"
       >

diff --git a/lib/lightning_web/live/workflow_live/webhook_auth_method_modal_component.ex b/lib/lightning_web/live/workflow_live/webhook_auth_method_modal_component.ex
@@ -279,7 +279,10 @@ defmodule LightningWeb.WorkflowLive.WebhookAuthMethodModalComponent do
             </span>
 
             <button
-              phx-click="close_webhook_modal"
+              phx-click={
+                JS.hide(to: "#webhooks_auth_method_modal")
+                |> JS.push("close_webhook_modal")
+              }
               phx-target={@myself}
               type="button"
               class="rounded-md bg-white text-gray-400 hover:text-gray-500 focus:outline-none"