Merge pull request #8896 from ProcessMaker/bugfix/FOUR-26363

FOUR-26363 | +Case Pagination Is Not Working Correctly

Author: nolanpro

resources/js/components/requests/requestModal.vue

@@ -8,6 +8,7 @@
       hide-footer
       :title="$t('New Case')"
       :size="size"
+      @hidden="hideModal"
     >
       <progress-loader
         ref="progressLoader"
@@ -171,10 +172,21 @@ export default {
     },
     showModal() {
       this.loaded = true;
-      // Perform initial load of requests from backend
       this.$refs.requestModalAdd.show();
       this.fetch();
     },
+    hideModal() {
+      this.loaded = false;
+      this.filter = "";
+      this.error = false;
+      this.processes = {};
+      this.page = 1;
+      this.perPage = 15;
+      const pagination = this.$refs.listProcess;
+      if (pagination && String(pagination.perPage) !== "15") {
+        pagination.perPage = "15";
+      }
+    },
     // Overwrite handler to change the page based on events fired
     onPageChange: function onPageChange(page) {
       if (page === "next") {
@@ -192,6 +204,19 @@ export default {
       }
       this.fetch();
     },
+    changePerPage(value) {
+      const perPage = Number(value);
+      this.perPage = perPage;
+      const pagination = this.$refs.listProcess ? this.$refs.listProcess.tablePagination : null;
+      const total = pagination && pagination.total ? pagination.total : 0;
+      if (total > 0 && this.page * perPage > total) {
+        this.page = Math.ceil(total / perPage);
+      }
+      if (this.page <= 0) {
+        this.page = 1;
+      }
+      this.fetch();
+    },
     fetch() {
       if (!this.loaded) {
         return;