From b6e8d2f21e05e2b27411cc32f54a983ebe2fbb02 Mon Sep 17 00:00:00 2001
From: jgeorgi <justin.georgi@gmail.com>
Date: Tue, 11 Jul 2023 22:01:18 -0700
Subject: [PATCH 1/3] Add cacheSource repeater property

Signed-off-by: jgeorgi <justin.georgi@gmail.com>
---
 .../doc/components/oh-repeater.md             |  5 ++
 .../definitions/widgets/system/repeater.js    |  3 +-
 .../components/widgets/system/oh-repeater.vue | 58 +++++++------------
 3 files changed, 27 insertions(+), 39 deletions(-)

diff --git a/bundles/org.openhab.ui/doc/components/oh-repeater.md b/bundles/org.openhab.ui/doc/components/oh-repeater.md
index 7a406f122a..4db3e1d35a 100644
--- a/bundles/org.openhab.ui/doc/components/oh-repeater.md
+++ b/bundles/org.openhab.ui/doc/components/oh-repeater.md
@@ -122,6 +122,11 @@ Iterate over an array and repeat the children components in the default slot
     Render all children directly under the repeater's parent, without any container
   </PropDescription>
 </PropBlock>
+<PropBlock type="BOOLEAN" name="cacheSource" label="Suppress source refresh">
+  <PropDescription>
+    The source array will be cached and not refreshed on page updates
+  </PropDescription>
+</PropBlock>
 </PropGroup>
 </div>
 
diff --git a/bundles/org.openhab.ui/web/src/assets/definitions/widgets/system/repeater.js b/bundles/org.openhab.ui/web/src/assets/definitions/widgets/system/repeater.js
index 8d650f5282..6715a59768 100644
--- a/bundles/org.openhab.ui/web/src/assets/definitions/widgets/system/repeater.js
+++ b/bundles/org.openhab.ui/web/src/assets/definitions/widgets/system/repeater.js
@@ -27,5 +27,6 @@ export default () => [
   pb('listContainer', 'List container', 'The child components will be wrapped in a <code>ul</code> HTML elements instead of a <code>div</code>'),
   pt('containerClasses', 'Classes of the container', 'Add these CSS classes to the container'),
   pt('containerStyle', 'Styles of the container', 'Add these CSS styles to the container'),
-  pb('fragment', 'No container (fragment)', 'Render all children directly under the repeater\'s parent, without any container')
+  pb('fragment', 'No container (fragment)', 'Render all children directly under the repeater\'s parent, without any container'),
+  pb('cacheSource', 'Suppress source refresh', 'The source array will be cached and not refreshed on page updates')
 ]
diff --git a/bundles/org.openhab.ui/web/src/components/widgets/system/oh-repeater.vue b/bundles/org.openhab.ui/web/src/components/widgets/system/oh-repeater.vue
index 4997292258..97e94c394a 100644
--- a/bundles/org.openhab.ui/web/src/components/widgets/system/oh-repeater.vue
+++ b/bundles/org.openhab.ui/web/src/components/widgets/system/oh-repeater.vue
@@ -1,4 +1,4 @@
-<template v-if="ready">
+<template>
   <ul v-if="config.listContainer" :class="config.containerClasses" :style="config.containerStyle">
     <generic-widget-component :context="ctx" v-for="(ctx, idx) in childrenContexts" :key="'repeater-' + idx" @command="onCommand" />
   </ul>
@@ -22,15 +22,6 @@ export default {
     Fragment
   },
   widget: OhRepeaterDefinition,
