Keep custom path open if user selected one (#787)

* Keep custom path open if user selected one * Update tests to account for latest changes * Fix linter error --------- Co-authored-by: Bero <[email protected]>
Automattic · Jan 9, 2025 · a0aacb7 · a0aacb7
1 parent f8c5420
commit a0aacb7
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/src/components/tests/add-site.test.tsx b/src/components/tests/add-site.test.tsx
@@ -71,7 +71,7 @@ describe( 'AddSite', () => {
 		await user.click( screen.getByRole( 'button', { name: 'Advanced settings' } ) );
 		await user.click( screen.getByTestId( 'select-path-button' ) );
 
-		expect( mockShowOpenFolderDialog ).toHaveBeenCalledWith( 'Choose folder for site' );
+		expect( mockShowOpenFolderDialog ).toHaveBeenCalledWith( 'Choose folder for site', '' );
 		await user.click( screen.getByRole( 'button', { name: 'Add site' } ) );
 
 		await waitFor( () => {
@@ -104,7 +104,7 @@ describe( 'AddSite', () => {
 		await user.click( screen.getByRole( 'button', { name: 'Advanced settings' } ) );
 		await user.click( screen.getByTestId( 'select-path-button' ) );
 
-		expect( mockShowOpenFolderDialog ).toHaveBeenCalledWith( 'Choose folder for site' );
+		expect( mockShowOpenFolderDialog ).toHaveBeenCalledWith( 'Choose folder for site', '' );
 
 		await waitFor( () => {
 			expect( screen.getByRole( 'button', { name: 'Add site' } ) ).toBeDisabled();
@@ -136,7 +136,7 @@ describe( 'AddSite', () => {
 		await user.click( screen.getByRole( 'button', { name: 'Advanced settings' } ) );
 		await user.click( screen.getByTestId( 'select-path-button' ) );
 
-		expect( mockShowOpenFolderDialog ).toHaveBeenCalledWith( 'Choose folder for site' );
+		expect( mockShowOpenFolderDialog ).toHaveBeenCalledWith( 'Choose folder for site', '' );
 
 		await waitFor( () => {
 			expect( screen.getByRole( 'button', { name: 'Add site' } ) ).not.toBeDisabled();

diff --git a/src/hooks/use-add-site.ts b/src/hooks/use-add-site.ts
@@ -26,13 +26,17 @@ export function useAddSite() {
 	);
 
 	const handlePathSelectorClick = useCallback( async () => {
-		const response = await getIpcApi().showOpenFolderDialog( __( 'Choose folder for site' ) );
+		const response = await getIpcApi().showOpenFolderDialog(
+			__( 'Choose folder for site' ),
+			sitePath
+		);
 		if ( response?.path ) {
 			const { path, name, isEmpty, isWordPress } = response;
 			setDoesPathContainWordPress( false );
 			setError( '' );
 			const pathResetToDefaultSitePath =
 				path === proposedSitePath.substring( 0, proposedSitePath.lastIndexOf( '/' ) );
+
 			setSitePath( pathResetToDefaultSitePath ? '' : path );
 			if ( siteWithPathAlreadyExists( path ) ) {
 				return;
@@ -50,7 +54,7 @@ export function useAddSite() {
 				setSiteName( name ?? null );
 			}
 		}
-	}, [ __, siteWithPathAlreadyExists, siteName, proposedSitePath ] );
+	}, [ __, siteWithPathAlreadyExists, siteName, proposedSitePath, sitePath ] );
 
 	const handleAddSiteClick = useCallback( async () => {
 		try {

diff --git a/src/ipc-handlers.ts b/src/ipc-handlers.ts
@@ -460,7 +460,8 @@ export async function showSaveAsDialog( event: IpcMainInvokeEvent, options: Save
 
 export async function showOpenFolderDialog(
 	event: IpcMainInvokeEvent,
-	title: string
+	title: string,
+	defaultDialogPath: string
 ): Promise< FolderDialogResponse | null > {
 	const parentWindow = BrowserWindow.fromWebContents( event.sender );
 	if ( ! parentWindow ) {
@@ -482,7 +483,7 @@ export async function showOpenFolderDialog(
 
 	const { canceled, filePaths } = await dialog.showOpenDialog( parentWindow, {
 		title,
-		defaultPath: DEFAULT_SITE_PATH,
+		defaultPath: defaultDialogPath !== '' ? defaultDialogPath : DEFAULT_SITE_PATH,
 		properties: [
 			'openDirectory',
 			'createDirectory', // allow user to create new directories; macOS only

diff --git a/src/preload.ts b/src/preload.ts
@@ -40,7 +40,8 @@ const api: IpcApi = {
 		{ autoLogin = true }: { autoLogin?: boolean } = {}
 	) => ipcRenderer.invoke( 'openSiteURL', id, relativeURL, { autoLogin } ),
 	openURL: ( url: string ) => ipcRenderer.invoke( 'openURL', url ),
-	showOpenFolderDialog: ( title: string ) => ipcRenderer.invoke( 'showOpenFolderDialog', title ),
+	showOpenFolderDialog: ( title: string, defaultDialogPath: string ) =>
+		ipcRenderer.invoke( 'showOpenFolderDialog', title, defaultDialogPath ),
 	showSaveAsDialog: ( options: SaveDialogOptions ) =>
 		ipcRenderer.invoke( 'showSaveAsDialog', options ),
 	saveUserLocale: ( locale: string ) => ipcRenderer.invoke( 'saveUserLocale', locale ),