← All changes
|
modules/global-classes/global-classes-rest-api.php
+13
-178
4.0.9
→
3.29.0-beta4
View file →
| @@ -1,12 +1,10 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | namespace Elementor\Modules\GlobalClasses; |
| 4 | 4 | |
| 5 | -use Elementor\Modules\GlobalClasses\Usage\Applied_Global_Classes_Usage; | |
| 6 | -use Elementor\Core\Utils\Api\Error_Builder; | |
| 7 | -use Elementor\Core\Utils\Api\Response_Builder; | |
| 8 | -use Elementor\Modules\GlobalClasses\Database\Migrations\Add_Capabilities; | |
| 5 | +use Elementor\Modules\GlobalClasses\Utils\Error_Builder; | |
| 6 | +use Elementor\Modules\GlobalClasses\Utils\Response_Builder; | |
| 9 | 7 | |
| 10 | 8 | if ( ! defined( 'ABSPATH' ) ) { |
| 11 | 9 | exit; // Exit if accessed directly. |
| 12 | 10 | } |
| @@ -13,12 +11,11 @@ | ||
| 13 | 11 | |
| 14 | 12 | class Global_Classes_REST_API { |
| 15 | 13 | const API_NAMESPACE = 'elementor/v1'; |
| 16 | 14 | const API_BASE = 'global-classes'; |
| 17 | - const API_BASE_USAGE = self::API_BASE . '/usage'; | |
| 18 | - const MAX_ITEMS = 100; | |
| 19 | - const LABEL_PREFIX = 'DUP_'; | |
| 20 | - const MAX_LABEL_LENGTH = 50; | |
| 15 | + | |
| 16 | + const MAX_ITEMS = 50; | |
| 17 | + | |
| 21 | 18 | private $repository = null; |
| 22 | 19 | |
| 23 | 20 | public function register_hooks() { |
| 24 | 21 | add_action( 'rest_api_init', fn() => $this->register_routes() ); |
| @@ -36,26 +33,8 @@ | ||
| 36 | 33 | register_rest_route( self::API_NAMESPACE, '/' . self::API_BASE, [ |
| 37 | 34 | [ |
| 38 | 35 | 'methods' => 'GET', |
| 39 | 36 | 'callback' => fn( $request ) => $this->route_wrapper( fn() => $this->all( $request ) ), |
| 40 | - 'permission_callback' => fn() => is_user_logged_in(), | |
| 41 | - 'args' => [ | |
| 42 | - 'context' => [ | |
| 43 | - 'type' => 'string', | |
| 44 | - 'required' => false, | |
| 45 | - 'default' => Global_Classes_Repository::CONTEXT_FRONTEND, | |
| 46 | - 'enum' => [ | |
| 47 | - Global_Classes_Repository::CONTEXT_FRONTEND, | |
| 48 | - Global_Classes_Repository::CONTEXT_PREVIEW, | |
| 49 | - ], | |
| 50 | - ], | |
| 51 | - ], | |
| 52 | - ], | |
| 53 | - ] ); | |
| 54 | - | |
| 55 | - register_rest_route( self::API_NAMESPACE, '/' . self::API_BASE_USAGE, [ | |
| 56 | - [ | |
| 57 | - 'callback' => fn() => $this->route_wrapper( fn() => $this->get_usage() ), | |
| 58 | 37 | 'permission_callback' => fn() => current_user_can( 'manage_options' ), |
| 59 | 38 | 'args' => [ |
| 60 | 39 | 'context' => [ |
| 61 | 40 | 'type' => 'string', |
| @@ -73,9 +52,9 @@ | ||
| 73 | 52 | register_rest_route( self::API_NAMESPACE, '/' . self::API_BASE, [ |
| 74 | 53 | [ |
| 75 | 54 | 'methods' => 'PUT', |
| 76 | 55 | 'callback' => fn( $request ) => $this->route_wrapper( fn() => $this->put( $request ) ), |
| 77 | - 'permission_callback' => fn() => current_user_can( Add_Capabilities::UPDATE_CLASS ), | |
| 56 | + 'permission_callback' => fn() => current_user_can( 'manage_options' ), | |
| 78 | 57 | 'args' => [ |
| 79 | 58 | 'context' => [ |
| 80 | 59 | 'type' => 'string', |
| 81 | 60 | 'required' => false, |
| @@ -84,30 +63,8 @@ | ||
| 84 | 63 | Global_Classes_Repository::CONTEXT_FRONTEND, |
| 85 | 64 | Global_Classes_Repository::CONTEXT_PREVIEW, |
| 86 | 65 | ], |
| 87 | 66 | ], |
| 88 | - 'changes' => [ | |
| 89 | - 'type' => 'object', | |
| 90 | - 'required' => true, | |
| 91 | - 'additionalProperties' => false, | |
| 92 | - 'properties' => [ | |
| 93 | - 'added' => [ | |
| 94 | - 'type' => 'array', | |
| 95 | - 'required' => true, | |
| 96 | - 'items' => [ 'type' => 'string' ], | |
| 97 | - ], | |
| 98 | - 'deleted' => [ | |
| 99 | - 'type' => 'array', | |
| 100 | - 'required' => true, | |
| 101 | - 'items' => [ 'type' => 'string' ], | |
| 102 | - ], | |
| 103 | - 'modified' => [ | |
| 104 | - 'type' => 'array', | |
| 105 | - 'required' => true, | |
| 106 | - 'items' => [ 'type' => 'string' ], | |
| 107 | - ], | |
| 108 | - ], | |
| 109 | - ], | |
| 110 | 67 | 'items' => [ |
| 111 | 68 | 'required' => true, |
| 112 | 69 | 'type' => 'object', |
| 113 | 70 | 'additionalProperties' => [ |
| @@ -154,27 +111,10 @@ | ||
| 154 | 111 | ->set_meta( [ 'order' => $classes->get_order()->all() ] ) |
| 155 | 112 | ->build(); |
| 156 | 113 | } |
| 157 | 114 | |
| 158 | - private function get_usage() { | |
| 159 | - $classes_usage = ( new Applied_Global_Classes_Usage() )->get_detailed_usage(); | |
| 160 | - | |
| 161 | - return Response_Builder::make( (object) $classes_usage )->build(); | |
| 162 | - } | |
| 163 | - | |
| 164 | 115 | private function put( \WP_REST_Request $request ) { |
| 165 | - $context = $request->get_param( 'context' ); | |
| 166 | - $changes = $request->get_param( 'changes' ) ?? []; | |
| 167 | - $new_added_items_ids = $changes['added'] ?? []; | |
| 168 | 116 | $parser = Global_Classes_Parser::make(); |
| 169 | - $existing_labels = Global_Classes_Repository::make() | |
| 170 | - ->context( $context ) | |
| 171 | - ->all() | |
| 172 | - ->get_items() | |
| 173 | - ->map( function ( $item ) { | |
| 174 | - return $item['label']; | |
| 175 | - } ) | |
| 176 | - ->all(); | |
| 177 | 117 | |
| 178 | 118 | $items_result = $parser->parse_items( |
| 179 | 119 | $request->get_param( 'items' ) |
| 180 | 120 | ); |
| @@ -180,20 +120,15 @@ | ||
| 180 | 120 | ); |
| 181 | 121 | |
| 182 | 122 | $items_count = count( $items_result->unwrap() ); |
| 183 | 123 | |
| 184 | - if ( $items_count > self::MAX_ITEMS ) { | |
| 124 | + if ( $items_count >= static::MAX_ITEMS ) { | |
| 185 | 125 | return Error_Builder::make( 'global_classes_limit_exceeded' ) |
| 186 | 126 | ->set_status( 400 ) |
| 187 | - ->set_meta([ | |
| 188 | - 'current_count' => $items_count, | |
| 189 | - 'max_allowed' => self::MAX_ITEMS, | |
| 190 | - ]) | |
| 191 | - ->set_message(sprintf( | |
| 192 | - /* translators: %d: Maximum allowed items. */ | |
| 127 | + ->set_message( sprintf( | |
| 193 | 128 | __( 'Global classes limit exceeded. Maximum allowed: %d', 'elementor' ), |
| 194 | - self::MAX_ITEMS | |
| 195 | - )) | |
| 129 | + static::MAX_ITEMS | |
| 130 | + ) ) | |
| 196 | 131 | ->build(); |
| 197 | 132 | } |
| 198 | 133 | |
| 199 | 134 | if ( ! $items_result->is_valid() ) { |
| @@ -214,46 +149,15 @@ | ||
| 214 | 149 | ->set_message( 'Invalid order: ' . $order_result->errors()->to_string() ) |
| 215 | 150 | ->build(); |
| 216 | 151 | } |
| 217 | 152 | |
| 218 | - $repository = $this->get_repository() | |
| 219 | - ->context( $request->get_param( 'context' ) ); | |
| 153 | + $context = $request->get_param( 'context' ); | |
| 220 | 154 | |
| 221 | - $changes_resolver = Global_Classes_Changes_Resolver::make( | |
| 222 | - $repository, | |
| 223 | - $changes, | |
| 224 | - ); | |
| 225 | - | |
| 226 | - $duplicated_labels = Global_Classes_Parser::check_for_duplicate_labels( | |
| 227 | - $existing_labels, | |
| 155 | + $this->get_repository()->context( $context )->put( | |
| 228 | 156 | $items_result->unwrap(), |
| 229 | - $new_added_items_ids | |
| 157 | + $order_result->unwrap(), | |
| 230 | 158 | ); |
| 231 | 159 | |
| 232 | - $final_items = $items_result->unwrap(); | |
| 233 | - $duplicate_validation_result = null; | |
| 234 | - | |
| 235 | - if ( ! empty( $duplicated_labels ) ) { | |
| 236 | - $modified_labels = $this->handle_duplicates( $duplicated_labels, $existing_labels ); | |
| 237 | - $duplicate_validation_result = $modified_labels; | |
| 238 | - foreach ( $modified_labels as $item_id => $labels ) { | |
| 239 | - $final_items[ $item_id ]['label'] = $labels['modified']; | |
| 240 | - } | |
| 241 | - } | |
| 242 | - | |
| 243 | - $repository->put( | |
| 244 | - $changes_resolver->resolve_items( $final_items ), | |
| 245 | - $changes_resolver->resolve_order( $order_result->unwrap() ), | |
| 246 | - ); | |
| 247 | - | |
| 248 | - if ( $duplicate_validation_result ) { | |
| 249 | - $response_data = [ | |
| 250 | - 'code' => 'DUPLICATED_LABEL', | |
| 251 | - 'modifiedLabels' => $duplicate_validation_result, | |
| 252 | - ]; | |
| 253 | - return Response_Builder::make( $response_data )->build(); | |
| 254 | - } | |
| 255 | - | |
| 256 | 160 | return Response_Builder::make()->no_content()->build(); |
| 257 | 161 | } |
| 258 | 162 | |
| 259 | 163 | private function route_wrapper( callable $cb ) { |
| @@ -265,75 +169,6 @@ | ||
| 265 | 169 | ->build(); |
| 266 | 170 | } |
| 267 | 171 | |
| 268 | 172 | return $response; |
| 269 | - } | |
| 270 | - | |
| 271 | - private function handle_duplicates( array $duplicate_labels, array $existing_labels ) { | |
| 272 | - | |
| 273 | - $modified_labels = []; | |
| 274 | - | |
| 275 | - foreach ( $duplicate_labels as $duplicate_label ) { | |
| 276 | - $item_id = $duplicate_label['item_id']; | |
| 277 | - $original_label = $duplicate_label['label']; | |
| 278 | - | |
| 279 | - $modified_label = $this->generate_unique_label( $original_label, $existing_labels ); | |
| 280 | - | |
| 281 | - $modified_labels[ $item_id ] = [ | |
| 282 | - 'original' => $original_label, | |
| 283 | - 'modified' => $modified_label, | |
| 284 | - ]; | |
| 285 | - } | |
| 286 | - | |
| 287 | - return $modified_labels; | |
| 288 | - } | |
| 289 | - | |
| 290 | - | |
| 291 | - private function generate_unique_label( $original_label, $existing_labels ) { | |
| 292 | - $prefix = self::LABEL_PREFIX; | |
| 293 | - $max_length = self::MAX_LABEL_LENGTH; | |
| 294 | - | |
| 295 | - $has_prefix = strpos( $original_label, $prefix ) === 0; | |
| 296 | - | |
| 297 | - if ( $has_prefix ) { | |
| 298 | - $base_label = substr( $original_label, strlen( $prefix ) ); | |
| 299 | - | |
| 300 | - $counter = 1; | |
| 301 | - $new_label = $prefix . $base_label . $counter; | |
| 302 | - | |
| 303 | - while ( in_array( $new_label, $existing_labels, true ) ) { | |
| 304 | - ++$counter; | |
| 305 | - $new_label = $prefix . $base_label . $counter; | |
| 306 | - } | |
| 307 | - | |
| 308 | - if ( strlen( $new_label ) > $max_length ) { | |
| 309 | - $available_length = $max_length - strlen( $prefix . $counter ); | |
| 310 | - $base_label = substr( $base_label, 0, $available_length ); | |
| 311 | - $new_label = $prefix . $base_label . $counter; | |
| 312 | - } | |
| 313 | - } else { | |
| 314 | - $new_label = $prefix . $original_label; | |
| 315 | - | |
| 316 | - if ( strlen( $new_label ) > $max_length ) { | |
| 317 | - $available_length = $max_length - strlen( $prefix ); | |
| 318 | - $new_label = $prefix . substr( $original_label, 0, $available_length ); | |
| 319 | - } | |
| 320 | - | |
| 321 | - $counter = 1; | |
| 322 | - $base_label = substr( $original_label, 0, $available_length ?? strlen( $original_label ) ); | |
| 323 | - | |
| 324 | - while ( in_array( $new_label, $existing_labels, true ) ) { | |
| 325 | - $new_label = $prefix . $base_label . $counter; | |
| 326 | - | |
| 327 | - if ( strlen( $new_label ) > $max_length ) { | |
| 328 | - $available_length = $max_length - strlen( $prefix . $counter ); | |
| 329 | - $base_label = substr( $original_label, 0, $available_length ); | |
| 330 | - $new_label = $prefix . $base_label . $counter; | |
| 331 | - } | |
| 332 | - | |
| 333 | - ++$counter; | |
| 334 | - } | |
| 335 | - } | |
| 336 | - | |
| 337 | - return $new_label; | |
| 338 | 173 | } |
| 339 | 174 | } |