From 052229a33061273005060a0b1302c50776a4b97c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6nke=20K=C3=BCper?= <soenkekueper@gmx.de>
Date: Sun, 17 Jan 2021 13:41:36 +0100
Subject: [PATCH 1/3] Adjusted schedule ui to use the new rest service provided
 to get the expected rule executions instead of generating them
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Sönke Küper <soenkekueper@gmx.de>
---
 bundles/org.openhab.ui/web/package-lock.json  |  8 ---
 bundles/org.openhab.ui/web/package.json       |  1 -
 .../src/pages/settings/schedule/schedule.vue  | 51 ++++---------------
 3 files changed, 9 insertions(+), 51 deletions(-)

diff --git a/bundles/org.openhab.ui/web/package-lock.json b/bundles/org.openhab.ui/web/package-lock.json
index a49801bfb5..05c867c460 100644
--- a/bundles/org.openhab.ui/web/package-lock.json
+++ b/bundles/org.openhab.ui/web/package-lock.json
@@ -34713,14 +34713,6 @@
         "webpack-sources": "^1.1.0"
       }
     },
-    "later-again": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/later-again/-/later-again-0.1.1.tgz",
-      "integrity": "sha512-pvkLoGxtOcg1EZ0G8dGYn3RyoCygBJS3CHcIUROYBiMWAe1aVRzvG3VeN6JrNPAbGfvJFv9z49LkoK3i2c5NAg==",
-      "requires": {
-        "moment-timezone": "0.5.17"
-      }
-    },
     "lazy-ass": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.6.0.tgz",
diff --git a/bundles/org.openhab.ui/web/package.json b/bundles/org.openhab.ui/web/package.json
index 2d24732ebc..5f4e81f26a 100644
--- a/bundles/org.openhab.ui/web/package.json
+++ b/bundles/org.openhab.ui/web/package.json
@@ -72,7 +72,6 @@
     "framework7": "^5.7.12",
     "framework7-icons": "^3.0.1",
     "framework7-vue": "^5.7.12",
-    "later-again": "^0.1.1",
     "leaflet": "^1.7.1",
     "leaflet-providers": "^1.11.0",
     "lodash": "^4.17.20",
diff --git a/bundles/org.openhab.ui/web/src/pages/settings/schedule/schedule.vue b/bundles/org.openhab.ui/web/src/pages/settings/schedule/schedule.vue
index cf91805793..f413236b78 100644
--- a/bundles/org.openhab.ui/web/src/pages/settings/schedule/schedule.vue
+++ b/bundles/org.openhab.ui/web/src/pages/settings/schedule/schedule.vue
@@ -79,8 +79,6 @@
 </style>
 
 <script>
