feat: indicate errors in JSON schema

openmrs · Aug 20, 2024 · 7a7d26f · 7a7d26f
1 parent cca7bb8
commit 7a7d26f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/src/components/form-editor/form-editor.component.tsx b/src/components/form-editor/form-editor.component.tsx
@@ -361,6 +361,15 @@ const FormEditorContent: React.FC<TranslationFnProps> = ({ t }) => {
               <ErrorNotification error={clobdataError} title={t('schemaLoadError', 'Error loading schema')} />
             ) : null}
             <div className={styles.editorContainer}>
+              {invalidJsonErrorMessage ? (
+                <InlineNotification
+                  kind="error"
+                  lowContrast
+                  title={t('errorParsingJsonSchema', 'Error parsing JSON schema')}
+                  subtitle={invalidJsonErrorMessage}
+                  className={styles.jsonSchemaError}
+                />
+              ) : null}
               <SchemaEditor
                 errors={errors}
                 isLoading={isLoadingFormOrSchema}

diff --git a/src/components/form-editor/form-editor.scss b/src/components/form-editor/form-editor.scss
@@ -36,6 +36,13 @@
   padding: 0;
 }
 
+.jsonSchemaError {
+  width: 100%;
+  max-width: unset;
+  padding: '0rem';
+  margin-bottom: 1rem;
+}
+
 .actionButtons {
   display: flex;
   align-items: center;

diff --git a/src/components/schema-editor/schema-editor.component.tsx b/src/components/schema-editor/schema-editor.component.tsx
@@ -178,6 +178,7 @@ const SchemaEditor: React.FC<SchemaEditorProps> = ({
     setCurrentIndex(0);
     onSchemaChange(newValue);
     debouncedValidateSchema(newValue, schema);
+    setErrors([]);
   };
 
   // Schema Validation Errors