Skip to content

Migrated remaining bootstrap 4 classes & other minor css fixes#4538

Merged
tdonohue merged 5 commits intoDSpace:mainfrom
alexandrevryghem:bootstrap-issues_contribute-main
Jul 8, 2025
Merged

Migrated remaining bootstrap 4 classes & other minor css fixes#4538
tdonohue merged 5 commits intoDSpace:mainfrom
alexandrevryghem:bootstrap-issues_contribute-main

Conversation

@alexandrevryghem
Copy link
Copy Markdown
Member

References

Description

Replaced the remaining bootstrap 4 classes with their matching bootstrap 5 classes. I also ran the ng generate @angular/core:control-flow command again on the whole code base to auto-fix the last remaining issues, they were all import fixes. I also fixed some other small layout issues I encountered when I went over the changes (like the bundle section from the edit bitstream page & centering the authority icon vertically in the submission form fields).

Instructions for Reviewers

List of changes in this PR:

  • Replaced all the old bootstrap 4 classes with their bootstrap 5 equivalent (full migration guide)
  • Ran the ng generate @angular/core:control-flow again on the whole code base, due to the lint rules there are no *ngIfs anymore, so the only changes it suggested were to import individual imports instead of the whole CommonModule for example when you only need one import from that module.

Guidance for how to test or review this PR:

  • Go over the html changes and verify that everything is now fixed e.g:
    • The advanced search section should have a dropdown arrow again
    • The accessibility settings page should have proper spacing again
    • The create LDN service confirmation modal should be properly styled again
    • The pagination settings on the edit item bitstreams tab should show the whole dropdown modal even when there are very few bitstreams (e.g. only one bitstream and one bundle for example)
    • ...

Checklist

  • My PR is created against the main branch of code (unless it is a backport or is fixing an issue specific to an older branch).
  • 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.
  • My PR passes ESLint validation using npm run lint
  • My PR doesn't introduce circular dependencies (verified via npm run check-circ-deps)
  • My PR includes TypeDoc comments for all new (or modified) public methods and classes. It also includes TypeDoc for large or complex private methods.
  • My PR passes all specs/tests and includes new/updated specs or tests based on the Code Testing Guide.
  • My PR aligns with Accessibility guidelines if it makes changes to the user interface.
  • My PR uses i18n (internationalization) keys instead of hardcoded English text, to allow for translations.
  • My PR includes details on how to test it. I've provided clear instructions to reviewers on how to successfully test this fix or feature.
  • 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.
  • If my PR includes new features or configurations, I've provided basic technical documentation in the PR itself.
  • If my PR fixes an issue ticket, I've linked them together.

@alexandrevryghem alexandrevryghem self-assigned this Jul 8, 2025
@alexandrevryghem alexandrevryghem added code task ux User Experience related works labels Jul 8, 2025
@alexandrevryghem alexandrevryghem force-pushed the bootstrap-issues_contribute-main branch from e1a41ae to f5ea04a Compare July 8, 2025 14:29
@tdonohue
Copy link
Copy Markdown
Member

tdonohue commented Jul 8, 2025

@alexandrevryghem : This PR appears to have broken a few e2e tests. Both my-dspace.cy.ts and submission.cy.ts now have failures.

@alexandrevryghem alexandrevryghem force-pushed the bootstrap-issues_contribute-main branch from f5ea04a to a59dc5a Compare July 8, 2025 16:55
@tdonohue tdonohue added the port to dspace-9_x This PR needs to be ported to `dspace-9_x` branch for next bug-fix release label Jul 8, 2025
@tdonohue tdonohue moved this to 🙋 Needs Reviewers Assigned in DSpace 10.0 Release Jul 8, 2025
@tdonohue tdonohue added the 1 APPROVAL pull request only requires a single approval to merge label Jul 8, 2025
@tdonohue tdonohue self-requested a review July 8, 2025 19:39
Copy link
Copy Markdown
Member

@tdonohue tdonohue left a comment

Choose a reason for hiding this comment

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

👍 Thanks @alexandrevryghem ! I gave this a test today, and did my best to test each of the modified components (to verify no odd styles or similar). It all looks good to me now.

@github-project-automation github-project-automation bot moved this from 🙋 Needs Reviewers Assigned to 👍 Reviewer Approved in DSpace 10.0 Release Jul 8, 2025
@tdonohue tdonohue added this to the 10.0 milestone Jul 8, 2025
@tdonohue tdonohue merged commit c51fc63 into DSpace:main Jul 8, 2025
15 checks passed
@github-project-automation github-project-automation bot moved this from 👍 Reviewer Approved to ✅ Done in DSpace 10.0 Release Jul 8, 2025
@dspace-bot
Copy link
Copy Markdown
Contributor

Backport failed for dspace-9_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-9_x
git worktree add -d .worktree/backport-4538-to-dspace-9_x origin/dspace-9_x
cd .worktree/backport-4538-to-dspace-9_x
git switch --create backport-4538-to-dspace-9_x
git cherry-pick -x 45934e31f258221247eac7acdf1ce330ab0d0475 b4d694e0c0cf47fdb40a2e0f6c29847d7898f0fb e3b54056982e8ca120a7a99456a5fc53ef8c8eb9

@tdonohue
Copy link
Copy Markdown
Member

tdonohue commented Jul 8, 2025

@alexandrevryghem : Could you manually backport this to the dspace-9_x branch? I'm surprised it didn't backport automatically, but there must be some difference between main and dspace-9_x which is causing this PR issues.

@tdonohue
Copy link
Copy Markdown
Member

tdonohue commented Jul 9, 2025

@alexandrevryghem : If you can find time to port this to dspace-9_x, I'd love to include this in 9.1. However, 9.1 is likely coming out later this week or early next...if it misses that release, it'll have to wait for 9.2.

@alexandrevryghem alexandrevryghem deleted the bootstrap-issues_contribute-main branch July 9, 2025 22:43
@alexandrevryghem alexandrevryghem removed the port to dspace-9_x This PR needs to be ported to `dspace-9_x` branch for next bug-fix release label Jul 10, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

1 APPROVAL pull request only requires a single approval to merge code task ux User Experience related works

Projects

Status: ✅ Done

Development

Successfully merging this pull request may close these issues.

3 participants