From e7edeb05168b798edd8e4d2e03770d9bac952007 Mon Sep 17 00:00:00 2001 From: luNunezProcessmaker Date: Tue, 5 Dec 2023 15:19:19 -0400 Subject: [PATCH 1/4] feature/FOUR-12713 --- .../ProcessesCatalogueController.php | 16 +--- .../components/Breadcrumbs.vue | 20 +---- .../components/CardProcess.vue | 4 +- .../components/ProcessInfo.vue | 76 ++++++------------- .../components/ProcessMap.vue | 4 +- .../components/ProcessesCatalogue.vue | 45 ++++++++++- .../views/processes-catalogue/index.blade.php | 8 +- .../views/processes-catalogue/open.blade.php | 26 ------- routes/web.php | 5 +- 9 files changed, 81 insertions(+), 123 deletions(-) delete mode 100644 resources/views/processes-catalogue/open.blade.php diff --git a/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php b/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php index b5a6f7ea11..cfa376807b 100644 --- a/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php +++ b/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php @@ -9,20 +9,8 @@ class ProcessesCatalogueController extends Controller { - public function index(Request $request) + public function index(Request $request, Process $process = null) { - return view('processes-catalogue.index'); - } - - /** - * @param Process $process - * @param string $id - * - * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View - */ - public function open(Process $process, Request $request) - { - $category = $request->input('category') ?? 0; - return view('processes-catalogue.open', compact('process', 'category')); + return view('processes-catalogue.index', compact('process')); } } diff --git a/resources/js/processes-catalogue/components/Breadcrumbs.vue b/resources/js/processes-catalogue/components/Breadcrumbs.vue index a4c8013bbd..6f13f85c4a 100644 --- a/resources/js/processes-catalogue/components/Breadcrumbs.vue +++ b/resources/js/processes-catalogue/components/Breadcrumbs.vue @@ -14,8 +14,8 @@
  • - - {{ categoryName }} + + {{ category }}
    • @@ -32,24 +32,10 @@ export default { props: ["process", "category"], data() { return { - categoryName: "", }; }, mounted() { - this.getCategory(); - }, - methods: { - getCategory(value = "") { - if (value) { - this.categoryName = value; - } else if (this.category) { - ProcessMaker.apiClient - .get(`process_categories/${this.category}`) - .then((response) => { - this.categoryName = response.data.name; - }); - } - }, }, + methods: {}, }; diff --git a/resources/js/processes-catalogue/components/CardProcess.vue b/resources/js/processes-catalogue/components/CardProcess.vue index 59cca403cd..196a892c7b 100644 --- a/resources/js/processes-catalogue/components/CardProcess.vue +++ b/resources/js/processes-catalogue/components/CardProcess.vue @@ -4,7 +4,7 @@ v-for="process in processList" :key="process.id" class="card-process" - @click="openProcessInfo(process.id)" + @click="openProcessInfo(process)" >
    - - -

    {{ $t("Processes Browser") }}

    - -     - -
    - - - - - - - -
    - Process Tab +
    + + + + + + + +
    + + Process Tab
    @@ -52,34 +40,14 @@ export default { MenuCatologue, ProcessesCarousel, }, - props: ["process", "permission", "isDocumenterInstalled", "currentUserId", "category"], + props: ["process", "permission", "isDocumenterInstalled", "currentUserId"], data() { return { - listCategories: [], - selectCategory: 0, }; }, - created() { - this.selectCategory = this.selectedCategory(); - this.getCategories(); - }, methods: { - selectedCategory() { - if (this.category) { - return this.category; - } - const categories = this.process.process_category_id; - return typeof categories === "string" ? categories.split(",")[0] : categories; - }, - getCategories() { - ProcessMaker.apiClient - .get("process_categories") - .then((response) => { - this.listCategories = response.data.data; - }); - }, - selectCategorie(value) { - // TODO Flow from processInfo to ProcessesCtalogue + goBackCategory() { + this.$emit("goBackCategory"); }, }, }; diff --git a/resources/js/processes-catalogue/components/ProcessMap.vue b/resources/js/processes-catalogue/components/ProcessMap.vue index 0ef30fc5c3..842e45ad8b 100644 --- a/resources/js/processes-catalogue/components/ProcessMap.vue +++ b/resources/js/processes-catalogue/components/ProcessMap.vue @@ -102,8 +102,8 @@ export default { this.processLaunchpadActions = this.processActions.filter((action) => action.value !== "open-launchpad"); }, goBack() { - window.location = "/processes-catalogue"; - } + this.$emit("goBackCategory"); + }, }, }; diff --git a/resources/js/processes-catalogue/components/ProcessesCatalogue.vue b/resources/js/processes-catalogue/components/ProcessesCatalogue.vue index 4c4b0d6b4a..e6f6eb488c 100644 --- a/resources/js/processes-catalogue/components/ProcessesCatalogue.vue +++ b/resources/js/processes-catalogue/components/ProcessesCatalogue.vue @@ -2,7 +2,8 @@
    @@ -29,7 +30,7 @@
    @@ -38,6 +39,15 @@ + @@ -45,6 +55,7 @@ -@endsection diff --git a/routes/web.php b/routes/web.php index bef3b8382f..96e60155de 100644 --- a/routes/web.php +++ b/routes/web.php @@ -91,9 +91,8 @@ 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', [ProcessesCatalogueController::class, 'index'])->name('processes.catalogue.index'); - Route::get('processes-catalogue/{process}', [ProcessesCatalogueController::class, 'open'])->name('processes.catalogue.open'); - + Route::get('processes-catalogue/{process?}', [ProcessesCatalogueController::class, 'index'])->name('processes.catalogue.index'); + Route::get('processes', [ProcessController::class, 'index'])->name('processes.index'); Route::get('processes/{process}/edit', [ProcessController::class, 'edit'])->name('processes.edit')->middleware('can:edit-processes'); Route::get('processes/{process}/export/{page?}', [ProcessController::class, 'export'])->name('processes.export')->middleware('can:export-processes'); From be263fe86be911051f551ee56a090bf394b628f8 Mon Sep 17 00:00:00 2001 From: luNunezProcessmaker Date: Tue, 5 Dec 2023 16:06:23 -0400 Subject: [PATCH 2/4] feature/FOUR-12713 --- .../Http/Controllers/ProcessesCatalogueController.php | 6 ++++++ .../js/processes-catalogue/components/CardProcess.vue | 1 + .../js/processes-catalogue/components/ProcessInfo.vue | 1 + resources/js/processes-catalogue/components/ProcessMap.vue | 1 + .../processes-catalogue/components/ProcessesCatalogue.vue | 7 +++++++ 5 files changed, 16 insertions(+) diff --git a/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php b/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php index cfa376807b..2fb00e3419 100644 --- a/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php +++ b/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php @@ -7,6 +7,12 @@ use ProcessMaker\Models\Process; use ProcessMaker\Models\ProcessCategory; +/** + * @param Request $request + * @param Process $process + * + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ class ProcessesCatalogueController extends Controller { public function index(Request $request, Process $process = null) diff --git a/resources/js/processes-catalogue/components/CardProcess.vue b/resources/js/processes-catalogue/components/CardProcess.vue index 196a892c7b..3441dd1603 100644 --- a/resources/js/processes-catalogue/components/CardProcess.vue +++ b/resources/js/processes-catalogue/components/CardProcess.vue @@ -43,6 +43,7 @@ export default { this.processList = response.data.data; }); }, + /** go to process info */ openProcessInfo(process) { this.$emit("openProcess", process); }, diff --git a/resources/js/processes-catalogue/components/ProcessInfo.vue b/resources/js/processes-catalogue/components/ProcessInfo.vue index e7a7e94477..5c5e59fbe6 100644 --- a/resources/js/processes-catalogue/components/ProcessInfo.vue +++ b/resources/js/processes-catalogue/components/ProcessInfo.vue @@ -46,6 +46,7 @@ export default { }; }, methods: { + /** Rerun a process cards */ goBackCategory() { this.$emit("goBackCategory"); }, diff --git a/resources/js/processes-catalogue/components/ProcessMap.vue b/resources/js/processes-catalogue/components/ProcessMap.vue index 842e45ad8b..bfe3eef1ac 100644 --- a/resources/js/processes-catalogue/components/ProcessMap.vue +++ b/resources/js/processes-catalogue/components/ProcessMap.vue @@ -101,6 +101,7 @@ export default { getActions() { this.processLaunchpadActions = this.processActions.filter((action) => action.value !== "open-launchpad"); }, + /** Rerun a process cards from process info */ goBack() { this.$emit("goBackCategory"); }, diff --git a/resources/js/processes-catalogue/components/ProcessesCatalogue.vue b/resources/js/processes-catalogue/components/ProcessesCatalogue.vue index e6f6eb488c..ec93c350cd 100644 --- a/resources/js/processes-catalogue/components/ProcessesCatalogue.vue +++ b/resources/js/processes-catalogue/components/ProcessesCatalogue.vue @@ -86,10 +86,12 @@ export default { this.checkSelectedProcess(); }, methods: { + /** Add new page of categories */ addCategories() { this.page += 1; this.getCategories(); }, + /** Get list of categories */ getCategories() { ProcessMaker.apiClient .get(`process_categories?page=${this.page}&per_page=${this.numCategories}`) @@ -97,6 +99,7 @@ export default { this.listCategories = [...this.listCategories, ...response.data.data]; }); }, + /** Check if there is a pre-selected process */ checkSelectedProcess() { if (this.process) { this.openProcess(this.process); @@ -109,6 +112,7 @@ export default { }); } }, + /** Select a category and show display */ selectCategorie(value) { this.category = value; this.selectedProcess = null; @@ -116,16 +120,19 @@ export default { this.showWizardTemplates = false; this.showProcess = false; }, + /** Select a wizard templates and show display */ wizardTemplatesSelected() { this.showWizardTemplates = true; this.showCardProcesses = false; this.showProcess = false; }, + /** Select a process and show display */ openProcess(process) { this.showCardProcesses = false; this.showProcess = true; this.selectedProcess = process; }, + /** Rerun a process cards from process info */ returnedFromInfo() { this.selectCategorie(this.category); }, From 1dfa2ad85ceb3e709b36b73e75f8a2517433a385 Mon Sep 17 00:00:00 2001 From: luNunezProcessmaker Date: Tue, 5 Dec 2023 16:52:23 -0400 Subject: [PATCH 3/4] feature/FOUR-12713 --- resources/js/processes-catalogue/open.js | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 resources/js/processes-catalogue/open.js diff --git a/resources/js/processes-catalogue/open.js b/resources/js/processes-catalogue/open.js deleted file mode 100644 index 94e67c4e58..0000000000 --- a/resources/js/processes-catalogue/open.js +++ /dev/null @@ -1,9 +0,0 @@ -import Vue from "vue"; -import ProcessInfo from "./components/ProcessInfo.vue"; - -new Vue({ - el: "#open-process", - components: { ProcessInfo }, - data: {}, - methods: {}, -}); From bae9e67650194ba39d2d095c6ff988e72fa00575 Mon Sep 17 00:00:00 2001 From: Paula Quispe Date: Wed, 6 Dec 2023 10:22:27 -0400 Subject: [PATCH 4/4] . --- webpack.mix.js | 1 - 1 file changed, 1 deletion(-) diff --git a/webpack.mix.js b/webpack.mix.js index 0a2e976666..bd6544419c 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -119,7 +119,6 @@ mix.js("resources/js/app-layout.js", "public/js") .js("resources/js/processes/translations/import.js", "public/js/processes/translations") .js("resources/js/processes-catalogue/index.js", "public/js/processes-catalogue/index.js") - .js("resources/js/processes-catalogue/open.js", "public/js/processes-catalogue/open.js") .js("resources/js/tasks/index.js", "public/js/tasks/index.js") .js("resources/js/tasks/mobile.js", "public/js/tasks/mobile.js")