Remove unnecessary use of mailpoet_data
MAILPOET-6431
This commit is contained in:
committed by
Oluwaseun Olorunsola
parent
9ad79e75b5
commit
e5498b6baf
@ -5,6 +5,7 @@ import { useMemo } from '@wordpress/element';
|
||||
import { parse } from '@wordpress/blocks';
|
||||
import { BlockInstance } from '@wordpress/blocks/index';
|
||||
import { useSelect } from '@wordpress/data';
|
||||
import { applyFilters } from '@wordpress/hooks';
|
||||
|
||||
/**
|
||||
* Internal dependencies
|
||||
@ -163,6 +164,11 @@ export function usePreviewTemplates(
|
||||
|
||||
const allEmailPosts = useMemo( () => {
|
||||
return emailPosts?.map( ( post: EmailEditorPostType ) => {
|
||||
const preferredTitle = applyFilters(
|
||||
'mailpoet_email_editor_preferred_template_title',
|
||||
'',
|
||||
post
|
||||
);
|
||||
const { postTemplateContent } = generateTemplateContent(
|
||||
post,
|
||||
allTemplates
|
||||
@ -180,9 +186,8 @@ export function usePreviewTemplates(
|
||||
const template = {
|
||||
...post,
|
||||
title: {
|
||||
raw: post?.mailpoet_data?.subject || post.title.raw,
|
||||
rendered:
|
||||
post?.mailpoet_data?.subject || post.title.rendered, // use MailPoet subject as title
|
||||
raw: post.title.raw,
|
||||
rendered: preferredTitle || post.title.rendered,
|
||||
},
|
||||
};
|
||||
return {
|
||||
|
@ -96,13 +96,8 @@ export const isEmpty = createRegistrySelector( ( select ) => (): boolean => {
|
||||
return true;
|
||||
}
|
||||
|
||||
const { content, mailpoet_data: mailpoetData, title } = post;
|
||||
return (
|
||||
! content.raw &&
|
||||
! mailpoetData.subject &&
|
||||
! mailpoetData.preheader &&
|
||||
! title.raw
|
||||
);
|
||||
const { content, title } = post;
|
||||
return ! content.raw && ! title.raw;
|
||||
} );
|
||||
|
||||
export const hasEmptyContent = createRegistrySelector(
|
||||
|
@ -261,7 +261,6 @@ export type MailPoetEmailPostContentExtended = {
|
||||
|
||||
export type EmailEditorPostType = Omit< Post, 'type' > & {
|
||||
type: string;
|
||||
mailpoet_data?: MailPoetEmailPostContentExtended;
|
||||
};
|
||||
|
||||
export type EmailContentValidationAction = {
|
||||
|
Reference in New Issue
Block a user