From 18c07a595b1d12898d4dc55a81cba70d4c6277d9 Mon Sep 17 00:00:00 2001
From: Dan Feder <dan.feder@civicactions.com>
Date: Mon, 22 Sep 2025 16:38:27 -0400
Subject: [PATCH 1/2] Use resource id not dist in dashboard

---
 modules/datastore/src/Form/DashboardForm.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/datastore/src/Form/DashboardForm.php b/modules/datastore/src/Form/DashboardForm.php
index 61d3e279df..968e2e2a31 100644
--- a/modules/datastore/src/Form/DashboardForm.php
+++ b/modules/datastore/src/Form/DashboardForm.php
@@ -574,7 +574,7 @@ protected function buildResourceData(array $dist, bool $importable, string $post
       [
         'data' => [
           '#theme' => 'datastore_dashboard_resource_cell',
-          '#uuid' => $dist['distribution_uuid'],
+          '#uuid' => $dist['resource_id'],
           '#file_name' => basename((string) $dist['source_path']),
           '#file_path' => UrlHostTokenResolver::resolve($dist['source_path']),
         ],

From 61fad68b86f54f2f4bef6318bf053f26624f0656 Mon Sep 17 00:00:00 2001
From: Dan Feder <dan.feder@civicactions.com>
Date: Mon, 22 Sep 2025 16:57:26 -0400
Subject: [PATCH 2/2] Update test

---
 .../tests/src/Unit/Form/DashboardFormTest.php  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/datastore/tests/src/Unit/Form/DashboardFormTest.php b/modules/datastore/tests/src/Unit/Form/DashboardFormTest.php
index b1e434f107..645bc2a988 100644
--- a/modules/datastore/tests/src/Unit/Form/DashboardFormTest.php
+++ b/modules/datastore/tests/src/Unit/Form/DashboardFormTest.php
@@ -424,7 +424,7 @@ public function testBuildTableRowsWithUnsupportedResourceTypes() {
         'distributions' => [
           [
             'distribution_uuid' => 'dist-1',
-            'resource_id' => '9ad17d45894f823c6a8e4f6d32b9535g',
+            'resource_id' => 'resource-1',
             'resource_version' => '1679508886',
             'fetcher_status' => 'waiting',
             'fetcher_percent_done' => 0,
@@ -436,7 +436,7 @@ public function testBuildTableRowsWithUnsupportedResourceTypes() {
           ],
           [
             'distribution_uuid' => 'dist-2',
-            'resource_id' => '9ad17d45894f823c6a8e4f6d32b9535g',
+            'resource_id' => 'resource-2',
             'resource_version' => '1679508886',
             'fetcher_status' => 'waiting',
             'fetcher_percent_done' => 0,
@@ -480,7 +480,7 @@ public function testBuildTableRowsWithUnsupportedResourceTypes() {
     $this->assertEquals(2, count($form['table']['#rows']));
 
     // Table uuid for first row is correct.
-    $this->assertEquals('dist-1', $form['table']['#rows'][0][3]['data']['#uuid']);
+    $this->assertEquals('resource-1', $form['table']['#rows'][0][3]['data']['#uuid']);
     // First row has six columns.
     $this->assertEquals(5, count($form['table']['#rows'][0]));
     // Rowspan on first two columns.
@@ -496,8 +496,8 @@ public function testBuildTableRowsWithUnsupportedResourceTypes() {
 
     // The second row has only four columns.
     $this->assertEquals(4, count($form['table']['#rows'][1]));
-    // Table uuid for first second row is correct.
-    $this->assertEquals('dist-2', $form['table']['#rows'][1][0]['data']['#uuid']);
+    // Resource ID for first second row is correct.
+    $this->assertEquals('resource-2', $form['table']['#rows'][1][0]['data']['#uuid']);
     // The second row fetch status is correct.
     $this->assertEquals('waiting', $form["table"]["#rows"][1][1]["data"]["#status"]);
     // The second row fetch class is correct.
@@ -527,7 +527,7 @@ public function testBuildTableRowsDatasetMultipleDistribution() {
         'distributions' => [
           [
             'distribution_uuid' => 'dist-1',
-            'resource_id' => '9ad17d45894f823c6a8e4f6d32b9535g',
+            'resource_id' => 'resource-1',
             'resource_version' => '1679508886',
             'fetcher_status' => 'waiting',
             'fetcher_percent_done' => 0,
@@ -539,7 +539,7 @@ public function testBuildTableRowsDatasetMultipleDistribution() {
           ],
           [
             'distribution_uuid' => 'dist-2',
-            'resource_id' => '9ad17d45894f823c6a8e4f6d32b9535g',
+            'resource_id' => 'resource-2',
             'resource_version' => '1679508886',
             'fetcher_status' => 'done',
             'fetcher_percent_done' => 100,
@@ -585,8 +585,8 @@ public function testBuildTableRowsDatasetMultipleDistribution() {
     // The second row has only three columns.
     $this->assertEquals(4, count($form['table']['#rows'][1]));
 
-    $this->assertEquals('dist-1', $form['table']['#rows'][0][3]['data']['#uuid']);
-    $this->assertEquals('dist-2', $form['table']['#rows'][1][0]['data']['#uuid']);
+    $this->assertEquals('resource-1', $form['table']['#rows'][0][3]['data']['#uuid']);
+    $this->assertEquals('resource-2', $form['table']['#rows'][1][0]['data']['#uuid']);
     $this->assertEquals('done', $form['table']['#rows'][0][6]['data']['#status']);
     $this->assertEquals(NULL, $form['table']['#rows'][0][6]['data']['#error']);
   }