{{future-date-input class="pin-until" - includeFarFuture=true clearable=true input=model.pinnedInCategoryUntil onChangeInput=(action (mut model.pinnedInCategoryUntil)) @@ -57,7 +56,6 @@ {{d-icon "far-clock"}} {{future-date-input class="pin-until" - includeFarFuture=true clearable=true input=model.pinnedInCategoryUntil onChangeInput=(action (mut model.pinnedInCategoryUntil)) @@ -93,7 +91,6 @@
{{future-date-input class="pin-until" - includeFarFuture=true clearable=true input=model.pinnedGloballyUntil onChangeInput=(action (mut model.pinnedGloballyUntil)) @@ -107,7 +104,6 @@ {{d-icon "far-clock"}} {{future-date-input class="pin-until" - includeFarFuture=true clearable=true input=model.pinnedGloballyUntil onChangeInput=(action (mut model.pinnedGloballyUntil)) diff --git a/app/assets/javascripts/discourse/app/templates/modal/ignore-duration-with-username.hbs b/app/assets/javascripts/discourse/app/templates/modal/ignore-duration-with-username.hbs index 2cebb1831a..170e9530a7 100644 --- a/app/assets/javascripts/discourse/app/templates/modal/ignore-duration-with-username.hbs +++ b/app/assets/javascripts/discourse/app/templates/modal/ignore-duration-with-username.hbs @@ -13,9 +13,8 @@ {{future-date-input label="user.user_notifications.ignore_duration_when" input=(readonly ignoredUntil) - includeWeekend=true + customShortcuts=timeShortcuts includeDateTime=false - includeFarFuture=true onChangeInput=(action (mut ignoredUntil)) }}
{{i18n "user.user_notifications.ignore_duration_note"}}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/ignore-duration.hbs b/app/assets/javascripts/discourse/app/templates/modal/ignore-duration.hbs index 566b60f21a..9825c0b511 100644 --- a/app/assets/javascripts/discourse/app/templates/modal/ignore-duration.hbs +++ b/app/assets/javascripts/discourse/app/templates/modal/ignore-duration.hbs @@ -2,9 +2,8 @@ {{future-date-input label="user.user_notifications.ignore_duration_when" input=ignoredUntil - includeWeekend=true + customShortcuts=timeShortcuts includeDateTime=false - includeFarFuture=true onChangeInput=(action (mut ignoredUntil)) }}{{i18n "user.user_notifications.ignore_duration_note"}}
diff --git a/app/assets/javascripts/discourse/tests/integration/components/future-date-input-selector-test.js b/app/assets/javascripts/discourse/tests/integration/components/future-date-input-selector-test.js deleted file mode 100644 index 6fba9aa951..0000000000 --- a/app/assets/javascripts/discourse/tests/integration/components/future-date-input-selector-test.js +++ /dev/null @@ -1,82 +0,0 @@ -import selectKit from "discourse/tests/helpers/select-kit-helper"; -import componentTest, { - setupRenderingTest, -} from "discourse/tests/helpers/component-test"; -import { - discourseModule, - exists, - queryAll, -} from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; -import I18n from "I18n"; - -discourseModule( - "Unit | Lib | select-kit/future-date-input-selector", - function (hooks) { - setupRenderingTest(hooks); - - hooks.beforeEach(function () { - this.set("subject", selectKit()); - }); - - hooks.afterEach(function () { - if (this.clock) { - this.clock.restore(); - } - }); - - componentTest("rendering and expanding", { - template: hbs` - {{future-date-input-selector - options=(hash - none="time_shortcut.select_timeframe" - ) - }} - `, - - async test(assert) { - assert.ok( - exists(".future-date-input-selector"), - "Selector is rendered" - ); - - assert.ok( - this.subject.header().label() === - I18n.t("time_shortcut.select_timeframe"), - "Default text is rendered" - ); - - await this.subject.expand(); - - assert.ok( - exists(".select-kit-collection"), - "List of options is rendered" - ); - }, - }); - - componentTest("shows 'Custom date and time' if it's enabled", { - template: hbs` - {{future-date-input-selector - includeDateTime=true - }} - `, - - async test(assert) { - await this.subject.expand(); - const options = getOptions(); - const customDateAndTime = I18n.t("time_shortcut.custom"); - - assert.ok(options.includes(customDateAndTime)); - }, - }); - - function getOptions() { - return Array.from( - queryAll(`.select-kit-collection .select-kit-row`).map( - (_, span) => span.dataset.name - ) - ); - } - } -); diff --git a/app/assets/javascripts/discourse/tests/integration/components/future-date-input-test.js b/app/assets/javascripts/discourse/tests/integration/components/future-date-input-test.js new file mode 100644 index 0000000000..d7e2cdc1e0 --- /dev/null +++ b/app/assets/javascripts/discourse/tests/integration/components/future-date-input-test.js @@ -0,0 +1,136 @@ +import selectKit from "discourse/tests/helpers/select-kit-helper"; +import componentTest, { + setupRenderingTest, +} from "discourse/tests/helpers/component-test"; +import { + discourseModule, + exists, + fakeTime, + queryAll, +} from "discourse/tests/helpers/qunit-helpers"; +import hbs from "htmlbars-inline-precompile"; +import I18n from "I18n"; + +discourseModule("Unit | Lib | select-kit/future-date-input", function (hooks) { + setupRenderingTest(hooks); + + hooks.beforeEach(function () { + this.set("subject", selectKit()); + }); + + hooks.afterEach(function () { + if (this.clock) { + this.clock.restore(); + } + }); + + componentTest("rendering and expanding", { + template: hbs` + {{future-date-input + options=(hash + none="time_shortcut.select_timeframe" + ) + }} + `, + + async test(assert) { + assert.ok(exists(".future-date-input-selector"), "Selector is rendered"); + + assert.ok( + this.subject.header().label() === + I18n.t("time_shortcut.select_timeframe"), + "Default text is rendered" + ); + + await this.subject.expand(); + + assert.ok( + exists(".select-kit-collection"), + "List of options is rendered" + ); + }, + }); + + componentTest("renders default options", { + template: hbs`{{future-date-input}}`, + + beforeEach() { + const monday = "2100-12-13T08:00:00"; + this.clock = fakeTime(monday, this.currentUser._timezone, true); + }, + + async test(assert) { + await this.subject.expand(); + const options = getOptions(); + const expected = [ + I18n.t("time_shortcut.later_today"), + I18n.t("time_shortcut.tomorrow"), + I18n.t("time_shortcut.later_this_week"), + I18n.t("time_shortcut.start_of_next_business_week_alt"), + I18n.t("time_shortcut.two_weeks"), + I18n.t("time_shortcut.next_month"), + I18n.t("time_shortcut.two_months"), + I18n.t("time_shortcut.three_months"), + I18n.t("time_shortcut.four_months"), + I18n.t("time_shortcut.six_months"), + I18n.t("time_shortcut.one_year"), + I18n.t("time_shortcut.forever"), + I18n.t("time_shortcut.custom"), + ]; + + assert.deepEqual(options, expected); + }, + }); + + componentTest("shows 'Custom date and time' by default", { + template: hbs`{{future-date-input}}`, + + async test(assert) { + await this.subject.expand(); + const options = getOptions(); + const customDateAndTime = I18n.t("time_shortcut.custom"); + + assert.ok(options.includes(customDateAndTime)); + }, + }); + + componentTest("doesn't show 'Custom date and time' if disabled", { + template: hbs` + {{future-date-input + includeDateTime=false + }} + `, + + async test(assert) { + await this.subject.expand(); + const options = getOptions(); + const customDateAndTime = I18n.t("time_shortcut.custom"); + + assert.notOk(options.includes(customDateAndTime)); + }, + }); + + componentTest("shows the now option if enabled", { + template: hbs` + {{future-date-input + includeNow=true + }} + `, + + async test(assert) { + await this.subject.expand(); + const options = getOptions(); + const now = I18n.t("time_shortcut.now"); + + assert.ok(options.includes(now)); + }, + }); + + function getOptions() { + return Array.from( + queryAll(`.select-kit-collection .select-kit-row`).map( + (_, span) => span.dataset.name + ) + ); + } +}); diff --git a/app/assets/javascripts/discourse/tests/unit/lib/time-shortcut-test.js b/app/assets/javascripts/discourse/tests/unit/lib/time-shortcut-test.js new file mode 100644 index 0000000000..1d8b5e1ff0 --- /dev/null +++ b/app/assets/javascripts/discourse/tests/unit/lib/time-shortcut-test.js @@ -0,0 +1,92 @@ +import { module, test } from "qunit"; +import { fakeTime } from "discourse/tests/helpers/qunit-helpers"; +import { + defaultTimeShortcuts, + hideDynamicTimeShortcuts, +} from "discourse/lib/time-shortcut"; + +module( + "Unit | Lib | time-shortcut | hideDynamicTimeShortcuts", + function (hooks) { + hooks.afterEach(function () { + if (this.clock) { + this.clock.restore(); + } + }); + + test("hides 'Later Today' at the end of the day", function (assert) { + const timezone = moment.tz.guess(); + const shortcuts = defaultTimeShortcuts(timezone); + + this.clock = fakeTime("2100-04-19 08:00:00", timezone, true); // morning + let result = hideDynamicTimeShortcuts(shortcuts, timezone).mapBy("id"); + assert.ok( + result.includes("later_today"), + "shows later_today in the morning" + ); + + this.clock = fakeTime("2100-04-19 18:00:00", timezone, true); // evening + result = hideDynamicTimeShortcuts(shortcuts, timezone).mapBy("id"); + assert.notOk(result.includes("doesn't show later_today in the evening")); + }); + + test("hides 'Later This Week' starting from Thursday", function (assert) { + const timezone = moment.tz.guess(); + const shortcuts = defaultTimeShortcuts(timezone); + + this.clock = fakeTime("2100-04-21 18:00:00", timezone, true); // Wednesday + let result = hideDynamicTimeShortcuts(shortcuts, timezone).mapBy("id"); + assert.ok( + result.includes("later_this_week"), + "shows later_this_week on Wednesdays" + ); + + this.clock = fakeTime("2100-04-22 18:00:00", timezone, true); // Thursday + result = hideDynamicTimeShortcuts(shortcuts, timezone).mapBy("id"); + assert.notOk( + result.includes("later_this_week"), + "doesn't show later_this_week on Thursdays" + ); + + this.clock = fakeTime("2100-04-23 18:00:00", timezone, true); // Friday + result = hideDynamicTimeShortcuts(shortcuts, timezone).mapBy("id"); + assert.notOk( + result.includes("later_this_week"), + "doesn't show later_this_week on Fridays" + ); + }); + + test("hides 'This Weekend' on Fridays, Saturdays and Sundays", function (assert) { + const timezone = moment.tz.guess(); + const shortcuts = defaultTimeShortcuts(timezone); + + this.clock = fakeTime("2100-04-22 18:00:00", timezone, true); // Thursday + let result = hideDynamicTimeShortcuts(shortcuts, timezone).mapBy("id"); + assert.ok( + result.includes("this_weekend"), + "shows this_weekend on Thursdays" + ); + + this.clock = fakeTime("2100-04-23 18:00:00", timezone, true); // Friday + result = hideDynamicTimeShortcuts(shortcuts, timezone).mapBy("id"); + assert.notOk( + result.includes("this_weekend"), + "doesn't show this_weekend on Fridays" + ); + + this.clock = fakeTime("2100-04-24 18:00:00", timezone, true); // Saturday + result = hideDynamicTimeShortcuts(shortcuts, timezone).mapBy("id"); + assert.notOk( + result.includes("this_weekend"), + "doesn't show this_weekend on Saturdays" + ); + + this.clock = fakeTime("2100-04-25 18:00:00", timezone, true); // Sunday + result = hideDynamicTimeShortcuts(shortcuts, timezone).mapBy("id"); + assert.notOk( + result.includes("this_weekend"), + "doesn't show this_weekend on Sundays" + ); + }); + } +); diff --git a/app/assets/javascripts/discourse/tests/unit/lib/timeframes-builder-test.js b/app/assets/javascripts/discourse/tests/unit/lib/timeframes-builder-test.js deleted file mode 100644 index 51dd461af5..0000000000 --- a/app/assets/javascripts/discourse/tests/unit/lib/timeframes-builder-test.js +++ /dev/null @@ -1,169 +0,0 @@ -import { module, test } from "qunit"; -import { fakeTime } from "discourse/tests/helpers/qunit-helpers"; -import buildTimeframes from "discourse/lib/timeframes-builder"; - -module("Unit | Lib | timeframes-builder", function (hooks) { - hooks.afterEach(function () { - if (this.clock) { - this.clock.restore(); - } - }); - - test("default options", function (assert) { - const timezone = moment.tz.guess(); - this.clock = fakeTime("2100-06-07T08:00:00", timezone, true); // Monday - - const expected = [ - "later_today", - "tomorrow", - "later_this_week", - "start_of_next_business_week", - "two_weeks", - "next_month", - "two_months", - "three_months", - "four_months", - "six_months", - ]; - - assert.deepEqual(buildTimeframes(timezone).mapBy("id"), expected); - }); - - test("doesn't output 'Next Week' on Sundays", function (assert) { - const timezone = moment.tz.guess(); - this.clock = fakeTime("2100-06-13T08:00:00", timezone, true); // Sunday - - assert.ok( - !buildTimeframes(timezone) - .mapBy("id") - .includes("start_of_next_business_week") - ); - }); - - test("outputs 'This Weekend' if it's enabled", function (assert) { - const timezone = moment.tz.guess(); - this.clock = fakeTime("2100-06-07T08:00:00", timezone, true); // Monday - - assert.ok( - buildTimeframes(timezone, { includeWeekend: true }) - .mapBy("id") - .includes("this_weekend") - ); - }); - - test("doesn't output 'This Weekend' on Fridays", function (assert) { - const timezone = moment.tz.guess(); - this.clock = fakeTime("2100-04-23 18:00:00", timezone, true); // Friday - - assert.ok( - !buildTimeframes(timezone, { includeWeekend: true }) - .mapBy("id") - .includes("this_weekend") - ); - }); - - test("doesn't show 'This Weekend' on Sundays", function (assert) { - /* - We need this test to avoid regressions. - We tend to write such conditions and think that - they mean the beginning of work week - (Monday, Tuesday and Wednesday in this specific case): - - if (date.day <= 3) { - ... - } - - In fact, Sunday will pass this check too, because - in moment.js 0 stands for Sunday. - */ - - const timezone = moment.tz.guess(); - this.clock = fakeTime("2100-04-25 18:00:00", timezone, true); // Sunday - - assert.ok( - !buildTimeframes(timezone, { includeWeekend: true }) - .mapBy("id") - .includes("this_weekend") - ); - }); - - test("outputs 'Later This Week' instead of 'Later Today' at the end of the day", function (assert) { - const timezone = moment.tz.guess(); - this.clock = fakeTime("2100-04-19 18:00:00", timezone, true); // Monday evening - const timeframes = buildTimeframes(timezone).mapBy("id"); - - assert.notOk(timeframes.includes("later_today")); - assert.ok(timeframes.includes("later_this_week")); - }); - - test("doesn't output 'Later This Week' on Thursdays", function (assert) { - const timezone = moment.tz.guess(); - this.clock = fakeTime("2100-04-22 18:00:00", timezone, true); // Thursday evening - const timeframes = buildTimeframes(timezone).mapBy("id"); - - assert.notOk(timeframes.includes("later_this_week")); - }); - - test("doesn't output 'Later This Week' on Sundays", function (assert) { - /* - We need this test to avoid regressions. - We tend to write such conditions and think that - they mean the beginning of business week - (Monday, Tuesday and Wednesday in this specific case): - - if (date.day < 3) { - ... - } - - In fact, Sunday will pass this check too, because - in moment.js 0 stands for Sunday. - */ - const timezone = moment.tz.guess(); - this.clock = fakeTime("2100-04-25 18:00:00", timezone, true); // Sunday evening - const timeframes = buildTimeframes(timezone).mapBy("id"); - - assert.notOk(timeframes.includes("later_this_week")); - }); - - test("doesn't output 'Next Month' on the last day of the month", function (assert) { - const timezone = moment.tz.guess(); - this.clock = fakeTime("2100-04-30 18:00:00", timezone, true); // The last day of April - const timeframes = buildTimeframes(timezone).mapBy("id"); - - assert.notOk(timeframes.includes("next_month")); - }); - - test("shows far future options if enabled", function (assert) { - const timezone = moment.tz.guess(); - this.clock = fakeTime("2100-06-07T08:00:00", timezone, true); // Monday - - const timeframes = buildTimeframes(timezone, { - includeFarFuture: true, - }).mapBy("id"); - - assert.ok(timeframes.includes("one_year")); - assert.ok(timeframes.includes("forever")); - }); - - test("shows the pick-date-and-time option if enabled", function (assert) { - const timezone = moment.tz.guess(); - this.clock = fakeTime("2100-06-07T08:00:00", timezone, true); // Monday - - const timeframes = buildTimeframes(timezone, { - includeDateTime: true, - }).mapBy("id"); - - assert.ok(timeframes.includes("custom")); - }); - - test("shows the now option if enabled", function (assert) { - const timezone = moment.tz.guess(); - this.clock = fakeTime("2100-06-07T08:00:00", timezone, true); // Monday - - const timeframes = buildTimeframes(timezone, { - canScheduleNow: true, - }).mapBy("id"); - - assert.ok(timeframes.includes("now")); - }); -}); diff --git a/app/assets/javascripts/select-kit/addon/components/future-date-input-selector.js b/app/assets/javascripts/select-kit/addon/components/future-date-input-selector.js index 53b845905f..18031e21f7 100644 --- a/app/assets/javascripts/select-kit/addon/components/future-date-input-selector.js +++ b/app/assets/javascripts/select-kit/addon/components/future-date-input-selector.js @@ -1,9 +1,6 @@ import ComboBoxComponent from "select-kit/components/combo-box"; -import { computed } from "@ember/object"; import { equal } from "@ember/object/computed"; import { isEmpty } from "@ember/utils"; -import buildTimeframes from "discourse/lib/timeframes-builder"; -import I18n from "I18n"; export const FORMAT = "YYYY-MM-DD HH:mmZ"; @@ -28,25 +25,6 @@ export default ComboBoxComponent.extend({ return "future-date-input-selector/future-date-input-selector-row"; }, - content: computed("statusType", function () { - const opts = { - includeWeekend: this.includeWeekend, - includeFarFuture: this.includeFarFuture, - includeDateTime: this.includeDateTime, - canScheduleNow: this.includeNow || false, - }; - - return buildTimeframes(this.userTimezone, opts).map((tf) => { - return { - id: tf.id, - name: I18n.t(tf.label), - time: tf.time, - timeFormatted: tf.timeFormatted, - icon: tf.icon, - }; - }); - }), - actions: { onChange(value) { if (value !== "custom" && !isEmpty(value)) { diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/date-time-inputs.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/date-time-inputs.hbs index 51cbad64f6..c55c80fbfb 100644 --- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/date-time-inputs.hbs +++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/date-time-inputs.hbs @@ -21,7 +21,6 @@ {{#styleguide-example title="future-date-input"}} {{future-date-input displayLabelIcon="far-clock" - includeDateTime=true clearable=true }} {{/styleguide-example}} diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/dropdowns.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/dropdowns.hbs index 81226a37dc..0426135687 100644 --- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/dropdowns.hbs +++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/dropdowns.hbs @@ -58,7 +58,6 @@ {{#styleguide-example title="future-date-input-selector"}} {{future-date-input-selector - statusType="open" input=dummy.topicTimerUpdateDate includeWeekend=true includeForever=true