From 6ff906ad350bac37f02d84f1a0b75fa7faab9ce0 Mon Sep 17 00:00:00 2001 From: Jacob Levernier Date: Fri, 21 Jan 2022 14:47:25 -0500 Subject: [PATCH] Started adding inline regex validation. --- src/SettingsTab.ts | 120 +++++++++++++++++++++++++++++++++++---------- styles.css | 12 +++++ 2 files changed, 106 insertions(+), 26 deletions(-) diff --git a/src/SettingsTab.ts b/src/SettingsTab.ts index a8c5d95..a84074f 100644 --- a/src/SettingsTab.ts +++ b/src/SettingsTab.ts @@ -528,7 +528,17 @@ export class SettingsTab extends PluginSettingTab { }); }); - new Setting(ruleEl) + const ruleFromEl = ruleEl.createEl('div'); + const ruleFromElSetting = new Setting(ruleFromEl); + const ruleFromValidEl = ruleFromEl.createEl('span'); + ruleFromValidEl.addClass('validation-text'); + const ruleFromValid = validateRuleString(rule.from); + if (ruleFromValid.valid !== true) { + ruleFromEl.addClass('invalid'); + ruleFromValidEl.setText(ruleFromValid.string); + } + + ruleFromElSetting .setName('Matching text (Regex)') .addText((text) => { text.setPlaceholder('') @@ -552,6 +562,15 @@ export class SettingsTab extends PluginSettingTab { }); await this.plugin.saveSettings(); + + const valueValid = validateRuleString(value); + if (valueValid.valid === true) { + ruleFromEl.removeClass('invalid'); + ruleFromValidEl.setText(''); + } else { + ruleFromEl.addClass('invalid'); + ruleFromValidEl.setText(valueValid.string); + } }); }); @@ -642,32 +661,51 @@ export class SettingsTab extends PluginSettingTab { }); }); - new Setting(ruleEl) - .setName('Replacement text') - .addText((text) => { - text.setPlaceholder('') - .setValue(rule.to) - .onChange(async (value) => { - const newPatterns = cloneDeep( - getSettings().patterns, - ); - newPatterns[patternIndex].rules.splice( - ruleIndex, - 1, - { - ...newPatterns[patternIndex].rules[ - ruleIndex - ], - to: value || '', - }, - ); - updateSettings({ - patterns: newPatterns, - }); + const ruleToEl = ruleEl.createEl('div'); + const ruleToElSetting = new Setting(ruleToEl); + const ruleToValidEl = ruleFromEl.createEl('span'); + ruleToValidEl.addClass('validation-text'); + const ruleToValid = validateRuleString(rule.to, false); - await this.plugin.saveSettings(); + if (ruleToValid.valid !== null) { + ruleToEl.addClass('invalid'); + ruleToValidEl.setText(ruleToValid.string); + } + + ruleToElSetting.setName('Replacement text').addText((text) => { + text.setPlaceholder('') + .setValue(rule.to) + .onChange(async (value) => { + const newPatterns = cloneDeep( + getSettings().patterns, + ); + newPatterns[patternIndex].rules.splice( + ruleIndex, + 1, + { + ...newPatterns[patternIndex].rules[ + ruleIndex + ], + to: value || '', + }, + ); + updateSettings({ + patterns: newPatterns, }); - }); + + await this.plugin.saveSettings(); + + const valueValid = validateRuleString(value, false); + + if (valueValid.valid === null) { + ruleToEl.removeClass('invalid'); + ruleToValidEl.setText(''); + } else { + ruleToEl.addClass('invalid'); + ruleToValidEl.setText(valueValid.string); + } + }); + }); let deleteRulePrimed = false; let ruleDeletePrimerTimer: ReturnType | null; @@ -1116,7 +1154,25 @@ export class SettingsTab extends PluginSettingTab { }); }); - new Setting(commandEl) + const commandPatternNameEl = commandEl.createEl('div'); + const commandPatternNameSetting = new Setting(commandPatternNameEl); + const commandPatternNameValidEl = + commandPatternNameEl.createEl('span'); + commandPatternNameValidEl.addClass('validation-text'); + const commandPatternNameValid = validateRuleString( + command.patternFilter, + ); + + console.log(1166, commandPatternNameValid); + + if (commandPatternNameValid.valid !== true) { + commandPatternNameEl.addClass('invalid'); + commandPatternNameValidEl.setText( + commandPatternNameValid.string, + ); + } + + commandPatternNameSetting .setName('Pattern name filter') .addText((text) => { text.setPlaceholder('') @@ -1134,6 +1190,18 @@ export class SettingsTab extends PluginSettingTab { }); await this.plugin.saveSettings(); + + const valueValid = validateRuleString(value); + + if (valueValid.valid === true) { + commandPatternNameEl.removeClass('invalid'); + commandPatternNameValidEl.setText(''); + } else { + commandPatternNameEl.addClass('invalid'); + commandPatternNameValidEl.setText( + valueValid.string, + ); + } }); }); diff --git a/styles.css b/styles.css index 61b3546..27eb70a 100644 --- a/styles.css +++ b/styles.css @@ -48,3 +48,15 @@ color: var(--text-error); font-size: 1.15em; } + +.invalid input[type='text'] { + background: rgb(255, 0, 0, 0.2) !important; +} + +.validation-text { + color: var(--text-error) !important; + text-align: right; + display: block; + font-size: small; + font-style: italic; +}