github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

refactor(agent): refactor rest factories to es6 (#4090) 

* refactor(agent): replace v1 browse with es6 module

* refactor(agent): refactor agentv1 to es6

* refactor(agent): replace agent factory with es6

* refactor(agent): refactor browse response to es6

* refactor(agent): refactor browse to es6

* refactor(agent): import angular

* refactor(agent): refactor host to es6

* refactor(agent): refactor ping to es6
pull/4098/head
Chaim Lev-Ari 2020-07-23 10:45:01 +03:00 committed by GitHub
parent 435f15ec6a
commit 7eb8d5449a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 143 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
app/agent/rest/agent.js
View File

@ -1,19 +1,16 @@
angular.module('portainer.agent').factory('Agent', [
'$resource',
'API_ENDPOINT_ENDPOINTS',
'EndpointProvider',
'StateManager',
function AgentFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider, StateManager) {
'use strict';
return $resource(
API_ENDPOINT_ENDPOINTS + '/:endpointId/docker/v:version/agents',
{
endpointId: EndpointProvider.endpointID,
version: StateManager.getAgentApiVersion,
},
{
query: { method: 'GET', isArray: true },
}
);
},
]);
import angular from 'angular';
angular.module('portainer.agent').factory('Agent', AgentFactory);
function AgentFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider, StateManager) {
return $resource(
`${API_ENDPOINT_ENDPOINTS}/:endpointId/docker/v:version/agents`,
{
endpointId: EndpointProvider.endpointID,
version: StateManager.getAgentApiVersion,
},
{
query: { method: 'GET', isArray: true },
}
);
}

69
app/agent/rest/browse.js
View File

@ -1,39 +1,36 @@
import angular from 'angular';
import { browseGetResponse } from './response/browse';
angular.module('portainer.agent').factory('Browse', [
'$resource',
'API_ENDPOINT_ENDPOINTS',
'EndpointProvider',
'StateManager',
function BrowseFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider, StateManager) {
'use strict';
return $resource(
API_ENDPOINT_ENDPOINTS + '/:endpointId/docker/v:version/browse/:action',
{
endpointId: EndpointProvider.endpointID,
version: StateManager.getAgentApiVersion,
angular.module('portainer.agent').factory('Browse', BrowseFactory);
function BrowseFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider, StateManager) {
return $resource(
`${API_ENDPOINT_ENDPOINTS}/:endpointId/docker/v:version/browse/:action`,
{
endpointId: EndpointProvider.endpointID,
version: StateManager.getAgentApiVersion,
},
{
ls: {
method: 'GET',
isArray: true,
params: { action: 'ls' },
},
{
ls: {
method: 'GET',
isArray: true,
params: { action: 'ls' },
},
get: {
method: 'GET',
params: { action: 'get' },
transformResponse: browseGetResponse,
responseType: 'arraybuffer',
},
delete: {
method: 'DELETE',
params: { action: 'delete' },
},
rename: {
method: 'PUT',
params: { action: 'rename' },
},
}
);
},
]);
get: {
method: 'GET',
params: { action: 'get' },
transformResponse: browseGetResponse,
responseType: 'arraybuffer',
},
delete: {
method: 'DELETE',
params: { action: 'delete' },
},
rename: {
method: 'PUT',
params: { action: 'rename' },
},
}
);
}

35
app/agent/rest/host.js
View File

@ -1,19 +1,16 @@
angular.module('portainer.agent').factory('Host', [
'$resource',
'API_ENDPOINT_ENDPOINTS',
'EndpointProvider',
'StateManager',
function AgentFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider, StateManager) {
'use strict';
return $resource(
API_ENDPOINT_ENDPOINTS + '/:endpointId/docker/v:version/host/:action',
{
endpointId: EndpointProvider.endpointID,
version: StateManager.getAgentApiVersion,
},
{
info: { method: 'GET', params: { action: 'info' } },
}
);
},
]);
import angular from 'angular';
angular.module('portainer.agent').factory('Host', HostFactory);
function HostFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider, StateManager) {
return $resource(
`${API_ENDPOINT_ENDPOINTS}/:endpointId/docker/v:version/host/:action`,
{
endpointId: EndpointProvider.endpointID,
version: StateManager.getAgentApiVersion,
},
{
info: { method: 'GET', params: { action: 'info' } },
}
);
}

