Merge pull request #1083 from alleyinteractive/hotfix/963-apple-news-…

…sections-meta Fix issue with apple_news_section throwing notice when being cast as a string
alleyinteractive · Mar 14, 2024 · 6ce402a · 6ce402a
2 parents 8e94a3f + 4040b20
commit 6ce402a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/admin/class-admin-apple-news.php b/admin/class-admin-apple-news.php
@@ -141,13 +141,14 @@ public function __construct() {
 					'default' => '',
 				],
 				'apple_news_metadata'            => [
-					'default'           => '',
+					'default'           => [],
 					'sanitize_callback' => function ( $value ) {
 						return ! empty( $value ) && is_string( $value ) ? json_decode( $value, true ) : $value;
 					},
 					'show_in_rest'      => [
 						'prepare_callback' => 'apple_news_json_encode',
 					],
+					'type'              => 'array',
 				],
 				'apple_news_pullquote'           => [
 					'default' => '',
@@ -159,11 +160,16 @@ public function __construct() {
 					'default' => '',
 				],
 				'apple_news_sections'            => [
-					'default'           => '',
-					'sanitize_callback' => 'apple_news_sanitize_selected_sections',
-					'show_in_rest'      => [
-						'prepare_callback' => 'apple_news_json_encode',
+					'default'      => [],
+					'show_in_rest' => [
+						'schema' => [
+							'items' => [
+								'type' => 'string',
+							],
+							'type'  => 'array',
+						],
 					],
+					'type'         => 'array',
 				],
 				'apple_news_suppress_video_url'  => [
 					'default' => false,
@@ -192,7 +198,7 @@ function ( $key ) {
 						}
 					)
 					: $meta_keys;
-				} 
+				}
 			);
 
 			add_action(

diff --git a/assets/js/pluginsidebar/sidebar.jsx b/assets/js/pluginsidebar/sidebar.jsx
@@ -91,14 +91,13 @@ function Sidebar() {
   const [metadataRaw, setMetadataRaw] = usePostMetaValue('apple_news_metadata');
   const [pullquoteText, setPullquoteText] = usePostMetaValue('apple_news_pullquote');
   const [pullquotePosition, setPullquotePosition] = usePostMetaValue('apple_news_pullquote_position');
-  const [selectedSectionsRaw, setSelectedSectionsRaw] = usePostMetaValue('apple_news_sections');
+  const [selectedSections, setSelectedSectionsRaw] = usePostMetaValue('apple_news_sections');
   const [slug, setSlug] = usePostMetaValue('apple_news_slug');
   const [suppressVideoURL, setSuppressVideoURL] = usePostMetaValue('apple_news_suppress_video_url');
   const [useImageComponent, setUseImageComponent] = usePostMetaValue('apple_news_use_image_component');
 
   // Decode selected sections.
   const metadata = safeJsonParseArray(metadataRaw);
-  const selectedSections = safeJsonParseArray(selectedSectionsRaw);
 
   /**
    * A helper function for setting metadata.
@@ -110,7 +109,7 @@ function Sidebar() {
    * A helper function for setting selected sections.
    * @param {Array} next - The array of selected sections to set.
    */
-  const setSelectedSections = (next) => setSelectedSectionsRaw(JSON.stringify(next));
+  const setSelectedSections = (next) => setSelectedSectionsRaw(next);
 
   /**
    * A helper function for displaying a notification to the user.