Merge branch 'dev' into feat/GAT-9195

Author: philreekshdr

.github/workflows/e2e-isolated.yml

@@ -100,7 +100,10 @@ env:
 
 jobs:
   e2e-tests:
-    if: github.event_name != 'pull_request' || github.event.pull_request.state == 'open' && github.event.pull_request.draft == false
+    if: >-
+      (github.event_name != 'pull_request' ||
+       (github.event.pull_request.state == 'open' && github.event.pull_request.draft == false))
+      && github.actor != 'dependabot[bot]'
     runs-on: ubuntu-latest
     environment: cypress_dev
 
@@ -143,8 +146,9 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Generate GitHub App token
+        if: ${{ github.actor != 'dependabot[bot]' }}
         id: generate-deployment-token
-        uses: actions/create-github-app-token@v2
+        uses: actions/create-github-app-token@v3
         with:
           app-id: ${{ secrets.DEPLOY_APP_ID }}
           private-key: ${{ secrets.DEPLOY_APP_PRIVATE_KEY }}

.github/workflows/semantic-release-workflow.yaml

@@ -14,11 +14,13 @@ jobs:
 
   setup-preprod:
     uses: ./.github/workflows/build-args.yaml
+    needs: semantic
     with:
      environment: preprod
 
   setup-prod:
     uses: ./.github/workflows/build-args.yaml
+    needs: semantic
     with:
      environment: prod
 

CHANGELOG.md

