diff --git a/module/instance/config/form.php b/module/instance/config/form.php index 041a8abda8..366524dce2 100644 --- a/module/instance/config/form.php +++ b/module/instance/config/form.php @@ -25,3 +25,6 @@ $config->instance->form->install['version'] = array('type' => 'string', 're $config->instance->form->install['dbType'] = array('type' => 'string', 'required' => false, 'default' => ''); $config->instance->form->install['dbService'] = array('type' => 'string', 'required' => false, 'default' => '', 'filter' => 'trim'); $config->instance->form->install['app_version'] = array('type' => 'string', 'required' => false, 'default' => ''); + +$config->instance->form->events = array(); +$config->instance->form->events['component'] = array('type' => 'string', 'required' => false, 'default' => ''); \ No newline at end of file diff --git a/module/instance/control.php b/module/instance/control.php index ede9332594..b05fa0a943 100644 --- a/module/instance/control.php +++ b/module/instance/control.php @@ -777,8 +777,8 @@ class instance extends control public function showEvents(int $id, string $component = '') { $instance = $this->instance->getByID($id); - - $data = $this->cne->getEvents($instance, $component) ?? new stdClass(); + $formData = form::data($this->config->instance->form->events)->get(); + $data = $this->cne->getEvents($instance, $formData->component) ?? new stdClass(); return print(json_encode($data)); } } diff --git a/module/instance/js/events.ui.js b/module/instance/js/events.ui.js index 4b98f057f7..3cb6e8e998 100644 --- a/module/instance/js/events.ui.js +++ b/module/instance/js/events.ui.js @@ -1,4 +1,4 @@ -window.initComponent = function (instanceID) +window.initComponent = function(instanceID) { toggleLoading('#events-panel', true); const $picker = $('[name=component]').zui('picker'); @@ -8,20 +8,21 @@ window.initComponent = function (instanceID) { toggleLoading('#events-panel', false); $picker.render({items: items}); - if (typeof (items) !== 'undefined') $picker.$.setValue(items.component); + if (typeof items !== 'undefined') $picker.$.setValue(items.component); if (items.length === 1) $('#component-events').addClass('hidden'); - showEvents(instanceID); }); }; -window.showEvents = function (instanceID, noEventTip) +window.showEvents = function(instanceID, noEventTip) { const instanceComponent = $('[name=component]').val(); - if (instanceComponent === '') return; - const target = $.createLink('instance', 'showEvents', 'id=' + instanceID + "&component=" + instanceComponent); + if(instanceComponent === '') return; + const target = $.createLink('instance', 'showEvents', 'id=' + instanceID); + let formData = {}; + formData.component = instanceComponent; toggleLoading('#events-panel', true); - $.getJSON(target, function (resp) + $.post(target, formData, function(resp) { toggleLoading('#events-panel', false); $('#events-content').removeClass('dtable-empty-tip flex'); @@ -31,7 +32,7 @@ window.showEvents = function (instanceID, noEventTip) $('#events-content').addClass('dtable-empty-tip flex'); return; } - $('#events-content').html(resp.data.map(item => item.lastSeen + ' ' + item.type + ' ' + item.reason + ' ' + item.object + ' ' + item.message).join('\n')); - $('#events-content')[0].scrollTop = $('#events-content')[0].scrollHeight; + $('#events-content').html(resp.data.map(item => item.lastSeen + ' ' + item.type + ' ' + item.reason + ' ' + item.object + ' ' + item.message).join('\n')); + $('#events-content')[0].scrollTop = $('#events-content')[0].scrollHeight; }); };