Feat datatables searchpanes structured queries

.github/workflows/ci.yml

@@ -18,42 +18,47 @@ jobs:
       matrix:
         include:
           - mediawiki_version: '1.39'
-            smw_version: dev-master
+            smw_version: 5.1.0
             php_version: 8.1
+            mm_version: 6.0.1
             database_type: mysql
-            database_image: "mariadb:10"
+            database_image: "mariadb:11.2"
             coverage: false
             experimental: false
           - mediawiki_version: '1.40'
-            smw_version: dev-master
+            smw_version: 5.1.0
             php_version: 8.1
+            mm_version: 6.0.1
             database_type: mysql
             database_image: "mariadb:11.2"
             coverage: true
             experimental: false
           - mediawiki_version: '1.41'
-            smw_version: dev-master
+            smw_version: 5.1.0
             pf_version: 5.9
             sfs_version: dev-master
             php_version: 8.1
+            mm_version: 6.0.1
             database_type: mysql
             database_image: "mariadb:11.2"
             coverage: false
             experimental: false
           - mediawiki_version: '1.42'
-            smw_version: dev-master
+            smw_version: 5.1.0
             pf_version: 5.9
             sfs_version: dev-master
             php_version: 8.1
+            mm_version: 6.0.1
             database_type: mysql
             database_image: "mariadb:11.2"
             coverage: false
             experimental: false
-          - mediawiki_version: '1.43'
+          - mediawiki_version: '1.43.1'
             smw_version: dev-master
             pf_version: 5.9
             sfs_version: dev-master
             php_version: 8.1
+            mm_version: 6.0.1
             database_type: mysql
             database_image: "mariadb:11.2"
             coverage: false
@@ -67,6 +72,7 @@ jobs:
       PHP_VERSION: ${{ matrix.php_version }}
       DB_TYPE: ${{ matrix.database_type }}
       DB_IMAGE: ${{ matrix.database_image }}
+      MM_VERSION: ${{ matrix.mm_version }} 
 
 
     steps:

Makefile

@@ -14,13 +14,13 @@ EXTENSION=SemanticResultFormats
 MW_VERSION?=1.39
 PHP_VERSION?=8.1
 DB_TYPE?=mysql
-DB_IMAGE?="mariadb:10"
+DB_IMAGE?="mariadb:11.2"
 
 # extensions
-SMW_VERSION?=dev-master
+SMW_VERSION ?= 5.0.2
 PF_VERSION ?= 5.5.1
 SFS_VERSION ?= 4.0.0-beta
-MM_VERSION ?= 3.1.0
+MM_VERSION ?= 6.0.1
 
 # composer
 # Enables "composer update" inside of extension

README.md

@@ -9,9 +9,7 @@ Semantic Result Formats (SRF) is a MediaWiki extension that provides extra visua
 
 ## Requirements
 
-- PHP 7.3.19 or later
-- MediaWiki 1.35 or later
-- Semantic MediaWiki 3.0 or later
+PHP, MediaWiki, and Semantic MediaWiki. For specific supported versions, see the [compatibility overview](docs/COMPATIBILITY.md).
 
 ## Installation
 
