From e504b7f096d15f037798044554d551b5b81acc58 Mon Sep 17 00:00:00 2001
From: Mark Russ <mark@hatfieldmedia.com>
Date: Thu, 25 Jul 2024 14:44:51 -0400
Subject: [PATCH 1/2] Added pagination for nested modules.

---
 .../table/nested/NestedDatatable.vue          | 40 +++++++++++++++++++
 .../js/components/table/nested/NestedList.vue |  4 ++
 src/Repositories/ModuleRepository.php         |  5 +++
 3 files changed, 49 insertions(+)

diff --git a/frontend/js/components/table/nested/NestedDatatable.vue b/frontend/js/components/table/nested/NestedDatatable.vue
index dce4a3ccf..6b6a53b46 100644
--- a/frontend/js/components/table/nested/NestedDatatable.vue
+++ b/frontend/js/components/table/nested/NestedDatatable.vue
@@ -19,6 +19,11 @@
           :maxDepth="maxDepth"
           :draggable="draggable"
         />
+      
+        <a17-paginate v-if="maxPage > 1 || initialMaxPage > maxPage && !isEmpty" :max="maxPage" :value="page"
+          :offset="offset" :availableOffsets="[initialOffset,initialOffset*3,initialOffset*6]"
+          @changePage="updatePage" @changeOffset="updateOffset"
+        />
       </div>
     </div>
   </div>
@@ -27,9 +32,12 @@
 <script>
   import { DatatableMixin, DraggableMixin, NestedDraggableMixin } from '@/mixins/index'
   import { DATATABLE } from '@/store/mutations/index'
+  import ACTIONS from '@/store/actions'
+  import { mapState } from 'vuex'
 
   import a17Table from './../Table.vue'
   import a17Tablehead from './../TableHead.vue'
