Merge pull request 'Improve query args modification with term relationship' (#4) from query-block into main

Reviewed-on: #4

.gitea/workflows/release.yml

@@ -26,4 +26,4 @@ jobs:
         uses: akkuman/gitea-release-action@v1
         with:
           files: |-
-            *.zip
+            dist/*.zip

.gitignore

@@ -2,3 +2,4 @@ vendor
 lib
 node_modules
 *.zip
+dist

composer.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://getcomposer.org/schema.json",
     "name": "cleverogre/ogre-sort",
-    "version": "1.0.0",
+    "version": "1.1.1",
     "title": "Ogre Sort",
     "description": "WordPress plugin which enables drag-and-drop sorting within the admin area for posts, terms, and posts within terms.",
     "author": "CleverOgre",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "fe877c0f300b012a3667fb458d1768b3",
+    "content-hash": "0e7b2523bace7acb04e7c97d1e711d62",
     "packages": [
         {
             "name": "cleverogre/plugin-framework",

gulpfile.js

@@ -1,19 +1,37 @@
-const gulp = require('gulp'),
+const fs = require('fs'),
+	gulp = require('gulp'),
 	clean = require('gulp-clean'),
-	path = require('path'),
 	zip = require('gulp-zip').default;
 
-const NAME = path.basename(__dirname);
+const PACKAGE = require('./package.json');
+const NAME = PACKAGE.name.split('/').pop();
 
 // Clean Tasks
 
-gulp.task('clean-package', () => {
-	return gulp.src(`${NAME}.zip`, {
+gulp.task('clean-package-files', (done) => {
+	if (!fs.existsSync('./dist')) return done();
+	return gulp.src(`./dist/${NAME}`, {
 		read: false,
 		allowEmpty: true,
 	}).pipe(clean());
 });
 
+gulp.task('clean-package-zip', (done) => {
+	if (!fs.existsSync('./dist')) return done();
+	return gulp.src('./dist/*.zip', {
+		read: false,
+		allowEmpty: true,
+	}).pipe(clean());
+});
+
+gulp.task(
+	'clean-package',
+	gulp.series(
+		'clean-package-files',
+		'clean-package-zip'
+	)
+);
+
 gulp.task(
 	'clean',
 	gulp.series(
@@ -23,7 +41,7 @@ gulp.task(
 
 // Package Tasks
 
-gulp.task('package-compress', () => {
+gulp.task('package-copy', () => {
 	return gulp.src([
 		'assets/**/*',
 		'inc/**/*',
@@ -35,16 +53,26 @@ gulp.task('package-compress', () => {
 	], {
         base: './',
         encoding: false,
+    })
+		.pipe(gulp.dest(`./dist/${NAME}`));
+});
+
+gulp.task('package-compress', () => {
+	return gulp.src(`./dist/${NAME}/**/*`, {
+        base: './dist',
+        encoding: false,
     })
 		.pipe(zip(`${NAME}.zip`))
-		.pipe(gulp.dest('./'));
+		.pipe(gulp.dest('./dist'));
 });
 
 gulp.task(
 	'package',
 	gulp.series(
 		'clean',
-		'package-compress'
+		'package-copy',
+		'package-compress',
+		'clean-package-files'
 	)
 );
 

inc/class-refresh.php

@@ -0,0 +1,69 @@
+<?php
+/**
+ * @package ogre-sort
+ * @author cleverogre
+ * @copyright 2026 CleverOgre
+ * @license GLP-3.0-or-later
+ * @version 1.1.0
+ * @since 1.1.0
+ */
+
+namespace Ogre\Sort;
+
+use Ogre\Singleton;
+use Ogre\Sort as Plugin;
+
+defined('ABSPATH') || exit;
+
+final class Refresh {
+    use Singleton;
+
+    const CAPABILITY = 'manage_options';
+    const ACTION = 'ogre-sort-refresh';
+
+    protected function __construct() {
+        add_filter('plugin_action_links_' . Plugin::get_basename(), [$this, 'action_links'], 5);
+        add_action('admin_post_' . self::ACTION, [$this, 'handle_action']);
+        add_action('admin_notices', [$this, 'handle_notices']);
+    }
+
+    public function action_links($links) {
+        if (current_user_can(self::CAPABILITY)) {
+            array_unshift($links, sprintf(
+                '<a href="%s">%s</a>',
+                esc_url(add_query_arg([
+                    '_wpnonce' => wp_create_nonce(self::ACTION),
+                ], self::get_url())),
+                esc_html(Plugin::__('Refresh'))
+            ));
+        }
+        return $links;
+    }
+
+    public function handle_action():void {
+        if (!current_user_can(self::CAPABILITY)) wp_die(Plugin::__('Invalid request.'));
+        check_admin_referer(self::ACTION);
+
+        Sort::instance()->refresh_all();
+
+        wp_redirect(add_query_arg([
+            self::ACTION => '1',
+        ], Settings::get_url()));
+        exit;
+    }
+
+    public function handle_notices():void {
+        if (!current_user_can(self::CAPABILITY) || !isset($_GET['page']) || $_GET['page'] != Plugin::get_id() || !isset($_GET[self::ACTION])) return;
+        printf(
+            '<div class="notice notice-success is-dismissable"><p>%s</p></div>',
+            Plugin::esc_html__('All sort relationships successfully refreshed!')
+        );
+    }
+
+    public static function get_url():string {
+        return admin_url('admin-post.php?action=' . self::ACTION);
+    }
+
+}
+
+Refresh::instance();

