From 87b21cd71150d64936d90a775b4e37e2117aaa1b Mon Sep 17 00:00:00 2001
From: luvi <luvi@odoo.com>
Date: Wed, 20 Jul 2022 12:05:56 +0000
Subject: [PATCH] [FIX] web: cancel action on close of ConfirmationDialog

This commits fixes the behavior of the confirmation dialog.
When a user dismiss a dialog using the close button or the
ESCAPE key, it should expect to execute the cancel action,
if any had been given to the dialog.
The behavior was missing, and the dialog was simply closed.

Tests have also been added, since this core component didn't
have any test since its introduction.

closes odoo/odoo#99418

Signed-off-by: Aaron Bohy (aab) <aab@odoo.com>
---
 .../confirmation_dialog.js                    |  3 +
 .../tests/core/confirmation_dialog_tests.js   | 95 +++++++++++++++++++
 2 files changed, 98 insertions(+)
 create mode 100644 addons/web/static/tests/core/confirmation_dialog_tests.js

diff --git a/addons/web/static/src/core/confirmation_dialog/confirmation_dialog.js b/addons/web/static/src/core/confirmation_dialog/confirmation_dialog.js
index 4254194face..5ae45156fba 100644
--- a/addons/web/static/src/core/confirmation_dialog/confirmation_dialog.js
+++ b/addons/web/static/src/core/confirmation_dialog/confirmation_dialog.js
@@ -6,6 +6,9 @@ import { _lt } from "../l10n/translation";
 const { Component } = owl;
 
 export class ConfirmationDialog extends Component {
+    setup() {
+        this.env.dialogData.close = () => this._cancel();
+    }
     _cancel() {
         if (this.props.cancel) {
             this.props.cancel();
diff --git a/addons/web/static/tests/core/confirmation_dialog_tests.js b/addons/web/static/tests/core/confirmation_dialog_tests.js
new file mode 100644
index 00000000000..d6e2760209b
--- /dev/null
+++ b/addons/web/static/tests/core/confirmation_dialog_tests.js
@@ -0,0 +1,95 @@
+/** @odoo-module **/
+
+import { registry } from "@web/core/registry";
+import { uiService } from "@web/core/ui/ui_service";
+import { hotkeyService } from "@web/core/hotkeys/hotkey_service";
+import { ConfirmationDialog } from "@web/core/confirmation_dialog/confirmation_dialog";
+import { makeTestEnv } from "../helpers/mock_env";
+import { click, getFixture, mount, triggerHotkey } from "../helpers/utils";
+import { makeFakeDialogService } from "../helpers/mock_services";
+
+const serviceRegistry = registry.category("services");
+let target;
+
+async function makeDialogTestEnv() {
+    const env = await makeTestEnv();
+    env.dialogData = {
+        isActive: true,
+        close: () => {},
+    };
+    return env;
+}
+
+QUnit.module("Components", (hooks) => {
+    hooks.beforeEach(async (assert) => {
+        target = getFixture();
+        async function addDialog(dialogClass, props) {
+            assert.strictEqual(props.body, "Some content");
+            assert.strictEqual(props.title, "Confirmation");
+        }
+        serviceRegistry.add("hotkey", hotkeyService);
+        serviceRegistry.add("ui", uiService);
+        serviceRegistry.add("dialog", makeFakeDialogService(addDialog), { force: true });
+    });
+
+    QUnit.module("ConfirmationDialog");
+
+    QUnit.test("pressing escape to close the dialog", async function (assert) {
+        assert.expect(4);
+
+        const env = await makeDialogTestEnv();
+        await mount(ConfirmationDialog, target, {
+            env,
+            props: {
+                body: "Some content",
+                title: "Confirmation",
+                close: () => {
+                    assert.step("Close action");
+                },
+                confirm: () => {},
+                cancel: () => {
+                    assert.step("Cancel action");
+                }
+            }
+        });
+        assert.verifySteps([]);
+        triggerHotkey("escape");
+        assert.verifySteps([
+            "Cancel action",
+            "Close action"
+        ], "dialog has called its cancel method before its closure");
+    });
+
+    QUnit.test("clicking on dialog buttons", async function (assert) {
+        assert.expect(7);
+
+        const env = await makeDialogTestEnv();
+        await mount(ConfirmationDialog, target, {
+            env,
+            props: {
+                body: "Some content",
+                title: "Confirmation",
+                close: () => {
+                    assert.step("Close action");
+                },
+                confirm: () => {
+                    assert.step("Confirm action");
+                },
+                cancel: () => {
+                    assert.step("Cancel action");
+                }
+            }
+        });
+        assert.verifySteps([]);
+        await click(target, ".modal-footer .btn-primary");
+        assert.verifySteps([
+            "Confirm action",
+            "Close action"
+        ]);
+        await click(target, ".modal-footer .btn-secondary");
+        assert.verifySteps([
+            "Cancel action",
+            "Close action"
+        ], "dialog has called its cancel method before its closure");
+    });
+});