Merge pull request #620 from aws-samples/fix-pagination

ページネーションのバグ修正
aws-samples · Aug 26, 2024 · 59d8a2b · 59d8a2b
2 parents 0de904d + 812d363
commit 59d8a2b
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 deletions.
diff --git a/browser-extension/src/app/features/settings/useSettings.ts b/browser-extension/src/app/features/settings/useSettings.ts
@@ -39,7 +39,7 @@ const useSettings = () => {
             throw new Error(`${key}は、string型で入力してください`);
           }
         }
-      })
+      }),
     );
   }, []);
 
@@ -120,7 +120,7 @@ const useSettings = () => {
                 !!settings.lambdaArn &&
                 !!settings.userPoolClientId &&
                 !!settings.userPoolId &&
-                !!settings.region
+                !!settings.region,
             );
             window.location.reload();
           } else {

diff --git a/browser-extension/src/index.html b/browser-extension/src/index.html
@@ -1,15 +1,13 @@
 <!doctype html>
 <html lang="ja">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta http-equiv="X-UA-Compatible" content="ie=edge" />
+  </head>
 
-<head>
-  <meta charset="UTF-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <meta http-equiv="X-UA-Compatible" content="ie=edge" />
-</head>
-
-<body style="background-color: #232f3e">
-  <div id="root"></div>
-  <script src="./index.tsx" type="module"></script>
-</body>
-
-</html>
+  <body style="background-color: #232f3e">
+    <div id="root"></div>
+    <script src="./index.tsx" type="module"></script>
+  </body>
+</html>
diff --git a/browser-extension/src/index.tsx b/browser-extension/src/index.tsx
@@ -14,6 +14,6 @@ proxyStore.ready().then(() => {
           <SSOPage />
         </Authenticator.Provider>
       </Provider>
-    </React.StrictMode>
+    </React.StrictMode>,
   );
 });
diff --git a/browser-extension/src/pages/chat/index.tsx b/browser-extension/src/pages/chat/index.tsx
@@ -18,6 +18,6 @@ proxyStore.ready().then(() => {
           </DndProvider>
         </Authenticator.Provider>
       </Provider>
-    </React.StrictMode>
+    </React.StrictMode>,
   );
 });
diff --git a/packages/web/src/hooks/useChatList.ts b/packages/web/src/hooks/useChatList.ts
@@ -5,7 +5,7 @@ import { ListChatsResponse, Chat } from 'generative-ai-use-cases-jp';
 
 const useChatList = () => {
   const { listChats, deleteChat: deleteChatApi, updateTitle } = useChatApi();
-  const { data, size, setSize, isLoading, mutate } = listChats();
+  const { data, size, setSize, mutate } = listChats();
 
   const chats = useMemo(() => {
     if (data) {
@@ -15,14 +15,16 @@ const useChatList = () => {
     }
   }, [data]);
 
-  const isLoadingMore = useMemo(() => {
-    return (
-      isLoading || (size > 0 && data && typeof data[size - 1] === 'undefined')
-    );
-  }, [isLoading, size, data]);
+  const isLoading = useMemo(() => {
+    if (!data) return false;
+    return data!.length < size || data![size - 1] === undefined;
+  }, [data, size]);
 
   const canLoadMore = useMemo(() => {
-    return !data || data!.length === size;
+    // チャットリストは 1 度に最大で 100 件取得される
+    return (
+      !data || (data!.length === size && data![size - 1].chats.length === 100)
+    );
   }, [data, size]);
 
   const loadMore = useCallback(() => {
@@ -93,7 +95,7 @@ const useChatList = () => {
   };
 
   return {
-    loading: isLoadingMore,
+    loading: isLoading,
     chats,
     mutate,
     updateChatTitle,