Merge branch 'main' into ICP-3-stores_support

Author: Rocket Web

Console/Command/DumpCmsData.php

@@ -25,6 +25,7 @@ class DumpCmsData extends \Symfony\Component\Console\Command\Command
     private const INPUT_KEY_TYPE = 'type';
     private const INPUT_TYPE_VALUES = ['block', 'page', 'all'];
     private const INPUT_KEY_IDENTIFIER = 'identifier';
+    private const INPUT_KEY_REMOVE_ALL = 'removeAll';
     private \RocketWeb\CmsImportExport\Model\Service\DumpCmsDataService $dumpCmsDataService;
 
     public function __construct(
@@ -51,6 +52,12 @@ protected function configure()
                 'i',
                 InputOption::VALUE_OPTIONAL,
                 'identifier to process (one or CSV list)'
+            ),
+            new InputOption(
+                self::INPUT_KEY_REMOVE_ALL,
+                'r',
+                InputOption::VALUE_NONE,
+                'Flag to remove all existing data'
             )
         ]);
         parent::configure();
@@ -59,6 +66,7 @@ protected function configure()
     protected function execute(InputInterface $input, OutputInterface $output): void
     {
         $type = $input->getOption(self::INPUT_KEY_TYPE);
+        $removeAll = (bool)$input->getOption(self::INPUT_KEY_REMOVE_ALL);
         if ($type === null) {
             throw new \RuntimeException("Type ([-t|--type) is required");
         }
@@ -78,6 +86,6 @@ protected function execute(InputInterface $input, OutputInterface $output): void
             $identifiers = explode(',', $identifiers);
         }
 
-        $this->dumpCmsDataService->execute($types, $identifiers);
+        $this->dumpCmsDataService->execute($types, $identifiers, $removeAll);
     }
 }

Console/Command/ImportCmsData.php

@@ -27,6 +27,7 @@ class ImportCmsData extends \Symfony\Component\Console\Command\Command
     private const INPUT_KEY_TYPE = 'type';
     private const INPUT_TYPE_VALUES = ['block', 'page', 'all'];
     private const INPUT_KEY_IDENTIFIER = 'identifier';
+    private const INPUT_KEY_IMPORT_ALL = 'importAll';
     private \RocketWeb\CmsImportExport\Model\Service\ImportCmsDataService $importCmsDataService;
 
     public function __construct(
@@ -53,6 +54,12 @@ protected function configure()
                 'i',
                 InputOption::VALUE_OPTIONAL,
                 'identifier to process (one or CSV list)'
+            ),
+            new InputOption(
+                self::INPUT_KEY_IMPORT_ALL,
+                'a',
+                InputOption::VALUE_NONE,
+                'Flag to import all files'
             )
         ]);
         parent::configure();
@@ -61,6 +68,7 @@ protected function configure()
     protected function execute(InputInterface $input, OutputInterface $output): void
     {
         $type = $input->getOption(self::INPUT_KEY_TYPE);
+        $importAll = (bool)$input->getOption(self::INPUT_KEY_IMPORT_ALL);
         if ($type === null) {
             throw new \RuntimeException("Type ([-t|--type) is required");
         }
@@ -80,6 +88,6 @@ protected function execute(InputInterface $input, OutputInterface $output): void
             $identifiers = explode(',', $identifiers);
         }
 
-        $this->importCmsDataService->execute($types, $identifiers);
+        $this->importCmsDataService->execute($types, $identifiers, $importAll);
     }
 }

Model/Service/DumpCmsDataService.php

@@ -53,12 +53,12 @@ public function __construct(
         $this->storeManager = $storeManager;
     }
 
-    public function execute(array $types, ?array $identifiers)
+    public function execute(array $types, ?array $identifiers, bool $removeAll)
     {
         $varDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::VAR_DIR);
         $varPath = $this->directoryList->getPath(DirectoryList::VAR_DIR);
         $workingDirPath = $varPath . '/sync_cms_data';
