Skip to content

9913 template preview - fix display of Terms of Access#9967

Merged
kcondon merged 7 commits intodevelopfrom
9913-template-preview
Oct 2, 2023
Merged

9913 template preview - fix display of Terms of Access#9967
kcondon merged 7 commits intodevelopfrom
9913-template-preview

Conversation

@sekmiller
Copy link
Contributor

@sekmiller sekmiller commented Sep 28, 2023

What this PR does / why we need it:
Allows Terms of Access to display on template view/preview

Which issue(s) this PR closes:

Closes #9913 template preview should display terms of access, etc.
Closes #8918 Template View issues.
Closes #8781 Collapse not working for Restricted files TOA

Special notes for your reviewer:

Suggestions on how to test this:
Add terms of access and see that it is displayed with preview on the manage templates page

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

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

Additional documentation: none

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.

Haven't tested but I did walk through code to identify that the DatasetPage.restrictedFileCount > 0 was what was shutting this off in the template preview and this fix looks like it should work - easy to see in QA.

@sekmiller
Copy link
Contributor Author

I'm going to pull this back because Gustavo asked me to take a look at related issues to see if they would be fixed by this or if they are low-hanging fruit to add to this, but thanks for the quick action @qqmyers

also fix various render issues.
@coveralls
Copy link

coveralls commented Sep 28, 2023

Coverage Status

coverage: 19.908%. remained the same when pulling 973e471 on 9913-template-preview into c26e1e7 on develop.

@sekmiller
Copy link
Contributor Author

@qqmyers can you take another look at this in light of #8918 ? Thanks!

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.

Looks good - one question about the request access selected entry showing on the template page.

@github-actions

This comment has been minimized.

@github-actions

This comment has been minimized.

@github-actions
Copy link

github-actions bot commented Oct 2, 2023

📦 Pushed preview images as

ghcr.io/gdcc/dataverse:9913-template-preview
ghcr.io/gdcc/configbaker:9913-template-preview

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

@kcondon kcondon assigned kcondon and unassigned qqmyers Oct 2, 2023
@kcondon kcondon merged commit e420d68 into develop Oct 2, 2023
@kcondon kcondon deleted the 9913-template-preview branch October 2, 2023 19:38
@pdurbin pdurbin added this to the 6.1 milestone Oct 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

5 participants