Release: dev -> main (restore fixes, theming, schema-checker, quickicon hardening) #300

Merged

jmiller merged 27 commits from release/dev-to-main-r2 into main 2026-07-16 18:43:06 +00:00

Conversation 0 Commits 27 Files Changed 34

+749 -224

jmiller commented 2026-07-16 18:42:50 +00:00

Owner

Copy Link

Copy Source

Cuts a fresh stable from dev: schema-checker reconciliation, restore/backup progress theming + controls, MokoRestore black theme, restore cancel cleanup, silent-partial-restore fixes, snapshots type-label, ntfy default, quickicon dashboard hardening. Excludes the untested component Type-Name change (#299), held for install-testing.

https://claude.ai/code/session_01WbGBN9VyRK61zczYWcCQ2i

Cuts a fresh stable from dev: schema-checker reconciliation, restore/backup progress theming + controls, MokoRestore black theme, restore cancel cleanup, silent-partial-restore fixes, snapshots type-label, ntfy default, quickicon dashboard hardening. Excludes the untested component Type-Name change (#299), held for install-testing. https://claude.ai/code/session_01WbGBN9VyRK61zczYWcCQ2i

jmiller added 27 commits 2026-07-16 18:42:51 +00:00

chore(ci): converge dev with main's full gitea->git rebrand ... 0b9cf6f4d8

Back-fills dev with the fuller rebrand that shipped on main in the
dev->main release (#282): MokoGitea->MokoGIT, GITEA_ORG->GIT_ORG,
mokogit-actions[bot], and the corrected .mokogit/CLAUDE.md path. dev's
earlier partial rename (#279) is superseded so dev and main no longer
diverge on CI config.

Claude-Session: https://claude.ai/code/session_01WbGBN9VyRK61zczYWcCQ2i

Merge pull request 'chore(ci): converge dev with main full gitea->git rebrand' (#283) from chore/converge-full-rebrand into dev e0b5d72c40

fix(lang): drop redundant "backup" in admin-lock message ... cac691ec92

"A MokoSuiteBackup backup is currently running" -> "A MokoSuiteBackup
is currently running". en-GB + en-US.

Claude-Session: https://claude.ai/code/session_01WbGBN9VyRK61zczYWcCQ2i

Merge pull request 'fix(lang): drop redundant backup word in admin-lock message' (#284) from fix/lock-message-wording into dev c77e921582

feat(ui): add auto-continue + action buttons to the backup-progress modal ... d0c12914a8

Brings the full-screen runbackup screen's controls onto the black
backup-progress modal in the backups view:
- "Automatically return to the list when finished" checkbox (default on);
  unchecked leaves the completion screen up with buttons.
- Cancel button while running (double confirm) — stops the step loop and
  cancels the record via ajax.cancelBackup.
- Terminal buttons: View backup record + Back to backups on success;
  Retry + Back to backups on failure.
Title icon/text updated via safe DOM (no innerHTML). Restore modal
unchanged in this pass.

Claude-Session: https://claude.ai/code/session_01WbGBN9VyRK61zczYWcCQ2i

feat(ui): mirror progress-modal controls onto the restore modal ... 4ab24b20a6

Restore-progress modal now matches the backup modal: auto-continue
checkbox, terminal buttons (Retry restore / Back to backups), and a
double-confirm Cancel. Restore's cancel warns that stopping mid-flight
may leave the site partially restored (no server rollback), and there is
no "view record" button (restore has no new record). startSteppedRestore
split into a re-runnable runSteppedRestore() so Retry works. Title via
safe DOM (no innerHTML).

Claude-Session: https://claude.ai/code/session_01WbGBN9VyRK61zczYWcCQ2i

Merge pull request 'feat(ui): auto-continue + action buttons on the backup-progress modal' (#285) from feat/progress-modal-controls into dev e88040f60d

feat(ui): re-brand the standalone MokoRestore wizard to the black theme ... f8e121d925

The generated restore.php wizard used a light "Joomla-styled" blue theme.
Restyled its stylesheet to the full-black MokoSuite look that matches the
runbackup / backup-progress screens: black background + big header, dark
panels/cards, dark form inputs with readable contrast, MokoSuite blue/green
accents, dark step-bar/checks/alerts/progress/log, and all inline help-box
styles converted from light to the dark palette. No logic changes.

Claude-Session: https://claude.ai/code/session_01WbGBN9VyRK61zczYWcCQ2i

Merge pull request 'feat(ui): re-brand standalone MokoRestore wizard to the black theme' (#286) from feat/mokorestore-black-theme into dev 388db8c7d0

fix(restore): clean up staging + session state on cancel/abandon ... ab6bee7b51

The stepped-restore Cancel button (added with the progress-modal controls)
stopped the client loop and reloaded, but left the server-side restore
session, *.restore.json state, and the extracted staging directory behind
with no reaper — so cancelled/abandoned restores leaked disk indefinitely.

- SteppedRestoreEngine::cancel() mirrors the failure-cleanup path (delete
  staging dir + restore state + session).
- AjaxController::restoreCancel() exposes it (token + restore ACL gated).
- Restore modal Cancel now calls ajax.restoreCancel with the session id
  before leaving (session id tracked in restoreSessionId).
- SteppedSession::cleanupOldSessions() also reaps orphaned
  mokosuitebackup-restore-* staging dirs >24h (backstop for browser-close).

Found by an audit of the restore path against recent changes; the schema
(retired sftp_*/VARCHAR include_mokorestore) and PHP 8.3 changes were
confirmed to NOT affect restore.

Claude-Session: https://claude.ai/code/session_01WbGBN9VyRK61zczYWcCQ2i

Merge pull request 'fix(restore): clean up staging + session state on cancel/abandon' (#287) from fix/restore-cancel-cleanup into dev b0590bef80

fix(restore): surface partial DB-import failures + quote-aware SQL split ... 9323de955f

Stepped restore silently swallowed every failed SQL statement and always
reported "Restore complete", so a half-imported database looked fine.

- SteppedRestoreEngine::stepDatabase() now records a failure count + first
  few messages (recordSqlError) instead of only error_log(), and the
  completion step returns the count with a warning; the modal shows
  "Restore Complete (with warnings)" and does NOT auto-return.
- New quote/backtick/escape-aware isCompleteStatement() replaces the naive
  "line ends with ;" terminator, so a ; or newline inside a string value no
  longer splits a statement mid-value.
- Comment/blank lines are only skipped BETWEEN statements, never inside an
  accumulating multi-line statement.

Relates to #188 (DatabaseImporter) and the standalone MokoRestore splitter;
tracked in #291.

Claude-Session: https://claude.ai/code/session_01WbGBN9VyRK61zczYWcCQ2i

Merge pull request 'fix(restore): surface partial DB-import failures + quote-aware SQL split' (#292) from fix/restore-silent-sql-import into dev 57e7dd98b1

fix: default ntfy server to ntfy.mokoconsulting.tech (#166) ... 313b96b070

Replaces the old public ntfy.sh default in the runtime defaults: profile
form default/hint, NotificationSender fallbacks, the ntfy_server column
default in install.mysql.sql, and the en-GB field description. ntfy.sh is
still documented as the public alternative.

Closes #166.

Claude-Session: https://claude.ai/code/session_01WbGBN9VyRK61zczYWcCQ2i

fix: snapshots restore type labels show raw type (#170) ... 2b6dbdac23

typeLabels[TYPE] referenced an undefined uppercase variable; the forEach
parameter is lowercase `type`, so every type label rendered as the raw
type string instead of its translated label.

Closes #170.

Claude-Session: https://claude.ai/code/session_01WbGBN9VyRK61zczYWcCQ2i

Merge pull request 'fix: snapshots restore type labels show raw type' (#295) from fix/snapshots-typelabel into dev 95d2b3375c

Merge pull request 'fix: default ntfy server to ntfy.mokoconsulting.tech' (#293) from fix/ntfy-default-url into dev ed2dbee579

chore(version): pre-release bump to 02.64.09-dev [skip ci] 3616f49570

chore(version): pre-release bump to 02.64.10-dev [skip ci] c42962c919

fix(restore): surface DatabaseImporter errors + quote-aware split (#188) ... 028e1c7e80

RestoreEngine ignored DatabaseImporter::hasErrors(), so the non-stepped
restore always reported success even when SQL statements failed. It now
logs the failures and returns a warning ("database may be incomplete").
DatabaseImporter's splitter is also quote/backtick/escape-aware so a ; or
newline inside a value no longer splits a statement, and comments are only
skipped between statements — matching the stepped-engine fix (#291).

Closes #188.

Claude-Session: https://claude.ai/code/session_01WbGBN9VyRK61zczYWcCQ2i

Merge pull request 'fix(restore): surface DatabaseImporter errors + quote-aware split' (#294) from fix/databaseimporter-surface-errors into dev f3bcf9d79e

chore(version): pre-release bump to 02.64.11-dev [skip ci] 54d7710783

fix(quickicon): never let the dashboard widget crash the admin page (#297) ... 7e58ca7598

The mod_quickicon helper array_merge()s a defaults array into each icon a
plugin returns; if a plugin's DB query throws or it returns a malformed
(unwrapped) icon, the whole admin dashboard can 500 with an array_merge
TypeError. The current handler is structurally correct (icons are wrapped
in a list, matching core plg_quickicon_joomlaupdate), so this hardens it:

- Extract the query/state logic into buildStatusIcon().
- Wrap it in try/catch — on any Throwable, log and contribute no icon
  instead of bubbling into the dashboard render.
- Document why the [$icon] list-wrapping is load-bearing.

Closes #297.

Claude-Session: https://claude.ai/code/session_01WbGBN9VyRK61zczYWcCQ2i

chore(version): pre-release bump to 02.64.12-dev [skip ci] 747e50bf62

Merge pull request 'fix(quickicon): never let the dashboard widget crash the admin page' (#298) from fix/quickicon-harden into dev b1b81fd107

chore(version): pre-release bump to 02.64.13-dev [skip ci] 22e8ebe832

Merge remote-tracking branch 'origin/dev' into release/dev-to-main-r2 ... 9a82fc97f2

# Conflicts:
#	.mokogit/workflows/issue-branch.yml

jmiller merged commit 84fd06bf2d into main 2026-07-16 18:43:06 +00:00

jmiller deleted branch release/dev-to-main-r2 2026-07-16 18:43:07 +00:00

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

Clear labels

component: admin

Admin UI and views

component: api

REST API

component: engine

Backup/restore engine

component: remote

Remote storage (FTP/GDrive)

component: scheduler

Scheduled tasks

bug

Something is not working

duplicate

This issue or pull request already exists

enhancement

New feature

help wanted

Need some help

invalid

Something is wrong

question

More information is needed

wontfix

This won't be fixed

No labels

Priority -

Type -

Milestone

No items

No Milestone

Assignees

Clear assignees

jmiller (Jonathan Miller)

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: MokoConsulting/MokoSuiteBackup#300