From f0be948518427e84723de71ef8d412c0aeb73747 Mon Sep 17 00:00:00 2001 From: Claudiu Filip Date: Tue, 22 Oct 2024 16:26:45 +0300 Subject: [PATCH] Remove unneded changes --- .../single-list-view/index.jsx | 24 +++++-------------- .../plugins/plugins-discovery-page/index.jsx | 6 ----- 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/client/my-sites/plugins/plugins-browser/single-list-view/index.jsx b/client/my-sites/plugins/plugins-browser/single-list-view/index.jsx index 3826cc47b8db66..701f3b21da85a0 100644 --- a/client/my-sites/plugins/plugins-browser/single-list-view/index.jsx +++ b/client/my-sites/plugins/plugins-browser/single-list-view/index.jsx @@ -31,24 +31,15 @@ function isNotInstalled( plugin, installedPlugins ) { ); } -const SingleListView = ( { - category, - plugins, - isFetching, - siteSlug, - sites, - noHeader, - title, - subtitle, -} ) => { +const SingleListView = ( { category, plugins, isFetching, siteSlug, sites, noHeader } ) => { const translate = useTranslate(); const siteId = useSelector( getSelectedSiteId ); const domain = useSelector( ( state ) => getSiteDomain( state, siteId ) ); const categories = useCategories(); - const categoryName = title || categories[ category ]?.title || translate( 'Plugins' ); - const categoryDescription = subtitle || categories[ category ]?.description || null; + const categoryName = categories[ category ]?.title || translate( 'Plugins' ); + const categoryDescription = categories[ category ]?.description || null; const { localizePath } = useLocalizedPlugins(); @@ -60,12 +51,9 @@ const SingleListView = ( { .filter( isNotBlocked ) .filter( ( plugin ) => ! siteId || isNotInstalled( plugin, installedPlugins ) ); - let listLink; - if ( category ) { - listLink = '/plugins/browse/' + category; - if ( domain ) { - listLink += '/' + domain; - } + let listLink = '/plugins/browse/' + category; + if ( domain ) { + listLink = '/plugins/browse/' + category + '/' + domain; } if ( ! isFetching && plugins.length === 0 ) { diff --git a/client/my-sites/plugins/plugins-discovery-page/index.jsx b/client/my-sites/plugins/plugins-discovery-page/index.jsx index c61286d5f8fec0..589d361e602bf5 100644 --- a/client/my-sites/plugins/plugins-discovery-page/index.jsx +++ b/client/my-sites/plugins/plugins-discovery-page/index.jsx @@ -6,7 +6,6 @@ import { TrialAcknowledgeModal } from 'calypso/my-sites/plans/trials/trial-ackno import { WithOnclickTrialRequest } from 'calypso/my-sites/plans/trials/trial-acknowledge/with-onclick-trial-request'; import { isCompatiblePlugin } from 'calypso/my-sites/plugins/plugin-compatibility'; import { isUserLoggedIn } from 'calypso/state/current-user/selectors'; -import { useCategories } from '../categories/use-categories'; import { WPBEGINNER_PLUGINS } from '../constants'; import EducationFooter from '../education-footer'; import CollectionListView from '../plugins-browser/collection-list-view'; @@ -53,10 +52,7 @@ export const PaidPluginsSection = ( props ) => { }; export const FeaturedWPBeginnerSection = ( props ) => { const category = 'wpbeginner'; - const categories = useCategories(); - const categoryName = categories[ category ]?.title || category; - const categoryDescription = categories[ category ]?.description; const { data: plugins = [], isFetching } = useESPlugin( WPBEGINNER_PLUGINS ); return ( @@ -65,8 +61,6 @@ export const FeaturedWPBeginnerSection = ( props ) => { category={ category } plugins={ plugins } isFetching={ isFetching } - title={ categoryName } - subtitle={ categoryDescription } /> ); };