Merge branch 'main' into ICP-7_import_all

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);
     }
 }

Model/Service/DumpCmsDataService.php

@@ -49,12 +49,12 @@ public function __construct(
         $this->categoryList = $categoryList;
     }
 
-    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);
         }
 
@@ -102,6 +102,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));
         }
     }
@@ -133,6 +136,9 @@ private function dumpBlocks(string $path, WriteInterface $varDirectory, ?array $
                 'stores' => [1],
                 '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

@@ -107,6 +107,9 @@ private function importBlocks(string $dirPath, ?array $identifiers): void
             $block->setIdentifier($jsonData['identifier']);
             $block->setStoreId($jsonData['stores'][0]);
             $block->setIsActive((bool)$jsonData['is_active']);
+            if (isset($jsonData['is_tailwindcss_jit_enabled'])) {
+                $block->setIsTailwindcssJitEnabled($jsonData['is_tailwindcss_jit_enabled']);
+            }
 
             try {
                 $this->blockRepository->save($block);
@@ -154,6 +157,9 @@ private function importPages(string $dirPath, ?array $identifiers): void
             $page->setPageLayout($jsonData['page_layout']);
             $page->setContentHeading($jsonData['content_heading']);
             $page->setIsActive((bool)$jsonData['is_active']);
+            if (isset($jsonData['is_tailwindcss_jit_enabled'])) {
+                $page->setIsTailwindcssJitEnabled($jsonData['is_tailwindcss_jit_enabled']);
+            }
 
             try {
                 $this->pageRepository->save($page);

README.md

@@ -29,6 +29,7 @@ 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: