@openmrs/esm-form-builder-app 2.3.1-pre.677 → 2.3.1-pre.685

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

@@ -69,7 +69,7 @@
       "auxiliaryFiles": [
         "153.js.map"
       ],
-      "hash": "e8a3d3e72636e09f",
+      "hash": "88ba4a2bfb2af6b6",
       "childrenByOrder": {}
     },
     {
@@ -99,213 +99,15 @@
       "hash": "84b779495120e0b1",
       "childrenByOrder": {}
     },
-    {
-      "rendered": true,
-      "initial": true,
-      "entry": true,
-      "recorded": false,
-      "size": 22517,
-      "sizes": {
-        "consume-shared": 42,
-        "javascript": 2139,
-        "share-init": 210,
-        "runtime": 20126
-      },
-      "names": [
-        "main"
-      ],
-      "idHints": [],
-      "runtime": [
-        "main"
-      ],
-      "files": [
-        "main.js"
-      ],
-      "auxiliaryFiles": [
-        "main.js.map"
-      ],
-      "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": "e4ecdccee54c81fd",
-      "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": {}
-    },
     {
       "rendered": true,
       "initial": false,
       "entry": false,
       "recorded": false,
       "reason": "split chunk (cache group: defaultVendors)",
-      "size": 3122981,
+      "size": 4166575,
       "sizes": {
-        "javascript": 3122981
+        "javascript": 4166575
       },
       "names": [],
       "idHints": [
@@ -316,7 +118,7 @@
         "main"
       ],
       "files": [
-        "626.js"
+        "167.js"
       ],
       "auxiliaryFiles": [
         "002a2ac7b7d3b3b807ddcb210cfc91eb.js",
@@ -362,6 +164,7 @@
         "1533058f0ce13acdaa8d5bdc7d147bef.js",
         "154e51d48e7dc7f244bf748e4deb64f9.js",
         "15f3800d33b854ba476c9daf1b9e0326.js",
+        "167.js.map",
         "16b5146f5e9b7a1a196f6d11a6187282.js",
         "170487867de05784a96608617bdd544d.js",
         "1736cea368ae85240f34289307fdf67f.js",
@@ -519,7 +322,6 @@
         "5fedbf948ed123687f77167fac1faf8b.js",
         "6231f0100394f756aac18e8d972d8f2b.js",
         "6257c20a623b032171b358cc95a1adab.js",
-        "626.js.map",
         "62a96977e725e8bc809dc80afe0fedf1.js",
         "6327ff8d569aa463a91e5ea774d1980e.js",
         "63596b4896732fb322ab0496b4be1e74.js",
@@ -764,7 +566,229 @@
         "ffb6d262efb0718a20d60b5fecb76ea6.js",
         "ffd3b83e8b5878f4785591ff54b1dfff.js"
       ],
-      "hash": "a0bbebf2f20cfe12",
+      "hash": "b2ec3ce836af773f",
+      "childrenByOrder": {}
+    },
+    {
+      "rendered": true,
+      "initial": true,
+      "entry": true,
+      "recorded": false,
+      "size": 22517,
+      "sizes": {
+        "consume-shared": 42,
+        "javascript": 2139,
+        "share-init": 210,
+        "runtime": 20126
+      },
+      "names": [
+        "main"
+      ],
+      "idHints": [],
+      "runtime": [
+        "main"
+      ],
+      "files": [
+        "main.js"
+      ],
+      "auxiliaryFiles": [
+        "main.js.map"
+      ],
+      "hash": "41c75056d775da6b",
+      "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": "e79ec0c9ce613d23",
+      "childrenByOrder": {}
+    },
+    {
+      "rendered": true,
+      "initial": false,
+      "entry": false,
+      "recorded": false,
+      "reason": "split chunk (cache group: defaultVendors)",
+      "size": 2569084,
+      "sizes": {
+        "javascript": 2569084
+      },
+      "names": [],
+      "idHints": [
+        "vendors"
+      ],
+      "runtime": [
+        "@openmrs/esm-form-builder-app",
+        "main"
+      ],
+      "files": [
+        "291.js"
+      ],
+      "auxiliaryFiles": [
+        "291.js.map"
+      ],
+      "hash": "05942285e99dd2d1",
+      "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": "7075dd523643cc9b",
+      "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": "799b4eee401223fe",
       "childrenByOrder": {}
     },
     {
@@ -793,9 +817,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 323365,
+      "size": 323678,
       "sizes": {
-        "javascript": 323323,
+        "javascript": 323636,
         "consume-shared": 42
       },
       "names": [],
@@ -810,7 +834,7 @@
       "auxiliaryFiles": [
         "729.js.map"
       ],
-      "hash": "91f8d3e56767e3e9",
+      "hash": "53cdb51b9b099190",
       "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.3.1-pre.677"}
