feat: Pagination not updating after last item deletion (#66)

casbin · Aug 13, 2024 · 778df9d · 778df9d
1 parent 95331b8
commit 778df9d
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 8 deletions.
diff --git a/web/src/CertListPage.js b/web/src/CertListPage.js
@@ -64,6 +64,7 @@ class CertListPage extends BaseListPage {
           this.setState({
             data: Setting.prependRow(this.state.data, newCert),
           });
+          this.fetch();
         }
       }
       )
@@ -79,8 +80,11 @@ class CertListPage extends BaseListPage {
           Setting.showMessage("error", `Failed to delete: ${res.msg}`);
         } else {
           Setting.showMessage("success", "Cert deleted successfully");
-          this.setState({
-            data: Setting.deleteRow(this.state.data, i),
+          this.fetch({
+            pagination: {
+              ...this.state.pagination,
+              current: this.state.pagination.current > 1 && this.state.data.length === 1 ? this.state.pagination.current - 1 : this.state.pagination.current,
+            },
           });
         }
       }

diff --git a/web/src/RecordListPage.js b/web/src/RecordListPage.js
@@ -98,8 +98,11 @@ class RecordListPage extends BaseListPage {
           Setting.showMessage("error", `Failed to delete: ${res.msg}`);
         } else {
           Setting.showMessage("success", "Record deleted successfully");
-          this.setState({
-            data: Setting.deleteRow(this.state.data, i),
+          this.fetch({
+            pagination: {
+              ...this.state.pagination,
+              current: this.state.pagination.current > 1 && this.state.data.length === 1 ? this.state.pagination.current - 1 : this.state.pagination.current,
+            },
           });
         }
       }

diff --git a/web/src/RuleListPage.js b/web/src/RuleListPage.js
@@ -68,6 +68,7 @@ class RuleListPage extends BaseListPage {
         this.setState({
           data: Setting.prependRow(this.state.data, newRule),
         });
+        this.fetch();
       }
     });
   }
@@ -78,8 +79,11 @@ class RuleListPage extends BaseListPage {
         Setting.showMessage("error", `Failed to delete: ${res.msg}`);
       } else {
         Setting.showMessage("success", "Deleted successfully");
-        this.setState({
-          data: Setting.deleteRow(this.state.data, i),
+        this.fetch({
+          pagination: {
+            ...this.state.pagination,
+            current: this.state.pagination.current > 1 && this.state.data.length === 1 ? this.state.pagination.current - 1 : this.state.pagination.current,
+          },
         });
       }
     });

diff --git a/web/src/SiteListPage.js b/web/src/SiteListPage.js
@@ -85,8 +85,11 @@ class SiteListPage extends BaseListPage {
           Setting.showMessage("error", `Failed to delete: ${res.msg}`);
         } else {
           Setting.showMessage("success", "Site deleted successfully");
-          this.setState({
-            data: Setting.deleteRow(this.state.data, i),
+          this.fetch({
+            pagination: {
+              ...this.state.pagination,
+              current: this.state.pagination.current > 1 && this.state.data.length === 1 ? this.state.pagination.current - 1 : this.state.pagination.current,
+            },
           });
         }
       }