Merge pull request #19699 from colemanw/controlField

APIv4 - Rename 'controlField' property to 'control_field'
civicrm · Mar 1, 2021 · a6ba1fe · a6ba1fe
2 parents c7ef840 + 0dcd942
commit a6ba1fe
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/Civi/Api4/Generic/AbstractAction.php b/Civi/Api4/Generic/AbstractAction.php
@@ -498,7 +498,7 @@ protected function formatWriteValues(&$record) {
             'val' => $record[$expr],
             'field' => $field,
             'suffix' => substr($expr, $suffix + 1),
-            'depends' => $field['input_attrs']['controlField'] ?? NULL,
+            'depends' => $field['input_attrs']['control_field'] ?? NULL,
           ];
           unset($record[$expr]);
         }

diff --git a/Civi/Api4/Service/Spec/SpecFormatter.php b/Civi/Api4/Service/Spec/SpecFormatter.php
@@ -172,6 +172,14 @@ public static function setInputTypeAndAttrs(FieldSpec &$fieldSpec, $data, $dataT
         }
       }
     }
+    // Ensure all keys use lower_case not camelCase
+    foreach ($inputAttrs as $key => $val) {
+      if ($key !== strtolower($key)) {
+        unset($inputAttrs[$key]);
+        $key = strtolower(preg_replace('/(?=[A-Z])/', '_$0', $key));
+        $inputAttrs[$key] = $val;
+      }
+    }
     $fieldSpec
       ->setInputType($inputType)
       ->setInputAttrs($inputAttrs);

diff --git a/ext/afform/core/ang/af/afField.component.js b/ext/afform/core/ang/af/afField.component.js
@@ -45,15 +45,15 @@
 
         // ChainSelect - watch control field & reload options as needed
         if (ctrl.defn.input_type === 'ChainSelect') {
-          $scope.$watch('dataProvider.getFieldData()[defn.input_attrs.controlField]', function(val) {
+          $scope.$watch('dataProvider.getFieldData()[defn.input_attrs.control_field]', function(val) {
             if (val) {
               var params = {
                 where: [['name', '=', ctrl.fieldName]],
                 select: ['options'],
                 loadOptions: ['id', 'label'],
                 values: {}
               };
-              params.values[ctrl.defn.input_attrs.controlField] = val;
+              params.values[ctrl.defn.input_attrs.control_field] = val;
               crmApi4($scope.dataProvider.getEntityType(), 'getFields', params, 0)
                 .then(function(data) {
                   ctrl.defn.options = data.options;