Improve page URL fetching

gilbitron · Nov 15, 2023 · 6c12ea3 · 6c12ea3
1 parent edcf95a
commit 6c12ea3
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 16 deletions.
diff --git a/src/RenderlessPagination.vue b/src/RenderlessPagination.vue
@@ -27,9 +27,12 @@ export default {
                 : this.data.current_page ?? null;
         },
         firstPageUrl() {
-            return this.isApiResource
-                ? this.data.links.first
-                : this.data.first_page_url ?? null;
+            return (
+                this.data.first_page_url ??
+                this.data.meta?.first_page_url ??
+                this.data.links?.first ??
+                null
+            );
         },
         from() {
             return this.isApiResource
@@ -42,24 +45,33 @@ export default {
                 : this.data.last_page ?? null;
         },
         lastPageUrl() {
-            return this.isApiResource
-                ? this.data.links.last
-                : this.data.last_page_url ?? null;
+            return (
+                this.data.last_page_url ??
+                this.data.meta?.last_page_url ??
+                this.data.links?.last ??
+                null
+            );
         },
         nextPageUrl() {
-            return this.isApiResource
-                ? this.data.links.next
-                : this.data.next_page_url ?? null;
+            return (
+                this.data.next_page_url ??
+                this.data.meta?.next_page_url ??
+                this.data.links?.next ??
+                null
+            );
         },
         perPage() {
             return this.isApiResource
                 ? this.data.meta.per_page
                 : this.data.per_page ?? null;
         },
         prevPageUrl() {
-            return this.isApiResource
-                ? this.data.links.prev
-                : this.data.prev_page_url ?? null;
+            return (
+                this.data.prev_page_url ??
+                this.data.meta?.prev_page_url ??
+                this.data.links?.prev ??
+                null
+            );
         },
         to() {
             return this.isApiResource

diff --git a/tests/unit/RenderlessPagination.spec.mjs b/tests/unit/RenderlessPagination.spec.mjs
@@ -216,13 +216,15 @@ test('parses paginate data', function () {
 
     expect(wrapper.vm.isApiResource).toEqual(true);
     expect(wrapper.vm.currentPage).toEqual(dataPaginateData.meta.current_page);
-    expect(wrapper.vm.firstPageUrl).toEqual(dataPaginateData.links.first);
+    expect(wrapper.vm.firstPageUrl).toEqual(
+        dataPaginateData.meta.first_page_url
+    );
     expect(wrapper.vm.from).toEqual(dataPaginateData.meta.from);
     expect(wrapper.vm.lastPage).toEqual(dataPaginateData.meta.last_page);
-    expect(wrapper.vm.lastPageUrl).toEqual(dataPaginateData.links.last);
-    expect(wrapper.vm.nextPageUrl).toEqual(dataPaginateData.links.next);
+    expect(wrapper.vm.lastPageUrl).toEqual(dataPaginateData.meta.last_page_url);
+    expect(wrapper.vm.nextPageUrl).toEqual(dataPaginateData.meta.next_page_url);
     expect(wrapper.vm.perPage).toEqual(dataPaginateData.meta.per_page);
-    expect(wrapper.vm.prevPageUrl).toEqual(dataPaginateData.links.prev);
+    expect(wrapper.vm.prevPageUrl).toEqual(dataPaginateData.meta.prev_page_url);
     expect(wrapper.vm.to).toEqual(dataPaginateData.meta.to);
     expect(wrapper.vm.total).toEqual(dataPaginateData.meta.total);
     expect(wrapper.vm.pageRange).toEqual(10);