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

Bug 1509142 - Should not display the 'Reveal Secret' link when secret is without 'data' field #2448

Merged
merged 1 commit into from
Nov 3, 2017
Merged

Bug 1509142 - Should not display the 'Reveal Secret' link when secret is without 'data' field #2448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions app/scripts/controllers/secret.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ angular.module('openshiftConsole')
$scope.addToApplicationVisible = false;

$scope.addToApplication = function() {
if (!$scope.secret.data) {
return;
}
$scope.addToApplicationVisible = true;
};

Expand Down
11 changes: 8 additions & 3 deletions app/views/browse/secret.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ <h1 class="contains-actions">
<button ng-if="project.metadata.name | canIAddToProject"
type="button"
class="btn btn-default hidden-xs"
ng-disabled="!secret.data"
ng-click="addToApplication()">
Add to Application
</button>
Expand All @@ -32,8 +33,8 @@ <h1 class="contains-actions">
class="dropdown-toggle actions-dropdown-kebab visible-xs-inline"
data-toggle="dropdown"><i class="fa fa-ellipsis-v" aria-hidden="true"></i><span class="sr-only">Actions</span></a>
<ul class="dropdown-menu dropdown-menu-right actions action-button">
<li ng-if="project.metadata.name | canIAddToProject" class="visible-xs">
<a href="" role="button" ng-click="addToApplication()">Add to Application</a>
<li ng-if="(project.metadata.name | canIAddToProject)" class="visible-xs">
<a href="" role="button" ng-class="{ 'disabled-link': !secret.data }" ng-attr-aria-disabled="{{!secret.data ? 'true' : undefined}}" ng-click="addToApplication()">Add to Application</a>
</li>
<li ng-if="'secrets' | canI : 'update'">
<a ng-href="{{secret | editYamlURL}}" role="button">Edit YAML</a>
Expand Down Expand Up @@ -61,7 +62,7 @@ <h1 class="contains-actions">
<div class="resource-details">
<h2 class="mar-top-none">
{{secret.type}}
<small class="mar-left-sm"><a href="" ng-click="view.showSecret = !view.showSecret">{{view.showSecret ? "Hide" : "Reveal"}} Secret</a></small>
<small class="mar-left-sm"><a href="" ng-if="secret.data" ng-click="view.showSecret = !view.showSecret">{{view.showSecret ? "Hide" : "Reveal"}} Secret</a></small>
</h2>
<dl class="secret-data left">
<div ng-repeat="(secretDataName, secretData) in decodedSecretData" class="image-source-item">
Expand Down Expand Up @@ -90,6 +91,10 @@ <h2 class="mar-top-none">
</div>
</div>
</dl>
<div ng-if="!secret.data" class="empty-state-message text-center">
<h2>No data.</h2>
<p>This secret has no data.</p>
</div>
<annotations annotations="secret.metadata.annotations"></annotations>
</div>
</div><!-- /col-* -->
Expand Down
2 changes: 1 addition & 1 deletion dist/scripts/scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6460,7 +6460,7 @@ link: "project/" + e.project + "/browse/secrets"
}, {
title: n.secretName
} ], n.addToApplicationVisible = !1, n.addToApplication = function() {
n.addToApplicationVisible = !0;
n.secret.data && (n.addToApplicationVisible = !0);
}, n.closeAddToApplication = function() {
n.addToApplicationVisible = !1;
}, r.get(e.project).then(_.spread(function(e, t) {
Expand Down
12 changes: 8 additions & 4 deletions dist/scripts/templates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3576,7 +3576,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<h1 class=\"contains-actions\">\n" +
"<div class=\"pull-right dropdown\">\n" +
"\n" +
"<button ng-if=\"project.metadata.name | canIAddToProject\" type=\"button\" class=\"btn btn-default hidden-xs\" ng-click=\"addToApplication()\">\n" +
"<button ng-if=\"project.metadata.name | canIAddToProject\" type=\"button\" class=\"btn btn-default hidden-xs\" ng-disabled=\"!secret.data\" ng-click=\"addToApplication()\">\n" +
"Add to Application\n" +
"</button>\n" +
"<button type=\"button\" class=\"dropdown-toggle btn btn-default actions-dropdown-btn hidden-xs\" data-toggle=\"dropdown\" ng-hide=\"!('secrets' | canIDoAny)\">\n" +
Expand All @@ -3586,8 +3586,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"\n" +
"<a href=\"\" ng-if=\"project.metadata.name | canIAddToProject\" class=\"dropdown-toggle actions-dropdown-kebab visible-xs-inline\" data-toggle=\"dropdown\"><i class=\"fa fa-ellipsis-v\" aria-hidden=\"true\"></i><span class=\"sr-only\">Actions</span></a>\n" +
"<ul class=\"dropdown-menu dropdown-menu-right actions action-button\">\n" +
"<li ng-if=\"project.metadata.name | canIAddToProject\" class=\"visible-xs\">\n" +
"<a href=\"\" role=\"button\" ng-click=\"addToApplication()\">Add to Application</a>\n" +
"<li ng-if=\"(project.metadata.name | canIAddToProject)\" class=\"visible-xs\">\n" +
"<a href=\"\" role=\"button\" ng-class=\"{ 'disabled-link': !secret.data }\" ng-attr-aria-disabled=\"{{!secret.data ? 'true' : undefined}}\" ng-click=\"addToApplication()\">Add to Application</a>\n" +
"</li>\n" +
"<li ng-if=\"'secrets' | canI : 'update'\">\n" +
"<a ng-href=\"{{secret | editYamlURL}}\" role=\"button\">Edit YAML</a>\n" +
Expand All @@ -3611,7 +3611,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<div class=\"resource-details\">\n" +
"<h2 class=\"mar-top-none\">\n" +
"{{secret.type}}\n" +
"<small class=\"mar-left-sm\"><a href=\"\" ng-click=\"view.showSecret = !view.showSecret\">{{view.showSecret ? \"Hide\" : \"Reveal\"}} Secret</a></small>\n" +
"<small class=\"mar-left-sm\"><a href=\"\" ng-if=\"secret.data\" ng-click=\"view.showSecret = !view.showSecret\">{{view.showSecret ? \"Hide\" : \"Reveal\"}} Secret</a></small>\n" +
"</h2>\n" +
"<dl class=\"secret-data left\">\n" +
"<div ng-repeat=\"(secretDataName, secretData) in decodedSecretData\" class=\"image-source-item\">\n" +
Expand All @@ -3636,6 +3636,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"</div>\n" +
"</div>\n" +
"</dl>\n" +
"<div ng-if=\"!secret.data\" class=\"empty-state-message text-center\">\n" +
"<h2>No data.</h2>\n" +
"<p>This secret has no data.</p>\n" +
"</div>\n" +
"<annotations annotations=\"secret.metadata.annotations\"></annotations>\n" +
"</div>\n" +
"</div>\n" +
Expand Down