JavaScriptFragment.asJson() #5108
Merged
Conversation
This file contains 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
replace Jsp.unsafe() with JavaScriptFragment.unsafe() in <script> blocks replace new ObjectMapper() with JsonUtil.DEFAULT_MAPPER or JsonUtil.createDefaultMapper()
labkey-adam
reviewed
Jan 23, 2024
| @@ -388,7 +389,7 @@ private String getBestJson(String currentValue, String newValue, String serverSe | |||
| } | |||
|
|
|||
| // Rather than overwrite the current json map, merge the new with the current. | |||
| ObjectMapper mapper = new ObjectMapper(); | |||
| ObjectMapper mapper = JsonUtil.createDefaultMapper(); | |||
There was a problem hiding this comment.
Could be JsonUtil.DEFAULT_MAPPER
There was a problem hiding this comment.
I've taken to using DEFAULT_MAPPER when I can inline the whole usage. Just a style choice and speeds up converting code (what does readerForUpdating() do? beats me.).
labkey-adam
requested changes
Jan 23, 2024
| @@ -244,7 +245,7 @@ | |||
|
|
|||
| Ext4.onReady(function() | |||
| { | |||
| var datasetInfo = <%=unsafe(JsonUtil.DEFAULT_MAPPER.writeValueAsString(datasetInfo))%>; | |||
| var datasetInfo = <%=JavaScriptFragment.asJson(datasetInfo)%>; | |||
| var store = LABKEY.study.DataViewUtil.getViewCategoriesStore({ | |||
| storeId : '<%=h(storeId)%>', | |||
There was a problem hiding this comment.
I assume this is some Ext weirdness where you have to htmlEncode() id's so they don't get injected into the html? I don't think I changed this.
There was a problem hiding this comment.
configRequestabilityRules.jsp has a strange use of h() which I changed to qh(), not sure if it's wrong.
labkey-adam
approved these changes
Jan 26, 2024
labkey-jeckels
pushed a commit
that referenced
this pull request
Jan 29, 2024
* JavaScriptFragment.asJson() replace Jsp.unsafe() with JavaScriptFragment.unsafe() in <script> blocks replace new ObjectMapper() with JsonUtil.DEFAULT_MAPPER or JsonUtil.createDefaultMapper() * use HtmlString for html * JavaScriptFragment.asString() * typo
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.
replace Jsp.unsafe() with JavaScriptFragment.unsafe() in <script> blocks replace new ObjectMapper() with JsonUtil.DEFAULT_MAPPER or JsonUtil.createDefaultMapper()
Rationale
Related Pull Requests
Changes