Fix syscollector fetching method

wazuh · Sep 7, 2018 · f7565d7 · f7565d7
1 parent 9a04774
commit f7565d7
Showing 1 changed file with 29 additions and 15 deletions.
diff --git a/public/controllers/agent/agents.js b/public/controllers/agent/agents.js
@@ -162,25 +162,47 @@ function (
         $scope.agent.syscheck = result;
     }
 
+    const loadSyscollector = async id => {
+        try {
+            const data = await Promise.all([
+                apiReq.request('GET', `/syscollector/${id}/hardware`, {}),
+                apiReq.request('GET', `/syscollector/${id}/os`, {})
+            ])
+            if(!data[0] || !data[0].data || !data[0].data.data || typeof data[0].data.data !== 'object' || !Object.keys(data[0].data.data).length ||
+               !data[1] || !data[1].data || !data[1].data.data || typeof data[1].data.data !== 'object' || !Object.keys(data[1].data.data).length){
+                $scope.syscollector = null;
+            } else {
+                $scope.syscollector = {
+                    hardware: data[0].data.data,
+                    os: data[1].data.data
+                };
+            }
+
+            return;
+
+        } catch (error) {
+            return Promise.reject(error);
+        }
+    }
+
     $scope.getAgent = async newAgentId => {
         try {
             $scope.load = true;
             changeAgent = true;
 
             const globalAgent = shareAgent.getAgent()
 
+            const id = commonData.checkLocationAgentId(newAgentId, globalAgent)
+
             if($scope.tab === 'configuration'){
-                return $scope.getAgentConfig(newAgentId);
+                await loadSyscollector(id)
+                return $scope.getAgentConfig(id);
             }
 
-            const id = commonData.checkLocationAgentId(newAgentId, globalAgent)
-
             const data = await Promise.all([
                 apiReq.request('GET', `/agents/${id}`, {}),
                 apiReq.request('GET', `/syscheck/${id}/last_scan`, {}),
-                apiReq.request('GET', `/rootcheck/${id}/last_scan`, {}),
-                apiReq.request('GET', `/syscollector/${id}/hardware`, {}),
-                apiReq.request('GET', `/syscollector/${id}/os`, {})
+                apiReq.request('GET', `/rootcheck/${id}/last_scan`, {})
             ]);
 
             // Agent
@@ -200,15 +222,7 @@ function (
 
             $scope.switchTab($scope.tab, true);
 
-            if(!data[3] || !data[3].data || !data[3].data.data || typeof data[3].data.data !== 'object' || !Object.keys(data[3].data.data).length ||
-               !data[4] || !data[4].data || !data[4].data.data || typeof data[4].data.data !== 'object' || !Object.keys(data[4].data.data).length){
-                $scope.syscollector = null;
-            } else {
-                $scope.syscollector = {
-                    hardware: data[3].data.data,
-                    os: data[4].data.data
-                };
-            }
+            await loadSyscollector(id);
 
             $scope.load = false;
             if(!$scope.$$phase) $scope.$digest();