@openmrs/esm-form-builder-app 2.2.2-pre.651 → 2.2.2-pre.658

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

@@ -53,10 +53,10 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 2783,
+      "size": 2181,
       "sizes": {
         "consume-shared": 42,
-        "javascript": 2741
+        "javascript": 2139
       },
       "names": [],
       "idHints": [],
@@ -69,7 +69,7 @@
       "auxiliaryFiles": [
         "153.js.map"
       ],
-      "hash": "1feb363b8fb039cb",
+      "hash": "e8a3d3e72636e09f",
       "childrenByOrder": {}
     },
     {
@@ -104,10 +104,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 23119,
+      "size": 22517,
       "sizes": {
         "consume-shared": 42,
-        "javascript": 2741,
+        "javascript": 2139,
         "share-init": 210,
         "runtime": 20126
       },
@@ -124,7 +124,177 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "72e6d606e0055745",
+      "hash": "71a4d27b5460352d",
+      "childrenByOrder": {}
+    },
+    {
+      "rendered": true,
+      "initial": false,
+      "entry": false,
+      "recorded": false,
+      "size": 3602,
+      "sizes": {
+        "javascript": 3602
+      },
+      "names": [],
+      "idHints": [],
+      "runtime": [
+        "@openmrs/esm-form-builder-app",
+        "main"
+      ],
+      "files": [
+        "256.js"
+      ],
+      "auxiliaryFiles": [
+        "256.js.map"
+      ],
+      "hash": "dc564bd5a1b8a9d0",
+      "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,
+      "size": 984,
+      "sizes": {
+        "javascript": 984
+      },
+      "names": [],
+      "idHints": [],
+      "runtime": [
+        "@openmrs/esm-form-builder-app",
+        "main"
+      ],
+      "files": [
+        "447.js"
+      ],
+      "auxiliaryFiles": [
+        "447.js.map"
+      ],
+      "hash": "ad9a7848e19ba2a6",
+      "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,
+      "reason": "split chunk (cache group: defaultVendors)",
+      "size": 2552869,
+      "sizes": {
+        "javascript": 2552869
+      },
+      "names": [],
+      "idHints": [
+        "vendors"
+      ],
+      "runtime": [
+        "@openmrs/esm-form-builder-app",
+        "main"
+      ],
+      "files": [
+        "565.js"
+      ],
+      "auxiliaryFiles": [
+        "565.js.map"
+      ],
+      "hash": "08a8c97407f9ffcf",
+      "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": {}
     },
     {
@@ -133,9 +303,9 @@
       "entry": false,
       "recorded": false,
       "reason": "split chunk (cache group: defaultVendors)",
-      "size": 2970520,
+      "size": 3122981,
       "sizes": {
-        "javascript": 2970520
+        "javascript": 3122981
       },
       "names": [],
       "idHints": [
@@ -146,7 +316,7 @@
         "main"
       ],
       "files": [
-        "223.js"
+        "626.js"
       ],
       "auxiliaryFiles": [
         "002a2ac7b7d3b3b807ddcb210cfc91eb.js",
@@ -212,7 +382,6 @@
         "2091e4c01015d7dda392116f3ae59801.js",
         "211511e7b374f57ad31acaf49dbdccb1.js",
         "2184bcd361a0e38d249bc49439d994cb.js",
-        "223.js.map",
         "2272c6632c52c3e402ab27b8045ab8f1.js",
         "23602ad4c88f0f19e7a0a12454ebf556.js",
         "23bb1a9f279e7a732bfd405350aab114.js",
@@ -350,6 +519,7 @@
         "5fedbf948ed123687f77167fac1faf8b.js",
         "6231f0100394f756aac18e8d972d8f2b.js",
         "6257c20a623b032171b358cc95a1adab.js",
+        "626.js.map",
         "62a96977e725e8bc809dc80afe0fedf1.js",
         "6327ff8d569aa463a91e5ea774d1980e.js",
         "63596b4896732fb322ab0496b4be1e74.js",
@@ -594,41 +764,17 @@
         "ffb6d262efb0718a20d60b5fecb76ea6.js",
         "ffd3b83e8b5878f4785591ff54b1dfff.js"
       ],
-      "hash": "bb6a01952667b7a9",
-      "childrenByOrder": {}
-    },
-    {
-      "rendered": true,
-      "initial": false,
-      "entry": false,
-      "recorded": false,
-      "size": 3602,
-      "sizes": {
-        "javascript": 3602
-      },
-      "names": [],
-      "idHints": [],
-      "runtime": [
-        "@openmrs/esm-form-builder-app",
-        "main"
-      ],
-      "files": [
-        "256.js"
-      ],
-      "auxiliaryFiles": [
-        "256.js.map"
-      ],
-      "hash": "d4d5b35efe1d8ede",
+      "hash": "eaa037b07d797dcf",
       "childrenByOrder": {}
     },
     {
-      "rendered": true,
+      "rendered": false,
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 312334,
+      "reason": "reused as split chunk (cache group: default)",
+      "size": 42,
       "sizes": {
-        "javascript": 312292,
         "consume-shared": 42
       },
       "names": [],
@@ -637,59 +783,9 @@
         "@openmrs/esm-form-builder-app",
         "main"
       ],
