Skip to content

[Port to dtq-dev-767-base] Fill ${...} placeholders on the Terms of Service page - #1721

Merged
milanmajchrak merged 1 commit into
dtq-dev-767-basefrom
767-base/fe-port-lindat-1683
Nov 10, 2026
Merged

milanmajchrak merged 1 commit into
dtq-dev-767-basefrom
767-base/fe-port-lindat-1683

Conversation

@milanmajchrak

Copy link
Copy Markdown
Collaborator

References

  • Port of dataquest-dev/dspace-angular PR 1683 from customer/lindat (commit 544e127), the same commit as PR 1697 for dtq-dev
  • Originally ufal/dspace-angular PR 185 and PR 188, issue 184
  • Needs the BE part: dataquest-dev/DSpace PR 1661. Without it the page shows the raw placeholders.

Description

Static pages replace ${key} with the backend config property key, so the Terms of Service page no longer shows raw ${...}. Values are HTML-escaped.

Instructions for Reviewers

List of changes in this PR:

  • Commit 544e127 cherry-picked with -x, no conflicts. All 3 files are byte-identical to dtq-dev (f590749).
  • StaticPageComponent.interpolateVariables() reads each placeholder through ConfigurationDataService. A property that is not exposed, empty, or fails to load leaves the placeholder as it is.
  • terms-of-service.html uses description.* instead of lr.description.*.
  • This branch has no default values for description.*. Each deployment sets them in the backend local.cfg.
  • Lint and specs were not run locally, they are left to CI.

How to test: with the BE part deployed and the four description.* keys set in local.cfg, open /static/terms-of-service.html. You see the institution, location, country and city, no ${...}.

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 follows all coding best practices based on the Code Conventions Guide
  • 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.

🤖 Generated with Claude Code

…e page

* fix(static-page): interpolate  placeholders from config (ufal/dspace-angular PR 185)

(cherry picked from commit 45ab229)

* fix(static-page): read ${...} placeholder values from backend config (ufal/dspace-angular PR 188)

Fill the Terms of Service placeholders from /api/config/properties instead of
a new staticPage UI config section, as XMLUI did. Rename the placeholders to
the backend keys (description.*), join comma-split values with ", ", and
leave a placeholder as is when the property is missing or fails to load.
Requires ufal/clarin-dspace PR 1424.

(cherry picked from commit 550ec11)

---------

(cherry picked from commit 544e127)

Co-authored-by: Ondřej Košarko <kosarko@ufal.mff.cuni.cz>
Co-authored-by: Amad Ul Hassan <hassan@ufal.mff.cuni.cz>
Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
@milanmajchrak
milanmajchrak merged commit 5548887 into dtq-dev-767-base Nov 10, 2026
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant