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.

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

Logged-in Performance Profiler: Add base PageSelector #94449

Merged
merged 5 commits into from
Sep 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import page from '@automattic/calypso-router';
import { Button } from '@automattic/components';
import { Button, SearchableDropdown } from '@automattic/components';
import { TextareaControl, TextControl, ToggleControl } from '@wordpress/components';
import { useTranslate } from 'i18n-calypso';
import { useCallback } from 'react';
Expand All @@ -9,7 +9,6 @@ import validateEmail from 'calypso/a8c-for-agencies/components/form/hoc/with-err
import validateNonEmpty from 'calypso/a8c-for-agencies/components/form/hoc/with-error-handling/validators/non-empty';
import validateUrl from 'calypso/a8c-for-agencies/components/form/hoc/with-error-handling/validators/url';
import FormSection from 'calypso/a8c-for-agencies/components/form/section';
import SearchableDropdown from 'calypso/a8c-for-agencies/components/searchable-dropdown';
import { A4A_PARTNER_DIRECTORY_DASHBOARD_LINK } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants';
import BudgetSelector from 'calypso/a8c-for-agencies/sections/partner-directory/components/budget-selector';
import { AgencyDetails } from 'calypso/a8c-for-agencies/sections/partner-directory/types';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import { Button, Gridicon, FormLabel } from '@automattic/components';
import { Button, Gridicon, FormLabel, SearchableDropdown } from '@automattic/components';
import { useLocalizeUrl } from '@automattic/i18n-utils';
import clsx from 'clsx';
import { useTranslate } from 'i18n-calypso';
import { useCallback, useState, useMemo, ChangeEvent, useEffect } from 'react';
import SearchableDropdown from 'calypso/a8c-for-agencies/components/searchable-dropdown';
import TextPlaceholder from 'calypso/a8c-for-agencies/components/text-placeholder';
import FormFieldset from 'calypso/components/forms/form-fieldset';
import FormSelect from 'calypso/components/forms/form-select';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Button, Gridicon, FormLabel } from '@automattic/components';
import { Button, Gridicon, FormLabel, SearchableDropdown } from '@automattic/components';
import { useTranslate } from 'i18n-calypso';
import { useCallback, useState, useMemo, ChangeEvent, useEffect } from 'react';
import FormFieldset from 'calypso/components/forms/form-fieldset';
Expand All @@ -8,7 +8,6 @@ import FormTextInput from 'calypso/components/forms/form-text-input';
import TextPlaceholder from 'calypso/jetpack-cloud/sections/partner-portal/text-placeholder';
import { PartnerDetailsPayload } from 'calypso/state/partner-portal/types';
import PartnerProgramOptInFieldSet from '../partner-program-opt-in-fieldset/partner-program-opt-in-fieldset';
import SearchableDropdown from '../searchable-dropdown';
import { Option as CountryOption, useCountriesAndStates } from './hooks/use-countries-and-states';
import type { FormEventHandler } from 'react';

Expand Down

This file was deleted.

This file was deleted.

52 changes: 52 additions & 0 deletions client/site-performance/components/PageSelector.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
import page from '@automattic/calypso-router';
import { SearchableDropdown } from '@automattic/components';
import { useDebouncedInput } from '@wordpress/compose';
import { useSelector } from 'calypso/state';
import getCurrentQueryArguments from 'calypso/state/selectors/get-current-query-arguments';
import { useSitePages } from '../hooks/useSitePages';

export const PageSelector = () => {
const queryParams = useSelector( getCurrentQueryArguments );
const [ , setQuery, query ] = useDebouncedInput();
const pages = useSitePages( { query } );

return (
<>
<SearchableDropdown
zaguiini marked this conversation as resolved.
Show resolved Hide resolved
onFilterValueChange={ setQuery }
options={ pages }
value={ queryParams?.page_id?.toString() }
onChange={ ( page_id ) => {
const url = new URL( window.location.href );

if ( page_id ) {
url.searchParams.set( 'page_id', page_id );
} else {
url.searchParams.delete( 'page_id' );
}

page.replace( url.pathname + url.search );
} }
css={ {
maxWidth: '240px',
'.components-form-token-field__suggestions-list': { maxHeight: 'initial !important' },
'.components-form-token-field__suggestions-list li': { padding: '0 !important' },
} }
__experimentalRenderItem={ ( { item } ) => (
<div
aria-label={ item.label }
css={ {
display: 'flex',
flexDirection: 'column',
paddingInline: '16px',
paddingBlock: '8px',
} }
>
<span>{ item.label }</span>
<span>{ item.url }</span>
</div>
) }
/>
</>
);
};
3 changes: 2 additions & 1 deletion client/site-performance/controller.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import config from '@automattic/calypso-config';
import page from '@automattic/calypso-router';
import PageViewTracker from 'calypso/lib/analytics/page-view-tracker';
import { PageSelector } from './components/PageSelector';
import type { Context as PageJSContext } from '@automattic/calypso-router';

