Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check dialog-user for info on valid inputs #3686

Merged
merged 3 commits into from
Apr 4, 2018
Merged

Check dialog-user for info on valid inputs #3686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b536cd
Check dialog-user for info on valid inputs
ZitaNemeckova Mar 26, 2018
c452e4f
saveable checkes for dialogFieldRefreshService.areFieldsBeingRefreshed
ZitaNemeckova Apr 3, 2018
0ec8ebf
Add data for vm.isValid or set it
ZitaNemeckova Apr 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/assets/javascripts/controllers/dialog_user/dialog_user_controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ ManageIQ.angular.app.controller('dialogUserController', ['API', 'dialogFieldRefr
vm.submitButtonClicked = submitButtonClicked;
vm.cancelClicked = cancelClicked;
vm.saveable = saveable;
vm.isValid = false;

function refreshField(field) {
var idList = {
Expand All @@ -37,6 +38,7 @@ ManageIQ.angular.app.controller('dialogUserController', ['API', 'dialogFieldRefr
}

function setDialogData(data) {
vm.isValid = data.validations.isValid;
vm.dialogData = data.data;
}

Expand Down Expand Up @@ -69,6 +71,6 @@ ManageIQ.angular.app.controller('dialogUserController', ['API', 'dialogFieldRefr
}

function saveable() {
return ! dialogFieldRefreshService.areFieldsBeingRefreshed;
return vm.isValid && ! dialogFieldRefreshService.areFieldsBeingRefreshed;
}
}]);
11 changes: 7 additions & 4 deletions spec/javascripts/controllers/dialog_user/dialog_user_controller.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,15 @@ describe('dialogUserController', function() {
it('sets the data attribute of the data passed in to dialogData', function() {
expect($controller.dialogData).toEqual(undefined);

$controller.setDialogData({data: 'newData'});
$controller.setDialogData({data: 'newData', validations: { isValid : true}});

expect($controller.dialogData).toEqual('newData');
});
});

describe('submitButtonClicked', function() {
beforeEach(function() {
$controller.setDialogData({data: {field1: 'field1'}});
$controller.setDialogData({data: {field1: 'field1'}, validations: { isValid : true}});
});

context('when the submit endpoint deals with generic objects', function() {
Expand All @@ -103,9 +103,10 @@ describe('dialogUserController', function() {
resourceActionId: '789',
targetId: '987',
targetType: 'targettype',
saveable: true,
});

$controller.setDialogData({data: {field1: 'field1'}});
$controller.setDialogData({data: {field1: 'field1'}, validations: { isValid : true}});

spyOn(API, 'post').and.returnValue(Promise.resolve('awesome'));
}));
Expand Down Expand Up @@ -206,16 +207,18 @@ describe('dialogUserController', function() {
context('when fields are being refreshed', function() {
beforeEach(function() {
dialogFieldRefreshService.areFieldsBeingRefreshed = true;
$controller.isValid = true;
});

it('returns false', function() {
expect($controller.saveable()).toBe(false);
});
});

context('when fields are not being refrshed', function() {
context('when fields are not being refreshed', function() {
beforeEach(function() {
dialogFieldRefreshService.areFieldsBeingRefreshed = false;
$controller.isValid = true;
});

it('returns true', function() {
Expand Down