Skip to content

FOUR-19226: Rename Cases to Request #7385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pmPaulis merged 5 commits into from
Sep 20, 2024
Merged

FOUR-19226: Rename Cases to Request #7385

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
20874b7
FOUR-19226
pmPaulis Sep 18, 2024
a6b418e
redirect to requests
pmPaulis Sep 18, 2024
372fa26
observations
pmPaulis Sep 19, 2024
59663a6
conflicts
pmPaulis Sep 19, 2024
ea21797
Merge remote-tracking branch 'origin/feature/FOUR-18130' into feature…
pmPaulis Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
redirect to requests
  • Loading branch information
@pmPaulis
pmPaulis committed Sep 18, 2024
commit a6b418e1c9de8b9997cdc2c7e5018f194e456d78
10 changes: 8 additions & 2 deletions ProcessMaker/Http/Middleware/GenerateMenus.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,18 @@ public function handle(Request $request, Closure $next)
['route' => 'process.browser.index', 'id' => 'process-browser']
)->active('process-browser/*');
});
$menu->group(['prefix' => 'requests'], function ($request_items) {
$menu->group(['prefix' => 'cases'], function ($request_items) {
$request_items->add(
__('Cases'),
['route' => 'cases-main.index', 'id' => 'cases']
)->active('cases/*');
});
/*$menu->group(['prefix' => 'requests'], function ($request_items) {
$request_items->add(
__('Requests'),
['route' => 'requests.index', 'id' => 'requests']
)->active('requests/*');
});
});*/
//@TODO change the index to the correct blade
$menu->group(['prefix' => 'tasks'], function ($request_items) {
$request_items->add(
Expand Down
2 changes: 1 addition & 1 deletion resources/jscomposition/cases/casesMain/utils/counters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export const formatCounters = (data) => {
color: "gray",
icon: "fas fa-play",
url: () => {
window.location.href = "/cases";
window.location.href = "/requests";
},
},
];
Expand Down
2 changes: 1 addition & 1 deletion routes/api.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@
Route::get('/tasks/rule-execution-log', [InboxRulesController::class, 'executionLog'])->name('inboxrules.execution-log');

// Cases
Route::get('cases', [ProcessRequestController::class, 'index'])->name('cases.index');
//Route::get('cases', [ProcessRequestController::class, 'index'])->name('cases.index');
// Requests
Route::get('requests', [ProcessRequestController::class, 'index'])->name('requests.index'); // Already filtered in controller
Route::get('requests/{process}/count', [ProcessRequestController::class, 'getCount'])->name('requests.count');
Expand Down
16 changes: 7 additions & 9 deletions routes/web.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
use ProcessMaker\Http\Controllers\Auth\LoginController;
use ProcessMaker\Http\Controllers\Auth\ResetPasswordController;
use ProcessMaker\Http\Controllers\Auth\TwoFactorAuthController;
use ProcessMaker\Http\Controllers\CasesController;
use ProcessMaker\Http\Controllers\Designer\DesignerController;
use ProcessMaker\Http\Controllers\HomeController;
use ProcessMaker\Http\Controllers\InboxRulesController;
Expand All @@ -32,7 +33,6 @@
use ProcessMaker\Http\Controllers\ProcessesCatalogueController;
use ProcessMaker\Http\Controllers\ProfileController;
use ProcessMaker\Http\Controllers\RequestController;
use ProcessMaker\Http\Controllers\CasesController;
use ProcessMaker\Http\Controllers\Saml\MetadataController;
use ProcessMaker\Http\Controllers\TaskController;
use ProcessMaker\Http\Controllers\TemplateController;
Expand Down Expand Up @@ -136,20 +136,18 @@

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', [CasesController::class, 'index'])->name('cases.index')->middleware('no-cache');
// This is a temporary API the engine team will create the API
Route::get('cases-main', [CasesController::class, 'index'])->name('cases-main.index')->middleware('no-cache');
Route::get('cases/{type?}', [RequestController::class, 'index'])->name('cases_by_type')
->where('type', 'all|in_progress|completed')
->middleware('no-cache');
// Requests
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', [RequestController::class, 'index'])
->name('requests.index')
->middleware('no-cache');
Route::get('requests/{type?}', [RequestController::class, 'index'])
->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');
Expand Down