From: Jo-Philipp Wich <jo@mein.io>
Date: Fri, 22 Jul 2022 21:41:05 +0000 (+0200)
Subject: luci-base: form.js: fix removing just created named GridSection
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1e7d9e4461ac5965aedcc8ccf7e48627d07e46ac;p=project%2Fluci.git

luci-base: form.js: fix removing just created named GridSection

Since the `handleModalSave()` handler of the GridSection class invokes
`handleModalCancel()` after saving the data but before removing the
`addedSection` property, the `handleModalCancel` handler incorrectly
removed the uci section that has just been created.

This bug didn't affect anonymous GridSections because after saving the
id of the created section changes, causing the remove command to fail,
but for named ones with stable section IDs, the bug manifested.

Solve the issue by passing a flag to `handleModalCancel()` indicating
whether the method was called from a safe operation and use it do
decide whether to delete the new staged uci section or not.

Fixes: #5760
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 2771360108cb3e2011c7c9cb4921a9047ea70910)
---

diff --git a/modules/luci-base/htdocs/luci-static/resources/form.js b/modules/luci-base/htdocs/luci-static/resources/form.js
index c17f8ff0ca..54bc3d4fc5 100644
--- a/modules/luci-base/htdocs/luci-static/resources/form.js
+++ b/modules/luci-base/htdocs/luci-static/resources/form.js
@@ -3032,7 +3032,7 @@ var CBITableSection = CBITypedSection.extend(/** @lends LuCI.form.TableSection.p
 		}
 
 		return saveTasks
-			.then(L.bind(this.handleModalCancel, this, modalMap, ev))
+			.then(L.bind(this.handleModalCancel, this, modalMap, ev, true))
 			.catch(function() {});
 	},
 
@@ -3313,20 +3313,19 @@ var CBIGridSection = CBITableSection.extend(/** @lends LuCI.form.GridSection.pro
 		var mapNode = this.getPreviousModalMap(),
 		    prevMap = mapNode ? dom.findClassInstance(mapNode) : this.map;
 
-		return this.super('handleModalSave', arguments)
-			.then(function() { delete prevMap.addedSection });
+		return this.super('handleModalSave', arguments);
 	},
 
 	/** @private */
-	handleModalCancel: function(/* ... */) {
+	handleModalCancel: function(modalMap, ev, isSaving) {
 		var config_name = this.uciconfig || this.map.config,
 		    mapNode = this.getPreviousModalMap(),
 		    prevMap = mapNode ? dom.findClassInstance(mapNode) : this.map;
 
-		if (prevMap.addedSection != null) {
+		if (prevMap.addedSection != null && !isSaving)
 			this.map.data.remove(config_name, prevMap.addedSection);
-			delete prevMap.addedSection;
-		}
+
+		delete prevMap.addedSection;
 
 		return this.super('handleModalCancel', arguments);
 	},