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

remove duplicate properties keys #9718

Merged
merged 12 commits into from
Jul 1, 2024

Conversation

stevenferey
Copy link
Contributor

What this PR does / why we need it:

Remove duplicate property keys from property files

Which issue(s) this PR closes:

Closes #9169

Special notes for your reviewer:

Suggestions on how to test this:

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

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

No

Additional documentation:

@pdurbin
Copy link
Member

pdurbin commented Jul 19, 2023

@stevenferey thanks for the pull request!

I have no idea why but edu.harvard.iq.dataverse.api.FilesIT.testAccessFacet failed:

Screen Shot 2023-07-19 at 4 45 44 PM

From https://jenkins.dataverse.org/job/IQSS-Dataverse-Develop-PR/job/PR-9718/1/testReport/junit/edu.harvard.iq.dataverse.api/FilesIT/testAccessFacet/

@pdurbin
Copy link
Member

pdurbin commented Jul 19, 2023

/push-image

@github-actions
Copy link

📦 Pushed preview images as

ghcr.io/gdcc/dataverse:9169-duplicate-property-key
ghcr.io/gdcc/configbaker:9169-duplicate-property-key

🚢 See on GHCR. Use by referencing with full name as printed above, mind the registry name.

@qqmyers
Copy link
Member

qqmyers commented Jul 19, 2023

FWIW: I've seen this on another PR - #9599. Not sure what it is yet.

Copy link
Member

@qqmyers qqmyers left a comment

Choose a reason for hiding this comment

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

Yep, all duplicates - thanks for the cleanup!

@qqmyers qqmyers added the Size: 0.5 A percentage of a sprint. 0.35 hours label Dec 13, 2023
@pdurbin pdurbin added the Component: Code Infrastructure formerly "Feature: Code Infrastructure" label Feb 28, 2024
@@ -952,7 +952,6 @@ advanced.search.header.datasets=Datasets
advanced.search.header.files=Files
advanced.search.files.name.tip=The name given to identify the file.
advanced.search.files.description.tip=A summary describing the file and its variables.
advanced.search.files.persistentId.tip=The persistent identifier for the file.
advanced.search.files.persistentId=Data File Persistent ID
advanced.search.files.persistentId.tip=The unique persistent identifier for a data file, which can be a Handle or DOI in Dataverse.
Copy link
Member

Choose a reason for hiding this comment

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

Given that we now allow PermaLinks and people can add new PID types, perhaps the shorter version is better? i.e. keep line 955 and remove this one?

@@ -961,7 +960,6 @@ advanced.search.files.variableName=Variable Name
advanced.search.files.variableName.tip=The name of the variable's column in the data frame.
advanced.search.files.variableLabel=Variable Label
advanced.search.files.variableLabel.tip=A short description of the variable.
advanced.search.datasets.persistentId.tip=The persistent identifier for the Dataset.
advanced.search.datasets.persistentId=Persistent Identifier
advanced.search.datasets.persistentId.tip=The Dataset's unique persistent identifier, either a DOI or Handle
Copy link
Member

Choose a reason for hiding this comment

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

Same idea - Given that we now allow PermaLinks and people can add new PID types, perhaps the shorter version is better? i.e. keep line 964 and remove this one?

Copy link
Contributor

Choose a reason for hiding this comment

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

I think this would resolve #9740, too

Copy link
Member

@qqmyers qqmyers left a comment

Choose a reason for hiding this comment

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

@stevenferey - Can you flip which lines are kept as requested in the comments? Assuming that's OK, we can move this forward once you're done. It will probably need a merge with develop too to pick up the v6.2 tag so the war can be built/IT tests will run.

@qqmyers
Copy link
Member

qqmyers commented Jun 17, 2024

@stevenferey - can you make the changes requested above so this can move forward. (If not, let us know if you're OK with the change and we can get someone else to edit.)

Assuming the change is OK with the submitter so we can move this forward
Copy link
Member

@qqmyers qqmyers left a comment

Choose a reason for hiding this comment

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

I've gone ahead and changed to use the shorter versions of two duplicates (ones that don't mention DOIs and Handles which should also now include PermaLinks, etc.). With that - the other changes look good and this should be able to move forward.

@stevenwinship stevenwinship self-assigned this Jul 1, 2024
@stevenwinship stevenwinship merged commit 1026a3a into IQSS:develop Jul 1, 2024
1 of 2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component: Code Infrastructure formerly "Feature: Code Infrastructure" Size: 0.5 A percentage of a sprint. 0.35 hours
Projects
Status: 🚀 Done (Recherche Data Gouv)
Development

Successfully merging this pull request may close these issues.

Duplicate property key in Bundle.properties file V5.12.1
5 participants