@@ -1,3 +1,33 @@
+## [2.41.0](https://github.com/HDRUK/gateway-web/compare/v2.40.0...v2.41.0) (2026-07-28)
+
+### ✨ Features
+
+* **GAT-9190:** add History tab to integration detail page ([e4e964f](https://github.com/HDRUK/gateway-web/commit/e4e964fcb8be6b3a900093fbce55a56479f92df1)), closes [GAT-9190](undefinedGAT-9190)
+* **GAT-9202:** Typesense search and superadmin panel (#1575) ([19b201e](https://github.com/HDRUK/gateway-web/commit/19b201e5c517b109f4e9a76f4282bfa8d40a447f)), closes [GAT-9202](undefinedGAT-9202)
+* **GAT-9287:** copy update (#1586) ([d630ba0](https://github.com/HDRUK/gateway-web/commit/d630ba00862a55c3c3aa4d51ab8764d485dbd3f1)), closes [GAT-9287](undefinedGAT-9287)
+
+## [2.40.0](https://github.com/HDRUK/gateway-web/compare/v2.39.0...v2.40.0) (2026-07-24)
+
+### ✨ Features
+
+* **GAT-7563:** Data Custodian Network = Split owned/associated content (#1569) ([7e462ff](https://github.com/HDRUK/gateway-web/commit/7e462ff8d1589d2a3d34ebefed1a225211c0c4cf)), closes [GAT-7563](undefinedGAT-7563)
+* **GAT-7564:** Data custodian associated resources (#1567) ([45e9c1d](https://github.com/HDRUK/gateway-web/commit/45e9c1da229c5c4e03694d102575c7ffda8c7297)), closes [GAT-7564](undefinedGAT-7564)
+* **GAT-7604:** Data custodian display tweaks (#1562) ([82b222c](https://github.com/HDRUK/gateway-web/commit/82b222c3e7430d1ff6e0dc65a465ff145ae348cd)), closes [GAT-7604](undefinedGAT-7604)
+* **GAT-8094:** Display dataset aliases (#1566) ([65e819a](https://github.com/HDRUK/gateway-web/commit/65e819a05c9440a3834ec22f307488721aac5764)), closes [GAT-8094](undefinedGAT-8094)
+* **GAT-8131:** Widget test harness (#1573) ([ac6fda3](https://github.com/HDRUK/gateway-web/commit/ac6fda325a3166df8975e951e5304539048a1992)), closes [GAT-8131](undefinedGAT-8131)
+* **GAT-8478:** Add support link (#1571) ([c51fa80](https://github.com/HDRUK/gateway-web/commit/c51fa800ec87edd22ff07fa8105b6fb8dd182e9b)), closes [GAT-8478](undefinedGAT-8478)
+* **GAT-8709:** Fix confusing naming for running a fedaration test. ([6aedd84](https://github.com/HDRUK/gateway-web/commit/6aedd84ab0c888eaeed13cc5ff33dbc09b11508c))
+* **GAT-8724:** Update dataset filter order (#1576) ([71843f9](https://github.com/HDRUK/gateway-web/commit/71843f9890af782f7ea5689e28690d2b37d5336b)), closes [GAT-8724](undefinedGAT-8724)
+* **GAT-8798:** Added run now button for integrations ([f944277](https://github.com/HDRUK/gateway-web/commit/f9442777ae9e20efb06cd2bcf11630845b30a5ff)), closes [GAT-8798](undefinedGAT-8798)
+* **GAT-8821:** Correct DAR dialog & save draft logic (#1578) ([04eace6](https://github.com/HDRUK/gateway-web/commit/04eace6b2831d47b077ffe34d22130e479b3b985)), closes [GAT-8821](undefinedGAT-8821)
+* **GAT-9193:** Update sign-in modal design (#1581) ([ee76b95](https://github.com/HDRUK/gateway-web/commit/ee76b95c2305e36e0752fbe1a00cb6357bcdfdb1)), closes [GAT-9193](undefinedGAT-9193)
+* **GAT-9193:** Update wording (#1582) ([68ae7bb](https://github.com/HDRUK/gateway-web/commit/68ae7bb1b84cc4433e4dbf342e9f5bf71d0b2296)), closes [GAT-9193](undefinedGAT-9193)
+
+### 🐛 Bug Fixes
+
+* **GAT-8754:** Fix empty widget preview state (#1577) ([a827c08](https://github.com/HDRUK/gateway-web/commit/a827c086bb5da4403d3b7cd7eb79493644df4af2))
+* **GAT-9237:** bug in the onboarding form for tools (#1579) ([2071ecb](https://github.com/HDRUK/gateway-web/commit/2071ecb6e692d70fcf5219678310e2cb8ecb0cf9)), closes [GAT-9237](undefinedGAT-9237)
+
 ## [2.39.0](https://github.com/HDRUK/gateway-web/compare/v2.38.0...v2.39.0) (2026-07-06)
 
 ### ✨ Features

chart/gateway-web/Chart.yaml

@@ -21,4 +21,4 @@ version: 2.0.1
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "2.39.0"
+appVersion: "2.41.0"

mocks/data/integration/v1/integration.data.ts

@@ -5,6 +5,7 @@ import {
     FederationType,
     AuthType,
 } from "@/interfaces/Integration";
+import { IntegrationHistory } from "@/interfaces/IntegrationHistory";
 
 const generateIntegrationV1 = (data = {}): Integration => {
     return {
@@ -21,13 +22,18 @@ const generateIntegrationV1 = (data = {}): Integration => {
         created_at: faker.date
             .between("2020-01-01T00:00:00.000Z", "2020-03-01T00:00:00.000Z")
             .toISOString(),
+        last_run_at: faker.date
+            .between("2020-01-01T00:00:00.000Z", "2020-03-01T00:00:00.000Z")
+            .toISOString(),
         auth_secret_key: faker.datatype.string(),
         endpoint_baseurl: faker.datatype.string(),
         endpoint_datasets: faker.datatype.string(),
         endpoint_dataset: faker.datatype.string(),
         run_time_hour: faker.datatype.number(),
         enabled: faker.datatype.boolean(),
         tested: faker.datatype.boolean(),
+        error: false,
+        error_text: null,
         notifications: [],
         id: faker.datatype.number(),
         ...data,
@@ -50,14 +56,46 @@ const generateIntegrationsV1 = (n = 3): Integration[] => {
     return Array.from({ length: n }).map(() => generateIntegrationV1());
 };
 
+const generateIntegrationHistoryV1 = (data = {}): IntegrationHistory => {
+    const status = faker.helpers.arrayElement([
+        "success",
+        "failed",
+    ]) as IntegrationHistory["status"];
+
+    return {
+        job_uuid: faker.datatype.uuid(),
+        started_at: faker.date
+            .between("2020-01-01T00:00:00.000Z", "2020-03-01T00:00:00.000Z")
+            .toISOString(),
+        finished_at: faker.date
+            .between("2020-01-01T00:00:00.000Z", "2020-03-01T00:00:00.000Z")
+            .toISOString(),
+        status,
+        message: status === "failed" ? faker.lorem.sentence() : null,
+        failed_datasets:
+            status === "failed"
+                ? [{ pid: faker.datatype.uuid(), message: faker.lorem.sentence() }]
+                : [],
+        ...data,
+    };
+};
+
+const generateIntegrationHistoriesV1 = (n = 3): IntegrationHistory[] => {
+    return Array.from({ length: n }).map(() => generateIntegrationHistoryV1());
+};
+
 const integrationV1 = generateIntegrationV1();
 const federationTestResponseV1 = generateFederationTestResponseV1();
 const integrationsV1 = generateIntegrationsV1();
+const integrationHistoriesV1 = generateIntegrationHistoriesV1();
 
 export {
     generateIntegrationsV1,
     generateIntegrationV1,
+    generateIntegrationHistoryV1,
+    generateIntegrationHistoriesV1,
     integrationsV1,
     integrationV1,
+    integrationHistoriesV1,
     federationTestResponseV1,
 };

mocks/handlers/integration/v1/integration.handler.ts

@@ -1,10 +1,12 @@
 import { rest } from "msw";
 import { FederationTestResponse } from "@/interfaces/Federation";
 import { Integration } from "@/interfaces/Integration";
+import { IntegrationHistory } from "@/interfaces/IntegrationHistory";
 import { PaginationType } from "@/interfaces/Pagination";
 import apis from "@/config/apis";
 import {
     federationTestResponseV1,
+    integrationHistoriesV1,
     integrationV1,
     integrationsV1,
 } from "@/mocks/data/integration";
@@ -150,10 +152,52 @@ const getFederationRunV1 = ({
     );
 };
 
+interface getFederationHistoryProps {
+    data?: IntegrationHistory[];
+    teamId?: number;
+    federationId?: number;
+    status?: number;
+    pagination?: Omit<PaginationType<IntegrationHistory>, "list">;
+}
+
+const getFederationHistoryV1 = ({
+    data = integrationHistoriesV1,
+    teamId = teamV1.id,
+    federationId = integrationV1.id,
+    status = 200,
+    pagination,
+}: getFederationHistoryProps = {}) => {
+    return rest.get(
+        `${apis.teamsV1Url}/${teamId}/federations/${federationId}/history`,
+        (req, res, ctx) => {
+            if (status !== 200) {
+                return res(
+                    ctx.status(status),
+                    ctx.json(`Request failed with status code ${status}`)
+                );
+            }
+            if (pagination) {
+                return res(
+                    ctx.status(status),
+                    ctx.json<PaginationType<IntegrationHistory>>({
+                        list: data,
+                        ...pagination,
+                    })
+                );
+            }
+            return res(
+                ctx.status(status),
+                ctx.json<{ data: IntegrationHistory[] }>({ data })
+            );
+        }
+    );
+};
+
 export {
     getIntegrationV1,
     getIntegrationsV1,
     postIntegrationV1,
     postFederationsTestV1,
     getFederationRunV1,
+    getFederationHistoryV1,
 };