Merge pull request #1148 from WPChill/2.11.4

2.11.4

Author: razvanaldea89

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.3
+* Version:                  2.11.4
 * 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.3' );
+define( 'MODULA_LITE_VERSION', '2.11.4' );
 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

@@ -3,7 +3,6 @@ import { Button } from '@wordpress/components';
 import he from 'he';
 
 export function NotificationActions( { actions, id, onDismiss } ) {
-
 	const handleClick = (action, id) => {
 		if (action.callback && typeof window[action.callback] === 'function') {
 			window[action.callback](action, id);
@@ -20,7 +19,7 @@ export function NotificationActions( { actions, id, onDismiss } ) {
 				<Button
 					key={index}
 					className={action.class || 'notification-action'}
-					{...(action.url ? { href: action.url } : {})}
+					{...(action.url ? { href: he.decode(action.url) } : {})}
 					{...(action.id ? { id: action.id } : {})}
 					target={action.target || ''}
 					text={he.decode(action.label || __('Action', 'modula-best-grid-gallery'))}

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

@@ -26,7 +26,6 @@ export function NotificationsList() {
     };
 
 	useEffect(() => {
-
 		visibleNotifications.forEach( (notification) => {
 			if (notification.timed && openPanels.includes( notification.id ) ) {
 				setTimeout(() => {

apps/notification-system/query/useNotificationDismiss.js

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

apps/notification-system/query/useNotificationQuery.js

@@ -5,7 +5,7 @@ export const useNotificationQuery = () => {
 		queryKey: ['notifications'],
 		queryFn: async () => {
 			const data = await apiFetch({
-				path: `/modula-api/v1/notifications`,
+				path: `/modula/v1/notifications`,
 				method: 'GET',
 			});
 			return data;

apps/notification-system/query/useNotificationsDismiss.js

@@ -3,7 +3,7 @@ import apiFetch from '@wordpress/api-fetch';
 
 const dismissNotices = () => {
 	const response = apiFetch( {
-		path: '/modula-api/v1/notifications',
+		path: '/modula/v1/notifications',
 		method: 'DELETE',
 	} );
 	return response;

assets/js/admin/notification-system/notification-system.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-components', 'wp-element', 'wp-i18n'), 'version' => '2b99bd8c07dd045879b3');
+<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-components', 'wp-element', 'wp-i18n'), 'version' => 'e9b0768b4f909a8b9e65');

assets/js/admin/notification-system/notification-system.js

@@ -2,6 +2,7 @@
 = 2.11.3 - 27.11.2024 =
 Fixed: PHP Warning
 Fixed: Gallery item has data-width and data-height on non-required gallery types
+Fixed: Notification action URL encoding
 
 = 2.11.2 - 20.11.2024 =
 Added: Increased functionality for sanitization of gallery settings.

changelog.txt

@@ -5,7 +5,7 @@
 }
 
 class Modula_Rest_Api {
-	protected $namespace = 'modula-api/v1';
+	protected $namespace = 'modula/v1';
 
 	public function __construct() {
 		add_action( 'rest_api_init', array( $this, 'register_routes' ) );
@@ -17,7 +17,7 @@ public function register_routes() {
 			'/notifications',
 			array(
 				'methods'             => 'GET',
-				'callback'            => array( $this, 'process_request' ),
+				'callback'            => array( $this, 'get_notifications' ),
 				'permission_callback' => array( $this, '_permissions_check' ),
 			)
 		);
@@ -27,7 +27,7 @@ public function register_routes() {
 			'/notifications',
 			array(
 				'methods'             => 'DELETE',
-				'callback'            => array( $this, 'process_request' ),
+				'callback'            => array( $this, 'delete_notifications' ),
 				'permission_callback' => array( $this, '_permissions_check' ),
 			)
 		);
@@ -37,7 +37,7 @@ public function register_routes() {
 			'/notifications/(?P<id>[\w-]+)',
 			array(
 				'methods'             => 'DELETE',
-				'callback'            => array( $this, 'process_request' ),
+				'callback'            => array( $this, 'delete_notification' ),
 				'permission_callback' => array( $this, '_permissions_check' ),
 			)
 		);
@@ -74,6 +74,41 @@ function ( $carry, $item ) {
 		return rest_ensure_response( array() );
 	}
 
+	public function delete_notifications() {
+		$manager = Modula_Notifications::get_instance();
+		$manager->clear_notifications();
+		return rest_ensure_response( true );
+	}
+
+	public function delete_notification( $request ) {
+		$manager         = Modula_Notifications::get_instance();
+		$body            = $request->get_json_params();
+		$notification_id = $request->get_param( 'id' );
+
+		if ( ! $notification_id ) {
+			return rest_ensure_response( false );
+		}
+
+		$permanent = isset( $body['permanent'] ) ? $body['permanent'] : false;
+		$manager->clear_notification( $notification_id, $permanent );
+		return rest_ensure_response( true );
+	}
+
+	public function get_notifications() {
+		$manager       = Modula_Notifications::get_instance();
+		$notifications = $manager->get_notifications();
+
+		$is_empty = array_reduce(
+			$notifications,
+			function ( $carry, $item ) {
+				return $carry && empty( $item );
+			},
+			true
+		);
+
+		return rest_ensure_response( $is_empty ? array() : $notifications );
+	}
+
 	public function _permissions_check() {
 		return current_user_can( 'manage_options' );
 	}