← All changes | modules/global-classes/import-export-customization/runners/import.php +27 -30 4.1.3 → 3.32.0-dev3 View file →

		@@ -1,18 +1,17 @@
1	1	<?php
2	2
3	3	namespace Elementor\Modules\GlobalClasses\ImportExportCustomization\Runners;
4	4
5		-use Elementor\App\Modules\ImportExportCustomization\Design_System_Import_Context;
6	5	use Elementor\App\Modules\ImportExportCustomization\Runners\Import\Import_Runner_Base;
	6	+use Elementor\App\Modules\ImportExportCustomization\Utils as ImportExportUtils;
	7	+use Elementor\Modules\GlobalClasses\Global_Classes_Repository;
	8	+use Elementor\Modules\GlobalClasses\Global_Classes_Parser;
7	9	use Elementor\Modules\GlobalClasses\ImportExportCustomization\Import_Export_Customization;
8		-use Elementor\Modules\GlobalClasses\ImportExportUtils\Import_Utils;
9	10	use Elementor\Plugin;
10		-use Elementor\Core\Kits\Documents\Kit;
11		-use Elementor\Modules\GlobalClasses\ImportExportUtils\Legacy_Import_Utils;
12	11
13	12	if ( ! defined( 'ABSPATH' ) ) {
14		- exit;
	13	+ exit; // Exit if accessed directly.
15	14	}
16	15
17	16	class Import extends Import_Runner_Base {
18	17	public static function get_name(): string {
		@@ -18,42 +17,40 @@
18	17	public static function get_name(): string {
19	18	return 'global-classes';
20	19	}
21	20
22		- public function should_import( array $data ): bool {
23		- $import_context = Design_System_Import_Context::from_data( $data );
24		-
	21	+ public function should_import( array $data ) {
	22	+ // Same as the site-settings runner.
25	23	return (
26		- $import_context->is_included() &&
27		- ! empty( $data['extracted_directory_path'] ) &&
28		- $this->is_classes_enabled( $data )
	24	+ isset( $data['include'] ) &&
	25	+ in_array( 'settings', $data['include'], true ) &&
	26	+ ! empty( $data['site_settings']['settings'] ) &&
	27	+ ! empty( $data['extracted_directory_path'] )
29	28	);
30	29	}
31	30
32		- private function is_classes_enabled( array $data ): bool {
33		- if ( isset( $data['customization']['settings']['classes'] ) ) {
34		- return (bool) $data['customization']['settings']['classes'];
	31	+ public function import( array $data, array $imported_data ) {
	32	+ $kit = Plugin::$instance->kits_manager->get_active_kit();
	33	+
	34	+ $file_name = Import_Export_Customization::FILE_NAME;
	35	+ $global_classes = ImportExportUtils::read_json_file( "{$data['extracted_directory_path']}/{$file_name}.json" );
	36	+
	37	+ if ( ! $kit || ! $global_classes ) {
	38	+ return [];
35	39	}
36	40
37		- return true;
38		- }
	41	+ $global_classes_result = Global_Classes_Parser::make()->parse( $global_classes );
39	42
40		- public function import( array $data, array $imported_data ): array {
41		- $import_context = Design_System_Import_Context::from_data( $data );
42		- $conflict_resolution = $import_context->resolve_conflict_resolution( $data, 'classesOverrideAll' );
43		-
44		- if ( $this->is_legacy_import_format( $data ) ) {
45		- $global_classes_file = $data['extracted_directory_path'] . '/' . Import_Export_Customization::FILE_NAME . '.json';
46		- return Legacy_Import_Utils::import_classes( $global_classes_file, $conflict_resolution );
	43	+ if ( ! $global_classes_result->is_valid() ) {
	44	+ return [];
47	45	}
48	46
49		- $global_classes_dir = $data['extracted_directory_path'] . '/' . Import_Export_Customization::DIRECTORY_NAME;
50		- return Import_Utils::import_classes( $global_classes_dir, [ 'conflict_resolution' => $conflict_resolution ] );
51		- }
	47	+ $global_classes = $global_classes_result->unwrap();
52	48
53		- protected function is_legacy_import_format( array $data ): bool {
54		- $manifest = $data['manifest'];
55		- $elementor_version = $manifest['elementor_version'];
	49	+ Global_Classes_Repository::make()->put(
	50	+ $global_classes['items'],
	51	+ $global_classes['order']
	52	+ );
56	53
57		- return version_compare( $elementor_version, '4.1.0-beta1', '<' );
	54	+ return $global_classes;
58	55	}
59	56	}