-  data () {
-    return {
-      ready: false,
-      loadedSource: null
-    }
-  },
-  created () {
-    this.load()
-  },
   computed: {
     childrenContexts () {
       const iterationContext = (ctx, el, idx, source) => {
@@ -75,42 +66,33 @@ export default {
       }
 
       return contexts
-    },
-    source () {
-      if (this.loadedSource !== null) return this.loadedSource
-      switch (this.config.sourceType) {
-        case 'range':
-          const start = this.config.rangeStart || 0
-          const stop = this.config.rangeStop || 10
-          const step = this.config.rangeStep || 1
-          return Array(Math.ceil((stop + 1 - start) / step)).fill(start).map((x, y) => x + y * step)
-        default:
-          return this.config.in
-      }
     }
   },
-  methods: {
-    load () {
-      let loadPromise
-      if (this.config.sourceType === 'itemsWithTags' && this.config.itemTags) {
-        loadPromise = this.$oh.api.get('/rest/items?metadata=' + this.config.fetchMetadata + '&tags=' + this.config.itemTags).then((d) => Promise.resolve(d.sort(compareItems)))
+  asyncComputed: {
+    source () {
+      if (this.config.cacheSource && this.sourceCache) return this.sourceCache
+      let sourceResult
+      if (this.config.sourceType === 'range') {
+        const start = this.config.rangeStart || 0
+        const stop = this.config.rangeStop || 10
+        const step = this.config.rangeStep || 1
+        sourceResult = Promise.resolve(Array(Math.ceil((stop + 1 - start) / step)).fill(start).map((x, y) => x + y * step))
+      } else if (this.config.sourceType === 'itemsWithTags' && this.config.itemTags) {
+        sourceResult = this.$oh.api.get('/rest/items?metadata=' + this.config.fetchMetadata + '&tags=' + this.config.itemTags).then((d) => Promise.resolve(d.sort(compareItems)))
       } else if (this.config.sourceType === 'itemsInGroup') {
-        loadPromise = this.$oh.api.get('/rest/items/' + this.config.groupItem + '?metadata=' + this.config.fetchMetadata + '&tags=' + this.config.itemTags).then((i) => Promise.resolve(i.members.sort(compareItems)))
+        sourceResult = this.$oh.api.get('/rest/items/' + this.config.groupItem + '?metadata=' + this.config.fetchMetadata + '&tags=' + this.config.itemTags).then((i) => Promise.resolve(i.members.sort(compareItems)))
       } else if (this.config.sourceType === 'itemStateOptions') {
-        loadPromise = this.$oh.api.get('/rest/items/' + this.config.itemOptions).then((i) => Promise.resolve((i.stateDescription) ? i.stateDescription.options : []))
+        sourceResult = this.$oh.api.get('/rest/items/' + this.config.itemOptions).then((i) => Promise.resolve((i.stateDescription) ? i.stateDescription.options : []))
       } else if (this.config.sourceType === 'itemCommandOptions') {
-        loadPromise = this.$oh.api.get('/rest/items/' + this.config.itemOptions).then((i) => Promise.resolve((i.commandDescription) ? i.commandDescription.commandOptions : []))
+        sourceResult = this.$oh.api.get('/rest/items/' + this.config.itemOptions).then((i) => Promise.resolve((i.commandDescription) ? i.commandDescription.commandOptions : []))
       } else if (this.config.sourceType === 'rulesWithTags' && this.config.ruleTags) {
-        loadPromise = this.$oh.api.get('/rest/rules?summary=true' + '&tags=' + this.config.ruleTags).then((r) => Promise.resolve(r.sort(compareRules)))
+        sourceResult = this.$oh.api.get('/rest/rules?summary=true' + '&tags=' + this.config.ruleTags).then((r) => Promise.resolve(r.sort(compareRules)))
       } else {
-        this.ready = true
-        return
+        sourceResult = Promise.resolve(this.config.in)
       }
-      loadPromise.then((d) => {
-        this.loadedSource = d
-        this.ready = true
-      })
+      this.sourceCache = (this.config.cacheSource) ? sourceResult : null
+      return sourceResult
     }
   }
 }
-</script>
+</script>
\ No newline at end of file

From 81894298b6e8f4476ea7fb9c79b92ef15d44e547 Mon Sep 17 00:00:00 2001
From: jgeorgi <justin.georgi@gmail.com>
Date: Thu, 13 Jul 2023 18:13:41 -0700
Subject: [PATCH 2/3] Cache only  loaded repeater sources

Signed-off-by: jgeorgi <justin.georgi@gmail.com>
---
 bundles/org.openhab.ui/doc/components/oh-repeater.md  |  2 +-
 .../src/assets/definitions/widgets/system/repeater.js |  2 +-
 .../web/src/components/widgets/system/oh-repeater.vue | 11 ++++++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/bundles/org.openhab.ui/doc/components/oh-repeater.md b/bundles/org.openhab.ui/doc/components/oh-repeater.md
index 4db3e1d35a..b246d58c95 100644
--- a/bundles/org.openhab.ui/doc/components/oh-repeater.md
+++ b/bundles/org.openhab.ui/doc/components/oh-repeater.md
@@ -124,7 +124,7 @@ Iterate over an array and repeat the children components in the default slot
 </PropBlock>
 <PropBlock type="BOOLEAN" name="cacheSource" label="Suppress source refresh">
   <PropDescription>
-    The source array will be cached and not refreshed on page updates
+    For loaded sources (e.g. with Items or rules), the source array will be cached and not refreshed on page updates
   </PropDescription>
 </PropBlock>
 </PropGroup>
diff --git a/bundles/org.openhab.ui/web/src/assets/definitions/widgets/system/repeater.js b/bundles/org.openhab.ui/web/src/assets/definitions/widgets/system/repeater.js
index 6715a59768..bb156793f6 100644
--- a/bundles/org.openhab.ui/web/src/assets/definitions/widgets/system/repeater.js
+++ b/bundles/org.openhab.ui/web/src/assets/definitions/widgets/system/repeater.js
@@ -28,5 +28,5 @@ export default () => [
   pt('containerClasses', 'Classes of the container', 'Add these CSS classes to the container'),
   pt('containerStyle', 'Styles of the container', 'Add these CSS styles to the container'),
   pb('fragment', 'No container (fragment)', 'Render all children directly under the repeater\'s parent, without any container'),
-  pb('cacheSource', 'Suppress source refresh', 'The source array will be cached and not refreshed on page updates')
+  pb('cacheSource', 'Suppress source refresh', 'For loaded sources (e.g. with Items or rules), the source array will be cached and not refreshed on page updates')
 ]
diff --git a/bundles/org.openhab.ui/web/src/components/widgets/system/oh-repeater.vue b/bundles/org.openhab.ui/web/src/components/widgets/system/oh-repeater.vue
index 97e94c394a..64beab4132 100644
--- a/bundles/org.openhab.ui/web/src/components/widgets/system/oh-repeater.vue
+++ b/bundles/org.openhab.ui/web/src/components/widgets/system/oh-repeater.vue
@@ -22,6 +22,11 @@ export default {
     Fragment
   },
   widget: OhRepeaterDefinition,
+  data () {
+    return {
+      sourceCache: null
+    }
+  },
   computed: {
     childrenContexts () {
       const iterationContext = (ctx, el, idx, source) => {
@@ -70,7 +75,6 @@ export default {
   },
   asyncComputed: {
     source () {
-      if (this.config.cacheSource && this.sourceCache) return this.sourceCache
       let sourceResult
       if (this.config.sourceType === 'range') {
         const start = this.config.rangeStart || 0
@@ -78,14 +82,19 @@ export default {
         const step = this.config.rangeStep || 1
         sourceResult = Promise.resolve(Array(Math.ceil((stop + 1 - start) / step)).fill(start).map((x, y) => x + y * step))
       } else if (this.config.sourceType === 'itemsWithTags' && this.config.itemTags) {
+        if (this.config.cacheSource && this.sourceCache) return this.sourceCache
         sourceResult = this.$oh.api.get('/rest/items?metadata=' + this.config.fetchMetadata + '&tags=' + this.config.itemTags).then((d) => Promise.resolve(d.sort(compareItems)))
       } else if (this.config.sourceType === 'itemsInGroup') {
+        if (this.config.cacheSource && this.sourceCache) return this.sourceCache
         sourceResult = this.$oh.api.get('/rest/items/' + this.config.groupItem + '?metadata=' + this.config.fetchMetadata + '&tags=' + this.config.itemTags).then((i) => Promise.resolve(i.members.sort(compareItems)))
       } else if (this.config.sourceType === 'itemStateOptions') {
+        if (this.config.cacheSource && this.sourceCache) return this.sourceCache
         sourceResult = this.$oh.api.get('/rest/items/' + this.config.itemOptions).then((i) => Promise.resolve((i.stateDescription) ? i.stateDescription.options : []))
       } else if (this.config.sourceType === 'itemCommandOptions') {
+        if (this.config.cacheSource && this.sourceCache) return this.sourceCache
         sourceResult = this.$oh.api.get('/rest/items/' + this.config.itemOptions).then((i) => Promise.resolve((i.commandDescription) ? i.commandDescription.commandOptions : []))
       } else if (this.config.sourceType === 'rulesWithTags' && this.config.ruleTags) {
+        if (this.config.cacheSource && this.sourceCache) return this.sourceCache
         sourceResult = this.$oh.api.get('/rest/rules?summary=true' + '&tags=' + this.config.ruleTags).then((r) => Promise.resolve(r.sort(compareRules)))
       } else {
         sourceResult = Promise.resolve(this.config.in)

From 44780c16eb6f04bcf97198116fcfe2bac92b1afc Mon Sep 17 00:00:00 2001
From: jgeorgi <justin.georgi@gmail.com>
Date: Fri, 14 Jul 2023 10:52:02 -0700
Subject: [PATCH 3/3] Refactor repeater caching

Signed-off-by: jgeorgi <justin.georgi@gmail.com>
---
 .../src/components/widgets/system/oh-repeater.vue    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bundles/org.openhab.ui/web/src/components/widgets/system/oh-repeater.vue b/bundles/org.openhab.ui/web/src/components/widgets/system/oh-repeater.vue
index 64beab4132..6a189c5f81 100644
--- a/bundles/org.openhab.ui/web/src/components/widgets/system/oh-repeater.vue
+++ b/bundles/org.openhab.ui/web/src/components/widgets/system/oh-repeater.vue
@@ -75,6 +75,7 @@ export default {
   },
   asyncComputed: {
     source () {
+      if (this.config.cacheSource && this.sourceCache) return this.sourceCache
       let sourceResult
       if (this.config.sourceType === 'range') {
         const start = this.config.rangeStart || 0
@@ -82,24 +83,23 @@ export default {
         const step = this.config.rangeStep || 1
         sourceResult = Promise.resolve(Array(Math.ceil((stop + 1 - start) / step)).fill(start).map((x, y) => x + y * step))
       } else if (this.config.sourceType === 'itemsWithTags' && this.config.itemTags) {
-        if (this.config.cacheSource && this.sourceCache) return this.sourceCache
         sourceResult = this.$oh.api.get('/rest/items?metadata=' + this.config.fetchMetadata + '&tags=' + this.config.itemTags).then((d) => Promise.resolve(d.sort(compareItems)))
+        this.sourceCache = (this.config.cacheSource) ? sourceResult : null
       } else if (this.config.sourceType === 'itemsInGroup') {
-        if (this.config.cacheSource && this.sourceCache) return this.sourceCache
         sourceResult = this.$oh.api.get('/rest/items/' + this.config.groupItem + '?metadata=' + this.config.fetchMetadata + '&tags=' + this.config.itemTags).then((i) => Promise.resolve(i.members.sort(compareItems)))
+        this.sourceCache = (this.config.cacheSource) ? sourceResult : null
       } else if (this.config.sourceType === 'itemStateOptions') {
-        if (this.config.cacheSource && this.sourceCache) return this.sourceCache
         sourceResult = this.$oh.api.get('/rest/items/' + this.config.itemOptions).then((i) => Promise.resolve((i.stateDescription) ? i.stateDescription.options : []))
+        this.sourceCache = (this.config.cacheSource) ? sourceResult : null
       } else if (this.config.sourceType === 'itemCommandOptions') {
-        if (this.config.cacheSource && this.sourceCache) return this.sourceCache
         sourceResult = this.$oh.api.get('/rest/items/' + this.config.itemOptions).then((i) => Promise.resolve((i.commandDescription) ? i.commandDescription.commandOptions : []))
+        this.sourceCache = (this.config.cacheSource) ? sourceResult : null
       } else if (this.config.sourceType === 'rulesWithTags' && this.config.ruleTags) {
-        if (this.config.cacheSource && this.sourceCache) return this.sourceCache
         sourceResult = this.$oh.api.get('/rest/rules?summary=true' + '&tags=' + this.config.ruleTags).then((r) => Promise.resolve(r.sort(compareRules)))
+        this.sourceCache = (this.config.cacheSource) ? sourceResult : null
       } else {
         sourceResult = Promise.resolve(this.config.in)
       }
-      this.sourceCache = (this.config.cacheSource) ? sourceResult : null
       return sourceResult
     }
   }