Skip to content

Commit 3cecd5d

Browse files
authored
[MI-2736]: Done the review fixes of a github PR mattermost#636 (#21)
* [MI-2736]: Review fixes done 1. Improved code readability * [MI-2736]: Review fixes done 1. Fixed linting errors * [MI-2736]: Review fixes done 1. Fixed linting error * [MI-2736]: Review fixes done 1. Improved code readability * [MI-2736]: Review fixes done 1. Changed the case of few endpoints to snake case
1 parent 70ae885 commit 3cecd5d

File tree

3 files changed

+27
-26
lines changed

3 files changed

+27
-26
lines changed

server/plugin/api.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -90,17 +90,17 @@ func (p *Plugin) initializeAPI() {
9090
apiRouter.HandleFunc("/user", p.checkAuth(p.attachContext(p.getGitHubUser), ResponseTypeJSON)).Methods(http.MethodPost)
9191
apiRouter.HandleFunc("/todo", p.checkAuth(p.attachUserContext(p.postToDo), ResponseTypeJSON)).Methods(http.MethodPost)
9292
apiRouter.HandleFunc("/reviews", p.checkAuth(p.attachUserContext(p.getReviews), ResponseTypePlain)).Methods(http.MethodGet)
93-
apiRouter.HandleFunc("/yourprs", p.checkAuth(p.attachUserContext(p.getYourPrs), ResponseTypePlain)).Methods(http.MethodGet)
94-
apiRouter.HandleFunc("/prsdetails", p.checkAuth(p.attachUserContext(p.getPrsDetails), ResponseTypePlain)).Methods(http.MethodPost)
95-
apiRouter.HandleFunc("/searchissues", p.checkAuth(p.attachUserContext(p.searchIssues), ResponseTypePlain)).Methods(http.MethodGet)
96-
apiRouter.HandleFunc("/yourassignments", p.checkAuth(p.attachUserContext(p.getYourAssignments), ResponseTypePlain)).Methods(http.MethodGet)
97-
apiRouter.HandleFunc("/createissue", p.checkAuth(p.attachUserContext(p.createIssue), ResponseTypePlain)).Methods(http.MethodPost)
98-
apiRouter.HandleFunc("/closeorreopenissue", p.checkAuth(p.attachUserContext(p.closeOrReopenIssue), ResponseTypePlain)).Methods(http.MethodPost)
99-
apiRouter.HandleFunc("/updateissue", p.checkAuth(p.attachUserContext(p.updateIssue), ResponseTypePlain)).Methods(http.MethodPost)
100-
apiRouter.HandleFunc("/editissuemodal", p.checkAuth(p.attachUserContext(p.openIssueEditModal), ResponseTypePlain)).Methods(http.MethodPost)
93+
apiRouter.HandleFunc("/your_prs", p.checkAuth(p.attachUserContext(p.getYourPrs), ResponseTypePlain)).Methods(http.MethodGet)
94+
apiRouter.HandleFunc("/prs_details", p.checkAuth(p.attachUserContext(p.getPrsDetails), ResponseTypePlain)).Methods(http.MethodPost)
95+
apiRouter.HandleFunc("/search_issues", p.checkAuth(p.attachUserContext(p.searchIssues), ResponseTypePlain)).Methods(http.MethodGet)
96+
apiRouter.HandleFunc("/your_assignments", p.checkAuth(p.attachUserContext(p.getYourAssignments), ResponseTypePlain)).Methods(http.MethodGet)
97+
apiRouter.HandleFunc("/create_issue", p.checkAuth(p.attachUserContext(p.createIssue), ResponseTypePlain)).Methods(http.MethodPost)
98+
apiRouter.HandleFunc("/close_or_reopen_issue", p.checkAuth(p.attachUserContext(p.closeOrReopenIssue), ResponseTypePlain)).Methods(http.MethodPost)
99+
apiRouter.HandleFunc("/update_issue", p.checkAuth(p.attachUserContext(p.updateIssue), ResponseTypePlain)).Methods(http.MethodPost)
100+
apiRouter.HandleFunc("/edit_issue_modal", p.checkAuth(p.attachUserContext(p.openIssueEditModal), ResponseTypePlain)).Methods(http.MethodPost)
101101
apiRouter.HandleFunc("/close_reopen_issue_modal", p.checkAuth(p.attachUserContext(p.openCloseOrReopenIssueModal), ResponseTypePlain)).Methods(http.MethodPost)
102-
apiRouter.HandleFunc("/attachcommentissuemodal", p.checkAuth(p.attachUserContext(p.openAttachCommentIssueModal), ResponseTypePlain)).Methods(http.MethodPost)
103-
apiRouter.HandleFunc("/createissuecomment", p.checkAuth(p.attachUserContext(p.createIssueComment), ResponseTypePlain)).Methods(http.MethodPost)
102+
apiRouter.HandleFunc("/attach_comment_issue_modal", p.checkAuth(p.attachUserContext(p.openAttachCommentIssueModal), ResponseTypePlain)).Methods(http.MethodPost)
103+
apiRouter.HandleFunc("/create_issue_comment", p.checkAuth(p.attachUserContext(p.createIssueComment), ResponseTypePlain)).Methods(http.MethodPost)
104104
apiRouter.HandleFunc("/mentions", p.checkAuth(p.attachUserContext(p.getMentions), ResponseTypePlain)).Methods(http.MethodGet)
105105
apiRouter.HandleFunc("/unreads", p.checkAuth(p.attachUserContext(p.getUnreads), ResponseTypePlain)).Methods(http.MethodGet)
106106
apiRouter.HandleFunc("/labels", p.checkAuth(p.attachUserContext(p.getLabels), ResponseTypePlain)).Methods(http.MethodGet)

webapp/src/client/client.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ import {id as pluginId} from '../manifest';
88

99
export default class Client {
1010
editIssueModal = async (payload) => {
11-
return this.doPost(`${this.url}/editissuemodal`, payload);
11+
return this.doPost(`${this.url}/edit_issue_modal`, payload);
1212
}
1313

1414
closeOrReopenIssueModal = async (payload) => {
1515
return this.doPost(`${this.url}/close_reopen_issue_modal`, payload);
1616
}
1717

1818
attachCommentIssueModal = async (payload) => {
19-
return this.doPost(`${this.url}/attachcommentissuemodal`, payload);
19+
return this.doPost(`${this.url}/attach_comment_issue_modal`, payload);
2020
}
2121

2222
setServerRoute(url) {
@@ -32,15 +32,15 @@ export default class Client {
3232
}
3333

3434
getYourPrs = async () => {
35-
return this.doGet(`${this.url}/yourprs`);
35+
return this.doGet(`${this.url}/your_prs`);
3636
}
3737

3838
getPrsDetails = async (prList) => {
39-
return this.doPost(`${this.url}/prsdetails`, prList);
39+
return this.doPost(`${this.url}/prs_details`, prList);
4040
}
4141

4242
getYourAssignments = async () => {
43-
return this.doGet(`${this.url}/yourassignments`);
43+
return this.doGet(`${this.url}/your_assignments`);
4444
}
4545

4646
getMentions = async () => {
@@ -72,23 +72,23 @@ export default class Client {
7272
}
7373

7474
createIssue = async (payload) => {
75-
return this.doPost(`${this.url}/createissue`, payload);
75+
return this.doPost(`${this.url}/create_issue`, payload);
7676
}
7777

7878
closeOrReopenIssue = async (payload) => {
79-
return this.doPost(`${this.url}/closeorreopenissue`, payload);
79+
return this.doPost(`${this.url}/close_or_reopen_issue`, payload);
8080
}
8181

8282
updateIssue = async (payload) => {
83-
return this.doPost(`${this.url}/updateissue`, payload);
83+
return this.doPost(`${this.url}/update_issue`, payload);
8484
}
8585

8686
searchIssues = async (searchTerm) => {
87-
return this.doGet(`${this.url}/searchissues?term=${searchTerm}`);
87+
return this.doGet(`${this.url}/search_issues?term=${searchTerm}`);
8888
}
8989

9090
attachCommentToIssue = async (payload) => {
91-
return this.doPost(`${this.url}/createissuecomment`, payload);
91+
return this.doPost(`${this.url}/create_issue_comment`, payload);
9292
}
9393

9494
getIssue = async (owner, repo, issueNumber) => {

webapp/src/components/modals/create_update_issue/create_update_issue.jsx

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,10 @@ export default class CreateOrUpdateIssueModal extends PureComponent {
6464
value: milestone_number,
6565
label: milestone_title,
6666
},
67+
repo: {
68+
name: repo_full_name,
69+
},
6770
issueDescription: description,
68-
repo: repo_full_name,
6971
issueTitle: title.substring(0, MAX_TITLE_LENGTH)});
7072
}
7173
}
@@ -151,29 +153,28 @@ export default class CreateOrUpdateIssueModal extends PureComponent {
151153
handleIssueDescriptionChange = (issueDescription) => this.setState({issueDescription});
152154

153155
renderIssueAttributeSelectors = () => {
154-
if (!this.state.repo || (this.state.repo.permissions && !this.state.repo.permissions.push)) {
156+
if (!this.state.repo || !this.state.repo.name || (this.state.repo.permissions && !this.state.repo.permissions.push)) {
155157
return null;
156158
}
157159

158-
const repoName = this.state.repo.name ?? this.state.repo;
159160
return (
160161
<>
161162
<GithubLabelSelector
162-
repoName={repoName}
163+
repoName={this.state.repo.name}
163164
theme={this.props.theme}
164165
selectedLabels={this.state.labels}
165166
onChange={this.handleLabelsChange}
166167
/>
167168

168169
<GithubAssigneeSelector
169-
repoName={repoName}
170+
repoName={this.state.repo.name}
170171
theme={this.props.theme}
171172
selectedAssignees={this.state.assignees}
172173
onChange={this.handleAssigneesChange}
173174
/>
174175

175176
<GithubMilestoneSelector
176-
repoName={repoName}
177+
repoName={this.state.repo.name}
177178
theme={this.props.theme}
178179
selectedMilestone={this.state.milestone}
179180
onChange={this.handleMilestoneChange}

0 commit comments

Comments
 (0)