Implement JSON formatting and syntax highlighting #443
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
Pavinati
requested changes
Jul 5, 2024
AmerMesanovic
force-pushed
the
json-editor
branch
2 times, most recently
from
2148e57 to
e493080
Compare
Pavinati
requested changes
Jul 11, 2024
AmerMesanovic
force-pushed
the
json-editor
branch
from
e493080 to
b761066
Compare
Pavinati
requested changes
Jul 12, 2024
AmerMesanovic
force-pushed
the
json-editor
branch
from
b761066 to
896bc9b
Compare
Pavinati
approved these changes
Jul 12, 2024
AmerMesanovic
force-pushed
the
json-editor
branch
from
896bc9b to
1d73438
Compare
Pavinati
requested changes
Aug 5, 2024
AmerMesanovic
force-pushed
the
json-editor
branch
from
1d73438 to
db10ac3
Compare
Pavinati
requested changes
Aug 8, 2024
AmerMesanovic
force-pushed
the
json-editor
branch
from
db10ac3 to
339313b
Compare
AmerMesanovic
force-pushed
the
json-editor
branch
2 times, most recently
from
00f7438 to
a095ea6
Compare
Pavinati
requested changes
Aug 9, 2024
AmerMesanovic
force-pushed
the
json-editor
branch
from
a095ea6 to
2e2ccbe
Compare
Enhance UX in Dashboard with JSON text editor using Monaco Editor (@monaco-editor/react) for improved formatting, syntax highlighting, and validation error reporting. Signed-off-by: AmerMesanovic <amer.mesanovic@secomind.com>
utilizing MonacoEditor. - Updated test selectors to target JSONEditor component. - Used force option for clicks to handle overlays in the editor. - Increased timeouts where necessary to account for MonacoEditor's loading times Signed-off-by: AmerMesanovic <amer.mesanovic@secomind.com>
AmerMesanovic
force-pushed
the
json-editor
branch
from
2e2ccbe to
44e9eb8
Compare
eddbbt
reviewed
Dec 2, 2024
| databaseTTL, | ||
| } = parseMappingOptions(_.get(iface.mappings, '0')); | ||
| const { reliability, explicitTimestamp, retention, expiry, databaseRetention, databaseTTL } = | ||
| parseMappingOptions(_.get(iface.mappings, '0')); |
There was a problem hiding this comment.
if there are no changes, please avoid to change code format as this will introduce undesired noise to the pr.
Same goes for unnecessary ; at the end of a line
there are multiple occurrences in this PR that only changes how the code is styled but add nothing, it's better to move a restyling in another PR
| @@ -128,7 +128,7 @@ const checkMappingEditorUIValues = ({ mapping, type, aggregation = 'individual' | |||
| .should('be.visible') | |||
| .within(() => { | |||
| cy.contains(mapping.endpoint); | |||
| cy.get('button').contains('Edit...').click(); | |||
| cy.get('button').contains('Edit...').should('have.length', 1).click({ force: true }); | |||
There was a problem hiding this comment.
we could possible have more that one edit button? There is a necessity to check that?
| interfaceFixtures.forEach((interfaceFixture) => { | ||
| cy.fixture(interfaceFixture).then(({ data: iface }) => { | ||
| setupInterfaceEditorFromUI(iface); | ||
| checkInterfaceEditorUIValues(iface); | ||
|
|
There was a problem hiding this comment.
as above, avoid newlines if not necessary
Comment on lines
+86
to
+116
| if (win.monaco && win.monaco.editor) { | ||
| const editor = win.monaco.editor.getModels()[0]; | ||
| const editorContent = editor.getValue(); | ||
| const editorJson = JSON.parse(editorContent); | ||
|
|
||
| expect(editorJson.simple_triggers[0].interface_name).to.equal(iface); | ||
| } else { | ||
| throw new Error('Monaco Editor instance is not available'); | ||
| } | ||
| }); | ||
| cy.window().then((win) => { | ||
| if (win.monaco && win.monaco.editor) { | ||
| const editor = win.monaco.editor.getModels()[0]; | ||
| const editorContent = editor.getValue(); | ||
| const editorJson = JSON.parse(editorContent); | ||
|
|
||
| expect(editorJson.simple_triggers[0].interface_major).to.equal(simpleTrigger.interface_major); | ||
| } else { | ||
| throw new Error('Monaco Editor instance is not available'); | ||
| } | ||
| }); | ||
| cy.window().then((win) => { | ||
| if (win.monaco && win.monaco.editor) { | ||
| const editor = win.monaco.editor.getModels()[0]; | ||
| const editorContent = editor.getValue(); | ||
| const editorJson = JSON.parse(editorContent); | ||
|
|
||
| expect(editorJson.simple_triggers[0].match_path).to.equal(simpleTrigger.match_path); | ||
| } else { | ||
| throw new Error('Monaco Editor instance is not available'); | ||
| } |
There was a problem hiding this comment.
Here there is a repetition of
cy.window().then((win) => {
if (win.monaco && win.monaco.editor) {
const editor = win.monaco.editor.getModels()[0];
const editorContent = editor.getValue();
const editorJson = JSON.parse(editorContent);
all of that can be merged in a single if clause
| .scrollIntoView() | ||
| .should('be.visible') | ||
| .contains(simpleTrigger.interface_major) | ||
| .contains(triggerOperatorToLabel[simpleTrigger.value_match_operator]) |
There was a problem hiding this comment.
good to check for more than one property, but
.contains(simpleTrigger.interface_major)
got removed
| .scrollIntoView() | ||
| .should('be.visible') | ||
| .contains(simpleTrigger.interface_major) | ||
| .contains(triggerOperatorToLabel[simpleTrigger.value_match_operator]) |
There was a problem hiding this comment.
good to check for more than one property, but
.contains(simpleTrigger.interface_major)
got removed entirely
Comment on lines
+338
to
+342
| cy.get('#triggerSource', { timeout: 1000 }).scrollIntoView().should('be.visible'); | ||
| cy.get('button').contains('Hide source', { timeout: 1000 }).scrollIntoView().click(); | ||
| cy.get('#triggerSource', { timeout: 1000 }).should('not.exist'); | ||
| cy.get('button').contains('Show source', { timeout: 1000 }).scrollIntoView().click(); | ||
| cy.get('#triggerSource', { timeout: 1000 }).scrollIntoView().should('be.visible'); |
There was a problem hiding this comment.
if not required, all of those timeouts would only prolong the duration of this already long tests
This apply for the entire PR, check and be sure the timeouts/cy.wait functions are really needed
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.
Enhance UX in Dashboard with JSON text editor using Monaco Editor (@monaco-editor/react) for improved formatting, syntax highlighting, and validation error reporting.