From 8927c386c9b0f6ce0d4ff9c1479e99acdaea54e5 Mon Sep 17 00:00:00 2001 From: luNunezProcessmaker Date: Thu, 19 Sep 2024 10:43:29 -0400 Subject: [PATCH 1/3] feature/FOUR-18976 --- .../cases/casesMain/CasesMain.vue | 15 ++++- .../jscomposition/config/configBreadcrum.js | 9 +++ resources/jscomposition/config/index.js | 1 + resources/jscomposition/system/Breadcrums.vue | 61 ++++++++++--------- resources/views/cases/casesMain.blade.php | 3 - 5 files changed, 56 insertions(+), 33 deletions(-) create mode 100644 resources/jscomposition/config/configBreadcrum.js create mode 100644 resources/jscomposition/config/index.js diff --git a/resources/jscomposition/cases/casesMain/CasesMain.vue b/resources/jscomposition/cases/casesMain/CasesMain.vue index 086cc57bce..672eb4db91 100644 --- a/resources/jscomposition/cases/casesMain/CasesMain.vue +++ b/resources/jscomposition/cases/casesMain/CasesMain.vue @@ -1,6 +1,6 @@ diff --git a/resources/views/cases/casesMain.blade.php b/resources/views/cases/casesMain.blade.php index cab8d50617..a311f336db 100644 --- a/resources/views/cases/casesMain.blade.php +++ b/resources/views/cases/casesMain.blade.php @@ -7,9 +7,6 @@ @include('layouts.sidebar', ['sidebar'=> Menu::get('sidebar_request')]) @endsection -@section('breadcrumbs') -@endsection - @section('content')
@endsection From d5936694258b5ec941d32d44de92a61dbc528797 Mon Sep 17 00:00:00 2001 From: luNunezProcessmaker Date: Thu, 19 Sep 2024 12:54:47 -0400 Subject: [PATCH 2/3] feature/FOUR-18976 --- .../jscomposition/cases/casesMain/CasesMain.vue | 13 +++++++------ resources/jscomposition/system/Breadcrums.vue | 15 +++++---------- routes/web.php | 4 +++- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/resources/jscomposition/cases/casesMain/CasesMain.vue b/resources/jscomposition/cases/casesMain/CasesMain.vue index 672eb4db91..fd4ac300da 100644 --- a/resources/jscomposition/cases/casesMain/CasesMain.vue +++ b/resources/jscomposition/cases/casesMain/CasesMain.vue @@ -31,12 +31,7 @@ export default defineComponent({ const countersData = ref([]); const router = useRouter(); const route = useRoute(); - - const pages = ref([ - configHomeBreadcrum(), - { name: "Cases", href: "/cases", current: false }, - { name: "My Cases", current: true }, - ]); + const pages = ref([]); const onChangeCounter = (counter) => { if (typeof counter.url == "function") { @@ -52,6 +47,12 @@ export default defineComponent({ onMounted(async () => { const resCounters = await getCounters(); countersData.value = formatCounters(resCounters); + const currentCounter = countersData.value.find((counter) => counter.url === route.path); + pages.value = [ + configHomeBreadcrum(), + { name: "Cases", href: "/cases", current: false }, + { name: currentCounter.header, current: true }, + ]; }); return { diff --git a/resources/jscomposition/system/Breadcrums.vue b/resources/jscomposition/system/Breadcrums.vue index 3530b6f060..9ee3d8277e 100644 --- a/resources/jscomposition/system/Breadcrums.vue +++ b/resources/jscomposition/system/Breadcrums.vue @@ -3,29 +3,24 @@
  1. + :key="page.name" >
    + class="fas fa-slash fa-xs tw-rotate-90 tw-mr-1" /> + :aria-current="page.current ? 'page' : undefined" > + class="tw-mr-1" /> {{ page.name }} + class="tw-text-black" > {{ page.name }}
    diff --git a/routes/web.php b/routes/web.php index 79f9f40450..c7f470a47d 100644 --- a/routes/web.php +++ b/routes/web.php @@ -138,7 +138,9 @@ // Cases Route::get('cases', [RequestController::class, 'index'])->name('cases.index')->middleware('no-cache'); // This is a temporary API the engine team will create the API - Route::get('cases-main', [CasesController::class, 'index'])->name('cases-main.index')->middleware('no-cache'); + Route::get('cases-main/{type?}', [CasesController::class, 'index'])->name('cases-main.index') + ->where('type', 'my-cases|in-progress|completed|all-cases') + ->middleware('no-cache'); Route::get('cases/{type?}', [RequestController::class, 'index'])->name('cases_by_type') ->where('type', 'all|in_progress|completed') ->middleware('no-cache'); From 6eb206596f158c1c93b39438c85f36eda699f351 Mon Sep 17 00:00:00 2001 From: luNunezProcessmaker <123644082+luNunezProcessmaker@users.noreply.github.com> Date: Thu, 19 Sep 2024 15:18:30 -0400 Subject: [PATCH 3/3] Update CasesMain.vue --- resources/jscomposition/cases/casesMain/CasesMain.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/jscomposition/cases/casesMain/CasesMain.vue b/resources/jscomposition/cases/casesMain/CasesMain.vue index fd4ac300da..1535407048 100644 --- a/resources/jscomposition/cases/casesMain/CasesMain.vue +++ b/resources/jscomposition/cases/casesMain/CasesMain.vue @@ -46,8 +46,9 @@ export default defineComponent({ onMounted(async () => { const resCounters = await getCounters(); - countersData.value = formatCounters(resCounters); const currentCounter = countersData.value.find((counter) => counter.url === route.path); + + countersData.value = formatCounters(resCounters); pages.value = [ configHomeBreadcrum(), { name: "Cases", href: "/cases", current: false },