From f0c7f3da4b735be965936dcc55da25a794aae4bb Mon Sep 17 00:00:00 2001
From: Alexander Vokin <setvvgamer@gmail.com>
Date: Fri, 27 Dec 2024 12:13:08 +0800
Subject: [PATCH 1/7] experiments with children

---
 src/scripts/Sitemap.js | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/scripts/Sitemap.js b/src/scripts/Sitemap.js
index d71a9d6d..c6a7f724 100644
--- a/src/scripts/Sitemap.js
+++ b/src/scripts/Sitemap.js
@@ -156,9 +156,23 @@ export default class Sitemap {
 		// selector is undefined when creating a new one and delete old one, if it exist
 		if (selector === undefined || selector.type !== selectorData.type) {
 			if (selector) {
-				this.deleteSelector(selector);
+				if (selector.canHaveChildSelectors()) {
+					const children = this.selectors.filter(selectorFromList =>
+						selectorFromList.parentSelectors.includes(selector.uuid)
+					);
+					const newSelector = SelectorList.createSelector(selectorData);
+					children.forEach(child => {
+						const parentUuidIndex = child.parentSelectors.indexOf(selector.uuid);
+						console.log(child.parentSelector);
+						child.parentSelector[parentUuidIndex] = newSelector.uuid;
+					});
+					selector = newSelector;
+				} else {
+					this.deleteSelector(selector);
+				}
+			} else {
+				selector = SelectorList.createSelector(selectorData);
 			}
-			selector = SelectorList.createSelector(selectorData);
 		}
 
 		// update child selectors

From 7b6412ec52bf3a18766e539666571bc4bb075a4d Mon Sep 17 00:00:00 2001
From: Alexander Vokin <setvvgamer@gmail.com>
Date: Fri, 27 Dec 2024 12:39:55 +0800
Subject: [PATCH 2/7] bug fix for updateSelector func

---
 src/scripts/Sitemap.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/scripts/Sitemap.js b/src/scripts/Sitemap.js
index c6a7f724..6cb4dc24 100644
--- a/src/scripts/Sitemap.js
+++ b/src/scripts/Sitemap.js
@@ -157,18 +157,19 @@ export default class Sitemap {
 		if (selector === undefined || selector.type !== selectorData.type) {
 			if (selector) {
 				if (selector.canHaveChildSelectors()) {
+					//custom logic: we don’t delete children, but redefined them a parent
 					const children = this.selectors.filter(selectorFromList =>
 						selectorFromList.parentSelectors.includes(selector.uuid)
 					);
 					const newSelector = SelectorList.createSelector(selectorData);
 					children.forEach(child => {
 						const parentUuidIndex = child.parentSelectors.indexOf(selector.uuid);
-						console.log(child.parentSelector);
-						child.parentSelector[parentUuidIndex] = newSelector.uuid;
+						child.parentSelectors[parentUuidIndex] = newSelector.uuid;
 					});
 					selector = newSelector;
 				} else {
 					this.deleteSelector(selector);
+					selector = SelectorList.createSelector(selectorData);
 				}
 			} else {
 				selector = SelectorList.createSelector(selectorData);

From a05cdda590cd09b922254c81c9a40ef73560e558 Mon Sep 17 00:00:00 2001
From: Alexander Vokin <setvvgamer@gmail.com>
Date: Fri, 31 Jan 2025 17:33:40 +0800
Subject: [PATCH 3/7] add modal dialog window for update selector

---
 src/_locales/en/messages.json | 12 +++++++
 src/scripts/Controller.js     | 67 ++++++++++++++++++++++++++++++++++-
 src/scripts/Sitemap.js        |  8 +++--
 3 files changed, 84 insertions(+), 3 deletions(-)

diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index b2da4b8c..2c88bbde 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -355,13 +355,25 @@
 	"modal_confirm_action_title_delete_selector": {
 		"message": "Are you sure you want to delete selector <span id='modal-selector-id'></span>?"
 	},
+	"modal_confirm_action_title_update_selector": {
+		"message": "Новый тип селектора не поддерживает дочерние селекторы. Удалить существующие дочерние селекторы?"
+	},
+	"modal_confirm_action_title_update_selector_can_have_child": {
+		"message": "Новый тип селектора поддерживает дочерние селекторы. Удалить или сохранить существующие дочерние селекторы?"
+	},
 	"modal_confirm_action_title_delete_sitemap": {
 		"message": "Are you sure you want to delete sitemap <span id='modal-sitemap-id'></span>?"
 	},
 	"modal_confirm_action_message_delete_selector": {
 		"message": "The following selectors will be removed (<span id='modal-child-count'></span> obj):"
 	},
+	"modal_confirm_action_message_update_selector": {
+		"message": "Дочерние селекторы (<span id='modal-child-count'></span> obj):"
+	},
 	"modal_confirm_action_submit_delete_selector": { "message": "Confirm" },
+	"modal_confirm_action_submit_update_selector": { "message": "Удалить селекторы" },
+	"modal_confirm_action_submit_update_save_selector": { "message": "Сохранить селекторы" },
+	"modal_confirm_action_cancel_update_selector": { "message": "Cancel" },
 	"modal_confirm_action_cancel_delete_selector": { "message": "Cancel" },
 	"modal_confirm_action_submit_delete_sitemap": { "message": "Confirm" },
 	"modal_confirm_action_cancel_delete_sitemap": { "message": "Cancel" },
diff --git a/src/scripts/Controller.js b/src/scripts/Controller.js
index 00215e25..09b44b3d 100644
--- a/src/scripts/Controller.js
+++ b/src/scripts/Controller.js
@@ -199,6 +199,12 @@ export default class SitemapController {
 			'.delete_selector_submit': {
 				click: this.confirmDeleteSelector,
 			},
+			'.update_selector_submit': {
+				click: this.confirmDeleteChildSelectors,
+			},
+			'#modal-save-child-selectors': {
+				click: this.confirmSaveChildSelectors,
+			},
 			'.delete_sitemap_submit': {
 				click: this.confirmDeleteSitemap,
 			},
@@ -1384,6 +1390,38 @@ export default class SitemapController {
 		const validator = this.getFormValidator();
 		validator.revalidateField('id');
 		// cancel submit if invalid form
+		if (selector.canHaveChildSelectors()) {
+			const children = sitemap.selectors.filter(selectorFromList =>
+				selectorFromList.parentSelectors.includes(selector.uuid)
+			);
+			if (children.length > 0) {
+				this.initConfirmActionPanel({ action: 'update_selector' });
+				if (newSelector.canHaveChildSelectors()) {
+					const saveSelectorsBtn = $('<button/>', {
+						class: 'btn btn-primary',
+						id: 'modal-save-child-selectors',
+						text: Translator.getTranslationByKey(
+							'modal_confirm_action_submit_update_save_selector'
+						),
+					});
+					$('.modal-footer').append(saveSelectorsBtn);
+					$('#modal-title').text(
+						Translator.getTranslationByKey(
+							'modal_confirm_action_title_update_selector_can_have_child'
+						)
+					);
+				}
+				$('#modal-child-count').text(children.length);
+				$('#modal-message').after('<ul id="list-deleted-children"></ul>');
+				children.forEach(child => {
+					const $child = $('<li></li>');
+					$child.text(`#${child.uuid} ${child.id}`);
+					$('#list-deleted-children').append($child);
+				});
+				$('#modal-message').show();
+				return true;
+			}
+		}
 		if (!this.isValidForm()) {
 			return false;
 		}
@@ -1402,7 +1440,34 @@ export default class SitemapController {
 			this.showSitemapSelectorList();
 		}
 	}
-
+	async confirmSaveChildSelectors(button) {
+		const sitemap = this.state.currentSitemap;
+		const selector = this.state.currentSelector;
+		const newSelector = this.getCurrentlyEditedSelector();
+		try {
+			sitemap.updateSelector(selector, newSelector, true);
+			await this.store.saveSitemap(sitemap, undefined, this.getCurrentProjectId());
+		} catch (err) {
+			console.error(err);
+		} finally {
+			this.showSitemapSelectorList();
+		}
+		$('#confirm-action-modal').modal('hide');
+	}
+	async confirmDeleteChildSelectors(button) {
+		const sitemap = this.state.currentSitemap;
+		const selector = this.state.currentSelector;
+		const newSelector = this.getCurrentlyEditedSelector();
+		try {
+			sitemap.updateSelector(selector, newSelector, false);
+			await this.store.saveSitemap(sitemap, undefined, this.getCurrentProjectId());
+		} catch (err) {
+			console.error(err);
+		} finally {
+			this.showSitemapSelectorList();
+		}
+		$('#confirm-action-modal').modal('hide');
+	}
 	/**
 	 * Get selector from selector editing form
 	 */
diff --git a/src/scripts/Sitemap.js b/src/scripts/Sitemap.js
index 6cb4dc24..ac524693 100644
--- a/src/scripts/Sitemap.js
+++ b/src/scripts/Sitemap.js
@@ -152,11 +152,15 @@ export default class Sitemap {
 		return urls;
 	}
 
-	updateSelector(selector, selectorData) {
+	updateSelector(selector, selectorData, saveChildSelectors = false) {
 		// selector is undefined when creating a new one and delete old one, if it exist
 		if (selector === undefined || selector.type !== selectorData.type) {
 			if (selector) {
-				if (selector.canHaveChildSelectors()) {
+				if (
+					selector.canHaveChildSelectors() &&
+					selectorData.canHaveChildSelectors() &&
+					saveChildSelectors
+				) {
 					//custom logic: we don’t delete children, but redefined them a parent
 					const children = this.selectors.filter(selectorFromList =>
 						selectorFromList.parentSelectors.includes(selector.uuid)

From 3e966a396c06362cfde4f9731db09ca83929db51 Mon Sep 17 00:00:00 2001
From: Alexander Vokin <setvvgamer@gmail.com>
Date: Fri, 31 Jan 2025 17:40:09 +0800
Subject: [PATCH 4/7] locales fix

---
 src/_locales/en/messages.json | 10 +++++-----
 src/_locales/ru/messages.json | 13 +++++++++++++
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index 2c88bbde..2f38280b 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -356,10 +356,10 @@
 		"message": "Are you sure you want to delete selector <span id='modal-selector-id'></span>?"
 	},
 	"modal_confirm_action_title_update_selector": {
-		"message": "Новый тип селектора не поддерживает дочерние селекторы. Удалить существующие дочерние селекторы?"
+		"message": "The new selector type does not support additional selectors. Remove additional child selectors?"
 	},
 	"modal_confirm_action_title_update_selector_can_have_child": {
-		"message": "Новый тип селектора поддерживает дочерние селекторы. Удалить или сохранить существующие дочерние селекторы?"
+		"message": "The new selector type supports child selectors. Remove or keep existing child selectors?"
 	},
 	"modal_confirm_action_title_delete_sitemap": {
 		"message": "Are you sure you want to delete sitemap <span id='modal-sitemap-id'></span>?"
@@ -368,11 +368,11 @@
 		"message": "The following selectors will be removed (<span id='modal-child-count'></span> obj):"
 	},
 	"modal_confirm_action_message_update_selector": {
-		"message": "Дочерние селекторы (<span id='modal-child-count'></span> obj):"
+		"message": "Child selectors (<span id='modal-child-count'></span> obj):"
 	},
 	"modal_confirm_action_submit_delete_selector": { "message": "Confirm" },
-	"modal_confirm_action_submit_update_selector": { "message": "Удалить селекторы" },
-	"modal_confirm_action_submit_update_save_selector": { "message": "Сохранить селекторы" },
+	"modal_confirm_action_submit_update_selector": { "message": "Delete selectors" },
+	"modal_confirm_action_submit_update_save_selector": { "message": "Save selectors" },
 	"modal_confirm_action_cancel_update_selector": { "message": "Cancel" },
 	"modal_confirm_action_cancel_delete_selector": { "message": "Cancel" },
 	"modal_confirm_action_submit_delete_sitemap": { "message": "Confirm" },
diff --git a/src/_locales/ru/messages.json b/src/_locales/ru/messages.json
index cade54ff..48728a7a 100644
--- a/src/_locales/ru/messages.json
+++ b/src/_locales/ru/messages.json
@@ -395,6 +395,19 @@
 	"modal_confirm_action_message_delete_selector": {
 		"message": "Будут удалены следующие селекторы (<span id='modal-child-count'></span> шт.):"
 	},
+	"modal_confirm_action_message_update_selector": {
+		"message": "Дочерние селекторы (<span id='modal-child-count'></span> obj):"
+	},
+	"modal_confirm_action_title_update_selector": {
+		"message": "Новый тип селектора не поддерживает дочерние селекторы. Удалить существующие дочерние селекторы?"
+	},
+	"modal_confirm_action_title_update_selector_can_have_child": {
+		"message": "Новый тип селектора поддерживает дочерние селекторы. Удалить или сохранить существующие дочерние селекторы?"
+	},
+	"modal_confirm_action_submit_update_selector": { "message": "Удалить селекторы" },
+	"modal_confirm_action_submit_update_save_selector": { "message": "Сохранить селекторы" },
+	"modal_confirm_action_cancel_update_selector": { "message": "Отмена" },
+
 	"modal_confirm_action_submit_delete_selector": { "message": "Подтвердить" },
 	"modal_confirm_action_cancel_delete_selector": { "message": "Отмена" },
 	"modal_confirm_action_submit_delete_sitemap": { "message": "Подтвердить" },

From 47149645f5082bf6c502600641e35b8ae9bbbb8c Mon Sep 17 00:00:00 2001
From: Alexander Vokin <setvvgamer@gmail.com>
Date: Fri, 31 Jan 2025 20:45:20 +0800
Subject: [PATCH 5/7] update version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 03c39808..ac267909 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "web-scraper-chrome-extension",
-	"version": "0.5.1",
+	"version": "0.5.2",
 	"description": "Web data extraction tool implemented as chrome extension",
 	"scripts": {
 		"lint": "eslint --ext .js src",

From 035104547da4fb9f61e7184f3b41d8608d48cf48 Mon Sep 17 00:00:00 2001
From: Alexander Vokin <setvvgamer@gmail.com>
Date: Mon, 3 Feb 2025 21:24:17 +0800
Subject: [PATCH 6/7] improves(fix for a situation when we don`t change
 selector type )

---
 src/scripts/Controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scripts/Controller.js b/src/scripts/Controller.js
index 3401da0c..330d24b3 100644
--- a/src/scripts/Controller.js
+++ b/src/scripts/Controller.js
@@ -1408,7 +1408,7 @@ export default class SitemapController {
 		const validator = this.getFormValidator();
 		validator.revalidateField('id');
 		// cancel submit if invalid form
-		if (selector.canHaveChildSelectors()) {
+		if (selector.type !== newSelector.type) {
 			const children = sitemap.selectors.filter(selectorFromList =>
 				selectorFromList.parentSelectors.includes(selector.uuid)
 			);

From d006ed2fc58af8cf8e8ad0770317ce41c16cf512 Mon Sep 17 00:00:00 2001
From: Alexander Vokin <setvvgamer@gmail.com>
Date: Tue, 4 Feb 2025 00:19:00 +0800
Subject: [PATCH 7/7] better code optimization

---
 src/scripts/Controller.js | 29 +++++++----------------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/src/scripts/Controller.js b/src/scripts/Controller.js
index 330d24b3..fc7e3bbf 100644
--- a/src/scripts/Controller.js
+++ b/src/scripts/Controller.js
@@ -1407,7 +1407,6 @@ export default class SitemapController {
 		const newSelector = this.getCurrentlyEditedSelector();
 		const validator = this.getFormValidator();
 		validator.revalidateField('id');
-		// cancel submit if invalid form
 		if (selector.type !== newSelector.type) {
 			const children = sitemap.selectors.filter(selectorFromList =>
 				selectorFromList.parentSelectors.includes(selector.uuid)
@@ -1449,41 +1448,27 @@ export default class SitemapController {
 		} catch (err) {
 			console.error(err);
 		}
-		try {
-			sitemap.updateSelector(selector, newSelector);
-			await this.store.saveSitemap(sitemap, undefined, this.getCurrentProjectId());
-		} catch (err) {
-			console.error(err);
-		} finally {
-			this.showSitemapSelectorList();
-		}
+		await this.updateSelector();
 	}
-	async confirmSaveChildSelectors(button) {
+	async updateSelector(saveChildSelectors = false) {
 		const sitemap = this.state.currentSitemap;
 		const selector = this.state.currentSelector;
 		const newSelector = this.getCurrentlyEditedSelector();
 		try {
-			sitemap.updateSelector(selector, newSelector, true);
+			sitemap.updateSelector(selector, newSelector, saveChildSelectors);
 			await this.store.saveSitemap(sitemap, undefined, this.getCurrentProjectId());
 		} catch (err) {
 			console.error(err);
 		} finally {
 			this.showSitemapSelectorList();
 		}
+	}
+	async confirmSaveChildSelectors(button) {
+		await this.updateSelector(true);
 		$('#confirm-action-modal').modal('hide');
 	}
 	async confirmDeleteChildSelectors(button) {
-		const sitemap = this.state.currentSitemap;
-		const selector = this.state.currentSelector;
-		const newSelector = this.getCurrentlyEditedSelector();
-		try {
-			sitemap.updateSelector(selector, newSelector, false);
-			await this.store.saveSitemap(sitemap, undefined, this.getCurrentProjectId());
-		} catch (err) {
-			console.error(err);
-		} finally {
-			this.showSitemapSelectorList();
-		}
+		await this.updateSelector(false);
 		$('#confirm-action-modal').modal('hide');
 	}
 	/**