export function sitePerformance( context: PageJSContext, next: () => void ) {
Expand All @@ -12,7 +13,7 @@ export function sitePerformance( context: PageJSContext, next: () => void ) {
context.primary = (
<>
<PageViewTracker path="/site-performance/:site" title="Site Performance" />
<div>Site Performance</div>
<PageSelector />
</>
);

Expand Down
81 changes: 81 additions & 0 deletions client/site-performance/hooks/useSitePages.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
import { useQuery, keepPreviousData } from '@tanstack/react-query';
import { useI18n } from '@wordpress/react-i18n';
import { addQueryArgs } from '@wordpress/url';
import { useMemo } from 'react';
import wpcomRequest from 'wpcom-proxy-request';
import { useSiteSettings } from 'calypso/blocks/plugins-scheduled-updates/hooks/use-site-settings';
import { useSelector } from 'calypso/state';
import { getSelectedSite } from 'calypso/state/ui/selectors';

interface SitePage {
id: number;
link: string;
title: { rendered: string };
wpcom_performance_url?: string;
}

const getPages = ( siteId: number, query = '' ) => {
return wpcomRequest< SitePage[] >( {
path: addQueryArgs( `/sites/${ siteId }/pages`, {
per_page: 10,
search: query,
page: 1,
status: 'publish',
_fields: [ 'id', 'link', 'title', 'wpcom_performance_url' ],
} ),
method: 'GET',
apiNamespace: 'wp/v2',
} );
};

export const useSitePages = ( { query = '' } ) => {
const { __ } = useI18n();

const site = useSelector( getSelectedSite );
const siteId = site?.ID;

const { data } = useQuery( {
queryKey: [ 'useSitePages', siteId, query ],
queryFn: () => getPages( siteId!, query ),
refetchOnWindowFocus: false,
enabled: !! siteId,
placeholderData: keepPreviousData,
select: ( data ) => {
return data.map( ( page ) => {
let url = page.link.replace( site?.URL ?? '', '' );
url = url.length > 1 ? url.replace( /\/$/, '' ) : url;

return {
url,
label: page.title.rendered,
value: page.id.toString(),
wpcom_performance_url: page.wpcom_performance_url,
};
} );
},
meta: {
persist: false,
},
} );

const { getSiteSetting } = useSiteSettings( site?.slug );
const homePagePerformanceUrl = getSiteSetting( 'wpcom_performance_url' );

const pages = useMemo( () => {
if ( ! query ) {
return [
{
url: '/',
label: __( 'Home' ),
value: 'home',
wpcom_performance_url: homePagePerformanceUrl || undefined,
},
...( data ?? [] ),
];
}

return data ?? [];
}, [ query, data, __, homePagePerformanceUrl ] );

return pages;
};
1 change: 1 addition & 0 deletions packages/components/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export { default as RootChild } from './root-child';
export { default as ScreenReaderText } from './screen-reader-text';
export { useScrollToTop } from './scroll-to-top/use-scroll-to-top';
export { default as SelectDropdown } from './select-dropdown';
export { default as SearchableDropdown } from './searchable-dropdown';
export { SiteThumbnail, DEFAULT_THUMBNAIL_SIZE } from './site-thumbnail';
export { default as Suggestions } from './suggestions';
export { default as PaginationControl } from './pagination-control';
Expand Down
27 changes: 27 additions & 0 deletions packages/components/src/searchable-dropdown/index.stories.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import { useState } from 'react';
import SearchableDropdown from './index';
import type { Meta, StoryObj } from '@storybook/react';

const meta: Meta< typeof SearchableDropdown > = {
title: 'packages/components/SearchableDropdown',
component: ( props ) => {
// eslint-disable-next-line react-hooks/rules-of-hooks
const [ value, onChange ] = useState( 'home' );

return <SearchableDropdown value={ value } onChange={ ( e ) => onChange( e! ) } { ...props } />;
},
};

export default meta;
type Story = StoryObj< typeof SearchableDropdown >;

export const Default: Story = {
args: {
options: [
{
label: 'Home',
value: 'home',
},
],
},
};
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ type Props = React.ComponentProps< typeof ComboboxControl > & {
};

export default function SearchableDropdown( props: Props ) {
const { disabled } = props;
const { disabled = false } = props;

return (
<div
Expand Down
Loading