-
Notifications
You must be signed in to change notification settings - Fork 27
Add paging to users/{user_ID}/tasks #322
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.
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
Open
Dylan-Riley
wants to merge
4
commits into
North-Seattle-College:development
Choose a base branch
from
Dylan-Riley:add_paging_to_users_id_tasks
base: development
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
6282450
commenting out incompleted delete task functionality
Dylan-Riley 96707f5
rerouting, beginning testing of existing utils
Dylan-Riley 34bb729
trying axios implementation like in usersPaginated
Dylan-Riley 51705dc
added back button, TODO comments
Dylan-Riley File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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
73 changes: 73 additions & 0 deletions
73
ui/react-ui/src/components/routes/userTasks/UserTasksPaginated.js
This file contains hidden or 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 |
---|---|---|
@@ -0,0 +1,73 @@ | ||
import React, {useState, useEffect} from 'react'; | ||
import {useParams} from 'react-router-dom'; | ||
import BackButton from '../../bootstrapBackButton/BootstrapBackButton' | ||
import BootstrapTable from 'react-bootstrap-table-next'; | ||
import paginationFactory from 'react-bootstrap-table2-paginator' | ||
import * as ReactBootStrap from 'react-bootstrap'; | ||
import axios from 'axios'; | ||
|
||
const UserTasksPaginated = () => { | ||
let [userTasks, setUserTasks] = useState([]); | ||
let [loading, setLoading] = useState(false); | ||
let {userId} = useParams(); | ||
|
||
const columns = [ | ||
{dataField: "taskId", text: "Task ID"}, | ||
{dataField: "title", text: "Task"}, | ||
{dataField: "description", text: "Description"}, | ||
{dataField: "createdDate", text: "Date Created"}, | ||
{dataField: "dueDate", text: "Due Date"}, | ||
{dataField: "completed", text: "Is Complete"}, | ||
{dataField: "completedDate", text: "Date Completed"} | ||
] | ||
|
||
// TODO: | ||
// Add options to delete a task | ||
// sort of present in original UserTasks.js but didn't really work | ||
|
||
const getData = async (userId)=>{ | ||
try{ | ||
/* | ||
* I wanted to use the fetchTableState from ../../utils | ||
* But it just returned the data in a really unhelpful way with an incorrect | ||
* "title" and "subtitle" tacked onto the front | ||
*/ | ||
const data = await axios.get( | ||
`https://nsc-fun-dev-usw2-thursday.azurewebsites.net/api/users/${userId}/tasks` | ||
); | ||
console.log(data); | ||
setUserTasks(data.data); | ||
} catch (error) { | ||
console.error(error); | ||
} | ||
} | ||
|
||
useEffect(() => { | ||
getData(userId); | ||
setLoading(true); | ||
}, [userId]); | ||
|
||
// TODO: | ||
// Table spacing is bad in narrow windows | ||
|
||
return ( | ||
<div className="pagination"> | ||
<div><BackButton /></div> | ||
{loading | ||
?( | ||
<div className="table-wrapper"> | ||
<BootstrapTable | ||
rowStyle = {{backgroundColor: 'white'}} | ||
className="table" | ||
keyField="taskId" | ||
data={userTasks} | ||
columns={columns} | ||
pagination={paginationFactory()} | ||
/> | ||
</div> | ||
): (<ReactBootStrap.Spinner animation="border" />)} | ||
</div> | ||
) | ||
} | ||
|
||
export default UserTasksPaginated; |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this looks like it should go before your axios call. I don't see any place that shuts off loading afterwards