Skip to content
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

[MI-2736]: Done the review fixes of a github PR #636 #21

Merged
merged 8 commits into from
Feb 16, 2023
20 changes: 10 additions & 10 deletions server/plugin/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,17 +90,17 @@ func (p *Plugin) initializeAPI() {
apiRouter.HandleFunc("/user", p.checkAuth(p.attachContext(p.getGitHubUser), ResponseTypeJSON)).Methods(http.MethodPost)
apiRouter.HandleFunc("/todo", p.checkAuth(p.attachUserContext(p.postToDo), ResponseTypeJSON)).Methods(http.MethodPost)
apiRouter.HandleFunc("/reviews", p.checkAuth(p.attachUserContext(p.getReviews), ResponseTypePlain)).Methods(http.MethodGet)
apiRouter.HandleFunc("/yourprs", p.checkAuth(p.attachUserContext(p.getYourPrs), ResponseTypePlain)).Methods(http.MethodGet)
apiRouter.HandleFunc("/prsdetails", p.checkAuth(p.attachUserContext(p.getPrsDetails), ResponseTypePlain)).Methods(http.MethodPost)
apiRouter.HandleFunc("/searchissues", p.checkAuth(p.attachUserContext(p.searchIssues), ResponseTypePlain)).Methods(http.MethodGet)
apiRouter.HandleFunc("/yourassignments", p.checkAuth(p.attachUserContext(p.getYourAssignments), ResponseTypePlain)).Methods(http.MethodGet)
apiRouter.HandleFunc("/createissue", p.checkAuth(p.attachUserContext(p.createIssue), ResponseTypePlain)).Methods(http.MethodPost)
apiRouter.HandleFunc("/closeorreopenissue", p.checkAuth(p.attachUserContext(p.closeOrReopenIssue), ResponseTypePlain)).Methods(http.MethodPost)
apiRouter.HandleFunc("/updateissue", p.checkAuth(p.attachUserContext(p.updateIssue), ResponseTypePlain)).Methods(http.MethodPost)
apiRouter.HandleFunc("/editissuemodal", p.checkAuth(p.attachUserContext(p.openIssueEditModal), ResponseTypePlain)).Methods(http.MethodPost)
apiRouter.HandleFunc("/your_prs", p.checkAuth(p.attachUserContext(p.getYourPrs), ResponseTypePlain)).Methods(http.MethodGet)
apiRouter.HandleFunc("/prs_details", p.checkAuth(p.attachUserContext(p.getPrsDetails), ResponseTypePlain)).Methods(http.MethodPost)
apiRouter.HandleFunc("/search_issues", p.checkAuth(p.attachUserContext(p.searchIssues), ResponseTypePlain)).Methods(http.MethodGet)
apiRouter.HandleFunc("/your_assignments", p.checkAuth(p.attachUserContext(p.getYourAssignments), ResponseTypePlain)).Methods(http.MethodGet)
apiRouter.HandleFunc("/create_issue", p.checkAuth(p.attachUserContext(p.createIssue), ResponseTypePlain)).Methods(http.MethodPost)
apiRouter.HandleFunc("/close_or_reopen_issue", p.checkAuth(p.attachUserContext(p.closeOrReopenIssue), ResponseTypePlain)).Methods(http.MethodPost)
apiRouter.HandleFunc("/update_issue", p.checkAuth(p.attachUserContext(p.updateIssue), ResponseTypePlain)).Methods(http.MethodPost)
apiRouter.HandleFunc("/edit_issue_modal", p.checkAuth(p.attachUserContext(p.openIssueEditModal), ResponseTypePlain)).Methods(http.MethodPost)
apiRouter.HandleFunc("/close_reopen_issue_modal", p.checkAuth(p.attachUserContext(p.openCloseOrReopenIssueModal), ResponseTypePlain)).Methods(http.MethodPost)
apiRouter.HandleFunc("/attachcommentissuemodal", p.checkAuth(p.attachUserContext(p.openAttachCommentIssueModal), ResponseTypePlain)).Methods(http.MethodPost)
apiRouter.HandleFunc("/createissuecomment", p.checkAuth(p.attachUserContext(p.createIssueComment), ResponseTypePlain)).Methods(http.MethodPost)
apiRouter.HandleFunc("/attach_comment_issue_modal", p.checkAuth(p.attachUserContext(p.openAttachCommentIssueModal), ResponseTypePlain)).Methods(http.MethodPost)
apiRouter.HandleFunc("/create_issue_comment", p.checkAuth(p.attachUserContext(p.createIssueComment), ResponseTypePlain)).Methods(http.MethodPost)
apiRouter.HandleFunc("/mentions", p.checkAuth(p.attachUserContext(p.getMentions), ResponseTypePlain)).Methods(http.MethodGet)
apiRouter.HandleFunc("/unreads", p.checkAuth(p.attachUserContext(p.getUnreads), ResponseTypePlain)).Methods(http.MethodGet)
apiRouter.HandleFunc("/labels", p.checkAuth(p.attachUserContext(p.getLabels), ResponseTypePlain)).Methods(http.MethodGet)
Expand Down
20 changes: 10 additions & 10 deletions webapp/src/client/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ import {id as pluginId} from '../manifest';

export default class Client {
editIssueModal = async (payload) => {
return this.doPost(`${this.url}/editissuemodal`, payload);
return this.doPost(`${this.url}/edit_issue_modal`, payload);
}

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

attachCommentIssueModal = async (payload) => {
return this.doPost(`${this.url}/attachcommentissuemodal`, payload);
return this.doPost(`${this.url}/attach_comment_issue_modal`, payload);
}

setServerRoute(url) {
Expand All @@ -32,15 +32,15 @@ export default class Client {
}

getYourPrs = async () => {
return this.doGet(`${this.url}/yourprs`);
return this.doGet(`${this.url}/your_prs`);
}

getPrsDetails = async (prList) => {
return this.doPost(`${this.url}/prsdetails`, prList);
return this.doPost(`${this.url}/prs_details`, prList);
}

getYourAssignments = async () => {
return this.doGet(`${this.url}/yourassignments`);
return this.doGet(`${this.url}/your_assignments`);
}

getMentions = async () => {
Expand Down Expand Up @@ -72,23 +72,23 @@ export default class Client {
}

createIssue = async (payload) => {
return this.doPost(`${this.url}/createissue`, payload);
return this.doPost(`${this.url}/create_issue`, payload);
}

closeOrReopenIssue = async (payload) => {
return this.doPost(`${this.url}/closeorreopenissue`, payload);
return this.doPost(`${this.url}/close_or_reopen_issue`, payload);
}

updateIssue = async (payload) => {
return this.doPost(`${this.url}/updateissue`, payload);
return this.doPost(`${this.url}/update_issue`, payload);
}

searchIssues = async (searchTerm) => {
return this.doGet(`${this.url}/searchissues?term=${searchTerm}`);
return this.doGet(`${this.url}/search_issues?term=${searchTerm}`);
}

attachCommentToIssue = async (payload) => {
return this.doPost(`${this.url}/createissuecomment`, payload);
return this.doPost(`${this.url}/create_issue_comment`, payload);
}

getIssue = async (owner, repo, issueNumber) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,10 @@ export default class CreateOrUpdateIssueModal extends PureComponent {
value: milestone_number,
label: milestone_title,
},
repo: {
name: repo_full_name,
},
issueDescription: description,
repo: repo_full_name,
issueTitle: title.substring(0, MAX_TITLE_LENGTH)});
}
}
Expand Down Expand Up @@ -151,29 +153,28 @@ export default class CreateOrUpdateIssueModal extends PureComponent {
handleIssueDescriptionChange = (issueDescription) => this.setState({issueDescription});

renderIssueAttributeSelectors = () => {
if (!this.state.repo || (this.state.repo.permissions && !this.state.repo.permissions.push)) {
if (!this.state.repo || !this.state.repo.name || (this.state.repo.permissions && !this.state.repo.permissions.push)) {
return null;
}

const repoName = this.state.repo.name ?? this.state.repo;
return (
<>
<GithubLabelSelector
repoName={repoName}
repoName={this.state.repo.name}
theme={this.props.theme}
selectedLabels={this.state.labels}
onChange={this.handleLabelsChange}
/>

<GithubAssigneeSelector
repoName={repoName}
repoName={this.state.repo.name}
theme={this.props.theme}
selectedAssignees={this.state.assignees}
onChange={this.handleAssigneesChange}
/>

<GithubMilestoneSelector
repoName={repoName}
repoName={this.state.repo.name}
theme={this.props.theme}
selectedMilestone={this.state.milestone}
onChange={this.handleMilestoneChange}
Expand Down