-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Cra rxjs issue pagination fix (#1938)
* chore: pagination for issues, fix render issue with React pagination component * chore: removed comments
- Loading branch information
Showing
6 changed files
with
75 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 20 additions & 12 deletions
32
cra-rxjs-styled-components/src/components/repo-issues/Issues/Issues.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,27 @@ | ||
import { useState } from 'react'; | ||
import IssueView from './Issues.view'; | ||
import type { IssueTabValues, IssueTypes } from '../../../types/types'; | ||
import useIssuesPRs from '../../../hooks/useIssuesPRs'; | ||
import { IssuePRTabValues } from '../../../components/pr-issue-tab/IssuePRTabHeader'; | ||
|
||
type IssuesProps = { | ||
issues: IssueTypes; | ||
}; | ||
export default function IssueCtrl() { | ||
const { open, closed, setClosedPRPage, setOpenPRPage } = useIssuesPRs({ | ||
searchType: 'issue', | ||
type: 'issues', | ||
}); | ||
const [activeTab, setActiveTab] = useState<IssuePRTabValues>('open'); | ||
const setPRPage = activeTab === 'open' ? setOpenPRPage : setClosedPRPage; | ||
|
||
export default function IssueCtrl({ issues }: IssuesProps) { | ||
const [activeTab, setActiveTab] = useState<IssueTabValues>('open'); | ||
const issues = activeTab === 'open' ? open.items : closed.items; | ||
return ( | ||
<IssueView | ||
issues={issues[activeTab].items} | ||
closedCount={issues?.closed.total_count!} | ||
openCount={issues?.open.total_count!} | ||
changeActiveTab={setActiveTab} | ||
/> | ||
<div key={activeTab}> | ||
<IssueView | ||
issues={issues} | ||
closedCount={closed.total_count} | ||
openCount={open.total_count} | ||
activeTab={activeTab} | ||
changeActiveTab={setActiveTab} | ||
setPRPage={setPRPage} | ||
/> | ||
</div> | ||
); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 1 addition & 3 deletions
4
cra-rxjs-styled-components/src/routes/repo/repository-issues.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,5 @@ | ||
import useIssuesPRs from '../../hooks/useIssuesPRs'; | ||
import IssueCtrl from '../../components/repo-issues/Issues/Issues'; | ||
|
||
export default function RepoIssues() { | ||
const { open, closed } = useIssuesPRs({ searchType: 'issue', type: 'issues' }); | ||
return <IssueCtrl issues={{ open, closed }} />; | ||
return <IssueCtrl />; | ||
} |