Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
ef3c359
feat(jsonInput): format the provided value to display properly
RyanMG Mar 11, 2025
4edcfad
refactor(jsonInput): remove auto formatting of JSON data for connecti…
RyanMG Mar 11, 2025
3bcf2ff
post-pr review updates to jsonInput formatting update
RyanMG Mar 11, 2025
eae1a14
doc: update CHANGELOG for the jsonInput format update
RyanMG Mar 11, 2025
aab149f
codeInput autoformatting update - prop to auto format the display whe…
RyanMG Mar 18, 2025
a9035ef
clean up activity detail admin JSON display
RyanMG Mar 18, 2025
5806d9f
Merge branch 'develop' into remove-json-preformat
RyanMG Mar 18, 2025
50cbf39
doc: CHANGELOG update to account for version bump
RyanMG Mar 18, 2025
27bd0f5
revert original batch of jsonInput changes
RyanMG Mar 18, 2025
97b36ec
have the default formatter for jsonInput be the safe version of the J…
RyanMG Mar 18, 2025
ae1a065
method name update from formatValue -> formatAndSetEditorValue to bet…
RyanMG Mar 18, 2025
d64e207
Merge branch 'develop' into remove-json-preformat
RyanMG Apr 9, 2025
82c3900
Remove jest testing code which got stuck and commited on accident
RyanMG Apr 9, 2025
a20c17a
Merge branch 'develop' into remove-json-preformat
RyanMG Oct 31, 2025
d9c3cb1
Return some of the changes done by the linted automatically
RyanMG Oct 31, 2025
ead237a
Merge remote-tracking branch 'origin/develop' into remove-json-preformat
lbwexler Jun 18, 2026
cb4e99b
Add CHANGELOG entry for jsonInput autoFormat / safe formatting
lbwexler Jun 19, 2026
608e72e
Merge remote-tracking branch 'origin/develop' into remove-json-preformat
lbwexler Jun 19, 2026
14f3a70
Default codeInput autoFormat on for readonly inputs; warn if set on e…
lbwexler Jun 19, 2026
e8e66b3
Drop redundant manual JSON pretty-printing for readonly jsonInputs
lbwexler Jun 19, 2026
bc42d4d
Use warnIf for autoFormat-on-editable warning
lbwexler Jun 19, 2026
6b5ad76
Make timestamp-formatted readonly jsonInputs declarative
lbwexler Jun 19, 2026
da4eabc
Drop redundant safeFmtJson; rely on CodeInput's formatter try/catch
lbwexler Jun 19, 2026
1f48163
Drop redundant filter.toJSON() - JSON.stringify invokes it automatically
lbwexler Jun 19, 2026
4b3e072
Bind pool config jsonInput to poolConfiguration model observable
lbwexler Jun 19, 2026
2dcb74d
Resolve pool config bind via context model lookup
lbwexler Jun 19, 2026
b50bc4a
Extract shared adminJsonDisplay for readonly admin JSON panels
lbwexler Jun 19, 2026
0b5c63e
Build flex: 1 into adminJsonDisplay default sizing
lbwexler Jun 19, 2026
d9b6286
Bind DetailPanel json display to selectedAdminStats
lbwexler Jun 19, 2026
75e9b4d
Bind service DetailsPanel json display to stats
lbwexler Jun 19, 2026
0e1fade
checkpoint
lbwexler Jun 19, 2026
aa987a4
Note readonly JsonInput call-site simplification in CHANGELOG
lbwexler Jun 19, 2026
ae9f1e0
Merge remote-tracking branch 'origin/develop' into remove-json-preformat
lbwexler Jun 23, 2026
762eeea
Allow autoFormat on editable CodeInput (formats on blur)
lbwexler Jun 23, 2026
dd958c7
Enable autoFormat on editable JSON editors (grid filter, REST form)
lbwexler Jun 23, 2026
7b56d3a
tweaks from code review
lbwexler Jun 23, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ const poolConfigPanel = hoistCmp.factory<ConnPoolMonitorModel>({
enableSearch: true,
showFullscreenButton: false,
editorProps: {lineNumbers: false},
value: JSON.stringify(model.poolConfiguration, null, 2)
value: model.poolConfiguration
})
});
}
Expand Down
9 changes: 8 additions & 1 deletion desktop/cmp/input/JsonInput.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,18 @@ export const [JsonInput, jsonInput] = hoistCmp.withFactory<JsonInputProps>({
displayName: 'JsonInput',
className: 'xh-json-input',
render(props, ref) {
let {value, ...jsonInputProps} = props;

if (typeof value !== 'string') {
Comment thread
lbwexler marked this conversation as resolved.
Outdated
value = value === null ? '' : JSON.stringify(value, null, 2);
}

return codeInput({
linter: linter,
formatter: fmtJson,
mode: 'application/json',
...props,
...jsonInputProps,
value,
ref
});
}
Expand Down