From 3ac5db6c6a554af8b4f231a9c984bf230a775ed6 Mon Sep 17 00:00:00 2001
From: "Matthew Riley MacPherson (tofumatt)" <hi@tofumatt.com>
Date: Fri, 22 Jun 2018 19:30:52 +0100
Subject: [PATCH 1/2] fix: Show permalink editor in editor (fix #7467)

---
 editor/components/post-permalink/index.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/editor/components/post-permalink/index.js b/editor/components/post-permalink/index.js
index b1ba0dec54c96f..40f33632f9c894 100644
--- a/editor/components/post-permalink/index.js
+++ b/editor/components/post-permalink/index.js
@@ -60,7 +60,7 @@ class PostPermalink extends Component {
 		const { isCopied, isEditingPermalink } = this.state;
 		const ariaLabel = isCopied ? __( 'Permalink copied' ) : __( 'Copy the permalink' );
 
-		if ( isNew || ! previewLink ) {
+		if ( isNew ) {
 			return null;
 		}
 
@@ -123,7 +123,13 @@ class PostPermalink extends Component {
 
 export default compose( [
 	withSelect( ( select ) => {
-		const { isEditedPostNew, isPermalinkEditable, getEditedPostPreviewLink, getPermalink, isCurrentPostPublished } = select( 'core/editor' );
+		const {
+			isEditedPostNew,
+			isPermalinkEditable,
+			getEditedPostPreviewLink,
+			getPermalink,
+			isCurrentPostPublished,
+		} = select( 'core/editor' );
 		return {
 			isNew: isEditedPostNew(),
 			previewLink: getEditedPostPreviewLink(),

From 7f3afdcce81d6a053122b47f499b9d09049c63bf Mon Sep 17 00:00:00 2001
From: "Matthew Riley MacPherson (tofumatt)" <hi@tofumatt.com>
Date: Mon, 25 Jun 2018 22:14:28 +0100
Subject: [PATCH 2/2] Use getCurrentPost() to get the link

---
 editor/components/post-permalink/index.js | 13 ++++++++-----
 editor/store/selectors.js                 | 11 -----------
 editor/store/test/selectors.js            | 21 ---------------------
 3 files changed, 8 insertions(+), 37 deletions(-)

diff --git a/editor/components/post-permalink/index.js b/editor/components/post-permalink/index.js
index 40f33632f9c894..e81302a486cdc1 100644
--- a/editor/components/post-permalink/index.js
+++ b/editor/components/post-permalink/index.js
@@ -56,11 +56,11 @@ class PostPermalink extends Component {
 	}
 
 	render() {
-		const { isNew, previewLink, isEditable, samplePermalink, isPublished } = this.props;
+		const { isNew, postLink, isEditable, samplePermalink, isPublished } = this.props;
 		const { isCopied, isEditingPermalink } = this.state;
 		const ariaLabel = isCopied ? __( 'Permalink copied' ) : __( 'Copy the permalink' );
 
-		if ( isNew ) {
+		if ( isNew || ! postLink ) {
 			return null;
 		}
 
@@ -80,7 +80,7 @@ class PostPermalink extends Component {
 				{ ! isEditingPermalink &&
 					<Button
 						className="editor-post-permalink__link"
-						href={ ! isPublished ? previewLink : samplePermalink }
+						href={ ! isPublished ? postLink : samplePermalink }
 						target="_blank"
 						ref={ ( permalinkButton ) => this.permalinkButton = permalinkButton }
 					>
@@ -126,13 +126,16 @@ export default compose( [
 		const {
 			isEditedPostNew,
 			isPermalinkEditable,
-			getEditedPostPreviewLink,
+			getCurrentPost,
 			getPermalink,
 			isCurrentPostPublished,
 		} = select( 'core/editor' );
+
+		const { link } = getCurrentPost();
+
 		return {
 			isNew: isEditedPostNew(),
-			previewLink: getEditedPostPreviewLink(),
+			postLink: link,
 			isEditable: isPermalinkEditable(),
 			samplePermalink: getPermalink(),
 			isPublished: isCurrentPostPublished(),
diff --git a/editor/store/selectors.js b/editor/store/selectors.js
index ea5d7d8180b4cd..44b9ab41bc9ec3 100644
--- a/editor/store/selectors.js
+++ b/editor/store/selectors.js
@@ -444,17 +444,6 @@ export function getDocumentTitle( state ) {
 	return title;
 }
 
-/**
- * Returns a URL to preview the post being edited.
- *
- * @param {Object} state Global application state.
- *
- * @return {string} Preview URL.
- */
-export function getEditedPostPreviewLink( state ) {
-	return getCurrentPost( state ).preview_link || null;
-}
-
 /**
  * Returns a new reference when the inner blocks of a given block UID change.
  * This is used exclusively as a memoized selector dependant, relying on this
diff --git a/editor/store/test/selectors.js b/editor/store/test/selectors.js
index 42e2b917e39d3c..c1c665fa8d85d6 100644
--- a/editor/store/test/selectors.js
+++ b/editor/store/test/selectors.js
@@ -39,7 +39,6 @@ const {
 	hasAutosave,
 	isEditedPostEmpty,
 	isEditedPostBeingScheduled,
-	getEditedPostPreviewLink,
 	getBlockDependantsCacheBust,
 	getBlockName,
 	getBlock,
@@ -1314,26 +1313,6 @@ describe( 'selectors', () => {
 		} );
 	} );
 
-	describe( 'getEditedPostPreviewLink', () => {
-		it( 'should return null if the post has not link yet', () => {
-			const state = {
-				currentPost: {},
-			};
-
-			expect( getEditedPostPreviewLink( state ) ).toBeNull();
-		} );
-
-		it( 'should return the correct url when the post object has a preview_link', () => {
-			const state = {
-				currentPost: {
-					preview_link: 'https://andalouses.com/?p=1&preview=true',
-				},
-			};
-
-			expect( getEditedPostPreviewLink( state ) ).toBe( 'https://andalouses.com/?p=1&preview=true' );
-		} );
-	} );
-
 	describe( 'getBlockDependantsCacheBust', () => {
 		const rootBlock = { uid: 123, name: 'core/paragraph', attributes: {} };
 		const rootOrder = [ 123 ];