From 85daa08a68e3ef0c824c942cfe56cc1227fa36d2 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Fri, 22 Jan 2021 16:41:55 -0500 Subject: [PATCH] Afform - Move entity boilerplate out of runtime code & into metadata files --- ext/afform/admin/afformEntities/Activity.php | 3 +++ ext/afform/admin/afformEntities/Household.php | 3 +++ ext/afform/admin/afformEntities/Individual.php | 3 +++ ext/afform/admin/afformEntities/Organization.php | 3 +++ ext/afform/admin/ang/afGuiEditor/afGuiEditor.component.js | 8 ++++---- 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ext/afform/admin/afformEntities/Activity.php b/ext/afform/admin/afformEntities/Activity.php index 4d362f1fda..32c3b8f02b 100644 --- a/ext/afform/admin/afformEntities/Activity.php +++ b/ext/afform/admin/afformEntities/Activity.php @@ -3,4 +3,7 @@ return [ 'entity' => 'Activity', 'label' => ts('Activity'), 'defaults' => "{'url-autofill': '1'}", + 'boilerplate' => [ + ['#tag' => 'af-field', 'name' => 'subject'], + ], ]; diff --git a/ext/afform/admin/afformEntities/Household.php b/ext/afform/admin/afformEntities/Household.php index 0788e51fe1..abe3253c5f 100644 --- a/ext/afform/admin/afformEntities/Household.php +++ b/ext/afform/admin/afformEntities/Household.php @@ -9,4 +9,7 @@ return [ }, 'url-autofill': '1' }", + 'boilerplate' => [ + ['#tag' => 'afblock-name-household'], + ], ]; diff --git a/ext/afform/admin/afformEntities/Individual.php b/ext/afform/admin/afformEntities/Individual.php index 626518f3bf..3d651fc35c 100644 --- a/ext/afform/admin/afformEntities/Individual.php +++ b/ext/afform/admin/afformEntities/Individual.php @@ -9,4 +9,7 @@ return [ }, 'url-autofill': '1' }", + 'boilerplate' => [ + ['#tag' => 'afblock-name-individual'], + ], ]; diff --git a/ext/afform/admin/afformEntities/Organization.php b/ext/afform/admin/afformEntities/Organization.php index 358dcf3cda..99f0ebbb0f 100644 --- a/ext/afform/admin/afformEntities/Organization.php +++ b/ext/afform/admin/afformEntities/Organization.php @@ -9,4 +9,7 @@ return [ }, 'url-autofill': '1' }", + 'boilerplate' => [ + ['#tag' => 'afblock-name-organization'], + ], ]; diff --git a/ext/afform/admin/ang/afGuiEditor/afGuiEditor.component.js b/ext/afform/admin/ang/afGuiEditor/afGuiEditor.component.js index 5d43f11f4a..d2a1f4889a 100644 --- a/ext/afform/admin/ang/afGuiEditor/afGuiEditor.component.js +++ b/ext/afform/admin/ang/afGuiEditor/afGuiEditor.component.js @@ -90,10 +90,10 @@ var fieldset = _.cloneDeep(afGui.meta.elements.fieldset.element); fieldset['af-fieldset'] = type + num; fieldset['#children'][0]['#children'][0]['#text'] = meta.label + ' ' + num; - // Add default contact name block - if (meta.entity === 'Contact') { - fieldset['#children'].push({'#tag': 'afblock-name-' + type.toLowerCase()}); - } + // Add boilerplate contents + _.each(meta.boilerplate, function(tag) { + fieldset['#children'].push(tag); + }); // Attempt to place the new af-fieldset after the last one on the form pos = 1 + _.findLastIndex(editor.layout['#children'], 'af-fieldset'); if (pos) { -- 2.25.1