diff --git a/resources/js/tasks/components/TasksList.vue b/resources/js/tasks/components/TasksList.vue index 8f43156949..b27f874437 100644 --- a/resources/js/tasks/components/TasksList.vue +++ b/resources/js/tasks/components/TasksList.vue @@ -310,7 +310,7 @@ export default { }, { value: "showRequestSummary", - content: "Open Case", + content: "Open Request", icon: "fas fa-clipboard", link: true, href: "/requests/{{process_request.id}}", diff --git a/routes/web.php b/routes/web.php index 317bb87eb6..b95bd9e0c6 100644 --- a/routes/web.php +++ b/routes/web.php @@ -136,21 +136,20 @@ Route::post('/keep-alive', [LoginController::class, 'keepAlive'])->name('keep-alive'); // Cases Route::get('cases', [RequestController::class, 'index'])->name('cases.index')->middleware('no-cache'); - Route::get('cases/{request}', [RequestController::class, 'show'])->name('cases.show'); Route::get('cases/{type?}', [RequestController::class, 'index'])->name('cases_by_type') ->where('type', 'all|in_progress|completed') ->middleware('no-cache'); // Requests - Route::get('requests/search', [RequestController::class, 'search'])->name('requests.search'); - Route::get('requests/{type?}', [RequestController::class, 'index']) - ->where('type', 'all|in_progress|completed') - ->name('requests_by_type') - ->middleware('no-cache'); - Route::get('request/{request}/files/{media}', [RequestController::class, 'downloadFiles'])->middleware('can:view,request'); - Route::get('requests', [RequestController::class, 'index']) - ->name('requests.index') - ->middleware('no-cache'); + Route::get('requests', function () { + return redirect()->route('cases.index'); + })->name('requests.index')->middleware('no-cache'); + Route::get('requests/{type?}', function ($type = null) { + return redirect()->route('cases_by_type', ['type' => $type]); + })->where('type', 'all|in_progress|completed')->name('requests_by_type')->middleware('no-cache'); + Route::get('requests/{request}', [RequestController::class, 'show'])->name('requests.show'); + Route::get('request/{request}/files/{media}', [RequestController::class, 'downloadFiles'])->middleware('can:view,request'); + Route::get('requests/search', [RequestController::class, 'search'])->name('requests.search'); Route::get('requests/mobile/{request}', [RequestController::class, 'show'])->name('requests.showMobile'); Route::get('requests/{request}/task/{task}/screen/{screen}', [RequestController::class, 'screenPreview'])->name('requests.screen-preview'); diff --git a/tests/Feature/RedirectTest.php b/tests/Feature/RedirectTest.php index 0da2c3e6b3..f595a5100b 100644 --- a/tests/Feature/RedirectTest.php +++ b/tests/Feature/RedirectTest.php @@ -24,11 +24,11 @@ public function test401RedirectsToLogin() 'is_administrator' => false, ]); Auth::login($user); - $response = $this->get('/requests'); + $response = $this->get('/cases'); $response->assertStatus(200); $response->assertViewIs('requests.index'); Auth::logoutCurrentDevice(); - $response = $this->get('/requests'); + $response = $this->get('/cases'); //302 because we want to make sure they are being redirected $response->assertStatus(302); } diff --git a/tests/Feature/RequestTest.php b/tests/Feature/RequestTest.php index f39421c5ec..ee2138d301 100644 --- a/tests/Feature/RequestTest.php +++ b/tests/Feature/RequestTest.php @@ -45,7 +45,7 @@ class RequestTest extends TestCase public function testIndexRoute() { // get the URL - $response = $this->webCall('GET', '/requests'); + $response = $this->webCall('GET', '/cases'); $response->assertStatus(200); // check the correct view is called $response->assertViewIs('requests.index');