From c4d994ae60d89d325589f87f31aac0d3675f9a0b Mon Sep 17 00:00:00 2001 From: Paula Quispe Date: Wed, 7 Feb 2024 16:30:03 -0400 Subject: [PATCH 1/8] FOUR-14077 --- ProcessMaker/Http/Middleware/GenerateMenus.php | 4 ++-- resources/js/components/templates/AssetConfirmationModal.vue | 2 +- .../components/templates/mixins/wizardHelperProcessModal.js | 2 +- routes/web.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ProcessMaker/Http/Middleware/GenerateMenus.php b/ProcessMaker/Http/Middleware/GenerateMenus.php index cebb3afd04..8cd341fcbd 100644 --- a/ProcessMaker/Http/Middleware/GenerateMenus.php +++ b/ProcessMaker/Http/Middleware/GenerateMenus.php @@ -32,8 +32,8 @@ public function handle(Request $request, Closure $next) $menu->group(['prefix' => 'processes'], function ($request_items) { $request_items->add( __('Processes'), - ['route' => 'processes.catalogue.index', 'id' => 'processes-catalogue'] - )->active('processes-catalogue/*'); + ['route' => 'processes.browser.index', 'id' => 'processes-browser'] + )->active('processes-browser/*'); }); $menu->group(['prefix' => 'requests'], function ($request_items) { $request_items->add( diff --git a/resources/js/components/templates/AssetConfirmationModal.vue b/resources/js/components/templates/AssetConfirmationModal.vue index bf67c04566..f5d426a7ee 100644 --- a/resources/js/components/templates/AssetConfirmationModal.vue +++ b/resources/js/components/templates/AssetConfirmationModal.vue @@ -53,7 +53,7 @@ if (undefined !== this.redirectTo && null !== this.redirectTo) { if (this.redirectTo === 'process-launchpad') { - window.location = `/processes-catalogue/${this.processId}`; + window.location = `/processes-browser/${this.processId}`; } } else { window.location = "/modeler/" + this.processId; diff --git a/resources/js/components/templates/mixins/wizardHelperProcessModal.js b/resources/js/components/templates/mixins/wizardHelperProcessModal.js index 083105da3f..03e9009965 100644 --- a/resources/js/components/templates/mixins/wizardHelperProcessModal.js +++ b/resources/js/components/templates/mixins/wizardHelperProcessModal.js @@ -114,7 +114,7 @@ export default { this.handleExistingAssets(response.data); } else { // redirect to the new process launchpad - window.location = `/processes-catalogue/${response.data.processId}`; + window.location = `/processes-browser/${response.data.processId}`; } }).catch((error) => { ProcessMaker.alert(error.message, "danger"); diff --git a/routes/web.php b/routes/web.php index 75a178e383..872bb5fcf0 100644 --- a/routes/web.php +++ b/routes/web.php @@ -94,7 +94,7 @@ Route::get('designer/scripts/categories', [ScriptController::class, 'index'])->name('script-categories.index')->middleware('can:view-script-categories'); Route::get('designer', [DesignerController::class, 'index'])->name('designer.index'); - Route::get('processes-catalogue/{process?}', [ProcessesCatalogueController::class, 'index'])->name('processes.catalogue.index')->middleware('can:view-process-catalog'); + Route::get('processes-browser/{process?}', [ProcessesCatalogueController::class, 'index'])->name('processes.browser.index')->middleware('can:view-process-catalog'); Route::get('processes', [ProcessController::class, 'index'])->name('processes.index'); Route::get('processes/{process}/edit', [ProcessController::class, 'edit'])->name('processes.edit')->middleware('can:edit-processes'); From de7888dbd5ac47a4e25e2067254f23d085831f4c Mon Sep 17 00:00:00 2001 From: paulis Date: Wed, 7 Feb 2024 18:22:00 -0400 Subject: [PATCH 2/8] sonarQueue --- routes/web.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/routes/web.php b/routes/web.php index 872bb5fcf0..14b5cad9ba 100644 --- a/routes/web.php +++ b/routes/web.php @@ -94,7 +94,9 @@ Route::get('designer/scripts/categories', [ScriptController::class, 'index'])->name('script-categories.index')->middleware('can:view-script-categories'); Route::get('designer', [DesignerController::class, 'index'])->name('designer.index'); - Route::get('processes-browser/{process?}', [ProcessesCatalogueController::class, 'index'])->name('processes.browser.index')->middleware('can:view-process-catalog'); + Route::get('processes-browser/{process?}', [ProcessesCatalogueController::class, 'index']) + ->name('processes.browser.index') + ->middleware('can:view-process-catalog'); Route::get('processes', [ProcessController::class, 'index'])->name('processes.index'); Route::get('processes/{process}/edit', [ProcessController::class, 'edit'])->name('processes.edit')->middleware('can:edit-processes'); From 246fe936effe10d248a8c2b1115436007581afbf Mon Sep 17 00:00:00 2001 From: Luciana Nunez Date: Thu, 8 Feb 2024 13:25:17 -0400 Subject: [PATCH 3/8] feature/FOUR-14077 --- ProcessMaker/Http/Middleware/GenerateMenus.php | 2 +- resources/js/components/shared/EllipsisMenu.vue | 2 +- resources/js/components/shared/ellipsisMenuActions.js | 2 +- resources/js/components/templates/AssetConfirmationModal.vue | 2 +- .../js/components/templates/mixins/wizardHelperProcessModal.js | 2 +- resources/js/processes-catalogue/components/Breadcrumbs.vue | 2 +- resources/js/processes-catalogue/components/menuCatologue.vue | 2 +- routes/web.php | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ProcessMaker/Http/Middleware/GenerateMenus.php b/ProcessMaker/Http/Middleware/GenerateMenus.php index cebb3afd04..6b60a4de77 100644 --- a/ProcessMaker/Http/Middleware/GenerateMenus.php +++ b/ProcessMaker/Http/Middleware/GenerateMenus.php @@ -33,7 +33,7 @@ public function handle(Request $request, Closure $next) $request_items->add( __('Processes'), ['route' => 'processes.catalogue.index', 'id' => 'processes-catalogue'] - )->active('processes-catalogue/*'); + )->active('process-browser/*'); }); $menu->group(['prefix' => 'requests'], function ($request_items) { $request_items->add( diff --git a/resources/js/components/shared/EllipsisMenu.vue b/resources/js/components/shared/EllipsisMenu.vue index 49b8d57f22..e67d417e50 100644 --- a/resources/js/components/shared/EllipsisMenu.vue +++ b/resources/js/components/shared/EllipsisMenu.vue @@ -229,7 +229,7 @@ export default { }, isProcessesCatalogueInUrl() { const currentUrl = window.location.href; - const isInUrl = currentUrl.includes("processes-catalogue"); + const isInUrl = currentUrl.includes("process-browser"); return isInUrl; } }, diff --git a/resources/js/components/shared/ellipsisMenuActions.js b/resources/js/components/shared/ellipsisMenuActions.js index 6f57675b42..554373c513 100644 --- a/resources/js/components/shared/ellipsisMenuActions.js +++ b/resources/js/components/shared/ellipsisMenuActions.js @@ -25,7 +25,7 @@ export default { value: "open-launchpad", content: "Open Launchpad", link: true, - href: "/processes-catalogue/{{id}}", + href: "/process-browser/{{id}}", permission: ["edit-processes", "create-projects", "view-projects"], icon: "fas fa-file-export", conditional: "if(status == 'ACTIVE', true, false)" diff --git a/resources/js/components/templates/AssetConfirmationModal.vue b/resources/js/components/templates/AssetConfirmationModal.vue index bf67c04566..243d76c7ae 100644 --- a/resources/js/components/templates/AssetConfirmationModal.vue +++ b/resources/js/components/templates/AssetConfirmationModal.vue @@ -53,7 +53,7 @@ if (undefined !== this.redirectTo && null !== this.redirectTo) { if (this.redirectTo === 'process-launchpad') { - window.location = `/processes-catalogue/${this.processId}`; + window.location = `/process-browser/${this.processId}`; } } else { window.location = "/modeler/" + this.processId; diff --git a/resources/js/components/templates/mixins/wizardHelperProcessModal.js b/resources/js/components/templates/mixins/wizardHelperProcessModal.js index 083105da3f..acba5bbb88 100644 --- a/resources/js/components/templates/mixins/wizardHelperProcessModal.js +++ b/resources/js/components/templates/mixins/wizardHelperProcessModal.js @@ -114,7 +114,7 @@ export default { this.handleExistingAssets(response.data); } else { // redirect to the new process launchpad - window.location = `/processes-catalogue/${response.data.processId}`; + window.location = `/process-browser/${response.data.processId}`; } }).catch((error) => { ProcessMaker.alert(error.message, "danger"); diff --git a/resources/js/processes-catalogue/components/Breadcrumbs.vue b/resources/js/processes-catalogue/components/Breadcrumbs.vue index b1badcced4..b50cf1dd40 100644 --- a/resources/js/processes-catalogue/components/Breadcrumbs.vue +++ b/resources/js/processes-catalogue/components/Breadcrumbs.vue @@ -12,7 +12,7 @@
  • {{ $t('Processes') }} diff --git a/resources/js/processes-catalogue/components/menuCatologue.vue b/resources/js/processes-catalogue/components/menuCatologue.vue index 7334644af0..e49fc2813a 100644 --- a/resources/js/processes-catalogue/components/menuCatologue.vue +++ b/resources/js/processes-catalogue/components/menuCatologue.vue @@ -230,7 +230,7 @@ export default { * Select Default Option */ selectDefault() { - if (window.location.pathname === "/processes-catalogue") { + if (window.location.pathname === "/process-browser") { this.selectProcessItem(this.data[0]); } }, diff --git a/routes/web.php b/routes/web.php index 053a3d6a75..d1835a8f73 100644 --- a/routes/web.php +++ b/routes/web.php @@ -93,7 +93,7 @@ Route::get('designer/scripts/categories', [ScriptController::class, 'index'])->name('script-categories.index')->middleware('can:view-script-categories'); Route::get('designer', [DesignerController::class, 'index'])->name('designer.index'); - Route::get('processes-catalogue/{process?}', [ProcessesCatalogueController::class, 'index'])->name('processes.catalogue.index')->middleware('can:view-process-catalog'); + Route::get('process-browser/{process?}', [ProcessesCatalogueController::class, 'index'])->name('processes.catalogue.index')->middleware('can:view-process-catalog'); Route::get('processes', [ProcessController::class, 'index'])->name('processes.index'); Route::get('processes/{process}/edit', [ProcessController::class, 'edit'])->name('processes.edit')->middleware('can:edit-processes'); From 59caccd8da5257d5c6ca5f04472cc4d4c0522684 Mon Sep 17 00:00:00 2001 From: Luciana Nunez Date: Fri, 9 Feb 2024 11:10:41 -0400 Subject: [PATCH 4/8] feature/FOUR-14077 --- .../Http/Controllers/ProcessesCatalogueController.php | 5 +++++ routes/web.php | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php b/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php index 2fb00e3419..22fa9f3923 100644 --- a/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php +++ b/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php @@ -19,4 +19,9 @@ public function index(Request $request, Process $process = null) { return view('processes-catalogue.index', compact('process')); } + + public function redirect(Request $request) + { + return redirect()->route('process.browser.index'); + } } diff --git a/routes/web.php b/routes/web.php index 9348baeeec..2e19472dd0 100644 --- a/routes/web.php +++ b/routes/web.php @@ -93,7 +93,9 @@ Route::get('designer/scripts/categories', [ScriptController::class, 'index'])->name('script-categories.index')->middleware('can:view-script-categories'); Route::get('designer', [DesignerController::class, 'index'])->name('designer.index'); - + Route::get('processes-catalogue/{process?}', [ProcessesCatalogueController::class, 'redirect']) + ->name('processes.catalogue.index') + ->middleware('can:view-process-catalog'); Route::get('process-browser/{process?}', [ProcessesCatalogueController::class, 'index']) ->name('process.browser.index') ->middleware('can:view-process-catalog'); From 23e2b3fc158e2ce8899979b76595f8f0eaf5b7d0 Mon Sep 17 00:00:00 2001 From: Luciana Nunez Date: Fri, 9 Feb 2024 11:51:42 -0400 Subject: [PATCH 5/8] feature/FOUR-14077 --- routes/web.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/routes/web.php b/routes/web.php index 2e19472dd0..c1cef28efe 100644 --- a/routes/web.php +++ b/routes/web.php @@ -96,6 +96,9 @@ Route::get('processes-catalogue/{process?}', [ProcessesCatalogueController::class, 'redirect']) ->name('processes.catalogue.index') ->middleware('can:view-process-catalog'); + Route::get('process-catalogue/{process?}', [ProcessesCatalogueController::class, 'redirect']) + ->name('process.catalogue.index') + ->middleware('can:view-process-catalog'); Route::get('process-browser/{process?}', [ProcessesCatalogueController::class, 'index']) ->name('process.browser.index') ->middleware('can:view-process-catalog'); From 625fb80ffd3f28fc00804a71e02925b5f820d926 Mon Sep 17 00:00:00 2001 From: Luciana Nunez Date: Fri, 9 Feb 2024 13:48:56 -0400 Subject: [PATCH 6/8] feature/FOUR-14077 --- routes/web.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/routes/web.php b/routes/web.php index c1cef28efe..37d90abe5b 100644 --- a/routes/web.php +++ b/routes/web.php @@ -96,9 +96,13 @@ Route::get('processes-catalogue/{process?}', [ProcessesCatalogueController::class, 'redirect']) ->name('processes.catalogue.index') ->middleware('can:view-process-catalog'); - Route::get('process-catalogue/{process?}', [ProcessesCatalogueController::class, 'redirect']) - ->name('process.catalogue.index') - ->middleware('can:view-process-catalog'); + //------------------------------------------------------------------------------------------ + // Below route is for backward compatibility with old format routes. PLEASE DO NOT REMOVE + //------------------------------------------------------------------------------------------ + Route::get('processes-catalogue/{process?}', function ($process = null) { + return redirect()->route('process.browser.index', [$process]); + })->name('processes.catalogue.index.redirect'); + //------------------------------------------------------------------------------------------ Route::get('process-browser/{process?}', [ProcessesCatalogueController::class, 'index']) ->name('process.browser.index') ->middleware('can:view-process-catalog'); From 46c36d1b555903d72510515345f98f27042a9dfc Mon Sep 17 00:00:00 2001 From: Luciana Nunez Date: Fri, 9 Feb 2024 13:49:28 -0400 Subject: [PATCH 7/8] feature/FOUR-14077 --- .../Http/Controllers/ProcessesCatalogueController.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php b/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php index 22fa9f3923..2fb00e3419 100644 --- a/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php +++ b/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php @@ -19,9 +19,4 @@ public function index(Request $request, Process $process = null) { return view('processes-catalogue.index', compact('process')); } - - public function redirect(Request $request) - { - return redirect()->route('process.browser.index'); - } } From 0bce06231121f870e0aa41b7430d652eadfcd7ad Mon Sep 17 00:00:00 2001 From: Paula Quispe Date: Fri, 9 Feb 2024 14:25:33 -0400 Subject: [PATCH 8/8] backward compatibility --- routes/web.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/routes/web.php b/routes/web.php index 37d90abe5b..154d670a09 100644 --- a/routes/web.php +++ b/routes/web.php @@ -93,19 +93,17 @@ Route::get('designer/scripts/categories', [ScriptController::class, 'index'])->name('script-categories.index')->middleware('can:view-script-categories'); Route::get('designer', [DesignerController::class, 'index'])->name('designer.index'); - Route::get('processes-catalogue/{process?}', [ProcessesCatalogueController::class, 'redirect']) - ->name('processes.catalogue.index') + + Route::get('process-browser/{process?}', [ProcessesCatalogueController::class, 'index']) + ->name('process.browser.index') ->middleware('can:view-process-catalog'); //------------------------------------------------------------------------------------------ // Below route is for backward compatibility with old format routes. PLEASE DO NOT REMOVE //------------------------------------------------------------------------------------------ Route::get('processes-catalogue/{process?}', function ($process = null) { - return redirect()->route('process.browser.index', [$process]); - })->name('processes.catalogue.index.redirect'); + return redirect()->route('process.browser.index', [$process]); + })->name('processes.catalogue.index'); //------------------------------------------------------------------------------------------ - Route::get('process-browser/{process?}', [ProcessesCatalogueController::class, 'index']) - ->name('process.browser.index') - ->middleware('can:view-process-catalog'); Route::get('processes', [ProcessController::class, 'index'])->name('processes.index'); Route::get('processes/{process}/edit', [ProcessController::class, 'edit'])->name('processes.edit')->middleware('can:edit-processes');