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

Feat/clearer diffs #1910

Merged
merged 33 commits into from
May 24, 2024
Merged

Feat/clearer diffs #1910

merged 33 commits into from
May 24, 2024

Conversation

mikevespi
Copy link
Contributor

This PR updates the way the custom diff fields represent the changes. The fields will now show the latest committed state (if any), and what will be changed/added/removed in the committing project revision. The intent is that it will be easier for users to discern what they will be changing about a project when applying a revision by avoiding showing them any intermittent states the project may have been in between the revision being created, and now.

@mikevespi mikevespi force-pushed the feat/clearer-diffs branch from 473f4ad to a58d853 Compare May 21, 2024 01:15
@mikevespi mikevespi marked this pull request as ready for review May 21, 2024 02:51
@mikevespi mikevespi force-pushed the feat/clearer-diffs branch from a5d14ec to 32bd1d3 Compare May 22, 2024 22:25
mikevespi added 27 commits May 22, 2024 20:40
@mikevespi mikevespi force-pushed the feat/clearer-diffs branch from 32bd1d3 to 62785eb Compare May 23, 2024 03:41
Copy link
Contributor

@pbastia pbastia left a comment

Choose a reason for hiding this comment

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

Slick!! This is a bunch of fantastic work.
Just nitpicking about a couple of comments, we don't have to fix them

@@ -65,6 +67,12 @@ const AttachmentTableRow: React.FC<Props> = ({
return (
<>
<tr>
{operation && (
<td>
{operation.charAt(0).toUpperCase() +
Copy link
Contributor

Choose a reason for hiding this comment

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

Nice! This will help clarify for our users

Comment on lines +58 to +59
formDataTableName: "reporting_requirement"
reportType: "TEIMP"
Copy link
Contributor

Choose a reason for hiding this comment

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

This was a bug the whole time, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It was, so these would always have been showing up as new and the previous data in tests was always empty

},
latestCommittedReportMap[
milestoneReport.newFormData.reportingRequirementIndex
]
Copy link
Contributor

Choose a reason for hiding this comment

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

Sweet, I think this was missing in the first place right?

Comment on lines 74 to 75
proponentsSharePercentage: 10, // will trigger three diffs
totalProjectValue: 12, // will trigger three diffs
Copy link
Contributor

Choose a reason for hiding this comment

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

Comment needs adjusting, we don't display three diffs anymore

@mikevespi mikevespi merged commit 74fdbe9 into develop May 24, 2024
17 checks passed
@mikevespi mikevespi deleted the feat/clearer-diffs branch May 24, 2024 20:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants