From a1d950672ae266120e52f543452450aaeef7906e Mon Sep 17 00:00:00 2001
From: Nolan Ehrstrom <github@nolanpro.com>
Date: Thu, 23 May 2024 15:34:13 -0700
Subject: [PATCH 1/4] Format launchpad process list for mobile

---
 ProcessMaker/Helpers/MobileHelper.php         |   5 +
 .../ProcessesCatalogueController.php          |  14 +-
 .../components/CardProcess.vue                |   8 +-
 .../components/ProcessesCatalogue.vue         | 164 +++++++++++++++---
 .../components/menuCatologue.vue              |  19 ++
 .../components/utils/Card.vue                 |  53 ++++--
 resources/sass/_variables.scss                |   3 +
 .../views/layouts/navbarMobile.blade.php      |   7 +-
 .../processes-catalogue/mobile.blade.php      |  30 ++++
 webpack.mix.js                                |   1 +
 10 files changed, 268 insertions(+), 36 deletions(-)
 create mode 100644 resources/views/processes-catalogue/mobile.blade.php

diff --git a/ProcessMaker/Helpers/MobileHelper.php b/ProcessMaker/Helpers/MobileHelper.php
index f577f4284f..2d8254f763 100644
--- a/ProcessMaker/Helpers/MobileHelper.php
+++ b/ProcessMaker/Helpers/MobileHelper.php
@@ -13,4 +13,9 @@ public static function isMobile($userAgent)
 
         return false;
     }
+
+    public static function detectMobile()
+    {
+        return isset($_SERVER['HTTP_USER_AGENT']) && self::isMobile($_SERVER['HTTP_USER_AGENT']);
+    }
 }
diff --git a/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php b/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php
index 7e333e24a7..4c394861f8 100644
--- a/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php
+++ b/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php
@@ -5,12 +5,13 @@
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use ProcessMaker\Events\ScreenBuilderStarting;
+use ProcessMaker\Helpers\MobileHelper;
 use ProcessMaker\Http\Controllers\Controller;
 use ProcessMaker\Managers\ScreenBuilderManager;
-use ProcessMaker\Models\Process;
 use ProcessMaker\Models\Bookmark;
-use ProcessMaker\Models\ProcessLaunchpad;
+use ProcessMaker\Models\Process;
 use ProcessMaker\Models\ProcessCategory;
