From 814781780d6df699ee0a72e5a8224a96468c6ea1 Mon Sep 17 00:00:00 2001
From: Andrei Prigorshnev <a.prigorshnev@gmail.com>
Date: Sat, 24 Jul 2021 18:34:38 +0400
Subject: [PATCH] FIX: Don't show the Later This Week option in date pickers on
 Sundays

---
 .../future-date-input-selector-test.js        | 28 +++++++++++++++++++
 .../components/future-date-input-selector.js  |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/future-date-input-selector-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/future-date-input-selector-test.js
index ae2e97bc49a..37212d5661b 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/future-date-input-selector-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/future-date-input-selector-test.js
@@ -209,6 +209,34 @@ discourseModule(
       },
     });
 
+    componentTest("doesn't show 'Later This Week' on Sundays", {
+      /* 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. */
+
+      template: hbs`{{future-date-input-selector}}`,
+
+      beforeEach() {
+        const timezone = moment.tz.guess();
+        this.clock = fakeTime("2100-04-25 18:00:00", timezone, true); // Sunday evening
+      },
+
+      async test(assert) {
+        await this.subject.expand();
+        const options = getOptions();
+        const laterThisWeek = I18n.t("topic.auto_update_input.later_this_week");
+        assert.not(options.includes(laterThisWeek));
+      },
+    });
+
     componentTest("doesn't show 'Next Month' on the last day of the month", {
       template: hbs`{{future-date-input-selector}}`,
 
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 cfd208b453e..b163c485656 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
@@ -40,7 +40,7 @@ export const TIMEFRAMES = [
   buildTimeframe({
     id: "later_this_week",
     format: "ddd, h a",
-    enabled: (opts) => !opts.canScheduleToday && opts.day < 4,
+    enabled: (opts) => !opts.canScheduleToday && opts.day > 0 && opts.day < 4,
     when: (time, timeOfDay) => time.add(2, "day").hour(timeOfDay).minute(0),
   }),
   buildTimeframe({