Delete empty site groups on import with force

nerds-and-company · Nov 18, 2018 · 68c2942 · 68c2942
1 parent 1a4150e
commit 68c2942
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 ### 4.0.18
 ### Added
-- Delete empty field groups on import with force
+- Delete empty field and site groups on import with force
 ### Fixed
 - Fixed user field sources not being exported
 - Fixed import of multiple sites in same sitegroup

diff --git a/src/DataTypes/SiteDataType.php b/src/DataTypes/SiteDataType.php
@@ -35,9 +35,20 @@ public function getRecords(): array
     }
 
     /**
-     * Reset craft site service sites cache using reflection.
+     * {@inheritdoc}
      */
     public function afterImport()
+    {
+        $this->clearSiteCaches();
+        if (Schematic::$force) {
+            $this->clearEmptyGroups();
+        }
+    }
+
+    /**
+     * Reset craft site service sites cache using reflection.
+     */
+    private function clearSiteCaches()
     {
         $obj = Craft::$app->sites;
         $refObject = new \ReflectionObject($obj);
@@ -53,4 +64,16 @@ public function afterImport()
         }
         $obj->init(); // reload sites
     }
+
+    /**
+     * Clear empty sute groups
+     */
+    private function clearEmptyGroups()
+    {
+        foreach (Craft::$app->sites->getAllGroups() as $group) {
+            if (count($group->getSites()) == 0) {
+                Craft::$app->sites->deleteGroup($group);
+            }
+        }
+    }
 }