diff --git a/themes/fueled-movies-complete/blocks/movie-metadata-director/block.json b/themes/fueled-movies-complete/blocks/movie-metadata-director/block.json deleted file mode 100644 index 4b081e0..0000000 --- a/themes/fueled-movies-complete/blocks/movie-metadata-director/block.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "$schema": "https://schemas.wp.org/trunk/block.json", - "apiVersion": 3, - "name": "tenup/movie-metadata-director", - "title": "Movie Metadata: Director", - "category": "text", - "icon": "video-alt", - "description": "A read only block to display the director(s) of a Movie.", - "parent": ["tenup/metadata"], - "attributes": {}, - "supports": { - "html": false - }, - "textdomain": "tenup", - "editorScript": "file:./index.js", - "render": "file:./markup.php" -} diff --git a/themes/fueled-movies-complete/blocks/movie-metadata-director/edit.js b/themes/fueled-movies-complete/blocks/movie-metadata-director/edit.js deleted file mode 100644 index ef4ea27..0000000 --- a/themes/fueled-movies-complete/blocks/movie-metadata-director/edit.js +++ /dev/null @@ -1,40 +0,0 @@ -/* eslint-disable jsx-a11y/anchor-is-valid */ - -/** - * @todo Match to FE once we can make dynamic. - */ -import { useEntityProp } from '@wordpress/core-data'; -import { __ } from '@wordpress/i18n'; -import { usePost } from '@10up/block-components'; - -export const BlockEdit = () => { - const { postType } = usePost(); - const [meta] = useEntityProp('postType', 'tenup-movie', 'meta'); - - const { tenup_movie_plot = '' } = meta || {}; - - // Fallback for template preview. - if (postType === 'wp_template') { - return ( - <> -
{__('Director', 'tenup')}
-
- {__('Steven Spielberg', 'tenup')} -
- - ); - } - - if (tenup_movie_plot !== '') { - return ( - <> -
{__('Director', 'tenup')}
-
{tenup_movie_plot}
- - ); - } - - return ( -
{__('Movie director not found.', 'tenup')}
- ); -}; diff --git a/themes/fueled-movies-complete/blocks/movie-metadata-director/index.js b/themes/fueled-movies-complete/blocks/movie-metadata-director/index.js deleted file mode 100644 index 542d386..0000000 --- a/themes/fueled-movies-complete/blocks/movie-metadata-director/index.js +++ /dev/null @@ -1,9 +0,0 @@ -import { registerBlockType } from '@wordpress/blocks'; - -import { BlockEdit } from './edit'; -import metadata from './block.json'; - -registerBlockType(metadata, { - edit: BlockEdit, - save: () => null, -}); diff --git a/themes/fueled-movies-complete/blocks/movie-metadata-director/markup.php b/themes/fueled-movies-complete/blocks/movie-metadata-director/markup.php deleted file mode 100644 index 6727434..0000000 --- a/themes/fueled-movies-complete/blocks/movie-metadata-director/markup.php +++ /dev/null @@ -1,41 +0,0 @@ - 'Steven Spielberg', - 'link' => '#', - ], -]; - -if ( ! is_array( $directors ) || empty( $directors ) ) { - return; -} - -$label = _n( 'Director', 'Directors', $directors, 'tenup' ); -$directors = array_map( - function ( $director ) { - return sprintf( - '%2$s', - esc_url( $director['link'] ), - esc_html( $director['name'] ) - ); - }, - $directors -); -$directors = implode( ', ', $directors ); - -?> - -
-
diff --git a/themes/fueled-movies-complete/blocks/movie-metadata-genre/block.json b/themes/fueled-movies-complete/blocks/movie-metadata-genre/block.json index 48f4999..bc0b85f 100644 --- a/themes/fueled-movies-complete/blocks/movie-metadata-genre/block.json +++ b/themes/fueled-movies-complete/blocks/movie-metadata-genre/block.json @@ -7,6 +7,7 @@ "icon": "video-alt", "description": "A read only block to display the Genre(s) for a Movie.", "parent": ["tenup/metadata"], + "usesContext": ["postId", "postType"], "attributes": {}, "supports": { "html": false diff --git a/themes/fueled-movies-complete/blocks/movie-metadata-genre/markup.php b/themes/fueled-movies-complete/blocks/movie-metadata-genre/markup.php index cfbedce..6b1e55d 100644 --- a/themes/fueled-movies-complete/blocks/movie-metadata-genre/markup.php +++ b/themes/fueled-movies-complete/blocks/movie-metadata-genre/markup.php @@ -11,7 +11,14 @@ use TenUpPlugin\Taxonomies\Genre; -$terms = get_the_terms( get_the_ID(), Genre::TAXONOMY_NAME ); +$context = $block->context; +$post_id = $context['postId'] ?? null; + +if ( ! $post_id ) { + return; +} + +$terms = get_the_terms( $post_id, Genre::TAXONOMY_NAME ); if ( false === $terms || is_wp_error( $terms ) ) { return; diff --git a/themes/fueled-movies-complete/blocks/movie-metadata-plot/block.json b/themes/fueled-movies-complete/blocks/movie-metadata-plot/block.json index 1f1956e..e2564d2 100644 --- a/themes/fueled-movies-complete/blocks/movie-metadata-plot/block.json +++ b/themes/fueled-movies-complete/blocks/movie-metadata-plot/block.json @@ -7,6 +7,7 @@ "icon": "video-alt", "description": "A read only block to display the plot post meta for a Movie.", "parent": ["tenup/metadata"], + "usesContext": ["postId", "postType"], "attributes": {}, "supports": { "html": false diff --git a/themes/fueled-movies-complete/blocks/movie-metadata-plot/markup.php b/themes/fueled-movies-complete/blocks/movie-metadata-plot/markup.php index d21fe94..e639598 100644 --- a/themes/fueled-movies-complete/blocks/movie-metadata-plot/markup.php +++ b/themes/fueled-movies-complete/blocks/movie-metadata-plot/markup.php @@ -9,7 +9,14 @@ * @var WP_Block $block Block instance. */ -$plot = get_post_meta( get_the_ID(), 'tenup_movie_plot', true ) ?? ''; +$context = $block->context; +$post_id = $context['postId'] ?? null; + +if ( ! $post_id ) { + return; +} + +$plot = get_post_meta( $post_id, 'tenup_movie_plot', true ) ?? ''; if ( '' === $plot ) { return; diff --git a/themes/fueled-movies-complete/blocks/movie-metadata-stars/block.json b/themes/fueled-movies-complete/blocks/movie-metadata-stars/block.json index 9b00759..44c2701 100644 --- a/themes/fueled-movies-complete/blocks/movie-metadata-stars/block.json +++ b/themes/fueled-movies-complete/blocks/movie-metadata-stars/block.json @@ -7,6 +7,7 @@ "icon": "video-alt", "description": "A read only block to display the stars for a Movie.", "parent": ["tenup/metadata"], + "usesContext": ["postId", "postType"], "attributes": {}, "supports": { "html": false diff --git a/themes/fueled-movies-complete/blocks/movie-metadata-stars/markup.php b/themes/fueled-movies-complete/blocks/movie-metadata-stars/markup.php index b7c5c23..6b009e1 100644 --- a/themes/fueled-movies-complete/blocks/movie-metadata-stars/markup.php +++ b/themes/fueled-movies-complete/blocks/movie-metadata-stars/markup.php @@ -9,8 +9,8 @@ * @var WP_Block $block Block instance. */ -// Get the current post ID (movie post). -$post_id = get_the_ID(); +$context = $block->context; +$post_id = $context['postId'] ?? null; if ( ! $post_id ) { return; diff --git a/themes/fueled-movies-complete/blocks/movie-mpa-rating/block.json b/themes/fueled-movies-complete/blocks/movie-mpa-rating/block.json index e304c2e..5d2e6a5 100644 --- a/themes/fueled-movies-complete/blocks/movie-mpa-rating/block.json +++ b/themes/fueled-movies-complete/blocks/movie-mpa-rating/block.json @@ -6,6 +6,7 @@ "category": "text", "icon": "thumbs-up", "description": "A read only block to display the MPA rating post meta for a Movie.", + "usesContext": ["postId", "postType"], "attributes": {}, "supports": { "html": false diff --git a/themes/fueled-movies-complete/blocks/movie-mpa-rating/markup.php b/themes/fueled-movies-complete/blocks/movie-mpa-rating/markup.php index f1c71f4..1039ef4 100644 --- a/themes/fueled-movies-complete/blocks/movie-mpa-rating/markup.php +++ b/themes/fueled-movies-complete/blocks/movie-mpa-rating/markup.php @@ -9,7 +9,14 @@ * @var WP_Block $block Block instance. */ -$rating = get_post_meta( get_the_ID(), 'tenup_movie_mpa_rating', true ) ?? ''; +$context = $block->context; +$post_id = $context['postId'] ?? null; + +if ( ! $post_id ) { + return; +} + +$rating = get_post_meta( $post_id, 'tenup_movie_mpa_rating', true ) ?? ''; if ( '' === $rating ) { return; diff --git a/themes/fueled-movies-complete/blocks/movie-release-year/block.json b/themes/fueled-movies-complete/blocks/movie-release-year/block.json index 4a74993..492d756 100644 --- a/themes/fueled-movies-complete/blocks/movie-release-year/block.json +++ b/themes/fueled-movies-complete/blocks/movie-release-year/block.json @@ -6,6 +6,7 @@ "category": "text", "icon": "calendar", "description": "A read only block to display the release year post meta for a Movie.", + "usesContext": ["postId", "postType"], "attributes": {}, "supports": { "html": false diff --git a/themes/fueled-movies-complete/blocks/movie-release-year/markup.php b/themes/fueled-movies-complete/blocks/movie-release-year/markup.php index 44fe0a2..023021d 100644 --- a/themes/fueled-movies-complete/blocks/movie-release-year/markup.php +++ b/themes/fueled-movies-complete/blocks/movie-release-year/markup.php @@ -9,7 +9,14 @@ * @var WP_Block $block Block instance. */ -$year = get_post_meta( get_the_ID(), 'tenup_movie_release_year', true ) ?? ''; +$context = $block->context; +$post_id = $context['postId'] ?? null; + +if ( ! $post_id ) { + return; +} + +$year = get_post_meta( $post_id, 'tenup_movie_release_year', true ) ?? ''; if ( '' === $year ) { return; diff --git a/themes/fueled-movies-complete/blocks/movie-runtime/block.json b/themes/fueled-movies-complete/blocks/movie-runtime/block.json index 12babf4..e458f82 100644 --- a/themes/fueled-movies-complete/blocks/movie-runtime/block.json +++ b/themes/fueled-movies-complete/blocks/movie-runtime/block.json @@ -6,6 +6,7 @@ "category": "text", "icon": "backup", "description": "A read only block to display the runtime post meta for a Movie.", + "usesContext": ["postId", "postType"], "attributes": {}, "supports": { "html": false diff --git a/themes/fueled-movies-complete/blocks/movie-runtime/markup.php b/themes/fueled-movies-complete/blocks/movie-runtime/markup.php index bba9479..de83bc5 100644 --- a/themes/fueled-movies-complete/blocks/movie-runtime/markup.php +++ b/themes/fueled-movies-complete/blocks/movie-runtime/markup.php @@ -9,7 +9,14 @@ * @var WP_Block $block Block instance. */ -$runtime = get_post_meta( get_the_ID(), 'tenup_movie_runtime', true ) ?? ''; +$context = $block->context; +$post_id = $context['postId'] ?? null; + +if ( ! $post_id ) { + return; +} + +$runtime = get_post_meta( $post_id, 'tenup_movie_runtime', true ) ?? ''; if ( '' === $runtime ) { return; diff --git a/themes/fueled-movies-complete/blocks/person-metadata-biography/block.json b/themes/fueled-movies-complete/blocks/person-metadata-biography/block.json index a543d35..8e1fa56 100644 --- a/themes/fueled-movies-complete/blocks/person-metadata-biography/block.json +++ b/themes/fueled-movies-complete/blocks/person-metadata-biography/block.json @@ -6,6 +6,7 @@ "category": "text", "icon": "admin-users", "description": "A read only block to display the biography post meta for a Person.", + "usesContext": ["postId", "postType"], "parent": ["tenup/metadata"], "attributes": {}, "supports": { diff --git a/themes/fueled-movies-complete/blocks/person-metadata-biography/markup.php b/themes/fueled-movies-complete/blocks/person-metadata-biography/markup.php index 423e11b..0f84dc0 100644 --- a/themes/fueled-movies-complete/blocks/person-metadata-biography/markup.php +++ b/themes/fueled-movies-complete/blocks/person-metadata-biography/markup.php @@ -9,7 +9,14 @@ * @var WP_Block $block Block instance. */ -$biography = get_post_meta( get_the_ID(), 'tenup_person_biography', true ) ?? ''; +$context = $block->context; +$post_id = $context['postId'] ?? null; + +if ( ! $post_id ) { + return; +} + +$biography = get_post_meta( $post_id, 'tenup_person_biography', true ) ?? ''; if ( '' === $biography ) { return; diff --git a/themes/fueled-movies-complete/blocks/person-metadata-birthplace/block.json b/themes/fueled-movies-complete/blocks/person-metadata-birthplace/block.json index 187a42a..7537dbe 100644 --- a/themes/fueled-movies-complete/blocks/person-metadata-birthplace/block.json +++ b/themes/fueled-movies-complete/blocks/person-metadata-birthplace/block.json @@ -6,6 +6,7 @@ "category": "text", "icon": "admin-users", "description": "A read only block to display the birthplace post meta for a Person.", + "usesContext": ["postId", "postType"], "parent": ["tenup/metadata"], "attributes": {}, "supports": { diff --git a/themes/fueled-movies-complete/blocks/person-metadata-birthplace/markup.php b/themes/fueled-movies-complete/blocks/person-metadata-birthplace/markup.php index 55e18f7..4fefc35 100644 --- a/themes/fueled-movies-complete/blocks/person-metadata-birthplace/markup.php +++ b/themes/fueled-movies-complete/blocks/person-metadata-birthplace/markup.php @@ -9,7 +9,14 @@ * @var WP_Block $block Block instance. */ -$birthplace = get_post_meta( get_the_ID(), 'tenup_person_birthplace', true ) ?? ''; +$context = $block->context; +$post_id = $context['postId'] ?? null; + +if ( ! $post_id ) { + return; +} + +$birthplace = get_post_meta( $post_id, 'tenup_person_birthplace', true ) ?? ''; if ( '' === $birthplace ) { return; diff --git a/themes/fueled-movies-complete/blocks/person-metadata-born/block.json b/themes/fueled-movies-complete/blocks/person-metadata-born/block.json index 3f00b58..e91edd7 100644 --- a/themes/fueled-movies-complete/blocks/person-metadata-born/block.json +++ b/themes/fueled-movies-complete/blocks/person-metadata-born/block.json @@ -7,6 +7,7 @@ "icon": "admin-users", "description": "A read only block to display the born post meta for a Person.", "parent": ["tenup/metadata"], + "usesContext": ["postId", "postType"], "attributes": {}, "supports": { "html": false diff --git a/themes/fueled-movies-complete/blocks/person-metadata-born/markup.php b/themes/fueled-movies-complete/blocks/person-metadata-born/markup.php index ed25fc3..bd94e53 100644 --- a/themes/fueled-movies-complete/blocks/person-metadata-born/markup.php +++ b/themes/fueled-movies-complete/blocks/person-metadata-born/markup.php @@ -9,7 +9,14 @@ * @var WP_Block $block Block instance. */ -$born = get_post_meta( get_the_ID(), 'tenup_person_born', true ) ?? ''; +$context = $block->context; +$post_id = $context['postId'] ?? null; + +if ( ! $post_id ) { + return; +} + +$born = get_post_meta( $post_id, 'tenup_person_born', true ) ?? ''; if ( '' === $born ) { return; diff --git a/themes/fueled-movies-complete/blocks/person-metadata-deathplace/block.json b/themes/fueled-movies-complete/blocks/person-metadata-deathplace/block.json index 7271b9a..1f47d00 100644 --- a/themes/fueled-movies-complete/blocks/person-metadata-deathplace/block.json +++ b/themes/fueled-movies-complete/blocks/person-metadata-deathplace/block.json @@ -7,6 +7,7 @@ "icon": "admin-users", "description": "A read only block to display the deathplace post meta for a Person.", "parent": ["tenup/metadata"], + "usesContext": ["postId", "postType"], "attributes": {}, "supports": { "html": false diff --git a/themes/fueled-movies-complete/blocks/person-metadata-deathplace/markup.php b/themes/fueled-movies-complete/blocks/person-metadata-deathplace/markup.php index 9ac6d70..96242e3 100644 --- a/themes/fueled-movies-complete/blocks/person-metadata-deathplace/markup.php +++ b/themes/fueled-movies-complete/blocks/person-metadata-deathplace/markup.php @@ -9,7 +9,14 @@ * @var WP_Block $block Block instance. */ -$deathplace = get_post_meta( get_the_ID(), 'tenup_person_deathplace', true ) ?? ''; +$context = $block->context; +$post_id = $context['postId'] ?? null; + +if ( ! $post_id ) { + return; +} + +$deathplace = get_post_meta( $post_id, 'tenup_person_deathplace', true ) ?? ''; if ( '' === $deathplace ) { return; diff --git a/themes/fueled-movies-complete/blocks/person-metadata-died/block.json b/themes/fueled-movies-complete/blocks/person-metadata-died/block.json index 320a125..1a97872 100644 --- a/themes/fueled-movies-complete/blocks/person-metadata-died/block.json +++ b/themes/fueled-movies-complete/blocks/person-metadata-died/block.json @@ -6,6 +6,7 @@ "category": "text", "icon": "admin-users", "description": "A read only block to display the died post meta for a Person.", + "usesContext": ["postId", "postType"], "parent": ["tenup/metadata"], "attributes": {}, "supports": { diff --git a/themes/fueled-movies-complete/blocks/person-metadata-died/markup.php b/themes/fueled-movies-complete/blocks/person-metadata-died/markup.php index 8e1704b..68d20de 100644 --- a/themes/fueled-movies-complete/blocks/person-metadata-died/markup.php +++ b/themes/fueled-movies-complete/blocks/person-metadata-died/markup.php @@ -9,7 +9,14 @@ * @var WP_Block $block Block instance. */ -$died = get_post_meta( get_the_ID(), 'tenup_person_died', true ) ?? ''; +$context = $block->context; +$post_id = $context['postId'] ?? null; + +if ( ! $post_id ) { + return; +} + +$died = get_post_meta( $post_id, 'tenup_person_died', true ) ?? ''; if ( '' === $died ) { return; diff --git a/themes/fueled-movies-complete/blocks/person-metadata-movies/block.json b/themes/fueled-movies-complete/blocks/person-metadata-movies/block.json index 8ebf840..7f6f194 100644 --- a/themes/fueled-movies-complete/blocks/person-metadata-movies/block.json +++ b/themes/fueled-movies-complete/blocks/person-metadata-movies/block.json @@ -7,6 +7,7 @@ "icon": "admin-users", "description": "A read only block to display the movies for a Person.", "parent": ["tenup/metadata"], + "usesContext": ["postId", "postType"], "attributes": {}, "supports": { "html": false diff --git a/themes/fueled-movies-complete/blocks/person-metadata-movies/markup.php b/themes/fueled-movies-complete/blocks/person-metadata-movies/markup.php index be56072..360fcf5 100644 --- a/themes/fueled-movies-complete/blocks/person-metadata-movies/markup.php +++ b/themes/fueled-movies-complete/blocks/person-metadata-movies/markup.php @@ -9,8 +9,8 @@ * @var WP_Block $block Block instance. */ -// Get the current post ID (person post). -$post_id = get_the_ID(); +$context = $block->context; +$post_id = $context['postId'] ?? null; if ( ! $post_id ) { return;