From 51c3a31eab92037e0e92083f76b9863a89e5c9ab Mon Sep 17 00:00:00 2001 From: Fabio Date: Mon, 27 Nov 2023 16:22:12 +0000 Subject: [PATCH 01/43] FOUR-12111:Process Browser - List Available Process --- .../components/CardProcess.vue | 5 ++ .../components/CatalogueEmpty.vue | 25 +++++++ .../components/ProcessesCatalogue.vue | 64 +++++++++-------- .../components/menuCatologue.vue | 72 +++++++++++++++++++ 4 files changed, 135 insertions(+), 31 deletions(-) create mode 100644 resources/js/processes-catalogue/components/CardProcess.vue create mode 100644 resources/js/processes-catalogue/components/CatalogueEmpty.vue create mode 100644 resources/js/processes-catalogue/components/menuCatologue.vue diff --git a/resources/js/processes-catalogue/components/CardProcess.vue b/resources/js/processes-catalogue/components/CardProcess.vue new file mode 100644 index 0000000000..a5fef11e98 --- /dev/null +++ b/resources/js/processes-catalogue/components/CardProcess.vue @@ -0,0 +1,5 @@ + diff --git a/resources/js/processes-catalogue/components/CatalogueEmpty.vue b/resources/js/processes-catalogue/components/CatalogueEmpty.vue new file mode 100644 index 0000000000..d82e3181ab --- /dev/null +++ b/resources/js/processes-catalogue/components/CatalogueEmpty.vue @@ -0,0 +1,25 @@ + diff --git a/resources/js/processes-catalogue/components/ProcessesCatalogue.vue b/resources/js/processes-catalogue/components/ProcessesCatalogue.vue index b245fe3710..3cf3ef6ab1 100644 --- a/resources/js/processes-catalogue/components/ProcessesCatalogue.vue +++ b/resources/js/processes-catalogue/components/ProcessesCatalogue.vue @@ -1,48 +1,50 @@ - diff --git a/resources/js/processes-catalogue/components/menuCatologue.vue b/resources/js/processes-catalogue/components/menuCatologue.vue new file mode 100644 index 0000000000..480bf82639 --- /dev/null +++ b/resources/js/processes-catalogue/components/menuCatologue.vue @@ -0,0 +1,72 @@ + + + + + From 48b565d0a50b639fe2b7e36511d01a6f2e135b63 Mon Sep 17 00:00:00 2001 From: luNunezProcessmaker Date: Tue, 28 Nov 2023 09:10:39 -0400 Subject: [PATCH 02/43] feature/FOUR-12607 --- .../components/Breadcrumbs.vue | 62 +++++++++++++++++++ .../components/ProcessesCatalogue.vue | 61 ++++++++++-------- 2 files changed, 96 insertions(+), 27 deletions(-) create mode 100644 resources/js/processes-catalogue/components/Breadcrumbs.vue diff --git a/resources/js/processes-catalogue/components/Breadcrumbs.vue b/resources/js/processes-catalogue/components/Breadcrumbs.vue new file mode 100644 index 0000000000..25d689fc5b --- /dev/null +++ b/resources/js/processes-catalogue/components/Breadcrumbs.vue @@ -0,0 +1,62 @@ + + + diff --git a/resources/js/processes-catalogue/components/ProcessesCatalogue.vue b/resources/js/processes-catalogue/components/ProcessesCatalogue.vue index b245fe3710..8926d388b9 100644 --- a/resources/js/processes-catalogue/components/ProcessesCatalogue.vue +++ b/resources/js/processes-catalogue/components/ProcessesCatalogue.vue @@ -1,32 +1,37 @@ + + diff --git a/resources/views/processes-catalogue/open.blade.php b/resources/views/processes-catalogue/open.blade.php index 4532aea778..d617bad9ac 100644 --- a/resources/views/processes-catalogue/open.blade.php +++ b/resources/views/processes-catalogue/open.blade.php @@ -10,7 +10,7 @@ @section('content')
- +
@endsection From 4adf90b3dfd83d8df039827108266e8e9a54af84 Mon Sep 17 00:00:00 2001 From: luNunezProcessmaker Date: Wed, 29 Nov 2023 13:29:52 -0400 Subject: [PATCH 07/43] feature/FOUR-11536 --- .../components/ProcessOptions.vue | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/resources/js/processes-catalogue/components/ProcessOptions.vue b/resources/js/processes-catalogue/components/ProcessOptions.vue index 9b12ad7cde..aa800dcfcb 100644 --- a/resources/js/processes-catalogue/components/ProcessOptions.vue +++ b/resources/js/processes-catalogue/components/ProcessOptions.vue @@ -57,6 +57,9 @@ export default { this.getStartEvents(); }, methods: { + /** + * get start events for dropdown Menu + */ getStartEvents() { window.ProcessMaker.apiClient .get(`processes/${this.processId}`) @@ -69,18 +72,17 @@ export default { }); }); }, + /** + * Start new request + */ goToNewRequest(event) { - window.ProcessMaker.apiClient + ProcessMaker.apiClient .post(`/process_events/${this.processId}?event=${event}`) .then((response) => { this.spin = 0; let instance = response.data; this.$cookies.set("fromTriggerStartEvent", true, "1min"); - if (this.$cookies.get("isMobile") === "true") { - window.location = `/requests/mobile/${instance.id}`; - } else { - window.location = `/requests/${instance.id}`; - } + window.location = `/requests/${instance.id}`; }).catch((err) => { const data = err.response.data; if (data.message) { From 8dd16b0211592845af25f9953d0529b796ce07c3 Mon Sep 17 00:00:00 2001 From: luNunezProcessmaker Date: Wed, 29 Nov 2023 14:17:25 -0400 Subject: [PATCH 08/43] feature/FOUR-11534 --- .../components/ProcessInfo.vue | 5 +- .../components/ProcessMap.vue | 56 +++++++++++++++++++ 2 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 resources/js/processes-catalogue/components/ProcessMap.vue diff --git a/resources/js/processes-catalogue/components/ProcessInfo.vue b/resources/js/processes-catalogue/components/ProcessInfo.vue index aac435aecc..58680e0fa5 100644 --- a/resources/js/processes-catalogue/components/ProcessInfo.vue +++ b/resources/js/processes-catalogue/components/ProcessInfo.vue @@ -14,7 +14,7 @@
- Process Map + @@ -28,10 +28,11 @@ From ca020b85f41e90acbeaf030c1774459f809d049f Mon Sep 17 00:00:00 2001 From: luNunezProcessmaker Date: Wed, 29 Nov 2023 14:48:03 -0400 Subject: [PATCH 09/43] feature/FOUR-11536 --- .../components/ProcessInfo.vue | 54 +++++++------- .../components/ProcessOptions.vue | 71 ++++++++++++++++++- 2 files changed, 99 insertions(+), 26 deletions(-) diff --git a/resources/js/processes-catalogue/components/ProcessInfo.vue b/resources/js/processes-catalogue/components/ProcessInfo.vue index aac435aecc..239dad1aba 100644 --- a/resources/js/processes-catalogue/components/ProcessInfo.vue +++ b/resources/js/processes-catalogue/components/ProcessInfo.vue @@ -1,37 +1,41 @@ diff --git a/resources/js/processes-catalogue/components/ProcessOptions.vue b/resources/js/processes-catalogue/components/ProcessOptions.vue index 8756c51ad7..bca4b59279 100644 --- a/resources/js/processes-catalogue/components/ProcessOptions.vue +++ b/resources/js/processes-catalogue/components/ProcessOptions.vue @@ -9,10 +9,7 @@ > {{ $t('Start this process') }} -
+

From 4bc83be2541e7266144edf03c3cd2a5b4b9d70fd Mon Sep 17 00:00:00 2001 From: Fabio Date: Wed, 29 Nov 2023 19:08:43 +0000 Subject: [PATCH 12/43] FOUR-Process Browser - List the cards --- .../components/CardProcess.vue | 43 +++++++++++++++++-- .../components/ProcessesCatalogue.vue | 7 ++- 2 files changed, 45 insertions(+), 5 deletions(-) diff --git a/resources/js/processes-catalogue/components/CardProcess.vue b/resources/js/processes-catalogue/components/CardProcess.vue index a5fef11e98..97cf87cdce 100644 --- a/resources/js/processes-catalogue/components/CardProcess.vue +++ b/resources/js/processes-catalogue/components/CardProcess.vue @@ -1,5 +1,42 @@ + + + + diff --git a/resources/js/processes-catalogue/components/ProcessesCatalogue.vue b/resources/js/processes-catalogue/components/ProcessesCatalogue.vue index 9b1d09212f..f527cee5c1 100644 --- a/resources/js/processes-catalogue/components/ProcessesCatalogue.vue +++ b/resources/js/processes-catalogue/components/ProcessesCatalogue.vue @@ -17,6 +17,7 @@ >

+
@@ -25,11 +26,13 @@ diff --git a/resources/js/processes-catalogue/components/ProcessesCarousel.vue b/resources/js/processes-catalogue/components/ProcessesCarousel.vue new file mode 100644 index 0000000000..c626d5aa39 --- /dev/null +++ b/resources/js/processes-catalogue/components/ProcessesCarousel.vue @@ -0,0 +1,61 @@ + + + diff --git a/webpack.mix.js b/webpack.mix.js index f05618cfae..f6a724a419 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -54,6 +54,7 @@ mix.extract([ "@fortawesome/vue-fontawesome" ]) .copy("resources/img/*", "public/img") + .copy("resources/img/launchpad-images/*", "public/img/launchpad-images") .copy("node_modules/snapsvg/dist/snap.svg.js", "public/js") .copy("resources/js/components/CustomActions.vue", "public/js") .copy("resources/js/components/DetailRow.vue", "public/js") From f1d97db5029a6c07c810cdae8304dfd12871cf9d Mon Sep 17 00:00:00 2001 From: luNunezProcessmaker Date: Thu, 30 Nov 2023 14:14:05 -0400 Subject: [PATCH 17/43] feature/FOUR-11534 --- .../components/ProcessMap.vue | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/resources/js/processes-catalogue/components/ProcessMap.vue b/resources/js/processes-catalogue/components/ProcessMap.vue index a83e217041..8cb60f6a7f 100644 --- a/resources/js/processes-catalogue/components/ProcessMap.vue +++ b/resources/js/processes-catalogue/components/ProcessMap.vue @@ -6,16 +6,10 @@ class="d-flex justify-content-between mb-3" >

- + {{ process.name }}

- + + + From 95334c989e6ba85fd15a2e57426939397d786952 Mon Sep 17 00:00:00 2001 From: luNunezProcessmaker Date: Thu, 30 Nov 2023 14:55:24 -0400 Subject: [PATCH 18/43] feature/FOUR-11537 --- .../components/ProcessOptions.vue | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/resources/js/processes-catalogue/components/ProcessOptions.vue b/resources/js/processes-catalogue/components/ProcessOptions.vue index 15852650c2..f0a3755ec8 100644 --- a/resources/js/processes-catalogue/components/ProcessOptions.vue +++ b/resources/js/processes-catalogue/components/ProcessOptions.vue @@ -28,8 +28,18 @@ {{ event.name }}

+

{{ $t('Starting events') }} From 011c736cdd0f647217aee0209c5a8e926c14079e Mon Sep 17 00:00:00 2001 From: Fabio Date: Thu, 30 Nov 2023 20:33:27 +0000 Subject: [PATCH 21/43] card load functional --- resources/img/default-process.svg | 9 +++ .../components/CardProcess.vue | 60 +++++++++++++++---- .../components/ProcessesCatalogue.vue | 18 ++++-- .../components/WizardTemplates.vue | 45 +++++++------- .../components/menuCatologue.vue | 6 +- 5 files changed, 98 insertions(+), 40 deletions(-) create mode 100644 resources/img/default-process.svg diff --git a/resources/img/default-process.svg b/resources/img/default-process.svg new file mode 100644 index 0000000000..c5ee87ced4 --- /dev/null +++ b/resources/img/default-process.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/resources/js/processes-catalogue/components/CardProcess.vue b/resources/js/processes-catalogue/components/CardProcess.vue index 97cf87cdce..fdc0ab1d97 100644 --- a/resources/js/processes-catalogue/components/CardProcess.vue +++ b/resources/js/processes-catalogue/components/CardProcess.vue @@ -1,29 +1,42 @@ - diff --git a/resources/js/processes-catalogue/components/menuCatologue.vue b/resources/js/processes-catalogue/components/menuCatologue.vue index 8688eb6f72..4d08bd9e38 100644 --- a/resources/js/processes-catalogue/components/menuCatologue.vue +++ b/resources/js/processes-catalogue/components/menuCatologue.vue @@ -7,8 +7,8 @@ class="m-1" >

- - {{ $t("Avaible Processses") }} + + {{ $t(title) }}
@@ -33,7 +33,7 @@ diff --git a/resources/js/processes-catalogue/components/ProcessesCarousel.vue b/resources/js/processes-catalogue/components/ProcessesCarousel.vue index c626d5aa39..770827f75a 100644 --- a/resources/js/processes-catalogue/components/ProcessesCarousel.vue +++ b/resources/js/processes-catalogue/components/ProcessesCarousel.vue @@ -2,31 +2,18 @@
-
- -
-
- - -
+
@@ -34,12 +21,12 @@ + From 37f7def3c3ad70baf46d013428cc61784ce54cc9 Mon Sep 17 00:00:00 2001 From: luNunezProcessmaker Date: Thu, 30 Nov 2023 17:06:55 -0400 Subject: [PATCH 23/43] feature/FOUR-12636 --- resources/js/components/shared/ellipsisMenuActions.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/js/components/shared/ellipsisMenuActions.js b/resources/js/components/shared/ellipsisMenuActions.js index 60e13d6209..9a9a3fd67d 100644 --- a/resources/js/components/shared/ellipsisMenuActions.js +++ b/resources/js/components/shared/ellipsisMenuActions.js @@ -28,8 +28,8 @@ export default { icon: "fas fa-file-export", }, { - value: "edit-designer", - content: "Edit Process", + value: "open-in-modeler", + content: "Open in Modeler", link: true, href: "/modeler/{{id}}", permission: ["edit-processes", "create-projects", "view-projects"], From 377f27cc3a55207836fb28577c405f8552e13fd8 Mon Sep 17 00:00:00 2001 From: CarliPinell Date: Fri, 1 Dec 2023 02:59:05 +0000 Subject: [PATCH 24/43] Adjustments in Carousel image container --- .../components/ProcessesCarousel.vue | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/resources/js/processes-catalogue/components/ProcessesCarousel.vue b/resources/js/processes-catalogue/components/ProcessesCarousel.vue index ab78743405..4211a7c867 100644 --- a/resources/js/processes-catalogue/components/ProcessesCarousel.vue +++ b/resources/js/processes-catalogue/components/ProcessesCarousel.vue @@ -2,7 +2,6 @@
@@ -36,7 +36,9 @@ export default { sliding: null, images: [ { url: "https://picsum.photos/1024/480/?image=55" }, - { url: "https://picsum.photos/800/400/?image=54" }, + { url: "https://picsum.photos/100/100/?image=54" }, + { url: "https://picsum.photos/200/100/?image=53" }, + { url: "https://picsum.photos/1024/800/?image=56" }, ], defaultImage: Array(4).fill({ url: "/img/launchpad-images/noImage.svg" }), }; @@ -66,11 +68,14 @@ export default { }; From 638ce821a7b976d127ec5a2a2270f92b2b58f0b3 Mon Sep 17 00:00:00 2001 From: Paula Quispe Date: Thu, 30 Nov 2023 16:14:09 -0400 Subject: [PATCH 25/43] FOUR-12652 --- ProcessMaker/Models/Bookmark.php | 25 ++++++++++++++ ..._add_launchpad_properties_at_processes.php | 34 +++++++++++++++++++ ...39_create_user_process_bookmarks_table.php | 32 +++++++++++++++++ 3 files changed, 91 insertions(+) create mode 100644 ProcessMaker/Models/Bookmark.php create mode 100644 database/migrations/2023_11_30_165723_add_launchpad_properties_at_processes.php create mode 100644 database/migrations/2023_11_30_170839_create_user_process_bookmarks_table.php diff --git a/ProcessMaker/Models/Bookmark.php b/ProcessMaker/Models/Bookmark.php new file mode 100644 index 0000000000..67e3f64af7 --- /dev/null +++ b/ProcessMaker/Models/Bookmark.php @@ -0,0 +1,25 @@ +json('launchpad_properties')->nullable(); + }); + Schema::table('process_versions', function (Blueprint $table) { + $table->json('launchpad_properties')->nullable(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('processes', function (Blueprint $table) { + $table->dropColumn(['launchpad_properties']); + }); + Schema::table('process_versions', function (Blueprint $table) { + $table->dropColumn(['launchpad_properties']); + }); + } +}; diff --git a/database/migrations/2023_11_30_170839_create_user_process_bookmarks_table.php b/database/migrations/2023_11_30_170839_create_user_process_bookmarks_table.php new file mode 100644 index 0000000000..3c113edd96 --- /dev/null +++ b/database/migrations/2023_11_30_170839_create_user_process_bookmarks_table.php @@ -0,0 +1,32 @@ +bigIncrements('id'); + $table->unsignedBigInteger('user_id'); + $table->unsignedInteger('process_id'); + $table->timestamps(); + + // Foreign keys + $table->foreign('process_id')->references('id')->on('processes')->onDelete('cascade'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('user_process_bookmarks'); + } +}; From 941f07ee13fbfe789806fb6d58c04671ebaa0f6a Mon Sep 17 00:00:00 2001 From: luNunezProcessmaker Date: Fri, 1 Dec 2023 08:36:37 -0400 Subject: [PATCH 26/43] feature/FOUR-12636 --- resources/lang/en.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/en.json b/resources/lang/en.json index b7e37e07ca..a486d70504 100644 --- a/resources/lang/en.json +++ b/resources/lang/en.json @@ -1133,6 +1133,7 @@ "Provide Values": "Provide Values", "Provider": "Provider", "Publish Template": "Publish Template", + "Open in Modeler": "Open in Modeler", "Queue Management": "Queue Management", "QueueManagementAccessed": "Queue Management Accessed", "Radio Button Group": "Radio Button Group", From dc90b7928a52aadb8583fde3cd5bcfd0000d0d7d Mon Sep 17 00:00:00 2001 From: Paula Quispe Date: Fri, 1 Dec 2023 08:33:29 -0400 Subject: [PATCH 27/43] FOUR-12621 --- .../Controllers/Api/ProcessController.php | 5 ++++ ProcessMaker/Models/Process.php | 8 +++++++ tests/Feature/Api/ProcessTest.php | 23 +++++++++++++++++++ 3 files changed, 36 insertions(+) diff --git a/ProcessMaker/Http/Controllers/Api/ProcessController.php b/ProcessMaker/Http/Controllers/Api/ProcessController.php index 6a834fef74..7560aff516 100644 --- a/ProcessMaker/Http/Controllers/Api/ProcessController.php +++ b/ProcessMaker/Http/Controllers/Api/ProcessController.php @@ -107,6 +107,11 @@ public function index(Request $request) if (!empty($filter)) { $processes->filter($filter); } + // Filter by category + $category = $request->input('category', null); + if (!empty($category)) { + $processes->category($category); + } if (!empty($pmql)) { try { diff --git a/ProcessMaker/Models/Process.php b/ProcessMaker/Models/Process.php index 9bb5270516..230b790f7f 100644 --- a/ProcessMaker/Models/Process.php +++ b/ProcessMaker/Models/Process.php @@ -450,6 +450,14 @@ public function scopeArchived($query) return $query->where('processes.status', 'ARCHIVED'); } + /** + * Scope a query to include a specific category + */ + public function scopeCategory($query, int $id) + { + return $query->where('processes.process_category_id', $id); + } + public function getCollaborations() { $this->bpmnDefinitions = app(BpmnDocumentInterface::class, ['process' => $this]); diff --git a/tests/Feature/Api/ProcessTest.php b/tests/Feature/Api/ProcessTest.php index 018605ab4e..4e58be9912 100644 --- a/tests/Feature/Api/ProcessTest.php +++ b/tests/Feature/Api/ProcessTest.php @@ -555,6 +555,29 @@ public function testSorting() ]); } + /** + * Test filter by Category + */ + public function testFilterCategory() + { + // Create Category + $categoryA = ProcessCategory::factory()->create(); + $categoryB = ProcessCategory::factory()->create(); + // Now we create process related to this + Process::factory()->count(5)->create([ + 'process_category_id' => $categoryB->id, + ]); + // Get process without category + $response = $this->apiCall('GET', route('api.processes.index', ['per_page' => 5, 'page' => 1])); + $response->assertJsonCount(5, 'data'); + // Get process without category + $response = $this->apiCall('GET', route('api.processes.index', ['category' => $categoryA->id])); + $response->assertJsonCount(0, 'data'); + // The first page should have 5 items related to the category + $response = $this->apiCall('GET', route('api.processes.index', ['category' => $categoryB->id])); + $response->assertJsonCount(5, 'data'); + } + /** * Test pagination of process list */ From e76e111c2848b60daf362ad19c788ef754aabccb Mon Sep 17 00:00:00 2001 From: CarliPinell Date: Fri, 1 Dec 2023 18:32:39 +0000 Subject: [PATCH 28/43] Observations solved --- resources/img/launchpad-images/imageDefault.png | Bin 0 -> 19371 bytes .../components/ProcessInfo.vue | 2 -- .../components/ProcessesCarousel.vue | 3 ++- 3 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 resources/img/launchpad-images/imageDefault.png diff --git a/resources/img/launchpad-images/imageDefault.png b/resources/img/launchpad-images/imageDefault.png new file mode 100644 index 0000000000000000000000000000000000000000..9f080fa0147fe22322b06c4f9c2d0e7b7fef3975 GIT binary patch literal 19371 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 Dq(aY* literal 0 HcmV?d00001 diff --git a/resources/js/processes-catalogue/components/ProcessInfo.vue b/resources/js/processes-catalogue/components/ProcessInfo.vue index e6508c9e04..674563e1b7 100644 --- a/resources/js/processes-catalogue/components/ProcessInfo.vue +++ b/resources/js/processes-catalogue/components/ProcessInfo.vue @@ -24,7 +24,6 @@ /> @@ -49,7 +48,6 @@ export default { data() { return { fields: [], - intervalValue: 2000, }; }, }; diff --git a/resources/js/processes-catalogue/components/ProcessesCarousel.vue b/resources/js/processes-catalogue/components/ProcessesCarousel.vue index 4211a7c867..2a017f1fa6 100644 --- a/resources/js/processes-catalogue/components/ProcessesCarousel.vue +++ b/resources/js/processes-catalogue/components/ProcessesCarousel.vue @@ -40,7 +40,8 @@ export default { { url: "https://picsum.photos/200/100/?image=53" }, { url: "https://picsum.photos/1024/800/?image=56" }, ], - defaultImage: Array(4).fill({ url: "/img/launchpad-images/noImage.svg" }), + defaultImage: Array(4).fill({ url: "/img/launchpad-images/imageDefault.png" }), + interval: 2000 }; }, methods: { From f46c7e4da3ad385d92a01ac12a95b5b5e3ff13ec Mon Sep 17 00:00:00 2001 From: luNunezProcessmaker Date: Fri, 1 Dec 2023 14:36:04 -0400 Subject: [PATCH 29/43] feature/FOUR-12645 --- .../ProcessesCatalogueController.php | 5 ++- .../components/Breadcrumbs.vue | 19 ++++++-- .../components/ProcessInfo.vue | 45 ++++++++++++++++--- .../components/ProcessesCatalogue.vue | 6 ++- .../views/processes-catalogue/open.blade.php | 1 + 5 files changed, 63 insertions(+), 13 deletions(-) diff --git a/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php b/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php index e237d349c7..b5a6f7ea11 100644 --- a/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php +++ b/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php @@ -20,8 +20,9 @@ public function index(Request $request) * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View */ - public function open(Process $process) + public function open(Process $process, Request $request) { - return view('processes-catalogue.open', compact('process')); + $category = $request->input('category') ?? 0; + return view('processes-catalogue.open', compact('process', 'category')); } } diff --git a/resources/js/processes-catalogue/components/Breadcrumbs.vue b/resources/js/processes-catalogue/components/Breadcrumbs.vue index 6b6a93ab38..a4c8013bbd 100644 --- a/resources/js/processes-catalogue/components/Breadcrumbs.vue +++ b/resources/js/processes-catalogue/components/Breadcrumbs.vue @@ -14,8 +14,8 @@
  • - - {{ category }} + + {{ categoryName }}
    • @@ -29,14 +29,27 @@ diff --git a/resources/js/processes-catalogue/components/ProcessInfo.vue b/resources/js/processes-catalogue/components/ProcessInfo.vue index e0ad61c235..5fe9030866 100644 --- a/resources/js/processes-catalogue/components/ProcessInfo.vue +++ b/resources/js/processes-catalogue/components/ProcessInfo.vue @@ -1,17 +1,18 @@ diff --git a/resources/js/processes-catalogue/components/ProcessesCatalogue.vue b/resources/js/processes-catalogue/components/ProcessesCatalogue.vue index 3a5f0b06a4..8c4cdd418b 100644 --- a/resources/js/processes-catalogue/components/ProcessesCatalogue.vue +++ b/resources/js/processes-catalogue/components/ProcessesCatalogue.vue @@ -1,6 +1,9 @@