Fix small things after PR feedback

These are minor but do improve the code
greenpeace · Jan 24, 2025 · ed44cc0 · ed44cc0
1 parent 96ff7bf
commit ed44cc0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 11 deletions.
diff --git a/assets/src/block-editor/TermSelector/index.js b/assets/src/block-editor/TermSelector/index.js
@@ -31,7 +31,6 @@ const DEFAULT_QUERY = {
 };
 
 const MIN_TERMS_COUNT_FOR_FILTER = 8;
-
 const EMPTY_ARRAY = [];
 
 /**
@@ -51,10 +50,6 @@ export function sortBySelected(termsTree, terms) {
     const termASelected = treeHasSelection(termA);
     const termBSelected = treeHasSelection(termB);
 
-    if (termASelected === termBSelected) {
-      return 0;
-    }
-
     if (termASelected && !termBSelected) {
       return -1;
     }
@@ -65,6 +60,7 @@ export function sortBySelected(termsTree, terms) {
 
     return 0;
   };
+
   const newTermTree = [...termsTree];
   newTermTree.sort(termIsSelected);
   return newTermTree;

diff --git a/src/Controllers/Menu/ArchiveImport.php b/src/Controllers/Menu/ArchiveImport.php
@@ -141,7 +141,7 @@ public function get_page(): string
 
         //phpcs:disable
         echo 'Peak memory usage: ' . $this->readable_bytes(memory_get_peak_usage());
-        echo "Total: $total<br/>";
+        echo 'Total: ' . $total . '<br/>';
         echo 'Existing or duplicate: ' . count($existing) . '<br/>';
         echo 'Created:: ' . count($created) . '<br/>';
         echo 'Errors(' . count($errors) . '): ' . print_r($errors, true) . '<br/>';

diff --git a/src/Loader.php b/src/Loader.php
@@ -129,8 +129,7 @@ private function load_services(array $services): void
                 $this->default_services[] = Importer::class;
             }
 
-            $view = new View();
-            (new Controllers\Menu\ArchiveImport($view))->load();
+            (new Controllers\Menu\ArchiveImport(new View()))->load();
         }
 
         // Run Activator after theme switched to planet4-master-theme or a planet4 child theme.
@@ -178,9 +177,8 @@ private function load_block_services(): void
         $services[] = Controllers\Menu\PostmetaCheckController::class;
         $services[] = Admin\Rest::class;
 
-        $view = new View();
         foreach ($services as $service) {
-            (new $service($view))->load();
+            (new $service(new View()))->load();
         }
     }
 

diff --git a/src/MasterSite.php b/src/MasterSite.php
@@ -344,9 +344,9 @@ function (): void {
         $remove_rtl_fix();
         add_action('wpml_after_startup', $remove_rtl_fix, 10, 0);
 
+        AuthorPage::hooks();
         BreakpointsImageSizes::hooks();
         QueryLoopPagination::hooks();
-        AuthorPage::hooks();
         Search\Search::hooks();
         Sendgrid::hooks();
     }