Merge pull request #1718 from ral-facilities/release/v2.2.0

Release v2.2.0

Author: louise-davies

.github/workflows/ci-build.yml

@@ -89,7 +89,7 @@ jobs:
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
         with:
           repository: icatproject-contrib/icat-ansible
-          ref: master
+          ref: datagateway-download-api-3.1.0
           path: icat-ansible
       - name: Install Ansible (ensure we're using the system python)
         run: /usr/bin/python3 -m pip install -r icat-ansible/requirements.txt

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [v2.2.0](https://github.com/ral-facilities/datagateway/tree/v2.2.0) (2025-05-16)
+
+## What's Changed
+
+### Features
+
+* Handle isDeleted and no prepared id cases in progress bars by @louise-davies in https://github.com/ral-facilities/datagateway/pull/1715
+* Restore visit button #1694 by @louise-davies in https://github.com/ral-facilities/datagateway/pull/1714
+
+**Full Changelog**: https://github.com/ral-facilities/datagateway/compare/v2.1.1...2.2.0
+
 ## [v2.1.1](https://github.com/ral-facilities/datagateway/tree/v2.1.1) (2025-03-18)
 
 ## What's Changed

package.json

@@ -1,7 +1,7 @@
 {
   "name": "datagateway",
   "private": true,
-  "version": "2.1.1",
+  "version": "2.2.0",
   "workspaces": [
     "packages/*"
   ],

packages/datagateway-common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "datagateway-common",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "private": true,
   "files": [
     "lib"

packages/datagateway-common/src/__mocks__/axios.ts

@@ -7,6 +7,7 @@ const requests = {
   post: jest.fn(() => Promise.resolve({ data: {} })),
   delete: jest.fn(() => Promise.resolve({ data: {} })),
   CancelToken: axios.CancelToken,
+  AxiosError: axios.AxiosError,
 };
 
 export default requests;

packages/datagateway-common/src/__mocks__/react-i18next.jsx

@@ -36,8 +36,11 @@ const renderNodes = (reactNodes) => {
   });
 };
 
-const useMock = [(k) => k, {}];
-useMock.t = (k) => k;
+const useMock = [
+  (k, o) => (o ? `${k} ${JSON.stringify(o).replace(/"/g, '')}` : k),
+  {},
+];
+useMock.t = (k, o) => (o ? `${k} ${JSON.stringify(o).replace(/"/g, '')}` : k);
 useMock.i18n = {};
 
 const applyTranslation = (Component) => {