A platform for community discussion. Free, open, simple.
FIX: Apply the relativeDate min bound in the native date picker
Régis Hanol80fa1c33e889
diff --git a/frontend/discourse/app/ui-kit/d-date-input.gjs b/frontend/discourse/app/ui-kit/d-date-input.gjsindex 57162433565..834a28e3d6c 100644--- a/frontend/discourse/app/ui-kit/d-date-input.gjs+++ b/frontend/discourse/app/ui-kit/d-date-input.gjs@@ -79,13 +79,8 @@ export default class DDateInput extends Component {this._picker.setDate(parsedDate, true);}- if (this._picker && this.relativeDate) {- const parsedRelativeDate =- this.relativeDate instanceof moment- ? this.relativeDate- : moment(this.relativeDate);-- this._picker.setMinDate(parsedRelativeDate, true);+ if (this._picker) {+ this._picker.setMinDate(this.relativeDate);}if (this._picker && !this.date) {@@ -122,7 +117,12 @@ export default class DDateInput extends Component {defaultOptions.minDate = moment(this.relativeDate).toDate();}- return new Pikaday({ ...defaultOptions, ...this._opts() });+ const picker = new Pikaday({ ...defaultOptions, ...this._opts() });+ const pikadaySetMinDate = picker.setMinDate.bind(picker);+ picker.setMinDate = (date) =>+ pikadaySetMinDate(date ? moment(date).toDate() : null);++ return picker;}_loadNativePicker(container) {@@ -139,13 +139,17 @@ export default class DDateInput extends Component {picker.value = date ? moment(date).format("YYYY-MM-DD") : null;};picker.setMinDate = (date) => {- picker.min = date;+ picker.min = date ? moment(date).format("YYYY-MM-DD") : "";};if (this.date) {picker.setDate(this.date);}+ if (this.relativeDate) {+ picker.setMinDate(this.relativeDate);+ }+return Promise.resolve(picker);}diff --git a/frontend/discourse/tests/integration/ui-kit/d-date-input-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-date-input-test.gjsindex 21f35150920..4f5b3d0317c 100644--- a/frontend/discourse/tests/integration/ui-kit/d-date-input-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-date-input-test.gjs@@ -1,4 +1,4 @@-import { fillIn, render, triggerEvent } from "@ember/test-helpers";+import { fillIn, render, settled, triggerEvent } from "@ember/test-helpers";import { module, test } from "qunit";import { setupRenderingTest } from "discourse/tests/helpers/component-test";import DDateInput from "discourse/ui-kit/d-date-input";@@ -48,6 +48,37 @@ module("Integration | ui-kit | DDateInput", function (hooks) {assert.true(this.date.isSame(moment("2019-02-02")));});+ test("bounds the picker to the relative date and follows its changes", async function (assert) {+ this.setProperties({+ date: DEFAULT_DATE,+ relativeDate: moment("2019-01-20"),+ });++ await render(+ <template>+ <DDateInput @date={{this.date}} @relativeDate={{this.relativeDate}} />+ </template>+ );++ assert+ .dom(".date-picker")+ .hasAttribute("min", "2019-01-20", "the bound is applied on load");++ this.set("relativeDate", moment("2019-01-25"));+ await settled();++ assert+ .dom(".date-picker")+ .hasAttribute("min", "2019-01-25", "the bound tracks the relative date");++ this.set("relativeDate", null);+ await settled();++ assert+ .dom(".date-picker")+ .hasAttribute("min", "", "the bound is dropped with the relative date");+ });+test("always shows date in timezone of input timestamp", async function (assert) {this.setProperties({date: moment.tz("2023-05-05T10:00:00", "ETC/GMT-12"),diff --git a/frontend/discourse/tests/integration/ui-kit/d-date-time-input-range-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-date-time-input-range-test.gjsindex 9a3ad38e808..a3648a9ff1d 100644--- a/frontend/discourse/tests/integration/ui-kit/d-date-time-input-range-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-date-time-input-range-test.gjs@@ -155,6 +155,30 @@ module("Integration | ui-kit | DDateTimeInputRange", function (hooks) {);});+ test("the to date picker is bounded by the from date", async function (assert) {+ this.setProperties({+ state: { from: DEFAULT_DATE_TIME, to: moment("2019-01-30 16:45") },+ });++ await render(+ <template>+ <DDateTimeInputRange+ @from={{this.state.from}}+ @onChange={{fn (mut this.state)}}+ @to={{this.state.to}}+ />+ </template>+ );++ assert+ .dom(".to.d-date-time-input .date-picker")+ .hasAttribute(+ "min",+ "2019-01-29",+ "days before the start are not selectable"+ );+ });+test("timezone support", async function (assert) {this.setProperties({state: {