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

[mm-66, mm-12, mm-47] - resolves all three issues #85

Closed

Conversation

maisnamrajusingh
Copy link
Contributor

@maisnamrajusingh maisnamrajusingh commented Jul 29, 2021

Summary

This PR adds the date selection UI, the ability to requeue and item for the next meeting and updates the agenda items on deletion. The PRs were supposed to go out separately but things got intertwined because things would need to change in the subsequent issues that we worked on. Please bear this one @mickmister.

Ticket Link

#12 - Re-queue an item for next meeting
#66 - Improve date format selection UI
#47 - Agenda item number should get updated if the items of the agenda are deleted

@maisnamrajusingh
Copy link
Contributor Author

@mickmister sorry the lint failed. Let me fix this first before you review it.

@codecov
Copy link

codecov bot commented Jul 30, 2021

Codecov Report

Merging #85 (2b97830) into master (2f22484) will decrease coverage by 4.83%.
The diff coverage is 5.83%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master      #85      +/-   ##
==========================================
- Coverage   26.03%   21.19%   -4.84%     
==========================================
  Files           7        7              
  Lines         315      453     +138     
==========================================
+ Hits           82       96      +14     
- Misses        216      339     +123     
- Partials       17       18       +1     
Impacted Files Coverage Δ
server/command.go 0.00% <0.00%> (ø)
server/utils.go 62.74% <0.00%> (-31.20%) ⬇️
server/meeting.go 62.06% <50.00%> (-0.98%) ⬇️
server/main.go 0.00% <0.00%> (ø)
server/manifest.go 100.00% <0.00%> (ø)
server/configuration.go 0.00% <0.00%> (ø)
server/plugin.go 25.74% <0.00%> (+3.16%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2f22484...2b97830. Read the comment docs.

Copy link
Contributor

@mickmister mickmister left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @maisnamrajusingh, I've skimmed over the PR, and I think it would be much more straightforward to review this if the PRs were split up. We can talk through this on Mattermost or video call to see how we can split up the code. What do you think? Sorry for my late response on this.

Comment on lines +97 to +100
if (!currentChannel) {
currentChannel = await Client4.getChannelByName(currentTeamId, 'town-square');
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mattermost has loaded if we are running this command right?

Copy link
Contributor

@sanjaydemansol sanjaydemansol Aug 4, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we skip this check?

try {
//@ts-ignore Typing in mattermost-redux is wrong
return Client4.executeCommand(command, args);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we use the action at mattermost-redux/actions/integrations.ts instead of accessing the client directly here?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, will replace with suggested one.


try {
//@ts-ignore Typing in mattermost-redux is wrong
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you explain why the typing is wrong? What error is it giving, and how does it differ from what you expect?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(R1)

@@ -17,8 +17,9 @@ export default class MeetingSettingsModal extends React.PureComponent {
super(props);

this.state = {
hashtag: '{{Jan02}}',
hashtagPrefix: 'Prefix',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like everything in this file is scoped to #66

@@ -1,5 +1,5 @@

import {updateSearchTerms, updateSearchResultsTerms, updateRhsState, performSearch, openMeetingSettingsModal} from './actions';
import {updateSearchTerms, updateSearchResultsTerms, updateRhsState, performSearch, openMeetingSettingsModal, requeueItem} from './actions';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is scoped to #12

}

export function requeueItem(itemId) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is scoped to #12

}
//---- requeue Logic
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we remove this line?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure

@mickmister
Copy link
Contributor

@maisnamrajusingh @sanjaydemansol Since the code is mixed together as it currently stands, it's difficult to compartmentalize which features are being reviewed with each block of code. If you can, please take another attempt at separating the code out separately. If the features were implemented in succession, then you can use the different commits as base branches for the sequential PRs.

For instance, the first commit says it fixes #66. Does this mean that commit can be used as a PR for that issue? Then you can use that branch as the base branch for the next PR, and do the same for the next feature. It's unfortunate that the completed work is currently in this form, but this is a way to separate it out into individual reviews. Ideally the code is just separated because these features don't seem very related.

@sanjaydemansol please mention me on replies to comments on GitHub. Since I'm not the PR author, I won't get notifications for the comments unless I'm mentioned.

@maisnamrajusingh
Copy link
Contributor Author

@maisnamrajusingh @sanjaydemansol Since the code is mixed together as it currently stands, it's difficult to compartmentalize which features are being reviewed with each block of code. If you can, please take another attempt at separating the code out separately. If the features were implemented in succession, then you can use the different commits as base branches for the sequential PRs.

For instance, the first commit says it fixes #66. Does this mean that commit can be used as a PR for that issue? Then you can use that branch as the base branch for the next PR, and do the same for the next feature. It's unfortunate that the completed work is currently in this form, but this is a way to separate it out into individual reviews. Ideally the code is just separated because these features don't seem very related.

@sanjaydemansol please mention me on replies to comments on GitHub. Since I'm not the PR author, I won't get notifications for the comments unless I'm mentioned.

I think Sanjay is already doing this but I'll just confirm. Will close the PR for now.

@hanzei hanzei added Invalid This doesn't seem right and removed 2: Dev Review Requires review by a core committer labels Sep 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Invalid This doesn't seem right
Projects
None yet
4 participants