Skip to content

Commit 620ab1e

Browse files
Fix problem where UI appears unresponsive while waiting for websocket update
1 parent 58d1eeb commit 620ab1e

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

app/scripts/services/resourceAlerts.js

+1
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ angular.module("openshiftConsole")
101101
details: $filter('getErrorDetails')(e)
102102
};
103103
});
104+
return true;
104105
}
105106
}]
106107
};

app/views/browse/deployment-config.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ <h1 class="contains-actions">
9090
<div ng-if="!loaded">Loading...</div>
9191
<div class="row" ng-if="loaded">
9292
<div class="col-md-12" ng-class="{ 'hide-tabs' : !deploymentConfig }">
93-
<div ng-if="deploymentConfig.spec.paused" class="alert alert-info animate-if">
93+
<div ng-if="deploymentConfig.spec.paused && !updatingPausedState" class="alert alert-info animate-if">
9494
<span class="pficon pficon-info" aria-hidden="true"></span>
9595
<strong>{{deploymentConfig.metadata.name}} is paused.</strong>
9696
This will stop any new rollouts or triggers from running until resumed.

app/views/browse/deployment.html

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<div class="middle">
2-
32
<div class="middle-header">
43
<div class="container-fluid">
54
<breadcrumbs breadcrumbs="breadcrumbs"></breadcrumbs>
@@ -71,7 +70,7 @@ <h1 class="contains-actions">
7170
<div ng-if="!loaded">Loading...</div>
7271
<div class="row" ng-if="loaded">
7372
<div class="col-md-12" ng-class="{ 'hide-tabs' : !deployment }">
74-
<div ng-if="deployment.spec.paused" class="alert alert-info animate-if">
73+
<div ng-if="deployment.spec.paused && !updatingPausedState" class="alert alert-info animate-if">
7574
<span class="pficon pficon-info" aria-hidden="true"></span>
7675
<strong>{{deployment.metadata.name}} is paused.</strong>
7776
This pauses any in-progress rollouts and stops new

dist/scripts/scripts.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -4189,15 +4189,15 @@ links: [ {
41894189
href: "",
41904190
label: "Resume Rollouts",
41914191
onClick: function() {
4192-
n.setPaused(t, !1, {
4192+
return n.setPaused(t, !1, {
41934193
namespace: t.metadata.namespace
41944194
}).then(_.noop, function(n) {
41954195
a[t.metadata.uid + "-pause-error"] = {
41964196
type: "error",
41974197
message: "An error occurred resuming the " + s(t.kind) + ".",
41984198
details: e("getErrorDetails")(n)
41994199
};
4200-
});
4200+
}), !0;
42014201
}
42024202
} ]
42034203
}), a;

dist/scripts/templates.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2373,7 +2373,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
23732373
"<div ng-if=\"!loaded\">Loading...</div>\n" +
23742374
"<div class=\"row\" ng-if=\"loaded\">\n" +
23752375
"<div class=\"col-md-12\" ng-class=\"{ 'hide-tabs' : !deploymentConfig }\">\n" +
2376-
"<div ng-if=\"deploymentConfig.spec.paused\" class=\"alert alert-info animate-if\">\n" +
2376+
"<div ng-if=\"deploymentConfig.spec.paused && !updatingPausedState\" class=\"alert alert-info animate-if\">\n" +
23772377
"<span class=\"pficon pficon-info\" aria-hidden=\"true\"></span>\n" +
23782378
"<strong>{{deploymentConfig.metadata.name}} is paused.</strong>\n" +
23792379
"This will stop any new rollouts or triggers from running until resumed.\n" +
@@ -2669,7 +2669,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
26692669
"<div ng-if=\"!loaded\">Loading...</div>\n" +
26702670
"<div class=\"row\" ng-if=\"loaded\">\n" +
26712671
"<div class=\"col-md-12\" ng-class=\"{ 'hide-tabs' : !deployment }\">\n" +
2672-
"<div ng-if=\"deployment.spec.paused\" class=\"alert alert-info animate-if\">\n" +
2672+
"<div ng-if=\"deployment.spec.paused && !updatingPausedState\" class=\"alert alert-info animate-if\">\n" +
26732673
"<span class=\"pficon pficon-info\" aria-hidden=\"true\"></span>\n" +
26742674
"<strong>{{deployment.metadata.name}} is paused.</strong>\n" +
26752675
"This pauses any in-progress rollouts and stops new rollouts from running until the deployment is resumed.\n" +

0 commit comments

Comments
 (0)