tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-04-08 18:55:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed errors VC

Browse Source
This commit is contained in:
Daniel Barbero Martin 2020-02-05 18:56:28 +01:00
parent 902c42b559
commit 68dd01ba09
12 changed files with 170 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

200
pandora_console/general/header.php
View File

@ -213,85 +213,107 @@ if ($config['menu_type'] == 'classic') {
$select[0]['autorefresh_white_list']
);
if ($autorefresh_list !== null
&& array_search($_GET['sec2'], $autorefresh_list) !== false
if ($_GET['sec2'] === 'operation/visual_console/render_view'
&& $config['legacy_vc']
) {
$do_refresh = true;
if ($_GET['sec2'] == 'operation/agentes/pandora_networkmap') {
if ((!isset($_GET['tab'])) || ($_GET['tab'] != 'view')) {
$do_refresh = false;
if ($autorefresh_list !== null
&& array_search($_GET['sec2'], $autorefresh_list) !== false
) {
$do_refresh = true;
if ($_GET['sec2'] == 'operation/agentes/pandora_networkmap') {
if ((!isset($_GET['tab'])) || ($_GET['tab'] != 'view')) {
$do_refresh = false;
}
}
}
if ($do_refresh) {
if ($do_refresh) {
$autorefresh_img = html_print_image(
'images/header_refresh_gray.png',
true,
[
'class' => 'bot',
'alt' => 'lightning',
'title' => __('Configure autorefresh'),
]
);
if ((isset($select[0]['time_autorefresh']) === true)
&& $select[0]['time_autorefresh'] !== 0
&& $config['refr'] === null
) {
$config['refr'] = $select[0]['time_autorefresh'];
$autorefresh_txt .= ' (<span id="refrcounter">';
$autorefresh_txt .= date(
'i:s',
$config['refr']
);
$autorefresh_txt .= '</span>)';
} else if ($_GET['refr']) {
$autorefresh_txt .= ' (<span id="refrcounter">';
$autorefresh_txt .= date('i:s', $config['refr']);
$autorefresh_txt .= '</span>)';
}
$ignored_params['refr'] = '';
$values = get_refresh_time_array();
$autorefresh_additional = '<span id="combo_refr" style="display: none;">';
$autorefresh_additional .= html_print_select(
$values,
'ref',
'',
'',
__('Select'),
'0',
true,
false,
false
);
$autorefresh_additional .= '</span>';
unset($values);
if ($home_page != '') {
$autorefresh_link_open_img = '<a class="white autorefresh" href="index.php?refr=">';
} else {
$autorefresh_link_open_img = '<a class="white autorefresh" href="'.ui_get_url_refresh($ignored_params).'">';
}
if ($_GET['refr']
|| ((isset($select[0]['time_autorefresh']) === true)
&& $select[0]['time_autorefresh'] !== 0)
) {
if ($home_page != '') {
$autorefresh_link_open_txt = '<a class="autorefresh autorefresh_txt" href="index.php?refr=">';
} else {
$autorefresh_link_open_txt = '<a class="autorefresh autorefresh_txt" href="'.ui_get_url_refresh($ignored_params).'">';
}
} else {
$autorefresh_link_open_txt = '<a>';
}
$autorefresh_link_close = '</a>';
$display_counter = 'display:block';
} else {
$autorefresh_img = html_print_image('images/header_refresh_disabled_gray.png', true, ['class' => 'bot autorefresh_disabled', 'alt' => 'lightning', 'title' => __('Disabled autorefresh')]);
$ignored_params['refr'] = false;
$autorefresh_link_open_img = '';
$autorefresh_link_open_txt = '';
$autorefresh_link_close = '';
$display_counter = 'display:none';
}
} else {
$autorefresh_img = html_print_image(
'images/header_refresh_gray.png',
'images/header_refresh_disabled_gray.png',
true,
[
'class' => 'bot',
'class' => 'bot autorefresh_disabled',
'alt' => 'lightning',
'title' => __('Configure autorefresh'),
'title' => __('Disabled autorefresh'),
]
);
if ((isset($select[0]['time_autorefresh']) === true)
&& $select[0]['time_autorefresh'] !== 0
&& $config['refr'] === null
) {
$config['refr'] = $select[0]['time_autorefresh'];
$autorefresh_txt .= ' (<span id="refrcounter">';
$autorefresh_txt .= date(
'i:s',
$config['refr']
);
$autorefresh_txt .= '</span>)';
} else if ($_GET['refr']) {
$autorefresh_txt .= ' (<span id="refrcounter">';
$autorefresh_txt .= date('i:s', $config['refr']);
$autorefresh_txt .= '</span>)';
}
$ignored_params['refr'] = '';
$values = get_refresh_time_array();
$autorefresh_additional = '<span id="combo_refr" style="display: none;">';
$autorefresh_additional .= html_print_select(
$values,
'ref',
'',
'',
__('Select'),
'0',
true,
false,
false
);
$autorefresh_additional .= '</span>';
unset($values);
if ($home_page != '') {
$autorefresh_link_open_img = '<a class="white autorefresh" href="index.php?refr=">';
} else {
$autorefresh_link_open_img = '<a class="white autorefresh" href="'.ui_get_url_refresh($ignored_params).'">';
}
if ($_GET['refr']
|| ((isset($select[0]['time_autorefresh']) === true)
&& $select[0]['time_autorefresh'] !== 0)
) {
if ($home_page != '') {
$autorefresh_link_open_txt = '<a class="autorefresh autorefresh_txt" href="index.php?refr=">';
} else {
$autorefresh_link_open_txt = '<a class="autorefresh autorefresh_txt" href="'.ui_get_url_refresh($ignored_params).'">';
}
} else {
$autorefresh_link_open_txt = '<a>';
}
$autorefresh_link_close = '</a>';
$display_counter = 'display:block';
} else {
$autorefresh_img = html_print_image('images/header_refresh_disabled_gray.png', true, ['class' => 'bot autorefresh_disabled', 'alt' => 'lightning', 'title' => __('Disabled autorefresh')]);
$ignored_params['refr'] = false;
$autorefresh_link_open_img = '';
@ -300,39 +322,21 @@ if ($config['menu_type'] == 'classic') {
$display_counter = 'display:none';
}
} else {
$autorefresh_img = html_print_image(
'images/header_refresh_disabled_gray.png',
true,
[
'class' => 'bot autorefresh_disabled',
'alt' => 'lightning',
'title' => __('Disabled autorefresh'),
]
);
$ignored_params['refr'] = false;
$header_autorefresh = '<div id="header_autorefresh">';
$header_autorefresh .= $autorefresh_link_open_img;
$header_autorefresh .= $autorefresh_img;
$header_autorefresh .= $autorefresh_link_close;
$header_autorefresh .= '</div>';
$autorefresh_link_open_img = '';
$autorefresh_link_open_txt = '';
$autorefresh_link_close = '';
$display_counter = 'display:none';
$header_autorefresh_counter = '<div id="header_autorefresh_counter" style="'.$display_counter.'">';
$header_autorefresh_counter .= $autorefresh_link_open_txt;
$header_autorefresh_counter .= $autorefresh_txt;
$header_autorefresh_counter .= $autorefresh_link_close;
$header_autorefresh_counter .= $autorefresh_additional;
$header_autorefresh_counter .= '</div>';
}
$header_autorefresh = '<div id="header_autorefresh">';
$header_autorefresh .= $autorefresh_link_open_img;
$header_autorefresh .= $autorefresh_img;
$header_autorefresh .= $autorefresh_link_close;
$header_autorefresh .= '</div>';
$header_autorefresh_counter = '<div id="header_autorefresh_counter" style="'.$display_counter.'">';
$header_autorefresh_counter .= $autorefresh_link_open_txt;
$header_autorefresh_counter .= $autorefresh_txt;
$header_autorefresh_counter .= $autorefresh_link_close;
$header_autorefresh_counter .= $autorefresh_additional;
$header_autorefresh_counter .= '</div>';
// Button for feedback pandora.
if (enterprise_installed()) {
$header_feedback = '<div id="feedback-icon-header">';

38
pandora_console/include/rest-api/models/VisualConsole/Item.php
View File

@ -1885,16 +1885,18 @@ class Item extends CachedModel
],
];
// Link enabled.
$inputs[] = [
'label' => __('Link enabled'),
'arguments' => [
'name' => 'isLinkEnabled',
'id' => 'isLinkEnabled',
'type' => 'switch',
'value' => $values['isLinkEnabled'],
],
];
if ($values['type'] !== LABEL) {
// Link enabled.
$inputs[] = [
'label' => __('Link enabled'),
'arguments' => [
'name' => 'isLinkEnabled',
'id' => 'isLinkEnabled',
'type' => 'switch',
'value' => $values['isLinkEnabled'],
],
];
}
// Show on top.
$inputs[] = [
@ -2232,7 +2234,21 @@ class Item extends CachedModel
{
// LinkConsoleInputGroup.
$fields = self::getAllVisualConsole($values['vCId']);
\array_unshift($fields, ['id' => 0, 'name' => __('None')]);
if ($fields === false) {
$fields = [];
} else {
$fields = \array_reduce(
$fields,
function ($carry, $item) {
$carry[$item['id']] = $item['name'];
return $carry;
},
[]
);
}
$fields[0] = __('None');
$getAllVisualConsoleValue = $values['linkedLayoutId'];
if (\is_metaconsole() === true) {

14
pandora_console/include/rest-api/models/VisualConsole/Items/Label.php
View File

@ -60,6 +60,16 @@ final class Label extends Item
);
}
if ($values['tabSelected'] === 'specific') {
// Inputs LinkedVisualConsole.
$inputsLinkedVisualConsole = self::inputsLinkedVisualConsole(
$values
);
foreach ($inputsLinkedVisualConsole as $key => $value) {
$inputs[] = $value;
}
}
return $inputs;
}
@ -75,10 +85,6 @@ final class Label extends Item
*/
public function getDefaultGeneralValues(array $values): array
{
if (isset($values['isLinkEnabled']) === false) {
$values['isLinkEnabled'] = false;
}
// Retrieve global - common inputs.
$values = parent::getDefaultGeneralValues($values);

24
pandora_console/include/rest-api/models/VisualConsole/Items/ModuleGraph.php
View File

@ -276,7 +276,7 @@ final class ModuleGraph extends Item
\enterprise_include_once('include/functions_metaconsole.php');
}
$imageOnly = true;
$imageOnly = false;
$backgroundType = static::extractBackgroundType($data);
$period = static::extractPeriod($data);
@ -344,7 +344,10 @@ final class ModuleGraph extends Item
'modules_series' => $customGraph['modules_series'],
];
$imgbase64 = 'data:image/jpg;base64,';
if ($imageOnly !== false) {
$imgbase64 = 'data:image/jpg;base64,';
}
$imgbase64 .= \graphic_combined_module(
false,
$params,
@ -356,8 +359,6 @@ final class ModuleGraph extends Item
throw new \InvalidArgumentException('missing module Id');
}
$imageOnly = false;
$params = [
'agent_module_id' => $moduleId,
'period' => $period,
@ -416,9 +417,18 @@ final class ModuleGraph extends Item
);
}
$data = array_reduce(
$data,
function ($carry, $item) {
$carry[$item['id_graph']] = $item['name'];
return $carry;
},
[]
);
$data[0] = __('None');
return array_reverse($data);
return $data;
}
@ -451,6 +461,10 @@ final class ModuleGraph extends Item
$values['period'] = 3600;
}
if (isset($values['showLegend']) === false) {
$values['showLegend'] = true;
}
// Background color.
$fields = [
'white' => __('White'),

16
pandora_console/include/rest-api/models/VisualConsole/View.php
View File

@ -81,19 +81,6 @@ class View extends \HTML
$activetabs = 2;
if ($type === LABEL) {
$activetabs = 0;
$tabs = [
[
'name' => __('Label settings'),
'id' => 'tab-label',
'href' => $url.'&tabSelected=label',
'img' => 'zoom.png',
],[
'name' => __('General settings'),
'id' => 'tab-general',
'href' => $url.'&tabSelected=general',
'img' => 'pencil.png',
],
];
} else if ($type === LINE_ITEM) {
$activetabs = 0;
$tabs = [
@ -501,6 +488,9 @@ class View extends \HTML
break;
case LABEL:
$data['isLinkEnabled'] = true;
break;
default:
// Not posible.
break;

3
pandora_console/include/visual-console-client/vc.main.css
View File

@ -699,7 +699,8 @@ li#li-timeZone-item > select:not(:first-child) {
}
div.label,
div.simple-value {
div.simple-value,
div.module-graph {
display: inline-table;
min-width: -webkit-fit-content;
min-width: -moz-fit-content;

2
pandora_console/include/visual-console-client/vc.main.css.map
View File

File diff suppressed because one or more lines are too long

2
pandora_console/include/visual-console-client/vc.main.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
pandora_console/include/visual-console-client/vc.main.min.js.map
View File

File diff suppressed because one or more lines are too long

2
visual_console_client/src/Item.ts
View File

@ -516,7 +516,7 @@ abstract class VisualConsoleItem<Props extends ItemProps> {
e.stopPropagation();
} else {
// Add loading click item.
if (this.itemProps.isLinkEnabled) {
if (this.itemProps.isLinkEnabled && this.itemProps.link != null) {
const divParent = document.createElement("div");
divParent.className = "div-visual-console-spinner";
const divSpinner = document.createElement("div");

1
visual_console_client/src/items/ModuleGraph.ts
View File

@ -96,6 +96,7 @@ export default class ModuleGraph extends Item<ModuleGraphProps> {
//}px`;
element.innerHTML = this.props.html;
element.className = "module-graph";
// Remove the overview graph.
const legendP = element.getElementsByTagName("p");

3
visual_console_client/src/main.css
View File

@ -525,7 +525,8 @@ li#li-timeZone-item > select:not(:first-child) {
}
div.label,
div.simple-value {
div.simple-value,
div.module-graph {
display: inline-table;
min-width: fit-content;
min-height: fit-content;