Skip to content

Commit 099ea5d

Browse files
codedmonkeycodedmonkey
committed
Add preliminary revision history UI
1 parent 4cdda8f commit 099ea5d

6 files changed

Lines changed: 167 additions & 60 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: 41 additions & 5 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;
@@ -31,24 +32,41 @@ public function __construct(
3132
*/
3233
#[Route('/packages/{package}', name: 'dashboard_packages_info', requirements: ['package' => MapPackage::PACKAGE_REGEX])]
3334
#[IsGrantedAccess]
34-
public function info(#[MapPackage] Package $package): Response
35+
public function info(Request $request, #[MapPackage] Package $package): Response
3536
{
3637
$version = $package->getLatestVersion();
3738

3839
if (!$version) {
3940
return $this->redirectToRoute('dashboard_packages_versions', ['package' => $package->getName()]);
4041
}
4142

42-
return $this->versionInfo($package, $version);
43+
return $this->versionInfo($request, $package, $version);
4344
}
4445

4546
#[Route('/packages/{package}/versions/{version}', name: 'dashboard_packages_version_info', requirements: ['package' => MapPackage::PACKAGE_REGEX, 'version' => '.*'])]
47+
#[Route(
48+
path: '/packages/{package}/versions/{version}/-/{revision}',
49+
name: 'dashboard_packages_version_revision',
50+
requirements: ['package' => MapPackage::PACKAGE_REGEX, 'version' => '.*'],
51+
)]
4652
#[IsGrantedAccess]
47-
public function versionInfo(#[MapPackage] Package $package, #[MapPackage] Version $version): Response
53+
public function versionInfo(Request $request, #[MapPackage] Package $package, #[MapPackage] Version $version): Response
4854
{
4955
/** @var MetadataRepository $metadataRepository */
5056
$metadataRepository = $this->entityManager->getRepository(Metadata::class);
51-
$metadataRepository->fetchMetadataCollections($version->getCurrentMetadata());
57+
58+
$metadata = $version->getCurrentMetadata();
59+
$revision = $request->query->getInt('revision');
60+
if (0 !== $revision) {
61+
$metadata = $metadataRepository->findOneBy(['version' => $version, 'revision' => $revision]);
62+
}
63+
if (null === $metadata) {
64+
throw $this->createNotFoundException('The revision does not exist.');
65+
}
66+
67+
$metadataRepository->fetchMetadataCollections($metadata);
68+
69+
$revisionCount = $metadataRepository->count(['version' => $version]);
5270

5371
$dependentCount = $this->entityManager->getRepository(PackageRequireLink::class)->count(['linkedPackageName' => $package->getName()]);
5472
$implementationCount = $this->entityManager->getRepository(PackageProvideLink::class)->count(['linkedPackageName' => $package->getName(), 'implementation' => true]);
@@ -58,15 +76,33 @@ public function versionInfo(#[MapPackage] Package $package, #[MapPackage] Versio
5876
return $this->render('dashboard/packages/package_info.html.twig', [
5977
'package' => $package,
6078
'version' => $version,
61-
'metadata' => $version->getCurrentMetadata(),
79+
'metadata' => $metadata,
6280

6381
'dependentCount' => $dependentCount,
6482
'implementationCount' => $implementationCount,
6583
'providerCount' => $providerCount,
84+
'revisionCount' => $revisionCount,
6685
'suggesterCount' => $suggesterCount,
6786
]);
6887
}
6988

89+
#[Route('/packages/{package}/revisions/{version}', name: 'dashboard_packages_version_revisions', requirements: ['package' => MapPackage::PACKAGE_REGEX, 'version' => '.*'])]
90+
#[IsGrantedAccess]
91+
public function versionRevisions(#[MapPackage] Package $package, #[MapPackage] Version $version): Response
92+
{
93+
$revisions = $this->entityManager->getRepository(Metadata::class)->findBy(
94+
['version' => $version],
95+
['revision' => Order::Descending->value],
96+
);
97+
98+
return $this->render('dashboard/packages/package_version_revisions.html.twig', [
99+
'package' => $package,
100+
'version' => $version,
101+
102+
'revisions' => $revisions,
103+
]);
104+
}
105+
70106
#[Route('/packages/{package}/versions', name: 'dashboard_packages_versions', requirements: ['package' => MapPackage::PACKAGE_REGEX])]
71107
#[IsGrantedAccess]
72108
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: 77 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -100,66 +100,91 @@
100100
{% endif %}
101101
</div>
102102

103-
<div class="row border-bottom pb-3 mb-3">
104-
{{ _self.linkBlock('Requires', metadata.requireLinks) }}
105-
{{ _self.linkBlock('Requires (dev)', metadata.devRequireLinks) }}
106-
{{ _self.provideBlock(metadata.provideLinks) }}
107-
{{ _self.linkBlock('Suggests', metadata.suggestLinks) }}
108-
{{ _self.linkBlock('Conflicts', metadata.conflictLinks) }}
109-
{{ _self.linkBlock('Replaces', metadata.replaceLinks) }}
103+
<div class="border-bottom mb-3">
104+
<div class="row g-0">
105+
{{ _self.linkBlock('Requires', metadata.requireLinks) }}
106+
{{ _self.linkBlock('Requires (dev)', metadata.devRequireLinks) }}
107+
{{ _self.provideBlock(metadata.provideLinks) }}
108+
{{ _self.linkBlock('Suggests', metadata.suggestLinks) }}
109+
{{ _self.linkBlock('Conflicts', metadata.conflictLinks) }}
110+
{{ _self.linkBlock('Replaces', metadata.replaceLinks) }}
111+
</div>
110112
</div>
111113

112-
<div class="row border-bottom pb-3 mb-3">
113-
<div class="col-md-6">
114-
{% if metadata.hasSource() %}
115-
<div class="h5">
116-
{{ 'Source'|trans }}
117-
<span class="badge text-bg-secondary">{{ metadata.sourceType }}</span>
118-
</div>
119-
120-
<div class="mb-2">
121-
<code>{{ metadata.sourceUrl }}</code>
122-
</div>
123-
124-
<div class="mb-2">
125-
{{ 'Reference'|trans }}: <code>{{ metadata.sourceReference }}</code>
126-
</div>
127-
128-
<div class="mb-2">
129-
{% set browseUrl = metadata.browsableRepositoryUrl %}
130-
{% if browseUrl %}
131-
<a class="btn btn-sm btn-secondary" href="{{ browseUrl }}">
114+
<div class="border-bottom pb-3 mb-3">
115+
{% if revisionCount > 1 %}
116+
{% set isCurrent = metadata == version.currentMetadata %}
117+
<div class="bg-body-secondary px-3 py-2 mb-3 rounded">
118+
<p>Multiple revisions found for version <strong>{{ version.name }}</strong> of package <strong>{{ package.name }}</strong>.</p>
119+
{% if not isCurrent %}
120+
<p class="text-danger"><strong>You're viewing an inactive revision of this package.</strong></p>
121+
{% endif %}
122+
<div class="btn-toolbar gap-1">
123+
<a class="btn btn-sm btn-secondary" href="{{ path('dashboard_packages_version_revisions', {package: package.name, version: version.name}) }}">
124+
<span class="fa-solid fa-list me-1" aria-hidden="true"></span>
125+
<span class="btn-label">{{ 'View revisions'|trans }}</span>
126+
</a>
127+
{% if not isCurrent %}
128+
<a class="btn btn-sm btn-secondary" href="{{ path('dashboard_packages_version_info', {package: package.name, version: version.name}) }}">
132129
<span class="fa-solid fa-code me-1" aria-hidden="true"></span>
133-
{{ 'Browse code'|trans }}
130+
<span class="btn-label">{{ 'Go to current revision'|trans }}</span>
134131
</a>
135132
{% endif %}
136133
</div>
137-
{% else %}
138-
<div class="h5">{{ 'Source'|trans }}</div>
139-
-
140-
{% endif %}
141-
</div>
142-
<div class="col-md-6">
143-
{% if metadata.hasDist() %}
144-
<div class="h5">
145-
{{ 'Distribution'|trans }}
146-
<span class="badge text-bg-secondary">{{ metadata.distType }}</span>
147-
</div>
134+
</div>
135+
{% endif %}
136+
<div class="row g-0">
137+
<div class="col-md-6">
138+
{% if metadata.hasSource() %}
139+
<div class="h5">
140+
{{ 'Source'|trans }}
141+
<span class="badge text-bg-secondary">{{ metadata.sourceType }}</span>
142+
</div>
148143

149-
<div class="mb-2">
150-
{{ 'Reference'|trans }}: <code>{{ metadata.distReference }}</code>
151-
</div>
144+
<div class="mb-2">
145+
<code>{{ metadata.sourceUrl }}</code>
146+
</div>
152147

153-
<div class="mb-2">
154-
<a class="btn btn-sm btn-secondary" href="{{ metadata.distUrl }}" download>
155-
<span class="fa-solid fa-download me-1" aria-hidden="true"></span>
156-
{{ 'Download' }}
157-
</a>
158-
</div>
159-
{% else %}
160-
<div class="h5">{{ 'Distribution'|trans }}</div>
161-
-
162-
{% endif %}
148+
<div class="mb-2">
149+
{{ 'Reference'|trans }}: <code>{{ metadata.sourceReference }}</code>
150+
</div>
151+
152+
<div>
153+
{% set browseUrl = metadata.browsableRepositoryUrl %}
154+
{% if browseUrl %}
155+
<a class="btn btn-sm btn-secondary" href="{{ browseUrl }}">
156+
<span class="fa-solid fa-code me-1" aria-hidden="true"></span>
157+
<span class="btn-label">{{ 'Browse code'|trans }}</span>
158+
</a>
159+
{% endif %}
160+
</div>
161+
{% else %}
162+
<div class="h5">{{ 'Source'|trans }}</div>
163+
-
164+
{% endif %}
165+
</div>
166+
<div class="col-md-6">
167+
{% if metadata.hasDist() %}
168+
<div class="h5">
169+
{{ 'Distribution'|trans }}
170+
<span class="badge text-bg-secondary">{{ metadata.distType }}</span>
171+
</div>
172+
173+
<div class="mb-2">
174+
{{ 'Reference'|trans }}: <code>{{ metadata.distReference }}</code>
175+
</div>
176+
177+
<div>
178+
<a class="btn btn-sm btn-secondary" href="{{ metadata.distUrl }}" download>
179+
<span class="fa-solid fa-download me-1" aria-hidden="true"></span>
180+
<span class="btn-label">{{ 'Download' }}</span>
181+
</a>
182+
</div>
183+
{% else %}
184+
<div class="h5">{{ 'Distribution'|trans }}</div>
185+
-
186+
{% endif %}
187+
</div>
163188
</div>
164189
</div>
165190

‎templates/dashboard/packages/package_version_revisions.html.twig‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
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 metadata in revisions %}
17+
{% set isCurrent = metadata == version.currentMetadata %}
18+
{% set infoUrl = isCurrent
19+
? path('dashboard_packages_version_info', {package: package.name, version: version.name})
20+
: path('dashboard_packages_version_info', {package: package.name, version: version.name, revision: metadata.revision})
21+
%}
22+
<a href="{{ infoUrl }}" class="list-group-item">
23+
<div class="d-flex justify-content-between">
24+
<div>
25+
<span>{{ 'Revision'|trans }} {{ metadata.revision }}: <span class="text-monospace">{{ metadata.sourceReference }}</span></span>
26+
{% if isCurrent %}
27+
<span class="badge text-bg-secondary">{{ 'Current'|trans }}</span>
28+
{% endif %}
29+
</div>
30+
<span class="text-muted">{{ metadata.releasedAt ? metadata.releasedAt.format('Y-m-d') }}</span>
31+
</div>
32+
</a>
33+
{% endfor %}
34+
</div>
35+
{% 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)