Skip to content

Commit 0080c8a

Browse files
ksraj123ksraj123
committed
suggested changes
1 parent af6313a commit 0080c8a

File tree

9 files changed

+80
-113
lines changed

9 files changed

+80
-113
lines changed

‎package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
"react-share": "^4.2.1",
5151
"react-spinners": "^0.8.3",
5252
"react-switch": "^5.0.1",
53-
"react-tiny-fab": "^3.5.0",
5453
"react-toastify": "^6.0.5",
5554
"redux": "^4.0.5",
5655
"redux-thunk": "^2.3.0",

‎src/actions/authAction.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ export const loginUser = (userInfo, history) => async (dispatch) => {
4747

4848
// update state with user
4949
const decodedData = await jwt_decode(token);
50-
localStorage.setItem('userId', decodedData._id)
50+
console.log("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! PRINTING RES.DATA.USER !!!!!!!!!!!!!!1");
51+
console.log(res.data.user);
52+
localStorage.setItem('userId', res.data.user._id)
5153
dispatch(setCurrentUser(decodedData));
5254

5355
// Update user name in localStorage

‎src/user/Admin/Tickets/NewTicketEditor/index.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ class Editor extends Component {
3030
};
3131
if (newTicket.shortDescription.length < 10) {
3232
toast.error("Short description should be atleast 10 characters long");
33+
} else if (newTicket.shortDescription.length > 100) {
34+
toast.error("Short description should not be more than 100 characters long");
3335
} else if (newTicket.content.length < 10) {
3436
toast.error("Ticket content should be atleast 10 characters long");
3537
} else if (newTicket.title.length < 10) {

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,7 @@ class TicketContent extends Component {
2828
{" "}
2929
{row.title}
3030
</div>
31-
<div className="Ticket-dashboard-shortDesciption">{`${row.shortDescription.slice(
32-
0,
33-
100
34-
)}...`}</div>
31+
<div className="Ticket-dashboard-shortDesciption">{row.shortDescription}</div>
3532
</div>
3633
</div>
3734
);
@@ -78,7 +75,7 @@ class TicketContent extends Component {
7875
marginLeft: "10px",
7976
}}
8077
>
81-
<div className="profile-text">{row.createdBy.name}</div>
78+
<div className="profile-text">{row.createdBy.name ? row.createdBy.name : "Anonymous"}</div>
8279
<Moment format="DD MMM YYYY, h:mm a">{row.createdAt}</Moment>
8380
</div>
8481
</div>

‎src/user/Admin/Tickets/TicketDashboard.js‎

Lines changed: 60 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,21 @@ class TicketDashboard extends Component {
5353
});
5454
};
5555

56-
componentWillReceiveProps(nextProps) {
57-
this.setState({
58-
all: nextProps.tickets.tickets,
59-
filtered: nextProps.tickets.tickets,
60-
});
56+
// componentWillReceiveProps(nextProps) {
57+
// this.setState({
58+
// all: nextProps.tickets.tickets,
59+
// filtered: nextProps.tickets.tickets,
60+
// });
61+
// }
62+
63+
componentDidUpdate(prevProps) {
64+
const { tickets } = this.props;
65+
if (JSON.stringify(prevProps.tickets.tickets) !== JSON.stringify(tickets.tickets)){
66+
this.setState({
67+
all: tickets.tickets,
68+
filtered: tickets.tickets,
69+
})
70+
}
6171
}
6272

6373
setFilteredTickets = (tickets) => {
@@ -138,7 +148,7 @@ class TicketDashboard extends Component {
138148
});
139149
};
140150

