Merge in 5.25

[civicrm-core.git] / ang / api4Explorer / Explorer.js

diff --git a/ang/api4Explorer/Explorer.js b/ang/api4Explorer/Explorer.js
index 369474fc0bf18476dff942a5ebd839017af3e4e1..1db4d564f80503629b035488940bb9f78c762360 100644 (file)
--- a/ang/api4Explorer/Explorer.js
+++ b/ang/api4Explorer/Explorer.js
@@ -222,25 +222,9 @@
       }
     };
 
-    // Gets params that should be represented as generic input fields in the explorer
-    // This fn doesn't have to be particularly efficient as its output is cached in one-time bindings
-    $scope.getGenericParams = function(paramType, defaultNull) {
-      // Returns undefined if params are not yet set; one-time bindings will stabilize when this function returns a value
-      if (_.isEmpty($scope.availableParams)) {
-        return;
-      }
-      var specialParams = ['select', 'fields', 'action', 'where', 'values', 'defaults', 'orderBy', 'chain', 'groupBy', 'having'];
-      if ($scope.availableParams.limit && $scope.availableParams.offset) {
-        specialParams.push('limit', 'offset');
-      }
-      return _.transform($scope.availableParams, function(genericParams, param, name) {
-        if (!_.contains(specialParams, name) &&
-          !(typeof paramType !== 'undefined' && !_.contains(paramType, param.type[0])) &&
-          !(typeof defaultNull !== 'undefined' && ((param.default === null) !== defaultNull))
-        ) {
-          genericParams[name] = param;
-        }
-      });
+    $scope.isSpecial = function(name) {
+      var specialParams = ['select', 'fields', 'action', 'where', 'values', 'defaults', 'orderBy', 'chain'];
+      return _.contains(specialParams, name);
     };
 
     $scope.selectRowCount = function() {
@@ -399,8 +383,8 @@
               deep: format === 'json'
             });
           }
-          if (typeof objectParams[name] !== 'undefined' && name !== 'orderBy') {
-            $scope.$watch('params.' + name, function (values) {
+          if (typeof objectParams[name] !== 'undefined') {
+            $scope.$watch('params.' + name, function(values) {
               // Remove empty values
               _.each(values, function (clause, index) {
                 if (!clause || !clause[0]) {
@@ -424,17 +408,13 @@
               var field = value;
               $timeout(function() {
                 if (field) {
-                  if (typeof objectParams[name] === 'undefined') {
-                    $scope.params[name].push(field);
-                  } else {
-                    var defaultOp = _.cloneDeep(objectParams[name]);
-                    if (name === 'chain') {
-                      var num = $scope.params.chain.length;
-                      defaultOp[0] = field;
-                      field = 'name_me_' + num;
-                    }
-                    $scope.params[name].push([field, defaultOp]);
+                  var defaultOp = _.cloneDeep(objectParams[name]);
+                  if (name === 'chain') {
+                    var num = $scope.params.chain.length;
+                    defaultOp[0] = field;
+                    field = 'name_me_' + num;
                   }
+                  $scope.params[name].push([field, defaultOp]);
                   $scope.controls[name] = null;
                 }
               });