some tweaks

openmrs · Sep 25, 2024 · 4183b23 · 4183b23
1 parent 96307ee
commit 4183b23
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 23 deletions.
diff --git a/src/components/interactive-builder/add-package-modal.component.tsx b/src/components/interactive-builder/add-package-modal.component.tsx
@@ -83,7 +83,7 @@ const PackageModal: React.FC<PackageModalProps> = ({ closeModal, schema, onSchem
           },
         };
 
-        onSchemaChange(updatedSchema);
+        onSchemaChange(JSON.parse(JSON.stringify(updatedSchema, null, 2)));
 
         setTitle('');
         setSlotName('');

diff --git a/src/components/interactive-builder/interactive-builder.component.tsx b/src/components/interactive-builder/interactive-builder.component.tsx
@@ -29,7 +29,8 @@ const InteractiveBuilder = ({ schema, onSchemaChange }: InteractiveBuilderProps)
     };
 
     if (!schema) {
-      onSchemaChange({ ...dummySchema });
+      onSchemaChange(dummySchema);
+      return dummySchema;
     }
 
     return schema || dummySchema;

diff --git a/src/components/schema-editor/dummy-schema.ts b/src/components/schema-editor/dummy-schema.ts
diff --git a/src/components/view-editor/view-editor.component.tsx b/src/components/view-editor/view-editor.component.tsx
@@ -51,7 +51,7 @@ const ContentPackagesEditorContent: React.FC<TranslationFnProps> = ({ t }) => {
 
   const updateSchema = useCallback((updatedSchema: Schema) => {
     setSchema(updatedSchema);
-    const stringfiedJson: string = JSON.stringify(updatedSchema);
+    const stringfiedJson: string = JSON.stringify(updatedSchema, null, 2);
     setStringifiedSchema(stringfiedJson);
   }, []);
 
@@ -144,7 +144,7 @@ const ContentPackagesEditorContent: React.FC<TranslationFnProps> = ({ t }) => {
         ].title;
       }
     }
-    return 'default_schema_name';
+    return '';
   };
 
   const handleSavePackage = () => {
@@ -181,7 +181,7 @@ const ContentPackagesEditorContent: React.FC<TranslationFnProps> = ({ t }) => {
   };
 
   const navGroupTitle = getNavGroupTitle(schema);
-  const sanitizedTitle = navGroupTitle.replace(/\s+/g, '_');
+  const sanitizedTitle = navGroupTitle?.replace(/\s+/g, '_');
 
   const responsiveSize = isMaximized ? 16 : 8;
   const defaultEnterDelayInMs = 300;
@@ -263,7 +263,9 @@ const ContentPackagesEditorContent: React.FC<TranslationFnProps> = ({ t }) => {
             <span className={styles.tabHeading}>{t('interactiveBuilder', 'Interactive Builder')}</span>
             <div className={styles.topBtns}>
               <Button disabled={!navGroupTitle || isSaving} onClick={handleSavePackage}>
-                {schema && schema.id ? t('updateSchema', 'Update Schema') : t('saveClinicalView', 'Save clinical view')}
+                {schema && clinicalViewId
+                  ? t('updateSchema', 'Update Schema')
+                  : t('saveClinicalView', 'Save clinical view')}
               </Button>
             </div>
           </div>