Merge pull request #1138 from WPChill/2.11.1

Release 2.11.1

Author: TeoAlex

Modula.php

@@ -4,7 +4,7 @@
 * Plugin URI:               https://wp-modula.com/
 * Description:              Modula is the most powerful, user-friendly WordPress gallery plugin. Add galleries, masonry grids and more in a few clicks.
 * Author:                   WPChill
-* Version:                  2.11.0
+* Version:                  2.11.1
 * Author URI:               https://www.wpchill.com/
 * License:                  GPLv3 or later
 * License URI:              http://www.gnu.org/licenses/gpl-3.0.html
@@ -47,7 +47,7 @@
  * @since    2.0.2
  */
 
-define( 'MODULA_LITE_VERSION', '2.11.0' );
+define( 'MODULA_LITE_VERSION', '2.11.1' );
 define( 'MODULA_PATH', plugin_dir_path( __FILE__ ) );
 define( 'MODULA_URL', plugin_dir_url( __FILE__ ) );
 defined( 'MODULA_PRO_STORE_URL' ) || define( 'MODULA_PRO_STORE_URL', 'https://wp-modula.com' );

apps/notification-system/notification/notification-actions.jsx

@@ -10,7 +10,7 @@ export function NotificationActions( { actions, id, onDismiss } ) {
 		}
 
 		if (action.dismiss) {
-			onDismiss(id);
+			onDismiss(id, action.permanent);
 		}
 	};
 

apps/notification-system/notification/notifications-list.jsx

@@ -14,8 +14,8 @@ export function NotificationsList() {
 	const { state, dispatch } = useModulaState();
 	const {visibleNotifications, openPanels} = state;
 
-	const dismissNotification = (id) => {
-		mutation.mutate( id, {
+	const dismissNotification = (id, permanent = false ) => {
+		mutation.mutate( {id, permanent}, {
 			onSettled: () => {
 				queryClient.invalidateQueries(['notifications']);
 			},

apps/notification-system/query/useNotificationDismiss.js

@@ -1,10 +1,12 @@
 import { useMutation } from '@tanstack/react-query';
 import apiFetch from '@wordpress/api-fetch';
 
-const dismissNotice = async ( id ) => {
+const dismissNotice = async ( data ) => {
+	console.error(data);
 	const response = await apiFetch( {
-		path: '/modula-api/v1/notifications/' + id,
+		path: '/modula-api/v1/notifications/',
 		method: 'DELETE',
+		data: data,
 	} );
 	return response;
 };

changelog.txt

@@ -1,3 +1,6 @@
+= 2.11.1 - 06.11.2024 =
+Changed: Notification action option to permanently dissmiss a notice.
+
 = 2.11.0 - 24.10.2024 =
 Added: Upload images from folder functionality
 Added: Upload images from zip file functionality

includes/admin/class-modula-notifications.php

@@ -8,8 +8,9 @@ class Modula_Notifications {
 
 	public static $instance;
 
-	public static $notification_prefix = 'modula_notification_';
-	private $hook_name                 = 'modula_notifications_remote';
+	public static $notification_prefix   = 'modula_notification_';
+	public static $blocked_notifications = 'modula_blocked_notifications';
+	private $hook_name                   = 'modula_notifications_remote';
 
 	public function __construct() {
 
@@ -30,6 +31,11 @@ public static function get_instance() {
 	}
 
 	public static function add_notification( $key, $notification ) {
+		$blocked = get_option( self::$blocked_notifications, array() );
+		if ( in_array( $key, $blocked, true ) ) {
+			return;
+		}
+
 		update_option( self::$notification_prefix . $key, $notification );
 	}
 
@@ -89,7 +95,13 @@ private function _get_options_wildcard( $option_pattern ) {
 		return $options;
 	}
 
-	public function clear_notification( $key ) {
+	public function clear_notification( $key, $permanent = false ) {
+		if ( $permanent ) {
+			$blocked   = get_option( self::$blocked_notifications, array() );
+			$blocked[] = $key;
+			update_option( self::$blocked_notifications, $blocked );
+		}
+
 		delete_option( self::$notification_prefix . $key );
 	}
 

includes/admin/class-modula-rest-api.php

@@ -46,9 +46,11 @@ public function register_routes() {
 	public function process_request( $request ) {
 		$manager = Modula_Notifications::get_instance();
 		if ( 'DELETE' === $request->get_method() ) {
-			$post_id = $request->get_param( 'id' );
+			$body    = $request->get_json_params();
+			$post_id = isset( $body['id'] ) ? $body['id'] : false;
 			if ( $post_id ) {
-				$manager->clear_notification( $post_id );
+				$permanent = isset( $body['permanent'] ) ? $body['permanent'] : false;
+				$manager->clear_notification( $post_id, $permanent );
 				return rest_ensure_response( true );
 			}
 			$manager->clear_notifications();

includes/admin/class-modula-upsells.php

@@ -1171,6 +1171,11 @@ public function get_modal_bulk_editor_upgrade() {
 		if ( $this->wpchill_upsells && ! $this->wpchill_upsells->is_upgradable_addon( 'modula' ) ) {
 			wp_die();
 		}
+		$settings = array(
+			'classes'     => '',
+			'dismissible' => true,
+			'id'          => 'modula-modal-bulk-editor-upgrade-' . get_the_ID(),
+		);
 
 		require MODULA_PATH . '/includes/admin/templates/modal/modula-modal-bulk-editor-upgrade.php';
 		wp_die();

package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "modula-best-grid-gallery",
-	"version": "2.11.0",
+	"version": "2.11.1",
 	"description": "Modula Image Gallery build tools",
 	"author": "WPChill",
 	"license": "GPL-2.0-or-later",