From 4e0cff1d613d3a300c31046fde3c550375806bd3 Mon Sep 17 00:00:00 2001
From: gqcorneby <185756521+gqcorneby@users.noreply.github.com>
Date: Tue, 14 Oct 2025 15:12:42 +0800
Subject: [PATCH 01/13] allow and run script tags

---
 .../custom-form/custom-form.jsx               | 27 ++++++++++++++-----
 .../custom-form/parse-html-to-react.jsx       |  5 ++--
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/data-workspace/custom-form/custom-form.jsx b/src/data-workspace/custom-form/custom-form.jsx
index afe96b0306..287890cf49 100644
--- a/src/data-workspace/custom-form/custom-form.jsx
+++ b/src/data-workspace/custom-form/custom-form.jsx
@@ -1,15 +1,10 @@
 import PropTypes from 'prop-types'
-import React from 'react'
+import React, { useEffect, useRef } from 'react'
 import useCustomForm from '../../custom-forms/use-custom-form.js'
 import { useMetadata } from '../../shared/index.js'
 import styles from './custom-form.module.css'
 import { parseHtmlToReact } from './parse-html-to-react.jsx'
 
-/**
- * This implementation of custom forms only supports custom
- * HTML and CSS. It does not support custom logic (JavaScript).
- * For more info see ./docs/custom-froms.md
- */
 export const CustomForm = ({ dataSet }) => {
     const { data: customForm } = useCustomForm({
         id: dataSet.dataEntryForm.id,
@@ -17,8 +12,26 @@ export const CustomForm = ({ dataSet }) => {
     })
     const { data: metadata } = useMetadata()
 
+    const containerRef = useRef(null)
+
+    useEffect(() => {
+        if (containerRef.current) {
+            const scripts = containerRef.current.querySelectorAll('script')
+
+            scripts.forEach((oldScript) => {
+                const newScript = document.createElement('script')
+
+                for (const attr of oldScript.attributes) {
+                    newScript.setAttribute(attr.name, attr.value)
+                }
+                newScript.text = oldScript.innerHTML
+                oldScript.parentNode.replaceChild(newScript, oldScript)
+            })
+        }
+    }, [customForm])
+
     return customForm ? (
-        <div className={styles.customForm}>
+        <div className={styles.customForm} ref={containerRef}>
             {parseHtmlToReact(customForm.htmlCode, metadata)}
         </div>
     ) : null
diff --git a/src/data-workspace/custom-form/parse-html-to-react.jsx b/src/data-workspace/custom-form/parse-html-to-react.jsx
index f8fcff4fc4..b6141fdc66 100644
--- a/src/data-workspace/custom-form/parse-html-to-react.jsx
+++ b/src/data-workspace/custom-form/parse-html-to-react.jsx
@@ -12,8 +12,9 @@ export const parseHtmlToReact = (htmlCode, metadata) =>
                 case 'td':
                     return replaceTdNode(domNode, metadata)
                 case 'script':
-                    // remove script tags
-                    return <></>
+                    // Always allow scripts to pass through, but don't let html-react-parser
+                    // handle them inconsistently - we'll execute them manually in CustomForm
+                    return undefined
                 default:
                     return undefined
             }

From e53883be7fa59f6aca22dd62f3e42d42d5945f9e Mon Sep 17 00:00:00 2001
From: gqcorneby <185756521+gqcorneby@users.noreply.github.com>
Date: Tue, 14 Oct 2025 15:27:27 +0800
Subject: [PATCH 02/13] add field id in generic input

---
 src/data-workspace/inputs/generic-input.jsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/data-workspace/inputs/generic-input.jsx b/src/data-workspace/inputs/generic-input.jsx
index 29935d4588..e7e2aa79d8 100644
--- a/src/data-workspace/inputs/generic-input.jsx
+++ b/src/data-workspace/inputs/generic-input.jsx
@@ -114,6 +114,7 @@ export const GenericInput = ({
 
     return (
         <input
+            id={`${deId}-${cocId}`}
             value={value ?? ''}
             className={cx(styles.basicInput, {
                 [styles.alignToEnd]: NUMBER_TYPES.includes(valueType),

From 90f9dbe37410aa47e447e4ff9ba3966e4cf34bef Mon Sep 17 00:00:00 2001
From: gqcorneby <185756521+gqcorneby@users.noreply.github.com>
Date: Tue, 14 Oct 2025 20:04:42 +0800
Subject: [PATCH 03/13] create and use legacy dhis2 bridge

---
 src/app/app.jsx                               | 15 ++--
 .../LegacyDhis2BridgeProvider.jsx             | 71 +++++++++++++++++++
 .../legacy-dhis2-bridge/legacyEvents.js       | 18 +++++
 .../legacy-dhis2-bridge/useCustomEvent.js     | 20 ++++++
 src/shared/legacy-dhis2-bridge/useEmit.js     | 28 ++++++++
 src/shared/legacy-dhis2-bridge/utils.js       | 44 ++++++++++++
 6 files changed, 190 insertions(+), 6 deletions(-)
 create mode 100644 src/shared/legacy-dhis2-bridge/LegacyDhis2BridgeProvider.jsx
 create mode 100644 src/shared/legacy-dhis2-bridge/legacyEvents.js
 create mode 100644 src/shared/legacy-dhis2-bridge/useCustomEvent.js
 create mode 100644 src/shared/legacy-dhis2-bridge/useEmit.js
 create mode 100644 src/shared/legacy-dhis2-bridge/utils.js

diff --git a/src/app/app.jsx b/src/app/app.jsx
index d77c52b033..823f4c32da 100644
--- a/src/app/app.jsx
+++ b/src/app/app.jsx
@@ -15,6 +15,7 @@ import {
 } from '../shared/index.js'
 import { Layout } from './layout/index.js'
 import LoadApp from './load-app.jsx'
+import { LegacyDhis2BridgeProvider } from '../shared/legacy-dhis2-bridge/LegacyDhis2BridgeProvider'
 
 const idSidebarMap = {
     [contextualHelpSidebarId]: ContextualHelpSidebar,
@@ -44,12 +45,14 @@ const App = () => {
 
     return (
         <LoadApp>
-            <Layout
-                header={contextSelection}
-                main={dataWorkspace}
-                sidebar={<RightHandPanel idSidebarMap={idSidebarMap} />}
-                showSidebar={!!id}
-            />
+            <LegacyDhis2BridgeProvider>
+                <Layout
+                    header={contextSelection}
+                    main={dataWorkspace}
+                    sidebar={<RightHandPanel idSidebarMap={idSidebarMap} />}
+                    showSidebar={!!id}
+                />
+            </LegacyDhis2BridgeProvider>
         </LoadApp>
     )
 }
diff --git a/src/shared/legacy-dhis2-bridge/LegacyDhis2BridgeProvider.jsx b/src/shared/legacy-dhis2-bridge/LegacyDhis2BridgeProvider.jsx
new file mode 100644
index 0000000000..84e0d2b915
--- /dev/null
+++ b/src/shared/legacy-dhis2-bridge/LegacyDhis2BridgeProvider.jsx
@@ -0,0 +1,71 @@
+import React, { createContext, useContext, useEffect, useMemo } from 'react'
+import { updateDhis2Bridge, initializeDhis2Bridge } from './utils.js'
+import { useEmitOnChange } from './useEmit.js'
+import { DE_EVENTS, FIELD_EVENTS } from './legacyEvents.js'
+import {
+    selectors,
+    useMetadata,
+    usePeriod,
+    useDataSetId,
+    useOrgUnitId,
+    usePeriodId,
+} from '../index.js'
+
+const LegacyDhis2BridgeContext = createContext(undefined)
+
+export function LegacyDhis2BridgeProvider({ children }) {
+    const value = useLegacyDhis2Bridge()
+
+    const [periodId] = usePeriodId()
+    const [dataSetId] = useDataSetId()
+    const [orgUnitId] = useOrgUnitId()
+
+    const selectedPeriod = usePeriod(periodId)
+
+    const { data: metadata } = useMetadata()
+
+    useEmitOnChange(selectedPeriod, { eventName: FIELD_EVENTS.period })
+    useEmitOnChange(dataSetId, { eventName: FIELD_EVENTS.dataSet })
+    useEmitOnChange(orgUnitId, { eventName: FIELD_EVENTS.orgUnit })
+
+    useEffect(() => {
+        initializeDhis2Bridge()
+    }, [])
+
+    useEffect(() => {
+        if (!window.isLegacyDhis2Bridge) return
+        updateDhis2Bridge(orgUnitId, dataSetId, selectedPeriod)
+    }, [orgUnitId, dataSetId, selectedPeriod])
+
+    return (
+        <LegacyDhis2BridgeContext.Provider value={value}>
+            {children}
+        </LegacyDhis2BridgeContext.Provider>
+    )
+}
+
+export function useLegacyDhis2BridgeContext() {
+    const ctx = useContext(LegacyDhis2BridgeContext)
+    if (!ctx)
+        throw new Error(
+            'useLegacyDhis2BridgeContext must be used within a LegacyDhis2BridgeProvider'
+        )
+    return ctx
+}
+
+function useLegacyDhis2Bridge() {
+    const emit = useMemo(() => {
+        return (type, detail) => {
+            if (typeof window === 'undefined') {
+                return false
+            }
+            const event = new CustomEvent(type, { detail })
+            return window.dispatchEvent(event)
+        }
+    }, [])
+
+    return {
+        dhis2: typeof window !== 'undefined' ? window.dhis2 : undefined,
+        emit,
+    }
+}
diff --git a/src/shared/legacy-dhis2-bridge/legacyEvents.js b/src/shared/legacy-dhis2-bridge/legacyEvents.js
new file mode 100644
index 0000000000..443d0f2480
--- /dev/null
+++ b/src/shared/legacy-dhis2-bridge/legacyEvents.js
@@ -0,0 +1,18 @@
+//copied from window.dhis2.de.event in DHIS2 2.41
+export const DE_EVENTS = {
+    completed: 'dhis2.de.event.completed',
+    dataValueSaved: 'dhis2.de.event.dataValueSaved',
+    dataValuesLoaded: 'dhis2.de.event.dataValuesLoaded',
+    formLoaded: 'dhis2.de.event.formLoaded',
+    formReady: 'dhis2.de.event.formReady',
+    uncompleted: 'dhis2.de.event.uncompleted',
+    validationError: 'dhis2.de.event.validationError',
+    validationSucces: 'dhis2.de.event.validationSuccess',
+}
+
+//can replace form triggers
+export const FIELD_EVENTS = {
+    period: 'dhis2.de.event.periodChanged',
+    orgUnit: 'dhis2.de.event.orgUnitChanged',
+    dataSet: 'dhis2.de.event.dataSetChanged',
+}
diff --git a/src/shared/legacy-dhis2-bridge/useCustomEvent.js b/src/shared/legacy-dhis2-bridge/useCustomEvent.js
new file mode 100644
index 0000000000..5d49da59b8
--- /dev/null
+++ b/src/shared/legacy-dhis2-bridge/useCustomEvent.js
@@ -0,0 +1,20 @@
+import { useCallback } from 'react'
+
+export function useCustomEvent(opts) {
+    const { target = typeof window !== 'undefined' ? window : null } =
+        opts || {}
+
+    return useCallback(
+        (type, detail, options) => {
+            if (!target) return false
+            const evt = new CustomEvent(type, {
+                detail,
+                bubbles: options?.bubbles ?? false,
+                cancelable: options?.cancelable ?? false,
+                composed: options?.composed ?? false,
+            })
+            return target.dispatchEvent(evt)
+        },
+        [target]
+    )
+}
diff --git a/src/shared/legacy-dhis2-bridge/useEmit.js b/src/shared/legacy-dhis2-bridge/useEmit.js
new file mode 100644
index 0000000000..df57f9f18e
--- /dev/null
+++ b/src/shared/legacy-dhis2-bridge/useEmit.js
@@ -0,0 +1,28 @@
+import { useCallback, useEffect, useRef } from "react";
+import { useCustomEvent } from "./useCustomEvent";
+
+export function useEmitOnSet(setFn, { eventName, target, mapDetail }) {
+    const emit = useCustomEvent({ target });
+
+    return useCallback((value) => {
+        setFn(value);
+        const detail = typeof mapDetail === "function" ? mapDetail(value) : value;
+        emit(eventName, detail);
+    }, [setFn, emit, eventName, mapDetail]);
+}
+
+export function useEmitOnChange(value, { eventName, target, mapDetail, fireOnMount = false }) {
+    const emit = useCustomEvent({ target });
+    const first = useRef(true);
+
+    useEffect(() => {
+        if (!fireOnMount && first.current) {
+            first.current = false;
+            return;
+        }
+        first.current = false;
+
+        const detail = typeof mapDetail === "function" ? mapDetail(value) : value;
+        emit(eventName, detail);
+    }, [value, emit, eventName, mapDetail, fireOnMount]);
+}
diff --git a/src/shared/legacy-dhis2-bridge/utils.js b/src/shared/legacy-dhis2-bridge/utils.js
new file mode 100644
index 0000000000..5b45e66965
--- /dev/null
+++ b/src/shared/legacy-dhis2-bridge/utils.js
@@ -0,0 +1,44 @@
+import { DE_EVENTS } from './legacyEvents'
+
+export function initializeDhis2Bridge() {
+    if (typeof window === 'undefined') return
+
+    // Only skip if our bridge already initialized it
+    if (window.isLegacyDhis2Bridge && window.dhis2) return
+
+    window.dhis2 = {
+        util: {
+            on(type, handler) {
+                window.removeEventListener(type, handler)
+                window.addEventListener(type, handler)
+            },
+            off(type, handler) {
+                window.removeEventListener(type, handler)
+            },
+        },
+        de: {
+            event: { ...DE_EVENTS },
+            currentOrganisationUnitId: null,
+            currentDataSetId: null,
+            getSelectedPeriod() {
+                return null
+            },
+        },
+    }
+    window.isLegacyDhis2Bridge = true
+    console.info('Legacy DHIS2 bridge initialized')
+}
+
+export function updateDhis2Bridge(orgUnitId, dataSetId, selectedPeriod) {
+    if (typeof window === 'undefined' || !window.isLegacyDhis2Bridge) return
+
+    if (window.dhis2?.de) {
+        window.dhis2.de.currentOrganisationUnitId = orgUnitId
+        window.dhis2.de.currentDataSetId = dataSetId
+        window.dhis2.de.getSelectedPeriod = () => selectedPeriod
+    }
+}
+
+if (typeof window !== 'undefined') {
+    initializeDhis2Bridge()
+}

From 6a669df025e160d110004bea1b73b9ddb3419f6d Mon Sep 17 00:00:00 2001
From: gqcorneby <185756521+gqcorneby@users.noreply.github.com>
Date: Tue, 21 Oct 2025 18:27:15 +0800
Subject: [PATCH 04/13] emit formLoaded

---
 src/data-workspace/custom-form/custom-form.jsx | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/data-workspace/custom-form/custom-form.jsx b/src/data-workspace/custom-form/custom-form.jsx
index 287890cf49..cc54a94b8b 100644
--- a/src/data-workspace/custom-form/custom-form.jsx
+++ b/src/data-workspace/custom-form/custom-form.jsx
@@ -4,6 +4,8 @@ import useCustomForm from '../../custom-forms/use-custom-form.js'
 import { useMetadata } from '../../shared/index.js'
 import styles from './custom-form.module.css'
 import { parseHtmlToReact } from './parse-html-to-react.jsx'
+import { useLegacyDhis2BridgeContext } from '../../shared/legacy-dhis2-bridge/LegacyDhis2BridgeProvider'
+import { DE_EVENTS } from '../../shared/legacy-dhis2-bridge/legacyEvents'
 
 export const CustomForm = ({ dataSet }) => {
     const { data: customForm } = useCustomForm({
@@ -11,6 +13,7 @@ export const CustomForm = ({ dataSet }) => {
         version: dataSet.version,
     })
     const { data: metadata } = useMetadata()
+    const { emit } = useLegacyDhis2BridgeContext()
 
     const containerRef = useRef(null)
 
@@ -27,8 +30,15 @@ export const CustomForm = ({ dataSet }) => {
                 newScript.text = oldScript.innerHTML
                 oldScript.parentNode.replaceChild(newScript, oldScript)
             })
+
+            // Emit formLoaded after scripts have been injected and executed
+            // Use a short delay to allow async script initialization (dependency loading)
+            // assuming only custom forms use the legacy bridge now
+            setTimeout(() => {
+                emit(DE_EVENTS.formLoaded, dataSet.id)
+            }, 0)
         }
-    }, [customForm])
+    }, [customForm, dataSet.id, emit])
 
     return customForm ? (
         <div className={styles.customForm} ref={containerRef}>

From 73e1eced1f69ed979b0422d8810e52236e307d0b Mon Sep 17 00:00:00 2001
From: gqcorneby <185756521+gqcorneby@users.noreply.github.com>
Date: Tue, 21 Oct 2025 18:29:04 +0800
Subject: [PATCH 05/13] update comment

---
 src/data-workspace/custom-form/parse-html-to-react.jsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/data-workspace/custom-form/parse-html-to-react.jsx b/src/data-workspace/custom-form/parse-html-to-react.jsx
index b6141fdc66..4fa48306d4 100644
--- a/src/data-workspace/custom-form/parse-html-to-react.jsx
+++ b/src/data-workspace/custom-form/parse-html-to-react.jsx
@@ -12,8 +12,7 @@ export const parseHtmlToReact = (htmlCode, metadata) =>
                 case 'td':
                     return replaceTdNode(domNode, metadata)
                 case 'script':
-                    // Always allow scripts to pass through, but don't let html-react-parser
-                    // handle them inconsistently - we'll execute them manually in CustomForm
+                    // Always allow scripts to pass through, but execute them manually in CustomForm
                     return undefined
                 default:
                     return undefined

From 328f4edbbcbda0a1aad9e149a527e82cde271cf6 Mon Sep 17 00:00:00 2001
From: gqcorneby <185756521+gqcorneby@users.noreply.github.com>
Date: Mon, 3 Nov 2025 13:09:57 +0800
Subject: [PATCH 06/13] add id to textarea

---
 src/data-workspace/inputs/long-text.jsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/data-workspace/inputs/long-text.jsx b/src/data-workspace/inputs/long-text.jsx
index 8d6be58f16..7065d6927f 100644
--- a/src/data-workspace/inputs/long-text.jsx
+++ b/src/data-workspace/inputs/long-text.jsx
@@ -47,6 +47,7 @@ export const LongText = ({
 
     return (
         <textarea
+            id={`${deId}-${cocId}`}
             className={styles.longText}
             rows="4"
             value={value ?? ''}

From 8ca08379b663f9e441f483a0c8bdf75c24bf33ea Mon Sep 17 00:00:00 2001
From: gqcorneby <185756521+gqcorneby@users.noreply.github.com>
Date: Mon, 3 Nov 2025 13:27:23 +0800
Subject: [PATCH 07/13] clean up unused references

---
 .../legacy-dhis2-bridge/LegacyDhis2BridgeProvider.jsx       | 6 +-----
 src/shared/legacy-dhis2-bridge/utils.js                     | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/shared/legacy-dhis2-bridge/LegacyDhis2BridgeProvider.jsx b/src/shared/legacy-dhis2-bridge/LegacyDhis2BridgeProvider.jsx
index 84e0d2b915..77c2393c49 100644
--- a/src/shared/legacy-dhis2-bridge/LegacyDhis2BridgeProvider.jsx
+++ b/src/shared/legacy-dhis2-bridge/LegacyDhis2BridgeProvider.jsx
@@ -1,10 +1,8 @@
 import React, { createContext, useContext, useEffect, useMemo } from 'react'
 import { updateDhis2Bridge, initializeDhis2Bridge } from './utils.js'
 import { useEmitOnChange } from './useEmit.js'
-import { DE_EVENTS, FIELD_EVENTS } from './legacyEvents.js'
+import { FIELD_EVENTS } from './legacyEvents.js'
 import {
-    selectors,
-    useMetadata,
     usePeriod,
     useDataSetId,
     useOrgUnitId,
@@ -22,8 +20,6 @@ export function LegacyDhis2BridgeProvider({ children }) {
 
     const selectedPeriod = usePeriod(periodId)
 
-    const { data: metadata } = useMetadata()
-
     useEmitOnChange(selectedPeriod, { eventName: FIELD_EVENTS.period })
     useEmitOnChange(dataSetId, { eventName: FIELD_EVENTS.dataSet })
     useEmitOnChange(orgUnitId, { eventName: FIELD_EVENTS.orgUnit })
diff --git a/src/shared/legacy-dhis2-bridge/utils.js b/src/shared/legacy-dhis2-bridge/utils.js
index 5b45e66965..3ff7e79477 100644
--- a/src/shared/legacy-dhis2-bridge/utils.js
+++ b/src/shared/legacy-dhis2-bridge/utils.js
@@ -3,7 +3,7 @@ import { DE_EVENTS } from './legacyEvents'
 export function initializeDhis2Bridge() {
     if (typeof window === 'undefined') return
 
-    // Only skip if our bridge already initialized it
+    // Only skip if bridge already initialized it
     if (window.isLegacyDhis2Bridge && window.dhis2) return
 
     window.dhis2 = {
@@ -38,7 +38,3 @@ export function updateDhis2Bridge(orgUnitId, dataSetId, selectedPeriod) {
         window.dhis2.de.getSelectedPeriod = () => selectedPeriod
     }
 }
-
-if (typeof window !== 'undefined') {
-    initializeDhis2Bridge()
-}

From f4df7ea5cd3ae78a317b78750f998127a0d4d11b Mon Sep 17 00:00:00 2001
From: gqcorneby <185756521+gqcorneby@users.noreply.github.com>
Date: Mon, 3 Nov 2025 15:22:10 +0800
Subject: [PATCH 08/13] update filenames to match project convention

---
 src/app/app.jsx                               |  2 +-
 .../custom-form/custom-form.jsx               | 30 +++---------
 ...r.jsx => legacy-dhis2-bridge-provider.jsx} | 46 +++++++++++++++++--
 .../{legacyEvents.js => legacy-events.js}     |  0
 .../{useEmit.js => use-emit.js}               | 30 +++++++++---
 .../legacy-dhis2-bridge/useCustomEvent.js     | 20 --------
 src/shared/legacy-dhis2-bridge/utils.js       | 40 ----------------
 7 files changed, 73 insertions(+), 95 deletions(-)
 rename src/shared/legacy-dhis2-bridge/{LegacyDhis2BridgeProvider.jsx => legacy-dhis2-bridge-provider.jsx} (55%)
 rename src/shared/legacy-dhis2-bridge/{legacyEvents.js => legacy-events.js} (100%)
 rename src/shared/legacy-dhis2-bridge/{useEmit.js => use-emit.js} (52%)
 delete mode 100644 src/shared/legacy-dhis2-bridge/useCustomEvent.js
 delete mode 100644 src/shared/legacy-dhis2-bridge/utils.js

diff --git a/src/app/app.jsx b/src/app/app.jsx
index 823f4c32da..463f93a964 100644
--- a/src/app/app.jsx
+++ b/src/app/app.jsx
@@ -15,7 +15,7 @@ import {
 } from '../shared/index.js'
 import { Layout } from './layout/index.js'
 import LoadApp from './load-app.jsx'
-import { LegacyDhis2BridgeProvider } from '../shared/legacy-dhis2-bridge/LegacyDhis2BridgeProvider'
+import { LegacyDhis2BridgeProvider } from '../shared/legacy-dhis2-bridge/legacy-dhis2-bridge-provider'
 
 const idSidebarMap = {
     [contextualHelpSidebarId]: ContextualHelpSidebar,
diff --git a/src/data-workspace/custom-form/custom-form.jsx b/src/data-workspace/custom-form/custom-form.jsx
index cc54a94b8b..cb682b43e8 100644
--- a/src/data-workspace/custom-form/custom-form.jsx
+++ b/src/data-workspace/custom-form/custom-form.jsx
@@ -4,8 +4,9 @@ import useCustomForm from '../../custom-forms/use-custom-form.js'
 import { useMetadata } from '../../shared/index.js'
 import styles from './custom-form.module.css'
 import { parseHtmlToReact } from './parse-html-to-react.jsx'
-import { useLegacyDhis2BridgeContext } from '../../shared/legacy-dhis2-bridge/LegacyDhis2BridgeProvider'
-import { DE_EVENTS } from '../../shared/legacy-dhis2-bridge/legacyEvents'
+import { useLegacyDhis2BridgeContext } from '../../shared/legacy-dhis2-bridge/legacy-dhis2-bridge-provider'
+import { DE_EVENTS } from '../../shared/legacy-dhis2-bridge/legacy-events'
+import {useRunCustomFormScripts} from "../../shared/legacy-dhis2-bridge/use-run-scripts";
 
 export const CustomForm = ({ dataSet }) => {
     const { data: customForm } = useCustomForm({
@@ -17,28 +18,11 @@ export const CustomForm = ({ dataSet }) => {
 
     const containerRef = useRef(null)
 
-    useEffect(() => {
-        if (containerRef.current) {
-            const scripts = containerRef.current.querySelectorAll('script')
+    useRunCustomFormScripts({
+        containerRef,
+        dataSetId: dataSet.id
+    }, [customForm.htmlCode, dataSet.id])
 
-            scripts.forEach((oldScript) => {
-                const newScript = document.createElement('script')
-
-                for (const attr of oldScript.attributes) {
-                    newScript.setAttribute(attr.name, attr.value)
-                }
-                newScript.text = oldScript.innerHTML
-                oldScript.parentNode.replaceChild(newScript, oldScript)
-            })
-
-            // Emit formLoaded after scripts have been injected and executed
-            // Use a short delay to allow async script initialization (dependency loading)
-            // assuming only custom forms use the legacy bridge now
-            setTimeout(() => {
-                emit(DE_EVENTS.formLoaded, dataSet.id)
-            }, 0)
-        }
-    }, [customForm, dataSet.id, emit])
 
     return customForm ? (
         <div className={styles.customForm} ref={containerRef}>
diff --git a/src/shared/legacy-dhis2-bridge/LegacyDhis2BridgeProvider.jsx b/src/shared/legacy-dhis2-bridge/legacy-dhis2-bridge-provider.jsx
similarity index 55%
rename from src/shared/legacy-dhis2-bridge/LegacyDhis2BridgeProvider.jsx
rename to src/shared/legacy-dhis2-bridge/legacy-dhis2-bridge-provider.jsx
index 77c2393c49..6f8c598657 100644
--- a/src/shared/legacy-dhis2-bridge/LegacyDhis2BridgeProvider.jsx
+++ b/src/shared/legacy-dhis2-bridge/legacy-dhis2-bridge-provider.jsx
@@ -1,13 +1,12 @@
 import React, { createContext, useContext, useEffect, useMemo } from 'react'
-import { updateDhis2Bridge, initializeDhis2Bridge } from './utils.js'
-import { useEmitOnChange } from './useEmit.js'
-import { FIELD_EVENTS } from './legacyEvents.js'
+import { DE_EVENTS, FIELD_EVENTS } from './legacy-events.js'
 import {
     usePeriod,
     useDataSetId,
     useOrgUnitId,
     usePeriodId,
 } from '../index.js'
+import { useEmitOnChange } from "./use-emit";
 
 const LegacyDhis2BridgeContext = createContext(undefined)
 
@@ -29,7 +28,7 @@ export function LegacyDhis2BridgeProvider({ children }) {
     }, [])
 
     useEffect(() => {
-        if (!window.isLegacyDhis2Bridge) return
+        if (typeof window === 'undefined' || !window.isLegacyDhis2Bridge) return
         updateDhis2Bridge(orgUnitId, dataSetId, selectedPeriod)
     }, [orgUnitId, dataSetId, selectedPeriod])
 
@@ -65,3 +64,42 @@ function useLegacyDhis2Bridge() {
         emit,
     }
 }
+
+export function initializeDhis2Bridge() {
+    if (typeof window === 'undefined') return
+
+    // Only skip if bridge already initialized it
+    if (window.isLegacyDhis2Bridge && window.dhis2) return
+
+    window.dhis2 = {
+        util: {
+            on(type, handler) {
+                window.removeEventListener(type, handler)
+                window.addEventListener(type, handler)
+            },
+            off(type, handler) {
+                window.removeEventListener(type, handler)
+            },
+        },
+        de: {
+            event: { ...DE_EVENTS },
+            currentOrganisationUnitId: null,
+            currentDataSetId: null,
+            getSelectedPeriod() {
+                return null
+            },
+        },
+    }
+    window.isLegacyDhis2Bridge = true
+    console.info('Legacy DHIS2 bridge initialized')
+}
+
+function updateDhis2Bridge(orgUnitId, dataSetId, selectedPeriod) {
+    if (typeof window === 'undefined' || !window.isLegacyDhis2Bridge) return
+
+    if (window.dhis2?.de) {
+        window.dhis2.de.currentOrganisationUnitId = orgUnitId
+        window.dhis2.de.currentDataSetId = dataSetId
+        window.dhis2.de.getSelectedPeriod = () => selectedPeriod
+    }
+}
diff --git a/src/shared/legacy-dhis2-bridge/legacyEvents.js b/src/shared/legacy-dhis2-bridge/legacy-events.js
similarity index 100%
rename from src/shared/legacy-dhis2-bridge/legacyEvents.js
rename to src/shared/legacy-dhis2-bridge/legacy-events.js
diff --git a/src/shared/legacy-dhis2-bridge/useEmit.js b/src/shared/legacy-dhis2-bridge/use-emit.js
similarity index 52%
rename from src/shared/legacy-dhis2-bridge/useEmit.js
rename to src/shared/legacy-dhis2-bridge/use-emit.js
index df57f9f18e..0a98fc6e31 100644
--- a/src/shared/legacy-dhis2-bridge/useEmit.js
+++ b/src/shared/legacy-dhis2-bridge/use-emit.js
@@ -1,5 +1,20 @@
-import { useCallback, useEffect, useRef } from "react";
-import { useCustomEvent } from "./useCustomEvent";
+import { useCallback, useEffect, useRef } from 'react'
+
+export function useCustomEvent(opts) {
+    const { target = typeof window !== 'undefined' ? window : null } =
+        opts || {}
+
+    return useCallback(
+        (type, detail) => {
+            if (!target) return false
+            const evt = new CustomEvent(type, {
+                detail
+            })
+            return target.dispatchEvent(evt)
+        },
+        [target]
+    )
+}
 
 export function useEmitOnSet(setFn, { eventName, target, mapDetail }) {
     const emit = useCustomEvent({ target });
@@ -13,14 +28,15 @@ export function useEmitOnSet(setFn, { eventName, target, mapDetail }) {
 
 export function useEmitOnChange(value, { eventName, target, mapDetail, fireOnMount = false }) {
     const emit = useCustomEvent({ target });
-    const first = useRef(true);
+    const isFirstRender = useRef(true);
 
     useEffect(() => {
-        if (!fireOnMount && first.current) {
-            first.current = false;
-            return;
+        if (isFirstRender.current) {
+            isFirstRender.current = false;
+            if (!fireOnMount) {
+                return;
+            }
         }
-        first.current = false;
 
         const detail = typeof mapDetail === "function" ? mapDetail(value) : value;
         emit(eventName, detail);
diff --git a/src/shared/legacy-dhis2-bridge/useCustomEvent.js b/src/shared/legacy-dhis2-bridge/useCustomEvent.js
deleted file mode 100644
index 5d49da59b8..0000000000
--- a/src/shared/legacy-dhis2-bridge/useCustomEvent.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import { useCallback } from 'react'
-
-export function useCustomEvent(opts) {
-    const { target = typeof window !== 'undefined' ? window : null } =
-        opts || {}
-
-    return useCallback(
-        (type, detail, options) => {
-            if (!target) return false
-            const evt = new CustomEvent(type, {
-                detail,
-                bubbles: options?.bubbles ?? false,
-                cancelable: options?.cancelable ?? false,
-                composed: options?.composed ?? false,
-            })
-            return target.dispatchEvent(evt)
-        },
-        [target]
-    )
-}
diff --git a/src/shared/legacy-dhis2-bridge/utils.js b/src/shared/legacy-dhis2-bridge/utils.js
deleted file mode 100644
index 3ff7e79477..0000000000
--- a/src/shared/legacy-dhis2-bridge/utils.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import { DE_EVENTS } from './legacyEvents'
-
-export function initializeDhis2Bridge() {
-    if (typeof window === 'undefined') return
-
-    // Only skip if bridge already initialized it
-    if (window.isLegacyDhis2Bridge && window.dhis2) return
-
-    window.dhis2 = {
-        util: {
-            on(type, handler) {
-                window.removeEventListener(type, handler)
-                window.addEventListener(type, handler)
-            },
-            off(type, handler) {
-                window.removeEventListener(type, handler)
-            },
-        },
-        de: {
-            event: { ...DE_EVENTS },
-            currentOrganisationUnitId: null,
-            currentDataSetId: null,
-            getSelectedPeriod() {
-                return null
-            },
-        },
-    }
-    window.isLegacyDhis2Bridge = true
-    console.info('Legacy DHIS2 bridge initialized')
-}
-
-export function updateDhis2Bridge(orgUnitId, dataSetId, selectedPeriod) {
-    if (typeof window === 'undefined' || !window.isLegacyDhis2Bridge) return
-
-    if (window.dhis2?.de) {
-        window.dhis2.de.currentOrganisationUnitId = orgUnitId
-        window.dhis2.de.currentDataSetId = dataSetId
-        window.dhis2.de.getSelectedPeriod = () => selectedPeriod
-    }
-}

From bed4fbce849ecb5267d2bb74176374cb84766fda Mon Sep 17 00:00:00 2001
From: gqcorneby <185756521+gqcorneby@users.noreply.github.com>
Date: Mon, 3 Nov 2025 15:22:24 +0800
Subject: [PATCH 09/13] update run script

---
 .../legacy-dhis2-bridge/use-run-scripts.js    | 63 +++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 src/shared/legacy-dhis2-bridge/use-run-scripts.js

diff --git a/src/shared/legacy-dhis2-bridge/use-run-scripts.js b/src/shared/legacy-dhis2-bridge/use-run-scripts.js
new file mode 100644
index 0000000000..c9c49b8217
--- /dev/null
+++ b/src/shared/legacy-dhis2-bridge/use-run-scripts.js
@@ -0,0 +1,63 @@
+import { useRef, useEffect } from 'react';
+import { DE_EVENTS } from './legacy-events';
+import { useCustomEvent } from './use-emit';
+
+export function useRunCustomFormScripts(
+    { containerRef, dataSetId }, deps
+) {
+    const ranRef = useRef(false);
+    const emit = useCustomEvent();
+
+    useEffect(() => {
+        const container = containerRef.current;
+        if (!container) return;
+
+        if (ranRef.current) return;
+        ranRef.current = true;
+
+        let cancelled = false;
+        (async () => {
+            await runScriptsInOrder(container);
+            if (!cancelled) emit(DE_EVENTS.formLoaded, dataSetId);
+        })();
+
+        return () => { cancelled = true; };
+    }, deps);
+}
+
+function runScriptsInOrder(container) {
+    const originals = [...container.querySelectorAll('script')];
+
+    return originals.reduce((chain, old) => {
+        return chain.then(() => new Promise((resolve) => {
+            const s = document.createElement('script');
+            copyOrderedAttrs(old, s);
+
+            const type = (old.getAttribute('type') || '').trim();
+            const isModule = type === 'module';
+
+            s.onload = () => resolve();
+            s.onerror = () => resolve();
+
+            if (!old.src) {
+                s.text = old.text || old.innerHTML || '';
+            } else {
+                s.async = false;
+                s.defer = false;
+            }
+
+            if (old.parentNode) old.parentNode.replaceChild(s, old);
+
+            if (!old.src && !isModule) {
+                setTimeout(resolve, 0);
+            }
+        }));
+    }, Promise.resolve());
+}
+
+function copyOrderedAttrs(src, dst) {
+    for (const { name, value } of Array.from(src.attributes)) {
+        if (name === 'async' || name === 'defer') continue;
+        dst.setAttribute(name, value);
+    }
+}

From 126e05ce10f7d19c1771169723f8806646cc3178 Mon Sep 17 00:00:00 2001
From: gqcorneby <185756521+gqcorneby@users.noreply.github.com>
Date: Mon, 3 Nov 2025 15:34:07 +0800
Subject: [PATCH 10/13] clean up unused references

---
 src/data-workspace/custom-form/custom-form.jsx   |  7 ++-----
 .../legacy-dhis2-bridge-provider.jsx             | 16 +++++-----------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/data-workspace/custom-form/custom-form.jsx b/src/data-workspace/custom-form/custom-form.jsx
index cb682b43e8..337cc6ff7a 100644
--- a/src/data-workspace/custom-form/custom-form.jsx
+++ b/src/data-workspace/custom-form/custom-form.jsx
@@ -1,12 +1,10 @@
 import PropTypes from 'prop-types'
-import React, { useEffect, useRef } from 'react'
+import React, { useRef } from 'react'
 import useCustomForm from '../../custom-forms/use-custom-form.js'
 import { useMetadata } from '../../shared/index.js'
 import styles from './custom-form.module.css'
 import { parseHtmlToReact } from './parse-html-to-react.jsx'
-import { useLegacyDhis2BridgeContext } from '../../shared/legacy-dhis2-bridge/legacy-dhis2-bridge-provider'
-import { DE_EVENTS } from '../../shared/legacy-dhis2-bridge/legacy-events'
-import {useRunCustomFormScripts} from "../../shared/legacy-dhis2-bridge/use-run-scripts";
+import { useRunCustomFormScripts } from "../../shared/legacy-dhis2-bridge/use-run-scripts";
 
 export const CustomForm = ({ dataSet }) => {
     const { data: customForm } = useCustomForm({
@@ -14,7 +12,6 @@ export const CustomForm = ({ dataSet }) => {
         version: dataSet.version,
     })
     const { data: metadata } = useMetadata()
-    const { emit } = useLegacyDhis2BridgeContext()
 
     const containerRef = useRef(null)
 
diff --git a/src/shared/legacy-dhis2-bridge/legacy-dhis2-bridge-provider.jsx b/src/shared/legacy-dhis2-bridge/legacy-dhis2-bridge-provider.jsx
index 6f8c598657..585c169661 100644
--- a/src/shared/legacy-dhis2-bridge/legacy-dhis2-bridge-provider.jsx
+++ b/src/shared/legacy-dhis2-bridge/legacy-dhis2-bridge-provider.jsx
@@ -1,4 +1,4 @@
-import React, { createContext, useContext, useEffect, useMemo } from 'react'
+import React, { createContext, useContext, useEffect } from 'react'
 import { DE_EVENTS, FIELD_EVENTS } from './legacy-events.js'
 import {
     usePeriod,
@@ -6,7 +6,7 @@ import {
     useOrgUnitId,
     usePeriodId,
 } from '../index.js'
-import { useEmitOnChange } from "./use-emit";
+import {useCustomEvent, useEmitOnChange} from "./use-emit";
 
 const LegacyDhis2BridgeContext = createContext(undefined)
 
@@ -49,15 +49,9 @@ export function useLegacyDhis2BridgeContext() {
 }
 
 function useLegacyDhis2Bridge() {
-    const emit = useMemo(() => {
-        return (type, detail) => {
-            if (typeof window === 'undefined') {
-                return false
-            }
-            const event = new CustomEvent(type, { detail })
-            return window.dispatchEvent(event)
-        }
-    }, [])
+    const emit = useCustomEvent({
+        target: typeof window !== 'undefined' ? window : null,
+    });
 
     return {
         dhis2: typeof window !== 'undefined' ? window.dhis2 : undefined,

From b1ecc719e0315fcbd5e31c836c7d4011ea0ebf04 Mon Sep 17 00:00:00 2001
From: gqcorneby <185756521+gqcorneby@users.noreply.github.com>
Date: Mon, 3 Nov 2025 15:40:38 +0800
Subject: [PATCH 11/13] update references

---
 src/data-workspace/custom-form/custom-form.jsx    |  2 +-
 src/shared/legacy-dhis2-bridge/use-run-scripts.js | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/data-workspace/custom-form/custom-form.jsx b/src/data-workspace/custom-form/custom-form.jsx
index 337cc6ff7a..04d8b22fff 100644
--- a/src/data-workspace/custom-form/custom-form.jsx
+++ b/src/data-workspace/custom-form/custom-form.jsx
@@ -18,7 +18,7 @@ export const CustomForm = ({ dataSet }) => {
     useRunCustomFormScripts({
         containerRef,
         dataSetId: dataSet.id
-    }, [customForm.htmlCode, dataSet.id])
+    }, [customForm?.htmlCode, dataSet.id])
 
 
     return customForm ? (
diff --git a/src/shared/legacy-dhis2-bridge/use-run-scripts.js b/src/shared/legacy-dhis2-bridge/use-run-scripts.js
index c9c49b8217..b058a93a78 100644
--- a/src/shared/legacy-dhis2-bridge/use-run-scripts.js
+++ b/src/shared/legacy-dhis2-bridge/use-run-scripts.js
@@ -28,27 +28,27 @@ export function useRunCustomFormScripts(
 function runScriptsInOrder(container) {
     const originals = [...container.querySelectorAll('script')];
 
-    return originals.reduce((chain, old) => {
+    return originals.reduce((chain, script) => {
         return chain.then(() => new Promise((resolve) => {
             const s = document.createElement('script');
-            copyOrderedAttrs(old, s);
+            copyOrderedAttrs(script, s);
 
-            const type = (old.getAttribute('type') || '').trim();
+            const type = (script.getAttribute('type') || '').trim();
             const isModule = type === 'module';
 
             s.onload = () => resolve();
             s.onerror = () => resolve();
 
-            if (!old.src) {
-                s.text = old.text || old.innerHTML || '';
+            if (!script.src) {
+                s.text = script.text || script.innerHTML || '';
             } else {
                 s.async = false;
                 s.defer = false;
             }
 
-            if (old.parentNode) old.parentNode.replaceChild(s, old);
+            if (script.parentNode) script.parentNode.replaceChild(s, script);
 
-            if (!old.src && !isModule) {
+            if (!script.src && !isModule) {
                 setTimeout(resolve, 0);
             }
         }));

From 06c0a3f1c096d702b06cf97e96c3f2392430b3a0 Mon Sep 17 00:00:00 2001
From: gqcorneby <185756521+gqcorneby@users.noreply.github.com>
Date: Mon, 3 Nov 2025 16:00:49 +0800
Subject: [PATCH 12/13] only run inline scripts

---
 .../custom-form/custom-form.jsx               |  4 +-
 .../use-run-inline-scripts.js                 | 46 ++++++++++++++
 .../legacy-dhis2-bridge/use-run-scripts.js    | 63 -------------------
 3 files changed, 48 insertions(+), 65 deletions(-)
 create mode 100644 src/shared/legacy-dhis2-bridge/use-run-inline-scripts.js
 delete mode 100644 src/shared/legacy-dhis2-bridge/use-run-scripts.js

diff --git a/src/data-workspace/custom-form/custom-form.jsx b/src/data-workspace/custom-form/custom-form.jsx
index 04d8b22fff..8bbecdaaf3 100644
--- a/src/data-workspace/custom-form/custom-form.jsx
+++ b/src/data-workspace/custom-form/custom-form.jsx
@@ -4,7 +4,7 @@ import useCustomForm from '../../custom-forms/use-custom-form.js'
 import { useMetadata } from '../../shared/index.js'
 import styles from './custom-form.module.css'
 import { parseHtmlToReact } from './parse-html-to-react.jsx'
-import { useRunCustomFormScripts } from "../../shared/legacy-dhis2-bridge/use-run-scripts";
+import { useRunInlineScripts } from "../../shared/legacy-dhis2-bridge/use-run-inline-scripts";
 
 export const CustomForm = ({ dataSet }) => {
     const { data: customForm } = useCustomForm({
@@ -15,7 +15,7 @@ export const CustomForm = ({ dataSet }) => {
 
     const containerRef = useRef(null)
 
-    useRunCustomFormScripts({
+    useRunInlineScripts({
         containerRef,
         dataSetId: dataSet.id
     }, [customForm?.htmlCode, dataSet.id])
diff --git a/src/shared/legacy-dhis2-bridge/use-run-inline-scripts.js b/src/shared/legacy-dhis2-bridge/use-run-inline-scripts.js
new file mode 100644
index 0000000000..8018370d75
--- /dev/null
+++ b/src/shared/legacy-dhis2-bridge/use-run-inline-scripts.js
@@ -0,0 +1,46 @@
+import { useRef, useEffect } from 'react';
+import { DE_EVENTS } from './legacy-events';
+import { useCustomEvent } from './use-emit';
+
+export function useRunInlineScripts(
+    { containerRef, dataSetId }, deps
+) {
+    const emit = useCustomEvent();
+
+    useEffect(() => {
+        const container = containerRef.current;
+        if (!container) return;
+
+        let cancelled = false;
+        (async () => {
+            await runInlineScripts(container);
+            if (!cancelled) emit(DE_EVENTS.formLoaded, dataSetId);
+        })();
+
+        return () => { cancelled = true; };
+    }, deps);
+}
+
+function runInlineScripts(container) {
+    const scripts = [...container.querySelectorAll('script:not([src])')];
+
+    return scripts.reduce((chain, script) => {
+        return chain.then(() => new Promise((resolve) => {
+            const injScript = document.createElement('script');
+            copyAttrs(script, injScript);
+
+            injScript.text = script.text || script.innerHTML || '';
+
+            if (script.parentNode) script.parentNode.replaceChild(injScript, script);
+
+            Promise.resolve().then(resolve)
+        }));
+    }, Promise.resolve());
+}
+
+function copyAttrs(src, dst) {
+    for (const { name, value } of Array.from(src.attributes)) {
+        if (name === 'type' || name === 'async' || name === 'defer') continue;
+        dst.setAttribute(name, value);
+    }
+}
diff --git a/src/shared/legacy-dhis2-bridge/use-run-scripts.js b/src/shared/legacy-dhis2-bridge/use-run-scripts.js
deleted file mode 100644
index b058a93a78..0000000000
--- a/src/shared/legacy-dhis2-bridge/use-run-scripts.js
+++ /dev/null
@@ -1,63 +0,0 @@
-import { useRef, useEffect } from 'react';
-import { DE_EVENTS } from './legacy-events';
-import { useCustomEvent } from './use-emit';
-
-export function useRunCustomFormScripts(
-    { containerRef, dataSetId }, deps
-) {
-    const ranRef = useRef(false);
-    const emit = useCustomEvent();
-
-    useEffect(() => {
-        const container = containerRef.current;
-        if (!container) return;
-
-        if (ranRef.current) return;
-        ranRef.current = true;
-
-        let cancelled = false;
-        (async () => {
-            await runScriptsInOrder(container);
-            if (!cancelled) emit(DE_EVENTS.formLoaded, dataSetId);
-        })();
-
-        return () => { cancelled = true; };
-    }, deps);
-}
-
-function runScriptsInOrder(container) {
-    const originals = [...container.querySelectorAll('script')];
-
-    return originals.reduce((chain, script) => {
-        return chain.then(() => new Promise((resolve) => {
-            const s = document.createElement('script');
-            copyOrderedAttrs(script, s);
-
-            const type = (script.getAttribute('type') || '').trim();
-            const isModule = type === 'module';
-
-            s.onload = () => resolve();
-            s.onerror = () => resolve();
-
-            if (!script.src) {
-                s.text = script.text || script.innerHTML || '';
-            } else {
-                s.async = false;
-                s.defer = false;
-            }
-
-            if (script.parentNode) script.parentNode.replaceChild(s, script);
-
-            if (!script.src && !isModule) {
-                setTimeout(resolve, 0);
-            }
-        }));
-    }, Promise.resolve());
-}
-
-function copyOrderedAttrs(src, dst) {
-    for (const { name, value } of Array.from(src.attributes)) {
-        if (name === 'async' || name === 'defer') continue;
-        dst.setAttribute(name, value);
-    }
-}

From 0131cf50a2766b7a6f23654e3052a9b48ab43a5b Mon Sep 17 00:00:00 2001
From: gqcorneby <185756521+gqcorneby@users.noreply.github.com>
Date: Mon, 3 Nov 2025 16:16:24 +0800
Subject: [PATCH 13/13] clean up imports

---
 src/shared/legacy-dhis2-bridge/use-emit.js               | 2 +-
 src/shared/legacy-dhis2-bridge/use-run-inline-scripts.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/shared/legacy-dhis2-bridge/use-emit.js b/src/shared/legacy-dhis2-bridge/use-emit.js
index 0a98fc6e31..e022a77d08 100644
--- a/src/shared/legacy-dhis2-bridge/use-emit.js
+++ b/src/shared/legacy-dhis2-bridge/use-emit.js
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useRef } from 'react'
+import { useCallback, useEffect, useRef } from 'react';
 
 export function useCustomEvent(opts) {
     const { target = typeof window !== 'undefined' ? window : null } =
diff --git a/src/shared/legacy-dhis2-bridge/use-run-inline-scripts.js b/src/shared/legacy-dhis2-bridge/use-run-inline-scripts.js
index 8018370d75..8d148da410 100644
--- a/src/shared/legacy-dhis2-bridge/use-run-inline-scripts.js
+++ b/src/shared/legacy-dhis2-bridge/use-run-inline-scripts.js
@@ -1,4 +1,4 @@
-import { useRef, useEffect } from 'react';
+import { useEffect } from 'react';
 import { DE_EVENTS } from './legacy-events';
 import { useCustomEvent } from './use-emit';