-import later from 'later-again'
-
 export default {
   components: {
     'empty-state-placeholder': () => import('@/components/empty-state-placeholder.vue')
@@ -109,45 +107,22 @@ export default {
       if (this.loading) return
       this.loading = true
       let occurrences = []
-      this.$oh.api.get('/rest/rules?tags=Schedule').then(data => {
-        this.rules = data.sort((a, b) => {
-          return a.name.localeCompare(b.name)
-        })
+      
+      let start = new Date(), limit = new Date()
+      limit.setDate(start.getDate() + 31)
+
+      this.$oh.api.get('/rest/rules/simulation?from=' + start.toISOString() + '&until=' + limit.toISOString()).then(data => {
+        this.rules = data
         this.initSearchbar = true
         this.loading = false
 
-        // compute occurrences for rules
+        // map RulesExecutions per time
         this.rules.forEach((rule) => {
-          rule.triggers.forEach((t) => {
-            if (t.type === 'timer.GenericCronTrigger') {
-              if (t.configuration && t.configuration.cronExpression) {
-                try {
-                  const laterSchedule = later.cron(t.configuration.cronExpression, true)
-                  const triggerNextOccurrences = later.schedule(laterSchedule).next(100)
-                  occurrences.push(...triggerNextOccurrences.map((o) => {
-                    return [o.toISOString(), rule]
-                  }))
-                } catch (err) {
-                  throw err
-                }
-              }
-            } else if (t.type === 'timer.TimeOfDayTrigger') {
-              if (t.configuration && t.configuration.time && t.configuration.time.match(/^\d\d:\d\d/)) {
-                for (let i = 0, d = new Date(); i < 31; i++) {
-                  d.setUTCHours(t.configuration.time.split(':')[0], t.configuration.time.split(':')[1])
-                  occurrences.push([d.toISOString().replace(), rule])
-                  d.setDate(d.getDate() + 1)
-                }
-              }
-            }
-          })
+            occurrences.push([new Date(rule.date).toISOString(), rule.rule])
         })
-
-        occurrences = occurrences.sort((o1, o2) => o1[0].localeCompare(o2[0]))
+        
         this.$set(this, 'calendar', {})
 
-        let start = new Date(), limit = new Date()
-        limit.setDate(start.getDate() + 31)
         let day = start
         // eslint-disable-next-line no-unmodified-loop-condition
         while (day < limit) {
@@ -163,14 +138,6 @@ export default {
           const dayOccurrences = occurrences.filter((o) => {
             const occurrenceISODate = o[0].split('T')[0]
             const rule = o[1]
-
-            // filter out the occurrences not satisfying common rule conditions modules
-            if (rule.conditions.some((c) => c.type === 'timer.DayOfWeekCondition' &&
-                c.configuration && Array.isArray(c.configuration.days) &&
-                c.configuration.days.indexOf(['SUN', 'MON', 'TUE', 'WED', 'THU', 'FRI', 'SAT'][day.getDay()]) < 0)) {
-              return false
-            }
-
             return occurrenceISODate === dayISODate
           })
           cal[year][month][dayofmonth] = dayOccurrences

From e849ff6049540cfcaeddf510c6470fd2ab741fd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6nke=20K=C3=BCper?= <soenkekueper@gmx.de>
Date: Fri, 2 Apr 2021 18:16:21 +0200
Subject: [PATCH 2/3] Fixed ESLint
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Sönke Küper <soenkekueper@gmx.de>
---
 .../web/src/pages/settings/schedule/schedule.vue            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bundles/org.openhab.ui/web/src/pages/settings/schedule/schedule.vue b/bundles/org.openhab.ui/web/src/pages/settings/schedule/schedule.vue
index f413236b78..24298a9e9d 100644
--- a/bundles/org.openhab.ui/web/src/pages/settings/schedule/schedule.vue
+++ b/bundles/org.openhab.ui/web/src/pages/settings/schedule/schedule.vue
@@ -107,7 +107,7 @@ export default {
       if (this.loading) return
       this.loading = true
       let occurrences = []
-      
+
       let start = new Date(), limit = new Date()
       limit.setDate(start.getDate() + 31)
 
@@ -118,9 +118,9 @@ export default {
 
         // map RulesExecutions per time
         this.rules.forEach((rule) => {
-            occurrences.push([new Date(rule.date).toISOString(), rule.rule])
+          occurrences.push([new Date(rule.date).toISOString(), rule.rule])
         })
-        
+
         this.$set(this, 'calendar', {})
 
         let day = start

From 2643e2c63174fd790dcc96cb3674afdad6b571a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6nke=20K=C3=BCper?= <soenkekueper@gmx.de>
Date: Wed, 7 Apr 2021 17:44:30 +0200
Subject: [PATCH 3/3] #2044: Adjusted rest endpoint.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Sönke Küper <soenkekueper@gmx.de>
---
 .../org.openhab.ui/web/src/pages/settings/schedule/schedule.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.openhab.ui/web/src/pages/settings/schedule/schedule.vue b/bundles/org.openhab.ui/web/src/pages/settings/schedule/schedule.vue
index 24298a9e9d..59e9858444 100644
--- a/bundles/org.openhab.ui/web/src/pages/settings/schedule/schedule.vue
+++ b/bundles/org.openhab.ui/web/src/pages/settings/schedule/schedule.vue
@@ -111,7 +111,7 @@ export default {
       let start = new Date(), limit = new Date()
       limit.setDate(start.getDate() + 31)
 
-      this.$oh.api.get('/rest/rules/simulation?from=' + start.toISOString() + '&until=' + limit.toISOString()).then(data => {
+      this.$oh.api.get('/rest/rules/schedule/simulations?from=' + start.toISOString() + '&until=' + limit.toISOString()).then(data => {
         this.rules = data
         this.initSearchbar = true
         this.loading = false