From b40528766bdc9d19b4d44a73ae5949796a2886e1 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Fri, 23 Apr 2021 06:29:17 +0200 Subject: [PATCH] Server: #152 - unify pagination --- frontend/src/models/pagination.model.ts | 4 ++-- frontend/src/services/auth.backend.service.ts | 2 +- .../src/Domain/Backup/Entity/Authentication/User.php | 2 +- .../Backup/Response/Collection/ListingResponse.php | 11 ++++------- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/frontend/src/models/pagination.model.ts b/frontend/src/models/pagination.model.ts index 642d3c5b4..a31d9200c 100644 --- a/frontend/src/models/pagination.model.ts +++ b/frontend/src/models/pagination.model.ts @@ -24,8 +24,8 @@ export default class Pagination { return new Pagination( pagination['page'], - pagination['maxPages'], - pagination['perPageLimit'] + pagination['max_pages'], + pagination['per_page_limit'] ) } } diff --git a/frontend/src/services/auth.backend.service.ts b/frontend/src/services/auth.backend.service.ts index 8572e9aa5..b0f12a607 100644 --- a/frontend/src/services/auth.backend.service.ts +++ b/frontend/src/services/auth.backend.service.ts @@ -51,7 +51,7 @@ export default class AuthBackend extends BackupRepositoryBackend { return new UserListingResponse( response.data.data.map(function (userData) { return User.fromDict(userData) }), - new Pagination(page, response.data.context.pagination.maxPages, limit) + new Pagination(page, response.data.context.pagination.max_pages, limit) ) }) } diff --git a/server/src/Domain/Backup/Entity/Authentication/User.php b/server/src/Domain/Backup/Entity/Authentication/User.php index 2f6cbf027..10823a171 100644 --- a/server/src/Domain/Backup/Entity/Authentication/User.php +++ b/server/src/Domain/Backup/Entity/Authentication/User.php @@ -9,7 +9,7 @@ class User extends TokenFromCommon implements \JsonSerializable { protected Email $email; - public function jsonSerialize() + public function jsonSerialize(): array { return [ 'id' => $this->getId(), diff --git a/server/src/Domain/Backup/Response/Collection/ListingResponse.php b/server/src/Domain/Backup/Response/Collection/ListingResponse.php index b87d10a38..6d4703e18 100644 --- a/server/src/Domain/Backup/Response/Collection/ListingResponse.php +++ b/server/src/Domain/Backup/Response/Collection/ListingResponse.php @@ -30,16 +30,13 @@ public static function createFromResults(array $elements, int $maxPages, int $cu public function jsonSerialize(): array { - $data = parent::jsonSerialize(); - $data = array_merge($data, [ + return array_merge(parent::jsonSerialize(), [ 'elements' => $this->elements, 'pagination' => [ - 'page' => $this->currentPage, - 'maxPages' => $this->maxPages, - 'perPageLimit' => $this->perPage + 'page' => $this->currentPage, + 'max_pages' => $this->maxPages, + 'per_page_limit' => $this->perPage ] ]); - - return $data; } }