From 28589c5e466d78a411262a77be25daf1d0113947 Mon Sep 17 00:00:00 2001 From: Arnei Date: Thu, 12 Dec 2024 12:33:34 +0100 Subject: [PATCH] Update @reduxjs/toolkit to 2.5.0 Supersedes #1002. Could not figure out why the type `AsyncThunkConfig` is not exported anymore, nor could I find an equivalent type, so I've just removed it for now. --- package-lock.json | 22 +++++++++---------- package.json | 2 +- .../DetailsExtendedMetadataTab.tsx | 3 +-- .../ModalTabsAndPages/DetailsMetadataTab.tsx | 3 +-- src/components/recordings/Recordings.tsx | 3 +-- src/components/shared/TableFilterProfiles.tsx | 3 +-- src/components/shared/TableFilters.tsx | 3 +-- .../modals/ResourceDetailsAccessPolicyTab.tsx | 7 +++--- 8 files changed, 20 insertions(+), 26 deletions(-) diff --git a/package-lock.json b/package-lock.json index be31794a2a..9f5d075643 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "@hello-pangea/dnd": "^17.0.0", "@mui/material": "^6.1.6", "@mui/x-date-pickers": "^7.18.0", - "@reduxjs/toolkit": "^2.2.6", + "@reduxjs/toolkit": "^2.5.0", "@types/dompurify": "^3.0.5", "@types/react-router-dom": "^5.3.3", "array-move": "^4.0.0", @@ -3155,9 +3155,9 @@ } }, "node_modules/@reduxjs/toolkit": { - "version": "2.2.6", - "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.2.6.tgz", - "integrity": "sha512-kH0r495c5z1t0g796eDQAkYbEQ3a1OLYN9o8jQQVZyKyw367pfRGS+qZLkHYvFHiUUdafpoSlQ2QYObIApjPWA==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.5.0.tgz", + "integrity": "sha512-awNe2oTodsZ6LmRqmkFhtb/KH03hUhxOamEQy411m3Njj3BbFvoBovxo4Q1cBWnV1ErprVj9MlF0UPXkng0eyg==", "dependencies": { "immer": "^10.0.3", "redux": "^5.0.1", @@ -3165,7 +3165,7 @@ "reselect": "^5.1.0" }, "peerDependencies": { - "react": "^16.9.0 || ^17.0.0 || ^18", + "react": "^16.9.0 || ^17.0.0 || ^18 || ^19", "react-redux": "^7.2.1 || ^8.1.3 || ^9.0.0" }, "peerDependenciesMeta": { @@ -5608,9 +5608,9 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "dependencies": { "path-key": "^3.1.0", @@ -8565,9 +8565,9 @@ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "node_modules/nanoid": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", - "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", + "version": "3.3.8", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", + "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==", "funding": [ { "type": "github", diff --git a/package.json b/package.json index 6208ec3049..47b7c9ca61 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "@hello-pangea/dnd": "^17.0.0", "@mui/material": "^6.1.6", "@mui/x-date-pickers": "^7.18.0", - "@reduxjs/toolkit": "^2.2.6", + "@reduxjs/toolkit": "^2.5.0", "@types/dompurify": "^3.0.5", "@types/react-router-dom": "^5.3.3", "array-move": "^4.0.0", diff --git a/src/components/events/partials/ModalTabsAndPages/DetailsExtendedMetadataTab.tsx b/src/components/events/partials/ModalTabsAndPages/DetailsExtendedMetadataTab.tsx index 5a54353fde..3854a366a6 100644 --- a/src/components/events/partials/ModalTabsAndPages/DetailsExtendedMetadataTab.tsx +++ b/src/components/events/partials/ModalTabsAndPages/DetailsExtendedMetadataTab.tsx @@ -16,7 +16,6 @@ import { getMetadataCollectionFieldName } from "../../../../utils/resourceUtils" import { useAppDispatch, useAppSelector } from "../../../../store"; import { MetadataCatalog } from "../../../../slices/eventSlice"; import { AsyncThunk } from "@reduxjs/toolkit"; -import { AsyncThunkConfig } from "@reduxjs/toolkit/dist/createAsyncThunk"; /** * This component renders metadata details of a certain event or series @@ -34,7 +33,7 @@ const DetailsExtendedMetadataTab = ({ id: string; values: { [key: string]: any; }; catalog: MetadataCatalog; - }, AsyncThunkConfig> //(id: string, values: { [key: string]: any }, catalog: MetadataCatalog) => void, + }, any> //(id: string, values: { [key: string]: any }, catalog: MetadataCatalog) => void, }) => { const { t } = useTranslation(); const dispatch = useAppDispatch(); diff --git a/src/components/events/partials/ModalTabsAndPages/DetailsMetadataTab.tsx b/src/components/events/partials/ModalTabsAndPages/DetailsMetadataTab.tsx index 179f2abd10..09007b0bde 100644 --- a/src/components/events/partials/ModalTabsAndPages/DetailsMetadataTab.tsx +++ b/src/components/events/partials/ModalTabsAndPages/DetailsMetadataTab.tsx @@ -14,7 +14,6 @@ import { getMetadataCollectionFieldName } from "../../../../utils/resourceUtils" import { useAppDispatch, useAppSelector } from "../../../../store"; import { MetadataCatalog } from "../../../../slices/eventSlice"; import { AsyncThunk } from "@reduxjs/toolkit"; -import { AsyncThunkConfig } from "@reduxjs/toolkit/dist/createAsyncThunk"; /** * This component renders metadata details of a certain event or series @@ -27,7 +26,7 @@ const DetailsMetadataTab = ({ editAccessRole, }: { metadataFields: MetadataCatalog, - updateResource: AsyncThunk + updateResource: AsyncThunk resourceId: string, header: string, editAccessRole: string, diff --git a/src/components/recordings/Recordings.tsx b/src/components/recordings/Recordings.tsx index b030f0dce9..fa8c11cb27 100644 --- a/src/components/recordings/Recordings.tsx +++ b/src/components/recordings/Recordings.tsx @@ -20,7 +20,6 @@ import { getCurrentFilterResource } from "../../selectors/tableFilterSelectors"; import { useAppDispatch, useAppSelector } from "../../store"; import { fetchRecordings } from "../../slices/recordingSlice"; import { AsyncThunk } from "@reduxjs/toolkit"; -import { AsyncThunkConfig } from "@reduxjs/toolkit/dist/createAsyncThunk"; /** * This component renders the table view of recordings @@ -86,7 +85,7 @@ const Recordings = () => {
{/* Include filters component */} } + loadResource={fetchRecordings as AsyncThunk} loadResourceIntoTable={loadRecordingsIntoTable} resource={"recordings"} /> diff --git a/src/components/shared/TableFilterProfiles.tsx b/src/components/shared/TableFilterProfiles.tsx index 3c775d502e..b70340449c 100644 --- a/src/components/shared/TableFilterProfiles.tsx +++ b/src/components/shared/TableFilterProfiles.tsx @@ -17,7 +17,6 @@ import { useHotkeys } from "react-hotkeys-hook"; import { availableHotkeys } from "../../configs/hotkeysConfig"; import { Tooltip } from "./Tooltip"; import { AsyncThunk } from "@reduxjs/toolkit"; -import { AsyncThunkConfig } from "@reduxjs/toolkit/dist/createAsyncThunk"; /** * This component renders the table filter profiles in the upper right corner when clicked on settings icon of the @@ -32,7 +31,7 @@ const TableFiltersProfiles = ({ }: { showFilterSettings: boolean, setFilterSettings: (_: boolean) => void, - loadResource: AsyncThunk, + loadResource: AsyncThunk, loadResourceIntoTable: () => AppThunk, resource: string, }) => { diff --git a/src/components/shared/TableFilters.tsx b/src/components/shared/TableFilters.tsx index 449a395d55..130d3793ab 100644 --- a/src/components/shared/TableFilters.tsx +++ b/src/components/shared/TableFilters.tsx @@ -29,7 +29,6 @@ import { renderValidDate } from "../../utils/dateUtils"; import { Tooltip } from "./Tooltip"; import DropDown from "./DropDown"; import { AsyncThunk } from "@reduxjs/toolkit"; -import { AsyncThunkConfig } from "@reduxjs/toolkit/dist/createAsyncThunk"; /** * This component renders the table filters in the upper right corner of the table @@ -39,7 +38,7 @@ const TableFilters = ({ loadResourceIntoTable, resource, }: { - loadResource: AsyncThunk, + loadResource: AsyncThunk, loadResourceIntoTable: () => AppThunk, resource: string, }) => { diff --git a/src/components/shared/modals/ResourceDetailsAccessPolicyTab.tsx b/src/components/shared/modals/ResourceDetailsAccessPolicyTab.tsx index 3583664285..5a5f308623 100644 --- a/src/components/shared/modals/ResourceDetailsAccessPolicyTab.tsx +++ b/src/components/shared/modals/ResourceDetailsAccessPolicyTab.tsx @@ -25,7 +25,6 @@ import { removeNotificationWizardForm, addNotification } from "../../../slices/n import { useTranslation } from "react-i18next"; import { TransformedAcl } from "../../../slices/aclDetailsSlice"; import { AsyncThunk, unwrapResult } from "@reduxjs/toolkit"; -import { AsyncThunkConfig } from "@reduxjs/toolkit/dist/createAsyncThunk"; import { SaveEditFooter } from "../SaveEditFooter"; @@ -48,9 +47,9 @@ const ResourceDetailsAccessPolicyTab = ({ resourceId: string, header: string, policies: TransformedAcl[], - fetchHasActiveTransactions?: AsyncThunk - fetchAccessPolicies: AsyncThunk, - saveNewAccessPolicies: AsyncThunk + fetchHasActiveTransactions?: AsyncThunk + fetchAccessPolicies: AsyncThunk, + saveNewAccessPolicies: AsyncThunk descriptionText: string, buttonText: string, editAccessRole: string,