Skip to content

PM-589 Fix Load more logic #1055

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 29, 2025
Merged

PM-589 Fix Load more logic #1055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b24648c
Fix Load more logic
Apr 28, 2025
827d9e2
bot suggestions
Apr 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/apps/copilots/src/pages/copilot-opportunity-list/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ const CopilotOpportunityList: FC<{}> = () => {
const navigate = useNavigate()

const {
data: opportunities, isValidating, size, setSize,
data: opportunities, hasMoreOpportunities, isValidating, size, setSize,
}: CopilotOpportunitiesResponse = useCopilotOpportunities()

const tableData = useMemo(() => opportunities.map(opportunity => ({
Expand All @@ -129,7 +129,7 @@ const CopilotOpportunityList: FC<{}> = () => {
<Table
columns={tableColumns}
data={tableData}
moreToLoad={isValidating || opportunities.length > 0}
moreToLoad={hasMoreOpportunities}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The variable hasMoreOpportunities should be defined and initialized properly in the component to ensure it accurately reflects whether there are more opportunities to load. Verify that hasMoreOpportunities is correctly set and updated based on the data source.

onLoadMoreClick={loadMore}
onRowClick={handleRowClick}
removeDefaultSort
Expand Down
6 changes: 5 additions & 1 deletion src/apps/copilots/src/services/copilot-opportunities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ function copilotOpportunityFactory(data: any): CopilotOpportunity {
export interface CopilotOpportunitiesResponse {
isValidating: boolean;
data: CopilotOpportunity[];
hasMoreOpportunities: boolean;
size: number;
setSize: (size: number) => void;
}
Expand Down Expand Up @@ -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] || []
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Check if data is not null or undefined before accessing data.length to prevent potential runtime errors.

const hasMoreOpportunities = lastPage.length === PAGE_SIZE

return { data: opportunities, hasMoreOpportunities, isValidating, setSize: (s: number) => { setSize(s) }, size }
}

export type CopilotOpportunityResponse = SWRResponse<CopilotOpportunity, CopilotOpportunity>
Expand Down