X-Git-Url: https://git.cyclocoop.org/%242?a=blobdiff_plain;f=includes%2Fspecialpage%2FChangesListSpecialPage.php;h=bd8c4b6ec752ca13e5df70a58691bb10c495b4c2;hb=b31c87ab91b3e2bbb80d3b814953ea3790498c36;hp=dcd14e80981e8e23c6c94a78b690be548db9b5e4;hpb=23673a0ff99f4173ded689ee32dae799f2d07642;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specialpage/ChangesListSpecialPage.php b/includes/specialpage/ChangesListSpecialPage.php
index dcd14e8098..bd8c4b6ec7 100644
--- a/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@ -540,6 +540,8 @@ abstract class ChangesListSpecialPage extends SpecialPage {
 	public function execute( $subpage ) {
 		$this->rcSubpage = $subpage;
 
+		$this->considerActionsForDefaultSavedQuery();
+
 		$rows = $this->getRows();
 		$opts = $this->getOptions();
 		if ( $rows === false ) {
@@ -591,6 +593,77 @@ abstract class ChangesListSpecialPage extends SpecialPage {
 		$this->includeRcFiltersApp();
 	}
 
+	/**
+	 * Check whether or not the page should load defaults, and if so, whether
+	 * a default saved query is relevant to be redirected to. If it is relevant,
+	 * redirect properly with all necessary query parameters.
+	 */
+	protected function considerActionsForDefaultSavedQuery() {
+		if ( !$this->isStructuredFilterUiEnabled() ) {
+			return;
+		}
+
+		$knownParams = call_user_func_array(
+			[ $this->getRequest(), 'getValues' ],
+			array_keys( $this->getOptions()->getAllValues() )
+		);
+
+		// HACK: Temporarily until we can properly define "sticky" filters and parameters,
+		// we need to exclude several parameters we know should not be counted towards preventing
+		// the loading of defaults.
+		$excludedParams = [ 'limit' => '', 'days' => '', 'enhanced' => '', 'from' => '' ];
+		$knownParams = array_diff_key( $knownParams, $excludedParams );
+
+		if (
+			// If there are NO known parameters in the URL request
+			// (that are not excluded) then we need to check into loading
+			// the default saved query
+			count( $knownParams ) === 0
+		) {
+			// Get the saved queries data and parse it
+			$savedQueries = FormatJson::decode(
+				$this->getUser()->getOption( static::$savedQueriesPreferenceName ),
+				true
+			);
+
+			if ( $savedQueries && isset( $savedQueries[ 'default' ] ) ) {
+				// Only load queries that are 'version' 2, since those
+				// have parameter representation
+				if ( isset( $savedQueries[ 'version' ] ) && $savedQueries[ 'version' ] === '2' ) {
+					$savedQueryDefaultID = $savedQueries[ 'default' ];
+					$defaultQuery = $savedQueries[ 'queries' ][ $savedQueryDefaultID ][ 'data' ];
+
+					// Build the entire parameter list
+					$query = array_merge(
+						$defaultQuery[ 'params' ],
+						$defaultQuery[ 'highlights' ],
+						[
+							'urlversion' => '2',
+						]
+					);
+					// Add to the query any parameters that we may have ignored before
+					// but are still valid and requested in the URL
+					$query = array_merge( $this->getRequest()->getValues(), $query );
+					unset( $query[ 'title' ] );
+					$this->getOutput()->redirect( $this->getPageTitle()->getCanonicalURL( $query ) );
+				} else {
+					// There's a default, but the version is not 2, and the server can't
+					// actually recognize the query itself. This happens if it is before
+					// the conversion, so we need to tell the UI to reload saved query as
+					// it does the conversion to version 2
+					$this->getOutput()->addJsConfigVars(
+						'wgStructuredChangeFiltersDefaultSavedQueryExists',
+						true
+					);
+
+					// Add the class that tells the frontend it is still loading
+					// another query
+					$this->getOutput()->addBodyClasses( 'mw-rcfilters-ui-loading' );
+				}
+			}
+		}
+	}
+
 	/**
 	 * Include the modules and configuration for the RCFilters app.
 	 * Conditional on the user having the feature enabled.
@@ -632,25 +705,15 @@ abstract class ChangesListSpecialPage extends SpecialPage {
 				]
 			);
 
+			$out->addJsConfigVars(
+				'wgStructuredChangeFiltersSavedQueriesPreferenceName',
+				static::$savedQueriesPreferenceName
+			);
+
 			$out->addJsConfigVars(
 				'StructuredChangeFiltersLiveUpdatePollingRate',
 				$this->getConfig()->get( 'StructuredChangeFiltersLiveUpdatePollingRate' )
 			);
-
-			if ( static::$savedQueriesPreferenceName ) {
-				$savedQueries = FormatJson::decode(
-					$this->getUser()->getOption( static::$savedQueriesPreferenceName )
-				);
-				if ( $savedQueries && isset( $savedQueries->default ) ) {
-					// If there is a default saved query, show a loading spinner,
-					// since the frontend is going to reload the results
-					$out->addBodyClasses( 'mw-rcfilters-ui-loading' );
-				}
-				$out->addJsConfigVars(
-					'wgStructuredChangeFiltersSavedQueriesPreferenceName',
-					static::$savedQueriesPreferenceName
-				);
-			}
 		} else {
 			$out->addBodyClasses( 'mw-rcfilters-disabled' );
 		}
@@ -907,6 +970,23 @@ abstract class ChangesListSpecialPage extends SpecialPage {
 		return $unstructuredGroupDefinition;
 	}
 
+	/**
+	 * @return array The legacy show/hide toggle filters
+	 */
+	protected function getLegacyShowHideFilters() {
+		$filters = [];
+		foreach ( $this->filterGroups as $group ) {
+			if ( $group instanceof  ChangesListBooleanFilterGroup ) {
+				foreach ( $group->getFilters() as $key => $filter ) {
+					if ( $filter->displaysOnUnstructuredUi( $this ) ) {
+						$filters[ $key ] = $filter;
+					}
+				}
+			}
+		}
+		return $filters;
+	}
+
 	/**
 	 * Register all the filters, including legacy hook-driven ones.
 	 * Then create a FormOptions object with options as specified by the user
@@ -947,19 +1027,9 @@ abstract class ChangesListSpecialPage extends SpecialPage {
 		// If urlversion=2 is set, ignore the filter defaults and set them all to false/empty
 		$useDefaults = $this->getRequest()->getInt( 'urlversion' ) !== 2;
 
-		// Add all filters
 		/** @var ChangesListFilterGroup $filterGroup */
 		foreach ( $this->filterGroups as $filterGroup ) {
-			// URL parameters can be per-group, like 'userExpLevel',
-			// or per-filter, like 'hideminor'.
-			if ( $filterGroup->isPerGroupRequestParameter() ) {
-				$opts->add( $filterGroup->getName(), $useDefaults ? $filterGroup->getDefault() : '' );
-			} else {
-				/** @var ChangesListBooleanFilter $filter */
-				foreach ( $filterGroup->getFilters() as $filter ) {
-					$opts->add( $filter->getName(), $useDefaults ? $filter->getDefault( $structuredUI ) : false );
-				}
-			}
+			$filterGroup->addOptions( $opts, $useDefaults, $structuredUI );
 		}
 
 		$opts->add( 'namespace', '', FormOptions::STRING );
@@ -1090,9 +1160,9 @@ abstract class ChangesListSpecialPage extends SpecialPage {
 		// or per-filter, like 'hideminor'.
 
 		foreach ( $this->filterGroups as $filterGroup ) {
-			if ( $filterGroup->isPerGroupRequestParameter() ) {
+			if ( $filterGroup instanceof ChangesListStringOptionsFilterGroup ) {
 				$stringParameterNameSet[$filterGroup->getName()] = true;
-			} elseif ( $filterGroup->getType() === ChangesListBooleanFilterGroup::TYPE ) {
+			} elseif ( $filterGroup instanceof ChangesListBooleanFilterGroup ) {
 				foreach ( $filterGroup->getFilters() as $filter ) {
 					$hideParameterNameSet[$filter->getName()] = true;
 				}
@@ -1228,20 +1298,10 @@ abstract class ChangesListSpecialPage extends SpecialPage {
 		$dbr = $this->getDB();
 		$isStructuredUI = $this->isStructuredFilterUiEnabled();
 
+		/** @var ChangesListFilterGroup $filterGroup */
 		foreach ( $this->filterGroups as $filterGroup ) {
-			// URL parameters can be per-group, like 'userExpLevel',
-			// or per-filter, like 'hideminor'.
-			if ( $filterGroup->isPerGroupRequestParameter() ) {
-				$filterGroup->modifyQuery( $dbr, $this, $tables, $fields, $conds,
-					$query_options, $join_conds, $opts[$filterGroup->getName()] );
-			} else {
-				foreach ( $filterGroup->getFilters() as $filter ) {
-					if ( $filter->isActive( $opts, $isStructuredUI ) ) {
-						$filter->modifyQuery( $dbr, $this, $tables, $fields, $conds,
-							$query_options, $join_conds );
-					}
-				}
-			}
+			$filterGroup->modifyQuery( $dbr, $this, $tables, $fields, $conds,
+				$query_options, $join_conds, $opts, $isStructuredUI );
 		}
 
 		// Namespace filtering