From fc821933753d7f668027944ad7fd230d9c2e2d15 Mon Sep 17 00:00:00 2001
From: Andrei Draganescu <andrei.draganescu@automattic.com>
Date: Thu, 7 May 2020 17:29:58 +0300
Subject: [PATCH] adding stored URL back

removing the URL from the navigation item caused LinkControl to not load in edit mode when a link is present. it also messes the look of the navigation items.

It is rather weird that we store a potentially outdated link but we can address that separately.
---
 packages/block-library/src/navigation-link/edit.js             | 3 ---
 packages/block-library/src/navigation/edit.js                  | 3 ++-
 .../specs/experiments/__snapshots__/navigation.test.js.snap    | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/block-library/src/navigation-link/edit.js b/packages/block-library/src/navigation-link/edit.js
index 7116b8f8959287..b04039d7bf6385 100644
--- a/packages/block-library/src/navigation-link/edit.js
+++ b/packages/block-library/src/navigation-link/edit.js
@@ -249,9 +249,6 @@ function NavigationLinkEdit( {
 								} = {} ) =>
 									setAttributes( {
 										url: ( () => {
-											if ( id ) {
-												return undefined;
-											}
 											return encodeURI( newURL );
 										} )(),
 										label: ( () => {
diff --git a/packages/block-library/src/navigation/edit.js b/packages/block-library/src/navigation/edit.js
index fd13720bb7c60e..6511897c0b3a19 100644
--- a/packages/block-library/src/navigation/edit.js
+++ b/packages/block-library/src/navigation/edit.js
@@ -91,9 +91,10 @@ function Navigation( {
 			return null;
 		}
 
-		return pages.map( ( { title, id } ) =>
+		return pages.map( ( { title, link: url, id } ) =>
 			createBlock( 'core/navigation-link', {
 				id,
+				url,
 				label: ! title.rendered
 					? __( '(no title)' )
 					: escape( title.rendered ),
diff --git a/packages/e2e-tests/specs/experiments/__snapshots__/navigation.test.js.snap b/packages/e2e-tests/specs/experiments/__snapshots__/navigation.test.js.snap
index 5248e19375f626..af169ee9da857b 100644
--- a/packages/e2e-tests/specs/experiments/__snapshots__/navigation.test.js.snap
+++ b/packages/e2e-tests/specs/experiments/__snapshots__/navigation.test.js.snap
@@ -20,6 +20,6 @@ exports[`Navigation allows a navigation menu to be created using existing pages
 
 exports[`Navigation allows pages to be created from the navigation block and their links added to menu 1`] = `
 "<!-- wp:navigation {\\"orientation\\":\\"horizontal\\"} -->
-<!-- wp:navigation-link {\\"label\\":\\"A really long page name that will not exist\\",\\"id\\":1} /-->
+<!-- wp:navigation-link {\\"label\\":\\"A really long page name that will not exist\\",\\"id\\":1,\\"url\\":\\"https://this/is/a/test/create/page/my-new-page\\"} /-->
 <!-- /wp:navigation -->"
 `;