Skip to content

#4655 Add link to node/123 to dataset import status table. #4656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
swirtSJW wants to merge 5 commits into
base: 2.x
Choose a base branch
from
Open

#4655 Add link to node/123 to dataset import status table. #4656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fca612c
#4655 Add link to node/123 to dataset import status table.
Feb 13, 2026
facb0ff
adjust the tests.
Feb 13, 2026
02cc8a5
adjust the tests.
Feb 13, 2026
5104f28
Rework the output for admin and view
Feb 13, 2026
ecfc0a1
Add assertions of node_id to tests.
Feb 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions modules/datastore/datastore.module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ function datastore_theme($existing, $type, $theme, $path) {
'uuid' => NULL,
'title' => NULL,
'url' => NULL,
'node_id' => NULL,
],
],
'datastore_dashboard_revision_cell' => [
Expand Down
2 changes: 2 additions & 0 deletions modules/datastore/src/Form/DashboardForm.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,7 @@ protected function buildRevisionRow(array $rev, int $resourceCount, string $harv
if ($moderation_class == 'hidden') {
$moderation_class = 'published-hidden';
}

return [
[
'rowspan' => $resourceCount,
Expand All @@ -510,6 +511,7 @@ protected function buildRevisionRow(array $rev, int $resourceCount, string $harv
'#uuid' => $rev['uuid'],
'#title' => $rev['title'],
'#url' => Url::fromUri("internal:/dataset/$rev[uuid]"),
'#node_id' => $rev['node_id'],
],
],
[
Expand Down
10 changes: 8 additions & 2 deletions modules/datastore/templates/datastore-dashboard-dataset-cell.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
<div class="datastore-status-dataset-uuid">{{ uuid }}</div>
<div class="datastore-status-dataset-link">{{ link(title, url) }}</div>
<div class="datastore-status-dataset-link">
{{title}} <a href="{{ path('entity.node.canonical', {'node': node_id}) }}" aria-label="{{ 'admin'|t }}: {{title}}">{{ 'admin'|t }}</a>
{% if url is not empty %}
{% set link_attributes = create_attribute({'aria-label': 'view: @title'|t({'@title': title})}) %}
| {{ link('view', url, {'attributes': link_attributes}) }}
{% endif %}
</div>
<div class="datastore-status-dataset-uuid">{{ uuid }}</div>
11 changes: 11 additions & 0 deletions modules/datastore/tests/src/Unit/Form/DashboardFormTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ public function testBuildTableRowsWithHarvestIdFilter() {
'moderation_state' => 'published',
'modified_date_metadata' => '2020-01-15',
'modified_date_dkan' => '2021-02-11',
'node_id' => 1,
];
$distribution = [
'distribution_uuid' => 'dist-1',
Expand Down Expand Up @@ -154,6 +155,7 @@ public function testBuildTableRowsWithHarvestIdFilter() {
$this->assertEquals('NEW', $form['table']['#rows'][0][2]['data']);
$this->assertEquals('done', $form['table']['#rows'][0][6]['data']['#status']);
$this->assertEquals(NULL, $form['table']['#rows'][0][6]['data']['#error']);
$this->assertEquals(1, $form['table']['#rows'][0][0]['data']['#node_id']);
}

/**
Expand All @@ -167,6 +169,7 @@ public function testBuildTableRowsWithDatasetTitleFilter() {
'moderation_state' => 'published',
'modified_date_metadata' => '2020-01-15',
'modified_date_dkan' => '2021-02-11',
'node_id' => 2,
];
$distribution = [
'distribution_uuid' => 'dist-1',
Expand Down Expand Up @@ -222,6 +225,7 @@ public function testBuildTableRowsWithDatasetTitleFilter() {
$this->assertEquals('NEW', $form['table']['#rows'][0][2]['data']);
$this->assertEquals('done', $form['table']['#rows'][0][6]['data']['#status']);
$this->assertEquals(NULL, $form['table']['#rows'][0][6]['data']['#error']);
$this->assertEquals(2, $form['table']['#rows'][0][0]['data']['#node_id']);
}

/**
Expand All @@ -235,6 +239,7 @@ public function testBuildTableRowsWithUuidFilter() {
'moderation_state' => 'published',
'modified_date_metadata' => '2020-01-15',
'modified_date_dkan' => '2021-02-11',
'node_id' => 3,
];
$distribution = [
'distribution_uuid' => 'dist-1',
Expand Down Expand Up @@ -295,6 +300,7 @@ public function testBuildTableRowsWithAllDatasets() {
'title' => 'Dataset 1',
'modified_date_metadata' => '2019-08-12',
'modified_date_dkan' => '2021-07-08',
'node_id' => 3,
'distributions' => [
[
'distribution_uuid' => 'dist-1',
Expand All @@ -320,6 +326,7 @@ public function testBuildTableRowsWithAllDatasets() {
'title' => 'Non-Harvest Dataset',
'modified_date_metadata' => '2019-08-12',
'modified_date_dkan' => '2021-07-08',
'node_id' => 3,
'distributions' => [
[
'distribution_uuid' => 'dist-2',
Expand Down Expand Up @@ -395,6 +402,7 @@ public function testBuildTableRowsDatasetWithNoDistribution() {
'modified_date_metadata' => '2019-08-12',
'modified_date_dkan' => '2021-07-08',
'distributions' => ['Not found'],
'node_id' => 1,
],
];

Expand All @@ -421,6 +429,7 @@ public function testBuildTableRowsWithUnsupportedResourceTypes() {
'title' => 'Dataset 1',
'modified_date_metadata' => '2019-08-12',
'modified_date_dkan' => '2021-07-08',
'node_id' => 5,
'distributions' => [
[
'distribution_uuid' => 'dist-1',
Expand Down Expand Up @@ -510,6 +519,7 @@ public function testBuildTableRowsWithUnsupportedResourceTypes() {
$this->assertEquals('done', $form["table"]["#rows"][1][3]["data"]["#status"]);
// The second row post import class is correct.
$this->assertEquals('done', $form["table"]["#rows"][1][3]["class"]);
$this->assertEquals(5, $form['table']['#rows'][0][0]['data']['#node_id']);
}

/**
Expand All @@ -524,6 +534,7 @@ public function testBuildTableRowsDatasetMultipleDistribution() {
'title' => 'Dataset 1',
'modified_date_metadata' => '2019-08-12',
'modified_date_dkan' => '2021-07-08',
'node_id' => 7,
'distributions' => [
[
'distribution_uuid' => 'dist-1',
Expand Down