mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix validation page (#13929)

Browse Source 
* Validation web page fixes

* Validation web page fixes

* update baseline
This commit is contained in:
Tony Murray
2022-04-17 08:38:16 -05:00
committed by GitHub
parent 6410775bd5
commit 9c126572a2
5 changed files with 6 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
LibreNMS/Util/Html.php
View File

@@ -136,19 +136,6 @@ class Html
return $graph_data; return $graph_data;
} }
/**
* Find all links in some text and turn them into html links.
*
* @param string|null $text
* @return string
*/
public static function linkify(?string $text): string
{
$regex = "#(http|https|ftp|ftps)://[a-z0-9\-.]*[a-z0-9\-]+(/\S*)?#i";
return preg_replace($regex, '<a href="$0">$0</a>', $text);
}
public static function percentageBar($width, $height, $percent, $left_text = '', $right_text = '', $warn = null, $shadow = null, $colors = null) public static function percentageBar($width, $height, $percent, $left_text = '', $right_text = '', $warn = null, $shadow = null, $colors = null)
{ {
$percent = min($percent, 100); $percent = min($percent, 100);

6
LibreNMS/ValidationResult.php
View File

@@ -25,7 +25,7 @@
namespace LibreNMS; namespace LibreNMS;
use LibreNMS\Util\Html; use Illuminate\Support\Arr;
class ValidationResult class ValidationResult
{ {
@@ -223,9 +223,9 @@ class ValidationResult
return [ return [
'status' => $resultStatus, 'status' => $resultStatus,
'statusText' => $this->getStatusText($resultStatus), 'statusText' => substr($this->getStatusText($resultStatus), 2, -2), // remove console colors
'message' => $this->getMessage(), 'message' => $this->getMessage(),
'fix' => is_array($resultFix) ? $resultFix : ($resultList ? [Html::linkify($resultFix)] : []), 'fix' => Arr::wrap($resultFix),
'listDescription' => $this->getListDescription(), 'listDescription' => $this->getListDescription(),
'list' => is_array($resultList) ? array_values($resultList) : [], 'list' => is_array($resultList) ? array_values($resultList) : [],
]; ];

5
phpstan-baseline.neon
View File

@@ -11235,11 +11235,6 @@ parameters:
count: 1 count: 1
path: tests/FunctionsTest.php path: tests/FunctionsTest.php
-
message: "#^Method LibreNMS\\\\Tests\\\\FunctionsTest\\:\\:testLinkify\\(\\) has no return type specified\\.$#"
count: 1
path: tests/FunctionsTest.php
- -
message: "#^Method LibreNMS\\\\Tests\\\\FunctionsTest\\:\\:testMacCleanToReadable\\(\\) has no return type specified\\.$#" message: "#^Method LibreNMS\\\\Tests\\\\FunctionsTest\\:\\:testMacCleanToReadable\\(\\) has no return type specified\\.$#"
count: 1 count: 1

10
resources/views/validate/index.blade.php
View File

@@ -32,18 +32,14 @@
<div x-bind:id="'body-' + group.group" class="panel-collapse collapse" x-bind:class="{'in': group.status !== 2}"> <div x-bind:id="'body-' + group.group" class="panel-collapse collapse" x-bind:class="{'in': group.status !== 2}">
<div class="panel-body"> <div class="panel-body">
<template x-for="result in group.results"> <template x-for="result in group.results">
<div class="panel" x-bind:class="{'panel-success': group.status === 2, 'panel-warning': group.status === 1, 'panel-danger': group.status === 0}"> <div class="panel" x-bind:class="{'panel-success': result.status === 2, 'panel-warning': result.status === 1, 'panel-danger': result.status === 0}">
<div class="panel-heading" <div class="panel-heading"
x-bind:class="{'bg-success': result.status === 2, 'bg-warning': result.status === 1, 'bg-danger': result.status === 0}"
x-text="result.statusText + ': ' + result.message" x-text="result.statusText + ': ' + result.message"
></div> ></div>
<div class="panel-body" x-show="result.fix.length || result.list.length"> <div class="panel-body" x-show="result.fix.length || result.list.length">
<div x-show="result.fix.length"> <div x-show="result.fix.length">
{{ __('validation.results.fix') }}: <code> {{ __('validation.results.fix') }}: <pre x-text='result.fix.join("\r\n")'>
<template x-for="fixText in result.fix"> </pre>
<span x-text="fixText"></span>
</template>
</code>
</div> </div>
<div x-show="result.list.length" class="tw-mt-5"> <div x-show="result.list.length" class="tw-mt-5">
<ul class='list-group' style='margin-bottom: -1px'> <ul class='list-group' style='margin-bottom: -1px'>

18
tests/FunctionsTest.php
View File

@@ -26,7 +26,6 @@
namespace LibreNMS\Tests; namespace LibreNMS\Tests;
use LibreNMS\Device\YamlDiscovery; use LibreNMS\Device\YamlDiscovery;
use LibreNMS\Util\Html;
use LibreNMS\Util\Rewrite; use LibreNMS\Util\Rewrite;
class FunctionsTest extends TestCase class FunctionsTest extends TestCase
@@ -55,23 +54,6 @@ class FunctionsTest extends TestCase
$this->assertFalse(isHexString('a5fe53')); $this->assertFalse(isHexString('a5fe53'));
} }
public function testLinkify()
{
$input = 'foo@demo.net bar.ba@test.co.uk
www.demo.com http://foo.co.uk/
sdfsd ftp://192.168.1.1/help/me/now.php
http://regexr.com/foo.html?q=bar
https://mediatemple.net.';
$expected = 'foo@demo.net bar.ba@test.co.uk
www.demo.com <a href="http://foo.co.uk/">http://foo.co.uk/</a>
sdfsd <a href="ftp://192.168.1.1/help/me/now.php">ftp://192.168.1.1/help/me/now.php</a>
<a href="http://regexr.com/foo.html?q=bar">http://regexr.com/foo.html?q=bar</a>
<a href="https://mediatemple.net">https://mediatemple.net</a>.';
$this->assertSame($expected, Html::linkify($input));
}
public function testDynamicDiscoveryGetValue() public function testDynamicDiscoveryGetValue()
{ {
$pre_cache = [ $pre_cache = [