Skip to content

LINDAT/Backport ufal: fill ${...} placeholders on the Terms of Service page - #1683

Merged
milanmajchrak merged 2 commits into
customer/lindatfrom
lindat/fe-ufal-tos-placeholders
Nov 2, 2026
Merged

milanmajchrak merged 2 commits into
customer/lindatfrom
lindat/fe-ufal-tos-placeholders

Conversation

@milanmajchrak

@milanmajchrak milanmajchrak commented Nov 2, 2026 •

Copy link
Copy Markdown
Collaborator

References

  • Backport of ufal/dspace-angular PR 185 and PR 188, issue 184 (ufal commits 45ab229, 550ec11)
  • BE part: dataquest-dev/DSpace PR 1595 (ufal/clarin-dspace PR 1424). 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:

  • Two ufal commits cherry-picked with -x, no conflicts. The second one replaces the first one's FE config with backend properties, so the net change is 3 files.
  • 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.*.
  • All 3 files are the same as on ufal clarin-v7.

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

AI Disclosure

  • No
  • Yes

Claude Code made the cherry-picks and wrote this description. The touched files were diffed against ufal clarin-v7.

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

amadulhaxxani and others added 2 commits November 2, 2026 08:58
…ngular PR 185)

Co-authored-by: Ondřej Košarko <kosarko@ufal.mff.cuni.cz>
(cherry picked from commit 45ab229)
…(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)
@milanmajchrak
milanmajchrak merged commit 544e127 into customer/lindat Nov 2, 2026
5 checks passed
milanmajchrak added a commit that referenced this pull request Nov 10, 2026
…e page (#1683) (#1697)

* 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: milanmajchrak <90026355+milanmajchrak@users.noreply.github.com>
Co-authored-by: Amad Ul Hassan <hassan@ufal.mff.cuni.cz>
Co-authored-by: Ondřej Košarko <kosarko@ufal.mff.cuni.cz>
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.

3 participants