From 5d8ac70395f548923549bb73d183004c9a71e756 Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Fri, 18 Dec 2020 12:05:33 -0500 Subject: Display an indication when Anki field order/existence doesn't match (#1119) --- ext/bg/js/settings/anki-controller.js | 38 ++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) (limited to 'ext/bg/js/settings') diff --git a/ext/bg/js/settings/anki-controller.js b/ext/bg/js/settings/anki-controller.js index 957f86d9..541916b7 100644 --- a/ext/bg/js/settings/anki-controller.js +++ b/ext/bg/js/settings/anki-controller.js @@ -46,6 +46,7 @@ class AnkiController { this._ankiErrorInvalidResponseInfo = null; this._ankiCardPrimary = null; this._ankiCardPrimaryType = null; + this._validateFieldsToken = null; } async prepare() { @@ -464,10 +465,19 @@ class AnkiCardController { const markers = this._ankiController.getFieldMarkers(this._cardType); const totalFragment = document.createDocumentFragment(); + const fieldMap = new Map(); + let index = 0; for (const [fieldName, fieldValue] of Object.entries(this._fields)) { const content = this._settingsController.instantiateTemplateFragment('anki-card-field'); - content.querySelector('.anki-card-field-name').textContent = fieldName; + const fieldNameContainerNode = content.querySelector('.anki-card-field-name-container'); + fieldNameContainerNode.dataset.index = `${index}`; + const fieldNameNode = content.querySelector('.anki-card-field-name'); + fieldNameNode.textContent = fieldName; + fieldMap.set(fieldName, {fieldNameContainerNode}); + + const valueContainer = content.querySelector('.anki-card-field-value-container'); + valueContainer.dataset.index = `${index}`; const inputField = content.querySelector('.anki-card-field-value'); inputField.value = fieldValue; @@ -494,6 +504,8 @@ class AnkiCardController { } totalFragment.appendChild(content); + + ++index; } const ELEMENT_NODE = Node.ELEMENT_NODE; @@ -503,6 +515,30 @@ class AnkiCardController { container.removeChild(node); } container.appendChild(totalFragment); + + this._validateFields(fieldMap); + } + + async _validateFields(fieldMap) { + const token = {}; + this._validateFieldsToken = token; + + let fieldNames; + try { + fieldNames = await this._ankiController.getModelFieldNames(this._model); + } catch (e) { + return; + } + + if (token !== this._validateFieldsToken) { return; } + + const fieldNamesSet = new Set(fieldNames); + let index = 0; + for (const [fieldName, {fieldNameContainerNode}] of fieldMap.entries()) { + fieldNameContainerNode.dataset.isValid = `${fieldNamesSet.has(fieldName)}`; + fieldNameContainerNode.dataset.orderMatches = `${index < fieldNames.length && fieldName === fieldNames[index]}`; + ++index; + } } async _setDeck(value) { -- cgit v1.2.3