Skip to content

Commit 40ef27b

Browse files
committed
implementing spinner and chancelling of asyc calls on component unmounting
1 parent 4e45897 commit 40ef27b

File tree

12 files changed

+622
-352
lines changed

12 files changed

+622
-352
lines changed

src/reducers/ticketReducer.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@ export default (state = initialState, action) => {
77
switch (action.type) {
88
case GET_TICKETs: {
99
console.log(`Action Recieved in reducer! ${action.type}`);
10-
console.log(action.payload);
1110
return {
1211
...state,
13-
tickets: action.payload,
12+
tickets: action.payload.reverse(),
1413
};
1514
}
1615
default: {

src/user/Admin/Tickets/TicketContent/TicketContent.js

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@ import ChatBubbleOutlinedIcon from "@material-ui/icons/ChatBubbleOutlined";
1111

1212
class TicketContent extends Component {
1313
handleRowClick = (arg1) => {
14-
console.log("Row Clicked!");
15-
console.log(arg1);
1614
this.props.viewTicket(arg1._id);
1715
};
1816

1917
render() {
2018
const CustomTitle = ({ row }) => {
21-
console.log(row);
2219
return (
2320
<div className="Ticket-dashboard-ticket">
2421
<div className="status">
2522
<BadgeElement ticketState={row.status} />
2623
</div>
2724
<div>
2825
<div className="Ticket-dashboard-title">
26+
{"# "}
27+
{row.number}
28+
{" "}
2929
{row.title}
3030
</div>
3131
<div className="Ticket-dashboard-shortDesciption">{`${row.shortDescription.slice(
@@ -46,15 +46,17 @@ class TicketContent extends Component {
4646
},
4747
{
4848
grow: 3,
49-
cell: (row) => (row.tags.map((ele, index) => (
50-
<Badge
51-
pill
52-
variant="info"
53-
style={{ fontSize: "13px", margin: "2px" }}
54-
>
55-
<span style={{ verticalAlign: "middle" }}>{ele}</span>
56-
</Badge>
57-
)))
49+
cell: (row) =>
50+
row.tags.map((ele, index) => (
51+
<Badge
52+
pill
53+
key={index}
54+
variant="info"
55+
style={{ fontSize: "13px", margin: "2px" }}
56+
>
57+
<span style={{ verticalAlign: "middle" }}>{ele}</span>
58+
</Badge>
59+
)),
5860
},
5961
{
6062
name: "Created",
@@ -69,9 +71,15 @@ class TicketContent extends Component {
6971
className="profile-img"
7072
roundedCircle
7173
/>
72-
<div style={{ display: "flex", flexDirection: "column", marginLeft: "10px" }}>
74+
<div
75+
style={{
76+
display: "flex",
77+
flexDirection: "column",
78+
marginLeft: "10px",
79+
}}
80+
>
7381
<div className="profile-text">{row.createdBy.name}</div>
74-
<Moment format="DD MMM YYYY">{row.createdAt}</Moment>
82+
<Moment format="DD MMM YYYY, h:mm a">{row.createdAt}</Moment>
7583
</div>
7684
</div>
7785
),
@@ -84,7 +92,9 @@ class TicketContent extends Component {
8492
cell: (row) => (
8593
<div>
8694
{row.comments}
87-
<ChatBubbleOutlinedIcon style={{ marginLeft: "5px", color: "rgba(0,0,0,0.5)" }}/>
95+
<ChatBubbleOutlinedIcon
96+
style={{ marginLeft: "5px", color: "rgba(0,0,0,0.5)" }}
97+
/>
8898
</div>
8999
),
90100
},
@@ -94,7 +104,6 @@ class TicketContent extends Component {
94104
<DataTable
95105
pagination
96106
columns={columns}
97-
pointerOnHover={true}
98107
highlightOnHover={true}
99108
data={this.props.tickets}
100109
customStyles={customStyles}

0 commit comments

Comments
 (0)