From aa472ead4fc0e3d6274672271aea118dba0878f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20de=20la=20Pen=CC=83a?= <p@shedcollective.org>
Date: Fri, 30 Oct 2026 19:18:21 +0000
Subject: [PATCH] feat: Run find-replace on the pre-new-admin admin

Ports the module from develop onto the legacy admin:

- The admin controller lives in admin/controllers, extends the old
  Base, and offers the `search` and `replace` permission strings.
- `moduleName` becomes `findReplace` so the router can build the
  controller namespace; the module folder follows it.
- Permission strings and admin URLs live in src so the queue task,
  the API, and the views can use them without loading the controller.
- The results screen brings its own progress bar and badge colours,
  which the Bootstrap 3 admin does not have.
- Dependencies and CI target feature/pre-new-admin.

The JSON status action is dropped; the API already serves it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .github/workflows/build_and_test.yml          |   6 +-
 .github/workflows/migration_numbering.yml     |   2 +-
 .github/workflows/static_analysis.yml         |   4 +-
 .phpstan/config.neon                          |   3 +-
 .../controllers}/FindReplace.php              | 107 ++++++++++--------
 admin/views/FindReplace/changes.php           |   6 +-
 admin/views/FindReplace/results.php           |  18 ++-
 assets/css/admin.min.css                      |   2 +-
 assets/js/admin.min.js                        |   2 +-
 assets/js/components/Progress.js              |  25 +++-
 assets/sass/admin.scss                        |  63 +++++++++++
 composer.json                                 |  16 +--
 .../config/email_types.php                    |   4 +-
 .../views/Email/templates/search/complete.php |   0
 .../templates/search/complete_plaintext.php   |   0
 .../views/Email/templates/search/fail.php     |   0
 .../Email/templates/search/fail_plaintext.php |   0
 src/Admin/Permission.php                      |  13 +++
 src/Admin/Permission/Replace.php              |  18 ---
 src/Admin/Permission/Search.php               |  18 ---
 src/Admin/Url.php                             |  19 ++++
 src/Api/Controller/Search.php                 |   6 +-
 src/Queue/Task/Search.php                     |   4 +-
 tests/Admin/PermissionTest.php                |  44 +++++++
 24 files changed, 262 insertions(+), 118 deletions(-)
 rename {src/Admin/Controller => admin/controllers}/FindReplace.php (90%)
 rename {find-replace => findReplace}/config/email_types.php (86%)
 rename {find-replace => findReplace}/views/Email/templates/search/complete.php (100%)
 rename {find-replace => findReplace}/views/Email/templates/search/complete_plaintext.php (100%)
 rename {find-replace => findReplace}/views/Email/templates/search/fail.php (100%)
 rename {find-replace => findReplace}/views/Email/templates/search/fail_plaintext.php (100%)
 create mode 100644 src/Admin/Permission.php
 delete mode 100644 src/Admin/Permission/Replace.php
 delete mode 100644 src/Admin/Permission/Search.php
 create mode 100644 src/Admin/Url.php
 create mode 100644 tests/Admin/PermissionTest.php

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 1f7e44d..6b1fd62 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -1,9 +1,9 @@
 name: build_and_test
 on:
     push:
-        branches: [ main, develop ]
+        branches: [ main, develop, feature/pre-new-admin ]
     pull_request:
-        branches: [ main, develop ]
+        branches: [ main, develop, feature/pre-new-admin ]
 
 jobs:
     test:
@@ -61,7 +61,7 @@ jobs:
                         ${{ runner.os }}-yarn-
 
             -   name: Install Composer dependencies
-                run: COMPOSER_ROOT_VERSION=dev-develop composer install --no-interaction --prefer-dist
+                run: COMPOSER_ROOT_VERSION=dev-feature/pre-new-admin composer install --no-interaction --prefer-dist
 
             -   name: Install Yarn dependencies
                 run: yarn install
diff --git a/.github/workflows/migration_numbering.yml b/.github/workflows/migration_numbering.yml
index 069c767..d2801df 100644
--- a/.github/workflows/migration_numbering.yml
+++ b/.github/workflows/migration_numbering.yml
@@ -2,7 +2,7 @@ name: migration_numbering
 on:
     pull_request:
     push:
-        branches: [ main, develop ]
+        branches: [ main, develop, feature/pre-new-admin ]
         paths:
             - 'src/Database/Migration/**'
             - 'composer.json'
diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml
index e1c5360..235a708 100644
--- a/.github/workflows/static_analysis.yml
+++ b/.github/workflows/static_analysis.yml
@@ -3,7 +3,7 @@ on:
     pull_request:
     # Run on push, but only if PHP files have changed
     push:
-        branches: [ main, develop ]
+        branches: [ main, develop, feature/pre-new-admin ]
         paths:
             - '**.php'
             - 'composer.json'
@@ -36,7 +36,7 @@ jobs:
                         ${{ runner.os }}-composer-
 
             -   name: Install Composer dependencies
-                run: COMPOSER_ROOT_VERSION=dev-develop composer install --no-interaction --prefer-dist
+                run: COMPOSER_ROOT_VERSION=dev-feature/pre-new-admin composer install --no-interaction --prefer-dist
 
             -   name: Run PHPStan
                 run: composer analyse
diff --git a/.phpstan/config.neon b/.phpstan/config.neon
index 0761360..72705b8 100644
--- a/.phpstan/config.neon
+++ b/.phpstan/config.neon
@@ -1,6 +1,7 @@
 parameters:
     level: 10
     paths:
+        - ../admin/controllers
         - ../src
         - ../tests
     bootstrapFiles:
@@ -9,4 +10,4 @@ parameters:
         - ../vendor/nails/common/helpers/url.php
         - ../vendor/nails/common/src/Common/CodeIgniter/Core/Common.php
         - ../vendor/nails/module-auth/helpers/user.php
-        - ../vendor/nails/module-admin/helpers/permission.php
+        - ../vendor/nails/module-admin/src/Controller/Base.php
diff --git a/src/Admin/Controller/FindReplace.php b/admin/controllers/FindReplace.php
similarity index 90%
rename from src/Admin/Controller/FindReplace.php
rename to admin/controllers/FindReplace.php
index 3afbb5e..6e1a067 100644
--- a/src/Admin/Controller/FindReplace.php
+++ b/admin/controllers/FindReplace.php
@@ -1,16 +1,18 @@
 <?php
 
-namespace Nails\FindReplace\Admin\Controller;
+namespace Nails\Admin\FindReplace;
 
 use Nails\Admin\Controller\Base;
 use Nails\Admin\Factory\Nav;
 use Nails\Admin\Helper;
 use Nails\Common\Service\Input;
