Merge pull request #1669 from HalianElf/v2-develop

Add Healthchecks Toggles

api/config/default.php

@@ -214,6 +214,8 @@ return array(
 	'healthChecksToken' => '',
 	'healthChecksTags' => '',
 	'homepageHealthChecksAuth' => '1',
+	'homepageHealthChecksShowDesc' => false,
+	'homepageHealthChecksShowTags' => false,
 	'homepageOrdercustomhtml' => '1',
 	'homepageOrdercustomhtmlTwo' => '2',
 	'homepageOrdertransmission' => '3',

api/homepage/healthchecks.php

@@ -63,6 +63,18 @@ trait HealthChecksHomepageItem
 						'value' => $this->config['homepageHealthChecksRefresh'],
 						'options' => $this->timeOptions()
 					),
+					array(
+						'type' => 'switch',
+						'name' => 'homepageHealthChecksShowDesc',
+						'label' => 'Show Description',
+						'value' => $this->config['homepageHealthChecksShowDesc'],
+					),
+					array(
+						'type' => 'switch',
+						'name' => 'homepageHealthChecksShowTags',
+						'label' => 'Show Tags',
+						'value' => $this->config['homepageHealthChecksShowTags'],
+					),
 				),
 			)
 		);
@@ -135,6 +147,10 @@ trait HealthChecksHomepageItem
 		usort($api['content']['checks'], function ($a, $b) {
 			return $a['status'] <=> $b['status'];
 		});
+		$api['options'] = [
+			'desc' => $this->config['homepageHealthChecksShowDesc'],
+			'tags' => $this->config['homepageHealthChecksShowTags'],
+		];
 		$api['content']['checks'] = isset($api['content']['checks']) ? $api['content']['checks'] : false;
 		$this->setAPIResponse('success', null, 200, $api);
 		return $api;

js/functions.js

@@ -6410,7 +6410,7 @@ function buildHealthChecks(array){
 			<div class="clearfix"></div>
 		    <!-- .cards -->
 		    <div class="healthCheckCards">
-			    `+buildHealthChecksItem(array.content.checks)+`
+			    `+buildHealthChecksItem(array)+`
 			</div>
 		    <!-- /.cards-->
 		</div>
@@ -6552,10 +6552,10 @@ function healthCheckIcon(tags){
 }
 function buildHealthChecksItem(array){
     var checks = '';
-    $.each(array, function(i,v) {
+    $.each(array.content.checks, function(i,v) {
         var hasIcon = healthCheckIcon(v.tags);
         v.name = (v.name) ? v.name : 'New Item';
-	v.desc = (v.desc) ? '<h5>Notes: '+v.desc+'</h5>' : '';
+	    v.desc = (array.options.desc && v.desc) ? '<h5>Notes: '+v.desc+'</h5>' : '';
         switch(v.status){
             case 'up':
                 var statusColor = 'success';
@@ -6594,13 +6594,13 @@ function buildHealthChecksItem(array){
                 var lastPing = 'n/a';
         }
     	var tagPrimaryElem = '', tagSecondaryElem = '';
-	if (v.tags){
-		v.tags = v.tags.split(' ');
-		tagPrimaryElem = '<span class="pull-right mt-3 mr-2"><span class="label text-uppercase bg-'+statusColor.replace('animated-3 loop-animation flash','')+' label-rounded font-12">'+v.tags[0]+'</span></span>';
-		tagSecondaryElem = '<h5>Tags: ';
-		tagSecondaryElem += v.tags.map(t => { return t }).join(', ');
-		tagSecondaryElem += '</h5>'
-	}
+        if (array.options.tags && v.tags){
+            v.tags = v.tags.split(' ');
+            tagPrimaryElem = '<span class="pull-right mt-3 mr-2"><span class="label text-uppercase bg-'+statusColor.replace('animated-3 loop-animation flash','')+' label-rounded font-12">'+v.tags[0]+'</span></span>';
+            tagSecondaryElem = '<h5>Tags: ';
+            tagSecondaryElem += v.tags.map(t => { return t }).join(', ');
+            tagSecondaryElem += '</h5>'
+        }
         checks += `
             <div class="col-xl-2 col-lg-3 col-md-4 col-sm-6 col-xs-12">
                 <div class="card bg-inverse text-white mb-3 showMoreHealth mouse" data-id="`+i+`">