From 08ddbcc7698bcc9c88e1f4a63aaa4c0a54933e80 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Tue, 19 Jan 2021 11:35:14 +0200
Subject: [PATCH] FIX: Add 'none' option to region selector (#94)

---
 .../discourse/components/region-input.js.es6           | 10 ++++++----
 config/locales/client.en.yml                           |  2 +-
 jobs/scheduled/create_holiday_events.rb                |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/assets/javascripts/discourse/components/region-input.js.es6 b/assets/javascripts/discourse/components/region-input.js.es6
index 7fd534a3..d367b2a3 100644
--- a/assets/javascripts/discourse/components/region-input.js.es6
+++ b/assets/javascripts/discourse/components/region-input.js.es6
@@ -18,11 +18,13 @@ export default ComboBoxComponent.extend({
       localeNames[locale.value] = locale.name;
     });
 
-    return HOLIDAY_REGIONS.map((region) => {
-      return {
+    let values = [{ name: I18n.t("discourse_calendar.region.none"), id: null }];
+    values = values.concat(
+      HOLIDAY_REGIONS.map((region) => ({
         name: I18n.t(`discourse_calendar.region.names.${region}`),
         id: region,
-      };
-    }).sort((a, b) => a.name.localeCompare(b.name));
+      })).sort((a, b) => a.name.localeCompare(b.name))
+    );
+    return values;
   }),
 });
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 5ad79648..9557b724 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -13,7 +13,7 @@ en:
       add_to_calendar: "Add to Google Calendar"
       region:
         title: "Region"
-        none: "Select a region..."
+        none: "None"
         use_current_region: "Use Current Region"
         names:
           ar: "Argentina"
diff --git a/jobs/scheduled/create_holiday_events.rb b/jobs/scheduled/create_holiday_events.rb
index 6f4243b8..27ee5887 100644
--- a/jobs/scheduled/create_holiday_events.rb
+++ b/jobs/scheduled/create_holiday_events.rb
@@ -15,7 +15,7 @@ module Jobs
       UserCustomField
         .where(name: ::DiscourseCalendar::REGION_CUSTOM_FIELD)
         .pluck(:user_id, :value)
-        .each { |user_id, region| regions_and_user_ids[region] << user_id }
+        .each { |user_id, region| regions_and_user_ids[region] << user_id if region.present? }
 
       usernames = User
         .real