@govuk-one-login/frontend-ui 1.5.0 → 3.0.0

package/build/cjs/frontend/spinner/spinner.d.ts

@@ -1,90 +1,60 @@
-export declare function useSpinner(): void;
-type TVDOM = {
-    classes: string[];
-    buttonDisabled?: boolean;
-    id?: string;
-    innerHTML?: string;
-    nodeName: string;
-    text?: string;
+export declare function useSpinner(containerId: string, pollingFunction: PollingFunction, successFunction: VoidFunction, errorFunction: VoidFunction): Promise<void>;
+export type PollingFunction = (abortSignal: AbortSignal) => Promise<PollResult>;
+export declare enum PollResult {
+    Success = 0,
+    Failure = 1,
+    Pending = 2
+}
+declare enum SpinnerState {
+    Waiting = 0,
+    LongWaiting = 1,
+    Error = 2,
+    Complete = 3
+}
+type SpinnerConfig = {
+    msBeforeInformingOfLongWait: number;
+    msBeforeAbort: number;
+    msBetweenRequests: number;
+    msBetweenDomUpdate: number;
+    ariaAlertCompletionText?: string;
+    hideSpinnerOnError: boolean;
 };
 export declare class Spinner {
-    container: HTMLElement;
-    spinnerContainer: HTMLElement;
-    ariaLiveContainer: HTMLElement;
-    content: {
-        complete: {
-            ariaButtonEnabledMessage?: string;
-            spinnerState: string;
-        };
-        continueButton: {
-            text: string;
-        };
-        error: {
-            heading: string;
-            messageText: string;
-            whatYouCanDo: {
-                heading: string;
-                message: {
-                    text1: string;
-                    link: {
-                        href: string;
-                        text: string;
-                    };
-                    text2: string;
-                };
-            };
-        };
-        initial: {
-            heading: string;
-            spinnerStateText: string;
-            spinnerState: string;
-        };
-        longWait: {
-            spinnerStateText: string;
-        };
-    };
-    domRequirementsMet?: boolean;
-    state: {
-        ariaButtonEnabledMessage?: string;
-        buttonDisabled: boolean;
-        done: boolean;
-        error: boolean;
-        heading: string;
-        messageText?: string;
-        spinnerState: string;
-        spinnerStateText: string;
-        virtualDom: TVDOM[];
-    };
-    updateDomTimer: NodeJS.Timeout;
+    container: HTMLDivElement;
+    noJsContent: HTMLElement;
+    waitContent?: HTMLElement;
+    longWaitContent?: HTMLElement;
+    successContent?: HTMLElement;
+    errorContent?: HTMLElement;
+    ariaLiveContainer: HTMLDivElement;
+    visibleElementsContainer: HTMLDivElement;
+    state: SpinnerState;
+    displayState?: SpinnerState;
+    updateDomTimer?: NodeJS.Timeout;
     abortController: AbortController;
-    config: {
-        apiUrl: string;
-        ariaButtonEnabledMessage?: string;
-        msBeforeInformingOfLongWait: number;
-        msBeforeAbort: number;
-        msBetweenRequests: number;
-        msBetweenDomUpdate: number;
-    };
-    notInErrorOrDoneState: () => boolean;
-    reflectCompletion: () => void;
-    reflectError: () => void;
-    reflectLongWait(): void;
-    updateAccordingToTimeElapsed: (initTime: number) => void;
-    initialiseState(): void;
-    initialiseContent(element: HTMLElement): void;
-    createVirtualDom(): TVDOM[];
-    vDomHasChanged: (currentVDom: TVDOM[], nextVDom: TVDOM[]) => boolean;
-    convert: (node: TVDOM) => HTMLElement;
-    updateAriaAlert: (messageText: string) => void;
-    updateDom: () => void;
-    requestIDProcessingStatus(initTime: number): Promise<void>;
-    initialiseContainers: () => void;
-    getInitTime(): number;
-    initTimer: (initTime: number) => void;
-    handleAbort: () => void;
-    initialiseAbortController: () => void;
-    init(): void;
-    constructor(domContainer: HTMLElement);
+    config: SpinnerConfig;
+    pollingFunction: PollingFunction;
+    onSuccess: VoidFunction;
+    onError: VoidFunction;
+    constructor(domContainer: HTMLDivElement, pollingFunction: PollingFunction, onSuccess: VoidFunction, onError: VoidFunction);
+    init(): Promise<void>;
+    private getElementOrThrow;
+    private getConfig;
+    private createAbortController;
+    private handleAbort;
+    private getInitTime;
+    private initTimer;
+    private hasCompleted;
+    private reflectSuccess;
+    private reflectError;
+    private reflectLongWait;
+    private updateStateAccordingToTimeElapsed;
+    private createSpinnerElement;
+    private updateDom;
+    private cloneAndAddIfExists;
+    private callPollingFunction;
+    private createAriaLiveContainer;
+    private updateAriaAlert;
 }
 export {};
 //# sourceMappingURL=spinner.d.ts.map

package/build/cjs/frontend/spinner/spinner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spinner.d.ts","sourceRoot":"","sources":["../../../../frontend-src/spinner/spinner.ts"],"names":[],"mappings":"AAAA,wBAAgB,UAAU,SAWzB;AAED,KAAK,KAAK,GAAG;IACX,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,qBAAa,OAAO;IAClB,SAAS,cAAC;IACV,gBAAgB,EAAE,WAAW,CAAC;IAC9B,iBAAiB,EAAE,WAAW,CAAC;IAC/B,OAAO,EAAE;QACP,QAAQ,EAAE;YACR,wBAAwB,CAAC,EAAE,MAAM,CAAC;YAClC,YAAY,EAAE,MAAM,CAAC;SACtB,CAAC;QACF,cAAc,EAAE;YACd,IAAI,EAAE,MAAM,CAAC;SACd,CAAC;QACF,KAAK,EAAE;YACL,OAAO,EAAE,MAAM,CAAC;YAChB,WAAW,EAAE,MAAM,CAAC;YACpB,YAAY,EAAE;gBACZ,OAAO,EAAE,MAAM,CAAC;gBAChB,OAAO,EAAE;oBACP,KAAK,EAAE,MAAM,CAAC;oBACd,IAAI,EAAE;wBACJ,IAAI,EAAE,MAAM,CAAC;wBACb,IAAI,EAAE,MAAM,CAAC;qBACd,CAAC;oBACF,KAAK,EAAE,MAAM,CAAC;iBACf,CAAC;aACH,CAAC;SACH,CAAC;QACF,OAAO,EAAE;YACP,OAAO,EAAE,MAAM,CAAC;YAChB,gBAAgB,EAAE,MAAM,CAAC;YACzB,YAAY,EAAE,MAAM,CAAC;SACtB,CAAC;QACF,QAAQ,EAAE;YACR,gBAAgB,EAAE,MAAM,CAAC;SAC1B,CAAC;KACH,CAAC;IACF,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,KAAK,EAAE;QACL,wBAAwB,CAAC,EAAE,MAAM,CAAC;QAClC,cAAc,EAAE,OAAO,CAAC;QACxB,IAAI,EAAE,OAAO,CAAC;QACd,KAAK,EAAE,OAAO,CAAC;QACf,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,YAAY,EAAE,MAAM,CAAC;QACrB,gBAAgB,EAAE,MAAM,CAAC;QACzB,UAAU,EAAE,KAAK,EAAE,CAAC;KACrB,CAAC;IACF,cAAc,EAAE,MAAM,CAAC,OAAO,CAAC;IAC/B,eAAe,EAAE,eAAe,CAAC;IACjC,MAAM,EAAE;QACN,MAAM,EAAE,MAAM,CAAC;QACf,wBAAwB,CAAC,EAAE,MAAM,CAAC;QAClC,2BAA2B,EAAE,MAAM,CAAC;QACpC,aAAa,EAAE,MAAM,CAAC;QACtB,iBAAiB,EAAE,MAAM,CAAC;QAC1B,kBAAkB,EAAE,MAAM,CAAC;KAC5B,CAMC;IAEF,qBAAqB,gBAEnB;IAEF,iBAAiB,aAQf;IAEF,YAAY,aAQV;IAEF,eAAe;IAMf,4BAA4B,GAAI,UAAU,MAAM,UAO9C;IAEF,eAAe;IAef,iBAAiB,CAAC,OAAO,EAAE,WAAW;IA8EtC,gBAAgB,IAAI,KAAK,EAAE;IAwD3B,cAAc,GAAI,aAAa,KAAK,EAAE,EAAE,UAAU,KAAK,EAAE,aAEvD;IAEF,OAAO,GAAI,MAAM,KAAK,iBASpB;IAEF,eAAe,GAAI,aAAa,MAAM,UAQpC;IAEF,SAAS,aA0BP;IAEI,yBAAyB,CAAC,QAAQ,EAAE,MAAM;IAgChD,oBAAoB,aAUlB;IAEF,WAAW;IAYX,SAAS,GAAI,UAAU,MAAM,UAO3B;IAEF,WAAW,aAET;IAEF,yBAAyB,aAIvB;IAEF,IAAI;gBAWQ,YAAY,EAAE,WAAW;CAMtC"}
+{"version":3,"file":"spinner.d.ts","sourceRoot":"","sources":["../../../../frontend-src/spinner/spinner.ts"],"names":[],"mappings":"AAAA,wBAAsB,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,eAAe,EAAE,eAAe,EAAE,eAAe,EAAE,YAAY,EAAE,aAAa,EAAE,YAAY,iBAoBjJ;AAED,MAAM,MAAM,eAAe,GAAG,CAAC,WAAW,EAAE,WAAW,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;AAEhF,oBAAY,UAAU;IACpB,OAAO,IAAA;IACP,OAAO,IAAA;IACP,OAAO,IAAA;CACR;AAED,aAAK,YAAY;IACf,OAAO,IAAA;IACP,WAAW,IAAA;IACX,KAAK,IAAA;IACL,QAAQ,IAAA;CACT;AAED,KAAK,aAAa,GAAG;IACnB,2BAA2B,EAAE,MAAM,CAAC;IACpC,aAAa,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,kBAAkB,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF,qBAAa,OAAO;IAClB,SAAS,EAAE,cAAc,CAAC;IAC1B,WAAW,EAAE,WAAW,CAAC;IACzB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,eAAe,CAAC,EAAE,WAAW,CAAC;IAC9B,cAAc,CAAC,EAAE,WAAW,CAAC;IAC7B,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,iBAAiB,EAAE,cAAc,CAAC;IAElC,wBAAwB,EAAE,cAAc,CAAC;IAEzC,KAAK,EAAE,YAAY,CAAwB;IAC3C,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,cAAc,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;IAChC,eAAe,EAAE,eAAe,CAAC;IACjC,MAAM,EAAE,aAAa,CAAC;IAEtB,eAAe,EAAE,eAAe,CAAC;IACjC,SAAS,EAAE,YAAY,CAAC;IACxB,OAAO,EAAE,YAAY,CAAC;gBAGpB,YAAY,EAAE,cAAc,EAC5B,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,YAAY,EACvB,OAAO,EAAE,YAAY;IA2CjB,IAAI;IAUV,OAAO,CAAC,iBAAiB;IAQzB,OAAO,CAAC,SAAS;IAuBjB,OAAO,CAAC,qBAAqB;IAO7B,OAAO,CAAC,WAAW,CAEjB;IAEF,OAAO,CAAC,WAAW;IAYnB,OAAO,CAAC,SAAS,CAKf;IAEF,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,cAAc,CAGpB;IAEF,OAAO,CAAC,YAAY,CAIlB;IAEF,OAAO,CAAC,eAAe;IAMvB,OAAO,CAAC,iCAAiC,CAWvC;IAEF,OAAO,CAAC,oBAAoB;IAU5B,OAAO,CAAC,SAAS,CAkDf;IAEF,OAAO,CAAC,mBAAmB;YASb,mBAAmB;IA8BjC,OAAO,CAAC,uBAAuB;IAS/B,OAAO,CAAC,eAAe;CAWxB"}

package/build/components/_all.scss

@@ -3,3 +3,4 @@
 @use "./language-select";
 @use "./spinner";
 @use "./footer";
+@use "./progress-button";

package/build/components/bases/identity/identity-base-form.njk

@@ -1,10 +1,14 @@
 {% if MAY_2025_REBRAND_ENABLED %}
-{% set govukRebrand = true %}
-{% set assetPath = "/public/rebrand"%}
+  {% set govukRebrand = true %}
+  {% set assetPath = "/public/rebrand"%}
 {% endif %}
 
+{% set isPageDataSensitive = true %}
+{% set taxLevel1 = 'web cri' %}
+
 {% extends "form-template.njk" %}
 
+{% from "frontend-analytics/components/ga4-opl/macro.njk" import ga4OnPageLoad %}
 {% from "frontend-ui/build/components/cookie-banner/macro.njk" import frontendUiCookieBanner %}
 {% from "frontend-ui/build/components/phase-banner/macro.njk" import frontendUiPhaseBanner %}
 {% from "frontend-ui/build/components/header/macro.njk" import frontendUiHeader %}
@@ -16,12 +20,12 @@
 {% endblock %}
 
 {%- block pageTitle %}
-    {{- (translate("govuk.error", { default: "Error" }) + ": ") if errorlist.length }}{{ hmpoTitle | safe }}{{ " – " + govukServiceName | safe if govukServiceName !== " " }} – GOV.UK One Login
+  {{- (translate("govuk.error", { default: "Error" }) + ": ") if errorlist.length }}{{ hmpoTitle | safe }}{{ " – " + govukServiceName | safe if govukServiceName !== " " }} – GOV.UK One Login
 {%- endblock %}
 
 {% block header %}
   {% block cookieBanner %}
-      {{ frontendUiCookieBanner({
+    {{ frontendUiCookieBanner({
     translations: translations.cookieBanner
   }
   )}}
@@ -36,7 +40,7 @@
 {% endblock %}
 
 {% block beforeContent %}
-    {{ frontendUiPhaseBanner({
+  {{ frontendUiPhaseBanner({
       translations: translations.phaseBanner,
       url: currentUrl,
       contactUrl: 'https://signin.account.gov.uk/contact-us'
@@ -47,18 +51,17 @@
       url: currentUrl,
       activeLanguage: htmlLang
     }) }}
-      {% if backLink %}
-        {% from "govuk/components/back-link/macro.njk" import govukBackLink %}
-        <span id="back">{{ govukBackLink({
+    {% if backLink %}
+      {% from "govuk/components/back-link/macro.njk" import govukBackLink %}
+      <span id="back">{{ govukBackLink({
           text: translate("govuk.backLink"),
           href: backLink}) }}
-        </span>
-      {% endif %}
+      </span>
+    {% endif %}
 
   {% endblock %}
 {% endblock %}
 
-
 {% block footer %}
   {{ frontendUiFooter({
     translations: translations.footer
@@ -70,31 +73,49 @@
     <script type="text/javascript" src="/public/javascripts/all.js"></script>
     <script type="text/javascript" src="/public/javascripts/analytics.js"></script>
     <script type="text/javascript" {% if cspNonce %} nonce="{{ cspNonce }}"{%  endif %}>
-      window.GOVUKFrontend.initAll()
-      window.DI.appInit({
-        ga4ContainerId: "{{ga4ContainerId}}",
-        uaContainerId:"{{uaContainerId}}"},{
-          enableGa4Tracking:{{ga4Enabled}},
-          enableUaTracking:{{uaEnabled}},
-          enablePageViewTracking:{{ga4PageViewEnabled}},
-          enableFormErrorTracking:{{ga4FormErrorEnabled}},
-          enableFormChangeTracking:{{ga4FormChangeEnabled}},
-          enableFormResponseTracking:{{ga4FormResponseEnabled}},
-          enableNavigationTracking:{{ga4NavigationEnabled}},
-          enableSelectContentTracking:{{ga4SelectContentEnabled}},
-          cookieDomain:"{{analyticsCookieDomain}}",
-          isDataSensitive:{{analyticsDataSensitive}}
-        }
-      );
+      window
+        .GOVUKFrontend
+        .initAll()
+      window
+        .DI
+        .appInit({
+          ga4ContainerId: "{{ga4ContainerId}}",
+          uaContainerId: "{{uaContainerId}}"
+        }, {
+          enableGa4Tracking: {{ga4Enabled}},
+          enableUaTracking: {{uaEnabled}},
+          enablePageViewTracking: {{ga4PageViewEnabled}},
+          enableFormErrorTracking: {{ga4FormErrorEnabled}},
+          enableFormChangeTracking: {{ga4FormChangeEnabled}},
+          enableFormResponseTracking: {{ga4FormResponseEnabled}},
+          enableNavigationTracking: {{ga4NavigationEnabled}},
+          enableSelectContentTracking: {{ga4SelectContentEnabled}},
+          cookieDomain: "{{analyticsCookieDomain}}",
+          isDataSensitive: {{analyticsDataSensitive}},
+          isPageDataSensitive: {{isPageDataSensitive}}
+        });
     </script>
 
     {% if deviceIntelligenceEnabled %}
-    <script type="module" src="/public/javascripts/deviceIntelligence.js"></script>
-    <script type="module" {% if cspNonce %} nonce="{{ cspNonce }}"{%  endif %}>
-      import { setFingerprintCookie } from "/public/javascripts/deviceIntelligence.js";
-      setFingerprintCookie("{{deviceIntelligenceDomain}}")
-    </script>
+      <script type="module" src="/public/javascripts/deviceIntelligence.js"></script>
+      <script type="module" {% if cspNonce %} nonce="{{ cspNonce }}"{%  endif %}>
+        import {setFingerprintCookie} from "/public/javascripts/deviceIntelligence.js";
+        setFingerprintCookie("{{deviceIntelligenceDomain}}")
+      </script>
     {% endif %}
 
+    {{ ga4OnPageLoad({
+        nonce: cspNonce,
+        statusCode: statusCode,
+        dynamic: isPageDynamic,
+        englishPageTitle: pageTitleKey | translate,
+        taxonomyLevel1: taxLevel1,
+        taxonomyLevel2: taxLevel2,
+        taxonomyLevel3: taxLevel3,
+        taxonomyLevel4: taxLevel4,
+        taxonomyLevel5: taxLevel5,
+        contentId: contentID,
+        loggedInStatus: loggedInStatus
+    }) }}
   {% endblock %}
-{% endblock %}
+{% endblock %}

package/build/components/bases/identity/identity-base-page.njk

@@ -1,10 +1,14 @@
 {% if MAY_2025_REBRAND_ENABLED %}
-{% set govukRebrand = true %}
-{% set assetPath = "/public/rebrand"%}
+  {% set govukRebrand = true %}
+  {% set assetPath = "/public/rebrand"%}
 {% endif %}
 
+{% set isPageDataSensitive = true %}
+{% set taxLevel1 = 'web cri' %}
+
 {% extends "hmpo-template.njk" %}
 
+{% from "frontend-analytics/components/ga4-opl/macro.njk" import ga4OnPageLoad %}
 {% from "frontend-ui/build/components/cookie-banner/macro.njk" import frontendUiCookieBanner %}
 {% from "frontend-ui/build/components/phase-banner/macro.njk" import frontendUiPhaseBanner %}
 {% from "frontend-ui/build/components/header/macro.njk" import frontendUiHeader %}
@@ -21,7 +25,7 @@
 
 {% block header %}
   {% block cookieBanner %}
-      {{ frontendUiCookieBanner({
+    {{ frontendUiCookieBanner({
     translations: translations.cookieBanner
   }
   )}}
@@ -36,7 +40,7 @@
 {% endblock %}
 
 {% block beforeContent %}
-    {{ frontendUiPhaseBanner({
+  {{ frontendUiPhaseBanner({
       translations: translations.phaseBanner,
       url: currentUrl,
       contactUrl: 'https://signin.account.gov.uk/contact-us'
@@ -47,13 +51,13 @@
       url: currentUrl,
       activeLanguage: htmlLang
     }) }}
-      {% if backLink %}
-        {% from "govuk/components/back-link/macro.njk" import govukBackLink %}
-        <span id="back">{{ govukBackLink({
+    {% if backLink %}
+      {% from "govuk/components/back-link/macro.njk" import govukBackLink %}
+      <span id="back">{{ govukBackLink({
           text: translate("govuk.backLink"),
           href: backLink}) }}
-        </span>
-      {% endif %}
+      </span>
+    {% endif %}
 
   {% endblock %}
 {% endblock %}
@@ -69,31 +73,49 @@
     <script type="text/javascript" src="/public/javascripts/all.js"></script>
     <script type="text/javascript" src="/public/javascripts/analytics.js"></script>
     <script type="text/javascript" {% if cspNonce %} nonce="{{ cspNonce }}"{%  endif %}>
-      window.GOVUKFrontend.initAll()
-      window.DI.appInit({
-        ga4ContainerId: "{{ga4ContainerId}}",
-        uaContainerId:"{{uaContainerId}}"
-      },{
-        enableGa4Tracking:{{ga4Enabled}},
-        enableUaTracking:{{uaEnabled}},
-        enablePageViewTracking:{{ga4PageViewEnabled}},
-        enableFormErrorTracking:{{ga4FormErrorEnabled}},
-        enableFormChangeTracking:{{ga4FormChangeEnabled}},
-        enableFormResponseTracking:{{ga4FormResponseEnabled}},
-        enableNavigationTracking:{{ga4NavigationEnabled}},
-        enableSelectContentTracking:{{ga4SelectContentEnabled}},
-        cookieDomain:"{{analyticsCookieDomain}}",
-        isDataSensitive:{{analyticsDataSensitive}}
-      });
+      window
+        .GOVUKFrontend
+        .initAll()
+      window
+        .DI
+        .appInit({
+          ga4ContainerId: "{{ga4ContainerId}}",
+          uaContainerId: "{{uaContainerId}}"
+        }, {
+          enableGa4Tracking: {{ga4Enabled}},
+          enableUaTracking: {{uaEnabled}},
+          enablePageViewTracking: {{ga4PageViewEnabled}},
+          enableFormErrorTracking: {{ga4FormErrorEnabled}},
+          enableFormChangeTracking: {{ga4FormChangeEnabled}},
+          enableFormResponseTracking: {{ga4FormResponseEnabled}},
+          enableNavigationTracking: {{ga4NavigationEnabled}},
+          enableSelectContentTracking: {{ga4SelectContentEnabled}},
+          cookieDomain: "{{analyticsCookieDomain}}",
+          isDataSensitive: {{analyticsDataSensitive}},
+          isPageDataSensitive: {{isPageDataSensitive}}
+        });
     </script>
 
     {% if deviceIntelligenceEnabled %}
-    <script type="module" src="/public/javascripts/deviceIntelligence.js"></script>
-    <script type="module" {% if cspNonce %} nonce="{{ cspNonce }}"{%  endif %}>
-      import { setFingerprintCookie } from "/public/javascripts/deviceIntelligence.js";
-      setFingerprintCookie("{{deviceIntelligenceDomain}}")
-    </script>
-  {% endif %}
+      <script type="module" src="/public/javascripts/deviceIntelligence.js"></script>
+      <script type="module" {% if cspNonce %} nonce="{{ cspNonce }}"{%  endif %}>
+        import {setFingerprintCookie} from "/public/javascripts/deviceIntelligence.js";
+        setFingerprintCookie("{{deviceIntelligenceDomain}}")
+      </script>
+    {% endif %}
 
+    {{ ga4OnPageLoad({
+        nonce: cspNonce,
+        statusCode: statusCode,
+        dynamic: isPageDynamic,
+        englishPageTitle: pageTitleKey | translate,
+        taxonomyLevel1: taxLevel1,
+        taxonomyLevel2: taxLevel2,
+        taxonomyLevel3: taxLevel3,
+        taxonomyLevel4: taxLevel4,
+        taxonomyLevel5: taxLevel5,
+        contentId: contentID,
+        loggedInStatus: loggedInStatus
+    }) }}
   {% endblock %}
-{% endblock %}
+{% endblock %}

package/build/components/bases/ipv-core/ipv-core-base.njk

@@ -2,7 +2,10 @@
     {% set govukRebrand = true %}
 {% endif %}
 
-{% set isPageDataSensitive = false %}
+{% set isPageDataSensitive = true %}
+{% set taxLevel1 = 'web cri' %}
+{% set taxLevel2 = 'pre cri' %}
+
 
 {% extends "govuk/template.njk" %}
 {% from "frontend-ui/build/components/cookie-banner/macro.njk" import frontendUiCookieBanner %}
@@ -10,9 +13,7 @@
 {% from "frontend-ui/build/components/header/macro.njk" import frontendUiHeader %}
 {% from "frontend-ui/build/components/footer/macro.njk" import frontendUiFooter %}
 {% from "frontend-ui/build/components/language-select/macro.njk" import frontendUiLanguageSelect %}
-{# {% from "frontend-analytics/components/ga4-opl/macro.njk" import frontendAnalyticsGa4OnPageLoad %} #}
-
-{% from  basePath ~ "/views/shared/ga4/on-page-load-macro.njk" import ga4OnPageLoad %}
+{% from "frontend-analytics/components/ga4-opl/macro.njk" import ga4OnPageLoad %}
 {% from "govuk/components/back-link/macro.njk" import govukBackLink %}
 {% from "govuk/components/error-summary/macro.njk" import govukErrorSummary %}
 {% from "govuk/components/notification-banner/macro.njk" import govukNotificationBanner %}
@@ -146,18 +147,24 @@
                     ga4ContainerId: "{{ ga4ContainerId }}",
                     uaContainerId: "{{ uaContainerId }}"
                 }, {
+                    isDataSensitive: {{analyticsDataSensitive}},
+                    isPageDataSensitive: {{isPageDataSensitive}},
                     enableGa4Tracking: {{isGa4Enabled}},
                     enableUaTracking: {{isUaEnabled}},
                     cookieDomain: "{{analyticsCookieDomain}}"
                 });
         </script>
         {{ ga4OnPageLoad({
-        cspNonce: cspNonce,
-        isPageDynamic: isPageDynamic,
-         englishPageTitle: pageTitleKey | translateToEnglish }) }}
-        {# {{ frontendAnalyticsGa4OnPageLoad({
         nonce: cspNonce,
+        statusCode: statusCode,         
         dynamic: isPageDynamic,
-        englishPageTitle: pageTitleKey | translateToEnglish }) }} #}
+        englishPageTitle: pageTitleKey | translateToEnglish,
+        taxonomyLevel1: taxLevel1,
+        taxonomyLevel2: taxLevel2,
+        taxonomyLevel3: taxLevel3,
+        taxonomyLevel4: taxLevel4,
+        taxonomyLevel5: taxLevel5,
+        contentId: contentID
+    }) }}
 
     {% endblock %}

package/build/components/progress-button/_index.scss

@@ -0,0 +1,44 @@
+.govuk-button--progress{
+  border-bottom: 8px;
+  position: relative;
+}
+
+.govuk-button--progress-loading{
+   background-color: #505A5F !important;
+   color: #fff !important;
+   pointer-events: none !important;
+   padding-left: 40px !important;
+}
+
+@keyframes rotate {
+  from {
+    transform: rotate(0);
+  }
+
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+
+.govuk-button--progress-loading::before {
+  content: "";
+  border: 3px solid rgba(255, 255, 255, 0.35);
+  border-top: 3px solid #fff;
+  border-radius: 50%;
+  width: 20px;
+  height: 20px;
+  animation: rotate 1s infinite linear;
+  position: absolute;
+  top: 12% !important;
+  left: 8px;
+}
+  
+@media (prefers-reduced-motion: reduce) {
+.govuk-button--progress-loading {
+     animation: none;
+  }
+}
+
+
+

package/build/components/progress-button/macro.njk

@@ -0,0 +1,2 @@
+{% macro frontendUiProgressButton(params) %} {%- include "./template.njk" -%} {% endmacro
+%}

package/build/components/progress-button/progress-button.yaml

@@ -0,0 +1,13 @@
+params:
+  - name: translations
+    type: string
+    required: true
+    description: translations from middleware 
+  - name: href
+    type: string
+    required: true
+    description: URL for the button to link to
+  - name: errorPage
+    type: string
+    required: true
+    description: URL for the error help page