diff --git a/app/src/interfaces/_system/system-interface-options/system-interface-options.vue b/app/src/interfaces/_system/system-interface-options/system-interface-options.vue index 1c93634282..98ba63a034 100644 --- a/app/src/interfaces/_system/system-interface-options/system-interface-options.vue +++ b/app/src/interfaces/_system/system-interface-options/system-interface-options.vue @@ -77,7 +77,6 @@ export default defineComponent({ const usesCustomComponent = computed(() => { if (!selectedInterface.value) return false; - return selectedInterface.value.options && 'render' in selectedInterface.value.options; }); diff --git a/app/src/modules/settings/routes/data-model/field-detail/field-detail-advanced/field-detail-advanced-conditions.vue b/app/src/modules/settings/routes/data-model/field-detail/field-detail-advanced/field-detail-advanced-conditions.vue index 18fba828fe..8b715077f1 100644 --- a/app/src/modules/settings/routes/data-model/field-detail/field-detail-advanced/field-detail-advanced-conditions.vue +++ b/app/src/modules/settings/routes/data-model/field-detail/field-detail-advanced/field-detail-advanced-conditions.vue @@ -100,6 +100,9 @@ export default defineComponent({ const selectedInterface = getInterface(interfaceID.value); if (!selectedInterface || !selectedInterface.options) return []; + // Indicates a custom vue component is used for the interface options + if ('render' in selectedInterface.options) return []; + let optionsObjectOrArray; if (typeof selectedInterface.options === 'function') { @@ -132,6 +135,7 @@ export default defineComponent({ } else { optionsObjectOrArray = selectedInterface.options; } + const optionsArray = Array.isArray(optionsObjectOrArray) ? optionsObjectOrArray : [...optionsObjectOrArray.standard, ...optionsObjectOrArray.advanced];