Skip to content

Improve resiliance of Import Status dashboard #4691

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

Draft
swirtSJW wants to merge 1 commit into
base: 4.x
Choose a base branch
from
Draft

Improve resiliance of Import Status dashboard #4691

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions modules/dkan_datastore/src/Form/DashboardForm.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ protected function buildRevisionRows(array $datasetInfo, string $harvestStatus)
// Create a row for each dataset revision (there could be both a published
// and latest).
foreach ($datasetInfo as $rev) {
$distributions = $rev['distributions'];
$distributions = $rev['distributions'] ?? [];
// For first distribution, combine with revision information.
$rows[] = array_merge(
$this->buildRevisionRow($rev, count($distributions), $harvestStatus),
Expand Down Expand Up @@ -499,7 +499,7 @@ protected function buildRevisionRow(array $rev, int $resourceCount, string $harv
// Moderation state can be 'hidden', which is not a good CSS class if we
// don't want data to be hidden. We hijack the 'registered' class for use
// here.
$moderation_class = $rev['moderation_state'];
$moderation_class = $rev['moderation_state'] ?? NULL;
if ($moderation_class == 'hidden') {
$moderation_class = 'published-hidden';
}
Expand All @@ -508,19 +508,19 @@ protected function buildRevisionRow(array $rev, int $resourceCount, string $harv
'rowspan' => $resourceCount,
'data' => [
'#theme' => 'dkan_datastore_dashboard_dataset_cell',
'#uuid' => $rev['uuid'],
'#title' => $rev['title'],
'#url' => Url::fromUri("internal:/dataset/$rev[uuid]"),
'#uuid' => $rev['uuid'] ?? NULL,
'#title' => $rev['title'] ?? $this->t('unknown'),
'#url' => (!empty($rev['uuid'])) ? Url::fromUri("internal:/dataset/{$rev['uuid']}") : NULL,
],
],
[
'rowspan' => $resourceCount,
'class' => [$moderation_class],
'data' => [
'#theme' => 'dkan_datastore_dashboard_revision_cell',
'#revision_id' => $rev['revision_id'],
'#modified' => $this->dateFormatter->format(strtotime((string) $rev['modified_date_dkan']), 'short'),
'#moderation_state' => $rev['moderation_state'],
'#revision_id' => $rev['revision_id'] ?? NULL,
'#modified' => (!empty($rev['modified_date_dkan'])) ? $this->dateFormatter->format(strtotime((string) $rev['modified_date_dkan']), 'short') : NULL,
'#moderation_state' => $rev['moderation_state'] ?? NULL,
],
],
[
Expand Down