@openmrs/esm-form-builder-app 2.3.1-pre.699 → 2.3.1-pre.702

package/dist/openmrs-esm-form-builder-app.js.buildmanifest.json

@@ -69,7 +69,7 @@
       "auxiliaryFiles": [
         "153.js.map"
       ],
-      "hash": "4121dd0563784128",
+      "hash": "2bf348dd99984024",
       "childrenByOrder": {}
     },
     {
@@ -124,7 +124,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "4d40dda42ce28906",
+      "hash": "3edaa952c08e173d",
       "childrenByOrder": {}
     },
     {
@@ -151,253 +151,15 @@
       "hash": "787937730b6dc905",
       "childrenByOrder": {}
     },
-    {
-      "rendered": true,
-      "initial": false,
-      "entry": false,
-      "recorded": false,
-      "size": 7103,
-      "sizes": {
-        "javascript": 7103
-      },
-      "names": [],
-      "idHints": [],
-      "runtime": [
-        "@openmrs/esm-form-builder-app",
-        "main"
-      ],
-      "files": [
-        "294.js"
-      ],
-      "auxiliaryFiles": [
-        "294.js.map"
-      ],
-      "hash": "b314e60f1c149ba9",
-      "childrenByOrder": {}
-    },
-    {
-      "rendered": true,
-      "initial": false,
-      "entry": false,
-      "recorded": false,
-      "size": 9345,
-      "sizes": {
-        "javascript": 9345
-      },
-      "names": [],
-      "idHints": [],
-      "runtime": [
-        "@openmrs/esm-form-builder-app",
-        "main"
-      ],
-      "files": [
-        "319.js"
-      ],
-      "auxiliaryFiles": [],
-      "hash": "c49c5a43474341c0",
-      "childrenByOrder": {}
-    },
-    {
-      "rendered": true,
-      "initial": false,
-      "entry": false,
-      "recorded": false,
-      "reason": "split chunk (cache group: defaultVendors)",
-      "size": 2563762,
-      "sizes": {
-        "javascript": 2563762
-      },
-      "names": [],
-      "idHints": [
-        "vendors"
-      ],
-      "runtime": [
-        "@openmrs/esm-form-builder-app",
-        "main"
-      ],
-      "files": [
-        "333.js"
-      ],
-      "auxiliaryFiles": [
-        "333.js.map"
-      ],
-      "hash": "ec26bad1e23fa22b",
-      "childrenByOrder": {}
-    },
-    {
-      "rendered": true,
-      "initial": false,
-      "entry": false,
-      "recorded": false,
-      "size": 984,
-      "sizes": {
-        "javascript": 984
-      },
-      "names": [],
-      "idHints": [],
-      "runtime": [
-        "@openmrs/esm-form-builder-app",
-        "main"
-      ],
-      "files": [
-        "447.js"
-      ],
-      "auxiliaryFiles": [
-        "447.js.map"
-      ],
-      "hash": "7fadd63088be49ea",
-      "childrenByOrder": {}
-    },
-    {
-      "rendered": true,
-      "initial": false,
-      "entry": false,
-      "recorded": false,
-      "reason": "reused as split chunk (cache group: defaultVendors)",
-      "size": 29495,
-      "sizes": {
-        "javascript": 29495
-      },
-      "names": [],
-      "idHints": [
-        "vendors"
-      ],
-      "runtime": [
-        "@openmrs/esm-form-builder-app",
-        "main"
-      ],
-      "files": [
-        "527.js"
-      ],
-      "auxiliaryFiles": [
-        "527.js.map"
-      ],
-      "hash": "a720aabbfca50357",
-      "childrenByOrder": {}
-    },
-    {
-      "rendered": true,
-      "initial": false,
-      "entry": false,
-      "recorded": false,
-      "size": 9260,
-      "sizes": {
-        "javascript": 9260
-      },
-      "names": [],
-      "idHints": [],
-      "runtime": [
-        "@openmrs/esm-form-builder-app",
-        "main"
-      ],
-      "files": [
-        "574.js"
-      ],
-      "auxiliaryFiles": [],
-      "hash": "1da013de0387b341",
-      "childrenByOrder": {}
-    },
-    {
-      "rendered": true,
-      "initial": false,
-      "entry": false,
-      "recorded": false,
-      "size": 11051,
-      "sizes": {
-        "javascript": 11051
-      },
-      "names": [],
-      "idHints": [],
-      "runtime": [
-        "@openmrs/esm-form-builder-app",
-        "main"
-      ],
-      "files": [
-        "626.js"
-      ],
-      "auxiliaryFiles": [
-        "626.js.map"
-      ],
-      "hash": "8121ff38bfc8ddc9",
-      "childrenByOrder": {}
-    },
-    {
-      "rendered": false,
-      "initial": false,
-      "entry": false,
-      "recorded": false,
-      "reason": "reused as split chunk (cache group: default)",
-      "size": 42,
-      "sizes": {
-        "consume-shared": 42
-      },
-      "names": [],
-      "idHints": [],
-      "runtime": [
-        "@openmrs/esm-form-builder-app",
-        "main"
-      ],
-      "files": [],
-      "auxiliaryFiles": [],
-      "hash": "c20b64ea6ed751d0",
-      "childrenByOrder": {}
-    },
-    {
-      "rendered": true,
-      "initial": false,
-      "entry": false,
-      "recorded": false,
-      "size": 323548,
-      "sizes": {
-        "javascript": 323506,
-        "consume-shared": 42
-      },
-      "names": [],
-      "idHints": [],
-      "runtime": [
-        "@openmrs/esm-form-builder-app",
-        "main"
-      ],
-      "files": [
-        "729.js"
-      ],
-      "auxiliaryFiles": [
-        "729.js.map"
-      ],
-      "hash": "2f208eb093a15b7b",
-      "childrenByOrder": {}
-    },
-    {
-      "rendered": true,
-      "initial": false,
-      "entry": false,
-      "recorded": false,
-      "size": 9345,
-      "sizes": {
-        "javascript": 9345
-      },
-      "names": [],
-      "idHints": [],
-      "runtime": [
-        "@openmrs/esm-form-builder-app",
-        "main"
-      ],
-      "files": [
-        "757.js"
-      ],
-      "auxiliaryFiles": [],
-      "hash": "e3182ff4297c5147",
-      "childrenByOrder": {}
-    },
     {
       "rendered": true,
       "initial": false,
       "entry": false,
       "recorded": false,
       "reason": "split chunk (cache group: defaultVendors)",
-      "size": 4168894,
+      "size": 4293801,
       "sizes": {
-        "javascript": 4168894
+        "javascript": 4293801
       },
       "names": [],
       "idHints": [
@@ -408,7 +170,7 @@
         "main"
       ],
       "files": [
-        "772.js"
+        "279.js"
       ],
       "auxiliaryFiles": [
         "002a2ac7b7d3b3b807ddcb210cfc91eb.js",
@@ -489,6 +251,7 @@
         "277128dcbc226dfeb8fde9391fb24787.js",
         "2772fa250d538d9b7a8702fb6c50d195.js",
         "27730a0bdc6f430cc85049a46a73a029.js",
+        "279.js.map",
         "283970c76db99e2d0d90f0e7c45494f9.js",
         "28785bea435918d49b290d27bf660baa.js",
         "2ad349208b3a727abb3c9f943865a27c.js",
@@ -647,7 +410,6 @@
         "755114145e5b97e5571a160a39e716db.js",
         "7620537538da40e17ccbf70a43f4fd0c.js",
         "764b59bdd3a89e14f88c9d63020551a1.js",
-        "772.js.map",
         "77aaca51c1c32acaf32656d45f4dc017.js",
         "77c629df0ebf40b066d0ffeb34b7711b.js",
         "78b1ba82f7882d931072c4ef6e87f579.js",
@@ -856,7 +618,245 @@
         "ffb6d262efb0718a20d60b5fecb76ea6.js",
         "ffd3b83e8b5878f4785591ff54b1dfff.js"
       ],
-      "hash": "744b515a85ccb68b",
+      "hash": "f4cfc16783ab0897",
+      "childrenByOrder": {}
+    },
+    {
+      "rendered": true,
+      "initial": false,
+      "entry": false,
+      "recorded": false,
+      "size": 7103,
+      "sizes": {
+        "javascript": 7103
+      },
+      "names": [],
+      "idHints": [],
+      "runtime": [
+        "@openmrs/esm-form-builder-app",
+        "main"
+      ],
+      "files": [
+        "294.js"
+      ],
+      "auxiliaryFiles": [
+        "294.js.map"
+      ],
+      "hash": "b314e60f1c149ba9",
+      "childrenByOrder": {}
+    },
+    {
+      "rendered": true,
+      "initial": false,
+      "entry": false,
+      "recorded": false,
+      "size": 9345,
+      "sizes": {
+        "javascript": 9345
+      },
+      "names": [],
+      "idHints": [],
+      "runtime": [
+        "@openmrs/esm-form-builder-app",
+        "main"
+      ],
+      "files": [
+        "319.js"
+      ],
+      "auxiliaryFiles": [],
+      "hash": "c49c5a43474341c0",
+      "childrenByOrder": {}
+    },
+    {
+      "rendered": true,
+      "initial": false,
+      "entry": false,
+      "recorded": false,
+      "reason": "split chunk (cache group: defaultVendors)",
+      "size": 2563762,
+      "sizes": {
+        "javascript": 2563762
+      },
+      "names": [],
+      "idHints": [
+        "vendors"
+      ],
+      "runtime": [
+        "@openmrs/esm-form-builder-app",
+        "main"
+      ],
+      "files": [
+        "333.js"
+      ],
+      "auxiliaryFiles": [
+        "333.js.map"
+      ],
+      "hash": "ec26bad1e23fa22b",
+      "childrenByOrder": {}
+    },
+    {
+      "rendered": true,
+      "initial": false,
+      "entry": false,
+      "recorded": false,
+      "size": 984,
+      "sizes": {
+        "javascript": 984
+      },
+      "names": [],
+      "idHints": [],
+      "runtime": [
+        "@openmrs/esm-form-builder-app",
+        "main"
+      ],
+      "files": [
+        "447.js"
+      ],
+      "auxiliaryFiles": [
+        "447.js.map"
+      ],
+      "hash": "7fadd63088be49ea",
+      "childrenByOrder": {}
+    },
+    {
+      "rendered": true,
+      "initial": false,
+      "entry": false,
+      "recorded": false,
+      "reason": "reused as split chunk (cache group: defaultVendors)",
+      "size": 29495,
+      "sizes": {
+        "javascript": 29495
+      },
+      "names": [],
+      "idHints": [
+        "vendors"
+      ],
+      "runtime": [
+        "@openmrs/esm-form-builder-app",
+        "main"
+      ],
+      "files": [
+        "527.js"
+      ],
+      "auxiliaryFiles": [
+        "527.js.map"
+      ],
+      "hash": "a720aabbfca50357",
+      "childrenByOrder": {}
+    },
+    {
+      "rendered": true,
+      "initial": false,
+      "entry": false,
+      "recorded": false,
+      "size": 9260,
+      "sizes": {
+        "javascript": 9260
+      },
+      "names": [],
+      "idHints": [],
+      "runtime": [
+        "@openmrs/esm-form-builder-app",
+        "main"
+      ],
+      "files": [
+        "574.js"
+      ],
+      "auxiliaryFiles": [],
+      "hash": "1da013de0387b341",
+      "childrenByOrder": {}
+    },
+    {
+      "rendered": true,
+      "initial": false,
+      "entry": false,
+      "recorded": false,
+      "size": 11051,
+      "sizes": {
+        "javascript": 11051
+      },
+      "names": [],
+      "idHints": [],
+      "runtime": [
+        "@openmrs/esm-form-builder-app",
+        "main"
+      ],
+      "files": [
+        "626.js"
+      ],
+      "auxiliaryFiles": [
+        "626.js.map"
+      ],
+      "hash": "8121ff38bfc8ddc9",
+      "childrenByOrder": {}
+    },
+    {
+      "rendered": false,
+      "initial": false,
+      "entry": false,
+      "recorded": false,
+      "reason": "reused as split chunk (cache group: default)",
+      "size": 42,
+      "sizes": {
+        "consume-shared": 42
+      },
+      "names": [],
+      "idHints": [],
+      "runtime": [
+        "@openmrs/esm-form-builder-app",
+        "main"
+      ],
+      "files": [],
+      "auxiliaryFiles": [],
+      "hash": "c20b64ea6ed751d0",
+      "childrenByOrder": {}
+    },
+    {
+      "rendered": true,
+      "initial": false,
+      "entry": false,
+      "recorded": false,
+      "size": 324555,
+      "sizes": {
+        "javascript": 324513,
+        "consume-shared": 42
+      },
+      "names": [],
+      "idHints": [],
+      "runtime": [
+        "@openmrs/esm-form-builder-app",
+        "main"
+      ],
+      "files": [
+        "729.js"
+      ],
+      "auxiliaryFiles": [
+        "729.js.map"
+      ],
+      "hash": "c7d141e55a939f03",
+      "childrenByOrder": {}
+    },
+    {
+      "rendered": true,
+      "initial": false,
+      "entry": false,
+      "recorded": false,
+      "size": 9345,
+      "sizes": {
+        "javascript": 9345
+      },
+      "names": [],
+      "idHints": [],
+      "runtime": [
+        "@openmrs/esm-form-builder-app",
+        "main"
+      ],
+      "files": [
+        "757.js"
+      ],
+      "auxiliaryFiles": [],
+      "hash": "e3182ff4297c5147",
       "childrenByOrder": {}
     },
     {

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":"^2.2.0"},"pages":[{"component":"root","route":"form-builder","online":true,"offline":true,"order":1}],"extensions":[{"name":"system-administration-form-builder-card-link","slot":"system-admin-page-card-link-slot","component":"systemAdministrationFormBuilderCardLink","online":true,"offline":true}],"version":"2.3.1-pre.699"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":"^2.2.0"},"pages":[{"component":"root","route":"form-builder","online":true,"offline":true,"order":1}],"extensions":[{"name":"system-administration-form-builder-card-link","slot":"system-admin-page-card-link-slot","component":"systemAdministrationFormBuilderCardLink","online":true,"offline":true}],"version":"2.3.1-pre.702"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-form-builder-app",
-  "version": "2.3.1-pre.699",
+  "version": "2.3.1-pre.702",
   "license": "MPL-2.0",
   "description": "OpenMRS ESM Form Builder App",
   "browser": "dist/openmrs-esm-form-builder-app.js",

