[MM-380] Fix issue of todo permalink opening in new tab #251
There are no files selected for viewing
This file contains 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 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 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 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 |
|---|---|---|
|
|
@@ -58,8 +58,8 @@ func NewListManager(api plugin.API) ListManager { | |
| } | ||
| } | ||
|
|
||
| func (l *listManager) AddIssue(userID, message, postPermalink, description, postID string) (*Issue, error) { | ||
| issue := newIssue(message, postPermalink, description, postID) | ||
|
|
||
| if err := l.store.SaveIssue(issue); err != nil { | ||
| return nil, err | ||
|
|
@@ -75,13 +75,13 @@ func (l *listManager) AddIssue(userID, message, description, postID string) (*Is | |
| return issue, nil | ||
| } | ||
|
|
||
| func (l *listManager) SendIssue(senderID, receiverID, message, postPermalink, description, postID string) (string, error) { | ||
| senderIssue := newIssue(message, postPermalink, description, postID) | ||
| if err := l.store.SaveIssue(senderIssue); err != nil { | ||
| return "", err | ||
| } | ||
|
|
||
| receiverIssue := newIssue(message, postPermalink, description, postID) | ||
| if err := l.store.SaveIssue(receiverIssue); err != nil { | ||
| if rollbackError := l.store.RemoveIssue(senderIssue.ID); rollbackError != nil { | ||
| l.api.LogError("cannot rollback sender issue after send error, Err=", err.Error()) | ||
|
|
@@ -201,30 +201,30 @@ func (l *listManager) EditIssue(userID, issueID, newMessage, newDescription stri | |
| return ir.ForeignUserID, list, oldMessage, nil | ||
| } | ||
|
|
||
| func (l *listManager) ChangeAssignment(issueID string, userID string, sendTo string) (issue *Issue, oldOwner string, err error) { | ||
| issue, err = l.store.GetIssue(issueID) | ||
| if err != nil { | ||
| return nil, "", err | ||
| } | ||
|
|
||
| list, ir, _ := l.store.GetIssueListAndReference(userID, issueID) | ||
| if ir == nil { | ||
| return nil, "", errors.New("reference not found") | ||
| } | ||
|
|
||
| if (list == InListKey) || (ir.ForeignIssueID != "" && list == MyListKey) { | ||
| return nil, "", errors.New("trying to change the assignment of a todo not owned") | ||
| } | ||
|
|
||
| if ir.ForeignUserID != "" { | ||
| // Remove reference from foreign user | ||
| foreignList, foreignIR, _ := l.store.GetIssueListAndReference(ir.ForeignUserID, ir.ForeignIssueID) | ||
| if foreignIR == nil { | ||
| return nil, "", errors.New("reference not found") | ||
| } | ||
|
|
||
| if err := l.store.RemoveReference(ir.ForeignUserID, ir.ForeignIssueID, foreignList); err != nil { | ||
| return nil, "", err | ||
| } | ||
|
|
||
| _, err := l.store.GetAndRemoveIssue(ir.ForeignIssueID) | ||
|
|
@@ -235,34 +235,34 @@ func (l *listManager) ChangeAssignment(issueID string, userID string, sendTo str | |
|
|
||
| if userID == sendTo && list == OutListKey { | ||
| if err := l.store.RemoveReference(userID, issueID, OutListKey); err != nil { | ||
| return nil, "", err | ||
| } | ||
|
|
||
| if err := l.store.AddReference(userID, issueID, MyListKey, "", ""); err != nil { | ||
| return nil, "", err | ||
| } | ||
|
|
||
| return issue, ir.ForeignUserID, nil | ||
| } | ||
|
|
||
| if err := l.store.RemoveReference(userID, issueID, list); err != nil { | ||
| return nil, "", err | ||
| } | ||
|
|
||
| receiverIssue := newIssue(issue.Message, issue.PostPermalink, issue.Description, issue.PostID) | ||
|
There was a problem hiding this comment. Seems like this could just accept a There was a problem hiding this comment. @mickmister This function https://github.com/mattermost/mattermost-plugin-todo/blob/b8dff94f7bebfcb7f81f36f588f110e08e34ef9f/server/issue.go#L27 just return a new object with passed parameters value. At some places https://github.com/mattermost/mattermost-plugin-todo/blob/b8dff94f7bebfcb7f81f36f588f110e08e34ef9f/server/list.go#L62 we are passing the value directly instead of the case above |
||
| if err := l.store.SaveIssue(receiverIssue); err != nil { | ||
| return nil, "", err | ||
| } | ||
|
|
||
| if err := l.store.AddReference(userID, issueID, OutListKey, sendTo, receiverIssue.ID); err != nil { | ||
| return nil, "", err | ||
| } | ||
|
|
||
| if err := l.store.AddReference(sendTo, receiverIssue.ID, InListKey, userID, issue.ID); err != nil { | ||
| return nil, "", err | ||
| } | ||
|
|
||
| return issue, ir.ForeignUserID, nil | ||
| } | ||
|
|
||
| func (l *listManager) AcceptIssue(userID, issueID string) (todoMessage string, foreignUserID string, outErr error) { | ||
|
|
@@ -292,6 +292,10 @@ func (l *listManager) AcceptIssue(userID, issueID string) (todoMessage string, f | |
| return "", "", err | ||
| } | ||
|
|
||
| if issue.PostPermalink != "" { | ||
| issue.Message = fmt.Sprintf("%s\n[Permalink](%s)", issue.Message, issue.PostPermalink) | ||
| } | ||
|
|
||
| return issue.Message, ir.ForeignUserID, nil | ||
| } | ||
|
|
||
|
|
@@ -360,28 +364,28 @@ func (l *listManager) PopIssue(userID string) (issue *Issue, foreignID string, e | |
| return issue, ir.ForeignUserID, nil | ||
| } | ||
|
|
||
| func (l *listManager) BumpIssue(userID, issueID string) (todo *Issue, receiver string, foreignIssueID string, outErr error) { | ||
| ir, _, err := l.store.GetIssueReference(userID, issueID, OutListKey) | ||
| if err != nil { | ||
| return nil, "", "", err | ||
| } | ||
|
|
||
| if ir == nil { | ||
| return nil, "", "", fmt.Errorf("cannot find sender issue") | ||
| } | ||
|
|
||
| err = l.store.BumpReference(ir.ForeignUserID, ir.ForeignIssueID, InListKey) | ||
| if err != nil { | ||
| return nil, "", "", err | ||
| } | ||
|
|
||
| issue, err := l.store.GetIssue(ir.ForeignIssueID) | ||
| if err != nil { | ||
| l.api.LogError("cannot find foreigner issue after bump, Err=", err.Error()) | ||
| return nil, "", "", nil | ||
| } | ||
|
|
||
| return issue, ir.ForeignUserID, ir.ForeignIssueID, nil | ||
| } | ||
|
|
||
| func (l *listManager) GetUserName(userID string) string { | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
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.
What happens for posts that do not have this prop?
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.
If we don't have this prop, we won't have a permalink in the message in the
todosent to other user in the post