Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2025-10-26 00:36:31 +02:00
Code Issues Packages Projects Releases Activity

more upgrade flow fixes

Browse Source
This commit is contained in:
Andy Miller
2025-10-16 15:04:40 -06:00
parent 4d789fc31a
commit f642992f32
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
themes/grav/app/updates/safe-upgrade.js
View File

@@ -429,6 +429,8 @@ export default class SafeUpgrade {
this.pollTimer = null;
let nextStage = null;
let shouldContinue = true;
this.statusRequest = request(this.urls.status, (response) => {
if (response.status === 'error') {
if (!silent) {
@@ -445,6 +447,10 @@ export default class SafeUpgrade {
const data = response.data || {};
nextStage = data.stage || null;
this.renderProgress(data);
if (nextStage === 'installing' || nextStage === 'finalizing' || nextStage === 'complete') {
shouldContinue = false;
}
});
const finalize = () => {
@@ -456,8 +462,10 @@ export default class SafeUpgrade {
if (nextStage === 'complete' || nextStage === 'error') {
this.stopPolling();
} else {
} else if (shouldContinue) {
this.schedulePoll();
} else {
this.stopPolling();
}
};

8
themes/grav/js/admin.min.js vendored
View File

@@ -4896,6 +4896,7 @@ var SafeUpgrade = /*#__PURE__*/function () {
}
this.pollTimer = null;
var nextStage = null;
var shouldContinue = !0;
this.statusRequest = utils_request(this.urls.status, function (response) {
if (response.status === 'error') {
if (!silent) {
@@ -4911,6 +4912,9 @@ var SafeUpgrade = /*#__PURE__*/function () {
var data = response.data || {};
nextStage = data.stage || null;
_this6.renderProgress(data);
if (nextStage === 'installing' || nextStage === 'finalizing' || nextStage === 'complete') {
shouldContinue = !1;
}
});
var finalize = function finalize() {
_this6.statusRequest = null;
@@ -4919,8 +4923,10 @@ var SafeUpgrade = /*#__PURE__*/function () {
}
if (nextStage === 'complete' || nextStage === 'error') {
_this6.stopPolling();
} else {
} else if (shouldContinue) {
_this6.schedulePoll();
} else {
_this6.stopPolling();
}
};
this.statusRequest.then(finalize, finalize);