@streamlayer/feature-gamification 0.30.3 → 0.31.0

package/lib/leaderboard.d.ts

@@ -7,11 +7,12 @@ type LeaderboardOptions = {
 type LeaderboardStore = {
     data?: LeaderboardItem[];
     loading?: boolean;
+    hasMore: boolean;
     error?: string;
 };
 export declare const leaderboard: (transport: Transport, $eventId: ReadableAtom<string | undefined>, options?: LeaderboardOptions) => {
     $store: import("nanostores").MapStore<LeaderboardStore>;
-    fetchMore: () => void;
+    fetchMore: (page?: number) => void;
     invalidate: () => void;
 };
 export {};

package/lib/leaderboard.js

@@ -4,9 +4,13 @@ const defaultOptions = {
     pageSize: 10,
 };
 export const leaderboard = (transport, $eventId, options) => {
+    let maxPage = 0;
     const $pagination = createSingleStore({ pageSize: options?.pageSize || defaultOptions.pageSize, page: 0 });
-    const $store = createMapStore({ data: [], loading: undefined, error: undefined });
+    const $store = createMapStore({ data: [], hasMore: true, loading: undefined, error: undefined });
     const fetch = createLeaderboardListFetch(transport);
+    /**
+     * Refetch leaderboard data, reset pagination
+     */
     const refetch = async (eventId) => {
         if (eventId) {
             $store.setKey('loading', true);
@@ -15,7 +19,14 @@ export const leaderboard = (transport, $eventId, options) => {
                 pagination: { page: 0, pageSize: options?.pageSize || defaultOptions.pageSize },
             };
             const newData = await fetch(request);
-            $store.set({ data: newData.data.map((item) => item.attributes), loading: false });
+            $store.set({
+                data: newData.data.map((item) => item.attributes),
+                hasMore: true,
+                loading: false,
+            });
+            if (newData.meta) {
+                maxPage = Math.round(newData.meta.count / newData.meta.pageSize);
+            }
             $pagination.set(request.pagination);
         }
     };
@@ -25,24 +36,35 @@ export const leaderboard = (transport, $eventId, options) => {
     };
     $pagination.listen(async (pagination) => {
         const eventId = $eventId.get();
-        const prevDataLength = $store.get().data?.length || 0;
-        if (pagination.page > 0 && eventId && prevDataLength >= pagination.page * pagination.pageSize) {
-            $store.setKey('loading', true);
-            const request = {
-                eventId: eventId,
-                pagination,
-            };
-            const newData = await fetch(request);
-            const prevData = $store.get().data || [];
-            $store.set({
-                data: [...prevData, ...newData.data.map((item) => item.attributes)],
-                loading: false,
-            });
+        if (pagination.page > 0 && eventId) {
+            if (pagination.page < maxPage) {
+                $store.setKey('loading', true);
+                const request = {
+                    eventId: eventId,
+                    pagination,
+                };
+                const newData = await fetch(request);
+                const prevData = $store.get().data || [];
+                $store.set({
+                    data: [...prevData, ...newData.data.map((item) => item.attributes)],
+                    loading: false,
+                    hasMore: true,
+                });
+            }
+            else {
+                $store.setKey('hasMore', false);
+            }
         }
     });
-    const fetchMore = () => {
+    /**
+     * Whether there is more data to fetch
+     */
+    const fetchMore = (page) => {
         const pagination = $pagination.get();
-        $pagination.set({ ...pagination, page: pagination.page + 1 });
+        const nextPage = page || pagination.page + 1;
+        if (nextPage <= maxPage) {
+            $pagination.set({ ...pagination, page: nextPage });
+        }
     };
     return { $store, fetchMore, invalidate };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@streamlayer/feature-gamification",
-  "version": "0.30.3",
+  "version": "0.31.0",
   "peerDependencies": {
     "@bufbuild/protobuf": "^1.4.2",
     "@streamlayer/sl-eslib": "^5.61.0",
@@ -8,10 +8,10 @@
     "nanostores": "^0.9.5",
     "@streamlayer/sdk-web-api": "^0.1.0",
     "@streamlayer/sdk-web-core": "^0.1.0",
-    "@streamlayer/sdk-web-interfaces": "^0.18.19",
-    "@streamlayer/sdk-web-notifications": "^0.0.3",
-    "@streamlayer/sdk-web-storage": "^0.0.4",
+    "@streamlayer/sdk-web-interfaces": "^0.18.20",
     "@streamlayer/sdk-web-logger": "^0.0.1",
+    "@streamlayer/sdk-web-notifications": "^0.0.4",
+    "@streamlayer/sdk-web-storage": "^0.0.4",
     "@streamlayer/sdk-web-types": "^0.1.0"
   },
   "devDependencies": {