package/src/components/form-editor/form-editor.component.tsx

@@ -1,4 +1,5 @@
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import classNames from 'classnames';
 import {
   Button,
   Column,
@@ -17,9 +18,10 @@ import {
   TabPanels,
   TabPanel,
 } from '@carbon/react';
-import { ArrowLeft, Download } from '@carbon/react/icons';
+import { ArrowLeft, Download, Maximize, Minimize } from '@carbon/react/icons';
 import { useParams } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
+import { ConfigurableLink } from '@openmrs/esm-framework';
 import type { OHRIFormSchema } from '@openmrs/openmrs-form-engine-lib';
 import type { Schema } from '../../types';
 import { useClobdata } from '../../hooks/useClobdata';
@@ -31,7 +33,6 @@ import Header from '../header/header.component';
 import InteractiveBuilder from '../interactive-builder/interactive-builder.component';
 import SchemaEditor from '../schema-editor/schema-editor.component';
 import styles from './form-editor.scss';
-import { ConfigurableLink } from '@openmrs/esm-framework';
 
 interface ErrorProps {
   error: Error;
@@ -61,6 +62,7 @@ const FormEditor: React.FC = () => {
   const { form, formError, isLoadingForm } = useForm(formUuid);
   const { clobdata, clobdataError, isLoadingClobdata } = useClobdata(form);
   const [status, setStatus] = useState<Status>('idle');
+  const [isMaximized, setIsMaximized] = useState(false);
   const [stringifiedSchema, setStringifiedSchema] = useState(schema ? JSON.stringify(schema, null, 2) : '');
 
   const isLoadingFormOrSchema = Boolean(formUuid) && (isLoadingClobdata || isLoadingForm);
@@ -239,14 +241,24 @@ const FormEditor: React.FC = () => {
     await navigator.clipboard.writeText(stringifiedSchema);
   }, [stringifiedSchema]);
 
+  const handleToggleMaximize = () => {
+    setIsMaximized(!isMaximized);
+  };
+
+  const responsiveSize = isMaximized ? 16 : 8;
+
   return (
     <>
       <Header title={t('schemaEditor', 'Schema editor')} />
       <BackButton />
       <div className={styles.container}>
         {showDraftSchemaModal && <DraftSchemaModal />}
-        <Grid className={styles.grid}>
-          <Column lg={8} md={8} className={styles.column}>
+        <Grid
+          className={classNames(styles.grid as string, {
+            [styles.maximized]: isMaximized,
+          })}
+        >
+          <Column lg={responsiveSize} md={responsiveSize} className={styles.column}>
             <div className={styles.actionButtons}>
               {isLoadingFormOrSchema ? (
                 <InlineLoading description={t('loadingSchema', 'Loading schema') + '...'} />
@@ -271,6 +283,18 @@ const FormEditor: React.FC = () => {
                 <span className={styles.tabHeading}>{t('schemaEditor', 'Schema editor')}</span>
                 {schema ? (
                   <>
+                    <Button
+                      enterDelayMs={300}
+                      renderIcon={isMaximized ? Minimize : Maximize}
+                      kind={'ghost'}
+                      iconDescription={
+                        isMaximized ? t('minimizeEditor', 'Minimize editor') : t('maximizeEditor', 'Maximize editor')
+                      }
+                      hasIconOnly
+                      size="md"
+                      tooltipAlignment="start"
+                      onClick={handleToggleMaximize}
+                    />
                     <CopyButton
                       align="top"
                       className="cds--btn--md"

package/src/components/form-editor/form-editor.scss

@@ -26,6 +26,10 @@
   margin-right: 0;
 }
 
+.maximized .column:last-child {
+  display: none;
+}
+
 .errorNotification {
   min-width: 100%;
   margin: 0;