-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
UI: New JSON viewer #4541
UI: New JSON viewer #4541
Changes from all commits
b58c229
19d7202
8291373
ee08e40
dcd8133
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,33 +1,11 @@ | ||
import Component from '@ember/component'; | ||
import { computed } from '@ember/object'; | ||
import { run } from '@ember/runloop'; | ||
import { copy } from '@ember/object/internals'; | ||
import JSONFormatter from 'json-formatter-js'; | ||
|
||
export default Component.extend({ | ||
classNames: ['json-viewer'], | ||
|
||
json: null, | ||
expandDepth: Infinity, | ||
|
||
formatter: computed('json', 'expandDepth', function() { | ||
return new JSONFormatter(copy(this.get('json'), true), this.get('expandDepth'), { | ||
theme: 'nomad', | ||
}); | ||
jsonStr: computed('json', function() { | ||
return JSON.stringify(this.get('json'), null, 2); | ||
}), | ||
|
||
didReceiveAttrs() { | ||
const json = this.get('json'); | ||
if (!json) { | ||
return; | ||
} | ||
|
||
run.scheduleOnce('afterRender', this, embedViewer); | ||
}, | ||
}); | ||
|
||
function embedViewer() { | ||
this.$() | ||
.empty() | ||
.append(this.get('formatter').render()); | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,127 @@ | ||
$dark-bright: lighten($dark, 15%); | ||
|
||
.CodeMirror { | ||
height: auto; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Does this work by itself? I remember reading something that you'd have to also pass bottom margin There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It works for this context because job definitions always have a value. I ran into the problem I think you are talking about with new job. The empty editor is still only one line tall. I'll look into the bottom margin |
||
} | ||
|
||
.cm-s-hashi, | ||
.cm-s-hashi-read-only { | ||
&.CodeMirror { | ||
background-color: $dark-3; | ||
color: $grey-blue; | ||
border: none; | ||
font-family: $family-monospace; | ||
-webkit-font-smoothing: auto; | ||
line-height: 1.4; | ||
} | ||
|
||
.CodeMirror-gutters { | ||
background-color: $dark-2; | ||
border: none; | ||
} | ||
|
||
.CodeMirror-cursor { | ||
border-left: solid thin $white-ter; | ||
} | ||
|
||
.CodeMirror-linenumber { | ||
color: $dark-bright; | ||
} | ||
|
||
&.CodeMirror-focused div.CodeMirror-selected { | ||
background: rgba(255, 255, 255, 0.1); | ||
} | ||
|
||
.CodeMirror-line::selection, | ||
.CodeMirror-line > span::selection, | ||
.CodeMirror-line > span > span::selection { | ||
background: rgba(255, 255, 255, 0.1); | ||
} | ||
|
||
span.cm-comment { | ||
color: $grey-light; | ||
} | ||
|
||
span.cm-string, | ||
span.cm-string-2 { | ||
color: $nomad-green; | ||
} | ||
|
||
span.cm-number { | ||
color: $serf-red; | ||
} | ||
|
||
span.cm-variable { | ||
color: $packer-blue; | ||
} | ||
|
||
span.cm-variable-2 { | ||
color: $packer-blue; | ||
} | ||
|
||
span.cm-def { | ||
color: $nomad-green; | ||
} | ||
|
||
span.cm-operator { | ||
color: $grey; | ||
} | ||
span.cm-keyword { | ||
color: $yellow; | ||
} | ||
|
||
span.cm-atom { | ||
color: $terraform-purple-bright; | ||
} | ||
|
||
span.cm-meta { | ||
color: $nomad-green; | ||
} | ||
|
||
span.cm-tag { | ||
color: $nomad-green; | ||
} | ||
|
||
span.cm-attribute { | ||
color: $consul-pink; | ||
} | ||
|
||
span.cm-qualifier { | ||
color: $consul-pink; | ||
} | ||
|
||
span.cm-property { | ||
color: $nomad-green; | ||
} | ||
|
||
span.cm-variable-3 { | ||
color: $consul-pink; | ||
} | ||
|
||
span.cm-builtin { | ||
color: $consul-pink; | ||
} | ||
|
||
.CodeMirror-activeline-background { | ||
background: $black-ter; | ||
} | ||
|
||
.CodeMirror-matchingbracket { | ||
text-decoration: underline; | ||
color: $white; | ||
} | ||
} | ||
|
||
.cm-s-auto-height.CodeMirror { | ||
height: auto; | ||
} | ||
|
||
.cm-s-hashi-read-only { | ||
&.CodeMirror { | ||
background-color: $dark-2; | ||
} | ||
|
||
.CodeMirror-gutters { | ||
background-color: $dark-2; | ||
} | ||
} |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
{{ivy-codemirror | ||
value=jsonStr | ||
options=(hash | ||
mode="javascript" | ||
theme="hashi-read-only" | ||
tabSize=2 | ||
lineNumbers=true | ||
readOnly=true | ||
)}} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
❤️ that JSON makes pretty-printing so easy - in Vault, we have this as a template helper because we have some places we render object values in the UI that aren't in a code mirror instance (though thinking about it now, maybe they should be 🤔 ).