yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-26 08:52:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

first mark feedback

Browse Source
This commit is contained in:
Rémi de Juvigny 2023-01-12 16:22:02 +01:00 committed by Fernando Chavez
parent ee7520bfa0
commit 8babbcb31d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/admin/admin/src/pages/MarketplacePage/tests/plugins.test.js
View File

@ -121,7 +121,7 @@ describe('Marketplace page - plugins tab', () => {
expect(noResult).toBeVisible(); expect(noResult).toBeVisible();
}); });
it('shows the installed text for installed plugins', async () => { it('shows the installed text for installed plugins', () => {
// Plugin that's already installed // Plugin that's already installed
const alreadyInstalledCard = screen const alreadyInstalledCard = screen
.getAllByTestId('npm-package-card') .getAllByTestId('npm-package-card')

14
packages/core/admin/admin/src/pages/MarketplacePage/utils/useMarketplaceData.js
View File

@ -47,16 +47,16 @@ function useMarketplaceData({ npmPackageType, debouncedSearch, query, tabQuery }
} }
); );
const relevantResponse = npmPackageType === 'plugin' ? pluginsResponse : providersResponse; const npmPackageTypeResponse = npmPackageType === 'plugin' ? pluginsResponse : providersResponse;
const relevantStatus = npmPackageType === 'plugin' ? pluginsStatus : providersStatus; const npmPackageTypeStatus = npmPackageType === 'plugin' ? pluginsStatus : providersStatus;
const [possibleCollections, setPossibleCollections] = useState({}); const [possibleCollections, setPossibleCollections] = useState({});
const [possibleCategories, setPossibleCategories] = useState({}); const [possibleCategories, setPossibleCategories] = useState({});
// Keep possible filters up to date, but don't lose them while loading // Keep possible filters up to date, but don't lose them while loading
useEffect(() => { useEffect(() => {
if (relevantStatus === 'success') { if (npmPackageTypeStatus === 'success') {
setPossibleCollections(relevantResponse.meta.collections); setPossibleCollections(npmPackageTypeResponse.meta.collections);
} }
if (pluginsStatus === 'success') { if (pluginsStatus === 'success') {
@ -65,11 +65,11 @@ function useMarketplaceData({ npmPackageType, debouncedSearch, query, tabQuery }
}, [ }, [
pluginsResponse?.meta.categories, pluginsResponse?.meta.categories,
pluginsStatus, pluginsStatus,
relevantResponse?.meta.collections, npmPackageTypeResponse?.meta.collections,
relevantStatus, npmPackageTypeStatus,
]); ]);
const { pagination } = relevantStatus === 'success' ? relevantResponse.meta : {}; const { pagination } = npmPackageTypeStatus === 'success' ? npmPackageTypeResponse.meta : {};
return { return {
pluginsResponse, pluginsResponse,