fix: pagination load more count and refactor

frappe · Feb 21, 2024 · ec583eb · ec583eb
1 parent d3ab2fe
commit ec583eb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 44 deletions.
diff --git a/desk/src/pages/tickets/TicketsAgent2.vue b/desk/src/pages/tickets/TicketsAgent2.vue
@@ -23,7 +23,7 @@
     <TicketsAgentList2
       :rows="rows"
       :columns="columns"
-      :page-length-count="pageLength"
+      :page-length="pageLength"
       :col-field-type="colFieldType"
       :options="{
         rowCount: rowCount,
@@ -65,6 +65,7 @@ let sorts = ref(storage.value.sorts);
 let sortsToApply = storage.value.sortsToApply;
 
 let pageLength = ref(20);
+let pageLengthCount = pageLength.value;
 
 const tickets = createResource({
   url: "helpdesk.api.doc.get_list_data",
@@ -110,27 +111,13 @@ const tickets = createResource({
 
 function updatePageLength(value) {
   if (value == "loadMore") {
-    tickets.update({
-      params: {
-        doctype: "HD Ticket",
-        filters: filtersToApply,
-        order_by: sortsToApply,
-        page_length: tickets.data.data.length + pageLength.value,
-      },
-    });
+    pageLengthCount = tickets.data.data.length + pageLength.value;
   } else {
     pageLength.value = value;
-    tickets.update({
-      params: {
-        doctype: "HD Ticket",
-        filters: filtersToApply,
-        order_by: sortsToApply,
-        page_length: pageLength.value,
-      },
-    });
+    pageLengthCount = value;
   }
 
-  tickets.reload();
+  apply();
 }
 
 function processFieldClick(event) {
@@ -148,15 +135,6 @@ function processFieldClick(event) {
   storage.value.filters = filters.value;
   storage.value.filtersToApply = filtersToApply;
 
-  tickets.update({
-    params: {
-      order_by: sortsToApply,
-      filters: filtersToApply,
-      page_length: pageLength.value,
-      doctype: "HD Ticket",
-    },
-  });
-
   apply();
 }
 
@@ -178,15 +156,6 @@ function processSorts(sortEvent) {
   storage.value.sorts = sorts.value;
   storage.value.sortsToApply = sortsToApply;
 
-  tickets.update({
-    params: {
-      order_by: sortsToApply,
-      filters: filtersToApply,
-      page_length: pageLength.value,
-      doctype: "HD Ticket",
-    },
-  });
-
   apply();
 }
 
@@ -224,19 +193,19 @@ function processFilters(filterEvent) {
   storage.value.filters = filters.value;
   storage.value.filtersToApply = filtersToApply;
 
+  apply();
+}
+
+function apply() {
   tickets.update({
     params: {
       order_by: sortsToApply,
       filters: filtersToApply,
-      page_length: pageLength.value,
+      page_length: pageLengthCount,
       doctype: "HD Ticket",
     },
   });
 
-  apply();
-}
-
-function apply() {
   tickets.reload();
 }
 

diff --git a/desk/src/pages/tickets/TicketsAgentList2.vue b/desk/src/pages/tickets/TicketsAgentList2.vue
@@ -105,7 +105,7 @@
     </ListRows>
   </ListView>
   <ListFooter
-    v-model="pageLengthCount"
+    v-model="pageLength"
     class="bottom-0 border-t bg-blue-50 px-5 py-2"
     :options="{ rowCount: options.rowCount, totalCount: options.totalCount }"
     @update:model-value="emit('update:pageLength', $event)"
@@ -157,7 +157,7 @@ const props = defineProps({
     type: Object,
     required: true,
   },
-  pageLengthCount: {
+  pageLength: {
     type: Number,
     required: true,
     default: 20,
@@ -171,7 +171,7 @@ const props = defineProps({
   },
 });
 
-let pageLengthCount = ref(props.pageLengthCount);
+let pageLength = ref(props.pageLength);
 let emit = defineEmits(["update:pageLength", "event:fieldClick"]);
 
 const slaStatusColorMap = {