Make post type error more specific

keesiemeijer · Dec 5, 2019 · a748c94 · a748c94
1 parent a05fae7
commit a748c94
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/blocks/calendar/index.js b/blocks/calendar/index.js
@@ -18,6 +18,7 @@ registerBlockType('cptda/calendar', {
 	keywords: [ __( 'posts', 'custom-post-type-date-archives' ), __( 'archive', 'custom-post-type-date-archives' ) ],
 	supports: {
 		align: true,
+		html: false,
 	},
 	edit,
 	save() {

diff --git a/blocks/components/post-types.js b/blocks/components/post-types.js
@@ -95,15 +95,15 @@ export default function PostTypeSelect({
 	let help = '';
 	let invalidPostType = '';
 
-	if (dateArchives && !isDateArchivePostType(postType)) {
+	if (!isPublicPostType(postType)) {
 		error = 'cptda-select-error';
-		help = sprintf(__("The post type %s doesn't exist or doesn't have date archives.", 'custom-post-type-date-archives'), postType);
-		help += ' ' + __('Please select another post type', 'custom-post-type-date-archives');
+		help = sprintf(__("The post type %s doesn't exist.", 'custom-post-type-date-archives'), postType);
+		help += ' ' + __('Please select another post type.', 'custom-post-type-date-archives');
 		invalidPostType = postType;
-	} else if (!dateArchives && !isPublicPostType(postType)) {
+	} else if (dateArchives && !isDateArchivePostType(postType)) {
 		error = 'cptda-select-error';
-		help = sprintf(__("The post type %s doesn't exist.", 'custom-post-type-date-archives'), postType);
-		help += ' ' + __('Please select another post type', 'custom-post-type-date-archives');
+		help = sprintf(__("The post type %s doesn't have date archives.", 'custom-post-type-date-archives'), postType);
+		help += ' ' + __('Please select another post type or add date archives to this post type.', 'custom-post-type-date-archives');
 		invalidPostType = postType;
 	}
 

diff --git a/blocks/components/query-panel.js b/blocks/components/query-panel.js
@@ -53,5 +53,4 @@ const typeOptions = [
 	{ value: 'postbypost', label: __('Post By Post') },
 	{ value: 'weekly', label: __('Weekly') },
 	{ value: 'yearly', label: __('Yearly') },
-
-];
+];
diff --git a/blocks/components/server-side-render.js b/blocks/components/server-side-render.js
@@ -134,6 +134,7 @@ CPTDA_ServerSideRender.defaultProps = {
 		if ('Invalid post type' === response.errorMsg) {
 			let error = getPostTypeError(post_type, dateArchives);
 			if (error.length) {
+				error += ' ' + __('See the settings of this block for more information.', 'custom-post-type-date-archives');
 				errorMessage = (<span>{errorMessage}<br/><br/>{error}</span>);
 			}
 		}

diff --git a/blocks/latest-posts/edit.js b/blocks/latest-posts/edit.js
@@ -82,7 +82,7 @@ class LatestPostsEdit extends Component {
 						dateArchives={false}
 					/>
 					<RangeControl
-							label={ __( 'Number of posts', 'custom-post-type-date-archives' ) }
+							label={ __( 'Number of items', 'custom-post-type-date-archives' ) }
 							value={ number }
 							onChange={ ( value ) => setAttributes( { number: value } ) }
 							min={ 1 }

diff --git a/blocks/package.json b/blocks/package.json
@@ -1,6 +1,6 @@
 {
   "name": "custom-post-type-date-archives-blocks",
-  "version": "2.6.2-alpha",
+  "version": "2.7.0-beta1",
   "license": "GPL-2.0-or-later",
   "devDependencies": {
     "@wordpress/components": "^8.4.0",