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