63
app/agent/rest/ping.js
View File

@ -1,35 +1,32 @@
angular.module('portainer.agent').factory('AgentPing', [
'$resource',
'API_ENDPOINT_ENDPOINTS',
'EndpointProvider',
'$q',
function AgentPingFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider, $q) {
'use strict';
return $resource(
API_ENDPOINT_ENDPOINTS + '/:endpointId/docker/ping',
{
endpointId: EndpointProvider.endpointID,
},
{
ping: {
method: 'GET',
interceptor: {
response: function versionInterceptor(response) {
var instance = response.resource;
var version = response.headers('Portainer-Agent-Api-Version') || 1;
instance.version = Number(version);
return instance;
},
responseError: function versionResponseError(error) {
// 404 - agent is up - set version to 1
if (error.status === 404) {
return { version: 1 };
}
return $q.reject(error);
},
import angular from 'angular';
angular.module('portainer.agent').factory('AgentPing', AgentPingFactory);
function AgentPingFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider, $q) {
return $resource(
`${API_ENDPOINT_ENDPOINTS}/:endpointId/docker/ping`,
{
endpointId: EndpointProvider.endpointID,
},
{
ping: {
method: 'GET',
interceptor: {
response: function versionInterceptor(response) {
const instance = response.resource;
const version = response.headers('Portainer-Agent-Api-Version') || 1;
instance.version = Number(version);
return instance;
},
responseError: function versionResponseError(error) {
// 404 - agent is up - set version to 1
if (error.status === 404) {
return { version: 1 };
}
return $q.reject(error);
},
},
}
);
},
]);
},
}
);
}

2
app/agent/rest/response/browse.js
View File

@ -3,7 +3,7 @@
// This functions simply creates a response object and assign
// the data to a field.
export function browseGetResponse(data) {
var response = {};
const response = {};
response.file = data;
return response;
}

32
app/agent/rest/v1/agent.js
View File

@ -1,17 +1,15 @@
angular.module('portainer.agent').factory('AgentVersion1', [
'$resource',
'API_ENDPOINT_ENDPOINTS',
'EndpointProvider',
function AgentFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider) {
'use strict';
return $resource(
API_ENDPOINT_ENDPOINTS + '/:endpointId/docker/agents',
{
endpointId: EndpointProvider.endpointID,
},
{
query: { method: 'GET', isArray: true },
}
);
},
]);
import angular from 'angular';
angular.module('portainer.agent').factory('AgentVersion1', AgentFactory);
function AgentFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider) {
return $resource(
`${API_ENDPOINT_ENDPOINTS}/:endpointId/docker/agents`,
{
endpointId: EndpointProvider.endpointID,
},
{
query: { method: 'GET', isArray: true },
}
);
}

66
app/agent/rest/v1/browse.js
View File

@ -1,37 +1,35 @@
import angular from 'angular';
import { browseGetResponse } from '../response/browse';
angular.module('portainer.agent').factory('BrowseVersion1', [
'$resource',
'API_ENDPOINT_ENDPOINTS',
'EndpointProvider',
function BrowseFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider) {
'use strict';
return $resource(
API_ENDPOINT_ENDPOINTS + '/:endpointId/docker/browse/:volumeID/:action',
{
endpointId: EndpointProvider.endpointID,
angular.module('portainer.agent').factory('BrowseVersion1', BrowseFactory);
function BrowseFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider) {
return $resource(
`${API_ENDPOINT_ENDPOINTS}/:endpointId/docker/browse/:volumeID/:action`,
{
endpointId: EndpointProvider.endpointID,
},
{
ls: {
method: 'GET',
isArray: true,
params: { action: 'ls' },
},
{
ls: {
method: 'GET',
isArray: true,
params: { action: 'ls' },
},
get: {
method: 'GET',
params: { action: 'get' },
transformResponse: browseGetResponse,
responseType: 'arraybuffer',
},
delete: {
method: 'DELETE',
params: { action: 'delete' },
},
rename: {
method: 'PUT',
params: { action: 'rename' },
},
}
);
},
]);
get: {
method: 'GET',
params: { action: 'get' },
transformResponse: browseGetResponse,
responseType: 'arraybuffer',
},
delete: {
method: 'DELETE',
params: { action: 'delete' },
},
rename: {
method: 'PUT',
params: { action: 'rename' },
},
}
);
}