From ae3c71758718d06183a9075989a3bca1f3c57928 Mon Sep 17 00:00:00 2001
From: Flix6x <Flix6x@users.noreply.github.com>
Date: Tue, 4 May 2021 23:15:24 +0000
Subject: [PATCH 1/4] Create draft PR for #116


From ee70e96db592342d92aee68f0e95868909ae0f1e Mon Sep 17 00:00:00 2001
From: "F.N. Claessen" <felix@seita.nl>
Date: Wed, 5 May 2021 01:18:07 +0200
Subject: [PATCH 2/4] Fix bug due to redefining older javascript content as a
 js module.

---
 .../ui/static/js/flexmeasures-module.js       | 19 +++++++++++++++++
 flexmeasures/ui/static/js/flexmeasures.js     | 21 -------------------
 flexmeasures/ui/templates/base.html           |  3 ++-
 3 files changed, 21 insertions(+), 22 deletions(-)
 create mode 100644 flexmeasures/ui/static/js/flexmeasures-module.js

diff --git a/flexmeasures/ui/static/js/flexmeasures-module.js b/flexmeasures/ui/static/js/flexmeasures-module.js
new file mode 100644
index 000000000..41c5f3f48
--- /dev/null
+++ b/flexmeasures/ui/static/js/flexmeasures-module.js
@@ -0,0 +1,19 @@
+// Date range utils
+export function subtract(oldDate, nDays) {
+    var newDate = new Date(oldDate)
+    newDate.setDate(newDate.getDate() - nDays);
+    return newDate;
+}
+export function thisMonth(oldDate) {
+    var d1 = new Date(oldDate)
+    d1.setDate(1);
+    var d2 = new Date(d1.getFullYear(), d1.getMonth() + 1, 0);
+    return [d1, d2];
+};
+export function lastNMonths(oldDate, nMonths) {
+    var d0 = new Date(oldDate)
+    var d1 = new Date(d0.getFullYear(), d0.getMonth() - nMonths + 2, 0);
+    d1.setDate(1);
+    var d2 = new Date(d0.getFullYear(), d0.getMonth() + 1, 0);
+    return [d1, d2];
+};
diff --git a/flexmeasures/ui/static/js/flexmeasures.js b/flexmeasures/ui/static/js/flexmeasures.js
index 66e00404c..8dd0becba 100644
--- a/flexmeasures/ui/static/js/flexmeasures.js
+++ b/flexmeasures/ui/static/js/flexmeasures.js
@@ -310,24 +310,3 @@ function submit_market() {
 function submit_sensor_type() {
     $("#sensor_type-form").attr("action", empty_location).submit();
 }
-
-
-// Date range utils
-export function subtract(oldDate, nDays) {
-    var newDate = new Date(oldDate)
-    newDate.setDate(newDate.getDate() - nDays);
-    return newDate;
-}
-export function thisMonth(oldDate) {
-    var d1 = new Date(oldDate)
-    d1.setDate(1);
-    var d2 = new Date(d1.getFullYear(), d1.getMonth() + 1, 0);
-    return [d1, d2];
-};
-export function lastNMonths(oldDate, nMonths) {
-    var d0 = new Date(oldDate)
-    var d1 = new Date(d0.getFullYear(), d0.getMonth() - nMonths + 2, 0);
-    d1.setDate(1);
-    var d2 = new Date(d0.getFullYear(), d0.getMonth() + 1, 0);
-    return [d1, d2];
-};
diff --git a/flexmeasures/ui/templates/base.html b/flexmeasures/ui/templates/base.html
index 328f35830..b0d39da3f 100644
--- a/flexmeasures/ui/templates/base.html
+++ b/flexmeasures/ui/templates/base.html
@@ -209,7 +209,8 @@
     <script src="https://cdn.jsdelivr.net/npm/ion-rangeslider@2.3.1/js/ion.rangeSlider.min.js"></script>
 
     <!-- Custom scripts -->
-    <script type="module" src="{{ url_for('flexmeasures_ui.static', filename='js/flexmeasures.js') }}"></script>
+    <script src="{{ url_for('flexmeasures_ui.static', filename='js/flexmeasures.js') }}"></script>
+    <script type="module" src="{{ url_for('flexmeasures_ui.static', filename='js/flexmeasures-module.js') }}"></script>
     {% if show_datepicker %}
     <script src="{{ url_for('flexmeasures_ui.static', filename='js/daterangepicker-init.js') }}"></script>
     {% endif %}

From 84ba2f6c388e557bae409ff8207b2c1741b1a984 Mon Sep 17 00:00:00 2001
From: "F.N. Claessen" <felix@seita.nl>
Date: Fri, 7 May 2021 12:04:31 +0200
Subject: [PATCH 3/4] Changelog entry

---
 documentation/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/documentation/changelog.rst b/documentation/changelog.rst
index d78be74b2..8bdd80414 100644
--- a/documentation/changelog.rst
+++ b/documentation/changelog.rst
@@ -25,6 +25,7 @@ v0.4.1 | May XX, 2021
 
 Bugfixes
 -----------
+* Fixed a regression that stopped asset, market and sensor selection from working [see `PR #117 <http://www.github.com/SeitaBV/flexmeasures/pull/117>`_]
 * Prevent logging out user when clearing the session [see `PR #112 <http://www.github.com/SeitaBV/flexmeasures/pull/112>`_]
 * Prevent user type data source to be created without setting a user [see `PR #111 <https://github.com/SeitaBV/flexmeasures/pull/111>`_]
 

From 8c4f4dd09f0141cc75d20a834252809ef47db69d Mon Sep 17 00:00:00 2001
From: "F.N. Claessen" <felix@seita.nl>
Date: Fri, 7 May 2021 13:49:52 +0200
Subject: [PATCH 4/4] More targeted loading of js functions from module

---
 .../ui/static/js/{flexmeasures-module.js => daterange-utils.js} | 0
 flexmeasures/ui/templates/base.html                             | 1 -
 flexmeasures/ui/templates/views/sensors.html                    | 2 +-
 3 files changed, 1 insertion(+), 2 deletions(-)
 rename flexmeasures/ui/static/js/{flexmeasures-module.js => daterange-utils.js} (100%)

diff --git a/flexmeasures/ui/static/js/flexmeasures-module.js b/flexmeasures/ui/static/js/daterange-utils.js
similarity index 100%
rename from flexmeasures/ui/static/js/flexmeasures-module.js
rename to flexmeasures/ui/static/js/daterange-utils.js
diff --git a/flexmeasures/ui/templates/base.html b/flexmeasures/ui/templates/base.html
index 7222ab59f..9dfd7b3a0 100644
--- a/flexmeasures/ui/templates/base.html
+++ b/flexmeasures/ui/templates/base.html
@@ -210,7 +210,6 @@
 
     <!-- Custom scripts -->
     <script src="{{ url_for('flexmeasures_ui.static', filename='js/flexmeasures.js') }}"></script>
-    <script type="module" src="{{ url_for('flexmeasures_ui.static', filename='js/flexmeasures-module.js') }}"></script>
     {% if show_datepicker %}
     <script src="{{ url_for('flexmeasures_ui.static', filename='js/daterangepicker-init.js') }}"></script>
     {% endif %}
diff --git a/flexmeasures/ui/templates/views/sensors.html b/flexmeasures/ui/templates/views/sensors.html
index 2800d5f8c..5bb5c7e15 100644
--- a/flexmeasures/ui/templates/views/sensors.html
+++ b/flexmeasures/ui/templates/views/sensors.html
@@ -25,7 +25,7 @@
     <!-- Render Charts -->
     <script type="module" type="text/javascript">
 
-      import { subtract, thisMonth, lastNMonths } from "{{ url_for('flexmeasures_ui.static', filename='js/flexmeasures.js') }}";
+      import { subtract, thisMonth, lastNMonths } from "{{ url_for('flexmeasures_ui.static', filename='js/daterange-utils.js') }}";
 
       let vegaView;