Repository navigation
LINDAT/Backport ufal: fill ${...} placeholders on the Terms of Service page - #1683
Merged
Merged
Conversation
…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
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>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
References
Description
Static pages replace
${key}with the backend config propertykey, so the Terms of Service page no longer shows raw${...}. Values are HTML-escaped.Instructions for Reviewers
List of changes in this PR:
-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 throughConfigurationDataService. A property that is not exposed, empty, or fails to load leaves the placeholder as it is.terms-of-service.htmlusesdescription.*instead oflr.description.*.clarin-v7.How to test: with the BE part deployed and
description.country/description.cityset inlocal.cfg, open/static/terms-of-service.html. You see the institution, location, country and city, no${...}.AI Disclosure
Claude Code made the cherry-picks and wrote this description. The touched files were diffed against ufal
clarin-v7.Checklist
mainbranch of code (unless it is a backport or is fixing an issue specific to an older branch).npm run lintnpm run check-circ-deps)package.json), I've made sure their licenses align with the DSpace BSD License based on the Licensing of Contributions documentation.🤖 Generated with Claude Code