-      "files": [
-        "259.js"
-      ],
-      "auxiliaryFiles": [
-        "259.js.map"
-      ],
-      "hash": "147a465e51ccdb52",
-      "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": 9293,
-      "sizes": {
-        "javascript": 9293
-      },
-      "names": [],
-      "idHints": [],
-      "runtime": [
-        "@openmrs/esm-form-builder-app",
-        "main"
-      ],
-      "files": [
-        "319.js"
-      ],
+      "files": [],
       "auxiliaryFiles": [],
-      "hash": "5636b451deeba091",
+      "hash": "c20b64ea6ed751d0",
       "childrenByOrder": {}
     },
     {
@@ -697,9 +793,10 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 984,
+      "size": 323036,
       "sizes": {
-        "javascript": 984
+        "javascript": 322994,
+        "consume-shared": 42
       },
       "names": [],
       "idHints": [],
@@ -708,109 +805,12 @@
         "main"
       ],
       "files": [
-        "447.js"
+        "729.js"
       ],
       "auxiliaryFiles": [
-        "447.js.map"
+        "729.js.map"
       ],
-      "hash": "40f540e9c6d5d988",
-      "childrenByOrder": {}
-    },
-    {
-      "rendered": true,
-      "initial": false,
-      "entry": false,
-      "recorded": false,
-      "reason": "split chunk (cache group: defaultVendors)",
-      "size": 2552869,
-      "sizes": {
-        "javascript": 2552869
-      },
-      "names": [],
-      "idHints": [
-        "vendors"
-      ],
-      "runtime": [
-        "@openmrs/esm-form-builder-app",
-        "main"
-      ],
-      "files": [
-        "501.js"
-      ],
-      "auxiliaryFiles": [
-        "501.js.map"
-      ],
-      "hash": "6fda22fd27ff1fcc",
-      "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": 9208,
-      "sizes": {
-        "javascript": 9208
-      },
-      "names": [],
-      "idHints": [],
-      "runtime": [
-        "@openmrs/esm-form-builder-app",
-        "main"
-      ],
-      "files": [
-        "574.js"
-      ],
-      "auxiliaryFiles": [],
-      "hash": "f7fb7d49cfc0d124",
-      "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",
+      "hash": "701111784b37afe9",
       "childrenByOrder": {}
     },
     {
@@ -818,9 +818,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 9293,
+      "size": 9345,
       "sizes": {
-        "javascript": 9293
+        "javascript": 9345
       },
       "names": [],
       "idHints": [],
@@ -832,7 +832,7 @@
         "757.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "dc0b6206faa09706",
+      "hash": "e3182ff4297c5147",
       "childrenByOrder": {}
     },
     {
@@ -840,9 +840,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 9293,
+      "size": 9345,
       "sizes": {
-        "javascript": 9293
+        "javascript": 9345
       },
       "names": [],
       "idHints": [],
@@ -854,7 +854,7 @@
         "788.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "99d9c4c64629db69",
+      "hash": "844b917810e0e155",
       "childrenByOrder": {}
     },
     {
@@ -889,9 +889,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 9293,
+      "size": 9345,
       "sizes": {
-        "javascript": 9293
+        "javascript": 9345
       },
       "names": [],
       "idHints": [],
@@ -903,7 +903,7 @@
         "807.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "72cccdd76e06f658",
+      "hash": "127b571eff8030fc",
       "childrenByOrder": {}
     },
     {
@@ -911,9 +911,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 9293,
+      "size": 9345,
       "sizes": {
-        "javascript": 9293
+        "javascript": 9345
       },
       "names": [],
       "idHints": [],
@@ -925,7 +925,7 @@
         "833.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "08f084e1a4c42962",
+      "hash": "f536e5ca87096aeb",
       "childrenByOrder": {}
     },
     {
@@ -952,7 +952,7 @@
       "auxiliaryFiles": [
         "openmrs-esm-form-builder-app.js.map"
       ],
-      "hash": "ecfa5c47e380b15d",
+      "hash": "f0fea8763f807b66",
       "childrenByOrder": {}
     },
     {

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":"^1.2.0","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.2.2-pre.651"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":"^1.2.0","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.2.2-pre.658"}

