Do not include archived assets in metrics count.

CHANGELOG.md

@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Do not include archived assets in metrics count.
 - Remove "administer farm map" from Manager role permissions.
 - [Add allow-plugins config #467](https://github.com/farmOS/farmOS/pull/467)
 

modules/core/ui/metrics/src/Plugin/Block/FarmMetricsBlock.php

@@ -74,7 +74,7 @@ class FarmMetricsBlock extends BlockBase implements ContainerFactoryPluginInterf
 
     // Create a container for asset metrics.
     $output['asset'] = [
-      '#markup' => '<strong>' . Link::createFromRoute('Assets', 'view.farm_asset.page')->toString() . '</strong>',
+      '#markup' => '<strong>' . Link::createFromRoute('Assets', 'view.farm_asset.page')->toString() . ' (active)</strong>',
       'metrics' => [
         '#type' => 'container',
         '#attributes' => [
@@ -140,11 +140,16 @@ class FarmMetricsBlock extends BlockBase implements ContainerFactoryPluginInterf
 
     // Count records by type.
     foreach ($bundles as $bundle => $bundle_info) {
-      $count = $this->entityTypeManager->getStorage($entity_type)->getAggregateQuery()
+      $query = $this->entityTypeManager->getStorage($entity_type)->getAggregateQuery()
         ->accessCheck(TRUE)
-        ->condition('type', $bundle)
-        ->count()
-        ->execute();
+        ->condition('type', $bundle);
+
+      // Only include active assets.
+      if ($entity_type == 'asset') {
+        $query->condition('status', 'active');
+      }
+
+      $count = $query->count()->execute();
       $route_name = "view.farm_$entity_type.page_type";
       $metrics[] = Link::createFromRoute($bundle_info['label'] . ': ' . $count, $route_name, ['arg_0' => $bundle], ['attributes' => ['class' => ['metric', 'button']]])->toString();
     }