+use Nails\Common\Service\MetaData;
 use Nails\Common\Service\Output;
 use Nails\Common\Service\PDODatabase;
 use Nails\Factory;
 use Nails\FindReplace\Admin\OutcomeNotice;
 use Nails\FindReplace\Admin\Permission;
+use Nails\FindReplace\Admin\Url;
 use Nails\FindReplace\Constants;
 use Nails\FindReplace\Exclusion\Pattern;
 use Nails\FindReplace\Factory\Outcome;
@@ -30,9 +32,19 @@ class FindReplace extends Base
 {
     const PER_PAGE = 50;
 
+    /**
+     * The view data, shared with the admin router by reference.
+     *
+     * @var array<string, mixed>
+     */
+    public $data;
+
+    /**
+     * @return Nav|array<Nav>|null
+     */
     public static function announce(): Nav|array|null
     {
-        if (!userHasPermission(Permission\Search::class)) {
+        if (!userHasPermission(Permission::SEARCH)) {
             return null;
         }
 
@@ -45,6 +57,22 @@ public static function announce(): Nav|array|null
         return $nav;
     }
 
+    /**
+     * @return array<string, string>
+     */
+    public static function permissions(): array
+    {
+        return [
+            'search' => 'Can search, view results, export CSV, and manage your own saved searches',
+            'replace' => 'Can apply find-replace replacements and revert your own changes',
+        ];
+    }
+
+    public static function url(string $action = ''): string
+    {
+        return Url::to($action);
+    }
+
     public function index(): void
     {
         $this->requireSearchPermission();
@@ -54,10 +82,8 @@ public function index(): void
             $this->oUserFeedback->warning(htmlspecialchars($warning, ENT_QUOTES, 'UTF-8'));
         }
 
-        $this
-            ->addBreadcrumb('Utilities')
-            ->addBreadcrumb('Find & Replace')
-            ->loadView('index');
+        $this->title('Find &amp; Replace');
+        Helper::loadView('index');
     }
 
     public function create(): void
@@ -94,23 +120,6 @@ public function create(): void
         redirect(self::url('results') . '?id=' . $id);
     }
 
-    public function status(): void
-    {
-        $this->requireSearchPermission();
-        $search = $this->requireOwned();
-        $payload = [
-            'status' => $search->status(),
-            'tables_scanned' => $search->tablesScanned(),
-            'tables_total' => $search->tablesTotal(),
-            'result_count' => $search->resultCount(),
-            'error' => $search->errorMessage(),
-        ];
-        $json = json_encode($payload, JSON_THROW_ON_ERROR);
-        $this->output()
-            ->setContentType('application/json')
-            ->setOutput($json);
-    }
-
     public function results(): void
     {
         $this->requireSearchPermission();
@@ -155,20 +164,17 @@ public function results(): void
             );
         }
 
-        $this
-            ->addBreadcrumb('Utilities')
-            ->addBreadcrumb('Find & Replace', self::url())
-            ->addBreadcrumb($search->term())
-            ->setData('search', $search)
-            ->setData('rows', $rows)
-            ->setData('facets', $facets)
-            ->setData('facetOptions', $this->facetOptions((int) $search->id))
-            ->setData('badgeKeys', $this->registry()->badges())
-            ->setData('outstanding', $outstanding)
-            ->setData('pagination', Helper::paginationObject($page, self::PER_PAGE, $total))
-            ->setData('total', $total)
-            ->setData('canReplace', userHasPermission(Permission\Replace::class))
-            ->loadView('results');
+        $this->title('Find &amp; Replace: ' . htmlspecialchars($search->term(), ENT_QUOTES, 'UTF-8'));
+        $this->data['search'] = $search;
+        $this->data['rows'] = $rows;
+        $this->data['facets'] = $facets;
+        $this->data['facetOptions'] = $this->facetOptions((int) $search->id);
+        $this->data['badgeKeys'] = $this->registry()->badges();
+        $this->data['outstanding'] = $outstanding;
+        $this->data['pagination'] = Helper::paginationObject($page, self::PER_PAGE, $total);
+        $this->data['total'] = $total;
+        $this->data['canReplace'] = userHasPermission(Permission::REPLACE);
+        Helper::loadView('results');
     }
 
     public function export(): void
@@ -318,13 +324,10 @@ public function changes(): void
             $runs[$row->getRunId()][] = $row;
         }
 
-        $this
-            ->addBreadcrumb('Utilities')
-            ->addBreadcrumb('Find & Replace', self::url())
-            ->addBreadcrumb('My changes')
-            ->setData('runs', $runs)
-            ->setData('canReplace', userHasPermission(Permission\Replace::class))
-            ->loadView('changes');
+        $this->title('Find &amp; Replace: My changes');
+        $this->data['runs'] = $runs;
+        $this->data['canReplace'] = userHasPermission(Permission::REPLACE);
+        Helper::loadView('changes');
     }
 
     public function revert(): void
@@ -373,9 +376,21 @@ public function revert(): void
         redirect(self::url('changes'));
     }
 
