From 87b704b56a0b6bcf1209fb9e7196d96607a0f9b2 Mon Sep 17 00:00:00 2001
From: Thibault Debatty <thibault.debatty@gmail.com>
Date: Fri, 23 Oct 2020 09:49:13 +0200
Subject: [PATCH] show help link next to detector algorithm
---
app/Http/Controllers/MarkController.php | 12 ++++++------
composer.json | 2 +-
composer.lock | 8 ++++----
resources/views/app/ranking.blade.php | 13 +++++++++----
4 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/app/Http/Controllers/MarkController.php b/app/Http/Controllers/MarkController.php
index 9e561c0..6dbf0f2 100644
--- a/app/Http/Controllers/MarkController.php
+++ b/app/Http/Controllers/MarkController.php
@@ -75,7 +75,7 @@ class MarkController extends Controller
$detectors = $this->server()->activation();
$detector = null;
foreach ($detectors as $d) {
- if ($d["label"] == $label) {
+ if ($d->label == $label) {
$detector = $d;
break;
}
@@ -99,16 +99,16 @@ class MarkController extends Controller
{
$activation_graph_elements = [];
$activation = $this->server()->activation();
- foreach ($activation as $agent) {
+ foreach ($activation as $detector) {
// nodes
- $activation_graph_elements[] = ["data" => ["id" => $agent["label"]]];
- $activation_graph_elements[] = ["data" => ["id" => $agent["triggerLabel"]]];
+ $activation_graph_elements[] = ["data" => ["id" => $detector->label]];
+ $activation_graph_elements[] = ["data" => ["id" => $detector->trigger_label]];
// edges
$activation_graph_elements[] = ["data" => [
"id" => rand(),
- "source" => $agent["triggerLabel"],
- "target" => $agent["label"]]];
+ "source" => $detector->trigger_label,
+ "target" => $detector->label]];
}
return view("app.detectors", ["activation_graph_elements" => $activation_graph_elements]);
diff --git a/composer.json b/composer.json
index ddc9ca4..f1703c0 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
"license": "MIT",
"require": {
"php": "^7.2.5",
- "cylab/mark-php-client": "^1.4.0",
+ "cylab/mark-php-client": "^1.5.0",
"fideloper/proxy": "^4.2",
"fruitcake/laravel-cors": "^2.0",
"guzzlehttp/guzzle": "^6.3",
diff --git a/composer.lock b/composer.lock
index c6c654b..5a504ba 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "014131ad522560e6629d1d02563612fd",
+ "content-hash": "d6f723c258bc6e2120c110dc37bab10a",
"packages": [
{
"name": "asm89/stack-cors",
@@ -106,11 +106,11 @@
},
{
"name": "cylab/mark-php-client",
- "version": "1.4.0",
+ "version": "1.5.0",
"source": {
"type": "git",
"url": "https://gitlab.cylab.be/cylab/mark-php-client.git",
- "reference": "07c272a48dc44c86f4b12abfe354f30644df0f4c"
+ "reference": "4d3209df9d37cea6c6199269999c286793b6d12c"
},
"require": {
"fguillot/json-rpc": "^1.2",
@@ -139,7 +139,7 @@
}
],
"description": "A PHP client for the MARK framework",
- "time": "2020-10-15T06:47:14+00:00"
+ "time": "2020-10-23T07:32:55+00:00"
},
{
"name": "dnoegel/php-xdg-base-dir",
diff --git a/resources/views/app/ranking.blade.php b/resources/views/app/ranking.blade.php
index ce49235..5930bd0 100644
--- a/resources/views/app/ranking.blade.php
+++ b/resources/views/app/ranking.blade.php
@@ -5,12 +5,17 @@
<h1>{{ $label }}</h1>
- <p>Algorithm: {{ $detector["className"] }}</p>
- <p>Activation label: {{ $detector["triggerLabel"] }}</p>
- <p>Min activation interval: {{ $detector["triggerInterval"] }} seconds</p>
+ <p>
+ Algorithm: {{ $detector->class_name }}
+ <a class="btn btn-sm btn-primary" target="_blanck" href="{{ $detector->javadoc() }}">
+ <i class="fas fa-info-circle"></i> Help
+ </a>
+ </p>
+ <p>Activation label: {{ $detector->trigger_label }}</p>
+ <p>Min activation interval: {{ $detector->trigger_interval }} seconds</p>
<p>Parameters:</p>
<ul>
- @foreach ($detector["parameters"] as $key => $value)
+ @foreach ($detector->parameters as $key => $value)
<li>{{ $key }} : {{ $value }}</li>
@endforeach
</ul>
--
GitLab