141-
handleRemoveTag = async (id, tagName) => {
151+
handleRemoveTag = (id, tagName) => {
142152
const tickets = [...this.state.all];
143153
tickets.forEach((ele) => {
144154
if (ele._id === id) {
@@ -166,7 +176,48 @@ class TicketDashboard extends Component {
166176
};
167177

168178
render() {
169-
const { spinner, editorMode, viewingTicket, ticket, all, filtered, notificationDrawer, notifications } = this.state;
179+
const {
180+
spinner,
181+
editorMode,
182+
viewingTicket,
183+
ticket,
184+
all,
185+
filtered,
186+
notificationDrawer,
187+
notifications,
188+
} = this.state;
189+
const ticketDashboard = (
190+
<React.Fragment>
191+
<div className="ticket-status">
192+
<TicketFilter
193+
tickets={all}
194+
filtered={filtered}
195+
clear={this.clearFilters}
196+
toggleNewTicketEditor={this.toggleNewTicketEditor}
197+
setFiltered={this.setFilteredTickets}
198+
/>
199+
</div>
200+
{!!all.length && (
201+
<div className="ticket-content">
202+
<TicketContent
203+
viewTicket={this.handleViewTicket}
204+
tickets={filtered}
205+
/>
206+
</div>
207+
)}
208+
</React.Fragment>
209+
);
210+
const ticeketDiscussion = (
211+
<TicketDisscussion
212+
addTag={this.handleAddTag}
213+
back={this.handleViewTicket}
214+
currentUser={this.props.user}
215+
removeTag={this.handleRemoveTag}
216+
deleteTicket={this.deleteTicket}
217+
ticketId={viewingTicket}
218+
singleUpdate={this.handleTicketSingleUpdate}
219+
/>
220+
);
170221
return (
171222
<div className="ticket">
172223
<div className="navigation">
@@ -194,44 +245,14 @@ class TicketDashboard extends Component {
194245
<NotificationsNoneOutlinedIcon />
195246
</Button>
196247
</div>
197-
{!editorMode && !viewingTicket && (
198-
<React.Fragment>
199-
<div className="ticket-status">
200-
<TicketFilter
201-
tickets={all}
202-
filtered={filtered}
203-
clear={this.clearFilters}
204-
toggleNewTicketEditor={this.toggleNewTicketEditor}
205-
setFiltered={this.setFilteredTickets}
206-
/>
207-
</div>
208-
{!!all.length && (
209-
<div className="ticket-content">
210-
<TicketContent
211-
viewTicket={this.handleViewTicket}
212-
tickets={filtered}
213-
/>
214-
</div>
215-
)}
216-
</React.Fragment>
217-
)}
248+
{!editorMode && !viewingTicket && ticketDashboard}
218249
{editorMode && !viewingTicket && (
219250
<NewTicketEditor
220251
save={this.handleCreateNewTicket}
221252
cancel={() => this.toggleNewTicketEditor(false)}
222253
/>
223254
)}
224-
{viewingTicket && (
225-
<TicketDisscussion
226-
addTag={this.handleAddTag}
227-
back={this.handleViewTicket}
228-
currentUser={this.props.user}
229-
removeTag={this.handleRemoveTag}
230-
deleteTicket={this.deleteTicket}
231-
ticketId={viewingTicket}
232-
singleUpdate={this.handleTicketSingleUpdate}
233-
/>
234-
)}
255+
{viewingTicket && ticeketDiscussion}
235256
</div>
236257
</LoadingOverlay>
237258
<Drawer

‎src/user/Admin/Tickets/TicketDiscussion/Discussion/Discussion.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class Discussion extends Component {
9898
>
9999
<div>
100100
<div style={{ display: "flex", alignItems: "center" }}>
101-
<h2>{ticket.createdBy.name}</h2>
101+
<h2>{ticket.createdBy.name? ticket.createdBy.name : "Anonymous"}</h2>
102102
{editor === "new" &&
103103
editsAllowed && (
104104
<EditButton

‎src/user/Admin/Tickets/TicketDiscussion/Layout/Layout.js‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,24 @@ class Layout extends Component {
1717
constructor(props) {
1818
super(props);
1919
this.state = {
20+
tags: [],
21+
title: '',
22+
summary: '',
2023
tagsEditor: false,
2124
titleEditor: false,
2225
summaryEditor: false,
23-
tags: props.ticket?.tags,
24-
title: props.ticket?.title,
25-
summary: props.ticket?.shortDescription,
2626
};
2727
}
2828

29+
componentDidMount() {
30+
const { ticket } = this.props;
31+
this.setState({
32+
tags: ticket?.tags,
33+
title: ticket?.title,
34+
summary: ticket?.shortDescription,
35+
})
36+
}
37+
2938
render() {
3039
const HtmlTooltip = withStyles((theme) => ({
3140
tooltip: {

‎src/user/organization/organization.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import { getOrgProfile } from "../../actions/orgAction";
1616
import { Link } from "react-router-dom";
1717
import { Button } from "react-bootstrap";
1818
import NewTicket from "./popups/NewTicket";
19-
import FloatingActionButton from "./ticket/FloatingActionButton";
2019

2120
class Organization extends Component {
2221
constructor(props) {
@@ -56,7 +55,6 @@ class Organization extends Component {
5655
} = orgProfile;
5756
return (
5857
<div className="organization">
59-
<FloatingActionButton />
6058
<div className="navigation">
6159
<Navigation org={this.state.org}></Navigation>
6260
</div>

‎src/user/organization/ticket/FloatingActionButton.js‎

Lines changed: 0 additions & 61 deletions
This file was deleted.

0 commit comments

Comments
 (0)