PluginProbe
Elementor Website Builder – more than just a page builder / 4.1.0-beta1
Elementor Website Builder – more than just a page builder v4.1.0-beta1
4.3.3 4.3.2 4.3.1 4.3.0 4.3.0-beta3 4.3.0-beta2 4.3.0-beta1 4.2.4 4.2.3 4.2.2 4.2.1 4.2.0 4.1.5 4.2.0-beta2 4.2.0-dev2 4.2.0-beta1 4.1.4 4.1.3 4.1.2 4.1.1 4.1.0 4.1.0-beta3 4.1.0-dev3 4.0.9 4.1.0-beta2 All 456 releases
← All changes | modules/global-classes/global-classes-repository.php +98 -190 4.3.0-beta1 → 4.1.0-beta1 View file →
@@ -2,11 +2,10 @@
2 2 namespace Elementor\Modules\GlobalClasses;
3 3
4 4 use Elementor\Core\Kits\Documents\Kit;
5 5 use Elementor\Modules\DesignSystemSync\Classes\Global_Classes_Sync_Map;
6 -use Elementor\Core\Kits\Concerns\Has_Kit_Dependency;
6 +use Elementor\Modules\GlobalClasses\Concerns\Has_Kit_Dependency;
7 7 use Elementor\Modules\GlobalClasses\Concerns\Has_Preview_Context;
8 -use Elementor\Modules\GlobalClasses\Utils\Global_Class_Data_Normalizer;
9 8
10 9 if ( ! defined( 'ABSPATH' ) ) {
11 10 exit; // Exit if accessed directly.
12 11 }
@@ -28,8 +27,12 @@
28 27 'event' => [
29 28 'frontend' => self::CONTEXT_FRONTEND,
30 29 'preview' => self::CONTEXT_PREVIEW,
31 30 ],
31 + 'meta_key' => [
32 + 'frontend' => self::META_KEY_FRONTEND,
33 + 'preview' => self::META_KEY_PREVIEW,
34 + ],
32 35 ];
33 36
34 37 private ?Global_Classes $cache = null;
35 38
@@ -66,15 +69,13 @@
66 69 return $this->labels()->get_ordered_labels();
67 70 }
68 71
69 72 public function get_order(): array {
70 - return Global_Classes_Order::make( $this->get_kit() )->set_preview( $this->is_preview() )->get_order();
73 + return Global_Classes_Order::make( $this->get_kit() )->get_order();
71 74 }
72 75
73 76 public function update_order_and_labels( array $order, array $new_labels ): void {
74 - Global_Classes_Order::make( $this->get_kit() )
75 - ->set_preview( $this->is_preview() )
76 - ->set_order( $order );
77 + Global_Classes_Order::make( $this->get_kit() )->set_order( $order );
77 78
78 79 $labels = $this->labels();
79 80 $existing_labels = $labels->get_labels();
80 81
@@ -91,9 +92,9 @@
91 92 return Global_Classes_Labels::make( $this->get_kit() )->set_preview( $this->is_preview() );
92 93 }
93 94
94 95 public function get( string $class_id ): ?array {
95 - $post = Global_Class_Post::find_by_class_id( $class_id, $this->is_preview(), $this->get_kit() );
96 + $post = Global_Class_Post::find_by_class_id( $class_id, $this->is_preview() );
96 97
97 98 return $post ? $post->to_array() : null;
98 99 }
99 100
@@ -101,17 +102,13 @@
101 102 if ( empty( $class_ids ) ) {
102 103 return [];
103 104 }
104 105
105 - $post_ids = Global_Classes_Post_IDs::make( $this->get_kit() )->get_post_ids( $class_ids );
106 106 $items = [];
107 107
108 - foreach ( $post_ids as $class_id => $post_id ) {
109 - $post = Global_Class_Post::from_post_id( $post_id, $this->is_preview() );
110 -
111 - if ( $post ) {
112 - $items[ $class_id ] = $post->to_array();
113 - }
108 + foreach ( $this->iterate_class_posts_for_ids( $class_ids ) as $class_post ) {
109 + $class_data = $class_post->to_array();
110 + $items[ $class_data['id'] ] = $class_data;
114 111 }
115 112
116 113 return $items;
117 114 }
@@ -133,28 +130,24 @@
133 130 $final_label_map[ $id ] = $before[ $id ];
134 131 }
135 132 }
136 133
137 - $affected_post_ids = $this->get_posts_affected_by_deletion( $to_delete );
138 -
139 134 $this->persist_class_batch_mutations( $to_delete, $to_create, $to_update, $touched_items, $is_preview );
140 135
141 - $classes_order = Global_Classes_Order::make( $this->get_kit() )->set_preview( $this->is_preview() );
136 + $classes_order = Global_Classes_Order::make( $this->get_kit() );
142 137 $classes_order->set_order( $order );
143 138 $labels->set_labels( $final_label_map );
144 139
145 140 if ( ! $is_preview ) {
146 141 Global_Classes_Sync_Map::make( $this->get_kit() )->apply_changes( $touched_items, $to_delete );
147 - Global_Classes_Order::make( $this->get_kit() )
148 - ->set_preview( true )
149 - ->set_order( $order );
150 142
151 - $this->bulk_clear_preview_meta( array_values( $to_update ) );
152 - $this->clear_preview_labels_for_ids( array_merge(
153 - array_values( $to_create ),
154 - array_values( $to_update ),
155 - array_values( $to_delete )
156 - ) );
143 + $this->each_class_id_batch( array_values( $to_update ), function ( string $class_id ) {
144 + $post = Global_Class_Post::find_by_class_id( $class_id, false );
145 + if ( $post ) {
146 + delete_post_meta( $post->get_post_id(), Global_Class_Post::META_KEY_DATA_PREVIEW );
147 + clean_post_cache( $post->get_post_id() );
148 + }
149 + } );
157 150 }
158 151
159 152 $this->cache = null;
160 153 $this->flush_runtime_cache();
@@ -163,18 +156,9 @@
163 156 'added' => $to_create,
164 157 'deleted' => $to_delete,
165 158 'modified' => $to_update,
166 159 'order' => $order_changed,
167 - 'affected_post_ids' => $affected_post_ids,
168 160 ] );
169 -
170 - if ( ! empty( $to_delete ) && ! $is_preview ) {
171 - do_action(
172 - 'elementor/global_classes/cleanup',
173 - $to_delete,
174 - $affected_post_ids
175 - );
176 - }
177 161 }
178 162
179 163 public function each_item( callable $cb, bool $skip_migration = false, int $batch_size = self::READ_BATCH_SIZE ): void {
180 164 $order = Global_Classes_Order::make( $this->get_kit() )->get_order();
@@ -190,69 +174,31 @@
190 174 }
191 175 }
192 176
193 177 public function put( array $items, array $order ) {
194 - $current_ids = Global_Classes_Order::make( $this->get_kit() )
195 - ->set_preview( $this->is_preview() )
196 - ->get_order();
178 + $current_ids = Global_Classes_Order::make( $this->get_kit() )->get_order();
197 179
198 180 $new_ids = array_keys( $items );
181 +
199 182 $current_order_string = implode( ';', $current_ids );
200 - $deleted_class_ids = array_values( array_diff( $current_ids, $new_ids ) );
201 183
202 184 $changes = [
203 185 'added' => array_values( array_diff( $new_ids, $current_ids ) ),
204 - 'deleted' => $deleted_class_ids,
186 + 'deleted' => array_values( array_diff( $current_ids, $new_ids ) ),
205 187 'modified' => array_values( array_intersect( $new_ids, $current_ids ) ),
206 188 'order' => implode( ';', $order ) !== $current_order_string,
207 189 ];
208 190
209 - /**
210 - * We collect all affected ids before the put_to_posts execution
211 - * as the update mechanism would handle the Global_Classes_Relations as it iterates over the update batches
212 - * So once we get to the cleanup phase - we would no longer have the relevant relations
213 - *
214 - * On top of that - by collecting all affected posts in advance, means we would iterate over each document's elements only once
215 - * (as the alternative would be to trigger the cleanup per removed class, but that means we may end up iterating over the same document N times, if all N styles are used in it)
216 - */
217 - $affected_post_ids = $this->get_posts_affected_by_deletion( $deleted_class_ids );
218 -
219 191 $this->put_to_posts( $items, $order, $current_ids );
220 192
221 193 $this->cache = null;
222 194
223 - $changes['affected_post_ids'] = $affected_post_ids;
224 -
225 195 do_action( 'elementor/global_classes/update', $this->get_context_key( 'event' ), $changes );
226 -
227 - if ( ! empty( $deleted_class_ids ) && ! $this->is_preview() ) {
228 - do_action(
229 - 'elementor/global_classes/cleanup',
230 - $deleted_class_ids,
231 - $affected_post_ids
232 - );
233 - }
234 196 }
235 197
236 - private function get_posts_affected_by_deletion( array $deleted_class_ids ): array {
237 - if ( empty( $deleted_class_ids ) ) {
238 - return [];
239 - }
240 -
241 - $relations = new Global_Classes_Relations();
242 - $post_ids = [];
243 -
244 - foreach ( $deleted_class_ids as $class_id ) {
245 - $post_ids[] = $relations->get_posts_by_style( $class_id );
246 - }
247 -
248 - return array_values( array_unique( array_merge( ...$post_ids ) ) );
249 - }
250 -
251 198 private function all_from_posts(): Global_Classes {
252 - $order = Global_Classes_Order::make( $this->get_kit() )
253 - ->set_preview( $this->is_preview() )
254 - ->get_order();
199 + $classes_order = Global_Classes_Order::make( $this->get_kit() );
200 + $order = $classes_order->get_order();
255 201
256 202 if ( empty( $order ) ) {
257 203 return Global_Classes::make( [], [] );
258 204 }
@@ -278,9 +224,9 @@
278 224 $to_update = array_intersect( $new_ids, $current_ids );
279 225
280 226 $this->persist_class_batch_mutations( $to_delete, $to_create, $to_update, $items, $is_preview );
281 227
282 - $classes_order = Global_Classes_Order::make( $this->get_kit() )->set_preview( $this->is_preview() );
228 + $classes_order = Global_Classes_Order::make( $this->get_kit() );
283 229 $classes_order->set_order( $order );
284 230
285 231 $label_map = [];
286 232 foreach ( $order as $id ) {
@@ -297,14 +243,15 @@
297 243 array_flip( $touched_ids )
298 244 );
299 245 Global_Classes_Sync_Map::make( $this->get_kit() )->apply_changes( $touched_items, array_values( $to_delete ) );
300 246
301 - $this->bulk_clear_preview_meta( array_values( $to_update ) );
302 - $this->clear_preview_labels_for_ids( array_merge(
303 - array_values( $to_create ),
304 - array_values( $to_update ),
305 - array_values( $to_delete )
306 - ) );
247 + $this->each_class_id_batch( array_values( $to_update ), function ( string $class_id ) {
248 + $post = Global_Class_Post::find_by_class_id( $class_id, false );
249 + if ( $post ) {
250 + delete_post_meta( $post->get_post_id(), Global_Class_Post::META_KEY_DATA_PREVIEW );
251 + clean_post_cache( $post->get_post_id() );
252 + }
253 + } );
307 254 }
308 255 }
309 256
310 257 private function iterate_class_posts_for_ids( array $class_ids ): \Generator {
@@ -321,13 +268,28 @@
321 268 ],
322 269 ],
323 270 ] );
324 271
272 + $seen_class_ids = [];
273 +
325 274 foreach ( $posts as $post ) {
275 + $class_id = get_post_meta( $post->ID, Global_Class_Post::META_KEY_ID, true );
276 +
277 + if ( $class_id && isset( $seen_class_ids[ $class_id ] ) ) {
278 + // if for some reason there's already a post meta to that class - delete any other ones
279 + // otherwise we may end up updating a stale post meta
280 + wp_delete_post( $post->ID, true );
281 + continue;
282 + }
283 +
284 + if ( $class_id ) {
285 + $seen_class_ids[ $class_id ] = true;
286 + }
287 +
326 288 yield Global_Class_Post::from_post( $post, $this->is_preview() );
327 289 clean_post_cache( $post->ID );
328 290 }
329 - unset( $posts );
291 + unset( $posts, $seen_class_ids );
330 292 $this->flush_runtime_cache();
331 293 }
332 294 }
333 295
@@ -338,28 +300,13 @@
338 300 array $items_by_id,
339 301 bool $is_preview
340 302 ): void {
341 303 $relations = new Global_Classes_Relations();
342 - $post_ids_map = Global_Classes_Post_IDs::make( $this->get_kit() );
343 304
344 - $ids_to_resolve = array_values( array_merge(
345 - array_values( $to_delete ),
346 - array_values( $to_update ),
347 - array_values( $to_create )
348 - ) );
349 - $post_ids = $post_ids_map->get_post_ids( $ids_to_resolve );
305 + $this->each_class_id_batch( array_values( $to_delete ), function ( string $class_id ) use ( $is_preview, $relations ) {
306 + $post = Global_Class_Post::find_by_class_id( $class_id, false );
350 307
351 - $this->each_class_id_batch(
352 - array_values( $to_delete ),
353 - function ( string $class_id ) use ( $is_preview, $relations, $post_ids ) {
354 - $post = isset( $post_ids[ $class_id ] )
355 - ? Global_Class_Post::from_post_id( $post_ids[ $class_id ], false )
356 - : null;
357 -
358 - if ( ! $post ) {
359 - return;
360 - }
361 -
308 + if ( $post ) {
362 309 if ( $is_preview ) {
363 310 $post->set_preview( true );
364 311 $post->update_data( [] );
365 312 clean_post_cache( $post->get_post_id() );
@@ -367,65 +314,57 @@
367 314 $relations->clear_class_relations( $class_id );
368 315 $post->delete();
369 316 }
370 317 }
371 - );
318 + } );
372 319
373 - $this->each_class_id_batch( $to_create, function ( string $class_id ) use ( $items_by_id, $is_preview, $post_ids, $post_ids_map ) {
320 + $this->each_class_id_batch( $to_create, function ( string $class_id ) use ( $items_by_id, $is_preview ) {
374 321 if ( ! isset( $items_by_id[ $class_id ] ) ) {
375 322 return;
376 323 }
377 324
378 325 $item = $items_by_id[ $class_id ];
379 - $data = Global_Class_Data_Normalizer::normalize_style_fields( $item );
380 - $kit = $this->get_kit();
381 - $existing_post_id = $post_ids[ $class_id ] ?? null;
382 - $existing_post = $existing_post_id ? Global_Class_Post::from_post_id( $existing_post_id, $is_preview ) : null;
326 + $data = $this->build_class_data_for_storage( $item );
383 327
384 - if ( $existing_post ) {
385 - $existing_post->update_data( $data );
328 + if ( $is_preview ) {
329 + $post = Global_Class_Post::find_by_class_id( $class_id, true );
386 330
387 - if ( ! $is_preview ) {
388 - $existing_post->update_label( $item['label'] );
331 + if ( $post ) {
332 + $post->set_preview( true );
333 + $post->update_data( $data );
334 + $post->update_label( $item['label'] );
335 + clean_post_cache( $post->get_post_id() );
336 + } else {
337 + $created = Global_Class_Post::create( $class_id, $item['label'], $data );
338 + if ( $created ) {
339 + clean_post_cache( $created->get_post_id() );
340 + }
389 341 }
342 + } else {
343 + $created = Global_Class_Post::create( $class_id, $item['label'], $data );
344 + if ( $created ) {
345 + clean_post_cache( $created->get_post_id() );
346 + }
347 + }
348 + } );
390 349
391 - clean_post_cache( $existing_post->get_post_id() );
392 -
350 + $this->each_class_id_batch( $to_update, function ( string $class_id ) use ( $items_by_id, $is_preview ) {
351 + if ( ! isset( $items_by_id[ $class_id ] ) ) {
393 352 return;
394 353 }
395 354
396 - $created = Global_Class_Post::create( $class_id, $item['label'], $data, $kit );
355 + $item = $items_by_id[ $class_id ];
356 + $post = Global_Class_Post::find_by_class_id( $class_id, $is_preview );
397 357
398 - if ( $created ) {
399 - $post_ids_map->set( $class_id, $created->get_post_id() );
400 - clean_post_cache( $created->get_post_id() );
358 + if ( ! $post ) {
359 + return;
401 360 }
361 +
362 + $data = $this->build_class_data_for_storage( $item );
363 + $post->update_data( $data );
364 + $post->update_label( $item['label'] );
365 + clean_post_cache( $post->get_post_id() );
402 366 } );
403 -
404 - $this->each_class_id_batch(
405 - $to_update,
406 - function ( string $class_id ) use ( $items_by_id, $is_preview, $post_ids ) {
407 - if ( ! isset( $items_by_id[ $class_id ] ) || ! isset( $post_ids[ $class_id ] ) ) {
408 - return;
409 - }
410 -
411 - $item = $items_by_id[ $class_id ];
412 - $post = Global_Class_Post::from_post_id( $post_ids[ $class_id ], $is_preview );
413 -
414 - if ( ! $post ) {
415 - return;
416 - }
417 -
418 - $data = Global_Class_Data_Normalizer::normalize_style_fields( $item );
419 - $post->update_data( $data );
420 -
421 - if ( ! $is_preview ) {
422 - $post->update_label( $item['label'] );
423 - }
424 -
425 - clean_post_cache( $post->get_post_id() );
426 - }
427 - );
428 367 }
429 368
430 369 public function delete_all(): void {
431 370 $order = $this->get_order();
@@ -430,9 +369,9 @@
430 369 public function delete_all(): void {
431 370 $order = $this->get_order();
432 371
433 372 $this->each_class_id_batch( $order, function ( string $class_id ) {
434 - $post = Global_Class_Post::find_by_class_id( $class_id, false, $this->get_kit() );
373 + $post = Global_Class_Post::find_by_class_id( $class_id );
435 374
436 375 if ( $post ) {
437 376 $post->delete();
438 377 }
@@ -441,52 +380,8 @@
441 380 Global_Classes_Order::make( $this->get_kit() )->set_order( [] );
442 381 $this->labels()->set_labels( [] );
443 382 }
444 383
445 - private function clear_preview_labels_for_ids( array $class_ids ): void {
446 - if ( empty( $class_ids ) ) {
447 - return;
448 - }
449 -
450 - $preview_labels = Global_Classes_Labels::make( $this->get_kit() )->set_preview( true );
451 - $labels_map = $preview_labels->get_labels();
452 -
453 - if ( empty( $labels_map ) ) {
454 - return;
455 - }
456 -
457 - $ids_to_remove = array_intersect( array_unique( $class_ids ), array_keys( $labels_map ) );
458 -
459 - if ( empty( $ids_to_remove ) ) {
460 - return;
461 - }
462 -
463 - foreach ( $ids_to_remove as $id ) {
464 - unset( $labels_map[ $id ] );
465 - }
466 -
467 - $preview_labels->set_labels( $labels_map );
468 - }
469 -
470 - private function bulk_clear_preview_meta( array $class_ids ): void {
471 - if ( empty( $class_ids ) ) {
472 - return;
473 - }
474 -
475 - $post_ids_map = Global_Classes_Post_IDs::make( $this->get_kit() );
476 -
477 - foreach ( array_chunk( $class_ids, self::PERSIST_BATCH_SIZE ) as $chunk ) {
478 - $post_ids = $post_ids_map->get_post_ids( $chunk );
479 -
480 - foreach ( $post_ids as $post_id ) {
481 - delete_post_meta( $post_id, Global_Class_Post::META_KEY_DATA_PREVIEW );
482 - clean_post_cache( $post_id );
483 - }
484 -
485 - $this->flush_runtime_cache();
486 - }
487 - }
488 -
489 384 private function each_class_id_batch( $class_ids, callable $callback, int $batch_size = self::PERSIST_BATCH_SIZE ): void {
490 385 $class_ids = is_array( $class_ids ) ? $class_ids : iterator_to_array( $class_ids, false );
491 386 foreach ( array_chunk( array_values( $class_ids ), $batch_size ) as $batch ) {
492 387 foreach ( $batch as $class_id ) {
@@ -499,6 +394,19 @@
499 394 private function flush_runtime_cache(): void {
500 395 if ( function_exists( 'wp_cache_flush_runtime' ) ) {
501 396 wp_cache_flush_runtime();
502 397 }
398 + }
399 +
400 + private function build_class_data_for_storage( array $item ): array {
401 + $data = [
402 + 'type' => $item['type'] ?? 'class',
403 + 'variants' => $item['variants'] ?? [],
404 + ];
405 +
406 + if ( array_key_exists( 'sync_to_v3', $item ) ) {
407 + $data['sync_to_v3'] = (bool) $item['sync_to_v3'];
408 + }
409 +
410 + return $data;
503 411 }
504 412 }