openstack/deb-horizon
Code Issues Proposed changes

allow hiding help-button for first ng workflow step

Browse Source 
we have merged patch that will hide the help-button on
workflow steps if helpUrl is not defined
https://review.openstack.org/#/c/299705/

However, it forgot to factor in the 'first' step.
With this patch, you can see it used on its parent patch:
Create Volume action removed the helpUrl and the
helpBtn doesn't show up either.

Change-Id: I7e3ee4d03b9f5f1fa924d7f233e4fa4ea4ed12a7
This commit is contained in:
Cindy Lu 2016-08-04 11:56:16 -07:00
parent 0aacdbe2ec
commit 0b05f527a1
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
horizon/static/framework/widgets/wizard/wizard.controller.js
View File

@ -78,15 +78,8 @@
from: $scope.currentIndex,
to: index
});
/**
* Toggle help icon button if a step's helpUrl is not defined
*/
toggleHelpBtn(index);
/*eslint-disable angular/controller-as */
if (angular.isUndefined(steps[index].helpUrl)) {
$scope.hideHelpBtn = true;
} else {
$scope.hideHelpBtn = false;
}
$scope.currentIndex = index;
$scope.openHelp = false;
/*eslint-enable angular/controller-as*/
@ -119,12 +112,24 @@
function onInitSuccess() {
$scope.$broadcast(wizardEvents.ON_INIT_SUCCESS);
if (steps.length > 0) {
toggleHelpBtn(0);
}
}
function onInitError() {
$scope.$broadcast(wizardEvents.ON_INIT_ERROR);
}
function toggleHelpBtn(index) {
// Toggle help icon button if a step's helpUrl is not defined
if (angular.isUndefined(steps[index].helpUrl)) {
$scope.hideHelpBtn = true;
} else {
$scope.hideHelpBtn = false;
}
}
/**
* Each step in the workflow can provide an optional `checkReadiness`
* method, which should return a promise. When this method is provided
@ -186,7 +191,7 @@
}
});
viewModel.ready = (stepReadyPromises.length === 0);
viewModel.ready = stepReadyPromises.length === 0;
return $q.all(stepReadyPromises);
}

2
horizon/static/framework/widgets/wizard/wizard.spec.js
View File

@ -69,7 +69,7 @@
steps: [ {}, {}, {} ]
};
$scope.$apply();
expect(angular.element(element).find('.help-toggle').hasClass('ng-hide')).toBe(false);
expect(angular.element(element).find('.help-toggle').hasClass('ng-hide')).toBe(true);
$scope.workflow.steps[1] = {};
$scope.switchTo(1);