From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 25 Feb 2015 02:20:57 +0000 (-0500)
Subject: Api explorer code tidy - use _.includes method
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=ed0eacccbcfef7756afb222d827b72e1dfd6f325;p=civicrm-core.git

Api explorer code tidy - use _.includes method
---

diff --git a/templates/CRM/Admin/Page/APIExplorer.js b/templates/CRM/Admin/Page/APIExplorer.js
index bc829e5d4d..00d880fdad 100644
--- a/templates/CRM/Admin/Page/APIExplorer.js
+++ b/templates/CRM/Admin/Page/APIExplorer.js
@@ -190,8 +190,8 @@
       formatResult: renderAction
     });
     // If previously selected action is not available, set it to 'get' if possible
-    if (_.indexOf(actions.values, val) < 0) {
-      $('#api-action').select2('val', _.indexOf(actions.values, 'get') < 0 ? actions.values[0] : 'get', true);
+    if (!_.includes(actions.values, val)) {
+      $('#api-action').select2('val', !_.includes(actions.values, 'get') ? actions.values[0] : 'get', true);
     }
   }
 
@@ -227,7 +227,7 @@
    * @returns boolean
    */
   function isSelect(fieldName, operator) {
-    return (options[fieldName] || (getFieldData[fieldName] && getFieldData[fieldName].FKApiName)) && ($.inArray(operator, TEXT) < 0);
+    return (options[fieldName] || (getFieldData[fieldName] && getFieldData[fieldName].FKApiName)) && !_.includes(TEXT, operator);
   }
 
   /**
@@ -238,7 +238,7 @@
    * @returns boolean
    */
   function isMultiSelect(fieldName, operator) {
-    if ($.inArray(operator, MULTI) > -1) {
+    if (_.includes(MULTI, operator)) {
       return true;
     }
     // The = operator is ambiguous but all others can be safely assumed to be single
@@ -267,7 +267,7 @@
       multiSelect = isMultiSelect(name, operator),
       currentVal = $valField.val();
     // Boolean fields only have 1 possible value
-    if ($.inArray(operator, BOOL) > -1) {
+    if (_.includes(BOOL, operator)) {
       if ($valField.data('select2')) {
         $valField.select2('destroy');
       }
@@ -282,7 +282,7 @@
         $valField.val('');
       }
       // When switching from multi-select to single select
-      else if (!multiSelect && currentVal.indexOf(',') > -1) {
+      else if (!multiSelect && _.includes(currentVal, ',')) {
         $valField.val(currentVal.split(',')[0]);
       }
       // Select options
@@ -300,7 +300,7 @@
           entity: getFieldData[name].FKApiName,
           select: {
             multiple: multiSelect,
-            minimumInputLength: $.inArray(getFieldData[name].FKApiName, OPEN_IMMEDIATELY) > -1 ? 0 : 1
+            minimumInputLength: _.includes(OPEN_IMMEDIATELY, getFieldData[name].FKApiName) ? 0 : 1
           }
         });
       }
@@ -384,7 +384,7 @@
    * @param key string
    */
   function smartyFormat(js, key) {
-    if (js.indexOf('[') > -1 || js.indexOf('{') > -1) {
+    if (_.includes(js, '[') || _.includes(js, '{')) {
       smartyStub = true;
       return '$' + key.replace(/[. -]/g, '_');
     }
@@ -406,7 +406,7 @@
         op = $('select.api-param-op', $row).val() || '=',
         name = $('input.api-param-name', $row).val(),
         // Workaround for ambiguity of the = operator
-        makeArray = (op === '=' && isSelect(name, op)) ? input.indexOf(',') > -1 : op !== '=' && isMultiSelect(name, op),
+        makeArray = (op === '=' && isSelect(name, op)) ? _.includes(input, ',') : op !== '=' && isMultiSelect(name, op),
         val = evaluate(input, makeArray);
 
       // Ignore blank values for the return field
@@ -506,7 +506,7 @@
     q.php += ");";
     q.json += ").done(function(result) {\n  // do something\n});";
     q.smarty += "}\n{foreach from=$result.values item=" + entity.toLowerCase() + "}\n  {$" + entity.toLowerCase() + ".some_field}\n{/foreach}";
-    if (action.indexOf('get') < 0) {
+    if (!_.includes(action, 'get')) {
       q.smarty = '{* Smarty API only works with get actions *}';
     } else if (smartyStub) {
       q.smarty = "{* Smarty does not have a syntax for array literals; assign complex variables from php *}\n" + q.smarty;
@@ -527,7 +527,7 @@
       alert(ts('Select an entity.'));
       return;
     }
-    if (action.indexOf('get') < 0 && action != 'check') {
+    if (!_.includes(action, 'get') && action != 'check') {
       var msg = action === 'delete' ? ts('This will delete data from CiviCRM. Are you sure?') : ts('This will write to the database. Continue?');
       CRM.confirm({title: ts('Confirm %1', {1: action}), message: msg}).on('crmConfirm:yes', execute);
     } else {
@@ -549,7 +549,7 @@
         prettyprint: 1,
         json: JSON.stringify(params)
       },
-      type: action.indexOf('get') < 0 ? 'POST' : 'GET',
+      type: _.includes(action, 'get') ? 'GET' : 'POST',
       dataType: 'text'
     }).done(function(text) {
       $('#api-result').addClass('prettyprint').removeClass('prettyprinted').text(text);