Merge pull request #4272 from 10up/fix/feature-is-active-condition

Only consider a feature active if not disabled by code

Author: felipeelia

assets/js/features/components/control.js

@@ -62,9 +62,8 @@ const Control = ({
 	 * Get missing required features.
 	 */
 	const missingRequiredFeatures = requiredFeaturesList
-		.filter((featureSlug) => settings[featureSlug]?.active !== true)
 		.map((featureSlug) => getFeature(featureSlug))
-		.filter(Boolean);
+		.filter((feature) => !feature.isAvailable || settings[feature.slug]?.active !== true);
 
 	/**
 	 * Help text formatted to allow safe HTML.

includes/classes/Feature.php

@@ -243,7 +243,11 @@ public function is_active() {
 		$active = false;
 
 		if ( ! empty( $feature_settings[ $this->slug ] ) && $feature_settings[ $this->slug ]['active'] ) {
-			$active = true;
+			$active = ! in_array(
+				$this->requirements_status()->get_code(),
+				[ FeatureRequirementsStatus::FORCE_DISABLED, FeatureRequirementsStatus::TEMPORARILY_DISABLED ],
+				true
+			);
 		}
 
 		/**

tests/php/TestFeatureActivation.php

@@ -9,6 +9,7 @@
 
 use ElasticPress;
 use ElasticPress\Features;
+use ElasticPress\FeatureRequirementsStatus;
 use ElasticPress\REST\Features as FeaturesRest;
 
 /**
@@ -251,6 +252,25 @@ public function testReqChangeNothingWithFeature() {
 		$this->assertEquals( 1, $requirements_statuses['test'] );
 	}
 
+	/**
+	 * Test that a feature is not active if it's force disabled or temporarily disabled
+	 *
+	 * @since 5.3.3
+	 * @group feature-activation
+	 */
+	public function test_feature_is_active_only_if_not_disabled() {
+		foreach ( [ FeatureRequirementsStatus::FORCE_DISABLED, FeatureRequirementsStatus::TEMPORARILY_DISABLED ] as $code ) {
+			$feature = new FeatureTestB( $code );
+			Features::factory()->register_feature( $feature );
+			Features::factory()->activate_feature( 'test-b' );
+
+			$this->handle_feature_activation();
+			ElasticPress\Features::factory()->setup_features();
+
+			$this->assertFalse( $feature->is_active() );
+		}
+	}
+
 	/**
 	 * Test that the pre_handle_feature_activation method is called
 	 *

tests/php/screen/TestStatusReport.php

@@ -429,6 +429,8 @@ function ( $logs ) use ( $time_stamp, $random_no ) {
 	 * @since 4.5.1
 	 */
 	public function testElasticPressIoReport() {
+		add_filter( 'ep_instant_results_available', '__return_true' );
+
 		\ElasticPress\Features::factory()->activate_feature( 'autosuggest' );
 		\ElasticPress\Features::factory()->activate_feature( 'instant-results' );