Revert topic card work (#6495)

* Revert "Remove duplicate docs per topic"

This reverts commit e625a79.

* Revert "Do not show duplicate docs"

This reverts commit f2678dc.

* Revert "pass template context to help_topics (#6492)"

This reverts commit f62ada8.

* Revert "use request locale in topic card links (#6491)"

This reverts commit f2d651c.

* Revert "Expose fallback documents in topic cards."

This reverts commit 14dcc4a.

* Revert "Do not clip article counter (#6488)"

This reverts commit 2ddb33c.

* Revert "Fix queries for non en-US locales (#6487)"

This reverts commit 0d52f40.

* Revert "Update padding in topic cards"

This reverts commit fae102f.

* Revert "Update wording in macro."

This reverts commit 676e36e.

* Revert "Topic cards revised to show three articles (#6471)"

This reverts commit 01b2e16.

kitsune/products/jinja2/products/includes/topic_macros.html

@@ -1,46 +1,32 @@
 {% macro help_topics(topics, product_slug=None, new_tab=False) -%}
-{# topics: List of topic_data dicts containing:
-    - topic: Topic model instance
-    - topic_url: URL to topic page
-    - title: Topic title
-    - total_articles: Number of articles
-    - image_url: URL to topic icon
-    - documents: three documents for the topic
-#}
-<div class="topics-section">
-  <div class="topics-grid">
-    {% for topic_data in topics %}
-    <div class="card--topic">
-      <div class="topic-header">
+  <div class="sumo-card-grid">
+    <div class="scroll-wrap">
+      {% for topic in topics %}
+      {% set topic_url = url('products.documents', product_slug=product_slug or product.slug, topic_slug=topic.slug) %}
+      <div class="card card--topic">
         <img
           class="card--icon"
-          src="{{ topic_data.image_url }}"
-          alt="{{ pgettext('DB: products.Topic.title', topic_data.title) }} icon"
-          loading="lazy"
+          src="{{ topic.image_url }}"
+          alt="{{ pgettext('DB: products.Topic.title', topic.title) }} icon"
         />
+        <div class="card--details">
           <h3 class="card--title">
-            <a href="{{ topic_data.topic_url }}">
-              {{ pgettext('DB: products.Topic.title', topic_data.title) }}
+            <a class="expand-this-link" href="{{ topic_url }}" data-on-hover="{{ _('See all') }}" {% if new_tab %} target="_blank" {% endif %}
+              data-event-name="link_click"
+              data-event-parameters='{
+                "link_name": "product-and-topic-home",
+                "link_detail": "{{ (product_slug or product.slug) + '/' + topic.slug }}"
+              }'>
+              {{ pgettext('DB: products.Topic.title', topic.title) }}
             </a>
           </h3>
+        </div>
       </div>
-      <ul class="article-list">
-        {% for document in topic_data.documents %}
-        <li>
-          <a href="{{ document.get_absolute_url() | replace('/' + settings.WIKI_DEFAULT_LANGUAGE + '/', '/' + request.LANGUAGE_CODE + '/')}}">
-            {{ document.title }}</a>
-        </li>
-        {% endfor %}
-      </ul>
-      <a class="view-all-link" href="{{ topic_data.topic_url }}">View All {{ topic_data.total_articles }} Articles</a>
+      {% endfor %}
     </div>
-    {% endfor %}
   </div>
-</div>
 {%- endmacro %}
 
-
-
 {% macro topic_metadata(topics, product=None) %}
 {% if product and has_aaq_config and not settings.READ_ONLY %}
   <section class="support-callouts mzp-l-content sumo-page-section--inner">
@@ -168,4 +154,4 @@ <h3 class="sidebar-subheading large-only">{{ _('Popular') }} {% if product %} {{
     {% endfor %}
   </ul>
 </nav>
-{%- endmacro %}
+{%- endmacro %}

kitsune/products/jinja2/products/product.html

@@ -123,7 +123,7 @@ <h1 class="sumo-page-heading-xl">
     <div class="sumo-page-subheader">
       <div class="sumo-page-subheader--text">
         <div class="text-center-to-left-on-large">
-          <h2 class="sumo-page-subheading">{{ _('Topics') }}</h2>
+          <h2 class="sumo-page-subheading">{{ _('Frequent Topics') }}</h2>
           <p class="sumo-page-intro">{{ _('Explore the knowledge base.') }}</p>
         </div>
       </div>

kitsune/products/views.py

@@ -2,7 +2,7 @@
 
 from django.conf import settings
 from django.db.models import Exists, OuterRef, Q
-from django.http import Http404, HttpRequest, HttpResponse
+from django.http import Http404, HttpResponse
 from django.shortcuts import get_object_or_404, redirect, render
 from product_details import product_details
 
@@ -11,7 +11,7 @@
 from kitsune.wiki.decorators import check_simple_wiki_locale
 from kitsune.wiki.facets import documents_for, topics_for
 from kitsune.wiki.models import Document, Revision
-from kitsune.wiki.utils import build_topics_data, get_featured_articles
+from kitsune.wiki.utils import get_featured_articles
 
 
 @check_simple_wiki_locale
@@ -23,19 +23,8 @@ def product_list(request):
 
 
 @check_simple_wiki_locale
-def product_landing(request: HttpRequest, slug: str) -> HttpResponse:
-    """The product landing page.
-
-    Args:
-        request: The HTTP request
-        slug: Product slug identifier
-
-    Returns:
-        Rendered product landing page
-
-    Raises:
-        Http404: If product not found
-    """
+def product_landing(request, slug):
+    """The product landing page."""
     if slug == "firefox-accounts":
         return redirect(product_landing, slug="mozilla-account", permanent=True)
 
@@ -56,15 +45,14 @@ def product_landing(request: HttpRequest, slug: str) -> HttpResponse:
             latest_version = versions[0].min_version
         else:
             latest_version = 0
-    topics = topics_for(request.user, product=product, parent=None)
 
     return render(
         request,
         "products/product.html",
         {
             "product": product,
             "products": Product.active.filter(visible=True),
-            "topics": build_topics_data(request, product, topics),
+            "topics": topics_for(request.user, product=product, parent=None),
             "search_params": {"product": slug},
             "latest_version": latest_version,
             "featured": get_featured_articles(product, locale=request.LANGUAGE_CODE),

kitsune/questions/jinja2/questions/includes/aaq_macros.html

@@ -1,4 +1,4 @@
-{% from 'products/includes/topic_macros.html' import help_topics with context %}
+{% from 'products/includes/topic_macros.html' import help_topics %}
 {% from 'includes/common_macros.html' import featured_articles, scam_banner %}
 
 {% macro select_product(products) -%}
@@ -132,7 +132,7 @@ <h2 class="card--title has-bottom-margin">
     </div>
 {%- endmacro %}
 
-{% macro explore_solutions(product, search_box, featured, topics, has_ticketing_support=True) -%}
+{% macro explore_solutions(product, search_box, featured, topics, request, has_ticketing_support=True) -%}
 {% set search_params = {'product': product.slug} %}
 <section class="sumo-page-section question-masthead shade-bg">
   <div class="mzp-l-content">
@@ -173,7 +173,7 @@ <h2 class="sumo-page-subheading">{{ _('Featured Articles') }}</h2>
   <section class="sumo-page-section--inner hide-when-search-is-active highlight-box">
       <div class="mzp-l-content">
         <div class="text-center-to-left-on-large aaq-popular-topics">
-          <h2 class="sumo-page-subheading">{{ _('Topics') }}</h2>
+          <h2 class="sumo-page-subheading">{{ _('Popular Topics') }}</h2>
         </div>
         {{ help_topics(topics, product_slug=product.slug, new_tab=True) }}
       </div>

kitsune/questions/jinja2/questions/new_question.html

@@ -1,5 +1,5 @@
 {% extends "questions/includes/question_editing_frame.html" %}
-{% from "questions/includes/aaq_macros.html" import explore_solutions with context %}
+{% from "questions/includes/aaq_macros.html" import explore_solutions %}
 {% from "questions/includes/aaq_macros.html" import select_product %}
 {% set title = _('Get Support') %}
 {% set no_headline = True %}
@@ -20,7 +20,7 @@
 
 {% block contentwrap %}
   {% if current_step == 2 %}
-    {{ explore_solutions(current_product, search_box, featured, topics, has_ticketing_support) }}
+    {{ explore_solutions(current_product, search_box, featured, topics, request, has_ticketing_support) }}
   {% else %}
     {{ super() }}
   {% endif %}

kitsune/questions/views.py

@@ -70,7 +70,6 @@
 from kitsune.upload.models import ImageAttachment
 from kitsune.users.models import Setting
 from kitsune.wiki.facets import topics_for
-from kitsune.wiki.utils import build_topics_data
 
 log = logging.getLogger("k.questions")
 
@@ -569,10 +568,8 @@ def aaq(request, product_slug=None, step=1, is_loginless=False):
         context["ga_products"] = f"/{product_slug}/"
 
     if step == 2:
-        topics = topics_for(request.user, product, parent=None)
-
         context["featured"] = get_featured_articles(product, locale=request.LANGUAGE_CODE)
-        context["topics"] = build_topics_data(request, product, topics)
+        context["topics"] = topics_for(request.user, product, parent=None)
 
     elif step == 3:
         context["cancel_url"] = get_next_url(request) or (