Skip to content
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

Jump to bottom

[Idea wanted] Add centralised link list in the network management [long loading time] #2898

Closed
wants to merge 1 commit into from
Closed

[Idea wanted] Add centralised link list in the network management [long loading time] #2898

Show file tree
Hide file tree
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
7 changes: 7 additions & 0 deletions integreat_cms/cms/templates/_base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,13 @@
<i icon-name="layout-grid"></i>
{% translate "Admin Dashboard" %}
</a>
{% if perms.cms.view_broken_links %}
<a href="{% url 'linkcheck_landing' %}"
class="{% if current_menu_item == 'linkcheck' %} active{% endif %}">
<i icon-name="link"></i>
{% translate "Broken Links" %}
</a>
{% endif %}
{% if perms.cms.view_region %}
<a href="{% url 'regions' %}"
class="{% if current_menu_item == 'regions' %} active{% endif %}">
Expand Down
12 changes: 10 additions & 2 deletions integreat_cms/cms/templates/linkcheck/link_list_row.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,11 @@
</td>
<td class="text-right pr-4">
<a title="{% translate "Replace URL globally" %}"
href="{% url 'edit_url' url_id=url.id url_filter=view.kwargs.url_filter region_slug=request.region.slug %}{{ pagination_params }}#replace-url"
href="{% if request.region.slug %}
{% url 'edit_url' url_id=url.id url_filter=view.kwargs.url_filter region_slug=request.region.slug %}{{ pagination_params }}#replace-url
{% else %}
{% url 'edit_url' url_id=url.id url_filter=view.kwargs.url_filter %}{{ pagination_params }}#replace-url
{% endif %}"
class="btn-icon">
<i icon-name="pen-square"></i>
</a>
Expand All @@ -112,7 +116,11 @@
<td colspan="10">
<div class="flex gap-2 p-2">
{% render_field edit_url_form.url|add_error_class:"border-red-500" type="url" form="edit-url-form" %}
<a href="{% url 'linkcheck' url_filter=view.kwargs.url_filter region_slug=request.region.slug %}{{ pagination_params }}"
<a href="{% if request.region.slug %}
{% url 'linkcheck' url_filter=view.kwargs.url_filter region_slug=request.region.slug %}{{ pagination_params }}
{% else %}
{% url 'linkcheck' url_filter=view.kwargs.url_filter %}{{ pagination_params }}
{% endif %}"
class="btn btn-red">{% translate "Cancel" %}</a>
<button type="submit" form="edit-url-form" class="btn">
{% translate "Save" %}
Expand Down
93 changes: 83 additions & 10 deletions integreat_cms/cms/templates/linkcheck/links_by_filter.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,34 +21,74 @@ <h1 class="heading">
{% endif %}
</h1>
{% if request.user.expert_mode %}
<a href="{% url 'search_and_replace_link' region_slug=request.region.slug %}"
<a href="{% if request.region.slug %}
{% url 'search_and_replace_link' region_slug=request.region.slug %}
{% else %}
{% url 'search_and_replace_link' %}
{% endif %}"
class="font-bold text-sm text-gray-800 flex items-center gap-1 mb-2 hover:underline">
<span><i icon-name="replace" class="align-top h-5"></i> {% translate "Search & replace" %}</span>
</a>
{% endif %}
</div>
<a href="{% if view.kwargs.url_filter == 'valid' %}#{% else %}{% url 'linkcheck' region_slug=request.region.slug url_filter='valid' %}{% if request.GET.size %}?size={{ request.GET.size }}{% endif %}{% endif %}"
<a href="{% if view.kwargs.url_filter == 'valid' %}
#
{% else %}
{% if request.region.slug %}
{% url 'linkcheck' region_slug=request.region.slug url_filter='valid' %}
{% else %}
{% url 'linkcheck' url_filter='valid' %}
{% endif %}
{% if request.GET.size %}?size={{ request.GET.size }}{% endif %}
{% endif %}"
class="pr-2 {% if view.kwargs.url_filter == 'valid' %}text-black font-bold cursor-default{% else %}bg-transparent hover:underline text-blue-500 hover:text-blue-600 cursor-pointer{% endif %}">
{% translate "Valid" %}
<span class="{% if view.kwargs.url_filter == 'valid' %}text-gray-500 font-normal{% endif %}">
({{ number_valid_urls }})
</span>
</a>
<a href="{% if view.kwargs.url_filter == 'invalid' %}#{% else %}{% url 'linkcheck' region_slug=request.region.slug url_filter='invalid' %}{% if request.GET.size %}?size={{ request.GET.size }}{% endif %}{% endif %}"
<a href="{% if view.kwargs.url_filter == 'invalid' %}
#
{% else %}
{% if request.region.slug %}
{% url 'linkcheck' region_slug=request.region.slug url_filter='invalid' %}
{% else %}
{% url 'linkcheck' url_filter='invalid' %}
{% endif %}
{% if request.GET.size %}?size={{ request.GET.size }}{% endif %}
{% endif %}"
class="px-2 border-l-2 border-gray-500 {% if view.kwargs.url_filter == 'invalid' %}text-black font-bold cursor-default{% else %}bg-transparent hover:underline text-blue-500 hover:text-blue-600 cursor-pointer{% endif %}">
{% translate "Invalid" %}
<span class="{% if view.kwargs.url_filter == 'invalid' %}text-gray-500 font-normal{% endif %}">
({{ number_invalid_urls }})
</span>
</a>
<a href="{% if view.kwargs.url_filter == 'unchecked' %}#{% else %}{% url 'linkcheck' region_slug=request.region.slug url_filter='unchecked' %}{% if request.GET.size %}?size={{ request.GET.size }}{% endif %}{% endif %}"
<a href="{% if view.kwargs.url_filter == 'unchecked' %}
#
{% else %}
{% if request.region.slug %}
{% url 'linkcheck' region_slug=request.region.slug url_filter='unchecked' %}
{% else %}
{% url 'linkcheck' url_filter='unchecked' %}
{% endif %}
{% if request.GET.size %}?size={{ request.GET.size }}{% endif %}
{% endif %}"
class="px-2 border-l-2 border-gray-500 {% if view.kwargs.url_filter == 'unchecked' %}text-black font-bold cursor-default{% else %}bg-transparent hover:underline text-blue-500 hover:text-blue-600 cursor-pointer{% endif %}">
{% translate "Unchecked" %}
<span class="{% if view.kwargs.url_filter == 'unchecked' %}text-gray-500 font-normal{% endif %}">
({{ number_unchecked_urls }})
</span>
</a>
<a href="{% if view.kwargs.url_filter == 'ignored' %}#{% else %}{% url 'linkcheck' region_slug=request.region.slug url_filter='ignored' %}{% if request.GET.size %}?size={{ request.GET.size }}{% endif %}{% endif %}"
<a href="{% if view.kwargs.url_filter == 'ignored' %}
#
{% else %}
{% if request.region.slug %}
{% url 'linkcheck' region_slug=request.region.slug url_filter='ignored' %}
{% else %}
{% url 'linkcheck' url_filter='ignored' %}
{% endif %}
{% if request.GET.size %}?size={{ request.GET.size }}{% endif %}
{% endif %}"
class="px-2 border-l-2 border-gray-500 {% if view.kwargs.url_filter == 'ignored' %}text-black font-bold cursor-default{% else %}bg-transparent hover:underline text-blue-500 hover:text-blue-600 cursor-pointer{% endif %}">
{% translate "Ignored" %}
<span class="{% if view.kwargs.url_filter == 'ignored' %}text-gray-500 font-normal{% endif %}">
Expand All @@ -57,7 +97,16 @@ <h1 class="heading">
</a>
{% if request.user.expert_mode %}
{% if LINKCHECK_EMAIL_ENABLED %}
<a href="{% if view.kwargs.url_filter == 'email' %}#{% else %}{% url 'linkcheck' region_slug=request.region.slug url_filter='email' %}{% if request.GET.size %}?size={{ request.GET.size }}{% endif %}{% endif %}"
<a href="{% if view.kwargs.url_filter == 'email' %}
#
{% else %}
{% if request.region.slug %}
{% url 'linkcheck' region_slug=request.region.slug url_filter='email' %}
{% else %}
{% url 'linkcheck' url_filter='email' %}
{% endif %}
{% if request.GET.size %}?size={{ request.GET.size }}{% endif %}
{% endif %}"
class="px-2 border-l-2 border-gray-500 {% if view.kwargs.url_filter == 'email' %}text-black font-bold cursor-default{% else %}bg-transparent hover:underline text-blue-500 hover:text-blue-600 cursor-pointer{% endif %}">
{% translate "Email links" %}
<span class="{% if view.kwargs.url_filter == 'email' %}text-gray-500 font-normal{% endif %}">
Expand All @@ -66,7 +115,16 @@ <h1 class="heading">
</a>
{% endif %}
{% if LINKCHECK_PHONE_ENABLED %}
<a href="{% if view.kwargs.url_filter == 'phone' %}#{% else %}{% url 'linkcheck' region_slug=request.region.slug url_filter='phone' %}{% if request.GET.size %}?size={{ request.GET.size }}{% endif %}{% endif %}"
<a href="{% if view.kwargs.url_filter == 'phone' %}
#
{% else %}
{% if request.region.slug %}
{% url 'linkcheck' region_slug=request.region.slug url_filter='phone' %}
{% else %}
{% url 'linkcheck' url_filter='phone' %}
{% endif %}
{% if request.GET.size %}?size={{ request.GET.size }}{% endif %}
{% endif %}"
class="px-2 border-l-2 border-gray-500 {% if view.kwargs.url_filter == 'phone' %}text-black font-bold cursor-default{% else %}bg-transparent hover:underline text-blue-500 hover:text-blue-600 cursor-pointer{% endif %}">
{% translate "Phone links" %}
<span class="{% if view.kwargs.url_filter == 'phone' %}text-gray-500 font-normal{% endif %}">
Expand Down Expand Up @@ -170,16 +228,31 @@ <h1 class="heading">
</option>
{% if view.kwargs.url_filter == 'ignored' %}
<option value="unignore"
data-bulk-action="{% url 'linkcheck' region_slug=request.region.slug url_filter=view.kwargs.url_filter %}{{ pagination_params }}">
data-bulk-action="{% if request.region.slug %}
{% url 'linkcheck' region_slug=request.region.slug url_filter=view.kwargs.url_filter %}
{% else %}
{% url 'linkcheck' url_filter=view.kwargs.url_filter %}
{% endif %}
{{ pagination_params }}">
{% translate "Unignore" %}
</option>
{% else %}
<option value="recheck"
data-bulk-action="{% url 'linkcheck' region_slug=request.region.slug url_filter=view.kwargs.url_filter %}{{ pagination_params }}">
data-bulk-action="{% if request.region.slug %}
{% url 'linkcheck' region_slug=request.region.slug url_filter=view.kwargs.url_filter %}
{% else %}
{% url 'linkcheck' url_filter=view.kwargs.url_filter %}
{% endif %}
{{ pagination_params }}">
{% translate "Recheck" %}
</option>
<option value="ignore"
data-bulk-action="{% url 'linkcheck' region_slug=request.region.slug url_filter=view.kwargs.url_filter %}{{ pagination_params }}">
data-bulk-action="{% if request.region.slug %}
{% url 'linkcheck' region_slug=request.region.slug url_filter=view.kwargs.url_filter %}
{% else %}
{% url 'linkcheck' url_filter=view.kwargs.url_filter %}
{% endif %}
{{ pagination_params }}">
{% translate "Ignore" %}
</option>
{% endif %}
Expand Down
39 changes: 39 additions & 0 deletions integreat_cms/cms/urls/protected.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,45 @@
dashboard.AdminDashboardView.as_view(),
name="admin_dashboard",
),
path(
"linkcheck/",
include(
[
path(
"",
linkcheck.LinkcheckRedirectView.as_view(),
name="linkcheck_landing",
),
path(
"stats",
linkcheck.LinkcheckStatsView.as_view(),
name="linkcheck_stats",
),
path(
"<slug:url_filter>/",
include(
[
path(
"",
linkcheck.LinkcheckListView.as_view(),
name="linkcheck",
),
path(
"<int:url_id>/",
linkcheck.LinkcheckListView.as_view(),
name="edit_url",
),
]
),
),
path(
"search_and_replace_link",
linkcheck.LinkReplaceView.as_view(),
name="search_and_replace_link",
),
]
),
),
path(
"regions/",
include(
Expand Down
78 changes: 42 additions & 36 deletions integreat_cms/cms/utils/linkcheck_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,22 +48,22 @@ def get_urls(
if url_ids is not None:
# If the results should be limited to specific ids, filter the queryset
urls = urls.filter(id__in=url_ids)
if region_slug:
region = Region.objects.get(slug=region_slug)
region_links = get_region_links(region)

# Prefetch all link objects of the requested region
urls = (
urls.filter(links__in=region_links)
.distinct()
.prefetch_related(
Prefetch(
"links",
queryset=region_links,
to_attr="region_links",
)

region = Region.objects.get(slug=region_slug) if region_slug else None
region_links = get_region_links(region)

# Prefetch all link objects of the requested region
urls = (
urls.filter(links__in=region_links)
.distinct()
.prefetch_related(
Prefetch(
"links",
queryset=region_links,
to_attr="region_links",
)
)
)

# Filter out ignored URL types
if settings.LINKCHECK_IGNORED_URL_TYPES:
Expand All @@ -74,34 +74,40 @@ def get_urls(
return urls


def get_region_links(region: Region) -> QuerySet:
def get_region_links(region: Region| None) -> QuerySet:
"""
Returns the links of translations of the given region
:param region: The region
:return: A query containing the relevant links
"""
latest_pagetranslation_versions = Subquery(
PageTranslation.objects.filter(
page__id__in=Subquery(region.non_archived_pages.values("pk")),
if region:
latest_pagetranslation_versions = Subquery(
PageTranslation.objects.filter(
page__id__in=Subquery(region.non_archived_pages.values("pk")),
)
.distinct("page__id", "language__id")
.values_list("pk", flat=True)
)
.distinct("page__id", "language__id")
.values_list("pk", flat=True)
)
latest_poitranslation_versions = Subquery(
POITranslation.objects.filter(poi__region=region)
.distinct("poi__id", "language__id")
.values_list("pk", flat=True)
)
latest_eventtranslation_versions = Subquery(
EventTranslation.objects.filter(event__region=region)
.distinct("event__id", "language__id")
.values_list("pk", flat=True)
)
latest_imprinttranslation_versions = Subquery(
ImprintPageTranslation.objects.filter(page__region=region)
.distinct("page__id", "language__id")
.values_list("pk", flat=True)
)
latest_poitranslation_versions = Subquery(
POITranslation.objects.filter(poi__region=region)
.distinct("poi__id", "language__id")
.values_list("pk", flat=True)
)
latest_eventtranslation_versions = Subquery(
EventTranslation.objects.filter(event__region=region)
.distinct("event__id", "language__id")
.values_list("pk", flat=True)
)
latest_imprinttranslation_versions = Subquery(
ImprintPageTranslation.objects.filter(page__region=region)
.distinct("page__id", "language__id")
.values_list("pk", flat=True)
)
else:
latest_pagetranslation_versions = PageTranslation.objects.distinct("page__id", "language__id").values_list("pk", flat=True)
latest_poitranslation_versions = POITranslation.objects.distinct("poi__id", "language__id").values_list("pk", flat=True)
latest_eventtranslation_versions = EventTranslation.objects.distinct("event__id", "language__id").values_list("pk", flat=True)
latest_imprinttranslation_versions = ImprintPageTranslation.objects.distinct("page__id", "language__id").values_list("pk", flat=True)
# Get all link objects of the requested region
region_links = Link.objects.filter(
Q(page_translation__id__in=latest_pagetranslation_versions)
Expand Down
14 changes: 9 additions & 5 deletions integreat_cms/cms/views/linkcheck/link_replace_view.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,13 @@ def post(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:
_("Links were replaced successfully."),
)

if request.region:
return redirect(
"linkcheck_landing",
**{
"region_slug": request.region.slug,
},
)
return redirect(
"linkcheck_landing",
**{
"region_slug": request.region.slug,
},
)
"linkcheck_landing",
)
Loading
Loading