Skip to content

Commit d1fa0db

Browse files
committed
Clicking WP admin or Open site now start site.
1 parent 6f35694 commit d1fa0db

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

src/components/site-menu.tsx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,15 @@ function SiteItem( { site }: { site: SiteDetails } ) {
173173
void stopServer( site.id );
174174
break;
175175
case 'open-site':
176-
ipcApi.openSiteURL( site.id );
176+
if ( ! site.running ) {
177+
await startServer( site.id );
178+
}
179+
ipcApi.openSiteURL( site.id, '', { autoLogin: false } );
177180
break;
178181
case 'open-admin':
182+
if ( ! site.running ) {
183+
await startServer( site.id );
184+
}
179185
ipcApi.openSiteURL( site.id, '/wp-admin/' );
180186
break;
181187
case 'open-finder':
@@ -250,7 +256,7 @@ function SiteItem( { site }: { site: SiteDetails } ) {
250256
return () => {
251257
unsubscribe?.();
252258
};
253-
}, [ site.id, site.name, site.path, startServer, stopServer, deleteSite, editor ] );
259+
}, [ site.id, site.name, site.path, site.running, startServer, stopServer, deleteSite, editor ] );
254260

255261
return (
256262
<li

src/ipc-handlers.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1385,7 +1385,7 @@ export function showSiteContextMenu(
13851385
menu.append(
13861386
new MenuItem( {
13871387
label: __( 'Open site' ),
1388-
enabled: isRunning && ! isAddingSite,
1388+
enabled: ! isLoading && ! isAddingSite,
13891389
click: () => {
13901390
sendIpcEventToRendererWithWindow(
13911391
BrowserWindow.fromWebContents( event.sender ),
@@ -1402,7 +1402,7 @@ export function showSiteContextMenu(
14021402
menu.append(
14031403
new MenuItem( {
14041404
label: __( 'WP admin' ),
1405-
enabled: isRunning && ! isAddingSite,
1405+
enabled: ! isLoading && ! isAddingSite,
14061406
click: () => {
14071407
sendIpcEventToRendererWithWindow(
14081408
BrowserWindow.fromWebContents( event.sender ),

0 commit comments

Comments
 (0)