-        if ($varDirectory->isExist($workingDirPath)) {
+        if ($varDirectory->isExist($workingDirPath) && $removeAll) {
             $varDirectory->delete($workingDirPath);
         }
 
@@ -130,6 +130,9 @@ private function dumpPages(string $path, WriteInterface $varDirectory, ?array $i
                 'content_heading' => $page->getContentHeading(),
 
             ];
+            if ($page->getIsTailwindcssJitEnabled() !== null) {
+                $jsonContent['is_tailwindcss_jit_enabled'] = $page->getIsTailwindcssJitEnabled();
+            }
             $this->write($varDirectory, $jsonPath, $this->serializer->serialize($jsonContent));
         }
     }
@@ -162,6 +165,9 @@ private function dumpBlocks(string $path, WriteInterface $varDirectory, ?array $
                 'stores' => $storeCodes,
                 'is_active' => $block->isActive()
             ];
+            if ($block->getIsTailwindcssJitEnabled() !== null) {
+                $jsonContent['is_tailwindcss_jit_enabled'] = $block->getIsTailwindcssJitEnabled();
+            }
             $this->write($varDirectory, $jsonPath, $this->serializer->serialize($jsonContent));
         }
     }

Model/Service/ImportCmsDataService.php

@@ -51,14 +51,18 @@ public function __construct(
         $this->storeRepository = $storeRepository;
     }
 
-    public function execute(array $types, ?array $identifiers)
+    public function execute(array $types, ?array $identifiers, bool $importAll)
     {
         $workingDirPath = 'sync_cms_data';
 
         if (!$this->directoryRead->isExist($this->varPath . $workingDirPath)) {
             throw new \Exception('The sync folder does not exists! Path: ' . $workingDirPath);
         }
 
+        if (!$identifiers && !$importAll) {
+            throw new \Exception('If you want to import all entries at once, use --importAll flag');
+        }
+
         foreach ($types as $type) {
             $typeDirPath = $workingDirPath . sprintf('/cms/%ss/', $type);
             if (!$this->directoryRead->isExist($this->varPath . $typeDirPath)) {
@@ -129,6 +133,10 @@ private function importBlocks(string $dirPath, ?array $identifiers): void
             $block->setIdentifier($jsonData['identifier']);
             $block->setIsActive((bool)$jsonData['is_active']);
             $block->setStores($storeIds);
+            if (isset($jsonData['is_tailwindcss_jit_enabled'])) {
+                $block->setIsTailwindcssJitEnabled($jsonData['is_tailwindcss_jit_enabled']);
+            }
+
             try {
                 $this->blockRepository->save($block);
             } catch (\Exception $exception) {
@@ -178,6 +186,9 @@ private function importPages(string $dirPath, ?array $identifiers): void
             $page->setContentHeading($jsonData['content_heading']);
             $page->setIsActive((bool)$jsonData['is_active']);
             $page->setStores($storeIds);
+            if (isset($jsonData['is_tailwindcss_jit_enabled'])) {
+                $page->setIsTailwindcssJitEnabled($jsonData['is_tailwindcss_jit_enabled']);
+            }
 
             try {
                 $this->pageRepository->save($page);

README.md

@@ -28,6 +28,8 @@ Dumps cms pages/blocks to var/sync_cms_data for further import
 Options:
 -t, --type=TYPE                Which type are we dumping - block/page/all
 -i, --identifier[=IDENTIFIER]  identifier to process (one or CSV list)
+-a, --importAll                Flag to import all files
+-r, --removeAll                Flag to remove all existing data
 ```
 
 As you can see from the options, we need to define:
@@ -86,4 +88,4 @@ With the combination of these two, we can **import**:
 - specific CMS block or blocks (using --type=block --identifier=who-are-we,homepage-carousel)
 
 Once you execute the command, the content will be created/updated in Magento Admin. 
-By executing `php bin/magento cache:flush` you should be able to see the updated CMS content on frontend also!
+By executing `php bin/magento cache:flush` you should be able to see the updated CMS content on frontend also!