inc/class-settings.php

@@ -2,9 +2,9 @@
 /**
  * @package ogre-sort
  * @author cleverogre
- * @copyright 2025 CleverOgre
+ * @copyright 2026 CleverOgre
  * @license GLP-3.0-or-later
- * @version 1.0.0
+ * @version 1.1.1
  * @since 1.0.0
  */
 
@@ -196,12 +196,13 @@ final class Settings {
 
         echo implode('<br>', array_map(
             fn (object $option):string => sprintf(
-                '<label><input type="checkbox" name="%s[%s][]" value="%s" %s>&nbsp;%s</label>',
+                '<label><input type="checkbox" name="%s[%s][]" value="%s" %s>&nbsp;%s (%s)</label>',
                 esc_attr(Plugin::get_id()),
                 esc_attr($name),
                 esc_attr($option->name),
                 checked($this->is_checked($name, $option->name), display: false),
-                esc_html($option->label)
+                esc_html($option->label),
+                esc_html($option->name)
             ),
             $options
         ));

inc/class-sort.php

@@ -4,7 +4,7 @@
  * @author cleverogre
  * @copyright 2025 CleverOgre
  * @license GLP-3.0-or-later
- * @version 1.0.0
+ * @version 1.1.0
  * @since 1.0.0
  */
 
@@ -88,6 +88,15 @@ final class Sort {
         // Post Updating
         add_action('save_post', [$this, 'save_post'], 10, 3);
 
+        // Ajax
+        add_action('wp_ajax_ogre_sort', [$this, 'sort']);
+
+        $this->enable();
+    }
+
+    protected function enable():void {
+        if (empty($this->relationships)) return;
+        
         // Post Types
         add_action('pre_get_posts', [$this, 'pre_get_posts'], 10, 1);
         add_filter('get_previous_post_where', [$this, 'previous_post_where']);
@@ -101,9 +110,24 @@ final class Sort {
         add_filter('wp_get_object_terms', [$this, 'wp_get_object_terms'], 10, 4);
         add_filter('get_terms', [$this, 'get_terms'], 10, 4);
         add_action('create_term', [$this, 'add_term_relationship'], 10, 3);
+    }
 
-        // Ajax
-        add_action('wp_ajax_ogre_sort', [$this, 'sort']);
+    protected function disable():void {
+        if (empty($this->relationships)) return;
+
+        // Post Types
+        remove_action('pre_get_posts', [$this, 'pre_get_posts'], 10, 1);
+        remove_filter('get_previous_post_where', [$this, 'previous_post_where']);
+        remove_filter('get_previous_post_sort', [$this, 'previous_post_sort']);
+        remove_filter('get_next_post_where', [$this, 'next_post_where']);
+        remove_filter('get_next_post_sort', [$this, 'next_post_sort']);
+
+        // Taxonomy
+        remove_filter('terms_clauses', [$this, 'terms_clauses'], 10, 3);
+        remove_filter('get_terms_orderby', [$this, 'get_terms_orderby'], 10, 3);
+        remove_filter('wp_get_object_terms', [$this, 'wp_get_object_terms'], 10, 4);
+        remove_filter('get_terms', [$this, 'get_terms'], 10, 4);
+        remove_action('create_term', [$this, 'add_term_relationship'], 10, 3);
     }
 
     public function current_screen() {
@@ -276,17 +300,18 @@ final class Sort {
                     foreach ($wp_query->query['tax_query'] as $tax) {
                         if (!isset($tax['taxonomy'])) continue;
                         if ($current_relationship['taxonomy'] != $tax['taxonomy']) continue;
-                        $term_by = $tax['field'];
+                        $term_by = $tax['field'] ?? 'term_id';
                         $term_id = $tax['terms'];
                         break;
                     }
                 } else if ($current_relationship['taxonomy'] === 'category' && isset($wp_query->query['category_name'])) {
                     $term_id = $wp_query->query['category_name'];
                 }
-                if (empty($term_id)) break;
+                if (is_array($term_id)) $term_id = array_values($term_id)[0];
+                if (empty($term_id)) return;
 
                 $term = get_term_by($term_by, $term_id, $current_relationship['taxonomy']);
-                if (!is_a($term, 'WP_Term')) break;
+                if (!is_a($term, 'WP_Term')) return;
 
                 $wp_query->set('meta_key', "ogre-sort_{$current_relationship['taxonomy']}_{$term->term_id}");
                 $wp_query->set('orderby', 'meta_value_num');
@@ -705,6 +730,8 @@ final class Sort {
     public function refresh($relationship) {
         global $wpdb;
 
+        $this->disable();
+
         switch ($relationship['type']) {
 
             case 'term':
@@ -841,6 +868,8 @@ final class Sort {
 
         }
 
+        $this->enable();
+
         return true;
     }
 

ogre-sort.php

@@ -4,16 +4,16 @@
  *
  * @package ogre-sort
  * @author cleverogre
- * @copyright 2025 CleverOgre
+ * @copyright 2026 CleverOgre
  * @license GLP-3.0-or-later
- * @version 1.0.0
+ * @version 1.1.1
  * @since 1.0.0
  *
  * @wordpress-plugin
  * Plugin Name:       Ogre Sort
  * Plugin URI:        https://plugins.cleverogre.com/plugin/ogre-sort/
  * Description:       WordPress plugin which enables drag-and-drop sorting within the admin area for posts, terms, and posts within terms.
- * Version:           1.0.0
+ * Version:           1.1.1
  * Requires at least: 5.0
  * Requires PHP:      8.0
  * Author:            CleverOgre
@@ -41,6 +41,7 @@ final class Sort extends Plugin {
         $this->add_files([
             'inc/class-settings.php',
             'inc/class-sort.php',
+            'inc/class-refresh.php',
         ]);
     }
 

package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "cleverogre/ogre-sort",
-	"version": "1.0.0",
+	"version": "1.1.0",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "cleverogre/ogre-sort",
-			"version": "1.0.0",
+			"version": "1.1.0",
 			"license": "GPL-3.0+",
 			"devDependencies": {
 				"gulp": "^5.0.0",
@@ -57,9 +57,9 @@
 			"license": "MIT"
 		},
 		"node_modules/@types/node": {
-			"version": "24.10.1",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz",
-			"integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
+			"version": "25.0.10",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz",
+			"integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1400,9 +1400,9 @@
 			}
 		},
 		"node_modules/fastq": {
-			"version": "1.19.1",
-			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
-			"integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==",
+			"version": "1.20.1",
+			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.20.1.tgz",
+			"integrity": "sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {

package.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://www.schemastore.org/package.json",
 	"name": "cleverogre/ogre-sort",
-	"version": "1.0.0",
+	"version": "1.1.1",
     "title": "Ogre Sort",
     "description": "WordPress plugin which enables drag-and-drop sorting within the admin area for posts, terms, and posts within terms.",
 	"author": "CleverOgre",

readme.txt

@@ -3,7 +3,7 @@ Contributors: ogrecooper, cleverogre
 Tested up to: 6.8
 Requires at least: 5.0
 Requires PHP: 8.0
-Version: 1.0.0
+Version: 1.1.1
 License: GPLv3 or later
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 Copyright: CleverOgre
@@ -28,5 +28,13 @@ If you don't know what plugin you have downloaded, please contact [CleverOgre](t
 
 == Changelog ==
 
+= 1.1.1 - 2026-02-03 =
+* Add name slugs to admin UI
+* Fix undefined array key notice
+
+= 1.1.0 - 2026-01-21 =
+* Add manual refresh action
+* Fix filtering issue during refresh
+
 = 1.0.0 - 2025-11-18 =
 * Initial release