Adapt to 7.5.1

wazuh · Dec 20, 2019 · 71f0ef2 · 71f0ef2
1 parent 1eedbb2
commit 71f0ef2
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "revision": "0555",
   "code": "0555-0",
   "kibana": {
-    "version": "7.5.0"
+    "version": "7.5.1"
   },
   "description": "Wazuh app",
   "main": "index.js",
@@ -52,7 +52,7 @@
     "winston": "3.0.0"
   },
   "devDependencies": {
-    "@elastic/plugin-helpers": "^7.1.8",
+    "@kbn/plugin-helpers": "link:../../packages/kbn-plugin-helpers",
     "babel-eslint": "^8.2.6",
     "chai": "^4.1.2",
     "eslint": "^5.10.0",

diff --git a/public/factories/tab-visualizations.js b/public/factories/tab-visualizations.js
@@ -22,7 +22,7 @@ export class TabVisualizations {
       pm: 4,
       vuls: 10,
       oscap: 13,
-      ciscat: 11,
+      ciscat: 3,
       audit: 9,
       gdpr: 6,
       pci: 6,
@@ -41,7 +41,7 @@ export class TabVisualizations {
       pm: 5,
       vuls: 10,
       oscap: 11,
-      ciscat: 11,
+      ciscat: 3,
       audit: 6,
       pci: 5,
       gdpr: 5,

diff --git a/public/factories/vis-handlers.js b/public/factories/vis-handlers.js
@@ -125,4 +125,4 @@ export class VisHandlers {
   removeAll() {
     this.list = [];
   }
-}
+}
diff --git a/public/kibana-integrations/index.js b/public/kibana-integrations/index.js
@@ -12,4 +12,4 @@
 import './kibana-visualization';
 import './kibana-discover';
 import './saved-visualizations';
-import './wz-top-nav';
+import './wz-top-nav';
diff --git a/public/kibana-integrations/kibana-discover.js b/public/kibana-integrations/kibana-discover.js
@@ -501,8 +501,8 @@ function discoverController(
                   queryFilter.getFilters()
                 );
                 $scope.filters = queryFilter.getFilters();
-                $rootScope.$broadcast('updateVis');
                 $rootScope.$broadcast('fetch');
+                $rootScope.$broadcast('updateVis');
                 if ($location.search().tab != 'configuration') {
                   loadedVisualizations.removeAll();
                   $rootScope.rendered = false;
@@ -691,16 +691,16 @@ function discoverController(
     // Update query from search bar
     discoverPendingUpdates.removeAll();
     discoverPendingUpdates.addItem($state.query, queryFilter.getFilters());
-
+    //Kibana 7.5.0
+    queryFilter.setFilters(queryFilter.getFilters());
+    /////
+    $rootScope.$broadcast('updateVis');
     timefilter.setTime(dateRange);
     if (query && typeof query === 'object') $state.query = query;
-
     $scope.fetch();
-    $rootScope.$broadcast('updateVis');
   };
 
   function onResults(resp) {
-
     logInspectorResponse(resp);
 
     if ($scope.opts.timefield) {
@@ -735,6 +735,7 @@ function discoverController(
 
     $scope.fetchStatus = fetchStatuses.COMPLETE;
     $scope.activeNoImplicitsFilters();
+    $rootScope.$broadcast('updateVis');
   }
 
   let inspectorRequest;
@@ -1099,7 +1100,7 @@ function discoverController(
   $rootScope.$watch('rendered', () => {
     if (!$rootScope.rendered) {
       $scope.hideCloseButtons();
-    }else{
+    } else {
       $scope.activeNoImplicitsFilters();
     }
   });
@@ -1169,4 +1170,4 @@ function discoverController(
   ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
   ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
   init();
-}
+}
diff --git a/public/kibana-integrations/kibana-visualization.js b/public/kibana-integrations/kibana-visualization.js
@@ -171,7 +171,6 @@ app.directive('kbnVis', function () {
                 });
               }
               setSearchSource(discoverList);
-              $rootScope.rendered = true;
             }
           }
         } catch (error) {
@@ -252,7 +251,7 @@ app.directive('kbnVis', function () {
         loadedVisualizations.addItem(true);
 
         const currentLoaded = loadedVisualizations.getList().length;
-        const deadVis = tabVisualizations.getDeadVis();
+        const deadVis = tab === 'ciscat' ? 0 : tabVisualizations.getDeadVis();
         const totalTabVis = tabVisualizations.getItem(tab) - deadVis;
 
         if (totalTabVis < 1) {
@@ -284,4 +283,4 @@ app.directive('kbnVis', function () {
       let loader = null;
     }
   };
-});
+});
diff --git a/public/kibana-integrations/saved-object-loader.js b/public/kibana-integrations/saved-object-loader.js
@@ -167,4 +167,4 @@ export class SavedObjectLoader {
       };
     });
   }
-}
+}
diff --git a/public/kibana-integrations/wz-top-nav.js b/public/kibana-integrations/wz-top-nav.js
@@ -114,4 +114,4 @@ module.directive('wzTopNavHelper', (reactDirective) => {
       'showAutoRefreshOnly',
     ],
   );
-});
+});