@@ -48,6 +46,9 @@ A list of people who have made contributions in the past can be found [here][con
 This extension provides unit and integration tests and is usually run by a [continues integration platform][GitHub Actions]
 but can also be executed locally using the shortcut command `composer phpunit` from the extension base directory.
 
+## For developers
+
+See the documention on how to [update d3chart JS library](https://github.com/SemanticMediaWiki/SemanticResultFormats/blob/master/formats/d3/README.md).
 
 ## License
 

RELEASE-NOTES.md

@@ -1,37 +1,72 @@
 These are the release notes for the [Semantic Result Formats](https://www.semantic-mediawiki.org/wiki/Extension:Semantic_Result_Formats) (a.k.a SRF) MediaWiki extension.
 
+## SRF 5.1.0
+
+Released on September 3, 2025.
+
+### Improvements to 
+
+* Fixed compatibility issue with MediaWiki 1.43 in the `filtered` format
+* Added `sep` parameter to the `filtered` format to allow specifying the separator ([952](https://github.com/SemanticMediaWiki/SemanticResultFormats/pull/952))
+* Improved the `d3chart` format
+    * Refactored d3chart codebase to support newer D3 versions
+    * Bumped d3 from v3.0.4 to v6.7.0 ([951](https://github.com/SemanticMediaWiki/SemanticResultFormats/pull/951))
+    * Introduced package.json and modern build tooling to manage D3 as an npm dependency
+    * Updated D3 import and initialization to align with ES module standards
+    * Replaced legacy d3.v3.js with modern d3.min.js for better modularity and smaller bundle size
+    * Revised documentation to reflect new D3 usage and build process
+* Improved the `graph` format by adding `graphfieldspages` param to optionally include Page-type values as node fields ([958](https://github.com/SemanticMediaWiki/SemanticResultFormats/pull/958))
+* Fixed support for template names with spaces in the `datatables` format
+
 ## SRF 5.0.0
 
-Released on TDB
+Released on April 7, 2025.
+
+Highlights:
+* Support for MediaWiki 1.43 and Semantic MediaWiki 5
+* Significant enhancements to the DataTables format
 
-Compatibility changes
+### Compatibility Changes
 
 * Added compatibility with Semantic MediaWiki 5.x
-* Changed minimum PHP version from 7.3 to 8.0
-* Improved PHP support up to version 8.4
-* Changed minimum MediaWiki version from 1.35 to 1.39
-* Improved MediaWiki support up to 1.43
+* Added support for PHP up to version 8.4
+* Added support for MediaWiki support up to version 1.43
+* Dropped support for MediaWiki older than 1.39
+* Dropped support for PHP older than 8.1
 
-Breaking changes
+### Breaking Changes
 
-* 
+* Removed the Exhibit format
 
-New features and enhancements
+### New Features and Enhancements
 
-* [864](https://github.com/SemanticMediaWiki/SemanticResultFormats/pull/864) Updated DataTables from 1.13.2 to 2.1.8 (by @alistair3149)
+* Overhauled DataTables format
+  * Improved UI integration with MediaWiki by using [Codex](https://doc.wikimedia.org/codex/main/) [871](https://github.com/SemanticMediaWiki/SemanticResultFormats/pull/871), [879](https://github.com/SemanticMediaWiki/SemanticResultFormats/pull/879) (by @alistair3149)
+  * Added "show all" to DataTable length [868](https://github.com/SemanticMediaWiki/SemanticResultFormats/pull/868) (by @alistair3149)
+  * Fixed various sorting and filter issues [865](https://github.com/SemanticMediaWiki/SemanticResultFormats/pull/865) (by @alistair3149)
+  * Fixed template Ajax navigation and improved expansion [931](https://github.com/SemanticMediaWiki/SemanticResultFormats/pull/931) (by @thomas-topway-it for ([KM-A](https://km-a.net))
+  * Fixed missing [ParentProperties](https://www.semantic-mediawiki.org/wiki/Help:Subobjects_and_queries) values [833](https://github.com/SemanticMediaWiki/SemanticResultFormats/pull/833) and [825](https://github.com/SemanticMediaWiki/SemanticResultFormats/issues/825) (by @hkwi)
+  * Bump DataTables from 1.13.2 to 2.1.8 [864](https://github.com/SemanticMediaWiki/SemanticResultFormats/pull/864) (by @alistair3149)
+  * Improved client-side cache mechanism [904](https://github.com/SemanticMediaWiki/SemanticResultFormats/pull/904) (by @thomas-topway-it)
+  * Improved accessibility with `aria-live = "polite"` attribute in DataTable [845](https://github.com/SemanticMediaWiki/SemanticResultFormats/pull/845) (by @robinwiel)
+* Updated Filtered format dependencies: Fullcalendar 6 and leaflet 1.9/leaflet-providers 2.0 (by @thomas-topway-it for ([KM-A](https://km-a.net))
+* Added `prolog` format that generates SVO predicates
+* Added `dataframe` format
+* Improved `carousel` format with vertical centering, height adjustments, smarter captions, and nested slide [857](https://github.com/SemanticMediaWiki/SemanticResultFormats/pull/857) (by @thomas-topway-it for ([KM-A](https://km-a.net))
 
-Bug fixes
+### Bug Fixes
 
-* 
+* Fixed precision issue in the `time` format
+* Fixed reuse of values output by the `incoming` format when no template is used
 
 ## SRF 4.2.1
 
 Released on March 13, 2024.
 
-* [815](https://github.com/SemanticMediaWiki/SemanticResultFormats/pull/815) Document graphfields parameter to the graph format (by @alex-mashin) 
+* [815](https://github.com/SemanticMediaWiki/SemanticResultFormats/pull/815) Document graphfields parameter to the graph format (by @alex-mashin)
 * [806](https://github.com/SemanticMediaWiki/SemanticResultFormats/pull/806) Added required resources for the bubble chare to the jqplotchart format (by@YOUR1)
 * [805](https://github.com/SemanticMediaWiki/SemanticResultFormats/pull/805) Fixed issue creating a lot of log spam (by @sophivorus)
-* [793](https://github.com/SemanticMediaWiki/SemanticResultFormats/pull/793) Fixed issue with the slidesToShow paramter to the carousel format (by @thomas-topway-it)
+* [793](https://github.com/SemanticMediaWiki/SemanticResultFormats/pull/793) Fixed issue with the slidesToShow parameter to the carousel format (by @thomas-topway-it)
 * Further improvements and fixes to the Continuous Integration (CI) (by [gesinn.it](https://gesinn.it))
 * Updated translations (by translatewiki.net community)
 

Resources.php

@@ -569,7 +569,7 @@
 
 	// D3
 	'ext.d3.core' => $moduleTemplate + [
-		'scripts' => 'resources/jquery/d3/d3.v3.js'
+		'scripts' => 'resources/jquery/d3/d3.min.js'
 	],
 
 	//
@@ -780,7 +780,8 @@
 			],
 			'dependencies' => [
 				'ext.srf.filtered.calendar-view.messages',
-				'ext.jquery.fullcalendar'
+				// included using gulp
+				// 'ext.jquery.fullcalendar'
 			],
 		],
 

SemanticResultFormats.hooks.php

@@ -94,6 +94,7 @@ public static function addToAdminLinks( ALTree &$admin_links_tree ) {
 	 * @return true
 	 */
 	public static function onResourceLoaderGetConfigVars( &$vars ) {
+		// Powers srf.settings.get(), via ext.stf.js.
 		$vars['srf-config'] = [
 			'version' => SRF_VERSION,
 			'settings' => [

SemanticResultFormats.utils.php

@@ -27,21 +27,6 @@ public static function htmlProcessingElement( $isHtml = true ) {
 		);
 	}
 
-	/**
-	 * Add JavaScript variables to the output
-	 *
-	 * @since 1.8
-	 */
-	public static function addGlobalJSVariables() {
-		$options = [
-			'srfgScriptPath' => $GLOBALS['srfgScriptPath'],
-			'srfVersion' => SRF_VERSION
-		];
-
-		$requireHeadItem = [ 'srf.options' => $options ];
-		SMWOutputs::requireHeadItem( 'srf.options', self::makeVariablesScript( $requireHeadItem ) );
-	}
-
 	/**
 	 * Returns semantic search link for the current query
 	 *

composer.json

@@ -44,9 +44,9 @@
 		"source": "https://github.com/SemanticMediaWiki/SemanticResultFormats"
 	},
 	"require": {
-		"php": ">=7.3",
+		"php": ">=8.1",
 		"composer/installers": ">=1.0.1",
-		"nicmart/tree": "^0.2.7",
+		"nicmart/tree": "^0.4.0",
 		"data-values/geo": "~4.0|~3.0|~2.0"
 	},
 	"suggest": {

docs/COMPATIBILITY.md

@@ -17,19 +17,26 @@ minimum requirements are indicated in bold.
 		<th>Semantic MediaWiki</th>
 		<th>Release status</th>
 	</tr>
+	<tr>
+		<th>5.1.x</th>
+		<td>8.1 - 8.4</td>
+		<td>1.39 - 1.44</td>
+		<td>5.0 - 6.x</td>
+		<td><strong>Stable release</strong></td>
+	<tr>
 	<tr>
 		<th>5.0.x</th>
-		<td><strong>8.0</strong> - 8.3+</td>
-		<td><strong>1.39</strong> - 1.43+</td>
-		<td><strong>4.0.0</strong> - 4.2+</td>
-		<td>Future release</td>
+		<td><strong>8.1</strong> - 8.4</td>
+		<td><strong>1.39</strong> - 1.43</td>
+		<td><strong>5.0</strong></td>
+		<td>Obsolete release, no support</td>
 	<tr>
 	<tr>
 		<th>4.2.x</th>
-		<td>7.3 - 8.1</td>
-		<td>1.35 - 1.39+</td>
-		<td>3.2.x - 4.2+</td>
-		<td><strong>Stable release</strong></td>
+		<td>7.3 - 8.2</td>
+		<td>1.35 - 1.39</td>
+		<td>3.2.x - 4.2</td>
+		<td>Obsolete release, no support</td>
 	<tr>
 	<tr>
 		<th>4.1.x</th>

docs/INSTALL.md

@@ -20,15 +20,15 @@ create one and add the following content to it:
 ```
 {
 	"require": {
-		"mediawiki/semantic-result-formats": "~4.2"
+		"mediawiki/semantic-result-formats": "~5.0"
 	}
 }
 ```
 
 If you already have a "composer.local.json" file add the following line to the end of the "require"
 section in your file:
 
-    "mediawiki/semantic-result-formats": "~4.2"
+    "mediawiki/semantic-result-formats": "~5.0"
 
 Remember to add a comma to the end of the preceding line in this section.
 

docs/README.md

@@ -8,6 +8,7 @@
 ## Technical documentation
 
 * [Filtered format](https://github.com/SemanticMediaWiki/SemanticResultFormats/blob/master/formats/filtered/README.md)
+* [D3chart format](https://github.com/SemanticMediaWiki/SemanticResultFormats/blob/master/formats/d3/README.md)
 
 ## Repository documentation
 

extension.json

@@ -1,6 +1,6 @@
 {
     "name": "SemanticResultFormats",
-	"version": "5.0.0-alpha",
+	"version": "5.1.0",
 	"author": [
 		"James Hong Kong",
 		"Stephan Gambke",
@@ -38,22 +38,22 @@
 		"SRF\\Tests\\": "tests/phpunit/"
 	},
 	"QUnitTestModule": {
-		"localBasePath": "",
-		"remoteExtPath": "SemanticResultFormats",
+		"localBasePath": "tests/qunit/",
+		"remoteExtPath": "SemanticResultFormats/tests/qunit/",
 		"scripts": [
-			"tests/qunit/ext.srf.test.js",
-			"tests/qunit/ext.srf.util.test.js",
-			"tests/qunit/formats/ext.srf.formats.datatables.test.js",
-			"tests/qunit/formats/ext.srf.formats.carousel.test.js",
-			"tests/qunit/formats/ext.srf.formats.eventcalendar.tests.js",
-			"tests/qunit/formats/ext.srf.formats.filtered.test.js",
-			"tests/qunit/formats/ext.srf.formats.gallery.test.js",
-			"tests/qunit/formats/ext.srf.formats.media.test.js",
-			"tests/qunit/formats/ext.srf.formats.tagcloud.test.js",
-			"tests/qunit/widgets/ext.srf.widgets.eventcalendar.tests.js",
-			"tests/qunit/widgets/ext.srf.widgets.optionslist.test.js",
-			"tests/qunit/widgets/ext.srf.widgets.panel.test.js",
-			"tests/qunit/widgets/ext.srf.widgets.parameters.test.js"
+			"ext.srf.test.js",
+			"ext.srf.util.test.js",
+			"formats/ext.srf.formats.datatables.test.js",
+			"formats/ext.srf.formats.carousel.test.js",
+			"formats/ext.srf.formats.eventcalendar.tests.js",
+			"formats/ext.srf.formats.filtered.test.js",
+			"formats/ext.srf.formats.gallery.test.js",
+			"formats/ext.srf.formats.media.test.js",
+			"formats/ext.srf.formats.tagcloud.test.js",
+			"widgets/ext.srf.widgets.eventcalendar.tests.js",
+			"widgets/ext.srf.widgets.optionslist.test.js",
+			"widgets/ext.srf.widgets.panel.test.js",
+			"widgets/ext.srf.widgets.parameters.test.js"
 		],
 		"dependencies": [
 			"ext.srf",

formats/Prolog/PrologPrinter.php

@@ -36,7 +36,7 @@ class PrologPrinter extends FileExportPrinter {
 	 * {@inheritDoc}
 	 */
 	public function getName() {
-		return $this->msg( 'srf-printername-prolog' );
+		return $this->msg( 'srf-printername-prolog' )->text();
 	}
 
 	/**

formats/calendar/SRF_Calendar.php

@@ -393,7 +393,7 @@ public function displayCalendar( $events ) {
 			$lastDayOfWeek = 7;
 		} else {
 			$firstDayOfWeek =
-				array_search( $srfgFirstDayOfWeek, $weekDayNames );
+				array_search( wfMessage( $srfgFirstDayOfWeek )->text(), $weekDayNames );
 			if ( $firstDayOfWeek === false ) {
 				// Bad value for $srfgFirstDayOfWeek!
 				print 'Warning: Bad value for $srfgFirstDayOfWeek "' .