Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: footnotes escape html only once #2088

Merged
merged 33 commits into from
Feb 10, 2025
Merged

fix: footnotes escape html only once #2088

merged 33 commits into from
Feb 10, 2025

Conversation

derschnee68
Copy link
Collaborator

@derschnee68 derschnee68 commented Feb 7, 2025

Fix the bug of a footnote being html escaped twice (now once)
in <footnote content="ESCAPING" />

# Conflicts:
#	libs/vre/pages/ontology/ontology-classes/src/lib/list-view/resource-list/resource-list.component.html
#	libs/vre/resource-editor/resource-properties/src/lib/switch-components/rich-text-switch.component.ts
#	libs/vre/resource-editor/resource-properties/src/lib/switch-components/text-html-switch.component.ts
#	libs/vre/ui/ui/src/index.ts
#	libs/vre/ui/ui/src/ui.components.ts
# Conflicts:
#	libs/vre/resource-editor/resource-properties/src/lib/footnote-parser.pipe.ts
@derschnee68 derschnee68 marked this pull request as ready for review February 7, 2025 17:11
Copy link
Collaborator

@mpro7 mpro7 left a comment

Choose a reason for hiding this comment

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

Please find one remark below.

@@ -0,0 +1,10 @@
export function unescapeHtml(str: string) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Does it make sense to extract this single function like that? Would it make more sense to keep it where it was or move it to CkEditorComponent or ideally to service which handles footnote (not sure if this exists, but if not creating it for single function doesn't make sense).

Copy link
Collaborator Author

@derschnee68 derschnee68 Feb 10, 2025

Choose a reason for hiding this comment

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

it is used in two different nx libs so to me that seems like the cleanest way

@derschnee68 derschnee68 merged commit cc85f14 into main Feb 10, 2025
10 checks passed
@derschnee68 derschnee68 deleted the julien/footnote-pipe branch February 10, 2025 10:53
irmastnt added a commit that referenced this pull request Feb 11, 2025
…ist-values-leads-to-randomly

* main:
  chore(deps-dev): bump prettier from 3.4.2 to 3.5.0 (#2094)
  chore(deps-dev): bump @typescript-eslint/utils from 8.22.0 to 8.24.0 (#2099)
  chore(deps): bump the grafana-deps group across 1 directory with 2 updates (#2100)
  chore: add CODEOWNERS file (#2095)
  fix: update footnote plugin (ckeditor5) to 2.1.5 (#2096)
  chore: add tsc command to nx projects (#2097)
  chore(main): release 11.25.1 (#2083)
  fix: footnotes escape html only once (#2088)
  fix: selected region click only fires when a region iri is found (#2089)
  refactor: remove unused variables (#2086)

# Conflicts:
#	package-lock.json
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