cerebrate-project
/
cerebrate
mirror of https://github.com/cerebrate-project/cerebrate
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: [topology] various fixes

refacto/CRUDComponent
iglocska 2023-10-05 12:47:18 +02:00
parent 49d4c959aa
commit d23e393a9a
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Model/Table/InstanceTable.php
View File

@ -275,7 +275,7 @@ class InstanceTable extends AppTable
$status = ''; $status = '';
if ($brood['status']['code'] === 200) { if ($brood['status']['code'] === 200) {
$status = sprintf( $status = sprintf(
'<br />Ping: %sms<br />Version: <span class="%s">v%s</span><br />Role: %s<br />', "<br />Ping: %sms<br />Version: <span class='%s'>v%s</span><br />Role: %s<br />",
h($brood['status']['ping']), h($brood['status']['ping']),
$brood['status']['response']['version'] === $newest ? 'text-success' : 'text-danger', $brood['status']['response']['version'] === $newest ? 'text-success' : 'text-danger',
h($brood['status']['response']['version']) . ($brood['status']['response']['version'] !== $newest ? ' - outdated' : ''), h($brood['status']['response']['version']) . ($brood['status']['response']['version'] !== $newest ? ' - outdated' : ''),
@ -292,7 +292,7 @@ class InstanceTable extends AppTable
sprintf( sprintf(
" cerebrate_%s[%s<br />%s<a href='/broods/view/%s'>fas:fa-eye</a>]" . PHP_EOL, " cerebrate_%s[%s<br />%s<a href='/broods/view/%s'>fas:fa-eye</a>]" . PHP_EOL,
h($brood['id']), h($brood['id']),
'<span class="font-weight-bold">' . h($brood['name']) . '</span>', "<span class='font-weight-bold'>" . h($brood['name']) . '</span>',
sprintf( sprintf(
"Connected: <span class='%s' title='%s'>%s</span>%s", "Connected: <span class='%s' title='%s'>%s</span>%s",
$brood['status']['code'] === 200 ? 'text-success' : 'text-danger', $brood['status']['code'] === 200 ? 'text-success' : 'text-danger',
@ -311,20 +311,20 @@ class InstanceTable extends AppTable
); );
} }
$tools = ''; $tools = '';
foreach ($data['tools'] as $tool) { foreach ($data['tools'] as $k => $tool) {
$tools .= sprintf( $tools .= sprintf(
' subgraph instance_local_tools_%s[%s %s connector]' . PHP_EOL . ' direction TB' . PHP_EOL, ' subgraph instance_local_tools_%s[%s %s connector]' . PHP_EOL . ' direction TB' . PHP_EOL,
h($tool['name']), h($k),
isset($tool['logo']) ? '<img src="/img/local_tools/' . h($tool['logo']) . '" style="width: 50px; height:50px;" />' : 'fas:fa-wrench', isset($tool['logo']) ? "<img src='/img/local_tools/" . h($tool['logo']) . "' style='width: 50px; height:50px;' />" : 'fas:fa-wrench',
h($tool['name']) h($tool['name'])
); );
foreach ($tool['connections'] as $connection) { foreach ($tool['connections'] as $k2 => $connection) {
$tools .= sprintf( $tools .= sprintf(
" %s[%s<br />%s<br />%s]" . PHP_EOL, " connection%s[%s<br />%s<br />%s]" . PHP_EOL,
h($connection['name']), h($k2),
h($connection['name']), h($connection['name']),
sprintf( sprintf(
__('Health') . ': <span title="%s" class="%s">%s</span>', __('Health') . ": <span title='%s' class='%s'>%s</span>",
h($connection['message']), h($connection['message']),
$connection['health'] === 1 ? 'text-success' : 'text-danger', $connection['health'] === 1 ? 'text-success' : 'text-danger',
$connection['health'] === 1 ? 'fas:fa-check' : 'fas:fa-times' $connection['health'] === 1 ? 'fas:fa-check' : 'fas:fa-times'
@ -338,7 +338,7 @@ class InstanceTable extends AppTable
$tools .= ' end' . PHP_EOL; $tools .= ' end' . PHP_EOL;
} }
$this_cerebrate = sprintf( $this_cerebrate = sprintf(
'C1[My Cerebrate<br />Version: <span class="%s">v%s</span>]', "C1[My Cerebrate<br />Version: <span class='%s'>v%s</span>]",
$version === $newest ? 'text-success' : 'text-danger', $version === $newest ? 'text-success' : 'text-danger',
$version $version
); );

4
templates/Instance/topology.php
View File

@ -1,4 +1,8 @@
<?php <?php
echo sprintf(
'<a class="btn btn-primary" href="%s/instance/downloadTopology">Download markdown</a>',
h($baseurl)
);
echo $this->element('genericElements/mermaid', [ echo $this->element('genericElements/mermaid', [
'data' => $data, 'data' => $data,
]); ]);