+  import a17Paginate from './../Paginate.vue'
   import NestedList from './NestedList'
 
   export default {
@@ -43,8 +51,35 @@
     components: {
       'a17-table': a17Table,
       'a17-tablehead': a17Tablehead,
+      'a17-paginate': a17Paginate,
       'a17-nested-list': NestedList
     },
+    computed: {
+      ...mapState({
+        page: state => state.datatable.page,
+        offset: state => state.datatable.offset,
+        maxPage: state => state.datatable.maxPage,
+        initialOffset: state => state.datatable.defaultOffset,
+        initialMaxPage: state => state.datatable.defaultMaxPage
+      })
+    },
+    methods: {
+      updateOffset: function (value) {
+        this.$store.commit(DATATABLE.UPDATE_DATATABLE_PAGE, 1)
+        this.$store.commit(DATATABLE.UPDATE_DATATABLE_OFFSET, value)
+
+        // reload datas
+        this.$store.dispatch(ACTIONS.GET_DATATABLE)
+      },
+      updatePage: function (value) {
+        if (value !== this.page) {
+          this.$store.commit(DATATABLE.UPDATE_DATATABLE_PAGE, value)
+
+          // reload datas
+          this.$store.dispatch(ACTIONS.GET_DATATABLE)
+        }
+      }
+    },
     beforeMount: function () {
       function findBulkColumn (column) {
         return column.name === 'bulk'
@@ -93,5 +128,10 @@
   .nested-datatable__table {
     position: relative;
     width: 100%;
+
+    .paginate {
+      border: 1px solid #F2F2F2;
+      border-top: 0;
+    }
   }
 </style>
diff --git a/frontend/js/components/table/nested/NestedList.vue b/frontend/js/components/table/nested/NestedList.vue
index ed577da4f..6d4533faa 100644
--- a/frontend/js/components/table/nested/NestedList.vue
+++ b/frontend/js/components/table/nested/NestedList.vue
@@ -138,6 +138,10 @@
     // border:1px solid grey;
     padding: 15px 0px 15px 0px;
 
+    &:first-child {
+      padding-bottom: 0px;
+    }
+
     * {
       will-change: auto;
     }
diff --git a/src/Repositories/ModuleRepository.php b/src/Repositories/ModuleRepository.php
index 5ade539a3..c576fe9a5 100644
--- a/src/Repositories/ModuleRepository.php
+++ b/src/Repositories/ModuleRepository.php
@@ -26,6 +26,7 @@
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
+use Kalnoy\Nestedset\NodeTrait;
 use ReflectionClass;
 
 abstract class ModuleRepository
@@ -61,6 +62,10 @@ public function get(
         array $appliedFilters = []
     ): LengthAwarePaginator|Collection {
         $query = $this->model->with($with);
+        
+        if (in_array(NodeTrait::class, class_uses($this->model))) {
+            $query = $query->where('parent_id', NULL);
+        }
 
         $query = $this->filter($query, $scopes);
         $query = $this->order($query, $orders);

From 97d8a0128232bb834f1e2b7ae1772111f2932d60 Mon Sep 17 00:00:00 2001
From: Mark Russ <mark@hatfieldmedia.com>
Date: Fri, 26 Jul 2024 13:10:30 -0400
Subject: [PATCH 2/2] Added 'Everything' option to 'Rows per page' dropdown in
 paginator.

---
 frontend/js/components/table/Paginate.vue               | 9 ++++++++-
 frontend/js/components/table/nested/NestedDatatable.vue | 2 +-
 lang/en/lang.php                                        | 1 +
 src/Http/Controllers/Admin/ModuleController.php         | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/frontend/js/components/table/Paginate.vue b/frontend/js/components/table/Paginate.vue
index 2544490cb..62d87bdc9 100755
--- a/frontend/js/components/table/Paginate.vue
+++ b/frontend/js/components/table/Paginate.vue
@@ -4,9 +4,12 @@
         {{ $trans('listing.paginate.rows-per-page') }}
         <template v-if="availableOffsets.length > 1">
           <a17-dropdown ref="paginateDropdown" position="bottom-right">
-            <button @click="$refs.paginateDropdown.toggle()" class="paginate__button">{{ newOffset }}</button>
+            <button @click="$refs.paginateDropdown.toggle()" class="paginate__button">{{ newOffset !== -1 ? newOffset : $trans('listing.paginate.everything') }}</button>
             <div slot="dropdown__content">
               <button type="button" v-for="availableOffset in availableOffsets" :key="availableOffset" :class="{ 'dropdown__active' : availableOffset === newOffset }" @click="changeOffset(availableOffset)">{{ availableOffset }}</button>
+              <button type="button" v-if="isShowEverythingEnabled" :class="{ 'dropdown__active' : availableOffset === newOffset }" @click="changeOffset(-1)">
+                {{ $trans('listing.paginate.everything') }}
+              </button>
             </div>
           </a17-dropdown>
         </template>
@@ -34,6 +37,10 @@
         type: Number,
         default: 60
       },
+      isShowEverythingEnabled: {
+        type: Boolean,
+        default: false
+      },
       availableOffsets: {
         type: Array,
         default: function () { return [] }
diff --git a/frontend/js/components/table/nested/NestedDatatable.vue b/frontend/js/components/table/nested/NestedDatatable.vue
index 6b6a53b46..2b6cbf3e9 100644
--- a/frontend/js/components/table/nested/NestedDatatable.vue
+++ b/frontend/js/components/table/nested/NestedDatatable.vue
@@ -20,7 +20,7 @@
           :draggable="draggable"
         />
       
-        <a17-paginate v-if="maxPage > 1 || initialMaxPage > maxPage && !isEmpty" :max="maxPage" :value="page"
+        <a17-paginate v-if="maxPage > 1 || initialMaxPage > maxPage && !isEmpty" :max="maxPage" :value="page" :isShowEverythingEnabled="true"
           :offset="offset" :availableOffsets="[initialOffset,initialOffset*3,initialOffset*6]"
           @changePage="updatePage" @changeOffset="updateOffset"
         />
diff --git a/lang/en/lang.php b/lang/en/lang.php
index 9aa915e7a..a5b373e2d 100644
--- a/lang/en/lang.php
+++ b/lang/en/lang.php
@@ -209,6 +209,7 @@
         'listing-empty-message' => 'There is no item here yet.',
         'paginate' => [
             'rows-per-page' => 'Rows per page:',
+            'everything' => 'Everything',
         ],
         'bulk-selected-item' => 'item selected',
         'bulk-selected-items' => 'items selected',
diff --git a/src/Http/Controllers/Admin/ModuleController.php b/src/Http/Controllers/Admin/ModuleController.php
index a89e186d9..72c3cb183 100644
--- a/src/Http/Controllers/Admin/ModuleController.php
+++ b/src/Http/Controllers/Admin/ModuleController.php
@@ -1769,7 +1769,7 @@ protected function getIndexData(array $prependScope = []): array
                 'hiddenFilters' => $this->filters(),
                 'filterLinks' => $this->filterLinks ?? [],
                 'maxPage' => method_exists($items, 'lastPage') ? $items->lastPage() : 1,
-                'defaultMaxPage' => method_exists($items, 'total') ? ceil($items->total() / $this->perPage) : 1,
+                'defaultMaxPage' => ceil((method_exists($items, 'total') ? $items->total() : count($items)) / $this->perPage),
                 'offset' => method_exists($items, 'perPage') ? $items->perPage() : count($items),
                 'defaultOffset' => $this->perPage,
             ] + $this->getIndexUrls($this->moduleName, $this->routePrefix);