Skip to content

Conversation

@epeicher
Copy link
Contributor

@epeicher epeicher commented May 20, 2025

Related issues

Proposed Changes

  • Return the passed URL parameter when it cannot be parsed instead of an empty string

Testing Instructions

  • Apply this branch and run npm start
  • Go to the Sync tab and connect a site, or use one of your connected sites
  • Run a Push or a Pull
  • Check that the notification contains the hostname of the connected site

Additional testing

  • You can force the URL to be invalid, for example applying this diff
diff --git i/src/hooks/sync-sites/use-sync-pull.ts w/src/hooks/sync-sites/use-sync-pull.ts
index ef0864e7..e4de1d71 100644
--- i/src/hooks/sync-sites/use-sync-pull.ts
+++ w/src/hooks/sync-sites/use-sync-pull.ts
@@ -226,7 +226,7 @@ export function useSyncPull( {
 					body: sprintf(
 						// translators: %s is the site url without the protocol.
 						__( 'Studio site has been updated from %s' ),
-						getHostnameFromUrl( remoteSiteUrl )
+						getHostnameFromUrl( remoteSiteUrl.replace( 'https://', '' ) )
 					),
 				} );
  • And running a Pull and checking that you can still see the URL in the notification

Pre-merge Checklist

  • Have you checked for TypeScript, React or other console errors?

@epeicher epeicher requested a review from a team May 20, 2025 14:31
Copy link
Contributor

@katinthehatsite katinthehatsite left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes look good to me, I tested both cases and did not spot any regressions. Nice work!

Copy link
Contributor

@ivan-ottinger ivan-ottinger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Likewise! The change looks good and works as expected. 👌🏼 Example with pull when the parsing fails (having the suggested diff from the PR description applied):

Markup on 2025-05-21 at 13:41:41

Copy link
Member

@sejas sejas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for accepting the suggestion. I was worried that the text in the notifications might appear incoherent with a missing domain.

@sejas
Copy link
Member

sejas commented May 22, 2025

@ivan-ottinger, @epeicher, what do you think about merging this PR so it can be included in the 1.5.2 release?

@epeicher
Copy link
Contributor Author

@ivan-ottinger, @epeicher, what do you think about merging this PR so it can be included in the 1.5.2 release?

This one is pretty safe to merge. I was waiting for the release to complete, but if @ivan-ottinger is OK with that, it can be included

@sejas
Copy link
Member

sejas commented May 23, 2025

Merging after getting approval from @ivan-ottinger : p1748005992305009/1747991964.446809-slack-C06DRMD6VPZ

@sejas sejas merged commit d6a7905 into trunk May 23, 2025
15 checks passed
@sejas sejas deleted the update/parse-url-utility branch May 23, 2025 13:23
@epeicher epeicher self-assigned this May 23, 2025
@ivan-ottinger
Copy link
Contributor

Merging after getting approval from @ivan-ottinger : p1748005992305009/1747991964.446809-slack-C06DRMD6VPZ

It took me some time to go through all the notifications. Thank you for the ping in Slack! Yes, all is looking good here. 🙂