+use ProcessMaker\Models\ProcessLaunchpad;
 use ProcessMaker\Traits\HasControllerAddons;
 
 /**
@@ -22,7 +23,7 @@
 class ProcessesCatalogueController extends Controller
 {
     use HasControllerAddons;
-    
+
     public function index(Request $request, Process $process = null)
     {
         $manager = app(ScreenBuilderManager::class);
@@ -33,6 +34,13 @@ public function index(Request $request, Process $process = null)
             $process->launchpad = ProcessLaunchpad::getLaunchpad(true, $process->id);
             $process->bookmark_id = Bookmark::getBookmarked(true, $process->id, $currentUser['id']);
         }
+
+        if (MobileHelper::detectMobile()) {
+            $title = __('Process Browser');
+
+            return view('processes-catalogue.mobile', compact('title', 'process', 'currentUser', 'manager'));
+        }
+
         return view('processes-catalogue.index', compact('process', 'currentUser', 'manager'));
     }
 }
diff --git a/resources/js/processes-catalogue/components/CardProcess.vue b/resources/js/processes-catalogue/components/CardProcess.vue
index f8ad2b7dac..49111e1425 100644
--- a/resources/js/processes-catalogue/components/CardProcess.vue
+++ b/resources/js/processes-catalogue/components/CardProcess.vue
@@ -154,10 +154,16 @@ export default {
 };
 </script>
 
-<style>
+<style scoped lang="scss">
+
+@import '~styles/variables';
 .processList {
   display: flex;
   flex-wrap: wrap;
+  
+  @media (max-width: $lp-breakpoint) {
+    display: block;
+  }
 }
 .text-custom {
   color: #1572C2;
diff --git a/resources/js/processes-catalogue/components/ProcessesCatalogue.vue b/resources/js/processes-catalogue/components/ProcessesCatalogue.vue
index 4cee707da8..275300c8c8 100644
--- a/resources/js/processes-catalogue/components/ProcessesCatalogue.vue
+++ b/resources/js/processes-catalogue/components/ProcessesCatalogue.vue
@@ -6,24 +6,37 @@
       :process="selectedProcess ? selectedProcess.name : ''"
       :template="guidedTemplates ? 'Guided Templates' : ''"
     />
-    <div class="d-flex">
-      <div class="menu">
-        <span class="pl-3 menu-title"> {{ $t('Process Browser') }} </span>
-        <MenuCatologue
-          ref="categoryList"
-          title="Available Processes"
-          preicon="fas fa-play-circle"
-          class="mt-3"
-          show-bookmark="true"
-          :category-count="categoryCount"
-          :data="listCategories"
-          :from-process-list="fromProcessList"
-          :select="selectCategorie"
-          :filter-categories="filterCategories"
-          :permission="permission"
-          @wizardLinkSelect="wizardTemplatesSelected"
-          @addCategories="addCategories"
-        />
+    <div class="main">
+      <div class="menu" :class="{ 'menu-open' : showMenu }">
+        <div class="container-1">
+          <div class="container-2">
+            <span class="pl-3 menu-title"> {{ $t('Process Browser') }} </span>
+            <MenuCatologue
+              ref="categoryList"
+              title="Available Processes"
+              preicon="fas fa-play-circle"
+              class="mt-3"
+              show-bookmark="true"
+              :category-count="categoryCount"
+              :data="listCategories"
+              :from-process-list="fromProcessList"
+              :select="selectCategorie"
+              :filter-categories="filterCategories"
+              :permission="permission"
+              @wizardLinkSelect="wizardTemplatesSelected"
+              @addCategories="addCategories"
+              @selectedCategoryName="selectedCategoryName = $event"
+            />
+          </div>
+          <div class="mobile-slide-close" v-if="showMenu">
+            <b-button variant="secondary" @click="showMenu = false">
+              <i class="fa fa-times"></i>
+            </b-button>
+          </div>
+        </div>
+      </div>
+      <div class="slide-control">
+        <a href="#" @click="showMenu = !showMenu">M</a>
       </div>
       <div class="processes-info">
         <div
@@ -33,6 +46,13 @@
           <CatalogueEmpty />
         </div>
         <div v-else>
+          <div class="mobile-menu-control">
+            <span @click="showMenu = !showMenu">
+              <i class="fa fa-bars"></i>
+              {{ selectedCategoryName }}
+            </span>
+          </div>
+
           <CardProcess
             v-if="showCardProcesses && !showWizardTemplates && !showProcess"
             :key="key"
@@ -83,6 +103,9 @@ export default {
   props: ["permission", "isDocumenterInstalled", "currentUserId", "process", "currentUser"],
   data() {
     return {
+      showMenu: false,
+      selectedCategoryName: '',
+      isMobile: window.screen.width < 650,
       listCategories: [],
       defaultOptions: [
         {
@@ -126,6 +149,19 @@ export default {
         this.$refs.categoryList.selectTemplateItem();
       }
     }, 500);
+
+    // Show the menu by default when not on mobile
+    if (!this.isMobile) {
+      this.showMenu = true;
+    }
+  },
+  watch: {
+    selectedCategoryName() {
+      // Only hide the menu automatically if we are on mobile
+      if (this.isMobile) {
+        this.showMenu = false;
+      }
+    }
   },
   methods: {
     /**
@@ -295,12 +331,90 @@ export default {
 };
 </script>
 
-<style scoped>
+<style scoped lang="scss">
+@import '~styles/variables';
+
+
+@media (max-width: $lp-breakpoint) {
+  .breadcrum-main {
+    display: none;
+  }
+}
+
+.main {
+  display: flex;
+
+  @media (max-width: $lp-breakpoint) {
+      display: block;
+  }
+}
+
 .menu {
-  min-width: 304px;
+  width: 0px;
+  flex: 0 0 0px;
   height: calc(100vh - 145px);
-  overflow-y: auto;
+  overflow: hidden;
   margin-top: 15px;
+  transition: width 0.2s, flex 0.2s;
+
+  @media (max-width: $lp-breakpoint) {
+    position: absolute;
+    z-index: 4; // above pagination
+    display: flex;
+    margin-top: 0;
+  }
+  
+  .container-1 {
+    // width: 315px;
+    display: flex;
+    .container-2 {
+      background-color: #F7F9FB;
+      border-right: 2px solid rgba(0, 0, 0, 0.1);
+      flex: 0 0 315px;
+    }
+
+    .mobile-slide-close {
+      display: none;
+      padding-left: 10px;
+      padding-top: 10px;
+      @media (max-width: $lp-breakpoint) {
+        display: block;
+      }
+    }
+      
+  }
+}
+.slide-control {
+  flex: 0 0 10px;
+  border-right: 1px solid rgba(0, 0, 0, 0.1);
+  background-color: pink;
+  
+  @media (max-width: $lp-breakpoint) {
+    display: none;
+  }
+}
+
+.mobile-menu-control {
+  display: none;
+  color: #6A7887;
+  font-size: 1.3em;
+  margin-top: 10px;
+  i {
+    margin-right: 3px;
+  }
+  @media (max-width: $lp-breakpoint) {
+    display: block;
+  }
+}
+
+.menu-open {
+  width: 315px;
+  flex: 0 0 315px;
+
+  @media (max-width: $lp-breakpoint) {
+    width: 365px;
+    flex: 0 0 365px;
+  }
 }
 .menu-title {
   color: #556271;
@@ -309,11 +423,19 @@ export default {
   font-weight: 600;
   line-height: 46.08px;
   letter-spacing: -0.44px;
+
+  @media (max-width: $lp-breakpoint) {
+    display: none;
+  }
 }
 .processes-info {
   width: 100%;
   margin-right: 16px;
   height: calc(100vh - 145px);
   padding-left: 32px;
+  
+  @media (max-width: $lp-breakpoint) {
+    padding-left: 0;
+  }
 }
 </style>
diff --git a/resources/js/processes-catalogue/components/menuCatologue.vue b/resources/js/processes-catalogue/components/menuCatologue.vue
index 83a4aec20f..103bafa69f 100644
--- a/resources/js/processes-catalogue/components/menuCatologue.vue
+++ b/resources/js/processes-catalogue/components/menuCatologue.vue
@@ -3,6 +3,7 @@
     <SearchCategories
       ref="searchCategory"
       :filter-pmql="onFilter"
+      class="hide-on-mobile"
     />
     <div
       v-b-toggle.category-menu
@@ -48,6 +49,7 @@
         </p>
       </b-list-group>
     </b-collapse>
+    <div class="hide-on-mobile">
     <hr class="my-12">
     <div
       v-b-toggle.collapse-3
@@ -74,6 +76,7 @@
     <b-collapse
       id="collapse-3"
       visible
+      class="hide-on-mobile"
     >
       <b-list-group>
         <b-list-group-item
@@ -88,6 +91,7 @@
         </b-list-group-item>
       </b-list-group>
     </b-collapse>
+    </div>
 
     <select-template-modal
       ref="addProcessModal"
@@ -168,6 +172,14 @@ export default {
       this.selectDefault();
     }
   },
+  watch: {
+    selectedProcessItem: {
+      deep: true,
+      handler: function () {
+        this.$emit('selectedCategoryName', this.selectedProcessItem?.name);
+      },
+    }
+  },
   methods: {
     /**
      * Adding categories
@@ -256,6 +268,7 @@ export default {
 
 <style lang="scss" scoped>
 @import url("../../../sass/_scrollbar.scss");
+@import "~styles/variables";
 i {
   font-size: 20px;
   color: #6a7888;
@@ -313,4 +326,10 @@ i {
   padding: 12px 18px;
   gap: 16px;
 }
+
+.hide-on-mobile {
+  @media (max-width: $lp-breakpoint) {
+    display: none;
+  }
+}
 </style>
diff --git a/resources/js/processes-catalogue/components/utils/Card.vue b/resources/js/processes-catalogue/components/utils/Card.vue
index bd6731d64a..8afd51b6f0 100644
--- a/resources/js/processes-catalogue/components/utils/Card.vue
+++ b/resources/js/processes-catalogue/components/utils/Card.vue
@@ -4,15 +4,6 @@
     class="card-process"
   >
     <b-card-text>
-      <div class="card-bookmark">
-        <i
-          :ref="`bookmark-${process.id}`"
-          v-b-tooltip.hover.bottom
-          :title="$t(labelTooltip)"
-          :class="bookmarkIcon()"
-          @click="checkBookmark(process)"
-        />
-      </div>
       <div
         class="card-info"
         @click="openInfo(process)"
@@ -37,6 +28,15 @@
           variant="custom"
         />
       </div>
+      <div class="card-bookmark">
+        <i
+          :ref="`bookmark-${process.id}`"
+          v-b-tooltip.hover.bottom
+          :title="$t(labelTooltip)"
+          :class="bookmarkIcon()"
+          @click="checkBookmark(process)"
+        />
+      </div>
     </b-card-text>
   </b-card>
 </template>
@@ -101,7 +101,10 @@ export default {
 };
 </script>
 
-<style scoped>
+<style scoped lang="scss">
+
+@import '~styles/variables';
+
 .card-process {
   max-width: 343px;
   min-width: 296px;
@@ -111,6 +114,14 @@ export default {
   margin-right: 1rem;
   border-radius: 16px;
   background-image: url("/img/launchpad-images/process_background.svg");
+
+  @media (max-width: $lp-breakpoint) {
+    width: 100%;
+    max-width: none;
+    min-width: none;
+    border-radius: 8px;
+    height: 150px;
+  }
 }
 .card-process:hover {
   box-shadow: 0px 3px 16px 2px #acbdcf75;
@@ -119,6 +130,10 @@ export default {
   padding: 32px;
   height: 100%;
   width: 100%;
+
+  @media (max-width: $lp-breakpoint) {
+    padding: 16px;
+  }
 }
 .card-img {
   border-radius: 16px;
@@ -132,19 +147,37 @@ export default {
 }
 .card-text {
   height: 100%;
+  display: flex;
+  width: 100%;
+  
+  @media (max-width: $lp-breakpoint) {
+    align-items: center;
+  }
 }
 .card-info {
   cursor: pointer;
   height: 100%;
+  flex: 1;
   display: flex;
   flex-direction: column;
   align-items: baseline;
   justify-content: flex-end;
+
+  @media (max-width: $lp-breakpoint) {
+    flex-direction: row;
+    align-items: center;
+    justify-content: normal;
+  }
 }
 .icon-process {
   width: 48px;
   height: 48px;
   margin-bottom: 16px;
+
+  @media (max-width: $lp-breakpoint) {
+    margin-bottom: 0;
+    margin-right: 10px;
+  }
 }
 .marked {
   color: #f5bC00;
diff --git a/resources/sass/_variables.scss b/resources/sass/_variables.scss
index daf3e789fb..140d115001 100644
--- a/resources/sass/_variables.scss
+++ b/resources/sass/_variables.scss
@@ -140,3 +140,6 @@ $alertZIndex: 1051;
 $darkneutral: #42526E;
 $dangerlight: #FFEBE9;
 $successlight: #E6FFEB;
+
+// Launchpad Mobile Breakpoint
+$lp-breakpoint: 650px;
\ No newline at end of file
diff --git a/resources/views/layouts/navbarMobile.blade.php b/resources/views/layouts/navbarMobile.blade.php
index 96a56a88ea..54dc3eff4b 100644
--- a/resources/views/layouts/navbarMobile.blade.php
+++ b/resources/views/layouts/navbarMobile.blade.php
@@ -1,7 +1,7 @@
 @php
   $showPrincipalNavbar = 1;
 
-  if (Request::path() !== 'tasks' && Request::path() !== 'requests') {
+  if (Request::path() !== 'tasks' && Request::path() !== 'requests' && Request::path() !== 'process-browser') {
     $showPrincipalNavbar = 0;
   }
 @endphp
@@ -67,6 +67,11 @@ class="dropdown-item"
             'url' => route('requests.index'),
             'isActive' => Request::path() === 'requests',
           ],
+          [
+            'name' => __('Processes'),
+            'url' => route('process.browser.index'),
+            'isActive' => Request::path() === 'process-browser',
+          ],
         ];
       @endphp
       <!-- Nav tabs -->
diff --git a/resources/views/processes-catalogue/mobile.blade.php b/resources/views/processes-catalogue/mobile.blade.php
new file mode 100644
index 0000000000..c7a188f705
--- /dev/null
+++ b/resources/views/processes-catalogue/mobile.blade.php
@@ -0,0 +1,30 @@
+@extends('layouts.mobile')
+@section('title')
+{{__($title)}}
+@endsection
+@section('content_mobile')
+  <div class="px-3 page-content mb-0" id="processes-catalogue">
+    <processes-catalogue
+      :process="{{$process ?? 0}}"
+      :current-user-id="{{ \Auth::user()->id }}"
+      :permission="{{ \Auth::user()->hasPermissionsFor('processes', 'process-templates', 'pm-blocks', 'projects') }}"
+      :current-user="{{ \Auth::user() }}"
+      is-documenter-installed="{{\ProcessMaker\PackageHelper::isPmPackageProcessDocumenterInstalled()}}"
+    >
+    </processes-catalogue>
+  </div>
+@endsection
+
+@section('js')
+  @foreach($manager->getScripts() as $script)
+    <script src="{{$script}}"></script>
+  @endforeach
+  <script src="{{mix('js/processes-catalogue/index.js')}}"></script>
+  <script>
+    window.Processmaker.user = @json($currentUser);
+  </script>
+@endsection
+
+@section('css')
+
+@endsection
diff --git a/webpack.mix.js b/webpack.mix.js
index 811935b1a2..b9343235ac 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -22,6 +22,7 @@ mix.webpackConfig({
     symlinks: false,
     alias: {
       "vue-monaco": path.resolve(__dirname, "resources/js/vue-monaco-amd.js"),
+      "styles": path.resolve(__dirname, "resources/sass"),
     },
   },
 });

From aeb79b6440e95a924d6874a2759af0b416559a44 Mon Sep 17 00:00:00 2001
From: Nolan Ehrstrom <github@nolanpro.com>
Date: Tue, 28 May 2024 16:05:36 -0700
Subject: [PATCH 2/4] Add recent cases and active case count

---
 .../Api/ProcessLaunchpadController.php        | 12 +++---
 ProcessMaker/Models/Process.php               | 39 ++++++++++++++---
 .../components/ProcessesCatalogue.vue         | 43 ++++++++++++++++---
 .../components/utils/Card.vue                 | 23 +++++++++-
 resources/lang/en.json                        |  3 +-
 5 files changed, 99 insertions(+), 21 deletions(-)

diff --git a/ProcessMaker/Http/Controllers/Api/ProcessLaunchpadController.php b/ProcessMaker/Http/Controllers/Api/ProcessLaunchpadController.php
index a25e7452e6..6346f0486f 100644
--- a/ProcessMaker/Http/Controllers/Api/ProcessLaunchpadController.php
+++ b/ProcessMaker/Http/Controllers/Api/ProcessLaunchpadController.php
@@ -24,7 +24,9 @@ public function getProcesses(Request $request)
         $processes = Process::nonSystem()->active();
         // Filter by category
         $category = $request->input('category', null);
-        if (!empty($category)) {
+        if ($category === 'recent') {
+            $processes->orderByRecentRequests();
+        } elseif (!empty($category)) {
             $processes->processCategory($category);
         }
         // Filter pmql
@@ -44,6 +46,7 @@ public function getProcesses(Request $request)
         // Get the processes
         $processes = $processes
             ->select('processes.*')
+            ->withRequestCount()
             ->orderBy('processes.name', 'asc')
             ->paginate($perPage);
 
@@ -120,9 +123,9 @@ public function destroy(ProcessLaunchpad $launch)
         return response([], 204);
     }
 
-   /**
-    * Store the elements related to the carousel [IMAGE, EMBED URL]
-    */
+    /**
+     * Store the elements related to the carousel [IMAGE, EMBED URL]
+     */
     public function saveContentCarousel(Request $request, Process $process)
     {
         $contentCarousel = $request->input('imagesCarousel');
@@ -144,7 +147,6 @@ public function saveContentCarousel(Request $request, Process $process)
                         // Nothing
                         break;
                 }
