Skip to content
Draft
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
4 changes: 3 additions & 1 deletion apps/ui/src/components/site-dropdown/index.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ vi.mock( '@/data/sync-activity', () => ( { useSiteSyncActivity: () => null } ) )
vi.mock( '@/components/selective-sync/lib/get-ipc-api', () => ( {
registerSelectiveSyncConnector: vi.fn(),
} ) );
vi.mock( './disconnect-site-dialog', () => ( { DisconnectSiteDialog: () => null } ) );
vi.mock( '@/components/site-toolbar/disconnect-site-dialog', () => ( {
DisconnectSiteDialog: () => null,
} ) );
vi.mock( '@/components/selective-sync/lib/convert-tree-to-sync-options', () => ( {
convertTreeToPullOptions: () => ( { optionsToSync: [ 'all' ], include_path_list: [] } ),
convertTreeToPushOptions: () => ( { optionsToSync: [ 'all' ] } ),
Expand Down
9 changes: 7 additions & 2 deletions apps/ui/src/components/site-dropdown/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,25 @@ import {
import { registerSelectiveSyncConnector } from '@/components/selective-sync/lib/get-ipc-api';
import { SyncDialog } from '@/components/selective-sync/sync-dialog';
import '@/components/selective-sync/selective-sync.css';
import { DisconnectSiteDialog } from '@/components/site-toolbar/disconnect-site-dialog';
import {
deriveSiteStatus,
ensureProtocol,
pickLatestSnapshot,
pickLiveSite,
} from '@/components/site-toolbar/utils';
import { useConnector } from '@/data/core';
import { useConnectedWpcomSites } from '@/data/queries/use-connected-wpcom-sites';
import { useIsSiteStarting, useIsSiteStopping, useSiteOperation } from '@/data/queries/use-sites';
import { useSnapshots } from '@/data/queries/use-snapshots';
import { usePullSiteFromLive, usePushSiteToLive } from '@/data/queries/use-sync-site';
import { useSiteSyncActivity } from '@/data/sync-activity';
import { getSiteDisplayUrl } from '@/lib/get-site-url';
import { DisconnectSiteDialog } from './disconnect-site-dialog';
import { DropdownTrigger } from './dropdown-trigger';
import { MainView } from './main-view';
import { PublishPickerView } from './publish-picker-view';
import styles from './style.module.css';
import { getSiteDropdownSecondary } from './trigger-secondary';
import { deriveSiteStatus, ensureProtocol, pickLatestSnapshot, pickLiveSite } from './utils';
import type { TreeNode } from '@/components/selective-sync/tree-view';
import type { SiteDetails } from '@/data/core';

Expand Down
18 changes: 9 additions & 9 deletions apps/ui/src/components/site-dropdown/main-view.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@ import { Button, IconButton, Tooltip } from '@wordpress/ui';
import { clsx } from 'clsx';
import { useMemo } from 'react';
import * as Menu from '@/components/menu';
import {
deriveSiteStatus,
getSiteStatusName,
ensureProtocol,
getSnapshotHostname,
pickLatestSnapshot,
pickLiveSite,
stripProtocol,
} from '@/components/site-toolbar/utils';
import { XdebugIcon } from '@/components/xdebug-icon';
import { useConnector } from '@/data/core';
import { useAgenticFeatures } from '@/data/queries/use-agentic-features';
Expand All @@ -34,15 +43,6 @@ import { getSiteUrl } from '@/lib/get-site-url';
import styles from './main-view.module.css';
import { PopoverRow } from './popover-row';
import { getSyncActivityLabel } from './trigger-secondary';
import {
deriveSiteStatus,
getSiteStatusName,
ensureProtocol,
getSnapshotHostname,
pickLatestSnapshot,
pickLiveSite,
stripProtocol,
} from './utils';
import type { SiteDetails } from '@/data/core';
import type { SyncActivity } from '@/data/sync-activity';
import type { ComponentProps } from 'react';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ import { __ } from '@wordpress/i18n';
import { chevronLeft, plus } from '@wordpress/icons';
import { Icon, IconButton } from '@wordpress/ui';
import { useEffect, useState } from 'react';
import { stripProtocol } from '@/components/site-toolbar/utils';
import { useConnector } from '@/data/core';
import { useAuthUser } from '@/data/queries/use-auth-user';
import { connectedWpcomSitesQueryKey } from '@/data/queries/use-connected-wpcom-sites';
import { usePickableWpcomSites } from '@/data/queries/use-wpcom-sites';
import { getWpcomLoadErrorDetail } from '@/lib/wpcom-load-error';
import styles from './publish-picker-view.module.css';
import { stripProtocol } from './utils';
import type { SiteDetails, SyncSite } from '@/data/core';

type Props = {
Expand Down
2 changes: 1 addition & 1 deletion apps/ui/src/components/site-list/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import { DeleteSiteDialog } from '@/components/delete-site-dialog';
import * as Menu from '@/components/menu';
import { ReorderableList } from '@/components/reorderable-list';
import { SidebarButton } from '@/components/sidebar-button';
import { deriveSiteStatus, getSiteStatusName } from '@/components/site-dropdown/utils';
import { deriveSiteStatus, getSiteStatusName } from '@/components/site-toolbar/utils';
import { XdebugIcon } from '@/components/xdebug-icon';
import { useConnector } from '@/data/core';
import { useSiteAgentActivity, type SiteAgentActivity } from '@/data/queries/use-agent-run';
Expand Down
Loading