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

Ordering subfields while displaying dataset version differences #10969

Conversation

luddaniel
Copy link
Contributor

What this PR does / why we need it:

Ordering subfields while displaying dataset version differences

Which issue(s) this PR closes:

Special notes for your reviewer:

This code looks NullPointerException safe so I didn't overprotect it.

Suggestions on how to test this:

Create multiple versions by modifying the subfields each time and checking the operation with the comparison pop-up.

Does this PR introduce a user interface change? If mockups are available, please link/include them here:

Before:
Screenshot from 2024-10-25 15-42-39

After:
Screenshot from 2024-10-25 16-08-02

Is there a release notes update needed for this change?:

yes

@coveralls
Copy link

coveralls commented Oct 25, 2024

Coverage Status

coverage: 20.878% (-0.003%) from 20.881%
when pulling b3147a0 on Recherche-Data-Gouv:10968-order-subfields-version-difference
into 03538f0 on IQSS:develop.

@pdurbin pdurbin added Type: Bug a defect Size: 3 A percentage of a sprint. 2.1 hours. labels Oct 25, 2024
@pdurbin
Copy link
Member

pdurbin commented Oct 25, 2024

@luddaniel thanks for the PR! Any idea why we are seeing has this error?

org.opentest4j.AssertionFailedError: expected: <8> but was: <7>
	at org.junit.jupiter.api.AssertionFailureBuilder.build(AssertionFailureBuilder.java:151)
	at org.junit.jupiter.api.AssertionFailureBuilder.buildAndThrow(AssertionFailureBuilder.java:132)
	at org.junit.jupiter.api.AssertEquals.failNotEqual(AssertEquals.java:197)
	at org.junit.jupiter.api.AssertEquals.assertEquals(AssertEquals.java:150)
	at org.junit.jupiter.api.AssertEquals.assertEquals(AssertEquals.java:145)
	at org.junit.jupiter.api.Assertions.assertEquals(Assertions.java:531)
	at edu.harvard.iq.dataverse.api.HarvestingClientsIT.harvestingClientRun(HarvestingClientsIT.java:301)

@landreev
Copy link
Contributor

It's very unlikely, for anything in this PR to cause that test to fail. It is known to be a little flaky - let me take a quick look.
I also kicked off Jenkins to run one more time.

@landreev
Copy link
Contributor

(seeing how Jenkins tests did succeed once earlier today, on the same branch minus the release note, I am not too worried about it)

@landreev
Copy link
Contributor

It has just passed again (build #3). Somebody, merge it please before it breaks again.

@pdurbin
Copy link
Member

pdurbin commented Oct 25, 2024

Ha, well, I did put it in our new "ready for triage" column which we now look at as a team on Tuesdays, I believe.

It looks like there's the potential for merge conflicts with this PR:

@ofahimIQSS ofahimIQSS added the FY25 Sprint 9 FY25 Sprint 9 (2024-10-23 - 2024-11-06) label Oct 29, 2024
@stevenwinship stevenwinship self-assigned this Nov 4, 2024
Copy link
Contributor

@stevenwinship stevenwinship left a comment

Choose a reason for hiding this comment

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

I also checked the possibility of a merge conflict but did see any with code or tests

@stevenwinship stevenwinship removed their assignment Nov 4, 2024
@ofahimIQSS ofahimIQSS self-assigned this Nov 5, 2024
@ofahimIQSS
Copy link
Contributor

ofahimIQSS commented Nov 5, 2024

@luddaniel After pushing the fix to Internal and testing it, I noticed that the issue is still observed. See screenshots along with test steps below:

image
image

Test Steps:

  1. Go to https://dataverse-internal.iq.harvard.edu/
  2. Create new dataset and populate required fields.
  3. Populate Keyword section with data below (see screenshot)
    image
  4. Save and publish data set
  5. Edit Metadata for dataset and add two more terms (see screenshot below)
    image
  6. Save the dataset then go to versions tab
  7. For the Dataset Version Draft, click on view details under summary

@luddaniel
Copy link
Contributor Author

luddaniel commented Nov 6, 2024

Hi @ofahimIQSS Maybe my eyes trick me but it looks to work as expected :)

@ofahimIQSS
Copy link
Contributor

Merging PR - Testing Passed.
Testing of 10969.docx

@luddaniel Thank you!

@ofahimIQSS ofahimIQSS merged commit e208eed into IQSS:develop Nov 6, 2024
11 checks passed
@ofahimIQSS ofahimIQSS removed their assignment Nov 6, 2024
@pdurbin pdurbin added this to the 6.5 milestone Nov 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
FY25 Sprint 9 FY25 Sprint 9 (2024-10-23 - 2024-11-06) Size: 3 A percentage of a sprint. 2.1 hours. Type: Bug a defect
Projects
Status: Done 🧹
Status: 🚀 Done (Recherche Data Gouv)
Development

Successfully merging this pull request may close these issues.

Unordered metadata subfields in dataset version differences details
6 participants