Skip to content

Commit f100668

Browse files
author
Borja
authored
Merge pull request #1662 from wazuh/3.9.4-7.3.0
Fix file viewer margin bottom
2 parents 6ac98e0 + 3224f3b commit f100668

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

public/directives/wz-config-viewer/wz-config-viewer.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,11 @@ class WzConfigViewer {
8181
const bottom = $scope.isLogs ? 75 : 20;
8282
const headerContainer = $('.wzXmlEditorHeader');
8383
const headerContainerHeight =
84-
headerContainer.height() + 30 ? headerContainer.height() + 30 : 80;
84+
headerContainer.height() + 30
85+
? headerContainer.height() + 30
86+
: $scope.isLogs
87+
? 0
88+
: 80;
8589
editorContainer.height(windows - (offsetTop + bottom));
8690
$('.wzXmlEditorBody .CodeMirror').height(
8791
windows - (offsetTop + bottom + headerContainerHeight)

public/kibana-integrations/kibana-discover.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -1035,9 +1035,11 @@ function discoverController(
10351035
$scope.tabView = $location.search().tabView || 'panels';
10361036
const changeTabViewListener = $rootScope.$on(
10371037
'changeTabView',
1038-
(evt, parameters) => {
1038+
async (evt, parameters) => {
10391039
$scope.pinnedFilters = getPinnedFilters();
1040-
queryFilter.removeAll();
1040+
if (parameters.tabView !== 'discover') {
1041+
queryFilter.removeAll();
1042+
}
10411043
evt.stopPropagation();
10421044
$scope.tabView = parameters.tabView || 'panels';
10431045
}

0 commit comments

Comments
 (0)