feat(batch): delete historic batch entity feature

related to CAM-14723
vainamonen · Aug 3, 2022 · bb97193 · bb97193
1 parent f0a67d4
commit bb97193
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 9 deletions.
diff --git a/webapps/ui/cockpit/client/scripts/batches/components/batch.js b/webapps/ui/cockpit/client/scripts/batches/components/batch.js
@@ -119,7 +119,8 @@ Batch.prototype._remove = function(params) {
   var obj = this._batches.selection;
   params.id = obj.data.id;
   var self = this;
-  return this._sdk.resource('batch').delete(params, function(err) {
+
+  let cb = err => {
     self.deleteModal.instance && self.deleteModal.instance.close();
     self.deleteModal.instance = null;
 
@@ -132,7 +133,13 @@ Batch.prototype._remove = function(params) {
       obj.type = null;
       obj.data = {};
     }
-  });
+  };
+
+  if (obj.type === 'history') {
+    return this._sdk.resource('history').batchDelete(obj.data.id, cb);
+  } else {
+    return this._sdk.resource('batch').delete(params, cb);
+  }
 };
 
 var handleRetryResponse = function(context) {

diff --git a/webapps/ui/cockpit/client/scripts/batches/components/delete.js b/webapps/ui/cockpit/client/scripts/batches/components/delete.js
@@ -19,9 +19,10 @@
 
 var events = require('./events');
 
-var Delete = function() {
+var Delete = function(type) {
   this.cascade = false;
   this.disable = false;
+  this.type = type;
 };
 
 Delete.prototype.cancel = function() {

diff --git a/webapps/ui/cockpit/client/scripts/batches/controllers/modal-ctrl.js b/webapps/ui/cockpit/client/scripts/batches/controllers/modal-ctrl.js
@@ -22,6 +22,6 @@ var Ctrl = require('../components/delete');
 module.exports = [
   '$scope',
   function($scope) {
-    $scope.ctrl = new Ctrl();
+    $scope.ctrl = new Ctrl($scope.ctrl.getSelectionType());
   }
 ];
diff --git a/webapps/ui/cockpit/client/scripts/batches/controllers/view-ctrl.js b/webapps/ui/cockpit/client/scripts/batches/controllers/view-ctrl.js
@@ -158,6 +158,7 @@ module.exports = [
 
     events.on('deleteModal:open', function(deleteModal) {
       var modal = (deleteModal.instance = $modal.open({
+        scope: $scope,
         template: deleteModalTemplate,
         controller: deleteModalCtrl
       }));

diff --git a/webapps/ui/cockpit/client/scripts/batches/templates/cam-cockpit-batch-view.html b/webapps/ui/cockpit/client/scripts/batches/templates/cam-cockpit-batch-view.html
@@ -121,8 +121,7 @@ <h3 class="col-xs-8">
                   <span class="glyphicon glyphicon-repeat"></span>
                 </a>
 
-                <a ng-if="ctrl.getSelectionType() == 'runtime'"
-                   class="btn btn-danger action-button"
+                <a class="btn btn-danger action-button"
                    ng-click="ctrl.openDeleteModal()"
                    uib-tooltip="{{ 'BATCHES_PROGRESS_TOOLTIP_DELETE_BATCH' | translate }}">
                   <span class="glyphicon glyphicon-trash"></span>

diff --git a/webapps/ui/cockpit/client/scripts/batches/templates/delete-modal.html b/webapps/ui/cockpit/client/scripts/batches/templates/delete-modal.html
@@ -3,9 +3,11 @@ <h3 class="modal-title">{{ 'BATCHES_DELETE_TITLE' | translate }}</h3>
 </div>
 <div class="modal-body">
   {{ 'BATCHES_DELETE_LEGEND' | translate }}<br />
-  <br />
-  <input type="radio" ng-model="ctrl.cascade" ng-value="false" ng-disabled="ctrl.disable" /> {{ 'BATCHES_DELETE_INPUT_KEEP' | translate }}<br />
-  <input type="radio" ng-model="ctrl.cascade" ng-value="true" ng-disabled="ctrl.disable" /> {{ 'BATCHES_DELETE_INPUT_DELETE' | translate }}
+  <div ng-if="ctrl.type === 'runtime'">
+    <br />
+    <input type="radio" ng-model="ctrl.cascade" ng-value="false" ng-disabled="ctrl.disable" /> {{ 'BATCHES_DELETE_INPUT_KEEP' | translate }}<br />
+    <input type="radio" ng-model="ctrl.cascade" ng-value="true" ng-disabled="ctrl.disable" /> {{ 'BATCHES_DELETE_INPUT_DELETE' | translate }}
+  </div>
 </div>
 <div class="modal-footer">
     <button class="btn btn-default" ng-click="ctrl.cancel()" ng-disabled="ctrl.disable">{{ 'BATCHES_DELETE_BTN_CANCEL'  | translate }}</button>