copySitemapButton (#66)

* Added simple version of copyButton * Added confirm action to copySitemapButton with input field for id. Needed to insert validation of this field * Added input field for id. Also added validation of this field * Attempt to make a new algorithm * Fixed some problems. Worked version * Removed buttons from another branch * Working version, but with this.sitemap and this.selector * Unified modal-input-field * Renamed some functions * Updated version * Messages mistake fixed Co-authored-by: Alexander <[email protected]>
ispras · Jul 28, 2020 · 2797ad4 · 2797ad4
1 parent 8b9d046
commit 2797ad4
Show file tree

Hide file tree

Showing 6 changed files with 132 additions and 27 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "web-scraper-chrome-extension",
-	"version": "0.3.619",
+	"version": "0.3.7",
 	"description": "Web data extraction tool implemented as chrome extension",
 	"scripts": {
 		"lint": "eslint --ext .js src",

diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
@@ -285,5 +285,13 @@
 	"modal_confirm_action_submit_delete_selector": { "message": "Confirm" },
 	"modal_confirm_action_cancel_delete_selector": { "message": "Cancel" },
 	"modal_confirm_action_submit_delete_sitemap": { "message": "Confirm" },
-	"modal_confirm_action_cancel_delete_sitemap": { "message": "Cancel" }
+	"modal_confirm_action_cancel_delete_sitemap": { "message": "Cancel" },
+	"create_copy_sitemap": { "message": "Copy" },
+	"modal_confirm_action_submit_copy_sitemap": { "message": "Create sitemap" },
+	"modal_confirm_action_cancel_copy_sitemap": { "message": "Cancel" },
+	"modal_confirm_action_title_copy_sitemap": {
+		"message": "Copying sitemap <span id='modal-sitemap-id'></span>?"
+	},
+	"modal_confirm_action_message_copy_sitemap": { "message": "Sitemap name" },
+	"modal_confirm_action_input_copy_sitemap": { "message": "Sitemap name" }
 }
diff --git a/src/_locales/ru/messages.json b/src/_locales/ru/messages.json
@@ -317,5 +317,13 @@
 	"modal_confirm_action_submit_delete_selector": { "message": "Подтвердить" },
 	"modal_confirm_action_cancel_delete_selector": { "message": "Отмена" },
 	"modal_confirm_action_submit_delete_sitemap": { "message": "Подтвердить" },
-	"modal_confirm_action_cancel_delete_sitemap": { "message": "Отмена" }
+	"modal_confirm_action_cancel_delete_sitemap": { "message": "Отмена" },
+	"create_copy_sitemap": { "message": "Копировать" },
+	"modal_confirm_action_submit_copy_sitemap": { "message": "Создать карту обхода" },
+	"modal_confirm_action_cancel_copy_sitemap": { "message": "Отменить" },
+	"modal_confirm_action_title_copy_sitemap": {
+		"message": "Копирование карты <span id='modal-sitemap-id'></span>?"
+	},
+	"modal_confirm_action_message_copy_sitemap": { "message": "Идентификатор карты обхода" },
+	"modal_confirm_action_input_copy_sitemap": { "message": "Идентификатор карты обхода" }
 }
diff --git a/src/devtools/views/ActionConfirm.html b/src/devtools/views/ActionConfirm.html
@@ -1,4 +1,4 @@
-<div class="modal fade" id="confirm-action-modal">
+<div class="modal fade" role="form" id="confirm-action-modal">
 	<div class="modal-dialog">
 		<div class="modal-content">
 			<div class="modal-header">
@@ -10,8 +10,18 @@
 				<h5
 					id="modal-message"
 					data-i18n="modal_confirm_action_message_{{action}}"
-					hidden
+					style="display: none;"
 				></h5>
+				<form class="form-group">
+					<input
+						type="text"
+						class="form-control"
+						id="modal_confirm_action_input_{{action}}"
+						name="modal_confirm_action_input_{{action}}"
+						placeholder="modal_confirm_action_input_{{action}}"
+						style="display: none;"
+					/>
+				</form>
 			</div>
 			<div class="modal-footer">
 				<button
@@ -21,7 +31,7 @@
 					data-dismiss="modal"
 				></button>
 				<button
-					class="btn btn-primary"
+					class="btn btn-primary {{action}}_submit"
 					id="modal-submit"
 					data-i18n="modal_confirm_action_submit_{{action}}"
 				></button>

diff --git a/src/devtools/views/SitemapListItem.html b/src/devtools/views/SitemapListItem.html
@@ -17,6 +17,12 @@
 				class="btn btn-primary btn-xs"
 				data-i18n="delete_sitemap"
 			></button>
+			<button
+				action="create-copy-sitemap"
+				type="button"
+				class="btn btn-primary btn-xs"
+				data-i18n="create_copy_sitemap"
+			></button>
 		</div>
 	</td>
 </tr>
