From 5dfa81a8e5c77355cceb2c3275d65a0732fd851e Mon Sep 17 00:00:00 2001 From: Gustav Hansen Date: Thu, 31 Mar 2022 12:45:49 +0200 Subject: [PATCH] Upload: Namespace all queries with pluginId --- .../core/upload/admin/src/hooks/tests/useEditFolder.test.js | 4 +++- packages/core/upload/admin/src/hooks/useAssets.js | 4 +++- packages/core/upload/admin/src/hooks/useBulkRemoveAsset.js | 6 ++++-- packages/core/upload/admin/src/hooks/useEditAsset.js | 5 +++-- packages/core/upload/admin/src/hooks/useEditFolder.js | 4 +++- packages/core/upload/admin/src/hooks/useFolders.js | 4 +++- packages/core/upload/admin/src/hooks/useRemoveAsset.js | 2 +- packages/core/upload/admin/src/hooks/useUpload.js | 4 ++-- 8 files changed, 22 insertions(+), 11 deletions(-) diff --git a/packages/core/upload/admin/src/hooks/tests/useEditFolder.test.js b/packages/core/upload/admin/src/hooks/tests/useEditFolder.test.js index f11c5542c9..eecd0efc15 100644 --- a/packages/core/upload/admin/src/hooks/tests/useEditFolder.test.js +++ b/packages/core/upload/admin/src/hooks/tests/useEditFolder.test.js @@ -137,7 +137,9 @@ describe('useEditFolder', () => { }); await waitFor(() => - expect(queryClient.refetchQueries).toHaveBeenCalledWith(['folder'], { active: true }) + expect(queryClient.refetchQueries).toHaveBeenCalledWith(['upload', 'folder'], { + active: true, + }) ); }); diff --git a/packages/core/upload/admin/src/hooks/useAssets.js b/packages/core/upload/admin/src/hooks/useAssets.js index 76d6fa0434..653aad55be 100644 --- a/packages/core/upload/admin/src/hooks/useAssets.js +++ b/packages/core/upload/admin/src/hooks/useAssets.js @@ -2,6 +2,8 @@ import { useQuery } from 'react-query'; import { useNotifyAT } from '@strapi/design-system/LiveRegions'; import { useNotification, useQueryParams } from '@strapi/helper-plugin'; import { useIntl } from 'react-intl'; + +import pluginId from '../pluginId'; import { axiosInstance, getRequestUrl } from '../utils'; export const useAssets = ({ skipWhen }) => { @@ -33,7 +35,7 @@ export const useAssets = ({ skipWhen }) => { } }; - const { data, error, isLoading } = useQuery([`assets`, rawQuery], getAssets, { + const { data, error, isLoading } = useQuery([pluginId, `assets`, rawQuery], getAssets, { enabled: !skipWhen, staleTime: 0, cacheTime: 0, diff --git a/packages/core/upload/admin/src/hooks/useBulkRemoveAsset.js b/packages/core/upload/admin/src/hooks/useBulkRemoveAsset.js index 14af043c28..bfc3e3bd92 100644 --- a/packages/core/upload/admin/src/hooks/useBulkRemoveAsset.js +++ b/packages/core/upload/admin/src/hooks/useBulkRemoveAsset.js @@ -1,6 +1,8 @@ import { useMutation, useQueryClient } from 'react-query'; import { useNotification } from '@strapi/helper-plugin'; + import { deleteRequest } from '../utils/deleteRequest'; +import pluginId from '../pluginId'; const bulkRemoveQuery = assetIds => { const promises = assetIds.map(assetId => deleteRequest('files', assetId)); @@ -15,8 +17,8 @@ export const useBulkRemoveAsset = () => { const mutation = useMutation(bulkRemoveQuery, { onSuccess: () => { // Coupled with the cache of useAssets - queryClient.refetchQueries(['assets'], { active: true }); - queryClient.refetchQueries(['asset-count'], { active: true }); + queryClient.refetchQueries([pluginId, 'assets'], { active: true }); + queryClient.refetchQueries([pluginId, 'asset-count'], { active: true }); toggleNotification({ type: 'success', diff --git a/packages/core/upload/admin/src/hooks/useEditAsset.js b/packages/core/upload/admin/src/hooks/useEditAsset.js index e47d59534d..7a0cd3fe63 100644 --- a/packages/core/upload/admin/src/hooks/useEditAsset.js +++ b/packages/core/upload/admin/src/hooks/useEditAsset.js @@ -3,6 +3,7 @@ import { useRef, useState } from 'react'; import { useMutation, useQueryClient } from 'react-query'; import { useIntl } from 'react-intl'; import { useNotification } from '@strapi/helper-plugin'; + import { axiosInstance, getTrad } from '../utils'; import pluginId from '../pluginId'; @@ -46,8 +47,8 @@ export const useEditAsset = () => { ({ asset, file }) => editAssetRequest(asset, file, tokenRef.current, setProgress), { onSuccess: () => { - queryClient.refetchQueries(['assets'], { active: true }); - queryClient.refetchQueries(['asset-count'], { active: true }); + queryClient.refetchQueries([pluginId, 'assets'], { active: true }); + queryClient.refetchQueries([pluginId, 'asset-count'], { active: true }); }, onError: reason => { if (reason.response.status === 403) { diff --git a/packages/core/upload/admin/src/hooks/useEditFolder.js b/packages/core/upload/admin/src/hooks/useEditFolder.js index 5038fd8ff9..c07afc1b83 100644 --- a/packages/core/upload/admin/src/hooks/useEditFolder.js +++ b/packages/core/upload/admin/src/hooks/useEditFolder.js @@ -1,5 +1,7 @@ import { useMutation, useQueryClient } from 'react-query'; import { useNotification } from '@strapi/helper-plugin'; + +import pluginId from '../pluginId'; import { axiosInstance, getRequestUrl } from '../utils'; const editFolderRequest = folder => { @@ -15,7 +17,7 @@ export const useEditFolder = () => { const mutation = useMutation(({ folder }) => editFolderRequest(folder), { onSuccess: () => { - queryClient.refetchQueries(['folder'], { active: true }); + queryClient.refetchQueries([pluginId, 'folder'], { active: true }); }, onError: reason => { toggleNotification({ type: 'warning', message: reason.message }); diff --git a/packages/core/upload/admin/src/hooks/useFolders.js b/packages/core/upload/admin/src/hooks/useFolders.js index 084aea004a..0d218cf183 100644 --- a/packages/core/upload/admin/src/hooks/useFolders.js +++ b/packages/core/upload/admin/src/hooks/useFolders.js @@ -2,6 +2,8 @@ import { useQuery } from 'react-query'; import { useNotifyAT } from '@strapi/design-system/LiveRegions'; import { useNotification, useQueryParams } from '@strapi/helper-plugin'; import { useIntl } from 'react-intl'; + +import pluginId from '../pluginId'; import { axiosInstance, getRequestUrl } from '../utils'; export const useFolders = ({ enabled = true }) => { @@ -33,7 +35,7 @@ export const useFolders = ({ enabled = true }) => { } }; - const { data, error, isLoading } = useQuery([`folders`, rawQuery], fetchFolders, { + const { data, error, isLoading } = useQuery([pluginId, `folders`, rawQuery], fetchFolders, { enabled, staleTime: 0, cacheTime: 0, diff --git a/packages/core/upload/admin/src/hooks/useRemoveAsset.js b/packages/core/upload/admin/src/hooks/useRemoveAsset.js index 5cf1dc6210..e197f8fe4b 100644 --- a/packages/core/upload/admin/src/hooks/useRemoveAsset.js +++ b/packages/core/upload/admin/src/hooks/useRemoveAsset.js @@ -1,8 +1,8 @@ import { useMutation, useQueryClient } from 'react-query'; import { useNotification } from '@strapi/helper-plugin'; -import pluginId from '../pluginId'; import { deleteRequest } from '../utils/deleteRequest'; +import pluginId from '../pluginId'; export const useRemoveAsset = onSuccess => { const toggleNotification = useNotification(); diff --git a/packages/core/upload/admin/src/hooks/useUpload.js b/packages/core/upload/admin/src/hooks/useUpload.js index 72f9e2ba04..07305cf205 100644 --- a/packages/core/upload/admin/src/hooks/useUpload.js +++ b/packages/core/upload/admin/src/hooks/useUpload.js @@ -42,8 +42,8 @@ export const useUpload = () => { const mutation = useMutation(asset => uploadAsset(asset, tokenRef.current, setProgress), { onSuccess: () => { - queryClient.refetchQueries(['assets'], { active: true }); - queryClient.refetchQueries(['asset-count'], { active: true }); + queryClient.refetchQueries([pluginId, 'assets'], { active: true }); + queryClient.refetchQueries([pluginId, 'asset-count'], { active: true }); }, });