From a0eb8092f072f35dd52d9779ccbde02a13d10123 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 11 Oct 2022 11:25:32 +0100
Subject: [PATCH] FIX: Ensure local date format shortcuts work correctly
 (#18541)

Followup to 03b7b7d1bc7c978c280e441a610a5ef5c049c60c
---
 .../components/discourse-local-dates-create-form.js   |  2 +-
 .../acceptance/local-dates-composer-test.js           | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js b/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js
index 426f2ab4d66..3a880d715d5 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js
@@ -309,7 +309,7 @@ export default Component.extend({
   @action
   updateFormat(format, event) {
     event?.preventDefault();
-    this.format = format;
+    this.set("format", format);
   },
 
   actions: {
diff --git a/plugins/discourse-local-dates/test/javascripts/acceptance/local-dates-composer-test.js b/plugins/discourse-local-dates/test/javascripts/acceptance/local-dates-composer-test.js
index 354e2427523..3c4855cb610 100644
--- a/plugins/discourse-local-dates/test/javascripts/acceptance/local-dates-composer-test.js
+++ b/plugins/discourse-local-dates/test/javascripts/acceptance/local-dates-composer-test.js
@@ -9,7 +9,10 @@ import selectKit from "discourse/tests/helpers/select-kit-helper";
 
 acceptance("Local Dates - composer", function (needs) {
   needs.user();
-  needs.settings({ discourse_local_dates_enabled: true });
+  needs.settings({
+    discourse_local_dates_enabled: true,
+    discourse_local_dates_default_formats: "LLL|LTS|LL|LLLL",
+  });
 
   test("composer bbcode", async function (assert) {
     const getAttr = (attr) => {
@@ -121,5 +124,11 @@ acceptance("Local Dates - composer", function (needs) {
       query(".pika-table .is-selected"),
       "deleting selected TO date works"
     );
+
+    await click(".advanced-mode-btn");
+
+    assert.strictEqual(query("input.format-input").value, "");
+    await click("ul.formats a.moment-format");
+    assert.strictEqual(query("input.format-input").value, "LLL");
   });
 });