ISTWCMS-5666: cleaning up code

src/Controller/ContentTypeUseController.php → src/Controller/ContentTypeUsePage.php

@@ -14,7 +14,7 @@ use Drupal\Core\Entity\EntityTypeManagerInterface;
 /**
  * Provides route responses for the Example module.
  */
-class ContentTypeUseController extends ControllerBase {
+class ContentTypeUsePage extends ControllerBase {
   /**
    * Entity type manager from the core.
    *
@@ -77,8 +77,9 @@ class ContentTypeUseController extends ControllerBase {
     }
 
     // Call to the service to get the count of content types used.
-    $options = $this->uwService->getContentTypeUsage($cts);
-    return new JsonResponse($options);
+    $list = $this->uwService->getContentTypeUsage($cts, TRUE);
+
+    return new JsonResponse($list);
   }
 
 }

src/Service/UWService.php

@@ -8,6 +8,7 @@ use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\node\Entity\Node;
 use Drupal\simplify_menu\MenuItems;
 use Drupal\path_alias\AliasManager;
+use phpDocumentor\Reflection\Types\False_;
 use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
@@ -543,7 +544,10 @@ class UWService implements UWServiceInterface {
   /**
    * {@inheritDoc}
    */
-  public function getContentTypeUsage(array $content_types): array {
+  public function getContentTypeUsage(
+    array $content_types,
+    bool $show_null_content_types = FALSE
+  ): array {
 
     // Node content types array.
     $list = [];
@@ -560,14 +564,18 @@ class UWService implements UWServiceInterface {
 
       // If there are no nodes of the content type,
       // break out of this iteration, as we do not
-      // want to display no nodes.
-      if ($total == 0) {
+      // want to display no nodes, however if flag
+      // is set to show null nodes we will show them.
+      if ($total == 0 && !$show_null_content_types) {
         continue;
       }
 
       // Load the content type, we need to use current as this
       // will load multiple, current will load the first entry.
-      $content_type = current($this->entityTypeManager->getStorage('node_type')->loadByProperties(['type' => $ct]));
+      $content_type = current(
+        $this->entityTypeManager->getStorage('node_type')
+          ->loadByProperties(['type' => $ct])
+      );
 
       // Add the condition of published to query.
       $query->condition('status', 1);
@@ -583,6 +591,7 @@ class UWService implements UWServiceInterface {
         'unpublished' => $total - $published,
       ];
     }
+
     return $list;
   }
 

src/Service/UWServiceInterface.php

@@ -207,6 +207,6 @@ interface UWServiceInterface {
    * @throws \Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException
    * @throws \Drupal\Component\Plugin\Exception\PluginNotFoundException
    */
-  public function getContentTypeUsage(array $content_types): array;
+  public function getContentTypeUsage(array $content_types, bool $show_null_content_types): array;
 
 }

uw_cfg_common.routing.yml

@@ -27,10 +27,10 @@ uw_ldap.view_user:
     username: NULL
   requirements:
     _permission: 'administer site configuration'
-uw_cfg_common.Controller:
+uw_cfg_common.content_type_usage_page:
   path: '/content_type_use.json'
   defaults:
-    _controller: '\Drupal\uw_cfg_common\Controller\ContentTypeUseController::contentTypeUse'
+    _controller: '\Drupal\uw_cfg_common\Controller\ContentTypeUsePage::contentTypeUse'
     _title: 'Content type Use'
   requirements:
     _permission: 'access content'