refactor(agent): refactor agentService to es6 (#4091)

pull/4098/head
Chaim Lev-Ari 2020-07-23 10:45:47 +03:00 committed by GitHub
parent 1ef7347f19
commit f761e65167
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 45 deletions

View File

@ -1,21 +1,17 @@
import angular from 'angular';
import { AgentViewModel } from '../models/agent'; import { AgentViewModel } from '../models/agent';
angular.module('portainer.agent').factory('AgentService', [ angular.module('portainer.agent').factory('AgentService', AgentServiceFactory);
'$q',
'Agent',
'AgentVersion1',
'HttpRequestHelper',
'Host',
'StateManager',
function AgentServiceFactory($q, Agent, AgentVersion1, HttpRequestHelper, Host, StateManager) {
'use strict';
var service = {};
service.agents = agents; function AgentServiceFactory(Agent, AgentVersion1, HttpRequestHelper, Host, StateManager) {
service.hostInfo = hostInfo; return {
agents,
hostInfo,
};
function getAgentApiVersion() { function getAgentApiVersion() {
var state = StateManager.getState(); const state = StateManager.getState();
return state.endpoint.agentApiVersion; return state.endpoint.agentApiVersion;
} }
@ -24,27 +20,16 @@ angular.module('portainer.agent').factory('AgentService', [
return Host.info().$promise; return Host.info().$promise;
} }
function agents() { async function agents() {
var deferred = $q.defer(); const agentVersion = getAgentApiVersion();
const service = agentVersion > 1 ? Agent : AgentVersion1;
var agentVersion = getAgentApiVersion(); try {
var service = agentVersion > 1 ? Agent : AgentVersion1; const agents = await service.query({ version: agentVersion }).$promise;
return agents.map(function (item) {
service
.query({ version: agentVersion })
.$promise.then(function success(data) {
var agents = data.map(function (item) {
return new AgentViewModel(item); return new AgentViewModel(item);
}); });
deferred.resolve(agents); } catch (err) {
}) throw { msg: 'Unable to retrieve agents', err };
.catch(function error(err) { }
deferred.reject({ msg: 'Unable to retrieve agents', err: err }); }
});
return deferred.promise;
} }
return service;
},
]);