package/package.json

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

package/src/components/dashboard/dashboard.component.tsx

@@ -47,6 +47,7 @@ import { useClobdata } from '../../hooks/useClobdata';
 import { useForms } from '../../hooks/useForms';
 import EmptyState from '../empty-state/empty-state.component';
 import ErrorState from '../error-state/error-state.component';
+import Header from '../header/header.component';
 import styles from './dashboard.scss';
 
 type Mutator = KeyedMutator<{
@@ -436,24 +437,26 @@ const Dashboard: React.FC = () => {
   const { error, forms, isLoading, isValidating, mutate } = useForms();
 
   return (
-    <div className={styles.container}>
-      <h3 className={styles.heading}>{t('formBuilder', 'Form Builder')}</h3>
-      {(() => {
-        if (error) {
-          return <ErrorState error={error} />;
-        }
+    <main>
+      <Header title={t('home', 'Home')} />
+      <div className={styles.container}>
+        {(() => {
+          if (error) {
+            return <ErrorState error={error} />;
+          }
 
-        if (isLoading) {
-          return <DataTableSkeleton role="progressbar" />;
-        }
+          if (isLoading) {
+            return <DataTableSkeleton role="progressbar" />;
+          }
 
-        if (forms.length === 0) {
-          return <EmptyState />;
-        }
+          if (forms.length === 0) {
+            return <EmptyState />;
+          }
 
-        return <FormsList forms={forms} isValidating={isValidating} mutate={mutate} t={t} />;
-      })()}
-    </div>
+          return <FormsList forms={forms} isValidating={isValidating} mutate={mutate} t={t} />;
+        })()}
+      </div>
+    </main>
   );
 };
 

package/src/components/dashboard/dashboard.scss

@@ -3,7 +3,7 @@
 @use "@carbon/type";
 
 .container {
-  padding: 2rem;
+  padding: 1rem;
   background-color: colors.$gray-10;
 }
 
@@ -68,10 +68,6 @@
   }
 }
 
-.heading {
-  margin-bottom: 1.5rem;
-}
-
 .toolbar {
   position: relative;
   display: flex;
@@ -150,7 +146,7 @@
 }
 
 .warningMessage {
-  margin: 1.5rem 0;
+  margin: 1rem 0;
 }
 
 .spinner {