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 all commits
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
2 changes: 1 addition & 1 deletion ProcessMaker/Http/Controllers/RequestController.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ public function index($type = null)
$this->authorize('view-all_requests');
}

$title = 'My Cases';
$title = 'My Request';

$types = ['all'=>'All Requests', 'in_progress'=>'Requests In Progress', 'completed'=>'Completed Requests'];

Expand Down
16 changes: 8 additions & 8 deletions ProcessMaker/Http/Middleware/GenerateMenus.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,10 +36,10 @@ 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.index', 'id' => 'requests']
['route' => 'cases-main.index', 'id' => 'cases']
)->active('cases/*');
});
//@TODO change the index to the correct blade
Expand DownExpand Up@@ -141,21 +141,21 @@ public function handle(Request $request, Closure $next)
});
Menu::make('sidebar_request', function ($menu) {
$submenu = $menu->add(__('Cases'));
$submenu->add(__('My Cases'), [
'route' => ['cases_by_type', ''],
$submenu->add(__('My Requests'), [
'route' => ['requests_by_type', ''],
'icon' => 'fa-id-badge',
]);
$submenu->add(__('In Progress'), [
'route' => ['cases_by_type', 'in_progress'],
'route' => ['requests_by_type', 'in_progress'],
'icon' => 'fa-clipboard-list',
]);
$submenu->add(__('Completed'), [
'route' => ['cases_by_type', 'completed'],
'route' => ['requests_by_type', 'completed'],
'icon' => 'fa-clipboard-check',
]);
if (\Auth::check() && \Auth::user()->can('view-all_requests')) {
$submenu->add(__('All Cases'), [
'route' => ['cases_by_type', 'all'],
$submenu->add(__('All Requests'), [
'route' => ['requests_by_type', 'all'],
'icon' => 'fa-clipboard',
]);
}
Expand Down
2 changes: 1 addition & 1 deletion resources/jscomposition/cases/casesMain/utils/counters.js
View file
Open in desktop
Original file line numberDiff line numberDiff 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
14 changes: 7 additions & 7 deletions resources/views/requests/index.blade.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@

@section('breadcrumbs')
@include('shared.breadcrumbs', ['routes' => [
__('Cases') => route('requests.index'),
__('Requests') => route('requests.index'),
function() use ($title) { return [__($title), null]; }
]])
@endsection
Expand All@@ -22,31 +22,31 @@ function() use ($title) { return [__($title), null]; }
<counter-card
color="info"
icon="id-badge"
link="{{ route('cases_by_type', ['type' => '']) }}"
link="{{ route('requests_by_type', ['type' => '']) }}"
url='requests?total=true&pmql=(status = "In Progress") AND (requester = "{{ Auth::user()->username }}")'
:title="__('My Cases')"
:title="__('My Requests')"
></counter-card>
<counter-card
color="success"
icon="clipboard-list"
link="{{ route('cases_by_type', ['type' => 'in_progress']) }}"
link="{{ route('requests_by_type', ['type' => 'in_progress']) }}"
url='requests?total=true&pmql=(status = "In Progress")'
:title="__('In Progress')"
></counter-card>
<counter-card
color="primary"
icon="clipboard-check"
link="{{ route('cases_by_type', ['type' => 'completed']) }}"
link="{{ route('requests_by_type', ['type' => 'completed']) }}"
url='requests?total=true&pmql=(status = "Completed")'
:title="__('Completed')"
></counter-card>
@can('view-all_requests')
<counter-card
color="secondary"
icon="clipboard"
link="{{ route('cases_by_type', ['type' => 'all']) }}"
link="{{ route('requests_by_type', ['type' => 'all']) }}"
url='requests?total=true'
:title="__('All Cases')"
:title="__('All Requests')"
></counter-card>
@endcan
</counter-card-group>
Expand Down
2 changes: 1 addition & 1 deletion routes/api.php
View file
Open in desktop
Original file line numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand Up@@ -136,7 +136,7 @@

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');
Route::get('cases/{request}', [CasesController::class, 'edit'])->name('cases.edit');
// This is a temporary API the engine team will create the API
Route::get('cases-main/{type?}', [CasesController::class, 'index'])->name('cases-main.index')
Expand All@@ -146,13 +146,11 @@
->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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

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 all commits
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


2 changes: 1 addition & 1 deletion
ProcessMaker/Http/Controllers/RequestController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ public function index($type = null)
 $this->authorize('view-all_requests');
 }

 $title = 'My Cases';
 $title = 'My Request';

 $types = ['all'=>'All Requests', 'in_progress'=>'Requests In Progress', 'completed'=>'Completed Requests'];

Expand Down

16 changes: 8 additions & 8 deletions
ProcessMaker/Http/Middleware/GenerateMenus.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,10 +36,10 @@ 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.index', 'id' => 'requests']
 ['route' => 'cases-main.index', 'id' => 'cases']
 )->active('cases/*');
 });
 //@TODO change the index to the correct blade
Expand DownExpand Up@@ -141,21 +141,21 @@ public function handle(Request $request, Closure $next)
 });
 Menu::make('sidebar_request', function ($menu) {
 $submenu = $menu->add(__('Cases'));
 $submenu->add(__('My Cases'), [
 'route' => ['cases_by_type', ''],
 $submenu->add(__('My Requests'), [
 'route' => ['requests_by_type', ''],
 'icon' => 'fa-id-badge',
 ]);
 $submenu->add(__('In Progress'), [
 'route' => ['cases_by_type', 'in_progress'],
 'route' => ['requests_by_type', 'in_progress'],
 'icon' => 'fa-clipboard-list',
 ]);
 $submenu->add(__('Completed'), [
 'route' => ['cases_by_type', 'completed'],
 'route' => ['requests_by_type', 'completed'],
 'icon' => 'fa-clipboard-check',
 ]);
 if (\Auth::check() && \Auth::user()->can('view-all_requests')) {
 $submenu->add(__('All Cases'), [
 'route' => ['cases_by_type', 'all'],
 $submenu->add(__('All Requests'), [
 'route' => ['requests_by_type', 'all'],
 'icon' => 'fa-clipboard',
 ]);
 }
Expand Down

2 changes: 1 addition & 1 deletion
resources/jscomposition/cases/casesMain/utils/counters.js

View file


Open in desktop

Original file line numberDiff line numberDiff 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

14 changes: 7 additions & 7 deletions
resources/views/requests/index.blade.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@

@section('breadcrumbs')
@include('shared.breadcrumbs', ['routes' => [
 __('Cases') => route('requests.index'),
 __('Requests') => route('requests.index'),
 function() use ($title) { return [__($title), null]; }
]])
@endsection
Expand All@@ -22,31 +22,31 @@ function() use ($title) { return [__($title), null]; }
 <counter-card
 color="info"
 icon="id-badge"
 link="{{ route('cases_by_type', ['type' => '']) }}"
 link="{{ route('requests_by_type', ['type' => '']) }}"
 url='requests?total=true&pmql=(status = "In Progress") AND (requester = "{{ Auth::user()->username }}")'
 :title="__('My Cases')"
 :title="__('My Requests')"
 ></counter-card>
 <counter-card
 color="success"
 icon="clipboard-list"
 link="{{ route('cases_by_type', ['type' => 'in_progress']) }}"
 link="{{ route('requests_by_type', ['type' => 'in_progress']) }}"
 url='requests?total=true&pmql=(status = "In Progress")'
 :title="__('In Progress')"
 ></counter-card>
 <counter-card
 color="primary"
 icon="clipboard-check"
 link="{{ route('cases_by_type', ['type' => 'completed']) }}"
 link="{{ route('requests_by_type', ['type' => 'completed']) }}"
 url='requests?total=true&pmql=(status = "Completed")'
 :title="__('Completed')"
 ></counter-card>
 @can('view-all_requests')
 <counter-card
 color="secondary"
 icon="clipboard"
 link="{{ route('cases_by_type', ['type' => 'all']) }}"
 link="{{ route('requests_by_type', ['type' => 'all']) }}"
 url='requests?total=true'
 :title="__('All Cases')"
 :title="__('All Requests')"
 ></counter-card>
 @endcan
 </counter-card-group>
Expand Down

2 changes: 1 addition & 1 deletion
routes/api.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand Up@@ -136,7 +136,7 @@

 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');
 Route::get('cases/{request}', [CasesController::class, 'edit'])->name('cases.edit');
 // This is a temporary API the engine team will create the API
 Route::get('cases-main/{type?}', [CasesController::class, 'index'])->name('cases-main.index')
Expand All@@ -146,13 +146,11 @@
 ->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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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 all commits
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


2 changes: 1 addition & 1 deletion
ProcessMaker/Http/Controllers/RequestController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ public function index($type = null)
 $this->authorize('view-all_requests');
 }

 $title = 'My Cases';
 $title = 'My Request';

 $types = ['all'=>'All Requests', 'in_progress'=>'Requests In Progress', 'completed'=>'Completed Requests'];

Expand Down

16 changes: 8 additions & 8 deletions
ProcessMaker/Http/Middleware/GenerateMenus.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,10 +36,10 @@ 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.index', 'id' => 'requests']
 ['route' => 'cases-main.index', 'id' => 'cases']
 )->active('cases/*');
 });
 //@TODO change the index to the correct blade
Expand DownExpand Up@@ -141,21 +141,21 @@ public function handle(Request $request, Closure $next)
 });
 Menu::make('sidebar_request', function ($menu) {
 $submenu = $menu->add(__('Cases'));
 $submenu->add(__('My Cases'), [
 'route' => ['cases_by_type', ''],
 $submenu->add(__('My Requests'), [
 'route' => ['requests_by_type', ''],
 'icon' => 'fa-id-badge',
 ]);
 $submenu->add(__('In Progress'), [
 'route' => ['cases_by_type', 'in_progress'],
 'route' => ['requests_by_type', 'in_progress'],
 'icon' => 'fa-clipboard-list',
 ]);
 $submenu->add(__('Completed'), [
 'route' => ['cases_by_type', 'completed'],
 'route' => ['requests_by_type', 'completed'],
 'icon' => 'fa-clipboard-check',
 ]);
 if (\Auth::check() && \Auth::user()->can('view-all_requests')) {
 $submenu->add(__('All Cases'), [
 'route' => ['cases_by_type', 'all'],
 $submenu->add(__('All Requests'), [
 'route' => ['requests_by_type', 'all'],
 'icon' => 'fa-clipboard',
 ]);
 }
Expand Down

2 changes: 1 addition & 1 deletion
resources/jscomposition/cases/casesMain/utils/counters.js

View file


Open in desktop

Original file line numberDiff line numberDiff 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

14 changes: 7 additions & 7 deletions
resources/views/requests/index.blade.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@

@section('breadcrumbs')
@include('shared.breadcrumbs', ['routes' => [
 __('Cases') => route('requests.index'),
 __('Requests') => route('requests.index'),
 function() use ($title) { return [__($title), null]; }
]])
@endsection
Expand All@@ -22,31 +22,31 @@ function() use ($title) { return [__($title), null]; }
 <counter-card
 color="info"
 icon="id-badge"
 link="{{ route('cases_by_type', ['type' => '']) }}"
 link="{{ route('requests_by_type', ['type' => '']) }}"
 url='requests?total=true&pmql=(status = "In Progress") AND (requester = "{{ Auth::user()->username }}")'
 :title="__('My Cases')"
 :title="__('My Requests')"
 ></counter-card>
 <counter-card
 color="success"
 icon="clipboard-list"
 link="{{ route('cases_by_type', ['type' => 'in_progress']) }}"
 link="{{ route('requests_by_type', ['type' => 'in_progress']) }}"
 url='requests?total=true&pmql=(status = "In Progress")'
 :title="__('In Progress')"
 ></counter-card>
 <counter-card
 color="primary"
 icon="clipboard-check"
 link="{{ route('cases_by_type', ['type' => 'completed']) }}"
 link="{{ route('requests_by_type', ['type' => 'completed']) }}"
 url='requests?total=true&pmql=(status = "Completed")'
 :title="__('Completed')"
 ></counter-card>
 @can('view-all_requests')
 <counter-card
 color="secondary"
 icon="clipboard"
 link="{{ route('cases_by_type', ['type' => 'all']) }}"
 link="{{ route('requests_by_type', ['type' => 'all']) }}"
 url='requests?total=true'
 :title="__('All Cases')"
 :title="__('All Requests')"
 ></counter-card>
 @endcan
 </counter-card-group>
Expand Down

2 changes: 1 addition & 1 deletion
routes/api.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand Up@@ -136,7 +136,7 @@

 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');
 Route::get('cases/{request}', [CasesController::class, 'edit'])->name('cases.edit');
 // This is a temporary API the engine team will create the API
 Route::get('cases-main/{type?}', [CasesController::class, 'index'])->name('cases-main.index')
Expand All@@ -146,13 +146,11 @@
 ->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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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 all commits
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


2 changes: 1 addition & 1 deletion
ProcessMaker/Http/Controllers/RequestController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ public function index($type = null)
 $this->authorize('view-all_requests');
 }

 $title = 'My Cases';
 $title = 'My Request';

 $types = ['all'=>'All Requests', 'in_progress'=>'Requests In Progress', 'completed'=>'Completed Requests'];

Expand Down

16 changes: 8 additions & 8 deletions
ProcessMaker/Http/Middleware/GenerateMenus.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,10 +36,10 @@ 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.index', 'id' => 'requests']
 ['route' => 'cases-main.index', 'id' => 'cases']
 )->active('cases/*');
 });
 //@TODO change the index to the correct blade
Expand DownExpand Up@@ -141,21 +141,21 @@ public function handle(Request $request, Closure $next)
 });
 Menu::make('sidebar_request', function ($menu) {
 $submenu = $menu->add(__('Cases'));
 $submenu->add(__('My Cases'), [
 'route' => ['cases_by_type', ''],
 $submenu->add(__('My Requests'), [
 'route' => ['requests_by_type', ''],
 'icon' => 'fa-id-badge',
 ]);
 $submenu->add(__('In Progress'), [
 'route' => ['cases_by_type', 'in_progress'],
 'route' => ['requests_by_type', 'in_progress'],
 'icon' => 'fa-clipboard-list',
 ]);
 $submenu->add(__('Completed'), [
 'route' => ['cases_by_type', 'completed'],
 'route' => ['requests_by_type', 'completed'],
 'icon' => 'fa-clipboard-check',
 ]);
 if (\Auth::check() && \Auth::user()->can('view-all_requests')) {
 $submenu->add(__('All Cases'), [
 'route' => ['cases_by_type', 'all'],
 $submenu->add(__('All Requests'), [
 'route' => ['requests_by_type', 'all'],
 'icon' => 'fa-clipboard',
 ]);
 }
Expand Down

2 changes: 1 addition & 1 deletion
resources/jscomposition/cases/casesMain/utils/counters.js

View file


Open in desktop

Original file line numberDiff line numberDiff 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

14 changes: 7 additions & 7 deletions
resources/views/requests/index.blade.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@

@section('breadcrumbs')
@include('shared.breadcrumbs', ['routes' => [
 __('Cases') => route('requests.index'),
 __('Requests') => route('requests.index'),
 function() use ($title) { return [__($title), null]; }
]])
@endsection
Expand All@@ -22,31 +22,31 @@ function() use ($title) { return [__($title), null]; }
 <counter-card
 color="info"
 icon="id-badge"
 link="{{ route('cases_by_type', ['type' => '']) }}"
 link="{{ route('requests_by_type', ['type' => '']) }}"
 url='requests?total=true&pmql=(status = "In Progress") AND (requester = "{{ Auth::user()->username }}")'
 :title="__('My Cases')"
 :title="__('My Requests')"
 ></counter-card>
 <counter-card
 color="success"
 icon="clipboard-list"
 link="{{ route('cases_by_type', ['type' => 'in_progress']) }}"
 link="{{ route('requests_by_type', ['type' => 'in_progress']) }}"
 url='requests?total=true&pmql=(status = "In Progress")'
 :title="__('In Progress')"
 ></counter-card>
 <counter-card
 color="primary"
 icon="clipboard-check"
 link="{{ route('cases_by_type', ['type' => 'completed']) }}"
 link="{{ route('requests_by_type', ['type' => 'completed']) }}"
 url='requests?total=true&pmql=(status = "Completed")'
 :title="__('Completed')"
 ></counter-card>
 @can('view-all_requests')
 <counter-card
 color="secondary"
 icon="clipboard"
 link="{{ route('cases_by_type', ['type' => 'all']) }}"
 link="{{ route('requests_by_type', ['type' => 'all']) }}"
 url='requests?total=true'
 :title="__('All Cases')"
 :title="__('All Requests')"
 ></counter-card>
 @endcan
 </counter-card-group>
Expand Down

2 changes: 1 addition & 1 deletion
routes/api.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand Up@@ -136,7 +136,7 @@

 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');
 Route::get('cases/{request}', [CasesController::class, 'edit'])->name('cases.edit');
 // This is a temporary API the engine team will create the API
 Route::get('cases-main/{type?}', [CasesController::class, 'index'])->name('cases-main.index')
Expand All@@ -146,13 +146,11 @@
 ->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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

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 all commits
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


2 changes: 1 addition & 1 deletion
ProcessMaker/Http/Controllers/RequestController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ public function index($type = null)
 $this->authorize('view-all_requests');
 }

 $title = 'My Cases';
 $title = 'My Request';

 $types = ['all'=>'All Requests', 'in_progress'=>'Requests In Progress', 'completed'=>'Completed Requests'];

Expand Down

16 changes: 8 additions & 8 deletions
ProcessMaker/Http/Middleware/GenerateMenus.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,10 +36,10 @@ 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.index', 'id' => 'requests']
 ['route' => 'cases-main.index', 'id' => 'cases']
 )->active('cases/*');
 });
 //@TODO change the index to the correct blade
Expand DownExpand Up@@ -141,21 +141,21 @@ public function handle(Request $request, Closure $next)
 });
 Menu::make('sidebar_request', function ($menu) {
 $submenu = $menu->add(__('Cases'));
 $submenu->add(__('My Cases'), [
 'route' => ['cases_by_type', ''],
 $submenu->add(__('My Requests'), [
 'route' => ['requests_by_type', ''],
 'icon' => 'fa-id-badge',
 ]);
 $submenu->add(__('In Progress'), [
 'route' => ['cases_by_type', 'in_progress'],
 'route' => ['requests_by_type', 'in_progress'],
 'icon' => 'fa-clipboard-list',
 ]);
 $submenu->add(__('Completed'), [
 'route' => ['cases_by_type', 'completed'],
 'route' => ['requests_by_type', 'completed'],
 'icon' => 'fa-clipboard-check',
 ]);
 if (\Auth::check() && \Auth::user()->can('view-all_requests')) {
 $submenu->add(__('All Cases'), [
 'route' => ['cases_by_type', 'all'],
 $submenu->add(__('All Requests'), [
 'route' => ['requests_by_type', 'all'],
 'icon' => 'fa-clipboard',
 ]);
 }
Expand Down

2 changes: 1 addition & 1 deletion
resources/jscomposition/cases/casesMain/utils/counters.js

View file


Open in desktop

Original file line numberDiff line numberDiff 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

14 changes: 7 additions & 7 deletions
resources/views/requests/index.blade.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@

@section('breadcrumbs')
@include('shared.breadcrumbs', ['routes' => [
 __('Cases') => route('requests.index'),
 __('Requests') => route('requests.index'),
 function() use ($title) { return [__($title), null]; }
]])
@endsection
Expand All@@ -22,31 +22,31 @@ function() use ($title) { return [__($title), null]; }
 <counter-card
 color="info"
 icon="id-badge"
 link="{{ route('cases_by_type', ['type' => '']) }}"
 link="{{ route('requests_by_type', ['type' => '']) }}"
 url='requests?total=true&pmql=(status = "In Progress") AND (requester = "{{ Auth::user()->username }}")'
 :title="__('My Cases')"
 :title="__('My Requests')"
 ></counter-card>
 <counter-card
 color="success"
 icon="clipboard-list"
 link="{{ route('cases_by_type', ['type' => 'in_progress']) }}"
 link="{{ route('requests_by_type', ['type' => 'in_progress']) }}"
 url='requests?total=true&pmql=(status = "In Progress")'
 :title="__('In Progress')"
 ></counter-card>
 <counter-card
 color="primary"
 icon="clipboard-check"
 link="{{ route('cases_by_type', ['type' => 'completed']) }}"
 link="{{ route('requests_by_type', ['type' => 'completed']) }}"
 url='requests?total=true&pmql=(status = "Completed")'
 :title="__('Completed')"
 ></counter-card>
 @can('view-all_requests')
 <counter-card
 color="secondary"
 icon="clipboard"
 link="{{ route('cases_by_type', ['type' => 'all']) }}"
 link="{{ route('requests_by_type', ['type' => 'all']) }}"
 url='requests?total=true'
 :title="__('All Cases')"
 :title="__('All Requests')"
 ></counter-card>
 @endcan
 </counter-card-group>
Expand Down

2 changes: 1 addition & 1 deletion
routes/api.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand Up@@ -136,7 +136,7 @@

 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');
 Route::get('cases/{request}', [CasesController::class, 'edit'])->name('cases.edit');
 // This is a temporary API the engine team will create the API
 Route::get('cases-main/{type?}', [CasesController::class, 'index'])->name('cases-main.index')
Expand All@@ -146,13 +146,11 @@
 ->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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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 all commits
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


2 changes: 1 addition & 1 deletion
ProcessMaker/Http/Controllers/RequestController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ public function index($type = null)
 $this->authorize('view-all_requests');
 }

 $title = 'My Cases';
 $title = 'My Request';

 $types = ['all'=>'All Requests', 'in_progress'=>'Requests In Progress', 'completed'=>'Completed Requests'];

Expand Down

16 changes: 8 additions & 8 deletions
ProcessMaker/Http/Middleware/GenerateMenus.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,10 +36,10 @@ 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.index', 'id' => 'requests']
 ['route' => 'cases-main.index', 'id' => 'cases']
 )->active('cases/*');
 });
 //@TODO change the index to the correct blade
Expand DownExpand Up@@ -141,21 +141,21 @@ public function handle(Request $request, Closure $next)
 });
 Menu::make('sidebar_request', function ($menu) {
 $submenu = $menu->add(__('Cases'));
 $submenu->add(__('My Cases'), [
 'route' => ['cases_by_type', ''],
 $submenu->add(__('My Requests'), [
 'route' => ['requests_by_type', ''],
 'icon' => 'fa-id-badge',
 ]);
 $submenu->add(__('In Progress'), [
 'route' => ['cases_by_type', 'in_progress'],
 'route' => ['requests_by_type', 'in_progress'],
 'icon' => 'fa-clipboard-list',
 ]);
 $submenu->add(__('Completed'), [
 'route' => ['cases_by_type', 'completed'],
 'route' => ['requests_by_type', 'completed'],
 'icon' => 'fa-clipboard-check',
 ]);
 if (\Auth::check() && \Auth::user()->can('view-all_requests')) {
 $submenu->add(__('All Cases'), [
 'route' => ['cases_by_type', 'all'],
 $submenu->add(__('All Requests'), [
 'route' => ['requests_by_type', 'all'],
 'icon' => 'fa-clipboard',
 ]);
 }
Expand Down

2 changes: 1 addition & 1 deletion
resources/jscomposition/cases/casesMain/utils/counters.js

View file


Open in desktop

Original file line numberDiff line numberDiff 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

14 changes: 7 additions & 7 deletions
resources/views/requests/index.blade.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@

@section('breadcrumbs')
@include('shared.breadcrumbs', ['routes' => [
 __('Cases') => route('requests.index'),
 __('Requests') => route('requests.index'),
 function() use ($title) { return [__($title), null]; }
]])
@endsection
Expand All@@ -22,31 +22,31 @@ function() use ($title) { return [__($title), null]; }
 <counter-card
 color="info"
 icon="id-badge"
 link="{{ route('cases_by_type', ['type' => '']) }}"
 link="{{ route('requests_by_type', ['type' => '']) }}"
 url='requests?total=true&pmql=(status = "In Progress") AND (requester = "{{ Auth::user()->username }}")'
 :title="__('My Cases')"
 :title="__('My Requests')"
 ></counter-card>
 <counter-card
 color="success"
 icon="clipboard-list"
 link="{{ route('cases_by_type', ['type' => 'in_progress']) }}"
 link="{{ route('requests_by_type', ['type' => 'in_progress']) }}"
 url='requests?total=true&pmql=(status = "In Progress")'
 :title="__('In Progress')"
 ></counter-card>
 <counter-card
 color="primary"
 icon="clipboard-check"
 link="{{ route('cases_by_type', ['type' => 'completed']) }}"
 link="{{ route('requests_by_type', ['type' => 'completed']) }}"
 url='requests?total=true&pmql=(status = "Completed")'
 :title="__('Completed')"
 ></counter-card>
 @can('view-all_requests')
 <counter-card
 color="secondary"
 icon="clipboard"
 link="{{ route('cases_by_type', ['type' => 'all']) }}"
 link="{{ route('requests_by_type', ['type' => 'all']) }}"
 url='requests?total=true'
 :title="__('All Cases')"
 :title="__('All Requests')"
 ></counter-card>
 @endcan
 </counter-card-group>
Expand Down

2 changes: 1 addition & 1 deletion
routes/api.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand Up@@ -136,7 +136,7 @@

 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');
 Route::get('cases/{request}', [CasesController::class, 'edit'])->name('cases.edit');
 // This is a temporary API the engine team will create the API
 Route::get('cases-main/{type?}', [CasesController::class, 'index'])->name('cases-main.index')
Expand All@@ -146,13 +146,11 @@
 ->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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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 all commits
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


2 changes: 1 addition & 1 deletion
ProcessMaker/Http/Controllers/RequestController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ public function index($type = null)
 $this->authorize('view-all_requests');
 }

 $title = 'My Cases';
 $title = 'My Request';

 $types = ['all'=>'All Requests', 'in_progress'=>'Requests In Progress', 'completed'=>'Completed Requests'];

Expand Down

16 changes: 8 additions & 8 deletions
ProcessMaker/Http/Middleware/GenerateMenus.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,10 +36,10 @@ 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.index', 'id' => 'requests']
 ['route' => 'cases-main.index', 'id' => 'cases']
 )->active('cases/*');
 });
 //@TODO change the index to the correct blade
Expand DownExpand Up@@ -141,21 +141,21 @@ public function handle(Request $request, Closure $next)
 });
 Menu::make('sidebar_request', function ($menu) {
 $submenu = $menu->add(__('Cases'));
 $submenu->add(__('My Cases'), [
 'route' => ['cases_by_type', ''],
 $submenu->add(__('My Requests'), [
 'route' => ['requests_by_type', ''],
 'icon' => 'fa-id-badge',
 ]);
 $submenu->add(__('In Progress'), [
 'route' => ['cases_by_type', 'in_progress'],
 'route' => ['requests_by_type', 'in_progress'],
 'icon' => 'fa-clipboard-list',
 ]);
 $submenu->add(__('Completed'), [
 'route' => ['cases_by_type', 'completed'],
 'route' => ['requests_by_type', 'completed'],
 'icon' => 'fa-clipboard-check',
 ]);
 if (\Auth::check() && \Auth::user()->can('view-all_requests')) {
 $submenu->add(__('All Cases'), [
 'route' => ['cases_by_type', 'all'],
 $submenu->add(__('All Requests'), [
 'route' => ['requests_by_type', 'all'],
 'icon' => 'fa-clipboard',
 ]);
 }
Expand Down

2 changes: 1 addition & 1 deletion
resources/jscomposition/cases/casesMain/utils/counters.js

View file


Open in desktop

Original file line numberDiff line numberDiff 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

14 changes: 7 additions & 7 deletions
resources/views/requests/index.blade.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@

@section('breadcrumbs')
@include('shared.breadcrumbs', ['routes' => [
 __('Cases') => route('requests.index'),
 __('Requests') => route('requests.index'),
 function() use ($title) { return [__($title), null]; }
]])
@endsection
Expand All@@ -22,31 +22,31 @@ function() use ($title) { return [__($title), null]; }
 <counter-card
 color="info"
 icon="id-badge"
 link="{{ route('cases_by_type', ['type' => '']) }}"
 link="{{ route('requests_by_type', ['type' => '']) }}"
 url='requests?total=true&pmql=(status = "In Progress") AND (requester = "{{ Auth::user()->username }}")'
 :title="__('My Cases')"
 :title="__('My Requests')"
 ></counter-card>
 <counter-card
 color="success"
 icon="clipboard-list"
 link="{{ route('cases_by_type', ['type' => 'in_progress']) }}"
 link="{{ route('requests_by_type', ['type' => 'in_progress']) }}"
 url='requests?total=true&pmql=(status = "In Progress")'
 :title="__('In Progress')"
 ></counter-card>
 <counter-card
 color="primary"
 icon="clipboard-check"
 link="{{ route('cases_by_type', ['type' => 'completed']) }}"
 link="{{ route('requests_by_type', ['type' => 'completed']) }}"
 url='requests?total=true&pmql=(status = "Completed")'
 :title="__('Completed')"
 ></counter-card>
 @can('view-all_requests')
 <counter-card
 color="secondary"
 icon="clipboard"
 link="{{ route('cases_by_type', ['type' => 'all']) }}"
 link="{{ route('requests_by_type', ['type' => 'all']) }}"
 url='requests?total=true'
 :title="__('All Cases')"
 :title="__('All Requests')"
 ></counter-card>
 @endcan
 </counter-card-group>
Expand Down

2 changes: 1 addition & 1 deletion
routes/api.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand Up@@ -136,7 +136,7 @@

 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');
 Route::get('cases/{request}', [CasesController::class, 'edit'])->name('cases.edit');
 // This is a temporary API the engine team will create the API
 Route::get('cases-main/{type?}', [CasesController::class, 'index'])->name('cases-main.index')
Expand All@@ -146,13 +146,11 @@
 ->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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

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 all commits
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


2 changes: 1 addition & 1 deletion
ProcessMaker/Http/Controllers/RequestController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ public function index($type = null)
 $this->authorize('view-all_requests');
 }

 $title = 'My Cases';
 $title = 'My Request';

 $types = ['all'=>'All Requests', 'in_progress'=>'Requests In Progress', 'completed'=>'Completed Requests'];

Expand Down

16 changes: 8 additions & 8 deletions
ProcessMaker/Http/Middleware/GenerateMenus.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,10 +36,10 @@ 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.index', 'id' => 'requests']
 ['route' => 'cases-main.index', 'id' => 'cases']
 )->active('cases/*');
 });
 //@TODO change the index to the correct blade
Expand DownExpand Up@@ -141,21 +141,21 @@ public function handle(Request $request, Closure $next)
 });
 Menu::make('sidebar_request', function ($menu) {
 $submenu = $menu->add(__('Cases'));
 $submenu->add(__('My Cases'), [
 'route' => ['cases_by_type', ''],
 $submenu->add(__('My Requests'), [
 'route' => ['requests_by_type', ''],
 'icon' => 'fa-id-badge',
 ]);
 $submenu->add(__('In Progress'), [
 'route' => ['cases_by_type', 'in_progress'],
 'route' => ['requests_by_type', 'in_progress'],
 'icon' => 'fa-clipboard-list',
 ]);
 $submenu->add(__('Completed'), [
 'route' => ['cases_by_type', 'completed'],
 'route' => ['requests_by_type', 'completed'],
 'icon' => 'fa-clipboard-check',
 ]);
 if (\Auth::check() && \Auth::user()->can('view-all_requests')) {
 $submenu->add(__('All Cases'), [
 'route' => ['cases_by_type', 'all'],
 $submenu->add(__('All Requests'), [
 'route' => ['requests_by_type', 'all'],
 'icon' => 'fa-clipboard',
 ]);
 }
Expand Down

2 changes: 1 addition & 1 deletion
resources/jscomposition/cases/casesMain/utils/counters.js

View file


Open in desktop

Original file line numberDiff line numberDiff 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

14 changes: 7 additions & 7 deletions
resources/views/requests/index.blade.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@

@section('breadcrumbs')
@include('shared.breadcrumbs', ['routes' => [
 __('Cases') => route('requests.index'),
 __('Requests') => route('requests.index'),
 function() use ($title) { return [__($title), null]; }
]])
@endsection
Expand All@@ -22,31 +22,31 @@ function() use ($title) { return [__($title), null]; }
 <counter-card
 color="info"
 icon="id-badge"
 link="{{ route('cases_by_type', ['type' => '']) }}"
 link="{{ route('requests_by_type', ['type' => '']) }}"
 url='requests?total=true&pmql=(status = "In Progress") AND (requester = "{{ Auth::user()->username }}")'
 :title="__('My Cases')"
 :title="__('My Requests')"
 ></counter-card>
 <counter-card
 color="success"
 icon="clipboard-list"
 link="{{ route('cases_by_type', ['type' => 'in_progress']) }}"
 link="{{ route('requests_by_type', ['type' => 'in_progress']) }}"
 url='requests?total=true&pmql=(status = "In Progress")'
 :title="__('In Progress')"
 ></counter-card>
 <counter-card
 color="primary"
 icon="clipboard-check"
 link="{{ route('cases_by_type', ['type' => 'completed']) }}"
 link="{{ route('requests_by_type', ['type' => 'completed']) }}"
 url='requests?total=true&pmql=(status = "Completed")'
 :title="__('Completed')"
 ></counter-card>
 @can('view-all_requests')
 <counter-card
 color="secondary"
 icon="clipboard"
 link="{{ route('cases_by_type', ['type' => 'all']) }}"
 link="{{ route('requests_by_type', ['type' => 'all']) }}"
 url='requests?total=true'
 :title="__('All Cases')"
 :title="__('All Requests')"
 ></counter-card>
 @endcan
 </counter-card-group>
Expand Down

2 changes: 1 addition & 1 deletion
routes/api.php

View file


Open in desktop

Original file line numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand Up@@ -136,7 +136,7 @@

 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');
 Route::get('cases/{request}', [CasesController::class, 'edit'])->name('cases.edit');
 // This is a temporary API the engine team will create the API
 Route::get('cases-main/{type?}', [CasesController::class, 'index'])->name('cases-main.index')
Expand All@@ -146,13 +146,11 @@
 ->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