From a4ec5e93433075f6df98ac0483790c8e669ec279 Mon Sep 17 00:00:00 2001 From: Elinor Date: Mon, 29 Aug 2022 12:49:18 +0300 Subject: [PATCH 1/2] add json diagnostics --- src/app/views/common/monaco/Monaco.tsx | 17 +++++++++++++++-- .../adaptive-cards/AdaptiveCard.tsx | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/app/views/common/monaco/Monaco.tsx b/src/app/views/common/monaco/Monaco.tsx index 13717a8f6d..6faad45980 100644 --- a/src/app/views/common/monaco/Monaco.tsx +++ b/src/app/views/common/monaco/Monaco.tsx @@ -1,6 +1,6 @@ import { FocusZone } from '@fluentui/react'; -import Editor, { OnChange } from '@monaco-editor/react'; -import React from 'react'; +import Editor, { OnChange, useMonaco } from '@monaco-editor/react'; +import React, { useEffect } from 'react'; import { ThemeContext } from '../../../../themes/theme-context'; import './monaco.scss'; @@ -26,6 +26,19 @@ export function Monaco(props: IMonaco) { } const itemHeight = height ? height : '300px'; + const monaco = useMonaco(); + useEffect(() => { + if (monaco) { + monaco.languages.json.jsonDefaults.setDiagnosticsOptions({ + validate: true, + allowComments: false, + schemas: [], + enableSchemaRequest: true, + schemaRequest: 'ignore' + }); + } + }, [monaco]); + return (
diff --git a/src/app/views/query-response/adaptive-cards/AdaptiveCard.tsx b/src/app/views/query-response/adaptive-cards/AdaptiveCard.tsx index da846d465d..06ca7fabd6 100644 --- a/src/app/views/query-response/adaptive-cards/AdaptiveCard.tsx +++ b/src/app/views/query-response/adaptive-cards/AdaptiveCard.tsx @@ -163,7 +163,7 @@ class AdaptiveCard extends Component {
From aee17e8560020b80083d2f46a4ca9fcee49c6538 Mon Sep 17 00:00:00 2001 From: Elinor Date: Tue, 30 Aug 2022 12:16:27 +0300 Subject: [PATCH 2/2] undo height change --- src/app/views/query-response/adaptive-cards/AdaptiveCard.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/views/query-response/adaptive-cards/AdaptiveCard.tsx b/src/app/views/query-response/adaptive-cards/AdaptiveCard.tsx index 06ca7fabd6..da846d465d 100644 --- a/src/app/views/query-response/adaptive-cards/AdaptiveCard.tsx +++ b/src/app/views/query-response/adaptive-cards/AdaptiveCard.tsx @@ -163,7 +163,7 @@ class AdaptiveCard extends Component {