From c41aa384dd142d0bc080a36df1cdcd2520e80655 Mon Sep 17 00:00:00 2001
From: Florian Hotze <florianh_dev@icloud.com>
Date: Tue, 12 Mar 2024 23:21:03 +0100
Subject: [PATCH] Fix dirty warning shown on delete (#2470)

Fixes #2462.

Signed-off-by: Florian Hotze <florianh_dev@icloud.com>
---
 .../web/src/pages/settings/persistence/persistence-edit.vue     | 1 +
 .../org.openhab.ui/web/src/pages/settings/rules/rule-edit.vue   | 1 +
 .../web/src/pages/settings/rules/scene/scene-edit.vue           | 2 +-
 .../web/src/pages/settings/rules/script/script-edit.vue         | 1 +
 .../web/src/pages/settings/things/thing-details.vue             | 1 +
 .../src/pages/settings/transformations/transformation-edit.vue  | 1 +
 6 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/bundles/org.openhab.ui/web/src/pages/settings/persistence/persistence-edit.vue b/bundles/org.openhab.ui/web/src/pages/settings/persistence/persistence-edit.vue
index bc458f8219..c7c536e225 100644
--- a/bundles/org.openhab.ui/web/src/pages/settings/persistence/persistence-edit.vue
+++ b/bundles/org.openhab.ui/web/src/pages/settings/persistence/persistence-edit.vue
@@ -387,6 +387,7 @@ export default {
         'Delete persistence configuration',
         () => {
           this.$oh.api.delete('/rest/persistence/' + this.serviceId).then(() => {
+            this.dirty = false
             this.$f7router.back({ force: true })
           })
         }
diff --git a/bundles/org.openhab.ui/web/src/pages/settings/rules/rule-edit.vue b/bundles/org.openhab.ui/web/src/pages/settings/rules/rule-edit.vue
index 1714e877ac..a219fe9f5b 100644
--- a/bundles/org.openhab.ui/web/src/pages/settings/rules/rule-edit.vue
+++ b/bundles/org.openhab.ui/web/src/pages/settings/rules/rule-edit.vue
@@ -407,6 +407,7 @@ export default {
         'Delete Rule',
         () => {
           this.$oh.api.delete('/rest/rules/' + this.rule.uid).then(() => {
+            this.dirty = false
             this.$f7router.back('/settings/rules/', { force: true })
           })
         }
diff --git a/bundles/org.openhab.ui/web/src/pages/settings/rules/scene/scene-edit.vue b/bundles/org.openhab.ui/web/src/pages/settings/rules/scene/scene-edit.vue
index ab06debd50..1d988fa0a2 100644
--- a/bundles/org.openhab.ui/web/src/pages/settings/rules/scene/scene-edit.vue
+++ b/bundles/org.openhab.ui/web/src/pages/settings/rules/scene/scene-edit.vue
@@ -373,6 +373,7 @@ export default {
         'Delete Scene',
         () => {
           this.$oh.api.delete('/rest/rules/' + this.rule.uid).then(() => {
+            this.dirty = false
             this.$f7router.back('/settings/scenes/', { force: true })
           })
         }
@@ -441,7 +442,6 @@ export default {
       this.$set(this.rule, section, newSection)
     },
     buildActionModules () {
-      const currentItemNames = this.rule.actions.map((a) => a.configuration.itemName)
       const modulesToRemove = this.rule.actions.filter((a) => this.selectedItems.indexOf(a.configuration.itemName) < 0)
       if (modulesToRemove.length > 0) console.debug('Removing: ' + modulesToRemove.map((m) => m.configuration.itemName).join(', '))
       this.$set(this.rule, 'actions', this.rule.actions.filter((a) => this.selectedItems.indexOf(a.configuration.itemName) >= 0))
diff --git a/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-edit.vue b/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-edit.vue
index b7bbf2a67f..0d332b9913 100644
--- a/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-edit.vue
+++ b/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-edit.vue
@@ -536,6 +536,7 @@ export default {
         'Delete ' + (this.isScriptRule ? 'Script' : 'Rule'),
         () => {
           this.$oh.api.delete('/rest/rules/' + this.rule.uid).then(() => {
+            this.dirty = false
             this.$f7router.back('/settings/scripts/', { force: true })
           })
         }
diff --git a/bundles/org.openhab.ui/web/src/pages/settings/things/thing-details.vue b/bundles/org.openhab.ui/web/src/pages/settings/things/thing-details.vue
index 848fb6d2ef..cc330fc657 100644
--- a/bundles/org.openhab.ui/web/src/pages/settings/things/thing-details.vue
+++ b/bundles/org.openhab.ui/web/src/pages/settings/things/thing-details.vue
@@ -593,6 +593,7 @@ export default {
         'Delete Thing',
         () => {
           this.$oh.api.delete(url).then(() => {
+            this.dirty = false
             this.$f7router.back('/settings/things/', { force: true })
           })
         }
diff --git a/bundles/org.openhab.ui/web/src/pages/settings/transformations/transformation-edit.vue b/bundles/org.openhab.ui/web/src/pages/settings/transformations/transformation-edit.vue
index be228cbb21..ad0852bb0d 100644
--- a/bundles/org.openhab.ui/web/src/pages/settings/transformations/transformation-edit.vue
+++ b/bundles/org.openhab.ui/web/src/pages/settings/transformations/transformation-edit.vue
@@ -236,6 +236,7 @@ export default {
         'Delete Transformation',
         () => {
           this.$oh.api.delete('/rest/transformations/' + this.transformation.uid).then(() => {
+            this.dirty = false
             this.$f7router.back('/settings/transformations/', { force: true })
           })
         }