Refactor to remove usage of post related effects in packages/editor.

packages/editor/src/store/actions.js

@@ -14,7 +14,7 @@ import {
 	apiFetch,
 } from './controls';
 import {
-	MODULE_KEY,
+	STORE_KEY,
 	POST_UPDATE_TRANSACTION_ID,
 	SAVE_POST_NOTICE_ID,
 	TRASH_POST_NOTICE_ID,
@@ -92,15 +92,16 @@ export function __experimentalRequestPostUpdateStart( options = {} ) {
 /**
  * Optimistic action for indicating that the request post update has completed
  * successfully.
- * @param {Object}	data								The data for the action.
- * @param {Object} 	data.previousPost 	The previous post prior to update.
- * @param {Object} 	data.post						The new post after update
- * @param {boolean} data.isRevision 		Whether the post is a revision or not.
- * @param {Object} 	data.options 				Options passed through from the original
- * 																			action dispatch.
- * @param {Object} 	data.postType 			The post type object.
  *
- * @return {Object} Action object.
+ * @param {Object}  data                The data for the action.
+ * @param {Object}  data.previousPost   The previous post prior to update.
+ * @param {Object}  data.post           The new post after update
+ * @param {boolean} data.isRevision     Whether the post is a revision or not.
+ * @param {Object}  data.options        Options passed through from the original
+ *                                      action dispatch.
+ * @param {Object}  data.postType       The post type object.
+ *
+ * @return {Object}	Action object.
  */
 export function __experimentalRequestPostUpdateSuccess( {
 	previousPost,
@@ -130,12 +131,12 @@ export function __experimentalRequestPostUpdateSuccess( {
  * Optimistic action for indicating that the request post update has completed
  * with a failure.
  *
- * @param	{Object}	data					The data for the action
- * @param {Object} 	data.post 		The post that failed updating.
- * @param {Object} 	data.edits 		The fields that were being updated.
- * @param {*}				data.error 		The error from the failed call.
- * @param {Object} 	data.options	Options passed through from the original
- * 																action dispatch.
+ * @param	{Object}  data          The data for the action
+ * @param {Object}  data.post     The post that failed updating.
+ * @param {Object}  data.edits    The fields that were being updated.
+ * @param {*}       data.error    The error from the failed call.
+ * @param {Object}  data.options  Options passed through from the original
+ *                                action dispatch.
  * @return {Object} An action object
  */
 export function __experimentalRequestPostUpdateFailure( {
@@ -221,14 +222,14 @@ export function __experimentalOptimisticUpdatePost( edits ) {
  */
 export function* savePost( options = {} ) {
 	const isEditedPostSaveable = yield select(
-		MODULE_KEY,
+		STORE_KEY,
 		'isEditedPostSaveable'
 	);
 	if ( ! isEditedPostSaveable ) {
 		return;
 	}
 	let edits = yield select(
-		MODULE_KEY,
+		STORE_KEY,
 		'getPostEdits'
 	);
 	const isAutosave = !! options.isAutosave;
@@ -238,7 +239,7 @@ export function* savePost( options = {} ) {
 	}
 
 	const isEditedPostNew = yield select(
-		MODULE_KEY,
+		STORE_KEY,
 		'isEditedPostNew',
 	);
 
@@ -258,12 +259,12 @@ export function* savePost( options = {} ) {
 	}
 
 	const post = yield select(
-		MODULE_KEY,
+		STORE_KEY,
 		'getCurrentPost'
 	);
 
 	const editedPostContent = yield select(
-		MODULE_KEY,
+		STORE_KEY,
 		'getEditedPostContent'
 	);
 
@@ -274,7 +275,7 @@ export function* savePost( options = {} ) {
 	};
 
 	const currentPostType = yield select(
-		MODULE_KEY,
+		STORE_KEY,
 		'getCurrentPostType'
 	);
 
@@ -285,7 +286,7 @@ export function* savePost( options = {} ) {
 	);
 
 	yield dispatch(
-		MODULE_KEY,
+		STORE_KEY,
 		'__experimentalRequestPostUpdateStart',
 		options,
 	);
@@ -294,7 +295,7 @@ export function* savePost( options = {} ) {
 	// will be updated. See below logic in success resolution for revert
 	// if the autosave is applied as a revision.
 	yield dispatch(
-		MODULE_KEY,
+		STORE_KEY,
 		'__experimentalOptimisticUpdatePost',
 		toSend
 	);
@@ -303,7 +304,7 @@ export function* savePost( options = {} ) {
 	let method = 'PUT';
 	if ( isAutosave ) {
 		const autoSavePost = yield select(
-			MODULE_KEY,
+			STORE_KEY,
 			'getAutosave',
 		);
 		// Ensure autosaves contain all expected fields, using autosave or
@@ -336,10 +337,10 @@ export function* savePost( options = {} ) {
 		} );
 		const resetAction = isAutosave ? 'resetAutosave' : 'resetPost';
 
-		yield dispatch( MODULE_KEY, resetAction, newPost );
+		yield dispatch( STORE_KEY, resetAction, newPost );
 
 		yield dispatch(
-			MODULE_KEY,
+			STORE_KEY,
 			'__experimentalRequestPostUpdateSuccess',
 			{
 				previousPost: post,
@@ -368,7 +369,7 @@ export function* savePost( options = {} ) {
 		}
 	} catch ( error ) {
 		yield dispatch(
-			MODULE_KEY,
+			STORE_KEY,
 			'__experimentalRequestPostUpdateFailure',
 			{ post, edits, error, options }
 		);
@@ -392,11 +393,11 @@ export function* savePost( options = {} ) {
  */
 export function* refreshPost() {
 	const post = yield select(
-		MODULE_KEY,
+		STORE_KEY,
 		'getCurrentPost'
 	);
 	const postTypeSlug = yield select(
-		MODULE_KEY,
+		STORE_KEY,
 		'getCurrentPostType'
 	);
 	const postType = yield resolveSelect(
@@ -413,7 +414,7 @@ export function* refreshPost() {
 		}
 	);
 	yield dispatch(
-		MODULE_KEY,
+		STORE_KEY,
 		'resetPost',
 		newPost
 	);
@@ -424,7 +425,7 @@ export function* refreshPost() {
  */
 export function* trashPost() {
 	const postTypeSlug = yield select(
-		MODULE_KEY,
+		STORE_KEY,
 		'getCurrentPostType'
 	);
 	const postType = yield resolveSelect(
@@ -439,7 +440,7 @@ export function* trashPost() {
 	);
 	try {
 		const post = yield select(
-			MODULE_KEY,
+			STORE_KEY,
 			'getCurrentPost'
 		);
 		yield apiFetch(
@@ -452,7 +453,7 @@ export function* trashPost() {
 		// TODO: This should be an updatePost action (updating subsets of post
 		// properties), but right now editPost is tied with change detection.
 		yield dispatch(
-			MODULE_KEY,
+			STORE_KEY,
 			'resetPost',
 			{ ...post, status: 'trash' }
 		);
@@ -471,7 +472,11 @@ export function* trashPost() {
  * @param {Object?} options Extra flags to identify the autosave.
  */
 export function* autosave( options ) {
-	yield* generatorActions.savePost( { isAutosave: true, ...options } );
+	yield dispatch(
+		STORE_KEY,
+		'savePost',
+		{ isAutosave: true, ...options }
+	);
 }
 
 /**
@@ -733,12 +738,3 @@ export const exitFormattedText = getBlockEditorAction( 'exitFormattedText' );
 export const insertDefaultBlock = getBlockEditorAction( 'insertDefaultBlock' );
 export const updateBlockListSettings = getBlockEditorAction( 'updateBlockListSettings' );
 export const updateEditorSettings = getBlockEditorAction( 'updateEditorSettings' );
-
-// default export of generator actions.
-const generatorActions = {
-	savePost,
-	autosave,
-	trashPost,
-	refreshPost,
-};
-export default generatorActions;

packages/editor/src/store/constants.js

@@ -12,7 +12,7 @@ export const EDIT_MERGE_PROPERTIES = new Set( [
  * Constant for the store module (or reducer) key.
  * @type {string}
  */
-export const MODULE_KEY = 'core/editor';
+export const STORE_KEY = 'core/editor';
 
 export const POST_UPDATE_TRANSACTION_ID = 'post-update';
 export const SAVE_POST_NOTICE_ID = 'SAVE_POST_NOTICE_ID';

packages/editor/src/store/controls.js

@@ -40,9 +40,9 @@ export function select( storeKey, selectorName, ...args ) {
  * Dispatches a control action for triggering a registry select that has a
  * resolver.
  *
- * @param {string} 	storeKey
- * @param {string} 	selectorName
- * @param {Array} 	args  Arguments for the select.
+ * @param {string}  storeKey
+ * @param {string}  selectorName
+ * @param {Array}   args  Arguments for the select.
  *
  * @return {Object} control descriptor.
  */

packages/editor/src/store/index.js

@@ -11,9 +11,9 @@ import applyMiddlewares from './middlewares';
 import * as selectors from './selectors';
 import * as actions from './actions';
 import controls from './controls';
-import { MODULE_KEY } from './constants';
+import { STORE_KEY } from './constants';
 
-const store = registerStore( MODULE_KEY, {
+const store = registerStore( STORE_KEY, {
 	reducer,
 	selectors,
 	actions,

packages/editor/src/store/selectors.js

@@ -118,7 +118,7 @@ export function isEditedPostDirty( state ) {
 		return true;
 	}
 
-	// Edits and change detectiona are reset at the start of a save, but a post
+	// Edits and change detection are reset at the start of a save, but a post
 	// is still considered dirty until the point at which the save completes.
 	// Because the save is performed optimistically, the prior states are held
 	// until committed. These can be referenced to determine whether there's a
@@ -258,7 +258,7 @@ export function getCurrentPostAttribute( state, attributeName ) {
 
 /**
  * Returns a single attribute of the post being edited, preferring the unsaved
- * edit if one exists, but mergiging with the attribute value for the last known
+ * edit if one exists, but merging with the attribute value for the last known
  * saved state of the post (this is needed for some nested attributes like meta).
  *
  * @param {Object} state         Global application state.