+    /**
+     * The admin header prints the title as HTML, so callers escape it.
+     */
+    private function title(string $html): void
+    {
+        $page = $this->data['page'] ?? null;
+
+        if ($page instanceof MetaData) {
+            $page->title = $html;
+        }
+    }
+
     private function requireSearchPermission(): void
     {
-        if (!userHasPermission(Permission\Search::class)) {
+        if (!userHasPermission(Permission::SEARCH)) {
             unauthorised();
             exit;
         }
@@ -385,7 +400,7 @@ private function requireReplacePermission(): void
     {
         $this->requireSearchPermission();
 
-        if (!userHasPermission(Permission\Replace::class)) {
+        if (!userHasPermission(Permission::REPLACE)) {
             unauthorised();
             exit;
         }
diff --git a/admin/views/FindReplace/changes.php b/admin/views/FindReplace/changes.php
index 1c7b325..deb98d4 100644
--- a/admin/views/FindReplace/changes.php
+++ b/admin/views/FindReplace/changes.php
@@ -1,6 +1,6 @@
 <?php
 
-use Nails\FindReplace\Admin\Controller\FindReplace;
+use Nails\FindReplace\Admin\Url;
 use Nails\FindReplace\Factory\ChangeRecord;
 
 /** @var array<string, list<ChangeRecord>> $runs */
@@ -24,7 +24,7 @@
             <?php
 
             if ($canReplace) {
-                echo form_open(FindReplace::url('revert'), ['class' => 'form-inline']);
+                echo form_open(Url::to('revert'), ['class' => 'form-inline']);
                 ?>
                 <input type="hidden" name="run_id" value="<?=htmlspecialchars($runId)?>">
                 <button type="submit" class="btn btn-sm btn-default">Revert run</button>
@@ -63,7 +63,7 @@
                             <?php
 
                             if ($canReplace) {
-                                echo form_open(FindReplace::url('revert'));
+                                echo form_open(Url::to('revert'));
                                 ?>
                                 <input type="hidden" name="change_id" value="<?=$row->getId()?>">
                                 <button type="submit" class="btn btn-sm btn-default">Revert</button>
diff --git a/admin/views/FindReplace/results.php b/admin/views/FindReplace/results.php
index d196f76..d9d923d 100644
--- a/admin/views/FindReplace/results.php
+++ b/admin/views/FindReplace/results.php
@@ -1,7 +1,7 @@
 <?php
 
 use Nails\Admin\Helper;
-use Nails\FindReplace\Admin\Controller\FindReplace;
+use Nails\FindReplace\Admin\Url;
 use Nails\FindReplace\Factory\StoredResult;
 use Nails\FindReplace\Model\Search;
 use Nails\FindReplace\Resource;
@@ -28,6 +28,7 @@
 $scanned = $search->tablesScanned();
 $totalTables = $search->tablesTotal();
 $running = $search->status() === Search::STATUS_RUNNING;
+$percent = $totalTables > 0 ? min(100, (int) round($scanned / $totalTables * 100)) : 0;
 
 ?>
 <fieldset class="find-replace-detail"<?php
@@ -109,7 +110,12 @@
             Waiting for a worker to start this search.
         </div>
         <p data-find-replace-scanning<?=$running ? '' : ' hidden'?>>Scanning tables.</p>
-        <div class="js-admin-progress" data-value="<?=$scanned?>" data-max="<?=$totalTables?>"<?=$running ? '' : ' hidden'?>></div>
+        <div class="find-replace-meter" data-find-replace-meter<?=$running ? '' : ' hidden'?>>
+            <span class="find-replace-meter__track" role="progressbar" aria-valuemin="0" aria-valuemax="<?=$totalTables?>" aria-valuenow="<?=$scanned?>">
+                <span class="find-replace-meter__bar" style="width: <?=$percent?>%"></span>
+            </span>
+            <span class="find-replace-meter__label"><?=$scanned?> / <?=$totalTables?> tables</span>
+        </div>
         <?php
     }
 
@@ -125,7 +131,7 @@
 <?php
 
 if ($search->status() === Search::STATUS_FAILED) {
-    echo form_open(FindReplace::url('rerun'));
+    echo form_open(Url::to('rerun'));
     ?>
     <input type="hidden" name="id" value="<?=$id?>">
     <button type="submit" class="btn btn-primary">Run again</button>
@@ -146,7 +152,7 @@
     if ($hasFilters) {
         ?>
         <div class="search clearfix">
-            <?=form_open(FindReplace::url('results'), ['method' => 'GET'])?>
+            <?=form_open(Url::to('results'), ['method' => 'GET'])?>
             <input type="hidden" name="id" value="<?=$id?>">
             <?php
 
@@ -195,7 +201,7 @@
             ?>
             <div class="actions">
                 <button type="submit" class="btn btn-xs btn-primary">Search</button>
-                <?=anchor(FindReplace::url('results') . '?id=' . $id, 'Reset', 'class="btn btn-xs btn-default"')?>
+                <?=anchor(Url::to('results') . '?id=' . $id, 'Reset', 'class="btn btn-xs btn-default"')?>
             </div>
             <?=form_close()?>
         </div>
@@ -204,7 +210,7 @@
 
     echo Helper::loadPagination($pagination);
 
-    echo form_open(FindReplace::url('replace'), [
+    echo form_open(Url::to('replace'), [
         'id' => 'find-replace-results',
         'data-filtered' => $filtered ? '1' : '0',
     ])?>
diff --git a/assets/css/admin.min.css b/assets/css/admin.min.css
index 600c64c..cadc70d 100644
--- a/assets/css/admin.min.css
+++ b/assets/css/admin.min.css
@@ -1 +1 @@
-.find-replace-results mark,.find-replace-snippet mark,.find-replace-preview mark{padding:0 .15em}.find-replace-snippet mark{background-color:#c8f7c5}.find-replace-preview mark{background-color:#c5ddf7}.find-replace-results td.actions .btn{margin-bottom:.25rem}[data-find-replace-status]{font-variant-numeric:tabular-nums}.find-replace-searches{margin-top:2.5rem}.find-replace-searches .find-replace-status,.find-replace-searches .find-replace-progress,.find-replace-searches .find-replace-results,.find-replace-searches .find-replace-last-run,.find-replace-searches .actions{width:250px}.find-replace-detail__term{font-size:1.25rem}.find-replace-detail__arrow{margin:0 .35rem;color:#6c757d}.find-replace-detail__meta{display:flex;flex-wrap:wrap;align-items:center;gap:.5rem .75rem}.find-replace-detail__facts{display:flex;flex-wrap:wrap;gap:0 1.5rem}.find-replace-detail__fact{display:flex;flex-direction:column;gap:.15rem}.find-replace-detail__fact+.find-replace-detail__fact{padding-left:1.5rem;border-left:1px solid #dee2e6}.find-replace-detail__fact-label{color:#6c757d;font-size:.75rem;font-weight:600;letter-spacing:.04em;text-transform:uppercase}.find-replace-detail__fact-value{font-size:1rem;font-variant-numeric:tabular-nums}.find-replace-detail__scope{color:#6c757d}.find-replace-progress{font-variant-numeric:tabular-nums;white-space:nowrap}.find-replace-error{margin-top:.35rem;color:#a94442}
+.find-replace-results mark,.find-replace-snippet mark,.find-replace-preview mark{padding:0 .15em}.find-replace-snippet mark{background-color:#c8f7c5}.find-replace-preview mark{background-color:#c5ddf7}.find-replace-results td.actions .btn{margin-bottom:.25rem}[data-find-replace-status]{font-variant-numeric:tabular-nums}.find-replace-searches{margin-top:2.5rem}.find-replace-searches .find-replace-status,.find-replace-searches .find-replace-progress,.find-replace-searches .find-replace-results,.find-replace-searches .find-replace-last-run,.find-replace-searches .actions{width:250px}.find-replace-detail__term{font-size:1.25rem}.find-replace-detail__arrow{margin:0 .35rem;color:#6c757d}.find-replace-detail__meta{display:flex;flex-wrap:wrap;align-items:center;gap:.5rem .75rem}.find-replace-detail__facts{display:flex;flex-wrap:wrap;gap:0 1.5rem}.find-replace-detail__fact{display:flex;flex-direction:column;gap:.15rem}.find-replace-detail__fact+.find-replace-detail__fact{padding-left:1.5rem;border-left:1px solid #dee2e6}.find-replace-detail__fact-label{color:#6c757d;font-size:.75rem;font-weight:600;letter-spacing:.04em;text-transform:uppercase}.find-replace-detail__fact-value{font-size:1rem;font-variant-numeric:tabular-nums}.find-replace-detail__scope{color:#6c757d}.find-replace-progress{font-variant-numeric:tabular-nums;white-space:nowrap}.find-replace-error{margin-top:.35rem;color:#a94442}.badge.badge-warning,.badge.badge-info,.badge.badge-success,.badge.badge-danger,.badge.badge-secondary{color:#fff}.badge.badge-warning{background-color:#f0ad4e}.badge.badge-info{background-color:#5bc0de}.badge.badge-success{background-color:#5cb85c}.badge.badge-danger{background-color:#d9534f}.badge.badge-secondary{background-color:#777}.find-replace-meter{display:flex;align-items:center;gap:.75rem;margin-bottom:1em}.find-replace-meter[hidden]{display:none}.find-replace-meter__track{flex:1;height:10px;overflow:hidden;background-color:#efefef;border-radius:5px}.find-replace-meter__bar{display:block;height:100%;background-color:#5bc0de;transition:width .3s ease}.find-replace-meter__label{font-variant-numeric:tabular-nums;white-space:nowrap}
diff --git a/assets/js/admin.min.js b/assets/js/admin.min.js
index 2038568..1cc5092 100644
--- a/assets/js/admin.min.js
+++ b/assets/js/admin.min.js
@@ -1 +1 @@
-(()=>{"use strict";const e=class{constructor(e){this.adminController=e,this.pendingScope="selected",this.modal=null,e.onRefreshUi(()=>{this.bind()}),this.bind()}dialog(){return this.modal||(this.modal=this.adminController.getInstance("Modal").create(),this.modal.setTitle("Replace text?").addAction("Replace",["btn-danger"],()=>{this.apply()}).addAction("Cancel",["btn-default"],()=>{this.modal.hide()})),this.modal}show(e){const t=document.createElement("p");t.textContent=e,this.dialog().setBody(t).show()}apply(){const e=document.getElementById("find-replace-results");if(!e)return;let t=e.querySelector('input[type="hidden"][name="scope"]');t||(t=document.createElement("input"),t.type="hidden",t.name="scope",e.appendChild(t)),t.value=this.pendingScope,e.submit()}bind(){const e=document.getElementById("find-replace-results");e&&!e.classList.contains("js-find-replace-bound")&&(e.classList.add("js-find-replace-bound"),e.addEventListener("change",t=>{t.target.matches(".js-toggle-all")&&e.querySelectorAll('input[name="result_ids[]"]').forEach(e=>{e.checked=t.target.checked}),t.target.matches('.js-toggle-all, input[name="result_ids[]"]')&&this.sync(e)})),document.querySelectorAll(".js-find-replace-apply:not(.processed)").forEach(t=>{t.classList.add("processed"),t.addEventListener("click",s=>{s.preventDefault(),this.pendingScope=t.getAttribute("data-scope")||"selected",this.show(this.message(e,this.pendingScope))})}),this.sync(e)}message(e,t){if("all"===t)return e&&"1"===e.getAttribute("data-filtered")?"This updates every saved result that matches the current filters.":"This updates every saved result for this search.";const s=this.selectedCount(e);return`This updates ${s} selected ${1===s?"record":"records"}.`}selectedCount(e){return e?e.querySelectorAll('input[name="result_ids[]"]:checked').length:0}sync(e){if(!e)return;const t=e.querySelector('.js-find-replace-apply[data-scope="selected"]');t&&(t.disabled=0===this.selectedCount(e))}},t={PENDING:{variant:"badge-warning",label:"Pending"},RUNNING:{variant:"badge-info",label:"Running"},COMPLETE:{variant:"badge-success",label:"Complete"},FAILED:{variant:"badge-danger",label:"Failed"}};function s(e){return t[e]||{variant:"badge-secondary",label:e||"Unknown"}}const n=class{constructor(){document.querySelectorAll("[data-find-replace-status]").forEach(e=>{this.watch(e)})}watch(e){const t=e.getAttribute("data-url");t&&window.setTimeout(()=>{fetch(t,{credentials:"same-origin",headers:{Accept:"application/json","X-Requested-With":"XMLHttpRequest"}}).then(e=>e.json()).then(t=>{const s=t&&t.data&&!Array.isArray(t.data)?t.data:t;this.paint(e,s),"COMPLETE"!==s.status&&"FAILED"!==s.status?this.watch(e):window.location.reload()}).catch(()=>{this.watch(e)})},2e3)}paint(e,t){const n=t.status||"",a=e.querySelector("[data-find-replace-badge]"),r=e.querySelector("[data-find-replace-message]"),i=e.querySelector("[data-find-replace-scanning]"),c=e.querySelector(".js-admin-progress"),l=Number(t.tables_scanned)||0,d=Number(t.tables_total)||0;a&&function(e,t){const n=s(t);e.className="badge "+n.variant,e.textContent=n.label}(a,n),r&&(r.hidden="PENDING"!==n),i&&(i.hidden="RUNNING"!==n),c&&(c.hidden="RUNNING"!==n,c.dataset.max=String(d),c.dataset.value=String(l))}},a=class{constructor(){this.root=document.getElementById("find-replace"),this.form=document.getElementById("find-replace-form"),this.rows=document.getElementById("find-replace-searches"),this.alert=document.getElementById("find-replace-alert"),this.items=[],this.timer=null,this.root&&this.form&&this.rows&&(this.api=this.root.getAttribute("data-api"),this.form.addEventListener("submit",e=>{e.preventDefault(),this.create()}),this.load())}create(){const e=new FormData(this.form),t=this.form.querySelector('button[type="submit"]');t&&(t.disabled=!0),this.request(this.api,"POST",{term:e.get("term")||"",replacement:e.get("replacement")||"",case_sensitive:e.getAll("case_sensitive"),include_tables:e.get("include_tables")||"",exclude_tables:e.get("exclude_tables")||""}).then(()=>(this.message("success","Search queued."),this.form.reset(),this.restoreCaseSensitive(),this.load())).catch(e=>{this.message("danger",e.message)}).finally(()=>{t&&(t.disabled=!1)})}restoreCaseSensitive(){const e=this.form.querySelector('input[type="checkbox"][name="case_sensitive"]');e&&(e.checked=!0)}load(){return window.clearTimeout(this.timer),this.request(this.api,"GET").then(e=>{const t=Array.isArray(e.data)?e.data:[];this.render(t);const s=t.some(e=>"PENDING"===e.status||"RUNNING"===e.status);this.timer=window.setTimeout(()=>this.load(),s?2500:6e4)}).catch(e=>{this.message("danger",e.message),this.timer=window.setTimeout(()=>this.load(),6e4)})}render(e){const t=e.map(e=>e.id);e.forEach(e=>{const t=this.items.find(t=>t.id===e.id);t?this.update(t.node,e):this.items.push({id:e.id,node:this.add(e)})});for(let e=this.items.length-1;e>=0;e--)t.includes(this.items[e].id)||(this.items[e].node.remove(),this.items.splice(e,1));0===this.items.length&&(this.rows.textContent="",this.rows.append(this.empty("No searches yet")))}add(e){const t=this.rows.querySelector(".no-data");t&&t.closest("tr").remove();const s=document.createElement("tr");return s.append(this.cell("term",this.link(e)),this.cell("status"),this.cell("progress"),this.cell("results"),this.cell("last-run"),this.actions(e)),this.update(s,e),this.rows.append(s),s}update(e,t){const n=e.querySelector(".find-replace-term").querySelector("a");n&&(n.href=t.results_url,n.textContent=t.term);const a=e.querySelector(".find-replace-status");if(a.textContent="",a.append(function(e){const t=s(e),n=document.createElement("span");return n.className="badge "+t.variant,n.textContent=t.label,n}(t.status)),t.error){const e=document.createElement("div");e.className="find-replace-error",e.textContent=t.error,a.append(e)}e.querySelector(".find-replace-progress").textContent=t.tables_scanned+" / "+t.tables_total,e.querySelector(".find-replace-results").textContent=String(t.result_count),e.querySelector(".find-replace-last-run").textContent=t.last_run||"";const r=e.querySelector('[data-action="persistent"]');r.textContent=t.persistent?"Stop keeping":"Keep",r.dataset.persistent=t.persistent?"0":"1"}actions(e){const t=document.createElement("td");return t.className="actions",t.append(this.button("Keep","persistent",()=>this.persist(e.id,t)),this.button("Run again","rerun",()=>this.rerun(e.id)),this.button("Delete","delete",()=>this.remove(e.id),"btn-danger")),t}persist(e,t){const s=t.querySelector('[data-action="persistent"]');this.request(this.api+"/persistent","POST",{id:e,persistent:"1"===s.dataset.persistent}).then(()=>this.load()).catch(e=>this.message("danger",e.message))}rerun(e){this.request(this.api+"/rerun","POST",{id:e}).then(()=>this.load()).catch(e=>this.message("danger",e.message))}remove(e){window.confirm("Delete this search and its results?")&&this.request(this.api+"/delete","POST",{id:e}).then(()=>this.load()).catch(e=>this.message("danger",e.message))}button(e,t,s,n){const a=document.createElement("button");return a.type="button",a.className="btn btn-sm "+(n||"btn-default"),a.dataset.action=t,a.textContent=e,a.addEventListener("click",s),a}cell(e,t){const s=document.createElement("td");return s.className="find-replace-"+e,t&&s.append(t),s}link(e){const t=document.createElement("a");return t.href=e.results_url,t.textContent=e.term,t}empty(e){const t=document.createElement("tr"),s=document.createElement("td");return s.colSpan=6,s.className="no-data",s.textContent=e,t.append(s),t}message(e,t){this.alert&&(this.alert.hidden=!1,this.alert.className="alert alert-"+e,this.alert.textContent=t)}request(e,t,s){const n={method:t,credentials:"same-origin",headers:{Accept:"application/json","X-Requested-With":"XMLHttpRequest"}};return s&&(n.headers["Content-Type"]="application/json",n.body=JSON.stringify(s)),fetch(e,n).then(e=>e.json().then(t=>{if(!e.ok)throw new Error(t.error||"The request failed.");return t}))}};window.NAILS.ADMIN.registerPlugin("nails/module-find-replace","Confirm",t=>new e(t)).registerPlugin("nails/module-find-replace","Progress",()=>new n).registerPlugin("nails/module-find-replace","Searches",()=>new a)})();
\ No newline at end of file
+(()=>{"use strict";const e=class{constructor(e){this.adminController=e,this.pendingScope="selected",this.modal=null,e.onRefreshUi(()=>{this.bind()}),this.bind()}dialog(){return this.modal||(this.modal=this.adminController.getInstance("Modal").create(),this.modal.setTitle("Replace text?").addAction("Replace",["btn-danger"],()=>{this.apply()}).addAction("Cancel",["btn-default"],()=>{this.modal.hide()})),this.modal}show(e){const t=document.createElement("p");t.textContent=e,this.dialog().setBody(t).show()}apply(){const e=document.getElementById("find-replace-results");if(!e)return;let t=e.querySelector('input[type="hidden"][name="scope"]');t||(t=document.createElement("input"),t.type="hidden",t.name="scope",e.appendChild(t)),t.value=this.pendingScope,e.submit()}bind(){const e=document.getElementById("find-replace-results");e&&!e.classList.contains("js-find-replace-bound")&&(e.classList.add("js-find-replace-bound"),e.addEventListener("change",t=>{t.target.matches(".js-toggle-all")&&e.querySelectorAll('input[name="result_ids[]"]').forEach(e=>{e.checked=t.target.checked}),t.target.matches('.js-toggle-all, input[name="result_ids[]"]')&&this.sync(e)})),document.querySelectorAll(".js-find-replace-apply:not(.processed)").forEach(t=>{t.classList.add("processed"),t.addEventListener("click",s=>{s.preventDefault(),this.pendingScope=t.getAttribute("data-scope")||"selected",this.show(this.message(e,this.pendingScope))})}),this.sync(e)}message(e,t){if("all"===t)return e&&"1"===e.getAttribute("data-filtered")?"This updates every saved result that matches the current filters.":"This updates every saved result for this search.";const s=this.selectedCount(e);return`This updates ${s} selected ${1===s?"record":"records"}.`}selectedCount(e){return e?e.querySelectorAll('input[name="result_ids[]"]:checked').length:0}sync(e){if(!e)return;const t=e.querySelector('.js-find-replace-apply[data-scope="selected"]');t&&(t.disabled=0===this.selectedCount(e))}},t={PENDING:{variant:"badge-warning",label:"Pending"},RUNNING:{variant:"badge-info",label:"Running"},COMPLETE:{variant:"badge-success",label:"Complete"},FAILED:{variant:"badge-danger",label:"Failed"}};function s(e){return t[e]||{variant:"badge-secondary",label:e||"Unknown"}}const n=class{constructor(){document.querySelectorAll("[data-find-replace-status]").forEach(e=>{this.watch(e)})}watch(e){const t=e.getAttribute("data-url");t&&window.setTimeout(()=>{fetch(t,{credentials:"same-origin",headers:{Accept:"application/json","X-Requested-With":"XMLHttpRequest"}}).then(e=>e.json()).then(t=>{const s=t&&t.data&&!Array.isArray(t.data)?t.data:t;this.paint(e,s),"COMPLETE"!==s.status&&"FAILED"!==s.status?this.watch(e):window.location.reload()}).catch(()=>{this.watch(e)})},2e3)}paint(e,t){const n=t.status||"",a=e.querySelector("[data-find-replace-badge]"),r=e.querySelector("[data-find-replace-message]"),i=e.querySelector("[data-find-replace-scanning]"),l=e.querySelector("[data-find-replace-meter]"),c=Number(t.tables_scanned)||0,d=Number(t.tables_total)||0;a&&function(e,t){const n=s(t);e.className="badge "+n.variant,e.textContent=n.label}(a,n),r&&(r.hidden="PENDING"!==n),i&&(i.hidden="RUNNING"!==n),l&&(l.hidden="RUNNING"!==n,this.paintMeter(l,c,d))}paintMeter(e,t,s){const n=e.querySelector(".find-replace-meter__track"),a=e.querySelector(".find-replace-meter__bar"),r=e.querySelector(".find-replace-meter__label"),i=s>0?Math.min(100,Math.round(t/s*100)):0;n&&(n.setAttribute("aria-valuemax",String(s)),n.setAttribute("aria-valuenow",String(t))),a&&(a.style.width=i+"%"),r&&(r.textContent=t+" / "+s+" tables")}},a=class{constructor(){this.root=document.getElementById("find-replace"),this.form=document.getElementById("find-replace-form"),this.rows=document.getElementById("find-replace-searches"),this.alert=document.getElementById("find-replace-alert"),this.items=[],this.timer=null,this.root&&this.form&&this.rows&&(this.api=this.root.getAttribute("data-api"),this.form.addEventListener("submit",e=>{e.preventDefault(),this.create()}),this.load())}create(){const e=new FormData(this.form),t=this.form.querySelector('button[type="submit"]');t&&(t.disabled=!0),this.request(this.api,"POST",{term:e.get("term")||"",replacement:e.get("replacement")||"",case_sensitive:e.getAll("case_sensitive"),include_tables:e.get("include_tables")||"",exclude_tables:e.get("exclude_tables")||""}).then(()=>(this.message("success","Search queued."),this.form.reset(),this.restoreCaseSensitive(),this.load())).catch(e=>{this.message("danger",e.message)}).finally(()=>{t&&(t.disabled=!1)})}restoreCaseSensitive(){const e=this.form.querySelector('input[type="checkbox"][name="case_sensitive"]');e&&(e.checked=!0)}load(){return window.clearTimeout(this.timer),this.request(this.api,"GET").then(e=>{const t=Array.isArray(e.data)?e.data:[];this.render(t);const s=t.some(e=>"PENDING"===e.status||"RUNNING"===e.status);this.timer=window.setTimeout(()=>this.load(),s?2500:6e4)}).catch(e=>{this.message("danger",e.message),this.timer=window.setTimeout(()=>this.load(),6e4)})}render(e){const t=e.map(e=>e.id);e.forEach(e=>{const t=this.items.find(t=>t.id===e.id);t?this.update(t.node,e):this.items.push({id:e.id,node:this.add(e)})});for(let e=this.items.length-1;e>=0;e--)t.includes(this.items[e].id)||(this.items[e].node.remove(),this.items.splice(e,1));0===this.items.length&&(this.rows.textContent="",this.rows.append(this.empty("No searches yet")))}add(e){const t=this.rows.querySelector(".no-data");t&&t.closest("tr").remove();const s=document.createElement("tr");return s.append(this.cell("term",this.link(e)),this.cell("status"),this.cell("progress"),this.cell("results"),this.cell("last-run"),this.actions(e)),this.update(s,e),this.rows.append(s),s}update(e,t){const n=e.querySelector(".find-replace-term").querySelector("a");n&&(n.href=t.results_url,n.textContent=t.term);const a=e.querySelector(".find-replace-status");if(a.textContent="",a.append(function(e){const t=s(e),n=document.createElement("span");return n.className="badge "+t.variant,n.textContent=t.label,n}(t.status)),t.error){const e=document.createElement("div");e.className="find-replace-error",e.textContent=t.error,a.append(e)}e.querySelector(".find-replace-progress").textContent=t.tables_scanned+" / "+t.tables_total,e.querySelector(".find-replace-results").textContent=String(t.result_count),e.querySelector(".find-replace-last-run").textContent=t.last_run||"";const r=e.querySelector('[data-action="persistent"]');r.textContent=t.persistent?"Stop keeping":"Keep",r.dataset.persistent=t.persistent?"0":"1"}actions(e){const t=document.createElement("td");return t.className="actions",t.append(this.button("Keep","persistent",()=>this.persist(e.id,t)),this.button("Run again","rerun",()=>this.rerun(e.id)),this.button("Delete","delete",()=>this.remove(e.id),"btn-danger")),t}persist(e,t){const s=t.querySelector('[data-action="persistent"]');this.request(this.api+"/persistent","POST",{id:e,persistent:"1"===s.dataset.persistent}).then(()=>this.load()).catch(e=>this.message("danger",e.message))}rerun(e){this.request(this.api+"/rerun","POST",{id:e}).then(()=>this.load()).catch(e=>this.message("danger",e.message))}remove(e){window.confirm("Delete this search and its results?")&&this.request(this.api+"/delete","POST",{id:e}).then(()=>this.load()).catch(e=>this.message("danger",e.message))}button(e,t,s,n){const a=document.createElement("button");return a.type="button",a.className="btn btn-sm "+(n||"btn-default"),a.dataset.action=t,a.textContent=e,a.addEventListener("click",s),a}cell(e,t){const s=document.createElement("td");return s.className="find-replace-"+e,t&&s.append(t),s}link(e){const t=document.createElement("a");return t.href=e.results_url,t.textContent=e.term,t}empty(e){const t=document.createElement("tr"),s=document.createElement("td");return s.colSpan=6,s.className="no-data",s.textContent=e,t.append(s),t}message(e,t){this.alert&&(this.alert.hidden=!1,this.alert.className="alert alert-"+e,this.alert.textContent=t)}request(e,t,s){const n={method:t,credentials:"same-origin",headers:{Accept:"application/json","X-Requested-With":"XMLHttpRequest"}};return s&&(n.headers["Content-Type"]="application/json",n.body=JSON.stringify(s)),fetch(e,n).then(e=>e.json().then(t=>{if(!e.ok)throw new Error(t.error||"The request failed.");return t}))}};window.NAILS.ADMIN.registerPlugin("nails/module-find-replace","Confirm",t=>new e(t)).registerPlugin("nails/module-find-replace","Progress",()=>new n).registerPlugin("nails/module-find-replace","Searches",()=>new a)})();
\ No newline at end of file
diff --git a/assets/js/components/Progress.js b/assets/js/components/Progress.js
index 60a5bfd..48eee1c 100644
--- a/assets/js/components/Progress.js
+++ b/assets/js/components/Progress.js
@@ -45,7 +45,7 @@ class Progress {
         const badgeNode = node.querySelector('[data-find-replace-badge]');
         const message = node.querySelector('[data-find-replace-message]');
         const scanning = node.querySelector('[data-find-replace-scanning]');
-        const meter = node.querySelector('.js-admin-progress');
+        const meter = node.querySelector('[data-find-replace-meter]');
         const scanned = Number(payload.tables_scanned) || 0;
         const total = Number(payload.tables_total) || 0;
 
@@ -63,8 +63,27 @@ class Progress {
 
         if (meter) {
             meter.hidden = status !== 'RUNNING';
-            meter.dataset.max = String(total);
-            meter.dataset.value = String(scanned);
+            this.paintMeter(meter, scanned, total);
+        }
+    }
+
+    paintMeter(meter, scanned, total) {
+        const track = meter.querySelector('.find-replace-meter__track');
+        const bar = meter.querySelector('.find-replace-meter__bar');
+        const label = meter.querySelector('.find-replace-meter__label');
+        const percent = total > 0 ? Math.min(100, Math.round(scanned / total * 100)) : 0;
+
+        if (track) {
+            track.setAttribute('aria-valuemax', String(total));
+            track.setAttribute('aria-valuenow', String(scanned));
+        }
+
+        if (bar) {
+            bar.style.width = percent + '%';
+        }
+
+        if (label) {
+            label.textContent = scanned + ' / ' + total + ' tables';
         }
     }
 }
diff --git a/assets/sass/admin.scss b/assets/sass/admin.scss
index 611b2e8..c4103d8 100644
--- a/assets/sass/admin.scss
+++ b/assets/sass/admin.scss
@@ -95,3 +95,66 @@
     margin-top: 0.35rem;
     color: #a94442;
 }
+
+//  The pre-new-admin skin has a plain .badge and no progress bar, so the module brings its own
+
+.badge {
+    &.badge-warning,
+    &.badge-info,
+    &.badge-success,
+    &.badge-danger,
+    &.badge-secondary {
+        color: #ffffff;
+    }
+
+    &.badge-warning {
+        background-color: #f0ad4e;
+    }
+
+    &.badge-info {
+        background-color: #5bc0de;
+    }
+
+    &.badge-success {
+        background-color: #5cb85c;
+    }
+
+    &.badge-danger {
+        background-color: #d9534f;
+    }
+
+    &.badge-secondary {
+        background-color: #777777;
+    }
+}
+
+.find-replace-meter {
+    display: flex;
+    align-items: center;
+    gap: 0.75rem;
+    margin-bottom: 1em;
+
+    &[hidden] {
+        display: none;
+    }
+}
+
+.find-replace-meter__track {
+    flex: 1;
+    height: 10px;
+    overflow: hidden;
+    background-color: #efefef;
+    border-radius: 5px;
+}
+
+.find-replace-meter__bar {
+    display: block;
+    height: 100%;
+    background-color: #5bc0de;
+    transition: width 0.3s ease;
+}
+
+.find-replace-meter__label {
+    font-variant-numeric: tabular-nums;
+    white-space: nowrap;
+}
diff --git a/composer.json b/composer.json
index dbcf289..e7a8572 100644
--- a/composer.json
+++ b/composer.json
@@ -7,13 +7,13 @@
     "prefer-stable": true,
     "require": {
         "php": ">=8.3",
-        "nails/common": "dev-develop",
-        "nails/module-admin": "dev-develop",
-        "nails/module-api": "dev-develop",
-        "nails/module-console": "dev-develop",
-        "nails/module-email": "dev-develop",
-        "nails/module-housekeeping": "dev-develop",
-        "nails/module-queue": "dev-develop"
+        "nails/common": "dev-feature/pre-new-admin",
+        "nails/module-admin": "dev-feature/pre-new-admin",
+        "nails/module-api": "dev-feature/pre-new-admin",
+        "nails/module-console": "dev-feature/pre-new-admin",
+        "nails/module-email": "dev-feature/pre-new-admin",
+        "nails/module-housekeeping": "dev-feature/pre-new-admin",
+        "nails/module-queue": "dev-feature/pre-new-admin"
     },
     "require-dev": {
         "phpunit/phpunit": "^12.0",
@@ -36,7 +36,7 @@
     },
     "extra": {
         "nails": {
-            "moduleName": "find-replace",
+            "moduleName": "findReplace",
             "type": "module",
             "namespace": "Nails\\FindReplace\\",
             "data": {
diff --git a/find-replace/config/email_types.php b/findReplace/config/email_types.php
similarity index 86%
rename from find-replace/config/email_types.php
rename to findReplace/config/email_types.php
index e5c97f7..70e9b60 100644
--- a/find-replace/config/email_types.php
+++ b/findReplace/config/email_types.php
@@ -9,7 +9,7 @@
         'can_unsubscribe' => false,
         'description' => 'Sent when a saved find-replace search finishes',
         'template_header' => '',
-        'template_body' => 'find-replace/Email/templates/search/complete',
+        'template_body' => 'findReplace/Email/templates/search/complete',
         'template_footer' => '',
         'default_subject' => 'Find and replace search complete',
         'factory' => Constants::MODULE_SLUG . '::EmailSearchComplete',
@@ -20,7 +20,7 @@
         'can_unsubscribe' => false,
         'description' => 'Sent when a saved find-replace search fails',
         'template_header' => '',
-        'template_body' => 'find-replace/Email/templates/search/fail',
+        'template_body' => 'findReplace/Email/templates/search/fail',
         'template_footer' => '',
         'default_subject' => 'Find and replace search failed',
         'factory' => Constants::MODULE_SLUG . '::EmailSearchFail',
diff --git a/find-replace/views/Email/templates/search/complete.php b/findReplace/views/Email/templates/search/complete.php
similarity index 100%
rename from find-replace/views/Email/templates/search/complete.php
rename to findReplace/views/Email/templates/search/complete.php
diff --git a/find-replace/views/Email/templates/search/complete_plaintext.php b/findReplace/views/Email/templates/search/complete_plaintext.php
similarity index 100%
rename from find-replace/views/Email/templates/search/complete_plaintext.php
rename to findReplace/views/Email/templates/search/complete_plaintext.php
diff --git a/find-replace/views/Email/templates/search/fail.php b/findReplace/views/Email/templates/search/fail.php
similarity index 100%
rename from find-replace/views/Email/templates/search/fail.php
rename to findReplace/views/Email/templates/search/fail.php
diff --git a/find-replace/views/Email/templates/search/fail_plaintext.php b/findReplace/views/Email/templates/search/fail_plaintext.php
similarity index 100%
rename from find-replace/views/Email/templates/search/fail_plaintext.php
rename to findReplace/views/Email/templates/search/fail_plaintext.php
diff --git a/src/Admin/Permission.php b/src/Admin/Permission.php
new file mode 100644
index 0000000..6ad7138
--- /dev/null
+++ b/src/Admin/Permission.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Nails\FindReplace\Admin;
+
+/**
+ * The admin permission strings. The keys are what FindReplace::permissions() offers
+ * on a user group; the full strings are what userHasPermission() checks.
+ */
+class Permission
+{
+    const SEARCH = 'admin:findreplace:findreplace:search';
+    const REPLACE = 'admin:findreplace:findreplace:replace';
+}
diff --git a/src/Admin/Permission/Replace.php b/src/Admin/Permission/Replace.php
deleted file mode 100644
index 612ba1d..0000000
--- a/src/Admin/Permission/Replace.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace Nails\FindReplace\Admin\Permission;
-
-use Nails\Admin\Interfaces\Permission;
-
-class Replace implements Permission
-{
-    public function label(): string
-    {
-        return 'Can apply find-replace replacements and revert your own changes';
-    }
-
-    public function group(): string
-    {
-        return 'Find & Replace';
-    }
-}
diff --git a/src/Admin/Permission/Search.php b/src/Admin/Permission/Search.php
deleted file mode 100644
index cff1e71..0000000
--- a/src/Admin/Permission/Search.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace Nails\FindReplace\Admin\Permission;
-
-use Nails\Admin\Interfaces\Permission;
-
-class Search implements Permission
-{
-    public function label(): string
-    {
-        return 'Can search, view results, export CSV, and manage your own saved searches';
-    }
-
-    public function group(): string
-    {
-        return 'Find & Replace';
-    }
-}
diff --git a/src/Admin/Url.php b/src/Admin/Url.php
new file mode 100644
index 0000000..3ed0957
--- /dev/null
+++ b/src/Admin/Url.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Nails\FindReplace\Admin;
+
+/**
+ * Admin URLs for the Find & Replace screens.
+ *
+ * The admin controller lives in admin/controllers and is only loaded by the admin
+ * router, so the queue task, the API, and the views build links from here.
+ */
+class Url
+{
+    const BASE = 'admin/findReplace/findReplace';
+
+    public static function to(string $action = ''): string
+    {
+        return siteUrl(self::BASE . ($action !== '' ? '/' . $action : ''));
+    }
+}
diff --git a/src/Api/Controller/Search.php b/src/Api/Controller/Search.php
index d5389f6..5d99c04 100644
--- a/src/Api/Controller/Search.php
+++ b/src/Api/Controller/Search.php
@@ -8,8 +8,8 @@
 use Nails\Common\Exception\ValidationException;
 use Nails\Common\Service\HttpCodes;
 use Nails\Factory;
-use Nails\FindReplace\Admin\Controller\FindReplace;
 use Nails\FindReplace\Admin\Permission;
+use Nails\FindReplace\Admin\Url;
 use Nails\FindReplace\Constants;
 use Nails\FindReplace\Exclusion\Pattern;
 use Nails\FindReplace\Model\Result;
@@ -23,7 +23,7 @@ class Search extends \Nails\Api\Controller\Base
 
     public static function requirePermission(): ?string
     {
-        return Permission\Search::class;
+        return Permission::SEARCH;
     }
 
     public function getRemap(string $method): ApiResponse
@@ -126,7 +126,7 @@ private function payload(Resource\Search $search): array
             'persistent' => $search->isPersistent(),
             'last_run' => $search->lastRunLabel(),
             'error' => $search->errorMessage(),
-            'results_url' => FindReplace::url('results') . '?id=' . $id,
+            'results_url' => Url::to('results') . '?id=' . $id,
         ];
     }
 
diff --git a/src/Queue/Task/Search.php b/src/Queue/Task/Search.php
index 6a819d8..090ce56 100644
--- a/src/Queue/Task/Search.php
+++ b/src/Queue/Task/Search.php
@@ -4,7 +4,7 @@
 
 use Nails\Common\Service\Database;
 use Nails\Factory;
-use Nails\FindReplace\Admin\Controller\FindReplace;
+use Nails\FindReplace\Admin\Url;
 use Nails\FindReplace\Constants;
 use Nails\FindReplace\Factory\Email\Search\Complete;
 use Nails\FindReplace\Factory\Email\Search\Fail;
@@ -99,7 +99,7 @@ private function notifyComplete(Resource\Search $search, int $resultCount): void
                 ->data([
                     'term' => $search->term(),
                     'result_count' => $resultCount,
-                    'results_url' => FindReplace::url('results') . '?id=' . (int) $search->id,
+                    'results_url' => Url::to('results') . '?id=' . (int) $search->id,
                 ])
                 ->send();
         } catch (\Throwable) {
diff --git a/tests/Admin/PermissionTest.php b/tests/Admin/PermissionTest.php
new file mode 100644
index 0000000..ab00d99
--- /dev/null
+++ b/tests/Admin/PermissionTest.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Tests\FindReplace\Admin;
+
+require_once dirname(__DIR__, 2) . '/admin/controllers/FindReplace.php';
+
+use Nails\Admin\FindReplace\FindReplace;
+use Nails\FindReplace\Admin\Permission;
+use Nails\FindReplace\Admin\Url;
+use PHPUnit\Framework\TestCase;
+
+class PermissionTest extends TestCase
+{
+    /**
+     * The user group editor stores `admin:{module}:{controller}:{key}`, lower-cased,
+     * for each key the controller offers.
+     */
+    public function test_constants_match_what_the_group_editor_stores(): void
+    {
+        $stored = array_map(
+            static fn(string $key): string => strtolower('admin:findReplace:FindReplace:' . $key),
+            array_keys(FindReplace::permissions()),
+        );
+
+        $this->assertSame([Permission::SEARCH, Permission::REPLACE], $stored);
+    }
+
+    public function test_module_name_routes_to_the_controller(): void
+    {
+        $composer = (string) file_get_contents(dirname(__DIR__, 2) . '/composer.json');
+
+        //  The admin router loads Nails\Admin\{ucfirst(moduleName)}\{Controller}, so the
+        //  module name must be a valid namespace segment
+        $this->assertMatchesRegularExpression('/"moduleName":\s*"findReplace"/', $composer);
+        $this->assertSame('Nails\\Admin\\' . ucfirst('findReplace') . '\\FindReplace', FindReplace::class);
+    }
+
+    public function test_url_points_at_the_controller(): void
+    {
+        $this->assertStringEndsWith('/admin/findReplace/findReplace', Url::to());
+        $this->assertStringEndsWith('/admin/findReplace/findReplace/results', Url::to('results'));
+        $this->assertSame(Url::to('changes'), FindReplace::url('changes'));
+    }
+}