Catalog-only mode of nojs welcome page

src/html_dumper.cpp

@@ -30,7 +30,7 @@ std::string humanFriendlyTitle(std::string title)
 kainjow::mustache::object getLangTag(const std::vector<std::string>& bookLanguages) {
   std::string langShortString = "";
   std::string langFullString = "???";
-  
+
   //if more than 1 languages then show "mul" else show the language
   if(bookLanguages.size() > 1) {
     std::vector<std::string> mulLanguages;
@@ -44,7 +44,7 @@ kainjow::mustache::object getLangTag(const std::vector<std::string>& bookLanguag
     langShortString = bookLanguages[0];
     langFullString = getLanguageSelfName(langShortString);
   }
-  
+
   kainjow::mustache::object langTag;
     langTag["langShortString"] = langShortString;
     langTag["langFullString"] = langFullString;
@@ -130,6 +130,7 @@ std::string HTMLDumper::dumpPlainHTML(kiwix::Filter filter) const
              RESOURCE::templates::no_js_library_page_html,
              kainjow::mustache::object{
                {"root", rootLocation},
+               {"contentServerUrl", onlyAsNonEmptyMustacheValue(contentServerUrl)},
                {"books", booksData },
                {"searchQuery", searchQuery},
                {"languages", languages},

src/server/internalServer.cpp

@@ -857,12 +857,17 @@ std::unique_ptr<Response> InternalServer::handle_no_js(const RequestContext& req
   HTMLDumper htmlDumper(mp_library.get(), mp_nameMapper.get());
   htmlDumper.setRootLocation(m_root);
   htmlDumper.setLibraryId(getLibraryId());
+  if ( !m_contentServerUrl.empty() ) {
+    htmlDumper.setContentServerUrl(m_contentServerUrl);
+  } else if ( !m_catalogOnlyMode ) {
+    htmlDumper.setContentServerUrl(m_root);
+  }
   auto userLang = request.get_user_language();
   htmlDumper.setUserLanguage(userLang);
   std::string content;
 
   if (urlParts.size() == 1) {
-    auto filter = get_search_filter(request);
+    auto filter = get_search_filter(request, "", m_catalogOnlyMode);
     try {
       if (request.get_argument("category") == "") {
         filter.clearCategory();

static/templates/no_js_library_page.html

@@ -108,7 +108,7 @@
         <h3 class="kiwixHomeBody__results">{{translations.count-of-matching-books}}</h3>
         {{#books}}
         <div class="book__wrapper">
-            <a class="book__link" href="{{root}}/content/{{id}}" title="{{translations.preview-book}}" aria-label="{{translations.preview-book}}">
+            {{#contentServerUrl}}<a class="book__link" href="{{contentServerUrl}}/content/{{id}}" title="{{translations.preview-book}}" aria-label="{{translations.preview-book}}">{{/contentServerUrl}}
             <div class="book__link__wrapper">
             <div class="book__icon" {{faviconAttr}}></div>
             <div class="book__header">
@@ -116,7 +116,7 @@
             </div>
             <div class="book__description" title="{{description}}">{{description}}</div>
             </div>
-            </a>
+            {{#contentServerUrl}}</a>{{/contentServerUrl}}
             <div class="book__meta">
               <div class="book__languageTag" title="{{langTag.langFullString}}" aria-label="{{langTag.langFullString}}">{{langTag.langShortString}}</div>
               <div class="book__tags"><div class="book__tags--wrapper">

test/library_server.cpp

@@ -1388,6 +1388,32 @@ TEST_F(LibraryServerTest, no_name_mapper_catalog_v2_individual_entry_access)
   "            </div>\n" \
   "        </div>\n"
 
+#define INACCESSIBLEZIMFILE_BOOK_HTML \
+  "        <div class=\"book__wrapper\">\n" \
+  "            <a class=\"book__link\" href=\"/ROOT%23%3F/content/nosuchzimfile\" title=\"Preview\" aria-label=\"Preview\">\n" \
+  "            <div class=\"book__link__wrapper\">\n" \
+  "            <div class=\"book__icon\" style=background-image:url(/ROOT%23%3F/catalog/v2/illustration/inaccessiblezim/?size=48)></div>\n" \
+  "            <div class=\"book__header\">\n" \
+  "                <div id=\"book__title\">Catalog of all catalogs</div>\n" \
+  "            </div>\n" \
+  "            <div class=\"book__description\" title=\"Testing that running kiwix-serve without access to ZIM files doesn&apos;t lead to a catastrophe\">Testing that running kiwix-serve without access to ZIM files doesn&apos;t lead to a catastrophe</div>\n" \
+  "            </div>\n" \
+  "            </a>\n" \
+  "            <div class=\"book__meta\">\n" \
+  "              <div class=\"book__languageTag\" title=\"català\" aria-label=\"català\">cat</div>\n" \
+  "              <div class=\"book__tags\"><div class=\"book__tags--wrapper\">\n" \
+  "                  <span class=\"tag__link\" aria-label='unittest' title='unittest'>unittest</span>\n" \
+  "              </div>\n" \
+  "              </div>\n" \
+  "            </div>\n" \
+  "            <div>\n" \
+  "              <a class=\"book__download\" href=\"/ROOT%23%3F/nojs/download/nosuchzimfile\">\n" \
+  "                <img src=\"/ROOT%23%3F/skin/download-white.svg?cacheid=079ab989\">\n" \
+  "                <span>Download</span>\n" \
+  "              </a>\n" \
+  "            </div>\n" \
+  "        </div>\n"
+
 #define FINAL_HTML_TEXT \
   "        </div>\n" \
   "    </div>\n" \
@@ -1523,4 +1549,25 @@ TEST_F(LibraryServerTest, noJS) {
   EXPECT_EQ(r->body, RAY_CHARLES_UNCTZ_DOWNLOAD);
 }
 
+TEST_F(LibraryServerTest, noJS_catalogOnlyMode) {
+  const std::string contentServerUrl = "https://demo.kiwix.org";
+  const auto fixContentLinks = [=](std::string s) -> std::string {
+    s = replace(s, "/ROOT%23%3F/content", contentServerUrl + "/content");
+    return s;
+  };
+  resetServer(ZimFileServer::CATALOG_ONLY_MODE, contentServerUrl);
+
+  auto r = zfs1_->GET("/ROOT%23%3F/nojs");
+  EXPECT_EQ(r->status, 200);
+  EXPECT_EQ(r->body,
+            HTML_PREAMBLE
+            FILTERS_HTML("")
+            HOME_BODY_TEXT("4")
+            + fixContentLinks(CHARLES_RAY_BOOK_HTML)
+            + fixContentLinks(INACCESSIBLEZIMFILE_BOOK_HTML)
+            + fixContentLinks(RAY_CHARLES_BOOK_HTML)
+            + fixContentLinks(RAY_CHARLES_UNCTZ_BOOK_HTML)
+            + FINAL_HTML_TEXT);
+}
+
 #undef EXPECT_SEARCH_RESULTS