From 238f29fbf11b85e3cd5db79640857d48795ef12b Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nenciu.bianca@gmail.com>
Date: Wed, 3 Apr 2024 16:07:32 +0300
Subject: [PATCH] Apply code suggestions

---
 assets/javascripts/discourse/models/docs.js | 18 +++++++-----------
 lib/docs/query.rb                           | 12 ++++--------
 spec/requests/docs_controller_spec.rb       |  4 ++--
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/assets/javascripts/discourse/models/docs.js b/assets/javascripts/discourse/models/docs.js
index 5a62f3e..b93caef 100644
--- a/assets/javascripts/discourse/models/docs.js
+++ b/assets/javascripts/discourse/models/docs.js
@@ -40,12 +40,10 @@ Docs.reopenClass({
 
     return ajax(`/${docsPath}.json?${filters.join("&")}`).then((data) => {
       const site = Site.current();
-      if (site.lazy_load_categories) {
-        data.categories?.forEach((category) => site.updateCategory(category));
-        data.topics.topic_list.categories?.forEach((category) =>
-          site.updateCategory(category)
-        );
-      }
+      data.categories?.forEach((category) => site.updateCategory(category));
+      data.topics.topic_list.categories?.forEach((category) =>
+        site.updateCategory(category)
+      );
       data.topics.topic_list.topics = data.topics.topic_list.topics.map(
         (topic) => Topic.create(topic)
       );
@@ -60,11 +58,9 @@ Docs.reopenClass({
   loadMore(loadMoreUrl) {
     return ajax(loadMoreUrl).then((data) => {
       const site = Site.current();
-      if (site.lazy_load_categories) {
-        data.topics.topic_list.categories?.forEach((category) =>
-          site.updateCategory(category)
-        );
-      }
+      data.topics.topic_list.categories?.forEach((category) =>
+        site.updateCategory(category)
+      );
       data.topics.topic_list.topics = data.topics.topic_list.topics.map(
         (topic) => Topic.create(topic)
       );
diff --git a/lib/docs/query.rb b/lib/docs/query.rb
index 864407a..6af9e80 100644
--- a/lib/docs/query.rb
+++ b/lib/docs/query.rb
@@ -230,14 +230,10 @@ module Docs
           count = category_counts[category.id]
           active = @filters[:category] && @filters[:category].include?(category.id.to_s)
 
-          if @guardian.can_lazy_load_categories?
-            BasicCategorySerializer
-              .new(categories[id], scope: @guardian, root: false)
-              .as_json
-              .merge(count:, active:)
-          else
-            { id: category.id, count:, active: }
-          end
+          BasicCategorySerializer
+            .new(category, scope: @guardian, root: false)
+            .as_json
+            .merge(count:, active:)
         end
         .sort_by { |category| [category[:active] ? 0 : 1, -category[:count]] }
     end
diff --git a/spec/requests/docs_controller_spec.rb b/spec/requests/docs_controller_spec.rb
index e24ed64..83a4ff9 100644
--- a/spec/requests/docs_controller_spec.rb
+++ b/spec/requests/docs_controller_spec.rb
@@ -174,8 +174,8 @@ describe Docs::DocsController do
         topics = json["topics"]["topic_list"]["topics"]
 
         expect(categories.size).to eq(2)
-        expect(categories[0]).to eq({ "active" => true, "count" => 1, "id" => category2.id })
-        expect(categories[1]).to eq({ "active" => false, "count" => 2, "id" => category.id })
+        expect(categories[0]).to include({ "active" => true, "count" => 1, "id" => category2.id })
+        expect(categories[1]).to include({ "active" => false, "count" => 2, "id" => category.id })
         expect(topics.size).to eq(1)
       end