Renaming some frontend configuration to better support usage across the calendar

Author: cojennin

modules/calendar/calendar.php

@@ -1807,28 +1807,28 @@ public function get_calendar_post_stati() {
 		return apply_filters( 'ef_calendar_post_stati', $final_statuses );
 	}
 
-	public function get_calendar_dropdown_users() {
-		$users_dropdown_args = array(
+	public function get_calendar_users() {
+		$users_args = array(
 			'orderby'                 => 'display_name',
 			'order'                   => 'ASC',
 			'blog_id'                 => get_current_blog_id()
 		);
 
-		$users_dropdown_args = apply_filters( 'ef_calendar_dropdown_users_args', $users_dropdown_args );
+		$users_args = apply_filters( 'ef_calendar_dropdown_users_args', $users_args );
 
-		return get_users( $users_dropdown_args );
+		return get_users( $users_args );
 	}
 
-	public function get_calendar_categories_dropdown() {
-		$categories_dropdown_args = array(
+	public function get_calendar_categories() {
+		$categories_args = array(
 			'orderby'           => 'id',
 			'order'             => 'ASC',
 			'hide_empty'        => 0,
 			'hierarchical'      => 0,
 			'taxonomy'          => 'category'
 		);
 
-		return get_terms( $categories_dropdown_args );
+		return get_terms( $categories_args );
 	}
 
 	public function get_calendar_frontend_config() {
@@ -1837,48 +1837,18 @@ public function get_calendar_frontend_config() {
 		$all_post_types = get_post_types( null, 'objects' );
 
 		$config = array(
-			'POST_STATI' => array_merge(
-				array( 
-					array(
-						'label' => 'Unpublish',
-						'name' => 'unpublish'
-					)
-				),
-				array_map( 
-					function( $item ) {
-						return array( 
-							'name' => $item->name, 
-							'label' => $item->label,
-						);
-					}, 
-					$this->get_calendar_post_stati() 
-				)
-			),
+			'POST_STATI' => $this->get_calendar_post_stati(),
 			'USERS' => array_map( 
 				function( $item ) {
 					return array( 
 						'id' => $item->ID, 
 						'display_name' => $item->display_name,
 					);
 				}, 
-				$this->get_calendar_dropdown_users() 
-			),
-			'CATEGORIES' => array_map( 
-				function( $item ) {
-					return array( 
-						'term_id' => $item->term_id, 
-						'name' => $item->name, 
-						'parent' => $item->parent 
-					);
-				}, 
-				$this->get_calendar_categories_dropdown() 
+				$this->get_calendar_users() 
 			),
-			'CALENDAR_POST_TYPES' => array_map( function ( $item ) use ( $all_post_types ) {
-				return array(
-					'name' => $all_post_types[ $item ]->name,
-					'label' => $all_post_types[ $item ]->label
-				);
-			}, $this->get_post_types_for_module( $this->module ) ),
+			'CATEGORIES' => $this->get_calendar_categories(),
+			'POST_TYPES' => $this->get_post_types_for_module( $this->module ),
 			'NUM_WEEKS' => array(
 				'MAX' => $this->max_weeks,
 				'DEFAULT' => $this->total_weeks,

modules/calendar/lib/dist/calendar.react.build.js

@@ -93,13 +93,13 @@ const filters = [
 	},
 ];
 
-if ( EF_CALENDAR.CALENDAR_POST_TYPES && EF_CALENDAR.CALENDAR_POST_TYPES.length > 1 ) {
+if ( EF_CALENDAR.POST_TYPES && EF_CALENDAR.POST_TYPES.length > 1 ) {
 	filters.push( {
 		name: 'cpt',
 		filterType: 'select',
 		label: __( 'Select a type', 'edit-flow' ),
 		options: [ { value: '', label: __( 'Select a type', 'edit-flow' ) } ]
-			.concat( EF_CALENDAR.CALENDAR_POST_TYPES.map( ( { name: value, label } ) => ( { value, label } ) ) ),
+			.concat( EF_CALENDAR.POST_TYPES.map( ( { name: value, label } ) => ( { value, label } ) ) ),
 		initialValue: EF_CALENDAR.FILTERS.cpt,
 	} );
 }