diff --git a/src/scripts/Controller.js b/src/scripts/Controller.js
@@ -22,7 +22,6 @@ export default class SitemapController {
 		this.store = store;
 		this.templateDir = templateDir;
 		this.contentScript = getContentScript('DevTools');
-
 		this.selectorTypes = [
 			{
 				type: 'SelectorText',
@@ -191,6 +190,16 @@ export default class SitemapController {
 			'#sitemap-export-data-nav-button': {
 				click: this.showSitemapExportDataPanel,
 			},
+			'.delete_selector_submit': {
+				click: this.confirmDeleteSelector,
+			},
+			'.delete_sitemap_submit': {
+				click: this.confirmDeleteSitemap,
+			},
+			'.copy_sitemap_submit': {
+				click: this.confirmCopySitemap,
+			},
+
 			'#submit-create-sitemap': {
 				click: this.createSitemap,
 			},
@@ -221,6 +230,9 @@ export default class SitemapController {
 			'#sitemaps button[action=delete-sitemap]': {
 				click: this.deleteSitemap,
 			},
+			'#sitemaps button[action=create-copy-sitemap]': {
+				click: this.copySitemap,
+			},
 			'#sitemap-scrape-nav-button': {
 				click: this.showScrapeSitemapConfigPanel,
 			},
@@ -340,16 +352,16 @@ export default class SitemapController {
 	/**
 	 * Returns bootstrapValidator object for current form in viewport
 	 */
-	getFormValidator() {
-		return $('#viewport form').data('bootstrapValidator');
+	getFormValidator(selector = '#viewport form') {
+		return $(selector).data('bootstrapValidator');
 	}
 
 	/**
 	 * Returns whether current form in the viewport is valid
 	 * @returns {Boolean}
 	 */
-	isValidForm() {
-		const validator = this.getFormValidator();
+	isValidForm(selector = '#viewport form') {
+		const validator = this.getFormValidator(selector);
 		// validator.validate();
 		// validate method calls submit which is not needed in this case.
 		for (const field in validator.options.fields) {
@@ -439,6 +451,34 @@ export default class SitemapController {
 		return true;
 	}
 
+	initCopySitemapValidation() {
+		$('#confirm-action-modal').bootstrapValidator({
+			fields: {
+				modal_confirm_action_input_copy_sitemap: {
+					validators: {
+						notEmpty: {
+							message: Translator.getTranslationByKey('sitemapid_empty_message'),
+						},
+						stringLength: {
+							min: 3,
+							message: Translator.getTranslationByKey('sitemapid_short_message'),
+						},
+						regexp: {
+							regexp: /^[a-z][a-z0-9_\$\(\)\+\-/]+$/,
+							message: Translator.getTranslationByKey('sitemapid_invalid_char'),
+						},
+						callback: {
+							message: Translator.getTranslationByKey('sitemapid_repeated_id'),
+							callback(value, validator) {
+								return true;
+							},
+						},
+					},
+				},
+			},
+		});
+	}
+
 	initImportSitemapValidation() {
 		$('#viewport form').bootstrapValidator({
 			fields: {
@@ -1203,16 +1243,40 @@ export default class SitemapController {
 	initConfirmActionPanel(action) {
 		$('#confirm-action-modal').remove(); // remove old panel
 		$('#viewport').after(ich.ActionConfirm(action));
+		$('#confirm-action-modal').modal('show');
 		Translator.translatePage();
 	}
 
-	showConfirmActionPanel(onConfirm) {
-		const $confirmActionModal = $('#confirm-action-modal');
-		$('#modal-submit').click(() => {
-			$confirmActionModal.modal('hide');
-			onConfirm();
-		});
-		$confirmActionModal.modal('show');
+	async copySitemap(button) {
+		let sitemap = $(button).closest('tr').data('sitemap');
+		this.initConfirmActionPanel({ action: 'copy_sitemap' });
+		this.initCopySitemapValidation();
+		$('#modal-message').show();
+		$('#modal-sitemap-id').text(sitemap._id);
+		this.state.currentSitemap = sitemap;
+		$('#modal_confirm_action_input_copy_sitemap').show();
+	}
+
+	async confirmCopySitemap(button) {
+		const id = $('#modal_confirm_action_input_copy_sitemap').val();
+		let sitemap = this.state.currentSitemap;
+		if (!this.isValidForm('#confirm-action-modal')) {
+			return false;
+		}
+		const sitemapExist = await this.store.sitemapExists(id);
+		if (sitemapExist) {
+			const validator = $('#confirm-action-modal').data('bootstrapValidator');
+			validator.updateStatus(
+				'modal_confirm_action_input_copy_sitemap',
+				'INVALID',
+				'callback'
+			);
+			return false;
+		}
+		sitemap = new Sitemap(id, sitemap.startUrls, sitemap.model, sitemap.selectors);
+		sitemap = await this.store.createSitemap(sitemap);
+		this._editSitemap(sitemap, ['_root']);
+		$('#confirm-action-modal').modal('hide');
 	}
 
 	async deleteSelector(button) {
@@ -1225,21 +1289,30 @@ export default class SitemapController {
 			$('#modal-child-count').text(childCount);
 			$('#modal-message').show();
 		}
-		this.showConfirmActionPanel(async () => {
-			sitemap.deleteSelector(selector);
-			await this.store.saveSitemap(sitemap);
-			this.showSitemapSelectorList();
-		});
+		this.state.currentSelector = selector;
+		this.state.currentSitemap = sitemap;
+	}
+
+	async confirmDeleteSelector(button) {
+		const selector = this.state.currentSelector;
+		const sitemap = this.state.currentSitemap;
+		sitemap.deleteSelector(selector);
+		await this.store.saveSitemap(sitemap);
+		this.showSitemapSelectorList();
+		$('#confirm-action-modal').modal('hide');
 	}
 
 	async deleteSitemap(button) {
 		const sitemap = $(button).closest('tr').data('sitemap');
 		this.initConfirmActionPanel({ action: 'delete_sitemap' });
 		$('#modal-sitemap-id').text(sitemap._id);
-		this.showConfirmActionPanel(async () => {
-			await this.store.deleteSitemap(sitemap);
-			await this.showSitemaps();
-		});
+		this.state.currentSitemap = sitemap;
+	}
+
+	async confirmDeleteSitemap(button) {
+		await this.store.deleteSitemap(this.state.currentSitemap);
+		await this.showSitemaps();
+		$('#confirm-action-modal').modal('hide');
 	}
 
 	initScrapeSitemapConfigValidation() {