Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bulk Plugin Management: Avoid CSS leak when navigating to plugin details #99224

Merged
merged 5 commits into from
Feb 6, 2025
Merged

Bulk Plugin Management: Avoid CSS leak when navigating to plugin details #99224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b6fedde
Bulk Plugin Management: Avoid CSS leak when navigating to plugin details
epeicher Feb 3, 2025
ccacace
Use all sites instead of the selected one for listing the plugins
epeicher Feb 4, 2025
dc10505
Clear selected site when navigating to plugins management screen
epeicher Feb 4, 2025
a4ceee0
Add the noSite middleware to the plugins/manage/sites/:slug route
epeicher Feb 4, 2025
7bbef2b
Merge branch 'trunk' into fix/bulk-plugin-management-css-leak
epeicher Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion client/my-sites/plugins/index.web.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
render as clientRender,
redirectIfCurrentUserCannot,
} from 'calypso/controller';
import { navigation, siteSelection, sites } from 'calypso/my-sites/controller';
import { noSite, navigation, siteSelection, sites } from 'calypso/my-sites/controller';
import {
renderPluginsDashboard,
browsePlugins,
Expand Down Expand Up @@ -126,6 +126,7 @@ export default function ( router ) {
scrollTopIfNoHash,
navigation,
redirectTrialSites,
noSite,
renderPluginsSidebar,
renderPluginsDashboard,
makeLayout,
Expand All @@ -139,6 +140,7 @@ export default function ( router ) {
scrollTopIfNoHash,
navigation,
redirectTrialSites,
noSite,
renderPluginsSidebar,
renderPluginsDashboard,
makeLayout,
Expand Down
12 changes: 5 additions & 7 deletions client/my-sites/plugins/plugins-dashboard/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ import {
import { removePluginStatuses } from 'calypso/state/plugins/installed/status/actions';
import { getAllPlugins as getAllWporgPlugins } from 'calypso/state/plugins/wporg/selectors';
import { getProductsList } from 'calypso/state/products-list/selectors';
import getSelectedOrAllSites from 'calypso/state/selectors/get-selected-or-all-sites';
import getSelectedOrAllSitesWithPlugins from 'calypso/state/selectors/get-selected-or-all-sites-with-plugins';
import getSites from 'calypso/state/selectors/get-sites';
import { isRequestingSites } from 'calypso/state/sites/selectors';
import { PluginActionName, PluginActions, Site } from '../hooks/types';
import { withShowPluginActionDialog } from '../hooks/use-show-plugin-action-dialog';
Expand Down Expand Up @@ -108,9 +107,8 @@ const PluginsDashboard = ( {
const dispatch = useDispatch();
const translate = useTranslate();
const isJetpackCloudOrA8CForAgencies = isJetpackCloud() || isA8CForAgencies();
const allSites = useSelector( ( state ) => getSelectedOrAllSites( state ) );
const sites = useSelector( ( state ) => getSelectedOrAllSitesWithPlugins( state ) );
const siteIds = siteObjectsToSiteIds( sites ) ?? [];
const allSites = useSelector( ( state ) => getSites( state ) );
const siteIds = siteObjectsToSiteIds( allSites ) ?? [];
const wporgPlugins = useSelector( ( state ) => getAllWporgPlugins( state ) );
const isLoading = useSelector(
( state ) => isRequestingForAllSites( state ) || isRequestingSites( state )
Expand Down Expand Up @@ -170,7 +168,7 @@ const PluginsDashboard = ( {
?.filter( ( plugin: Plugin ) => ! isDeactivatingOrRemovingAndJetpackSelected( plugin ) )
.map( ( p: Plugin ) => {
return Object.keys( p.sites ).map( ( siteId ) => {
const site = sites.find( ( s ) => s?.ID === parseInt( siteId ) );
const site = allSites.find( ( s ) => s?.ID === parseInt( siteId ) );
return {
plugin: p,
site,
Expand Down Expand Up @@ -308,7 +306,7 @@ const PluginsDashboard = ( {
showPluginActionDialog(
actionName as PluginActionName,
pluginsToProcess,
sites as Site[],
allSites as Site[],
selectedActionCallback( pluginsToProcess )
);
};
Expand Down
3 changes: 3 additions & 0 deletions client/state/global-sidebar/selectors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ const SITE_DASHBOARD_ROUTES = [
'/domains/manage/all/overview',
'/domains/manage/all/email',
'/domains/manage/all/contact-info',

// Bulk Plugins management
'/plugins/manage/sites',
];

function isInRoute( state: AppState, routes: string[] ) {
Expand Down