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

fix(ui): remove loading of missing interceptors [EE-4604] (#8086)

pull/8042/head
Chaim Lev-Ari 2022-11-21 17:25:09 +02:00 committed by GitHub
parent 1e4c4e2616
commit 253a3a2b40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/docker/rest/container.js
View File

@ -4,8 +4,7 @@ angular.module('portainer.docker').factory('Container', [
'$resource', '$resource',
'API_ENDPOINT_ENDPOINTS', 'API_ENDPOINT_ENDPOINTS',
'EndpointProvider', 'EndpointProvider',
'ContainersInterceptor', function ContainerFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider) {
function ContainerFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider, ContainersInterceptor) {
'use strict'; 'use strict';
return $resource( return $resource(
API_ENDPOINT_ENDPOINTS + '/:endpointId/docker/containers/:id/:action', API_ENDPOINT_ENDPOINTS + '/:endpointId/docker/containers/:id/:action',
@ -18,7 +17,6 @@ angular.module('portainer.docker').factory('Container', [
method: 'GET', method: 'GET',
params: { all: 0, action: 'json', filters: '@filters' }, params: { all: 0, action: 'json', filters: '@filters' },
isArray: true, isArray: true,
interceptor: ContainersInterceptor,
}, },
get: { get: {
method: 'GET', method: 'GET',

5
app/docker/rest/image.js
View File

@ -6,8 +6,7 @@ angular.module('portainer.docker').factory('Image', [
'API_ENDPOINT_ENDPOINTS', 'API_ENDPOINT_ENDPOINTS',
'EndpointProvider', 'EndpointProvider',
'HttpRequestHelper', 'HttpRequestHelper',
'ImagesInterceptor', function ImageFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider, HttpRequestHelper) {
function ImageFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider, HttpRequestHelper, ImagesInterceptor) {
'use strict'; 'use strict';
return $resource( return $resource(
@ -16,7 +15,7 @@ angular.module('portainer.docker').factory('Image', [
endpointId: EndpointProvider.endpointID, endpointId: EndpointProvider.endpointID,
}, },
{ {
query: { method: 'GET', params: { all: 0, action: 'json' }, isArray: true, interceptor: ImagesInterceptor }, query: { method: 'GET', params: { all: 0, action: 'json' }, isArray: true },
get: { method: 'GET', params: { action: 'json' } }, get: { method: 'GET', params: { action: 'json' } },
search: { method: 'GET', params: { action: 'search' } }, search: { method: 'GET', params: { action: 'search' } },
history: { method: 'GET', params: { action: 'history' }, isArray: true }, history: { method: 'GET', params: { action: 'history' }, isArray: true },

4
app/docker/rest/network.js
View File

@ -4,8 +4,7 @@ angular.module('portainer.docker').factory('Network', [
'$resource', '$resource',
'API_ENDPOINT_ENDPOINTS', 'API_ENDPOINT_ENDPOINTS',
'EndpointProvider', 'EndpointProvider',
'NetworksInterceptor', function NetworkFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider) {
function NetworkFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider, NetworksInterceptor) {
'use strict'; 'use strict';
return $resource( return $resource(
API_ENDPOINT_ENDPOINTS + '/:endpointId/docker/networks/:id/:action', API_ENDPOINT_ENDPOINTS + '/:endpointId/docker/networks/:id/:action',
@ -17,7 +16,6 @@ angular.module('portainer.docker').factory('Network', [
query: { query: {
method: 'GET', method: 'GET',
isArray: true, isArray: true,
interceptor: NetworksInterceptor,
}, },
get: { get: {
method: 'GET', method: 'GET',

7
app/docker/rest/system.js
View File

@ -4,9 +4,7 @@ angular.module('portainer.docker').factory('System', [
'$resource', '$resource',
'API_ENDPOINT_ENDPOINTS', 'API_ENDPOINT_ENDPOINTS',
'EndpointProvider', 'EndpointProvider',
'InfoInterceptor', function SystemFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider) {
'VersionInterceptor',
function SystemFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider, InfoInterceptor, VersionInterceptor) {
'use strict'; 'use strict';
return $resource( return $resource(
API_ENDPOINT_ENDPOINTS + '/:endpointId/docker/:action/:subAction', API_ENDPOINT_ENDPOINTS + '/:endpointId/docker/:action/:subAction',
@ -18,9 +16,8 @@ angular.module('portainer.docker').factory('System', [
info: { info: {
method: 'GET', method: 'GET',
params: { action: 'info' }, params: { action: 'info' },
interceptor: InfoInterceptor,
}, },
version: { method: 'GET', params: { action: 'version' }, interceptor: VersionInterceptor }, version: { method: 'GET', params: { action: 'version' } },
events: { events: {
method: 'GET', method: 'GET',
params: { action: 'events', since: '@since', until: '@until' }, params: { action: 'events', since: '@since', until: '@until' },

5
app/docker/rest/volume.js
View File

@ -4,8 +4,7 @@ angular.module('portainer.docker').factory('Volume', [
'$resource', '$resource',
'API_ENDPOINT_ENDPOINTS', 'API_ENDPOINT_ENDPOINTS',
'EndpointProvider', 'EndpointProvider',
'VolumesInterceptor', function VolumeFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider) {
function VolumeFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider, VolumesInterceptor) {
'use strict'; 'use strict';
function addVolumeNameToHeader(config) { function addVolumeNameToHeader(config) {
@ -18,7 +17,7 @@ angular.module('portainer.docker').factory('Volume', [
endpointId: EndpointProvider.endpointID, endpointId: EndpointProvider.endpointID,
}, },
{ {
query: { method: 'GET', interceptor: VolumesInterceptor }, query: { method: 'GET' },
get: { method: 'GET', params: { id: '@id' } }, get: { method: 'GET', params: { id: '@id' } },
create: { create: {
method: 'POST', method: 'POST',