Commit 26496544 by Samuel Padgett

DataService.delete should cascade by default

parent 23923bd9
...@@ -1146,14 +1146,18 @@ angular.module('openshiftCommonServices') ...@@ -1146,14 +1146,18 @@ angular.module('openshiftCommonServices')
var deferred = $q.defer(); var deferred = $q.defer();
var self = this; var self = this;
var data, headers = {}; var data, headers = {};
var data = {
kind: "DeleteOptions",
apiVersion: "v1",
// Default to "Foreground" (cascading) if no propagationPolicy was given.
propagationPolicy: opts.propagationPolicy || "Foreground"
};
var headers = {
'Content-Type': 'application/json'
};
// Differentiate between 0 and undefined // Differentiate between 0 and undefined
if (_.has(opts, 'gracePeriodSeconds')) { if (_.has(opts, 'gracePeriodSeconds')) {
data = { data.gracePeriodSeconds = opts.gracePeriodSeconds;
kind: "DeleteOptions",
apiVersion: "v1",
gracePeriodSeconds: opts.gracePeriodSeconds
};
headers['Content-Type'] = 'application/json';
} }
this._getNamespace(resource, context, opts).then(function(ns){ this._getNamespace(resource, context, opts).then(function(ns){
$http(angular.extend({ $http(angular.extend({
......
...@@ -2492,14 +2492,18 @@ angular.module('openshiftCommonServices') ...@@ -2492,14 +2492,18 @@ angular.module('openshiftCommonServices')
var deferred = $q.defer(); var deferred = $q.defer();
var self = this; var self = this;
var data, headers = {}; var data, headers = {};
var data = {
kind: "DeleteOptions",
apiVersion: "v1",
// Default to "Foreground" (cascading) if no propagationPolicy was given.
propagationPolicy: opts.propagationPolicy || "Foreground"
};
var headers = {
'Content-Type': 'application/json'
};
// Differentiate between 0 and undefined // Differentiate between 0 and undefined
if (_.has(opts, 'gracePeriodSeconds')) { if (_.has(opts, 'gracePeriodSeconds')) {
data = { data.gracePeriodSeconds = opts.gracePeriodSeconds;
kind: "DeleteOptions",
apiVersion: "v1",
gracePeriodSeconds: opts.gracePeriodSeconds
};
headers['Content-Type'] = 'application/json';
} }
this._getNamespace(resource, context, opts).then(function(ns){ this._getNamespace(resource, context, opts).then(function(ns){
$http(angular.extend({ $http(angular.extend({
......
...@@ -1025,12 +1025,14 @@ var key = this._uniqueKey(resource, null, context, _.get(opts, "http.params")), ...@@ -1025,12 +1025,14 @@ var key = this._uniqueKey(resource, null, context, _.get(opts, "http.params")),
return callback && deferred.promise.then(callback), this._isCached(key) ? deferred.resolve(this._data(key)) :this._listInFlight(key) || this._startListOp(resource, context, opts), deferred.promise; return callback && deferred.promise.then(callback), this._isCached(key) ? deferred.resolve(this._data(key)) :this._listInFlight(key) || this._startListOp(resource, context, opts), deferred.promise;
}, DataService.prototype["delete"] = function(resource, name, context, opts) { }, DataService.prototype["delete"] = function(resource, name, context, opts) {
resource = APIService.toResourceGroupVersion(resource), opts = opts || {}; resource = APIService.toResourceGroupVersion(resource), opts = opts || {};
var data, deferred = $q.defer(), self = this, headers = {}; var data, deferred = $q.defer(), self = this, headers = {}, data = {
return _.has(opts, "gracePeriodSeconds") && (data = {
kind:"DeleteOptions", kind:"DeleteOptions",
apiVersion:"v1", apiVersion:"v1",
gracePeriodSeconds:opts.gracePeriodSeconds propagationPolicy:opts.propagationPolicy || "Foreground"
}, headers["Content-Type"] = "application/json"), this._getNamespace(resource, context, opts).then(function(ns) { }, headers = {
"Content-Type":"application/json"
};
return _.has(opts, "gracePeriodSeconds") && (data.gracePeriodSeconds = opts.gracePeriodSeconds), this._getNamespace(resource, context, opts).then(function(ns) {
$http(angular.extend({ $http(angular.extend({
method:"DELETE", method:"DELETE",
auth:{}, auth:{},
......
...@@ -147,14 +147,18 @@ angular.module('openshiftCommonServices') ...@@ -147,14 +147,18 @@ angular.module('openshiftCommonServices')
var deferred = $q.defer(); var deferred = $q.defer();
var self = this; var self = this;
var data, headers = {}; var data, headers = {};
var data = {
kind: "DeleteOptions",
apiVersion: "v1",
// Default to "Foreground" (cascading) if no propagationPolicy was given.
propagationPolicy: opts.propagationPolicy || "Foreground"
};
var headers = {
'Content-Type': 'application/json'
};
// Differentiate between 0 and undefined // Differentiate between 0 and undefined
if (_.has(opts, 'gracePeriodSeconds')) { if (_.has(opts, 'gracePeriodSeconds')) {
data = { data.gracePeriodSeconds = opts.gracePeriodSeconds;
kind: "DeleteOptions",
apiVersion: "v1",
gracePeriodSeconds: opts.gracePeriodSeconds
};
headers['Content-Type'] = 'application/json';
} }
this._getNamespace(resource, context, opts).then(function(ns){ this._getNamespace(resource, context, opts).then(function(ns){
$http(angular.extend({ $http(angular.extend({
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment