Revert "Expose widget-IDs to JS"

This reverts commit df34033.

Author: aristath

classes/admin/widgets/class-suggested-tasks.php

@@ -51,25 +51,22 @@ public function get_score() {
 	/**
 	 * Get previous month badge.
 	 *
-	 * @return \Progress_Planner\Badges\Monthly[]
+	 * @return \Progress_Planner\Badges\Monthly|null
 	 */
-	public function get_previous_incomplete_month_badges() {
-		$previous_incomplete_month_badges = [];
-
+	public function get_previous_incomplete_month_badge() {
 		$minus_one_month       = ( new DateTime() )->modify( 'first day of previous month' );
 		$minus_one_month_badge = Monthly::get_instance_from_id( Monthly::get_badge_id_from_date( $minus_one_month ) );
 		if ( $minus_one_month_badge && $minus_one_month_badge->progress_callback()['progress'] < 100 ) {
-			$previous_incomplete_month_badges[] = $minus_one_month_badge;
+			return $minus_one_month_badge;
 		}
 
 		$minus_two_months       = ( new DateTime() )->modify( 'first day of previous month' )->modify( 'first day of previous month' );
 		$minus_two_months_badge = Monthly::get_instance_from_id( Monthly::get_badge_id_from_date( $minus_two_months ) );
 		if ( $minus_two_months_badge && $minus_two_months_badge->progress_callback()['progress'] < 100 ) {
-			$previous_incomplete_month_badges[] = $minus_two_months_badge;
+			return $minus_two_months_badge;
 		}
 
-
-		return $previous_incomplete_month_badges;
+		return null;
 	}
 
 	/**
@@ -84,19 +81,6 @@ public function enqueue_scripts() {
 		\progress_planner()->get_admin__enqueue()->enqueue_script(
 			'widgets/suggested-tasks-badge-scroller',
 		);
-
-		$previous_incomplete_month_badges = [];
-		foreach ( $this->get_previous_incomplete_month_badges() as $badge ) {
-			$previous_incomplete_month_badges[] = $badge->get_id();
-		}
-
-		\wp_localize_script(
-			'progress-planner/widgets/suggested-tasks',
-			'prplSuggestedTasksWidgetData',
-			[
-				'previous_incomplete_month_badges' => $previous_incomplete_month_badges,
-			]
-		);
 	}
 
 	/**

views/page-widgets/suggested-tasks.php

@@ -61,26 +61,26 @@
 		</span>
 	</div>
 
-	<?php if ( ! empty( $prpl_widget->get_previous_incomplete_month_badges() ) ) : ?>
+	<?php if ( $prpl_widget->get_previous_incomplete_month_badge() ) : ?>
 		<h3><?php \esc_html_e( 'Oh no! You missed the previous monthly badge!', 'progress-planner' ); ?></h3>
 		<p><?php echo \wp_kses( __( 'No worries though! <strong>Collect the surplus of points</strong> you earn, and get your badge!', 'progress-planner' ), [ 'strong' => [] ] ); ?></p>
 		<div id="prpl-previous-month-badge-progress-bar" style="padding: 1rem 0; background-color: var(--prpl-background-orange); border-radius: 0.5rem; padding: 1rem;">
 			<prpl-badge-progress-bar
-				data-badge-id="<?php echo esc_attr( $prpl_widget->get_previous_incomplete_month_badges()[0]->get_id() ); ?>"
-				data-points="<?php echo (int) $prpl_widget->get_previous_incomplete_month_badges()[0]->progress_callback()['points']; ?>"
+				data-badge-id="<?php echo esc_attr( $prpl_widget->get_previous_incomplete_month_badge()->get_id() ); ?>"
+				data-points="<?php echo (int) $prpl_widget->get_previous_incomplete_month_badge()->progress_callback()['points']; ?>"
 				data-max-points="<?php echo (int) Monthly::TARGET_POINTS; ?>"
 			></prpl-badge-progress-bar>
 
 			<div class="prpl-widget-content-points">
 				<span id="prpl-widget-previous-ravi-points-number" class="prpl-widget-content-points-number">
-					<?php echo (int) $prpl_widget->get_previous_incomplete_month_badges()[0]->progress_callback()['points']; ?>pt
+					<?php echo (int) $prpl_widget->get_previous_incomplete_month_badge()->progress_callback()['points']; ?>pt
 				</span>
-				<span id="prpl-previous-month-badge-progress-bar-remaining" data-remaining="<?php echo (int) $prpl_widget->get_previous_incomplete_month_badges()[0]->progress_callback()['remaining']; ?>">
+				<span id="prpl-previous-month-badge-progress-bar-remaining" data-remaining="<?php echo (int) $prpl_widget->get_previous_incomplete_month_badge()->progress_callback()['remaining']; ?>">
 					<?php
 					printf(
 						/* translators: %d: The number of points. */
 						\esc_html__( 'Only %d more points to go', 'progress-planner' ),
-						(int) $prpl_widget->get_previous_incomplete_month_badges()[0]->progress_callback()['remaining']
+						(int) $prpl_widget->get_previous_incomplete_month_badge()->progress_callback()['remaining']
 					);
 					?>
 				</span>