Merge branch 'master' into feature/opt-in-widget

gbisurgi · gbisurgi · commit 592bcc07a5e6 · 2024-07-22T11:12:48.000+02:00
diff --git a/src/editor.js b/src/editor.js
@@ -17,7 +17,7 @@ export class AbstractEditor {
     this.active = true
     this.isUiOnly = false
     this.options = extend({}, (this.options || {}), (this.schema.options || {}), (options.schema.options || {}), options)
-    this.enforceConst = this.options.enforce_const ?? this.jsoneditor.options.enforce_const
+    this.enforceConstEnabled = this.options.enforce_const ?? this.jsoneditor.options.enforce_const
     this.formname = this.jsoneditor.options.form_name_root || 'root'
 
     if (!options.path && !this.schema.id) this.schema.id = this.formname
@@ -273,7 +273,7 @@ export class AbstractEditor {
       this.theme.visuallyHidden(this.header)
     }
 
-    if (this.enforceConst && this.schema.const) {
+    if (this.enforceConstEnabled && this.schema.const) {
       this.disable()
     }
   }
@@ -585,9 +585,18 @@ export class AbstractEditor {
   }
 
   setValue (value) {
+    value = this.applyConstFilter(value)
     this.value = value
   }
 
+  applyConstFilter (value) {
+    if (this.enforceConstEnabled && typeof this.schema.const !== 'undefined') {
+      value = this.schema.const
+    }
+
+    return value
+  }
+
   getValue () {
     if (!this.dependenciesFulfilled) {
       return undefined
@@ -629,7 +638,7 @@ export class AbstractEditor {
   }
 
   getDefault () {
-    if (this.enforceConst && this.schema.const) {
+    if (this.enforceConstEnabled && this.schema.const) {
       return this.schema.const
     }
 
diff --git a/src/editors/ace.js b/src/editors/ace.js
@@ -3,6 +3,7 @@ import { extend } from '../utilities.js'
 
 export class AceEditor extends StringEditor {
   setValue (value, initial, fromTemplate) {
+    value = this.applyConstFilter(value)
     const res = super.setValue(value, initial, fromTemplate)
     if (res !== undefined && res.changed && this.ace_editor_instance) {
       this.ace_editor_instance.setValue(res.value)
diff --git a/src/editors/array.js b/src/editors/array.js
@@ -348,6 +348,7 @@ export class ArrayEditor extends AbstractEditor {
   }
 
   setValue (value = [], initial) {
+    value = this.applyConstFilter(value)
     /* Make sure value has between minItems and maxItems items in it */
     value = this.ensureArraySize(value)
 
diff --git a/src/editors/array/choices.js b/src/editors/array/choices.js
@@ -4,6 +4,7 @@ import { extend } from '../../utilities.js'
 export class ArrayChoicesEditor extends MultiSelectEditor {
   setValue (value, initial) {
     if (this.choices_instance) {
+      value = this.applyConstFilter(value)
       /* Make sure we are dealing with an array of strings so we can check for strict equality */
       value = [].concat(value).map(e => `${e}`)
 
diff --git a/src/editors/array/select2.js b/src/editors/array/select2.js
@@ -3,6 +3,8 @@ import { extend, hasOwnProperty } from '../../utilities.js'
 
 export class ArraySelect2Editor extends MultiSelectEditor {
   setValue (value, initial) {
+    value = this.applyConstFilter(value)
+
     if (this.select2_instance) {
       /* Make sure we are dealing with an array of strings so we can check for strict equality */
       value = [].concat(value).map(e => `${e}`)
diff --git a/src/editors/array/selectize.js b/src/editors/array/selectize.js
@@ -3,6 +3,8 @@ import { extend } from '../../utilities.js'
 
 export class ArraySelectizeEditor extends MultiSelectEditor {
   setValue (value, initial) {
+    value = this.applyConstFilter(value)
+
     if (this.selectize_instance) {
       /* Make sure we are dealing with an array of strings so we can check for strict equality */
       value = [].concat(value).map(e => `${e}`)
diff --git a/src/editors/base64.js b/src/editors/base64.js
@@ -149,6 +149,8 @@ export class Base64Editor extends AbstractEditor {
   }
 
   setValue (val) {
+    val = this.applyConstFilter(val)
+
     if (this.value !== val) {
       if (this.schema.readOnly && this.schema.enum && !this.schema.enum.includes(val)) this.value = this.schema.enum[0]
       else this.value = val
diff --git a/src/editors/checkbox.js b/src/editors/checkbox.js
@@ -2,6 +2,7 @@ import { AbstractEditor } from '../editor.js'
 
 export class CheckboxEditor extends AbstractEditor {
   setValue (value, initial) {
+    value = this.applyConstFilter(value)
     value = !!value
     const changed = this.getValue() !== value
     this.value = value
diff --git a/src/editors/choices.js b/src/editors/choices.js
@@ -4,6 +4,8 @@ import rules from './choices.css.js'
 
 export class ChoicesEditor extends SelectEditor {
   setValue (value, initial) {
+    value = this.applyConstFilter(value)
+
     if (this.choices_instance) {
       /* Sanitize value before setting it */
       let sanitized = this.typecast(value || '')
diff --git a/src/editors/colorpicker.js b/src/editors/colorpicker.js
@@ -17,6 +17,8 @@ export class ColorEditor extends StringEditor {
   }
 
   setValue (value, initial, fromTemplate) {
+    value = this.applyConstFilter(value)
+
     const res = super.setValue(value, initial, fromTemplate)
     if (this.picker_instance && this.picker_instance.domElement && res && res.changed) {
       this.picker_instance.setColor(res.value, true)
diff --git a/src/editors/datetime.js b/src/editors/datetime.js
@@ -104,6 +104,8 @@ export class DatetimeEditor extends StringEditor {
   }
 
   setValue (value, initial, fromTemplate) {
+    value = this.applyConstFilter(value)
+
     if (this.schema.type === 'string') {
       super.setValue(value, initial, fromTemplate)
       if (this.flatpickr) this.flatpickr.setDate(value)
diff --git a/src/editors/describedby.js b/src/editors/describedby.js
@@ -160,6 +160,8 @@ export class DescribedByEditor extends AbstractEditor {
   }
 
   setValue (val, initial) {
+    val = this.applyConstFilter(val)
+
     if (this.editors[this.currentEditor]) {
       this.editors[this.currentEditor].setValue(val, initial)
       this.refreshValue()
diff --git a/src/editors/enum.js b/src/editors/enum.js
@@ -12,7 +12,7 @@ export class EnumEditor extends AbstractEditor {
 
     this.options.enum_titles = this.options.enum_titles || []
 
-    if (this.enforceConst && this.schema.const) {
+    if (this.enforceConstEnabled && this.schema.const) {
       this.enum = [this.schema.const]
     } else {
       this.enum = this.schema.enum
@@ -127,6 +127,8 @@ export class EnumEditor extends AbstractEditor {
   }
 
   setValue (val) {
+    val = this.applyConstFilter(val)
+
     if (this.value !== val) {
       this.value = val
       this.refreshValue()
diff --git a/src/editors/hidden.js b/src/editors/hidden.js
@@ -19,6 +19,8 @@ export class HiddenEditor extends AbstractEditor {
   }
 
   setValue (value, initial, fromTemplate) {
+    value = this.applyConstFilter(value)
+
     if (this.template && !fromTemplate) {
       return
     }
diff --git a/src/editors/jodit.js b/src/editors/jodit.js
@@ -3,6 +3,8 @@ import { extend } from '../utilities.js'
 
 export class JoditEditor extends StringEditor {
   setValue (value, initial, fromTemplate) {
+    value = this.applyConstFilter(value)
+
     const res = super.setValue(value, initial, fromTemplate)
     if (res !== undefined && res.changed && this.jodit_instance) this.jodit_instance.setEditorValue(res.value)
   }
diff --git a/src/editors/multiple.js b/src/editors/multiple.js
@@ -319,6 +319,8 @@ export class MultipleEditor extends AbstractEditor {
   }
 
   setValue (val, initial) {
+    val = this.applyConstFilter(val)
+
     /* Determine type by getting the first one that validates */
 
     const prevType = this.type
diff --git a/src/editors/multiselect.js b/src/editors/multiselect.js
@@ -132,6 +132,8 @@ export class MultiSelectEditor extends AbstractEditor {
   }
 
   setValue (value, initial) {
+    value = this.applyConstFilter(value)
+
     value = value || []
     if (!(Array.isArray(value))) value = [value]
 
diff --git a/src/editors/object.js b/src/editors/object.js
@@ -1296,6 +1296,8 @@ export class ObjectEditor extends AbstractEditor {
   }
 
   setValue (value, initial) {
+    value = this.applyConstFilter(value)
+
     value = value || {}
 
     if (typeof value !== 'object' || Array.isArray(value)) value = {}
diff --git a/src/editors/radio.js b/src/editors/radio.js
@@ -107,6 +107,8 @@ export class RadioEditor extends SelectEditor {
   }
 
   setValue (val) {
+    val = this.applyConstFilter(val)
+
     if (typeof val !== 'string') {
       val = String(val)
     }
diff --git a/src/editors/sceditor.js b/src/editors/sceditor.js
@@ -3,6 +3,8 @@ import { extend } from '../utilities.js'
 
 export class ScEditor extends StringEditor {
   setValue (value, initial, fromTemplate) {
+    value = this.applyConstFilter(value)
+
     const res = super.setValue(value, initial, fromTemplate)
     if (res !== undefined && res.changed && this.sceditor_instance) this.sceditor_instance.val(res.value)
   }
diff --git a/src/editors/select.js b/src/editors/select.js
@@ -3,6 +3,7 @@ import { extend } from '../utilities.js'
 
 export class SelectEditor extends AbstractEditor {
   setValue (value, initial) {
+    value = this.applyConstFilter(value)
     /* Sanitize value before setting it */
     let sanitized = this.typecast(value)
     const inEnum = (this.enum_options.length > 0 && this.enum_values.includes(sanitized))
diff --git a/src/editors/select2.js b/src/editors/select2.js
@@ -3,6 +3,8 @@ import { extend, hasOwnProperty } from '../utilities.js'
 
 export class Select2Editor extends SelectEditor {
   setValue (value, initial) {
+    value = this.applyConstFilter(value)
+
     if (this.select2_instance) {
       if (initial) this.is_dirty = false
       else if (this.jsoneditor.options.show_errors === 'change') this.is_dirty = true
diff --git a/src/editors/selectize.js b/src/editors/selectize.js
@@ -3,6 +3,8 @@ import { extend } from '../utilities.js'
 
 export class SelectizeEditor extends SelectEditor {
   setValue (value, initial) {
+    value = this.applyConstFilter(value)
+
     if (this.selectize_instance) {
       if (initial) this.is_dirty = false
       else if (this.jsoneditor.options.show_errors === 'change') this.is_dirty = true
diff --git a/src/editors/signature.js b/src/editors/signature.js
@@ -90,6 +90,8 @@ export class SignatureEditor extends StringEditor {
   }
 
   setValue (val) {
+    val = this.applyConstFilter(val)
+
     if (typeof SignaturePad === 'function') {
       const sanitized = this.sanitize(val)
       if (this.value === sanitized) {
diff --git a/src/editors/simplemde.js b/src/editors/simplemde.js
@@ -3,6 +3,8 @@ import { extend } from '../utilities.js'
 
 export class SimplemdeEditor extends StringEditor {
   setValue (value, initial, fromTemplate) {
+    value = this.applyConstFilter(value)
+
     const res = super.setValue(value, initial, fromTemplate)
     if (res !== undefined && res.changed && this.simplemde_instance) this.simplemde_instance.value(res.value)
   }
diff --git a/src/editors/starrating.js b/src/editors/starrating.js
@@ -122,6 +122,8 @@ export class StarratingEditor extends StringEditor {
   }
 
   setValue (value) {
+    value = this.applyConstFilter(value)
+
     this.value = value
 
     for (let i = 0; i < this.radioGroup.length; i++) {
diff --git a/src/editors/string.js b/src/editors/string.js
@@ -18,6 +18,8 @@ export class StringEditor extends AbstractEditor {
   }
 
   setValue (value, initial, fromTemplate) {
+    value = this.applyConstFilter(value)
+
     if (this.template && !fromTemplate) return
 
     if (!this.shouldBeUnset() && (value === null || typeof value === 'undefined')) value = ''
diff --git a/src/editors/table.js b/src/editors/table.js
@@ -187,6 +187,8 @@ export class TableEditor extends ArrayEditor {
   }
 
   setValue (value = [], initial) {
+    value = this.applyConstFilter(value)
+
     /* Make sure value has between minItems and maxItems items in it */
     value = this.ensureArraySize(value)
 
@@ -221,7 +223,6 @@ export class TableEditor extends ArrayEditor {
     if (numrowsChanged || initial) this.refreshRowButtons()
 
     this.onChange()
-
     /* TODO: sortable */
   }
 
diff --git a/src/editors/upload.js b/src/editors/upload.js
@@ -276,6 +276,8 @@ export class UploadEditor extends AbstractEditor {
   }
 
   setValue (val) {
+    val = this.applyConstFilter(val)
+
     if (this.value !== val) {
       this.value = val
       this.input.value = this.value
diff --git a/src/editors/uuid.js b/src/editors/uuid.js
@@ -31,6 +31,8 @@ export class UuidEditor extends StringEditor {
   }
 
   setValue (value, initial, fromTemplate) {
+    value = this.applyConstFilter(value)
+
     if (!this.testUuid(value)) value = this.uuid
     this.uuid = value
     super.setValue(value, initial, fromTemplate)
diff --git a/tests/pages/enforce-const.html b/tests/pages/enforce-const.html

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ export class AbstractEditor {`
`17`	`17`	`this.active = true`
`18`	`18`	`this.isUiOnly = false`
`19`	`19`	`this.options = extend({}, (this.options \|\| {}), (this.schema.options \|\| {}), (options.schema.options \|\| {}), options)`
`20`		`- this.enforceConst = this.options.enforce_const ?? this.jsoneditor.options.enforce_const`
	`20`	`+ this.enforceConstEnabled = this.options.enforce_const ?? this.jsoneditor.options.enforce_const`
`21`	`21`	`this.formname = this.jsoneditor.options.form_name_root \|\| 'root'`
`22`	`22`
`23`	`23`	`if (!options.path && !this.schema.id) this.schema.id = this.formname`
`@@ -273,7 +273,7 @@ export class AbstractEditor {`
`273`	`273`	`this.theme.visuallyHidden(this.header)`
`274`	`274`	`}`
`275`	`275`
`276`		`- if (this.enforceConst && this.schema.const) {`
	`276`	`+ if (this.enforceConstEnabled && this.schema.const) {`
`277`	`277`	`this.disable()`
`278`	`278`	`}`
`279`	`279`	`}`
`@@ -585,9 +585,18 @@ export class AbstractEditor {`
`585`	`585`	`}`
`586`	`586`
`587`	`587`	`setValue (value) {`
	`588`	`+ value = this.applyConstFilter(value)`
`588`	`589`	`this.value = value`
`589`	`590`	`}`
`590`	`591`
	`592`	`+ applyConstFilter (value) {`
	`593`	`+ if (this.enforceConstEnabled && typeof this.schema.const !== 'undefined') {`
	`594`	`+ value = this.schema.const`
	`595`	`+ }`
	`596`	`+`
	`597`	`+ return value`
	`598`	`+ }`
	`599`	`+`
`591`	`600`	`getValue () {`
`592`	`601`	`if (!this.dependenciesFulfilled) {`
`593`	`602`	`return undefined`
`@@ -629,7 +638,7 @@ export class AbstractEditor {`
`629`	`638`	`}`
`630`	`639`
`631`	`640`	`getDefault () {`
`632`		`- if (this.enforceConst && this.schema.const) {`
	`641`	`+ if (this.enforceConstEnabled && this.schema.const) {`
`633`	`642`	`return this.schema.const`
`634`	`643`	`}`
`635`	`644`
Original file line number	Diff line number	Diff line change
`@@ -348,6 +348,7 @@ export class ArrayEditor extends AbstractEditor {`
`348`	`348`	`}`
`349`	`349`
`350`	`350`	`setValue (value = [], initial) {`
	`351`	`+ value = this.applyConstFilter(value)`
`351`	`352`	`/* Make sure value has between minItems and maxItems items in it */`
`352`	`353`	`value = this.ensureArraySize(value)`
`353`	`354`
Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,8 @@ export class Base64Editor extends AbstractEditor {`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`setValue (val) {`
	`152`	`+ val = this.applyConstFilter(val)`
	`153`	`+`
`152`	`154`	`if (this.value !== val) {`
`153`	`155`	`if (this.schema.readOnly && this.schema.enum && !this.schema.enum.includes(val)) this.value = this.schema.enum[0]`
`154`	`156`	`else this.value = val`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@ export class ColorEditor extends StringEditor {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`setValue (value, initial, fromTemplate) {`
	`20`	`+ value = this.applyConstFilter(value)`
	`21`	`+`
`20`	`22`	`const res = super.setValue(value, initial, fromTemplate)`
`21`	`23`	`if (this.picker_instance && this.picker_instance.domElement && res && res.changed) {`
`22`	`24`	`this.picker_instance.setColor(res.value, true)`