Skip to content

Commit fe47669

Browse files
codedmonkeycodedmonkey
committed
Implement metadata refactoring in frontend
Signed-off-by: Tim Goudriaan <tim@codedmonkey.com>
1 parent 2fbed38 commit fe47669

File tree

4 files changed

+34
-33
lines changed

4 files changed

+34
-33
lines changed

‎src/Controller/Dashboard/DashboardPackagesInfoController.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ public function versionInfo(#[MapPackage] Package $package, #[MapPackage] Versio
5252
return $this->render('dashboard/packages/package_info.html.twig', [
5353
'package' => $package,
5454
'version' => $version,
55+
'metadata' => $version->getCurrentMetadata(),
5556

5657
'dependentCount' => $dependentCount,
5758
'implementationCount' => $implementationCount,

‎src/Doctrine/Entity/Version.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ public function getVersionAlias(): string
588588
return '';
589589
}
590590

591-
public function getVersionTitle(): string
591+
public function getExtendedName(): string
592592
{
593593
return $this->name . ($this->hasVersionAlias() ? ' / ' . $this->getVersionAlias() : '');
594594
}

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

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{% block page_title %}
44
{%- apply spaceless -%}
55
{{ package.name }}
6-
<small>{{ version.versionTitle }}</small>
6+
<small>{{ version.extendedName }}</small>
77
{%- endapply -%}
88
{% endblock %}
99

@@ -16,23 +16,23 @@
1616
<pre class="m-0"><code>composer require {{ package.name }}</code></pre>
1717
</div>
1818

19-
<p class="lead">{{ version.description }}</p>
19+
<p class="lead">{{ metadata.description }}</p>
2020

21-
{% if version.authors|length > 0 %}
21+
{% if metadata.authors|length > 0 %}
2222
<div class="d-flex flex-wrap gap-2 mb-2" aria-label="{{ 'Authors'|trans }}">
23-
{% for author in version.authors %}
23+
{% for author in metadata.authors %}
2424
{% set authorText %}<span class="fa-solid fa-user fa-fw me-1" aria-hidden="true"></span>{{ author.name }}{% endset %}
2525
{% if author.homepage is defined %}<a href="{{ author.homepage }}">{{ authorText }}</a>{% else %}<span>{{ authorText }}</span>{% endif %}
2626
{% endfor %}
2727
</div>
2828
{% endif %}
2929

30-
{% if version.keywords|length > 0 %}
30+
{% if metadata.keywords|length > 0 %}
3131
<div class="d-flex align-items-center mb-2">
3232
<span class="fa-solid fa-tags fa-fw me-1" title="{{ 'Keywords'|trans }}" aria-hidden="true"></span>
3333

3434
<div class="d-flex flex-wrap gap-2" aria-label="{{ 'Keywords'|trans }}">
35-
{% for keyword in version.keywords %}
35+
{% for keyword in metadata.keywords %}
3636
<span>{{ keyword.name }}</span>
3737
{% endfor %}
3838
</div>
@@ -52,8 +52,8 @@
5252
{% if package.browsableRepositoryUrl or package.mirrorRegistry %}
5353
<hr class="my-1">
5454
{% endif %}
55-
{% if version.homepage %}
56-
<div><a href="{{ version.homepage }}">Homepage</a></div>
55+
{% if metadata.homepage %}
56+
<div><a href="{{ metadata.homepage }}">Homepage</a></div>
5757
{% endif %}
5858
{% set packageStatisticsUrl = path('dashboard_packages_statistics', {package: package.name}) %}
5959
<div><span><a href="{{ packageStatisticsUrl }}">{{ 'Installations'|trans }}</a></span> {{ package.installations.total }}</div>
@@ -73,8 +73,8 @@
7373
{% set packageProvidersUrl = path('dashboard_packages_providers', {package: package.name}) %}
7474
<div><span><a href="{{ packageProvidersUrl }}">{{ 'Providers'|trans }}</a></span> {{ providerCount }}</div>
7575
{% endif %}
76-
{% if version.license %}
77-
<div><span>{{ 'License'|trans }}</span> {{ version.license|join(', ') }}</div>
76+
{% if metadata.license %}
77+
<div><span>{{ 'License'|trans }}</span> {{ metadata.license|join(', ') }}</div>
7878
{% else %}
7979
<div>No license specified</div>
8080
{% endif %}
@@ -95,38 +95,38 @@
9595

9696
<div class="d-flex justify-content-between border-top border-bottom py-3 mb-3">
9797
<div><strong>{{ version.name }}</strong></div>
98-
{% if version.releasedAt %}
99-
<div>{{ version.releasedAt.format('Y-m-d H:i') }} UTC</div>
98+
{% if metadata.releasedAt %}
99+
<div>{{ metadata.releasedAt.format('Y-m-d H:i') }} UTC</div>
100100
{% endif %}
101101
</div>
102102

103103
<div class="row border-bottom pb-3 mb-3">
104-
{{ _self.linkBlock('Requires', version.require) }}
105-
{{ _self.linkBlock('Requires (dev)', version.devRequire) }}
106-
{{ _self.provideBlock(version.provide) }}
107-
{{ _self.linkBlock('Suggests', version.suggest) }}
108-
{{ _self.linkBlock('Conflicts', version.conflict) }}
109-
{{ _self.linkBlock('Replaces', version.replace) }}
104+
{{ _self.linkBlock('Requires', metadata.require) }}
105+
{{ _self.linkBlock('Requires (dev)', metadata.devRequire) }}
106+
{{ _self.provideBlock(metadata.provide) }}
107+
{{ _self.linkBlock('Suggests', metadata.suggest) }}
108+
{{ _self.linkBlock('Conflicts', metadata.conflict) }}
109+
{{ _self.linkBlock('Replaces', metadata.replace) }}
110110
</div>
111111

112112
<div class="row border-bottom pb-3 mb-3">
113113
<div class="col-md-6">
114-
{% if version.hasSource() %}
114+
{% if metadata.hasSource() %}
115115
<div class="h5">
116116
{{ 'Source'|trans }}
117-
<span class="badge text-bg-secondary">{{ version.sourceType }}</span>
117+
<span class="badge text-bg-secondary">{{ metadata.sourceType }}</span>
118118
</div>
119119

120120
<div class="mb-2">
121-
<code>{{ version.sourceUrl }}</code>
121+
<code>{{ metadata.sourceUrl }}</code>
122122
</div>
123123

124124
<div class="mb-2">
125-
{{ 'Reference'|trans }}: <code>{{ version.sourceReference }}</code>
125+
{{ 'Reference'|trans }}: <code>{{ metadata.sourceReference }}</code>
126126
</div>
127127

128128
<div class="mb-2">
129-
{% set browseUrl = version.browsableRepositoryUrl %}
129+
{% set browseUrl = metadata.browsableRepositoryUrl %}
130130
{% if browseUrl %}
131131
<a class="btn btn-sm btn-secondary" href="{{ browseUrl }}">
132132
<span class="fa-solid fa-code me-1" aria-hidden="true"></span>
@@ -140,18 +140,18 @@
140140
{% endif %}
141141
</div>
142142
<div class="col-md-6">
143-
{% if version.hasDist() %}
143+
{% if metadata.hasDist() %}
144144
<div class="h5">
145145
{{ 'Distribution'|trans }}
146-
<span class="badge text-bg-secondary">{{ version.distType }}</span>
146+
<span class="badge text-bg-secondary">{{ metadata.distType }}</span>
147147
</div>
148148

149149
<div class="mb-2">
150-
{{ 'Reference'|trans }}: <code>{{ version.distReference }}</code>
150+
{{ 'Reference'|trans }}: <code>{{ metadata.distReference }}</code>
151151
</div>
152152

153153
<div class="mb-2">
154-
<a class="btn btn-sm btn-secondary" href="{{ version.distUrl }}" download>
154+
<a class="btn btn-sm btn-secondary" href="{{ metadata.distUrl }}" download>
155155
<span class="fa-solid fa-download me-1" aria-hidden="true"></span>
156156
{{ 'Download' }}
157157
</a>
@@ -163,9 +163,9 @@
163163
</div>
164164
</div>
165165

166-
{% if version.readme %}
166+
{% if metadata.readme %}
167167
<div class="mb-3">
168-
{{ version.readme|raw }}
168+
{{ metadata.readme|raw }}
169169
</div>
170170
{% endif %}
171171
{% endblock %}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@
5858
{% endmacro %}
5959

6060
{% macro versionListItem(version) %}
61-
{% set packageVersionInfoUrl = path('dashboard_packages_version_info', {package: version.packageName, version: version.name}) %}
61+
{% set packageVersionInfoUrl = path('dashboard_packages_version_info', {package: version.package.name, version: version.name}) %}
6262
<a href="{{ packageVersionInfoUrl }}" class="list-group-item">
6363
<div class="d-flex justify-content-between">
64-
<span>{{ version.versionTitle }}</span>
65-
<span class="text-muted">{{ version.releasedAt.format('Y-m-d') }}</span>
64+
<span>{{ version.extendedName }}</span>
65+
<span class="text-muted">{{ version.currentMetadata.releasedAt.format('Y-m-d') }}</span>
6666
</div>
6767
</a>
6868
{% endmacro %}

0 commit comments

Comments
 (0)