Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-05 13:55:21 +02:00
Code Issues Releases Activity

feat(container): add a deletion generic handler used for container/network deletion

Browse source
This commit is contained in:
Anthony Lapenna 2016-09-01 15:07:31 +12:00
parent 4b979628b3
commit fb982ca8f1
4 changed files with 48 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

46
app/shared/responseHandlers.js
View file

@ -21,6 +21,29 @@ function jsonObjectsToArrayHandler(data) {
return angular.fromJson(str);
}
// The Docker API often returns an empty string on success (Docker 1.9 -> Docker 1.12).
// On error, it returns either an error message as a string (Docker < 1.12) or a JSON object with the field message
// container the error (Docker = 1.12).
// This handler returns an empty object on success or a newly created JSON object with
// the field message containing the error message on failure.
// Used by the API in: container deletion, network deletion.
function deleteGenericHandler(data) {
var response = {};
// No data is returned when deletion is successful (Docker 1.9 -> 1.12)
if (!data) {
return response;
}
// A string is returned on failure (Docker < 1.12)
else if (!isJSON(data)) {
response.message = data;
}
// Docker 1.12 returns a valid JSON object when an error occurs
else {
response = angular.fromJson(data);
}
return response;
}
// Image delete API returns an array on success (Docker 1.9 -> Docker 1.12).
// On error, it returns either an error message as a string (Docker < 1.12) or a JSON object with the field message
// container the error (Docker = 1.12).
@ -43,26 +66,3 @@ function deleteImageHandler(data) {
}
return response;
}
// Network delete API returns an empty string on success (Docker 1.9 -> Docker 1.12).
// On error, it returns either an error message as a string (Docker < 1.12) or a JSON object with the field message
// container the error (Docker = 1.12).
// This handler returns an empty object on success or a newly created JSON object with
// the field message containing the error message on failure.
function deleteNetworkHandler(data) {
var response = {};
// No data is returned when deletion is successful (Docker 1.9 -> 1.12)
if (!data) {
return response;
}
// A string is returned when an error occurs (Docker < 1.12)
else if (data && !isJSON(data)) {
response.message = data;
return response;
}
// Docker 1.12 returns a valid JSON object when an error occurs
else {
response = angular.fromJson(data);
}
return response;
}

7
app/shared/services.js
View file

@ -16,7 +16,10 @@ angular.module('uifordocker.services', ['ngResource', 'ngSanitize'])
unpause: {method: 'POST', params: {id: '@id', action: 'unpause'}},
changes: {method: 'GET', params: {action: 'changes'}, isArray: true},
create: {method: 'POST', params: {action: 'create'}},
remove: {method: 'DELETE', params: {id: '@id', v: 0}},
remove: {
method: 'DELETE', params: {id: '@id', v: 0},
transformResponse: deleteGenericHandler
},
rename: {method: 'POST', params: {id: '@id', action: 'rename', name: '@name'}},
stats: {method: 'GET', params: {id: '@id', stream: false, action: 'stats'}, timeout: 5000},
exec: {method: 'POST', params: {id: '@id', action: 'exec'}}
@ -135,7 +138,7 @@ angular.module('uifordocker.services', ['ngResource', 'ngSanitize'])
query: {method: 'GET', isArray: true},
get: {method: 'GET'},
create: {method: 'POST', params: {action: 'create'}},
remove: { method: 'DELETE', transformResponse: deleteNetworkHandler },
remove: { method: 'DELETE', transformResponse: deleteGenericHandler },
connect: {method: 'POST', params: {action: 'connect'}},
disconnect: {method: 'POST', params: {action: 'disconnect'}}
});