dspace-angular
dspace-angular copied to clipboard
Themed component fixes
Description
Moved 2 themed components in the custom theme that were in the incorrect folder. Also added a missing themed component template to the custom theme and fixed a small issue with the wrapper.
Instructions for Reviewers
List of changes in this PR:
- Moved the
ComcolPageHandleComponent&ComcolPageBrowseByComponentto thecomcolfolder insrc/themes/customlike insrc/appand fixed incorrect path inThemedComcolPageBrowseByComponent - Added
SearchComponent&ItemListPreviewComponenttemplate incustomtheme and added missing injection token to theThemedSearchComponent - ~~Replaced the remaing usages of
<ds-thumbnail>with<ds-themed-thumbnail>~~ Dropped this commit https://github.com/DSpace/dspace-angular/pull/2753/commits/7bf098332899368b8152d31aafddd91cd1cd0c20 in favor of the #2845 (might still be worth cherry-picking on the backport branch) - Created
ThemedComcolPageContentComponent,ThemedMetadataImportPageComponent,ThemedItemDetailPreviewFieldComponent&ThemedProfilePageMetadataFormComponent
Checklist
- [x] My PR is small in size (e.g. less than 1,000 lines of code, not including comments & specs/tests), or I have provided reasons as to why that's not possible.
- [x] My PR passes ESLint validation using
yarn lint - [x] My PR doesn't introduce circular dependencies (verified via
yarn check-circ-deps) - [x] My PR includes TypeDoc comments for all new (or modified) public methods and classes. It also includes TypeDoc for large or complex private methods.
- [x] My PR passes all specs/tests and includes new/updated specs or tests based on the Code Testing Guide.
- [x] If my PR includes new libraries/dependencies (in
package.json), I've made sure their licenses align with the DSpace BSD License based on the Licensing of Contributions documentation. - [x] If my PR includes new features or configurations, I've provided basic technical documentation in the PR itself.
- [x] If my PR fixes an issue ticket, I've linked them together.
Thanks @alexandrevryghem. I recently noticed there was no example of the ThemedItemListPreviewComponent in the custom theme either. If you want to add that here...
Hi @alexandrevryghem, Conflicts have been detected against the base branch. Please resolve these conflicts as soon as you can. Thanks!
Hi @alexandrevryghem, Conflicts have been detected against the base branch. Please resolve these conflicts as soon as you can. Thanks!
Hi @alexandrevryghem, Conflicts have been detected against the base branch. Please resolve these conflicts as soon as you can. Thanks!
Hi @alexandrevryghem, Conflicts have been detected against the base branch. Please resolve these conflicts as soon as you can. Thanks!
Hi @alexandrevryghem, Conflicts have been detected against the base branch. Please resolve these conflicts as soon as you can. Thanks!
Hi @alexandrevryghem, Conflicts have been detected against the base branch. Please resolve these conflicts as soon as you can. Thanks!
Hi @alexandrevryghem, Conflicts have been detected against the base branch. Please resolve these conflicts as soon as you can. Thanks!
@tdonohue: Thnx for the feedback, both issues are now fixed
@tdonohue: Sry that component looked like it was pointing to the correct template, but actually it was still pointing to the HTML of the custom theme. I also found one other small mistake in ThemedComcolPageContentComponent but now everything should work 🤞
Backport failed for dspace-7_x, because it was unable to cherry-pick the commit(s).
Please cherry-pick the changes locally and resolve any conflicts.
git fetch origin dspace-7_x
git worktree add -d .worktree/backport-2753-to-dspace-7_x origin/dspace-7_x
cd .worktree/backport-2753-to-dspace-7_x
git switch --create backport-2753-to-dspace-7_x
git cherry-pick -x 22b596b3aa7fc1fe6b2b0d1228bd8bf8393becb7 106182d5fd61630a202d66929dcc97235e5db195 7ee425e4a375bfafe509def7d8492189fd0d51b5 5d123277b014b24943a5c3947c8c6493db69f379 8bf7e4fb5aab029ec2405a8ed6a698499edff691 7bf098332899368b8152d31aafddd91cd1cd0c20 7abf37cbeabef9379290a2097f7315cd615751cb 676400625306e96df290038c7fbf694a97716f58 f5f00ca24a36cfba87c8a66ee152be2f9ecefb48 70000353030bee598305300fd1639659cc258036 8b29a7189bb2eb42ca5f101d9343ec87aa949041 20e96ac9bcf3939495d01b74a728a8ca1e69a5a4 4c4531fe1e2107809f7d45b7ff297b7cbcc1dbe9 83fbf8b02bf0af0b9318626e0a3869e1b1dc34b2 c24e58eb667221aa10b55d81ed5f4ae3b17feda5
@alexandrevryghem : Because of the number of commits in this PR, this failed to be auto-backported to 7.x If you find time to create a backport PR, we can include it. Or, if that proves to be too complex, we also could consider this a change that is only available in 8.0.