Skip to content

Commit 402acb6

Browse files
committed
TEMP rev history
1 parent 03d75c8 commit 402acb6

6 files changed

Lines changed: 68 additions & 5 deletions

File tree

assets/stylesheets/dashboard-theme.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,3 +77,7 @@ body.ea-dark-scheme img.img-light {
7777
body:not(.ea-dark-scheme) img.img-dark {
7878
display: none;
7979
}
80+
81+
.text-monospace {
82+
font-family: var(--font-family-monospace);
83+
}

src/Controller/Dashboard/DashboardPackagesInfoController.php

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
use CodedMonkey\Dirigent\Doctrine\Entity\Version;
1313
use CodedMonkey\Dirigent\Doctrine\Repository\MetadataRepository;
1414
use CodedMonkey\Dirigent\EasyAdmin\PackagePaginator;
15+
use Doctrine\Common\Collections\Order;
1516
use Doctrine\ORM\EntityManagerInterface;
1617
use Doctrine\ORM\QueryBuilder;
1718
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -67,6 +68,23 @@ public function versionInfo(#[MapPackage] Package $package, #[MapPackage] Versio
6768
]);
6869
}
6970

71+
#[Route('/packages/{package}/revisions/{version}', name: 'dashboard_packages_version_revisions', requirements: ['package' => MapPackage::PACKAGE_REGEX, 'version' => '.*'])]
72+
#[IsGrantedAccess]
73+
public function versionRevisions(#[MapPackage] Package $package, #[MapPackage] Version $version): Response
74+
{
75+
$revisions = $this->entityManager->getRepository(Metadata::class)->findBy(
76+
['version' => $version],
77+
['revision' => Order::Descending->value],
78+
);
79+
80+
return $this->render('dashboard/packages/package_version_revisions.html.twig', [
81+
'package' => $package,
82+
'version' => $version,
83+
84+
'revisions' => $revisions,
85+
]);
86+
}
87+
7088
#[Route('/packages/{package}/versions', name: 'dashboard_packages_versions', requirements: ['package' => MapPackage::PACKAGE_REGEX])]
7189
#[IsGrantedAccess]
7290
public function versions(#[MapPackage] Package $package): Response

templates/dashboard/packages/_package_header.html.twig

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
{% set currentPage = currentPage|default(null) %}
2+
{% set currentVersion = currentVersion|default(null) %}
23
{% set attrActive = 'class="nav-link active" aria-current="page"' %}
34
{% set attr = 'class="nav-link text-primary"' %}
45

5-
<ul class="nav nav-pills nav-justified d-grid d-md-flex gap-1 pb-3 mb-3 border-bottom">
6+
<ul class="nav nav-pills nav-justified d-grid d-md-flex gap-1 pb-2 mb-3 border-bottom">
67
<li class="nav-item">
78
{% if package.versions|length > 0 %}
8-
{% set packageInfoUrl = path('dashboard_packages_info', {package: package.name}) %}
9+
{% set packageInfoUrl = version is defined
10+
? path('dashboard_packages_version_info', {package: package.name, version: version.name})
11+
: path('dashboard_packages_info', {package: package.name})
12+
%}
913
<a {{ (currentPage == 'info' ? attrActive : attr)|raw }} href="{{ packageInfoUrl }}">{{ 'Info'|trans }}</a>
1014
{% else %}
1115
<span class="nav-link disabled">{{ 'Info'|trans }}</span>

templates/dashboard/packages/package_info.html.twig

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
{% endif %}
101101
</div>
102102

103-
<div class="row border-bottom pb-3 mb-3">
103+
<div class="row g-0 border-bottom mb-3">
104104
{{ _self.linkBlock('Requires', metadata.requireLinks) }}
105105
{{ _self.linkBlock('Requires (dev)', metadata.devRequireLinks) }}
106106
{{ _self.provideBlock(metadata.provideLinks) }}
@@ -109,7 +109,11 @@
109109
{{ _self.linkBlock('Replaces', metadata.replaceLinks) }}
110110
</div>
111111

112-
<div class="row border-bottom pb-3 mb-3">
112+
<div class="border-bottom pb-3 mb-3">
113+
Revisions
114+
</div>
115+
116+
<div class="row g-0 border-bottom pb-3 mb-3">
113117
<div class="col-md-6">
114118
{% if metadata.hasSource() %}
115119
<div class="h5">
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{% extends 'dashboard/packages/package_base.html.twig' %}
2+
3+
{% block page_title %}
4+
{%- apply spaceless -%}
5+
{{ package.name }}
6+
<small>{{ version.extendedName }}</small>
7+
{%- endapply -%}
8+
{% endblock %}
9+
10+
{% block page_content %}
11+
{{ include('dashboard/packages/_package_header.html.twig') }}
12+
13+
<h2 class="h4">{{ 'Revisions'|trans }}</h2>
14+
15+
<div class="list-group list-group-flush border-bottom mb-3">
16+
{% for revision in revisions %}
17+
<a href="#" class="list-group-item">
18+
<div class="d-flex justify-content-between">
19+
<div>
20+
<span>{{ 'Revision'|trans }} {{ revision.revision }}: <span class="text-monospace">{{ revision.sourceReference }}</span></span>
21+
{% if revision == version.currentMetadata %}
22+
<span class="badge text-bg-secondary">{{ 'Current'|trans }}</span>
23+
{% endif %}
24+
</div>
25+
<span class="text-muted">{{ revision.releasedAt ? revision.releasedAt.format('Y-m-d') }}</span>
26+
</div>
27+
</a>
28+
{% endfor %}
29+
</div>
30+
{% endblock %}

templates/dashboard/packages/package_versions.html.twig

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,10 @@
6262
<a href="{{ packageVersionInfoUrl }}" class="list-group-item">
6363
<div class="d-flex justify-content-between">
6464
<span>{{ version.extendedName }}</span>
65-
<span class="text-muted">{{ version.currentMetadata.releasedAt ? version.currentMetadata.releasedAt.format('Y-m-d') }}</span>
65+
<span>
66+
<span class="me-1"><span class="fa-solid fa-file-alt" aria-hidden="true"></span></span>
67+
<span class="text-muted">{{ version.currentMetadata.releasedAt ? version.currentMetadata.releasedAt.format('Y-m-d') }}</span>
68+
</span>
6669
</div>
6770
</a>
6871
{% endmacro %}

0 commit comments

Comments
 (0)