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

Jump to bottom

Fix problem where UI appears unresponsive while waiting for websocket update #1959

Merged
merged 1 commit into from
Oct 6, 2017
Merged

Fix problem where UI appears unresponsive while waiting for websocket update #1959

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions app/scripts/services/resourceAlerts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ angular.module("openshiftConsole")
details: $filter('getErrorDetails')(e)
};
});
return true;
}
}]
};
Expand Down
2 changes: 1 addition & 1 deletion app/views/browse/deployment-config.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ <h1 class="contains-actions">
<div ng-if="!loaded">Loading...</div>
<div class="row" ng-if="loaded">
<div class="col-md-12" ng-class="{ 'hide-tabs' : !deploymentConfig }">
<div ng-if="deploymentConfig.spec.paused" class="alert alert-info animate-if">
<div ng-if="deploymentConfig.spec.paused && !updatingPausedState" class="alert alert-info animate-if">
<span class="pficon pficon-info" aria-hidden="true"></span>
<strong>{{deploymentConfig.metadata.name}} is paused.</strong>
This will stop any new rollouts or triggers from running until resumed.
Expand Down
3 changes: 1 addition & 2 deletions app/views/browse/deployment.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<div class="middle">

<div class="middle-header">
<div class="container-fluid">
<breadcrumbs breadcrumbs="breadcrumbs"></breadcrumbs>
Expand Down Expand Up @@ -71,7 +70,7 @@ <h1 class="contains-actions">
<div ng-if="!loaded">Loading...</div>
<div class="row" ng-if="loaded">
<div class="col-md-12" ng-class="{ 'hide-tabs' : !deployment }">
<div ng-if="deployment.spec.paused" class="alert alert-info animate-if">
<div ng-if="deployment.spec.paused && !updatingPausedState" class="alert alert-info animate-if">
<span class="pficon pficon-info" aria-hidden="true"></span>
<strong>{{deployment.metadata.name}} is paused.</strong>
This pauses any in-progress rollouts and stops new
Expand Down
4 changes: 2 additions & 2 deletions dist/scripts/scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4189,15 +4189,15 @@ links: [ {
href: "",
label: "Resume Rollouts",
onClick: function() {
n.setPaused(t, !1, {
return n.setPaused(t, !1, {
namespace: t.metadata.namespace
}).then(_.noop, function(n) {
a[t.metadata.uid + "-pause-error"] = {
type: "error",
message: "An error occurred resuming the " + s(t.kind) + ".",
details: e("getErrorDetails")(n)
};
});
}), !0;
}
} ]
}), a;
Expand Down
4 changes: 2 additions & 2 deletions dist/scripts/templates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2373,7 +2373,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<div ng-if=\"!loaded\">Loading...</div>\n" +
"<div class=\"row\" ng-if=\"loaded\">\n" +
"<div class=\"col-md-12\" ng-class=\"{ 'hide-tabs' : !deploymentConfig }\">\n" +
"<div ng-if=\"deploymentConfig.spec.paused\" class=\"alert alert-info animate-if\">\n" +
"<div ng-if=\"deploymentConfig.spec.paused && !updatingPausedState\" class=\"alert alert-info animate-if\">\n" +
"<span class=\"pficon pficon-info\" aria-hidden=\"true\"></span>\n" +
"<strong>{{deploymentConfig.metadata.name}} is paused.</strong>\n" +
"This will stop any new rollouts or triggers from running until resumed.\n" +
Expand Down Expand Up @@ -2669,7 +2669,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<div ng-if=\"!loaded\">Loading...</div>\n" +
"<div class=\"row\" ng-if=\"loaded\">\n" +
"<div class=\"col-md-12\" ng-class=\"{ 'hide-tabs' : !deployment }\">\n" +
"<div ng-if=\"deployment.spec.paused\" class=\"alert alert-info animate-if\">\n" +
"<div ng-if=\"deployment.spec.paused && !updatingPausedState\" class=\"alert alert-info animate-if\">\n" +
"<span class=\"pficon pficon-info\" aria-hidden=\"true\"></span>\n" +
"<strong>{{deployment.metadata.name}} is paused.</strong>\n" +
"This pauses any in-progress rollouts and stops new rollouts from running until the deployment is resumed.\n" +
Expand Down