bcotrim pushed a commit that referenced this pull request May 27, 2025
* Return the passed URL parameter when it cannot be parsed instead of an empty string
bcotrim added a commit that referenced this pull request May 27, 2025
commit d31733b
Author: katinthehatsite <[email protected]>
Date:   Tue May 27 09:12:55 2025 +0200

    Studio: Delete old proof-of-concept WP-CLI implementation (#1426)

    * Remove old scripts

    * Remove old cli.ts

    * Cleanup tests

    * Clean up terminal opening and feature flag

    * Cleanup assistant code

    * Clean shortcuts code

    * Cleanup feature flags

    * Cleanup feature flags

    * Cleanup shortcuts sessions

    * Removed unused feature flag for assistant

    * Assistant code block test fix

    * Adjust preload

    * Cleanup index file and tests

    * Refactor terminal usage

    * Add back the lock

    * Remove unintended change

    * Remove unnecesary type for warp

    * Use bundled Ids

    * Cleanup event parameter

    ---------

    Co-authored-by: Kateryna Kodonenko <[email protected]>

commit 4fac446
Author: Volodymyr Makukha <[email protected]>
Date:   Mon May 26 20:19:35 2025 +0100

    Update Ukrainian translations - May 26 (#1439)

commit c7536ef
Author: Antonio Sejas <[email protected]>
Date:   Mon May 26 18:34:28 2025 +0100

    Load LTR and RTL stylesheets conditionally (#1429)

    * Add a new component
    * Load @wordpress/components css conditionally based on RTL and LTR.
    * Load index.css a.k.a main_window.css after loading the WordPress stylesheet

commit c80b70e
Author: Bero <[email protected]>
Date:   Mon May 26 19:20:42 2025 +0200

    Update Playground packages to 1.0.38 and remove the Symlink manager (#1425)

    * Update Playground packages to 1.0.38
    * Remove SymlinkManager
    * Activate Playground's followSymlinks feature
    * Remove @php-wasm/universal patch

commit 5bfe676
Author: Wojtek Naruniec <[email protected]>
Date:   Mon May 26 15:40:18 2025 +0200

    Sanitize regex in Win editor path (#1411)

    * Sanitize regex

    * Import only escapeRegExp function

commit 2cd3e44
Author: Ivan Ottinger <[email protected]>
Date:   Mon May 26 13:18:02 2025 +0200

    Bump version from 1.5.2-beta4 to 1.5.2 (#1436)

commit f16865e
Author: Ivan Ottinger <[email protected]>
Date:   Mon May 26 12:38:24 2025 +0200

    Add release notes for 1.5.2 (#1434)

    * Add release notes for 1.5.2

    * Reorder release notes

    * Update release notes order and formatting

    * Added latest UI fix to the release notes

    * Consolidate Studio CLI fixes into a single bullet point

commit f6e48d5
Author: Ivan Ottinger <[email protected]>
Date:   Mon May 26 12:21:30 2025 +0200

    Add translations for 1.5.2 (#1433)

    * Add translations for 1.5.2

    * Add latest Polish and Spanish translations

    * Update spanish translations

    ---------

    Co-authored-by: Antonio Sejas <[email protected]>

commit ae1d163
Author: Antonio Sejas <[email protected]>
Date:   Mon May 26 10:58:22 2025 +0100

    Share same styles between preview and sync tabs (#1435)

commit d6a7905
Author: Roberto Aranda <[email protected]>
Date:   Fri May 23 15:23:14 2025 +0200

    Return original URL param when it cannot be parsed (#1420)

    * Return the passed URL parameter when it cannot be parsed instead of an empty string

commit 91d04be
Author: Antonio Sejas <[email protected]>
Date:   Fri May 23 14:22:34 2025 +0100

    Update localized docs links for Studio Sync  and Studio CLI (#1431)

    * Add translation link to new Spanish studio docs CLI
    * Add hash to Studio sync supported sites

commit 6213094
Author: katinthehatsite <[email protected]>
Date:   Fri May 23 14:27:53 2025 +0200

    Add patch to fix the accessibility with modals (#1423)

    Co-authored-by: Kateryna Kodonenko <[email protected]>

commit b2724c0
Author: Rahul Gavande <[email protected]>
Date:   Fri May 23 14:45:11 2025 +0530

    Use uri scheme to open Warp terminal app (#1428)

commit 43c831b
Author: Fredrik Rombach Ekelund <[email protected]>
Date:   Wed May 21 16:10:40 2025 +0200

    CLI: Set UTF8 encoding for output on Windows (#1424)

commit b1c0eeb
Author: Volodymyr Makukha <[email protected]>
Date:   Wed May 21 10:34:47 2025 +0100

    Fix hiding plugins spinner (#1419)

commit 48988ed
Author: Fredrik Rombach Ekelund <[email protected]>
Date:   Wed May 21 10:31:33 2025 +0200

    Add migration to rename launch uniques stat (#1415)

    * Add migration to rename launch uniques stat

    * Fix CLI zod schema

commit f363144
Author: Ivan Ottinger <[email protected]>
Date:   Tue May 20 18:24:00 2025 +0200

    Bump version to 1.5.2-beta4 (#1421)

commit 9768e67
Author: Ivan Ottinger <[email protected]>
Date:   Tue May 20 15:29:33 2025 +0200

    Pressable Sync: Fix remaining Sync modal issues (#1416)

    * Use absolute path for `WordPressLogoCircle` import

    * Use separate `isDisabled` to makde WP logo gray

    * Remove trailing space in site selector helper text

    * Decrease font size of sync sites modal learn more link

commit 9fab398
Author: Ian G. Maia <[email protected]>
Date:   Tue May 20 13:15:23 2025 +0200

    [Tooling] Update code to DRY the Windows build PS1 (#1408)

    * Update code to DRY the Windows build PS1

    * Update case of `Exit` command

    * Use `windows` instead of just `win` to prefix windows-related scripts

    * Add $LastExitCode check after `npm run make`

commit e5d4006
Author: Ivan Ottinger <[email protected]>
Date:   Tue May 20 12:01:21 2025 +0200

    Improve version comparison logic to handle prerelease transitions correctly (#1403)

commit f0a282b
Author: Rahul Gavande <[email protected]>
Date:   Tue May 20 15:15:25 2025 +0530

    HTTPS: Convert domain name Unicode characters to ASCII characters (#1400)

    * Convert domain name unicode chars to ASCII

    * Do not use punnycode domain name for paths

    * Remove unncessary punnycode domain name

commit 6cdc351
Author: Roberto Aranda <[email protected]>
Date:   Tue May 20 11:35:52 2025 +0200

    Sync: Update notification to include Hostname (#1412)

    * Push: Update notification to include Hostname

    * Pull: Update notification to include hostname

    * Add hints for translators

commit 69419a6
Author: Gergely Csécsey <[email protected]>
Date:   Tue May 20 10:30:57 2025 +0100

    Increase HTTP request timeout to 60 seconds (#1407)

    * Increase HTTP request timeout to 60 seconds

    * Increase curl timeout to 60 seconds

    * update comments

commit 6bcbbff
Author: Antonio Sejas <[email protected]>
Date:   Tue May 20 09:36:18 2025 +0100

    Update connect site text button when connecting another site (#1413)

    * Adapt the "Connect Site" button when connecting multiple sites on Sync.

commit 60a9cab
Author: Antonio Sejas <[email protected]>
Date:   Tue May 20 09:10:37 2025 +0100

    Avoid orphan in sync title (#1414)

commit 3b103cc
Author: Antonio Sejas <[email protected]>
Date:   Mon May 19 10:39:12 2025 +0100

    Release 1.5.2-beta3 (#1410)

commit a109671
Author: Ivan Ottinger <[email protected]>
Date:   Mon May 19 09:45:17 2025 +0200

    Sync: Update sync tab text and remove WordPress logo from title (#1405)

    * Update sync tab text and remove WordPress logo from title

    * Fix related test

    * Use comma

    * Update copy of the bullet points

    * Replace `WP.com` with `WordPress.com`.

    Co-authored-by: Antonio Sejas <[email protected]>

    * Replace WP.com with WordPress.com

    Co-authored-by: Antonio Sejas <[email protected]>

    * Delete unused WordPress short logo component

    ---------

    Co-authored-by: Antonio Sejas <[email protected]>

commit 716bc7a
Author: Ivan Ottinger <[email protected]>
Date:   Fri May 16 16:15:16 2025 +0200

    Sync: Update Sync modal content (#1406)

    * Update WordPress logo component `viewBox`

    * Update Sync modal heading

    * Update text below Sync search field

    * Update Sync modal site logos

    * Replace hardcoded arrows with `ArrowIcon` component in sync sites modal links

    * Localize sync modal Read more link using `getLocalizedLink` utility

commit 11b4302
Author: Roberto Aranda <[email protected]>
Date:   Fri May 16 15:14:40 2025 +0200

    Push: Read and update the progress from the sync endpoint (#1389)

    * Calls the GET /sync/import using the importId to obtain the progress
    * Use the progress from the /sync/import endpoint to update the progress in the importing state
    * Splits the progress of the importing state between backup and import

commit 7423bdf
Author: katinthehatsite <[email protected]>
Date:   Fri May 16 11:40:18 2025 +0200

    Studio: Fix no directory or file error on Windows (#1391)

    * Fix no directory or file error on Windows

    * Cleanup directories

    ---------

    Co-authored-by: Kateryna Kodonenko <[email protected]>

commit 1661ac4
Author: Antonio Sejas <[email protected]>
Date:   Fri May 16 10:04:32 2025 +0100

    Force display of what's new for minor version (#1404)

    * Force what's new display for minor version
    * Skip test that compares the patch version
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants