Skip to content

Commit 52737d5

Browse files
karimarie67karimarie67
authored
Merge branch 'boostorg:develop' into develop
2 parents 63c878a + aa8325f commit 52737d5

File tree

14 files changed

+270
-141
lines changed

14 files changed

+270
-141
lines changed

‎core/tests/content/leaf.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
}
2525
</script>
2626
<!-- BEGIN Manually appending items -->
27-
<script data-domain="preview.boost.org" defer="" src="https://plausible.io/js/script.js"></script>
27+
<script data-domain="boost.org" defer="" src="https://plausible.io/js/script.js"></script>
2828
<title>Boost</title>
2929
<meta charset="utf-8"/>
3030
<meta content="IE=edge" http-equiv="X-UA-Compatible"/>
@@ -48,7 +48,7 @@
4848
<!-- detect dark or light mode -->
4949
<script src="/static/js/DetectMode.js"></script>
5050
<script defer="" src="/static/js/scroll-to-link.js"></script>
51-
<script defer="" src="/static/js/boost-gecko/main.eb9cabc5.js"></script>
51+
<script defer="" src="/static/js/boost-gecko/main.cb02adc0.js"></script>
5252
<link href="/static/css/styles.css" rel="stylesheet"/>
5353
<link data-modernizer="boost-legacy-docs-extra-head" href="/static/css/fonts.css" rel="stylesheet"/>
5454
</link></link><!-- END Manually appending items --></head>

‎libraries/views.py‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import datetime
2+
import structlog
23

34
from django.contrib import messages
45
from django.db.models import F, Count, Prefetch
@@ -10,6 +11,7 @@
1011
from django.views.generic import DetailView, ListView
1112

1213
from core.githubhelper import GithubAPIClient
14+
from versions.exceptions import BoostImportedDataException
1315
from versions.models import Version
1416

1517
from .constants import README_MISSING
@@ -30,6 +32,8 @@
3032
)
3133
from .constants import LATEST_RELEASE_URL_PATH_STR
3234

35+
logger = structlog.get_logger()
36+
3337

3438
class LibraryListDispatcher(View):
3539
def dispatch(self, request, *args, **kwargs):
@@ -239,7 +243,12 @@ def get_context_data(self, **kwargs):
239243

240244
# Populate the commit graphs
241245
context["commit_data_by_release"] = self.get_commit_data_by_release()
242-
context["dependency_diff"] = self.get_dependency_diff(library_version)
246+
try:
247+
context["dependency_diff"] = self.get_dependency_diff(library_version)
248+
except BoostImportedDataException:
249+
logger.warning("Library version dependencies not set, need importing.")
250+
context["dependency_diff"] = {}
251+
context["dependencies_not_calculated"] = True
243252

244253
# Populate the library description
245254
client = GithubAPIClient(repo_slug=self.object.github_repo)

‎reports/constants.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
WORDCLOUD_FONT = "NotoSansMono-Regular.ttf"
2-
WEB_ANALYTICS_DOMAIN = "preview.boost.org"
2+
WEB_ANALYTICS_DOMAIN = "boost.org"
33
WEB_ANALYTICS_API_URL = (
44
f"https://plausible.io/api/stats/{WEB_ANALYTICS_DOMAIN}/top-stats/?period=custom"
55
"&from={:%Y-%m-%d}&to={:%Y-%m-%d}"

‎static/js/boost-gecko/main.cb02adc0.js‎

Lines changed: 189 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎static/js/boost-gecko/main.eb9cabc5.js‎

Lines changed: 0 additions & 103 deletions
This file was deleted.

‎templates/admin/library_report_base.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.6.0/css/all.min.css" />
2727
<!-- TODO bring this local if we like it -->
2828
<script src="https://cdn.jsdelivr.net/npm/apexcharts"></script>
29-
<script src="{% static 'js/boost-gecko/main.eb9cabc5.js' %}" defer></script>
29+
<script src="{% static 'js/boost-gecko/main.cb02adc0.js' %}" defer></script>
3030
{% block extra_head %}
3131
<link href="{% static 'css/styles.css' %}" rel="stylesheet" />
3232
{% endblock %}

‎templates/base.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<head>
88
{% if not disable_plausible %}
99
<script defer
10-
data-domain="preview.boost.org"
10+
data-domain="boost.org"
1111
src="https://plausible.io/js/script.manual.js"></script>
1212
{% endif %}
1313
<title>{% block title %}Boost{% endblock %}</title>
@@ -34,7 +34,7 @@
3434
<script src="https://cdn.jsdelivr.net/npm/apexcharts"></script>
3535
<script src="{% static 'js/theme_handling.js' %}"></script>
3636
<script src="{% static 'js/scroll-to-link.js' %}" defer></script>
37-
<script src="{% static 'js/boost-gecko/main.eb9cabc5.js' %}" defer></script>
37+
<script src="{% static 'js/boost-gecko/main.cb02adc0.js' %}" defer></script>
3838
{% block extra_head %}
3939
<link href="{% static 'css/styles.css' %}" rel="stylesheet">
4040
<link href="{% static 'css/components.css' %}" rel="stylesheet">

‎templates/libraries/detail.html‎

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -137,41 +137,45 @@ <h2 class="text-2xl">This Release</h2>
137137
</section>
138138
{% endif %}
139139

140-
{% if dependency_diff.previous_dependencies and dependency_diff.current_dependencies %}
141140
<section class="p-6 pt-1 my-4 bg-white md:rounded-lg md:shadow-lg dark:text-white text-slate dark:bg-charcoal dark:bg-neutral-700">
142141
<h2 class="text-2xl">Dependencies</h2>
143-
<div class="flex gap-x-4 gap-y-2 flex-wrap">
144-
{% for dep in dependency_diff.current_dependencies %}
145-
<div>
146-
{{ dep.name }}
147-
</div>
148-
{% endfor %}
149-
</div>
150-
151-
{% if dependency_diff.added %}
152-
<h4 class="mt-3">Added</h4>
153-
<div class="flex gap-x-4 flex-wrap">
142+
{% if dependency_diff.previous_dependencies and dependency_diff.current_dependencies %}
143+
<div class="flex gap-x-4 gap-y-2 flex-wrap">
154144
{% for dep in dependency_diff.current_dependencies %}
155-
{% if dep.name in dependency_diff.added %}
156-
<div>{{ dep.name }}</div>
157-
{% endif %}
145+
<div>
146+
<a href="{% url 'library-detail' version_slug=version_str library_slug=dep.slug %}" class="text-sky-600 dark:text-sky-300 hover:text-orange dark:hover:text-orange">{{ dep.name }}</a>
147+
</div>
158148
{% endfor %}
159149
</div>
160-
{% endif %}
161150

162-
{% if dependency_diff.removed %}
163-
<h4 class="mt-3">Removed</h4>
164-
<div class="flex gap-x-4 flex-wrap">
165-
{% for dep in dependency_diff.previous_dependencies %}
166-
{% if dep.name in dependency_diff.removed %}
167-
<div>{{ dep.name }}</div>
168-
{% endif %}
169-
{% endfor %}
151+
{% if dependency_diff.added %}
152+
<h4 class="mt-3">Added</h4>
153+
<div class="flex gap-x-4 flex-wrap">
154+
{% for dep in dependency_diff.current_dependencies %}
155+
{% if dep.name in dependency_diff.added %}
156+
<a href="{% url 'library-detail' version_slug=version_str library_slug=dep.slug %}" class="text-sky-600 dark:text-sky-300 hover:text-orange dark:hover:text-orange">{{ dep.name }}</a>
157+
{% endif %}
158+
{% endfor %}
159+
</div>
160+
{% endif %}
161+
162+
{% if dependency_diff.removed %}
163+
<h4 class="mt-3">Removed</h4>
164+
<div class="flex gap-x-4 flex-wrap">
165+
{% for dep in dependency_diff.previous_dependencies %}
166+
{% if dep.name in dependency_diff.removed %}
167+
<a href="{% url 'library-detail' version_slug=version_str library_slug=dep.slug %}" class="text-sky-600 dark:text-sky-300 hover:text-orange dark:hover:text-orange">{{ dep.name }}</a>
168+
{% endif %}
169+
{% endfor %}
170+
</div>
171+
{% endif %}
172+
{% elif dependencies_not_calculated %}
173+
<div class="text-sm">
174+
Library dependencies will be generated soon, please check back later.
170175
</div>
171176
{% endif %}
172177

173178
</section>
174-
{% endif %}
175179

176180
{% if description %}
177181
<section id="libraryReadMe"

‎templates/original_docs.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<head>
77
<meta charset="utf-8">
88
<link href="{% static 'css/header.css' %}">
9-
<script defer data-domain="preview.boost.org" src="https://plausible.io/js/script.manual.js"></script>
10-
<script src="{% static 'js/boost-gecko/main.eb9cabc5.js' %}" defer></script>
9+
<script defer data-domain="boost.org" src="https://plausible.io/js/script.manual.js"></script>
10+
<script src="{% static 'js/boost-gecko/main.cb02adc0.js' %}" defer></script>
1111
</head>
1212
<style>
1313
body {

‎templates/versions/detail.html‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,12 @@
8181
</div>
8282
</div>
8383
</div>
84+
{% elif dependencies_not_calculated %}
85+
<div class="text-base whitespace-normal text-sm">
86+
Library dependency calculations will be generated soon, please check back later.
87+
</div>
88+
{% endif %}
8489
</div>
85-
{% endif %}
8690
{% endif %}
8791

8892
</div>

0 commit comments

Comments
 (0)