From dd501707cfcefc2d4e8d4c46e801bcfe99773b57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Maro=C5=A1i?= Date: Mon, 26 Nov 2018 16:12:50 +0100 Subject: [PATCH] Removed old service form controller code. --- .../service/service_form_controller.js | 54 ----------- app/views/service/_service_form.html.haml | 45 +-------- .../service/service_form_controller_spec.js | 93 ------------------- 3 files changed, 2 insertions(+), 190 deletions(-) delete mode 100644 app/assets/javascripts/controllers/service/service_form_controller.js delete mode 100644 spec/javascripts/controllers/service/service_form_controller_spec.js diff --git a/app/assets/javascripts/controllers/service/service_form_controller.js b/app/assets/javascripts/controllers/service/service_form_controller.js deleted file mode 100644 index 3354673dbc70..000000000000 --- a/app/assets/javascripts/controllers/service/service_form_controller.js +++ /dev/null @@ -1,54 +0,0 @@ -ManageIQ.angular.app.controller('serviceFormController', ['$http', '$scope', 'serviceFormId', 'miqService', function($http, $scope, serviceFormId, miqService) { - var vm = this; - - var init = function() { - vm.serviceModel = { - name: '', - description: '', - }; - vm.formId = serviceFormId; - vm.afterGet = false; - vm.newRecord = false; - vm.modelCopy = Object.assign({}, vm.serviceModel); - vm.model = 'serviceModel'; - vm.saveable = miqService.saveable; - - ManageIQ.angular.scope = vm; - - miqService.sparkleOn(); - $http.get('/service/service_form_fields/' + serviceFormId) - .then(getServiceFormData) - .catch(miqService.handleFailure); - }; - - var serviceEditButtonClicked = function(buttonName, serializeFields) { - miqService.sparkleOn(); - var url = '/service/service_edit/' + serviceFormId + '?button=' + buttonName; - - miqService.miqAjaxButton(url, serializeFields); - }; - - vm.cancelClicked = function() { - serviceEditButtonClicked('cancel'); - }; - - vm.resetClicked = function() { - vm.serviceModel = Object.assign({}, vm.modelCopy); - $scope.angularForm.$setUntouched(true); - $scope.angularForm.$setPristine(true); - miqService.miqFlash('warn', __('All changes have been reset')); - }; - - vm.saveClicked = function() { - serviceEditButtonClicked('save', vm.serviceModel); - }; - - function getServiceFormData(response) { - var data = response.data; - vm.serviceModel = Object.assign({}, data); - vm.afterGet = true; - vm.modelCopy = Object.assign({}, vm.serviceModel); - } - - init(); -}]); diff --git a/app/views/service/_service_form.html.haml b/app/views/service/_service_form.html.haml index c5ff775a0568..1d4f213614fe 100644 --- a/app/views/service/_service_form.html.haml +++ b/app/views/service/_service_form.html.haml @@ -1,43 +1,2 @@ -- @angular_form = true - -%form.form-horizontal#form_div{"name" => "angularForm", - "ng-controller" => "serviceFormController as vm", - "ng-show" => "vm.afterGet", - "model" => "vm.serviceModel", - "model-copy" => "vm.modelCopy", - "miq-form" => true, - "form-changed" => true} - = render :partial => "layouts/flash_msg" - %div - %div - .form-group{"ng-class" => "{'has-error': angularForm.name.$invalid}"} - %div - %div - .form-group{"ng-class" => "{'has-error': angularForm.name.$invalid}"} - %label.col-md-2.control-label{"for" => "name"} - = _("Name") - .col-md-8 - %input.form-control{"type" => "text", - "id" => "name", - "name" => "name", - "ng-model" => "vm.serviceModel.name", - "maxlength" => "#{ViewHelper::MAX_NAME_LEN}", - "required" => true, - "auto-focus" => ""} - %span.help-block{"ng-show" => "angularForm.name.$error.miqrequired"} - = _("Required") - .form-group{"ng-class" => "{'has-error': angularForm.description.$invalid}"} - %label.col-md-2.control-label{"for" => "description"} - = _("Description") - .col-md-8 - %input.form-control{"type" => "text", - "id" => "description", - "name" => "description", - "ng-model" => "vm.serviceModel.description", - "maxlength" => "#{ViewHelper::MAX_DESC_LEN}", - "required" => true} - = render :partial => "layouts/angular/generic_form_buttons" - -:javascript - ManageIQ.angular.app.value('serviceFormId', '#{@service.id}'); - miq_bootstrap('#form_div'); += render :partial => "layouts/flash_msg" += react('ServiceForm', { :maxNameLen => ViewHelper::MAX_NAME_LEN, :maxDescLen => ViewHelper::MAX_DESC_LEN, :serviceFormId => @service.id}) diff --git a/spec/javascripts/controllers/service/service_form_controller_spec.js b/spec/javascripts/controllers/service/service_form_controller_spec.js deleted file mode 100644 index cbc4a27a2b17..000000000000 --- a/spec/javascripts/controllers/service/service_form_controller_spec.js +++ /dev/null @@ -1,93 +0,0 @@ -describe('serviceFormController', function() { - var $scope, $controller, $httpBackend, miqService, vm; - - beforeEach(module('ManageIQ')); - - beforeEach(inject(function($rootScope, _$controller_, _$httpBackend_, _miqService_) { - miqService = _miqService_; - spyOn(miqService, 'showButtons'); - spyOn(miqService, 'hideButtons'); - spyOn(miqService, 'miqAjaxButton'); - spyOn(miqService, 'sparkleOn'); - spyOn(miqService, 'sparkleOff'); - - $scope = $rootScope.$new(); - $httpBackend = _$httpBackend_; - - vm = _$controller_('serviceFormController', { - $scope: $scope, - serviceFormId: 1000000000001, - miqService: miqService - }); - })); - - beforeEach(inject(function(_$controller_) { - var serviceFormResponse = { - name: 'serviceName', - description: 'serviceDescription' - }; - $httpBackend.whenGET('/service/service_form_fields/1000000000001').respond(serviceFormResponse); - $httpBackend.flush(); - })); - - afterEach(function() { - $httpBackend.verifyNoOutstandingExpectation(); - $httpBackend.verifyNoOutstandingRequest(); - }); - - describe('initialization', function() { - it('sets the service name to the value returned via the http request', function() { - expect(vm.serviceModel.name).toEqual('serviceName'); - expect(vm.serviceModel.description).toEqual('serviceDescription'); - }); - }); - - describe('#cancelClicked', function() { - beforeEach(function() { - $scope.angularForm = { - $setPristine: function (value){} - }; - vm.cancelClicked(); - }); - - it('turns the spinner on via the miqService', function() { - expect(miqService.sparkleOn).toHaveBeenCalled(); - }); - - it('delegates to miqService.miqAjaxButton', function() { - expect(miqService.miqAjaxButton).toHaveBeenCalledWith('/service/service_edit/1000000000001?button=cancel', undefined); - }); - }); - - describe('#resetClicked', function() { - beforeEach(function() { - vm.serviceModel.name = 'foo'; - $scope.angularForm = { - $setPristine: function (value){}, - $setUntouched: function (value){}, - }; - vm.resetClicked(); - }); - - it('resets value of name field to initial value', function() { - expect(vm.serviceModel.name).toEqual('serviceName'); - }); - }); - - describe('#saveClicked', function() { - beforeEach(function() { - $scope.angularForm = { - $setPristine: function(value) {} - }; - vm.saveClicked(); - }); - - it('turns the spinner on via the miqService', function() { - expect(miqService.sparkleOn).toHaveBeenCalled(); - }); - - it('delegates to miqService.miqAjaxButton', function() { - expect(miqService.miqAjaxButton).toHaveBeenCalledWith('/service/service_edit/1000000000001?button=save', vm.serviceModel); - }); - }); -});