Merge pull request #1055 from topcoder-platform/PM-590-fixes

PM-589 Fix Load more logic

Author: kkartunov

src/apps/copilots/src/pages/copilot-opportunity-list/index.tsx

@@ -111,7 +111,7 @@ const CopilotOpportunityList: FC<{}> = () => {
     )
 
     const {
-        data: opportunities, isValidating, size, setSize,
+        data: opportunities, hasMoreOpportunities, isValidating, size, setSize,
     }: CopilotOpportunitiesResponse = useCopilotOpportunities()
 
     const tableData = useMemo(() => opportunities.map(opportunity => ({
@@ -143,7 +143,7 @@ const CopilotOpportunityList: FC<{}> = () => {
             <Table
                 columns={tableColumns}
                 data={tableData}
-                moreToLoad={isValidating || opportunities.length > 0}
+                moreToLoad={hasMoreOpportunities}
                 onLoadMoreClick={loadMore}
                 onRowClick={handleRowClick}
                 removeDefaultSort

src/apps/copilots/src/services/copilot-opportunities.ts

@@ -29,6 +29,7 @@ function copilotOpportunityFactory(data: any): CopilotOpportunity {
 export interface CopilotOpportunitiesResponse {
     isValidating: boolean;
     data: CopilotOpportunity[];
+    hasMoreOpportunities: boolean;
     size: number;
     setSize: (size: number) => void;
 }
@@ -59,7 +60,10 @@ export const useCopilotOpportunities = (): CopilotOpportunitiesResponse => {
     // Flatten data array
     const opportunities = data ? data.flat() : []
 
-    return { data: opportunities, isValidating, setSize: (s: number) => { setSize(s) }, size }
+    const lastPage = data[data.length - 1] || []
+    const hasMoreOpportunities = lastPage.length === PAGE_SIZE
+
+    return { data: opportunities, hasMoreOpportunities, isValidating, setSize: (s: number) => { setSize(s) }, size }
 }
 
 export type CopilotOpportunityResponse = SWRResponse<CopilotOpportunity, CopilotOpportunity>