-
             }
         }
     }
diff --git a/ProcessMaker/Models/Process.php b/ProcessMaker/Models/Process.php
index efa6d91c04..a4769090d3 100644
--- a/ProcessMaker/Models/Process.php
+++ b/ProcessMaker/Models/Process.php
@@ -1175,7 +1175,7 @@ public function manageCustomRoutes()
                                         'params' => $webentryRouteConfig->parameters,
                                     ]
                                 );
-                            } catch (\Exception $e) {
+                            } catch (Exception $e) {
                                 \Log::info('*** Error: ' . $e->getMessage());
                             }
                         }
@@ -1250,7 +1250,7 @@ private function getStartEventPermissions(User $user)
     /**
      * Process events relationship.
      *
-     * @return \ProcessMaker\Models\ProcessEvents
+     * @return ProcessEvents
      */
     public function events()
     {
@@ -1287,7 +1287,7 @@ public function launchpad()
     /**
      * Assignments of the process.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     * @return HasMany
      */
     public function assignments()
     {
@@ -1616,7 +1616,7 @@ private function validateSchema(BpmnDocument $document)
     private function deleteUnusedCustomRoutes($url, $processId, $nodeId)
     {
         // Delete unused custom routes
-        $customRoute = webentryRoute::where('process_id', $processId)->where('node_id', $nodeId)->first();
+        $customRoute = WebentryRoute::where('process_id', $processId)->where('node_id', $nodeId)->first();
         if ($customRoute) {
             $customRoute->delete();
         }
@@ -1751,9 +1751,9 @@ public function scopeFilter($query, $filterStr)
                  ->orWhere('processes.description', 'like', $filter)
                  ->orWhere('processes.status', '=', $filterStr)
                  ->orWhereHas('user', function ($query) use ($filter) {
-                    $query->where('firstname', 'like', $filter)
-                        ->orWhere('lastname', 'like', $filter);
-                })
+                     $query->where('firstname', 'like', $filter)
+                         ->orWhere('lastname', 'like', $filter);
+                 })
                  ->orWhereIn('processes.id', function ($qry) use ($filter) {
                      $qry->select('assignable_id')
                          ->from('category_assignments')
@@ -1797,4 +1797,29 @@ public function hasAlternative()
     {
         return true;
     }
+
+    public function scopeOrderByRecentRequests($query)
+    {
+        return $query->orderByDesc(
+            ProcessRequest::select('id')
+                // User has participated
+                ->whereHas('tokens', function ($q) {
+                    $q->where('user_id', Auth::user()->id);
+                })
+                ->whereColumn('process_id', 'processes.id')
+                ->orderByDesc('id') // using ID because created_at is not indexed
+                ->limit(1)
+        );
+    }
+
+    public function scopeWithRequestCount($query)
+    {
+        return $query->withCount(['requests' => function ($query) {
+            return $query->where('status', 'ACTIVE')
+                // User has participated
+                ->whereHas('tokens', function ($q) {
+                    $q->where('user_id', Auth::user()->id);
+                });
+        }]);
+    }
 }
diff --git a/resources/js/processes-catalogue/components/ProcessesCatalogue.vue b/resources/js/processes-catalogue/components/ProcessesCatalogue.vue
index 275300c8c8..fff9a48e08 100644
--- a/resources/js/processes-catalogue/components/ProcessesCatalogue.vue
+++ b/resources/js/processes-catalogue/components/ProcessesCatalogue.vue
@@ -35,8 +35,10 @@
           </div>
         </div>
       </div>
-      <div class="slide-control">
-        <a href="#" @click="showMenu = !showMenu">M</a>
+      <div class="slide-control" :class="{ 'slide-control-open' : showMenu }">
+        <a href="#" @click="showMenu = !showMenu">
+          <i class="fa" :class="{ 'fa-caret-right' : !showMenu, 'fa-caret-left' : showMenu }"></i>
+        </a>
       </div>
       <div class="processes-info">
         <div
@@ -108,15 +110,17 @@ export default {
       isMobile: window.screen.width < 650,
       listCategories: [],
       defaultOptions: [
+        {
+          id: 'recent',
+          name: this.$t("Recent Cases"),
+        },
         {
           id: -1,
           name: this.$t("All Processes"),
-          status: "ACTIVE",
         },
         {
           id: 0,
           name: this.$t("My Bookmarks"),
-          status: "ACTIVE",
         },
       ],
       fields: [],
@@ -369,7 +373,6 @@ export default {
     display: flex;
     .container-2 {
       background-color: #F7F9FB;
-      border-right: 2px solid rgba(0, 0, 0, 0.1);
       flex: 0 0 315px;
     }
 
@@ -386,12 +389,38 @@ export default {
 }
 .slide-control {
   flex: 0 0 10px;
-  border-right: 1px solid rgba(0, 0, 0, 0.1);
-  background-color: pink;
+  border-left: 0;
+  border-right: 1px solid #DEE0E1;
   
   @media (max-width: $lp-breakpoint) {
     display: none;
   }
+
+  a {
+    position: relative;
+    left: 6px;
+    top: 40px;
+    z-index: 5;
+
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 12px;
+    height: 40px;
+    background-color: #ffffff;
+    border-radius: 6px;
+    border: 1px solid #DEE0E1;
+  }
+}
+
+.slide-control-open {
+  border-right: 0;
+  border-left: 1px solid #DEE0E1;
+
+  a {
+    left: -6px;
+  }
+  
 }
 
 .mobile-menu-control {
diff --git a/resources/js/processes-catalogue/components/utils/Card.vue b/resources/js/processes-catalogue/components/utils/Card.vue
index 8afd51b6f0..31fc32815b 100644
--- a/resources/js/processes-catalogue/components/utils/Card.vue
+++ b/resources/js/processes-catalogue/components/utils/Card.vue
@@ -28,6 +28,9 @@
           variant="custom"
         />
       </div>
+      <div class="requests-count" v-if="process.requests_count">
+        {{ process.requests_count }}
+      </div>
       <div class="card-bookmark">
         <i
           :ref="`bookmark-${process.id}`"
@@ -120,7 +123,7 @@ export default {
     max-width: none;
     min-width: none;
     border-radius: 8px;
-    height: 150px;
+    height: 100px;
   }
 }
 .card-process:hover {
@@ -138,6 +141,24 @@ export default {
 .card-img {
   border-radius: 16px;
 }
+.requests-count {
+  display: none;
+  float: right;
+  font-size: 14px;
+  font-weight: bold;
+  background-color: #F9E7C3;
+  margin-right: 8px;
+  
+  border-radius: 50%;
+  width: 30px;
+  height: 30px;
+  justify-content: center;
+  align-items: center;
+
+  @media (max-width: $lp-breakpoint) {
+    display: flex;
+  }
+}
 .card-bookmark {
   float: right;
   font-size: 24px;
diff --git a/resources/lang/en.json b/resources/lang/en.json
index 0c29908269..ac7e6ba2bd 100644
--- a/resources/lang/en.json
+++ b/resources/lang/en.json
@@ -2259,5 +2259,6 @@
   "Your In-Progress tasks in the saved search {{title}}": "Your In-Progress tasks in the saved search {{title}}",
   "Choose a saved search to see the tasks that you can use with an Inbox Rule.": "Choose a saved search to see the tasks that you can use with an Inbox Rule.",
   "No tasks to show.": "No tasks to show.",
-  "But that's OK. You can still create this this Inbox Rule to apply to future tasks that match the above filters.": "But that's OK. You can still create this this Inbox Rule to apply to future tasks that match the above filters."
+  "But that's OK. You can still create this this Inbox Rule to apply to future tasks that match the above filters.": "But that's OK. You can still create this this Inbox Rule to apply to future tasks that match the above filters.",
+  "Recent Cases": "Recent Cases"
 }

From e96a71c9ad0b0db0a5ebd6fab7a629ea2f7ac15c Mon Sep 17 00:00:00 2001
From: Nolan Ehrstrom <github@nolanpro.com>
Date: Wed, 29 May 2024 14:45:31 -0700
Subject: [PATCH 3/4] Update slide out menus

---
 .../components/ProcessesCatalogue.vue         | 145 ++++++++++--------
 .../components/menuCatologue.vue              |   2 -
 2 files changed, 82 insertions(+), 65 deletions(-)

diff --git a/resources/js/processes-catalogue/components/ProcessesCatalogue.vue b/resources/js/processes-catalogue/components/ProcessesCatalogue.vue
index fff9a48e08..ab5c6c7a2c 100644
--- a/resources/js/processes-catalogue/components/ProcessesCatalogue.vue
+++ b/resources/js/processes-catalogue/components/ProcessesCatalogue.vue
@@ -6,36 +6,33 @@
       :process="selectedProcess ? selectedProcess.name : ''"
       :template="guidedTemplates ? 'Guided Templates' : ''"
     />
-    <div class="main">
-      <div class="menu" :class="{ 'menu-open' : showMenu }">
-        <div class="container-1">
-          <div class="container-2">
-            <span class="pl-3 menu-title"> {{ $t('Process Browser') }} </span>
-            <MenuCatologue
-              ref="categoryList"
-              title="Available Processes"
-              preicon="fas fa-play-circle"
-              class="mt-3"
-              show-bookmark="true"
-              :category-count="categoryCount"
-              :data="listCategories"
-              :from-process-list="fromProcessList"
-              :select="selectCategorie"
-              :filter-categories="filterCategories"
-              :permission="permission"
-              @wizardLinkSelect="wizardTemplatesSelected"
-              @addCategories="addCategories"
-              @selectedCategoryName="selectedCategoryName = $event"
-            />
-          </div>
-          <div class="mobile-slide-close" v-if="showMenu">
-            <b-button variant="secondary" @click="showMenu = false">
-              <i class="fa fa-times"></i>
-            </b-button>
-          </div>
+    <div class="menu-mask" :class="{ 'menu-open' : showMenu }"></div>
+    <div class="main" :class="{ 'menu-open' : showMenu }">
+      <div class="menu">
+        <span class="pl-3 menu-title"> {{ $t('Process Browser') }} </span>
+        <MenuCatologue
+          ref="categoryList"
+          title="Available Processes"
+          preicon="fas fa-play-circle"
+          class="pt-3 menu-catalog"
+          show-bookmark="true"
+          :category-count="categoryCount"
+          :data="listCategories"
+          :from-process-list="fromProcessList"
+          :select="selectCategorie"
+          :filter-categories="filterCategories"
+          :permission="permission"
+          @wizardLinkSelect="wizardTemplatesSelected"
+          @addCategories="addCategories"
+          @selectedCategoryName="selectedCategoryName = $event"
+        />
+        <div class="mobile-slide-close">
+          <b-button variant="light" @click="showMenu = false" size="lg">
+            <i class="fa fa-times"></i>
+          </b-button>
         </div>
       </div>
-      <div class="slide-control" :class="{ 'slide-control-open' : showMenu }">
+      <div class="slide-control">
         <a href="#" @click="showMenu = !showMenu">
           <i class="fa" :class="{ 'fa-caret-right' : !showMenu, 'fa-caret-left' : showMenu }"></i>
         </a>
@@ -354,43 +351,72 @@ export default {
 }
 
 .menu {
-  width: 0px;
-  flex: 0 0 0px;
+  left: -100%;
   height: calc(100vh - 145px);
   overflow: hidden;
   margin-top: 15px;
-  transition: width 0.2s, flex 0.2s;
+  transition: flex 0.3s;
+  flex: 0 0 315px;
+
+  .menu-catalog {
+    background-color: #F7F9FB;
+    flex: 1;
+    width: 315px;
+  }
 
   @media (max-width: $lp-breakpoint) {
     position: absolute;
     z-index: 4; // above pagination
     display: flex;
     margin-top: 0;
+    width: 85%;
+    transition: left 0.3s;
   }
+}
+
+.menu-mask {
+  display: none;
+  position: absolute;
+  left: -100%;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0, 0, 0, 0);
+  z-index: 3;
+  transition: background-color 0.3s;
   
-  .container-1 {
-    // width: 315px;
-    display: flex;
-    .container-2 {
-      background-color: #F7F9FB;
-      flex: 0 0 315px;
-    }
+  @media (max-width: $lp-breakpoint) {
+    display: block;
+  }
+}
 
-    .mobile-slide-close {
-      display: none;
-      padding-left: 10px;
-      padding-top: 10px;
-      @media (max-width: $lp-breakpoint) {
-        display: block;
-      }
-    }
-      
+.menu-mask.menu-open {
+  @media (max-width: $lp-breakpoint) {
+    left: 0;
+    background-color: rgba(0, 0, 0, 0.5);
+    display: block;
   }
 }
+
+.menu-open .menu {
+  flex: 0 0 0px;
+  @media (max-width: $lp-breakpoint) {
+    left: 0%;
+  }
+}
+
+.mobile-slide-close {
+  display: none;
+  padding-left: 10px;
+  padding-top: 10px;
+  @media (max-width: $lp-breakpoint) {
+    display: block;
+  }
+}
+
 .slide-control {
-  flex: 0 0 10px;
   border-left: 0;
   border-right: 1px solid #DEE0E1;
+  margin-left: 10px;
   
   @media (max-width: $lp-breakpoint) {
     display: none;
@@ -398,27 +424,27 @@ export default {
 
   a {
     position: relative;
-    left: 6px;
+    left: 10px;
     top: 40px;
     z-index: 5;
 
     display: flex;
     align-items: center;
     justify-content: center;
-    width: 12px;
-    height: 40px;
+    width: 20px;
+    height: 60px;
     background-color: #ffffff;
-    border-radius: 6px;
+    border-radius: 10px;
     border: 1px solid #DEE0E1;
   }
 }
 
-.slide-control-open {
+.menu-open .slide-control {
   border-right: 0;
   border-left: 1px solid #DEE0E1;
 
   a {
-    left: -6px;
+    left: -10px;
   }
   
 }
@@ -436,15 +462,6 @@ export default {
   }
 }
 
-.menu-open {
-  width: 315px;
-  flex: 0 0 315px;
-
-  @media (max-width: $lp-breakpoint) {
-    width: 365px;
-    flex: 0 0 365px;
-  }
-}
 .menu-title {
   color: #556271;
   font-size: 22px;
@@ -452,6 +469,8 @@ export default {
   font-weight: 600;
   line-height: 46.08px;
   letter-spacing: -0.44px;
+  display: block;
+  width: 315px;
 
   @media (max-width: $lp-breakpoint) {
     display: none;
diff --git a/resources/js/processes-catalogue/components/menuCatologue.vue b/resources/js/processes-catalogue/components/menuCatologue.vue
index 103bafa69f..12042c38f2 100644
--- a/resources/js/processes-catalogue/components/menuCatologue.vue
+++ b/resources/js/processes-catalogue/components/menuCatologue.vue
@@ -274,8 +274,6 @@ i {
   color: #6a7888;
 }
 #category-menu > .list-group {
-  max-height: 37vh;
-  min-height: 37vh;
   overflow-y: auto;
 }
 .list-group-item {

From f32f94e900cb6c8827c094716434ecfe696ec17d Mon Sep 17 00:00:00 2001
From: Nolan Ehrstrom <github@nolanpro.com>
Date: Fri, 31 May 2024 10:50:22 -0700
Subject: [PATCH 4/4] Fix sonar qube

---
 ProcessMaker/Models/Process.php | 39 +++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/ProcessMaker/Models/Process.php b/ProcessMaker/Models/Process.php
index a4769090d3..111b637904 100644
--- a/ProcessMaker/Models/Process.php
+++ b/ProcessMaker/Models/Process.php
@@ -1162,29 +1162,34 @@ public function manageCustomRoutes()
                         break;
 
                     default:
-                        if ($webEntryProperties->webentryRouteConfig->firstUrlSegment !== '') {
-                            $webentryRouteConfig = $webEntryProperties->webentryRouteConfig;
-                            try {
-                                WebentryRoute::updateOrCreate(
-                                    [
-                                        'process_id' => $this->id,
-                                        'node_id' => $webentryRouteConfig->nodeId,
-                                    ],
-                                    [
-                                        'first_segment' => $webentryRouteConfig->firstUrlSegment,
-                                        'params' => $webentryRouteConfig->parameters,
-                                    ]
-                                );
-                            } catch (Exception $e) {
-                                \Log::info('*** Error: ' . $e->getMessage());
-                            }
-                        }
+                        $this->manageWebentryRoute($webEntryProperties);
                         break;
                 }
             }
         }
     }
 
+    private function manageWebentryRoute($webEntryProperties)
+    {
+        if ($webEntryProperties->webentryRouteConfig->firstUrlSegment !== '') {
+            $webentryRouteConfig = $webEntryProperties->webentryRouteConfig;
+            try {
+                WebentryRoute::updateOrCreate(
+                    [
+                        'process_id' => $this->id,
+                        'node_id' => $webentryRouteConfig->nodeId,
+                    ],
+                    [
+                        'first_segment' => $webentryRouteConfig->firstUrlSegment,
+                        'params' => $webentryRouteConfig->parameters,
+                    ]
+                );
+            } catch (Exception $e) {
+                \Log::info('*** Error: ' . $e->getMessage());
+            }
+        }
+    }
+
     /**
      * Get node element attributes
      *