Localization: Adds termOrDefault() method to accept a fallback value#20947
Localization: Adds termOrDefault() method to accept a fallback value#20947leekelleher merged 9 commits intomainfrom
termOrDefault() method to accept a fallback value#20947Conversation
…if the translation does not exist
…te' to contain number of re-renders
There was a problem hiding this comment.
Pull request overview
This PR introduces a new termOrDefault() method to the UmbLocalizationController that provides a cleaner way to detect missing translations by accepting a fallback value, mirroring Umbraco's C# pattern. The implementation refactors the existing term() method to extract common logic into two private helper methods (#lookupTerm() and #processTerm()), improving code reusability. Additionally, the localization elements (umb-localize, umb-localize-number, umb-localize-relative-time) were updated to use the new method and the when() directive for more efficient conditional rendering.
Key Changes:
- Added
termOrDefault()method that returns a specified default value instead of the key when translation is not found - Refactored localization lookup and processing into reusable private helper methods
- Updated localization elements to use
when()directive to prevent double getter evaluation
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 5 comments.
Show a summary per file
| File | Description |
|---|---|
localization.controller.ts |
Added termOrDefault() method and refactored term() and string() methods to use extracted #lookupTerm() and #processTerm() helpers |
localization.controller.test.ts |
Added 8 comprehensive tests covering termOrDefault() scenarios including missing keys, arguments, function-based translations, and fallback resolution |
localize.element.ts |
Updated to use termOrDefault(key, null) for cleaner null checking and when() directive for rendering |
localize-number.element.ts |
Changed to use when() directive and added explicit type: Object for options property |
localize-relative-time.element.ts |
Changed to use when() directive for consistent rendering pattern |
src/Umbraco.Web.UI.Client/src/packages/core/localization/localize-number.element.ts
Outdated
Show resolved
Hide resolved
src/Umbraco.Web.UI.Client/src/packages/core/localization/localize-relative-time.element.ts
Outdated
Show resolved
Hide resolved
src/Umbraco.Web.UI.Client/src/libs/localization-api/localization.controller.ts
Show resolved
Hide resolved
src/Umbraco.Web.UI.Client/src/libs/localization-api/localization.controller.ts
Outdated
Show resolved
Hide resolved
Co-authored-by: Copilot <[email protected]>
leekelleher
left a comment
There was a problem hiding this comment.
Tested out, all working as described! 🚀
Updated [Umbraco.Cms.Persistence.Sqlite](https://github.com/umbraco/Umbraco-CMS) from 17.0.2 to 17.1.0. <details> <summary>Release notes</summary> _Sourced from [Umbraco.Cms.Persistence.Sqlite's releases](https://github.com/umbraco/Umbraco-CMS/releases)._ ## 17.1.0 # What's Changed Since 17.1.0-rc ### 🐛 Bug Fixes * Media: Fix files not deleted from disk when recycle bin protection is enabled by @AndyButland in umbraco/Umbraco-CMS#21309 * Document Editing: Refactor of Fix property variation change breaking document save via Infinite Editing (closes #21195) by @nielslyngsoe in umbraco/Umbraco-CMS#21293 * umbraco/Umbraco-CMS#21306 by @calm329 in umbraco/Umbraco-CMS#21306 **Full Changelog**: umbraco/Umbraco-CMS@release-17.1.0-rc...release-17.1.0 ## What's Changed Since the Last Release (17.0.2) ### 📦 Dependencies * Dependencies: Fixed dependency conflicts when installing Microsoft.EntityFrameworkCore.Design (closes #20421) by @lauraneto in umbraco/Umbraco-CMS#20474 * Dependencies: Remove `Microsoft.CodeAnalysis.CSharp` dependency from Umbraco.Infrastructure by @lauraneto in umbraco/Umbraco-CMS#20481 * build(deps): bumps @umbraco-ui/uui from 1.16.0-rc.0 to 1.16.0 by @iOvergaard in umbraco/Umbraco-CMS#20535 * Bump vite from 7.1.9 to 7.1.11 in /src/Umbraco.Web.UI.Client by @dependabot[bot] in umbraco/Umbraco-CMS#20580 * Bump vite from 7.1.9 to 7.1.11 in /src/Umbraco.Web.UI.Login by @dependabot[bot] in umbraco/Umbraco-CMS#20621 * Bump playwright and @playwright/test in /tests/Umbraco.Tests.AcceptanceTest by @dependabot[bot] in umbraco/Umbraco-CMS#20579 * Bump the npm_and_yarn group across 2 directories with 1 update by @dependabot[bot] in umbraco/Umbraco-CMS#20863 * Dependencies: Updates some dependencies to latest minor or patch releases by @AndyButland in umbraco/Umbraco-CMS#20953 * build(deps): bumps monaco-editor from 0.54.0 to 0.55.1 by @iOvergaard in umbraco/Umbraco-CMS#21054 ### 🌈 Accessibility Improvements * Entity Actions: Create button discernible text (fixes #20205) by @OskarKruger in umbraco/Umbraco-CMS#20434 * Entity Actions: More create button discernible text, extension of #20434 by @OskarKruger in umbraco/Umbraco-CMS#20458 * Header: Adjusted button focus border color contrast by @MrHutmat in umbraco/Umbraco-CMS#20562 * Login: Added custom validation for missing password and user/email on the login form by @MrHutmat in umbraco/Umbraco-CMS#20233 * Accessibility: Adding a label attribute for `<uui-button>` in news dashboard by @MrHutmat in umbraco/Umbraco-CMS#20780 * Keyboard navigation: Return to opening element after modal close by @MrHutmat in umbraco/Umbraco-CMS#20782 ### 🚀 New Features * Preview: Allows changing the preview environment inside the preview app, and other UX changes that enhance the experience by @leekelleher in umbraco/Umbraco-CMS#20598 * Login: Adds show/hide password toggle by @MrHutmat in umbraco/Umbraco-CMS#20611 * Adds Clear Clipboard button & logic by @warrenbuckley in umbraco/Umbraco-CMS#20757 * Member types: Implement containers by @ronaldbarendse in umbraco/Umbraco-CMS#20706 * Log viewer: Improves search functionality and code quality by @iOvergaard in umbraco/Umbraco-CMS#20913 * Log Viewer: Enhances the donut chart to be responsive, link to log search, and show numbers directly by @iOvergaard in umbraco/Umbraco-CMS#20928 * Culture and Hostnames: Add ability to sort hostnames (closes #20691) by @MrHutmat in umbraco/Umbraco-CMS#20826 * Localization: Adds `termOrDefault()` method to accept a fallback value by @iOvergaard in umbraco/Umbraco-CMS#20947 * Block Grid: Sort mode by @leekelleher in umbraco/Umbraco-CMS#20869 * News Dashboard: Adding functionality to overwrite the cache duration by @NillasKA in umbraco/Umbraco-CMS#21064 * Block List: Sort mode by @leekelleher in umbraco/Umbraco-CMS#21060 * Extend RTE output in Delivery API for better support for multi-site URL resolution by @MiguelGuedelha in umbraco/Umbraco-CMS#20846 * Content Types: Introduce schema service to support future schema generation by @lauraneto in umbraco/Umbraco-CMS#21031 * Delivery API: Adding allow list for content types by @NillasKA in umbraco/Umbraco-CMS#21111 * Emails: Add `Expires` header by @rickbutterfield in umbraco/Umbraco-CMS#20285 * Indexing: Make the indexing batch size configurable by @kjac in umbraco/Umbraco-CMS#20543 * Media: Add protection to restrict access to media in recycle bin (closes #2931) by @AndyButland in umbraco/Umbraco-CMS#20378 * Collection: Introduce Collection Item Card extension type by @madsrasmussen in umbraco/Umbraco-CMS#20954 * Collection: Introduce Collection Item Ref extension type by @madsrasmussen in umbraco/Umbraco-CMS#20994 ... (truncated) ## 17.1.0-rc ## What's Changed ### 📦 Dependencies * Dependencies: Fixed dependency conflicts when installing Microsoft.EntityFrameworkCore.Design (closes #20421) by @lauraneto in umbraco/Umbraco-CMS#20474 * Dependencies: Remove `Microsoft.CodeAnalysis.CSharp` dependency from Umbraco.Infrastructure by @lauraneto in umbraco/Umbraco-CMS#20481 * build(deps): bumps @umbraco-ui/uui from 1.16.0-rc.0 to 1.16.0 by @iOvergaard in umbraco/Umbraco-CMS#20535 * Bump vite from 7.1.9 to 7.1.11 in /src/Umbraco.Web.UI.Client by @dependabot[bot] in umbraco/Umbraco-CMS#20580 * Bump vite from 7.1.9 to 7.1.11 in /src/Umbraco.Web.UI.Login by @dependabot[bot] in umbraco/Umbraco-CMS#20621 * Bump playwright and @playwright/test in /tests/Umbraco.Tests.AcceptanceTest by @dependabot[bot] in umbraco/Umbraco-CMS#20579 * Bump the npm_and_yarn group across 2 directories with 1 update by @dependabot[bot] in umbraco/Umbraco-CMS#20863 * Dependencies: Updates some dependencies to latest minor or patch releases by @AndyButland in umbraco/Umbraco-CMS#20953 * build(deps): bumps monaco-editor from 0.54.0 to 0.55.1 by @iOvergaard in umbraco/Umbraco-CMS#21054 ### 🌈 Accessibility Improvements * Entity Actions: Create button discernible text (fixes #20205) by @OskarKruger in umbraco/Umbraco-CMS#20434 * Entity Actions: More create button discernible text, extension of #20434 by @OskarKruger in umbraco/Umbraco-CMS#20458 * Header: Adjusted button focus border color contrast by @MrHutmat in umbraco/Umbraco-CMS#20562 * Login: Added custom validation for missing password and user/email on the login form by @MrHutmat in umbraco/Umbraco-CMS#20233 * Accessibility: Adding a label attribute for `<uui-button>` in news dashboard by @MrHutmat in umbraco/Umbraco-CMS#20780 * Keyboard navigation: Return to opening element after modal close by @MrHutmat in umbraco/Umbraco-CMS#20782 ### 🚀 New Features * Preview: Allows changing the preview environment inside the preview app, and other UX changes that enhance the experience by @leekelleher in umbraco/Umbraco-CMS#20598 * Login: Adds show/hide password toggle by @MrHutmat in umbraco/Umbraco-CMS#20611 * Adds Clear Clipboard button & logic by @warrenbuckley in umbraco/Umbraco-CMS#20757 * Member types: Implement containers by @ronaldbarendse in umbraco/Umbraco-CMS#20706 * Log viewer: Improves search functionality and code quality by @iOvergaard in umbraco/Umbraco-CMS#20913 * Log Viewer: Enhances the donut chart to be responsive, link to log search, and show numbers directly by @iOvergaard in umbraco/Umbraco-CMS#20928 * Culture and Hostnames: Add ability to sort hostnames (closes #20691) by @MrHutmat in umbraco/Umbraco-CMS#20826 * Localization: Adds `termOrDefault()` method to accept a fallback value by @iOvergaard in umbraco/Umbraco-CMS#20947 * Block Grid: Sort mode by @leekelleher in umbraco/Umbraco-CMS#20869 * News Dashboard: Adding functionality to overwrite the cache duration by @NillasKA in umbraco/Umbraco-CMS#21064 * Block List: Sort mode by @leekelleher in umbraco/Umbraco-CMS#21060 * Extend RTE output in Delivery API for better support for multi-site URL resolution by @MiguelGuedelha in umbraco/Umbraco-CMS#20846 * Content Types: Introduce schema service to support future schema generation by @lauraneto in umbraco/Umbraco-CMS#21031 * Delivery API: Adding allow list for content types by @NillasKA in umbraco/Umbraco-CMS#21111 * Emails: Add `Expires` header by @rickbutterfield in umbraco/Umbraco-CMS#20285 * Indexing: Make the indexing batch size configurable by @kjac in umbraco/Umbraco-CMS#20543 * Media: Add protection to restrict access to media in recycle bin (closes #2931) by @AndyButland in umbraco/Umbraco-CMS#20378 * Collection: Introduce Collection Item Card extension type by @madsrasmussen in umbraco/Umbraco-CMS#20954 * Collection: Introduce Collection Item Ref extension type by @madsrasmussen in umbraco/Umbraco-CMS#20994 * Collection: Introduce Card and Ref Collection View kinds by @madsrasmussen in umbraco/Umbraco-CMS#21037 ### 🚤 Performance * Performance: Optimize memory footprint of document URL cache (closes #21055) by @AndyButland in umbraco/Umbraco-CMS#21066 * Distributed Background Jobs: Improve distributed background job locking behavior and performance by @nikolajlauridsen in umbraco/Umbraco-CMS#21100 * Repositories: Optimize repository caches to populate for both int and GUID keys by @AndyButland in umbraco/Umbraco-CMS#21124 * Performance: Re-introduce lazy locks by @lauraneto in umbraco/Umbraco-CMS#21102 ### 🐛 Bug Fixes ... (truncated) Commits viewable in [compare view](umbraco/Umbraco-CMS@release-17.0.2...release-17.1.0). </details> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Updated [Umbraco.Cms.DevelopmentMode.Backoffice](https://github.com/umbraco/Umbraco-CMS) from 17.0.2 to 17.1.0. <details> <summary>Release notes</summary> _Sourced from [Umbraco.Cms.DevelopmentMode.Backoffice's releases](https://github.com/umbraco/Umbraco-CMS/releases)._ ## 17.1.0 # What's Changed Since 17.1.0-rc ### 🐛 Bug Fixes * Media: Fix files not deleted from disk when recycle bin protection is enabled by @AndyButland in umbraco/Umbraco-CMS#21309 * Document Editing: Refactor of Fix property variation change breaking document save via Infinite Editing (closes #21195) by @nielslyngsoe in umbraco/Umbraco-CMS#21293 * umbraco/Umbraco-CMS#21306 by @calm329 in umbraco/Umbraco-CMS#21306 **Full Changelog**: umbraco/Umbraco-CMS@release-17.1.0-rc...release-17.1.0 ## What's Changed Since the Last Release (17.0.2) ### 📦 Dependencies * Dependencies: Fixed dependency conflicts when installing Microsoft.EntityFrameworkCore.Design (closes #20421) by @lauraneto in umbraco/Umbraco-CMS#20474 * Dependencies: Remove `Microsoft.CodeAnalysis.CSharp` dependency from Umbraco.Infrastructure by @lauraneto in umbraco/Umbraco-CMS#20481 * build(deps): bumps @umbraco-ui/uui from 1.16.0-rc.0 to 1.16.0 by @iOvergaard in umbraco/Umbraco-CMS#20535 * Bump vite from 7.1.9 to 7.1.11 in /src/Umbraco.Web.UI.Client by @dependabot[bot] in umbraco/Umbraco-CMS#20580 * Bump vite from 7.1.9 to 7.1.11 in /src/Umbraco.Web.UI.Login by @dependabot[bot] in umbraco/Umbraco-CMS#20621 * Bump playwright and @playwright/test in /tests/Umbraco.Tests.AcceptanceTest by @dependabot[bot] in umbraco/Umbraco-CMS#20579 * Bump the npm_and_yarn group across 2 directories with 1 update by @dependabot[bot] in umbraco/Umbraco-CMS#20863 * Dependencies: Updates some dependencies to latest minor or patch releases by @AndyButland in umbraco/Umbraco-CMS#20953 * build(deps): bumps monaco-editor from 0.54.0 to 0.55.1 by @iOvergaard in umbraco/Umbraco-CMS#21054 ### 🌈 Accessibility Improvements * Entity Actions: Create button discernible text (fixes #20205) by @OskarKruger in umbraco/Umbraco-CMS#20434 * Entity Actions: More create button discernible text, extension of #20434 by @OskarKruger in umbraco/Umbraco-CMS#20458 * Header: Adjusted button focus border color contrast by @MrHutmat in umbraco/Umbraco-CMS#20562 * Login: Added custom validation for missing password and user/email on the login form by @MrHutmat in umbraco/Umbraco-CMS#20233 * Accessibility: Adding a label attribute for `<uui-button>` in news dashboard by @MrHutmat in umbraco/Umbraco-CMS#20780 * Keyboard navigation: Return to opening element after modal close by @MrHutmat in umbraco/Umbraco-CMS#20782 ### 🚀 New Features * Preview: Allows changing the preview environment inside the preview app, and other UX changes that enhance the experience by @leekelleher in umbraco/Umbraco-CMS#20598 * Login: Adds show/hide password toggle by @MrHutmat in umbraco/Umbraco-CMS#20611 * Adds Clear Clipboard button & logic by @warrenbuckley in umbraco/Umbraco-CMS#20757 * Member types: Implement containers by @ronaldbarendse in umbraco/Umbraco-CMS#20706 * Log viewer: Improves search functionality and code quality by @iOvergaard in umbraco/Umbraco-CMS#20913 * Log Viewer: Enhances the donut chart to be responsive, link to log search, and show numbers directly by @iOvergaard in umbraco/Umbraco-CMS#20928 * Culture and Hostnames: Add ability to sort hostnames (closes #20691) by @MrHutmat in umbraco/Umbraco-CMS#20826 * Localization: Adds `termOrDefault()` method to accept a fallback value by @iOvergaard in umbraco/Umbraco-CMS#20947 * Block Grid: Sort mode by @leekelleher in umbraco/Umbraco-CMS#20869 * News Dashboard: Adding functionality to overwrite the cache duration by @NillasKA in umbraco/Umbraco-CMS#21064 * Block List: Sort mode by @leekelleher in umbraco/Umbraco-CMS#21060 * Extend RTE output in Delivery API for better support for multi-site URL resolution by @MiguelGuedelha in umbraco/Umbraco-CMS#20846 * Content Types: Introduce schema service to support future schema generation by @lauraneto in umbraco/Umbraco-CMS#21031 * Delivery API: Adding allow list for content types by @NillasKA in umbraco/Umbraco-CMS#21111 * Emails: Add `Expires` header by @rickbutterfield in umbraco/Umbraco-CMS#20285 * Indexing: Make the indexing batch size configurable by @kjac in umbraco/Umbraco-CMS#20543 * Media: Add protection to restrict access to media in recycle bin (closes #2931) by @AndyButland in umbraco/Umbraco-CMS#20378 * Collection: Introduce Collection Item Card extension type by @madsrasmussen in umbraco/Umbraco-CMS#20954 * Collection: Introduce Collection Item Ref extension type by @madsrasmussen in umbraco/Umbraco-CMS#20994 ... (truncated) ## 17.1.0-rc ## What's Changed ### 📦 Dependencies * Dependencies: Fixed dependency conflicts when installing Microsoft.EntityFrameworkCore.Design (closes #20421) by @lauraneto in umbraco/Umbraco-CMS#20474 * Dependencies: Remove `Microsoft.CodeAnalysis.CSharp` dependency from Umbraco.Infrastructure by @lauraneto in umbraco/Umbraco-CMS#20481 * build(deps): bumps @umbraco-ui/uui from 1.16.0-rc.0 to 1.16.0 by @iOvergaard in umbraco/Umbraco-CMS#20535 * Bump vite from 7.1.9 to 7.1.11 in /src/Umbraco.Web.UI.Client by @dependabot[bot] in umbraco/Umbraco-CMS#20580 * Bump vite from 7.1.9 to 7.1.11 in /src/Umbraco.Web.UI.Login by @dependabot[bot] in umbraco/Umbraco-CMS#20621 * Bump playwright and @playwright/test in /tests/Umbraco.Tests.AcceptanceTest by @dependabot[bot] in umbraco/Umbraco-CMS#20579 * Bump the npm_and_yarn group across 2 directories with 1 update by @dependabot[bot] in umbraco/Umbraco-CMS#20863 * Dependencies: Updates some dependencies to latest minor or patch releases by @AndyButland in umbraco/Umbraco-CMS#20953 * build(deps): bumps monaco-editor from 0.54.0 to 0.55.1 by @iOvergaard in umbraco/Umbraco-CMS#21054 ### 🌈 Accessibility Improvements * Entity Actions: Create button discernible text (fixes #20205) by @OskarKruger in umbraco/Umbraco-CMS#20434 * Entity Actions: More create button discernible text, extension of #20434 by @OskarKruger in umbraco/Umbraco-CMS#20458 * Header: Adjusted button focus border color contrast by @MrHutmat in umbraco/Umbraco-CMS#20562 * Login: Added custom validation for missing password and user/email on the login form by @MrHutmat in umbraco/Umbraco-CMS#20233 * Accessibility: Adding a label attribute for `<uui-button>` in news dashboard by @MrHutmat in umbraco/Umbraco-CMS#20780 * Keyboard navigation: Return to opening element after modal close by @MrHutmat in umbraco/Umbraco-CMS#20782 ### 🚀 New Features * Preview: Allows changing the preview environment inside the preview app, and other UX changes that enhance the experience by @leekelleher in umbraco/Umbraco-CMS#20598 * Login: Adds show/hide password toggle by @MrHutmat in umbraco/Umbraco-CMS#20611 * Adds Clear Clipboard button & logic by @warrenbuckley in umbraco/Umbraco-CMS#20757 * Member types: Implement containers by @ronaldbarendse in umbraco/Umbraco-CMS#20706 * Log viewer: Improves search functionality and code quality by @iOvergaard in umbraco/Umbraco-CMS#20913 * Log Viewer: Enhances the donut chart to be responsive, link to log search, and show numbers directly by @iOvergaard in umbraco/Umbraco-CMS#20928 * Culture and Hostnames: Add ability to sort hostnames (closes #20691) by @MrHutmat in umbraco/Umbraco-CMS#20826 * Localization: Adds `termOrDefault()` method to accept a fallback value by @iOvergaard in umbraco/Umbraco-CMS#20947 * Block Grid: Sort mode by @leekelleher in umbraco/Umbraco-CMS#20869 * News Dashboard: Adding functionality to overwrite the cache duration by @NillasKA in umbraco/Umbraco-CMS#21064 * Block List: Sort mode by @leekelleher in umbraco/Umbraco-CMS#21060 * Extend RTE output in Delivery API for better support for multi-site URL resolution by @MiguelGuedelha in umbraco/Umbraco-CMS#20846 * Content Types: Introduce schema service to support future schema generation by @lauraneto in umbraco/Umbraco-CMS#21031 * Delivery API: Adding allow list for content types by @NillasKA in umbraco/Umbraco-CMS#21111 * Emails: Add `Expires` header by @rickbutterfield in umbraco/Umbraco-CMS#20285 * Indexing: Make the indexing batch size configurable by @kjac in umbraco/Umbraco-CMS#20543 * Media: Add protection to restrict access to media in recycle bin (closes #2931) by @AndyButland in umbraco/Umbraco-CMS#20378 * Collection: Introduce Collection Item Card extension type by @madsrasmussen in umbraco/Umbraco-CMS#20954 * Collection: Introduce Collection Item Ref extension type by @madsrasmussen in umbraco/Umbraco-CMS#20994 * Collection: Introduce Card and Ref Collection View kinds by @madsrasmussen in umbraco/Umbraco-CMS#21037 ### 🚤 Performance * Performance: Optimize memory footprint of document URL cache (closes #21055) by @AndyButland in umbraco/Umbraco-CMS#21066 * Distributed Background Jobs: Improve distributed background job locking behavior and performance by @nikolajlauridsen in umbraco/Umbraco-CMS#21100 * Repositories: Optimize repository caches to populate for both int and GUID keys by @AndyButland in umbraco/Umbraco-CMS#21124 * Performance: Re-introduce lazy locks by @lauraneto in umbraco/Umbraco-CMS#21102 ### 🐛 Bug Fixes ... (truncated) Commits viewable in [compare view](umbraco/Umbraco-CMS@release-17.0.2...release-17.1.0). </details> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alexander Seeliger <[email protected]>
Add
termOrDefault()Method and Optimize Localization ElementsSummary
This PR adds a new
termOrDefault()method toUmbLocalizationControllerthat provides a cleaner way to detect missing translations, matching Umbraco's C# pattern. Additionally, we explored several performance optimization approaches for the localization elements and ultimately reverted to the original getter pattern, which proved to be the most performant solution.What We Changed
1. Added
termOrDefault()Method toUmbLocalizationControllerMotivation: The previous pattern for detecting missing translations required comparing the result to the key itself:
This mirrors Umbraco's C# pattern where
dictionaryValuereturns the key if missing, anddictionaryValueOrDefaultreturns a specified default value.New Pattern:
Implementation: Added helper methods to avoid code duplication:
Generic Type Constraint: The method signature uses
D extends string | nullto allow both string and null default values while maintaining type safety.2. Refactored Localization Elements to Use Getter Pattern
All three localization elements now use a consistent, simple getter pattern:
Changed Files:
localize.element.ts- Now usestermOrDefault(key, null)for cleaner null checkinglocalize-number.element.ts- Reverted fromwillUpdate()pattern to getterlocalize-relative-time.element.ts- Reverted fromwillUpdate()pattern to getter3. Added Comprehensive Tests
Added 8 new tests for
termOrDefault()method covering various scenarios:Performance Optimization Attempts
We explored several approaches to optimize the localization elements, aiming to reduce computational overhead during rendering.
Approach 1:
willUpdate()Lifecycle Hook with CachingTheory: Cache the computed localized value in a state variable using the
willUpdate()lifecycle hook, avoiding recomputation on every render.Implementation:
Results:
Why It Failed: The lifecycle overhead (
willUpdate()→ state update →updated()→ render) outweighed any benefit from caching. For simple computations like number formatting, the Lit lifecycle machinery adds more cost than the computation itself.Approach 2: Inline Ternary with Getter
Issue Discovered: When using inline ternary, the getter was accessed twice:
Solution: Use Lit's
when()directive, which evaluates the condition once and caches the result:Results: Reduced getter calls from 6 to 3 for 3 property changes (50% reduction).
Approach 3: Side Effects in
willUpdate()Concern: The getter pattern has side effects (DOM attribute manipulation), which is technically an anti-pattern.
Attempted Fix: Move side effects to
willUpdate():Results: This caused the getter to be called twice (once by
willUpdate(), once byrender()), doubling the computational cost.Conclusion: Side effects in the getter are acceptable for this use case since:
@state(), signaling reactive behaviorFinal Performance Comparison
After testing all approaches, the original getter pattern performed best:
The final implementation matches main branch performance while providing cleaner code through
termOrDefault().Key Takeaways
when()directive: Prevents double getter access in conditional rendering.termOrDefault()instead of string comparison makes the code more readable without any performance penalty.Files Changed
src/libs/localization-api/localization.controller.ts- AddedtermOrDefault(),#lookupTerm(),#processTerm()src/libs/localization-api/localization.controller.test.ts- Added 8 comprehensive testssrc/packages/core/localization/localize.element.ts- Updated to usetermOrDefault()src/packages/core/localization/localize-number.element.ts- Reverted to getter patternsrc/packages/core/localization/localize-relative-time.element.ts- Reverted to getter pattern