A platform for community discussion. Free, open, simple.
FIX: Pin date validation in feature topic modal (#39059)
Alan Guo Xiang Tan3f44441c54a7
diff --git a/frontend/discourse/app/components/modal/feature-topic.gjs b/frontend/discourse/app/components/modal/feature-topic.gjsindex 710a9f827c4..ee86711807d 100644--- a/frontend/discourse/app/components/modal/feature-topic.gjs+++ b/frontend/discourse/app/components/modal/feature-topic.gjs@@ -12,6 +12,7 @@ import PopupInputTip from "discourse/components/popup-input-tip";import { categoryLinkHTML } from "discourse/helpers/category-link";import icon from "discourse/helpers/d-icon";import { ajax } from "discourse/lib/ajax";+import { FORMAT } from "discourse/select-kit/components/future-date-input-selector";import { i18n } from "discourse-i18n";export default class FeatureTopic extends Component {@@ -107,7 +108,7 @@ export default class FeatureTopic extends Component {}_parseDate(date) {- return moment(date, ["YYYY-MM-DD", "YYYY-MM-DD HH:mm"]);+ return moment(date, FORMAT);}_isDateValid(parsedDate) {diff --git a/frontend/discourse/tests/acceptance/topic-test.js b/frontend/discourse/tests/acceptance/topic-test.jsindex e4775dba6b8..b77dd806b74 100644--- a/frontend/discourse/tests/acceptance/topic-test.js+++ b/frontend/discourse/tests/acceptance/topic-test.js@@ -12,8 +12,10 @@ import topicFixtures from "discourse/tests/fixtures/topic";import {acceptance,chromeTest,+ fakeTime,publishToMessageBus,selectText,+ updateCurrentUser,} from "discourse/tests/helpers/qunit-helpers";import selectKit from "discourse/tests/helpers/select-kit-helper";import { i18n } from "discourse-i18n";@@ -466,6 +468,11 @@ acceptance(`Topic featured links`, function (needs) {acceptance(`Topic pinning/unpinning as an admin`, function (needs) {needs.user({ admin: true });+ needs.pretender((server, helper) => {+ server.put("/t/a-topic-with-group-category-moderators/2480/status", () =>+ helper.response({ success: "OK" })+ );+ });test("Admin pinning topic", async function (assert) {await visit("/t/topic-for-group-moderators/2480");@@ -479,6 +486,38 @@ acceptance(`Topic pinning/unpinning as an admin`, function (needs) {assert.dom(".make-banner").exists("should show the 'Banner Topic' button");});++ test("Pinning a topic should consider user's timezone when selecting the later today date shortcut", async function (assert) {+ const timezone = "America/Los_Angeles";+ updateCurrentUser({ "user_option.timezone": timezone });+ // Now: 2100-12-13 14:00 local / 2100-12-13 22:00 UTC+ // Later today: 2100-12-13 17:00 local / 2100-12-14 01:00 UTC+ // emitted as "2100-12-13 17:00-08:00"+ // Without timezone: parsed as 2100-12-13 17:00 UTC which is before+ // now (2100-12-13 22:00 UTC)+ const clock = fakeTime("2100-12-13T14:00:00", timezone, true);++ try {+ await visit("/t/topic-for-group-moderators/2480");++ await click(".toggle-admin-menu");+ await click(".topic-admin-pin .btn");++ const futureDateInput = selectKit(+ ".pin-until .future-date-input-selector"+ );+ await futureDateInput.expand();+ await futureDateInput.selectRowByValue("later_today");++ await click(".feature-topic .btn-primary");++ assert+ .dom(".d-modal.feature-topic")+ .doesNotExist("topic is pinned and modal closes");+ } finally {+ clock.restore();+ }+ });});acceptance(`Topic pinning/unpinning as a staff member`, function (needs) {