From 408050666f3aab669b93623e3595fa357ffdda82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=9D=E5=8D=9C?= Date: Tue, 17 Mar 2026 16:30:15 +0800 Subject: [PATCH] =?UTF-8?q?feat(governance):=20=E6=89=B9=E6=AC=A1=E9=A1=B5?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=97=E8=A1=A8=E8=87=AA=E5=8A=A8=E5=AE=9A?= =?UTF-8?q?=E4=BD=8D=E5=88=B0=E7=AD=9B=E9=80=89=E5=8C=BA(anchor)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/PlatformBatchController.php | 32 +++++++++--------- .../admin/platform_batches/show.blade.php | 8 ++--- .../admin/platform_orders/index.blade.php | 2 +- ...rderIndexFiltersShouldHaveAnchorIdTest.php | 33 +++++++++++++++++++ 4 files changed, 54 insertions(+), 21 deletions(-) create mode 100644 tests/Feature/AdminPlatformOrderIndexFiltersShouldHaveAnchorIdTest.php diff --git a/app/Http/Controllers/Admin/PlatformBatchController.php b/app/Http/Controllers/Admin/PlatformBatchController.php index e23c0fe..286707e 100644 --- a/app/Http/Controllers/Admin/PlatformBatchController.php +++ b/app/Http/Controllers/Admin/PlatformBatchController.php @@ -97,58 +97,58 @@ class PlatformBatchController extends Controller $governanceLinks = []; if ($type === 'bas') { - $governanceLinks['all'] = BackUrl::withBack('/admin/platform-orders?' . \Illuminate\Support\Arr::query([ + $governanceLinks['all'] = BackUrl::withBackAndFragment('/admin/platform-orders?' . \Illuminate\Support\Arr::query([ 'batch_activation_run_id' => $runId, - ]), $safeBackForLinks); + ]), $safeBackForLinks, 'filters'); - $governanceLinks['failed'] = BackUrl::withBack('/admin/platform-orders?' . \Illuminate\Support\Arr::query([ + $governanceLinks['failed'] = BackUrl::withBackAndFragment('/admin/platform-orders?' . \Illuminate\Support\Arr::query([ 'batch_activation_run_id' => $runId, 'sync_status' => 'failed', - ]), $safeBackForLinks); + ]), $safeBackForLinks, 'filters'); - $governanceLinks['retry_syncable'] = BackUrl::withBack('/admin/platform-orders?' . \Illuminate\Support\Arr::query([ + $governanceLinks['retry_syncable'] = BackUrl::withBackAndFragment('/admin/platform-orders?' . \Illuminate\Support\Arr::query([ 'batch_activation_run_id' => $runId, 'sync_status' => 'unsynced', 'syncable_only' => '1', - ]), $safeBackForLinks); + ]), $safeBackForLinks, 'filters'); $topReason = (string) (data_get($summary, 'top_reasons.0.reason') ?? ''); $maxLen = (int) config('saasshop.platform_orders.sync_error_keyword_link_max_len', 200); $maxLen = max(50, min(1000, $maxLen)); if ($topReason !== '' && mb_strlen($topReason) <= $maxLen) { - $governanceLinks['top_reason'] = BackUrl::withBack('/admin/platform-orders?' . \Illuminate\Support\Arr::query([ + $governanceLinks['top_reason'] = BackUrl::withBackAndFragment('/admin/platform-orders?' . \Illuminate\Support\Arr::query([ 'batch_activation_run_id' => $runId, 'sync_status' => 'failed', 'sync_error_keyword' => $topReason, - ]), $safeBackForLinks); + ]), $safeBackForLinks, 'filters'); } } if ($type === 'bmpa') { - $governanceLinks['all'] = BackUrl::withBack('/admin/platform-orders?' . \Illuminate\Support\Arr::query([ + $governanceLinks['all'] = BackUrl::withBackAndFragment('/admin/platform-orders?' . \Illuminate\Support\Arr::query([ 'batch_bmpa_run_id' => $runId, - ]), $safeBackForLinks); + ]), $safeBackForLinks, 'filters'); - $governanceLinks['failed'] = BackUrl::withBack('/admin/platform-orders?' . \Illuminate\Support\Arr::query([ + $governanceLinks['failed'] = BackUrl::withBackAndFragment('/admin/platform-orders?' . \Illuminate\Support\Arr::query([ 'batch_bmpa_run_id' => $runId, 'bmpa_failed_only' => '1', - ]), $safeBackForLinks); + ]), $safeBackForLinks, 'filters'); - $governanceLinks['retry_processable'] = BackUrl::withBack('/admin/platform-orders?' . \Illuminate\Support\Arr::query([ + $governanceLinks['retry_processable'] = BackUrl::withBackAndFragment('/admin/platform-orders?' . \Illuminate\Support\Arr::query([ 'batch_bmpa_run_id' => $runId, 'status' => 'pending', 'payment_status' => 'unpaid', - ]), $safeBackForLinks); + ]), $safeBackForLinks, 'filters'); $topReason = (string) (data_get($summary, 'top_reasons.0.reason') ?? ''); $maxLen = (int) config('saasshop.platform_orders.sync_error_keyword_link_max_len', 200); $maxLen = max(50, min(1000, $maxLen)); if ($topReason !== '' && mb_strlen($topReason) <= $maxLen) { - $governanceLinks['top_reason'] = BackUrl::withBack('/admin/platform-orders?' . \Illuminate\Support\Arr::query([ + $governanceLinks['top_reason'] = BackUrl::withBackAndFragment('/admin/platform-orders?' . \Illuminate\Support\Arr::query([ 'batch_bmpa_run_id' => $runId, 'bmpa_failed_only' => '1', 'bmpa_error_keyword' => $topReason, - ]), $safeBackForLinks); + ]), $safeBackForLinks, 'filters'); } } diff --git a/resources/views/admin/platform_batches/show.blade.php b/resources/views/admin/platform_batches/show.blade.php index 54894da..a8ce55b 100644 --- a/resources/views/admin/platform_batches/show.blade.php +++ b/resources/views/admin/platform_batches/show.blade.php @@ -124,18 +124,18 @@ $reasonGovUrl = ''; if (! $reasonTooLong && $reason !== '') { if ($type === 'bas') { - $reasonGovUrl = \App\Support\BackUrl::withBack('/admin/platform-orders?' . \Illuminate\Support\Arr::query([ + $reasonGovUrl = \App\Support\BackUrl::withBackAndFragment('/admin/platform-orders?' . \Illuminate\Support\Arr::query([ 'batch_activation_run_id' => $runId, 'sync_status' => 'failed', 'sync_error_keyword' => $reason, - ]), $safeBackForLinks); + ]), $safeBackForLinks, 'filters'); } if ($type === 'bmpa') { - $reasonGovUrl = \App\Support\BackUrl::withBack('/admin/platform-orders?' . \Illuminate\Support\Arr::query([ + $reasonGovUrl = \App\Support\BackUrl::withBackAndFragment('/admin/platform-orders?' . \Illuminate\Support\Arr::query([ 'batch_bmpa_run_id' => $runId, 'bmpa_failed_only' => '1', 'bmpa_error_keyword' => $reason, - ]), $safeBackForLinks); + ]), $safeBackForLinks, 'filters'); } } @endphp diff --git a/resources/views/admin/platform_orders/index.blade.php b/resources/views/admin/platform_orders/index.blade.php index 87897ca..aa7f484 100644 --- a/resources/views/admin/platform_orders/index.blade.php +++ b/resources/views/admin/platform_orders/index.blade.php @@ -353,7 +353,7 @@ -
+

筛选条件

diff --git a/tests/Feature/AdminPlatformOrderIndexFiltersShouldHaveAnchorIdTest.php b/tests/Feature/AdminPlatformOrderIndexFiltersShouldHaveAnchorIdTest.php new file mode 100644 index 0000000..f4a8d65 --- /dev/null +++ b/tests/Feature/AdminPlatformOrderIndexFiltersShouldHaveAnchorIdTest.php @@ -0,0 +1,33 @@ +seed(); + + $this->post('/admin/login', [ + 'email' => 'platform.admin@demo.local', + 'password' => 'Platform@123456', + ])->assertRedirect('/admin'); + } + + public function test_platform_orders_filters_panel_should_have_anchor_id_filters(): void + { + $this->loginAsPlatformAdmin(); + + $html = $this->get('/admin/platform-orders') + ->assertOk() + ->getContent(); + + $this->assertStringContainsString('id="filters"', $html); + $this->assertStringContainsString('data-storage-key="admin.platform_orders.filters"', $html); + } +}