diff --git a/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php b/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php index b5a6f7ea11..2fb00e3419 100644 --- a/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php +++ b/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php @@ -7,22 +7,16 @@ 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) + 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 @@ @@ -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..3441dd1603 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") }}

- -
- -
- - - - - - - -
- - +
+ + + + + + +
+ +
@@ -56,34 +42,15 @@ export default { ProcessesCarousel, ProcessTab, }, - 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 + /** 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 0ef30fc5c3..bfe3eef1ac 100644 --- a/resources/js/processes-catalogue/components/ProcessMap.vue +++ b/resources/js/processes-catalogue/components/ProcessMap.vue @@ -101,9 +101,10 @@ export default { getActions() { this.processLaunchpadActions = this.processActions.filter((action) => action.value !== "open-launchpad"); }, + /** Rerun a process cards from process info */ 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..ec93c350cd 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'); 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")