+{"$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.3.1-pre.685"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-form-builder-app",
-  "version": "2.3.1-pre.677",
+  "version": "2.3.1-pre.685",
   "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

@@ -38,6 +38,7 @@ import {
   usePagination,
   useDebounce,
   openmrsFetch,
+  restBaseUrl,
 } from '@openmrs/esm-framework';
 import { type KeyedMutator, preload } from 'swr';
 
@@ -318,7 +319,7 @@ function FormsList({ forms, isValidating, mutate, t }: FormsListProps) {
         className={styles.link}
         to={editSchemaUrl}
         templateParams={{ formUuid: form?.uuid }}
-        onMouseEnter={() => void preload(`/ws/rest/v1/form/${form?.uuid}?v=full`, openmrsFetch)}
+        onMouseEnter={() => void preload(`${restBaseUrl}/form/${form?.uuid}?v=full`, openmrsFetch)}
       >
         {form.name}
       </ConfigurableLink>

package/src/forms.resource.ts

@@ -1,4 +1,4 @@
-import { openmrsFetch, type FetchResponse } from '@openmrs/esm-framework';
+import { openmrsFetch, type FetchResponse, restBaseUrl } from '@openmrs/esm-framework';
 import type { Form, Schema } from './types';
 
 interface SavePayload {
@@ -10,7 +10,7 @@ interface SavePayload {
 }
 
 export async function deleteClobdata(valueReference: string): Promise<FetchResponse<Schema>> {
-  const response: FetchResponse = await openmrsFetch(`/ws/rest/v1/clobdata/${valueReference}`, {
+  const response: FetchResponse = await openmrsFetch(`${restBaseUrl}/clobdata/${valueReference}`, {
     method: 'DELETE',
     headers: { 'Content-Type': 'application/json' },
   });
@@ -18,7 +18,7 @@ export async function deleteClobdata(valueReference: string): Promise<FetchRespo
 }
 
 export async function deleteForm(formUuid: string): Promise<FetchResponse<Record<string, never>>> {
-  const response: FetchResponse = await openmrsFetch(`/ws/rest/v1/form/${formUuid}`, {
+  const response: FetchResponse = await openmrsFetch(`${restBaseUrl}/form/${formUuid}`, {
     method: 'DELETE',
     headers: { 'Content-Type': 'application/json' },
   });
@@ -29,7 +29,7 @@ export async function deleteResource(
   formUuid: string,
   resourceUuid: string,
 ): Promise<FetchResponse<Record<string, never>>> {
-  const response: FetchResponse = await openmrsFetch(`/ws/rest/v1/form/${formUuid}/resource/${resourceUuid}`, {
+  const response: FetchResponse = await openmrsFetch(`${restBaseUrl}/form/${formUuid}/resource/${resourceUuid}`, {
     method: 'DELETE',
     headers: { 'Content-Type': 'application/json' },
   });
@@ -44,7 +44,7 @@ export async function uploadSchema(schema: Schema): Promise<string> {
   body.append('file', schemaBlob);
 
   const response = await window
-    .fetch(`${window.openmrsBase}/ws/rest/v1/clobdata`, {
+    .fetch(`${window.openmrsBase}/${restBaseUrl}/clobdata`, {
       body,
       method: 'POST',
     })
@@ -62,7 +62,7 @@ export async function getResourceUuid(formUuid: string, valueReference: string):
     valueReference: valueReference,
   };
 
-  const response: FetchResponse = await openmrsFetch(`/ws/rest/v1/form/${formUuid}/resource`, {
+  const response: FetchResponse = await openmrsFetch(`${restBaseUrl}/form/${formUuid}/resource`, {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
     body: body,
@@ -88,7 +88,7 @@ export async function updateForm(
     },
   };
 
-  const response: FetchResponse = await openmrsFetch(`/ws/rest/v1/form/${formUuid}`, {
+  const response: FetchResponse = await openmrsFetch(`${restBaseUrl}/form/${formUuid}`, {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
     body: body,
@@ -121,7 +121,7 @@ export async function saveNewForm(
     'Content-Type': 'application/json',
   };
 
-  const response: FetchResponse<Form> = await openmrsFetch(`/ws/rest/v1/form`, {
+  const response: FetchResponse<Form> = await openmrsFetch(`${restBaseUrl}/form`, {
     method: 'POST',
     headers: headers,
     body: body,
@@ -133,7 +133,7 @@ export async function saveNewForm(
 
 export async function publishForm(uuid: string): Promise<FetchResponse<Form>> {
   const body = { published: true };
-  const response: FetchResponse = await openmrsFetch(`/ws/rest/v1/form/${uuid}`, {
+  const response: FetchResponse = await openmrsFetch(`${restBaseUrl}/form/${uuid}`, {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
     body: body,
@@ -143,7 +143,7 @@ export async function publishForm(uuid: string): Promise<FetchResponse<Form>> {
 
 export async function unpublishForm(uuid: string): Promise<FetchResponse<Form>> {
   const body = { published: false };
-  const response: FetchResponse = await openmrsFetch(`/ws/rest/v1/form/${uuid}`, {
+  const response: FetchResponse = await openmrsFetch(`${restBaseUrl}/form/${uuid}`, {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
     body: body,

package/src/hooks/useClobdata.ts

@@ -1,11 +1,11 @@
 import useSWRImmutable from 'swr/immutable';
-import { openmrsFetch } from '@openmrs/esm-framework';
+import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
 import type { Form, Schema } from '../types';
 
 export const useClobdata = (form?: Form) => {
   const valueReferenceUuid = form?.resources?.find(({ name }) => name === 'JSON schema')?.valueReference;
   const formHasResources = form && form?.resources?.length > 0 && valueReferenceUuid;
-  const url = `/ws/rest/v1/clobdata/${valueReferenceUuid}`;
+  const url = `${restBaseUrl}/clobdata/${valueReferenceUuid}`;
 
   const { data, error, isLoading, isValidating, mutate } = useSWRImmutable<{ data: Schema }, Error>(
     formHasResources ? url : null,

package/src/hooks/useConceptLookup.ts

@@ -1,9 +1,9 @@
 import useSWR from 'swr';
-import { openmrsFetch } from '@openmrs/esm-framework';
+import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
 import type { Concept } from '../types';
 
 export function useConceptLookup(conceptId: string) {
-  const url = `/ws/rest/v1/concept?q=${conceptId}&v=full`;
+  const url = `${restBaseUrl}/concept?q=${conceptId}&v=full`;
 
   const { data, error } = useSWR<{ data: { results: Array<Concept> } }, Error>(conceptId ? url : null, openmrsFetch);
 

package/src/hooks/useConceptName.ts

@@ -1,9 +1,9 @@
 import useSWR from 'swr';
-import { openmrsFetch } from '@openmrs/esm-framework';
+import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
 
 export function useConceptName(conceptId: string | undefined) {
   const customRepresentation = 'custom:(name:(display))';
-  const url = `/ws/rest/v1/concept/${conceptId}?v=${customRepresentation}`;
+  const url = `${restBaseUrl}/concept/${conceptId}?v=${customRepresentation}`;
 
   const { data, error } = useSWR<{ data: { name: { display: string } } }, Error>(conceptId ? url : null, openmrsFetch);
 

package/src/hooks/useEncounterTypes.ts

@@ -1,9 +1,9 @@
 import useSWRImmutable from 'swr/immutable';
-import { openmrsFetch } from '@openmrs/esm-framework';
+import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
 import type { EncounterType } from '../types';
 
 export const useEncounterTypes = () => {
-  const url = `/ws/rest/v1/encountertype?v=custom:(uuid,name)`;
+  const url = `${restBaseUrl}/encountertype?v=custom:(uuid,name)`;
 
   const { data, error, isLoading } = useSWRImmutable<{ data: { results: Array<EncounterType> } }, Error>(
     url,

package/src/hooks/useForm.ts

@@ -1,9 +1,9 @@
 import useSWR from 'swr/immutable';
-import { openmrsFetch } from '@openmrs/esm-framework';
+import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
 import type { Form } from '../types';
 
 export const useForm = (uuid: string) => {
-  const url = `/ws/rest/v1/form/${uuid}?v=full`;
+  const url = `${restBaseUrl}/form/${uuid}?v=full`;
 
   const { data, error, isLoading, isValidating, mutate } = useSWR<{ data: Form }, Error>(
     uuid ? url : null,

package/src/hooks/useForms.ts

@@ -1,10 +1,9 @@
 import useSWR from 'swr';
-import { openmrsFetch } from '@openmrs/esm-framework';
+import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
 import type { Form } from '../types';
 
 export function useForms() {
-  const url =
-    '/ws/rest/v1/form?v=custom:(uuid,name,encounterType:(uuid,name),version,published,retired,resources:(uuid,name,dataType,valueReference))';
+  const url = `${restBaseUrl}/form?v=custom:(uuid,name,encounterType:(uuid,name),version,published,retired,resources:(uuid,name,dataType,valueReference))`;
 
   const { data, error, isValidating, mutate } = useSWR<{ data: { results: Array<Form> } }, Error>(url, openmrsFetch);